scd-backport-2-0 branch

[NIIBE Yutaka]

On 2012-06-22 at 10:25 +0200, Werner Koch wrote:
> On Fri, 22 Jun 2012 04:49, gniibe at fsij.org said:
> 
> > I backported SCD (scdaemon) related changes to scd-backport-2-0
> > branch.  If it doesn't have any problem, I'd like to merge it into
> > STABLE-BRANCH-2-0.
> 
> I am fine with this.  Shall I prepare a release candidate then?

I added one more change of following (I will add this change to master
branch too).  Then, rebase and merge scd-backport-2-0 branch into
STABLE-BRANCH-2-0.

I think that changes fix problems, and has no regression.  But, I
still have a concern about how scdaemon should run.  I am writing
about this in the next mail.

commit 34b78c7d82f3923052e36d405ba403787ae9df16
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Sun Jun 24 10:45:49 2012 +0900

    scd: handle reader/token removal.
    * scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
    SW_HOST_NO_READER.

diff --git a/scd/apdu.c b/scd/apdu.c
index a343307..0ce1c51 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -841,6 +841,7 @@ pcsc_error_to_sw (long ec)
     case PCSC_E_CANCELLED:           rc = SW_HOST_ABORTED; break;
     case PCSC_E_NO_MEMORY:           rc = SW_HOST_OUT_OF_CORE; break;
     case PCSC_E_TIMEOUT:             rc = SW_HOST_CARD_IO_ERROR; break;
+    case PCSC_E_UNKNOWN_READER:      rc = SW_HOST_NO_READER; break;
     case PCSC_E_SHARING_VIOLATION:   rc = SW_HOST_LOCKING_FAILED; break;
     case PCSC_E_NO_SMARTCARD:        rc = SW_HOST_NO_CARD; break;
     case PCSC_W_REMOVED_CARD:        rc = SW_HOST_NO_CARD; break;