summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-06-08 00:34:34 +0000
committerRoger Dingledine <arma@torproject.org>2008-06-08 00:34:34 +0000
commitd66bb67ae852d6d2efa9c69316bb399623f4a687 (patch)
tree6e40e5e25771e64e96d9ba29c0e4bd471d91e6c5
parent85a80ad73e10eb3a292a577b24f3f88872b61b48 (diff)
downloadtor-d66bb67ae852d6d2efa9c69316bb399623f4a687.tar.gz
tor-d66bb67ae852d6d2efa9c69316bb399623f4a687.zip
Tor 0.2.1.x can start with 'log notice stdout' and 'runasdaemon 1'
both set. Earlier Tors cannot. This will be considered a feature of 0.2.1.x, not a bug in 0.2.0.x. svn:r15018
-rw-r--r--src/or/config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 5e807faa64..51644f8ea6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3874,6 +3874,9 @@ options_init_logs(or_options_t *options, int validate_only)
ok = 0; goto cleanup;
}
if (!strcasecmp(smartlist_get(elts,1), "stdout")) {
+ /* Starting in 0.2.1.x, we will just decline to open the log file
+ * to stdout, rather than failing the whole program. But I'm leaving
+ * this intact for here so we can stabilize 0.2.0.x. -RD */
if (daemon) {
log_warn(LD_CONFIG, "Can't log to stdout with RunAsDaemon set.");
ok = 0; goto cleanup;