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 /sshd.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 'sshd.c')
-rw-r--r-- | sshd.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -1371,12 +1371,7 @@ main(int ac, char **av) | |||
1371 | /* ignored */ | 1371 | /* ignored */ |
1372 | break; | 1372 | break; |
1373 | case 'q': | 1373 | case 'q': |
1374 | if (options.log_level == SYSLOG_LEVEL_QUIET) { | 1374 | options.log_level = SYSLOG_LEVEL_QUIET; |
1375 | options.log_level = SYSLOG_LEVEL_SILENT; | ||
1376 | } | ||
1377 | else if (options.log_level != SYSLOG_LEVEL_SILENT) { | ||
1378 | options.log_level = SYSLOG_LEVEL_QUIET; | ||
1379 | } | ||
1380 | break; | 1375 | break; |
1381 | case 'b': | 1376 | case 'b': |
1382 | options.server_key_bits = (int)strtonum(optarg, 256, | 1377 | options.server_key_bits = (int)strtonum(optarg, 256, |