diff options
| -rw-r--r-- | build/moz.configure/old.configure | 2 | ||||
| -rw-r--r-- | old-configure.in | 18 | ||||
| -rw-r--r-- | security/certverifier/NSSCertDBTrustDomain.cpp | 2 | ||||
| -rw-r--r-- | security/manager/ssl/nsNSSComponent.cpp | 6 | ||||
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index cf224594a..d0f6909b9 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -204,7 +204,6 @@ def old_configure_options(*options): '--enable-negotiateauth', '--enable-nfc', '--enable-nspr-build', - '--enable-nss-sqlstore', '--enable-official-branding', '--enable-official-vendor', '--enable-oom-breakpoint', @@ -224,6 +223,7 @@ def old_configure_options(*options): '--enable-release', '--enable-safe-browsing', '--enable-sandbox', + '--enable-security-sqlstore', '--enable-signmar', '--enable-simulator', '--enable-small-chunk-size', diff --git a/old-configure.in b/old-configure.in index 1a2c32486..86cf2ae18 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2156,11 +2156,11 @@ MOZ_JETPACK=1 MOZ_DEVTOOLS_SERVER=1 MOZ_DEVTOOLS= MOZ_PLACES=1 +MOZ_SECURITY_SQLSTORE= MOZ_SERVICES_HEALTHREPORT=1 MOZ_SERVICES_SYNC=1 MOZ_USERINFO=1 NSS_DISABLE_DBM= -NSS_SQLSTORE= MOZ_MAILNEWS= MOZ_MAILNEWS_OAUTH2= MOZ_LDAP_XPCOM= @@ -2720,20 +2720,20 @@ AC_SUBST(NSS_DISABLE_DBM) dnl ========================================================= dnl = NSS SQL storage format dnl ========================================================= -MOZ_ARG_ENABLE_BOOL(nss-sqlstore, -[ --enable-nss-sqlstore Enable the use of SQL storage for NSS], - NSS_SQLSTORE=1, - NSS_SQLSTORE=) +MOZ_ARG_ENABLE_BOOL(security-sqlstore, +[ --enable-security-sqlstore Enable the use of SQL storage for NSS], + MOZ_SECURITY_SQLSTORE=1, + MOZ_SECURITY_SQLSTORE=) -if test -n "$NSS_DISABLE_DBM" -a -z "$NSS_SQLSTORE"; then +if test -n "$NSS_DISABLE_DBM" -a -z "$MOZ_SECURITY_SQLSTORE"; then AC_MSG_ERROR([DBM storage support is required if not using NSS SQL storage]) fi -if test -n "$NSS_SQLSTORE"; then - AC_DEFINE(NSS_SQLSTORE) +if test -n "$MOZ_SECURITY_SQLSTORE"; then + AC_DEFINE(MOZ_SECURITY_SQLSTORE) fi -AC_SUBST(NSS_SQLSTORE) +AC_SUBST(MOZ_SECURITY_SQLSTORE) dnl ========================================================= dnl = Don't fold mailnews related comps into libXUL 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) { diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 1f3615a6a..55072c474 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2792,7 +2792,7 @@ XREMain::XRE_mainInit(bool* aExitFlag) // Reduce the number of rounds for debug builds for perf/test reasons. SaveToEnv("NSS_MAX_MP_PBE_ITERATION_COUNT=15"); #else -#ifdef NSS_SQLSTORE +#ifdef MOZ_SECURITY_SQLSTORE // We're using SQL; NSS's defaults for rounds are fine. #else // Set default Master Password rounds to a sane value for DBM which is slower |