summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-03-11 16:49:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:33 -0500
commit0d91334fe799f6b50a8265f9dc097411c3a29e18 (patch)
treec86395688b41edd01055a2a75ac0ba7f6113ad18 /source3/smbd
parent5214cb6782b1ac01b4b23d53478fa11ad00915fe (diff)
downloadsamba-0d91334fe799f6b50a8265f9dc097411c3a29e18.tar.gz
samba-0d91334fe799f6b50a8265f9dc097411c3a29e18.tar.bz2
samba-0d91334fe799f6b50a8265f9dc097411c3a29e18.zip
r21784: Replace smb_register_idle_event() with event_add_timed(). This fixes winbind
who did not run the idle events to drop ldap connections. Volker (This used to be commit af3308ce5a21220ff4c510de356dbaa6cf9ff997)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c3
-rw-r--r--source3/smbd/server.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index dbac553aea..11ef33679f 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1351,9 +1351,6 @@ static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_t
/* become root again if waiting */
change_to_root_user();
- /* run all registered idle events */
- smb_run_idle_events(t);
-
/* check if we need to reload services */
check_reload(t);
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ab32d656d3..0ae2f3e836 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1010,7 +1010,7 @@ extern void build_options(BOOL screen);
/* Initialise the password backed before the global_sam_sid
to ensure that we fetch from ldap before we make a domain sid up */
- if(!initialize_password_db(False))
+ if(!initialize_password_db(False, smbd_event_context()))
exit(1);
if (!secrets_init()) {