[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  9d5ed16 s3:winbindd fix a return code check
      from  693533b s3: Add rmdir operation to streams_depot

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


- Log -----------------------------------------------------------------
commit 9d5ed16ddac1598918338a432e9effa8ab869300
Author: Christian Ambach <ambi at samba.org>
Date:   Wed Aug 24 16:21:37 2011 +0200

    s3:winbindd fix a return code check
    
    talloc_traverse_dict will return with -1 in case of an error and
    might return positive values that indicate the count of found
    entries
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Wed Aug 24 18:09:11 CEST 2011 on sn-devel-104
    
    Fix bug #8406 (winbind might not return groupnames to getgrgid nss calls).

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

Summary of changes:
 source3/winbindd/winbindd_group.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
index a985fa2..9cc1d14 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -115,7 +115,7 @@ NTSTATUS winbindd_print_groupmembers(struct talloc_dict *members,
 	c.len = 0;
 
 	res = talloc_dict_traverse(members, getgr_calc_memberlen, &c);
-	if (res != 0) {
+	if (res == -1) {
 		DEBUG(5, ("talloc_dict_traverse failed\n"));
 		return NT_STATUS_INTERNAL_ERROR;
 	}
@@ -128,7 +128,7 @@ NTSTATUS winbindd_print_groupmembers(struct talloc_dict *members,
 	}
 
 	res = talloc_dict_traverse(members, getgr_unparse_members, &m);
-	if (res != 0) {
+	if (res == -1) {
 		DEBUG(5, ("talloc_dict_traverse failed\n"));
 		TALLOC_FREE(m.buf);
 		return NT_STATUS_INTERNAL_ERROR;


-- 
Samba Shared Repository