summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
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()) {