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 4d9fa8657432b4409670ee3a490af3094034422c..2b7bab831675fdbedb4bf59d6d5f6a541c9a1580 100644 (file)
--- 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);
                        }