diff options
| author | jmagne <jmagne@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2010-02-19 00:10:17 +0000 |
|---|---|---|
| committer | jmagne <jmagne@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2010-02-19 00:10:17 +0000 |
| commit | 891d15dcd5e131908763545d48dc4ab4c1d6a7dc (patch) | |
| tree | ff26e0290f024860f627e5ad30899d1b42c08ddd | |
| parent | e558fe1a0917b76074c7844959748d42c21d5894 (diff) | |
Fix for #403571, CoolKey compatibility with OS X.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@85 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/libckyapplet/cky_card.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 154a4a7..92524af 100644 --- a/configure.in +++ b/configure.in @@ -78,9 +78,9 @@ case "$host" in PCSC_MSG=yes PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers" PCSC_LIBS="-Wl,-framework,PCSC" - CFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" + CFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" LDFLAGS="-L/System/Library/Frameworks/Security.framework/Versions/Current/Security -arch ppc -arch i386" - CXXFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" + CXXFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" ;; *) AC_MSG_RESULT([UNIX/LINUX]) diff --git a/src/libckyapplet/cky_card.c b/src/libckyapplet/cky_card.c index d2edfd4..c5b5eb2 100644 --- a/src/libckyapplet/cky_card.c +++ b/src/libckyapplet/cky_card.c @@ -493,7 +493,7 @@ CKYCardContext_Create(unsigned long scope) * 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 @@ CKYCardContext_ListReaders(CKYCardContext *ctx, CKYReaderNameList *readerNames) 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; } |