diff options
| author |   brad <brad@openbsd.org> | 2014-11-20 00:00:16 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2014-11-20 00:00:16 +0000 |
| commit | 98f3ca02f1c2abc8ff7f2e87736553685cd70368 (patch) | |
| tree | 8b12e320b4b6b4ba2a1f5c98920c90738af18a2f /usr.sbin/unbound/iterator/iter_utils.c | |
| parent | fix erroneous capitalisation of a word in the middle of a sentence. (diff) | |
| download | wireguard-openbsd-98f3ca02f1c2abc8ff7f2e87736553685cd70368.tar.xz wireguard-openbsd-98f3ca02f1c2abc8ff7f2e87736553685cd70368.zip | |
update to Unbound 1.5.0, ok sthen@
Diffstat (limited to 'usr.sbin/unbound/iterator/iter_utils.c')
| -rw-r--r-- | usr.sbin/unbound/iterator/iter_utils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/unbound/iterator/iter_utils.c b/usr.sbin/unbound/iterator/iter_utils.c index 5d55b623ea6..4148c1268f7 100644 --- a/usr.sbin/unbound/iterator/iter_utils.c +++ b/usr.sbin/unbound/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 || |