diff options
author | Martin Pool <mbp@samba.org> | 2001-11-19 02:49:53 +0000 |
---|---|---|
committer | Martin Pool <mbp@samba.org> | 2001-11-19 02:49:53 +0000 |
commit | f741f656737f4ec46cd318e986b6bf412ed309d2 (patch) | |
tree | fb2b1999441e25ae5db177631dd42abb051a9bce /source3/rpcclient/rpcclient.c | |
parent | a1b9de0b9872b91574e75bb360d49b887a072389 (diff) | |
download | samba-f741f656737f4ec46cd318e986b6bf412ed309d2.tar.gz samba-f741f656737f4ec46cd318e986b6bf412ed309d2.tar.xz samba-f741f656737f4ec46cd318e986b6bf412ed309d2.zip |
Store some path names in global variables initialized to configure
default, rather than in preprocessor macros.
(This used to be commit 79ec88f0da40faebe1e587f1b3e87b5f2b184f58)
Diffstat (limited to 'source3/rpcclient/rpcclient.c')
-rw-r--r-- | source3/rpcclient/rpcclient.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 66e84fc1a93..773548a7db3 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -620,8 +620,7 @@ static void usage(void) BOOL interactive = True; int opt; int olddebug; - pstring cmdstr = "", - servicesf = CONFIGFILE; + pstring cmdstr = ""; struct ntuser_creds creds; struct cli_state cli; fstring password, @@ -661,7 +660,7 @@ static void usage(void) break; case 's': - pstrcpy(servicesf, optarg); + pstrcpy(dyn_CONFIGFILE, optarg); break; case 'U': { @@ -710,8 +709,8 @@ static void usage(void) /* Load smb.conf file */ /* FIXME! How to get this DEBUGLEVEL to last over lp_load()? */ olddebug = DEBUGLEVEL; - if (!lp_load(servicesf,True,False,False)) { - fprintf(stderr, "Can't load %s\n", servicesf); + if (!lp_load(dyn_CONFIGFILE,True,False,False)) { + fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE); } DEBUGLEVEL = olddebug; |