diff options
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_prefork.c | 8 | ||||
| -rw-r--r-- | source4/smbd/process_single.c | 2 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 6 | ||||
| -rw-r--r-- | source4/smbd/server.c | 3 |
4 files changed, 17 insertions, 2 deletions
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c index f890a528d5..721856bb46 100644 --- a/source4/smbd/process_prefork.c +++ b/source4/smbd/process_prefork.c @@ -114,6 +114,9 @@ static void prefork_new_task(struct tevent_context *ev, /* This is now the child code. We need a completely new event_context to work with */ ev2 = s4_event_context_init(NULL); + /* setup this as the default context */ + s4_event_context_set_default(ev2); + /* the service has given us a private pointer that encapsulates the context it needs for this new connection - everything else will be freed */ @@ -171,7 +174,10 @@ static void prefork_new_task(struct tevent_context *ev, /* But we need a events system to handle reaping children */ ev_parent = s4_event_context_init(NULL); - + + /* setup this as the default context */ + s4_event_context_set_default(ev_parent); + /* TODO: Handle some events... */ /* we can't return to the top level here, as that event context is gone, diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index ff57a0bc34..f873de47af 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -99,7 +99,7 @@ static void single_new_task(struct tevent_context *ev, /* called when a task goes down */ static void single_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *reason) { - DEBUG(2,("single_terminate: reason[%s]\n",reason)); + DEBUG(3,("single_terminate: reason[%s]\n",reason)); } /* called to set a title of a task or connection */ diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index ab5ad5760c..145cbc0a2b 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -108,6 +108,9 @@ static void standard_accept_connection(struct tevent_context *ev, /* This is now the child code. We need a completely new event_context to work with */ ev2 = s4_event_context_init(NULL); + /* setup this as the default context */ + s4_event_context_set_default(ev2); + /* the service has given us a private pointer that encapsulates the context it needs for this new connection - everything else will be freed */ @@ -179,6 +182,9 @@ static void standard_new_task(struct tevent_context *ev, /* This is now the child code. We need a completely new event_context to work with */ ev2 = s4_event_context_init(NULL); + /* setup this as the default context */ + s4_event_context_set_default(ev2); + /* the service has given us a private pointer that encapsulates the context it needs for this new connection - everything else will be freed */ diff --git a/source4/smbd/server.c b/source4/smbd/server.c index e73cdfd659..99e9c68a87 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -376,6 +376,9 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ should hang off that */ event_ctx = s4_event_context_init(talloc_autofree_context()); + /* setup this as the default context */ + s4_event_context_set_default(event_ctx); + if (event_ctx == NULL) { DEBUG(0,("Initializing event context failed\n")); return 1; |