s3: re-run make samba3-idl.

Guenther

diff --git a/librpc/gen_ndr/cli_lsa.c b/librpc/gen_ndr/cli_lsa.c
index c75fb8fd6a5b205a9088bf7a419a1fdf4ccb10cb..7945ee9af1d7978e88884d17b889a0179d97535d 100644 (file)
--- a/librpc/gen_ndr/cli_lsa.c
+++ b/librpc/gen_ndr/cli_lsa.c
@@ -7274,9 +7274,9 @@ struct tevent_req *rpccli_lsa_SetTrustedDomainInfoByName_send(TALLOC_CTX *mem_ct
                                                              struct tevent_context *ev,
                                                              struct rpc_pipe_client *cli,
                                                              struct policy_handle *_handle /* [in] [ref] */,
-                                                             struct lsa_String _trusted_domain /* [in]  */,
+                                                             struct lsa_String *_trusted_domain /* [in] [ref] */,
                                                              enum lsa_TrustDomInfoEnum _level /* [in]  */,
-                                                             union lsa_TrustedDomainInfo *_info /* [in] [unique,switch_is(level)] */)
+                                                             union lsa_TrustedDomainInfo *_info /* [in] [ref,switch_is(level)] */)
 {
        struct tevent_req *req;
        struct rpccli_lsa_SetTrustedDomainInfoByName_state *state;
@@ -7374,9 +7374,9 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName_recv(struct tevent_req *req,
 NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                                               TALLOC_CTX *mem_ctx,
                                               struct policy_handle *handle /* [in] [ref] */,
-                                              struct lsa_String trusted_domain /* [in]  */,
+                                              struct lsa_String *trusted_domain /* [in] [ref] */,
                                               enum lsa_TrustDomInfoEnum level /* [in]  */,
-                                              union lsa_TrustedDomainInfo *info /* [in] [unique,switch_is(level)] */)
+                                              union lsa_TrustedDomainInfo *info /* [in] [ref,switch_is(level)] */)
 {
        struct lsa_SetTrustedDomainInfoByName r;
        NTSTATUS status;

diff --git a/librpc/gen_ndr/cli_lsa.h b/librpc/gen_ndr/cli_lsa.h
index 3caeb847c3a616d9aa7990876931e5b7314ae115..b38a4a272f00a4abcbc104c5ed0f0fff1b36da39 100644 (file)
--- a/librpc/gen_ndr/cli_lsa.h
+++ b/librpc/gen_ndr/cli_lsa.h
@@ -699,18 +699,18 @@ struct tevent_req *rpccli_lsa_SetTrustedDomainInfoByName_send(TALLOC_CTX *mem_ct
                                                              struct tevent_context *ev,
                                                              struct rpc_pipe_client *cli,
                                                              struct policy_handle *_handle /* [in] [ref] */,
-                                                             struct lsa_String _trusted_domain /* [in]  */,
+                                                             struct lsa_String *_trusted_domain /* [in] [ref] */,
                                                              enum lsa_TrustDomInfoEnum _level /* [in]  */,
-                                                             union lsa_TrustedDomainInfo *_info /* [in] [unique,switch_is(level)] */);
+                                                             union lsa_TrustedDomainInfo *_info /* [in] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName_recv(struct tevent_req *req,
                                                    TALLOC_CTX *mem_ctx,
                                                    NTSTATUS *result);
 NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                                               TALLOC_CTX *mem_ctx,
                                               struct policy_handle *handle /* [in] [ref] */,
-                                              struct lsa_String trusted_domain /* [in]  */,
+                                              struct lsa_String *trusted_domain /* [in] [ref] */,
                                               enum lsa_TrustDomInfoEnum level /* [in]  */,
-                                              union lsa_TrustedDomainInfo *info /* [in] [unique,switch_is(level)] */);
+                                              union lsa_TrustedDomainInfo *info /* [in] [ref,switch_is(level)] */);
 struct tevent_req *rpccli_lsa_EnumTrustedDomainsEx_send(TALLOC_CTX *mem_ctx,
                                                        struct tevent_context *ev,
                                                        struct rpc_pipe_client *cli,

diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h
index 82c377f454b42cd2fa731ffcb4d0da35bd7770d3..a03fdc2361d10ce3c155c64e9f75f717e8134b26 100644 (file)
--- a/librpc/gen_ndr/lsa.h
+++ b/librpc/gen_ndr/lsa.h
@@ -1513,9 +1513,9 @@ struct lsa_QueryTrustedDomainInfoByName {
 struct lsa_SetTrustedDomainInfoByName {
        struct {
                struct policy_handle *handle;/* [ref] */
-               struct lsa_String trusted_domain;
+               struct lsa_String *trusted_domain;/* [ref] */
                enum lsa_TrustDomInfoEnum level;
-               union lsa_TrustedDomainInfo *info;/* [unique,switch_is(level)] */
+               union lsa_TrustedDomainInfo *info;/* [ref,switch_is(level)] */
        } in;
 
        struct {

diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c
index 4389b9589db02579df71ea34ebbf0379297569d6..9d1fb09b2ea1e2f7d6bcc70eeb52d7d3c2e8ed6f 100644 (file)
--- a/librpc/gen_ndr/ndr_lsa.c
+++ b/librpc/gen_ndr/ndr_lsa.c
@@ -10623,20 +10623,23 @@ _PUBLIC_ void ndr_print_lsa_QueryTrustedDomainInfoByName(struct ndr_print *ndr,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_lsa_SetTrustedDomainInfoByName(struct ndr_push *ndr, int flags, const struct lsa_SetTrustedDomainInfoByName *r)
+_PUBLIC_ enum ndr_err_code ndr_push_lsa_SetTrustedDomainInfoByName(struct ndr_push *ndr, int flags, const struct lsa_SetTrustedDomainInfoByName *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
                NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.handle));
-               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.trusted_domain));
+               if (r->in.trusted_domain == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.trusted_domain));
                NDR_CHECK(ndr_push_lsa_TrustDomInfoEnum(ndr, NDR_SCALARS, r->in.level));
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.info));
-               if (r->in.info) {
-                       NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.info, r->in.level));
-                       NDR_CHECK(ndr_push_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
+               if (r->in.info == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
+               NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.info, r->in.level));
+               NDR_CHECK(ndr_push_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
@@ -10644,10 +10647,10 @@ static enum ndr_err_code ndr_push_lsa_SetTrustedDomainInfoByName(struct ndr_push
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_lsa_SetTrustedDomainInfoByName(struct ndr_pull *ndr, int flags, struct lsa_SetTrustedDomainInfoByName *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_lsa_SetTrustedDomainInfoByName(struct ndr_pull *ndr, int flags, struct lsa_SetTrustedDomainInfoByName *r)
 {
-       uint32_t _ptr_info;
        TALLOC_CTX *_mem_save_handle_0;
+       TALLOC_CTX *_mem_save_trusted_domain_0;
        TALLOC_CTX *_mem_save_info_0;
        if (flags & NDR_IN) {
                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
@@ -10657,21 +10660,22 @@ static enum ndr_err_code ndr_pull_lsa_SetTrustedDomainInfoByName(struct ndr_pull
                NDR_PULL_SET_MEM_CTX(ndr, r->in.handle, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.trusted_domain));
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->in.trusted_domain);
+               }
+               _mem_save_trusted_domain_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->in.trusted_domain, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.trusted_domain));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_trusted_domain_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_lsa_TrustDomInfoEnum(ndr, NDR_SCALARS, &r->in.level));
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
-               if (_ptr_info) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                        NDR_PULL_ALLOC(ndr, r->in.info);
-               } else {
-                       r->in.info = NULL;
-               }
-               if (r->in.info) {
-                       _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->in.info, 0);
-                       NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.info, r->in.level));
-                       NDR_CHECK(ndr_pull_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, 0);
                }
+               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->in.info, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.info, r->in.level));
+               NDR_CHECK(ndr_pull_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
@@ -10693,14 +10697,15 @@ _PUBLIC_ void ndr_print_lsa_SetTrustedDomainInfoByName(struct ndr_print *ndr, co
                ndr->depth++;
                ndr_print_policy_handle(ndr, "handle", r->in.handle);
                ndr->depth--;
-               ndr_print_lsa_String(ndr, "trusted_domain", &r->in.trusted_domain);
+               ndr_print_ptr(ndr, "trusted_domain", r->in.trusted_domain);
+               ndr->depth++;
+               ndr_print_lsa_String(ndr, "trusted_domain", r->in.trusted_domain);
+               ndr->depth--;
                ndr_print_lsa_TrustDomInfoEnum(ndr, "level", r->in.level);
                ndr_print_ptr(ndr, "info", r->in.info);
                ndr->depth++;
-               if (r->in.info) {
-                       ndr_print_set_switch_value(ndr, r->in.info, r->in.level);
-                       ndr_print_lsa_TrustedDomainInfo(ndr, "info", r->in.info);
-               }
+               ndr_print_set_switch_value(ndr, r->in.info, r->in.level);
+               ndr_print_lsa_TrustedDomainInfo(ndr, "info", r->in.info);
                ndr->depth--;
                ndr->depth--;
        }

diff --git a/librpc/gen_ndr/ndr_lsa.h b/librpc/gen_ndr/ndr_lsa.h
index 5ff7451cca729b24f897c39b7134df8e347e188f..c6bfa71d0df973ecf930f4de5cedcdc507ab9d60 100644 (file)
--- a/librpc/gen_ndr/ndr_lsa.h
+++ b/librpc/gen_ndr/ndr_lsa.h
@@ -373,6 +373,8 @@ void ndr_print_lsa_GetUserName(struct ndr_print *ndr, const char *name, int flag
 void ndr_print_lsa_QueryInfoPolicy2(struct ndr_print *ndr, const char *name, int flags, const struct lsa_QueryInfoPolicy2 *r);
 void ndr_print_lsa_SetInfoPolicy2(struct ndr_print *ndr, const char *name, int flags, const struct lsa_SetInfoPolicy2 *r);
 void ndr_print_lsa_QueryTrustedDomainInfoByName(struct ndr_print *ndr, const char *name, int flags, const struct lsa_QueryTrustedDomainInfoByName *r);
+enum ndr_err_code ndr_push_lsa_SetTrustedDomainInfoByName(struct ndr_push *ndr, int flags, const struct lsa_SetTrustedDomainInfoByName *r);
+enum ndr_err_code ndr_pull_lsa_SetTrustedDomainInfoByName(struct ndr_pull *ndr, int flags, struct lsa_SetTrustedDomainInfoByName *r);
 void ndr_print_lsa_SetTrustedDomainInfoByName(struct ndr_print *ndr, const char *name, int flags, const struct lsa_SetTrustedDomainInfoByName *r);
 void ndr_print_lsa_EnumTrustedDomainsEx(struct ndr_print *ndr, const char *name, int flags, const struct lsa_EnumTrustedDomainsEx *r);
 void ndr_print_lsa_CreateTrustedDomainEx(struct ndr_print *ndr, const char *name, int flags, const struct lsa_CreateTrustedDomainEx *r);