summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-01-19 20:05:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:19 -0500
commitda35d24b68d070fa11e40a97d9fb6b488af69d64 (patch)
tree2b2c830d17abad7942b6bbd12da6b8bf70aabf3c
parente5fbc269de86cec328c2ea0e748d6bbf3a5f5133 (diff)
downloadsamba-da35d24b68d070fa11e40a97d9fb6b488af69d64.tar.gz
samba-da35d24b68d070fa11e40a97d9fb6b488af69d64.tar.bz2
samba-da35d24b68d070fa11e40a97d9fb6b488af69d64.zip
r20914: Sync up incorrect differences between 3.0.24 and 3.0
Jeremy. (This used to be commit a2222a565c658fe5154d9321edab69a95ddeed15)
-rw-r--r--source3/nsswitch/winbindd_cm.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 2f913081e8..cd9947d90e 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -434,10 +434,18 @@ 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);
+
+ /* The above *has* to succeed for winbindd to work. */
+ if (!domain->check_online_event) {
+ smb_panic("set_domain_online_request: failed to add online handler.\n");
+ }
}
- TALLOC_FREE(domain->check_online_event);
-
GetTimeOfDay(&tev);
/* Go into "startup" mode again. */
@@ -446,16 +454,7 @@ void set_domain_online_request(struct winbindd_domain *domain)
tev.tv_sec += 5;
- domain->check_online_event = event_add_timed(
- winbind_event_context(), NULL, tev,
- "check_domain_online_handler",
- check_domain_online_handler,
- domain);
-
- /* The above *has* to succeed for winbindd to work. */
- if (!domain->check_online_event) {
- smb_panic("set_domain_online_request: failed to add online handler.\n");
- }
+ set_event_dispatch_time(winbind_event_context(), "check_domain_online_handler", tev);
}
/****************************************************************