diff options
author | Jonathan David Amery <jdamery@ysolde.ucam.org> | 2014-02-09 16:09:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-03-10 13:00:39 +0000 |
commit | b8c3ad59100fedf8aaab9986b55c9307c599ec61 (patch) | |
tree | dfacd8e7bbe10b86dd569fbe23eab43818e915d2 | |
parent | ce1a5718a57d2d1c0d9e59cfac81c2f6401780a0 (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 }, |
@@ -1119,7 +1119,7 @@ main(int ac, char **av) | |||
1119 | /* Do not allocate a tty if stdin is not a tty. */ | 1119 | /* Do not allocate a tty if stdin is not a tty. */ |
1120 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 1120 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
1121 | options.request_tty != REQUEST_TTY_FORCE) { | 1121 | options.request_tty != REQUEST_TTY_FORCE) { |
1122 | if (tty_flag) | 1122 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
1123 | logit("Pseudo-terminal will not be allocated because " | 1123 | logit("Pseudo-terminal will not be allocated because " |
1124 | "stdin is not a terminal."); | 1124 | "stdin is not a terminal."); |
1125 | tty_flag = 0; | 1125 | tty_flag = 0; |