mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

[master] 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 15:47:16 -08:00
parent 8454718b87
commit 41494939b6
3 changed files with 16 additions and 6 deletions
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 4287. [bug] Silence an overly noisy log message when message
parsing fails. [RT #41374] parsing fails. [RT #41374]

7
doc/arm/notes.xml
View File

@@ -759,6 +759,13 @@
</section> </section>
<section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info> <section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
<itemizedlist> <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> <listitem>
<para> <para>
Some of the options for GeoIP ACLs, including "areacode", Some of the options for GeoIP ACLs, including "areacode",

11
lib/dns/resolver.c
View File

@@ -3477,9 +3477,6 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) {
bogus) bogus)
aborted = ISC_TRUE; aborted = ISC_TRUE;
if (!isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3)))
return;
if (aborted) { if (aborted) {
addr->flags |= FCTX_ADDRINFO_MARK; addr->flags |= FCTX_ADDRINFO_MARK;
msg = "ignoring blackholed / bogus server: "; msg = "ignoring blackholed / bogus server: ";
@@ -3503,9 +3500,11 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) {
} else } else
return; return;
isc_netaddr_fromsockaddr(&na, sa); if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) {
isc_netaddr_format(&na, buf, sizeof(buf)); isc_netaddr_fromsockaddr(&na, sa);
FCTXTRACE2(msg, buf); isc_netaddr_format(&na, buf, sizeof(buf));
FCTXTRACE2(msg, buf);
}
} }
static inline dns_adbaddrinfo_t * static inline dns_adbaddrinfo_t *