ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Don't process DNSSEC-related and ZONEMD records in catz

Browse Source 
When processing a catalog zone update, skip processing records with
DNSSEC-related and ZONEMD types, because we are not interested in them
in the context of a catalog zone, and processing them will fail and
produce an unnecessary warning message.

(cherry picked from commit 73d6643137)
This commit is contained in:
Aram Sargsyan
2022-06-01 08:51:55 +00:00
parent 58760fb7d5
commit 1355fc6a04
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/dns/catz.c
View File

@@ -2100,6 +2100,12 @@ cleanup:
return (result); return (result);
} }
static bool
catz_rdatatype_is_processable(const dns_rdatatype_t type) {
return (!dns_rdatatype_isdnssec(type) && type != dns_rdatatype_cds &&
type != dns_rdatatype_cdnskey && type != dns_rdatatype_zonemd);
}
void void
dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) { dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
dns_catz_zone_t *oldzone = NULL, *newzone = NULL; dns_catz_zone_t *oldzone = NULL, *newzone = NULL;
@@ -2242,6 +2248,17 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
result = dns_rdatasetiter_first(rdsiter); result = dns_rdatasetiter_first(rdsiter);
while (result == ISC_R_SUCCESS) { while (result == ISC_R_SUCCESS) {
dns_rdatasetiter_current(rdsiter, &rdataset); dns_rdatasetiter_current(rdsiter, &rdataset);
/*
* Skip processing DNSSEC-related and ZONEMD types,
* because we are not interested in them in the context
* of a catalog zone, and processing them will fail
* and produce an unnecessary warning message.
*/
if (!catz_rdatatype_is_processable(rdataset.type)) {
goto next;
}
result = dns_catz_update_process(catzs, newzone, name, result = dns_catz_update_process(catzs, newzone, name,
&rdataset); &rdataset);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
@@ -2263,6 +2280,7 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
cname, classbuf, typebuf, cname, classbuf, typebuf,
isc_result_totext(result)); isc_result_totext(result));
} }
next:
dns_rdataset_disassociate(&rdataset); dns_rdataset_disassociate(&rdataset);
result = dns_rdatasetiter_next(rdsiter); result = dns_rdatasetiter_next(rdsiter);
} }