diff options
| author | Werner Koch <wk@gnupg.org> | 2018-04-26 12:28:53 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-04-26 12:28:53 +0200 |
| commit | cc66108253c58583d6bad3d1e2da2b004701d0f0 (patch) | |
| tree | bfe4972f1e4d35a51c82ccb0dfa5c1a8375e124b /dirmngr/ks-engine-hkp.c | |
| parent | dirmngr: Add the used TLS library to the debug output. (diff) | |
| download | gnupg2-cc66108253c58583d6bad3d1e2da2b004701d0f0.tar.xz gnupg2-cc66108253c58583d6bad3d1e2da2b004701d0f0.zip | |
dirmngr: Fix handling of CNAMEed keyserver pools.
* dirmngr/ks-engine-hkp.c (map_host): Don't use the cname for HTTPHOST.
* dirmngr/server.c (make_keyserver_item): Map keys.gnupg.net.
--
For a description of the problem see the comment in
make_keyserver_item.
GnuPG-bug-id: 3755
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/ks-engine-hkp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c index a9bb93666..eba7a1a48 100644 --- a/dirmngr/ks-engine-hkp.c +++ b/dirmngr/ks-engine-hkp.c @@ -583,7 +583,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect, /* Deal with the pool name before selecting a host. */ if (r_httphost) { - *r_httphost = xtrystrdup (hi->cname? hi->cname : hi->name); + *r_httphost = xtrystrdup (hi->name); if (!*r_httphost) return gpg_error_from_syserror (); } |