3115. [bug] Named could fail to return requested data when

                        following a CNAME that points into the same zone.
                        [RT #2445]

diff --git a/CHANGES b/CHANGES
index bbda76ac3c0b3ef85a02c669070fbbd49483ef48..9c2a9d52bb443fc80b3cb3446fd1b9ad3dc86f1f 100644 (file)
--- 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 5f697565b76286587a1a54c5ac942d8419408517..9b2880b25e441991e8708e980866168428d16ecd 100644 (file)
--- 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. */