summaryrefslogtreecommitdiffstats
path: root/common/homedir.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-04-15 16:40:48 +0200
committerWerner Koch <wk@gnupg.org>2014-04-22 16:59:06 +0200
commitfdd938a5bbecb5b70f564ae3afb4e17905404bb2 (patch)
treeb9733169518511618d2b9b1a452ee0ae9dfdbea6 /common/homedir.c
parentcommon: Add functions make_absfilename and make_absfilename_try. (diff)
downloadgnupg2-fdd938a5bbecb5b70f564ae3afb4e17905404bb2.tar.xz
gnupg2-fdd938a5bbecb5b70f564ae3afb4e17905404bb2.zip
gpg: Pass --homedir to gpg-agent.
* agent/gpg-agent.c (main): Make sure homedir is absolute. * common/asshelp.c (lock_spawning): Create lock file with an absolute name. (start_new_gpg_agent): Use an absolute name for the socket and pass option --homedir to the agent. (start_new_dirmngr): Use an absolute name for the --homedir. -- This patch makes gpg's --homedir option behave again like in older versions. This is done by starting a new agent for each different home directory. Note that this assumes --use-standard-socket is used which is the default for 2.1.
Diffstat (limited to 'common/homedir.c')
-rw-r--r--common/homedir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/homedir.c b/common/homedir.c
index e2a117bd7..c50809f8c 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -600,7 +600,7 @@ dirmngr_sys_socket_name (void)
}
-/* Return the user socket name used by DirMngr. If a a user specific
+/* Return the user socket name used by DirMngr. If a user specific
dirmngr installation is not supported, NULL is returned. */
const char *
dirmngr_user_socket_name (void)
@@ -611,7 +611,7 @@ dirmngr_user_socket_name (void)
static char *name;
if (!name)
- name = make_filename (default_homedir (), DIRMNGR_SOCK_NAME, NULL);
+ name = make_absfilename (default_homedir (), DIRMNGR_SOCK_NAME, NULL);
return name;
#endif /*!HAVE_W32_SYSTEM*/
}