From: Günther Deschner <gd@samba.org>
Date: Tue, 8 Apr 2008 20:55:52 +0000 (+0200)
Subject: Fix lsa_TrustedDomainInfo callers.
X-Git-Tag: samba-3.3.0pre1~2849
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0eae3901750c7b76560bbab9a86f24a64d42c8b;p=thirdparty%2Fsamba.git

Fix lsa_TrustedDomainInfo callers.

Guenther
---

diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index 90f8646810e..245969c26d5 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 5abae7f0053..f3f187bf0b1 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);