diff options
author | Damien Miller <djm@mindrot.org> | 2000-01-03 23:41:05 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-01-03 23:41:05 +1100 |
commit | 62ab38ab9e5bae5b516ff10ab62ef55a2592059a (patch) | |
tree | d121a0bc30cb68af0d6491ec0336bd9117b9ae66 /sshconnect.c | |
parent | e9c8f4dfdc0117fb02b9d9a421f07464ccadfcff (diff) |
- OpenBSD CVS updates
- [ssh-agent.c]
cleanup_exit() for SIGTERM/SIGHUP, too. from fgsch@ and
dgaudet@arctic.org
- [sshconnect.c]
compare correct version for 1.3 compat mode
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 645c4af22..e19392acf 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$Id: sshconnect.c,v 1.19 1999/12/21 09:57:20 damien Exp $"); | 11 | RCSID("$Id: sshconnect.c,v 1.20 2000/01/03 12:41:05 damien Exp $"); |
12 | 12 | ||
13 | #ifdef HAVE_OPENSSL | 13 | #ifdef HAVE_OPENSSL |
14 | #include <openssl/bn.h> | 14 | #include <openssl/bn.h> |
@@ -1021,7 +1021,7 @@ ssh_exchange_identification() | |||
1021 | /* We speak 1.3, too. */ | 1021 | /* We speak 1.3, too. */ |
1022 | if (remote_major == 1 && remote_minor == 3) { | 1022 | if (remote_major == 1 && remote_minor == 3) { |
1023 | enable_compat13(); | 1023 | enable_compat13(); |
1024 | if (options.forward_agent && strcmp(remote_version, SSH_VERSION) != 0) { | 1024 | if (options.forward_agent && strcmp(remote_version, "OpenSSH-1.1") != 0) { |
1025 | log("Agent forwarding disabled, remote version '%s' is not compatible.", | 1025 | log("Agent forwarding disabled, remote version '%s' is not compatible.", |
1026 | remote_version); | 1026 | remote_version); |
1027 | options.forward_agent = 0; | 1027 | options.forward_agent = 0; |