temporarily revert change #4859

(cherry picked from commit 06b52cc939e7edde801c60e04a2e25a557405bfe)

diff --git a/CHANGES b/CHANGES
index e9864c4121d5341a8b714d3d65225a09f974dc87..84704d406c55813c0fa4b9a0644abd20e38e5ae9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4904.  [bug]           Temporarily revert change #4859. [GL #124]
+
        --- 9.9.12rc1 released ---
 
 4889.  [func]          Warn about the use of old root keys without the new

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index c4d0565f0cc894e25af4dcdf81878c504d884f9c..48652acd32b1880df40449a9ec031544376a4203 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 #include <config.h>
 
 #include <isc/base32.h>
@@ -1117,8 +1115,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