Remove the char[1024] strings from dynconfig. Replace

them with malloc'ing accessor functions. Should save a
lot of static space :-).
Jeremy.

3 files changed, 8 insertions, 8 deletions

diff --git a/source/client/client.c b/source/client/client.c
index 80e906df5a4..d59af9e6cfb 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4705,9 +4705,9 @@ static int do_message_op(void)
 	if ( override_logfile )
 		setup_logging( lp_logfile(), false );
 
-	if (!lp_load(dyn_CONFIGFILE,true,false,false,true)) {
+	if (!lp_load(get_dyn_CONFIGFILE(),true,false,false,true)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
-			argv[0], dyn_CONFIGFILE);
+			argv[0], get_dyn_CONFIGFILE());
 	}
 
 	load_interfaces();
diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 2e8d5547212..98c61a30d89 100644
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -535,7 +535,7 @@ static void init_mount(void)
 	if (sys_fork() == 0) {
 		char *smbmnt_path;
 
-		asprintf(&smbmnt_path, "%s/smbmnt", dyn_BINDIR);
+		asprintf(&smbmnt_path, "%s/smbmnt", get_dyn_BINDIR());
 
 		if (file_exist(smbmnt_path, NULL)) {
 			execv(smbmnt_path, (char * const *)args);
@@ -586,7 +586,7 @@ static void get_password_file(void)
 	int fd = -1;
 	char *p;
 	bool close_it = False;
-	char *spec;
+	char *spec = NULL;
 	TALLOC_CTX *ctx = talloc_tos();
 	char pass[128];
 
@@ -1012,9 +1012,9 @@ static void parse_mount_smb(int argc, char **argv)
 		}
 	}
 
-	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());
 	}
 
 	parse_mount_smb(argc, argv);
diff --git a/source/client/smbspool.c b/source/client/smbspool.c
index 0ba4d57ff57..4270eb42720 100644
--- a/source/client/smbspool.c
+++ b/source/client/smbspool.c
@@ -230,9 +230,9 @@ static char *		uri_unescape_alloc(const char *);
 
   load_case_tables();
 
-  if (!lp_load(dyn_CONFIGFILE, True, False, False, True))
+  if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True))
   {
-    fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
+    fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", get_dyn_CONFIGFILE());
     goto done;
   }