From 035342c11719d1daa647c0b2ae7cec27a969f83a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 25 May 2012 09:16:50 -0700 Subject: 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. --- librpc/ndr/libndr.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'librpc/ndr/libndr.h') diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 37a3145e12..1bd284f798 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -135,7 +135,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) -- cgit