From: Jeremy Allison <jra@samba.org>
Date: Thu, 15 Jan 2009 23:52:41 +0000 (-0800)
Subject: Allow reinit_after_fork to be called safely from within swat and other binaries that... 
X-Git-Tag: samba-4.0.0alpha6~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fd867f036b0dfbc4d6639c737467132b41dd2e5;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 1e6ee562302..70eabbfa99e 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;
 }