From: Mark Andrews <marka@isc.org>
Date: Thu, 22 Oct 2020 04:03:59 +0000 (+1100)
Subject: DNS_ZONEFLAG_NOIXFR should be DNS_ZONEFLG_NOIXFR
X-Git-Tag: v9.17.7~43^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a044444bd5dcb0d3e3ba03fcfba8860ba5a1516;p=thirdparty%2Fbind9.git

DNS_ZONEFLAG_NOIXFR should be DNS_ZONEFLG_NOIXFR
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index db94e130ac1..03427968ad0 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -486,7 +486,7 @@ typedef enum {
 	DNS_ZONEFLG_DIALNOTIFY = 0x00020000U,
 	DNS_ZONEFLG_DIALREFRESH = 0x00040000U,
 	DNS_ZONEFLG_SHUTDOWN = 0x00080000U,
-	DNS_ZONEFLAG_NOIXFR = 0x00100000U, /*%< IXFR failed, force AXFR */
+	DNS_ZONEFLG_NOIXFR = 0x00100000U, /*%< IXFR failed, force AXFR */
 	DNS_ZONEFLG_FLUSH = 0x00200000U,
 	DNS_ZONEFLG_NOEDNS = 0x00400000U,
 	DNS_ZONEFLG_USEALTXFRSRC = 0x00800000U,
@@ -17038,7 +17038,7 @@ again:
 
 	case DNS_R_BADIXFR:
 		/* Force retry with AXFR. */
-		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLAG_NOIXFR);
+		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NOIXFR);
 		goto same_master;
 
 	case DNS_R_TOOMANYRECORDS:
@@ -17395,14 +17395,14 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 			      "initial version from %s",
 			      master);
 		xfrtype = dns_rdatatype_axfr;
-	} else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLAG_NOIXFR)) {
+	} else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOIXFR)) {
 		dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_DEBUG(1),
 			      "retrying with AXFR from %s due to "
 			      "previous IXFR failure",
 			      master);
 		xfrtype = dns_rdatatype_axfr;
 		LOCK_ZONE(zone);
-		DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLAG_NOIXFR);
+		DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NOIXFR);
 		UNLOCK_ZONE(zone);
 	} else {
 		bool use_ixfr = true;