]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Re-run make idl.
authorGünther Deschner <gd@samba.org>
Tue, 8 Apr 2008 20:54:18 +0000 (22:54 +0200)
committerGünther Deschner <gd@samba.org>
Tue, 8 Apr 2008 20:54:18 +0000 (22:54 +0200)
Guenther

source/librpc/gen_ndr/cli_lsa.c
source/librpc/gen_ndr/cli_lsa.h
source/librpc/gen_ndr/lsa.h
source/librpc/gen_ndr/ndr_lsa.c
source/librpc/gen_ndr/srv_lsa.c

index 2b673054dc050322ab301f55a9d8c84cdeeacd35..475dd1e60258c66b7bfea6d24eb52606f4b66df1 100644 (file)
@@ -1709,7 +1709,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
                                                struct policy_handle *handle /* [in] [ref] */,
                                                struct dom_sid2 *dom_sid /* [in] [ref] */,
                                                enum lsa_TrustDomInfoEnum level /* [in]  */,
-                                               union lsa_TrustedDomainInfo *info /* [out] [unique,switch_is(level)] */)
+                                               union lsa_TrustedDomainInfo **info /* [out] [ref,switch_is(level)] */)
 {
        struct lsa_QueryTrustedDomainInfoBySid r;
        NTSTATUS status;
@@ -1743,9 +1743,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       if (info && r.out.info) {
-               *info = *r.out.info;
-       }
+       *info = *r.out.info;
 
        /* Return result */
        return r.out.result;
@@ -2086,7 +2084,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                                                 struct policy_handle *handle /* [in] [ref] */,
                                                 struct lsa_String *trusted_domain /* [in] [ref] */,
                                                 enum lsa_TrustDomInfoEnum level /* [in]  */,
-                                                union lsa_TrustedDomainInfo *info /* [out] [ref,switch_is(level)] */)
+                                                union lsa_TrustedDomainInfo **info /* [out] [ref,switch_is(level)] */)
 {
        struct lsa_QueryTrustedDomainInfoByName r;
        NTSTATUS status;
@@ -2298,7 +2296,7 @@ NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
                                                 TALLOC_CTX *mem_ctx,
                                                 struct policy_handle *handle /* [in] [ref] */,
                                                 uint16_t level /* [in]  */,
-                                                union lsa_DomainInformationPolicy *info /* [out] [unique,switch_is(level)] */)
+                                                union lsa_DomainInformationPolicy **info /* [out] [ref,switch_is(level)] */)
 {
        struct lsa_QueryDomainInformationPolicy r;
        NTSTATUS status;
@@ -2331,9 +2329,7 @@ NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       if (info && r.out.info) {
-               *info = *r.out.info;
-       }
+       *info = *r.out.info;
 
        /* Return result */
        return r.out.result;
index aa326cdaba5f0cf6eaadf7a5411d76fdbd2a1f27..f4af6ed0d8bc85450e5733c00b3b08d7cecbe02b 100644 (file)
@@ -199,7 +199,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
                                                struct policy_handle *handle /* [in] [ref] */,
                                                struct dom_sid2 *dom_sid /* [in] [ref] */,
                                                enum lsa_TrustDomInfoEnum level /* [in]  */,
-                                               union lsa_TrustedDomainInfo *info /* [out] [unique,switch_is(level)] */);
+                                               union lsa_TrustedDomainInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetTrustedDomainInfo(struct rpc_pipe_client *cli,
                                         TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_lsa_DeleteTrustedDomain(struct rpc_pipe_client *cli,
@@ -236,7 +236,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                                                 struct policy_handle *handle /* [in] [ref] */,
                                                 struct lsa_String *trusted_domain /* [in] [ref] */,
                                                 enum lsa_TrustDomInfoEnum level /* [in]  */,
-                                                union lsa_TrustedDomainInfo *info /* [out] [ref,switch_is(level)] */);
+                                                union lsa_TrustedDomainInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                                               TALLOC_CTX *mem_ctx,
                                               struct policy_handle *handle /* [in] [ref] */,
@@ -258,7 +258,7 @@ NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
                                                 TALLOC_CTX *mem_ctx,
                                                 struct policy_handle *handle /* [in] [ref] */,
                                                 uint16_t level /* [in]  */,
-                                                union lsa_DomainInformationPolicy *info /* [out] [unique,switch_is(level)] */);
+                                                union lsa_DomainInformationPolicy **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_lsa_SetDomainInformationPolicy(struct rpc_pipe_client *cli,
                                               TALLOC_CTX *mem_ctx,
                                               struct policy_handle *handle /* [in] [ref] */,
index 7686bec336d24adc0e7fd5129b78cc267a7a5d80..a9c890663153f3dc1b62ef820f001afef6e30a5c 100644 (file)
@@ -1151,7 +1151,7 @@ struct lsa_QueryTrustedDomainInfoBySid {
        } in;
 
        struct {
-               union lsa_TrustedDomainInfo *info;/* [unique,switch_is(level)] */
+               union lsa_TrustedDomainInfo **info;/* [ref,switch_is(level)] */
                NTSTATUS result;
        } out;
 
@@ -1262,7 +1262,7 @@ struct lsa_QueryTrustedDomainInfoByName {
        } in;
 
        struct {
-               union lsa_TrustedDomainInfo *info;/* [ref,switch_is(level)] */
+               union lsa_TrustedDomainInfo **info;/* [ref,switch_is(level)] */
                NTSTATUS result;
        } out;
 
@@ -1328,7 +1328,7 @@ struct lsa_QueryDomainInformationPolicy {
        } in;
 
        struct {
-               union lsa_DomainInformationPolicy *info;/* [unique,switch_is(level)] */
+               union lsa_DomainInformationPolicy **info;/* [ref,switch_is(level)] */
                NTSTATUS result;
        } out;
 
index 844facebb4197ea907746a09ad24c391a6d1b45f..070ac0031a10b2d8395ddc14f9af05946f1ed3dc 100644 (file)
@@ -8348,10 +8348,13 @@ static enum ndr_err_code ndr_push_lsa_QueryTrustedDomainInfoBySid(struct ndr_pus
                NDR_CHECK(ndr_push_lsa_TrustDomInfoEnum(ndr, NDR_SCALARS, r->in.level));
        }
        if (flags & NDR_OUT) {
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.info));
-               if (r->out.info) {
-                       NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info, r->in.level));
-                       NDR_CHECK(ndr_push_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
+               if (r->out.info == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.info));
+               if (*r->out.info) {
+                       NDR_CHECK(ndr_push_set_switch_value(ndr, *r->out.info, r->in.level));
+                       NDR_CHECK(ndr_push_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
                }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
@@ -8364,6 +8367,7 @@ static enum ndr_err_code ndr_pull_lsa_QueryTrustedDomainInfoBySid(struct ndr_pul
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_dom_sid_0;
        TALLOC_CTX *_mem_save_info_0;
+       TALLOC_CTX *_mem_save_info_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -8382,21 +8386,29 @@ static enum ndr_err_code ndr_pull_lsa_QueryTrustedDomainInfoBySid(struct ndr_pul
                NDR_CHECK(ndr_pull_dom_sid2(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.dom_sid));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dom_sid_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_lsa_TrustDomInfoEnum(ndr, NDR_SCALARS, &r->in.level));
+               NDR_PULL_ALLOC(ndr, r->out.info);
+               ZERO_STRUCTP(r->out.info);
        }
        if (flags & NDR_OUT) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->out.info);
+               }
+               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->out.info, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
                if (_ptr_info) {
-                       NDR_PULL_ALLOC(ndr, r->out.info);
+                       NDR_PULL_ALLOC(ndr, *r->out.info);
                } else {
-                       r->out.info = NULL;
+                       *r->out.info = NULL;
                }
-               if (r->out.info) {
-                       _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->out.info, 0);
-                       NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.info, r->in.level));
-                       NDR_CHECK(ndr_pull_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, 0);
+               if (*r->out.info) {
+                       _mem_save_info_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.info, 0);
+                       NDR_CHECK(ndr_pull_set_switch_value(ndr, *r->out.info, r->in.level));
+                       NDR_CHECK(ndr_pull_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_1, 0);
                }
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -8428,11 +8440,14 @@ _PUBLIC_ void ndr_print_lsa_QueryTrustedDomainInfoBySid(struct ndr_print *ndr, c
                ndr->depth++;
                ndr_print_ptr(ndr, "info", r->out.info);
                ndr->depth++;
-               if (r->out.info) {
-                       ndr_print_set_switch_value(ndr, r->out.info, r->in.level);
-                       ndr_print_lsa_TrustedDomainInfo(ndr, "info", r->out.info);
+               ndr_print_ptr(ndr, "info", *r->out.info);
+               ndr->depth++;
+               if (*r->out.info) {
+                       ndr_print_set_switch_value(ndr, *r->out.info, r->in.level);
+                       ndr_print_lsa_TrustedDomainInfo(ndr, "info", *r->out.info);
                }
                ndr->depth--;
+               ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;
        }
@@ -9182,8 +9197,11 @@ static enum ndr_err_code ndr_push_lsa_QueryTrustedDomainInfoByName(struct ndr_pu
                if (r->out.info == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info, r->in.level));
-               NDR_CHECK(ndr_push_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.info));
+               if (*r->out.info) {
+                       NDR_CHECK(ndr_push_set_switch_value(ndr, *r->out.info, r->in.level));
+                       NDR_CHECK(ndr_push_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+               }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -9191,9 +9209,11 @@ static enum ndr_err_code ndr_push_lsa_QueryTrustedDomainInfoByName(struct ndr_pu
 
 static enum ndr_err_code ndr_pull_lsa_QueryTrustedDomainInfoByName(struct ndr_pull *ndr, int flags, struct lsa_QueryTrustedDomainInfoByName *r)
 {
+       uint32_t _ptr_info;
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_trusted_domain_0;
        TALLOC_CTX *_mem_save_info_0;
+       TALLOC_CTX *_mem_save_info_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -9221,8 +9241,19 @@ static enum ndr_err_code ndr_pull_lsa_QueryTrustedDomainInfoByName(struct ndr_pu
                }
                _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.info, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.info, r->in.level));
-               NDR_CHECK(ndr_pull_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
+               if (_ptr_info) {
+                       NDR_PULL_ALLOC(ndr, *r->out.info);
+               } else {
+                       *r->out.info = NULL;
+               }
+               if (*r->out.info) {
+                       _mem_save_info_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.info, 0);
+                       NDR_CHECK(ndr_pull_set_switch_value(ndr, *r->out.info, r->in.level));
+                       NDR_CHECK(ndr_pull_lsa_TrustedDomainInfo(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_1, 0);
+               }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
@@ -9255,8 +9286,13 @@ _PUBLIC_ void ndr_print_lsa_QueryTrustedDomainInfoByName(struct ndr_print *ndr,
                ndr->depth++;
                ndr_print_ptr(ndr, "info", r->out.info);
                ndr->depth++;
-               ndr_print_set_switch_value(ndr, r->out.info, r->in.level);
-               ndr_print_lsa_TrustedDomainInfo(ndr, "info", r->out.info);
+               ndr_print_ptr(ndr, "info", *r->out.info);
+               ndr->depth++;
+               if (*r->out.info) {
+                       ndr_print_set_switch_value(ndr, *r->out.info, r->in.level);
+                       ndr_print_lsa_TrustedDomainInfo(ndr, "info", *r->out.info);
+               }
+               ndr->depth--;
                ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;
@@ -9594,10 +9630,13 @@ static enum ndr_err_code ndr_push_lsa_QueryDomainInformationPolicy(struct ndr_pu
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.level));
        }
        if (flags & NDR_OUT) {
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.info));
-               if (r->out.info) {
-                       NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info, r->in.level));
-                       NDR_CHECK(ndr_push_lsa_DomainInformationPolicy(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
+               if (r->out.info == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.info));
+               if (*r->out.info) {
+                       NDR_CHECK(ndr_push_set_switch_value(ndr, *r->out.info, r->in.level));
+                       NDR_CHECK(ndr_push_lsa_DomainInformationPolicy(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
                }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
@@ -9609,6 +9648,7 @@ static enum ndr_err_code ndr_pull_lsa_QueryDomainInformationPolicy(struct ndr_pu
        uint32_t _ptr_info;
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_info_0;
+       TALLOC_CTX *_mem_save_info_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -9620,21 +9660,29 @@ static enum ndr_err_code ndr_pull_lsa_QueryDomainInformationPolicy(struct ndr_pu
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.level));
+               NDR_PULL_ALLOC(ndr, r->out.info);
+               ZERO_STRUCTP(r->out.info);
        }
        if (flags & NDR_OUT) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->out.info);
+               }
+               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->out.info, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
                if (_ptr_info) {
-                       NDR_PULL_ALLOC(ndr, r->out.info);
+                       NDR_PULL_ALLOC(ndr, *r->out.info);
                } else {
-                       r->out.info = NULL;
+                       *r->out.info = NULL;
                }
-               if (r->out.info) {
-                       _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->out.info, 0);
-                       NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.info, r->in.level));
-                       NDR_CHECK(ndr_pull_lsa_DomainInformationPolicy(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, 0);
+               if (*r->out.info) {
+                       _mem_save_info_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.info, 0);
+                       NDR_CHECK(ndr_pull_set_switch_value(ndr, *r->out.info, r->in.level));
+                       NDR_CHECK(ndr_pull_lsa_DomainInformationPolicy(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_1, 0);
                }
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -9662,11 +9710,14 @@ _PUBLIC_ void ndr_print_lsa_QueryDomainInformationPolicy(struct ndr_print *ndr,
                ndr->depth++;
                ndr_print_ptr(ndr, "info", r->out.info);
                ndr->depth++;
-               if (r->out.info) {
-                       ndr_print_set_switch_value(ndr, r->out.info, r->in.level);
-                       ndr_print_lsa_DomainInformationPolicy(ndr, "info", r->out.info);
+               ndr_print_ptr(ndr, "info", *r->out.info);
+               ndr->depth++;
+               if (*r->out.info) {
+                       ndr_print_set_switch_value(ndr, *r->out.info, r->in.level);
+                       ndr_print_lsa_DomainInformationPolicy(ndr, "info", *r->out.info);
                }
                ndr->depth--;
+               ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;
        }
index 1ce0448469039b47ac82e2a6e425aa18ebfda1b9..e38c5456f88fb7e622af0d79bc27e6d999763883 100644 (file)
@@ -3068,7 +3068,7 @@ static bool api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.info = talloc_zero(r, union lsa_TrustedDomainInfo);
+       r->out.info = talloc_zero(r, union lsa_TrustedDomainInfo *);
        if (r->out.info == NULL) {
                talloc_free(r);
                return false;
@@ -3749,7 +3749,7 @@ static bool api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.info = talloc_zero(r, union lsa_TrustedDomainInfo);
+       r->out.info = talloc_zero(r, union lsa_TrustedDomainInfo *);
        if (r->out.info == NULL) {
                talloc_free(r);
                return false;
@@ -4131,7 +4131,7 @@ static bool api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.info = talloc_zero(r, union lsa_DomainInformationPolicy);
+       r->out.info = talloc_zero(r, union lsa_DomainInformationPolicy *);
        if (r->out.info == NULL) {
                talloc_free(r);
                return false;