mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

SIGs covering different types are now considered separate rdatasets in dns_diff_apply()

Browse Source
This commit is contained in:
Andreas Gustafsson
1999-09-09 08:26:17 +00:00
parent a156e03d99
commit 93bcd26bfa
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dns/journal.c
View File

@@ -80,6 +80,12 @@ encode_uint32(isc_uint32_t val, unsigned char *p) {
p[3] = val >> 0; p[3] = val >> 0;
} }
static dns_rdatatype_t
rdata_covers(dns_rdata_t *rdata) {
return (rdata->type == dns_rdatatype_sig ?
dns_rdata_covers(rdata) : 0);
}
isc_uint32_t isc_uint32_t
dns_soa_getserial(dns_rdata_t *rdata) dns_soa_getserial(dns_rdata_t *rdata)
{ {
@@ -360,13 +366,14 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
CHECK(dns_db_findnode(db, name, ISC_TRUE, &node)); CHECK(dns_db_findnode(db, name, ISC_TRUE, &node));
while (t != NULL && dns_name_equal(&t->name, name)) { while (t != NULL && dns_name_equal(&t->name, name)) {
dns_rdatatype_t type; dns_rdatatype_t type, covers;
dns_diffop_t op; dns_diffop_t op;
dns_rdatalist_t rdl; dns_rdatalist_t rdl;
dns_rdataset_t rds; dns_rdataset_t rds;
op = t->op; op = t->op;
type = t->rdata.type; type = t->rdata.type;
covers = rdata_covers(&t->rdata);
/* /*
* Collect a contiguous set of updates with * Collect a contiguous set of updates with
@@ -383,15 +390,18 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
* of the diff itself is not affected. * of the diff itself is not affected.
*/ */
rdl.type = t->rdata.type; rdl.type = type;
rdl.covers = 0; /* XXX */ rdl.covers = covers;
rdl.rdclass = t->rdata.rdclass; rdl.rdclass = t->rdata.rdclass;
rdl.ttl = t->ttl; rdl.ttl = t->ttl;
ISC_LIST_INIT(rdl.rdata); ISC_LIST_INIT(rdl.rdata);
ISC_LINK_INIT(&rdl, link); ISC_LINK_INIT(&rdl, link);
while (t != NULL && dns_name_equal(&t->name, name) && while (t != NULL &&
t->op == op && t->rdata.type == type) dns_name_equal(&t->name, name) &&
t->op == op &&
t->rdata.type == type &&
rdata_covers(&t->rdata) == covers)
{ {
if (t->ttl != rdl.ttl) { if (t->ttl != rdl.ttl) {
printf("TTL differs in rdataset, " printf("TTL differs in rdataset, "