Re-run make idl.

Guenther

diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index 73c123bbdd5aaa641e954b44fdd69af79caa2d0a..1c71645069e623f75dc7405b6eeaae26ef567a5f 100644 (file)
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -136,7 +136,7 @@ NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
                                   struct policy_handle *handle,
                                   uint32_t sec_info,
-                                  struct sec_desc_buf *sdbuf)
+                                  struct sec_desc_buf **sdbuf)
 {
        struct samr_QuerySecurity r;
        NTSTATUS status;

diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 23f2d1f1b6a02e16e70443b526caecefd2cb685d..14f47ea92529333b42dcfc78859a68e4ed6f1126 100644 (file)
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -18,7 +18,7 @@ NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
                                   struct policy_handle *handle,
                                   uint32_t sec_info,
-                                  struct sec_desc_buf *sdbuf);
+                                  struct sec_desc_buf **sdbuf);
 NTSTATUS rpccli_samr_Shutdown(struct rpc_pipe_client *cli,
                              TALLOC_CTX *mem_ctx,
                              struct policy_handle *connect_handle);

diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index adbe549df032be184a720eecb66f601f86c71b86..d6f51b94b046451cf7eb3c3373c0a07a5d8f88aa 100644 (file)
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -5425,7 +5425,11 @@ static enum ndr_err_code ndr_push_samr_QuerySecurity(struct ndr_push *ndr, int f
                if (r->out.sdbuf == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sdbuf));
+               if (*r->out.sdbuf == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_ref_ptr(ndr));
+               NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sdbuf));
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -5433,8 +5437,10 @@ static enum ndr_err_code ndr_push_samr_QuerySecurity(struct ndr_push *ndr, int f
 
 static enum ndr_err_code ndr_pull_samr_QuerySecurity(struct ndr_pull *ndr, int flags, struct samr_QuerySecurity *r)
 {
+       uint32_t _ptr_sdbuf;
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_sdbuf_0;
+       TALLOC_CTX *_mem_save_sdbuf_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -5455,7 +5461,14 @@ static enum ndr_err_code ndr_pull_samr_QuerySecurity(struct ndr_pull *ndr, int f
                }
                _mem_save_sdbuf_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.sdbuf, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sdbuf));
+               NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_sdbuf));
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, *r->out.sdbuf);
+               }
+               _mem_save_sdbuf_1 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, *r->out.sdbuf, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sdbuf));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sdbuf_1, LIBNDR_FLAG_REF_ALLOC);
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sdbuf_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
@@ -5484,7 +5497,10 @@ _PUBLIC_ void ndr_print_samr_QuerySecurity(struct ndr_print *ndr, const char *na
                ndr->depth++;
                ndr_print_ptr(ndr, "sdbuf", r->out.sdbuf);
                ndr->depth++;
-               ndr_print_sec_desc_buf(ndr, "sdbuf", r->out.sdbuf);
+               ndr_print_ptr(ndr, "sdbuf", *r->out.sdbuf);
+               ndr->depth++;
+               ndr_print_sec_desc_buf(ndr, "sdbuf", *r->out.sdbuf);
+               ndr->depth--;
                ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;

diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index 2a6a826078f5cf62a273fdd9f86da7b0a9ebbe02..6e79773fab5fc36eeed72013f831b7a7afd905d7 100644 (file)
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -773,7 +773,7 @@ struct samr_QuerySecurity {
        } in;
 
        struct {
-               struct sec_desc_buf *sdbuf;/* [ref] */
+               struct sec_desc_buf **sdbuf;/* [ref] */
                NTSTATUS result;
        } out;
 

diff --git a/source/librpc/gen_ndr/srv_samr.c b/source/librpc/gen_ndr/srv_samr.c
index 72116f355b34d1ea069e13ca439dcae4239534cd..188c5b1eb23bc9e6a4f0744867d27221ef6b4e8e 100644 (file)
--- a/source/librpc/gen_ndr/srv_samr.c
+++ b/source/librpc/gen_ndr/srv_samr.c
@@ -273,7 +273,7 @@ static bool api_samr_QuerySecurity(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.sdbuf = talloc_zero(r, struct sec_desc_buf);
+       r->out.sdbuf = talloc_zero(r, struct sec_desc_buf *);
        if (r->out.sdbuf == NULL) {
                talloc_free(r);
                return false;