summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-09-23 06:42:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:01:04 -0500
commit61761288e929fad9eabd547c9597140dafbabc54 (patch)
tree76e9c8e8a424cb6bdaf90bc06381994b635c2b4e
parentee139b6f1276461dc16c762152aaaa135f913a85 (diff)
downloadsamba-61761288e929fad9eabd547c9597140dafbabc54.tar.gz
samba-61761288e929fad9eabd547c9597140dafbabc54.tar.bz2
samba-61761288e929fad9eabd547c9597140dafbabc54.zip
r18842: Protect against "winbind cache time = 0" on two other occasions.
Guenther (This used to be commit b1cd9d45e9581bec56bfdc21d2a8afb7f094be22)
-rw-r--r--source3/nsswitch/winbindd_cred_cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c
index ef49dbfe74..37e3bb2f8c 100644
--- a/source3/nsswitch/winbindd_cred_cache.c
+++ b/source3/nsswitch/winbindd_cred_cache.c
@@ -221,7 +221,7 @@ static void krb5_ticket_gain_handler(struct timed_event *te,
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 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
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);