Эх сурвалжийг харах

2008-10-21 Marcus Brinkmann <marcus@g10code.com>

	* src/slots.c (slots_update_slot): Ignore card errors.
Marcus Brinkmann 16 жил өмнө
parent
commit
43ee560119
2 өөрчлөгдсөн 9 нэмэгдсэн , 1 устгасан
  1. 4 0
      ChangeLog
  2. 5 1
      src/slots.c

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+2008-10-21  Marcus Brinkmann  <marcus@g10code.com>
+
+	* src/slots.c (slots_update_slot): Ignore card errors.
+
 2008-10-01  Marcus Brinkmann  <marcus@g10code.com>
 
 	* src/agent.c (agent_connect): Set assuan log stream.

+ 5 - 1
src/slots.c

@@ -428,8 +428,12 @@ slots_update_slot (slot_iterator_t id)
       scute_agent_release_card_info (&slot->info);
     }
 
+  /* We also ignore card errors, because unusable cards should not
+     affect slots, and firefox is quite unhappy about returning errors
+     here.  */
   if (gpg_err_code (err) == GPG_ERR_CARD_REMOVED
-      || gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT)
+      || gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT
+      || gpg_err_code (err) == GPG_ERR_CARD_ERR)
     /* Nothing to do.  */
     err = 0;
   else if (err == 0)