[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/26] libcacard: use system config directory for ns
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH 05/26] libcacard: use system config directory for nss db on win32 |
Date: |
Mon, 18 Mar 2013 15:10:51 +0200 |
From: Marc-André Lureau <address@hidden>
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é Lureau <address@hidden>
---
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 = NSS_Init(options->nss_db);
} else {
- rv = NSS_Init("sql:/etc/pki/nssdb");
+ gchar *path, *db;
+#ifndef _WIN32
+ path = g_strdup("/etc/pki/nssdb");
+#else
+ if (g_get_system_config_dirs() == NULL ||
+ g_get_system_config_dirs()[0] == NULL) {
+ return VCARD_EMUL_FAIL;
+ }
+
+ 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);
+ g_free(path);
}
if (rv != SECSuccess) {
return VCARD_EMUL_FAIL;
--
1.8.1.4
- [Qemu-devel] [PATCH 00/26] ccid and libcacard fixes for windows/mingw, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 01/26] libcacard: correct T0 historical bytes size, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 03/26] ccid: make backend_enum_table "static const" and adjust users, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 02/26] ccid-card-emul: do not crash if backend is not provided, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 04/26] ccid: declare DEFAULT_ATR table to be "static const", Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 07/26] build-sys: must link with -fstack-protector, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 06/26] util: move socket_init() to osdep.c, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 05/26] libcacard: use system config directory for nss db on win32,
Alon Levy <=
- [Qemu-devel] [PATCH 11/26] libcacard: teach vscclient to use GMainLoop for portability, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 10/26] libcacard: vscclient to use QemuThread for portability, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 12/26] hw/ccid-card-passthru.c: add atr check, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 08/26] libcacard: fix mingw64 cross-compilation, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 09/26] libcacard: split vscclient main() from socket reading, Alon Levy, 2013/03/18
- [Qemu-devel] [PATCH 15/26] hw/usb/dev-smartcard-reader.c: nicer debug messages, Alon Levy, 2013/03/18