Author: jerry Date: 2005-09-16 21:02:41 +0000 (Fri, 16 Sep 2005) New Revision: 811
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=811 Log: updated net rpc patch Modified: trunk/patches/net_rpc_shutdown_v1.patch Changeset: Modified: trunk/patches/net_rpc_shutdown_v1.patch =================================================================== --- trunk/patches/net_rpc_shutdown_v1.patch 2005-09-15 19:04:21 UTC (rev 810) +++ trunk/patches/net_rpc_shutdown_v1.patch 2005-09-16 21:02:41 UTC (rev 811) @@ -1,21 +1,31 @@ ## -## Fixes https://bugzilla.samba.org/bug/3080 +## fixes bug 3080 (net rpc shutdown) +## Updated on 16-Sept-2005 ## -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 +diff -urBN --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 -@@ -1485,8 +1485,10 @@ ++++ samba-3.0.20-new/source/rpc_parse/parse_reg.c 2005-09-16 16:00:10.000000000 -0500 +@@ -1485,8 +1485,17 @@ q_u->server = TALLOC_P( get_talloc_ctx(), uint16 ); *q_u->server = 0x1; +- q_u->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); +- init_unistr4( q_u->message, msg, UNI_FLAGS_NONE ); + if ( msg && *msg ) { - q_u->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); - init_unistr4( q_u->message, msg, UNI_FLAGS_NONE ); ++ q_u->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); ++ init_unistr4( q_u->message, msg, UNI_FLAGS_NONE ); ++ ++ /* Win2000 is apparently very sensitive to these lengths */ ++ /* do a special case here */ ++ ++ q_u->message->string->uni_max_len++; ++ q_u->message->size += 2; ++ + } q_u->timeout = timeout; -@@ -1536,6 +1538,8 @@ +@@ -1536,6 +1545,8 @@ if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) return False; @@ -24,7 +34,7 @@ if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4)) return False; -@@ -1594,6 +1598,8 @@ +@@ -1594,6 +1605,8 @@ if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) return False; @@ -33,7 +43,7 @@ if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4)) return False; -@@ -1667,6 +1673,8 @@ +@@ -1667,6 +1680,8 @@ if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) return False; @@ -42,21 +52,29 @@ return True; } -diff -urBbN --exclude-from=diff.excludes samba-3.0.20-orig/source/rpc_parse/parse_shutdown.c samba-3.0.20-new/source/rpc_parse/parse_shutdown.c +diff -urBN --exclude-from=diff.excludes samba-3.0.20-orig/source/rpc_parse/parse_shutdown.c samba-3.0.20-new/source/rpc_parse/parse_shutdown.c --- samba-3.0.20-orig/source/rpc_parse/parse_shutdown.c 2005-04-18 11:38:20.000000000 -0500 -+++ samba-3.0.20-new/source/rpc_parse/parse_shutdown.c 2005-09-15 13:35:30.000000000 -0500 -@@ -34,8 +34,10 @@ ++++ samba-3.0.20-new/source/rpc_parse/parse_shutdown.c 2005-09-16 16:00:10.000000000 -0500 +@@ -34,8 +34,16 @@ q_s->server = TALLOC_P( get_talloc_ctx(), uint16 ); *q_s->server = 0x1; +- q_s->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); +- init_unistr4( q_s->message, msg, UNI_FLAGS_NONE ); + if ( msg && *msg ) { - q_s->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); - init_unistr4( q_s->message, msg, UNI_FLAGS_NONE ); ++ q_s->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); ++ init_unistr4( q_s->message, msg, UNI_FLAGS_NONE ); ++ ++ /* Win2000 is apparently very sensitive to these lengths */ ++ /* do a special case here */ ++ ++ q_s->message->string->uni_max_len++; ++ q_s->message->size += 2; + } q_s->timeout = timeout; -@@ -84,6 +86,8 @@ +@@ -84,6 +92,8 @@ if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) return False; @@ -65,7 +83,7 @@ if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4)) return False; -@@ -142,6 +145,8 @@ +@@ -142,6 +152,8 @@ if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) return False; @@ -74,7 +92,7 @@ if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4)) return False; -@@ -214,6 +219,8 @@ +@@ -214,6 +226,8 @@ if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) return False;
