diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-26 22:07:50 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-03-26 22:07:50 +1100 |
| commit | 772839640e11664e1b1304d7f95146613d6ac1ac (patch) | |
| tree | d5e6474da4dc67cc5f4f6b830e6dfa1741171b38 /source3 | |
| parent | 789d67c4992e008fe17b830d3b23e3b95a4e70d9 (diff) | |
| download | samba-772839640e11664e1b1304d7f95146613d6ac1ac.tar.gz samba-772839640e11664e1b1304d7f95146613d6ac1ac.tar.bz2 samba-772839640e11664e1b1304d7f95146613d6ac1ac.zip | |
s3-event: switch s3 to using tevent_re_initialise()
This correctly initialises the event backend, and checks for errors
(thanks to Metze for suggesting this)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/event.h | 1 | ||||
| -rw-r--r-- | source3/lib/events.c | 6 | ||||
| -rw-r--r-- | source3/lib/util.c | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/event.h b/source3/include/event.h index 21c2eb5049..493bc15925 100644 --- a/source3/include/event.h +++ b/source3/include/event.h @@ -34,7 +34,6 @@ bool run_events(struct event_context *event_ctx, int selrtn, fd_set *read_fds, fd_set *write_fds); struct timeval *get_timed_events_timeout(struct event_context *event_ctx, struct timeval *to_ret); -void event_context_reinit(struct event_context *ev); void dump_event_list(struct event_context *event_ctx); struct tevent_context *s3_tevent_context_init(TALLOC_CTX *mem_ctx); diff --git a/source3/lib/events.c b/source3/lib/events.c index 651b25133b..21a13b63fb 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -192,12 +192,6 @@ static int s3_event_loop_once(struct tevent_context *ev, const char *location) return 0; } -void event_context_reinit(struct tevent_context *ev) -{ - tevent_common_context_destructor(ev); - return; -} - static int s3_event_context_init(struct tevent_context *ev) { return 0; diff --git a/source3/lib/util.c b/source3/lib/util.c index 68f26b8393..2339cfcc2a 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -931,8 +931,8 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx, goto done; } - if (ev_ctx) { - event_context_reinit(ev_ctx); + if (ev_ctx && tevent_re_initialise(ev_ctx) != 0) { + smb_panic(__location__ ": Failed to re-initialise event context"); } if (msg_ctx) { |