Changeset 596 for trunk/server/librpc/ndr/ndr.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.c (modified) (2 diffs)

trunk/server/librpc/ndr/ndr.c

@@ -1106 +1106 @@
         }
         if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) {
+                uint32_t relative_offset;
+                size_t pad;
+                size_t align = 1;
+
+                if (ndr->offset < ndr->relative_base_offset) {
+                        return ndr_push_error(ndr, NDR_ERR_BUFSIZE,
+                                      "ndr_push_relative_ptr2_start ndr->offset(%u) < ndr->relative_base_offset(%u)",
+                                      ndr->offset, ndr->relative_base_offset);
+                }
+
+                relative_offset = ndr->offset - ndr->relative_base_offset;
+
+                if (ndr->flags & LIBNDR_FLAG_NOALIGN) {
+                        align = 1;
+                } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+                        align = 2;
+                } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {
+                        align = 4;
+                } else if (ndr->flags & LIBNDR_FLAG_ALIGN8) {
+                        align = 8;
+                }
+
+                pad = ndr_align_size(relative_offset, align);
+                if (pad) {
+                        NDR_CHECK(ndr_push_zero(ndr, pad));
+                }
+
                 return ndr_push_relative_ptr2(ndr, p);
         }
@@ -1172 +1199 @@
         correct_offset = ndr->relative_end_offset - len;
 
-        /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */
-        align = 2;
-
-        if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+        if (ndr->flags & LIBNDR_FLAG_NOALIGN) {
+                align = 1;
+        } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
                 align = 2;
         } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {