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

                        level. [RT #10452]

diff --git a/CHANGES b/CHANGES
index e9a432b0e34db5ade14fa58d05c400e1be913c7b..20a0f84d999f09579d559a161204228323b2cab0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,8 @@
 
 1584.  [placeholder]   rt10461
 
-1583.  [placeholder]   rt10452
+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 e80182bf6704e3f2e5248c7335ab897c707cdc44..1db65b120a12ddb90180c3003721e5addad63c7d 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.7 2003/09/30 05:56:10 marka Exp $ */
+/* $Id: diff.c,v 1.8 2004/03/04 02:46:27 marka Exp $ */
 
 #include <config.h>
 
@@ -270,6 +270,7 @@ 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 ec2d7e6545e2de1d34af5d4eb8f4dba9febdae8d..9cc1a35d34ba5da95d5bb58b390d226583608b3a 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.193 2004/02/03 00:59:04 marka Exp $ */
+/* $Id: rbtdb.c,v 1.194 2004/03/04 02:46:28 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -4083,13 +4083,12 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        newheader->attributes = 0;
        newheader->noqname = NULL;
        newheader->count = 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;
                if ((rdataset->attributes & DNS_RDATASETATTR_NOQNAME) != 0) {