Changeset 752 for trunk/server/librpc/ndr

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)
• librpc/ndr/ndr.c (modified) (1 diff)
• librpc/ndr/ndr_basic.c (modified) (3 diffs)
• librpc/ndr/ndr_ntprinting.c (modified) (1 diff)
• librpc/ndr/ndr_string.c (modified) (1 diff)

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);
 

trunk/server/librpc/ndr/ndr.c

@@ -381 +381 @@
                 (*pflags) &= ~LIBNDR_FLAG_NDR64;
         }
-        if (new_flags & LIBNDR_FLAG_REMAINING) {
+        if (new_flags & LIBNDR_ALIGN_FLAGS) {
+                /* Ensure we only have the passed-in
+                   align flag set in the new_flags,
+                   remove any old align flag. */
                 (*pflags) &= ~LIBNDR_ALIGN_FLAGS;
-        }
-        if (new_flags & LIBNDR_ALIGN_FLAGS) {
-                (*pflags) &= ~LIBNDR_FLAG_REMAINING;
         }
         if (new_flags & LIBNDR_FLAG_NO_RELATIVE_REVERSE) {

trunk/server/librpc/ndr/ndr_basic.c

@@ -1214 +1214 @@
 
 /*
-  push a DATA_BLOB onto the wire. 
-*/
+ * Push a DATA_BLOB onto the wire.
+ * 1) When called with LIBNDR_FLAG_ALIGN* alignment flags set, push padding
+ *    bytes _only_. The length is determined by the alignment required and the
+ *    current ndr offset.
+ * 2) When called with the LIBNDR_FLAG_REMAINING flag, push the byte array to
+ *    the ndr buffer.
+ * 3) Otherwise, push a uint32 length _and_ a corresponding byte array to the
+ *    ndr buffer.
+ */
 _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob)
 {
         if (ndr->flags & LIBNDR_FLAG_REMAINING) {
                 /* nothing to do */
-        } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) {
-                if (ndr->flags & LIBNDR_FLAG_NOALIGN) {
-                        blob.length = 0;
-                } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+        } else if (ndr->flags & (LIBNDR_ALIGN_FLAGS & ~LIBNDR_FLAG_NOALIGN)) {
+                if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
                         blob.length = NDR_ALIGN(ndr, 2);
                 } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {
@@ -1240 +1245 @@
 
 /*
-  pull a DATA_BLOB from the wire. 
-*/
+ * Pull a DATA_BLOB from the wire.
+ * 1) when called with LIBNDR_FLAG_ALIGN* alignment flags set, pull padding
+ *    bytes _only_. The length is determined by the alignment required and the
+ *    current ndr offset.
+ * 2) When called with the LIBNDR_FLAG_REMAINING flag, pull all remaining bytes
+ *    from the ndr buffer.
+ * 3) Otherwise, pull a uint32 length _and_ a corresponding byte array from the
+ *    ndr buffer.
+ */
 _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_BLOB *blob)
 {
@@ -1248 +1260 @@
         if (ndr->flags & LIBNDR_FLAG_REMAINING) {
                 length = ndr->data_size - ndr->offset;
-        } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) {
-                if (ndr->flags & LIBNDR_FLAG_NOALIGN) {
-                        length = 0;
-                } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+        } else if (ndr->flags & (LIBNDR_ALIGN_FLAGS & ~LIBNDR_FLAG_NOALIGN)) {
+                if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
                         length = NDR_ALIGN(ndr, 2);
                 } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {

trunk/server/librpc/ndr/ndr_ntprinting.c

@@ -55 +55 @@
                                 ptr = IVAL(ndr->data, ndr->offset);
                                 if (ptr == 0) {
+                                        ndr->offset = ndr->offset + 4;
                                         break;
                                 }

trunk/server/librpc/ndr/ndr_string.c

@@ -695 +695 @@
 }
 
+_PUBLIC_ 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)
+{
+        size_t converted_size;
+        uint32_t str_len;
+
+        if (length == 0) {
+                *var = talloc_strdup(ndr->current_mem_ctx, "");
+                return NDR_ERR_SUCCESS;
+        }
+
+        if (NDR_BE(ndr) && chset == CH_UTF16) {
+                chset = CH_UTF16BE;
+        }
+
+        NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
+
+        str_len = ndr_string_length(ndr->data+ndr->offset, byte_mul);
+        str_len = MIN(str_len, length); /* overrun protection */
+
+        if (!convert_string_talloc(ndr->current_mem_ctx, chset, CH_UNIX,
+                                   ndr->data+ndr->offset, str_len*byte_mul,
+                                   discard_const_p(void *, var),
+                                   &converted_size, false))
+        {
+                return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
+                                      "Bad character conversion");
+        }
+        NDR_CHECK(ndr_pull_advance(ndr, length*byte_mul));
+
+        return NDR_ERR_SUCCESS;
+}
+
 _PUBLIC_ 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)
 {