diff options
author | Jonathan David Amery <jdamery@ysolde.ucam.org> | 2014-02-09 16:09:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:24:49 +0000 |
commit | b8ed36cdf2dbebc01e52e83eece4bb1d78607e84 (patch) | |
tree | ff70701a17000e150d8bc292dcd6ed8b372f5cfc /ssh.c | |
parent | 81540b7886fdc73c7be304706ea33d6d87b5fc81 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -965,7 +965,7 @@ main(int ac, char **av) | |||
965 | /* Do not allocate a tty if stdin is not a tty. */ | 965 | /* Do not allocate a tty if stdin is not a tty. */ |
966 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 966 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
967 | options.request_tty != REQUEST_TTY_FORCE) { | 967 | options.request_tty != REQUEST_TTY_FORCE) { |
968 | if (tty_flag) | 968 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
969 | logit("Pseudo-terminal will not be allocated because " | 969 | logit("Pseudo-terminal will not be allocated because " |
970 | "stdin is not a terminal."); | 970 | "stdin is not a terminal."); |
971 | tty_flag = 0; | 971 | tty_flag = 0; |