Re-run make idl.

Guenther
(This used to be commit eaead9ea470c296ff0ace353104a0ef31f11311c)

diff --git a/source3/librpc/gen_ndr/cli_lsa.c b/source3/librpc/gen_ndr/cli_lsa.c
index 227ae809c928527cc73a84301a0846c7d2384df5..edc75490112cb2f7d0027cc7a8feb26e199dc41a 100644 (file)
--- a/source3/librpc/gen_ndr/cli_lsa.c
+++ b/source3/librpc/gen_ndr/cli_lsa.c
@@ -762,7 +762,7 @@ NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
                                struct policy_handle *handle,
                                struct dom_sid2 *sid,
                                uint32_t access_mask,
-                               struct policy_handle *acct_handle)
+                               struct policy_handle **acct_handle)
 {
        struct lsa_OpenAccount r;
        NTSTATUS status;

diff --git a/source3/librpc/gen_ndr/cli_lsa.h b/source3/librpc/gen_ndr/cli_lsa.h
index ec9abaf568317edbf6698ece604d157df3a6fbb8..233154530f35b7f5a31e4e0da8101c8189c886dc 100644 (file)
--- a/source3/librpc/gen_ndr/cli_lsa.h
+++ b/source3/librpc/gen_ndr/cli_lsa.h
@@ -95,7 +95,7 @@ NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
                                struct policy_handle *handle,
                                struct dom_sid2 *sid,
                                uint32_t access_mask,
-                               struct policy_handle *acct_handle);
+                               struct policy_handle **acct_handle);
 NTSTATUS rpccli_lsa_EnumPrivsAccount(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx,
                                     struct policy_handle *handle,

diff --git a/source3/librpc/gen_ndr/lsa.h b/source3/librpc/gen_ndr/lsa.h
index 810ce945da00bbf35ea7e507728ec0a864c65731..03ffdd08ab997a744550a0a81c9701b900ec6ad2 100644 (file)
--- a/source3/librpc/gen_ndr/lsa.h
+++ b/source3/librpc/gen_ndr/lsa.h
@@ -829,7 +829,7 @@ struct lsa_OpenAccount {
        } in;
 
        struct {
-               struct policy_handle *acct_handle;/* [ref] */
+               struct policy_handle **acct_handle;/* [ref] */
                NTSTATUS result;
        } out;
 

diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/source3/librpc/gen_ndr/ndr_lsa.c
index 8c863085a933eaa13d8760649777fc57e4fa15ac..4e2304015117f82c7f72ac61dc56346a8e17b884 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/source3/librpc/gen_ndr/ndr_lsa.c
@@ -6208,7 +6208,10 @@ static enum ndr_err_code ndr_push_lsa_OpenAccount(struct ndr_push *ndr, int flag
                if (r->out.acct_handle == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.acct_handle));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.acct_handle));
+               if (*r->out.acct_handle) {
+                       NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.acct_handle));
+               }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -6216,9 +6219,11 @@ static enum ndr_err_code ndr_push_lsa_OpenAccount(struct ndr_push *ndr, int flag
 
 static enum ndr_err_code ndr_pull_lsa_OpenAccount(struct ndr_pull *ndr, int flags, struct lsa_OpenAccount *r)
 {
+       uint32_t _ptr_acct_handle;
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_sid_0;
        TALLOC_CTX *_mem_save_acct_handle_0;
+       TALLOC_CTX *_mem_save_acct_handle_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -6246,7 +6251,18 @@ static enum ndr_err_code ndr_pull_lsa_OpenAccount(struct ndr_pull *ndr, int flag
                }
                _mem_save_acct_handle_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.acct_handle, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.acct_handle));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_acct_handle));
+               if (_ptr_acct_handle) {
+                       NDR_PULL_ALLOC(ndr, *r->out.acct_handle);
+               } else {
+                       *r->out.acct_handle = NULL;
+               }
+               if (*r->out.acct_handle) {
+                       _mem_save_acct_handle_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.acct_handle, 0);
+                       NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.acct_handle));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_acct_handle_1, 0);
+               }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_acct_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
@@ -6279,7 +6295,12 @@ _PUBLIC_ void ndr_print_lsa_OpenAccount(struct ndr_print *ndr, const char *name,
                ndr->depth++;
                ndr_print_ptr(ndr, "acct_handle", r->out.acct_handle);
                ndr->depth++;
-               ndr_print_policy_handle(ndr, "acct_handle", r->out.acct_handle);
+               ndr_print_ptr(ndr, "acct_handle", *r->out.acct_handle);
+               ndr->depth++;
+               if (*r->out.acct_handle) {
+                       ndr_print_policy_handle(ndr, "acct_handle", *r->out.acct_handle);
+               }
+               ndr->depth--;
                ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;

diff --git a/source3/librpc/gen_ndr/srv_lsa.c b/source3/librpc/gen_ndr/srv_lsa.c
index 9d41be35a8e5e21b11a64ac4c4c075c9781d5093..f8ef1ad26beb29355e80ee2c7e7cc59966c97a8c 100644 (file)
--- a/source3/librpc/gen_ndr/srv_lsa.c
+++ b/source3/librpc/gen_ndr/srv_lsa.c
@@ -1372,7 +1372,7 @@ static bool api_lsa_OpenAccount(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.acct_handle = talloc_zero(r, struct policy_handle);
+       r->out.acct_handle = talloc_zero(r, struct policy_handle *);
        if (r->out.acct_handle == NULL) {
                talloc_free(r);
                return false;