From b8d703cf3aba81800cf1b8ccca64bb00ef0b30f7 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Thu, 27 Jun 2013 17:07:36 +0200 Subject: Replace new_subdomain() with find_subdomain_by_name() new_subdomain() will create a new domain object and should not be used anymore in the priovder code directly. Instead a reference to the domain from the common domain object should be used. --- src/providers/ipa/ipa_hbac_common.c | 4 ++-- src/providers/ipa/ipa_subdomains_id.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/providers/ipa') diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index 2384ba68..0473a028 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -448,9 +448,9 @@ hbac_ctx_to_eval_request(TALLOC_CTX *mem_ctx, /* Get user the user name and groups, * take care of subdomain users as well */ if (strcasecmp(pd->domain, domain->name) != 0) { - user_dom = new_subdomain(tmp_ctx, domain, pd->domain, NULL, NULL, NULL); + user_dom = find_subdomain_by_name(domain, pd->domain, true); if (user_dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("new_subdomain failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, ("find_subdomain_by_name failed.\n")); ret = ENOMEM; goto done; } diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c index 7fa09bd9..dc822888 100644 --- a/src/providers/ipa/ipa_subdomains_id.c +++ b/src/providers/ipa/ipa_subdomains_id.c @@ -73,12 +73,10 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx, goto fail; } - state->domain = new_subdomain(state, state->ctx->be->domain, ar->domain, - NULL, - get_flat_name_from_subdomain_name(ctx->be,ar->domain), - NULL); + state->domain = find_subdomain_by_name(state->ctx->be->domain, + ar->domain, true); if (state->domain == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("new_subdomain failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, ("find_subdomain_by_name failed.\n")); ret = ENOMEM; goto fail; } -- cgit