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

diff --git a/drill/drill.c b/drill/drill.c
index 36d149faea3012f5dde88b83d97ec0eb6ea4dc04..09e31015adb96e0072d3136707da4e71311c8e56 100644 (file)
--- 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 05facc2c9be5e505be09395b9a606f082a9b2e0c..7407f0e49613b148afbbdfbfa91d97d1ef38761f 100644 (file)
--- 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 {