[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4838-g56af611

Jeremy Allison jra at samba.org
Tue Jan 20 00:25:51 GMT 2009


The branch, v3-3-test has been updated
       via  56af6112d67aa9dd3757297fbe29ce1a3eabf00d (commit)
      from  acb1debf257c6c3df325267b2a4c8e2d40c1f850 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 56af6112d67aa9dd3757297fbe29ce1a3eabf00d
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

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

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 5ec6f26..0ea7bf6 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1055,6 +1055,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
@@ -1068,10 +1072,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
 		}
 	}
 
-	if (ev_ctx) {
-		event_context_reinit(ev_ctx);
-	}
-
 	return true;
 }
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list