summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-06-07 13:48:46 +0200
committerWerner Koch <wk@gnupg.org>2016-06-07 13:48:46 +0200
commit36550dde998fa1d497098050ca2d4e1a952ed6b6 (patch)
tree852698c73f3d10736b2a7f291992fefbbed9ae32 /scd
parentcommon: Remove homedir arg from start_new_{dirmngr,gpg_agent}. (diff)
downloadgnupg2-36550dde998fa1d497098050ca2d4e1a952ed6b6.tar.xz
gnupg2-36550dde998fa1d497098050ca2d4e1a952ed6b6.zip
common: New function gnupg_socketdir.
* common/homedir.c (gnupg_socketdir): New. * agent/gpg-agent.c (create_socket_name): Use new function instead of gnupg_homedir. (check_own_socket): Ditto. (check_for_running_agent): Ditto. * agent/preset-passphrase.c (main): Ditto. * common/asshelp.c (start_new_gpg_agent): Ditto. * scd/scdaemon.c (create_socket_name): Ditto. * tools/gpgconf.c (main): Ditto. * tools/symcryptrun.c (main): Ditto. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'scd')
-rw-r--r--scd/scdaemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 576dbf976..215e63f37 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1042,7 +1042,7 @@ create_socket_name (char *standard_name)
{
char *name;
- name = make_filename (gnupg_homedir (), standard_name, NULL);
+ name = make_filename (gnupg_socketdir (), standard_name, NULL);
if (strchr (name, PATHSEP_C))
{
log_error (("'%s' are not allowed in the socket name\n"), PATHSEP_S);