diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-01-15 17:29:57 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:13 +1300 |
| commit | 0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c (patch) | |
| tree | 32fd04e3952881feaab0021cb0c289dd29190e6e /source3/nmbd | |
| parent | cc6a77835bc286b2e570a05596b3b6acc54c1052 (diff) | |
| download | samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.gz | |
param: No longer have a special case for lp_configfile
This parameter is renamed because it does not normally return the current smb.conf file, but
instead returns the next one, as found in a config file = directive, to be loaded.
This avoids a conflict with the lpcfg_configfile from lib/param, which does refer to the
current smb.conf path.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index fd222c25c16..addb4167d6a 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -396,7 +396,7 @@ static bool reload_nmbd_services(bool test) set_remote_machine_name("nmbd", False); if ( lp_loaded() ) { - char *fname = lp_configfile(talloc_tos()); + char *fname = lp_next_configfile(talloc_tos()); if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) { set_dyn_CONFIGFILE(fname); test = False; |