Changeset 596 for trunk/server/librpc/ndr/ndr_basic.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/librpc/ndr/ndr_basic.c (modified) (4 diffs)

trunk/server/librpc/ndr/ndr_basic.c

@@ -1012 +1012 @@
 _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob)
 {
-        if (ndr->flags & LIBNDR_ALIGN_FLAGS) {
-                if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+        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) {
                         blob.length = NDR_ALIGN(ndr, 2);
                 } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {
@@ -1022 +1026 @@
                 NDR_PUSH_ALLOC_SIZE(ndr, blob.data, blob.length);
                 data_blob_clear(&blob);
-        } else if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) {
+        } else {
                 NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, blob.length));
         }
@@ -1036 +1040 @@
         uint32_t length = 0;
 
-        if (ndr->flags & LIBNDR_ALIGN_FLAGS) {
-                if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+        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) {
                         length = NDR_ALIGN(ndr, 2);
                 } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {
@@ -1047 +1055 @@
                         length = ndr->data_size - ndr->offset;
                 }
-        } else if (ndr->flags & LIBNDR_FLAG_REMAINING) {
-                length = ndr->data_size - ndr->offset;
         } else {
                 NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &length));