mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

don't set rdh_ttl in init_rdataset

Browse Source
This commit is contained in:
Mark Andrews 2015-04-17 23:09:05 +10:00
parent ab973ec40c
commit def6608a44
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dns/rbtdb.c
View File

@ -1031,12 +1031,15 @@ set_ttl(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, dns_ttl_t newttl) {
isc_heap_t *heap; isc_heap_t *heap;
dns_ttl_t oldttl; dns_ttl_t oldttl;
if (!IS_CACHE(rbtdb)) {
header->rdh_ttl = newttl;
return;
}
oldttl = header->rdh_ttl; oldttl = header->rdh_ttl;
header->rdh_ttl = newttl; header->rdh_ttl = newttl;
if (!IS_CACHE(rbtdb))
return;
/* /*
* It's possible the rbtdb is not a cache. If this is the case, * It's possible the rbtdb is not a cache. If this is the case,
* we will not have a heap, and we move on. If we do, though, * we will not have a heap, and we move on. If we do, though,
@ -1555,7 +1558,6 @@ static inline void
init_rdataset(dns_rbtdb_t *rbtdb, rdatasetheader_t *h) { init_rdataset(dns_rbtdb_t *rbtdb, rdatasetheader_t *h) {
ISC_LINK_INIT(h, link); ISC_LINK_INIT(h, link);
h->heap_index = 0; h->heap_index = 0;
h->rdh_ttl = 0;
h->is_mmapped = 0; h->is_mmapped = 0;
h->next_is_relative = 0; h->next_is_relative = 0;
h->node_is_relative = 0; h->node_is_relative = 0;
@ -1605,6 +1607,7 @@ new_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx) {
#endif #endif
memset(h->upper, 0xeb, sizeof(h->upper)); memset(h->upper, 0xeb, sizeof(h->upper));
init_rdataset(rbtdb, h); init_rdataset(rbtdb, h);
h->rdh_ttl = 0;
return (h); return (h);
} }