From 9ca0071db0e226e4e65b2a80fdeddd5048ca8990 Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Mon, 21 Jul 2014 08:01:58 +0100 Subject: UTIL: rename find_subdomain_by_sid The function was named "find_subdomain" yet it could find both main domain and subdomain. sed 's/find_subdomain_by_sid/find_domain_by_sid/' -i `find . -name "*.[ch]"` Reviewed-by: Jakub Hrozek --- src/providers/ad/ad_id.c | 2 +- src/providers/ipa/ipa_idmap.c | 4 ++-- src/providers/ldap/sdap_async_users.c | 2 +- src/providers/simple/simple_access_check.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/providers') diff --git a/src/providers/ad/ad_id.c b/src/providers/ad/ad_id.c index 90d807b25..2e53a685f 100644 --- a/src/providers/ad/ad_id.c +++ b/src/providers/ad/ad_id.c @@ -299,7 +299,7 @@ static bool ad_account_can_shortcut(struct be_ctx *be_ctx, case BE_FILTER_SECID: csid = sid == NULL ? filter_value : sid; - req_dom = find_subdomain_by_sid(domain, csid); + req_dom = find_domain_by_sid(domain, csid); if (req_dom == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Invalid domain\n"); goto done; diff --git a/src/providers/ipa/ipa_idmap.c b/src/providers/ipa/ipa_idmap.c index ae202d616..7e4f985f3 100644 --- a/src/providers/ipa/ipa_idmap.c +++ b/src/providers/ipa/ipa_idmap.c @@ -71,10 +71,10 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, return EINVAL; } - dom = find_subdomain_by_sid(idmap_ctx->id_ctx->be->domain, dom_sid_str); + dom = find_domain_by_sid(idmap_ctx->id_ctx->be->domain, dom_sid_str); if (dom == NULL) { DEBUG(SSSDBG_OP_FAILURE, - "find_subdomain_by_sid failed with SID [%s].\n", dom_sid_str); + "find_domain_by_sid failed with SID [%s].\n", dom_sid_str); return EINVAL; } diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c index be0536ef3..2331ba9df 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -180,7 +180,7 @@ int sdap_save_user(TALLOC_CTX *memctx, /* If this object has a SID available, we will determine the correct * domain by its SID. */ if (sid_str != NULL) { - subdomain = find_subdomain_by_sid(get_domains_head(dom), sid_str); + subdomain = find_domain_by_sid(get_domains_head(dom), sid_str); if (subdomain) { dom = subdomain; } else { diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c index 4b4400f6d..1fcff445f 100644 --- a/src/providers/simple/simple_access_check.c +++ b/src/providers/simple/simple_access_check.c @@ -611,7 +611,7 @@ simple_check_process_group(struct simple_check_groups_state *state, /* We will look it up in main domain. */ domain = state->ctx->domain; } else { - domain = find_subdomain_by_sid(state->ctx->domain, group_sid); + domain = find_domain_by_sid(state->ctx->domain, group_sid); if (domain == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "There is no domain information for " "SID %s\n", group_sid); -- cgit