| Index: mozilla/security/nss/lib/pk11wrap/pk11util.c
|
| ===================================================================
|
| --- mozilla/security/nss/lib/pk11wrap/pk11util.c (revision 164196)
|
| +++ mozilla/security/nss/lib/pk11wrap/pk11util.c (working copy)
|
| @@ -1082,7 +1082,7 @@
|
| }
|
| SECMOD_ReleaseReadLock(moduleLock);
|
| /* if everything was perm modules, don't lock up forever */
|
| - if (!removableSlotsFound) {
|
| + if ((mod->slotCount !=0) && !removableSlotsFound) {
|
| error =SEC_ERROR_NO_SLOT_SELECTED;
|
| PZ_Lock(mod->refLock);
|
| break;
|
| @@ -1251,6 +1251,9 @@
|
| ret = PR_TRUE;
|
| break;
|
| }
|
| + if (mod->slotCount == 0 ) {
|
| + ret = PR_TRUE;
|
| + }
|
| SECMOD_ReleaseReadLock(moduleLock);
|
| return ret;
|
| }
|
|
|