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>2014-10-07 14:26:47 +0100
commit69f7c00e04d1baa01a9038eeb764cfed0830fb19 (patch)
tree34318b36a51dfc5c6c854dc37825a4d9ab719833 /ssh.c
parentbd3abc2f732da3a61e4158b915480808957a4357 (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 26e9681b7..5bce695d9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -989,7 +989,7 @@ main(int ac, char **av)
989 /* Do not allocate a tty if stdin is not a tty. */ 989 /* Do not allocate a tty if stdin is not a tty. */
990 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 990 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
991 options.request_tty != REQUEST_TTY_FORCE) { 991 options.request_tty != REQUEST_TTY_FORCE) {
992 if (tty_flag) 992 if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
993 logit("Pseudo-terminal will not be allocated because " 993 logit("Pseudo-terminal will not be allocated because "
994 "stdin is not a terminal."); 994 "stdin is not a terminal.");
995 tty_flag = 0; 995 tty_flag = 0;