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 <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-03-02 16:41:04 +01:00
parent eb7806d63d
commit 3e1b451c5d
1 changed files with 2 additions and 0 deletions

View File

@ -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);
}