r20146: Now online checks are fully async we can do them

every cache timeout times.
Jeremy.
(This used to be commit 5d364bc5ccc45b8d7bf3e484d16b37ac9e06b5cf)

diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 07360e85d5df73f8eab89beedae6cd394cc8e363..ea2c0b1eace8f4b6a63522b552ac6b8a12eb569c 100644 (file)
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -271,7 +271,7 @@ static void check_domain_online_handler(struct timed_event *te,
 }
 
 /****************************************************************
- If we're still offline, exponentially increase the timeout check.
+ If we're still offline setup the timeout check.
 ****************************************************************/
 
 static void calc_new_online_timeout_check(struct winbindd_domain *domain)
@@ -282,12 +282,6 @@ static void calc_new_online_timeout_check(struct winbindd_domain *domain)
                domain->check_online_timeout = 10;
        } else if (domain->check_online_timeout < wbc) {
                domain->check_online_timeout = wbc;
-       } else {
-               uint32 new_to = domain->check_online_timeout * 3;
-               if (new_to > (3*60*60)) {
-                       new_to = 3*60*60; /* 3 hours. */
-               }
-               domain->check_online_timeout = new_to;
        }
 }