svn commit: samba r24801 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2007-08-30 11:26:17 +0000 (Thu, 30 Aug 2007)
New Revision: 24801

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

Log:
When told to ignore the winbind cache also do so while trying to store entries.
Thanks Michael for pointing this out.

Guenther

Modified:
   branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c
   branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c


Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c	2007-08-30 10:32:22 UTC (rev 24800)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c	2007-08-30 11:26:17 UTC (rev 24801)
@@ -799,6 +799,10 @@
 	char *kstr;
 	TDB_DATA key, data;
 
+	if (opt_nocache) {
+		return;
+	}
+
 	va_start(ap, format);
 	smb_xvasprintf(&kstr, format, ap);
 	va_end(ap);

Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c	2007-08-30 10:32:22 UTC (rev 24800)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c	2007-08-30 11:26:17 UTC (rev 24801)
@@ -799,6 +799,10 @@
 	char *kstr;
 	TDB_DATA key, data;
 
+	if (opt_nocache) {
+		return;
+	}
+
 	va_start(ap, format);
 	smb_xvasprintf(&kstr, format, ap);
 	va_end(ap);