svn commit: samba r8679 - in branches/SAMBA_4_0/source/lib/cmdline: .

[tridge at samba.org]

Author: tridge
Date: 2005-07-21 12:20:18 +0000 (Thu, 21 Jul 2005)
New Revision: 8679

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8679

Log:
only call fault setup once (thanks to andrew for pointing this out)



Modified:
   branches/SAMBA_4_0/source/lib/cmdline/popt_common.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2005-07-21 12:11:52 UTC (rev 8678)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2005-07-21 12:20:18 UTC (rev 8679)
@@ -49,9 +49,6 @@
 {
 	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 @@
 		pname++;
 
 	if (reason == POPT_CALLBACK_REASON_PRE) {
+		/* setup for panics */
+		fault_setup(poptGetInvocationName(con));
+
+		/* and logging */
 		setup_logging(pname, DEBUG_STDOUT);
 		return;
 	}