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/utils/smbpasswd.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/utils/smbpasswd.c')
| -rw-r--r-- | source3/utils/smbpasswd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index ee8bae7a4a..1e637ede35 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -898,8 +898,6 @@ static int process_nonroot(int argc, char *argv[]) **********************************************************/ int main(int argc, char **argv) { - static pstring servicesf = CONFIGFILE; - #if defined(HAVE_SET_AUTH_PARAMETERS) set_auth_parameters(argc, argv); #endif /* HAVE_SET_AUTH_PARAMETERS */ @@ -913,9 +911,9 @@ int main(int argc, char **argv) exit(1); } - 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); + dyn_CONFIGFILE); exit(1); } |