diff options
| author | Werner Koch <[email protected]> | 2016-06-07 11:48:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-07 11:48:46 +0000 |
| commit | 36550dde998fa1d497098050ca2d4e1a952ed6b6 (patch) | |
| tree | 852698c73f3d10736b2a7f291992fefbbed9ae32 /common/asshelp.c | |
| parent | common: Remove homedir arg from start_new_{dirmngr,gpg_agent}. (diff) | |
| download | gnupg-36550dde998fa1d497098050ca2d4e1a952ed6b6.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | common/asshelp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common/asshelp.c b/common/asshelp.c index f89d1d554..5c32c6ed3 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -374,7 +374,14 @@ start_new_gpg_agent (assuan_context_t *r_ctx, return err; } - sockname = make_absfilename (gnupg_homedir (), GPG_AGENT_SOCK_NAME, NULL); + sockname = make_filename_try (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL); + if (!sockname) + { + err = gpg_err_make (errsource, gpg_err_code_from_syserror ()); + assuan_release (ctx); + return err; + } + err = assuan_socket_connect (ctx, sockname, 0, 0); if (err && autostart) { |