[Pkg-gnupg-commit] [gnupg2] 85/292: agent: Another minor fix to 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 1cedc32c95c2e3c3ab98af23ddc2845d51e596c1
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 5 11:48:59 2016 +0200

    agent: Another minor fix to map_supervised_sockets.
    
    * agent/gpg-agent.c (map_supervised_sockets): Remove debug message.
    Provide correct fd in the second error case.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/gpg-agent.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index dcc9bb6..a4025ce 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -739,13 +739,11 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
         {
           for (j = 0; j < DIM (tbl); j++)
             {
-              log_debug ("i=%d j=%d fdname=%s check=%s\n", i, j,
-                         fdnames[i], tbl[j].label);
               if (!strcmp (fdnames[i], tbl[j].label) || j == DIM(tbl)-1)
                 {
+                  fd = 3 + i;
                   if (**tbl[j].fdaddr == -1)
                     {
-                      fd = 3 + i;
                       name = get_socket_name (fd);
                       if (name)
                         {

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