[ssh.c]
     Better diagnostic if an identity file is not accesible. ok markus@ djm@
This commit is contained in:
Damien Miller 2005-03-01 21:15:46 +11:00
parent dc8fc62103
commit 3eb48b6245
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,9 @@
20050301
- (djm) OpenBSD CVS sync:
- otto@cvs.openbsd.org 2005/02/16 09:56:44
[ssh.c]
Better diagnostic if an identity file is not accesible. ok markus@ djm@
20050226 20050226
- (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com. Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com.
@ -2173,4 +2179,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3666 2005/02/25 23:12:38 dtucker Exp $ $Id: ChangeLog,v 1.3667 2005/03/01 10:15:46 djm Exp $

5
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.230 2004/11/07 17:57:30 jmc Exp $"); RCSID("$OpenBSD: ssh.c,v 1.231 2005/02/16 09:56:44 otto Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -297,7 +297,8 @@ again:
case 'i': case 'i':
if (stat(optarg, &st) < 0) { if (stat(optarg, &st) < 0) {
fprintf(stderr, "Warning: Identity file %s " fprintf(stderr, "Warning: Identity file %s "
"does not exist.\n", optarg); "not accessible: %s.\n", optarg,
strerror(errno));
break; break;
} }
if (options.num_identity_files >= if (options.num_identity_files >=