upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-13 17:50:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v9_10] fixed bogus server regression

Browse source 
4288.	[bug]		Fixed a regression in resolver.c:possibly_mark()
			which caused known-bogus servers to be queried
			anyway. [RT #41321]
This commit is contained in:
Evan Hunt 2016-01-04 16:01:38 -08:00
parent e81fd88813
commit b4cf962eef
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
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]

11
doc/arm/notes.xml
View file

@ -117,8 +117,15 @@
<section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
<itemizedlist>
<listitem>
<para>
<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",
"metrocode", and "timezone", were incorrectly documented
as "area", "metro" and "tz". Both the long and abbreviated

11
lib/dns/resolver.c
View file

@ -3418,9 +3418,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: ";
@ -3444,9 +3441,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 *