[git] GnuPG - branch, master, updated. gnupg-2.1.11-165-g6677d8b

[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  6677d8b61446eb5760a30a2488c992d6e895a9ed (commit)
      from  35f4b6aafdf1889ed1ae569af5852f47738fe993 (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 6677d8b61446eb5760a30a2488c992d6e895a9ed
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon May 2 15:56:02 2016 +0900

    scd: More fix of error return path.
    
    * scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
    apdu_connect.
    
    --
    
    GnuPG-bug-id: 2306
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/command.c b/scd/command.c
index 4e80d76..72ff132 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -469,8 +469,8 @@ open_card (ctrl_t ctrl, const char *apptype)
           else if (sw == SW_HOST_CARD_INACTIVE)
             err = gpg_error (GPG_ERR_CARD_RESET);
           else
-            err = gpg_error (GPG_ERR_CARD);
-	}
+            err = gpg_error (GPG_ERR_ENODEV);
+        }
       else
         err = select_application (ctrl, slot, apptype, &ctrl->app_ctx);
     }

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

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


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