Re-run make idl.

Guenther

diff --git a/source/librpc/gen_ndr/cli_lsa.c b/source/librpc/gen_ndr/cli_lsa.c
index 7f784622b57d28817d9b2fe7a8e8056c1add9047..b1609ea97b6ee8a6a002dcb429c142d319d73278 100644 (file)
--- a/source/librpc/gen_ndr/cli_lsa.c
+++ b/source/librpc/gen_ndr/cli_lsa.c
@@ -2914,7 +2914,7 @@ NTSTATUS rpccli_lsa_LookupNames3(struct rpc_pipe_client *cli,
                                 struct policy_handle *handle,
                                 uint32_t num_names,
                                 struct lsa_String *names,
-                                struct lsa_RefDomainList *domains,
+                                struct lsa_RefDomainList **domains,
                                 struct lsa_TransSidArray3 *sids,
                                 enum lsa_LookupNamesLevel level,
                                 uint32_t *count,
@@ -3290,7 +3290,7 @@ NTSTATUS rpccli_lsa_LookupNames4(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx,
                                 uint32_t num_names,
                                 struct lsa_String *names,
-                                struct lsa_RefDomainList *domains,
+                                struct lsa_RefDomainList **domains,
                                 struct lsa_TransSidArray3 *sids,
                                 enum lsa_LookupNamesLevel level,
                                 uint32_t *count,

diff --git a/source/librpc/gen_ndr/cli_lsa.h b/source/librpc/gen_ndr/cli_lsa.h
index 8513a9d0353b8ff3d4ec741bc2be193a147833ea..7d6992648400ddd812bc4059fe3ae22a2c52f632 100644 (file)
--- a/source/librpc/gen_ndr/cli_lsa.h
+++ b/source/librpc/gen_ndr/cli_lsa.h
@@ -316,7 +316,7 @@ NTSTATUS rpccli_lsa_LookupNames3(struct rpc_pipe_client *cli,
                                 struct policy_handle *handle,
                                 uint32_t num_names,
                                 struct lsa_String *names,
-                                struct lsa_RefDomainList *domains,
+                                struct lsa_RefDomainList **domains,
                                 struct lsa_TransSidArray3 *sids,
                                 enum lsa_LookupNamesLevel level,
                                 uint32_t *count,
@@ -353,7 +353,7 @@ NTSTATUS rpccli_lsa_LookupNames4(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx,
                                 uint32_t num_names,
                                 struct lsa_String *names,
-                                struct lsa_RefDomainList *domains,
+                                struct lsa_RefDomainList **domains,
                                 struct lsa_TransSidArray3 *sids,
                                 enum lsa_LookupNamesLevel level,
                                 uint32_t *count,

diff --git a/source/librpc/gen_ndr/lsa.h b/source/librpc/gen_ndr/lsa.h
index 62f8f2c74a0aa92ac98ae5c2ff7909ea3101e678..cc7bca315003fa030c441f0615c2f3826eafceee 100644 (file)
--- a/source/librpc/gen_ndr/lsa.h
+++ b/source/librpc/gen_ndr/lsa.h
@@ -1472,7 +1472,7 @@ struct lsa_LookupNames3 {
        } in;
 
        struct {
-               struct lsa_RefDomainList *domains;/* [ref] */
+               struct lsa_RefDomainList **domains;/* [ref] */
                struct lsa_TransSidArray3 *sids;/* [ref] */
                uint32_t *count;/* [ref] */
                NTSTATUS result;
@@ -1576,7 +1576,7 @@ struct lsa_LookupNames4 {
        } in;
 
        struct {
-               struct lsa_RefDomainList *domains;/* [ref] */
+               struct lsa_RefDomainList **domains;/* [ref] */
                struct lsa_TransSidArray3 *sids;/* [ref] */
                uint32_t *count;/* [ref] */
                NTSTATUS result;

diff --git a/source/librpc/gen_ndr/ndr_lsa.c b/source/librpc/gen_ndr/ndr_lsa.c
index d5cbc0ec21a3c0e91549beade1c53bf89cc83827..dc4918a6d7082148f566233ee54265d9a659728a 100644 (file)
--- a/source/librpc/gen_ndr/ndr_lsa.c
+++ b/source/librpc/gen_ndr/ndr_lsa.c
@@ -10515,7 +10515,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_lsa_LookupNames3(struct ndr_push *ndr, int f
                if (r->out.domains == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.domains));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.domains));
+               if (*r->out.domains) {
+                       NDR_CHECK(ndr_push_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.domains));
+               }
                if (r->out.sids == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -10532,9 +10535,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_lsa_LookupNames3(struct ndr_push *ndr, int f
 _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupNames3(struct ndr_pull *ndr, int flags, struct lsa_LookupNames3 *r)
 {
        uint32_t cntr_names_0;
+       uint32_t _ptr_domains;
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_names_0;
        TALLOC_CTX *_mem_save_domains_0;
+       TALLOC_CTX *_mem_save_domains_1;
        TALLOC_CTX *_mem_save_sids_0;
        TALLOC_CTX *_mem_save_count_0;
        if (flags & NDR_IN) {
@@ -10595,7 +10600,18 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_LookupNames3(struct ndr_pull *ndr, int f
                }
                _mem_save_domains_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.domains, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.domains));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domains));
+               if (_ptr_domains) {
+                       NDR_PULL_ALLOC(ndr, *r->out.domains);
+               } else {
+                       *r->out.domains = NULL;
+               }
+               if (*r->out.domains) {
+                       _mem_save_domains_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.domains, 0);
+                       NDR_CHECK(ndr_pull_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.domains));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domains_1, 0);
+               }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domains_0, LIBNDR_FLAG_REF_ALLOC);
                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                        NDR_PULL_ALLOC(ndr, r->out.sids);
@@ -10661,7 +10677,12 @@ _PUBLIC_ void ndr_print_lsa_LookupNames3(struct ndr_print *ndr, const char *name
                ndr->depth++;
                ndr_print_ptr(ndr, "domains", r->out.domains);
                ndr->depth++;
-               ndr_print_lsa_RefDomainList(ndr, "domains", r->out.domains);
+               ndr_print_ptr(ndr, "domains", *r->out.domains);
+               ndr->depth++;
+               if (*r->out.domains) {
+                       ndr_print_lsa_RefDomainList(ndr, "domains", *r->out.domains);
+               }
+               ndr->depth--;
                ndr->depth--;
                ndr_print_ptr(ndr, "sids", r->out.sids);
                ndr->depth++;
@@ -11241,7 +11262,10 @@ static enum ndr_err_code ndr_push_lsa_LookupNames4(struct ndr_push *ndr, int fla
                if (r->out.domains == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.domains));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.domains));
+               if (*r->out.domains) {
+                       NDR_CHECK(ndr_push_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.domains));
+               }
                if (r->out.sids == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -11258,8 +11282,10 @@ static enum ndr_err_code ndr_push_lsa_LookupNames4(struct ndr_push *ndr, int fla
 static enum ndr_err_code ndr_pull_lsa_LookupNames4(struct ndr_pull *ndr, int flags, struct lsa_LookupNames4 *r)
 {
        uint32_t cntr_names_0;
+       uint32_t _ptr_domains;
        TALLOC_CTX *_mem_save_names_0;
        TALLOC_CTX *_mem_save_domains_0;
+       TALLOC_CTX *_mem_save_domains_1;
        TALLOC_CTX *_mem_save_sids_0;
        TALLOC_CTX *_mem_save_count_0;
        if (flags & NDR_IN) {
@@ -11313,7 +11339,18 @@ static enum ndr_err_code ndr_pull_lsa_LookupNames4(struct ndr_pull *ndr, int fla
                }
                _mem_save_domains_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.domains, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.domains));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domains));
+               if (_ptr_domains) {
+                       NDR_PULL_ALLOC(ndr, *r->out.domains);
+               } else {
+                       *r->out.domains = NULL;
+               }
+               if (*r->out.domains) {
+                       _mem_save_domains_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.domains, 0);
+                       NDR_CHECK(ndr_pull_lsa_RefDomainList(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.domains));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domains_1, 0);
+               }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domains_0, LIBNDR_FLAG_REF_ALLOC);
                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                        NDR_PULL_ALLOC(ndr, r->out.sids);
@@ -11375,7 +11412,12 @@ _PUBLIC_ void ndr_print_lsa_LookupNames4(struct ndr_print *ndr, const char *name
                ndr->depth++;
                ndr_print_ptr(ndr, "domains", r->out.domains);
                ndr->depth++;
-               ndr_print_lsa_RefDomainList(ndr, "domains", r->out.domains);
+               ndr_print_ptr(ndr, "domains", *r->out.domains);
+               ndr->depth++;
+               if (*r->out.domains) {
+                       ndr_print_lsa_RefDomainList(ndr, "domains", *r->out.domains);
+               }
+               ndr->depth--;
                ndr->depth--;
                ndr_print_ptr(ndr, "sids", r->out.sids);
                ndr->depth++;

diff --git a/source/librpc/gen_ndr/srv_lsa.c b/source/librpc/gen_ndr/srv_lsa.c
index b21a8256829ed3f9f332a7fa4ecdf2f8e894c804..1ce0448469039b47ac82e2a6e425aa18ebfda1b9 100644 (file)
--- a/source/librpc/gen_ndr/srv_lsa.c
+++ b/source/librpc/gen_ndr/srv_lsa.c
@@ -5258,7 +5258,7 @@ static bool api_lsa_LookupNames3(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.domains = talloc_zero(r, struct lsa_RefDomainList);
+       r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
        if (r->out.domains == NULL) {
                talloc_free(r);
                return false;
@@ -5940,7 +5940,7 @@ static bool api_lsa_LookupNames4(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.domains = talloc_zero(r, struct lsa_RefDomainList);
+       r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
        if (r->out.domains == NULL) {
                talloc_free(r);
                return false;