security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

dirmngr: Fix the pool keyserver case for a single host in the pool. 

* dirmngr/ks-engine-hkp.c (map_host): Set R_HOSTNAME also for
localhost and if there is no pool.
This commit is contained in:
Werner Koch 2020-09-10 10:19:44 +02:00
parent faabc49797
commit 5a87011c46
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dirmngr/ks-engine-hkp.c
View File

@ -479,7 +479,20 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
if (!name || !*name)
{
*r_host = xtrystrdup ("localhost");
return *r_host? 0 : gpg_error_from_syserror ();
if (!*r_host)
return gpg_error_from_syserror ();
if (r_httphost)
{
*r_httphost = xtrystrdup (*r_host);
if (!*r_httphost)
{
err = gpg_error_from_syserror ();
xfree (*r_host);
*r_host = NULL;
return err;
}
}
return 0;
}
/* See whether the host is in our table. */
@ -652,6 +665,12 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
}
free_dns_addrinfo (aibuf);
}
else if (r_httphost)
{
*r_httphost = xtrystrdup (hi->name);
if (!*r_httphost)
return gpg_error_from_syserror ();
}
if (hi->dead)
{