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, 1 insertions, 2 deletions

diff --git a/log.c b/log.c
index 249913785..d8a1f734e 100644
--- a/log.c
+++ b/log.c
@@ -90,7 +90,7 @@ static struct {
         LogLevel val;
 } log_levels[] =
 {
-        { "SILENT",     SYSLOG_LEVEL_SILENT },
+        { "SILENT",     SYSLOG_LEVEL_QUIET }, /* compatibility */
         { "QUIET",      SYSLOG_LEVEL_QUIET },
         { "FATAL",      SYSLOG_LEVEL_FATAL },
         { "ERROR",      SYSLOG_LEVEL_ERROR },
@@ -245,7 +245,6 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
         argv0 = av0;
 
         switch (level) {
-        case SYSLOG_LEVEL_SILENT:
         case SYSLOG_LEVEL_QUIET:
         case SYSLOG_LEVEL_FATAL:
         case SYSLOG_LEVEL_ERROR: