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

[gd at samba.org]

Author: gd
Date: 2006-09-23 06:42:28 +0000 (Sat, 23 Sep 2006)
New Revision: 18842

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

Log:
Protect against "winbind cache time = 0" on two other occasions.

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 06:36:22 UTC (rev 18841)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c	2006-09-23 06:42:28 UTC (rev 18842)
@@ -221,7 +221,7 @@
   retry_later:
 
 	entry->event = add_timed_event(entry,
-					timeval_current_ofs(lp_winbind_cache_time(), 0),
+					timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0),
 					"krb5_ticket_gain_handler",
 					krb5_ticket_gain_handler,
 					entry);
@@ -351,7 +351,7 @@
 	if (schedule_refresh_event && renew_until > 0) {
 		if (postponed_request) {
 			entry->event = add_timed_event(entry,
-						timeval_current_ofs(lp_winbind_cache_time(), 0),
+						timeval_current_ofs(MAX(30, lp_winbind_cache_time()), 0),
 						"krb5_ticket_gain_handler",
 						krb5_ticket_gain_handler,
 						entry);