[git] GnuPG - branch, master, updated. gnupg-2.1.21-118-g9998b16

[by Marcus Brinkmann]

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  9998b162b47931fb8a8ed961d53418d505358888 (commit)
      from  69614d55018ddb8678d8904a52e648931f480d72 (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 9998b162b47931fb8a8ed961d53418d505358888
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Thu Jul 20 17:41:49 2017 +0200

    g10: Return proper error when gpg-agent fails to start during probe.
    
    * g10/getkey.c (lookup): Return immediately on any other error than
    GPG_ERR_NO_SECKEY from agent_probe_any_secret_key.
    
    Signed-off-by: Marcus Brinkmann <mb at g10code.com>
    GnuPG-bug-id: 2204

diff --git a/g10/getkey.c b/g10/getkey.c
index 285ea35..2bec984 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3741,8 +3741,14 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
 	  goto skip;
 	}
 
-      if (want_secret && agent_probe_any_secret_key (NULL, keyblock))
-        goto skip; /* No secret key available.  */
+      if (want_secret)
+	{
+	  rc = agent_probe_any_secret_key (NULL, keyblock);
+	  if (gpg_err_code(rc) == GPG_ERR_NO_SECKEY)
+	    goto skip; /* No secret key available.  */
+	  if (rc)
+	    goto found; /* Unexpected error.  */
+	}
 
       /* Warning: node flag bits 0 and 1 should be preserved by
        * merge_selfsigs.  */

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

Summary of changes:
 g10/getkey.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


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