mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 08:35:31 +00:00
Code Issues Releases Wiki Activity

Add directory to dst_key structure

Browse Source 
Store key directory when reading the key from file. This is the
directory it was read from and can be used when saving the key back
to disk.
This commit is contained in:
Matthijs Mekking
2022-03-09 11:27:03 +01:00
parent 9081426313
commit 0701a140d3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dns/dst_api.c
View File

@@ -691,6 +691,10 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
} }
key->modified = false; key->modified = false;
if (dirname != NULL) {
key->directory = isc_mem_strdup(mctx, dirname);
}
*keyp = key; *keyp = key;
key = NULL; key = NULL;
@@ -1395,6 +1399,9 @@ dst_key_free(dst_key_t **keyp) {
INSIST(key->func->destroy != NULL); INSIST(key->func->destroy != NULL);
key->func->destroy(key); key->func->destroy(key);
} }
if (key->directory != NULL) {
isc_mem_free(mctx, key->directory);
}
if (key->engine != NULL) { if (key->engine != NULL) {
isc_mem_free(mctx, key->engine); isc_mem_free(mctx, key->engine);
} }

1
lib/dns/dst_internal.h
View File

@@ -91,6 +91,7 @@ struct dst_key {
dns_rdataclass_t key_class; /*%< class of the key record */ dns_rdataclass_t key_class; /*%< class of the key record */
dns_ttl_t key_ttl; /*%< default/initial dnskey ttl */ dns_ttl_t key_ttl; /*%< default/initial dnskey ttl */
isc_mem_t *mctx; /*%< memory context */ isc_mem_t *mctx; /*%< memory context */
char *directory; /*%< key directory */
char *engine; /*%< engine name (HSM) */ char *engine; /*%< engine name (HSM) */
char *label; /*%< engine label (HSM) */ char *label; /*%< engine label (HSM) */
char *object; /*%< engine object (HSM) */ char *object; /*%< engine object (HSM) */