diff options
-rw-r--r-- | log.c | 1 | ||||
-rw-r--r-- | ssh.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -94,6 +94,7 @@ static struct { | |||
94 | LogLevel val; | 94 | LogLevel val; |
95 | } log_levels[] = | 95 | } log_levels[] = |
96 | { | 96 | { |
97 | { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */ | ||
97 | { "QUIET", SYSLOG_LEVEL_QUIET }, | 98 | { "QUIET", SYSLOG_LEVEL_QUIET }, |
98 | { "FATAL", SYSLOG_LEVEL_FATAL }, | 99 | { "FATAL", SYSLOG_LEVEL_FATAL }, |
99 | { "ERROR", SYSLOG_LEVEL_ERROR }, | 100 | { "ERROR", SYSLOG_LEVEL_ERROR }, |
@@ -740,7 +740,7 @@ main(int ac, char **av) | |||
740 | /* Do not allocate a tty if stdin is not a tty. */ | 740 | /* Do not allocate a tty if stdin is not a tty. */ |
741 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 741 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
742 | options.request_tty != REQUEST_TTY_FORCE) { | 742 | options.request_tty != REQUEST_TTY_FORCE) { |
743 | if (tty_flag) | 743 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
744 | logit("Pseudo-terminal will not be allocated because " | 744 | logit("Pseudo-terminal will not be allocated because " |
745 | "stdin is not a terminal."); | 745 | "stdin is not a terminal."); |
746 | tty_flag = 0; | 746 | tty_flag = 0; |