diff options
Diffstat (limited to 'debian/patches/keepalive-extensions.patch')
-rw-r--r-- | debian/patches/keepalive-extensions.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch index 11378586d..4db3caa5a 100644 --- a/debian/patches/keepalive-extensions.patch +++ b/debian/patches/keepalive-extensions.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8f60ff6d23d4a1f8c347cf4b95267e00116f74fa Mon Sep 17 00:00:00 2001 | 1 | From 0bdc6351d8a32c33e65542617c71da8ddcdeb331 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 |
@@ -16,7 +16,7 @@ keepalives. | |||
16 | Author: Ian Jackson <ian@chiark.greenend.org.uk> | 16 | Author: Ian Jackson <ian@chiark.greenend.org.uk> |
17 | Author: Matthew Vernon <matthew@debian.org> | 17 | Author: Matthew Vernon <matthew@debian.org> |
18 | Author: Colin Watson <cjwatson@debian.org> | 18 | Author: Colin Watson <cjwatson@debian.org> |
19 | Last-Update: 2015-11-29 | 19 | Last-Update: 2016-12-26 |
20 | 20 | ||
21 | Patch-Name: keepalive-extensions.patch | 21 | Patch-Name: keepalive-extensions.patch |
22 | --- | 22 | --- |
@@ -72,7 +72,7 @@ index c1c3aae0..3efba242 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 a7703fc7..32fd100d 100644 | 75 | index a7703fc7..a0457314 100644 |
76 | --- a/ssh_config.5 | 76 | --- a/ssh_config.5 |
77 | +++ b/ssh_config.5 | 77 | +++ b/ssh_config.5 |
78 | @@ -250,8 +250,12 @@ Valid arguments are | 78 | @@ -250,8 +250,12 @@ Valid arguments are |
@@ -81,7 +81,7 @@ index a7703fc7..32fd100d 100644 | |||
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 |
84 | +option will be set to 300 seconds by default. | 84 | +option will be set to 300 seconds by default (Debian-specific). |
85 | This option is useful in scripts and other batch jobs where no user | 85 | This option is useful in scripts and other batch jobs where no user |
86 | -is present to supply the password. | 86 | -is present to supply the password. |
87 | +is present to supply the password, | 87 | +is present to supply the password, |
@@ -97,7 +97,7 @@ index a7703fc7..32fd100d 100644 | |||
97 | +is 0, indicating that these messages will not be sent to the server, | 97 | +is 0, indicating that these messages will not be sent to the server, |
98 | +or 300 if the | 98 | +or 300 if the |
99 | +.Cm BatchMode | 99 | +.Cm BatchMode |
100 | +option is set. | 100 | +option is set (Debian-specific). |
101 | +.Cm ProtocolKeepAlives | 101 | +.Cm ProtocolKeepAlives |
102 | +and | 102 | +and |
103 | +.Cm SetupTimeOut | 103 | +.Cm SetupTimeOut |