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

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/ndr_basic.c (modified) (3 diffs)

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