svn commit: samba r21129 - in branches: SAMBA_3_0/source/rpc_server SAMBA_3_0_24/source/rpc_server

[jra at samba.org]

Author: jra
Date: 2007-02-03 00:50:47 +0000 (Sat, 03 Feb 2007)
New Revision: 21129

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21129

Log:
Fix from Martin Zielinski <mz at seh.de> - ensure
the hand marshalled container size is a multiple
of 4 bytes for RPC alignment.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
   branches/SAMBA_3_0_24/source/rpc_server/srv_spoolss_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2007-02-02 22:02:42 UTC (rev 21128)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2007-02-03 00:50:47 UTC (rev 21129)
@@ -9532,6 +9532,16 @@
 	/* copy data into the reply */
 	
 	r_u->ctr.size        	= r_u->needed;
+
+	/* Fix from Martin Zielinski <mz at seh.de> - ensure
+	 * the hand marshalled container size is a multiple
+	 * of 4 bytes for RPC alignment.
+	 */
+
+	if (needed % 4) {
+		r_u->ctr.size += 4-(needed % 4);
+	}
+
 	r_u->ctr.size_of_array 	= r_u->returned;
 	r_u->ctr.values 	= enum_values;
 	

Modified: branches/SAMBA_3_0_24/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0_24/source/rpc_server/srv_spoolss_nt.c	2007-02-02 22:02:42 UTC (rev 21128)
+++ branches/SAMBA_3_0_24/source/rpc_server/srv_spoolss_nt.c	2007-02-03 00:50:47 UTC (rev 21129)
@@ -9396,6 +9396,16 @@
 	/* copy data into the reply */
 	
 	r_u->ctr.size        	= r_u->needed;
+
+	/* Fix from Martin Zielinski <mz at seh.de> - ensure
+	 * the hand marshalled container size is a multiple
+	 * of 4 bytes for RPC alignment.
+	 */
+
+	if (needed % 4) {
+		r_u->ctr.size += 4-(needed % 4);
+	}
+
 	r_u->ctr.size_of_array 	= r_u->returned;
 	r_u->ctr.values 	= enum_values;