diff options
| author | Ralph Boehme <slow@samba.org> | 2017-03-16 10:36:14 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-03-16 20:30:20 +0100 |
| commit | 1dbb5c3f6798cb6a3eff22faa89c39ab2705409d (patch) | |
| tree | 97e1d14fc9bb56378fa8539219884ea803c4c642 /source3/winbindd/winbindd_cache.c | |
| parent | b11c7f394ea83da8dde48387312b77458376b08c (diff) | |
| download | samba-1dbb5c3f6798cb6a3eff22faa89c39ab2705409d.tar.gz | |
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>
Diffstat (limited to 'source3/winbindd/winbindd_cache.c')
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 12 |
1 files changed, 6 insertions, 6 deletions
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) |