diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-08 23:32:27 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:55 +0100 |
| commit | 5c6eacdb04cd18d96dc6313c2a6f934925967e79 (patch) | |
| tree | a594790ba614a4ee6ee473c63635657e602f03d4 /source4/lib/cmdline | |
| parent | 5991108c81afa820f811d8520c51d42e9ca0ec49 (diff) | |
| download | samba-5c6eacdb04cd18d96dc6313c2a6f934925967e79.tar.gz samba-5c6eacdb04cd18d96dc6313c2a6f934925967e79.tar.bz2 samba-5c6eacdb04cd18d96dc6313c2a6f934925967e79.zip | |
r26350: More tests.
(This used to be commit 87799f55d5d85bf9a15a9637143faa32183b181b)
Diffstat (limited to 'source4/lib/cmdline')
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 6 |
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 */ |