From b3cbf5453e31d1a56491e73ff645907ff9880543 Mon Sep 17 00:00:00 2001 From: vtarasov Date: Thu, 2 Jun 2011 17:20:10 +0000 Subject: [PATCH] pkcs11: resolve problem 'change 5421 breaks MIT Kerberos login', thanks to Douglas. http://www.opensc-project.org/pipermail/opensc-devel/2011-June/016734.html git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5537 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/pkcs11/pkcs11-global.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pkcs11/pkcs11-global.c b/src/pkcs11/pkcs11-global.c index ca7875ef..460a9000 100644 --- a/src/pkcs11/pkcs11-global.c +++ b/src/pkcs11/pkcs11-global.c @@ -400,7 +400,9 @@ CK_RV C_GetSlotList(CK_BBOOL tokenPresent, /* only slots with token prese * - any slot with token; * - without token(s), one empty slot per reader; */ - if (!slot->reader || (!tokenPresent && slot->reader != prev_reader) || (slot->slot_info.flags & CKF_TOKEN_PRESENT)) + if ((!tokenPresent && !slot->reader) + || (!tokenPresent && slot->reader != prev_reader) + || (slot->slot_info.flags & CKF_TOKEN_PRESENT)) found[numMatches++] = slot->id; prev_reader = slot->reader; }