mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
dirmngr: Default to a user socket name and enable autostart.
* common/homedir.c (dirmngr_socket_name): Rename to dirmngr_sys_socket_name. (dirmngr_user_socket_name): New. * common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr socket. * dirmngr/dirmngr.c (main): Ditto. * dirmngr/server.c (cmd_getinfo): Ditto. * sm/server.c (gpgsm_server): Ditto. * dirmngr/dirmngr-client.c (start_dirmngr): Likewise. * tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs. * configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
This commit is contained in:
parent
6dd5d99a61
commit
5d321eb00b
9 changed files with 101 additions and 26 deletions
|
@ -1296,6 +1296,7 @@ gpgsm_server (certlist_t default_recplist)
|
|||
char *tmp = NULL;
|
||||
const char *s1 = getenv (GPG_AGENT_INFO_NAME);
|
||||
|
||||
/* Fixme: Use the really used socket name. */
|
||||
if (asprintf (&tmp,
|
||||
"Home: %s\n"
|
||||
"Config: %s\n"
|
||||
|
@ -1305,7 +1306,9 @@ gpgsm_server (certlist_t default_recplist)
|
|||
opt.homedir,
|
||||
opt.config_filename,
|
||||
s1?s1:"[not set]",
|
||||
dirmngr_socket_name (),
|
||||
(dirmngr_user_socket_name ()
|
||||
? dirmngr_user_socket_name ()
|
||||
: dirmngr_sys_socket_name ()),
|
||||
hello) > 0)
|
||||
{
|
||||
assuan_set_hello_line (ctx, tmp);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue