diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-05-15 13:35:22 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-06-14 21:47:23 +0200 |
| commit | de2bad8ae08f09964834bda0f88db9de39f47c5c (patch) | |
| tree | 473f93dec98af4ed37ccbcf25482d0c9e2f45811 /src/providers/ipa | |
| parent | 933314e53fac878d1a9b126af216454172cb945a (diff) | |
| download | sssd-de2bad8ae08f09964834bda0f88db9de39f47c5c.tar.gz sssd-de2bad8ae08f09964834bda0f88db9de39f47c5c.tar.xz sssd-de2bad8ae08f09964834bda0f88db9de39f47c5c.zip | |
IPA/AD: Set up AD domain in ad_create_2way_trust_options
Related:
https://fedorahosted.org/sssd/ticket/2638
Removed code duplication. Amends unit test to make sure we don't
regress.
Reviewed-by: Sumit Bose <sbose@redhat.com>
Diffstat (limited to 'src/providers/ipa')
| -rw-r--r-- | src/providers/ipa/ipa_subdomains_server.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/providers/ipa/ipa_subdomains_server.c b/src/providers/ipa/ipa_subdomains_server.c index f20160f4b..c2e6f567e 100644 --- a/src/providers/ipa/ipa_subdomains_server.c +++ b/src/providers/ipa/ipa_subdomains_server.c @@ -138,13 +138,17 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, struct ad_id_ctx *ad_id_ctx; const char *gc_service_name; struct ad_srv_plugin_ctx *srv_ctx; - char *ad_domain; + const char *ad_domain; const char *ad_site_override; struct sdap_domain *sdom; errno_t ret; const char *extra_attrs; + ad_domain = subdom->name; + DEBUG(SSSDBG_TRACE_LIBS, "Setting up AD subdomain %s\n", subdom->name); + ad_options = ad_create_2way_trust_options(id_ctx, id_ctx->server_mode->realm, + ad_domain, id_ctx->server_mode->hostname); if (ad_options == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD options\n"); @@ -152,15 +156,6 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, return ENOMEM; } - ad_domain = subdom->name; - - ret = dp_opt_set_string(ad_options->basic, AD_DOMAIN, ad_domain); - if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, "Cannot set AD domain\n"); - talloc_free(ad_options); - return ret; - } - ret = dp_opt_set_string(ad_options->basic, AD_KRB5_REALM, id_ctx->server_mode->realm); if (ret != EOK) { |