Merging upstream version 3.3.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 58 insertions, 1 deletions

diff --git a/doc/introduction.rst b/doc/introduction.rst
index 0174f05..398d0d4 100644
--- a/doc/introduction.rst
+++ b/doc/introduction.rst
@@ -42,7 +42,7 @@ DNS features:
   TXT, RP, AFSDB, RT, KEY, AAAA, LOC, SRV, NAPTR, KX, CERT, DNAME, APL, DS,
   SSHFP, IPSECKEY, RRSIG, NSEC, DNSKEY, DHCID, NSEC3, NSEC3PARAM, TLSA, SMIMEA,
   CDS, CDNSKEY, OPENPGPKEY, CSYNC, ZONEMD, SVCB, HTTPS, SPF, NID, L32, L64, LP,
-  EUI48, EUI64, URI, CAA, and Unknown
+  EUI48, EUI64, URI, CAA, WALLET, and Unknown
 
 Server features:
 
diff --git a/doc/man/keymgr.8in b/doc/man/keymgr.8in
index 39c46a9..01e244f 100644
--- a/doc/man/keymgr.8in
+++ b/doc/man/keymgr.8in
@@ -170,6 +170,17 @@ Remove the specified key from zone. If the key was not shared, it is also delete
 Import a key (specified by full key ID) from another zone as shared. After this, the key is
 owned by both zones equally.
 .UNINDENT
+.SS Keystore commands
+.INDENT 0.0
+.TP
+\fBkeystore_test\fP
+Conduct some tests on the specified keystore. Use a configured keystore id
+or \fB\-\fP for the default.
+.TP
+\fBkeystore_bench\fP [\fInum_threads\fP]
+Conduct a signing benchmark for each supported algorithm. Use a configured
+keystore id or \fB\-\fP for the default.
+.UNINDENT
 .SS Commands related to Offline KSK feature
 .INDENT 0.0
 .TP
diff --git a/doc/man/knot.conf.5in b/doc/man/knot.conf.5in
index a9b175e..d091d15 100644
--- a/doc/man/knot.conf.5in
+++ b/doc/man/knot.conf.5in
@@ -2253,6 +2253,7 @@ zone:
     master\-pin\-tolerance: TIME
     provide\-ixfr: BOOL
     semantic\-checks: BOOL | soft
+    default\-ttl: TIME
     zonefile\-sync: TIME
     zonefile\-load: none | difference | difference\-no\-serial | whole
     journal\-content: none | changes | all
@@ -2442,6 +2443,23 @@ query (malformed message) and triggers a zone bootstrap instead.
 .UNINDENT
 .sp
 \fIDefault:\fP \fBoff\fP
+.SS default\-ttl
+.sp
+The default TTL value if none is specified in a zone file or zone insertion
+using the dynamic configuration.
+.sp
+\fBWARNING:\fP
+.INDENT 0.0
+.INDENT 3.5
+As changing this value can result in differently parsed zone file(s),
+the corresponding zone SOA serial(s) should be incremented before
+reloading or commiting the configuration. Alternatively, setting
+\fI\%zonefile\-load\fP to \fBdifference\-no\-serial\fP ensures
+the resulting zone(s) update is correct.
+.UNINDENT
+.UNINDENT
+.sp
+\fIDefault:\fP \fB3600\fP
 .SS zonefile\-sync
 .sp
 The time in seconds after which the current zone in memory will be synced with
diff --git a/doc/man_keymgr.rst b/doc/man_keymgr.rst
index 362790e..de86972 100644
--- a/doc/man_keymgr.rst
+++ b/doc/man_keymgr.rst
@@ -143,6 +143,16 @@ Commands
   Import a key (specified by full key ID) from another zone as shared. After this, the key is
   owned by both zones equally.
 
+Keystore commands
+.................
+
+**keystore_test**
+  Conduct some tests on the specified keystore. Use a configured keystore id
+  or **-** for the default.
+**keystore_bench** [*num_threads*]
+  Conduct a signing benchmark for each supported algorithm. Use a configured
+  keystore id or **-** for the default.
+
 Commands related to Offline KSK feature
 .......................................
 
diff --git a/doc/reference.rst b/doc/reference.rst
index bbd4586..6cb42f3 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -2436,6 +2436,7 @@ Definition of zones served by the server.
      master-pin-tolerance: TIME
      provide-ixfr: BOOL
      semantic-checks: BOOL | soft
+     default-ttl: TIME
      zonefile-sync: TIME
      zonefile-load: none | difference | difference-no-serial | whole
      journal-content: none | changes | all
@@ -2639,6 +2640,23 @@ Extra checks:
 
 *Default:* ``off``
 
+.. _zone_default-ttl:
+
+default-ttl
+-----------
+
+The default TTL value if none is specified in a zone file or zone insertion
+using the dynamic configuration.
+
+.. WARNING::
+   As changing this value can result in differently parsed zone file(s),
+   the corresponding zone SOA serial(s) should be incremented before
+   reloading or commiting the configuration. Alternatively, setting
+   :ref:`zonefile-load <zone_zonefile-load>` to ``difference-no-serial`` ensures
+   the resulting zone(s) update is correct.
+
+*Default:* ``3600``
+
 .. _zone_zonefile-sync:
 
 zonefile-sync