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 @@ - Removed "nullok" directive from default PAM configuration files. Added information on enabling EmptyPasswords on openssh+PAM in UPGRADING file. + - 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 20000102 - Prevent multiple inclusion of config.h and defines.h. Suggested diff --git a/ssh-agent.c b/ssh-agent.c index 27ab6eaa..8a69b1d0 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -9,7 +9,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $"); #include "ssh.h" #include "rsa.h" @@ -643,10 +643,10 @@ main(int ac, char **av) signal(SIGALRM, check_parent_exists); alarm(10); } - signal(SIGHUP, cleanup_exit); - signal(SIGTERM, cleanup_exit); signal(SIGINT, SIG_IGN); signal(SIGPIPE, SIG_IGN); + signal(SIGHUP, cleanup_exit); + signal(SIGTERM, cleanup_exit); while (1) { FD_ZERO(&readset); FD_ZERO(&writeset); diff --git a/sshconnect.c b/sshconnect.c index 645c4af2..e19392ac 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -8,7 +8,7 @@ */ #include "includes.h" -RCSID("$Id: sshconnect.c,v 1.19 1999/12/21 09:57:20 damien Exp $"); +RCSID("$Id: sshconnect.c,v 1.20 2000/01/03 12:41:05 damien Exp $"); #ifdef HAVE_OPENSSL #include <openssl/bn.h> @@ -1021,7 +1021,7 @@ ssh_exchange_identification() /* We speak 1.3, too. */ if (remote_major == 1 && remote_minor == 3) { enable_compat13(); - if (options.forward_agent && strcmp(remote_version, SSH_VERSION) != 0) { + if (options.forward_agent && strcmp(remote_version, "OpenSSH-1.1") != 0) { log("Agent forwarding disabled, remote version '%s' is not compatible.", remote_version); options.forward_agent = 0; |