summaryrefslogtreecommitdiff
path: root/debian/patches/syslog-level-silent.patch
blob: 2bac7c8cbde36325105752e8b06160d5df977f66 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Description: "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: Jonathan David Amery <jdamery@ysolde.ucam.org>
Author: Matthew Vernon <matthew@debian.org>
Author: Colin Watson <cjwatson@debian.org>
Last-Update: 2013-05-16

Index: b/log.c
===================================================================
--- a/log.c
+++ b/log.c
@@ -92,6 +92,7 @@
 	LogLevel val;
 } log_levels[] =
 {
+	{ "SILENT",	SYSLOG_LEVEL_QUIET }, /* compatibility */
 	{ "QUIET",	SYSLOG_LEVEL_QUIET },
 	{ "FATAL",	SYSLOG_LEVEL_FATAL },
 	{ "ERROR",	SYSLOG_LEVEL_ERROR },
Index: b/ssh.c
===================================================================
--- a/ssh.c
+++ b/ssh.c
@@ -711,7 +711,7 @@
 	/* Do not allocate a tty if stdin is not a tty. */
 	if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
 	    options.request_tty != REQUEST_TTY_FORCE) {
-		if (tty_flag)
+		if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
 			logit("Pseudo-terminal will not be allocated because "
 			    "stdin is not a terminal.");
 		tty_flag = 0;