From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIJ3-0000ZD-Ov for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUIJ1-0001Yc-Hr for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIJ1-0001YJ-8a for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:23 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3MF5Mgb011826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Apr 2013 11:05:22 -0400 From: Alon Levy Date: Mon, 22 Apr 2013 18:04:42 +0300 Message-Id: <1366643098-2566-13-git-send-email-alevy@redhat.com> In-Reply-To: <1366643098-2566-1-git-send-email-alevy@redhat.com> References: <1366643098-2566-1-git-send-email-alevy@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 12/28] libcacard: remove sql: prefix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mlureau@redhat.com From: Marc-Andr=C3=A9 Lureau For some reason, with sql:/ prefix, the PKCS11 modules are not loaded. This patch goes on top of Alon smartcard series. --- 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 =3D NSS_Init(options->nss_db); } else { - gchar *path, *db; + gchar *path; #ifndef _WIN32 path =3D g_strdup("/etc/pki/nssdb"); #else @@ -905,10 +905,8 @@ vcard_emul_init(const VCardEmulOptions *options) path =3D g_build_filename( g_get_system_config_dirs()[0], "pki", "nssdb", NULL); #endif - db =3D g_strdup_printf("sql:%s", path); =20 - rv =3D NSS_Init(db); - g_free(db); + rv =3D NSS_Init(path); g_free(path); } if (rv !=3D SECSuccess) { --=20 1.8.2