[or-cvs] r8610: Forward port 07_log_to_file_by_default (in tor/branches/tor-0_1_1-patches/debian: . patches)

[weasel at seul.org]

Author: weasel
Date: 2006-10-06 17:33:43 -0400 (Fri, 06 Oct 2006)
New Revision: 8610

Modified:
   tor/branches/tor-0_1_1-patches/debian/changelog
   tor/branches/tor-0_1_1-patches/debian/patches/07_log_to_file_by_default.dpatch
Log:
Forward port 07_log_to_file_by_default

Modified: tor/branches/tor-0_1_1-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_1_1-patches/debian/changelog	2006-10-06 21:33:28 UTC (rev 8609)
+++ tor/branches/tor-0_1_1-patches/debian/changelog	2006-10-06 21:33:43 UTC (rev 8610)
@@ -5,6 +5,7 @@
     - tree.h has vanished somewhere along the current branch
     - ht.h is new and credits Christopher Clark
     - We didn't mention Matej Pfajfar's copyright before.
+  * Forward port 07_log_to_file_by_default.
 
  -- Peter Palfrader <weasel at debian.org>  Fri,  6 Oct 2006 23:32:45 +0200
 

Modified: tor/branches/tor-0_1_1-patches/debian/patches/07_log_to_file_by_default.dpatch
===================================================================
--- tor/branches/tor-0_1_1-patches/debian/patches/07_log_to_file_by_default.dpatch	2006-10-06 21:33:28 UTC (rev 8609)
+++ tor/branches/tor-0_1_1-patches/debian/patches/07_log_to_file_by_default.dpatch	2006-10-06 21:33:43 UTC (rev 8610)
@@ -23,14 +23,15 @@
 exit 0
 
 @DPATCH@
-diff -urNad tor-0.1.1.17/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.1.17/src/or/config.c
---- tor-0.1.1.17/src/or/config.c
-+++ /tmp/dpep.YwfNhI/tor-0.1.1.17/src/or/config.c
+diff -urNad tor-0.1.2.24/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.2.24/src/or/config.c
+--- tor-0.1.2.24/src/or/config.c
++++ /tmp/dpep.YwfNhI/tor-0.1.2.24/src/or/config.c
 @@ -2079,7 +2079,7 @@
  
    /* 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->Logs && !from_setconf)
 +    config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");
  
    if (options_init_logs(options, 1)<0) /* Validate the log(s) */