mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

3332. [bug] Re-use cached DS rrsets if possible. [RT 29446]

Browse Source
This commit is contained in:
Mark Andrews
2012-06-07 12:51:11 +10:00
parent 139fc0e144
commit a0c1fa2a8f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
3332. [bug] Re-use cached DS rrsets if possible. [RT 29446]
3331. [security] dns_rdataslab_fromrdataset could produce bad 3331. [security] dns_rdataslab_fromrdataset could produce bad
rdataslabs. [RT #29644] rdataslabs. [RT #29644]

6
lib/dns/rbtdb.c
View File

@@ -113,6 +113,8 @@ typedef isc_uint32_t rbtdb_rdatatype_t;
RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_cname) RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_cname)
#define RBTDB_RDATATYPE_SIGDNAME \ #define RBTDB_RDATATYPE_SIGDNAME \
RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_dname) RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_dname)
#define RBTDB_RDATATYPE_SIGDDS \
RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_ds)
#define RBTDB_RDATATYPE_NCACHEANY \ #define RBTDB_RDATATYPE_NCACHEANY \
RBTDB_RDATATYPE_VALUE(0, dns_rdatatype_any) RBTDB_RDATATYPE_VALUE(0, dns_rdatatype_any)
@@ -6181,7 +6183,9 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
} }
if (IS_CACHE(rbtdb) && header->rdh_ttl > now && if (IS_CACHE(rbtdb) && header->rdh_ttl > now &&
(header->type == dns_rdatatype_a || (header->type == dns_rdatatype_a ||
header->type == dns_rdatatype_aaaa) && header->type == dns_rdatatype_aaaa ||
header->type == dns_rdatatype_ds ||
header->type == RBTDB_RDATATYPE_SIGDDS) &&
!header_nx && !newheader_nx && !header_nx && !newheader_nx &&
header->trust >= newheader->trust && header->trust >= newheader->trust &&
dns_rdataslab_equal((unsigned char *)header, dns_rdataslab_equal((unsigned char *)header,