s3-build: re-run make samba3-idl.

Guenther

diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index dc0a2dfa654d4fab707eea03ad98f2f350e08981..179bd0007f0b4c84f993d8f09c471df3af0a7a3b 100644 (file)
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -2022,7 +2022,7 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
                                    TALLOC_CTX *mem_ctx,
                                    struct policy_handle *user_handle /* [in] [ref] */,
                                    uint16_t level /* [in]  */,
-                                   union samr_UserInfo *info /* [out] [ref,switch_is(level)] */)
+                                   union samr_UserInfo **info /* [out] [ref,switch_is(level)] */)
 {
        struct samr_QueryUserInfo2 r;
        NTSTATUS status;
@@ -2921,8 +2921,8 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx,
                                      enum samr_ValidatePasswordLevel level /* [in]  */,
-                                     union samr_ValidatePasswordReq req /* [in] [switch_is(level)] */,
-                                     union samr_ValidatePasswordRep *rep /* [out] [ref,switch_is(level)] */)
+                                     union samr_ValidatePasswordReq *req /* [in] [ref,switch_is(level)] */,
+                                     union samr_ValidatePasswordRep **rep /* [out] [ref,switch_is(level)] */)
 {
        struct samr_ValidatePassword r;
        NTSTATUS status;

diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 4c7a30ef63fc9ba45dc626bebe16f119e1e5c052..7216d0cf3ded0b679925a92428272a3d56dcb86f 100644 (file)
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -255,7 +255,7 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
                                    TALLOC_CTX *mem_ctx,
                                    struct policy_handle *user_handle /* [in] [ref] */,
                                    uint16_t level /* [in]  */,
-                                   union samr_UserInfo *info /* [out] [ref,switch_is(level)] */);
+                                   union samr_UserInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx,
                                       struct policy_handle *domain_handle /* [in] [ref] */,
@@ -384,6 +384,6 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx,
                                      enum samr_ValidatePasswordLevel level /* [in]  */,
-                                     union samr_ValidatePasswordReq req /* [in] [switch_is(level)] */,
-                                     union samr_ValidatePasswordRep *rep /* [out] [ref,switch_is(level)] */);
+                                     union samr_ValidatePasswordReq *req /* [in] [ref,switch_is(level)] */,
+                                     union samr_ValidatePasswordRep **rep /* [out] [ref,switch_is(level)] */);
 #endif /* __CLI_SAMR__ */

diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index 8e45ebdd15f8a0b6d25feae7002c2cec9a70fb33..71fdf45ece1d5735ec453a898cdeffa9e9a9adb5 100644 (file)
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -9815,8 +9815,11 @@ static enum ndr_err_code ndr_push_samr_QueryUserInfo2(struct ndr_push *ndr, int
                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_samr_UserInfo(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_samr_UserInfo(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+               }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -9824,8 +9827,10 @@ static enum ndr_err_code ndr_push_samr_QueryUserInfo2(struct ndr_push *ndr, int
 
 static enum ndr_err_code ndr_pull_samr_QueryUserInfo2(struct ndr_pull *ndr, int flags, struct samr_QueryUserInfo2 *r)
 {
+       uint32_t _ptr_info;
        TALLOC_CTX *_mem_save_user_handle_0;
        TALLOC_CTX *_mem_save_info_0;
+       TALLOC_CTX *_mem_save_info_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -9846,8 +9851,19 @@ static enum ndr_err_code ndr_pull_samr_QueryUserInfo2(struct ndr_pull *ndr, int
                }
                _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_samr_UserInfo(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_samr_UserInfo(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));
        }
@@ -9876,8 +9892,13 @@ _PUBLIC_ void ndr_print_samr_QueryUserInfo2(struct ndr_print *ndr, const char *n
                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_samr_UserInfo(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_samr_UserInfo(ndr, "info", *r->out.info);
+               }
+               ndr->depth--;
                ndr->depth--;
                ndr_print_NTSTATUS(ndr, "result", r->out.result);
                ndr->depth--;
@@ -12049,15 +12070,21 @@ static enum ndr_err_code ndr_push_samr_ValidatePassword(struct ndr_push *ndr, in
 {
        if (flags & NDR_IN) {
                NDR_CHECK(ndr_push_samr_ValidatePasswordLevel(ndr, NDR_SCALARS, r->in.level));
-               NDR_CHECK(ndr_push_set_switch_value(ndr, &r->in.req, r->in.level));
-               NDR_CHECK(ndr_push_samr_ValidatePasswordReq(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
+               if (r->in.req == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.req, r->in.level));
+               NDR_CHECK(ndr_push_samr_ValidatePasswordReq(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.req));
        }
        if (flags & NDR_OUT) {
                if (r->out.rep == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.rep, r->in.level));
-               NDR_CHECK(ndr_push_samr_ValidatePasswordRep(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.rep));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.rep));
+               if (*r->out.rep) {
+                       NDR_CHECK(ndr_push_set_switch_value(ndr, *r->out.rep, r->in.level));
+                       NDR_CHECK(ndr_push_samr_ValidatePasswordRep(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.rep));
+               }
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -12065,13 +12092,22 @@ static enum ndr_err_code ndr_push_samr_ValidatePassword(struct ndr_push *ndr, in
 
 static enum ndr_err_code ndr_pull_samr_ValidatePassword(struct ndr_pull *ndr, int flags, struct samr_ValidatePassword *r)
 {
+       uint32_t _ptr_rep;
+       TALLOC_CTX *_mem_save_req_0;
        TALLOC_CTX *_mem_save_rep_0;
+       TALLOC_CTX *_mem_save_rep_1;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
                NDR_CHECK(ndr_pull_samr_ValidatePasswordLevel(ndr, NDR_SCALARS, &r->in.level));
-               NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->in.req, r->in.level));
-               NDR_CHECK(ndr_pull_samr_ValidatePasswordReq(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.req));
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->in.req);
+               }
+               _mem_save_req_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->in.req, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.req, r->in.level));
+               NDR_CHECK(ndr_pull_samr_ValidatePasswordReq(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.req));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_req_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_PULL_ALLOC(ndr, r->out.rep);
                ZERO_STRUCTP(r->out.rep);
        }
@@ -12081,8 +12117,19 @@ static enum ndr_err_code ndr_pull_samr_ValidatePassword(struct ndr_pull *ndr, in
                }
                _mem_save_rep_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->out.rep, LIBNDR_FLAG_REF_ALLOC);
-               NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.rep, r->in.level));
-               NDR_CHECK(ndr_pull_samr_ValidatePasswordRep(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.rep));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_rep));
+               if (_ptr_rep) {
+                       NDR_PULL_ALLOC(ndr, *r->out.rep);
+               } else {
+                       *r->out.rep = NULL;
+               }
+               if (*r->out.rep) {
+                       _mem_save_rep_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.rep, 0);
+                       NDR_CHECK(ndr_pull_set_switch_value(ndr, *r->out.rep, r->in.level));
+                       NDR_CHECK(ndr_pull_samr_ValidatePasswordRep(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.rep));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_rep_1, 0);
+               }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_rep_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
        }
@@ -12100,8 +12147,11 @@ _PUBLIC_ void ndr_print_samr_ValidatePassword(struct ndr_print *ndr, const char
                ndr_print_struct(ndr, "in", "samr_ValidatePassword");
                ndr->depth++;
                ndr_print_samr_ValidatePasswordLevel(ndr, "level", r->in.level);
-               ndr_print_set_switch_value(ndr, &r->in.req, r->in.level);
-               ndr_print_samr_ValidatePasswordReq(ndr, "req", &r->in.req);
+               ndr_print_ptr(ndr, "req", r->in.req);
+               ndr->depth++;
+               ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
+               ndr_print_samr_ValidatePasswordReq(ndr, "req", r->in.req);
+               ndr->depth--;
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
@@ -12109,8 +12159,13 @@ _PUBLIC_ void ndr_print_samr_ValidatePassword(struct ndr_print *ndr, const char
                ndr->depth++;
                ndr_print_ptr(ndr, "rep", r->out.rep);
                ndr->depth++;
-               ndr_print_set_switch_value(ndr, r->out.rep, r->in.level);
-               ndr_print_samr_ValidatePasswordRep(ndr, "rep", r->out.rep);
+               ndr_print_ptr(ndr, "rep", *r->out.rep);
+               ndr->depth++;
+               if (*r->out.rep) {
+                       ndr_print_set_switch_value(ndr, *r->out.rep, r->in.level);
+                       ndr_print_samr_ValidatePasswordRep(ndr, "rep", *r->out.rep);
+               }
+               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 e7baf6a59c1c19793b94509e6e2e49005f03c097..b925a0bf16093b46f09f55b16f40111818e5e804 100644 (file)
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -1465,7 +1465,7 @@ struct samr_QueryUserInfo2 {
        } in;
 
        struct {
-               union samr_UserInfo *info;/* [ref,switch_is(level)] */
+               union samr_UserInfo **info;/* [ref,switch_is(level)] */
                NTSTATUS result;
        } out;
 
@@ -1771,11 +1771,11 @@ struct samr_SetDsrmPassword {
 struct samr_ValidatePassword {
        struct {
                enum samr_ValidatePasswordLevel level;
-               union samr_ValidatePasswordReq req;/* [switch_is(level)] */
+               union samr_ValidatePasswordReq *req;/* [ref,switch_is(level)] */
        } in;
 
        struct {
-               union samr_ValidatePasswordRep *rep;/* [ref,switch_is(level)] */
+               union samr_ValidatePasswordRep **rep;/* [ref,switch_is(level)] */
                NTSTATUS result;
        } out;
 

diff --git a/source/librpc/gen_ndr/srv_samr.c b/source/librpc/gen_ndr/srv_samr.c
index 1eaa19eaf720d6a567f54e1d71f48d0df7355302..0024588e8dc8a9e0b88bb700bcdac507c99ff9d1 100644 (file)
--- a/source/librpc/gen_ndr/srv_samr.c
+++ b/source/librpc/gen_ndr/srv_samr.c
@@ -3750,7 +3750,7 @@ static bool api_samr_QueryUserInfo2(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.info = talloc_zero(r, union samr_UserInfo);
+       r->out.info = talloc_zero(r, union samr_UserInfo *);
        if (r->out.info == NULL) {
                talloc_free(r);
                return false;
@@ -5355,7 +5355,7 @@ static bool api_samr_ValidatePassword(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
-       r->out.rep = talloc_zero(r, union samr_ValidatePasswordRep);
+       r->out.rep = talloc_zero(r, union samr_ValidatePasswordRep *);
        if (r->out.rep == NULL) {
                talloc_free(r);
                return false;