Store some path names in global variables initialized to configure

default, rather than in preprocessor macros.
(This used to be commit 79ec88f0da40faebe1e587f1b3e87b5f2b184f58)

6 files changed, 8 insertions, 14 deletions

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index b70b445c08..5d48a1f0fa 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -547,7 +547,6 @@ static void usage(void)
 	int opt;
 	char *p;
 	int seed, server;
-	static pstring servicesf = CONFIGFILE;
 
 	setlinebuf(stdout);
 
@@ -570,7 +569,7 @@ static void usage(void)
 
 	TimeInit();
 
-	lp_load(servicesf,True,False,False);
+	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();
 
 	if (getenv("USER")) {
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 734c9c44bf..5be9e9c02c 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -535,7 +535,6 @@ static void usage(void)
 	int opt;
 	char *p;
 	int seed;
-	static pstring servicesf = CONFIGFILE;
 
 	setlinebuf(stdout);
 
@@ -561,7 +560,7 @@ static void usage(void)
 
 	TimeInit();
 
-	lp_load(servicesf,True,False,False);
+	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();
 
 	if (getenv("USER")) {
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 2ed15ca51d..e39caf46bd 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -422,7 +422,6 @@ static void usage(void)
 	int opt;
 	char *p;
 	int seed;
-	static pstring servicesf = CONFIGFILE;
 
 	setlinebuf(stdout);
 
@@ -444,7 +443,7 @@ static void usage(void)
 
 	TimeInit();
 
-	lp_load(servicesf,True,False,False);
+	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();
 
 	if (getenv("USER")) {
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index f08d722803..31bc1ee6e8 100644
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -40,13 +40,12 @@ void pong_message(int msg_type, pid_t src, void *buf, size_t len)
 {
 	pid_t pid;
 	int i, n;
-	static pstring servicesf = CONFIGFILE;
 	char buf[12];
 
 	TimeInit();
 	setup_logging(argv[0],True);
 	
-	lp_load(servicesf,False,False,False);
+	lp_load(dyn_CONFIGFILE,False,False,False);
 
 	message_init();
 
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c
index b61bfb639e..27693f5575 100644
--- a/source3/torture/rpctorture.c
+++ b/source3/torture/rpctorture.c
@@ -225,7 +225,6 @@ enum client_action
 	int opt;
 	extern char *optarg;
 	extern int optind;
-	static pstring servicesf = CONFIGFILE;
 	pstring term_code;
 	BOOL got_pass = False;
 	char *cmd_str="";
@@ -246,9 +245,9 @@ enum client_action
 	*term_code = 0;
 #endif /* KANJI */
 
-	if (!lp_load(servicesf,True, False, False))
+	if (!lp_load(dyn_CONFIGFILE,True, False, False))
 	{
-		fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
+		fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
 	}
 
 	DEBUGLEVEL = 0;
@@ -469,7 +468,7 @@ enum client_action
 
 			case 's':
 			{
-				pstrcpy(servicesf, optarg);
+				pstrcpy(dyn_CONFIGFILE, optarg);
 				break;
 			}
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index e92c933015..2696b19e88 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3081,7 +3081,6 @@ static void usage(void)
 	int gotpass = 0;
 	extern char *optarg;
 	extern int optind;
-	static pstring servicesf = CONFIGFILE;
 	BOOL correct = True;
 
 	dbf = x_stdout;
@@ -3090,7 +3089,7 @@ static void usage(void)
 	setbuffer(stdout, NULL, 0);
 #endif
 
-	lp_load(servicesf,True,False,False);
+	lp_load(dyn_CONFIGFILE,True,False,False);
 	load_interfaces();
 
 	if (argc < 2) {