[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/28] libcacard: use system config directory for
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH v3 05/28] libcacard: use system config directory for nss db on win32 |
Date: |
Mon, 22 Apr 2013 18:04:35 +0300 |
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.2
- [Qemu-devel] [PATCH v3 00/28] ccid and libcacard fixes for windows/mingw, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 02/28] ccid-card-emul: do not crash if backend is not provided, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 01/28] libcacard: correct T0 historical bytes size, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 04/28] ccid: declare DEFAULT_ATR table to be "static const", Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 03/28] ccid: make backend_enum_table "static const" and adjust users, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 07/28] build-sys: must link with -fstack-protector, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 08/28] libcacard: fix mingw64 cross-compilation, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 06/28] util: move socket_init() to osdep.c, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 05/28] libcacard: use system config directory for nss db on win32,
Alon Levy <=
- [Qemu-devel] [PATCH v3 09/28] libcacard: split vscclient main() from socket reading, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 13/28] libcacard: remove default libcoolkey loading, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 12/28] libcacard: remove sql: prefix, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 11/28] libcacard: teach vscclient to use GMainLoop for portability, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 15/28] dev-smartcard-reader: nicer debug messages, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 16/28] dev-smartcard-reader: remove aborts (never triggered, but just in case), Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 17/28] dev-smartcard-reader: support windows guest, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 14/28] dev-smartcard-reader: white space fixes, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 18/28] dev-smartcard-reader: reuse usb.h definitions, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 20/28] ccid-card-passthru: add atr check, Alon Levy, 2013/04/22