summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2024-10-18 05:45:41 +0000
committerDamien Miller <djm@cvs.openbsd.org>2024-10-18 05:45:41 +0000
commitb4d60a88ceb42d3e8856a125bd4fc26c05d3d82e (patch)
tree1585f885b45127fdfa8a5055870cf6e3d5a6dc20 /usr.bin
parent85d8ac155a8f9cc127d9113b7f3fe53b2c3fb50f (diff)
remove duplicate check; GHPR392 from Pedro Martelletto
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshconnect2.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 5ad2ac4a7ef..99408335935 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -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) 2008 Damien Miller. All rights reserved.
@@ -1878,10 +1878,8 @@ userauth_pubkey(struct ssh *ssh)
debug("Trying private key: %s", id->filename);
id->key = load_identity_file(id);
if (id->key != NULL) {
- if (id->key != NULL) {
- id->isprivate = 1;
- sent = sign_and_send_pubkey(ssh, id);
- }
+ id->isprivate = 1;
+ sent = sign_and_send_pubkey(ssh, id);
sshkey_free(id->key);
id->key = NULL;
id->isprivate = 0;