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

Adjust RPZ trigger counts only when the entry being deleted exists (#43386)

Browse Source
This commit is contained in:
Mukund Sivaraman 2016-11-16 12:11:53 +09:00
parent 4176d278e2
commit f23c10f925
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
4600. [bug] Adjust RPZ trigger counts only when the entry
being deleted exists. [RT #43386]
4599. [bug] Fix inconsistencies in inline signing time
comparison that were introduced with the
introduction of rdatasetheader->resign_lsb.

7
lib/dns/rpz.c
View File

@ -2262,6 +2262,7 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num,
dns_rbtnode_t *nmnode;
dns_rpz_nm_data_t *nm_data, del_data;
isc_result_t result;
isc_boolean_t exists;
/*
* We need a summary database of names even with 1 policy zone,
@ -2305,6 +2306,9 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num,
del_data.wild.qname &= nm_data->wild.qname;
del_data.wild.ns &= nm_data->wild.ns;
exists = ISC_TF(del_data.set.qname != 0 || del_data.set.ns != 0 ||
del_data.wild.qname != 0 || del_data.wild.ns != 0);
nm_data->set.qname &= ~del_data.set.qname;
nm_data->set.ns &= ~del_data.set.ns;
nm_data->wild.qname &= ~del_data.wild.qname;
@ -2326,7 +2330,8 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num,
}
}
adj_trigger_cnt(rpzs, rpz_num, rpz_type, NULL, 0, ISC_FALSE);
if (exists)
adj_trigger_cnt(rpzs, rpz_num, rpz_type, NULL, 0, ISC_FALSE);
}
/*