diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-10-06 21:33:43 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-10-06 21:33:43 +0000 |
| commit | 303f5495b95f8dc16fe85977f207202d33b8d81a (patch) | |
| tree | f7d6adb30c6ff967321bf74a01b69cb711f23e4d | |
| parent | e550b2a9181d48c0736f17cc03c40b085366300e (diff) | |
| download | tor-303f5495b95f8dc16fe85977f207202d33b8d81a.tar.gz tor-303f5495b95f8dc16fe85977f207202d33b8d81a.zip | |
Forward port 07_log_to_file_by_default
svn:r8610
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/patches/07_log_to_file_by_default.dpatch | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 34bd30059c..7e81e23fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ tor (0.1.1.24-1) unstable; urgency=low - 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@debian.org> Fri, 6 Oct 2006 23:32:45 +0200 diff --git a/debian/patches/07_log_to_file_by_default.dpatch b/debian/patches/07_log_to_file_by_default.dpatch index da9aaf4324..197347f497 100755 --- a/debian/patches/07_log_to_file_by_default.dpatch +++ b/debian/patches/07_log_to_file_by_default.dpatch @@ -23,14 +23,15 @@ 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.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) */ |