diff options
| author | Jeremy Allison <jra@samba.org> | 2004-05-21 00:13:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:46 -0500 |
| commit | 74a81e6ba61ddc9a473b4c7c15fd7aae553b9b8b (patch) | |
| tree | 50b18dfef9529a4a84f437cbeedadd8a98e7e890 /source3 | |
| parent | 52ddd54083e5875c5ef7bd8e1cdd996289004982 (diff) | |
| download | samba-74a81e6ba61ddc9a473b4c7c15fd7aae553b9b8b.tar.gz samba-74a81e6ba61ddc9a473b4c7c15fd7aae553b9b8b.tar.bz2 samba-74a81e6ba61ddc9a473b4c7c15fd7aae553b9b8b.zip | |
r805: Fix to stop smbd hanging on missing group member from "Jianliang Lu" <j.lu@tiesse.com>.
Jeremy.
(This used to be commit d5fb5ba9df9fc0f9167e76402c59a971f52e1b1f)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index eca0913c1c..ea631d7c85 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3295,16 +3295,12 @@ static BOOL get_memberuids(gid_t gid, uid_t **uids, int *num) /* Secondary group members */ - gr = grp->gr_mem; - while ((*gr != NULL) && ((*gr)[0] != '\0')) { + for (gr = grp->gr_mem; (*gr != NULL) && ((*gr)[0] != '\0'); gr += 1) { struct passwd *pw = getpwnam(*gr); if (pw == NULL) continue; - add_uid_to_array_unique(pw->pw_uid, uids, num); - - gr += 1; } winbind_on(); |