1 files changed, 10 insertions, 10 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 4a26d9d31..c9bc83267 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 24c9c811bfd227e467ab1ce00503f08dcc22c0f4 Mon Sep 17 00:00:00 2001
+From 164d1c9f11309d38273ac64e30eda2baa3733f78 Mon Sep 17 00:00:00 2001
 From: Richard Kettlewell <rjk@greenend.org.uk>
 Date: Sun, 9 Feb 2014 16:09:52 +0000
 Subject: Various keepalive extensions
@@ -26,7 +26,7 @@ Patch-Name: keepalive-extensions.patch
  3 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 2ccc48572..431243193 100644
+index b069333fa..3d0a812b3 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -176,6 +176,7 @@ typedef enum {
@@ -46,7 +46,7 @@ index 2ccc48572..431243193 100644
  
         { NULL, oBadOption }
  };
-@@ -1519,6 +1522,8 @@ parse_keytypes:
+@@ -1534,6 +1537,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 2ccc48572..431243193 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -2222,8 +2227,13 @@ fill_default_options(Options * options)
+@@ -2266,8 +2271,13 @@ fill_default_options(Options * options)
                 options->rekey_interval = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -72,10 +72,10 @@ index 2ccc48572..431243193 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index e2a2359f9..85ab7447f 100644
+index bd86d000c..3ceb800ba 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -266,9 +266,13 @@ If set to
+@@ -275,9 +275,13 @@ If set to
  .Cm yes ,
  user interaction such as password prompts and host key confirmation requests
  will be disabled.
@@ -90,7 +90,7 @@ index e2a2359f9..85ab7447f 100644
  The argument must be
  .Cm yes
  or
-@@ -1604,7 +1608,14 @@ from the server,
+@@ -1624,7 +1628,14 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -106,7 +106,7 @@ index e2a2359f9..85ab7447f 100644
  .It Cm SetEnv
  Directly specify one or more environment variables and their contents to
  be sent to the server.
-@@ -1684,6 +1695,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1704,6 +1715,12 @@ Specifies whether the system should send TCP keepalive messages to the
  other side.
  If they are sent, death of the connection or crash of one
  of the machines will be properly noticed.
@@ -120,10 +120,10 @@ index e2a2359f9..85ab7447f 100644
  connections will die if the route is down temporarily, and some people
  find it annoying.
 diff --git a/sshd_config.5 b/sshd_config.5
-index 360e5fb1a..9f093be1f 100644
+index eabbe9e73..6457620bb 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1680,6 +1680,9 @@ This avoids infinitely hanging sessions.
+@@ -1691,6 +1691,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Cm no .