tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix regression reported by brad@ for passworded keys without
 agent present
This commit is contained in:
djm@openbsd.org 2015-01-15 11:04:36 +00:00 committed by Damien Miller
parent 45c0fd70bb
commit f14564c1f7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.214 2015/01/14 20:05:27 djm Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.215 2015/01/15 11:04:36 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -402,6 +402,7 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
authctxt.methoddata = NULL; authctxt.methoddata = NULL;
authctxt.sensitive = sensitive; authctxt.sensitive = sensitive;
authctxt.info_req_seen = 0; authctxt.info_req_seen = 0;
authctxt.agent_fd = -1;
if (authctxt.method == NULL) if (authctxt.method == NULL)
fatal("ssh_userauth2: internal error: cannot send userauth none request"); fatal("ssh_userauth2: internal error: cannot send userauth none request");
@ -1108,7 +1109,7 @@ load_identity_file(char *filename, int userprovided)
{ {
Key *private; Key *private;
char prompt[300], *passphrase; char prompt[300], *passphrase;
int r, perm_ok = 0, quit, i; int r, perm_ok = 0, quit = 0, i;
struct stat st; struct stat st;
if (stat(filename, &st) < 0) { if (stat(filename, &st) < 0) {
@ -1138,7 +1139,8 @@ load_identity_file(char *filename, int userprovided)
quit = 1; quit = 1;
break; break;
} }
debug2("bad passphrase given, try again..."); if (i != 0)
debug2("bad passphrase given, try again...");
break; break;
case SSH_ERR_SYSTEM_ERROR: case SSH_ERR_SYSTEM_ERROR:
if (errno == ENOENT) { if (errno == ENOENT) {