1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00

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>
This commit is contained in:
Ralph Boehme 2017-03-16 10:36:14 +01:00 committed by Jeremy Allison
parent b11c7f394e
commit 1dbb5c3f67

View File

@ -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)