r20915: Fixed the bad merge from 3.0.24.
authorJeremy Allison <jra@samba.org>
Fri, 19 Jan 2007 21:29:46 +0000 (21:29 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:17:19 +0000 (12:17 -0500)
Jeremy.

source/nsswitch/winbindd_cm.c

index cd9947d90e06563f7cf39abe2e9de443692a2e03..79c260a308252728ed8230e1e6375640b7160437 100644 (file)
@@ -328,7 +328,8 @@ void set_domain_offline(struct winbindd_domain *domain)
 
        calc_new_online_timeout_check(domain);
 
-       domain->check_online_event = event_add_timed(winbind_event_context(), NULL,
+       domain->check_online_event = event_add_timed(winbind_event_context(),
+                                               NULL,
                                                timeval_current_ofs(domain->check_online_timeout,0),
                                                "check_domain_online_handler",
                                                check_domain_online_handler,
@@ -434,11 +435,12 @@ void set_domain_online_request(struct winbindd_domain *domain)
                DEBUG(10,("set_domain_online_request: domain %s was globally offline.\n",
                        domain->name ));
 
-               domain->check_online_event = event_add_timed(
-                       winbind_event_context(), NULL, tev,
-                       "check_domain_online_handler",
-                       check_domain_online_handler,
-                       domain);
+               domain->check_online_event = event_add_timed(winbind_event_context(),
+                                                               NULL,
+                                                               timeval_current_ofs(5, 0),
+                                                               "check_domain_online_handler",
+                                                               check_domain_online_handler,
+                                                               domain);
 
                /* The above *has* to succeed for winbindd to work. */
                if (!domain->check_online_event) {