Re-run make idl.

Guenther

diff --git a/source/librpc/gen_ndr/cli_lsa.c b/source/librpc/gen_ndr/cli_lsa.c
index 8df638f051981d6e5f5f36b7a05131f9f32266be..4e81f7094cf9fba66fcded841f00160b62f1e482 100644 (file)
--- a/source/librpc/gen_ndr/cli_lsa.c
+++ b/source/librpc/gen_ndr/cli_lsa.c
@@ -1398,7 +1398,7 @@ NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
                                   struct policy_handle *handle /* [in] [ref] */,
                                   struct lsa_LUID *luid /* [in] [ref] */,
-                                  struct lsa_StringLarge *name /* [out] [unique] */)
+                                  struct lsa_StringLarge **name /* [out] [ref] */)
 {
        struct lsa_LookupPrivName r;
        NTSTATUS status;
@@ -1431,9 +1431,7 @@ NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       if (name && r.out.name) {
-               *name = *r.out.name;
-       }
+       *name = *r.out.name;
 
        /* Return result */
        return r.out.result;

diff --git a/source/librpc/gen_ndr/cli_lsa.h b/source/librpc/gen_ndr/cli_lsa.h
index 6befb1d86d4f30e0d8eaac1da10f6501eb070712..f3333a091b246fdf536a34f34ff19aef833ad436 100644 (file)
--- a/source/librpc/gen_ndr/cli_lsa.h
+++ b/source/librpc/gen_ndr/cli_lsa.h
@@ -161,7 +161,7 @@ NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
                                   struct policy_handle *handle /* [in] [ref] */,
                                   struct lsa_LUID *luid /* [in] [ref] */,
-                                  struct lsa_StringLarge *name /* [out] [unique] */);
+                                  struct lsa_StringLarge **name /* [out] [ref] */);
 NTSTATUS rpccli_lsa_LookupPrivDisplayName(struct rpc_pipe_client *cli,
                                          TALLOC_CTX *mem_ctx,
                                          struct policy_handle *handle /* [in] [ref] */,

diff --git a/source/librpc/gen_ndr/lsa.h b/source/librpc/gen_ndr/lsa.h
index 044d07b1e08064c31c3bcdb75f0640e8a1403e19..1e3d3162b280026137811dfab212205a690e40b8 100644 (file)
--- a/source/librpc/gen_ndr/lsa.h
+++ b/source/librpc/gen_ndr/lsa.h
@@ -1049,7 +1049,7 @@ struct lsa_LookupPrivName {
        } in;
 
        struct {
-               struct lsa_StringLarge *name;/* [unique] */
+               struct lsa_StringLarge **name;/* [ref] */
                NTSTATUS result;
        } out;
 

diff --git a/source/librpc/gen_ndr/ndr_lsa.c b/source/librpc/gen_ndr/ndr_lsa.c
index 396791af548eb8ee2d9a352a92391f5cd42dc434..c7d428b1b9997b67ada70b1e92ad65735cf67be2 100644 (file)
--- a/source/librpc/gen_ndr/ndr_lsa.c
+++ b/source/librpc/gen_ndr/ndr_lsa.c
@@ -7674,9 +7674,12 @@ static enum ndr_err_code ndr_push_lsa_LookupPrivName(struct ndr_push *ndr, int f
                NDR_CHECK(ndr_push_lsa_LUID(ndr, NDR_SCALARS, r->in.luid));
        }
        if (flags & NDR_OUT) {
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.name));
-               if (r->out.name) {
-                       NDR_CHECK(ndr_push_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.name));
+               if (r->out.name == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.name));
+               if (*r->out.name) {
+                       NDR_CHECK(ndr_push_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.name));
                }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
@@ -7689,6 +7692,7 @@ static enum ndr_err_code ndr_pull_lsa_LookupPrivName(struct ndr_pull *ndr, int f
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_luid_0;
        TALLOC_CTX *_mem_save_name_0;
+       TALLOC_CTX *_mem_save_name_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -7706,20 +7710,28 @@ static enum ndr_err_code ndr_pull_lsa_LookupPrivName(struct ndr_pull *ndr, int f
                NDR_PULL_SET_MEM_CTX(ndr, r->in.luid, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_lsa_LUID(ndr, NDR_SCALARS, r->in.luid));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_luid_0, LIBNDR_FLAG_REF_ALLOC);
+               NDR_PULL_ALLOC(ndr, r->out.name);
+               ZERO_STRUCTP(r->out.name);
        }
        if (flags & NDR_OUT) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->out.name);
+               }
+               _mem_save_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->out.name, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
                if (_ptr_name) {
-                       NDR_PULL_ALLOC(ndr, r->out.name);
+                       NDR_PULL_ALLOC(ndr, *r->out.name);
                } else {
-                       r->out.name = NULL;
+                       *r->out.name = NULL;
                }
-               if (r->out.name) {
-                       _mem_save_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->out.name, 0);
-                       NDR_CHECK(ndr_pull_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.name));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, 0);
+               if (*r->out.name) {
+                       _mem_save_name_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.name, 0);
+                       NDR_CHECK(ndr_pull_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.name));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_1, 0);
                }
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_name_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -7750,10 +7762,13 @@ _PUBLIC_ void ndr_print_lsa_LookupPrivName(struct ndr_print *ndr, const char *na
                ndr->depth++;
                ndr_print_ptr(ndr, "name", r->out.name);
                ndr->depth++;
-               if (r->out.name) {
-                       ndr_print_lsa_StringLarge(ndr, "name", r->out.name);
+               ndr_print_ptr(ndr, "name", *r->out.name);
+               ndr->depth++;
+               if (*r->out.name) {
+                       ndr_print_lsa_StringLarge(ndr, "name", *r->out.name);
                }
                ndr->depth--;
+               ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;
        }

diff --git a/source/librpc/gen_ndr/srv_lsa.c b/source/librpc/gen_ndr/srv_lsa.c
index e6fca8468767d580b0db0a2a70ce17a27f61f91d..249bdc04bb3aafc0bf97546822553d43cdfaa6a5 100644 (file)
--- a/source/librpc/gen_ndr/srv_lsa.c
+++ b/source/librpc/gen_ndr/srv_lsa.c
@@ -2521,7 +2521,7 @@ static bool api_lsa_LookupPrivName(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.name = talloc_zero(r, struct lsa_StringLarge);
+       r->out.name = talloc_zero(r, struct lsa_StringLarge *);
        if (r->out.name == NULL) {
                talloc_free(r);
                return false;