[git] GnuPG - branch, master, updated. gnupg-2.1.9-166-gb75e1b3

[by Justus Winter]

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  b75e1b3d8b1643640d046f7f8e89adf5b1caa7a3 (commit)
       via  946faaff04f3340ed6db9e89c5036dc5f9beca6a (commit)
      from  73c1a86ad937d7be027eece991c69aaeb6a1f092 (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 b75e1b3d8b1643640d046f7f8e89adf5b1caa7a3
Author: Justus Winter <justus at g10code.com>
Date:   Mon Nov 23 15:41:36 2015 +0100

    dirmngr: Fix http lookups when libadns is used.
    
    * dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
    --
    Previously, sin_port was set to zero, making connect fail.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 694c04b..b3ad9bc 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -253,7 +253,6 @@ resolve_name_adns (const char *name, unsigned short port,
   adns_answer *answer = NULL;
   int count;
 
-  (void)port;
   (void)want_family;
 
   *r_dai = NULL;
@@ -319,6 +318,7 @@ resolve_name_adns (const char *name, unsigned short port,
       dai->protocol = want_socktype == SOCK_STREAM? IPPROTO_TCP : IPPROTO_UDP;
       dai->addrlen = len;
       memcpy (dai->addr, &addr->addr.sa, len);
+      ((struct sockaddr_in *) dai->addr)->sin_port = htons (port);
       dai->next = daihead;
       daihead = dai;
       err = 0;

commit 946faaff04f3340ed6db9e89c5036dc5f9beca6a
Author: Justus Winter <justus at g10code.com>
Date:   Mon Nov 23 15:46:33 2015 +0100

    dirmngr: Fix SRV record lookups when using the system resolver.
    
    * dirmngr/dns-stuff.c (getsrv): Fix error handling.
    --
    This fixes hkp server pools not using SRV records.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 2af4dec..694c04b 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -1086,10 +1086,10 @@ getsrv (const char *name,struct srventry **list)
       return -1;
 
     r = res_query (name, C_IN, T_SRV, answer, sizeof answer);
-    if (r < sizeof (HEADER) || r > sizeof answer)
-      return -1;
     if (header->rcode != NOERROR || !(count=ntohs (header->ancount)))
       return 0; /* Error or no record found.  */
+    if (r < sizeof (HEADER) || r > sizeof answer)
+      return -1;
 
     emsg = &answer[r];
     pt = &answer[sizeof(HEADER)];

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

Summary of changes:
 dirmngr/dns-stuff.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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