summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--log.c1
-rw-r--r--ssh.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/log.c b/log.c
index ad12930e1..e68b84a20 100644
--- a/log.c
+++ b/log.c
@@ -93,6 +93,7 @@ static struct {
93 LogLevel val; 93 LogLevel val;
94} log_levels[] = 94} log_levels[] =
95{ 95{
96 { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */
96 { "QUIET", SYSLOG_LEVEL_QUIET }, 97 { "QUIET", SYSLOG_LEVEL_QUIET },
97 { "FATAL", SYSLOG_LEVEL_FATAL }, 98 { "FATAL", SYSLOG_LEVEL_FATAL },
98 { "ERROR", SYSLOG_LEVEL_ERROR }, 99 { "ERROR", SYSLOG_LEVEL_ERROR },
diff --git a/ssh.c b/ssh.c
index 67c1ebfa2..eb739035e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1106,7 +1106,7 @@ main(int ac, char **av)
1106 /* Do not allocate a tty if stdin is not a tty. */ 1106 /* Do not allocate a tty if stdin is not a tty. */
1107 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 1107 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
1108 options.request_tty != REQUEST_TTY_FORCE) { 1108 options.request_tty != REQUEST_TTY_FORCE) {
1109 if (tty_flag) 1109 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
1110 logit("Pseudo-terminal will not be allocated because " 1110 logit("Pseudo-terminal will not be allocated because "
1111 "stdin is not a terminal."); 1111 "stdin is not a terminal.");
1112 tty_flag = 0; 1112 tty_flag = 0;