diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-21 12:20:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:53 -0500 |
| commit | 87e2396be99a1560d3f083e77e5fc6c583d3b9c1 (patch) | |
| tree | ffe9c849e36ed2eecbc383fb392f9f84d6631670 /source4 | |
| parent | a369f0ecaf35fb49652873c4c1ddcaf28629c26e (diff) | |
| download | samba-87e2396be99a1560d3f083e77e5fc6c583d3b9c1.tar.gz samba-87e2396be99a1560d3f083e77e5fc6c583d3b9c1.tar.bz2 samba-87e2396be99a1560d3f083e77e5fc6c583d3b9c1.zip | |
r8679: only call fault setup once (thanks to andrew for pointing this out)
(This used to be commit f8a2b032a70dd63f4454b982d00168dcf6793202)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index 53bb7b5a8c..4e808652f7 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/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; } |