temporarily revert change #4859

(cherry picked from commit 84ec07999f66c8f639337e08aacbef2274d1d30b)

diff --git a/CHANGES b/CHANGES
index 1116a64ccf1fd593cd02155fc999df8edeaa108a..2c2946cb6672a85207404f1991623e2ba4c143d5 100644 (file)
--- 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 1659f8bbb5558018b06be3b43ed4eacd91f974a4..0eee3507f0985c2f838de93f77fc0912575b277f 100644 (file)
--- 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