389-commits February 2010

389-commits@lists.fedoraproject.org

4 participants
61 discussions

esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.27, 1.28
by Jack Magne 22 Feb '10

22 Feb '10

Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32427 Modified Files: ESC.js Log Message: Backout code for bug# 564059, to ESC 1.1.0.9 seems to have problem fetching enrollment page from server. Index: ESC.js =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ESC.js 28 Jan 2010 19:22:29 -0000 1.27 +++ ESC.js 22 Feb 2010 21:38:16 -0000 1.28 @@ -3453,7 +3453,7 @@ if(ui_id) { UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI); - ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT); + //ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT); ui_id.setAttribute("src",esc_enroll_uri); }

1 0

esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.24.2.1, 1.24.2.2
by Jack Magne 22 Feb '10

22 Feb '10

Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31449/chrome/content/esc Modified Files: Tag: PKI_8_0_RTM_BRANCH ESC.js Log Message: Backout code for bug# 564059, to ESC 1.1.0.9 seems to have problem fetching enrollment page from server. Index: ESC.js =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -u -r1.24.2.1 -r1.24.2.2 --- ESC.js 17 Nov 2009 23:33:11 -0000 1.24.2.1 +++ ESC.js 22 Feb 2010 21:35:05 -0000 1.24.2.2 @@ -3387,7 +3387,7 @@ if(ui_id) { UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI); - ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT); + //ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT); ui_id.setAttribute("src",esc_enroll_uri); }

1 0

esc/src/app/xul/esc application.ini,1.9.2.1,1.9.2.2
by Jack Magne 22 Feb '10

22 Feb '10

Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31449 Modified Files: Tag: PKI_8_0_RTM_BRANCH application.ini Log Message: Backout code for bug# 564059, to ESC 1.1.0.9 seems to have problem fetching enrollment page from server. Index: application.ini =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- application.ini 17 Nov 2009 23:30:28 -0000 1.9.2.1 +++ application.ini 22 Feb 2010 21:35:05 -0000 1.9.2.2 @@ -25,11 +25,11 @@ Name=ESC ; ; This field specifies your application's version. This field is optional. -Version=1.1.0-9 +Version=1.1.0-10 ; ; This field specifies your application's build ID (timestamp). This field is ; required. -BuildID=0000001011 +BuildID=0000001012 ; ; This ID is just an example. Every XUL app ought to have it's own unique ID. ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on

1 0

ldap/servers
by Noriko Hosoi 22 Feb '10

22 Feb '10

ldap/servers/slapd/back-ldbm/id2entry.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit c26ba79b19bb580a6fb8bf8d6d096bf888d197d6 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Feb 22 12:00:10 2010 -0800 567370 - dncache: assertion failure in id2entry_delete https://bugzilla.redhat.com/show_bug.cgi?id=567370 Descriptino: When deleting an entry, if the dn is in the dn cache, it should be removed. The original code was trying to remove it regardless of the existence in the dn cache. Fixed it so that only when the dn is in the cache, it's removed. diff --git a/ldap/servers/slapd/back-ldbm/id2entry.c b/ldap/servers/slapd/back-ldbm/id2entry.c index 05a0181..21f21fc 100644 --- a/ldap/servers/slapd/back-ldbm/id2entry.c +++ b/ldap/servers/slapd/back-ldbm/id2entry.c @@ -190,10 +190,14 @@ id2entry_delete( backend *be, struct backentry *e, back_txn *txn ) if (entryrdn_get_switch()) { ldbm_instance *inst = (ldbm_instance *)be->be_instance_info; - Slapi_DN *sdn = slapi_sdn_dup(slapi_entry_get_sdn_const(e->ep_entry)); - struct backdn *bdn = backdn_init(sdn, e->ep_id, 1); - CACHE_REMOVE(&inst->inst_dncache, bdn); - CACHE_RETURN(&inst->inst_dncache, &bdn); + struct backdn *bdn = dncache_find_id(&inst->inst_dncache, e->ep_id); + if (bdn) { + slapi_log_error(SLAPI_LOG_CACHE, ID2ENTRY, + "dncache_find_id returned: %s\n", + slapi_sdn_get_dn(bdn->dn_sdn)); + CACHE_REMOVE(&inst->inst_dncache, bdn); + CACHE_RETURN(&inst->inst_dncache, &bdn); + } } rc = db->del( db,db_txn,&key,0 );

1 0

Branch 'Directory_Server_8_2_Branch' - ldap/servers
by Noriko Hosoi 22 Feb '10

22 Feb '10

ldap/servers/plugins/replication/repl5.h | 2 - ldap/servers/plugins/replication/repl5_agmt.c | 8 ++--- ldap/servers/plugins/replication/repl5_protocol.c | 33 +++++++++++++++++++--- 3 files changed, 34 insertions(+), 9 deletions(-) New commits: commit bea4eb5bfa3d0f588628387fd43417982b47009c Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Feb 22 10:25:46 2010 -0800 539618 - Replication bulk import reports Invalid read/write https://bugzilla.redhat.com/show_bug.cgi?id=539618 Descriptions: When a protocol is freed by prot_free, prot_close is supposed to have been called to stop the main thread prot_thread_main. But, there was no mechanism for the freeing thread whether the prot_thread_main has already quitted or not, it could have released the Repl_Protocol even though it was still being in use. This fix is adding a checking method. diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 97ce556..332bfb8 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -410,7 +410,7 @@ void prot_initialize_replica(Repl_Protocol *rp); /* stop protocol session in progress */ void prot_stop(Repl_Protocol *rp); void prot_delete(Repl_Protocol **rpp); -void prot_free(Repl_Protocol **rpp); +void prot_free(Repl_Protocol **rpp, int wait_for_done); PRBool prot_set_active_protocol (Repl_Protocol *rp, PRBool total); void prot_clear_active_protocol (Repl_Protocol *rp); Repl_Connection *prot_get_connection(Repl_Protocol *rp); diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index d155004..2571d33 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -558,7 +558,7 @@ agmt_start(Repl_Agmt *ra) if (ra->protocol != NULL) { slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "replication already started for agreement \"%s\"\n", agmt_get_long_name(ra)); PR_Unlock(ra->lock); - prot_free(&prot); + prot_free(&prot, 0); return 0; } @@ -606,7 +606,7 @@ windows_agmt_start(Repl_Agmt *ra) if (ra->protocol != NULL) { slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "replication already started for agreement \"%s\"\n", agmt_get_long_name(ra)); PR_Unlock(ra->lock); - prot_free(&prot); + prot_free(&prot, 0); return 0; } @@ -644,8 +644,8 @@ agmt_stop(Repl_Agmt *ra) } PR_Lock(ra->lock); ra->stop_in_progress = PR_FALSE; - /* we do not reuse the protocol object so free it */ - prot_free(&ra->protocol); + /* we do not reuse the protocol object so free it */ + prot_free(&ra->protocol, 1); PR_Unlock(ra->lock); return return_value; } diff --git a/ldap/servers/plugins/replication/repl5_protocol.c b/ldap/servers/plugins/replication/repl5_protocol.c index 9d8cc16..4a50d0b 100644 --- a/ldap/servers/plugins/replication/repl5_protocol.c +++ b/ldap/servers/plugins/replication/repl5_protocol.c @@ -77,6 +77,7 @@ typedef struct repl_protocol /* States */ #define STATE_FINISHED 503 +#define STATE_DONE 504 #define STATE_BAD_STATE_SHOULD_NEVER_HAPPEN 599 /* Forward declarations */ @@ -172,16 +173,39 @@ prot_get_agreement(Repl_Protocol *rp) } - - void -prot_free(Repl_Protocol **rpp) +prot_free(Repl_Protocol **rpp, int wait_for_done) { Repl_Protocol *rp = NULL; + PRIntervalTime interval; if (rpp == NULL || *rpp == NULL) return; rp = *rpp; + /* + * This function has to wait until prot_thread_main exits if + * prot_start is successfully called and prot_thread_main is + * running. Otherwise, we may free Repl_Protocol while it's + * being used. + * + * This function is supposed to be called when the protocol is + * stopped either after prot_stop is called or when protocol + * hasn't been started. + * + * The latter case: prot_free is called with wait_for_done = 0. + * The former case: prot_free is called with wait_for_done = 1. + * prot_stop had set STATE_FINISHED to next_state and stopped + * the current activity. But depending upon the threads' + * scheduling, prot_thread_main may not have gotten out of the + * while loop at this moment. To make sure prot_thread_main + * finished referring Repl_Protocol, we wait for the state set + * to STATE_DONE. + */ + interval = PR_MillisecondsToInterval(1000); + while (wait_for_done && STATE_DONE != rp->state) + { + DS_Sleep(interval); + } PR_Lock(rp->lock); if (NULL != rp->prp_incremental) @@ -220,7 +244,7 @@ prot_delete(Repl_Protocol **rpp) if (NULL != rp) { prot_stop(rp); - prot_free(rpp); + prot_free(rpp, 1); } } @@ -338,6 +362,7 @@ prot_thread_main(void *arg) } rp->state = rp->next_state; } + rp->state = STATE_DONE; }

1 0

ldap/servers
by Noriko Hosoi 22 Feb '10

22 Feb '10

ldap/servers/plugins/replication/repl5.h | 2 - ldap/servers/plugins/replication/repl5_agmt.c | 8 ++--- ldap/servers/plugins/replication/repl5_protocol.c | 34 ++++++++++++++++++++-- ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 2 - 4 files changed, 37 insertions(+), 9 deletions(-) New commits: commit 4205086e4f237a52eb9113cd95f9cf87b39e9ed4 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Feb 22 08:49:49 2010 -0800 539618 - Replication bulk import reports Invalid read/write https://bugzilla.redhat.com/show_bug.cgi?id=539618 Descriptions: When a protocol is freed by prot_free, prot_close is supposed to have been called to stop the main thread prot_thread_main. But, there was no mechanism for the freeing thread whether the prot_thread_main has already quitted or not, it could have released the Repl_Protocol even though it was still being in use. This fix is adding a checking method. The same test revealed ldbm_back_modrdn had a chance to access a field of NULL entry structure. diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 97ce556..332bfb8 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -410,7 +410,7 @@ void prot_initialize_replica(Repl_Protocol *rp); /* stop protocol session in progress */ void prot_stop(Repl_Protocol *rp); void prot_delete(Repl_Protocol **rpp); -void prot_free(Repl_Protocol **rpp); +void prot_free(Repl_Protocol **rpp, int wait_for_done); PRBool prot_set_active_protocol (Repl_Protocol *rp, PRBool total); void prot_clear_active_protocol (Repl_Protocol *rp); Repl_Connection *prot_get_connection(Repl_Protocol *rp); diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index d155004..2571d33 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -558,7 +558,7 @@ agmt_start(Repl_Agmt *ra) if (ra->protocol != NULL) { slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "replication already started for agreement \"%s\"\n", agmt_get_long_name(ra)); PR_Unlock(ra->lock); - prot_free(&prot); + prot_free(&prot, 0); return 0; } @@ -606,7 +606,7 @@ windows_agmt_start(Repl_Agmt *ra) if (ra->protocol != NULL) { slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "replication already started for agreement \"%s\"\n", agmt_get_long_name(ra)); PR_Unlock(ra->lock); - prot_free(&prot); + prot_free(&prot, 0); return 0; } @@ -644,8 +644,8 @@ agmt_stop(Repl_Agmt *ra) } PR_Lock(ra->lock); ra->stop_in_progress = PR_FALSE; - /* we do not reuse the protocol object so free it */ - prot_free(&ra->protocol); + /* we do not reuse the protocol object so free it */ + prot_free(&ra->protocol, 1); PR_Unlock(ra->lock); return return_value; } diff --git a/ldap/servers/plugins/replication/repl5_protocol.c b/ldap/servers/plugins/replication/repl5_protocol.c index 9d8cc16..e909ed4 100644 --- a/ldap/servers/plugins/replication/repl5_protocol.c +++ b/ldap/servers/plugins/replication/repl5_protocol.c @@ -77,6 +77,7 @@ typedef struct repl_protocol /* States */ #define STATE_FINISHED 503 +#define STATE_DONE 504 #define STATE_BAD_STATE_SHOULD_NEVER_HAPPEN 599 /* Forward declarations */ @@ -173,15 +174,41 @@ prot_get_agreement(Repl_Protocol *rp) - +/* + */ void -prot_free(Repl_Protocol **rpp) +prot_free(Repl_Protocol **rpp, int wait_for_done) { Repl_Protocol *rp = NULL; + PRIntervalTime interval; if (rpp == NULL || *rpp == NULL) return; rp = *rpp; + /* + * This function has to wait until prot_thread_main exits if + * prot_start is successfully called and prot_thread_main is + * running. Otherwise, we may free Repl_Protocol while it's + * being used. + * + * This function is supposed to be called when the protocol is + * stopped either after prot_stop is called or when protocol + * hasn't been started. + * + * The latter case: prot_free is called with wait_for_done = 0. + * The former case: prot_free is called with wait_for_done = 1. + * prot_stop had set STATE_FINISHED to next_state and stopped + * the current activity. But depending upon the threads' + * scheduling, prot_thread_main may not have gotten out of the + * while loop at this moment. To make sure prot_thread_main + * finished referring Repl_Protocol, we wait for the state set + * to STATE_DONE. + */ + interval = PR_MillisecondsToInterval(1000); + while (wait_for_done && STATE_DONE != rp->state) + { + DS_Sleep(interval); + } PR_Lock(rp->lock); if (NULL != rp->prp_incremental) @@ -220,7 +247,7 @@ prot_delete(Repl_Protocol **rpp) if (NULL != rp) { prot_stop(rp); - prot_free(rpp); + prot_free(rpp, 1); } } @@ -338,6 +365,7 @@ prot_thread_main(void *arg) } rp->state = rp->next_state; } + rp->state = STATE_DONE; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 117eb3b..5e2b185 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -933,7 +933,7 @@ error_return: slapi_entry_free( postentry ); postentry= NULL; } - if (entryrdn_get_switch()) + if (e && entryrdn_get_switch()) { struct backdn *bdn = dncache_find_id(&inst->inst_dncache, e->ep_id); CACHE_REMOVE(&inst->inst_dncache, bdn);

1 0

coolkey/src/libckyapplet cky_card.c,1.3,1.4
by Jack Magne 19 Feb '10

19 Feb '10

Author: jmagne Update of /cvs/dirsec/coolkey/src/libckyapplet In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734/src/libckyapplet Modified Files: 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cky_card.c 2 Oct 2009 01:43:53 -0000 1.3 +++ cky_card.c 19 Feb 2010 00:10:17 -0000 1.4 @@ -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; }

1 0

coolkey configure.in,1.15,1.16
by Jack Magne 19 Feb '10

19 Feb '10

Author: jmagne Update of /cvs/dirsec/coolkey In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734 Modified Files: configure.in Log Message: Fix for #403571, CoolKey compatibility with OS X. Index: configure.in =================================================================== RCS file: /cvs/dirsec/coolkey/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configure.in 16 Sep 2009 23:56:40 -0000 1.15 +++ configure.in 19 Feb 2010 00:10:17 -0000 1.16 @@ -78,9 +78,9 @@ 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])

1 0

coolkey configure.in,1.14,1.14.4.1
by Jack Magne 19 Feb '10

19 Feb '10

Author: jmagne Update of /cvs/dirsec/coolkey In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27670 Modified Files: Tag: PKI_8_0_RTM_BRANCH configure.in Log Message: Fix for #403571, CoolKey compatibility with OS X. Index: configure.in =================================================================== RCS file: /cvs/dirsec/coolkey/configure.in,v retrieving revision 1.14 retrieving revision 1.14.4.1 diff -u -r1.14 -r1.14.4.1 --- configure.in 16 Feb 2007 19:50:50 -0000 1.14 +++ configure.in 19 Feb 2010 00:09:41 -0000 1.14.4.1 @@ -78,9 +78,9 @@ 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])

1 0

coolkey/src/libckyapplet cky_card.c,1.2.4.1,1.2.4.2
by Jack Magne 19 Feb '10

19 Feb '10

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; }

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits February 2010