- Fix unbound capsforid fallback, it ignores TTLs in comparison.

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

diff --git a/doc/Changelog b/doc/Changelog
index 4408cbd53cfb96add66908daa4acf90f6cd86440..6f3ab576809f3a597dbba3c8b03a592f346cc003 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 10 October 2014: Wouter
        - Fix unbound-checkconf check for module config with dns64 module.
+       - Fix unbound capsforid fallback, it ignores TTLs in comparison.
 
 6 October 2014: Wouter
        - Fix #614: man page variable substitution bug.

diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c
index 5d55b623ea69397a969267023eee4907f95e432e..4148c1268f78d208008acdd90010acf381152e7f 100644 (file)
--- a/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@ -666,7 +666,7 @@ rrset_equal(struct ub_packed_rrset_key* k1, struct ub_packed_rrset_key* k2)
                k1->rk.rrset_class != k2->rk.rrset_class ||
                query_dname_compare(k1->rk.dname, k2->rk.dname) != 0)
                return 0;
-       if(d1->ttl != d2->ttl ||
+       if(     /* do not check ttl: d1->ttl != d2->ttl || */
                d1->count != d2->count ||
                d1->rrsig_count != d2->rrsig_count ||
                d1->trust != d2->trust ||
@@ -675,7 +675,7 @@ rrset_equal(struct ub_packed_rrset_key* k1, struct ub_packed_rrset_key* k2)
        t = d1->count + d1->rrsig_count;
        for(i=0; i<t; i++) {
                if(d1->rr_len[i] != d2->rr_len[i] ||
-                       d1->rr_ttl[i] != d2->rr_ttl[i] ||
+                       /* no ttl check: d1->rr_ttl[i] != d2->rr_ttl[i] ||*/
                        memcmp(d1->rr_data[i], d2->rr_data[i], 
                                d1->rr_len[i]) != 0)
                        return 0;
@@ -689,8 +689,11 @@ reply_equal(struct reply_info* p, struct reply_info* q, struct regional* region)
        size_t i;
        if(p->flags != q->flags ||
                p->qdcount != q->qdcount ||
+               /* do not check TTL, this may differ */
+               /*
                p->ttl != q->ttl ||
                p->prefetch_ttl != q->prefetch_ttl ||
+               */
                p->security != q->security ||
                p->an_numrrsets != q->an_numrrsets ||
                p->ns_numrrsets != q->ns_numrrsets ||