bugfix #504: GPOS RR has three rdata fields

diff --git a/Changelog b/Changelog
index 8f29df59142e8b4f6f2c00cfb44bbf3ff13980ff..f7a777e9171a494dbe8a6005b1f6e9f56ace2fc0 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 1.6.17
+       * bugfix #504: GPOS RR has three rdata fields. Thanks Jelte Jansen.
        * -u and -U parameter for ldns-read-zone to mark/unmark a RR type
          for printing as unknown type
        * New output format flag (and accompanying funtions) to print certain

diff --git a/rr.c b/rr.c
index eae1f3af196badb713552230993d378aeb4198c1..cb97116111ddeb23aadc6511b8931f3c8a415704 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1827,9 +1827,7 @@ static const ldns_rdf_type type_px_wireformat[] = {
        LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_gpos_wireformat[] = {
-       LDNS_RDF_TYPE_STR,
-       LDNS_RDF_TYPE_STR,
-       LDNS_RDF_TYPE_STR
+       LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_STR
 };
 static const ldns_rdf_type type_aaaa_wireformat[] = { LDNS_RDF_TYPE_AAAA };
 static const ldns_rdf_type type_loc_wireformat[] = { LDNS_RDF_TYPE_LOC };
@@ -2057,7 +2055,7 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* 26 */
        {LDNS_RR_TYPE_PX, "PX", 3, 3, type_px_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 2 },
        /* 27 */
-       {LDNS_RR_TYPE_GPOS, "GPOS", 1, 1, type_gpos_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
+       {LDNS_RR_TYPE_GPOS, "GPOS", 3, 3, type_gpos_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 28 */
        {LDNS_RR_TYPE_AAAA, "AAAA", 1, 1, type_aaaa_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
        /* 29 */