ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Fix tsan errors

Browse Source 
When working internally on the zone, we can access the zone's
variables directly.
This commit is contained in:
Matthijs Mekking
2024-01-25 14:48:07 +01:00
parent 18b566ccea
commit 3dff3eac0a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dns/zone.c
+3 -3
View File
@@ -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);
}