removed prints, fixed time problem

diff --git a/dnssec.c b/dnssec.c
index ed362efc5f4d9796d9e03cb86b6daa434414a0e8..6fd3848ae86809ecb2956d88b7a206c63d96890e 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -1085,9 +1085,9 @@ ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys)
                                                ldns_rr_list_rr(rrset_clone, 0))));
                /* inception, expiration */
                (void)ldns_rr_rrsig_set_inception(current_sig,
-                               ldns_native2rdf_int32(LDNS_RDF_TYPE_INT32, ldns_key_inception(current_key)));
+                               ldns_native2rdf_int32(LDNS_RDF_TYPE_TIME, ldns_key_inception(current_key)));
                (void)ldns_rr_rrsig_set_expiration(current_sig,
-                               ldns_native2rdf_int32(LDNS_RDF_TYPE_INT32, ldns_key_expiration(current_key)));
+                               ldns_native2rdf_int32(LDNS_RDF_TYPE_TIME, ldns_key_expiration(current_key)));
                /* key-tag */
                (void)ldns_rr_rrsig_set_keytag(current_sig,
                                ldns_native2rdf_int16(LDNS_RDF_TYPE_INT16, ldns_key_keytag(current_key)));

diff --git a/host2str.c b/host2str.c
index 8f6d307bdc43a25afca6000f6f93db9c363dec14..0658e86c22245ea26571f5ebc48899a8f1f06672 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -686,6 +686,7 @@ ldns_rdf2buffer_str(ldns_buffer *buffer, ldns_rdf *rdf)
 {
        ldns_status res;
 
+       /*ldns_buffer_printf(buffer, "%u:", ldns_rdf_get_type(rdf));*/
        if (rdf) {
                switch(ldns_rdf_get_type(rdf)) {
                case LDNS_RDF_TYPE_NONE:

diff --git a/rr.c b/rr.c
index b47745ea8045eba136dff97bdcc9d9b542fe0eba..61df35382ee80fc72b5ad942041da48943433abb 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -406,15 +406,7 @@ ldns_rr_new_frm_fp_l(FILE *fp, uint16_t ttl, ldns_rdf *origin, int *line_nr)
         }
 
        rr = ldns_rr_new_frm_str((const char*) line, ttl, origin);
-/*
-printf("line %d: %s\n", *line_nr, line);
-*/
-if (rr && ldns_rr_get_type(rr) == LDNS_RR_TYPE_CERT) {
-       printf("got CERT RR:\n");
-       ldns_rr_print(stdout, rr);
-       printf("from:\n%s\n", line);
-exit(1);
-}
+
        LDNS_FREE(line);
        return rr;
 }

diff --git a/signzone.c b/signzone.c
index 93a422cdf1a2f973d99f3d2f1169cd3c6c87c384..f60fdd7100b1f3cb594aac76568bf157861b43ab 100644 (file)
--- a/signzone.c
+++ b/signzone.c
@@ -102,11 +102,7 @@ struct tm tm;
                                */
                                /* default to inception time now,
                                   exporation now + 2 weeks */
-                               time(&now);
-/*printf("NOW IS: %u\n", now);*/
-gmtime_r(&now, &tm);
-strftime(date_buf, 15, "%Y%m%d%H%M%S", &tm);
-/*printf("date: %s\n", date_buf);*/
+                               now = time(NULL);
 
                                ldns_key_set_inception(key, now);
                                ldns_key_set_expiration(key, now + 1209600);

diff --git a/str2host.c b/str2host.c
index 421cb725d147062a0a063f6d0b74d0480bf39e76..d5fa1e1f28133213ca3fc30737120b356edaea27 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -472,9 +472,7 @@ ldns_str2rdf_cert_alg(ldns_rdf **rd, const char *str)
        lt = ldns_lookup_by_name(ldns_cert_algorithms, str);
        st = LDNS_STATUS_OK;
 
-printf("YOYOYO\n");
        if (lt) {
-printf("LT: %s\n", str);
                /* it was given as a integer */
                *rd = ldns_rdf_new_frm_data(
                        LDNS_RDF_TYPE_INT8, sizeof(uint8_t), &lt->id);
@@ -482,7 +480,6 @@ printf("LT: %s\n", str);
                        st = LDNS_STATUS_ERR;
                }
        } else {
-printf("NO LT: %s\n", str);
                /* try as-is (a number) */
                st = ldns_str2rdf_int8(rd, str);
        }