From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 29 Aug 2023 13:13:22 +0000 (+0200)
Subject: Fix tsan errors
X-Git-Tag: v9.19.22~70^2~14
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=3dff3eac0aec61ba11afd357220630a4d679b75b;p=thirdparty%2Fbind9.git

Fix tsan errors

When working internally on the zone, we can access the zone's
variables directly.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 4d9fa865743..2b7bab83167 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6067,8 +6067,8 @@ was_dumping(dns_zone_t *zone) {
 static isc_result_t
 keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx,
 	    dst_key_t **key) {
-	const char *directory = dns_zone_getkeydirectory(zone);
-	dns_kasp_t *kasp = dns_zone_getkasp(zone);
+	const char *directory = zone->keydirectory;
+	dns_kasp_t *kasp = zone->kasp;
 	dst_key_t *foundkey = NULL;
 	isc_result_t result = ISC_R_NOTFOUND;
 
@@ -6088,7 +6088,7 @@ keyfromfile(dns_zone_t *zone, dst_key_t *pubkey, isc_mem_t *mctx,
 			if (ks == NULL ||
 			    strcmp(dns_keystore_name(ks), "key-directory") == 0)
 			{
-				directory = dns_zone_getkeydirectory(zone);
+				directory = zone->keydirectory;
 			} else {
 				directory = dns_keystore_directory(ks);
 			}