From f8a2b032a70dd63f4454b982d00168dcf6793202 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 21 Jul 2005 12:20:18 +0000
Subject: [PATCH] r8679: only call fault setup once (thanks to andrew for
 pointing this out)

---
 source/lib/cmdline/popt_common.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/lib/cmdline/popt_common.c b/source/lib/cmdline/popt_common.c
index 53bb7b5a8cf..4e808652f7b 100644
--- a/source/lib/cmdline/popt_common.c
+++ b/source/lib/cmdline/popt_common.c
@@ -49,9 +49,6 @@ static void popt_common_callback(poptContext con,
 {
 	const char *pname;
 
-	/* setup for panics */
-	fault_setup(poptGetInvocationName(con));
-	
 	if (reason == POPT_CALLBACK_REASON_POST) {
 		/* Hook any 'every Samba program must do this, after
 		 * the smb.conf is setup' functions here */
@@ -69,6 +66,10 @@ static void popt_common_callback(poptContext con,
 		pname++;
 
 	if (reason == POPT_CALLBACK_REASON_PRE) {
+		/* setup for panics */
+		fault_setup(poptGetInvocationName(con));
+
+		/* and logging */
 		setup_logging(pname, DEBUG_STDOUT);
 		return;
 	}