[or-cvs] r6983: Backport a bugfix that i should have backported before: If y (tor/branches/tor-0_1_1-patches/src/or)

[arma at seul.org]

Author: arma
Date: 2006-08-04 16:32:17 -0400 (Fri, 04 Aug 2006)
New Revision: 6983

Modified:
   tor/branches/tor-0_1_1-patches/src/or/config.c
Log:
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.


Modified: tor/branches/tor-0_1_1-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/config.c	2006-08-04 20:30:45 UTC (rev 6982)
+++ tor/branches/tor-0_1_1-patches/src/or/config.c	2006-08-04 20:32:17 UTC (rev 6983)
@@ -2086,7 +2086,7 @@
     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) */