[Pkg-gnupg-commit] [gnupg2] 83/292: agent: Fix error handling in map_supervised_sockets

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

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>
---
 agent/gpg-agent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
                 }

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