Re-run make idl.

Guenther

diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index f4282142a09a557bb60577ade822e94d1cdab357..4d0b963918a613da12859134bdcb268f1547f223 100644 (file)
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -679,8 +679,8 @@ NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx,
                                       struct policy_handle *domain_handle,
                                       uint32_t *resume_handle,
-                                      uint32_t acct_flags,
-                                      struct samr_SamArray *sam,
+                                      struct samr_SamArray **sam,
+                                      uint32_t max_size,
                                       uint32_t *num_entries)
 {
        struct samr_EnumDomainAliases r;
@@ -689,7 +689,7 @@ NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.domain_handle = domain_handle;
        r.in.resume_handle = resume_handle;
-       r.in.acct_flags = acct_flags;
+       r.in.max_size = max_size;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(samr_EnumDomainAliases, &r);

diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index a2db39bd748df63dbcde914dda35bffe144c4858..4c4371fb922fbb8337c035ce14a3c29c28d10149 100644 (file)
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -90,8 +90,8 @@ NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx,
                                       struct policy_handle *domain_handle,
                                       uint32_t *resume_handle,
-                                      uint32_t acct_flags,
-                                      struct samr_SamArray *sam,
+                                      struct samr_SamArray **sam,
+                                      uint32_t max_size,
                                       uint32_t *num_entries);
 NTSTATUS rpccli_samr_GetAliasMembership(struct rpc_pipe_client *cli,
                                        TALLOC_CTX *mem_ctx,

diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index cb9cef915aeb6c50833726f8f226ae8117658ab7..cc66ff8a87f7bbea6e8f553b6324fda5ef85e173 100644 (file)
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -6858,7 +6858,7 @@ static enum ndr_err_code ndr_push_samr_EnumDomainAliases(struct ndr_push *ndr, i
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.resume_handle));
-               NDR_CHECK(ndr_push_samr_AcctFlags(ndr, NDR_SCALARS, r->in.acct_flags));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_size));
        }
        if (flags & NDR_OUT) {
                if (r->out.resume_handle == NULL) {
@@ -6868,7 +6868,10 @@ static enum ndr_err_code ndr_push_samr_EnumDomainAliases(struct ndr_push *ndr, i
                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");
                }
@@ -6880,9 +6883,11 @@ static enum ndr_err_code ndr_push_samr_EnumDomainAliases(struct ndr_push *ndr, i
 
 static enum ndr_err_code ndr_pull_samr_EnumDomainAliases(struct ndr_pull *ndr, int flags, struct samr_EnumDomainAliases *r)
 {
+       uint32_t _ptr_sam;
        TALLOC_CTX *_mem_save_domain_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);
@@ -6901,7 +6906,7 @@ static enum ndr_err_code ndr_pull_samr_EnumDomainAliases(struct ndr_pull *ndr, i
                NDR_PULL_SET_MEM_CTX(ndr, r->in.resume_handle, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.resume_handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_resume_handle_0, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_samr_AcctFlags(ndr, NDR_SCALARS, &r->in.acct_flags));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.max_size));
                NDR_PULL_ALLOC(ndr, r->out.resume_handle);
                *r->out.resume_handle = *r->in.resume_handle;
                NDR_PULL_ALLOC(ndr, r->out.sam);
@@ -6922,7 +6927,18 @@ static enum ndr_err_code ndr_pull_samr_EnumDomainAliases(struct ndr_pull *ndr, i
                }
                _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);
@@ -6954,7 +6970,7 @@ _PUBLIC_ void ndr_print_samr_EnumDomainAliases(struct ndr_print *ndr, const char
                ndr->depth++;
                ndr_print_uint32(ndr, "resume_handle", *r->in.resume_handle);
                ndr->depth--;
-               ndr_print_samr_AcctFlags(ndr, "acct_flags", r->in.acct_flags);
+               ndr_print_uint32(ndr, "max_size", r->in.max_size);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
@@ -6966,7 +6982,12 @@ _PUBLIC_ void ndr_print_samr_EnumDomainAliases(struct ndr_print *ndr, const char
                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/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index 5a436fb0db6c2a9e2edca61e03c1647e6867a408..a0390aca3042e0a5f709ea55d2b598ea79cf0179 100644 (file)
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -975,12 +975,12 @@ struct samr_CreateDomAlias {
 struct samr_EnumDomainAliases {
        struct {
                struct policy_handle *domain_handle;/* [ref] */
-               uint32_t acct_flags;
+               uint32_t max_size;
                uint32_t *resume_handle;/* [ref] */
        } 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/source/librpc/gen_ndr/srv_samr.c b/source/librpc/gen_ndr/srv_samr.c
index 768c3b7ee3b281b153fe6afebfccd4b9c0074fc5..dcc6a197fac58734e4c315c86b14329ddf4e5340 100644 (file)
--- a/source/librpc/gen_ndr/srv_samr.c
+++ b/source/librpc/gen_ndr/srv_samr.c
@@ -1259,7 +1259,7 @@ static bool api_samr_EnumDomainAliases(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;