pullup:

1039.   [bug]           Negative responses with CNAMEs in the answer section
                        were cached incorrectly. [RT #1862]

diff --git a/CHANGES b/CHANGES
index bbcee9fdc5d3401e2eb2666fa284d7684760b060..3304c221058e39bc5baa658b91e63d476d49e1a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,9 @@
 1040.  [bug]           Multiple listen-on-v6 options with different ports
                        were not accepted. [RT #1875]
 
+1039.  [bug]           Negative responses with CNAMEs in the answer section
+                       were cached incorrectly. [RT #1862]
+
 1038.  [bug]           In servers configured with a tkey-domain option,
                        TKEY queries with an owner name other than the root
                        could cause an assertion failure. [RT #1866, #1869]

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 551bc8387c127eff9a358295a3e6310f4cb10302..35046624db90703c7e7f4113ca72fe29cbb0f9ff 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.3 2001/09/21 20:40:06 gson Exp $ */
+/* $Id: resolver.c,v 1.218.2.4 2001/10/12 17:49:41 gson Exp $ */
 
 #include <config.h>
 
@@ -3609,7 +3609,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) {
        if (ns_name != NULL)
                ns_name->attributes &= ~DNS_NAMEATTR_CACHE;
 
-       if (negative_response)
+       if (negative_response && oqname == NULL)
                fctx->attributes |= FCTX_ATTR_WANTNCACHE;
 
        return (ISC_R_SUCCESS);