Update NSS to NSS_3_15_1_BETA2.

nss/lib/pk11wrap/pk11util.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * Initialize the PCKS 11 subsystem
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
@@ skipping 1477 matching lines @@
     char *sendSpec;
     
     sendSpec = PR_smprintf("tokens=[0x%x=<>]", slot->slotID);
     if (sendSpec == NULL) {
         /* PR_smprintf does not set no memory error */
         PORT_SetError(SEC_ERROR_NO_MEMORY);
         return SECFailure;
     }
     rv = secmod_UserDBOp(slot, CKO_NETSCAPE_DELSLOT, sendSpec);
     PR_smprintf_free(sendSpec);
+    /* if we are in the delay period for the "isPresent" call, reset
+     * the delay since we know things have probably changed... */
+    if (slot->nssToken && slot->nssToken->slot) {
+        nssSlot_ResetDelay(slot->nssToken->slot);
+        /* force the slot info structures to properly reset */
+        (void)PK11_IsPresent(slot);
+    }
     return rv;
 }
 
 /*
  * Restart PKCS #11 modules after a fork(). See secmod.h for more information.
  */
 SECStatus
 SECMOD_RestartModules(PRBool force)
 {
     SECMODModuleList *mlp;
@@ skipping 61 matching lines @@
      * on multiple failures, we are only returning the lastError. The caller
      * can determine which slots are bad by calling PK11_IsDisabled().
      */
     if (rrv != SECSuccess) {
         /* restore the last error code */
         PORT_SetError(lastError);
     }
 
     return rrv;
 }