|
 |
e2c46b |
diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
|
|
|
e2c46b |
--- a/security/certverifier/NSSCertDBTrustDomain.cpp
|
|
|
e2c46b |
+++ b/security/certverifier/NSSCertDBTrustDomain.cpp
|
|
|
e2c46b |
@@ -1057,22 +1057,20 @@ InitializeNSS(const nsACString& dir, boo
|
|
|
e2c46b |
// "/usr/lib/nss/libnssckbi.so".
|
|
|
e2c46b |
uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
|
|
|
e2c46b |
if (readOnly) {
|
|
|
e2c46b |
flags |= NSS_INIT_READONLY;
|
|
|
e2c46b |
}
|
|
|
e2c46b |
if (!loadPKCS11Modules) {
|
|
|
e2c46b |
flags |= NSS_INIT_NOMODDB;
|
|
|
e2c46b |
}
|
|
|
e2c46b |
- nsAutoCString dbTypeAndDirectory("sql:");
|
|
|
e2c46b |
- dbTypeAndDirectory.Append(dir);
|
|
|
e2c46b |
MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
|
|
|
e2c46b |
- ("InitializeNSS(%s, %d, %d)", dbTypeAndDirectory.get(), readOnly,
|
|
|
e2c46b |
+ ("InitializeNSS(%s, %d, %d)", PromiseFlatCString(dir).get(), readOnly,
|
|
|
e2c46b |
loadPKCS11Modules));
|
|
|
e2c46b |
- SECStatus srv = NSS_Initialize(dbTypeAndDirectory.get(), "", "",
|
|
|
e2c46b |
+ SECStatus srv = NSS_Initialize(PromiseFlatCString(dir).get(), "", "",
|
|
|
e2c46b |
SECMOD_DB, flags);
|
|
|
e2c46b |
if (srv != SECSuccess) {
|
|
|
e2c46b |
return srv;
|
|
|
e2c46b |
}
|
|
|
e2c46b |
|
|
|
e2c46b |
if (!readOnly) {
|
|
|
e2c46b |
UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
|
|
|
e2c46b |
if (!slot) {
|