Remove the char[1024] strings from dynconfig. Replace

them with malloc'ing accessor functions. Should save a
lot of static space :-).
Jeremy.
(This used to be commit 52dc5eaef2106015b3a8b659e818bdb15ad94b05)

16 files changed, 26 insertions, 24 deletions

diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 424cee8189..c699f96be7 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -169,7 +169,7 @@ int main( int argc, char *argv[] )
 
 	opt_debug = 0;		/* todo set this from getopts */
 
-	lp_load( dyn_CONFIGFILE, True, False, False, True);
+	lp_load(get_dyn_CONFIGFILE(), True, False, False, True);
 
 	exename = argv[0];
 
diff --git a/source3/utils/net.c b/source3/utils/net.c
index e8fb2c4987..8118ec4512 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -1067,7 +1067,7 @@ static struct functable net_func[] = {
 	 * set by cmdline arg or remain default (0)
 	 */
 	AllowDebugChange = False;
-	lp_load(dyn_CONFIGFILE,True,False,False,True);
+	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
 	
  	argv_new = (const char **)poptGetArgs(pc);
 
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 37a02200f5..141031dacb 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -943,7 +943,7 @@ static NTSTATUS check_ads_config( void )
 
 	if ( lp_security() == SEC_ADS && !*lp_realm()) {
 		d_fprintf(stderr, "realm must be set in in %s for ADS "
-			"join to succeed.\n", dyn_CONFIGFILE);
+			"join to succeed.\n", get_dyn_CONFIGFILE());
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -1494,7 +1494,7 @@ int net_ads_join(int argc, const char **argv)
 	if (strcmp(ads->config.realm, lp_realm()) != 0) {
 		d_fprintf(stderr, "realm of remote server (%s) and realm in %s "
 			"(%s) DO NOT match.  Aborting join\n",
-			ads->config.realm, dyn_CONFIGFILE, lp_realm());
+			ads->config.realm, get_dyn_CONFIGFILE(), lp_realm());
 		nt_status = NT_STATUS_INVALID_PARAMETER;
 		goto fail;
 	}
@@ -1571,11 +1571,11 @@ int net_ads_join(int argc, const char **argv)
 	/* Check the short name of the domain */
 
 	if ( !strequal(lp_workgroup(), short_domain_name) ) {
-		d_printf("The workgroup in %s does not match the short\n", dyn_CONFIGFILE);
+		d_printf("The workgroup in %s does not match the short\n", get_dyn_CONFIGFILE());
 		d_printf("domain name obtained from the server.\n");
 		d_printf("Using the name [%s] from the server.\n", short_domain_name);
 		d_printf("You should set \"workgroup = %s\" in %s.\n",
-			 short_domain_name, dyn_CONFIGFILE);
+			 short_domain_name, get_dyn_CONFIGFILE());
 	}
 
 	d_printf("Using short domain name -- %s\n", short_domain_name);
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index dd2dddb7a8..c04b628b1b 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -314,9 +314,9 @@ int main(int argc,char *argv[])
 		exit(1);
 	}
 
-	if (!lp_load(dyn_CONFIGFILE,True,False,False,True)) {
+	if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) {
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n",
-				dyn_CONFIGFILE);
+				get_dyn_CONFIGFILE());
 	}
 
 	load_interfaces();
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 9312503d33..7e2771c900 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -2243,9 +2243,9 @@ enum {
 	
 	/* Samba client initialisation */
 
-	if (!lp_load(dyn_CONFIGFILE, True, False, False, True)) {
+	if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) {
 		d_fprintf(stderr, "ntlm_auth: error opening config file %s. Error was %s\n",
-			dyn_CONFIGFILE, strerror(errno));
+			get_dyn_CONFIGFILE(), strerror(errno));
 		exit(1);
 	}
 
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index c72d98953d..7d23c67f0c 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -828,8 +828,8 @@ int main (int argc, char **argv)
 	if (user_name == NULL)
 		user_name = poptGetArg(pc);
 
-	if (!lp_load(dyn_CONFIGFILE,True,False,False,True)) {
-		fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
+	if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) {
+		fprintf(stderr, "Can't load %s - run testparm to debug it\n", get_dyn_CONFIGFILE());
 		exit(1);
 	}
 
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index cd2c78f8f3..3da406dd34 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -573,7 +573,7 @@ int main(int argc, const char *argv[])
 
 	load_case_tables();
 
-	lp_load( dyn_CONFIGFILE, False, False, False, True );
+	lp_load( get_dyn_CONFIGFILE(), False, False, False, True );
 
 	/* check for initializing secrets.tdb first */
 	
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index e5ba8e5d0b..f823ea3bfd 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -895,7 +895,7 @@ static struct cli_state *connect_one(const char *server, const char *share)
 
 	setlinebuf(stdout);
 
-	lp_load(dyn_CONFIGFILE,True,False,False,True);
+	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
 	load_interfaces();
 
 	pc = poptGetContext("smbcacls", argc, argv, long_options, 0);
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 835adca4bd..fe0c22911e 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1340,7 +1340,7 @@ int main(int argc, const char **argv)
 	if (argc <= 1)
 		usage(pc);
 
-	lp_load(dyn_CONFIGFILE,False,False,False,True);
+	lp_load(get_dyn_CONFIGFILE(),False,False,False,True);
 
 	/* Need to invert sense of return code -- samba
          * routines mostly return True==1 for success, but
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 34a547d404..08a3cc1806 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -448,7 +448,7 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
 
 	fault_setup(NULL);
 
-	lp_load(dyn_CONFIGFILE,True,False,False,True);
+	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
 	load_interfaces();
 
 	pc = poptGetContext("smbcquotas", argc, argv, long_options, 0);
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 89a38d5b40..912d575c60 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
 
 	setup_logging(argv[0],True);
 
-	configfile = dyn_CONFIGFILE;
+	configfile = get_dyn_CONFIGFILE();
 
 	if (argc < 2) {
 		fprintf(stderr,"smbfilter <desthost> <netbiosname>\n");
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index fc5933cc1a..ea3bb38dc4 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -83,7 +83,7 @@ static void set_line_buffering(FILE *f)
 static int process_options(int argc, char **argv, int local_flags)
 {
 	int ch;
-	const char *configfile = dyn_CONFIGFILE;
+	const char *configfile = get_dyn_CONFIGFILE();
 
 	local_flags |= LOCAL_SET_PASSWORD;
 
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index cf880498c1..572f3dca83 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -291,7 +291,7 @@ static bool print_tree(struct user_auth_info *user_info)
 	while(poptGetNextOpt(pc) != -1);
 	poptFreeContext(pc);
 
-	lp_load(dyn_CONFIGFILE,True,False,False,True);
+	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
 	load_interfaces();
 
 	/* Parse command line args */
diff --git a/source3/utils/smbw_sample.c b/source3/utils/smbw_sample.c
index ba78eb22fc..eface2fc46 100644
--- a/source3/utils/smbw_sample.c
+++ b/source3/utils/smbw_sample.c
@@ -32,8 +32,9 @@ int main(int argc, char *argv[])
 	extern char *optarg;
 	extern int optind;
 	char *path;
+	TALLOC_CTX *frame = talloc_stackframe();
 
-	lp_load(dyn_CONFIGFILE,1,0,0,1);
+	lp_load(get_dyn_CONFIGFILE(),1,0,0,1);
 	smbw_setup_shared();
 
 	while ((opt = getopt(argc, argv, "W:U:R:d:P:l:hL:")) != EOF) {
@@ -90,5 +91,6 @@ int main(int argc, char *argv[])
 		printf("%s\n", dent->d_name);
 	}
 	smbw_closedir(dir);
+	TALLOC_FREE(frame);
 	return 0;
 }
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 5de80fa555..a42c2a11e0 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -356,11 +356,11 @@ static int traverse_sessionid(struct db_record *db, void *state)
 		Ucrit_addUid( nametouid(username) );
 
 	if (verbose) {
-		d_printf("using configfile = %s\n", dyn_CONFIGFILE);
+		d_printf("using configfile = %s\n", get_dyn_CONFIGFILE());
 	}
 
-	if (!lp_load(dyn_CONFIGFILE,False,False,False,True)) {
-		fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
+	if (!lp_load(get_dyn_CONFIGFILE(),False,False,False,True)) {
+		fprintf(stderr, "Can't load %s - run testparm to debug it\n", get_dyn_CONFIGFILE());
 		ret = -1;
 		goto done;
 	}
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index aa519565ad..fbfc85535c 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -199,7 +199,7 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 
  int main(int argc, const char *argv[])
 {
-	const char *config_file = dyn_CONFIGFILE;
+	const char *config_file = get_dyn_CONFIGFILE();
 	int s;
 	static int silent_mode = False;
 	static int show_all_parameters = False;