summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-08-08 17:34:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:35 -0500
commit7ade7f947b37b8da2f4f29d0981a7e6128ca66f4 (patch)
tree2351f5eb7ec965b8a11ab7f636158635f4e1407b
parent4d6d92400cab57c53e3a093f8e21711a11c04780 (diff)
downloadsamba-7ade7f947b37b8da2f4f29d0981a7e6128ca66f4.tar.gz
samba-7ade7f947b37b8da2f4f29d0981a7e6128ca66f4.tar.bz2
samba-7ade7f947b37b8da2f4f29d0981a7e6128ca66f4.zip
r17461: Ensure we never save a NULL SID mapping. || should be &&.
Found by Whitfield school. Jeremy. (This used to be commit f8584a475853bd8937fb0cf1b304c98f96fbd872)
-rw-r--r--source3/nsswitch/winbindd_cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 95a66420c5..42206de055 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -1241,7 +1241,7 @@ do_query:
status = domain->backend->name_to_sid(domain, mem_ctx, domain_name, name, sid, type);
/* and save it */
- if (domain->online || !is_null_sid(sid)) {
+ if (domain->online && !is_null_sid(sid)) {
wcache_save_name_to_sid(domain, status, domain_name, name, sid, *type);
}