From 335189792448a209f1f654c6173f359f17ae7fb1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 29 Mar 2011 14:30:24 +1100 Subject: s4-cmdline: moved loadparm init after fault setup Pair-Programmed-With: Andrew Bartlett --- source4/lib/cmdline/popt_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/lib/cmdline') 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; } -- cgit