CHANGES, release note

(cherry picked from commit 08401e38c12594af53073f28119699661c28d519)

diff --git a/CHANGES b/CHANGES
index c8e2956bc598b89e7fdd0d005d425c29afe8f5e3..07568fccf310bd15a28fae11dfe1daf0fdb18bca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5452.  [bug]           The "blackhole" ACL was accidentally disabled with
+                       respect to client queries. [GL #1936]
+
 5449.  [bug]           Fix a socket shutdown race in netmgr udp. [GL #1938]
 
 5448.  [bug]           Fix a race condition in isc__nm_tcpdns_send().

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index ba37f130db7a4535714dd5d727629a02f2ca8d36..b226a8f8e1672cc2bf434fc757c5c8e278f25111 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -52,3 +52,8 @@ Bug Fixes
   unsupported algorithm appeared earlier in the DNSKEY RRset than a
   supported algorithm.  It could also stop if it detected a malformed
   public key. [GL #1689]
+
+- The ``blackhole`` ACL was inadvertently disabled with respect to
+  client queries. Blocked IP addresses were not used for upstream
+  queries but queries from those addresses could still be answered.
+  [GL #1936]