[or-cvs] Forward port 07_log_to_file_by_default.dpatch

[weasel@xxxxxxxx (Peter Palfrader)]

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

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

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.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- 07_log_to_file_by_default.dpatch	28 Mar 2006 07:48:30 -0000	1.7
+++ 07_log_to_file_by_default.dpatch	15 Jun 2006 23:20:50 -0000	1.8
@@ -23,13 +23,13 @@ esac
 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.0-alpha-cvs/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.2.0-alpha-cvs/src/or/config.c
+--- tor-0.1.2.0-alpha-cvs/src/or/config.c
++++ /tmp/dpep.YwfNhI/tor-0.1.2.0-alpha-cvs/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");
 +    config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log");