From: Mark Andrews <marka@isc.org>
Date: Fri, 30 Jan 2015 10:48:28 +0000 (+1100)
Subject: 4049.   [bug]           CDS and CDNSKEY had the wrong attributes. [RT #38491]
X-Git-Tag: v9.11.0a1~1070
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e77ef50a57091eeb70d0a6d021638c92442c8f0a;p=thirdparty%2Fbind9.git

4049.   [bug]           CDS and CDNSKEY had the wrong attributes. [RT #38491]
---

diff --git a/CHANGES b/CHANGES
index 36fac1741f6..aa1f79d3574 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4049.	[bug]		CDS and CDNSKEY had the wrong attributes. [RT #38491]
+
 4048.	[bug]		adb hash table was not being grown. [RT #38470]
 
 4047.	[cleanup]	"named -V" now reports the current running versions
diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c
index 8bf876d2e1e..f5a700a61b8 100644
--- a/lib/dns/rdata/generic/cdnskey_60.c
+++ b/lib/dns/rdata/generic/cdnskey_60.c
@@ -21,7 +21,7 @@
 
 #include <dst/dst.h>
 
-#define RRTYPE_CDNSKEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
+#define RRTYPE_CDNSKEY_ATTRIBUTES 0
 
 static inline isc_result_t
 fromtext_cdnskey(ARGS_FROMTEXT) {
diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c
index 62884ffdf07..23b6fe89840 100644
--- a/lib/dns/rdata/generic/cds_59.c
+++ b/lib/dns/rdata/generic/cds_59.c
@@ -19,8 +19,7 @@
 #ifndef RDATA_GENERIC_CDS_59_C
 #define RDATA_GENERIC_CDS_59_C
 
-#define RRTYPE_CDS_ATTRIBUTES \
-	(DNS_RDATATYPEATTR_DNSSEC|DNS_RDATATYPEATTR_ATPARENT)
+#define RRTYPE_CDS_ATTRIBUTES 0
 
 #include <isc/sha1.h>
 #include <isc/sha2.h>