3 files changed, 5 insertions, 6 deletions
diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h
index 5b208acd6..1feb34479 100644
--- a/security/nss/lib/certdb/certt.h
+++ b/security/nss/lib/certdb/certt.h
@@ -60,10 +60,10 @@ typedef struct CERTAttributeStr                  CERTAttribute;
 typedef struct CERTAuthInfoAccessStr             CERTAuthInfoAccess;
 typedef struct CERTAuthKeyIDStr                  CERTAuthKeyID;
 typedef struct CERTBasicConstraintsStr           CERTBasicConstraints;
-#ifdef STAN_CERT_DB
-typedef NSSTrustDomain                           CERTCertDBHandle;
-#else
+#ifdef NSS_CLASSIC
 typedef struct CERTCertDBHandleStr               CERTCertDBHandle;
+#else
+typedef NSSTrustDomain                           CERTCertDBHandle;
 #endif
 typedef struct CERTCertExtensionStr              CERTCertExtension;
 typedef struct CERTCertKeyStr                    CERTCertKey;
diff --git a/security/nss/lib/certdb/manifest.mn b/security/nss/lib/certdb/manifest.mn
index a9b5f3d8c..33b3fb612 100644
--- a/security/nss/lib/certdb/manifest.mn
+++ b/security/nss/lib/certdb/manifest.mn
@@ -46,8 +46,6 @@ PRIVATE_EXPORTS = \
 
 MODULE = security
 
-DEFINES=-DSTAN_CERT_DB
-
 CSRCS = \
 	alg1485.c \
 	certdb.c \
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c
index 69a1df7e5..6d68473e2 100644
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -566,8 +566,9 @@ loser:
 SECItem *
 CERT_FindSMimeProfile(CERTCertificate *cert)
 {
+    PK11SlotInfo *slot = NULL;
     return 
-	PK11_FindSMimeProfile(NULL, cert->emailAddr, &cert->derSubject, NULL);
+	PK11_FindSMimeProfile(&slot, cert->emailAddr, &cert->derSubject, NULL);
 }
 
 /*