[git] GnuPG - branch, master, updated. gnupg-2.1.19-82-gcaf0091
by Justus Winter
cvs at cvs.gnupg.org
Mon Mar 27 16:24:24 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via caf00915532e6e8e509738962964edcd14fb0654 (commit)
from c1e6302b347caf852a056b9c721469ccb51f44da (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit caf00915532e6e8e509738962964edcd14fb0654
Author: Justus Winter <justus at g10code.com>
Date: Mon Mar 27 16:14:20 2017 +0200
common: Fix connecting to the agent.
* common/homedir.c (_gnupg_socketdir_internal): Fix error handling.
--
Prior to 26086b36 the non-existance of the socket directory was
considered an error if a non-default home directory is used. Since
26086b36 we now create the directory on demand, but the function still
returned the fallback path. This made the agent bind the socket in
the socket directory, and the client trying to connect to the socket
in the home directory.
Fixes-commit: 26086b362ff47d21b1abefaf674a6464bf0a8921
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/common/homedir.c b/common/homedir.c
index ee4438c..fce6d44 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -586,6 +586,8 @@ _gnupg_socketdir_internal (int skip_checks, unsigned *r_info)
else
*r_info |= 64; /* Subdir does not exist. */
}
+ else
+ goto leave; /* Success! */
}
else
*r_info |= 64; /* Subdir does not exist. */
-----------------------------------------------------------------------
Summary of changes:
common/homedir.c | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list