The branch, v3-2-test has been updated
via e0eae3901750c7b76560bbab9a86f24a64d42c8b (commit)
via 83dc2e1477333480511b8948d4e3e8e90ff86e25 (commit)
via 7903103c70119d28b9d73cc340a1d85d04313b83 (commit)
via 18272d53859378b8832c098bcfafacf306e0eeca (commit)
via 7a822c3c71fde8e86bc99c28701517e0db076263 (commit)
from 02f5f35e5ed3b061cfd020d0b13014c72fced5f4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e0eae3901750c7b76560bbab9a86f24a64d42c8b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Apr 8 22:55:52 2008 +0200
Fix lsa_TrustedDomainInfo callers.
Guenther
commit 83dc2e1477333480511b8948d4e3e8e90ff86e25
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Apr 8 22:54:18 2008 +0200
Re-run make idl.
Guenther
commit 7903103c70119d28b9d73cc340a1d85d04313b83
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Apr 8 22:52:26 2008 +0200
Fix IDL for lsa_QueryTrustedDomainInfoBySid.
Guenther
commit 18272d53859378b8832c098bcfafacf306e0eeca
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Apr 8 22:51:55 2008 +0200
Fix IDL for lsa_QueryTrustedDomainInfoByName.
Guenther
commit 7a822c3c71fde8e86bc99c28701517e0db076263
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Apr 8 22:50:05 2008 +0200
Fix IDL for lsa_QueryDomainInformationPolicy.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_lsa.c | 14 ++---
source/librpc/gen_ndr/cli_lsa.h | 6 +-
source/librpc/gen_ndr/lsa.h | 6 +-
source/librpc/gen_ndr/ndr_lsa.c | 123 +++++++++++++++++++++++++++-----------
source/librpc/gen_ndr/srv_lsa.c | 6 +-
source/librpc/idl/lsa.idl | 12 ++--
source/rpcclient/cmd_lsarpc.c | 8 +-
source/utils/net_rpc.c | 10 +--
8 files changed, 114 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_lsa.c b/source/librpc/gen_ndr/cli_lsa.c
index 2b67305..475dd1e 100644
--- a/source/librpc/gen_ndr/cli_lsa.c
+++ b/source/librpc/gen_ndr/cli_lsa.c
@@ -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;
diff --git a/source/librpc/gen_ndr/cli_lsa.h b/source/librpc/gen_ndr/cli_lsa.h
index aa326cd..f4af6ed 100644
--- a/source/librpc/gen_ndr/cli_lsa.h
+++ b/source/librpc/gen_ndr/cli_lsa.h
@@ -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] */,
diff --git a/source/librpc/gen_ndr/lsa.h b/source/librpc/gen_ndr/lsa.h
index 7686bec..a9c8906 100644
--- a/source/librpc/gen_ndr/lsa.h
+++ b/source/librpc/gen_ndr/lsa.h
@@ -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;
diff --git a/source/librpc/gen_ndr/ndr_lsa.c b/source/librpc/gen_ndr/ndr_lsa.c
index 844face..070ac00 100644
--- a/source/librpc/gen_ndr/ndr_lsa.c
+++ b/source/librpc/gen_ndr/ndr_lsa.c
@@ -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--;
}
diff --git a/source/librpc/gen_ndr/srv_lsa.c b/source/librpc/gen_ndr/srv_lsa.c
index 1ce0448..e38c545 100644
--- a/source/librpc/gen_ndr/srv_lsa.c
+++ b/source/librpc/gen_ndr/srv_lsa.c
@@ -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;
diff --git a/source/librpc/idl/lsa.idl b/source/librpc/idl/lsa.idl
index a9f546e..531b754 100644
--- a/source/librpc/idl/lsa.idl
+++ b/source/librpc/idl/lsa.idl
@@ -745,9 +745,9 @@ import "security.idl";
/* Function: 0x27 */
NTSTATUS lsa_QueryTrustedDomainInfoBySid(
[in] policy_handle *handle,
- [in] dom_sid2 *dom_sid,
- [in] lsa_TrustDomInfoEnum level,
- [out,switch_is(level),unique] lsa_TrustedDomainInfo *info
+ [in,ref] dom_sid2 *dom_sid,
+ [in] lsa_TrustDomInfoEnum level,
+ [out,switch_is(level),ref] lsa_TrustedDomainInfo **info
);
/* Function: 0x28 */
@@ -803,7 +803,7 @@ import "security.idl";
[in] policy_handle *handle,
[in,ref] lsa_String *trusted_domain,
[in] lsa_TrustDomInfoEnum level,
- [out,ref,switch_is(level)] lsa_TrustedDomainInfo *info
+ [out,ref,switch_is(level)] lsa_TrustedDomainInfo **info
);
/**********************/
@@ -871,8 +871,8 @@ import "security.idl";
NTSTATUS lsa_QueryDomainInformationPolicy(
[in] policy_handle *handle,
- [in] uint16 level,
- [out,unique,switch_is(level)] lsa_DomainInformationPolicy
*info
+ [in] uint16 level,
+ [out,ref,switch_is(level)] lsa_DomainInformationPolicy
**info
);
/* Function 0x36 */
diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index 90f8646..245969c 100644
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -1001,7 +1001,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct
rpc_pipe_client *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
DOM_SID dom_sid;
uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
- union lsa_TrustedDomainInfo info;
+ union lsa_TrustedDomainInfo *info = NULL;
enum lsa_TrustDomInfoEnum info_class = 1;
if (argc > 3 || argc < 2) {
@@ -1028,7 +1028,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct
rpc_pipe_client *cli,
if (!NT_STATUS_IS_OK(result))
goto done;
- display_trust_dom_info(mem_ctx, &info, info_class, cli->pwd.password);
+ display_trust_dom_info(mem_ctx, info, info_class, cli->pwd.password);
done:
rpccli_lsa_Close(cli, mem_ctx, &pol);
@@ -1085,7 +1085,7 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct
rpc_pipe_client *cli,
POLICY_HND pol, trustdom_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
uint32 access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
- union lsa_TrustedDomainInfo info;
+ union lsa_TrustedDomainInfo *info = NULL;
DOM_SID dom_sid;
enum lsa_TrustDomInfoEnum info_class = 1;
@@ -1123,7 +1123,7 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct
rpc_pipe_client *cli,
if (!NT_STATUS_IS_OK(result))
goto done;
- display_trust_dom_info(mem_ctx, &info, info_class, cli->pwd.password);
+ display_trust_dom_info(mem_ctx, info, info_class, cli->pwd.password);
done:
rpccli_lsa_Close(cli, mem_ctx, &pol);
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 5abae7f..f3f187b 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -6128,7 +6128,7 @@ static NTSTATUS vampire_trusted_domain(struct
rpc_pipe_client *pipe_hnd,
const char *trusted_dom_name)
{
NTSTATUS nt_status;
- union lsa_TrustedDomainInfo info;
+ union lsa_TrustedDomainInfo *info = NULL;
char *cleartextpwd = NULL;
DATA_BLOB data;
@@ -6143,12 +6143,8 @@ static NTSTATUS vampire_trusted_domain(struct
rpc_pipe_client *pipe_hnd,
goto done;
}
- data = data_blob(NULL, info.password.password->length);
-
- memcpy(data.data,
- info.password.password->data,
- info.password.password->length);
- data.length = info.password.password->length;
+ data = data_blob(info->password.password->data,
+ info->password.password->length);
cleartextpwd = decrypt_trustdom_secret(pipe_hnd->cli->pwd.password,
&data);
--
Samba Shared Repository
