summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-07 10:06:44 +0100
committerGünther Deschner <gd@samba.org>2008-02-07 10:07:00 +0100
commit8fabdec776090b2bcf6a89ee852aecc367072408 (patch)
tree3b7638f0a4ea88b98ce68abe621b24da6d562a50
parent66865bf674b90cb68e8fa51ab27a50d181d7ca95 (diff)
downloadsamba-8fabdec776090b2bcf6a89ee852aecc367072408.tar.gz
samba-8fabdec776090b2bcf6a89ee852aecc367072408.tar.bz2
samba-8fabdec776090b2bcf6a89ee852aecc367072408.zip
Re-run make idl.
Guenther (This used to be commit 297ad1fe5d10ab67fae51f88df8f74d44db28b0a)
-rw-r--r--source3/librpc/gen_ndr/cli_samr.c4
-rw-r--r--source3/librpc/gen_ndr/cli_samr.h4
-rw-r--r--source3/librpc/gen_ndr/ndr_samr.c54
-rw-r--r--source3/librpc/gen_ndr/samr.h4
-rw-r--r--source3/librpc/gen_ndr/srv_samr.c4
5 files changed, 56 insertions, 14 deletions
diff --git a/source3/librpc/gen_ndr/cli_samr.c b/source3/librpc/gen_ndr/cli_samr.c
index 339f02b293..4bd4e5c146 100644
--- a/source3/librpc/gen_ndr/cli_samr.c
+++ b/source3/librpc/gen_ndr/cli_samr.c
@@ -2803,8 +2803,8 @@ NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
struct samr_CryptPassword *lm_password,
struct samr_Password *lm_verifier,
struct samr_CryptPassword *password3,
- struct samr_DomInfo1 *dominfo,
- struct samr_ChangeReject *reject)
+ struct samr_DomInfo1 **dominfo,
+ struct samr_ChangeReject **reject)
{
struct samr_ChangePasswordUser3 r;
NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_samr.h b/source3/librpc/gen_ndr/cli_samr.h
index 9a895789f0..0855adeba1 100644
--- a/source3/librpc/gen_ndr/cli_samr.h
+++ b/source3/librpc/gen_ndr/cli_samr.h
@@ -360,8 +360,8 @@ NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
struct samr_CryptPassword *lm_password,
struct samr_Password *lm_verifier,
struct samr_CryptPassword *password3,
- struct samr_DomInfo1 *dominfo,
- struct samr_ChangeReject *reject);
+ struct samr_DomInfo1 **dominfo,
+ struct samr_ChangeReject **reject);
NTSTATUS rpccli_samr_Connect5(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *system_name,
diff --git a/source3/librpc/gen_ndr/ndr_samr.c b/source3/librpc/gen_ndr/ndr_samr.c
index a5315153e8..a7c0f4deaa 100644
--- a/source3/librpc/gen_ndr/ndr_samr.c
+++ b/source3/librpc/gen_ndr/ndr_samr.c
@@ -11256,11 +11256,17 @@ static enum ndr_err_code ndr_push_samr_ChangePasswordUser3(struct ndr_push *ndr,
if (r->out.dominfo == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_samr_DomInfo1(ndr, NDR_SCALARS, r->out.dominfo));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.dominfo));
+ if (*r->out.dominfo) {
+ NDR_CHECK(ndr_push_samr_DomInfo1(ndr, NDR_SCALARS, *r->out.dominfo));
+ }
if (r->out.reject == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_samr_ChangeReject(ndr, NDR_SCALARS, r->out.reject));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.reject));
+ if (*r->out.reject) {
+ NDR_CHECK(ndr_push_samr_ChangeReject(ndr, NDR_SCALARS, *r->out.reject));
+ }
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
return NDR_ERR_SUCCESS;
@@ -11274,6 +11280,8 @@ static enum ndr_err_code ndr_pull_samr_ChangePasswordUser3(struct ndr_pull *ndr,
uint32_t _ptr_lm_password;
uint32_t _ptr_lm_verifier;
uint32_t _ptr_password3;
+ uint32_t _ptr_dominfo;
+ uint32_t _ptr_reject;
TALLOC_CTX *_mem_save_server_0;
TALLOC_CTX *_mem_save_account_0;
TALLOC_CTX *_mem_save_nt_password_0;
@@ -11282,7 +11290,9 @@ static enum ndr_err_code ndr_pull_samr_ChangePasswordUser3(struct ndr_pull *ndr,
TALLOC_CTX *_mem_save_lm_verifier_0;
TALLOC_CTX *_mem_save_password3_0;
TALLOC_CTX *_mem_save_dominfo_0;
+ TALLOC_CTX *_mem_save_dominfo_1;
TALLOC_CTX *_mem_save_reject_0;
+ TALLOC_CTX *_mem_save_reject_1;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -11377,14 +11387,36 @@ static enum ndr_err_code ndr_pull_samr_ChangePasswordUser3(struct ndr_pull *ndr,
}
_mem_save_dominfo_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.dominfo, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_samr_DomInfo1(ndr, NDR_SCALARS, r->out.dominfo));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dominfo));
+ if (_ptr_dominfo) {
+ NDR_PULL_ALLOC(ndr, *r->out.dominfo);
+ } else {
+ *r->out.dominfo = NULL;
+ }
+ if (*r->out.dominfo) {
+ _mem_save_dominfo_1 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, *r->out.dominfo, 0);
+ NDR_CHECK(ndr_pull_samr_DomInfo1(ndr, NDR_SCALARS, *r->out.dominfo));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dominfo_1, 0);
+ }
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dominfo_0, LIBNDR_FLAG_REF_ALLOC);
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.reject);
}
_mem_save_reject_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.reject, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_samr_ChangeReject(ndr, NDR_SCALARS, r->out.reject));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_reject));
+ if (_ptr_reject) {
+ NDR_PULL_ALLOC(ndr, *r->out.reject);
+ } else {
+ *r->out.reject = NULL;
+ }
+ if (*r->out.reject) {
+ _mem_save_reject_1 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, *r->out.reject, 0);
+ NDR_CHECK(ndr_pull_samr_ChangeReject(ndr, NDR_SCALARS, *r->out.reject));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_reject_1, 0);
+ }
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_reject_0, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
}
@@ -11449,11 +11481,21 @@ _PUBLIC_ void ndr_print_samr_ChangePasswordUser3(struct ndr_print *ndr, const ch
ndr->depth++;
ndr_print_ptr(ndr, "dominfo", r->out.dominfo);
ndr->depth++;
- ndr_print_samr_DomInfo1(ndr, "dominfo", r->out.dominfo);
+ ndr_print_ptr(ndr, "dominfo", *r->out.dominfo);
+ ndr->depth++;
+ if (*r->out.dominfo) {
+ ndr_print_samr_DomInfo1(ndr, "dominfo", *r->out.dominfo);
+ }
+ ndr->depth--;
ndr->depth--;
ndr_print_ptr(ndr, "reject", r->out.reject);
ndr->depth++;
- ndr_print_samr_ChangeReject(ndr, "reject", r->out.reject);
+ ndr_print_ptr(ndr, "reject", *r->out.reject);
+ ndr->depth++;
+ if (*r->out.reject) {
+ ndr_print_samr_ChangeReject(ndr, "reject", *r->out.reject);
+ }
+ ndr->depth--;
ndr->depth--;
ndr_print_NTSTATUS(ndr, "result", r->out.result);
ndr->depth--;
diff --git a/source3/librpc/gen_ndr/samr.h b/source3/librpc/gen_ndr/samr.h
index 64e1733705..0108396a22 100644
--- a/source3/librpc/gen_ndr/samr.h
+++ b/source3/librpc/gen_ndr/samr.h
@@ -1677,8 +1677,8 @@ struct samr_ChangePasswordUser3 {
} in;
struct {
- struct samr_DomInfo1 *dominfo;/* [ref] */
- struct samr_ChangeReject *reject;/* [ref] */
+ struct samr_DomInfo1 **dominfo;/* [ref] */
+ struct samr_ChangeReject **reject;/* [ref] */
NTSTATUS result;
} out;
diff --git a/source3/librpc/gen_ndr/srv_samr.c b/source3/librpc/gen_ndr/srv_samr.c
index 0d7b47cf33..470c45ca00 100644
--- a/source3/librpc/gen_ndr/srv_samr.c
+++ b/source3/librpc/gen_ndr/srv_samr.c
@@ -5024,13 +5024,13 @@ static bool api_samr_ChangePasswordUser3(pipes_struct *p)
}
ZERO_STRUCT(r->out);
- r->out.dominfo = talloc_zero(r, struct samr_DomInfo1);
+ r->out.dominfo = talloc_zero(r, struct samr_DomInfo1 *);
if (r->out.dominfo == NULL) {
talloc_free(r);
return false;
}
- r->out.reject = talloc_zero(r, struct samr_ChangeReject);
+ r->out.reject = talloc_zero(r, struct samr_ChangeReject *);
if (r->out.reject == NULL) {
talloc_free(r);
return false;