aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/server.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-09-10 08:49:54 +0000
committerWerner Koch <[email protected]>2020-09-10 08:50:40 +0000
commit3cf9bb4d73cfe78d3d48734e7c8a65d9a98112a5 (patch)
tree7bbe28455ff3aacbb7f4b69fb61b5e144152c982 /dirmngr/server.c
parentdirmngr: Fix the pool keyserver case for a single host in the pool. (diff)
downloadgnupg-3cf9bb4d73cfe78d3d48734e7c8a65d9a98112a5.tar.gz
gnupg-3cf9bb4d73cfe78d3d48734e7c8a65d9a98112a5.zip
gpg-connect-agent: Catch signals so that SIGPIPE is ignored.
* dirmngr/server.c (cmd_killdirmngr): Return 0. * tools/gpg-connect-agent.c (main): Catch signals. -- And we also print nicer diagnostics. The reason we need this is that for example "gpgconf --kill dirmngr" uses gpg-connect-agent to send a command to dirmngr. This may results in a SIGPIPE which in turn leads to an annoying error message from gpgconf. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/server.c')
-rw-r--r--dirmngr/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 357aaa592..66ef1c8c9 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2718,7 +2718,7 @@ cmd_killdirmngr (assuan_context_t ctx, char *line)
ctrl->server_local->stopme = 1;
assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
- return gpg_error (GPG_ERR_EOF);
+ return 0;
}