New upstream release (6.9p1).

1 files changed, 12 insertions, 12 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 5bc70a566..42fc5be76 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 2c31a85436f1eac46e185382c2aa15406ae6c0ac Mon Sep 17 00:00:00 2001
+From 91729e3501d53d11fcc7a364b36994305c495945 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
@@ -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 b3a2841..bec53e0 100644
+index 8a5bd7b..fe3e311 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -166,6 +166,7 @@ initialize_server_options(ServerOptions *options)
+@@ -169,6 +169,7 @@ initialize_server_options(ServerOptions *options)
         options->ip_qos_bulk = -1;
         options->version_addendum = NULL;
         options->fingerprint_hash = -1;
@@ -30,7 +30,7 @@ index b3a2841..bec53e0 100644
  }
  
  /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
-@@ -342,6 +343,8 @@ fill_default_server_options(ServerOptions *options)
+@@ -347,6 +348,8 @@ fill_default_server_options(ServerOptions *options)
                 options->fwd_opts.streamlocal_bind_unlink = 0;
         if (options->fingerprint_hash == -1)
                 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
@@ -39,7 +39,7 @@ index b3a2841..bec53e0 100644
         /* Turn privilege separation on by default */
         if (use_privsep == -1)
                 use_privsep = PRIVSEP_NOSANDBOX;
-@@ -412,6 +415,7 @@ typedef enum {
+@@ -419,6 +422,7 @@ typedef enum {
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash,
@@ -47,7 +47,7 @@ index b3a2841..bec53e0 100644
         sDeprecated, sUnsupported
  } ServerOpCodes;
  
-@@ -556,6 +560,7 @@ static struct {
+@@ -565,6 +569,7 @@ static struct {
         { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
         { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
         { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
@@ -55,7 +55,7 @@ index b3a2841..bec53e0 100644
         { NULL, sBadOption, 0 }
  };
  
-@@ -1777,6 +1782,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1850,6 +1855,10 @@ process_server_config_line(ServerOptions *options, char *line,
                         options->fingerprint_hash = value;
                 break;
  
@@ -67,10 +67,10 @@ index b3a2841..bec53e0 100644
                 logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);
 diff --git a/servconf.h b/servconf.h
-index d2ed4d7..ed0f171 100644
+index b99b270..ba7b739 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -192,6 +192,8 @@ typedef struct {
+@@ -196,6 +196,8 @@ typedef struct {
         char   *auth_methods[MAX_AUTH_METHODS];
  
         int     fingerprint_hash;
@@ -80,7 +80,7 @@ index d2ed4d7..ed0f171 100644
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index c362209..5435968 100644
+index 96e75c6..7886d0e 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -442,7 +442,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
@@ -94,10 +94,10 @@ index c362209..5435968 100644
             options.version_addendum, newline);
  
 diff --git a/sshd_config.5 b/sshd_config.5
-index d14576e..ec58635 100644
+index 1269bbd..a5afbc3 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -476,6 +476,11 @@ or
+@@ -528,6 +528,11 @@ or
  .Dq no .
  The default is
  .Dq delayed .