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 | |
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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-agent.c | 8 | ||||
-rw-r--r-- | sshconnect.c | 4 |
3 files changed, 12 insertions, 6 deletions
@@ -5,6 +5,12 @@ | |||
5 | - Removed "nullok" directive from default PAM configuration files. | 5 | - Removed "nullok" directive from default PAM configuration files. |
6 | Added information on enabling EmptyPasswords on openssh+PAM in | 6 | Added information on enabling EmptyPasswords on openssh+PAM in |
7 | UPGRADING file. | 7 | UPGRADING file. |
8 | - OpenBSD CVS updates | ||
9 | - [ssh-agent.c] | ||
10 | cleanup_exit() for SIGTERM/SIGHUP, too. from fgsch@ and | ||
11 | dgaudet@arctic.org | ||
12 | - [sshconnect.c] | ||
13 | compare correct version for 1.3 compat mode | ||
8 | 14 | ||
9 | 20000102 | 15 | 20000102 |
10 | - Prevent multiple inclusion of config.h and defines.h. Suggested | 16 | - Prevent multiple inclusion of config.h and defines.h. Suggested |
diff --git a/ssh-agent.c b/ssh-agent.c index 27ab6eaa9..8a69b1d08 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "includes.h" | 11 | #include "includes.h" |
12 | RCSID("$OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $"); | 12 | RCSID("$OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $"); |
13 | 13 | ||
14 | #include "ssh.h" | 14 | #include "ssh.h" |
15 | #include "rsa.h" | 15 | #include "rsa.h" |
@@ -643,10 +643,10 @@ main(int ac, char **av) | |||
643 | signal(SIGALRM, check_parent_exists); | 643 | signal(SIGALRM, check_parent_exists); |
644 | alarm(10); | 644 | alarm(10); |
645 | } | 645 | } |
646 | signal(SIGHUP, cleanup_exit); | ||
647 | signal(SIGTERM, cleanup_exit); | ||
648 | signal(SIGINT, SIG_IGN); | 646 | signal(SIGINT, SIG_IGN); |
649 | signal(SIGPIPE, SIG_IGN); | 647 | signal(SIGPIPE, SIG_IGN); |
648 | signal(SIGHUP, cleanup_exit); | ||
649 | signal(SIGTERM, cleanup_exit); | ||
650 | while (1) { | 650 | while (1) { |
651 | FD_ZERO(&readset); | 651 | FD_ZERO(&readset); |
652 | FD_ZERO(&writeset); | 652 | FD_ZERO(&writeset); |
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; |