diff options
author | Natalie Amery <nmamery@chiark.greenend.org.uk> | 2014-02-09 16:09:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2024-03-14 09:52:49 +0000 |
commit | 289063d080305b43743ba16c0fef2c0d96068993 (patch) | |
tree | 4ddbcd1ba78794ec7d5cc0e49dc649b82c5e1487 | |
parent | 2b4e16a9212c0c8924e528e45871c75bfb0662b3 (diff) |
"LogLevel SILENT" compatibility
"LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to
match the behaviour of non-free SSH, in which -q does not suppress fatal
errors. However, this was unintentionally broken in 1:4.6p1-2 and nobody
complained, so we've dropped most of it. The parts that remain are basic
configuration file compatibility, and an adjustment to "Pseudo-terminal will
not be allocated ..." which should be split out into a separate patch.
Author: Matthew Vernon <matthew@debian.org>
Author: Colin Watson <cjwatson@debian.org>
Last-Update: 2013-09-14
Patch-Name: syslog-level-silent.patch
-rw-r--r-- | log.c | 1 | ||||
-rw-r--r-- | ssh.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -96,6 +96,7 @@ static struct { LogLevel val; } log_levels[] = { + { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */ { "QUIET", SYSLOG_LEVEL_QUIET }, { "FATAL", SYSLOG_LEVEL_FATAL }, { "ERROR", SYSLOG_LEVEL_ERROR }, @@ -1412,7 +1412,7 @@ main(int ac, char **av) /* Do not allocate a tty if stdin is not a tty. */ if ((!isatty(fileno(stdin)) || options.stdin_null) && options.request_tty != REQUEST_TTY_FORCE) { - 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; |