[git] GnuPG - branch, master, updated. gnupg-2.1.17-18-g3376904

[by NIIBE Yutaka]

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  337690441fcb19343fe56b139f5649bed7d25c83 (commit)
      from  f300e12a793d59deb1a369713384eaabfa39b3e6 (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 337690441fcb19343fe56b139f5649bed7d25c83
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Dec 30 15:17:50 2016 +0900

    scd: Fix select_application.
    
    * scd/app.c (select_application): Fix the condition for open.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app.c b/scd/app.c
index 39910d2..a499724 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -325,11 +325,11 @@ select_application (ctrl_t ctrl, const char *name, app_t *r_app, int scan)
 
   *r_app = NULL;
 
-  if (scan
+  if ((scan && !app_top)
       /* FIXME: Here, we can change code to support multiple readers.
          For now, we only open a single reader.
       */
-      && !app_top)
+      || !app_top)
     {
       slot = apdu_open_reader (opt.reader_port);
       if (slot >= 0)
@@ -374,6 +374,8 @@ select_application (ctrl_t ctrl, const char *name, app_t *r_app, int scan)
         }
       unlock_app (app);
     }
+  else
+    err = gpg_error (GPG_ERR_ENODEV);
 
   return err;
 }

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

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


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