diff options
Diffstat (limited to 'debian/patches/syslog-level-silent.patch')
-rw-r--r-- | debian/patches/syslog-level-silent.patch | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch index f8be76c89..a1eaa7513 100644 --- a/debian/patches/syslog-level-silent.patch +++ b/debian/patches/syslog-level-silent.patch | |||
@@ -1,20 +1,30 @@ | |||
1 | Description: "LogLevel SILENT" compatibility | 1 | From bbddcd71a027a33919f859f35dae800335a2de6a Mon Sep 17 00:00:00 2001 |
2 | "LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to | 2 | From: Jonathan David Amery <jdamery@ysolde.ucam.org> |
3 | match the behaviour of non-free SSH, in which -q does not suppress fatal | 3 | Date: Sun, 9 Feb 2014 16:09:54 +0000 |
4 | errors. However, this was unintentionally broken in 1:4.6p1-2 and nobody | 4 | Subject: "LogLevel SILENT" compatibility |
5 | complained, so we've dropped most of it. The parts that remain are basic | 5 | |
6 | configuration file compatibility, and an adjustment to "Pseudo-terminal | 6 | "LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to |
7 | will not be allocated ..." which should be split out into a separate patch. | 7 | match the behaviour of non-free SSH, in which -q does not suppress fatal |
8 | Author: Jonathan David Amery <jdamery@ysolde.ucam.org> | 8 | errors. However, this was unintentionally broken in 1:4.6p1-2 and nobody |
9 | complained, so we've dropped most of it. The parts that remain are basic | ||
10 | configuration file compatibility, and an adjustment to "Pseudo-terminal will | ||
11 | not be allocated ..." which should be split out into a separate patch. | ||
12 | |||
9 | Author: Matthew Vernon <matthew@debian.org> | 13 | Author: Matthew Vernon <matthew@debian.org> |
10 | Author: Colin Watson <cjwatson@debian.org> | 14 | Author: Colin Watson <cjwatson@debian.org> |
11 | Last-Update: 2013-09-14 | 15 | Last-Update: 2013-09-14 |
12 | 16 | ||
13 | Index: b/log.c | 17 | Patch-Name: syslog-level-silent.patch |
14 | =================================================================== | 18 | --- |
19 | log.c | 1 + | ||
20 | ssh.c | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/log.c b/log.c | ||
24 | index 32e1d2e..53e7b65 100644 | ||
15 | --- a/log.c | 25 | --- a/log.c |
16 | +++ b/log.c | 26 | +++ b/log.c |
17 | @@ -94,6 +94,7 @@ | 27 | @@ -94,6 +94,7 @@ static struct { |
18 | LogLevel val; | 28 | LogLevel val; |
19 | } log_levels[] = | 29 | } log_levels[] = |
20 | { | 30 | { |
@@ -22,11 +32,11 @@ Index: b/log.c | |||
22 | { "QUIET", SYSLOG_LEVEL_QUIET }, | 32 | { "QUIET", SYSLOG_LEVEL_QUIET }, |
23 | { "FATAL", SYSLOG_LEVEL_FATAL }, | 33 | { "FATAL", SYSLOG_LEVEL_FATAL }, |
24 | { "ERROR", SYSLOG_LEVEL_ERROR }, | 34 | { "ERROR", SYSLOG_LEVEL_ERROR }, |
25 | Index: b/ssh.c | 35 | diff --git a/ssh.c b/ssh.c |
26 | =================================================================== | 36 | index 567248d..219a466 100644 |
27 | --- a/ssh.c | 37 | --- a/ssh.c |
28 | +++ b/ssh.c | 38 | +++ b/ssh.c |
29 | @@ -740,7 +740,7 @@ | 39 | @@ -740,7 +740,7 @@ main(int ac, char **av) |
30 | /* Do not allocate a tty if stdin is not a tty. */ | 40 | /* Do not allocate a tty if stdin is not a tty. */ |
31 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 41 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
32 | options.request_tty != REQUEST_TTY_FORCE) { | 42 | options.request_tty != REQUEST_TTY_FORCE) { |