aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-12-11 10:01:21 +0000
committerRoger Dingledine <arma@torproject.org>2005-12-11 10:01:21 +0000
commit77c0f6d456115d92a954457bdfcf6b04fff4d290 (patch)
tree4a9d2b56acfae33ffc5083109fc3d4d8caed72e5
parent79f09b2f178627e14c84574dcca3b464a3e8feda (diff)
downloadtor-77c0f6d456115d92a954457bdfcf6b04fff4d290.tar.gz
tor-77c0f6d456115d92a954457bdfcf6b04fff4d290.zip
a first go at fixing a bug matt edman reported: when he tries
to "setconf log" via the controller, it is friendly and gives him a log to stdout, even though he didn't ask for one. svn:r5562
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 1582aae1dd..22bfd35443 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1806,8 +1806,8 @@ options_validate(or_options_t *old_options, or_options_t *options)
if (normalize_log_options(options))
return -1;
- /* Special case if no options are given. */
- if (!options->Logs) {
+ /* Special case on first boot if no Log options are given. */
+ if (!old_options && !options->Logs) {
config_line_append(&options->Logs, "Log", "notice stdout");
}