]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: fix reversed test that caused IdentitiesOnly=yes to not
authordjm@openbsd.org <djm@openbsd.org>
Fri, 17 Apr 2020 03:38:47 +0000 (03:38 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 17 Apr 2020 04:03:36 +0000 (14:03 +1000)
apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@

OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677

sshconnect2.c

index af00fb30c39b8e26adfc958c5588371ae54a66bb..1a6545edf026a5804c4213d721a30025e6405d32 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.320 2020/02/06 22:48:23 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.321 2020/04/17 03:38:47 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1671,7 +1671,7 @@ pubkey_prepare(Authctxt *authctxt)
                found = 0;
                TAILQ_FOREACH(id2, &files, next) {
                        if (id2->key == NULL ||
-                           (id2->key->flags & SSHKEY_FLAG_EXT) == 0)
+                           (id2->key->flags & SSHKEY_FLAG_EXT) != 0)
                                continue;
                        if (sshkey_equal(id->key, id2->key)) {
                                TAILQ_REMOVE(&files, id, next);