summaryrefslogtreecommitdiff
path: root/librpc
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2017-06-12 15:22:42 +0200
committerStefan Metzmacher <metze@samba.org>2017-06-27 16:57:43 +0200
commit91d8272e8604b5d87bcc0ce365b553bc760c8ed3 (patch)
treec5a949e4616c75f6eda7ba78ff4900bb3965b9d8 /librpc
parent81bbfb010599b65308aca89cc50532372ca4cb00 (diff)
downloadsamba-91d8272e8604b5d87bcc0ce365b553bc760c8ed3.tar.gz
librpc/ndr: align the definition of LIBNDR_STRING_FLAGS with currently defined flags
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>
Diffstat (limited to 'librpc')
-rw-r--r--librpc/ndr/libndr.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index d6e2e378bd2..049a35f392a 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -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)