mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-10 07:24:46 +02:00
upstream: remove unnecessary if statement.
github PR#422 from eyalasulin999, ok djm@ OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55
This commit is contained in:
parent
77b8b865cd
commit
c88a8788f9
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user