More lenient checks.

git-svn-id: file:///svn/unbound/trunk@1691 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 69e51130b132af251b5a9c05b727c74b8ee186ec..29c889e7851636156aa356491028ff3716fd9643 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 June 2009: Wouter
+       - more lenient truncation checks.
+
 29 June 2009: Wouter
        - ldns trunk r2959 imported as tarball, because of solaris cc compile
          support for c99.  r2960 for better configure.

diff --git a/validator/validator.c b/validator/validator.c
index 5af4ca5a99cbde5688d3c87cd0c7b9ace0309f2a..ebd492054448c4d4e3012a10f459b08e7277e0bd 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1490,7 +1490,8 @@ processValidate(struct module_qstate* qstate, struct val_qstate* vq,
                /* workaround bad recursor out there that truncates (even
                 * with EDNS4k) to 512 by removing RRSIG from auth section
                 * for positive replies*/
-               if(subtype == VAL_CLASS_POSITIVE &&
+               if((subtype == VAL_CLASS_POSITIVE || subtype == VAL_CLASS_ANY
+                       || subtype == VAL_CLASS_CNAME) &&
                        detect_wrongly_truncated(vq->orig_msg->rep)) {
                        /* truncate the message some more */
                        vq->orig_msg->rep->ns_numrrsets = 0;