summaryrefslogtreecommitdiffstats
path: root/dirmngr/server.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2018-01-27 19:46:19 +0100
committerWerner Koch <wk@gnupg.org>2018-01-27 19:46:19 +0100
commitf8e868d9dfb6fc1390e421e7993a1d076309ed83 (patch)
tree37e3fdbbf8633df461f0b07ff18ddefe98e399dd /dirmngr/server.c
parentagent: Fix last commit. (diff)
downloadgnupg2-f8e868d9dfb6fc1390e421e7993a1d076309ed83.tar.xz
gnupg2-f8e868d9dfb6fc1390e421e7993a1d076309ed83.zip
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@gnupg.org>
Diffstat (limited to 'dirmngr/server.c')
-rw-r--r--dirmngr/server.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 3d0768b2a..ab2ca852f 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;
}