From 62a1570f01053ec61e894ee3e58fc759ee809c6e Mon Sep 17 00:00:00 2001 From: Michal Židek Date: Tue, 14 Mar 2017 12:25:11 +0100 Subject: SUBDOMAINS: Allow options ad(_backup)_server Allow following options in the subdomain section: ad_server ad_backup_server Resolves: https://pagure.io/SSSD/sssd/issue/2599 Reviewed-by: Jakub Hrozek --- src/providers/ad/ad_subdomains.c | 7 ++++++- src/providers/ipa/ipa_subdomains_server.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index 6787abd59..156ecab42 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -156,6 +156,8 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, struct sdap_domain *sdom; errno_t ret; const char *realm; + const char *servers; + const char *backup_servers; const char *hostname; const char *keytab; char *subdom_conf_path; @@ -201,7 +203,10 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, return ENOMEM; } - ret = ad_failover_init(ad_options, be_ctx, NULL, NULL, realm, + servers = dp_opt_get_string(ad_options->basic, AD_SERVER); + backup_servers = dp_opt_get_string(ad_options->basic, AD_BACKUP_SERVER); + + ret = ad_failover_init(ad_options, be_ctx, servers, backup_servers, realm, service_name, gc_service_name, subdom->name, &ad_options->service); if (ret != EOK) { diff --git a/src/providers/ipa/ipa_subdomains_server.c b/src/providers/ipa/ipa_subdomains_server.c index cb270f50d..1af8676c5 100644 --- a/src/providers/ipa/ipa_subdomains_server.c +++ b/src/providers/ipa/ipa_subdomains_server.c @@ -223,6 +223,8 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, struct ad_srv_plugin_ctx *srv_ctx; const char *ad_domain; const char *ad_site_override; + const char *ad_servers; + const char *ad_backup_servers; struct sdap_domain *sdom; errno_t ret; const char *extra_attrs; @@ -279,9 +281,12 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, return ENOMEM; } + ad_servers = dp_opt_get_string(ad_options->basic, AD_SERVER); + ad_backup_servers = dp_opt_get_string(ad_options->basic, AD_BACKUP_SERVER); + /* Set KRB5 realm to same as the one of IPA when IPA * is able to attach PAC. For testing, use hardcoded. */ - ret = ad_failover_init(ad_options, be_ctx, NULL, NULL, + ret = ad_failover_init(ad_options, be_ctx, ad_servers, ad_backup_servers, id_ctx->server_mode->realm, service_name, gc_service_name, subdom->name, &ad_options->service); -- cgit