diff options
author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:36:13 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:39:41 +0000 |
commit | 2028ecabc263b3e43903b8d170f4bbd07fe408e9 (patch) | |
tree | 565242aad1c1d73b6d99f9bf2c62278fca5bdd8c /debian/patches/debian-banner.patch | |
parent | 18a9bd1867ee6fb9d913515773b322a279759b5d (diff) | |
parent | 733c4de05612fe398ac3dc7d31d318d7012fda05 (diff) |
New upstream release (7.1p1).
Diffstat (limited to 'debian/patches/debian-banner.patch')
-rw-r--r-- | debian/patches/debian-banner.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch index 35659cd33..59de3b115 100644 --- a/debian/patches/debian-banner.patch +++ b/debian/patches/debian-banner.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bb18ca3880d333834c89f535032cdf12bc362fdf Mon Sep 17 00:00:00 2001 | 1 | From e4e2b402150f28abadcd565941ab51c2bcbac8ce Mon Sep 17 00:00:00 2001 |
2 | From: Kees Cook <kees@debian.org> | 2 | From: Kees Cook <kees@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:06 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:06 +0000 |
4 | Subject: Add DebianBanner server configuration option | 4 | Subject: Add DebianBanner server configuration option |
@@ -80,7 +80,7 @@ index 778ba17..161fa37 100644 | |||
80 | 80 | ||
81 | /* Information about the incoming connection as used by Match */ | 81 | /* Information about the incoming connection as used by Match */ |
82 | diff --git a/sshd.c b/sshd.c | 82 | diff --git a/sshd.c b/sshd.c |
83 | index e3ac37b..d9f5199 100644 | 83 | index 0d4fb7f..6024e0e 100644 |
84 | --- a/sshd.c | 84 | --- a/sshd.c |
85 | +++ b/sshd.c | 85 | +++ b/sshd.c |
86 | @@ -443,7 +443,8 @@ sshd_exchange_identification(int sock_in, int sock_out) | 86 | @@ -443,7 +443,8 @@ sshd_exchange_identification(int sock_in, int sock_out) |
@@ -94,7 +94,7 @@ index e3ac37b..d9f5199 100644 | |||
94 | options.version_addendum, newline); | 94 | options.version_addendum, newline); |
95 | 95 | ||
96 | diff --git a/sshd_config.5 b/sshd_config.5 | 96 | diff --git a/sshd_config.5 b/sshd_config.5 |
97 | index 154e87e..641e1fa 100644 | 97 | index c8ee35d..b149bd3 100644 |
98 | --- a/sshd_config.5 | 98 | --- a/sshd_config.5 |
99 | +++ b/sshd_config.5 | 99 | +++ b/sshd_config.5 |
100 | @@ -533,6 +533,11 @@ or | 100 | @@ -533,6 +533,11 @@ or |