diff options
Diffstat (limited to 'debian/patches/syslog-level-silent.patch')
-rw-r--r-- | debian/patches/syslog-level-silent.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch new file mode 100644 index 000000000..2dc912b8e --- /dev/null +++ b/debian/patches/syslog-level-silent.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Description: "LogLevel SILENT" compatibility | ||
2 | "LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to | ||
3 | match the behaviour of non-free SSH, in which -q does not suppress fatal | ||
4 | errors. However, this was unintentionally broken in 1:4.6p1-2 and nobody | ||
5 | complained, so we've dropped most of it. The parts that remain are basic | ||
6 | configuration file compatibility, and an adjustment to "Pseudo-terminal | ||
7 | will not be allocated ..." which should be split out into a separate patch. | ||
8 | Author: Jonathan David Amery <jdamery@ysolde.ucam.org> | ||
9 | Author: Matthew Vernon <matthew@debian.org> | ||
10 | Author: Colin Watson <cjwatson@debian.org> | ||
11 | Last-Update: 2010-03-31 | ||
12 | |||
13 | Index: b/log.c | ||
14 | =================================================================== | ||
15 | --- a/log.c | ||
16 | +++ b/log.c | ||
17 | @@ -90,6 +90,7 @@ | ||
18 | LogLevel val; | ||
19 | } log_levels[] = | ||
20 | { | ||
21 | + { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */ | ||
22 | { "QUIET", SYSLOG_LEVEL_QUIET }, | ||
23 | { "FATAL", SYSLOG_LEVEL_FATAL }, | ||
24 | { "ERROR", SYSLOG_LEVEL_ERROR }, | ||
25 | Index: b/ssh.c | ||
26 | =================================================================== | ||
27 | --- a/ssh.c | ||
28 | +++ b/ssh.c | ||
29 | @@ -624,7 +624,7 @@ | ||
30 | tty_flag = 0; | ||
31 | /* Do not allocate a tty if stdin is not a tty. */ | ||
32 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { | ||
33 | - if (tty_flag) | ||
34 | + if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) | ||
35 | logit("Pseudo-terminal will not be allocated because " | ||
36 | "stdin is not a terminal."); | ||
37 | tty_flag = 0; | ||