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

diff --git a/ssh.c b/ssh.c
index 68178ff95..0afeb3b3a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -421,12 +421,7 @@ main(int ac, char **av)
                         options.exit_on_forward_failure = 1;
                         break;
                 case 'q':
-                        if (options.log_level == SYSLOG_LEVEL_QUIET) {
-                                options.log_level = SYSLOG_LEVEL_SILENT;
-                        }
-                        else if (options.log_level != SYSLOG_LEVEL_SILENT) {
-                                options.log_level = SYSLOG_LEVEL_QUIET;
-                        }
+                        options.log_level = SYSLOG_LEVEL_QUIET;
                         break;
                 case 'e':
                         if (optarg[0] == '^' && optarg[2] == 0 &&
@@ -629,7 +624,7 @@ main(int ac, char **av)
                 tty_flag = 0;
         /* Do not allocate a tty if stdin is not a tty. */
         if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) {
-                if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET)
+                if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
                         logit("Pseudo-terminal will not be allocated because "
                             "stdin is not a terminal.");
                 tty_flag = 0;