From c0984ac8bdb9ab8812374651bbabcfeb5873eb38 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 20 May 2011 05:09:30 +0000
Subject: [PATCH] 3115.   [bug]           Named could fail to return requested
 data when                         following a CNAME that points into the same
 zone.                         [RT #2445]

---
 CHANGES           | 4 ++++
 bin/named/query.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index bbda76ac3c..9c2a9d52bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3115.	[bug]		Named could fail to return requested data when
+			following a CNAME that points into the same zone.
+			[RT #2445]
+
 3114.	[bug]		Retain expired RRSIGs in dynamic zones if key is
 			inactive and there is no replacement key. [RT #23136]
 
diff --git a/bin/named/query.c b/bin/named/query.c
index 5f697565b7..9b2880b25e 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.363 2011/04/27 23:47:26 tbox Exp $ */
+/* $Id: query.c,v 1.364 2011/05/20 05:09:30 marka Exp $ */
 
 /*! \file */
 
@@ -635,6 +635,7 @@ query_findversion(ns_client_t *client, dns_db_t *db)
 		dns_db_attach(db, &dbversion->db);
 		dns_db_currentversion(db, &dbversion->version);
 		dbversion->acl_checked = ISC_FALSE;
+		dbversion->queryok = ISC_FALSE;
 		ISC_LIST_APPEND(client->query.activeversions,
 				dbversion, link);
 	}
@@ -766,6 +767,7 @@ query_validatezonedb(ns_client_t *client, dns_name_t *name,
 		dbversion->queryok = ISC_FALSE;
 		return (DNS_R_REFUSED);
 	}
+	dbversion->queryok = ISC_TRUE;
 
  approved:
 	/* Transfer ownership, if necessary. */