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

put switch_id and start_daemon earlier

Browse Source 
svn:r1188
This commit is contained in:
Roger Dingledine 2004-02-29 22:34:38 +00:00
parent e2881631cf
commit 2c341cd032
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/or/main.c
View File

@ -430,6 +430,17 @@ static int init_from_config(int argc, char **argv) {
return -1;
}
close_logs(); /* we'll close, then open with correct loglevel if necessary */
if(options.User || options.Group) {
if(switch_id(options.User, options.Group) != 0) {
return -1;
}
}
if (options.RunAsDaemon) {
start_daemon(options.DataDirectory);
}
if(!options.LogFile && !options.RunAsDaemon)
add_stream_log(options.loglevel, "<stdout>", stdout);
if(options.LogFile) {
@ -450,12 +461,6 @@ static int init_from_config(int argc, char **argv) {
global_read_bucket = options.BandwidthBurst; /* start it at max traffic */
stats_prev_global_read_bucket = global_read_bucket;
if(options.User || options.Group) {
if(switch_id(options.User, options.Group) != 0) {
return -1;
}
}
if(options.RunAsDaemon) {
/* XXXX Can we delay this any more? */
finish_daemon();
@ -680,10 +685,6 @@ int tor_main(int argc, char *argv[]) {
log_fn(LOG_WARN,"You are running Tor as root. You don't need to, and you probably shouldn't.");
#endif
if (options.RunAsDaemon) {
start_daemon(options.DataDirectory);
}
if(options.ORPort) { /* only spawn dns handlers if we're a router */
dns_init(); /* initialize the dns resolve tree, and spawn workers */
}