lint fixes

and another definition for LDNS_ROOT_LABEL. It is now gone
and called LDNS_ROOT_LABEL_STR.

We didn't even use it ourselves...

diff --git a/drill/securetrace.c b/drill/securetrace.c
index 380b8f48189290ff76cee0f4ae248b805a5aeb9d..97a67701835da5d4fa8eb94af74f94b794082f8a 100644 (file)
--- a/drill/securetrace.c
+++ b/drill/securetrace.c
@@ -104,8 +104,6 @@ get_dnssec_rr(ldns_pkt *p, ldns_rdf *name, ldns_rr_type t,
                sigs = ldns_pkt_rr_list_by_type(p, LDNS_RR_TYPE_RRSIG,
                                LDNS_SECTION_AUTHORITY);
        }
-
-
        if (sig) {
                ldns_rr_list_cat(*sig, sigs);
        }
@@ -194,17 +192,12 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
        ldns_resolver_set_dnssec_cd(res, true);
        ldns_resolver_set_recursive(local_res, false);
 
-       /* setup the root nameserver in the new resolver */
-       if (ldns_resolver_push_nameserver_rr_list(res, global_dns_root) != LDNS_STATUS_OK) {
-               return NULL;
-       }
-
        labels_count = ldns_dname_label_count(name);
        labels = LDNS_XMALLOC(ldns_rdf*, labels_count + 2);
        if (!labels) {
                return NULL;
        }
-       labels[0] = LDNS_ROOT_LABEL;
+       labels[0] = ldns_dname_new_frm_str(LDNS_ROOT_LABEL_STR);
        labels[1] = name;
        for(i = 2 ; i < (ssize_t)labels_count + 2; i++) {
                labels[i] = ldns_dname_left_chop(labels[i - 1]);
@@ -230,12 +223,11 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                                        LDNS_RR_TYPE_NS, LDNS_SECTION_ANSWER);
                }
 
-               while((pop = ldns_resolver_pop_nameserver(res))) { /* do it */ }
 
                if (!new_nss_aaaa && !new_nss_a) {
                         /* no nameserver found!!! */
-                       for(j = 0; j < (ssize_t)ldns_rr_list_rr_count(new_nss); j++) {
-                               pop = ldns_rr_rdf(ldns_rr_list_rr(new_nss, (size_t)j), 0);
+                       for(j = 0; j < ldns_rr_list_rr_count(new_nss); j++) {
+                               pop = ldns_rr_rdf(ldns_rr_list_rr(new_nss, j), 0);
                                if (!pop) {
                                        break;
                                }
@@ -310,6 +302,7 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                new_nss = NULL;
                ns_addr = NULL;
                key_list = NULL;
+               while((pop = ldns_resolver_pop_nameserver(res))) { /* do it */ }
                
                puts("");
        }

diff --git a/ldns/dns.h b/ldns/dns.h
index 87fd12766cf4aad062e0dd9a32ab4a3d5412e29e..f22ab5026acdff8ca107a009bc3358d039848b6a 100644 (file)
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -83,7 +83,7 @@ Or you can just use the menu above to browse through the API docs.
 #define LDNS_IP4ADDRLEN      (32/8)
 #define LDNS_IP6ADDRLEN      (128/8)
 #define LDNS_PORT      53
-#define LDNS_ROOT_LABEL        '\0'
+#define LDNS_ROOT_LABEL_STR     "."
 #define LDNS_DEFAULT_TTL       3600
 
 /* lookup tables for standard DNS stuff  */