[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-94-ged0328d

by NIIBE Yutaka cvs at cvs.gnupg.org
Tue Mar 26 00:58:57 CET 2013


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, STABLE-BRANCH-2-0 has been updated
       via  ed0328d49ad7d3361e608330205c92a06a508d06 (commit)
      from  ae22d629b6028aa994ff09f012e1cb029575eeae (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 ed0328d49ad7d3361e608330205c92a06a508d06
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Mar 26 08:43:15 2013 +0900

    scd: call update_card_removed only when detecting removal.
    
    * scd/command.c (update_reader_status_file): Add condition
    ss->status == 0.
    
    --
    
    To reproduce the bug: (1) insert card,
      (2) run "gpg2 --card-status",
      (3) remove card, (4) invoke "gpg2 --card-edit",
      (5) invoke some command like "verify"
    The last step fails (but with no error message to user).

diff --git a/scd/command.c b/scd/command.c
index e45153f..fc1f5a2 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -2310,10 +2310,8 @@ update_reader_status_file (int set_card_removed_flag)
             xfree (homestr);
           }
 
-          /* Set the card removed flag for all current sessions.  We
-             will set this on any card change because a reset or
-             SERIALNO request must be done in any case.  */
-          if (ss->any && set_card_removed_flag)
+          /* Set the card removed flag for all current sessions.  */
+          if (ss->any && ss->status == 0 && set_card_removed_flag)
             update_card_removed (idx, 1);
 
           ss->any = 1;

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

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


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




More information about the Gnupg-commits mailing list