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

Volker Lendecke vlendec at samba.org
Tue Mar 17 20:18:19 GMT 2009


The branch, v3-2-test has been updated
       via  e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b (commit)
      from  20d378eebfcaca53f456f0fbae39d46031729de7 (commit)

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


- Log -----------------------------------------------------------------
commit e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 16 13:17:04 2009 +0100

    Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members
    
    Thanks to François Legal <devel at thom.fr.eu.org> for reporting this bug

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

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


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index b03e035..f6a9c66 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -821,14 +821,15 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 		}
 
 		for (r=0; r<tmp_names.count; r++) {
-			(*names)[i+r] = fill_domain_username_talloc(mem_ctx,
-						domain->name,
-						tmp_names.names[r].string,
-						true);
-			(*name_types)[i+r] = tmp_types.ids[r];
+			if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
+				continue;
+			}
+			(*names)[total_names] = fill_domain_username_talloc(
+				mem_ctx, domain->name,
+				tmp_names.names[r].string, true);
+			(*name_types)[total_names] = tmp_types.ids[r];
+			total_names += 1;
 		}
-
-		total_names += tmp_names.count;
         }
 
         *num_names = total_names;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list