From c534eea8665a3b9341db967b7feb454177794d2a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sat, 8 Mar 2008 00:28:38 +0100 Subject: Re-run make idl. Guenther (This used to be commit 85007cf3f2e3df67c524cc67442396c114f6b784) --- source3/librpc/gen_ndr/cli_srvsvc.c | 8 ++--- source3/librpc/gen_ndr/cli_srvsvc.h | 4 +-- source3/librpc/gen_ndr/ndr_srvsvc.c | 58 +++++++++++++++++++++++++++---------- source3/librpc/gen_ndr/srv_srvsvc.c | 2 +- source3/librpc/gen_ndr/srvsvc.h | 4 +-- 5 files changed, 51 insertions(+), 25 deletions(-) (limited to 'source3/librpc') diff --git a/source3/librpc/gen_ndr/cli_srvsvc.c b/source3/librpc/gen_ndr/cli_srvsvc.c index 02c11aba37..2b61fb858e 100644 --- a/source3/librpc/gen_ndr/cli_srvsvc.c +++ b/source3/librpc/gen_ndr/cli_srvsvc.c @@ -2040,7 +2040,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli, const char *share, const char *file, uint32_t securityinformation, - struct sec_desc_buf *sd_buf, + struct sec_desc_buf **sd_buf, WERROR *werror) { struct srvsvc_NetGetFileSecurity r; @@ -2076,9 +2076,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli, } /* Return variables */ - if (sd_buf && r.out.sd_buf) { - *sd_buf = *r.out.sd_buf; - } + *sd_buf = *r.out.sd_buf; /* Return result */ if (werror) { @@ -2094,7 +2092,7 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli, const char *share, const char *file, uint32_t securityinformation, - struct sec_desc_buf sd_buf, + struct sec_desc_buf *sd_buf, WERROR *werror) { struct srvsvc_NetSetFileSecurity r; diff --git a/source3/librpc/gen_ndr/cli_srvsvc.h b/source3/librpc/gen_ndr/cli_srvsvc.h index d4acc92555..b8171a3d53 100644 --- a/source3/librpc/gen_ndr/cli_srvsvc.h +++ b/source3/librpc/gen_ndr/cli_srvsvc.h @@ -289,7 +289,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli, const char *share, const char *file, uint32_t securityinformation, - struct sec_desc_buf *sd_buf, + struct sec_desc_buf **sd_buf, WERROR *werror); NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, @@ -297,7 +297,7 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli, const char *share, const char *file, uint32_t securityinformation, - struct sec_desc_buf sd_buf, + struct sec_desc_buf *sd_buf, WERROR *werror); NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/source3/librpc/gen_ndr/ndr_srvsvc.c index 568d380385..8f577c6e8f 100644 --- a/source3/librpc/gen_ndr/ndr_srvsvc.c +++ b/source3/librpc/gen_ndr/ndr_srvsvc.c @@ -18257,9 +18257,12 @@ static enum ndr_err_code ndr_push_srvsvc_NetGetFileSecurity(struct ndr_push *ndr NDR_CHECK(ndr_push_security_secinfo(ndr, NDR_SCALARS, r->in.securityinformation)); } if (flags & NDR_OUT) { - NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.sd_buf)); - if (r->out.sd_buf) { - NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sd_buf)); + if (r->out.sd_buf == NULL) { + return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); + } + NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.sd_buf)); + if (*r->out.sd_buf) { + NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sd_buf)); } NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); } @@ -18274,6 +18277,7 @@ static enum ndr_err_code ndr_pull_srvsvc_NetGetFileSecurity(struct ndr_pull *ndr TALLOC_CTX *_mem_save_server_unc_0; TALLOC_CTX *_mem_save_share_0; TALLOC_CTX *_mem_save_sd_buf_0; + TALLOC_CTX *_mem_save_sd_buf_1; if (flags & NDR_IN) { ZERO_STRUCT(r->out); @@ -18321,20 +18325,28 @@ static enum ndr_err_code ndr_pull_srvsvc_NetGetFileSecurity(struct ndr_pull *ndr NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.file), sizeof(uint16_t))); NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.file, ndr_get_array_length(ndr, &r->in.file), sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_pull_security_secinfo(ndr, NDR_SCALARS, &r->in.securityinformation)); + NDR_PULL_ALLOC(ndr, r->out.sd_buf); + ZERO_STRUCTP(r->out.sd_buf); } if (flags & NDR_OUT) { + if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { + NDR_PULL_ALLOC(ndr, r->out.sd_buf); + } + _mem_save_sd_buf_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.sd_buf, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd_buf)); if (_ptr_sd_buf) { - NDR_PULL_ALLOC(ndr, r->out.sd_buf); + NDR_PULL_ALLOC(ndr, *r->out.sd_buf); } else { - r->out.sd_buf = NULL; + *r->out.sd_buf = NULL; } - if (r->out.sd_buf) { - _mem_save_sd_buf_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.sd_buf, 0); - NDR_CHECK(ndr_pull_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sd_buf)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sd_buf_0, 0); + if (*r->out.sd_buf) { + _mem_save_sd_buf_1 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, *r->out.sd_buf, 0); + NDR_CHECK(ndr_pull_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.sd_buf)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sd_buf_1, 0); } + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sd_buf_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); } return NDR_ERR_SUCCESS; @@ -18371,10 +18383,13 @@ _PUBLIC_ void ndr_print_srvsvc_NetGetFileSecurity(struct ndr_print *ndr, const c ndr->depth++; ndr_print_ptr(ndr, "sd_buf", r->out.sd_buf); ndr->depth++; - if (r->out.sd_buf) { - ndr_print_sec_desc_buf(ndr, "sd_buf", r->out.sd_buf); + ndr_print_ptr(ndr, "sd_buf", *r->out.sd_buf); + ndr->depth++; + if (*r->out.sd_buf) { + ndr_print_sec_desc_buf(ndr, "sd_buf", *r->out.sd_buf); } ndr->depth--; + ndr->depth--; ndr_print_WERROR(ndr, "result", r->out.result); ndr->depth--; } @@ -18403,7 +18418,10 @@ static enum ndr_err_code ndr_push_srvsvc_NetSetFileSecurity(struct ndr_push *ndr NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.file, CH_UTF16))); NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.file, ndr_charset_length(r->in.file, CH_UTF16), sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_push_security_secinfo(ndr, NDR_SCALARS, r->in.securityinformation)); - NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.sd_buf)); + if (r->in.sd_buf == NULL) { + return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); + } + NDR_CHECK(ndr_push_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.sd_buf)); } if (flags & NDR_OUT) { NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); @@ -18417,6 +18435,7 @@ static enum ndr_err_code ndr_pull_srvsvc_NetSetFileSecurity(struct ndr_pull *ndr uint32_t _ptr_share; TALLOC_CTX *_mem_save_server_unc_0; TALLOC_CTX *_mem_save_share_0; + TALLOC_CTX *_mem_save_sd_buf_0; if (flags & NDR_IN) { NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_server_unc)); if (_ptr_server_unc) { @@ -18462,7 +18481,13 @@ static enum ndr_err_code ndr_pull_srvsvc_NetSetFileSecurity(struct ndr_pull *ndr NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.file), sizeof(uint16_t))); NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.file, ndr_get_array_length(ndr, &r->in.file), sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_pull_security_secinfo(ndr, NDR_SCALARS, &r->in.securityinformation)); - NDR_CHECK(ndr_pull_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.sd_buf)); + if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { + NDR_PULL_ALLOC(ndr, r->in.sd_buf); + } + _mem_save_sd_buf_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->in.sd_buf, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_sec_desc_buf(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.sd_buf)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sd_buf_0, LIBNDR_FLAG_REF_ALLOC); } if (flags & NDR_OUT) { NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); @@ -18494,7 +18519,10 @@ _PUBLIC_ void ndr_print_srvsvc_NetSetFileSecurity(struct ndr_print *ndr, const c ndr->depth--; ndr_print_string(ndr, "file", r->in.file); ndr_print_security_secinfo(ndr, "securityinformation", r->in.securityinformation); - ndr_print_sec_desc_buf(ndr, "sd_buf", &r->in.sd_buf); + ndr_print_ptr(ndr, "sd_buf", r->in.sd_buf); + ndr->depth++; + ndr_print_sec_desc_buf(ndr, "sd_buf", r->in.sd_buf); + ndr->depth--; ndr->depth--; } if (flags & NDR_OUT) { diff --git a/source3/librpc/gen_ndr/srv_srvsvc.c b/source3/librpc/gen_ndr/srv_srvsvc.c index 13619d46e3..1bbf67995b 100644 --- a/source3/librpc/gen_ndr/srv_srvsvc.c +++ b/source3/librpc/gen_ndr/srv_srvsvc.c @@ -3067,7 +3067,7 @@ static bool api_srvsvc_NetGetFileSecurity(pipes_struct *p) } ZERO_STRUCT(r->out); - r->out.sd_buf = talloc_zero(r, struct sec_desc_buf); + r->out.sd_buf = talloc_zero(r, struct sec_desc_buf *); if (r->out.sd_buf == NULL) { talloc_free(r); return false; diff --git a/source3/librpc/gen_ndr/srvsvc.h b/source3/librpc/gen_ndr/srvsvc.h index 8b85736ee4..cf3f2372ae 100644 --- a/source3/librpc/gen_ndr/srvsvc.h +++ b/source3/librpc/gen_ndr/srvsvc.h @@ -1641,7 +1641,7 @@ struct srvsvc_NetGetFileSecurity { } in; struct { - struct sec_desc_buf *sd_buf;/* [unique] */ + struct sec_desc_buf **sd_buf;/* [ref] */ WERROR result; } out; @@ -1654,7 +1654,7 @@ struct srvsvc_NetSetFileSecurity { const char *share;/* [unique,charset(UTF16)] */ const char *file;/* [charset(UTF16)] */ uint32_t securityinformation; - struct sec_desc_buf sd_buf; + struct sec_desc_buf *sd_buf;/* [ref] */ } in; struct { -- cgit