summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorJonathan David Amery <jdamery@ysolde.ucam.org>2014-02-09 16:09:54 +0000
committerColin Watson <cjwatson@debian.org>2015-11-29 17:26:16 +0000
commit19ab567e88d730a6862aab3fb33e399a9c3f67b2 (patch)
tree2adcafbeae4e1fdf53ee7461b20191e0181ea3f0 /ssh.c
parent25698ed1091d932244f94e7c802dce05c458749a (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
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index 59c1f931c..712ea0ec2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1106,7 +1106,7 @@ main(int ac, char **av)
1106 /* Do not allocate a tty if stdin is not a tty. */ 1106 /* Do not allocate a tty if stdin is not a tty. */
1107 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 1107 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
1108 options.request_tty != REQUEST_TTY_FORCE) { 1108 options.request_tty != REQUEST_TTY_FORCE) {
1109 if (tty_flag) 1109 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
1110 logit("Pseudo-terminal will not be allocated because " 1110 logit("Pseudo-terminal will not be allocated because "
1111 "stdin is not a terminal."); 1111 "stdin is not a terminal.");
1112 tty_flag = 0; 1112 tty_flag = 0;