sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3-winbindd: use wcache_query_user_fullname after inspecting samlogon cache.

Browse Source 
The reason for this followup query is that very often the samlogon cache only
contains a info3 netlogon user structure that has been retrieved during a
netlogon samlogon authentication using "network" logon level. With that logon
level only a few info3 fields are filled in; the user's fullname is never filled
in that case. This is problematic when the cache is used to fill in the user's
gecos field (for NSS queries). When we have retrieved the user's fullname during
other queries, reuse it from the other caches.

Thanks to Matt Rogers <mrogers@redhat.com>.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10440

Guenther

Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Günther Deschner 2014-07-07 17:16:32 +02:00
parent cf0ae511eb
commit 1839417bcc
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/winbindd/winbindd_ads.c
View File

@ -621,6 +621,14 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
TALLOC_FREE(user);
if (info->full_name == NULL) {
/* this might fail so we dont check the return code */
wcache_query_user_fullname(domain,
mem_ctx,
sid,
&info->full_name);
}
return NT_STATUS_OK;
}

8
source3/winbindd/winbindd_msrpc.c
View File

@ -439,6 +439,14 @@ static NTSTATUS msrpc_query_user(struct winbindd_domain *domain,
user_info->full_name = talloc_strdup(user_info,
user->base.full_name.string);
if (user_info->full_name == NULL) {
/* this might fail so we dont check the return code */
wcache_query_user_fullname(domain,
mem_ctx,
user_sid,
&user_info->full_name);
}
status = NT_STATUS_OK;
goto done;
}

41
source3/winbindd/winbindd_pam.c
View File

@ -1804,6 +1804,26 @@ process_result:
sid_compose(&user_sid, info3->base.domain_sid,
info3->base.rid);
if (info3->base.full_name.string == NULL) {
struct netr_SamInfo3 *cached_info3;
cached_info3 = netsamlogon_cache_get(state->mem_ctx,
&user_sid);
if (cached_info3 != NULL &&
cached_info3->base.full_name.string != NULL) {
info3->base.full_name.string =
talloc_strdup(info3,
cached_info3->base.full_name.string);
} else {
/* this might fail so we dont check the return code */
wcache_query_user_fullname(domain,
info3,
&user_sid,
&info3->base.full_name.string);
}
}
wcache_invalidate_samlogon(find_domain_from_name(name_domain),
&user_sid);
netsamlogon_cache_store(name_user, info3);
@ -1945,6 +1965,27 @@ process_result:
sid_compose(&user_sid, (*info3)->base.domain_sid,
(*info3)->base.rid);
if ((*info3)->base.full_name.string == NULL) {
struct netr_SamInfo3 *cached_info3;
cached_info3 = netsamlogon_cache_get(mem_ctx,
&user_sid);
if (cached_info3 != NULL &&
cached_info3->base.full_name.string != NULL) {
(*info3)->base.full_name.string =
talloc_strdup(*info3,
cached_info3->base.full_name.string);
} else {
/* this might fail so we dont check the return code */
wcache_query_user_fullname(domain,
*info3,
&user_sid,
&(*info3)->base.full_name.string);
}
}
wcache_invalidate_samlogon(find_domain_from_name(name_domain),
&user_sid);
netsamlogon_cache_store(name_user, *info3);