summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-03-01 21:15:46 +1100
committerDamien Miller <djm@mindrot.org>2005-03-01 21:15:46 +1100
commit3eb48b62457b78a9308d10e5b968e85c2bc18525 (patch)
tree0f0eaed79a77f7f6131bfd96d7f7f29a181d43aa
parentdc8fc621036147ff43f3fb1e8a1aa0d8026e5208 (diff)
- otto@cvs.openbsd.org 2005/02/16 09:56:44
[ssh.c] Better diagnostic if an identity file is not accesible. ok markus@ djm@
-rw-r--r--ChangeLog8
-rw-r--r--ssh.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fd376c3b..7faf0e6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120050301
2 - (djm) OpenBSD CVS sync:
3 - otto@cvs.openbsd.org 2005/02/16 09:56:44
4 [ssh.c]
5 Better diagnostic if an identity file is not accesible. ok markus@ djm@
6
120050226 720050226
2 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] 8 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
3 Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com. 9 Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com.
@@ -2173,4 +2179,4 @@
2173 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2179 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2174 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2180 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2175 2181
2176$Id: ChangeLog,v 1.3666 2005/02/25 23:12:38 dtucker Exp $ 2182$Id: ChangeLog,v 1.3667 2005/03/01 10:15:46 djm Exp $
diff --git a/ssh.c b/ssh.c
index ac537338c..1f50727e9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.230 2004/11/07 17:57:30 jmc Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.231 2005/02/16 09:56:44 otto Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -297,7 +297,8 @@ again:
297 case 'i': 297 case 'i':
298 if (stat(optarg, &st) < 0) { 298 if (stat(optarg, &st) < 0) {
299 fprintf(stderr, "Warning: Identity file %s " 299 fprintf(stderr, "Warning: Identity file %s "
300 "does not exist.\n", optarg); 300 "not accessible: %s.\n", optarg,
301 strerror(errno));
301 break; 302 break;
302 } 303 }
303 if (options.num_identity_files >= 304 if (options.num_identity_files >=