diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-21 21:24:55 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-21 21:24:55 +0000 |
| commit | 14920293713ff4a5bbe45b495694bfd925d73894 (patch) | |
| tree | d0f63720bdcbc574dc3c018beeb28e6da4b5e1fb /ssh.c | |
| parent | 4a1d91646d4248c111f573e496cc0d10ba62e274 (diff) | |
| download | openssh-git-14920293713ff4a5bbe45b495694bfd925d73894.tar.gz | |
20001123
- (bal) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/11/15 22:31:36
[auth-options.c]
case insensitive key options; from stevesk@sweeden.hp.com
- markus@cvs.openbsd.org 2000/11/16 17:55:43
[dh.c]
do not use perror() in sshd, after child is forked()
- markus@cvs.openbsd.org 2000/11/14 23:42:40
[auth-rsa.c]
parse option only if key matches; fix some confusing seen by the client
- markus@cvs.openbsd.org 2000/11/14 23:44:19
[session.c]
check no_agent_forward_flag for ssh-2, too
- markus@cvs.openbsd.org 2000/11/15
[ssh-agent.1]
reorder SYNOPSIS; typo, use .It
- markus@cvs.openbsd.org 2000/11/14 23:48:55
[ssh-agent.c]
do not reorder keys if a key is removed
- markus@cvs.openbsd.org 2000/11/15 19:58:08
[ssh.c]
just ignore non existing user keys
- millert@cvs.openbsd.org 200/11/15 20:24:43
[ssh-keygen.c]
Add missing \n at end of error message.
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.72 2000/11/12 19:50:38 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.73 2000/11/15 19:58:08 markus Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -1049,7 +1049,7 @@ guess_identity_file_type(const char *filename) int type = KEY_RSA1; /* default */ if (stat(filename, &st) < 0) { - perror(filename); + /* ignore this key */ return KEY_UNSPEC; } public = key_new(type); |