From: Jelte Jansen <jelte@NLnetLabs.nl>
Date: Thu, 14 May 2009 12:20:36 +0000 (+0000)
Subject: drill -k <file>; file may now also contain DS records
X-Git-Tag: release-1.6.0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ed9fef10eece68112d81223befb65e8724486cc;p=thirdparty%2Fldns.git

drill -k <file>; file may now also contain DS records
---

diff --git a/drill/drill.c b/drill/drill.c
index 36d149fa..09e31015 100644
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -268,7 +268,7 @@ main(int argc, char *argv[])
 			case 'k':
 				status = read_key_file(optarg, key_list);
 				if (status != LDNS_STATUS_OK) {
-					error("Could not parse the key file: %s", optarg);
+					error("Could not parse the key file %s: %s", optarg, ldns_get_errorstr_by_id(status));
 				}
 				qdnssec = true; /* enable that too */
 				break;
diff --git a/drill/drill_util.c b/drill/drill_util.c
index 05facc2c..7407f0e4 100644
--- a/drill/drill_util.c
+++ b/drill/drill_util.c
@@ -61,7 +61,8 @@ read_key_file(const char *filename, ldns_rr_list *key_list)
 						"Error parsing DNSKEY RR in line %d: %s\n",
 						line_nr,
 						ldns_get_errorstr_by_id(status));
-			} else if (ldns_rr_get_type(rr) == LDNS_RR_TYPE_DNSKEY) {
+			} else if (ldns_rr_get_type(rr) == LDNS_RR_TYPE_DNSKEY || 
+					   ldns_rr_get_type(rr) == LDNS_RR_TYPE_DS) {
 				ldns_rr_list_push_rr(key_list, rr);
 				key_count++;
 			} else {