[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.29-22-g3e1b451

[by Justus Winter]

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, STABLE-BRANCH-2-0 has been updated
       via  3e1b451c5d330b81561436a600bdaa9fbacc1ba1 (commit)
      from  eb7806d63df63663170ba86f0673caa34b944c28 (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 3e1b451c5d330b81561436a600bdaa9fbacc1ba1
Author: Justus Winter <justus at g10code.com>
Date:   Wed Mar 2 16:41:04 2016 +0100

    agent: Do not remove the ssh socket.
    
    * agent/gpg-agent.c (create_server_socket): Also inhibit the removal
    of the ssh socket if another agent process is already running.
    
    GnuPG modern is not affected.
    
    GnuPG-bug-id: 2258
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 479f918..3b4a181 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1586,6 +1586,8 @@ create_server_socket (char *name, int is_ssh, assuan_sock_nonce_t *nonce)
           log_error (_("a gpg-agent is already running - "
                        "not starting a new one\n"));
           *name = 0; /* Inhibit removal of the socket by cleanup(). */
+          if (opt.ssh_support)
+            *socket_name_ssh = 0; /* Likewise for the ssh socket.  */
           assuan_sock_close (fd);
           agent_exit (2);
         }

-----------------------------------------------------------------------

Summary of changes:
 agent/gpg-agent.c | 2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org