summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-08-04 20:32:17 +0000
committerRoger Dingledine <arma@torproject.org>2006-08-04 20:32:17 +0000
commit60ddbef7d3e8c9f7a2c03207aab67125578c34e4 (patch)
tree740c7d297427253529e8d633475b67f746083dfa
parentbd62f5dacdd10567f6deba695a33f2ae93b775fa (diff)
downloadtor-60ddbef7d3e8c9f7a2c03207aab67125578c34e4.tar.gz
tor-60ddbef7d3e8c9f7a2c03207aab67125578c34e4.zip
Backport a bugfix that i should have backported before:
If you start with --RunAsDaemon 1, but don't have any log lines defined, then it will try to add a stdout log, and then refuse to start. svn:r6983
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 410bf4ee67..aacb9ec7dd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2086,7 +2086,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("Failed to normalize old Log options. See logs for details.");
/* Special case on first boot if no Log options are given. */
- if (!options->Logs && !from_setconf)
+ if (!options->Logs && !options->RunAsDaemon && !from_setconf)
config_line_append(&options->Logs, "Log", "notice stdout");
if (options_init_logs(options, 1)<0) /* Validate the log(s) */