[Pkg-gnupg-commit] [gnupg2] 82/124: common: Fix connecting to the agent.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 common/homedir.c | 2 ++
 1 file changed, 2 insertions(+)

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.  */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git