summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authordtucker <dtucker>2010-01-12 08:41:22 +0000
committerdtucker <dtucker>2010-01-12 08:41:22 +0000
commit78cfab89a3d5c1c2ae9729a9ea6605d5d1d10183 (patch)
treeb7bc2b36a12f7127c1e971fae019a974b29e0861 /sshconnect2.c
parent17f45333cd1f70ca11abe3b6c3f11fe9f1283793 (diff)
downloadopenssh-78cfab89a3d5c1c2ae9729a9ea6605d5d1d10183.tar.gz
- dtucker@cvs.openbsd.org 2010/01/11 04:46:45
[authfile.c sshconnect2.c] Do not prompt for a passphrase if we fail to open a keyfile, and log the reason the open failed to debug. bz #1693, found by tj AT castaglia org, ok djm@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 367f0fc6..ed40a9d7 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.177 2010/01/04 01:45:30 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.178 2010/01/11 04:46:45 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1250,7 +1250,7 @@ load_identity_file(char *filename)
{
Key *private;
char prompt[300], *passphrase;
- int perm_ok, quit, i;
+ int perm_ok = 0, quit, i;
struct stat st;
if (stat(filename, &st) < 0) {