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/smbd/server.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/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 16a092f152..c48cb37615 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -21,7 +21,6 @@ #include "includes.h" -pstring servicesf = CONFIGFILE; extern pstring debugf; extern fstring global_myworkgroup; extern pstring global_myname; @@ -357,8 +356,8 @@ BOOL reload_services(BOOL test) if (lp_loaded()) { pstring fname; pstrcpy(fname,lp_configfile()); - if (file_exist(fname,NULL) && !strcsequal(fname,servicesf)) { - pstrcpy(servicesf,fname); + if (file_exist(fname,NULL) && !strcsequal(fname,dyn_CONFIGFILE)) { + pstrcpy(dyn_CONFIGFILE,fname); test = False; } } @@ -370,7 +369,7 @@ BOOL reload_services(BOOL test) lp_killunused(conn_snum_used); - ret = lp_load(servicesf,False,False,True); + ret = lp_load(dyn_CONFIGFILE,False,False,True); load_printers(); @@ -588,7 +587,7 @@ static void usage(char *pname) int port = SMB_PORT; int opt; extern char *optarg; - + #ifdef HAVE_SET_AUTH_PARAMETERS set_auth_parameters(argc,argv); #endif @@ -606,7 +605,7 @@ static void usage(char *pname) break; case 's': - pstrcpy(servicesf,optarg); + pstrcpy(dyn_CONFIGFILE,optarg); break; case 'l': @@ -671,7 +670,8 @@ static void usage(char *pname) TimeInit(); if(!specified_logfile) { - slprintf(debugf, sizeof(debugf)-1, "%s/log.smbd", LOGFILEBASE); + slprintf(debugf, sizeof(debugf)-1, "%s/log.smbd", + dyn_LOGFILEBASE); } pstrcpy(remote_machine, "smbd"); |