sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r20915: Fixed the bad merge from 3.0.24.

Browse Source 
Jeremy.
(This used to be commit 018d7805b5ecb17e21e1a55b6cc65efaab4b3f63)
This commit is contained in:
Jeremy Allison 2007-01-19 21:29:46 +00:00 committed by Gerald (Jerry) Carter
parent da35d24b68
commit cce97a9b50
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/nsswitch/winbindd_cm.c
View 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) {