From: Mark Andrews <marka@isc.org>
Date: Mon, 8 Jan 2007 00:54:15 +0000 (+0000)
Subject: 2125.   [bug]           dns_zone_getzeronosoattl() REQUIRE failure if DLZ
X-Git-Tag: v9.5.0a2~161
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e7d32e57a5c8600893f91ec08f74117c983f8b8d;p=thirdparty%2Fbind9.git

2125.   [bug]           dns_zone_getzeronosoattl() REQUIRE failure if DLZ
                        was defined. [RT #16574]
---

diff --git a/CHANGES b/CHANGES
index 20e68c7facd..a616180eb1e 100644
--- 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 112d9dbd5dd..58c9dd38957 100644
--- 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