diff options
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/wb_lookupsids.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/wb_next_grent.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/wb_next_pwent.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_samr.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c index b050bd0698..4da2629d10 100644 --- a/source3/winbindd/wb_lookupsids.c +++ b/source3/winbindd/wb_lookupsids.c @@ -185,7 +185,7 @@ static bool wb_lookupsids_next(struct tevent_req *req, d = &state->domains[state->domains_done]; - if (sid_check_is_domain(&d->sid)) { + if (sid_check_is_our_sam(&d->sid)) { state->rids.num_rids = d->sids.num_sids; state->rids.rids = talloc_array(state, uint32_t, state->rids.num_rids); diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c index 2b3799ab93..d3b0333358 100644 --- a/source3/winbindd/wb_next_grent.c +++ b/source3/winbindd/wb_next_grent.c @@ -62,7 +62,7 @@ struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx, } if ((state->gstate->domain != NULL) - && sid_check_is_domain(&state->gstate->domain->sid)) { + && sid_check_is_our_sam(&state->gstate->domain->sid)) { state->gstate->domain = state->gstate->domain->next; } @@ -125,7 +125,7 @@ static void wb_next_grent_fetch_done(struct tevent_req *subreq) state->gstate->domain = state->gstate->domain->next; if ((state->gstate->domain != NULL) - && sid_check_is_domain(&state->gstate->domain->sid)) { + && sid_check_is_our_sam(&state->gstate->domain->sid)) { state->gstate->domain = state->gstate->domain->next; } diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c index 28ae9b7075..785658d4be 100644 --- a/source3/winbindd/wb_next_pwent.c +++ b/source3/winbindd/wb_next_pwent.c @@ -40,7 +40,7 @@ static struct winbindd_domain *wb_next_find_domain(struct winbindd_domain *domai } if ((domain != NULL) - && sid_check_is_domain(&domain->sid)) { + && sid_check_is_our_sam(&domain->sid)) { domain = domain->next; } return domain; @@ -114,7 +114,7 @@ static void wb_next_pwent_fetch_done(struct tevent_req *subreq) state->gstate->domain = state->gstate->domain->next; if ((state->gstate->domain != NULL) - && sid_check_is_domain(&state->gstate->domain->sid)) { + && sid_check_is_our_sam(&state->gstate->domain->sid)) { state->gstate->domain = state->gstate->domain->next; } diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 315202d618..66de29e061 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -124,7 +124,7 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain) } if (strequal(domain->name, get_global_sam_name()) && - sid_check_is_domain(&domain->sid)) { + sid_check_is_our_sam(&domain->sid)) { domain->backend = &sam_passdb_methods; domain->initialized = True; } @@ -668,7 +668,7 @@ static struct cache_entry *wcache_fetch_raw(char *kstr) static bool is_my_own_sam_domain(struct winbindd_domain *domain) { if (strequal(domain->name, get_global_sam_name()) && - sid_check_is_domain(&domain->sid)) { + sid_check_is_our_sam(&domain->sid)) { return true; } diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 44ca77bc6c..f52e723451 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2159,7 +2159,7 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, char *machine_account = NULL; char *domain_name = NULL; - if (sid_check_is_domain(&domain->sid)) { + if (sid_check_is_our_sam(&domain->sid)) { return open_internal_samr_conn(mem_ctx, domain, cli, sam_handle); } diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c index 5994a354b5..10074d142e 100644 --- a/source3/winbindd/winbindd_samr.c +++ b/source3/winbindd/winbindd_samr.c @@ -761,7 +761,7 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain, /* Paranoia check */ if (!sid_check_is_builtin(domain_sid) && - !sid_check_is_domain(domain_sid) && + !sid_check_is_our_sam(domain_sid) && !sid_check_is_unix_users(domain_sid) && !sid_check_is_unix_groups(domain_sid) && !sid_check_is_in_wellknown_domain(domain_sid)) { diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 7dff138fc1..af17e5f7b3 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -77,7 +77,7 @@ static bool is_internal_domain(const struct dom_sid *sid) if (sid == NULL) return False; - return (sid_check_is_domain(sid) || sid_check_is_builtin(sid)); + return (sid_check_is_our_sam(sid) || sid_check_is_builtin(sid)); } static bool is_in_internal_domain(const struct dom_sid *sid) |