Changeset 752 for trunk/server/librpc/ndr/ndr.c

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/ndr.c (modified) (1 diff)

trunk/server/librpc/ndr/ndr.c

@@ -381 +381 @@
                 (*pflags) &= ~LIBNDR_FLAG_NDR64;
         }
-        if (new_flags & LIBNDR_FLAG_REMAINING) {
+        if (new_flags & LIBNDR_ALIGN_FLAGS) {
+                /* Ensure we only have the passed-in
+                   align flag set in the new_flags,
+                   remove any old align flag. */
                 (*pflags) &= ~LIBNDR_ALIGN_FLAGS;
-        }
-        if (new_flags & LIBNDR_ALIGN_FLAGS) {
-                (*pflags) &= ~LIBNDR_FLAG_REMAINING;
         }
         if (new_flags & LIBNDR_FLAG_NO_RELATIVE_REVERSE) {