From: Ralph Boehme <slow@samba.org>
Date: Thu, 16 Mar 2017 09:36:14 +0000 (+0100)
Subject: winbindd: untangle reconnect_methods vs reconnect_ads_methods
X-Git-Tag: tdb-1.3.13~446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dbb5c3f6798cb6a3eff22faa89c39ab2705409d;p=thirdparty%2Fsamba.git

winbindd: untangle reconnect_methods vs reconnect_ads_methods

No change in behaviour. The previous logic just seemed a bit clumsy
because of the ifdefs.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index f0c19fbe2f7..0ef7c1632d8 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -162,8 +162,8 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 	   --jerry
 	 */
 
-	if (domain->backend == NULL) {
 #ifdef HAVE_ADS
+	if (domain->backend == NULL) {
 		struct winbindd_domain *our_domain = domain;
 
 		/* find our domain first so we can figure out if we 
@@ -177,13 +177,13 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 		    && !lp_winbind_rpc_only()) {
 			DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
 			domain->backend = &reconnect_ads_methods;
-		} else {
-#endif	/* HAVE_ADS */
-			DEBUG(5,("get_cache: Setting MS-RPC methods for domain %s\n", domain->name));
-			domain->backend = &reconnect_methods;
-#ifdef HAVE_ADS
 		}
+	}
 #endif	/* HAVE_ADS */
+
+	if (domain->backend == NULL) {
+		DEBUG(5,("get_cache: Setting MS-RPC methods for domain %s\n", domain->name));
+		domain->backend = &reconnect_methods;
 	}
 
 	if (ret)