diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-10-18 07:45:40 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-10-18 07:46:09 +0200 |
| commit | 9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f (patch) | |
| tree | 5f78b4480d5a1337cb3db1d5ad3c0c6d38b044c0 | |
| parent | upstream: allow "-" as output file for moduli screening (diff) | |
| download | openssh-9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f.tar.xz openssh-9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f.zip | |
upstream: remove duplicate check; GHPR392 from Pedro Martelletto
OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487
| -rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 11fcdea8a..a69c4da18 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; |