summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-08-01 08:15:04 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-08-01 18:54:30 +1000
commitc88a8788f9865d02b986d00405b9f0be65ad0b5a (patch)
treeb302f53838be19e527386dbd50b15bdcbe9b60d9
parent77b8b865cd5a8c79a47605c0c5b2bacf4692c4d5 (diff)
upstream: remove unnecessary if statement.
github PR#422 from eyalasulin999, ok djm@ OpenBSD-Commit-ID: 2b6b0dde4407e039f58f86c8d2ff584a8205ea55
-rw-r--r--sshconnect2.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index bc05f021..90cbba68 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -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.
@@ -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);