sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Use sid_array_from_info3 in lookup_usergroups_cached().

Browse Source 
Guenther
(This used to be commit 65b4cb20ea3fb806cfd50281e08f32bea70fafce)
This commit is contained in:
Günther Deschner 2008-04-04 02:53:40 +02:00
parent 69b23a39cd
commit bea4541e11
4 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/auth/auth_util.c
View File

@ -1620,7 +1620,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
nt_status = sid_array_from_info3(result, info3, nt_status = sid_array_from_info3(result, info3,
&result->sids, &result->sids,
&result->num_sids, &result->num_sids,
False); false, false);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
TALLOC_FREE(result); TALLOC_FREE(result);
return nt_status; return nt_status;

9
source3/lib/util_sid.c
View File

@ -668,7 +668,8 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
const struct netr_SamInfo3 *info3, const struct netr_SamInfo3 *info3,
DOM_SID **user_sids, DOM_SID **user_sids,
size_t *num_user_sids, size_t *num_user_sids,
bool include_user_group_rid) bool include_user_group_rid,
bool skip_ressource_groups)
{ {
NTSTATUS status; NTSTATUS status;
DOM_SID sid; DOM_SID sid;
@ -728,6 +729,12 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
*/ */
for (i = 0; i < info3->sidcount; i++) { for (i = 0; i < info3->sidcount; i++) {
if (skip_ressource_groups &&
(info3->sids[i].attributes & SE_GROUP_RESOURCE)) {
continue;
}
status = add_sid_to_array(mem_ctx, info3->sids[i].sid, status = add_sid_to_array(mem_ctx, info3->sids[i].sid,
&sid_array, &num_sids); &sid_array, &num_sids);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {

2
source3/winbindd/winbindd_pam.c
View File

@ -313,7 +313,7 @@ static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx,
status = sid_array_from_info3(mem_ctx, info3, status = sid_array_from_info3(mem_ctx, info3,
&token->user_sids, &token->user_sids,
&token->num_sids, &token->num_sids,
True); true, false);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
return status; return status;
} }

50
source3/winbindd/winbindd_util.c
View File

@ -1274,14 +1274,11 @@ NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
{ {
struct netr_SamInfo3 *info3 = NULL; struct netr_SamInfo3 *info3 = NULL;
NTSTATUS status = NT_STATUS_NO_MEMORY; NTSTATUS status = NT_STATUS_NO_MEMORY;
int i;
size_t num_groups = 0; size_t num_groups = 0;
DOM_SID group_sid, primary_group;
DEBUG(3,(": lookup_usergroups_cached\n")); DEBUG(3,(": lookup_usergroups_cached\n"));
*user_sids = NULL; *user_sids = NULL;
num_groups = 0;
*p_num_groups = 0; *p_num_groups = 0;
info3 = netsamlogon_cache_get(mem_ctx, user_sid); info3 = netsamlogon_cache_get(mem_ctx, user_sid);
@ -1294,46 +1291,19 @@ NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
TALLOC_FREE(info3); TALLOC_FREE(info3);
return NT_STATUS_UNSUCCESSFUL; return NT_STATUS_UNSUCCESSFUL;
} }
/* always add the primary group to the sid array */ /* Skip Domain local groups outside our domain.
sid_compose(&primary_group, info3->base.domain_sid, info3->base.rid); We'll get these from the getsidaliases() RPC call. */
status = sid_array_from_info3(mem_ctx, info3,
status = add_sid_to_array(mem_ctx, &primary_group, user_sids, user_sids,
&num_groups); &num_groups,
true, true);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3); TALLOC_FREE(info3);
return status; return status;
} }
for (i=0; i < info3->base.groups.count; i++) {
sid_copy(&group_sid, info3->base.domain_sid);
sid_append_rid(&group_sid, info3->base.groups.rids[i].rid);
status = add_sid_to_array(mem_ctx, &group_sid, user_sids,
&num_groups);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
return status;
}
}
/* Add any Universal groups in the other_sids list */
for (i=0; i < info3->sidcount; i++) {
/* Skip Domain local groups outside our domain.
We'll get these from the getsidaliases() RPC call. */
if (info3->sids[i].attributes & SE_GROUP_RESOURCE)
continue;
status = add_sid_to_array(mem_ctx, info3->sids[i].sid,
user_sids, &num_groups);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
return status;
}
}
TALLOC_FREE(info3); TALLOC_FREE(info3);
*p_num_groups = num_groups; *p_num_groups = num_groups;
status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY; status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;