summaryrefslogtreecommitdiffstats
path: root/dirmngr/server.c
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2016-10-26 22:37:06 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2016-10-27 03:30:55 +0200
commit6bb6ac56cca8135666387a0b9d88dd6b50311418 (patch)
treee7d09e7e38142eec58aa14ed1d9020fd122d56aa /dirmngr/server.c
parentcommon: Fix gnupg_inotify_has_name. (diff)
downloadgnupg2-6bb6ac56cca8135666387a0b9d88dd6b50311418.tar.xz
gnupg2-6bb6ac56cca8135666387a0b9d88dd6b50311418.zip
dirmngr: report actual socket name.
* dirmngr/dirmngr.[ch] (dirmngr_get_current_socket_name): new function to report known socket name. * dirmngr/server.c (cmd_getinfo): use dirmngr_get_current_socket_name to report correct socket name. -- This fixes the output of 'getinfo socket_name' when dirmngr is invoked with --socket-name. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to '')
-rw-r--r--dirmngr/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 57273c785..2d4f292f5 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2271,7 +2271,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
}
else if (!strcmp (line, "socket_name"))
{
- const char *s = dirmngr_socket_name ();
+ const char *s = dirmngr_get_current_socket_name ();
err = assuan_send_data (ctx, s, strlen (s));
}
else if (!strcmp (line, "tor"))