From 3e1b451c5d330b81561436a600bdaa9fbacc1ba1 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 2 Mar 2016 16:41:04 +0100 Subject: [PATCH] agent: Do not remove the ssh socket. * agent/gpg-agent.c (create_server_socket): Also inhibit the removal of the ssh socket if another agent process is already running. GnuPG modern is not affected. GnuPG-bug-id: 2258 Signed-off-by: Justus Winter --- agent/gpg-agent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 479f91802..3b4a181bb 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1586,6 +1586,8 @@ create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce) log_error (_("a gpg-agent is already running - " "not starting a new one\n")); *name = 0; /* Inhibit removal of the socket by cleanup(). */ + if (opt.ssh_support) + *socket_name_ssh = 0; /* Likewise for the ssh socket. */ assuan_sock_close (fd); agent_exit (2); }