From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIIu-0000DN-5O for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUIIo-0001UM-Vl for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIIo-0001U7-Ml for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:10 -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 r3MF5AVD017589 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Apr 2013 11:05:10 -0400 From: Alon Levy Date: Mon, 22 Apr 2013 18:04:35 +0300 Message-Id: <1366643098-2566-6-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 05/28] libcacard: use system config directory for nss db on win32 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 It's a bit nicer to look for default database under CSIDL_COMMON_APPDATA\pki\nss rather that /etc/pki/nss. Signed-off-by: Marc-Andr=C3=A9 Lureau --- libcacard/vcard_emul_nss.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index df79476..21d4689 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -893,7 +893,23 @@ vcard_emul_init(const VCardEmulOptions *options) if (options->nss_db) { rv =3D NSS_Init(options->nss_db); } else { - rv =3D NSS_Init("sql:/etc/pki/nssdb"); + gchar *path, *db; +#ifndef _WIN32 + path =3D g_strdup("/etc/pki/nssdb"); +#else + if (g_get_system_config_dirs() =3D=3D NULL || + g_get_system_config_dirs()[0] =3D=3D NULL) { + return VCARD_EMUL_FAIL; + } + + path =3D g_build_filename( + g_get_system_config_dirs()[0], "pki", "nssdb", NULL); +#endif + db =3D g_strdup_printf("sql:%s", path); + + rv =3D NSS_Init(db); + g_free(db); + g_free(path); } if (rv !=3D SECSuccess) { return VCARD_EMUL_FAIL; --=20 1.8.2