aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2016-10-26 20:37:06 +0000
committerNIIBE Yutaka <[email protected]>2016-10-27 01:30:55 +0000
commit6bb6ac56cca8135666387a0b9d88dd6b50311418 (patch)
treee7d09e7e38142eec58aa14ed1d9020fd122d56aa /dirmngr/dirmngr.c
parentcommon: Fix gnupg_inotify_has_name. (diff)
downloadgnupg-6bb6ac56cca8135666387a0b9d88dd6b50311418.tar.gz
gnupg-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 <[email protected]>
Diffstat (limited to '')
-rw-r--r--dirmngr/dirmngr.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 41e897b4f..c9e4a058b 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2074,3 +2074,12 @@ handle_connections (assuan_fd_t listen_fd)
cleanup ();
log_info ("%s %s stopped\n", strusage(11), strusage(13));
}
+
+const char*
+dirmngr_get_current_socket_name (void)
+{
+ if (socket_name)
+ return socket_name;
+ else
+ return dirmngr_socket_name ();
+}