The branch, v3-3-test has been updated via db811fbc3570f55b170567dbfd8882d270c10d83 (commit) from c863f8c767c9112a31da7b9f8a84c6c07bfb9d37 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log ----------------------------------------------------------------- commit db811fbc3570f55b170567dbfd8882d270c10d83 Author: Volker Lendecke <v...@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 <de...@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 efc9dab..14f7c0c 100644 --- a/source/winbindd/winbindd_rpc.c +++ b/source/winbindd/winbindd_rpc.c @@ -855,14 +855,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