upstream: remove duplicate check; GHPR392 from Pedro Martelletto

OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487

diff --git a/sshconnect2.c b/sshconnect2.c
index 11fcdea8aff18e6dc66dd1521001922df3c671b7..a69c4da18773e20d2c749d1a8ea8cd5c60dac71b 100644 (file)
--- a/sshconnect2.c
+++ b/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.
@@ -1885,10 +1885,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;