Add release note and CHANGES for GL #3677

News worthy.

diff --git a/CHANGES b/CHANGES
index ce35066732cbeb7dcdf07f05d515abc7429c78c7..e568b930f3f0ee88fcdf42ebd511a3edb3165e9f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+6218.  [func]          Add inline-signing to dnssec-policy. [GL #3677]
+
 6217.  [func]          The dns_badcache unit was refactored to use cds_lfht
                        instead of hand-crafted locked hashtable. [GL #4223]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 7e8907db1015e26f7b86b3e7dea83b0e3c424879..c2e2a53268cda3bf93a255f33279fa86166c6795 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -40,6 +40,12 @@ Feature Changes
   DNS SERVER COOKIES.  Previously these were silently treated as
   DNS CLIENT COOKIES.  :gl:`#4194`
 
+- The option :any:`inline-signing` can now also be set inside
+  :any:`dnssec-policy`. The built-in policies ``default`` and ``insecure``
+  enable the use of :any:`inline-signing`. If you set :any:`inline-signing`
+  at the ``zone`` level, it overrides the value used set in
+  :any:`dnssec-policy`. :gl:`#3677`.
+
 Bug Fixes
 ~~~~~~~~~