CHANGES, release note

diff --git a/CHANGES b/CHANGES
index 8cfb61e34b9f832a5776e201cd57efc1c6c73f00..10bfeaad94f65c07c525619c679215d9af76ab67 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5421.  [bug]           Fixed a race that could cause named to crash when
+                       looking up the nodename of an RBT node if the tree
+                       was modified. [GL #1857]
+
 5420.  [bug]           Add missing isc_{mutex,conditional}_destroy calls
                        that caused a memory leak on FreeBSD. [GL #1893]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 8289252f154df513987f95661d0733971dc90df4..4f71ff1e04fdd89d46735a947cde1906fb8ecb40 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -123,4 +123,8 @@ Bug Fixes
    addzone``. Thanks to Alberto Fernández. [GL #1695]
 
 -  Missing mutex and conditional destruction in netmgr code leads to a
-   memory leak on *BSD systems. [GL #1893]
+   memory leak on BSD systems. [GL #1893]
+
+-  ``named`` could crash with an assertion failure if the name of a
+   database node was looked up while the database was being modified.
+   [GL #1857]