librpc/ndr: Use portable format specifiers

[vlendec/samba-autobuild/.git] / librpc / ndr / ndr_drsblobs.c

diff --git a/librpc/ndr/ndr_drsblobs.c b/librpc/ndr/ndr_drsblobs.c
index 51880bb46f752f73542c8d0ae924bbfd8ccc9daf..99dd32e0416e17418bf6d93d084a7a5e74deb5e7 100644 (file)
--- a/librpc/ndr/ndr_drsblobs.c
+++ b/librpc/ndr/ndr_drsblobs.c
@@ -32,7 +32,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_AuthenticationInformationArray(struct ndr_pu
                for (cntr_array_0 = 0; cntr_array_0 < r->count; cntr_array_0++) {
                        NDR_CHECK(ndr_push_AuthenticationInformation(ndr, NDR_SCALARS, &r->array[cntr_array_0]));
                }
-               NDR_CHECK(ndr_push_trailer_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 4));
        }
        if (ndr_flags & NDR_BUFFERS) {
        }
@@ -51,7 +51,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_AuthenticationInformationArray(struct ndr_pu
                        NDR_CHECK(ndr_pull_AuthenticationInformation(ndr, NDR_SCALARS, &r->array[r->count]));
                        r->count++;
                }
-               NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 4));
        }
        if (ndr_flags & NDR_BUFFERS) {
        }
@@ -64,12 +64,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_trustAuthInOutBlob(struct ndr_push *ndr, int
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, (r->count > 0)?12:0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, (r->count > 0)?12 + ndr_size_AuthenticationInformationArray(&r->current, ndr_flags):0));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, (r->count > 0)?12 + ndr_size_AuthenticationInformationArray(&r->current, 0):0));
                {
                        struct ndr_push *_ndr_current;
-                       NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_current, 0, ((r->count > 0)?12 + ndr_size_AuthenticationInformationArray(&r->current, ndr_flags):0) - ((r->count > 0)?12:0)));
+                       NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_current, 0, ((r->count > 0)?12 + ndr_size_AuthenticationInformationArray(&r->current, 0):0) - ((r->count > 0)?12:0)));
                        NDR_CHECK(ndr_push_AuthenticationInformationArray(_ndr_current, NDR_SCALARS, &r->current));
-                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_current, 0, ((r->count > 0)?12 + ndr_size_AuthenticationInformationArray(&r->current, ndr_flags):0) - ((r->count > 0)?12:0)));
+                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_current, 0, ((r->count > 0)?12 + ndr_size_AuthenticationInformationArray(&r->current, 0):0) - ((r->count > 0)?12:0)));
                }
                {
                        uint32_t _flags_save_AuthenticationInformationArray = ndr->flags;
@@ -133,12 +133,12 @@ _PUBLIC_ void ndr_print_drsuapi_MSPrefixMap_Entry(struct ndr_print *ndr, const c
                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
                ndr->depth++;
                ndr_print_uint16(ndr, "entryID", r->entryID);
-               ndr->print(ndr, "%-25s: length=%u", "oid", r->length);
+               ndr->print(ndr, "%-25s: length=%"PRIu16, "oid", r->length);
                if (r->binary_oid) {
                        char *partial_oid = NULL;
                        DATA_BLOB oid_blob = data_blob_const(r->binary_oid, r->length);
                        char *hex_str = data_blob_hex_string_upper(ndr, &oid_blob);
-                       ber_read_partial_OID_String(ndr, oid_blob, (const char **)&partial_oid);
+                       ber_read_partial_OID_String(ndr, oid_blob, &partial_oid);
                        ndr->depth++;
                        ndr->print(ndr, "%-25s: 0x%s (%s)", "binary_oid", hex_str, partial_oid);
                        ndr->depth--;
@@ -149,3 +149,72 @@ _PUBLIC_ void ndr_print_drsuapi_MSPrefixMap_Entry(struct ndr_print *ndr, const c
                ndr->flags = _flags_save_STRUCT;
        }
 }
+
+_PUBLIC_ enum ndr_err_code ndr_push_supplementalCredentialsSubBlob(struct ndr_push *ndr, int ndr_flags, const struct supplementalCredentialsSubBlob *r)
+{
+       uint32_t cntr_packages_0;
+       NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+       if (ndr_flags & NDR_SCALARS) {
+               if ((r->signature != SUPPLEMENTAL_CREDENTIALS_SIGNATURE)
+                   && (r->num_packages == 0)) {
+                       return NDR_ERR_SUCCESS;
+               }
+               NDR_CHECK(ndr_push_align(ndr, 3));
+               NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, SUPPLEMENTAL_CREDENTIALS_PREFIX, 0x30, sizeof(uint16_t), CH_UTF16));
+               NDR_CHECK(ndr_push_supplementalCredentialsSignature(ndr, NDR_SCALARS, SUPPLEMENTAL_CREDENTIALS_SIGNATURE));
+               if (r->num_packages > 0) {
+                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->num_packages));
+               }
+               for (cntr_packages_0 = 0; cntr_packages_0 < (r->num_packages); cntr_packages_0++) {
+                       NDR_CHECK(ndr_push_supplementalCredentialsPackage(ndr, NDR_SCALARS, &r->packages[cntr_packages_0]));
+               }
+               NDR_CHECK(ndr_push_trailer_align(ndr, 3));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_supplementalCredentialsSubBlob(struct ndr_pull *ndr, int ndr_flags, struct supplementalCredentialsSubBlob *r)
+{
+       uint32_t size_prefix_0 = 0;
+       uint32_t size_packages_0 = 0;
+       uint32_t cntr_packages_0;
+       TALLOC_CTX *_mem_save_packages_0 = NULL;
+       NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+       if (ndr_flags & NDR_SCALARS) {
+               uint32_t remaining = 0;
+               NDR_CHECK(ndr_pull_align(ndr, 3));
+               size_prefix_0 = 0x30;
+               remaining = ndr->data_size - ndr->offset;
+               if (remaining >= size_prefix_0) {
+                       NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->prefix, size_prefix_0, sizeof(uint16_t), CH_UTF16));
+               } else {
+                       r->prefix = NULL;
+               }
+               remaining = ndr->data_size - ndr->offset;
+               if (remaining >= 2) {
+                       NDR_CHECK(ndr_pull_supplementalCredentialsSignature(ndr, NDR_SCALARS, &r->signature));
+               } else {
+                       r->signature = 0;
+               }
+               remaining = ndr->data_size - ndr->offset;
+               if (remaining > 0) {
+                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_packages));
+               } else {
+                       r->num_packages = 0;
+               }
+               size_packages_0 = r->num_packages;
+               NDR_PULL_ALLOC_N(ndr, r->packages, size_packages_0);
+               _mem_save_packages_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->packages, 0);
+               for (cntr_packages_0 = 0; cntr_packages_0 < (size_packages_0); cntr_packages_0++) {
+                       NDR_CHECK(ndr_pull_supplementalCredentialsPackage(ndr, NDR_SCALARS, &r->packages[cntr_packages_0]));
+               }
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_packages_0, 0);
+               NDR_CHECK(ndr_pull_trailer_align(ndr, 3));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+       }
+       return NDR_ERR_SUCCESS;
+}