summaryrefslogtreecommitdiffstats
path: root/base/nss_util.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 12:21:48 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 12:21:48 +0000
commit1b8082df377bacab88e4e2ef6d20f4951f7a0af9 (patch)
tree5a99fadcd3a8d15bb4955af337143e7b2e84ec23 /base/nss_util.cc
parent58c321dd57a1fc00c2c51b0a8b6e547fdf32aa74 (diff)
downloadchromium_src-1b8082df377bacab88e4e2ef6d20f4951f7a0af9.zip
chromium_src-1b8082df377bacab88e4e2ef6d20f4951f7a0af9.tar.gz
chromium_src-1b8082df377bacab88e4e2ef6d20f4951f7a0af9.tar.bz2
linux: make NSS version check non-fatal
It broke too many people for reasons outside of their control. BUG=33163 Review URL: http://codereview.chromium.org/562039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/nss_util.cc')
-rw-r--r--base/nss_util.cc15
1 files changed, 12 insertions, 3 deletions
diff --git a/base/nss_util.cc b/base/nss_util.cc
index c6c4ae3..58c8d62 100644
--- a/base/nss_util.cc
+++ b/base/nss_util.cc
@@ -89,9 +89,18 @@ class NSSInitSingleton {
nss_version_check_failed);
// Also check the run-time NSS version.
// NSS_VersionCheck is a >= check, not strict equality.
- CHECK(NSS_VersionCheck("3.12.3")) << "We depend on NSS >= 3.12.3. "
- "If NSS is up to date, please "
- "update NSPR to the latest version.";
+ if (!NSS_VersionCheck("3.12.3")) {
+ // It turns out many people have misconfigured NSS setups, where
+ // their run-time NSPR doesn't match the one their NSS was compiled
+ // against. So rather than aborting, complain loudly.
+ LOG(ERROR) << "NSS_VersionCheck(\"3.12.3\") failed. "
+ "We depend on NSS >= 3.12.3, and this error is not fatal "
+ "only because many people have busted NSS setups (for "
+ "example, using the wrong version of NSPR). "
+ "Please upgrade to the latest NSS and NSPR, and if you "
+ "still get this error, contact your distribution "
+ "maintainer.";
+ }
SECStatus status = SECFailure;
#if defined(USE_NSS_FOR_SSL_ONLY)