[svn] GnuPG - r3948 - branches/GNUPG-1-9-BRANCH/scd

[svn author wk]

Author: wk
Date: 2005-12-06 17:44:20 +0100 (Tue, 06 Dec 2005)
New Revision: 3948

Modified:
   branches/GNUPG-1-9-BRANCH/scd/ChangeLog
   branches/GNUPG-1-9-BRANCH/scd/apdu.c
Log:
Print warning for missing pcsc-wrapper


Modified: branches/GNUPG-1-9-BRANCH/scd/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/scd/ChangeLog	2005-11-28 11:52:25 UTC (rev 3947)
+++ branches/GNUPG-1-9-BRANCH/scd/ChangeLog	2005-12-06 16:44:20 UTC (rev 3948)
@@ -1,3 +1,8 @@
+2005-12-06  Werner Koch  <wk at g10code.com>
+
+	* apdu.c (open_pcsc_reader): Check that pcsc-wrapper is actually
+	installed.
+
 2005-11-23  Werner Koch  <wk at g10code.com>
 
 	* app-nks.c (verify_pin): Give a special error message for a Nullpin.

Modified: branches/GNUPG-1-9-BRANCH/scd/apdu.c
===================================================================
--- branches/GNUPG-1-9-BRANCH/scd/apdu.c	2005-11-28 11:52:25 UTC (rev 3947)
+++ branches/GNUPG-1-9-BRANCH/scd/apdu.c	2005-12-06 16:44:20 UTC (rev 3948)
@@ -1328,7 +1328,15 @@
   int err;
   unsigned int dummy_status;
   int sw = SW_HOST_CARD_IO_ERROR;
+  const char *wrapperpgm = GNUPG_LIBDIR "/pcsc-wrapper";
 
+  if (access (wrapperpgm, X_OK))
+    {
+      log_error ("can't run PC/SC access module `%s': %s\n",
+                 wrapperpgm, strerror (errno));
+      return -1;
+    }
+
   slot = new_reader_slot ();
   if (slot == -1)
     return -1;
@@ -1400,7 +1408,7 @@
         close(i);
       errno = 0;
 
-      execl (GNUPG_LIBDIR "/pcsc-wrapper",
+      execl (wrapperpgm,
              "pcsc-wrapper",
              "--",
              "1", /* API version */