run "make idl".

Guenther
(This used to be commit 5db4310d4c9149dc9d68f7684dc961926f94544a)

diff --git a/source3/librpc/gen_ndr/cli_netlogon.c b/source3/librpc/gen_ndr/cli_netlogon.c
index d6739c5a2608d098d7d604583d7826fc89d0225d..4c9d97651db1dec77f8d30e632a3547008639731 100644 (file)
--- a/source3/librpc/gen_ndr/cli_netlogon.c
+++ b/source3/librpc/gen_ndr/cli_netlogon.c
@@ -2019,7 +2019,7 @@ NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              const char *server_name,
                                              uint32_t trust_flags,
-                                             struct netr_DomainTrustList **trusts,
+                                             struct netr_DomainTrustList *trusts,
                                              WERROR *werror)
 {
        struct netr_DsrEnumerateDomainTrusts r;

diff --git a/source3/librpc/gen_ndr/cli_netlogon.h b/source3/librpc/gen_ndr/cli_netlogon.h
index 9716f4084b92e44d04c4853cb4b665054f7bf696..5e58986d3348899b751ba5e33284533642a4bf40 100644 (file)
--- a/source3/librpc/gen_ndr/cli_netlogon.h
+++ b/source3/librpc/gen_ndr/cli_netlogon.h
@@ -303,7 +303,7 @@ NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              const char *server_name,
                                              uint32_t trust_flags,
-                                             struct netr_DomainTrustList **trusts,
+                                             struct netr_DomainTrustList *trusts,
                                              WERROR *werror);
 NTSTATUS rpccli_netr_DSRDEREGISTERDNSHOSTRECORDS(struct rpc_pipe_client *cli,
                                                 TALLOC_CTX *mem_ctx,

diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/source3/librpc/gen_ndr/ndr_netlogon.c
index 7bc85935d15088f7f738dbd40a1c97eca0a969bf..67a54fb4c795b7031848fa9c436115045a31c0a2 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/source3/librpc/gen_ndr/ndr_netlogon.c
@@ -13350,11 +13350,7 @@ static enum ndr_err_code ndr_push_netr_DsrEnumerateDomainTrusts(struct ndr_push
                if (r->out.trusts == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               if (*r->out.trusts == NULL) {
-                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-               }
-               NDR_CHECK(ndr_push_ref_ptr(ndr));
-               NDR_CHECK(ndr_push_netr_DomainTrustList(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.trusts));
+               NDR_CHECK(ndr_push_netr_DomainTrustList(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.trusts));
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -13363,10 +13359,8 @@ static enum ndr_err_code ndr_push_netr_DsrEnumerateDomainTrusts(struct ndr_push
 static enum ndr_err_code ndr_pull_netr_DsrEnumerateDomainTrusts(struct ndr_pull *ndr, int flags, struct netr_DsrEnumerateDomainTrusts *r)
 {
        uint32_t _ptr_server_name;
-       uint32_t _ptr_trusts;
        TALLOC_CTX *_mem_save_server_name_0;
        TALLOC_CTX *_mem_save_trusts_0;
-       TALLOC_CTX *_mem_save_trusts_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -13398,14 +13392,7 @@ static enum ndr_err_code ndr_pull_netr_DsrEnumerateDomainTrusts(struct ndr_pull
                }
                _mem_save_trusts_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.trusts, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_trusts));
-               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                       NDR_PULL_ALLOC(ndr, *r->out.trusts);
-               }
-               _mem_save_trusts_1 = NDR_PULL_GET_MEM_CTX(ndr);
-               NDR_PULL_SET_MEM_CTX(ndr, *r->out.trusts, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_netr_DomainTrustList(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.trusts));
-               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_trusts_1, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_netr_DomainTrustList(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.trusts));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_trusts_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
        }
@@ -13436,10 +13423,7 @@ _PUBLIC_ void ndr_print_netr_DsrEnumerateDomainTrusts(struct ndr_print *ndr, con
                ndr->depth++;
                ndr_print_ptr(ndr, "trusts", r->out.trusts);
                ndr->depth++;
-               ndr_print_ptr(ndr, "trusts", *r->out.trusts);
-               ndr->depth++;
-               ndr_print_netr_DomainTrustList(ndr, "trusts", *r->out.trusts);
-               ndr->depth--;
+               ndr_print_netr_DomainTrustList(ndr, "trusts", r->out.trusts);
                ndr->depth--;
                ndr_print_WERROR(ndr, "result", r->out.result);
                ndr->depth--;

diff --git a/source3/librpc/gen_ndr/netlogon.h b/source3/librpc/gen_ndr/netlogon.h
index 64a70ca1a756b838d215b7ebf2b431e90e312660..d1c00b19fb0a9f293f10b7d3ca2d986e8e7dc342 100644 (file)
--- a/source3/librpc/gen_ndr/netlogon.h
+++ b/source3/librpc/gen_ndr/netlogon.h
@@ -1453,7 +1453,7 @@ struct netr_DsrEnumerateDomainTrusts {
        } in;
 
        struct {
-               struct netr_DomainTrustList **trusts;/* [ref] */
+               struct netr_DomainTrustList *trusts;/* [ref] */
                WERROR result;
        } out;
 

diff --git a/source3/librpc/gen_ndr/srv_netlogon.c b/source3/librpc/gen_ndr/srv_netlogon.c
index 3f88d7f69493b4308e9624c98556e228079a930e..692d9524e97096937cac2cadafb088ef401d3a7c 100644 (file)
--- a/source3/librpc/gen_ndr/srv_netlogon.c
+++ b/source3/librpc/gen_ndr/srv_netlogon.c
@@ -3253,7 +3253,7 @@ static bool api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.trusts = talloc_zero(r, struct netr_DomainTrustList *);
+       r->out.trusts = talloc_zero(r, struct netr_DomainTrustList);
        if (r->out.trusts == NULL) {
                talloc_free(r);
                return false;