projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4002714
)
added support for new SQLite cert database format: added a runtime check for version...
author
Gunter Knauf
<gk@gknw.de>
Mon, 21 Sep 2009 22:52:59 +0000
(22:52 +0000)
committer
Gunter Knauf
<gk@gknw.de>
Mon, 21 Sep 2009 22:52:59 +0000
(22:52 +0000)
lib/nss.c
patch
|
blob
|
history
diff --git
a/lib/nss.c
b/lib/nss.c
index
dbb9a57
..
d6f3fcd
100644
(file)
--- a/
lib/nss.c
+++ b/
lib/nss.c
@@
-991,8
+991,11
@@
CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
rv = NSS_NoDB_Init(NULL);
}
else {
- rv = NSS_Initialize(certDir, NULL, NULL, "secmod.db",
- NSS_INIT_READONLY);
+ char *certpath = PR_smprintf("%s%s",
+ NSS_VersionCheck("3.12.0") ? "sql:" : "",
+ certDir);
+ rv = NSS_Initialize(certpath, "", "", "", NSS_INIT_READONLY);
+ PR_smprintf_free(certpath);
}
if(rv != SECSuccess) {
infof(conn->data, "Unable to initialize NSS database\n");