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>

8 files changed, 5 insertions, 9 deletions

diff --git a/docs-xml/smbdotconf/misc/configfile.xml b/docs-xml/smbdotconf/misc/configfile.xml
index 755a43dbd3..abbc80c656 100644
--- a/docs-xml/smbdotconf/misc/configfile.xml
+++ b/docs-xml/smbdotconf/misc/configfile.xml
@@ -2,7 +2,7 @@
                  context="G"
 				 type="string"
 		 hide="1"
-                 generated_function="0"
+                 function="next_configfile"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This allows you to override the config file 
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index f7b2a4528e..f9092c6b8e 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 8dc6183e03..d108833aba 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,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e3618dc1f9..315f0254b4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -987,7 +987,6 @@ NTSTATUS trust_pw_change(struct netlogon_creds_cli_context *context,
 
 #include "source3/param/param_proto.h"
 
-char *lp_configfile(TALLOC_CTX *ctx);
 char *lp_servicename(TALLOC_CTX *ctx, int);
 const char *lp_const_servicename(int);
 bool lp_autoloaded(int);
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index fd222c25c1..addb4167d6 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;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ac0a5dc2a9..c464861fff 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1204,8 +1204,6 @@ int lp_cups_encrypt(void)
 
 /* These functions remain in source3/param for now */
 
-FN_GLOBAL_STRING(configfile, szConfigFile)
-
 #include "lib/param/param_functions.c"
 
 FN_LOCAL_STRING(servicename, szService)
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 795f9f0495..e1e3f9acd0 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -142,7 +142,7 @@ bool reload_services(struct smbd_server_connection *sconn,
 	bool ret;
 
 	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);
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index a22c6b796d..cfb2f06e08 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -96,7 +96,7 @@ static bool reload_services_file(const char *lfile)
 	bool ret;
 
 	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);