removed unnecesary printfs

only sign in-zone data, and skip RRSIGS

diff --git a/dnssec.c b/dnssec.c
index cab4c8ac3603b597185b19982ace6dc93e021952..cb21837420228fb81ffc3ec931d7ac5648aa8249 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -1398,6 +1398,7 @@ ldns_zone_sign(ldns_zone *zone, ldns_key_list *key_list)
        ldns_rdf *next_dname = NULL;
        ldns_rr *nsec;
        uint16_t i;
+       ldns_rr_type cur_rrset_type;
        
        ldns_rr_list *next_rrset;
 
@@ -1445,11 +1446,22 @@ ldns_zone_sign(ldns_zone *zone, ldns_key_list *key_list)
        }
        ldns_rr_list_free(orig_zone_rrs);
 
+       /* Sign all rrsets in the zone */
        cur_rrset = ldns_rr_list_pop_rrset(signed_zone_rrs);
        while (cur_rrset) {
-               cur_rrsigs = ldns_sign_public(cur_rrset, key_list);
-               ldns_zone_push_rr_list(signed_zone, cur_rrset);
-               ldns_zone_push_rr_list(signed_zone, cur_rrsigs);
+               /* don't sign certain types */
+               cur_rrset_type = ldns_rr_get_type(ldns_rr_list_rr(cur_rrset, 0));
+               cur_dname = ldns_rr_owner(ldns_rr_list_rr(cur_rrset, 0));
+
+               if (cur_rrset_type != LDNS_RR_TYPE_RRSIG &&
+                   (ldns_dname_is_subdomain(cur_dname, ldns_rr_owner(ldns_zone_soa(zone))) ||
+                    ldns_rdf_compare(cur_dname, ldns_rr_owner(ldns_zone_soa(zone))) == 0
+                   )
+                  ) {
+                       cur_rrsigs = ldns_sign_public(cur_rrset, key_list);
+                       ldns_zone_push_rr_list(signed_zone, cur_rrset);
+                       ldns_zone_push_rr_list(signed_zone, cur_rrsigs);
+               }
                cur_rrset = ldns_rr_list_pop_rrset(signed_zone_rrs);
        }
        

diff --git a/signzone.c b/signzone.c
index b51027c44a8b094178b4369a7e6f085ffe7f814e..fdce1d688f3c9d215ebd69733b7d48514708dc1f 100644 (file)
--- a/signzone.c
+++ b/signzone.c
@@ -99,8 +99,10 @@ main(int argc, char *argv[])
                return 1;
        }
 
+       /*
        printf("Reading zonefile: %s\n", zonefile_name);
-
+       */
+       
        zonefile = fopen(zonefile_name, "r");
        
        if (!zonefile) {
@@ -111,19 +113,16 @@ main(int argc, char *argv[])
                if (!orig_zone) {
                        fprintf(stderr, "Zone not read\n");
                } else {
-                       printf("Zone read.\nSOA:\n");
                        orig_soa = ldns_zone_soa(orig_zone);
                        orig_rrs = ldns_zone_rrs(orig_zone);
 
-                       ldns_rr_print(stdout, orig_soa);
-                       printf("\n");
-
-                       printf("Signing...\n");
+                       
                        signed_zone = ldns_zone_sign(orig_zone, keys);
-                       printf("done!\n\n");
                        
                        if (signed_zone) {
+                               /*
                                printf("SIGNED ZONE:\n");
+                               */
                                ldns_zone_print(stdout, signed_zone);
                                ldns_zone_deep_free(signed_zone);
                        } else {