diff options
Diffstat (limited to 'debian/patches/keepalive-extensions.patch')
-rw-r--r-- | debian/patches/keepalive-extensions.patch | 61 |
1 files changed, 36 insertions, 25 deletions
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch index a851a91bf..61389cc44 100644 --- a/debian/patches/keepalive-extensions.patch +++ b/debian/patches/keepalive-extensions.patch | |||
@@ -1,24 +1,35 @@ | |||
1 | Description: Various keepalive extensions | 1 | From affb41e3cf23b79a3d165ae0d97689a46a965b6f Mon Sep 17 00:00:00 2001 |
2 | Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, | 2 | From: Richard Kettlewell <rjk@greenend.org.uk> |
3 | supported in previous versions of Debian's OpenSSH package but since | 3 | Date: Sun, 9 Feb 2014 16:09:52 +0000 |
4 | superseded by ServerAliveInterval. (We're probably stuck with this bit for | 4 | Subject: Various keepalive extensions |
5 | compatibility.) | 5 | |
6 | . | 6 | Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, supported |
7 | In batch mode, default ServerAliveInterval to five minutes. | 7 | in previous versions of Debian's OpenSSH package but since superseded by |
8 | . | 8 | ServerAliveInterval. (We're probably stuck with this bit for |
9 | Adjust documentation to match and to give some more advice on use of | 9 | compatibility.) |
10 | keepalives. | 10 | |
11 | Author: Richard Kettlewell <rjk@greenend.org.uk> | 11 | In batch mode, default ServerAliveInterval to five minutes. |
12 | |||
13 | Adjust documentation to match and to give some more advice on use of | ||
14 | keepalives. | ||
15 | |||
12 | Author: Ian Jackson <ian@chiark.greenend.org.uk> | 16 | Author: Ian Jackson <ian@chiark.greenend.org.uk> |
13 | Author: Matthew Vernon <matthew@debian.org> | 17 | Author: Matthew Vernon <matthew@debian.org> |
14 | Author: Colin Watson <cjwatson@debian.org> | 18 | Author: Colin Watson <cjwatson@debian.org> |
15 | Last-Update: 2013-09-14 | 19 | Last-Update: 2013-09-14 |
16 | 20 | ||
17 | Index: b/readconf.c | 21 | Patch-Name: keepalive-extensions.patch |
18 | =================================================================== | 22 | --- |
23 | readconf.c | 14 ++++++++++++-- | ||
24 | ssh_config.5 | 21 +++++++++++++++++++-- | ||
25 | sshd_config.5 | 3 +++ | ||
26 | 3 files changed, 34 insertions(+), 4 deletions(-) | ||
27 | |||
28 | diff --git a/readconf.c b/readconf.c | ||
29 | index 22e5a3a..2dcbf31 100644 | ||
19 | --- a/readconf.c | 30 | --- a/readconf.c |
20 | +++ b/readconf.c | 31 | +++ b/readconf.c |
21 | @@ -141,6 +141,7 @@ | 32 | @@ -141,6 +141,7 @@ typedef enum { |
22 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, | 33 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
23 | oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, | 34 | oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, |
24 | oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, | 35 | oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, |
@@ -26,7 +37,7 @@ Index: b/readconf.c | |||
26 | oIgnoredUnknownOption, oDeprecated, oUnsupported | 37 | oIgnoredUnknownOption, oDeprecated, oUnsupported |
27 | } OpCodes; | 38 | } OpCodes; |
28 | 39 | ||
29 | @@ -263,6 +264,8 @@ | 40 | @@ -263,6 +264,8 @@ static struct { |
30 | { "ipqos", oIPQoS }, | 41 | { "ipqos", oIPQoS }, |
31 | { "requesttty", oRequestTTY }, | 42 | { "requesttty", oRequestTTY }, |
32 | { "ignoreunknown", oIgnoreUnknown }, | 43 | { "ignoreunknown", oIgnoreUnknown }, |
@@ -35,7 +46,7 @@ Index: b/readconf.c | |||
35 | 46 | ||
36 | { NULL, oBadOption } | 47 | { NULL, oBadOption } |
37 | }; | 48 | }; |
38 | @@ -939,6 +942,8 @@ | 49 | @@ -939,6 +942,8 @@ parse_int: |
39 | goto parse_flag; | 50 | goto parse_flag; |
40 | 51 | ||
41 | case oServerAliveInterval: | 52 | case oServerAliveInterval: |
@@ -44,7 +55,7 @@ Index: b/readconf.c | |||
44 | intptr = &options->server_alive_interval; | 55 | intptr = &options->server_alive_interval; |
45 | goto parse_time; | 56 | goto parse_time; |
46 | 57 | ||
47 | @@ -1404,8 +1409,13 @@ | 58 | @@ -1404,8 +1409,13 @@ fill_default_options(Options * options) |
48 | options->rekey_interval = 0; | 59 | options->rekey_interval = 0; |
49 | if (options->verify_host_key_dns == -1) | 60 | if (options->verify_host_key_dns == -1) |
50 | options->verify_host_key_dns = 0; | 61 | options->verify_host_key_dns = 0; |
@@ -60,11 +71,11 @@ Index: b/readconf.c | |||
60 | if (options->server_alive_count_max == -1) | 71 | if (options->server_alive_count_max == -1) |
61 | options->server_alive_count_max = 3; | 72 | options->server_alive_count_max = 3; |
62 | if (options->control_master == -1) | 73 | if (options->control_master == -1) |
63 | Index: b/ssh_config.5 | 74 | diff --git a/ssh_config.5 b/ssh_config.5 |
64 | =================================================================== | 75 | index 89b25cd..135d833 100644 |
65 | --- a/ssh_config.5 | 76 | --- a/ssh_config.5 |
66 | +++ b/ssh_config.5 | 77 | +++ b/ssh_config.5 |
67 | @@ -136,8 +136,12 @@ | 78 | @@ -136,8 +136,12 @@ Valid arguments are |
68 | If set to | 79 | If set to |
69 | .Dq yes , | 80 | .Dq yes , |
70 | passphrase/password querying will be disabled. | 81 | passphrase/password querying will be disabled. |
@@ -78,7 +89,7 @@ Index: b/ssh_config.5 | |||
78 | The argument must be | 89 | The argument must be |
79 | .Dq yes | 90 | .Dq yes |
80 | or | 91 | or |
81 | @@ -1141,8 +1145,15 @@ | 92 | @@ -1141,8 +1145,15 @@ from the server, |
82 | will send a message through the encrypted | 93 | will send a message through the encrypted |
83 | channel to request a response from the server. | 94 | channel to request a response from the server. |
84 | The default | 95 | The default |
@@ -95,7 +106,7 @@ Index: b/ssh_config.5 | |||
95 | .It Cm StrictHostKeyChecking | 106 | .It Cm StrictHostKeyChecking |
96 | If this flag is set to | 107 | If this flag is set to |
97 | .Dq yes , | 108 | .Dq yes , |
98 | @@ -1181,6 +1192,12 @@ | 109 | @@ -1181,6 +1192,12 @@ Specifies whether the system should send TCP keepalive messages to the |
99 | other side. | 110 | other side. |
100 | If they are sent, death of the connection or crash of one | 111 | If they are sent, death of the connection or crash of one |
101 | of the machines will be properly noticed. | 112 | of the machines will be properly noticed. |
@@ -108,11 +119,11 @@ Index: b/ssh_config.5 | |||
108 | However, this means that | 119 | However, this means that |
109 | connections will die if the route is down temporarily, and some people | 120 | connections will die if the route is down temporarily, and some people |
110 | find it annoying. | 121 | find it annoying. |
111 | Index: b/sshd_config.5 | 122 | diff --git a/sshd_config.5 b/sshd_config.5 |
112 | =================================================================== | 123 | index 18ec81f..510cc7c 100644 |
113 | --- a/sshd_config.5 | 124 | --- a/sshd_config.5 |
114 | +++ b/sshd_config.5 | 125 | +++ b/sshd_config.5 |
115 | @@ -1161,6 +1161,9 @@ | 126 | @@ -1161,6 +1161,9 @@ This avoids infinitely hanging sessions. |
116 | .Pp | 127 | .Pp |
117 | To disable TCP keepalive messages, the value should be set to | 128 | To disable TCP keepalive messages, the value should be set to |
118 | .Dq no . | 129 | .Dq no . |