From a677ae91c9d7a5bd2ef8574f84e9f33f90c45e44 Mon Sep 17 00:00:00 2001
From: Stephen Morris <stephen@isc.org>
Date: Fri, 9 Dec 2011 10:48:57 +0000
Subject: [PATCH] [master] ChangeLog for Trac 1383

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e8f57bae5c..c59c9ec34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+342.	[bug]		stephen
+	In the resolver, a FORMERR received from an upstream nameserver
+	now rsults in a SERVFAIL being returned as a response to the original
+	query.  Additional debug messages added to distinguish between
+	different errors in packets received from upstream nameservers.
+	(Trac #1383, git 9b2b249d23576c999a65d8c338e008cabe45f0c9)
+
 341.	[func]		tomek
 	libdhcp++: Support for handling both IPv4 and IPv6 added.
 	Also added support for binding IPv4 sockets.