From: Gerald Carter <jerry@samba.org>
Date: Sun, 6 May 2007 21:36:20 +0000 (+0000)
Subject: r22726: When performing an offline logon for a user in a trusted domain,
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~522
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0399f52a1cdbb1acf8d41afddf498529ff4923cf;p=thirdparty%2Fsamba.git

r22726: When performing an offline logon for a user in a trusted domain,
take care not to expire the name2sid cache entry just because
that child does not know that the primary domain is offline.
---

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index 5bb98b17da4..ed0d4131f61 100644
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -2448,6 +2448,7 @@ BOOL lookup_cached_name(TALLOC_CTX *mem_ctx,
 	struct cache_entry *centry = NULL;
 	NTSTATUS status;
 	fstring uname;
+	BOOL original_online_state;	
 
 	domain = find_lookup_domain_from_name(domain_name);
 	if (domain == NULL) {
@@ -2463,7 +2464,14 @@ BOOL lookup_cached_name(TALLOC_CTX *mem_ctx,
 	fstrcpy(uname, name);
 	strupper_m(uname);
 	
+	/* If we are doing a cached logon, temporarily set the domain
+	   offline so the cache won't expire the entry */
+	
+	original_online_state = domain->online;
+	domain->online = False;
 	centry = wcache_fetch(cache, domain, "NS/%s/%s", domain_name, uname);
+	domain->online = original_online_state;
+	
 	if (centry == NULL) {
 		return False;
 	}