diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 11:34:21 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 11:34:21 +0100 |
commit | 21653cc01f15857ec36fc5ec24aecf1d39c2855f (patch) | |
tree | 37140a381e866f78560ed021bd32b58e7d285cb6 /log.c | |
parent | 69456e98a770b7e946b416e5a41ec6288a31e22f (diff) |
Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
introduced to match the behaviour of non-free SSH, in which -q does not
suppress fatal errors, but matching the behaviour of OpenSSH upstream is
much more important nowadays. We no longer document that -q does not
suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to
"LogLevel QUIET" in sshd_config on upgrade.
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -90,7 +90,7 @@ static struct { | |||
90 | LogLevel val; | 90 | LogLevel val; |
91 | } log_levels[] = | 91 | } log_levels[] = |
92 | { | 92 | { |
93 | { "SILENT", SYSLOG_LEVEL_SILENT }, | 93 | { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */ |
94 | { "QUIET", SYSLOG_LEVEL_QUIET }, | 94 | { "QUIET", SYSLOG_LEVEL_QUIET }, |
95 | { "FATAL", SYSLOG_LEVEL_FATAL }, | 95 | { "FATAL", SYSLOG_LEVEL_FATAL }, |
96 | { "ERROR", SYSLOG_LEVEL_ERROR }, | 96 | { "ERROR", SYSLOG_LEVEL_ERROR }, |
@@ -245,7 +245,6 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) | |||
245 | argv0 = av0; | 245 | argv0 = av0; |
246 | 246 | ||
247 | switch (level) { | 247 | switch (level) { |
248 | case SYSLOG_LEVEL_SILENT: | ||
249 | case SYSLOG_LEVEL_QUIET: | 248 | case SYSLOG_LEVEL_QUIET: |
250 | case SYSLOG_LEVEL_FATAL: | 249 | case SYSLOG_LEVEL_FATAL: |
251 | case SYSLOG_LEVEL_ERROR: | 250 | case SYSLOG_LEVEL_ERROR: |