1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00

r3776: Fix for bug from Johann Hanne <jhml@gmx.net>. Don't check

for no groups after every lookup - move check to the end as we should
only fail if all lookups fail.
Jeremy.
(This used to be commit 3b40c1e4365f37b967e14be02c6aa52893a80f51)
This commit is contained in:
Jeremy Allison 2004-11-15 23:03:37 +00:00 committed by Gerald (Jerry) Carter
parent b5eeca9f70
commit 1c20bb833c

@ -1089,9 +1089,6 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
add_gids_from_group_sid(&info3->other_sids[i].sid,
&gid_list, &num_gids);
if (gid_list == NULL)
goto done;
}
for (i = 0; i < info3->num_groups2; i++) {
@ -1103,9 +1100,6 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
add_gids_from_group_sid(&group_sid, &gid_list,
&num_gids);
if (gid_list == NULL)
goto done;
}
SAFE_FREE(info3);
@ -1123,12 +1117,13 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
for (i = 0; i < num_groups; i++) {
add_gids_from_group_sid(user_grpsids[i],
&gid_list, &num_gids);
if (gid_list == NULL)
goto done;
}
}
/* We want at least one group... */
if (gid_list == NULL)
goto done;
remove_duplicate_gids( &num_gids, gid_list );
/* Send data back to client */