From cce97a9b50e6c022cc9eba3d97969c27ae7d106d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 19 Jan 2007 21:29:46 +0000 Subject: [PATCH] r20915: Fixed the bad merge from 3.0.24. Jeremy. (This used to be commit 018d7805b5ecb17e21e1a55b6cc65efaab4b3f63) --- source3/nsswitch/winbindd_cm.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index cd9947d90e0..79c260a3082 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -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) { -- 2.11.4.GIT