Commit 41494939 authored by Evan Hunt's avatar Evan Hunt

[master] fixed bogus server regression

4288.	[bug]		Fixed a regression in resolver.c:possibly_mark()
			which caused known-bogus servers to be queried
			anyway. [RT #41321]
parent 8454718b
4288. [bug] Fixed a regression in resolver.c:possibly_mark()
which caused known-bogus servers to be queried
anyway. [RT #41321]
4287. [bug] Silence an overly noisy log message when message
parsing fails. [RT #41374]
......
......@@ -759,6 +759,13 @@
</section>
<section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
<itemizedlist>
<listitem>
<para>
Authoritative servers that were marked as bogus (e.g. blackholed
in configuration or with invalid addresses) were being queried
anyway. [RT #41321]
</para>
</listitem>
<listitem>
<para>
Some of the options for GeoIP ACLs, including "areacode",
......
......@@ -3477,9 +3477,6 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) {
bogus)
aborted = ISC_TRUE;
if (!isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3)))
return;
if (aborted) {
addr->flags |= FCTX_ADDRINFO_MARK;
msg = "ignoring blackholed / bogus server: ";
......@@ -3503,9 +3500,11 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) {
} else
return;
isc_netaddr_fromsockaddr(&na, sa);
isc_netaddr_format(&na, buf, sizeof(buf));
FCTXTRACE2(msg, buf);
if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) {
isc_netaddr_fromsockaddr(&na, sa);
isc_netaddr_format(&na, buf, sizeof(buf));
FCTXTRACE2(msg, buf);
}
}
static inline dns_adbaddrinfo_t *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment