mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 01:03:48 +08:00
upstream: remove duplicate check; GHPR392 from Pedro Martelletto
OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487
This commit is contained in:
parent
d9cd208e89
commit
9c97b6af8e
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: sshconnect2.c,v 1.375 2024/09/09 02:39:57 djm Exp $ */
|
||||
/* $OpenBSD: sshconnect2.c,v 1.376 2024/10/18 05:45:40 djm Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||||
* Copyright (c) 2008 Damien Miller. All rights reserved.
|
||||
@ -1885,10 +1885,8 @@ userauth_pubkey(struct ssh *ssh)
|
||||
debug("Trying private key: %s", id->filename);
|
||||
id->key = load_identity_file(id);
|
||||
if (id->key != NULL) {
|
||||
if (id->key != NULL) {
|
||||
id->isprivate = 1;
|
||||
sent = sign_and_send_pubkey(ssh, id);
|
||||
}
|
||||
id->isprivate = 1;
|
||||
sent = sign_and_send_pubkey(ssh, id);
|
||||
sshkey_free(id->key);
|
||||
id->key = NULL;
|
||||
id->isprivate = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user