diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-08-19 14:23:51 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 16:48:11 +0100 |
| commit | 0f0841b2d28b7463267d4d91577e72e3340a1d3a (patch) | |
| tree | ba55fcd2b6e2cc22b30f5afb561dbb3da4c8b6c7 /debian/patches/syslog-level-silent.patch | |
| parent | f2a5f5dae656759efb0b76c3d94890b65c197a02 (diff) | |
| parent | 8698446b972003b63dfe5dcbdb86acfe986afb85 (diff) | |
New upstream release (6.8p1).
Diffstat (limited to 'debian/patches/syslog-level-silent.patch')
| -rw-r--r-- | debian/patches/syslog-level-silent.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch index bfc236927..d760e6c19 100644 --- a/debian/patches/syslog-level-silent.patch +++ b/debian/patches/syslog-level-silent.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 69f7c00e04d1baa01a9038eeb764cfed0830fb19 Mon Sep 17 00:00:00 2001 | 1 | From fbe5bd9e957ea90404158b3a3c11a6b91fe6f010 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jonathan David Amery <jdamery@ysolde.ucam.org> | 2 | From: Jonathan David Amery <jdamery@ysolde.ucam.org> |
| 3 | Date: Sun, 9 Feb 2014 16:09:54 +0000 | 3 | Date: Sun, 9 Feb 2014 16:09:54 +0000 |
| 4 | Subject: "LogLevel SILENT" compatibility | 4 | Subject: "LogLevel SILENT" compatibility |
| @@ -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 }, |
| 35 | diff --git a/ssh.c b/ssh.c | 35 | diff --git a/ssh.c b/ssh.c |
| 36 | index 26e9681..5bce695 100644 | 36 | index 0ad82f0..e8be6fe 100644 |
| 37 | --- a/ssh.c | 37 | --- a/ssh.c |
| 38 | +++ b/ssh.c | 38 | +++ b/ssh.c |
| 39 | @@ -989,7 +989,7 @@ main(int ac, char **av) | 39 | @@ -1107,7 +1107,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) { |