Skip to content

Commit

Permalink
upstream: remove unnecessary if statement.
Browse files Browse the repository at this point in the history
github PR#422 from eyalasulin999, ok djm@

OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55
  • Loading branch information
daztucker committed Aug 1, 2023
1 parent 77b8b86 commit c88a878
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions sshconnect2.c
Original file line number Diff line number Diff line change
@@ -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) 2008 Damien Miller. All rights reserved.
Expand Down Expand Up @@ -1868,12 +1868,10 @@ userauth_pubkey(struct ssh *ssh)
* private key instead
*/
if (id->key != NULL) {
if (id->key != NULL) {
ident = format_identity(id);
debug("Offering public key: %s", ident);
free(ident);
sent = send_pubkey_test(ssh, id);
}
ident = format_identity(id);
debug("Offering public key: %s", ident);
free(ident);
sent = send_pubkey_test(ssh, id);
} else {
debug("Trying private key: %s", id->filename);
id->key = load_identity_file(id);
Expand Down

0 comments on commit c88a878

Please sign in to comment.