- RFC 7553 RR type URI support, is now enabled by default.

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

diff --git a/doc/Changelog b/doc/Changelog
index 0ab107b9c078cb8054d1ec3a2f50eed1ec264455..9a24fdef2f7017f13d37388f6224ba690bd12e02 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+4 June 2015: Wouter
+       - RFC 7553 RR type URI support, is now enabled by default.
+
 2 June 2015: Wouter
        - Fix #674: Do not free pointers given by getenv.
 

diff --git a/sldns/rrdef.c b/sldns/rrdef.c
index 72161d7b6f87aa495192e1dbd4f0d9b05d8ad27a..a8c6229b9d2e351cff3f1988842d17806c052aec 100644 (file)
--- a/sldns/rrdef.c
+++ b/sldns/rrdef.c
@@ -213,13 +213,11 @@ static const sldns_rdf_type type_eui48_wireformat[] = {
 static const sldns_rdf_type type_eui64_wireformat[] = {
        LDNS_RDF_TYPE_EUI64
 };
-#ifdef DRAFT_RRTYPES
 static const sldns_rdf_type type_uri_wireformat[] = {
        LDNS_RDF_TYPE_INT16,
        LDNS_RDF_TYPE_INT16,
        LDNS_RDF_TYPE_LONG_STR
 };
-#endif
 static const sldns_rdf_type type_caa_wireformat[] = {
        LDNS_RDF_TYPE_INT8,
        LDNS_RDF_TYPE_TAG,
@@ -590,12 +588,8 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
        /* ANY: A request for all (available) records */
 {LDNS_RR_TYPE_ANY, "ANY", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 
-#ifdef DRAFT_RRTYPES
        /* 256 */
        {LDNS_RR_TYPE_URI, "URI", 3, 3, type_uri_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#else
-{LDNS_RR_TYPE_NULL, "TYPE256", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
-#endif
        /* 257 */
        {LDNS_RR_TYPE_CAA, "CAA", 3, 3, type_caa_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 

diff --git a/sldns/rrdef.h b/sldns/rrdef.h
index 933bcdfbf07efaa2cfa5a1999c12d86181bee250..678d2bc791e2cd270f007a0921f70b6f803959a9 100644 (file)
--- a/sldns/rrdef.h
+++ b/sldns/rrdef.h
@@ -220,8 +220,7 @@ enum sldns_enum_rr_type
        LDNS_RR_TYPE_MAILA = 254,
        /**  any type (wildcard) */
        LDNS_RR_TYPE_ANY = 255,
-       /** draft-faltstrom-uri-06 */
-       LDNS_RR_TYPE_URI = 256,
+       LDNS_RR_TYPE_URI = 256, /* RFC 7553 */
        LDNS_RR_TYPE_CAA = 257, /* RFC 6844 */
 
        /** DNSSEC Trust Authorities */