diff options
Diffstat (limited to 'debian/patches/keepalive-extensions.patch')
| -rw-r--r-- | debian/patches/keepalive-extensions.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch index b271f71..139084a 100644 --- a/debian/patches/keepalive-extensions.patch +++ b/debian/patches/keepalive-extensions.patch @@ -1,4 +1,4 @@ -From 07b232eaa2b9236e66282d4f126f1023d41efc0e Mon Sep 17 00:00:00 2001 +From 2b4e16a9212c0c8924e528e45871c75bfb0662b3 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 93e431d71..bd2e78ab7 100644 +index 0f0fb67a5..c6e609fca 100644 --- a/readconf.c +++ b/readconf.c @@ -182,6 +182,7 @@ typedef enum { @@ -46,7 +46,7 @@ index 93e431d71..bd2e78ab7 100644 { NULL, oBadOption } }; -@@ -1867,6 +1870,8 @@ parse_pubkey_algos: +@@ -1886,6 +1889,8 @@ parse_pubkey_algos: goto parse_flag; case oServerAliveInterval: @@ -55,7 +55,7 @@ index 93e431d71..bd2e78ab7 100644 intptr = &options->server_alive_interval; goto parse_time; -@@ -2820,8 +2825,13 @@ fill_default_options(Options * options) +@@ -2859,8 +2864,13 @@ fill_default_options(Options * options) options->rekey_interval = 0; if (options->verify_host_key_dns == -1) options->verify_host_key_dns = 0; @@ -72,7 +72,7 @@ index 93e431d71..bd2e78ab7 100644 options->server_alive_count_max = 3; if (options->control_master == -1) diff --git a/ssh_config.5 b/ssh_config.5 -index 7ca72aedf..25ccbed28 100644 +index 8e8aeb640..6b482ee15 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -297,9 +297,13 @@ If set to @@ -90,7 +90,7 @@ index 7ca72aedf..25ccbed28 100644 The argument must be .Cm yes or -@@ -1913,7 +1917,14 @@ from the server, +@@ -1923,7 +1927,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 7ca72aedf..25ccbed28 100644 .It Cm SessionType May be used to either request invocation of a subsystem on the remote system, or to prevent the execution of a remote command at all. -@@ -2027,6 +2038,12 @@ Specifies whether the system should send TCP keepalive messages to the +@@ -2037,6 +2048,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 7ca72aedf..25ccbed28 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 d2f09de9b..5de2fd8cf 100644 +index c0c1b0d9a..e06ef8abd 100644 --- a/sshd_config.5 +++ b/sshd_config.5 -@@ -1842,6 +1842,9 @@ This avoids infinitely hanging sessions. +@@ -1859,6 +1859,9 @@ This avoids infinitely hanging sessions. .Pp To disable TCP keepalive messages, the value should be set to .Cm no . |