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

                        [RT #19340]

diff --git a/CHANGES b/CHANGES
index ea31505f52037f68d4fe578b3d88784043c4dddb..a0742e8f1285e8fb4f50c87c1eb0c6253a9e762d 100644 (file)
--- 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 2f847ac21094747f57516e5a6e40f846717e6672..5f75523daf351d0531fb1d35b6d436225e8e2f0c 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.284.18.84 2009/01/19 00:36:27 marka Exp $ */
+/* $Id: resolver.c,v 1.284.18.85 2009/02/15 23:15:40 marka Exp $ */
 
 /*! \file */
 
@@ -4344,7 +4344,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,