ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4193. [bug] Handle broken servers that return BADVERS incorrectly.

Browse Source 
[RT #40427]
This commit is contained in:
Mark Andrews
2015-08-25 16:54:04 +10:00
parent 53d88bc684
commit d324bececc
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -1,3 +1,6 @@
4193. [bug] Handle broken servers that return BADVERS incorrectly.
[RT #40427]
4192. [bug] The default rrset-order of random was not always being
applied. [RT #40456]
lib/dns/resolver.c
+13 -2
View File
@@ -8012,6 +8012,8 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
unsigned int flags, mask;
unsigned int version;
#ifdef ISC_PLATFORM_USESIT
isc_boolean_t nosit = ISC_FALSE;
/*
* Some servers return BADVERS to unknown
* EDNS options. This cannot be long term
@@ -8021,19 +8023,21 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
*/
if (dns_adb_getsit(fctx->adb, query->addrinfo,
sit, sizeof(sit)) == 0U) {
if (!NOSIT(query->addrinfo))
nosit = ISC_TRUE;
dns_adb_changeflags(fctx->adb, query->addrinfo,
FCTX_ADDRINFO_NOSIT,
FCTX_ADDRINFO_NOSIT);
}
#endif
resend = ISC_TRUE;
INSIST(opt != NULL);
version = (opt->ttl >> 16) & 0xff;
flags = (version << DNS_FETCHOPT_EDNSVERSIONSHIFT) |
DNS_FETCHOPT_EDNSVERSIONSET;
mask = DNS_FETCHOPT_EDNSVERSIONMASK |
DNS_FETCHOPT_EDNSVERSIONSET;
/*
* Record that we got a good EDNS response.
*/
@@ -8043,6 +8047,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
FCTX_ADDRINFO_EDNSOK,
FCTX_ADDRINFO_EDNSOK);
}
/*
* Record the supported EDNS version.
*/
@@ -8050,7 +8055,13 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
case 0:
dns_adb_changeflags(fctx->adb, query->addrinfo,
flags, mask);
break;
#ifdef ISC_PLATFORM_USESIT
if (nosit) {
resend = ISC_TRUE;
break;
}
#endif
/* FALLTHROUGH */
default:
broken_server = DNS_R_BADVERS;
keep_trying = ISC_TRUE;