From add993636a7abdf241d378728a45bca940fb8bf3 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 4 Jun 2015 14:34:40 +0200
Subject: [PATCH] RFC7553 RR Type URI is supported by default.

---
 Changelog    | 1 +
 configure.ac | 8 --------
 ldns/rr.h    | 3 +--
 rr.c         | 6 ------
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Changelog b/Changelog
index b03e34dc..3392329e 100644
--- 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 5cdee61c..d6b28b60 100644
--- 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 d76b38c2..c3e70c4f 100644
--- 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 e52ea809..c73df3db 100644
--- 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 },
 
-- 
2.47.3