diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 23da59c330..a8214c9d39 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -1481,7 +1481,9 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, dns_adbname_t *name) { dns_adbaddrinfo_t *addrinfo = NULL; entry = namehook->entry; - if (adbentry_overquota(entry)) { + if ((find->options & DNS_ADBFIND_QUOTAEXEMPT) == 0 && + adbentry_overquota(entry)) + { find->options |= DNS_ADBFIND_OVERQUOTA; goto nextv4; } @@ -1503,7 +1505,9 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, dns_adbname_t *name) { dns_adbaddrinfo_t *addrinfo = NULL; entry = namehook->entry; - if (adbentry_overquota(entry)) { + if ((find->options & DNS_ADBFIND_QUOTAEXEMPT) == 0 && + adbentry_overquota(entry)) + { find->options |= DNS_ADBFIND_OVERQUOTA; goto nextv6; } diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index cf725b62fc..65acb09ccf 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -179,6 +179,10 @@ struct dns_adbfind { * This is useful for reestablishing glue that has expired. */ #define DNS_ADBFIND_STARTATZONE 0x00000020 +/*% + * Fetches will be exempted from the quota. + */ +#define DNS_ADBFIND_QUOTAEXEMPT 0x00000040 /*% * The server's fetch quota is exceeded; it will be treated as * lame for this query. diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 5936d16274..ded2e296fb 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -3263,6 +3263,13 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, options |= DNS_ADBFIND_STARTATZONE; } + /* + * Exempt prefetches from ADB quota. + */ + if ((fctx->options & DNS_FETCHOPT_PREFETCH) != 0) { + options |= DNS_ADBFIND_QUOTAEXEMPT; + } + /* * See what we know about this address. */