You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.7 KiB
53 lines
1.7 KiB
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c |
|
index 252a02f..bfffb8a 100644 |
|
--- a/lib/dns/resolver.c |
|
+++ b/lib/dns/resolver.c |
|
@@ -5957,6 +5957,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, |
|
unsigned int nlabels; |
|
dns_fixedname_t fixed; |
|
dns_name_t prefix; |
|
+ int order; |
|
|
|
REQUIRE(rdataset != NULL); |
|
REQUIRE(rdataset->type == dns_rdatatype_cname || |
|
@@ -5979,18 +5980,26 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, |
|
tname = &cname.cname; |
|
break; |
|
case dns_rdatatype_dname: |
|
+ if (dns_name_fullcompare(qname, rname, &order, &nlabels) != |
|
+ dns_namereln_subdomain) |
|
+ { |
|
+ return (ISC_TRUE); |
|
+ } |
|
result = dns_rdata_tostruct(&rdata, &dname, NULL); |
|
RUNTIME_CHECK(result == ISC_R_SUCCESS); |
|
dns_name_init(&prefix, NULL); |
|
dns_fixedname_init(&fixed); |
|
tname = dns_fixedname_name(&fixed); |
|
- nlabels = dns_name_countlabels(qname) - |
|
- dns_name_countlabels(rname); |
|
+ nlabels = dns_name_countlabels(rname); |
|
dns_name_split(qname, nlabels, &prefix, NULL); |
|
result = dns_name_concatenate(&prefix, &dname.dname, tname, |
|
NULL); |
|
- if (result == DNS_R_NAMETOOLONG) |
|
+ if (result == DNS_R_NAMETOOLONG) { |
|
+ if (chainingp != NULL) { |
|
+ *chainingp = ISC_TRUE; |
|
+ } |
|
return (ISC_TRUE); |
|
+ } |
|
RUNTIME_CHECK(result == ISC_R_SUCCESS); |
|
break; |
|
default: |
|
@@ -6719,7 +6728,9 @@ answer_response(fetchctx_t *fctx) { |
|
} |
|
if ((ardataset->type == dns_rdatatype_cname || |
|
ardataset->type == dns_rdatatype_dname) && |
|
- !is_answertarget_allowed(fctx, qname, aname, ardataset, |
|
+ type != ardataset->type && |
|
+ type != dns_rdatatype_any && |
|
+ !is_answertarget_allowed(fctx, qname, aname, ardataset, |
|
NULL)) |
|
{ |
|
return (DNS_R_SERVFAIL);
|
|
|