[Pkg-gnupg-commit] [gnupg2] 18/116: scd: Fix select_application.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

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>
---
 scd/app.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git