security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-11 22:52:47 +01:00
Code Activity

dirmngr: report actual socket name.

Browse Source 
* 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>
This commit is contained in:
Daniel Kahn Gillmor 2016-10-26 16:37:06 -04:00 committed by NIIBE Yutaka
parent bc28f320fa
commit 6bb6ac56cc
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dirmngr/dirmngr.c
View File

@ -2074,3 +2074,12 @@ handle_connections (assuan_fd_t listen_fd)
cleanup (); cleanup ();
log_info ("%s %s stopped\n", strusage(11), strusage(13)); 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 ();
}

1
dirmngr/dirmngr.h
View File

@ -184,6 +184,7 @@ void dirmngr_exit( int ); /* Wrapper for exit() */
void dirmngr_init_default_ctrl (ctrl_t ctrl); void dirmngr_init_default_ctrl (ctrl_t ctrl);
void dirmngr_deinit_default_ctrl (ctrl_t ctrl); void dirmngr_deinit_default_ctrl (ctrl_t ctrl);
void dirmngr_sighup_action (void); void dirmngr_sighup_action (void);
const char* dirmngr_get_current_socket_name (void);
/*-- Various housekeeping functions. --*/ /*-- Various housekeeping functions. --*/

2
dirmngr/server.c
View File

@ -2271,7 +2271,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
} }
else if (!strcmp (line, "socket_name")) 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)); err = assuan_send_data (ctx, s, strlen (s));
} }
else if (!strcmp (line, "tor")) else if (!strcmp (line, "tor"))