drsblobs.idl: mark supplementalCredentialsSubBlob as nopull,nopush
authorStefan Metzmacher <metze@samba.org>
Fri, 20 May 2016 15:06:23 +0000 (17:06 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 20 Jul 2016 19:27:17 +0000 (21:27 +0200)
This commit moves the autogenerated ndr_{pull,push}_supplementalCredentialsSubBlob()
function to the handwritten librpc/ndr/ndr_drsblobs.c

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11441

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
librpc/idl/drsblobs.idl
librpc/ndr/ndr_drsblobs.c

index 499febb069f842c3db006da04bebe03625ec41c3..645ec388cba64e4fec065223c1191da091038868 100644 (file)
@@ -291,7 +291,7 @@ interface drsblobs {
                [in] ldapControlDirSyncCookie cookie
                );
 
-       typedef struct {
+       typedef [public] struct {
                [value(2*strlen_m(name))] uint16 name_len;
                [value(strlen(data))] uint16 data_len;
                uint16 reserved; /* 2 for 'Packages', 1 for 'Primary:*', but should be ignored */
@@ -323,11 +323,11 @@ interface drsblobs {
        /* this are 0x30 (48) whitespaces (0x20) */
        const string SUPPLEMENTAL_CREDENTIALS_PREFIX = "                                                ";
 
-       typedef [flag(NDR_PAHEX)] enum {
+       typedef [flag(NDR_PAHEX),public] enum {
                SUPPLEMENTAL_CREDENTIALS_SIGNATURE = 0x0050
        } supplementalCredentialsSignature;
 
-       typedef [gensize] struct {
+       typedef [gensize,nopush,nopull] struct {
                [value(SUPPLEMENTAL_CREDENTIALS_PREFIX),charset(UTF16)] uint16 prefix[0x30];
                [value(SUPPLEMENTAL_CREDENTIALS_SIGNATURE)] supplementalCredentialsSignature signature;
                uint16 num_packages;
index 1392b987951d707198162b00bc0573bda3e99708..db842d330ad05dc5adec29b94fdd0af1e14dbd27 100644 (file)
@@ -149,3 +149,50 @@ _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) {
+               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));
+               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) {
+               NDR_CHECK(ndr_pull_align(ndr, 3));
+               size_prefix_0 = 0x30;
+               NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->prefix, size_prefix_0, sizeof(uint16_t), CH_UTF16));
+               NDR_CHECK(ndr_pull_supplementalCredentialsSignature(ndr, NDR_SCALARS, &r->signature));
+               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_packages));
+               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;
+}