From f741f656737f4ec46cd318e986b6bf412ed309d2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 19 Nov 2001 02:49:53 +0000
Subject: Store some path names in global variables initialized to configure
 default, rather than in preprocessor macros. (This used to be commit
 79ec88f0da40faebe1e587f1b3e87b5f2b184f58)

---
 source3/smbwrapper/smbsh.c | 2 +-
 source3/smbwrapper/smbw.c  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/smbwrapper')

diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index f0cdc1f053..694c6dd799 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -37,7 +37,7 @@ static void smbsh_usage(void)
 int main(int argc, char *argv[])
 {
 	char *p, *u;
-	char *libd = BINDIR;	
+	char *libd = dyn_BINDIR;
 	pstring line, wd;
 	int opt;
 	extern char *optarg;
diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c
index 3c7f4926f6..24d09e2d42 100644
--- a/source3/smbwrapper/smbw.c
+++ b/source3/smbwrapper/smbw.c
@@ -45,7 +45,6 @@ void smbw_init(void)
 {
 	extern BOOL in_client;
 	static int initialised;
-	static pstring servicesf = CONFIGFILE;
 	char *p;
 	int eno;
 	pstring line;
@@ -76,10 +75,10 @@ void smbw_init(void)
 	load_interfaces();
 
 	if ((p=smbw_getshared("SERVICESF"))) {
-		pstrcpy(servicesf, p);
+		pstrcpy(dyn_CONFIGFILE, p);
 	}
 
-	lp_load(servicesf,True,False,False);
+	lp_load(dyn_CONFIGFILE,True,False,False);
 
 	get_myname(global_myname);
 
-- 
cgit