From: Mark Andrews <marka@isc.org>
Date: Sun, 15 Feb 2009 23:13:32 +0000 (+0000)
Subject: 2552.   [bug]           zero-no-soa-ttl-cache was not being honoured.
X-Git-Tag: v9.3.6-P2~4^2~30
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=45c3c12ed3415e5cce50d73a735034e32aed1f73;p=thirdparty%2Fbind9.git

2552.   [bug]           zero-no-soa-ttl-cache was not being honoured.
                        [RT #19340]
---

diff --git a/CHANGES b/CHANGES
index 1d58e20e586..a9d89f1e8b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2552.	[bug]		zero-no-soa-ttl-cache was not being honoured.
+			[RT #19340]
+
 2551.	[bug]		Potential Reference leak on return. [RT #19341]
 
 2550.	[bug]		Check --with-openssl=<path> finds <openssl/opensslv.h>.
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 805b0a14feb..3ed7eb2ae68 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.390 2009/01/27 22:29:59 jinmei Exp $ */
+/* $Id: resolver.c,v 1.391 2009/02/15 23:13:32 marka Exp $ */
 
 /*! \file */
 
@@ -4610,7 +4610,8 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 	 */
 	ttl = fctx->res->view->maxncachettl;
 	if (fctx->type == dns_rdatatype_soa &&
-	    covers == dns_rdatatype_any)
+	    covers == dns_rdatatype_any &&
+	    fctx->res->zero_no_soa_ttl)
 		ttl = 0;
 
 	result = ncache_adderesult(fctx->rmessage, fctx->cache, node,