From 1975b2acbff807d88d494153db64882d19410724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 20 Mar 2013 14:07:48 +0100 Subject: [PATCH 223/241] libcacard: remove sql: prefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason, with sql:/ prefix, the PKCS11 modules are not loaded. This patch goes on top of Alon smartcard series. Signed-off-by: Marc-André Lureau Reviewed-by: Alon Levy (cherry picked from commit 667e0b4b6806d53e0b46e29a15d24427ef958c78) --- libcacard/vcard_emul_nss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 21d4689..6b1ca8a 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -893,7 +893,7 @@ vcard_emul_init(const VCardEmulOptions *options) if (options->nss_db) { rv = NSS_Init(options->nss_db); } else { - gchar *path, *db; + gchar *path; #ifndef _WIN32 path = g_strdup("/etc/pki/nssdb"); #else @@ -905,10 +905,8 @@ vcard_emul_init(const VCardEmulOptions *options) path = g_build_filename( g_get_system_config_dirs()[0], "pki", "nssdb", NULL); #endif - db = g_strdup_printf("sql:%s", path); - rv = NSS_Init(db); - g_free(db); + rv = NSS_Init(path); g_free(path); } if (rv != SECSuccess) { -- 1.8.3.1