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

Guenther
(This used to be commit b1cd9d45e9581bec56bfdc21d2a8afb7f094be22)

diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c
index ef49dbfe74b7bb59a4c4db72b117d000fb787f16..37e3bb2f8cfec03786686da31cf8b834114a932f 100644 (file)
--- 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);