RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2000-01-03 23:41:05 +11:00
parent e9c8f4dfdc
commit 62ab38ab9e
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

8
ssh-agent.c
View File

@ -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);

4
sshconnect.c
View File

@ -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;