upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-11 10:40:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 2023-08-29 15:13:22 +02:00
parent 18b566ccea
commit 3dff3eac0a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dns/zone.c
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);
}