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

change log category of some messages to DNS_LOGCATEGORY_XFER_IN

Browse Source
This commit is contained in:
Mark Andrews
2019-11-22 10:25:44 +11:00
parent eb21ecf55c
commit 444d742a94
1 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/dns/zone.c
View File

@@ -15960,7 +15960,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_DEBUG(1),
"zone transfer finished: %s", dns_result_totext(result)); "zone transfer finished: %s", dns_result_totext(result));
/* /*
@@ -16067,8 +16067,8 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
namebuf); namebuf);
} else } else
buf[0] = '\0'; buf[0] = '\0';
dns_zone_log(zone, ISC_LOG_INFO, dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN,
"transferred serial %u%s", ISC_LOG_INFO, "transferred serial %u%s",
serial, buf); serial, buf);
if (inline_raw(zone)) if (inline_raw(zone))
zone_send_secureserial(zone, serial); zone_send_secureserial(zone, serial);
@@ -16099,7 +16099,8 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
zone->masterfile != NULL) zone->masterfile != NULL)
zone_needdump(zone, delay); zone_needdump(zone, delay);
else if (result != ISC_R_SUCCESS) else if (result != ISC_R_SUCCESS)
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN,
ISC_LOG_ERROR,
"transfer: could not set file " "transfer: could not set file "
"modification time of '%s': %s", "modification time of '%s': %s",
zone->masterfile, zone->masterfile,
@@ -16419,7 +16420,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
&zone->sourceaddr, &now)) &zone->sourceaddr, &now))
{ {
isc_sockaddr_format(&zone->sourceaddr, source, sizeof(source)); isc_sockaddr_format(&zone->sourceaddr, source, sizeof(source));
dns_zone_log(zone, ISC_LOG_INFO, dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_INFO,
"got_transfer_quota: skipping zone transfer as " "got_transfer_quota: skipping zone transfer as "
"master %s (source %s) is unreachable (cached)", "master %s (source %s) is unreachable (cached)",
master, source); master, source);
@@ -16440,17 +16441,17 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read); ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
if (!loaded) { if (!loaded) {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_DEBUG(1),
"no database exists yet, requesting AXFR of " "no database exists yet, requesting AXFR of "
"initial version from %s", master); "initial version from %s", master);
xfrtype = dns_rdatatype_axfr; xfrtype = dns_rdatatype_axfr;
} else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)) { } else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)) {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_DEBUG(1),
"forced reload, requesting AXFR of " "forced reload, requesting AXFR of "
"initial version from %s", master); "initial version from %s", master);
xfrtype = dns_rdatatype_axfr; xfrtype = dns_rdatatype_axfr;
} else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLAG_NOIXFR)) { } else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLAG_NOIXFR)) {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_DEBUG(1),
"retrying with AXFR from %s due to " "retrying with AXFR from %s due to "
"previous IXFR failure", master); "previous IXFR failure", master);
xfrtype = dns_rdatatype_axfr; xfrtype = dns_rdatatype_axfr;
@@ -16464,15 +16465,17 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
if (peer == NULL || result != ISC_R_SUCCESS) if (peer == NULL || result != ISC_R_SUCCESS)
use_ixfr = zone->requestixfr; use_ixfr = zone->requestixfr;
if (use_ixfr == false) { if (use_ixfr == false) {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN,
"IXFR disabled, requesting %sAXFR from %s", ISC_LOG_DEBUG(1), "IXFR disabled, "
"requesting %sAXFR from %s",
soa_before, master); soa_before, master);
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_SOABEFOREAXFR)) if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_SOABEFOREAXFR))
xfrtype = dns_rdatatype_soa; xfrtype = dns_rdatatype_soa;
else else
xfrtype = dns_rdatatype_axfr; xfrtype = dns_rdatatype_axfr;
} else { } else {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN,
ISC_LOG_DEBUG(1),
"requesting IXFR from %s", master); "requesting IXFR from %s", master);
xfrtype = dns_rdatatype_ixfr; xfrtype = dns_rdatatype_ixfr;
} }
@@ -16498,7 +16501,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
&zone->tsigkey); &zone->tsigkey);
if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) { if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) {
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_ERROR,
"could not get TSIG key for zone transfer: %s", "could not get TSIG key for zone transfer: %s",
isc_result_totext(result)); isc_result_totext(result));
} }
@@ -17320,7 +17323,8 @@ zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi) {
*/ */
continue; continue;
} else { } else {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN,
ISC_LOG_DEBUG(1),
"starting zone transfer: %s", "starting zone transfer: %s",
isc_result_totext(result)); isc_result_totext(result));
break; break;
@@ -17422,7 +17426,8 @@ zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
ISC_LIST_APPEND(zmgr->xfrin_in_progress, zone, statelink); ISC_LIST_APPEND(zmgr->xfrin_in_progress, zone, statelink);
zone->statelist = &zmgr->xfrin_in_progress; zone->statelist = &zmgr->xfrin_in_progress;
isc_task_send(zone->task, &e); isc_task_send(zone->task, &e);
dns_zone_log(zone, ISC_LOG_INFO, "Transfer started."); dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_INFO,
"Transfer started.");
UNLOCK_ZONE(zone); UNLOCK_ZONE(zone);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);