[SCM] Samba Shared Repository - branch master updated - 6fd867f036b0dfbc4d6639c737467132b41dd2e5

[Jeremy Allison]

The branch, master has been updated
       via  6fd867f036b0dfbc4d6639c737467132b41dd2e5 (commit)
      from  9361c73c2f4ce9a2f9a7e5515a9272ddd14eb2ed (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6fd867f036b0dfbc4d6639c737467132b41dd2e5
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 15 15:52:41 2009 -0800

    Allow reinit_after_fork to be called safely from within swat and other binaries that don't have
    an event context or a msg context. Fixes crash bug in swat.
    Jeremy.

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

Summary of changes:
 source3/lib/util.c |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 1e6ee56..70eabbf 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -966,18 +966,22 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
 		return false;
 	}
 
-	/*
-	 * For clustering, we need to re-init our ctdbd connection after the
-	 * fork
-	 */
-	status = messaging_reinit(msg_ctx);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("messaging_reinit() failed: %s\n",
-			 nt_errstr(status)));
-		return false;
+	if (msg_ctx) {
+		/*
+		 * For clustering, we need to re-init our ctdbd connection after the
+		 * fork
+		 */
+		status = messaging_reinit(msg_ctx);
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(0,("messaging_reinit() failed: %s\n",
+				 nt_errstr(status)));
+			return false;
+		}
 	}
 
-	event_context_reinit(ev_ctx);
+	if (ev_ctx) {
+		event_context_reinit(ev_ctx);
+	}
 
 	return true;
 }


-- 
Samba Shared Repository