svn commit: samba r18841 - in branches/SAMBA_3_0/source/nsswitch: .

[gd at samba.org]

Author: gd
Date: 2006-09-23 06:36:22 +0000 (Sat, 23 Sep 2006)
New Revision: 18841

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

Log:
Protect against potential event loop when someone is using "winbind
cache time = 0".

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c	2006-09-23 04:36:30 UTC (rev 18840)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c	2006-09-23 06:36:22 UTC (rev 18841)
@@ -1,7 +1,7 @@
 /*
    Unix SMB/CIFS implementation.
 
-   Winbind daemon - krb5 credential cache funcions
+   Winbind daemon - krb5 credential cache functions
    and in-memory cache functions.
 
    Copyright (C) Guenther Deschner 2005-2006
@@ -136,7 +136,7 @@
 		 * seconds when the KDC was not available right now. */
 
 		if (ret == KRB5_KDC_UNREACH) {
-			new_start = time(NULL) + lp_winbind_cache_time();
+			new_start = time(NULL) + MAX(30, lp_winbind_cache_time());
 			goto done;
 		}