[pkg-gnupg-maint] another scdaemon fix

[NIIBE Yutaka]

NIIBE Yutaka <gniibe at fsij.org> wrote:
> Handling a bug report, I found a regression of scdaemon from 2.1.17 to
> 2.1.18.
>
>     https://lists.gnupg.org/pipermail/gnupg-users/2017-February/057662.html
>
> It is fixed in master.  Attached is a backport for 2.1.18-6 of Debian.
> I created it by quilt.  Please consider to include.
>
> -- 
> From: NIIBE Yutaka <gniibe at fsij.org>
> Subject: scd: Fix factory-reset.
>
> Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
>
> Backport from master branch:
>
>     99d4dfe83
>     e2792813a
>     031e3fa7b

The patch of mine is not good enough and introduced another bug.  I just
found the bug when I test it with 2.1.18-7 with PC/SC.

Here is another patch to fix the issue which is introduce by the patch.

--- scd/app.c.orig	2017-05-08 10:30:49.000000000 +0900
+++ scd/app.c	2017-05-08 10:45:57.852411477 +0900
@@ -362,6 +362,7 @@ select_application (ctrl_t ctrl, const c
         }
 
       apdu_dev_list_finish (l);
+      scd_kick_the_loop ();
     }
 
   npth_mutex_lock (&app_list_lock);
@@ -1065,6 +1066,8 @@ scd_update_reader_status_file (void)
               unlock_app (a);
             }
         }
+      else
+        unlock_app (a);
     }
   npth_mutex_unlock (&app_list_lock);
 }
--