[Pkg-gnupg-commit] [gnupg2] 169/292: dirmngr: report actual socket name.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 6bb6ac56cca8135666387a0b9d88dd6b50311418
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 26 16:37:06 2016 -0400

    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 at fifthhorseman.net>
---
 dirmngr/dirmngr.c | 9 +++++++++
 dirmngr/dirmngr.h | 1 +
 dirmngr/server.c  | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 41e897b..c9e4a05 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 ();
+}
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index d823519..9e216cd 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -184,6 +184,7 @@ void dirmngr_exit( int );  /* Wrapper for exit() */
 void dirmngr_init_default_ctrl (ctrl_t ctrl);
 void dirmngr_deinit_default_ctrl (ctrl_t ctrl);
 void dirmngr_sighup_action (void);
+const char* dirmngr_get_current_socket_name (void);
 
 
 /*-- Various housekeeping functions.  --*/
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 57273c7..2d4f292 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"))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git