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-08-19 17:09:56 +0100
commit9e6bb8525886d99876eb43a3b39c96bdf3032146 (patch)
treefe7ee222bd7b5fe238360694a3a52e4cfa8f5948 /ssh.c
parent02a61bcb045503a5f3f7e274ac1f4524e30f87c8 (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 3fd5a941f..d99f7ef6c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1105,7 +1105,7 @@ main(int ac, char **av)
1105 /* Do not allocate a tty if stdin is not a tty. */ 1105 /* Do not allocate a tty if stdin is not a tty. */
1106 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 1106 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
1107 options.request_tty != REQUEST_TTY_FORCE) { 1107 options.request_tty != REQUEST_TTY_FORCE) {
1108 if (tty_flag) 1108 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
1109 logit("Pseudo-terminal will not be allocated because " 1109 logit("Pseudo-terminal will not be allocated because "
1110 "stdin is not a terminal."); 1110 "stdin is not a terminal.");
1111 tty_flag = 0; 1111 tty_flag = 0;