[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-15-gf8e868d

[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, STABLE-BRANCH-2-2 has been updated
       via  f8e868d9dfb6fc1390e421e7993a1d076309ed83 (commit)
      from  d7207b39b71d1b07c4cddac602f29ec583f6d1ad (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 f8e868d9dfb6fc1390e421e7993a1d076309ed83
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Jan 27 19:46:19 2018 +0100

    dirmngr: Improve assuan error comment for cmd keyserver.
    
    * dirmngr/server.c: Add error comment in case --resolve fails in
    ensure_keyserver.
    --
    
    GnuPG-bug-id: 3756
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 3d0768b..ab2ca85 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2134,8 +2134,13 @@ cmd_keyserver (assuan_context_t ctx, char *line)
   if (resolve_flag)
     {
       err = ensure_keyserver (ctrl);
-      if (!err)
-        err = ks_action_resolve (ctrl, ctrl->server_local->keyservers);
+      if (err)
+        {
+          assuan_set_error (ctx, err,
+                            "Bad keyserver configuration in dirmngr.conf");
+          goto leave;
+        }
+      err = ks_action_resolve (ctrl, ctrl->server_local->keyservers);
       if (err)
         goto leave;
     }

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

Summary of changes:
 dirmngr/server.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


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