- Note RFC8162 support. SMIMEA record type can be read in by the

  zone record parser.

git-svn-id: file:///svn/unbound/trunk@4774 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 6894d9f608af18a58b9f3a8e0dcd61c29bab7362..52ede2978afe955ce2362476f476c5431049036f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,7 +2,8 @@
        - Fix documentation ambiguity for tls-win-cert in tls-upstream and
          forward-tls-upstream docs.
        - iana port update.
-       - Note RFC8162 support.
+       - Note RFC8162 support.  SMIMEA record type can be read in by the
+         zone record parser.
 
 4 July 2018: Wouter
        - Fix #4112: Fix that unbound-anchor -f /etc/resolv.conf will not pass

diff --git a/sldns/rrdef.c b/sldns/rrdef.c
index 644762f59f4ae449806832aa8f5a3948dc76c2dd..b365a4a8ec3a77c7715a4967dfab5eb119e30003 100644 (file)
--- a/sldns/rrdef.c
+++ b/sldns/rrdef.c
@@ -341,12 +341,9 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
        {LDNS_RR_TYPE_NSEC3PARAM, "NSEC3PARAM", 4, 4, type_nsec3param_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 52 */
        {LDNS_RR_TYPE_TLSA, "TLSA", 4, 4, type_tlsa_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-       /*53 */
-#ifdef DRAFT_RRTYPES
+       /* 53 */
        {LDNS_RR_TYPE_SMIMEA, "SMIMEA", 4, 4, type_tlsa_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#else
-{LDNS_RR_TYPE_NULL, "TYPE53", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#endif
+       /* 54 */
 {LDNS_RR_TYPE_NULL, "TYPE54", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
         /* 55
         * Hip ends with 0 or more Rendezvous Servers represented as dname's.