From 5d321eb00be0774418de1a05678ac0ec44d7193b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 12 Mar 2014 19:33:30 +0100 Subject: 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. --- sm/server.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sm/server.c') diff --git a/sm/server.c b/sm/server.c index 74caf6c5c..201a34b3e 100644 --- a/sm/server.c +++ b/sm/server.c @@ -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); -- cgit v1.2.3