From: Michał Kępień <michal@isc.org>
Date: Thu, 15 Feb 2018 19:31:53 +0000 (+0100)
Subject: Asynchronous zone load events have no way of getting canceled
X-Git-Tag: v9.12.1rc1~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3395f6fac3b6d4fa3162a373b6273efe64509054;p=thirdparty%2Fbind9.git

Asynchronous zone load events have no way of getting canceled

Code handling cancellation of asynchronous zone load events was likely
copied over from other functions when asynchronous zone loading was
first implemented in commit 8a2ab2b9203.  However, unlike those other
functions, asynchronous zone loading events currently have no way of
getting canceled once they get posted, which means the aforementioned
code is effectively dead.  Remove it to prevent confusion.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 183e11a8e80..c4147d19af7 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2168,20 +2168,15 @@ static void
 zone_asyncload(isc_task_t *task, isc_event_t *event) {
 	dns_asyncload_t *asl = event->ev_arg;
 	dns_zone_t *zone = asl->zone;
-	isc_result_t result = ISC_R_SUCCESS;
+	isc_result_t result;
 	isc_boolean_t load_pending;
 
 	UNUSED(task);
 
 	REQUIRE(DNS_ZONE_VALID(zone));
 
-	if ((event->ev_attributes & ISC_EVENTATTR_CANCELED) != 0)
-		result = ISC_R_CANCELED;
 	isc_event_free(&event);
 
-	if (result == ISC_R_CANCELED)
-		goto cleanup;
-
 	/* Make sure load is still pending */
 	LOCK_ZONE(zone);
 	load_pending = ISC_TF(DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING));