summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorJonathan David Amery <jdamery@ysolde.ucam.org>2014-02-09 16:09:54 +0000
committerColin Watson <cjwatson@debian.org>2014-02-10 02:40:15 +0000
commit36c21f10bd09ee15eb7f5bd7448309bf9a5cd466 (patch)
tree4a8346232647df914e6874a14fd926d90406446d /log.c
parent043f937820e1152df2c8416f37e6c8d923fc1811 (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
Diffstat (limited to 'log.c')
-rw-r--r--log.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/log.c b/log.c
index 32e1d2e45..53e7b6561 100644
--- a/log.c
+++ b/log.c
@@ -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 },