summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/cmdline/popt_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index aae22e00c3..2bbb59dbda 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -62,11 +62,11 @@ static void popt_samba_callback(poptContext con,
struct loadparm_context *lp_ctx = global_loadparm; /* FIXME: allow overriding */
if (reason == POPT_CALLBACK_REASON_POST) {
- if (!lp_loaded()) {
+ if (lp_ctx == NULL) {
if (getenv("SMB_CONF_PATH"))
- lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), NULL);
+ lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
else
- lp_load(talloc_autofree_context(), dyn_CONFIGFILE, NULL);
+ lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
}
/* Hook any 'every Samba program must do this, after
* the smb.conf is setup' functions here */