diff --git a/CHANGES b/CHANGES index c701da6e8f..0f7ed65ff9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +5661. [bug] A deadlock was introduced when fixing [GL #1875] because + when locking the key file mutex for each zone structure + that is in a different view, "in-view" logic was not + taken into account. This has been fixed. [GL #2783] + 5660. [bug] Checking of key-directory and dnssec-policy was broken. The checks failed to account for key-directory inheritance. [GL #2778] diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index e872dcb97c..6e46da2b39 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -55,3 +55,7 @@ Bug Fixes - Checking of ``key-directory`` and ``dnssec-policy`` was broken. The checks failed to account for key-directory inheritance. :gl:`#2778` + +- A deadlock at startup was introduced when fixing :gl:`#1875` because when + locking key files for reading and writing, "in-view" logic was not taken into + account. This has been fixed. [GL #2783]