From e6f7e411ef678ee4b78d7b68308721d82eec5dab 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)
(cherry picked from commit 470b8612b247dba5a5f8e9ff1491fdb53cd4215b)
---
 CHANGES           | 3 +++
 doc/arm/notes.xml | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES b/CHANGES
index 7713b7af834..6fe4ed20f4c 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]
+
 4981.	[bug]		Fix race in cmsg buffer usage in socket code.
 			[GL #180]
 
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 660f1ad9bce..84efc9aa523 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -84,6 +84,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>
-- 
2.47.3