[389-commits] coolkey/src/libckyapplet cky_card.c,1.2.4.1,1.2.4.2

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27670/src/libckyapplet

Modified Files:
      Tag: PKI_8_0_RTM_BRANCH
	cky_card.c 
Log Message:
Fix for #403571, CoolKey compatibility with OS X.


Index: cky_card.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/cky_card.c,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- cky_card.c	2 Oct 2009 01:42:37 -0000	1.2.4.1
+++ cky_card.c	19 Feb 2010 00:09:41 -0000	1.2.4.2
@@ -493,7 +493,7 @@
  * condition. Detect this case and continue. We'll establish the connection
  * later..
  */
-    if (ctx->lastError == SCARD_F_INTERNAL_ERROR) {
+    if (ctx->lastError == SCARD_F_INTERNAL_ERROR || ctx->lastError == SCARD_E_NO_SERVICE) {
 	ctx->context = 0; /* make sure it's not established */
 	return ctx;
     }
@@ -545,7 +545,7 @@
  	if (ret != CKYSUCCESS) {
 
 #ifdef MAC
-	    if (ctx->lastError == SCARD_F_INTERNAL_ERROR) {
+	    if (ctx->lastError == SCARD_F_INTERNAL_ERROR || ctx->lastError == SCARD_E_NO_SERVICE) {
 		/* Still can't establish, just treat it as 'zero' readers */
 		return CKYSUCCESS;
 	    }