summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-03-19 23:01:29 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-03-19 23:01:29 +0100
commit6f1d8fcce1f064447ccf778ea9925efae95bb5fc (patch)
tree0aa73b5f88db2ac0fc6698076606f67b192997a3 /security
parent6cbe27d1498666c410a3df1fe81b725f9a4056a0 (diff)
downloadUXP-6f1d8fcce1f064447ccf778ea9925efae95bb5fc.tar
UXP-6f1d8fcce1f064447ccf778ea9925efae95bb5fc.tar.gz
UXP-6f1d8fcce1f064447ccf778ea9925efae95bb5fc.tar.lz
UXP-6f1d8fcce1f064447ccf778ea9925efae95bb5fc.tar.xz
UXP-6f1d8fcce1f064447ccf778ea9925efae95bb5fc.zip
Issue #1467 - Part 4: Rename NSS_SQLSTORE to MOZ_SECURITY_SQLSTORE.
Rename the build config option accordingly.
Diffstat (limited to 'security')
-rw-r--r--security/certverifier/NSSCertDBTrustDomain.cpp2
-rw-r--r--security/manager/ssl/nsNSSComponent.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
index 2793fad48..cf48f6392 100644
--- a/security/certverifier/NSSCertDBTrustDomain.cpp
+++ b/security/certverifier/NSSCertDBTrustDomain.cpp
@@ -1102,7 +1102,7 @@ InitializeNSS(const nsACString& dir, bool readOnly, bool loadPKCS11Modules)
flags |= NSS_INIT_NOMODDB;
}
nsAutoCString dbTypeAndDirectory;
-#ifdef NSS_SQLSTORE
+#ifdef MOZ_SECURITY_SQLSTORE
// Not strictly necessary with current NSS versions, but can't hurt to be explicit.
dbTypeAndDirectory.Append("sql:");
#else
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
index 6d1e3c5f7..897b5743c 100644
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -12,7 +12,7 @@
#include "SharedSSLState.h"
#include "cert.h"
#include "certdb.h"
-#ifdef NSS_SQLSTORE
+#ifdef MOZ_SECURITY_SQLSTORE
#include "mozStorageCID.h"
#endif
#include "mozilla/ArrayUtils.h"
@@ -1712,7 +1712,7 @@ GetNSSProfilePath(nsAutoCString& aProfilePath)
("Could not get nsILocalFileWin for profile directory.\n"));
return NS_ERROR_FAILURE;
}
-#ifdef NSS_SQLSTORE
+#ifdef MOZ_SECURITY_SQLSTORE
// SQLite always takes UTF-8 file paths regardless of the current system
// code page.
nsAutoString u16ProfilePath;
@@ -1982,7 +1982,7 @@ nsNSSComponent::Init()
return NS_ERROR_NOT_SAME_THREAD;
}
-#ifdef NSS_SQLSTORE
+#ifdef MOZ_SECURITY_SQLSTORE
// To avoid an sqlite3_config race in NSS init, we require the storage service to get initialized first.
nsCOMPtr<nsISupports> storageService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
if (!storageService) {