mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 09:15:35 +00:00
Backed out changeset 5f58e2f5d1f7 (bug 1544511) for Build bustage. CLOSED TREE
This commit is contained in:
parent
9027ab34a7
commit
f86faf3c36
@ -1576,12 +1576,6 @@ static nsresult InitializeNSSWithFallbacks(const nsACString& profilePath,
|
||||
MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
|
||||
("nocertdb mode or empty profile path -> NSS_NoDB_Init"));
|
||||
SECStatus srv = NSS_NoDB_Init(nullptr);
|
||||
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
||||
if (srv != SECSuccess) {
|
||||
MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d",
|
||||
PR_GetError());
|
||||
}
|
||||
#endif
|
||||
return srv == SECSuccess ? NS_OK : NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
@ -1635,10 +1629,6 @@ static nsresult InitializeNSSWithFallbacks(const nsACString& profilePath,
|
||||
// Unload NSS so we can attempt to fix this situation for the user.
|
||||
srv = NSS_Shutdown();
|
||||
if (srv != SECSuccess) {
|
||||
# ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
||||
MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d",
|
||||
PR_GetError());
|
||||
# endif
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("trying to rename module db"));
|
||||
@ -1647,9 +1637,6 @@ static nsresult InitializeNSSWithFallbacks(const nsACString& profilePath,
|
||||
// fall back to NSS_NoDB_Init, which is the behavior we want.
|
||||
nsresult rv = AttemptToRenameBothPKCS11ModuleDBVersions(profilePath);
|
||||
if (NS_FAILED(rv)) {
|
||||
# ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
||||
MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %u", rv);
|
||||
# endif
|
||||
return rv;
|
||||
}
|
||||
srv = ::mozilla::psm::InitializeNSS(profilePath, false, true);
|
||||
@ -1668,12 +1655,6 @@ static nsresult InitializeNSSWithFallbacks(const nsACString& profilePath,
|
||||
|
||||
MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("last-resort NSS_NoDB_Init"));
|
||||
srv = NSS_NoDB_Init(nullptr);
|
||||
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
||||
if (srv != SECSuccess) {
|
||||
MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d",
|
||||
PR_GetError());
|
||||
}
|
||||
#endif
|
||||
return srv == SECSuccess ? NS_OK : NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user