From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 23 Nov 2016 14:25:06 +0000 (+0100)
Subject: OPENPGPKEY is RFC
X-Git-Tag: release-1.7.0-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c60b9ba7e86ca6a894ca95251592a4f67e24b52a;p=thirdparty%2Fldns.git

OPENPGPKEY is RFC
---

diff --git a/configure.ac b/configure.ac
index cf404f60..19a3847e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -480,12 +480,12 @@ case "$enable_rrtype_rkey" in
 	no|*)
 		;;
 esac
-AC_ARG_ENABLE(rrtype-openpgpkey, AC_HELP_STRING([--enable-rrtype-openpgpkey], [Enable draft RR type openpgpkey.]))
+AC_ARG_ENABLE(rrtype-openpgpkey, AC_HELP_STRING([--disable-rrtype-openpgpkey], [Disable openpgpkey RR type.]))
 case "$enable_rrtype_openpgpkey" in
-	yes)
-		AC_DEFINE_UNQUOTED([RRTYPE_OPENPGPKEY], [], [Define this to enable RR type OPENPGPKEY.])
+	no)
 		;;
-	no|*)
+	yes|*)
+		AC_DEFINE_UNQUOTED([RRTYPE_OPENPGPKEY], [], [Define this to enable RR type OPENPGPKEY.])
 		;;
 esac
 AC_ARG_ENABLE(rrtype-ta, AC_HELP_STRING([--enable-rrtype-ta], [Enable draft RR type ta.]))
diff --git a/ldns/rr.h b/ldns/rr.h
index 811efe74..5c53f829 100644
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -192,8 +192,7 @@ enum ldns_enum_rr_type
         LDNS_RR_TYPE_TALINK = 58,
 	LDNS_RR_TYPE_CDS = 59, /* RFC 7344 */
 	LDNS_RR_TYPE_CDNSKEY = 60, /* RFC 7344 */
-	/** draft-ietf-dane-openpgpkey */
-	LDNS_RR_TYPE_OPENPGPKEY = 61,
+	LDNS_RR_TYPE_OPENPGPKEY = 61, /* RFC 7929 */
 	LDNS_RR_TYPE_CSYNC = 62, /* RFC 7477 */
 
 	LDNS_RR_TYPE_SPF = 99, /* RFC 4408 */
diff --git a/rr.c b/rr.c
index 5bfd04fb..11ce6864 100644
--- a/rr.c
+++ b/rr.c
@@ -1950,9 +1950,11 @@ static const ldns_rdf_type type_dhcid_wireformat[] = {
 static const ldns_rdf_type type_talink_wireformat[] = {
 	LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
-/*@unused@*/ static const ldns_rdf_type type_openpgpkey_wireformat[] = {
+#ifdef RRTYPE_OPENPGPKEY
+static const ldns_rdf_type type_openpgpkey_wireformat[] = {
 	LDNS_RDF_TYPE_B64
 };
+#endif
 static const ldns_rdf_type type_csync_wireformat[] = {
 	LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_NSEC
 };