Re-run make idl.

Guenther
(This used to be commit 10ce833cf0413811db13d9849b9c23fcc27f4526)

diff --git a/source3/librpc/gen_ndr/cli_samr.c b/source3/librpc/gen_ndr/cli_samr.c
index c3cb5ad273803af59c2cf402dc80e9b449d8d6ce..efedb00078c039871a9d40ab189b3de8abf8de5b 100644 (file)
--- a/source3/librpc/gen_ndr/cli_samr.c
+++ b/source3/librpc/gen_ndr/cli_samr.c
@@ -261,8 +261,8 @@ NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx,
                                 struct policy_handle *connect_handle,
                                 uint32_t *resume_handle,
+                                struct samr_SamArray **sam,
                                 uint32_t buf_size,
-                                struct samr_SamArray *sam,
                                 uint32_t *num_entries)
 {
        struct samr_EnumDomains r;

diff --git a/source3/librpc/gen_ndr/cli_samr.h b/source3/librpc/gen_ndr/cli_samr.h
index 5df5e3a70c5e2e0ff1fdc4cf352d9a7a94c0790f..9eac17700133e042e6126c6eba1d1d1c0b2943b2 100644 (file)
--- a/source3/librpc/gen_ndr/cli_samr.h
+++ b/source3/librpc/gen_ndr/cli_samr.h
@@ -31,8 +31,8 @@ NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx,
                                 struct policy_handle *connect_handle,
                                 uint32_t *resume_handle,
+                                struct samr_SamArray **sam,
                                 uint32_t buf_size,
-                                struct samr_SamArray *sam,
                                 uint32_t *num_entries);
 NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
                                TALLOC_CTX *mem_ctx,

diff --git a/source3/librpc/gen_ndr/ndr_samr.c b/source3/librpc/gen_ndr/ndr_samr.c
index f257c178646043ded56cd29200254258c65d6304..8c97ea1d95ff64bde954417d4891badd72cfcbc9 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_samr.c
+++ b/source3/librpc/gen_ndr/ndr_samr.c
@@ -5788,7 +5788,10 @@ static enum ndr_err_code ndr_push_samr_EnumDomains(struct ndr_push *ndr, int fla
                if (r->out.sam == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sam));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.sam));
+               if (*r->out.sam) {
+                       NDR_CHECK(ndr_push_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sam));
+               }
                if (r->out.num_entries == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -5800,9 +5803,11 @@ static enum ndr_err_code ndr_push_samr_EnumDomains(struct ndr_push *ndr, int fla
 
 static enum ndr_err_code ndr_pull_samr_EnumDomains(struct ndr_pull *ndr, int flags, struct samr_EnumDomains *r)
 {
+       uint32_t _ptr_sam;
        TALLOC_CTX *_mem_save_connect_handle_0;
        TALLOC_CTX *_mem_save_resume_handle_0;
        TALLOC_CTX *_mem_save_sam_0;
+       TALLOC_CTX *_mem_save_sam_1;
        TALLOC_CTX *_mem_save_num_entries_0;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
@@ -5842,7 +5847,18 @@ static enum ndr_err_code ndr_pull_samr_EnumDomains(struct ndr_pull *ndr, int fla
                }
                _mem_save_sam_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.sam, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sam));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sam));
+               if (_ptr_sam) {
+                       NDR_PULL_ALLOC(ndr, *r->out.sam);
+               } else {
+                       *r->out.sam = NULL;
+               }
+               if (*r->out.sam) {
+                       _mem_save_sam_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.sam, 0);
+                       NDR_CHECK(ndr_pull_samr_SamArray(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sam));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sam_1, 0);
+               }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sam_0, LIBNDR_FLAG_REF_ALLOC);
                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                        NDR_PULL_ALLOC(ndr, r->out.num_entries);
@@ -5886,7 +5902,12 @@ _PUBLIC_ void ndr_print_samr_EnumDomains(struct ndr_print *ndr, const char *name
                ndr->depth--;
                ndr_print_ptr(ndr, "sam", r->out.sam);
                ndr->depth++;
-               ndr_print_samr_SamArray(ndr, "sam", r->out.sam);
+               ndr_print_ptr(ndr, "sam", *r->out.sam);
+               ndr->depth++;
+               if (*r->out.sam) {
+                       ndr_print_samr_SamArray(ndr, "sam", *r->out.sam);
+               }
+               ndr->depth--;
                ndr->depth--;
                ndr_print_ptr(ndr, "num_entries", r->out.num_entries);
                ndr->depth++;

diff --git a/source3/librpc/gen_ndr/samr.h b/source3/librpc/gen_ndr/samr.h
index 376feae5d16abd2fda924cbb37ca7d111630bcb7..2d6126a3f40110abc42dd0a30a7d3d5408b8e907 100644 (file)
--- a/source3/librpc/gen_ndr/samr.h
+++ b/source3/librpc/gen_ndr/samr.h
@@ -837,7 +837,7 @@ struct samr_EnumDomains {
        } in;
 
        struct {
-               struct samr_SamArray *sam;/* [ref] */
+               struct samr_SamArray **sam;/* [ref] */
                uint32_t *num_entries;/* [ref] */
                uint32_t *resume_handle;/* [ref] */
                NTSTATUS result;

diff --git a/source3/librpc/gen_ndr/srv_samr.c b/source3/librpc/gen_ndr/srv_samr.c
index 374df34a96bbaeb88a33a8312fb639494b3ef55c..33129641780892ab532960719bcbb255d82de728 100644 (file)
--- a/source3/librpc/gen_ndr/srv_samr.c
+++ b/source3/librpc/gen_ndr/srv_samr.c
@@ -507,7 +507,7 @@ static bool api_samr_EnumDomains(pipes_struct *p)
 
        ZERO_STRUCT(r->out);
        r->out.resume_handle = r->in.resume_handle;
-       r->out.sam = talloc_zero(r, struct samr_SamArray);
+       r->out.sam = talloc_zero(r, struct samr_SamArray *);
        if (r->out.sam == NULL) {
                talloc_free(r);
                return false;