diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-12-04 06:46:53 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-12-04 06:46:53 +0000 |
| commit | 1d66a6beba888a1be33e4b48e2b0d2a51fdbcbc0 (patch) | |
| tree | a11faf18a9f3b7da45cb9e5b21eb341cf17bd0a8 /source3/nsswitch/winbindd_group.c | |
| parent | 1838d83e241ceaa73c61c53b50d5f7104b2f6143 (diff) | |
| download | samba-1d66a6beba888a1be33e4b48e2b0d2a51fdbcbc0.tar.gz samba-1d66a6beba888a1be33e4b48e2b0d2a51fdbcbc0.tar.bz2 samba-1d66a6beba888a1be33e4b48e2b0d2a51fdbcbc0.zip | |
moved lookup_usergroups() into the backend structure
(This used to be commit 689f45d2079d06b09947b2cdd314867df98c938d)
Diffstat (limited to 'source3/nsswitch/winbindd_group.c')
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index 07f30f0acc..9d29fee67c 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -918,7 +918,8 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state) DOM_SID user_sid; enum SID_NAME_USE name_type; uint32 user_rid, num_groups, num_gids; - DOM_GID *user_groups = NULL; + NTSTATUS status; + uint32 *user_gids; struct winbindd_domain *domain; enum winbindd_result result = WINBINDD_ERROR; gid_t *gid_list; @@ -967,9 +968,8 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state) sid_split_rid(&user_sid, &user_rid); - if (!winbindd_lookup_usergroups(domain, mem_ctx, user_rid, - &num_groups, &user_groups)) - goto done; + status = domain->methods->lookup_usergroups(domain, mem_ctx, user_rid, &num_groups, &user_gids); + if (!NT_STATUS_IS_OK(status)) goto done; /* Copy data back to client */ @@ -980,12 +980,8 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state) goto done; for (i = 0; i < num_groups; i++) { - if (!winbindd_idmap_get_gid_from_rid( - domain->name, user_groups[i].g_rid, - &gid_list[num_gids])) { - - DEBUG(1, ("unable to convert group rid %d to gid\n", - user_groups[i].g_rid)); + if (!winbindd_idmap_get_gid_from_rid(domain->name, user_gids[i], &gid_list[num_gids])) { + DEBUG(1, ("unable to convert group rid %d to gid\n", user_gids[i])); continue; } |