sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

winbindd: avoid multiple wbint_LookupSids/lsa_LookupSids calls to the same domain

Browse Source 
find_lookup_domain_from_sid() returns the same domain for all non local
sids on a domain member. We should not chunk one wb_lookupsids_send/recv
into multiple wbint_LookupSids_send/recv to the same 'lookup' domain,
just because the requested SIDs don't all belong to the same domain.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sun Mar 12 00:56:14 CET 2017 on sn-devel-144
This commit is contained in:
Stefan Metzmacher 2017-03-10 16:53:53 +01:00 committed by Volker Lendecke
parent a860400725
commit 9eb46d587a
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source3/winbindd/wb_lookupsids.c
View File

@ -25,7 +25,6 @@
#include "passdb/machine_sid.h"
struct wb_lookupsids_domain {
struct dom_sid sid;
struct winbindd_domain *domain;
/*
@ -194,7 +193,12 @@ static bool wb_lookupsids_next(struct tevent_req *req,
d = &state->domains[state->domains_done];
if (sid_check_is_our_sam(&d->sid)) {
if (d->domain->internal) {
/*
* This is only our local SAM,
* see wb_lookupsids_bulk() and
* wb_lookupsids_get_domain().
*/
state->rids.num_rids = d->sids.num_sids;
state->rids.rids = talloc_array(state, uint32_t,
state->rids.num_rids);
@ -207,7 +211,7 @@ static bool wb_lookupsids_next(struct tevent_req *req,
}
subreq = dcerpc_wbint_LookupRids_send(
state, state->ev, dom_child_handle(d->domain),
&d->sid, &state->rids, &state->domain_name,
&d->domain->sid, &state->rids, &state->domain_name,
&state->rid_names);
if (tevent_req_nomem(subreq, req)) {
return false;
@ -322,17 +326,45 @@ static struct wb_lookupsids_domain *wb_lookupsids_get_domain(
domains = *pdomains;
num_domains = talloc_array_length(domains);
for (i=0; i<num_domains; i++) {
if (dom_sid_compare_domain(sid, &domains[i].sid) == 0) {
return &domains[i];
}
}
wb_domain = find_lookup_domain_from_sid(sid);
if (wb_domain == NULL) {
return NULL;
}
for (i=0; i<num_domains; i++) {
if (domains[i].domain != wb_domain) {
continue;
}
if (!domains[i].domain->internal) {
/*
* If it's not our local sam,
* we can re-use the domain without
* checking the sid.
*
* Note the wb_lookupsids_bulk() above
* already catched special SIDs,
* e.g. the unix and builtin domains.
*/
return &domains[i];
}
if (dom_sid_compare_domain(sid, &domains[i].domain->sid) == 0) {
/*
* If it's out local sam we can also use it.
*/
return &domains[i];
}
/*
* I'm not sure if this can be triggered,
* as wb_lookupsids_bulk() should also catch this,
* but we need to make sure that we don't use
* wbint_LookupRids() without a SID match.
*/
return NULL;
}
domains = talloc_realloc(
mem_ctx, domains, struct wb_lookupsids_domain, num_domains+1);
if (domains == NULL) {
@ -341,8 +373,6 @@ static struct wb_lookupsids_domain *wb_lookupsids_get_domain(
*pdomains = domains;
domain = &domains[num_domains];
sid_copy(&domain->sid, sid);
sid_split_rid(&domain->sid, NULL);
domain->domain = wb_domain;
domain->sids.sids = talloc_array(domains, struct lsa_SidPtr, num_sids);