From b1caacb098ae99ad65144120fdec4d0fd98ad9d5 Mon Sep 17 00:00:00 2001
From: Pavel Březina <pbrezina@redhat.com>
Date: Mon, 17 Sep 2012 11:11:28 +0200
Subject: Failover: use _srv_ when no primary server is defined

https://fedorahosted.org/sssd/ticket/1521
---
 src/providers/ad/ad_common.c     | 15 +++------------
 src/providers/ipa/ipa_common.c   | 13 +++----------
 src/providers/krb5/krb5_common.c | 15 +++------------
 src/providers/ldap/ldap_common.c | 15 +++------------
 4 files changed, 12 insertions(+), 46 deletions(-)

(limited to 'src/providers')

diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c
index 2749a96e7..21a7b5346 100644
--- a/src/providers/ad/ad_common.c
+++ b/src/providers/ad/ad_common.c
@@ -280,18 +280,9 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx,
     }
 
     if (!primary_servers) {
-        if (backup_servers) {
-            DEBUG(SSSDBG_TRACE_FUNC,
-                  ("No primary servers defined but backup are present, "
-                   "setting backup servers as primary\n"));
-            primary_servers = backup_servers;
-            backup_servers = NULL;
-        } else {
-            DEBUG(SSSDBG_TRACE_FUNC,
-                  ("No primary or backup servers defined but backup are present, "
-                   "setting backup servers as primary\n"));
-            primary_servers = BE_SRV_IDENTIFIER;
-        }
+        DEBUG(SSSDBG_CONF_SETTINGS,
+              ("No primary servers defined, using service discovery\n"));
+        primary_servers = BE_SRV_IDENTIFIER;
     }
 
     ret = ad_servers_init(mem_ctx, bectx, primary_servers, options, true);
diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c
index fe7ac91cb..db736921e 100644
--- a/src/providers/ipa/ipa_common.c
+++ b/src/providers/ipa/ipa_common.c
@@ -932,16 +932,9 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx,
     }
 
     if (!primary_servers) {
-        if (backup_servers) {
-            DEBUG(SSSDBG_CONF_SETTINGS, ("Missing primary IPA server but "
-                                         "backup server given - using it as primary!\n"));
-            primary_servers = backup_servers;
-            backup_servers = NULL;
-        } else {
-            DEBUG(SSSDBG_CONF_SETTINGS, ("Missing primary and backup IPA "
-                                         "servers - using service discovery!\n"));
-            primary_servers = BE_SRV_IDENTIFIER;
-        }
+        DEBUG(SSSDBG_CONF_SETTINGS,
+              ("No primary servers defined, using service discovery\n"));
+        primary_servers = BE_SRV_IDENTIFIER;
     }
 
     ret = ipa_servers_init(ctx, service, options, primary_servers, true);
diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c
index 0e96b806c..006dac1ce 100644
--- a/src/providers/krb5/krb5_common.c
+++ b/src/providers/krb5/krb5_common.c
@@ -637,18 +637,9 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx,
     }
 
     if (!primary_servers) {
-        if (backup_servers) {
-            DEBUG(SSSDBG_TRACE_FUNC,
-                  ("No primary servers defined but backup are present, "
-                   "setting backup servers as primary\n"));
-            primary_servers = backup_servers;
-            backup_servers = NULL;
-        } else {
-            DEBUG(SSSDBG_TRACE_FUNC,
-                  ("No primary or backup servers defined, "
-                   "using service discovery\n"));
-            primary_servers = BE_SRV_IDENTIFIER;
-        }
+        DEBUG(SSSDBG_CONF_SETTINGS,
+              ("No primary servers defined, using service discovery\n"));
+        primary_servers = BE_SRV_IDENTIFIER;
     }
 
     ret = krb5_servers_init(ctx, service, service_name, primary_servers, true);
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index c11d036a1..f0095b546 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -1243,18 +1243,9 @@ int sdap_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx,
     }
 
     if (!urls) {
-        if (backup_urls) {
-            DEBUG(SSSDBG_CONF_SETTINGS, ("Missing primary LDAP URL but "
-                                         "backup URL given - using it "
-                                         "as primary!\n"));
-            urls = backup_urls;
-            backup_urls = NULL;
-        }
-        else {
-            DEBUG(SSSDBG_CONF_SETTINGS, ("Missing primary and backup LDAP "
-                                         "URLs - using service discovery!\n"));
-            urls = BE_SRV_IDENTIFIER;
-        }
+        DEBUG(SSSDBG_CONF_SETTINGS,
+              ("No primary servers defined, using service discovery\n"));
+        urls = BE_SRV_IDENTIFIER;
     }
 
     ret = sdap_urls_init(ctx, service, service_name, dns_service_name,
-- 
cgit