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.

1 files changed, 12 insertions, 0 deletions

diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 557bf2b23..d415f3f0d 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -234,6 +234,13 @@ move_subsystem_sftp() {
 }
 
 
+fix_loglevel_silent() {
+        if [ "$(get_config_option LogLevel)" = SILENT ]; then
+                set_config_option LogLevel QUIET
+        fi
+}
+
+
 create_sshdconfig() {
         if [ -e /etc/ssh/sshd_config ] ; then
             # Upgrade an existing sshd configuration.
@@ -284,6 +291,11 @@ create_sshdconfig() {
                 rename_config_option KeepAlive TCPKeepAlive
             fi
 
+            # 'LogLevel SILENT' is now equivalent to QUIET.
+            if dpkg --compare-versions "$oldversion" lt 1:5.4p1-1; then
+                fix_loglevel_silent
+            fi
+
             return 0
         fi