TODO fix ndr_set_flags...

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 2279d1c1c3c9345a714ab3bc64001fcd9f87f1f2..26aaea95fb1f41bd4c2ea23483735398ab70c7d3 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -381,7 +381,11 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
        if (new_flags & LIBNDR_FLAG_REMAINING) {
                (*pflags) &= ~LIBNDR_ALIGN_FLAGS;
        }
+       if (new_flags & LIBNDR_FLAG_NOALIGN) {
+               (*pflags) &= ~LIBNDR_ALIGN_FLAGS;
+       }
        if (new_flags & LIBNDR_ALIGN_FLAGS) {
+               (*pflags) &= ~LIBNDR_FLAG_NOALIGN;
                (*pflags) &= ~LIBNDR_FLAG_REMAINING;
        }
        if (new_flags & LIBNDR_FLAG_NO_RELATIVE_REVERSE) {