Changeset 136 for trunk/samba/source/rpc_parse

Timestamp:

May 29, 2008, 12:22:03 PM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0rc1

Location:

trunk/samba/source/rpc_parse

Files:

• parse_rpc.c (modified) (1 diff)
• parse_spoolss.c (modified) (1 diff)

trunk/samba/source/rpc_parse/parse_rpc.c

@@ -410 +410 @@
 
         /* vers. of interface to use for replies */
-        rpc_ctx->transfer = transfer;
+        rpc_ctx->transfer = CONST_DISCARD(RPC_IFACE *, transfer);
 }
 

trunk/samba/source/rpc_parse/parse_spoolss.c

@@ -2130 +2130 @@
                 
                 buffer->string_at_end -= ((*devmode)->size + (*devmode)->driverextra);
-                
+
+                /* mz:  we have to align the device mode for VISTA */
+                if (buffer->string_at_end % 4) {
+                        buffer->string_at_end += 4 - (buffer->string_at_end % 4);
+                }
+
                 if(!prs_set_offset(ps, buffer->string_at_end))
                         return False;