svn commit: samba r10243 - branches/SAMBA_3_0/source/rpc_parse
trunk/source/rpc_parse
jerry at samba.org
jerry at samba.org
Thu Sep 15 18:35:27 GMT 2005
Author: jerry
Date: 2005-09-15 18:35:26 +0000 (Thu, 15 Sep 2005)
New Revision: 10243
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10243
Log:
fix net rpc shutdown (missing alignments and sending an invalid UNISTR4 for this request)
Modified:
branches/SAMBA_3_0/source/rpc_parse/parse_reg.c
branches/SAMBA_3_0/source/rpc_parse/parse_shutdown.c
trunk/source/rpc_parse/parse_reg.c
trunk/source/rpc_parse/parse_shutdown.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_reg.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_reg.c 2005-09-15 18:34:06 UTC (rev 10242)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_reg.c 2005-09-15 18:35:26 UTC (rev 10243)
@@ -1484,8 +1484,10 @@
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->timeout = timeout;
@@ -1535,6 +1537,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -1593,6 +1597,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -1666,6 +1672,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
return True;
}
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_shutdown.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_shutdown.c 2005-09-15 18:34:06 UTC (rev 10242)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_shutdown.c 2005-09-15 18:35:26 UTC (rev 10243)
@@ -34,8 +34,10 @@
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->timeout = timeout;
@@ -84,6 +86,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -99,7 +103,6 @@
if (!prs_uint8("reboot ", ps, depth, &(q_s->reboot)))
return False;
-
return True;
}
@@ -142,6 +145,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -214,6 +219,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
return True;
}
Modified: trunk/source/rpc_parse/parse_reg.c
===================================================================
--- trunk/source/rpc_parse/parse_reg.c 2005-09-15 18:34:06 UTC (rev 10242)
+++ trunk/source/rpc_parse/parse_reg.c 2005-09-15 18:35:26 UTC (rev 10243)
@@ -1484,8 +1484,10 @@
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->timeout = timeout;
@@ -1535,6 +1537,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -1593,6 +1597,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -1666,6 +1672,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
return True;
}
Modified: trunk/source/rpc_parse/parse_shutdown.c
===================================================================
--- trunk/source/rpc_parse/parse_shutdown.c 2005-09-15 18:34:06 UTC (rev 10242)
+++ trunk/source/rpc_parse/parse_shutdown.c 2005-09-15 18:35:26 UTC (rev 10243)
@@ -34,8 +34,10 @@
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->timeout = timeout;
@@ -84,6 +86,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -99,7 +103,6 @@
if (!prs_uint8("reboot ", ps, depth, &(q_s->reboot)))
return False;
-
return True;
}
@@ -142,6 +145,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
@@ -214,6 +219,8 @@
if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
+ if (!prs_align(ps))
+ return False;
return True;
}
More information about the samba-cvs
mailing list