[git] GnuPG - branch, master, updated. gnupg-2.1.18-96-gdea4b3c

[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  dea4b3c742acbd195d6ab12b279b4dda315f2582 (commit)
      from  3f4f64b6ac0d7160fd9e1301f95820894b219c3f (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 dea4b3c742acbd195d6ab12b279b4dda315f2582
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Feb 17 20:02:38 2017 +0900

    agent: No cards is not an error.
    
    * agent/command-ssh.c (card_key_list): Care the case of no cards.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 2c74618..7298700 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2387,9 +2387,15 @@ card_key_list (ctrl_t ctrl, char **r_serialno, strlist_t *result)
 {
   gpg_error_t err;
 
+  *r_serialno = NULL;
+  *result = NULL;
+
   err = agent_card_serialno (ctrl, r_serialno, NULL);
   if (err)
     {
+      if (gpg_err_code (err) == GPG_ERR_ENODEV)
+        return 0;               /* Nothing available.  */
+
       if (opt.verbose)
         log_info (_("error getting serial number of card: %s\n"),
                   gpg_strerror (err));

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

Summary of changes:
 agent/command-ssh.c | 6 ++++++
 1 file changed, 6 insertions(+)


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