1 files changed, 8 insertions, 3 deletions

diff --git a/ssh.c b/ssh.c
index d3a7ffc9b..a7f448bb6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -382,7 +382,12 @@ main(int ac, char **av)
                         }
                         break;
                 case 'q':
-                        options.log_level = SYSLOG_LEVEL_QUIET;
+                        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;
+                        }
                         break;
                 case 'e':
                         if (optarg[0] == '^' && optarg[2] == 0 &&
@@ -598,7 +603,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)
+                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;
         }
@@ -1482,7 +1487,7 @@ control_client(const char *path)
         } else
                 debug2("Received exit status from master %d", exitval[0]);
 
-        if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
+        if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET)
                 fprintf(stderr, "Shared connection to %s closed.\r\n", host);
 
         exit(exitval[0]);