[git] GnuPG - branch, master, updated. gnupg-2.1.9-142-g1e3dbb1

[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  1e3dbb15affd6d75a477aa17715d8e5470988c08 (commit)
      from  58e4a492e2c8e908d16135486ed601f602f1e38d (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 1e3dbb15affd6d75a477aa17715d8e5470988c08
Author: Justus Winter <justus at g10code.com>
Date:   Mon Nov 16 18:18:25 2015 +0100

    dirmngr: Fix specifying keyservers by IP address.
    
    * dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
    entry instead of creating another one.
    --
    Previously, if a keyserver was given using its IP address
    (e.g. 'hkp://127.0.0.1'), 'map_host' would create two entries in the
    'hosttable', one with the name '127.0.0.1', and the second one with
    the name 'localhost' and 'v4addr' being set to '127.0.0.1'.  But the
    first entry is the one being used for lookups, and since the 'v4' flag
    is not set, the 'HTTP_FLAG_IGNORE_IPv4' is used when doing the http
    request, making it fail.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
    GnuPG-bug-id: 2012

diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index c856d6c..7bb4ffe 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -378,7 +378,11 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect,
                 }
               else
                 {
-                  tmpidx = find_hostinfo (tmphost);
+                  if (!is_pool && is_ip_address (name))
+                    /* Update the original entry.  */
+                    tmpidx = idx;
+                  else
+                    tmpidx = find_hostinfo (tmphost);
                   log_info ("resolve_dns_addr for '%s': '%s'%s\n",
                             name, tmphost,
                             tmpidx == -1? "" : " [already known]");

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

Summary of changes:
 dirmngr/ks-engine-hkp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


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