1 files changed, 135 insertions, 0 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
new file mode 100644
index 000000000..00066c220
--- /dev/null
+++ b/debian/patches/keepalive-extensions.patch
@@ -0,0 +1,135 @@
+From 81540b7886fdc73c7be304706ea33d6d87b5fc81 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
+
+Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, supported
+in previous versions of Debian's OpenSSH package but since superseded by
+ServerAliveInterval.  (We're probably stuck with this bit for
+compatibility.)
+
+In batch mode, default ServerAliveInterval to five minutes.
+
+Adjust documentation to match and to give some more advice on use of
+keepalives.
+
+Author: Ian Jackson <ian@chiark.greenend.org.uk>
+Author: Matthew Vernon <matthew@debian.org>
+Author: Colin Watson <cjwatson@debian.org>
+Last-Update: 2013-09-14
+
+Patch-Name: keepalive-extensions.patch
+---
+ readconf.c    |   14 ++++++++++++--
+ ssh_config.5  |   21 +++++++++++++++++++--
+ sshd_config.5 |    3 +++
+ 3 files changed, 34 insertions(+), 4 deletions(-)
+
+diff --git a/readconf.c b/readconf.c
+index bcd8cad..6409937 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -151,6 +151,7 @@ typedef enum {
+        oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
+        oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
+        oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
++       oProtocolKeepAlives, oSetupTimeOut,
+        oIgnoredUnknownOption, oDeprecated, oUnsupported
+ } OpCodes;
+ 
+@@ -274,6 +275,8 @@ static struct {
+        { "canonicalizemaxdots", oCanonicalizeMaxDots },
+        { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
+        { "ignoreunknown", oIgnoreUnknown },
++       { "protocolkeepalives", oProtocolKeepAlives },
++       { "setuptimeout", oSetupTimeOut },
+ 
+        { NULL, oBadOption }
+ };
+@@ -1247,6 +1250,8 @@ parse_int:
+                goto parse_flag;
+ 
+        case oServerAliveInterval:
++       case oProtocolKeepAlives: /* Debian-specific compatibility alias */
++       case oSetupTimeOut:       /* Debian-specific compatibility alias */
+                intptr = &options->server_alive_interval;
+                goto parse_time;
+ 
+@@ -1746,8 +1751,13 @@ fill_default_options(Options * options)
+                options->rekey_interval = 0;
+        if (options->verify_host_key_dns == -1)
+                options->verify_host_key_dns = 0;
+-       if (options->server_alive_interval == -1)
+-               options->server_alive_interval = 0;
++       if (options->server_alive_interval == -1) {
++               /* in batch mode, default is 5mins */
++               if (options->batch_mode == 1)
++                       options->server_alive_interval = 300;
++               else
++                       options->server_alive_interval = 0;
++       }
+        if (options->server_alive_count_max == -1)
+                options->server_alive_count_max = 3;
+        if (options->control_master == -1)
+diff --git a/ssh_config.5 b/ssh_config.5
+index 473971e..3172fd4 100644
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -205,8 +205,12 @@ Valid arguments are
+ If set to
+ .Dq yes ,
+ passphrase/password querying will be disabled.
++In addition, the
++.Cm ServerAliveInterval
++option will be set to 300 seconds by default.
+ This option is useful in scripts and other batch jobs where no user
+-is present to supply the password.
++is present to supply the password,
++and where it is desirable to detect a broken network swiftly.
+ The argument must be
+ .Dq yes
+ or
+@@ -1305,8 +1309,15 @@ from the server,
+ will send a message through the encrypted
+ channel to request a response from the server.
+ The default
+-is 0, indicating that these messages will not be sent to the server.
++is 0, indicating that these messages will not be sent to the server,
++or 300 if the
++.Cm BatchMode
++option is set.
+ This option applies to protocol version 2 only.
++.Cm ProtocolKeepAlives
++and
++.Cm SetupTimeOut
++are Debian-specific compatibility aliases for this option.
+ .It Cm StrictHostKeyChecking
+ If this flag is set to
+ .Dq yes ,
+@@ -1345,6 +1356,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.
++This option only uses TCP keepalives (as opposed to using ssh level
++keepalives), so takes a long time to notice when the connection dies.
++As such, you probably want
++the
++.Cm ServerAliveInterval
++option as well.
+ However, this means that
+ 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 ceed88a..2164d58 100644
+--- a/sshd_config.5
++++ b/sshd_config.5
+@@ -1183,6 +1183,9 @@ This avoids infinitely hanging sessions.
+ .Pp
+ To disable TCP keepalive messages, the value should be set to
+ .Dq no .
++.Pp
++This option was formerly called
++.Cm KeepAlive .
+ .It Cm TrustedUserCAKeys
+ Specifies a file containing public keys of certificate authorities that are
+ trusted to sign user certificates for authentication.