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

diff --git a/src/or/config.c b/src/or/config.c
index 1582aae1dd38da139f1c281a141726a1b9e663d2..22bfd354430d3c6435cacb2bb011adbb49b566ad 100644 (file)
--- 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");
   }