diff options
Diffstat (limited to 'debian/patches/keepalive-extensions.patch')
-rw-r--r-- | debian/patches/keepalive-extensions.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch index 14ab7d34f..11378586d 100644 --- a/debian/patches/keepalive-extensions.patch +++ b/debian/patches/keepalive-extensions.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 67c34f23edbcd0f39ebc2aadae9d33950bd1f98a Mon Sep 17 00:00:00 2001 | 1 | From 8f60ff6d23d4a1f8c347cf4b95267e00116f74fa Mon Sep 17 00:00:00 2001 |
2 | From: Richard Kettlewell <rjk@greenend.org.uk> | 2 | From: Richard Kettlewell <rjk@greenend.org.uk> |
3 | Date: Sun, 9 Feb 2014 16:09:52 +0000 | 3 | Date: Sun, 9 Feb 2014 16:09:52 +0000 |
4 | Subject: Various keepalive extensions | 4 | Subject: Various keepalive extensions |
@@ -26,7 +26,7 @@ Patch-Name: keepalive-extensions.patch | |||
26 | 3 files changed, 34 insertions(+), 4 deletions(-) | 26 | 3 files changed, 34 insertions(+), 4 deletions(-) |
27 | 27 | ||
28 | diff --git a/readconf.c b/readconf.c | 28 | diff --git a/readconf.c b/readconf.c |
29 | index c0b7822..3a6c67b 100644 | 29 | index c1c3aae0..3efba242 100644 |
30 | --- a/readconf.c | 30 | --- a/readconf.c |
31 | +++ b/readconf.c | 31 | +++ b/readconf.c |
32 | @@ -173,6 +173,7 @@ typedef enum { | 32 | @@ -173,6 +173,7 @@ typedef enum { |
@@ -46,7 +46,7 @@ index c0b7822..3a6c67b 100644 | |||
46 | 46 | ||
47 | { NULL, oBadOption } | 47 | { NULL, oBadOption } |
48 | }; | 48 | }; |
49 | @@ -1403,6 +1406,8 @@ parse_keytypes: | 49 | @@ -1402,6 +1405,8 @@ parse_keytypes: |
50 | goto parse_flag; | 50 | goto parse_flag; |
51 | 51 | ||
52 | case oServerAliveInterval: | 52 | case oServerAliveInterval: |
@@ -55,7 +55,7 @@ index c0b7822..3a6c67b 100644 | |||
55 | intptr = &options->server_alive_interval; | 55 | intptr = &options->server_alive_interval; |
56 | goto parse_time; | 56 | goto parse_time; |
57 | 57 | ||
58 | @@ -2048,8 +2053,13 @@ fill_default_options(Options * options) | 58 | @@ -2047,8 +2052,13 @@ fill_default_options(Options * options) |
59 | options->rekey_interval = 0; | 59 | options->rekey_interval = 0; |
60 | if (options->verify_host_key_dns == -1) | 60 | if (options->verify_host_key_dns == -1) |
61 | options->verify_host_key_dns = 0; | 61 | options->verify_host_key_dns = 0; |
@@ -72,12 +72,12 @@ index c0b7822..3a6c67b 100644 | |||
72 | options->server_alive_count_max = 3; | 72 | options->server_alive_count_max = 3; |
73 | if (options->control_master == -1) | 73 | if (options->control_master == -1) |
74 | diff --git a/ssh_config.5 b/ssh_config.5 | 74 | diff --git a/ssh_config.5 b/ssh_config.5 |
75 | index 707d0e1..efc265a 100644 | 75 | index a7703fc7..32fd100d 100644 |
76 | --- a/ssh_config.5 | 76 | --- a/ssh_config.5 |
77 | +++ b/ssh_config.5 | 77 | +++ b/ssh_config.5 |
78 | @@ -268,8 +268,12 @@ The default is | 78 | @@ -250,8 +250,12 @@ Valid arguments are |
79 | If set to | 79 | If set to |
80 | .Dq yes , | 80 | .Cm yes , |
81 | passphrase/password querying will be disabled. | 81 | passphrase/password querying will be disabled. |
82 | +In addition, the | 82 | +In addition, the |
83 | +.Cm ServerAliveInterval | 83 | +.Cm ServerAliveInterval |
@@ -87,9 +87,9 @@ index 707d0e1..efc265a 100644 | |||
87 | +is present to supply the password, | 87 | +is present to supply the password, |
88 | +and where it is desirable to detect a broken network swiftly. | 88 | +and where it is desirable to detect a broken network swiftly. |
89 | The argument must be | 89 | The argument must be |
90 | .Dq yes | 90 | .Cm yes |
91 | or | 91 | or |
92 | @@ -1624,7 +1628,14 @@ from the server, | 92 | @@ -1485,7 +1489,14 @@ from the server, |
93 | will send a message through the encrypted | 93 | will send a message through the encrypted |
94 | channel to request a response from the server. | 94 | channel to request a response from the server. |
95 | The default | 95 | The default |
@@ -105,7 +105,7 @@ index 707d0e1..efc265a 100644 | |||
105 | .It Cm StreamLocalBindMask | 105 | .It Cm StreamLocalBindMask |
106 | Sets the octal file creation mode mask | 106 | Sets the octal file creation mode mask |
107 | .Pq umask | 107 | .Pq umask |
108 | @@ -1690,6 +1701,12 @@ Specifies whether the system should send TCP keepalive messages to the | 108 | @@ -1544,6 +1555,12 @@ Specifies whether the system should send TCP keepalive messages to the |
109 | other side. | 109 | other side. |
110 | If they are sent, death of the connection or crash of one | 110 | If they are sent, death of the connection or crash of one |
111 | of the machines will be properly noticed. | 111 | of the machines will be properly noticed. |
@@ -119,13 +119,13 @@ index 707d0e1..efc265a 100644 | |||
119 | connections will die if the route is down temporarily, and some people | 119 | connections will die if the route is down temporarily, and some people |
120 | find it annoying. | 120 | find it annoying. |
121 | diff --git a/sshd_config.5 b/sshd_config.5 | 121 | diff --git a/sshd_config.5 b/sshd_config.5 |
122 | index 3b4cba9..e05cdbe 100644 | 122 | index dd765b39..283ba889 100644 |
123 | --- a/sshd_config.5 | 123 | --- a/sshd_config.5 |
124 | +++ b/sshd_config.5 | 124 | +++ b/sshd_config.5 |
125 | @@ -1530,6 +1530,9 @@ This avoids infinitely hanging sessions. | 125 | @@ -1427,6 +1427,9 @@ This avoids infinitely hanging sessions. |
126 | .Pp | 126 | .Pp |
127 | To disable TCP keepalive messages, the value should be set to | 127 | To disable TCP keepalive messages, the value should be set to |
128 | .Dq no . | 128 | .Cm no . |
129 | +.Pp | 129 | +.Pp |
130 | +This option was formerly called | 130 | +This option was formerly called |
131 | +.Cm KeepAlive . | 131 | +.Cm KeepAlive . |