OPENPGPKEY is RFC

diff --git a/configure.ac b/configure.ac
index cf404f602bb6e4dfa4eb037b84c84274465df157..19a3847edbf045a7256fd092d41b2aed9cd4d3d7 100644 (file)
--- 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 811efe741c9d6a64ac2067e684cd42cd92f7dfed..5c53f8293f8fa319ad43670f5f23fa28dbe7f8a8 100644 (file)
--- 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 5bfd04fba720b96190a6dbb7131b38899c36d3df..11ce68640fedbb2756c44741904d51febff4ddf3 100644 (file)
--- 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
 };