diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-01-14 12:21:43 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2009-01-20 00:41:20 +0100 |
commit | 26e863e6dd864d6466165adebce716f79bec73b6 (patch) | |
tree | 382a1114c8c99e4c707cce1498b582d04194d0b6 | |
parent | 8d203d3cabdea6b3b8903432bcbc889ad6358011 (diff) | |
download | samba-26e863e6dd864d6466165adebce716f79bec73b6.tar.gz samba-26e863e6dd864d6466165adebce716f79bec73b6.tar.bz2 samba-26e863e6dd864d6466165adebce716f79bec73b6.zip |
s3: reinit_after_fork() should reinit the event context before the messaging context
Because messaging_reinit() may add events to the event context, which will
removed by event_context_reinit().
metze
-rw-r--r-- | source3/lib/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 70eabbfa99..2485d1def5 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -966,6 +966,10 @@ bool reinit_after_fork(struct messaging_context *msg_ctx, return false; } + if (ev_ctx) { + event_context_reinit(ev_ctx); + } + if (msg_ctx) { /* * For clustering, we need to re-init our ctdbd connection after the @@ -979,10 +983,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx, } } - if (ev_ctx) { - event_context_reinit(ev_ctx); - } - return true; } |