summaryrefslogtreecommitdiff
path: root/debian/patches/syslog-level-silent.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-11-29 17:18:35 +0000
committerColin Watson <cjwatson@debian.org>2015-11-29 17:32:50 +0000
commit0b372585c0026f78676f1414510ec9f87a383803 (patch)
treea3fa6b329a8a5e9841b526f30332d21fc110118a /debian/patches/syslog-level-silent.patch
parent24ffa45372888d206f21e1864e3911024c6d5e62 (diff)
parent6d0faf6dc76ac8cc73d6f8e478db7c97f7013a2d (diff)
New upstream release (7.0p1).
Diffstat (limited to 'debian/patches/syslog-level-silent.patch')
-rw-r--r--debian/patches/syslog-level-silent.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index dd8fe6904..aca618985 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -1,4 +1,4 @@
1From ff5dffb6e1e7b0c5cd6cf8f47fa89bcef10e666d Mon Sep 17 00:00:00 2001 1From 19ab567e88d730a6862aab3fb33e399a9c3f67b2 Mon Sep 17 00:00:00 2001
2From: Jonathan David Amery <jdamery@ysolde.ucam.org> 2From: Jonathan David Amery <jdamery@ysolde.ucam.org>
3Date: Sun, 9 Feb 2014 16:09:54 +0000 3Date: Sun, 9 Feb 2014 16:09:54 +0000
4Subject: "LogLevel SILENT" compatibility 4Subject: "LogLevel SILENT" compatibility
@@ -21,10 +21,10 @@ Patch-Name: syslog-level-silent.patch
21 2 files changed, 2 insertions(+), 1 deletion(-) 21 2 files changed, 2 insertions(+), 1 deletion(-)
22 22
23diff --git a/log.c b/log.c 23diff --git a/log.c b/log.c
24index 32e1d2e..53e7b65 100644 24index ad12930..e68b84a 100644
25--- a/log.c 25--- a/log.c
26+++ b/log.c 26+++ b/log.c
27@@ -94,6 +94,7 @@ static struct { 27@@ -93,6 +93,7 @@ static struct {
28 LogLevel val; 28 LogLevel val;
29 } log_levels[] = 29 } log_levels[] =
30 { 30 {
@@ -33,10 +33,10 @@ index 32e1d2e..53e7b65 100644
33 { "FATAL", SYSLOG_LEVEL_FATAL }, 33 { "FATAL", SYSLOG_LEVEL_FATAL },
34 { "ERROR", SYSLOG_LEVEL_ERROR }, 34 { "ERROR", SYSLOG_LEVEL_ERROR },
35diff --git a/ssh.c b/ssh.c 35diff --git a/ssh.c b/ssh.c
36index 3fd5a94..d99f7ef 100644 36index 59c1f93..712ea0e 100644
37--- a/ssh.c 37--- a/ssh.c
38+++ b/ssh.c 38+++ b/ssh.c
39@@ -1105,7 +1105,7 @@ main(int ac, char **av) 39@@ -1106,7 +1106,7 @@ main(int ac, char **av)
40 /* Do not allocate a tty if stdin is not a tty. */ 40 /* Do not allocate a tty if stdin is not a tty. */
41 if ((!isatty(fileno(stdin)) || stdin_null_flag) && 41 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
42 options.request_tty != REQUEST_TTY_FORCE) { 42 options.request_tty != REQUEST_TTY_FORCE) {