From 470b8612b247dba5a5f8e9ff1491fdb53cd4215b Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 27 Jun 2018 17:34:51 -0700
Subject: [PATCH] CHANGES, release note

(cherry picked from commit 2aee33f412ca7425989af9a249f9ca4292a4d33a)
---
 CHANGES           | 3 +++
 doc/arm/notes.xml | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES b/CHANGES
index 80800b8c62..f9601af521 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4984.	[bug]		Improve handling of very large incremental
+			zone transfers to prevent journal corruption. [GL #339]
+
 4983.	[cleanup]	Remove the deprecated flag from "answer-cookie";
 			it will be allowed to persist into 9.13. [GL #275].
 
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 0cebfe9290..528ae6da7a 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -181,6 +181,14 @@
 
   <section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
     <itemizedlist>
+      <listitem>
+	<para>
+	  <command>named</command> now rejects excessively large
+	  incremental (IXFR) zone transfers in order to prevent
+	  possible corruption of journal files which could cause
+	  <command>named</command> to abort when loading zones. [GL #339]
+	</para>
+      </listitem>
       <listitem>
 	<para>
 	  <command>rndc reload</command> could cause <command>named</command>