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 722260222550ff6ce861e675f3e5953d738fa059..f7b4742b85314e0fb5b0d3acbdc8e70c82c87553 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
                        dns_rdataset_totext() that could cause named to
                        crash with an assertion failure. [RT #24777]
 
+3115.  [bug]           Named could fail to return requested data when
+                       following a CNAME that points into the same zone.
+                       [RT #2445]
+
        --- 9.8.0-P2 released ---
 
 3121.   [security]      An authoritative name server sending a negative

diff --git a/bin/named/query.c b/bin/named/query.c
index 518204b0999127204c08b3911ff2ae3d439e087f..5de67e54f84cc6aac540b81bdd71305d13ae7661 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.353.8.2.2.2 2011/06/02 23:47:28 tbox Exp $ */
+/* $Id: query.c,v 1.353.8.2.2.3 2011/06/08 23:52:50 marka Exp $ */
 
 /*! \file */
 
@@ -637,6 +637,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);
        }
@@ -768,6 +769,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. */