Commit d6601f8c authored by Roger Dingledine's avatar Roger Dingledine
Browse files

make pidfile default to null rather than writing to your cwd


svn:r853
parent 4565150d
......@@ -259,7 +259,7 @@ void init_options(or_options_t *options) {
options->DirBindAddress = tor_strdup("0.0.0.0");
options->RecommendedVersions = tor_strdup("none");
options->loglevel = LOG_INFO;
options->PidFile = tor_strdup("tor.pid");
options->PidFile = NULL; // tor_strdup("tor.pid");
options->DataDirectory = NULL;
options->PathlenCoinWeight = 0.3;
options->MaxConn = 900;
......
......@@ -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_pidfile(options.PidFile);
/* XXX Is overwriting the pidfile ok? I think it is. -RD */
if(options.PidFile)
write_pidfile(options.PidFile);
return 0;
}
......@@ -750,7 +750,8 @@ static void catch(int 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 could do about it anyways */
unlink(options.PidFile);
if(options.PidFile)
unlink(options.PidFile);
exit(0);
case SIGHUP:
please_reset = 1;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment