diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-04 00:12:13 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:01 +0100 |
| commit | b038240ac72fa34a132eb52bda28bbb80f82c29e (patch) | |
| tree | 8870bbb7b50ce698806bc0f2210204b98e38c19a /source4/lib/cmdline/popt_common.c | |
| parent | fc2f06d31b6b52c5cbd83f34a34e5107649a5134 (diff) | |
| download | samba-b038240ac72fa34a132eb52bda28bbb80f82c29e.tar.gz samba-b038240ac72fa34a132eb52bda28bbb80f82c29e.tar.bz2 samba-b038240ac72fa34a132eb52bda28bbb80f82c29e.zip | |
r26275: return loadparm context in lp_load.
(This used to be commit d01f0f4c2037b531b3fd088060717f90e60471e9)
Diffstat (limited to 'source4/lib/cmdline/popt_common.c')
| -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 1c96bf64cf..1eeb611256 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -52,9 +52,9 @@ static void popt_common_callback(poptContext con, if (reason == POPT_CALLBACK_REASON_POST) { if (!lp_loaded()) { if (getenv("SMB_CONF_PATH")) - lp_load(getenv("SMB_CONF_PATH")); + lp_load(getenv("SMB_CONF_PATH"), NULL); else - lp_load(dyn_CONFIGFILE); + lp_load(dyn_CONFIGFILE, NULL); } /* Hook any 'every Samba program must do this, after * the smb.conf is setup' functions here */ @@ -101,7 +101,7 @@ static void popt_common_callback(poptContext con, case 's': if (arg) { - lp_load(arg); + lp_load(arg, NULL); } break; |