The branch, v3-2-test has been updated
via 918133544b535d12761b5d6242e59eb7d21bae45 (commit)
from c86c2219b23fb2e5ce652dae18b0299d76dcb524 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 918133544b535d12761b5d6242e59eb7d21bae45
Author: Stefan Metzmacher <[email protected]>
Date: Mon Jan 19 16:26:00 2009 -0800
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
(cherry picked from commit 56af6112d67aa9dd3757297fbe29ce1a3eabf00d)
Signed-off-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source/lib/util.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util.c b/source/lib/util.c
index 1ed70fd..002c14a 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1052,6 +1052,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
@@ -1065,10 +1069,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
}
}
- if (ev_ctx) {
- event_context_reinit(ev_ctx);
- }
-
return true;
}
--
Samba Shared Repository
