revert a6

diff --git a/Changelog b/Changelog
index 6ec8bc3d36b740f6a6ac27622707497501024885..6a11333abe65144ffebefba8dd0b620c91f2e246 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,6 @@
 1.x.x
 
-1.6.2  2009-10-01
+1.6.2  2009-11-05
        * Fix Makefile patch from Havard Eidnes, better install.sh usage.
        * Fix parse error on SOA serial of 2910532839.
          Fix print of ';' and readback of '\;' in names, also for '\\'.

diff --git a/rr.c b/rr.c
index 05cb45ef389635f719089b7e00281628cd544f8d..5175f3b8225ef6a597ab8a4b9093256195e55848 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1757,7 +1757,7 @@ static const ldns_rdf_type type_kx_wireformat[] = {
 static const ldns_rdf_type type_cert_wireformat[] = {
         LDNS_RDF_TYPE_CERT_ALG, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_ALG, LDNS_RDF_TYPE_B64
 };
-static const ldns_rdf_type type_a6_wireformat[] = { LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_AAAA, LDNS_RDF_TYPE_DNAME };
+static const ldns_rdf_type type_a6_wireformat[] = { LDNS_RDF_TYPE_UNKNOWN };
 static const ldns_rdf_type type_dname_wireformat[] = { LDNS_RDF_TYPE_DNAME };
 static const ldns_rdf_type type_sink_wireformat[] = { LDNS_RDF_TYPE_INT8,
        LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_B64
@@ -1898,7 +1898,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* 37 */
        {LDNS_RR_TYPE_CERT, "CERT", 4, 4, type_cert_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 38 */
-       {LDNS_RR_TYPE_A6, "A6", 3, 3, type_a6_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 1 },
+       {LDNS_RR_TYPE_A6, "A6", 1, 1, type_a6_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 39 */
        {LDNS_RR_TYPE_DNAME, "DNAME", 1, 1, type_dname_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 1 },
        /* 40 */