From patchwork Wed Mar 20 13:07:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 229378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A19192C00B5 for ; Thu, 21 Mar 2013 00:08:34 +1100 (EST) Received: from localhost ([::1]:52838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIIkq-00037N-Ev for incoming@patchwork.ozlabs.org; Wed, 20 Mar 2013 09:08:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIIkJ-0002yq-3W for qemu-devel@nongnu.org; Wed, 20 Mar 2013 09:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIIkF-0001I3-Lu for qemu-devel@nongnu.org; Wed, 20 Mar 2013 09:07:59 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:50073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIIkF-0001Hl-GB for qemu-devel@nongnu.org; Wed, 20 Mar 2013 09:07:55 -0400 Received: by mail-wi0-f176.google.com with SMTP id hm14so5255332wib.15 for ; Wed, 20 Mar 2013 06:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=EZBG+2CWugEd8yrOqZPTGMNDUPq8srPh9jT8+wmaPhs=; b=y+zrX74NZDlucZFeWbjFsPw2Fz8UNtYa6UsoylZQm2/EZLM3XIvLuCu5ef3nlhpgvz jfsfAItXXk0wNDJilgknPbWG6YgXEDwXQMaAAzO4CbMvhcBGf1Q8G4o41R/SI/qy9oZF 9R1hbTgN+61YfcIFr7srvPsQB/PnpOnQTmb2ultKmaQ1LtkvfF76vOyFSHfdEwhEI12l Vwkfm3HC6bsuRwGLZepeYcZnZs8+sJ7gmOnT9x2/OlJSLm2LQZNOWIJHcqP3cjxZcwMR teS5f8LsauxqHwRaPFOG5QY7nW1RrV8QmU9yBqXEM4tF5M14waOGQqxP97o40S4RdypR ECnA== X-Received: by 10.180.83.10 with SMTP id m10mr3755460wiy.5.1363784874270; Wed, 20 Mar 2013 06:07:54 -0700 (PDT) Received: from localhost (176.Red-79-150-198.dynamicIP.rima-tde.net. [79.150.198.176]) by mx.google.com with ESMTPS id fb8sm3089528wid.1.2013.03.20.06.07.51 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 20 Mar 2013 06:07:53 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Wed, 20 Mar 2013 14:07:48 +0100 Message-Id: <1363784869-23061-1-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.8.1.1.439.g50a6b54 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , alevy@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 1/2] libcacard: remove sql: prefix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 6bad0b9..a0dd32d 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -898,7 +898,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 @@ -910,10 +910,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) {