Fix for bug 403957 . nss_InitLock should be replaced with PZ_NewLock in softoken . r=nelson,wtc

security/nss/lib/softoken/legacydb/keydb.c

@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: keydb.c,v 1.6 2007-10-12 01:44:48 julien.pierre.boogz%sun.com Exp $ */
+/* $Id: keydb.c,v 1.7 2007-11-16 02:04:57 julien.pierre.boogz%sun.com Exp $ */
 
 #include "lowkeyi.h"
 #include "secasn1.h"
@@ -45,7 +45,6 @@
 #include "pcert.h"
 #include "mcom_db.h"
 #include "secerr.h"
-#include "nsslocks.h"
 
 #include "keydbi.h"
 #include "lgdb.h"
@@ -63,7 +62,7 @@
 /* Size of the global salt for key database */
 #define SALT_LENGTH     16
 
-SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate);
+SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate)
 
 const SEC_ASN1Template nsslowkey_EncryptedPrivateKeyInfoTemplate[] = {
     { SEC_ASN1_SEQUENCE,
@@ -115,7 +114,7 @@ static void
 keydb_InitLocks(NSSLOWKEYDBHandle *handle) 
 {
     if (handle->lock == NULL) {
-	nss_InitLock(&handle->lock, nssILockKeyDB);
+	handle->lock = PZ_NewLock(nssILockKeyDB);
     }
 
     return;

security/nss/lib/softoken/legacydb/pcertdb.c

@@ -37,7 +37,7 @@
 /*
  * Permanent Certificate database handling code 
  *
- * $Id: pcertdb.c,v 1.5 2007-06-15 20:37:56 rrelyea%redhat.com Exp $
+ * $Id: pcertdb.c,v 1.6 2007-11-16 02:04:57 julien.pierre.boogz%sun.com Exp $
  */
 #include "lowkeyti.h"
 #include "pcert.h"
@@ -46,7 +46,6 @@
 #include "secitem.h"
 #include "secder.h"
 
-#include "nsslocks.h"
 #include "secerr.h"
 #include "lgdb.h"
 
@@ -87,7 +86,7 @@ void
 certdb_InitDBLock(NSSLOWCERTCertDBHandle *handle)
 {
     if (dbLock == NULL) {
-	nss_InitLock(&dbLock, nssILockCertDB);
+	dbLock = PZ_NewLock(nssILockCertDB);
 	PORT_Assert(dbLock != NULL);
     }
 }
@@ -96,19 +95,19 @@ SECStatus
 nsslowcert_InitLocks(void)
 {
     if (freeListLock == NULL) {
-	nss_InitLock(&freeListLock, nssILockRefLock);
+	freeListLock = PZ_NewLock(nssILockRefLock);
 	if (freeListLock == NULL) {
 	    return SECFailure;
 	}
     }
     if (certRefCountLock == NULL) {
-	nss_InitLock(&certRefCountLock, nssILockRefLock);
+	certRefCountLock = PZ_NewLock(nssILockRefLock);
 	if (certRefCountLock == NULL) {
 	    return SECFailure;
 	}
     }
     if (certTrustLock == NULL ) {
-	nss_InitLock(&certTrustLock, nssILockCertDB);
+	certTrustLock = PZ_NewLock(nssILockCertDB);
 	if (certTrustLock == NULL) {
 	    return SECFailure;
 	}