Bug 16296: fix race in sdr code.
authorrelyea%netscape.com
Tue, 01 Oct 2002 00:46:20 +0000
changeset 3666 114ef6d37037d70a6c7607c332c58e83d5cdd1be
parent 3665 41b90994a5e6618df8979f1b1e82c96ff17278b7
child 3667 154bdb509ef4b5be979ef7ab67a5b5ec68611010
push idunknown
push userunknown
push dateunknown
bugs16296
Bug 16296: fix race in sdr code.
security/nss/lib/nss/nssinit.c
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@@ -469,16 +469,17 @@ loser:
 #ifndef XP_MAC
 	/* only servers need this. We currently do not have a mac server */
 	if ((!noModDB) && (!noCertDB) && (!noRootInit)) {
 	    if (!SECMOD_HasRootCerts()) {
 		nss_FindExternalRoot(configdir, secmodName);
 	    }
 	}
 #endif
+	pk11sdr_Init();
 	nss_IsInitted = PR_TRUE;
     }
     return rv;
 }
 
 
 SECStatus
 NSS_Init(const char *configdir)
@@ -539,16 +540,17 @@ SECStatus
 NSS_Shutdown(void)
 {
     SECStatus rv;
 
     ShutdownCRLCache();
     SECOID_Shutdown();
     STAN_Shutdown();
     rv = SECMOD_Shutdown();
+    pk11sdr_Shutdown();
     nss_IsInitted = PR_FALSE;
     return rv;
 }
 
 
 
 extern const char __nss_base_rcsid[];
 extern const char __nss_base_sccsid[];