Changeset 752 for trunk/server/librpc/ndr/libndr.h

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/libndr.h (modified) (2 diffs)

trunk/server/librpc/ndr/libndr.h

@@ -137 +137 @@
 #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)
@@ -569 +575 @@
 enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size);
 enum ndr_err_code ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset);
+enum ndr_err_code ndr_pull_charset_to_null(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset);
 enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset);