From e9a9ae4fc627f24cb960a3008f2723ba9a55b274 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Thu, 20 Apr 2000 18:47:21 +0000
Subject: [PATCH] Added dns_trust_ultimate for zone data (can be renamed later
 if necessary).

---
 CHANGES                     | 3 +++
 lib/dns/include/dns/types.h | 3 ++-
 lib/dns/journal.c           | 1 +
 lib/dns/master.c            | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 21b7e82bce..d486288d9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+  66.   [func]		Data in authoritative zones should have a trust level
+			beyond secure.
+
   65.   [cleanup]       Removed obsolete typedef of dns_zone_callbackarg_t
 			from <dns/types.h>.
 
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 4ffe4b339c..27e7037c65 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -207,7 +207,8 @@ enum {
 	dns_trust_authauthority = 5,
 	dns_trust_authanswer = 6,
 	dns_trust_secure = 7,
-	dns_trust_authsecure = 8
+	dns_trust_authsecure = 8,
+	dns_trust_ultimate = 9
 };
 
 /*
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 8501b2a4cc..be793d28f6 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -518,6 +518,7 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
 			/* Convert the rdatalist into a rdataset. */
 			dns_rdataset_init(&rds);
 			CHECK(dns_rdatalist_tordataset(&rdl, &rds));
+			rds.trust = dns_trust_ultimate;
 
 			INSIST(op == DNS_DIFFOP_ADD);
 			result = (*addfunc)(add_private, name, &rds);
diff --git a/lib/dns/master.c b/lib/dns/master.c
index 58057b2972..10e07b21a3 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: master.c,v 1.47 2000/04/06 22:02:00 explorer Exp $ */
+/* $Id: master.c,v 1.48 2000/04/20 18:47:17 bwelling Exp $ */
 
 #include <config.h>
 
@@ -1073,6 +1073,7 @@ commit(dns_rdatacallbacks_t *callbacks, rdatalist_head_t *head,
 		if (!ignore) {
 			dns_rdataset_init(&dataset);
 			dns_rdatalist_tordataset(this, &dataset);
+			dataset.trust = dns_trust_ultimate;
 			result = ((*callbacks->add)(callbacks->add_private,
 						    owner,
 						    &dataset));