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>2014-02-09 23:43:40 +0000
commitb8a355b5db58dc489fca181e333dacf5e14f4f1d (patch)
tree6993e3ca6813dea2c51703fa6d9771b674695490
parentbd3d91c378d549aed56246ad4535aea29db04150 (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 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 },
diff --git a/ssh.c b/ssh.c
index 87233bc91..550288919 100644
--- a/ssh.c
+++ b/ssh.c
@@ -740,7 +740,7 @@ main(int ac, char **av)
740 /* Do not allocate a tty if stdin is not a tty. */ 740 /* Do not allocate a tty if stdin is not a tty. */
741 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 741 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
742 options.request_tty != REQUEST_TTY_FORCE) { 742 options.request_tty != REQUEST_TTY_FORCE) {
743 if (tty_flag) 743 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
744 logit("Pseudo-terminal will not be allocated because " 744 logit("Pseudo-terminal will not be allocated because "
745 "stdin is not a terminal."); 745 "stdin is not a terminal.");
746 tty_flag = 0; 746 tty_flag = 0;