Finish integer size fix leftover :/

diff --git a/Changelog b/Changelog
index 5b3246e0a9a1a780a34ff9ac82c27e80638650f4..647c3644543a3b1132f7e8b9ee3b425d25fca3fa 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 1.6.17
-       * Fix ldns_dnssec_zone_new_frm_fp_l to allow NSEC3 (or its RRSIG)
-         covering an empty non terminal as the last line. 
+       * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a
+         zone to be an NSEC3 (or its RRSIG) covering an empty non terminal.
+
 
 1.6.16 2012-11-13
        * Fix Makefile to build pyldns with BSD make

diff --git a/str2host.c b/str2host.c
index ffeb07deb23e6c2c484c75121bd72a1fd561930a..c615491156f73ac62a31cb5c362d1bc377fc27e6 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -1327,10 +1327,10 @@ ldns_str2rdf_aaaa_half(ldns_rdf **rd, const char *str)
        if (sscanf(str, "%x:%x:%x:%x", &a, &b, &c, &d) == EOF) {
                return LDNS_STATUS_INVALID_AAAA_HALF;
        } else {
-               shorts[0] = htons(shorts[0]);
-               shorts[1] = htons(shorts[1]);
-               shorts[2] = htons(shorts[2]);
-               shorts[3] = htons(shorts[3]);
+               shorts[0] = htons(a);
+               shorts[1] = htons(b);
+               shorts[2] = htons(c);
+               shorts[3] = htons(d);
                *rd = ldns_rdf_new_frm_data(
                        LDNS_RDF_TYPE_AAAA_HALF, 4 * sizeof(uint16_t), &shorts);
        }