summaryrefslogtreecommitdiffstats
path: root/source/smbwrapper
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2001-11-19 02:49:53 +0000
committerMartin Pool <mbp@samba.org>2001-11-19 02:49:53 +0000
commit79ec88f0da40faebe1e587f1b3e87b5f2b184f58 (patch)
treea23afbb4a9526bc68e30350d800a9a086b735572 /source/smbwrapper
parent91e07a7fdc47b2baf42fc06e77d1e1d883111668 (diff)
downloadsamba-79ec88f0da40faebe1e587f1b3e87b5f2b184f58.tar.gz
samba-79ec88f0da40faebe1e587f1b3e87b5f2b184f58.tar.xz
samba-79ec88f0da40faebe1e587f1b3e87b5f2b184f58.zip
Store some path names in global variables initialized to configure
default, rather than in preprocessor macros.
Diffstat (limited to 'source/smbwrapper')
-rw-r--r--source/smbwrapper/smbsh.c2
-rw-r--r--source/smbwrapper/smbw.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/source/smbwrapper/smbsh.c b/source/smbwrapper/smbsh.c
index f0cdc1f0536..694c6dd7994 100644
--- a/source/smbwrapper/smbsh.c
+++ b/source/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/source/smbwrapper/smbw.c b/source/smbwrapper/smbw.c
index 3c7f4926f6d..24d09e2d423 100644
--- a/source/smbwrapper/smbw.c
+++ b/source/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);