svn commit: samba r15228 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-04-25 08:24:50 +0000 (Tue, 25 Apr 2006)
New Revision: 15228

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15228

Log:
Fix -n winbind option which has become meaningless with the persistent
cache.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
   trunk/source/nsswitch/winbindd_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-04-25 08:03:34 UTC (rev 15227)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2006-04-25 08:24:50 UTC (rev 15228)
@@ -524,6 +524,12 @@
 	char *kstr;
 	struct cache_entry *centry;
 
+	extern BOOL opt_nocache;
+
+	if (opt_nocache) {
+		return NULL;
+	}
+
 	refresh_sequence_number(domain, False);
 
 	va_start(ap, format);

Modified: trunk/source/nsswitch/winbindd_cache.c
===================================================================
--- trunk/source/nsswitch/winbindd_cache.c	2006-04-25 08:03:34 UTC (rev 15227)
+++ trunk/source/nsswitch/winbindd_cache.c	2006-04-25 08:24:50 UTC (rev 15228)
@@ -524,6 +524,12 @@
 	char *kstr;
 	struct cache_entry *centry;
 
+	extern BOOL opt_nocache;
+
+	if (opt_nocache) {
+		return NULL;
+	}
+
 	refresh_sequence_number(domain, False);
 
 	va_start(ap, format);