summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan David Amery <jdamery@ysolde.ucam.org>2014-02-09 16:09:54 +0000
committerColin Watson <cjwatson@debian.org>2016-03-21 12:06:15 +0000
commit68388fa20403834f5559486542b1baf4ad36141a (patch)
tree92e4e9a2ff7625723f4906821030e72f531c9159
parentc7c5d5805bd2a58fcab69da87daa53259db06d81 (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.c1
-rw-r--r--ssh.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/log.c b/log.c
index ad12930e1..e68b84a20 100644
--- a/log.c
+++ b/log.c
@@ -93,6 +93,7 @@ static struct {
93 LogLevel val; 93 LogLevel val;
94} log_levels[] = 94} log_levels[] =
95{ 95{
96 { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */
96 { "QUIET", SYSLOG_LEVEL_QUIET }, 97 { "QUIET", SYSLOG_LEVEL_QUIET },
97 { "FATAL", SYSLOG_LEVEL_FATAL }, 98 { "FATAL", SYSLOG_LEVEL_FATAL },
98 { "ERROR", SYSLOG_LEVEL_ERROR }, 99 { "ERROR", SYSLOG_LEVEL_ERROR },
diff --git a/ssh.c b/ssh.c
index f9ff91f04..314dd528d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1119,7 +1119,7 @@ main(int ac, char **av)
1119 /* Do not allocate a tty if stdin is not a tty. */ 1119 /* Do not allocate a tty if stdin is not a tty. */
1120 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 1120 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
1121 options.request_tty != REQUEST_TTY_FORCE) { 1121 options.request_tty != REQUEST_TTY_FORCE) {
1122 if (tty_flag) 1122 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
1123 logit("Pseudo-terminal will not be allocated because " 1123 logit("Pseudo-terminal will not be allocated because "
1124 "stdin is not a terminal."); 1124 "stdin is not a terminal.");
1125 tty_flag = 0; 1125 tty_flag = 0;