From 95c01ddde222c6ff921ba7bfcb23cd5864dbca27 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Fri, 2 Mar 2018 11:30:02 -0800 Subject: [PATCH] temporarily revert change #4859 (cherry picked from commit 84ec07999f66c8f639337e08aacbef2274d1d30b) --- CHANGES | 2 ++ lib/dns/validator.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 1116a64ccf1..2c2946cb667 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4904. [bug] Temporarily revert change #4859. [GL #124] + 4903. [bug] "check-mx fail;" did not prevent MX records containing IP addresses from being added to a zone by a dynamic update. [GL #112] diff --git a/lib/dns/validator.c b/lib/dns/validator.c index 1659f8bbb55..0eee3507f09 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -1099,8 +1099,7 @@ check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, for (parent = val; parent != NULL; parent = parent->parent) { if (parent->event != NULL && - (parent->event->type == type || - parent->event->type == dns_rdatatype_cname) && + parent->event->type == type && dns_name_equal(parent->event->name, name) && /* * As NSEC3 records are meta data you sometimes -- 2.47.3