2125. [bug] dns_zone_getzeronosoattl() REQUIRE failure if DLZ

                        was defined. [RT #16574]

diff --git a/CHANGES b/CHANGES
index 20e68c7facda9af51c686e0d87b1ca93b9f6e61b..a616180eb1ee1ec3b6646a8f6a5c717ce1bd87ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2125.  [bug]           dns_zone_getzeronosoattl() REQUIRE failure if DLZ
+                       was defined. [RT #16574]
+
 2124.  [bug]           It was possible to dereference a freed fetch
                        context. [RT #16584]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 112d9dbd5ddff34956f72751dad73ff3b36e8b61..58c9dd38957b037ebd652d4d637a9544594affbf 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.290 2006/12/07 04:38:56 marka Exp $ */
+/* $Id: query.c,v 1.291 2007/01/08 00:54:15 marka Exp $ */
 
 /*! \file */
 
@@ -3877,6 +3877,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                 * resolver and not have it cached.
                 */
                if (qtype == dns_rdatatype_soa &&
+#ifdef DLZ
+                   zone != NULL &&
+#endif
                    dns_zone_getzeronosoattl(zone))
                        result = query_addsoa(client, db, version, ISC_TRUE);
                else