From a3b502fa85d493795c963e4298aeec3dc5806fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Wed, 29 Jun 2016 14:58:37 +0200 Subject: [PATCH 095/102] failover: mark subdomain service with sd_ prefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Lukáš Slebodník Reviewed-by: Jakub Hrozek (cherry picked from commit 778f241e78241b0d6b8734148175f8dee804f494) --- src/providers/ad/ad_subdomains.c | 11 +++++++++-- src/providers/ipa/ipa_subdomains_server.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index e9da04e384e598927f9c8c203a751bcccd29e895..a0d5c2e544fc62fda64771dce59b3b7ab8ecd8b6 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -66,6 +66,7 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, struct ad_options *ad_options; struct ad_id_ctx *ad_id_ctx; const char *gc_service_name; + const char *service_name; struct ad_srv_plugin_ctx *srv_ctx; char *ad_domain; char *ad_site_override; @@ -94,14 +95,20 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, ad_site_override = dp_opt_get_string(ad_options->basic, AD_SITE); - gc_service_name = talloc_asprintf(ad_options, "%s%s", "gc_", subdom->name); + gc_service_name = talloc_asprintf(ad_options, "sd_gc_%s", subdom->name); if (gc_service_name == NULL) { talloc_free(ad_options); return ENOMEM; } + service_name = talloc_asprintf(ad_options, "sd_%s", subdom->name); + if (service_name == NULL) { + talloc_free(ad_options); + return ENOMEM; + } + ret = ad_failover_init(ad_options, be_ctx, NULL, NULL, realm, - subdom->name, gc_service_name, + service_name, gc_service_name, subdom->name, &ad_options->service); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD failover\n"); diff --git a/src/providers/ipa/ipa_subdomains_server.c b/src/providers/ipa/ipa_subdomains_server.c index 43636098f6928006db0e0a9c05f2e39f8427d705..13640b04d66a1cdbbf0c8eab7648f7ebe921884b 100644 --- a/src/providers/ipa/ipa_subdomains_server.c +++ b/src/providers/ipa/ipa_subdomains_server.c @@ -203,6 +203,7 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, struct ad_options *ad_options; struct ad_id_ctx *ad_id_ctx; const char *gc_service_name; + const char *service_name; struct ad_srv_plugin_ctx *srv_ctx; const char *ad_domain; const char *ad_site_override; @@ -250,17 +251,23 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, DEBUG(SSSDBG_TRACE_ALL, "No extra attrs set.\n"); } - gc_service_name = talloc_asprintf(ad_options, "%s%s", "gc_", subdom->forest); + gc_service_name = talloc_asprintf(ad_options, "sd_gc_%s", subdom->forest); if (gc_service_name == NULL) { talloc_free(ad_options); return ENOMEM; } + service_name = talloc_asprintf(ad_options, "sd_%s", subdom->name); + if (service_name == NULL) { + talloc_free(ad_options); + return ENOMEM; + } + /* 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, id_ctx->server_mode->realm, - subdom->name, gc_service_name, + service_name, gc_service_name, subdom->name, &ad_options->service); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD failover\n"); -- 2.4.11