summaryrefslogtreecommitdiff
path: root/debian/patches/openbsd-docs.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-31 11:34:21 +0100
committerColin Watson <cjwatson@debian.org>2010-03-31 11:34:21 +0100
commit21653cc01f15857ec36fc5ec24aecf1d39c2855f (patch)
tree37140a381e866f78560ed021bd32b58e7d285cb6 /debian/patches/openbsd-docs.patch
parent69456e98a770b7e946b416e5a41ec6288a31e22f (diff)
Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
introduced to match the behaviour of non-free SSH, in which -q does not suppress fatal errors, but matching the behaviour of OpenSSH upstream is much more important nowadays. We no longer document that -q does not suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to "LogLevel QUIET" in sshd_config on upgrade.
Diffstat (limited to 'debian/patches/openbsd-docs.patch')
-rw-r--r--debian/patches/openbsd-docs.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index e98938c15..0898c6ed3 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -60,7 +60,7 @@ Index: b/ssh.1
60=================================================================== 60===================================================================
61--- a/ssh.1 61--- a/ssh.1
62+++ b/ssh.1 62+++ b/ssh.1
63@@ -764,6 +764,10 @@ 63@@ -759,6 +759,10 @@
64 .Sx HISTORY 64 .Sx HISTORY
65 section of 65 section of
66 .Xr ssl 8 66 .Xr ssl 8
@@ -84,7 +84,7 @@ Index: b/sshd.8
84 It forks a new 84 It forks a new
85 daemon for each incoming connection. 85 daemon for each incoming connection.
86 The forked daemons handle 86 The forked daemons handle
87@@ -838,7 +838,7 @@ 87@@ -835,7 +835,7 @@
88 .Xr ssh 1 ) . 88 .Xr ssh 1 ) .
89 It should only be writable by root. 89 It should only be writable by root.
90 .Pp 90 .Pp
@@ -93,7 +93,7 @@ Index: b/sshd.8
93 Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". 93 Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
94 The file format is described in 94 The file format is described in
95 .Xr moduli 5 . 95 .Xr moduli 5 .
96@@ -934,7 +934,6 @@ 96@@ -931,7 +931,6 @@
97 .Xr ssh-vulnkey 1 , 97 .Xr ssh-vulnkey 1 ,
98 .Xr chroot 2 , 98 .Xr chroot 2 ,
99 .Xr hosts_access 5 , 99 .Xr hosts_access 5 ,