summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-29 14:30:24 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-29 06:17:03 +0200
commit335189792448a209f1f654c6173f359f17ae7fb1 (patch)
tree96a828b3b8972ac17d5a367533d8255e2621e4dc /source4
parent77cc1610e0b03e013ac478e8b9b874e73ac2e09a (diff)
downloadsamba-335189792448a209f1f654c6173f359f17ae7fb1.tar.gz
samba-335189792448a209f1f654c6173f359f17ae7fb1.tar.bz2
samba-335189792448a209f1f654c6173f359f17ae7fb1.zip
s4-cmdline: moved loadparm init after fault setup
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/cmdline/popt_common.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index afc874226e..16c6a1b81b 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -83,8 +83,6 @@ static void popt_samba_callback(poptContext con,
pname++;
if (reason == POPT_CALLBACK_REASON_PRE) {
- cmdline_lp_ctx = loadparm_init_global(false);
-
/* Hook for 'almost the first thing to do in a samba program' here */
/* setup for panics */
fault_setup();
@@ -94,6 +92,7 @@ static void popt_samba_callback(poptContext con,
talloc_set_log_fn(popt_s4_talloc_log_fn);
talloc_set_abort_fn(smb_panic);
+ cmdline_lp_ctx = loadparm_init_global(false);
return;
}