sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Revert "winbind: Remove wcache_lookup_usergroups"

Browse Source 
This reverts commit 876dc28b9c.

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

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2017-03-02 14:54:23 +01:00 committed by Ralph Boehme
parent 174b14b5aa
commit 52105ebaa8
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
source3/winbindd/winbindd_cache.c
View File

@ -2320,6 +2320,65 @@ NTSTATUS wcache_query_user_fullname(struct winbindd_domain *domain,
return NT_STATUS_OK;
}
NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
const struct dom_sid *user_sid,
uint32_t *pnum_sids,
struct dom_sid **psids)
{
struct winbind_cache *cache = get_cache(domain);
struct cache_entry *centry = NULL;
NTSTATUS status;
uint32_t i, num_sids;
struct dom_sid *sids;
fstring sid_string;
if (cache->tdb == NULL) {
return NT_STATUS_NOT_FOUND;
}
centry = wcache_fetch(cache, domain, "UG/%s",
sid_to_fstring(sid_string, user_sid));
if (centry == NULL) {
return NT_STATUS_NOT_FOUND;
}
/* If we have an access denied cache entry and a cached info3 in the
samlogon cache then do a query. This will force the rpc back end
to return the info3 data. */
if (NT_STATUS_EQUAL(domain->last_status, NT_STATUS_ACCESS_DENIED)
&& netsamlogon_cache_have(user_sid)) {
DEBUG(10, ("lookup_usergroups: cached access denied and have "
"cached info3\n"));
domain->last_status = NT_STATUS_OK;
centry_free(centry);
return NT_STATUS_NOT_FOUND;
}
num_sids = centry_uint32(centry);
sids = talloc_array(mem_ctx, struct dom_sid, num_sids);
if (sids == NULL) {
centry_free(centry);
return NT_STATUS_NO_MEMORY;
}
for (i=0; i<num_sids; i++) {
centry_sid(centry, &sids[i]);
}
status = centry->status;
DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s "
"status: %s\n", domain->name, nt_errstr(status)));
centry_free(centry);
*pnum_sids = num_sids;
*psids = sids;
return status;
}
static char *wcache_make_sidlist(TALLOC_CTX *mem_ctx, uint32_t num_sids,
const struct dom_sid *sids)
{

5
source3/winbindd/winbindd_proto.h
View File

@ -169,6 +169,11 @@ NTSTATUS wcache_lookup_useraliases(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
uint32_t num_sids, const struct dom_sid *sids,
uint32_t *pnum_aliases, uint32_t **paliases);
NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
const struct dom_sid *user_sid,
uint32_t *pnum_sids,
struct dom_sid **psids);
void wcache_flush_cache(void);
NTSTATUS wcache_count_cached_creds(struct winbindd_domain *domain, int *count);