summaryrefslogtreecommitdiff
path: root/source3/winbindd/winbindd_cache.c
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2017-03-16 17:51:29 +0100
committerJeremy Allison <jra@samba.org>2017-03-16 20:30:20 +0100
commiteab5292bccec3ff5ddf2df649183b6d37ed2d82e (patch)
treeb1872fff7f7a0279bd92a42ca9bf120bb8e28111 /source3/winbindd/winbindd_cache.c
parent63f65607ea2cb6fc50926efbc96a8781d968357b (diff)
downloadsamba-eab5292bccec3ff5ddf2df649183b6d37ed2d82e.tar.gz
winbindd: README.Coding fixes for get_cache()
Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/winbindd/winbindd_cache.c')
-rw-r--r--source3/winbindd/winbindd_cache.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index cad2843c5a3..f730f7597c4 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -135,11 +135,12 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
}
if (strequal(domain->name, get_global_sam_name()) &&
- sid_check_is_our_sam(&domain->sid)) {
+ sid_check_is_our_sam(&domain->sid))
+ {
domain->backend = &sam_passdb_methods;
}
- if ( !domain->initialized ) {
+ if (!domain->initialized) {
/* We do not need a connection to an RW DC for cache operation */
init_dc_connection(domain, false);
}
@@ -169,12 +170,14 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
/* find our domain first so we can figure out if we
are joined to a kerberized domain */
- if ( !domain->primary )
+ if (!domain->primary) {
our_domain = find_our_domain();
+ }
if ((our_domain->active_directory || IS_DC)
&& domain->active_directory
- && !lp_winbind_rpc_only()) {
+ && !lp_winbind_rpc_only())
+ {
DBG_INFO("Setting ADS methods for domain %s\n",
domain->name);
domain->backend = &reconnect_ads_methods;
@@ -187,8 +190,9 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
domain->backend = &reconnect_methods;
}
- if (ret)
+ if (ret != NULL) {
return ret;
+ }
ret = SMB_XMALLOC_P(struct winbind_cache);
ZERO_STRUCTP(ret);