RFC7553 RR Type URI is supported by default.

diff --git a/Changelog b/Changelog
index b03e34dca94cb0cc44f043fe1b5714653b047231..3392329e1cb33ce9e9cec9966a9ec45b2ad8ef01 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -52,6 +52,7 @@ TBD
          Thanks Erwin Lansing
        * Spelling fixes.  Thanks Andreas Schulze
        * Hyphen used as minus in manpages.  Thanks Andreas Schulze.
+       * RFC7553 RR Type URI is supported by default.
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/configure.ac b/configure.ac
index 5cdee61c499a6ca8d587500114d093b61fe3886d..d6b28b60625deecd2c08ff2a568b97a2062324b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -396,14 +396,6 @@ case "$enable_rrtype_openpgpkey" in
        no|*)
                ;;
 esac
-AC_ARG_ENABLE(rrtype-uri, AC_HELP_STRING([--enable-rrtype-uri], [Enable draft RR type uri.]))
-case "$enable_rrtype_uri" in
-       yes)
-               AC_DEFINE_UNQUOTED([RRTYPE_URI], [], [Define this to enable RR type URI.])
-               ;;
-       no|*)
-               ;;
-esac
 AC_ARG_ENABLE(rrtype-ta, AC_HELP_STRING([--enable-rrtype-ta], [Enable draft RR type ta.]))
 case "$enable_rrtype_ta" in
        yes)

diff --git a/ldns/rr.h b/ldns/rr.h
index d76b38c2c9c8e01d0c78ecaa8e60d55e0b9a28ee..c3e70c4f4089fe3551548f332bbd4e67005553b3 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -219,8 +219,7 @@ enum ldns_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 */

diff --git a/rr.c b/rr.c
index e52ea8094ec599520459275a7a373e80bbda2fef..c73df3db03452508f7dd8d4922a3d858252518f1 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -2012,13 +2012,11 @@ static const ldns_rdf_type type_eui48_wireformat[] = {
 static const ldns_rdf_type type_eui64_wireformat[] = {
        LDNS_RDF_TYPE_EUI64
 };
-#ifdef RRTYPE_URI
 static const ldns_rdf_type type_uri_wireformat[] = {
        LDNS_RDF_TYPE_INT16,
        LDNS_RDF_TYPE_INT16,
        LDNS_RDF_TYPE_LONG_STR
 };
-#endif
 static const ldns_rdf_type type_caa_wireformat[] = {
        LDNS_RDF_TYPE_INT8,
        LDNS_RDF_TYPE_TAG,
@@ -2401,12 +2399,8 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* ANY: A request for all (available) records */
 {LDNS_RR_TYPE_NULL, "TYPE255", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
 
-#ifdef RRTYPE_URI
        /* 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 },