[git] Assuan - branch, master, updated. libassuan-2.4.3-2-g8ab3b92

by Ben Kibbey cvs at cvs.gnupg.org
Sun Sep 4 20:27:42 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 "IPC library used by GnuPG".

The branch, master has been updated
       via  8ab3b9273524bd344bdb90dd5d3bc8e5f53ead6e (commit)
      from  bf39d04238c0ae43f6cf2b04baf394c2f1e1d838 (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 8ab3b9273524bd344bdb90dd5d3bc8e5f53ead6e
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Sun Sep 4 14:22:25 2016 -0400

    EPROTO portability fix.
    
    * src/assuan-socket.c(socks5_connect): Return EPROTONOSUPPORT rather
    than EPROTO.
    --
    
    OpenBSD, and maybe other systems, doesn't define EPROTO.
    
    Signed-off-by: Ben Kibbey <bjk at luxsci.net>

diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index d5e4ee4..d7616ce 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -803,7 +803,7 @@ socks5_connect (assuan_context_t ctx, assuan_fd_t sock,
       if (buffer[0] != 1)
         {
           /* SOCKS server returned wrong version.  */
-          gpg_err_set_errno (EPROTO);
+          gpg_err_set_errno (EPROTONOSUPPORT);
           return -1;
         }
       if (buffer[1])
@@ -863,7 +863,7 @@ socks5_connect (assuan_context_t ctx, assuan_fd_t sock,
     {
       /* Socks server returned wrong version or the reserved field is
          not zero.  */
-      gpg_err_set_errno (EPROTO);
+      gpg_err_set_errno (EPROTONOSUPPORT);
       return -1;
     }
   if (buffer[1])

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

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


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org




More information about the Gnupg-commits mailing list