The branch, master has been updated
via b29c69f45953bf099f1d4f6e6abd5726f5ac793e (commit)
from e95d0b548e344dbc8cb3dd0a0f29854711bd0cac (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b29c69f45953bf099f1d4f6e6abd5726f5ac793e
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:
source3/winbindd/winbindd_rpc.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 0070bde..2c0222e 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -857,14 +857,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
