diff options
author | Jonathan David Amery <jdamery@ysolde.ucam.org> | 2014-02-09 16:09:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 02:40:15 +0000 |
commit | 36c21f10bd09ee15eb7f5bd7448309bf9a5cd466 (patch) | |
tree | 4a8346232647df914e6874a14fd926d90406446d | |
parent | 043f937820e1152df2c8416f37e6c8d923fc1811 (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 }, |
@@ -889,7 +889,7 @@ main(int ac, char **av) | |||
889 | /* Do not allocate a tty if stdin is not a tty. */ | 889 | /* Do not allocate a tty if stdin is not a tty. */ |
890 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 890 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
891 | options.request_tty != REQUEST_TTY_FORCE) { | 891 | options.request_tty != REQUEST_TTY_FORCE) { |
892 | if (tty_flag) | 892 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
893 | logit("Pseudo-terminal will not be allocated because " | 893 | logit("Pseudo-terminal will not be allocated because " |
894 | "stdin is not a terminal."); | 894 | "stdin is not a terminal."); |
895 | tty_flag = 0; | 895 | tty_flag = 0; |