1997. [bug] Named was failing to replace negative cache entries

                        when a positive one for the type was learnt.
                        [RT #15818]

diff --git a/CHANGES b/CHANGES
index c8a431b1a1c9a6c3098f8989838f5076adfe9705..713ffb25f811004472deb07ccc7f9fefc8fd8401 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1997.  [bug]           Named was failing to replace negative cache entries
+                       when a positive one for the type was learnt.
+                       [RT #15818]
+
+1996.  [bug]           nsupdate: if a zone has been specified it should
+                       appear in the output of 'show'. [RT #15797]
+
 1995.  [bug]           'host' was reporting multiple "is an alias" messages.
                        [RT #15702]
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index a69bacb17fa7a60f2e1f33a4fc9bbb8fd04e76a6..f84fc54c4f987cd4019e4dec36df6397477e8ab7 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.130.18.12 2006/01/27 02:50:51 marka Exp $ */
+/* $Id: nsupdate.c,v 1.130.18.13 2006/03/02 23:19:20 marka Exp $ */
 
 /*! \file */
 
@@ -1421,6 +1421,41 @@ evaluate_update(char *cmdline) {
        return (update_addordelete(cmdline, isdelete));
 }
 
+static void
+setzone(dns_name_t *zonename) {
+       isc_result_t result;
+       dns_name_t *name = NULL;
+       dns_rdataset_t *rdataset = NULL;
+
+       result = dns_message_firstname(updatemsg, DNS_SECTION_ZONE);
+       if (result == ISC_R_SUCCESS) {
+               dns_message_currentname(updatemsg, DNS_SECTION_ZONE, &name);
+               dns_message_removename(updatemsg, name, DNS_SECTION_ZONE);
+               for (rdataset = ISC_LIST_HEAD(name->list);
+                    rdataset != NULL;
+                    rdataset = ISC_LIST_HEAD(name->list)) {
+                       ISC_LIST_UNLINK(name->list, rdataset, link);
+                       dns_rdataset_disassociate(rdataset);
+                       dns_message_puttemprdataset(updatemsg, &rdataset);
+               }
+               dns_message_puttempname(updatemsg, &name);
+       }
+
+       if (zonename != NULL) {
+               result = dns_message_gettempname(updatemsg, &name);
+               check_result(result, "dns_message_gettempname");
+               dns_name_init(name, NULL);
+               dns_name_clone(zonename, name);
+               result = dns_message_gettemprdataset(updatemsg, &rdataset);
+               check_result(result, "dns_message_gettemprdataset");
+               dns_rdataset_makequestion(rdataset, getzoneclass(),
+                                         dns_rdatatype_soa);
+               ISC_LIST_INIT(name->list);
+               ISC_LIST_APPEND(name->list, rdataset, link);
+               dns_message_addname(updatemsg, name, DNS_SECTION_ZONE);
+       }
+}
+
 static void
 show_message(dns_message_t *msg) {
        isc_result_t result;
@@ -1428,6 +1463,9 @@ show_message(dns_message_t *msg) {
        int bufsz;
 
        ddebug("show_message()");
+
+       setzone(userzone);
+
        bufsz = INITTEXT;
        do { 
                if (bufsz > MAXTEXT) {
@@ -1653,22 +1691,11 @@ send_update(dns_name_t *zonename, isc_sockaddr_t *master,
 {
        isc_result_t result;
        dns_request_t *request = NULL;
-       dns_name_t *name = NULL;
-       dns_rdataset_t *rdataset = NULL;
        unsigned int options = 0;
 
        ddebug("send_update()");
 
-       result = dns_message_gettempname(updatemsg, &name);
-       check_result(result, "dns_message_gettempname");
-       dns_name_init(name, NULL);
-       dns_name_clone(zonename, name);
-       result = dns_message_gettemprdataset(updatemsg, &rdataset);
-       check_result(result, "dns_message_gettemprdataset");
-       dns_rdataset_makequestion(rdataset, getzoneclass(), dns_rdatatype_soa);
-       ISC_LIST_INIT(name->list);
-       ISC_LIST_APPEND(name->list, rdataset, link);
-       dns_message_addname(updatemsg, name, DNS_SECTION_ZONE);
+       setzone(zonename);
 
        if (usevc)
                options |= DNS_REQUESTOPT_TCP;

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index a7e18a5cc2b683828ed4d952ba92399b26aa7711..9002b83f710bdfcfc219b7dc1e7d99bdce733f79 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.114.18.5 2006/02/28 03:10:48 marka Exp $ */
+/* $Id: message.h,v 1.114.18.6 2006/03/02 23:19:20 marka Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -769,6 +769,25 @@ dns_message_addname(dns_message_t *msg, dns_name_t *name,
  *\li  'section' be a named section.
  */
 
+void
+dns_message_removename(dns_message_t *msg, dns_name_t *name,
+                       dns_section_t section);
+/*%<
+ * Remove a existing name from a given section.
+ *
+ * It is the caller's responsibility to ensure the name is part of the
+ * given section.
+ *
+ * Requires:
+ *
+ *\li  'msg' be valid, and be a renderable message.
+ *
+ *\li  'name' be a valid absolute name.
+ *
+ *\li  'section' be a named section.
+ */
+
+
 /*
  * LOANOUT FUNCTIONS
  *

diff --git a/lib/dns/message.c b/lib/dns/message.c
index a32bf0bb9d349dc2c09606c3a4221968fbc914c8..a4a1f8781202956c407b3619ca53488d9124f48b 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.222.18.9 2006/02/28 03:10:48 marka Exp $ */
+/* $Id: message.c,v 1.222.18.10 2006/03/02 23:19:20 marka Exp $ */
 
 /*! \file */
 
@@ -2284,6 +2284,18 @@ dns_message_addname(dns_message_t *msg, dns_name_t *name,
        ISC_LIST_APPEND(msg->sections[section], name, link);
 }
 
+void
+dns_message_removename(dns_message_t *msg, dns_name_t *name,
+                      dns_section_t section)
+{
+       REQUIRE(msg != NULL);
+       REQUIRE(msg->from_to_wire == DNS_MESSAGE_INTENTRENDER);
+       REQUIRE(name != NULL);
+       REQUIRE(VALID_NAMED_SECTION(section));
+
+       ISC_LIST_UNLINK(msg->sections[section], name, link);
+}
+
 isc_result_t
 dns_message_gettempname(dns_message_t *msg, dns_name_t **item) {
        REQUIRE(DNS_MESSAGE_VALID(msg));

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 4d2e7065bbcea981ad30d5dc4a5f0d62a4d73466..2bd404024456323cd7b86151618015cf73d0a20e 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.196.18.28 2006/02/16 01:23:47 marka Exp $ */
+/* $Id: rbtdb.c,v 1.196.18.29 2006/03/02 23:19:20 marka Exp $ */
 
 /*! \file */
 
@@ -3331,7 +3331,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
        rdatasetheader_t *header, *header_prev, *header_next;
        rdatasetheader_t *found, *nsheader;
        rdatasetheader_t *foundsig, *nssig, *cnamesig;
-       rbtdb_rdatatype_t sigtype, nsectype;
+       rbtdb_rdatatype_t sigtype, negtype;
 
        UNUSED(version);
 
@@ -3408,7 +3408,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
        found = NULL;
        foundsig = NULL;
        sigtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
-       nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+       negtype = RBTDB_RDATATYPE_VALUE(0, type);
        nsheader = NULL;
        nssig = NULL;
        cnamesig = NULL;
@@ -3491,7 +3491,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
                                 */
                                foundsig = header;
                        } else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-                                  header->type == nsectype) {
+                                  header->type == negtype) {
                                /*
                                 * We've found a negative cache entry.
                                 */
@@ -4138,7 +4138,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
        dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node;
        rdatasetheader_t *header, *header_next, *found, *foundsig;
-       rbtdb_rdatatype_t matchtype, sigmatchtype, nsectype;
+       rbtdb_rdatatype_t matchtype, sigmatchtype, negtype;
        isc_result_t result;
        nodelock_t *lock;
        isc_rwlocktype_t locktype;
@@ -4160,7 +4160,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        found = NULL;
        foundsig = NULL;
        matchtype = RBTDB_RDATATYPE_VALUE(type, covers);
-       nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+       negtype = RBTDB_RDATATYPE_VALUE(0, type);
        if (covers == 0)
                sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
        else
@@ -4192,7 +4192,7 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
                        if (header->type == matchtype)
                                found = header;
                        else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-                                header->type == nsectype)
+                                header->type == negtype)
                                found = header;
                        else if (header->type == sigmatchtype)
                                foundsig = header;
@@ -4370,7 +4370,8 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
        isc_boolean_t header_nx;
        isc_boolean_t newheader_nx;
        isc_boolean_t merge;
-       dns_rdatatype_t nsectype, rdtype, covers;
+       dns_rdatatype_t rdtype, covers;
+       rbtdb_rdatatype_t negtype;
        dns_trust_t trust;
 
        /*
@@ -4408,7 +4409,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
        newheader_nx = NONEXISTENT(newheader) ? ISC_TRUE : ISC_FALSE;
        topheader_prev = NULL;
 
-       nsectype = 0;
+       negtype = 0;
        if (rbtversion == NULL && !newheader_nx) {
                rdtype = RBTDB_RDATATYPE_BASE(newheader->type);
                if (rdtype == 0) {
@@ -4418,12 +4419,13 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                        covers = RBTDB_RDATATYPE_EXT(newheader->type);
                        if (covers == dns_rdatatype_any) {
                                /*
-                                * We're adding an NXDOMAIN negative cache
-                                * entry.
+                                * We're adding an negative cache entry
+                                * which covers all types (NXDOMAIN,
+                                * NODATA(QTYPE=ANY)).
                                 *
                                 * We make all other data stale so that the
                                 * only rdataset that can be found at this
-                                * node is the NXDOMAIN negative cache entry.
+                                * node is the negative cache entry.
                                 */
                                for (topheader = rbtnode->data;
                                     topheader != NULL;
@@ -4435,17 +4437,19 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                                rbtnode->dirty = 1;
                                goto find_header;
                        }
-                       nsectype = RBTDB_RDATATYPE_VALUE(covers, 0);
+                       negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
                } else {
                        /*
                         * We're adding something that isn't a
                         * negative cache entry.  Look for an extant
-                        * non-stale NXDOMAIN negative cache entry.
+                        * non-stale NXDOMAIN/NODATA(QTYPE=ANY) negative
+                        * cache entry.
                         */
                        for (topheader = rbtnode->data;
                             topheader != NULL;
                             topheader = topheader->next) {
-                               if (NXDOMAIN(topheader))
+                               if (topheader->type == 
+                                   RBTDB_RDATATYPE_NCACHEANY)
                                        break;
                        }
                        if (topheader != NULL && EXISTS(topheader) &&
@@ -4455,7 +4459,8 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                                 */
                                if (trust < topheader->trust) {
                                        /*
-                                        * The NXDOMAIN is more trusted.
+                                        * The NXDOMAIN/NODATA(QTYPE=ANY)
+                                        * is more trusted.
                                         */
                                        
                                        free_rdataset(rbtdb->common.mctx,
@@ -4468,7 +4473,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                                }
                                /*
                                 * The new rdataset is better.  Expire the
-                                * NXDOMAIN.
+                                * NXDOMAIN/NODATA(QTYPE=ANY).
                                 */
                                topheader->ttl = 0;
                                topheader->attributes |= RDATASET_ATTR_STALE;
@@ -4476,7 +4481,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                                topheader = NULL;
                                goto find_header;
                        }
-                       nsectype = RBTDB_RDATATYPE_VALUE(0, rdtype);
+                       negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
                }
        }
 
@@ -4484,7 +4489,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
             topheader != NULL;
             topheader = topheader->next) {
                if (topheader->type == newheader->type ||
-                   topheader->type == nsectype)
+                   topheader->type == negtype)
                        break;
                topheader_prev = topheader;
        }
@@ -4650,6 +4655,10 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                        rbtnode->dirty = 1;
                        if (changed != NULL)
                                changed->dirty = ISC_TRUE;
+                       if (rbtversion == NULL) {
+                               header->ttl = 0;
+                               header->attributes |= RDATASET_ATTR_STALE;
+                       }
                }
        } else {
                /*
@@ -5819,7 +5828,8 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
        rdatasetheader_t *header, *top_next;
        rbtdb_serial_t serial;
        isc_stdtime_t now;
-       rbtdb_rdatatype_t type;
+       rbtdb_rdatatype_t type, negtype;
+       dns_rdatatype_t rdtype, covers;
 
        header = rbtiterator->current;
        if (header == NULL)
@@ -5837,9 +5847,18 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) {
                  isc_rwlocktype_read);
 
        type = header->type;
+       rdtype = RBTDB_RDATATYPE_BASE(header->type);
+       if (rdtype == 0) {
+               covers = RBTDB_RDATATYPE_EXT(header->type);
+               negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
+       } else 
+               negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
        for (header = header->next; header != NULL; header = top_next) {
                top_next = header->next;
-               if (header->type != type) {
+               /*
+                * If not walking back up the down list.
+                */
+               if (header->type != type && header->type != negtype) {
                        do {
                                if (header->serial <= serial &&
                                    !IGNORE(header)) {

diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 2a85e2070718d541f2714d179be863987db0cd65..193d5543fda91e5ec36ee0158e4f0c4ca89750af 100644 (file)
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -276,6 +276,7 @@ dns_message_puttemprdata
 dns_message_puttemprdatalist
 dns_message_puttemprdataset
 dns_message_rechecksig
+dns_message_removename
 dns_message_renderbegin
 dns_message_renderchangebuffer
 dns_message_renderend