Allow Ask always to work with tokens.
authorrelyea%netscape.com
Fri, 06 Jul 2001 19:00:12 +0000
changeset 1721 ee329def1cb74dddbc5880e109ca31bf23539cd2
parent 1719 a8b6b0b991c58e784f6266e1ed265a0c71b7dc64
child 1722 9804373079f65afbcb62d752bebb1f922b89e749
push idunknown
push userunknown
push dateunknown
Allow Ask always to work with tokens.
security/nss/lib/pk11wrap/pk11slot.c
--- a/security/nss/lib/pk11wrap/pk11slot.c
+++ b/security/nss/lib/pk11wrap/pk11slot.c
@@ -721,17 +721,17 @@ PK11_HandlePasswordCheck(PK11SlotInfo *s
 	    askpw = def_slot->askpw;
 	    PK11_FreeSlot(def_slot);
 	}
     }
 
     /* timeouts are handled by isLoggedIn */
     if (!PK11_IsLoggedIn(slot,wincx)) {
 	NeedAuth = PR_TRUE;
-    } else if (slot->askpw == -1) {
+    } else if (askpw == -1) {
 	if (!PK11_Global.inTransaction	||
 			 (PK11_Global.transaction != slot->authTransact)) {
     	    PK11_EnterSlotMonitor(slot);
 	    PK11_GETTAB(slot)->C_Logout(slot->session);
     	    PK11_ExitSlotMonitor(slot);
 	    NeedAuth = PR_TRUE;
 	}
     }