nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

make pidfile default to null rather than writing to your cwd

Browse Source 
svn:r853
This commit is contained in:
Roger Dingledine 2003-11-19 22:45:06 +00:00
parent 4565150db2
commit d6601f8cff
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -259,7 +259,7 @@ void init_options(or_options_t *options) {
options->DirBindAddress = tor_strdup("0.0.0.0"); options->DirBindAddress = tor_strdup("0.0.0.0");
options->RecommendedVersions = tor_strdup("none"); options->RecommendedVersions = tor_strdup("none");
options->loglevel = LOG_INFO; options->loglevel = LOG_INFO;
options->PidFile = tor_strdup("tor.pid"); options->PidFile = NULL; // tor_strdup("tor.pid");
options->DataDirectory = NULL; options->DataDirectory = NULL;
options->PathlenCoinWeight = 0.3; options->PathlenCoinWeight = 0.3;
options->MaxConn = 900; options->MaxConn = 900;

7
src/or/main.c
View File

@ -628,8 +628,8 @@ static int init_from_config(int argc, char **argv) {
} }
/* write our pid to the pid file, if we do not have write permissions we will log a warning */ /* write our pid to the pid file, if we do not have write permissions we will log a warning */
write_pidfile(options.PidFile); if(options.PidFile)
/* XXX Is overwriting the pidfile ok? I think it is. -RD */ write_pidfile(options.PidFile);
return 0; return 0;
} }
@ -750,7 +750,8 @@ static void catch(int the_signal) {
log(LOG_ERR,"Catching signal %d, exiting cleanly.", the_signal); log(LOG_ERR,"Catching signal %d, exiting cleanly.", the_signal);
/* we don't care if there was an error when we unlink, nothing /* we don't care if there was an error when we unlink, nothing
we could do about it anyways */ we could do about it anyways */
unlink(options.PidFile); if(options.PidFile)
unlink(options.PidFile);
exit(0); exit(0);
case SIGHUP: case SIGHUP:
please_reset = 1; please_reset = 1;