diff options
author | Werner Koch <[email protected]> | 2014-10-03 09:58:58 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2014-10-03 09:58:58 +0000 |
commit | 9c380384dafb213334f8834178c5ceb0bf33db6e (patch) | |
tree | 3522eab22d31542094d95c605394542a857e1c55 /agent/command.c | |
parent | gpg: Fix regression removing SHA256. (diff) | |
download | gnupg-9c380384dafb213334f8834178c5ceb0bf33db6e.tar.gz gnupg-9c380384dafb213334f8834178c5ceb0bf33db6e.zip |
Remove support for the GPG_AGENT_INFO envvar.
* agent/agent.h (opt): Remove field use_standard_socket.
* agent/command.c (cmd_killagent): Always allow killing.
* agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
--write-env-file into dummy options. Always return true for
--use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
setting or set that envvar.
(create_socket_name): Simplify by removing non standard socket
support.
(check_for_running_agent): Ditto.
* common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
* common/simple-pwquery.c (agent_open): Ditto.
* configure.ac (GPG_AGENT_INFO_NAME): Remove.
* g10/server.c (gpg_server): Do not print the AgentInfo comment.
* g13/server.c (g13_server): Ditto.
* sm/server.c (gpgsm_server): Ditto.
* tools/gpgconf.c (main): Simplify by removing non standard socket
support.
--
The indented fix to allow using a different socket than the one in the
gnupg home directory is to change Libassuan to check whether the
socket files exists as a regualr file with a special keyword to
redirect to another socket file name.
Diffstat (limited to 'agent/command.c')
-rw-r--r-- | agent/command.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/agent/command.c b/agent/command.c index e17232e98..8c6849840 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2605,8 +2605,7 @@ cmd_updatestartuptty (assuan_context_t ctx, char *line) static const char hlp_killagent[] = "KILLAGENT\n" "\n" - "If the agent has been started using a standard socket\n" - "we allow a client to stop the agent."; + "Stop the agent."; static gpg_error_t cmd_killagent (assuan_context_t ctx, char *line) { @@ -2614,9 +2613,6 @@ cmd_killagent (assuan_context_t ctx, char *line) (void)line; - if (!opt.use_standard_socket) - return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket"); - ctrl->server_local->stopme = 1; assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1); return 0; |