diff options
author | Natalie Amery <nmamery@chiark.greenend.org.uk> | 2014-02-09 16:09:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:25:35 +0100 |
commit | f2c3eb379d31f24de20dc9a2e0089ed84f52055b (patch) | |
tree | 308042a30a241b038d7c661b790614e53b1ac668 | |
parent | 24c9c811bfd227e467ab1ce00503f08dcc22c0f4 (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
@@ -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 }, |
@@ -1339,7 +1339,7 @@ main(int ac, char **av) | |||
1339 | /* Do not allocate a tty if stdin is not a tty. */ | 1339 | /* Do not allocate a tty if stdin is not a tty. */ |
1340 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 1340 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
1341 | options.request_tty != REQUEST_TTY_FORCE) { | 1341 | options.request_tty != REQUEST_TTY_FORCE) { |
1342 | if (tty_flag) | 1342 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
1343 | logit("Pseudo-terminal will not be allocated because " | 1343 | logit("Pseudo-terminal will not be allocated because " |
1344 | "stdin is not a terminal."); | 1344 | "stdin is not a terminal."); |
1345 | tty_flag = 0; | 1345 | tty_flag = 0; |