mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

2786. [bug] Spurious log message when zone keys were

Browse Source 
dynamically reconfigured. [RT #20659]
This commit is contained in:
Evan Hunt
2009-11-25 02:30:54 +00:00
parent d0ca4e90e2
commit fc1fb1a469
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2787. [bug] Spurious log message when zone keys were
dynamically reconfigured. [RT #20659]
2786. [bug] Additional could be promoted to answer. [RT #20663]
--- 9.7.0b3 released ---

4
lib/dns/diff.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: diff.c,v 1.21 2009/04/30 06:53:10 marka Exp $ */
/* $Id: diff.c,v 1.22 2009/11/25 02:30:54 each Exp $ */
/*! \file */
@@ -400,7 +400,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
isc_log_write(DIFF_COMMON_LOGARGS,
ISC_LOG_WARNING,
"%s/%s: update with no "
" effect", namebuf,
"effect", namebuf,
classbuf);
}
} else if (result == DNS_R_NXRRSET) {

7
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.532 2009/11/24 03:42:32 each Exp $ */
/* $Id: zone.c,v 1.533 2009/11/25 02:30:54 each Exp $ */
/*! \file */
@@ -13471,6 +13471,8 @@ zone_rekey(dns_zone_t *zone) {
CHECK(dns_db_newversion(db, &ver));
CHECK(dns_db_getoriginnode(db, &node));
dns_zone_log(zone, ISC_LOG_INFO, "reconfiguring zone keys");
/* Get the SOA record's TTL */
CHECK(dns_db_findrdataset(db, node, ver, dns_rdatatype_soa,
dns_rdatatype_none, 0, &soaset, &soasigs));
@@ -13500,12 +13502,11 @@ zone_rekey(dns_zone_t *zone) {
ISC_TF(!check_ksk), mctx, logmsg));
if (!ISC_LIST_EMPTY(diff.tuples)) {
commit = ISC_TRUE;
add_signing_records(db, zone->privatetype, ver, &diff);
dns_diff_apply(&diff, db, ver);
add_signing_records(db, zone->privatetype, ver, &diff);
result = increment_soa_serial(db, ver, &diff, mctx);
if (result == ISC_R_SUCCESS)
zone_journal(zone, &diff, "zone_rekey");
}
}