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. --- common/util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/util.h') diff --git a/common/util.h b/common/util.h index c4acb0bd3..4b3cbfc4d 100644 --- a/common/util.h +++ b/common/util.h @@ -231,7 +231,8 @@ const char *gnupg_libdir (void); const char *gnupg_datadir (void); const char *gnupg_localedir (void); const char *gnupg_cachedir (void); -const char *dirmngr_socket_name (void); +const char *dirmngr_sys_socket_name (void); +const char *dirmngr_user_socket_name (void); /* All module names. We also include gpg and gpgsm for the sake for gpgconf. */ -- cgit v1.2.3