temporarily revert change #4859

(cherry picked from commit 84ec07999f66c8f639337e08aacbef2274d1d30b)

diff --git a/CHANGES b/CHANGES
index af379a3b470ce156ab0bf59bb3c668606e67ba11..fac9cf1e5517f5df7872fe9aa3b1a09535274b3f 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 3350560f666182ad3a2bace767694a28e1f7c86e..0ca44845b0c591aebf0af40533f3ef7ca33670d4 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>
@@ -1110,8 +1108,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