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/torture/rpctorture.c | |
| parent | a1b9de0b9872b91574e75bb360d49b887a072389 (diff) | |
| download | samba-f741f656737f4ec46cd318e986b6bf412ed309d2.tar.gz samba-f741f656737f4ec46cd318e986b6bf412ed309d2.tar.bz2 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/torture/rpctorture.c')
| -rw-r--r-- | source3/torture/rpctorture.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c index b61bfb639e..27693f5575 100644 --- a/source3/torture/rpctorture.c +++ b/source3/torture/rpctorture.c @@ -225,7 +225,6 @@ enum client_action int opt; extern char *optarg; extern int optind; - static pstring servicesf = CONFIGFILE; pstring term_code; BOOL got_pass = False; char *cmd_str=""; @@ -246,9 +245,9 @@ enum client_action *term_code = 0; #endif /* KANJI */ - if (!lp_load(servicesf,True, False, False)) + if (!lp_load(dyn_CONFIGFILE,True, False, False)) { - fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf); + fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE); } DEBUGLEVEL = 0; @@ -469,7 +468,7 @@ enum client_action case 's': { - pstrcpy(servicesf, optarg); + pstrcpy(dyn_CONFIGFILE, optarg); break; } |