diff options
| author | Werner Koch <[email protected]> | 2016-01-22 11:34:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-01-22 11:34:50 +0000 |
| commit | 77bceb2902dd489443073d91836ea54376c60bf6 (patch) | |
| tree | 15a00f7992e41d1f995918fe1d9658cb41426a1a | |
| parent | dirmngr: Use sks-keyservers CA by default for the hkps pool. (diff) | |
| download | gnupg-77bceb2902dd489443073d91836ea54376c60bf6.tar.gz gnupg-77bceb2902dd489443073d91836ea54376c60bf6.zip | |
dirmngr: Provide the keyserver pool name even if there is no CNAME.
* dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
--
map_host is intended to return the name of the pool as an additional
information. However this broke some time ago and a pool name was
only retrained if the pool name was retrieved from a DNS CNAME.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | dirmngr/ks-engine-hkp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c index 598e614e3..eca02f001 100644 --- a/dirmngr/ks-engine-hkp.c +++ b/dirmngr/ks-engine-hkp.c @@ -545,9 +545,9 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect, if (hi->pool) { /* Deal with the pool name before selecting a host. */ - if (r_poolname && hi->cname) + if (r_poolname) { - *r_poolname = xtrystrdup (hi->cname); + *r_poolname = xtrystrdup (hi->cname? hi->cname : hi->name); if (!*r_poolname) return gpg_error_from_syserror (); } |