summaryrefslogtreecommitdiff
path: root/debian/patches/debian-banner.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-04-03 18:41:24 +0100
committerColin Watson <cjwatson@debian.org>2018-04-03 18:41:51 +0100
commit812462303fb4b0b1b9a175be508b78abc289d399 (patch)
treee437ba79ce9f0fbbdd068a8304baf31a637249d6 /debian/patches/debian-banner.patch
parent6343f33577c712fa8986d4f5a747d8e530571bb8 (diff)
parentea67bc97339c9a507343e4a1f5fb867f678fbe1d (diff)
Fix parsing of DebianBanner option
Closes: #894730
Diffstat (limited to 'debian/patches/debian-banner.patch')
-rw-r--r--debian/patches/debian-banner.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index bc87d31b4..b1338d2c7 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
1From 39e593d349cde42b6b5aac669a42eb1749ef70af Mon Sep 17 00:00:00 2001 1From 9ec4db016a0510c449f9cefeb3299c2e755698c7 Mon Sep 17 00:00:00 2001
2From: Kees Cook <kees@debian.org> 2From: Kees Cook <kees@debian.org>
3Date: Sun, 9 Feb 2014 16:10:06 +0000 3Date: Sun, 9 Feb 2014 16:10:06 +0000
4Subject: Add DebianBanner server configuration option 4Subject: Add DebianBanner server configuration option
@@ -8,7 +8,7 @@ initial protocol handshake, for those scared by package-versioning.patch.
8 8
9Bug-Debian: http://bugs.debian.org/562048 9Bug-Debian: http://bugs.debian.org/562048
10Forwarded: not-needed 10Forwarded: not-needed
11Last-Update: 2017-10-04 11Last-Update: 2018-04-03
12 12
13Patch-Name: debian-banner.patch 13Patch-Name: debian-banner.patch
14--- 14---
@@ -19,7 +19,7 @@ Patch-Name: debian-banner.patch
19 4 files changed, 18 insertions(+), 1 deletion(-) 19 4 files changed, 18 insertions(+), 1 deletion(-)
20 20
21diff --git a/servconf.c b/servconf.c 21diff --git a/servconf.c b/servconf.c
22index 3fff3d53..5be47aec 100644 22index 3fff3d53..0a8f6fd6 100644
23--- a/servconf.c 23--- a/servconf.c
24+++ b/servconf.c 24+++ b/servconf.c
25@@ -177,6 +177,7 @@ initialize_server_options(ServerOptions *options) 25@@ -177,6 +177,7 @@ initialize_server_options(ServerOptions *options)
@@ -61,7 +61,7 @@ index 3fff3d53..5be47aec 100644
61 61
62+ case sDebianBanner: 62+ case sDebianBanner:
63+ intptr = &options->debian_banner; 63+ intptr = &options->debian_banner;
64+ goto parse_int; 64+ goto parse_flag;
65+ 65+
66 case sDeprecated: 66 case sDeprecated:
67 case sIgnore: 67 case sIgnore: