diff options
author | Günther Deschner <gd@samba.org> | 2006-09-23 06:36:22 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:01:04 -0500 |
commit | ee139b6f1276461dc16c762152aaaa135f913a85 (patch) | |
tree | 157591a172271f9f65341a987d156f27c60d8d41 /source3/nsswitch | |
parent | 387bfebfcf74e4b56b21a772b0e38b6cdb9dcf25 (diff) | |
download | samba-ee139b6f1276461dc16c762152aaaa135f913a85.tar.gz samba-ee139b6f1276461dc16c762152aaaa135f913a85.tar.bz2 samba-ee139b6f1276461dc16c762152aaaa135f913a85.zip |
r18841: Protect against potential event loop when someone is using "winbind
cache time = 0".
Guenther
(This used to be commit 9ac6016e32d236e7470919c075df551d1d73498c)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r-- | source3/nsswitch/winbindd_cred_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c index 420ed2426d..ef49dbfe74 100644 --- a/source3/nsswitch/winbindd_cred_cache.c +++ b/source3/nsswitch/winbindd_cred_cache.c @@ -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 @@ static void krb5_ticket_refresh_handler(struct timed_event *te, * 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; } |