upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '4553-return-value-for-checkds-shadows-v9_18' into 'bind-9.18'

Browse source 
Don't also skip keymgr run if checkds is skipped

See merge request isc-projects/bind9!8688
This commit is contained in:
Matthijs Mekking 2024-02-01 14:29:33 +00:00
commit b9d1ab6df1
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/dns/zone.c
View file

@ -22108,20 +22108,20 @@ zone_rekey(dns_zone_t *zone) {
ISC_LIST_INIT(zone->checkds_ok);
UNLOCK_ZONE(zone);
result = dns_zone_getdnsseckeys(zone, db, ver, now,
&zone->checkds_ok);
if (result == ISC_R_SUCCESS) {
isc_result_t ret = dns_zone_getdnsseckeys(zone, db, ver, now,
&zone->checkds_ok);
if (ret == ISC_R_SUCCESS) {
zone_checkds(zone);
} else {
dnssec_log(zone,
(result == ISC_R_NOTFOUND) ? ISC_LOG_DEBUG(1)
: ISC_LOG_ERROR,
(ret == ISC_R_NOTFOUND) ? ISC_LOG_DEBUG(1)
: ISC_LOG_ERROR,
"zone_rekey:dns_zone_getdnsseckeys failed: "
"%s",
isc_result_totext(result));
isc_result_totext(ret));
}
/* Run keymgr */
if (result == ISC_R_SUCCESS || result == ISC_R_NOTFOUND) {
dns_zone_lock_keyfiles(zone);
result = dns_keymgr_run(&zone->origin, zone->rdclass,
@ -22142,6 +22142,12 @@ zone_rekey(dns_zone_t *zone) {
KASP_UNLOCK(kasp);
/*
* Update CDS, CDNSKEY and DNSKEY record sets if the keymgr ran
* successfully (dns_keymgr_run returned ISC_R_SUCCESS), or in
* case of DNSSEC management without dnssec-policy if we have keys
* (dns_dnssec_findmatchingkeys returned ISC_R_SUCCESS).
*/
if (result == ISC_R_SUCCESS) {
bool cdsdel = false;
bool cdnskeydel = false;