diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-13 12:02:31 +0200 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-13 12:02:31 +0200 |
| commit | 9b3871ed293f76e770e572cd6b59f59670f1f6f8 (patch) | |
| tree | 2b79286e3a6f7af9e26466393a0b26075a238be8 /source4/smbd/process_prefork.c | |
| parent | 309473f938d18b9993c2c4f120eeff7b4641985a (diff) | |
| parent | ca847952054f5bbde1d40ad4260589b6fcc9721d (diff) | |
| download | samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.tar.gz samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.tar.bz2 samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/smbd/process_prefork.c')
| -rw-r--r-- | source4/smbd/process_prefork.c | 8 |
1 files changed, 7 insertions, 1 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, |