Changes and release notes for [#2628]

(cherry picked from commit b99ec65745704b914b3b1233728dd60f8c1d5295)

diff --git a/CHANGES b/CHANGES
index d6ba1430e0e478ec9681135b073b2da51aa28513..0ce8f02d85a2bbd225c9f62331bb280a77a724f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5626.  [bug]           When generating new keys, check for keyid conflicts
+                       between new keys too. [GL #2628]
+
 5622.  [cleanup]       Remove lib/samples, since export versions of libraries
                        are no longer maintained. [GL !4835]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index ea58d3ccc2dc2afba84140a079149cf5b2c56652..c9d847cdcfb6b736c67c0f335cd6bdca52fbe01e 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -91,3 +91,6 @@ Bug Fixes
 
 - ``named`` would overwrite a zone file unconditionally when it recovered from
   a corrupted journal. [GL #2623]
+
+- With ``dnssec-policy``, when creating new keys also check for keyid conflicts
+  between the new keys too. [GL #2628]