aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-03-06 15:26:26 +0000
committerWerner Koch <[email protected]>2018-03-06 15:26:26 +0000
commitf574aabeeb873f14a586f80cac16b857e6088534 (patch)
treee84428513719a4e50cb1df1be509c12d34eb434a /dirmngr
parentgpg: Avoid writing a zero length last chunk in AEAD mode. (diff)
parentagent: Also evict cached items via a timer. (diff)
downloadgnupg-f574aabeeb873f14a586f80cac16b857e6088534.tar.gz
gnupg-f574aabeeb873f14a586f80cac16b857e6088534.zip
Merge branch 'STABLE-BRANCH-2-2' into wk-master
Diffstat (limited to 'dirmngr')
-rw-r--r--dirmngr/ks-engine-hkp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 4a0b08f4f..a9bb93666 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request,
case GPG_ERR_UNKNOWN_HOST:
case GPG_ERR_NETWORK:
case GPG_ERR_EIO: /* Sometimes used by estream cookie functions. */
+ case GPG_ERR_EADDRNOTAVAIL: /* e.g. when IPv6 is disabled */
+ case GPG_ERR_EAFNOSUPPORT: /* e.g. when IPv6 is not compiled in */
if (mark_host_dead (request) && *tries_left)
retry = 1;
break;