[git] GnuPG - branch, master, updated. gnupg-2.2.7-331-g0415b80

[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  0415b80227c52620bece3ae7502f38f24a23e59d (commit)
      from  c9f4c1f0de06672c6ae2b793d86cc001d131f9a6 (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 0415b80227c52620bece3ae7502f38f24a23e59d
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 25 19:12:32 2019 +0100

    scd: Improve app selection for app "undefined".
    
    * scd/app.c (app_new_register): Don't bail out early in undefined
    mode.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/scd/app.c b/scd/app.c
index 8e09555..219cee6 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -305,21 +305,27 @@ app_new_register (int slot, ctrl_t ctrl, const char *name,
         }
     }
 
-  /* For certain error codes, there is no need to try more.  */
-  if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT
-      || gpg_err_code (err) == GPG_ERR_ENODEV)
-    goto leave;
-
   /* Figure out the application to use.  */
   if (want_undefined)
     {
       /* We switch to the "undefined" application only if explicitly
          requested.  */
       app->apptype = "UNDEFINED";
+      /* Clear the error so that we don't run through the application
+       * selection chain.  */
       err = 0;
     }
   else
-    err = gpg_error (GPG_ERR_NOT_FOUND);
+    {
+      /* For certain error codes, there is no need to try more.  */
+      if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT
+          || gpg_err_code (err) == GPG_ERR_ENODEV)
+        goto leave;
+
+      /* Set a default error so that we run through the application
+       * selecion chain.  */
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+    }
 
   if (err && is_app_allowed ("openpgp")
           && (!name || !strcmp (name, "openpgp")))

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

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


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