[svn] GnuPG - r5006 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2009-05-11 12:01:11 +0200 (Mon, 11 May 2009)
New Revision: 5006

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/apdu.c
Log:
Fix bug 1045


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-05-11 09:37:25 UTC (rev 5005)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-05-11 10:01:11 UTC (rev 5006)
@@ -1,5 +1,7 @@
 2009-05-11  Werner Koch  <wk at g10code.com>
 
+	* apdu.c (send_le): Replace log_error by log_info.  Fixes bug#1043.
+
 	* skclist.c (build_sk_list): Use log_info for "duplicated entry".
 	Fixes bug#1045.
 

Modified: branches/STABLE-BRANCH-1-4/g10/apdu.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/apdu.c	2009-05-11 09:37:25 UTC (rev 5005)
+++ branches/STABLE-BRANCH-1-4/g10/apdu.c	2009-05-11 10:01:11 UTC (rev 5006)
@@ -2632,8 +2632,11 @@
   rc = send_apdu (slot, apdu, apdulen, result, &resultlen, pininfo);
   if (rc || resultlen < 2)
     {
-      log_error ("apdu_send_simple(%d) failed: %s\n",
-                 slot, apdu_strerror (rc));
+      /* We use log_info here so that in case of a transient error, and
+         if this module is used by gpg standalone, the error counter
+         isn't incremented.  */
+      log_info ("apdu_send_simple(%d) failed: %s\n",
+                slot, apdu_strerror (rc));
       unlock_slot (slot);
       return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
     }