prints etc

diff --git a/dnssec.c b/dnssec.c
index 7e5f75cd89d0cb7a4fbe5f19455e3a84cf2b6e17..1bfcec7df2cdfac0c10aeafee01c4574de53f791 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -82,19 +82,15 @@ ldns_verify(ldns_rr_list *rrset, ldns_rr_list *rrsig, ldns_rr_list *keys, ldns_r
        bool valid;
        ldns_status verify_result = LDNS_STATUS_ERR;
 
-printf("yo1\n");
        if (!rrset || !rrsig || !keys) {
                return LDNS_STATUS_ERR;
        }
 
        valid = false;
        
-printf("yo2\n");
        if (ldns_rr_list_rr_count(keys) < 1) {
-printf("yo3\n");
                verify_result = LDNS_STATUS_CRYPTO_NO_TRUSTED_DNSKEY;
        } else {
-printf("yo4\n");
                for (i = 0; i < ldns_rr_list_rr_count(rrsig); i++) {
 
                        verify_result = ldns_verify_rrsig_keylist(rrset,
@@ -485,7 +481,7 @@ ldns_verify_rrsig_dsa(ldns_buffer *sig, ldns_buffer *rrset, ldns_buffer *key)
        if (result == 1) {
                return LDNS_STATUS_OK;
        } else {
-               printf("error in verify: %d\n", result);
+               dprintf("error in verify: %d\n", result);
                return LDNS_STATUS_CRYPTO_BOGUS;
        }
 }
@@ -1224,8 +1220,8 @@ ldns_zone_sign(ldns_zone *zone, ldns_key_list *key_list)
                        /* TODO: make optional, replace exit call */
                        result = ldns_verify(cur_rrset, cur_rrsigs, pubkeys, NULL);
                        if (result != LDNS_STATUS_OK) {
-                               printf("Cannot verify own sig:\n");
-                               printf("%s\n", ldns_get_errorstr_by_id(result));
+                               dprintf("%s", "Cannot verify own sig:\n");
+                               dprintf("%s\n", ldns_get_errorstr_by_id(result));
                                ERR_load_crypto_strings();
                                ERR_print_errors_fp(stdout);
                                exit(result);

diff --git a/keys.c b/keys.c
index 21a9c8300fafbb20f2d0b1a345ffe9b0db6aef67..3e2ec0ca52350814018a9827090591b66b08cc87 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -96,7 +96,7 @@ ldns_key_new_frm_fp_l(FILE *fp, int *line_nr)
                return NULL;
        }
        if (strncmp(d, "v1.2", strlen(d)) != 0) {
-               printf("Wrong version. This version of ldns only supports 1.2\n");
+               dprintf("%s", "Wrong version for key file. This version of ldns only supports 1.2\n");
                return NULL;
        }
 
@@ -123,7 +123,7 @@ ldns_key_new_frm_fp_l(FILE *fp, int *line_nr)
        switch(alg) {
                case 0:
                default:
-                       printf("No or unknown algorithm seen, bailing out\n");
+                       dprintf("%s", "No or unknown algorithm seen, bailing out\n");
                        return NULL;
                case LDNS_SIGN_RSAMD5:
                case LDNS_SIGN_RSASHA1:

diff --git a/net.c b/net.c
index 60430e82774a338d47702f258c5863e838a9ea2c..7756bd988acd45898b047a6963dfea4dbf392a71 100644 (file)
--- a/net.c
+++ b/net.c
@@ -92,13 +92,13 @@ ldns_send(ldns_pkt **result, ldns_resolver *r, ldns_pkt *query_pkt)
                
                if ((ns->ss_family == AF_INET) && 
                                (ldns_resolver_ip6(r) == LDNS_RESOLV_INET6)) {
-                       printf("mismatch 4 - 6!!!\n");
+                       /*printf("mismatch 4 - 6!!!\n");*/
                        /* FREE OF NS */
                        /* continue; */
                }
                if ((ns->ss_family == AF_INET6) &&
                                 (ldns_resolver_ip6(r) == LDNS_RESOLV_INET)) {
-                       printf("mismatch!!! 6 - 4\n");
+                       /*printf("mismatch!!! 6 - 4\n");*/
                        /* continue; */
                }
 
@@ -362,7 +362,7 @@ ldns_udp_read_wire(int sockfd, size_t *size, struct sockaddr_storage *from,
 
        if (wire_size == -1) {
                if (errno == EAGAIN) {
-                       dprintf("%s", "socket timeout\n");
+                       /*dprintf("%s", "socket timeout\n");*/
                }
                *size = 0;
                perror("error receiving udp packet");
@@ -391,7 +391,7 @@ ldns_tcp_read_wire(int sockfd, size_t *size)
                bytes = recv(sockfd, wire, 2, 0);
                if (bytes == -1) {
                        if (errno == EAGAIN) {
-                               dprintf("%s", "socket timeout\n");
+                               /*dprintf("%s", "socket timeout\n");*/
                        }
                        perror("error receiving tcp packet");
                        *size = 0;
@@ -409,7 +409,7 @@ ldns_tcp_read_wire(int sockfd, size_t *size)
                bytes += recv(sockfd, wire + bytes, (size_t) (wire_size - bytes), 0);
                if (bytes == -1) {
                        if (errno == EAGAIN) {
-                               dprintf("%s", "socket timeout\n");
+                               /*dprintf("%s", "socket timeout\n");*/
                        }
                        perror("error receiving tcp packet");
                        LDNS_FREE(wire);

diff --git a/str2host.c b/str2host.c
index 8e09dbaebdf45bc09e32e442b060ca0fec1b8da6..263a2ce36ec80f0849e3651f967d522c07d7a4d7 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -776,7 +776,7 @@ east:
                }
                size_b = (uint8_t) size;
                if (size_e > 9) {
-                       printf("size too large\n");
+                       dprintf("%s", "size too large\n");
                        return LDNS_STATUS_INVALID_STR;
                }
                if (*my_str == 'm' || *my_str == 'M') {
@@ -822,7 +822,7 @@ east:
                }
                vert_pre_b = (uint8_t) vert_pre;
                if (vert_pre_e > 9) {
-                       printf("vert_pre too large\n");
+                       dprintf("%s", "vert_pre too large\n");
                        return LDNS_STATUS_INVALID_STR;
                }
                if (*my_str == 'm' || *my_str == 'M') {

diff --git a/wire2host.c b/wire2host.c
index 10e3572ac933cd658e1f8b5bfea438635f48900b..e44a84a9dd9f692297c38946ead4c6682df702d2 100644 (file)
--- a/wire2host.c
+++ b/wire2host.c
@@ -140,7 +140,7 @@ ldns_wire2dname(ldns_rdf **dname, const uint8_t *wire, size_t max, size_t *pos)
 
 /* maybe make this a goto error so data can be freed or something/ */
 #define LDNS_STATUS_CHECK_RETURN(st) {if (st != LDNS_STATUS_OK) { printf("STR %d\n", __LINE__); return st; }}
-#define LDNS_STATUS_CHECK_GOTO(st, label) {if (st != LDNS_STATUS_OK) { printf("STG %s:%d: status code %d\n", __FILE__, __LINE__, st);  goto label; }}
+#define LDNS_STATUS_CHECK_GOTO(st, label) {if (st != LDNS_STATUS_OK) { /*printf("STG %s:%d: status code %d\n", __FILE__, __LINE__, st);*/  goto label; }}
 
 ldns_status
 ldns_wire2rdf(ldns_rr *rr, const uint8_t *wire,

diff --git a/zone.c b/zone.c
index b85e087f2c07def7c389b791831c2c3e39842999..86b0b24f7957df737d42a5b9f81a7cf18581fee5 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -203,7 +203,7 @@ ldns_zone_new_frm_fp_l(FILE *fp, ldns_rdf *origin, uint16_t ttl, ldns_rr_class c
                if (rr) {
                        last_rr = rr;
                        if (!ldns_zone_push_rr(newzone, rr)) {
-                               printf("error pushing rr\n");
+                               dprintf("%s", "error pushing rr\n");
                                return NULL;
                        }
 
@@ -220,8 +220,8 @@ ldns_zone_new_frm_fp_l(FILE *fp, ldns_rdf *origin, uint16_t ttl, ldns_rr_class c
                        }
 
                        fprintf(stderr, "Last rr that was parsed:\n");
-                       ldns_rr_print(stdout, last_rr);
-                       printf("\n");
+                       ldns_rr_print(stderr, last_rr);
+                       dprintf("%s", "\n");
                }
        }
        return newzone;