From: Matthijs Mekking <matje@NLnetLabs.nl>
Date: Thu, 1 Nov 2012 15:15:00 +0000 (+0000)
Subject: fix for ldns-testns
X-Git-Tag: release-1.6.17rc1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=734ea6279581ce5d5474b975cdbbfb68255bbc21;p=thirdparty%2Fldns.git

fix for ldns-testns
---

diff --git a/Changelog b/Changelog
index c3ef20ef..6b50a82f 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@
 
 1.6.16
 	* Fix typo in exporting b32_* symbols to make pyldns load again
+	* Allow leaving the RR owner name empty in ldns-testns datafiles.
 
 1.6.15	2012-10-25
 	* Remove LDNS_STATUS_EXISTS_ERR from ldns/error.h to make ldns
diff --git a/examples/ldns-testpkts.c b/examples/ldns-testpkts.c
index 7a6c020e..002a6a90 100644
--- a/examples/ldns-testpkts.c
+++ b/examples/ldns-testpkts.c
@@ -509,12 +509,12 @@ read_entry(FILE* in, const char* name, int *lineno, uint32_t* default_ttl,
 			ldns_status status;
 			if(add_section == LDNS_SECTION_QUESTION)
 				status = ldns_rr_new_question_frm_str(
-					&n, parse, *origin, prev_rr);
-			else status = ldns_rr_new_frm_str(&n, parse, 
+					&n, line, *origin, prev_rr);
+			else status = ldns_rr_new_frm_str(&n, line, 
 				*default_ttl, *origin, prev_rr);
 			if(status != LDNS_STATUS_OK)
 				error("%s line %d:\n\t%s: %s", name, *lineno,
-					ldns_get_errorstr_by_id(status), parse);
+					ldns_get_errorstr_by_id(status), line);
 			ldns_pkt_push_rr(cur_reply->reply, add_section, n);
 		}