chase now reflects encountered error codes

diff --git a/drill/chasetrace.c b/drill/chasetrace.c
index 55361795bad869cee35629903ed7c4783984e835..cc2e7acb7b6ff274012e84fe107c1ab56e47dc84 100644 (file)
--- a/drill/chasetrace.c
+++ b/drill/chasetrace.c
@@ -355,9 +355,9 @@ do_chase(ldns_resolver *res, ldns_rdf *name, ldns_rr_type type, ldns_rr_class c,
                                );
                
                if (qdebug != -1) {
-                       mesg(";; Signed by: ");
+                       printf(";; Signed by: ");
                        ldns_rdf_print(stdout, ldns_rr_rdf(cur_sig, 7));
-                       mesg("\n");
+                       printf("\n");
                }
 
                if (!keys) {
@@ -387,7 +387,8 @@ do_chase(ldns_resolver *res, ldns_rdf *name, ldns_rr_type type, ldns_rr_class c,
                        return LDNS_STATUS_CRYPTO_NO_DNSKEY;
                } else {
                        for (key_i = 0; key_i < ldns_rr_list_rr_count(keys); key_i++) {
-                               if (ldns_verify_rrsig(rrset, cur_sig, ldns_rr_list_rr(keys, key_i))) {
+                               result = ldns_verify_rrsig(rrset, cur_sig, ldns_rr_list_rr(keys, key_i));
+                               if (result == LDNS_STATUS_OK) {
                                        for (tkey_i = 0; tkey_i < ldns_rr_list_rr_count(trusted_keys); tkey_i++) {
                                                if (ldns_rr_compare_ds(ldns_rr_list_rr(keys, key_i),
                                                                   ldns_rr_list_rr(trusted_keys, tkey_i)
@@ -409,7 +410,7 @@ do_chase(ldns_resolver *res, ldns_rdf *name, ldns_rr_type type, ldns_rr_class c,
                                        ldns_rr_free(cur_sig);
                                        return result;
                                } else {
-                                       mesg("Bad signature of wrong key\n");
+                                       return result;
                                }
                        }
                        ldns_rr_list_deep_free(keys);

diff --git a/drill/drill.c b/drill/drill.c
index e4fae2ca5de89ce118ca319b81741a2dc54e310a..ce5cf9f8fc1149f6b716f9846e552f35f9774294 100644 (file)
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -603,9 +603,9 @@ main(int argc, char *argv[])
                                        }
 
                                        /* verify */
-                                       key_verified = ldns_pkt_verify(pkt, type, qname, key_list, NULL);
+                                       result = ldns_pkt_verify(pkt, type, qname, key_list, NULL, NULL);
 
-                                       if (key_verified) {
+                                       if (result == LDNS_STATUS_OK) {
                                                for(key_count = 0; key_count < ldns_rr_list_rr_count(key_verified);
                                                                key_count++) {
                                                        if (qdebug != -1) {