1 files changed, 25 insertions, 25 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 49219cf93..ab64cbed5 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 9fcad888f4dbf0ecc0c7e87b6ef0f8d88d7ac3ec Mon Sep 17 00:00:00 2001
+From 114c8a8fb488cbe39507edb75c51198a4b9e8b24 Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees@debian.org>
 Date: Sun, 9 Feb 2014 16:10:06 +0000
 Subject: Add DebianBanner server configuration option
@@ -8,7 +8,7 @@ initial protocol handshake, for those scared by package-versioning.patch.
 
 Bug-Debian: http://bugs.debian.org/562048
 Forwarded: not-needed
-Last-Update: 2013-09-14
+Last-Update: 2014-10-07
 
 Patch-Name: debian-banner.patch
 ---
@@ -19,10 +19,10 @@ Patch-Name: debian-banner.patch
  4 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/servconf.c b/servconf.c
-index 90de888..37fd2de 100644
+index a252487..6c7741a 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -156,6 +156,7 @@ initialize_server_options(ServerOptions *options)
+@@ -160,6 +160,7 @@ initialize_server_options(ServerOptions *options)
         options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;
         options->version_addendum = NULL;
@@ -30,34 +30,34 @@ index 90de888..37fd2de 100644
  }
  
  void
-@@ -309,6 +310,8 @@ fill_default_server_options(ServerOptions *options)
-                options->ip_qos_bulk = IPTOS_THROUGHPUT;
-        if (options->version_addendum == NULL)
-                options->version_addendum = xstrdup("");
+@@ -321,6 +322,8 @@ fill_default_server_options(ServerOptions *options)
+                options->fwd_opts.streamlocal_bind_mask = 0177;
+        if (options->fwd_opts.streamlocal_bind_unlink == -1)
+                options->fwd_opts.streamlocal_bind_unlink = 0;
 +       if (options->debian_banner == -1)
 +               options->debian_banner = 1;
         /* Turn privilege separation on by default */
         if (use_privsep == -1)
                 use_privsep = PRIVSEP_NOSANDBOX;
-@@ -359,6 +362,7 @@ typedef enum {
-        sKexAlgorithms, sIPQoS, sVersionAddendum,
-        sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,
-        sAuthenticationMethods, sHostKeyAgent,
+@@ -373,6 +376,7 @@ typedef enum {
+        sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
+        sStreamLocalBindMask, sStreamLocalBindUnlink,
+        sAllowStreamLocalForwarding,
 +       sDebianBanner,
         sDeprecated, sUnsupported
  } ServerOpCodes;
  
-@@ -496,6 +500,7 @@ static struct {
-        { "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },
-        { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL },
-        { "authenticationmethods", sAuthenticationMethods, SSHCFG_ALL },
+@@ -514,6 +518,7 @@ static struct {
+        { "streamlocalbindmask", sStreamLocalBindMask, SSHCFG_ALL },
+        { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
+        { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
 +       { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
         { NULL, sBadOption, 0 }
  };
  
-@@ -1654,6 +1659,10 @@ process_server_config_line(ServerOptions *options, char *line,
-                }
-                return 0;
+@@ -1697,6 +1702,10 @@ process_server_config_line(ServerOptions *options, char *line,
+                intptr = &options->fwd_opts.streamlocal_bind_unlink;
+                goto parse_flag;
  
 +       case sDebianBanner:
 +               intptr = &options->debian_banner;
@@ -67,10 +67,10 @@ index 90de888..37fd2de 100644
                 logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);
 diff --git a/servconf.h b/servconf.h
-index c922eb5..dcd1c2a 100644
+index f8265a8..fa48804 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -186,6 +186,8 @@ typedef struct {
+@@ -188,6 +188,8 @@ typedef struct {
  
         u_int   num_auth_methods;
         char   *auth_methods[MAX_AUTH_METHODS];
@@ -80,10 +80,10 @@ index c922eb5..dcd1c2a 100644
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index af9b8f1..665c0b9 100644
+index 1710e71..87331c1 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -440,7 +440,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
+@@ -443,7 +443,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
@@ -94,10 +94,10 @@ index af9b8f1..665c0b9 100644
             options.version_addendum, newline);
  
 diff --git a/sshd_config.5 b/sshd_config.5
-index 2164d58..8f078f6 100644
+index 2843048..58997d3 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -413,6 +413,11 @@ or
+@@ -447,6 +447,11 @@ or
  .Dq no .
  The default is
  .Dq delayed .