From: Willem Toorop <willem@NLnetLabs.nl>
Date: Thu, 22 Nov 2012 13:21:39 +0000 (+0000)
Subject: Finish integer size fix leftover :/
X-Git-Tag: release-1.6.17rc1~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e22aef014b34b18da6cf95f63d0bd694db852d63;p=thirdparty%2Fldns.git

Finish integer size fix leftover :/
---

diff --git a/Changelog b/Changelog
index 5b3246e0..647c3644 100644
--- 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 ffeb07de..c6154911 100644
--- 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);
 	}