From 0ba3d44f7321cb235eb214194395d5da02824690 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 13 Feb 2008 00:25:40 +0100
Subject: Use rpccli_lsa_EnumTrustDom all over the place.

Guenther
(This used to be commit a25e7ffbca9c2c97dd36b0596e7cb38a72aaf9d9)
---
 source3/winbindd/winbindd_rpc.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'source3/winbindd/winbindd_rpc.c')

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 2703f2f64a..326ff61122 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -1008,22 +1008,24 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 	result = STATUS_MORE_ENTRIES;
 
 	while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
-		uint32 start_idx, num;
+		uint32 start_idx;
 		char **tmp_names;
 		DOM_SID *tmp_sids;
 		int i;
+		struct lsa_DomainList dom_list;
 
-		result = rpccli_lsa_enum_trust_dom(cli, mem_ctx,
-						   &lsa_policy, &enum_ctx,
-						   &num, &tmp_names,
-						   &tmp_sids);
+		result = rpccli_lsa_EnumTrustDom(cli, mem_ctx,
+						 &lsa_policy,
+						 &enum_ctx,
+						 &dom_list,
+						 (uint32_t)-1);
 
 		if (!NT_STATUS_IS_OK(result) &&
 		    !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
 			break;
 
 		start_idx = *num_domains;
-		*num_domains += num;
+		*num_domains += dom_list.count;
 		*names = TALLOC_REALLOC_ARRAY(mem_ctx, *names,
 					      char *, *num_domains);
 		*dom_sids = TALLOC_REALLOC_ARRAY(mem_ctx, *dom_sids,
@@ -1035,8 +1037,8 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 			return NT_STATUS_NO_MEMORY;
 
 		for (i=0; i<num; i++) {
-			(*names)[start_idx+i] = tmp_names[i];
-			(*dom_sids)[start_idx+i] = tmp_sids[i];
+			(*names)[start_idx+i] = dom_list.domains[i].name.string;
+			(*dom_sids)[start_idx+i] = dom_list.domains[i].sid;
 			(*alt_names)[start_idx+i] = talloc_strdup(mem_ctx, "");
 		}
 	}
-- 
cgit