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 /lib/param | |
| parent | cc6a77835bc286b2e570a05596b3b6acc54c1052 (diff) | |
| download | samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.gz samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.xz samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.zip | |
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 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index f7b2a4528e5..f9092c6b8e4 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -75,7 +75,6 @@ static bool defaults_saved = false; #define LOADPARM_EXTRA_GLOBALS \ struct parmlist_entry *param_opt; \ char *realm_original; \ - char *szConfigFile; \ int iminreceivefile; \ char *szPrintcapname; \ int CupsEncrypt; \ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 8dc6183e031..d108833aba1 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3271,7 +3271,7 @@ static struct parm_struct parm_table[] = { .label = "config file", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szConfigFile), + .offset = GLOBAL_VAR(next_configfile), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE|FLAG_META, |