summaryrefslogtreecommitdiff
path: root/source4/librpc/idl/idl_types.h
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-11-02 13:46:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:21 -0500
commita2fd2488c79902dfe1de764bea4f619ec6107fed (patch)
treeb0018bafa465de3b55acfd4db4bc9143ebce16c4 /source4/librpc/idl/idl_types.h
parent34c9263ed0ffc591e8313981085791b660ccfe26 (diff)
downloadsamba-a2fd2488c79902dfe1de764bea4f619ec6107fed.tar.gz
samba-a2fd2488c79902dfe1de764bea4f619ec6107fed.tar.bz2
samba-a2fd2488c79902dfe1de764bea4f619ec6107fed.zip
r3484: - add support for conformant string arrays at the end of a struct
- add support for strings where the length excludes the NULLTERM metze (This used to be commit 8251d8b3e5af351972aa41aed63f7a7d2640910e)
Diffstat (limited to 'source4/librpc/idl/idl_types.h')
-rw-r--r--source4/librpc/idl/idl_types.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h
index d74523d8fb..860c9d7260 100644
--- a/source4/librpc/idl/idl_types.h
+++ b/source4/librpc/idl/idl_types.h
@@ -1,11 +1,13 @@
-#define STR_ASCII LIBNDR_FLAG_STR_ASCII
-#define STR_LEN4 LIBNDR_FLAG_STR_LEN4
-#define STR_SIZE4 LIBNDR_FLAG_STR_SIZE4
-#define STR_SIZE2 LIBNDR_FLAG_STR_SIZE2
-#define STR_NOTERM LIBNDR_FLAG_STR_NOTERM
-#define STR_NULLTERM LIBNDR_FLAG_STR_NULLTERM
-#define STR_BYTESIZE LIBNDR_FLAG_STR_BYTESIZE
-#define STR_FIXLEN32 LIBNDR_FLAG_STR_FIXLEN32
+#define STR_ASCII LIBNDR_FLAG_STR_ASCII
+#define STR_LEN4 LIBNDR_FLAG_STR_LEN4
+#define STR_SIZE4 LIBNDR_FLAG_STR_SIZE4
+#define STR_SIZE2 LIBNDR_FLAG_STR_SIZE2
+#define STR_NOTERM LIBNDR_FLAG_STR_NOTERM
+#define STR_NULLTERM LIBNDR_FLAG_STR_NULLTERM
+#define STR_BYTESIZE LIBNDR_FLAG_STR_BYTESIZE
+#define STR_FIXLEN32 LIBNDR_FLAG_STR_FIXLEN32
+#define STR_CONFORMANT LIBNDR_FLAG_STR_CONFORMANT
+#define STR_CHARLEN LIBNDR_FLAG_STR_CHARLEN
/*
a UCS2 string prefixed with [size] [offset] [length], all 32 bits