1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00

r20914: Sync up incorrect differences between 3.0.24 and 3.0

Jeremy.
(This used to be commit a2222a565c)
This commit is contained in:
Jeremy Allison 2007-01-19 20:05:02 +00:00 committed by Gerald (Jerry) Carter
parent e5fbc269de
commit da35d24b68

View File

@ -434,9 +434,17 @@ 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);
TALLOC_FREE(domain->check_online_event);
/* 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");
}
}
GetTimeOfDay(&tev);
@ -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);
}
/****************************************************************