[or-cvs] Forward port patches/07_log_to_file_by_default

[Peter Palfrader]

Update of /home/or/cvsroot/tor/debian/patches
In directory moria:/tmp/cvs-serv304/patches

Modified Files:
	07_log_to_file_by_default.dpatch 
Log Message:
Forward port patches/07_log_to_file_by_default

Index: 07_log_to_file_by_default.dpatch
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/07_log_to_file_by_default.dpatch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- 07_log_to_file_by_default.dpatch	10 Jan 2006 23:18:48 -0000	1.6
+++ 07_log_to_file_by_default.dpatch	28 Mar 2006 07:48:30 -0000	1.7
@@ -23,15 +23,15 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad tor-0.1.1.5/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.1.5/src/or/config.c
---- tor-0.1.1.5/src/or/config.c
-+++ /tmp/dpep.YwfNhI/tor-0.1.1.5/src/or/config.c
-@@ -1548,7 +1548,7 @@
+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
+@@ -2079,7 +2079,7 @@
  
    /* Special case on first boot if no Log options are given. */
-   if (!options->Logs && !from_setconf) {
+   if (!options->Logs && !from_setconf)
 -    config_line_append(&options->Logs, "Log", "notice stdout");
 +    config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");
-   }
  
    if (options_init_logs(options, 1)<0) /* Validate the log(s) */
+     REJECT("Failed to validate Log options. See logs for details.");