[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-167-gf4b7f71

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  f4b7f7146349c388a2f3ce224ff2006606c66232 (commit)
      from  f6251c0d0af92331388f5e9bcd1750cbadcaca8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f4b7f7146349c388a2f3ce224ff2006606c66232
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 19 18:26:47 2011 +0100

    scd: Fix for card change returning GPG_ERR_CARD_RESET.
    
    * scd/apdu.c (apdu_connect): Do not test for zero atrlen.
    --
    When gpg-agent prompts for insertion of a card this error would be
    returned.
    
    Co-authored-by: Ben Kibbey <bjk at luxsci.net>

diff --git a/scd/apdu.c b/scd/apdu.c
index 5a51846..f470075 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -3150,8 +3150,7 @@ apdu_connect (int slot)
     ;
   else if (!(status & APDU_CARD_PRESENT))
     sw = SW_HOST_NO_CARD;
-  else if (((status & APDU_CARD_PRESENT) && !(status & APDU_CARD_ACTIVE))
-           || !reader_table[slot].atrlen)
+  else if ((status & APDU_CARD_PRESENT) && !(status & APDU_CARD_ACTIVE))
     sw = SW_HOST_CARD_INACTIVE;
 
   if (DBG_READER)

-----------------------------------------------------------------------

Summary of changes:
 scd/apdu.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org