RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: remove duplicate check; GHPR392 from Pedro Martelletto 

OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487
This commit is contained in:
djm@openbsd.org 2024-10-18 05:45:40 +00:00 committed by Damien Miller
parent d9cd208e89
commit 9c97b6af8e
No known key found for this signature in database
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshconnect2.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -1884,11 +1884,9 @@ userauth_pubkey(struct ssh *ssh)
} else { } else {
debug("Trying private key: %s", id->filename); debug("Trying private key: %s", id->filename);
id->key = load_identity_file(id); id->key = load_identity_file(id);
if (id->key != NULL) {
if (id->key != NULL) { if (id->key != NULL) {
id->isprivate = 1; id->isprivate = 1;
sent = sign_and_send_pubkey(ssh, id); sent = sign_and_send_pubkey(ssh, id);
}
sshkey_free(id->key); sshkey_free(id->key);
id->key = NULL; id->key = NULL;
id->isprivate = 0; id->isprivate = 0;