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

Merge branch '4500-log-the-change-that-generated-not-exact-when-applying-a-diff' into 'main'

Browse Source 
Resolve "Log the change that generated "not exact" when applying a diff."

Closes #4500

See merge request isc-projects/bind9!8591
This commit is contained in:
Mark Andrews
2023-12-19 15:37:45 +00:00
parent e05e3a3448 71d67b6fdf
commit 6a2ebd4f10
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
6306. [func] Log more details about the cause of "not exact" errors.
[GL #4500]
6305. [bug] Improve load configuration time for many zones with
the same dnssec-policy [GL #4423]

34
lib/dns/diff.c
View File

@@ -240,6 +240,22 @@ setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) {
}
}
static const char *
optotext(dns_diffop_t op) {
switch (op) {
case DNS_DIFFOP_ADD:
return ("add");
case DNS_DIFFOP_ADDRESIGN:
return ("add-resign");
case DNS_DIFFOP_DEL:
return ("del");
case DNS_DIFFOP_DELRESIGN:
return ("del-resign");
default:
return ("unknown");
}
}
static isc_result_t
diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) {
dns_difftuple_t *t;
@@ -269,6 +285,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) {
while (t != NULL && dns_name_equal(&t->name, name)) {
dns_rdatatype_t type, covers;
dns_rdataclass_t rdclass;
dns_diffop_t op;
dns_rdatalist_t rdl;
dns_rdataset_t rds;
@@ -277,6 +294,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) {
op = t->op;
type = t->rdata.type;
rdclass = t->rdata.rdclass;
covers = rdata_covers(&t->rdata);
/*
@@ -439,6 +457,22 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) {
dns_rdataset_disassociate(&ardataset);
}
} else {
if (result == DNS_R_NOTEXACT) {
dns_name_format(name, namebuf,
sizeof(namebuf));
dns_rdatatype_format(type, typebuf,
sizeof(typebuf));
dns_rdataclass_format(rdclass, classbuf,
sizeof(classbuf));
isc_log_write(
DIFF_COMMON_LOGARGS,
ISC_LOG_ERROR,
"dns_diff_apply: %s/%s/%s: %s "
"%s",
namebuf, typebuf, classbuf,
optotext(op),
isc_result_totext(result));
}
if (dns_rdataset_isassociated(&ardataset)) {
dns_rdataset_disassociate(&ardataset);
}