From 6bb6ac56cca8135666387a0b9d88dd6b50311418 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 26 Oct 2016 16:37:06 -0400
Subject: 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>
---
 dirmngr/dirmngr.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'dirmngr/dirmngr.c')

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 ();
+}
-- 
cgit v1.2.3