make compile depend on header files too

print ds for debugging (will be removed)
added correct prototype for new print function

diff --git a/drill/Makefile.in b/drill/Makefile.in
index f77147063a659c0bd2e2d9236d2a2a29702a7b29..fc710f74fd706f3e5584f7070d881ef05dd898e8 100644 (file)
--- a/drill/Makefile.in
+++ b/drill/Makefile.in
@@ -40,7 +40,7 @@ drill:        $(OBJ)
        $(LINK) -o drill $(OBJ) $(LIBS)
 
 ## implicit rule
-%.o:   $(srcdir)/%.c
+%.o:   $(srcdir)/%.c $(HEADER)
        $(COMPILE) -c $<
 
 clean:

diff --git a/drill/drill_util.h b/drill/drill_util.h
index c4c8f4f41a53306acb543a28ef1891c7355cab3d..bb5b75c1cc90a928886cc937ed5c5a59d4eb1216 100644 (file)
--- a/drill/drill_util.h
+++ b/drill/drill_util.h
@@ -37,17 +37,9 @@ void print_dnskey_abbr(FILE *fp, ldns_rr *key);
 void print_ds_abbr(FILE *fp, ldns_rr *ds);
 
 /**
- * print some rdfs of a dnskey list
+ * print some rdfs of a rr in a rr_list
  */
-void print_dnskey_list_abbr(FILE *fp, ldns_rr_list *sig, char *usr);
-/**
- * print some rdfs of a signature list
- */
-void print_rrsig_list_abbr(FILE *fp, ldns_rr_list *sig, char *usr);
-/**
- * print some rdfs of a ds list
- */
-void print_ds_list_abbr(FILE *fp, ldns_rr_list *sig, char *usr);
+void print_rr_lst_abbr(FILE *fp, ldns_rr_list *sig, char *usr);
 
 /**
  * Alloc some memory, with error checking

diff --git a/drill/securetrace.c b/drill/securetrace.c
index 2e45935b7844045005ce6ba433d8c1e4f828312a..b510b7ca134356e8f4f312d35ab8d70470996bdb 100644 (file)
--- a/drill/securetrace.c
+++ b/drill/securetrace.c
@@ -141,6 +141,8 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
        ldns_rr_list *ds_sig_list;
        ldns_rr_list *ds_list;
 
+       ldns_rr_list *TMP_ds_list;
+
        secure = true;
        authname = NULL;
        loop_count = 0;
@@ -299,7 +301,8 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                        print_rr_list_abbr(stdout, ds_list, NULL);
                        print_rr_list_abbr(stdout, sig_list, NULL); 
 
-                       ds_key_match(ds_list, trusted_keys);
+                       TMP_ds_list = ds_key_match(ds_list, trusted_keys);
+                       print_rr_list_abbr(stdout, TMP_ds_list, VAL);
 
                        break;
                case LDNS_PACKET_NXDOMAIN:
@@ -312,7 +315,6 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                /* /DNSSEC */
 
                if (loop_count++ > 20) {
-                       /* unlikely that we are doing something usefull */
                        error("Looks like we are looping");
                        ldns_pkt_free(p); 
                        return NULL;
@@ -412,7 +414,8 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                                        printf("not validated\n");
                                }
                        }
-                       ds_key_match(ds_list, trusted_keys);
+                       TMP_ds_list = ds_key_match(ds_list, trusted_keys);
+                       print_rr_list_abbr(stdout, TMP_ds_list, VAL);
                        break;
                case LDNS_PACKET_NXDOMAIN:
                case LDNS_PACKET_NODATA: