From 21653cc01f15857ec36fc5ec24aecf1d39c2855f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 31 Mar 2010 11:34:21 +0100 Subject: 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. --- sshd.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sshd.c') diff --git a/sshd.c b/sshd.c index df6c9d24e..75e267793 100644 --- a/sshd.c +++ b/sshd.c @@ -1371,12 +1371,7 @@ main(int ac, char **av) /* ignored */ break; case 'q': - if (options.log_level == SYSLOG_LEVEL_QUIET) { - options.log_level = SYSLOG_LEVEL_SILENT; - } - else if (options.log_level != SYSLOG_LEVEL_SILENT) { - options.log_level = SYSLOG_LEVEL_QUIET; - } + options.log_level = SYSLOG_LEVEL_QUIET; break; case 'b': options.server_key_bits = (int)strtonum(optarg, 256, -- cgit v1.2.3