diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:46:28 +0100 |
commit | efd3d4522636ae029488c2e9730b60c88e257d2e (patch) | |
tree | 31e02ac3f16090ce8c53448677356b2b7f423683 /debian/patches/ssh1-keepalive.patch | |
parent | bbec4db36d464ea1d464a707625125f9fd5c7b5e (diff) | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) |
* New upstream release (LP: #535029).
- After a transition period of about 10 years, this release disables SSH
protocol 1 by default. Clients and servers that need to use the
legacy protocol must explicitly enable it in ssh_config / sshd_config
or on the command-line.
- Remove the libsectok/OpenSC-based smartcard code and add support for
PKCS#11 tokens. This support is enabled by default in the Debian
packaging, since it now doesn't involve additional library
dependencies (closes: #231472, LP: #16918).
- Add support for certificate authentication of users and hosts using a
new, minimal OpenSSH certificate format (closes: #482806).
- Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
- Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
package, this overlaps with the key blacklisting facility added in
openssh 1:4.7p1-9, but with different file formats and slightly
different scopes; for the moment, I've roughly merged the two.)
- Various multiplexing improvements, including support for requesting
port-forwardings via the multiplex protocol (closes: #360151).
- Allow setting an explicit umask on the sftp-server(8) commandline to
override whatever default the user has (closes: #496843).
- Many sftp client improvements, including tab-completion, more options,
and recursive transfer support for get/put (LP: #33378). The old
mget/mput commands never worked properly and have been removed
(closes: #270399, #428082).
- Do not prompt for a passphrase if we fail to open a keyfile, and log
the reason why the open failed to debug (closes: #431538).
- Prevent sftp from crashing when given a "-" without a command. Also,
allow whitespace to follow a "-" (closes: #531561).
Diffstat (limited to 'debian/patches/ssh1-keepalive.patch')
-rw-r--r-- | debian/patches/ssh1-keepalive.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch index c82563033..ccd9a668e 100644 --- a/debian/patches/ssh1-keepalive.patch +++ b/debian/patches/ssh1-keepalive.patch | |||
@@ -7,13 +7,20 @@ Index: b/clientloop.c | |||
7 | =================================================================== | 7 | =================================================================== |
8 | --- a/clientloop.c | 8 | --- a/clientloop.c |
9 | +++ b/clientloop.c | 9 | +++ b/clientloop.c |
10 | @@ -502,16 +502,21 @@ | 10 | @@ -507,16 +507,21 @@ |
11 | static void | 11 | static void |
12 | server_alive_check(void) | 12 | server_alive_check(void) |
13 | { | 13 | { |
14 | - if (packet_inc_alive_timeouts() > options.server_alive_count_max) { | 14 | - if (packet_inc_alive_timeouts() > options.server_alive_count_max) { |
15 | - logit("Timeout, server not responding."); | 15 | - logit("Timeout, server not responding."); |
16 | - cleanup_exit(255); | 16 | - cleanup_exit(255); |
17 | - } | ||
18 | - packet_start(SSH2_MSG_GLOBAL_REQUEST); | ||
19 | - packet_put_cstring("keepalive@openssh.com"); | ||
20 | - packet_put_char(1); /* boolean: want reply */ | ||
21 | - packet_send(); | ||
22 | - /* Insert an empty placeholder to maintain ordering */ | ||
23 | - client_register_global_confirm(NULL, NULL); | ||
17 | + if (compat20) { | 24 | + if (compat20) { |
18 | + if (packet_inc_alive_timeouts() > options.server_alive_count_max) { | 25 | + if (packet_inc_alive_timeouts() > options.server_alive_count_max) { |
19 | + logit("Timeout, server not responding."); | 26 | + logit("Timeout, server not responding."); |
@@ -28,17 +35,11 @@ Index: b/clientloop.c | |||
28 | + } else { | 35 | + } else { |
29 | + packet_send_ignore(0); | 36 | + packet_send_ignore(0); |
30 | + packet_send(); | 37 | + packet_send(); |
31 | } | 38 | + } |
32 | - packet_start(SSH2_MSG_GLOBAL_REQUEST); | ||
33 | - packet_put_cstring("keepalive@openssh.com"); | ||
34 | - packet_put_char(1); /* boolean: want reply */ | ||
35 | - packet_send(); | ||
36 | - /* Insert an empty placeholder to maintain ordering */ | ||
37 | - client_register_global_confirm(NULL, NULL); | ||
38 | } | 39 | } |
39 | 40 | ||
40 | /* | 41 | /* |
41 | @@ -572,7 +577,7 @@ | 42 | @@ -574,7 +579,7 @@ |
42 | * event pending. | 43 | * event pending. |
43 | */ | 44 | */ |
44 | 45 | ||
@@ -51,7 +52,7 @@ Index: b/ssh_config.5 | |||
51 | =================================================================== | 52 | =================================================================== |
52 | --- a/ssh_config.5 | 53 | --- a/ssh_config.5 |
53 | +++ b/ssh_config.5 | 54 | +++ b/ssh_config.5 |
54 | @@ -935,7 +935,10 @@ | 55 | @@ -956,7 +956,10 @@ |
55 | .Cm ServerAliveCountMax | 56 | .Cm ServerAliveCountMax |
56 | is left at the default, if the server becomes unresponsive, | 57 | is left at the default, if the server becomes unresponsive, |
57 | ssh will disconnect after approximately 45 seconds. | 58 | ssh will disconnect after approximately 45 seconds. |