[git] GnuPG - branch, master, updated. gnupg-2.1.15-198-ga2127c7

by Daniel Kahn Gillmor cvs at cvs.gnupg.org
Wed Oct 5 08:16:21 CEST 2016


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  a2127c71dbf87c1710b43d91a733dd4c9b2953bc (commit)
      from  1a9c8d78ece2f31fdb1a8e2be049aa71053061fa (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 a2127c71dbf87c1710b43d91a733dd4c9b2953bc
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 5 00:23:11 2016 -0400

    agent: Fix error handling in map_supervised_sockets
    
    * agent/gpg-agent.c (map_supervised_sockets): the file descriptor to
      close on error is fd, not i.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 1696e5a..9c7b8fc 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -758,14 +758,14 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
                         {
                           log_error ("cannot listen on fd %d for %s socket\n",
                                      fd, tbl[j].label);
-                          close (i);
+                          close (fd);
                         }
                     }
                   else
                     {
                       log_error ("cannot listen on more than one %s socket\n",
                                  tbl[j].label);
-                      close (i);
+                      close (fd);
                     }
                   break;
                 }

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

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


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




More information about the Gnupg-commits mailing list