From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 25 Jan 2012 23:03:33 +0000 (-0800)
Subject: [master] changelog for #1571
X-Git-Tag: trac2351_base~278^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=023d2257c83bac2e06333f2bce2e4b9eda6abbde;p=thirdparty%2Fkea.git

[master] changelog for #1571
---

diff --git a/ChangeLog b/ChangeLog
index 81fede6fd6..5e7d7361ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+365.	[bug]		jinmei
+	libdatasrc: in-memory datasource incorrectly returned delegation
+	for DS lookups.
+	(Trac #1571, git d22e90b5ef94880183cd652e112399b3efb9bd67)
+
 364.	[func]		jinmei
 	b10-auth experimentally supports statistics counters of incoming
 	requests per opcode.  The counters can be (e.g.) shown as
diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index 66916bf805..00b527426a 100644
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -85,7 +85,7 @@ public:
     /// -# (Normal) empty non terminal: there is no matching (exact or
     ///    wildcard) name, but there is a subdomain with an RR of the query
     ///    name.  This is one case of "Name Error" of the RFC.
-    /// -# Wildcard empty non terminal: similar to 2a, but the empty name
+    /// -# Wildcard empty non terminal: similar to 2, but the empty name
     ///    is a wildcard, and matches the query name by wildcard expansion.
     ///    This is a special case of "Name Error" of the RFC.
     /// -# Wildcard no data: there is no exact match name, but there is a