Changeset 596 for trunk/server/librpc/ndr

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

Location:

trunk/server/librpc/ndr

Files:

• ndr.c (modified) (2 diffs)
• ndr_basic.c (modified) (4 diffs)
• ndr_spoolss_buf.c (modified) (1 diff)
• ndr_spoolss_buf.h (modified) (1 diff)

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

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

trunk/server/librpc/ndr/ndr_spoolss_buf.c

@@ -1383 +1383 @@
         return NDR_ERR_SUCCESS;
 }
+
+_PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r)
+{
+        struct tm tm;
+        time_t t;
+        char *str;
+
+        tm.tm_sec       = r->second;
+        tm.tm_min       = r->minute;
+        tm.tm_hour      = r->hour;
+        tm.tm_mday      = r->day;
+        tm.tm_mon       = r->month - 1;
+        tm.tm_year      = r->year - 1900;
+        tm.tm_wday      = r->day_of_week;
+        tm.tm_yday      = 0;
+        tm.tm_isdst     = -1;
+
+        t = mktime(&tm);
+
+        str = timestring(ndr, t);
+
+        ndr_print_struct(ndr, name, "spoolss_Time");
+        ndr->depth++;
+        ndr_print_string(ndr, "", str);
+        ndr->depth--;
+        talloc_free(str);
+}
+
+_PUBLIC_ uint32_t ndr_spoolss_PrinterEnumValues_align(enum winreg_Type type)
+{
+        switch(type) {
+        case REG_NONE:
+                return 0;
+        case REG_SZ:
+                return LIBNDR_FLAG_ALIGN2;
+        case REG_EXPAND_SZ:
+                return LIBNDR_FLAG_ALIGN2;
+        case REG_BINARY:
+                return 0;
+        case REG_DWORD:
+                return LIBNDR_FLAG_ALIGN4;
+        case REG_DWORD_BIG_ENDIAN:
+                return LIBNDR_FLAG_ALIGN4;
+        case REG_LINK:
+                return 0;
+        case REG_MULTI_SZ:
+                return LIBNDR_FLAG_ALIGN2;
+        case REG_RESOURCE_LIST:
+                return LIBNDR_FLAG_ALIGN2;
+        case REG_FULL_RESOURCE_DESCRIPTOR:
+                return LIBNDR_FLAG_ALIGN4;
+        case REG_RESOURCE_REQUIREMENTS_LIST:
+                return LIBNDR_FLAG_ALIGN2;
+        case REG_QWORD:
+                return LIBNDR_FLAG_ALIGN8;
+        }
+
+        return 0;
+}

trunk/server/librpc/ndr/ndr_spoolss_buf.h

@@ -52 +52 @@
 enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r);
 enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r);
+_PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r);
+_PUBLIC_ uint32_t ndr_spoolss_PrinterEnumValues_align(enum winreg_Type type);
 
 #undef _PRINTF_ATTRIBUTE