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

                        [RT #19340]

diff --git a/CHANGES b/CHANGES
index 1d58e20e586c67643ef4568ef5e2efc286fe659d..a9d89f1e8b513cd1875e15e86557eed7d71009c7 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 805b0a14feb0bf9924db5b657ba24a278f254ed9..3ed7eb2ae68e4e536042deab6e98059bf0a36f1d 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.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,