TODO testing librpc/ndr: let ndr_set_flags() clear all LIBNDR_ALIGN_FLAGS, if we...

metze

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 7cb6e214ba3aa0fc5c15e45088aebb49305061ef..613780515e310f3313beda8f5434cb3110de7b01 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -381,7 +381,7 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
                (*pflags) &= ~LIBNDR_ALIGN_FLAGS;
        }
        if (new_flags & LIBNDR_ALIGN_FLAGS) {
-               (*pflags) &= ~LIBNDR_FLAG_REMAINING;
+               (*pflags) &= ~(LIBNDR_FLAG_REMAINING|LIBNDR_ALIGN_FLAGS);
        }
        if (new_flags & LIBNDR_FLAG_NO_RELATIVE_REVERSE) {
                (*pflags) &= ~LIBNDR_FLAG_RELATIVE_REVERSE;