Author: jerry Date: 2005-09-15 19:04:21 +0000 (Thu, 15 Sep 2005) New Revision: 810
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=810 Log: adding more patches to the list Added: trunk/patches/64bit_segv_v1.patch trunk/patches/dosapps_v1.patch Modified: trunk/patches/index.html trunk/patches/net_rpc_shutdown_v1.patch trunk/patches/series Changeset: Added: trunk/patches/64bit_segv_v1.patch =================================================================== --- trunk/patches/64bit_segv_v1.patch 2005-09-15 18:38:19 UTC (rev 809) +++ trunk/patches/64bit_segv_v1.patch 2005-09-15 19:04:21 UTC (rev 810) @@ -0,0 +1,27 @@ +diff -urBbN --exclude-from=diff.excludes samba-3.0.20-orig/source/nsswitch/winbindd_group.c samba-3.0.20-new/source/nsswitch/winbindd_group.c +--- samba-3.0.20-orig/source/nsswitch/winbindd_group.c 2005-07-28 08:19:44.000000000 -0500 ++++ samba-3.0.20-new/source/nsswitch/winbindd_group.c 2005-09-15 13:56:19.000000000 -0500 +@@ -1148,7 +1148,9 @@ + DOM_SID user_sid; + NTSTATUS status; + +- int i, num_groups, len, bufsize; ++ int i, num_groups; ++ size_t bufsize; ++ ssize_t len; + DOM_SID *groups; + + /* Ensure null termination */ +diff -urBbN --exclude-from=diff.excludes samba-3.0.20-orig/source/printing/nt_printing.c samba-3.0.20-new/source/printing/nt_printing.c +--- samba-3.0.20-orig/source/printing/nt_printing.c 2005-08-07 18:09:53.000000000 -0500 ++++ samba-3.0.20-new/source/printing/nt_printing.c 2005-09-15 13:56:19.000000000 -0500 +@@ -342,7 +342,8 @@ + SEC_DESC *sec, *new_sec; + TALLOC_CTX *ctx = state; + int result, i; +- uint32 sd_size, size_new_sec; ++ uint32 sd_size; ++ size_t size_new_sec; + DOM_SID sid; + + if (!data.dptr || data.dsize == 0) Added: trunk/patches/dosapps_v1.patch =================================================================== --- trunk/patches/dosapps_v1.patch 2005-09-15 18:38:19 UTC (rev 809) +++ trunk/patches/dosapps_v1.patch 2005-09-15 19:04:21 UTC (rev 810) @@ -0,0 +1,36 @@ +## +## Fixes https://bugzilla.samba.org/bug/{3044,3060} +## BUG 3044: "Access denied" when running FOX Pro for DOS applications +## from two or more Win'98 or OS/2 workstations +## BUG 3060: DOS '>' does not truncate the file +## +diff -urBbN --exclude-from=diff.excludes samba-3.0.20-orig/source/smbd/open.c samba-3.0.20-new/source/smbd/open.c +--- samba-3.0.20-orig/source/smbd/open.c 2005-07-28 08:19:42.000000000 -0500 ++++ samba-3.0.20-new/source/smbd/open.c 2005-09-15 13:45:32.000000000 -0500 +@@ -1046,13 +1046,13 @@ + + /* Create the NT compatible access_mask. */ + switch (GET_OPENX_MODE(deny_mode)) { ++ case DOS_OPEN_EXEC: /* Implies read-only - used to be FILE_READ_DATA */ + case DOS_OPEN_RDONLY: + access_mask = FILE_GENERIC_READ; + break; + case DOS_OPEN_WRONLY: + access_mask = FILE_GENERIC_WRITE; + break; +- case DOS_OPEN_EXEC: /* This used to be FILE_READ_DATA... */ + case DOS_OPEN_RDWR: + case DOS_OPEN_FCB: + access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE; +diff -urBbN --exclude-from=diff.excludes samba-3.0.20-orig/source/smbd/reply.c samba-3.0.20-new/source/smbd/reply.c +--- samba-3.0.20-orig/source/smbd/reply.c 2005-07-28 08:19:42.000000000 -0500 ++++ samba-3.0.20-new/source/smbd/reply.c 2005-09-15 13:45:32.000000000 -0500 +@@ -1610,7 +1610,7 @@ + create_disposition = FILE_CREATE; + } else { + /* Create if file doesn't exist, truncate if it does. */ +- create_disposition = FILE_OPEN_IF; ++ create_disposition = FILE_OVERWRITE_IF; + } + + /* Open file using ntcreate. */ Modified: trunk/patches/index.html =================================================================== --- trunk/patches/index.html 2005-09-15 18:38:19 UTC (rev 809) +++ trunk/patches/index.html 2005-09-15 19:04:21 UTC (rev 810) @@ -75,8 +75,17 @@ </tr> <tr> <td><a href="/samba/patches/net_rpc_shutdown_v1.patch">net rpc shutdown</a></td> - <td>Fix a regression in "net rpc shutdown"</td> + <td>Fix a regression in "net rpc shutdown"(<a href="https://bugzilla.samba.org/bug/3080">BUG 3080</a>).</td> </tr> + <tr> + <td><a href="/samba/patches/dosapps_v1.patch">DOS Applications</a></td> + <td>Corrects <a href="https://bugzilla.samba.org/bug/3044">BUG 3044</a> and + <a href="https://bugzilla.samba.org/bug/3060">3060</a> DOS application interoperability issues.</td> + </tr> + <tr> + <td><a href="/samba/patches/64bit_segv_v1.patch">x64 crashes</a></td> + <td>Fixes crash bugs in winbindd and smbd on x64 systems.</td> + </tr> </tbody> </table> Modified: trunk/patches/net_rpc_shutdown_v1.patch =================================================================== --- trunk/patches/net_rpc_shutdown_v1.patch 2005-09-15 18:38:19 UTC (rev 809) +++ trunk/patches/net_rpc_shutdown_v1.patch 2005-09-15 19:04:21 UTC (rev 810) @@ -1,3 +1,6 @@ +## +## Fixes https://bugzilla.samba.org/bug/3080 +## diff -urBbN --exclude-from=diff.excludes samba-3.0.20-orig/source/rpc_parse/parse_reg.c samba-3.0.20-new/source/rpc_parse/parse_reg.c --- samba-3.0.20-orig/source/rpc_parse/parse_reg.c 2005-07-28 08:19:48.000000000 -0500 +++ samba-3.0.20-new/source/rpc_parse/parse_reg.c 2005-09-15 13:35:30.000000000 -0500 Modified: trunk/patches/series =================================================================== --- trunk/patches/series 2005-09-15 18:38:19 UTC (rev 809) +++ trunk/patches/series 2005-09-15 19:04:21 UTC (rev 810) @@ -8,3 +8,6 @@ winbindd_v1.patch regcreatekey_winxp_v1.patch usrmgr_groups_v1.patch +net_rpc_shutdown_v1.patch +dosapps_v1.patch +64bit_segv_v1.patch