Fix signatures-validity config option

KASP was using 'signatures-validity-dnskey' instead of
'signatures-validity'.

(cherry picked from commit ad63e9e4f84a126fb076fdc16aff7ebf7f21db44)

diff --git a/CHANGES b/CHANGES
index 1a63a2cffec840d9a669b2664b5a7924dc738be9..1f68387f661e4ca27b30fb9313ef21748f5928e2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5561.  [bug]           KASP incorrectly set signature validity to the value
+                       of the DNSKEY signature validity. This is now fixed.
+                       [GL #2383]
+
 5559.  [bug]           The --with-maxminddb=PATH form of the build-time option
                        enabling support for libmaxminddb was not working
                        correctly. This has been fixed. [GL #2366]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index ea1f00a90aa3a8d7894738e48451fa8727ae1bac..b4e36a550f50b8d11779176807da5b52ce2fb04d 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -69,3 +69,6 @@ Bug Fixes
 
 - Prevent rbtdb instances being destroyed by multiple threads at the same
   time. This can trigger assertion failures. [GL #2355]
+
+- KASP incorrectly set signature validity to the value of the DNSKEY signature
+  validity. This is now fixed. [GL #2383]

diff --git a/lib/dns/kasp.c b/lib/dns/kasp.c
index fc98a6c7cd81736c5785f616bfe9dc00f6123a31..5a0cd3028687c544ab5cb7d3dd5a379b58dca8a6 100644 (file)
--- a/lib/dns/kasp.c
+++ b/lib/dns/kasp.c
@@ -184,7 +184,7 @@ dns_kasp_setsigvalidity_dnskey(dns_kasp_t *kasp, uint32_t value) {
        REQUIRE(DNS_KASP_VALID(kasp));
        REQUIRE(!kasp->frozen);
 
-       kasp->signatures_validity = value;
+       kasp->signatures_validity_dnskey = value;
 }
 
 dns_ttl_t