[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2846-g26c05a5

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  26c05a52b73763dad5ad0525dab6e20014c3f8d6 (commit)
      from  1025f687910ce40283c7344ed67ebd5bf31217b7 (commit)

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


- Log -----------------------------------------------------------------
commit 26c05a52b73763dad5ad0525dab6e20014c3f8d6
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 15 00:14:27 2008 +0200

    Fix group parsing in libwbclient's copy_group_entry()
    
    This (also) fixes a flaw pointed out by the IBM checker. When verifying that I
    found out that the parsing was not working as I would have expected it to.
    
    Jerry, please check!
    (cherry picked from commit c2c7790155ab02e1e351caf2bed192ce72913663)

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

Summary of changes:
 source/nsswitch/libwbclient/wbc_pwd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/libwbclient/wbc_pwd.c b/source/nsswitch/libwbclient/wbc_pwd.c
index baee3c3..d23c378 100644
--- a/source/nsswitch/libwbclient/wbc_pwd.c
+++ b/source/nsswitch/libwbclient/wbc_pwd.c
@@ -97,11 +97,13 @@ static struct group *copy_group_entry(struct winbindd_gr *g,
 		grp->gr_mem[i] = talloc_strdup(grp, mem_p);
 		BAIL_ON_PTR_ERROR(grp->gr_mem[i], wbc_status);
 
-		*mem_q = ',';
-		mem_p++;
-		mem_p = mem_q;
+		if (mem_q == NULL) {
+			i += 1;
+			break;
+		}
+		mem_p = mem_q + 1;
 	}
-	grp->gr_mem[g->num_gr_mem] = NULL;
+	grp->gr_mem[i] = NULL;
 
 	wbc_status = WBC_ERR_SUCCESS;
 


-- 
Samba Shared Repository