[openssh-commits] [openssh] 02/02: upstream: remove duplicate check; GHPR392 from Pedro Martelletto

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 18 05:45:40 2024 +0000

    upstream: remove duplicate check; GHPR392 from Pedro Martelletto
    
    OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487
---
 sshconnect2.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sshconnect2.c b/sshconnect2.c
index 11fcdea8..a69c4da1 100644
--- 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;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.