tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-10 07:24:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: remove unnecessary if statement.

Browse Source 
github PR#422 from eyalasulin999, ok djm@

OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55
This commit is contained in:
dtucker@openbsd.org 2023-08-01 08:15:04 +00:00 committed by Darren Tucker
parent 77b8b865cd
commit c88a8788f9
No known key found for this signature in database
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.366 2023/03/09 07:11:05 dtucker Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.367 2023/08/01 08:15:04 dtucker 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.
@ -1868,12 +1868,10 @@ userauth_pubkey(struct ssh *ssh)
* private key instead * private key instead
*/ */
if (id->key != NULL) { if (id->key != NULL) {
if (id->key != NULL) { ident = format_identity(id);
ident = format_identity(id); debug("Offering public key: %s", ident);
debug("Offering public key: %s", ident); free(ident);
free(ident); sent = send_pubkey_test(ssh, id);
sent = send_pubkey_test(ssh, id);
}
} 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);