aboutsummaryrefslogtreecommitdiffstats
path: root/agent/gpg-agent.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-05-26 06:28:13 +0000
committerNIIBE Yutaka <[email protected]>2023-05-26 06:28:13 +0000
commitf15a643a2d45c5ac2fbd80568d031808d6058f41 (patch)
treee72e15060977b6e35d51315400f4b7f3db88a731 /agent/gpg-agent.c
parentgpg: Skip keys found via ADSKs. (diff)
downloadgnupg-f15a643a2d45c5ac2fbd80568d031808d6058f41.tar.gz
gnupg-f15a643a2d45c5ac2fbd80568d031808d6058f41.zip
agent,dirmngr: Shutdown fix for supervised mode.
* agent/gpg-agent.c (handle_connections): Break if supervised. * dirmngr/dirmngr.c (is_supervised): New. (handle_connections): Break if supervised. -- For supervised agent/dirmngr, 'systemctl stop' behaves just like 'gpgconf --kill', ignoring existing connections. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/gpg-agent.c')
-rw-r--r--agent/gpg-agent.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 1db422737..e55cd0b7c 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -3115,7 +3115,7 @@ handle_connections (gnupg_fd_t listen_fd,
/* Shutdown test. */
if (shutdown_pending)
{
- if (active_connections == 0)
+ if (active_connections == 0 || is_supervised)
break; /* ready */
/* Do not accept new connections but keep on running the