summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c9
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)
421 options.exit_on_forward_failure = 1; 421 options.exit_on_forward_failure = 1;
422 break; 422 break;
423 case 'q': 423 case 'q':
424 if (options.log_level == SYSLOG_LEVEL_QUIET) { 424 options.log_level = SYSLOG_LEVEL_QUIET;
425 options.log_level = SYSLOG_LEVEL_SILENT;
426 }
427 else if (options.log_level != SYSLOG_LEVEL_SILENT) {
428 options.log_level = SYSLOG_LEVEL_QUIET;
429 }
430 break; 425 break;
431 case 'e': 426 case 'e':
432 if (optarg[0] == '^' && optarg[2] == 0 && 427 if (optarg[0] == '^' && optarg[2] == 0 &&
@@ -629,7 +624,7 @@ main(int ac, char **av)
629 tty_flag = 0; 624 tty_flag = 0;
630 /* Do not allocate a tty if stdin is not a tty. */ 625 /* Do not allocate a tty if stdin is not a tty. */
631 if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { 626 if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) {
632 if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET) 627 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
633 logit("Pseudo-terminal will not be allocated because " 628 logit("Pseudo-terminal will not be allocated because "
634 "stdin is not a terminal."); 629 "stdin is not a terminal.");
635 tty_flag = 0; 630 tty_flag = 0;