[Pkg-gnupg-commit] [gnupg2] 165/292: agent: Avoid double error message.

[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 b77f95a4a675fd20f6eeb611f4e7b519eceb4ad3
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 26 09:10:29 2016 +0200

    agent: Avoid double error message.
    
    * agent/gpg-agent.c (map_supervised_sockets): Shorten error message.
    Remove unneeded diagnostic.
    --
    
    get_socket_name already prints error messages and thus there is not
    need to print another one.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/gpg-agent.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 8e2d012..6f73fc7 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -717,18 +717,17 @@ map_supervised_sockets (gnupg_fd_t *r_fd,
   if (!fdnames)
     {
       struct stat statbuf;
+
       if (fd_count != 1)
         log_error ("no LISTEN_FDNAMES and LISTEN_FDS (%d) != 1"
                    " in --supervised mode."
                    " (ignoring all sockets but the first one)\n",
                    fd_count);
       if (fstat (3, &statbuf) == -1 && errno ==EBADF)
-        log_fatal ("file descriptor 3 must be valid in --supervised mode (as the "
-                   "agent's standard socket) if LISTEN_FDNAMES is not set\n");
+        log_fatal ("file descriptor 3 must be valid in --supervised mode"
+                   " if LISTEN_FDNAMES is not set\n");
       *r_fd = 3;
       socket_name = get_socket_name (3);
-      if (!socket_name)
-          log_error ("cannot learn socket name for fd 3\n");
     }
   else if (fd_count != nfdnames)
     {

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