librpc/ndr: align the definition of LIBNDR_STRING_FLAGS with currently defined flags
authorStefan Metzmacher <metze@samba.org>
Mon, 12 Jun 2017 13:22:42 +0000 (15:22 +0200)
committerStefan Metzmacher <metze@samba.org>
Tue, 27 Jun 2017 14:57:43 +0000 (16:57 +0200)
The range included the unused (1<<14) before.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
librpc/ndr/libndr.h

index d6e2e378bd2cf3752c8ea62bb3523526b06b7eda..049a35f392a77f2525af7c336fb98036e8349704 100644 (file)
@@ -125,7 +125,19 @@ struct ndr_print {
 #define LIBNDR_FLAG_STR_CHARLEN                (1<<11)
 #define LIBNDR_FLAG_STR_UTF8           (1<<12)
 #define LIBNDR_FLAG_STR_RAW8           (1<<13)
-#define LIBNDR_STRING_FLAGS            (0x7FFC)
+#define LIBNDR_STRING_FLAGS            (0 | \
+               LIBNDR_FLAG_STR_ASCII | \
+               LIBNDR_FLAG_STR_LEN4 | \
+               LIBNDR_FLAG_STR_SIZE4 | \
+               LIBNDR_FLAG_STR_NOTERM | \
+               LIBNDR_FLAG_STR_NULLTERM | \
+               LIBNDR_FLAG_STR_SIZE2 | \
+               LIBNDR_FLAG_STR_BYTESIZE | \
+               LIBNDR_FLAG_STR_CONFORMANT | \
+               LIBNDR_FLAG_STR_CHARLEN | \
+               LIBNDR_FLAG_STR_UTF8 | \
+               LIBNDR_FLAG_STR_RAW8 | \
+               0)
 
 /* Disable string token compression  */
 #define LIBNDR_FLAG_NO_COMPRESSION     (1<<15)