diff options
author | Jonathan David Amery <jdamery@ysolde.ucam.org> | 2014-02-09 16:09:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 17:09:56 +0100 |
commit | 9e6bb8525886d99876eb43a3b39c96bdf3032146 (patch) | |
tree | fe7ee222bd7b5fe238360694a3a52e4cfa8f5948 | |
parent | 02a61bcb045503a5f3f7e274ac1f4524e30f87c8 (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
@@ -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 }, |
@@ -1105,7 +1105,7 @@ main(int ac, char **av) | |||
1105 | /* Do not allocate a tty if stdin is not a tty. */ | 1105 | /* Do not allocate a tty if stdin is not a tty. */ |
1106 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 1106 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
1107 | options.request_tty != REQUEST_TTY_FORCE) { | 1107 | options.request_tty != REQUEST_TTY_FORCE) { |
1108 | if (tty_flag) | 1108 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
1109 | logit("Pseudo-terminal will not be allocated because " | 1109 | logit("Pseudo-terminal will not be allocated because " |
1110 | "stdin is not a terminal."); | 1110 | "stdin is not a terminal."); |
1111 | tty_flag = 0; | 1111 | tty_flag = 0; |