[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-98-g410cb22

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  410cb22473a02705cc6f478d0f26d56b435ccd8e (commit)
       via  918133544b535d12761b5d6242e59eb7d21bae45 (commit)
      from  c860c4a688bb66dbe6916a365d340a94601ea416 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit 410cb22473a02705cc6f478d0f26d56b435ccd8e
Merge: c860c4a688bb66dbe6916a365d340a94601ea416 918133544b535d12761b5d6242e59eb7d21bae45
Author: Michael Adam <obnox at samba.org>
Date:   Fri Feb 6 17:03:18 2009 +0100

    Merge commit 'origin/v3-2-test' into v3-2-ctdb

commit 918133544b535d12761b5d6242e59eb7d21bae45
Author: Stefan Metzmacher <metze at samba.org>
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 <obnox at samba.org>

-----------------------------------------------------------------------

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 017384d..b913775 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-CTDB repository