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

Bug 495103: nss_Init should strip the "sql:" prefix from the pathname

Browse Source 
passed to nss_FindExternalRoot.  r=rrelyea.


git-svn-id: svn://10.0.0.236/trunk@257304 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com
2009-05-29 19:23:30 +00:00
parent 712dfe7374
commit 56d9e3d0af
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/security/nss/lib/nss/nssinit.c
View File

@@ -36,9 +36,10 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: nssinit.c,v 1.97 2008-08-22 01:33:03 wtc%google.com Exp $ */
/* $Id: nssinit.c,v 1.98 2009-05-29 19:23:30 wtc%google.com Exp $ */
#include <ctype.h>
#include <string.h>
#include "seccomon.h"
#include "prinit.h"
#include "prprf.h"
@@ -555,7 +556,11 @@ loser:
STAN_GetDefaultTrustDomain());
if ((!noModDB) && (!noCertDB) && (!noRootInit)) {
if (!SECMOD_HasRootCerts()) {
nss_FindExternalRoot(configdir, secmodName);
const char *dbpath = configdir;
if (strncmp(dbpath, "sql:", 4) == 0) {
dbpath += 4;
}
nss_FindExternalRoot(dbpath, secmodName);
}
}
pk11sdr_Init();