summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-01-19 21:29:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:19 -0500
commitcce97a9b50e6c022cc9eba3d97969c27ae7d106d (patch)
treeb4bf64edf4cbac7c263681e1fbccdf1f4003e73a
parentda35d24b68d070fa11e40a97d9fb6b488af69d64 (diff)
downloadsamba-cce97a9b50e6c022cc9eba3d97969c27ae7d106d.tar.gz
samba-cce97a9b50e6c022cc9eba3d97969c27ae7d106d.tar.bz2
samba-cce97a9b50e6c022cc9eba3d97969c27ae7d106d.zip
r20915: Fixed the bad merge from 3.0.24.
Jeremy. (This used to be commit 018d7805b5ecb17e21e1a55b6cc65efaab4b3f63)
-rw-r--r--source3/nsswitch/winbindd_cm.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index cd9947d90e..79c260a308 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) {