Fix CHANGES entry

diff --git a/CHANGES b/CHANGES
index 95f2a57b450def6becaa580f980d62626a90f145..b88123106a4ae82b2531afa88e2388354ba4babf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,7 +19,9 @@
 4935.  [func]          Add support for LibreSSL >= 2.7.0 (some OpenSSL 1.1.0
                        call were added). [GL #191]
 
-4934.  [security]      Simultaneous use of stale cache records and NSEC
+4934.  [security]      The serve-stale feature could cause an assertion failure
+                       in rbtdb.c even when stale-answer-enable was false.
+                       Simultaneous use of stale cache records and NSEC
                        aggressive negative caching could trigger a recursion
                        loop. (CVE-2018-5737) [GL #185]
 

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 1669eef2739267b786669c6bab6fb8337dc914ec..c2815c5e5bc0794861d4787644e7965cbf238871 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -42,11 +42,27 @@
     <itemizedlist>
       <listitem>
        <para>
-         update-policy rules that otherwise ignore the name field now
-         require that it be set to "." to ensure that any type list
-         present is properly interpreted.  Previously, if the name field
-         was omitted from the rule declaration but a type list was
-         present, it wouldn't be interpreted as expected.
+         The serve-stale feature could cause an assertion failure in
+         rbtdb.c even when stale-answer-enable was false. The
+         simultaneous use of stale cache records and NSEC aggressive
+         negative caching could trigger a recursion loop in the
+         <command>named</command> process. (CVE-2018-5737) [GL #185]
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+         A bug in zone database reference counting could lead to a crash
+         when multiple versions of a slave zone were transferred from a
+         master in close succession. (CVE-2018-5736) [GL #134]
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+         <command>update-policy</command> rules that otherwise ignore the
+         name field now require that it be set to "." to ensure that any
+         type list present is properly interpreted.  Previously, if the
+         name field was omitted from the rule declaration but a type list
+         was present, it wouldn't be interpreted as expected.
        </para>
       </listitem>
     </itemizedlist>