From 227911e2cd6d59822c15f90a5657850c614bdd2d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 25 May 2012 09:16:50 -0700 Subject: [PATCH] Fix bug #8373 - Can't join XP Pro workstations to 3.6.1 DC. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Treat LIBNDR_FLAG_NOALIGN and LIBNDR_FLAG_REMAINING the same as the other align flags - make them mutually exclusive. Combined work from Metze, Günther and Jeremy. (cherry picked from commit 035342c11719d1daa647c0b2ae7cec27a969f83a) --- librpc/ndr/libndr.h | 8 +++++++- librpc/ndr/ndr.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index f4b7db9..1e40779 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -136,7 +136,13 @@ struct ndr_print { #define LIBNDR_FLAG_ALIGN4 (1<<23) #define LIBNDR_FLAG_ALIGN8 (1<<24) -#define LIBNDR_ALIGN_FLAGS (LIBNDR_FLAG_ALIGN2|LIBNDR_FLAG_ALIGN4|LIBNDR_FLAG_ALIGN8) +#define LIBNDR_ALIGN_FLAGS ( 0 | \ + LIBNDR_FLAG_NOALIGN | \ + LIBNDR_FLAG_REMAINING | \ + LIBNDR_FLAG_ALIGN2 | \ + LIBNDR_FLAG_ALIGN4 | \ + LIBNDR_FLAG_ALIGN8 | \ + 0) #define LIBNDR_PRINT_ARRAY_HEX (1<<25) #define LIBNDR_PRINT_SET_VALUES (1<<26) diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 56d1fab..8b442b6 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -380,11 +380,11 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags) (*pflags) &= ~LIBNDR_FLAG_LITTLE_ENDIAN; (*pflags) &= ~LIBNDR_FLAG_NDR64; } - if (new_flags & LIBNDR_FLAG_REMAINING) { - (*pflags) &= ~LIBNDR_ALIGN_FLAGS; - } if (new_flags & LIBNDR_ALIGN_FLAGS) { - (*pflags) &= ~LIBNDR_FLAG_REMAINING; + /* 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_FLAG_NO_RELATIVE_REVERSE) { (*pflags) &= ~LIBNDR_FLAG_RELATIVE_REVERSE; -- 1.7.7.3