diff options
author | Pavel Reichl <preichl@redhat.com> | 2014-07-21 08:06:23 +0100 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-07-22 09:40:08 +0200 |
commit | db18dda869bc6c52a41797b2066cf121cf10f49c (patch) | |
tree | 7bdfa5d0ee9ce1d135202e1f87d63f95aafe0c6b /src/providers/ad | |
parent | 9ca0071db0e226e4e65b2a80fdeddd5048ca8990 (diff) | |
download | sssd-db18dda869bc6c52a41797b2066cf121cf10f49c.tar.gz sssd-db18dda869bc6c52a41797b2066cf121cf10f49c.tar.xz sssd-db18dda869bc6c52a41797b2066cf121cf10f49c.zip |
UTIL: rename find_subdomain_by_name
The function was named "find_subdomain" yet it could find both main
domain and subdomain.
sed 's/find_subdomain_by_name/find_domain_by_name/' -i `find . -name "*.[ch]"`
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/providers/ad')
-rw-r--r-- | src/providers/ad/ad_access.c | 4 | ||||
-rw-r--r-- | src/providers/ad/ad_id.c | 2 | ||||
-rw-r--r-- | src/providers/ad/ad_subdomains.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/providers/ad/ad_access.c b/src/providers/ad/ad_access.c index 06ad47417..74077ec10 100644 --- a/src/providers/ad/ad_access.c +++ b/src/providers/ad/ad_access.c @@ -456,9 +456,9 @@ ad_access_handler(struct be_req *breq) /* Handle subdomains */ if (strcasecmp(pd->domain, be_ctx->domain->name) != 0) { - domain = find_subdomain_by_name(be_ctx->domain, pd->domain, true); + domain = find_domain_by_name(be_ctx->domain, pd->domain, true); if (domain == NULL) { - DEBUG(SSSDBG_OP_FAILURE, "find_subdomain_by_name failed.\n"); + DEBUG(SSSDBG_OP_FAILURE, "find_domain_by_name failed.\n"); be_req_terminate(breq, DP_ERR_FATAL, PAM_SYSTEM_ERR, NULL); return; } diff --git a/src/providers/ad/ad_id.c b/src/providers/ad/ad_id.c index 2e53a685f..ddb108370 100644 --- a/src/providers/ad/ad_id.c +++ b/src/providers/ad/ad_id.c @@ -360,7 +360,7 @@ ad_account_info_handler(struct be_req *be_req) dom = be_ctx->domain; if (strcasecmp(ar->domain, be_ctx->domain->name) != 0) { /* Subdomain request, verify subdomain */ - dom = find_subdomain_by_name(be_ctx->domain, ar->domain, true); + dom = find_domain_by_name(be_ctx->domain, ar->domain, true); } if (dom == NULL) { diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index efe4b3fe1..f7574d05d 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -799,8 +799,8 @@ static struct ad_id_ctx *ads_get_root_id_ctx(struct ad_subdomains_req_ctx *ctx) } /* With a subsequent run, the root should already be known */ - root = find_subdomain_by_name(ctx->sd_ctx->be_ctx->domain, - name, false); + root = find_domain_by_name(ctx->sd_ctx->be_ctx->domain, + name, false); if (root == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Could not find the root domain\n"); return NULL; |