1583. [bug] Records add via UPDATE failed to get the correct trust

                        level. [RT #10452]

diff --git a/CHANGES b/CHANGES
index d1b83a56b0379151d82e66cb7d04e152d88871c9..1639ad8d881dad7b11407ded02480624eed1b3f8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1583.  [bug]           Records add via UPDATE failed to get the correct trust
+                       level. [RT #10452]
+
 1582.  [bug]           rrset-order failed to work on RRsets with more
                        than 32 elements. [RT #10381]
 

diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 2adcf659f34dbbca13981fc861ab2608746e3503..1f6ea7ae3b1ca8c3175ad8180d5c319f27965d0f 100644 (file)
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: diff.c,v 1.4.2.1 2002/08/08 04:54:30 marka Exp $ */
+/* $Id: diff.c,v 1.4.2.2 2004/03/04 02:46:23 marka Exp $ */
 
 #include <config.h>
 
@@ -270,6 +270,7 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
                         */
                        dns_rdataset_init(&rds);
                        CHECK(dns_rdatalist_tordataset(&rdl, &rds));
+                       rds.trust = dns_trust_ultimate;
 
                        /*
                         * Merge the rdataset into the database.

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 810ecb530ef5d52f81f742ccd62bd1eaa8eeb3db..ed8ba61846a8f122b70b36eeea02109909c8f2d1 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.168.2.13 2003/10/17 05:39:44 marka Exp $ */
+/* $Id: rbtdb.c,v 1.168.2.14 2004/03/04 02:46:24 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -3923,13 +3923,12 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        newheader->type = RBTDB_RDATATYPE_VALUE(rdataset->type,
                                                rdataset->covers);
        newheader->attributes = 0;
+       newheader->trust = rdataset->trust;
        if (rbtversion != NULL) {
                newheader->serial = rbtversion->serial;
-               newheader->trust = 0;
                now = 0;
        } else {
                newheader->serial = 1;
-               newheader->trust = rdataset->trust;
                if ((rdataset->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0)
                        newheader->attributes |= RDATASET_ATTR_NXDOMAIN;
        }