diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-20 10:07:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:48 -0500 |
| commit | 2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 (patch) | |
| tree | 52876d17edf8162d20c8da7c1761cd0fbb0e0db1 /source4/lib/cmdline | |
| parent | 238a7e2f4c46f5bb586bcef36f39e1bf6749c2c1 (diff) | |
| download | samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.gz samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.bz2 samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.zip | |
r8643: - make lp_configfile() work again
- get rid of redundeny dyn_CONFIGFILE argument to lp_load()
- fixed provisioning to work with completely pristine install,
creating an initial smb.conf is none is present
- added lp.set() and lp.reload() to loadparm ejs object interface
(This used to be commit c2691ef7126ddcee5f95970b78759b40a049d0a7)
Diffstat (limited to 'source4/lib/cmdline')
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index b7b7bdc286..e39c8e964d 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -52,7 +52,7 @@ static void popt_common_callback(poptContext con, if (reason == POPT_CALLBACK_REASON_POST) { /* Hook any 'every Samba program must do this, after * the smb.conf is setup' functions here */ - lp_load(dyn_CONFIGFILE); + lp_load(); load_interfaces(); return; } @@ -92,7 +92,7 @@ static void popt_common_callback(poptContext con, case 's': if (arg) { - pstrcpy(dyn_CONFIGFILE, arg); + lp_set_cmdline("config file", arg); } break; |