[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2126-gc62c89c

[Günther Deschner]

The branch, v3-2-test has been updated
       via  c62c89c8f0d1ff8e384b88b3b192aa96f0b2183e (commit)
      from  90b07714ddb16ef87865cdf4f9c64c0372200e42 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit c62c89c8f0d1ff8e384b88b3b192aa96f0b2183e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 13 01:29:52 2008 +0100

    Fix the build of winbindd, sorry.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd_rpc.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index 326ff61..473d2a5 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -1009,8 +1009,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 
 	while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
 		uint32 start_idx;
-		char **tmp_names;
-		DOM_SID *tmp_sids;
 		int i;
 		struct lsa_DomainList dom_list;
 
@@ -1036,9 +1034,9 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 		    (*alt_names == NULL))
 			return NT_STATUS_NO_MEMORY;
 
-		for (i=0; i<num; i++) {
-			(*names)[start_idx+i] = dom_list.domains[i].name.string;
-			(*dom_sids)[start_idx+i] = dom_list.domains[i].sid;
+		for (i=0; i<dom_list.count; i++) {
+			(*names)[start_idx+i] = CONST_DISCARD(char *, 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, "");
 		}
 	}


-- 
Samba Shared Repository