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. --- dirmngr/dirmngr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dirmngr/dirmngr.c') diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 7bcff7a6a..e3f98c04e 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -666,7 +666,6 @@ main (int argc, char **argv) opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT; /* Other defaults. */ - socket_name = dirmngr_socket_name (); /* Check whether we have a config file given on the commandline */ orig_argc = argc; @@ -721,7 +720,12 @@ main (int argc, char **argv) #endif opt.homedir_data = gnupg_datadir (); opt.homedir_cache = gnupg_cachedir (); + socket_name = dirmngr_sys_socket_name (); } + else if (dirmngr_user_socket_name ()) + socket_name = dirmngr_user_socket_name (); + else + socket_name = dirmngr_sys_socket_name (); if (default_config) configname = make_filename (opt.homedir, DIRMNGR_NAME".conf", NULL ); -- cgit v1.2.3