Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 309877 PSM/NSS init (thus SSL/https) fails when no profile exists

Browse Source 
original patch by benb r=rrelyea moa=kaie


git-svn-id: svn://10.0.0.236/trunk@200822 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2006-06-25 07:12:44 +00:00
parent 705be7e9c6
commit 6884c8fe13
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/security/manager/ssl/src/nsNSSComponent.cpp
View File

@ -1346,8 +1346,13 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
getter_AddRefs(profilePath));
if (NS_FAILED(rv)) {
PR_LOG(gPIPNSSLog, PR_LOG_ERROR, ("Unable to get profile directory\n"));
return rv;
ConfigureInternalPKCS11Token();
SECStatus init_rv = NSS_NoDB_Init(NULL);
if (init_rv != SECSuccess)
return NS_ERROR_NOT_AVAILABLE;
}
else
{
// XP_MAC == CFM
// XP_MACOSX == MachO
@ -1425,9 +1430,12 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init in r/o either\n"));
which_nss_problem = problem_no_security_at_all;
NSS_NoDB_Init(profileStr.get());
init_rv = NSS_NoDB_Init(profileStr.get());
if (init_rv != SECSuccess)
return NS_ERROR_NOT_AVAILABLE;
}
}
} // have profile dir
} // lock
// init phase 3, only if phase 2 was successful