Disable printing to stderr with configure option

diff --git a/Changelog b/Changelog
index b201c9e2bbdd6092db55bf278ef62704fc063081..6b89ababe82f17067132ef7ad8cf6a82dc249f4f 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,7 @@
          --enable-rrtype-ta
        * bugfix #530: Don't sign and verify duplicate RRs (Thanks Jelte Jansen)
        * bugfix #505: Manpage and usage output fixes (Thanks Tomas Hozza)
+       * Disable printing to stderr with --disable-stderr-msgs configure option
 
 1.6.16 2012-11-13
        * Fix Makefile to build pyldns with BSD make

diff --git a/configure.ac b/configure.ac
index 74d12c953c37d7e777b2322d479c1266742d42d7..28b01118c37f323b20778b18110bc57a74fd4993 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -183,7 +183,7 @@ else
 fi
 
 # add option to disable installation of ldns-config script
-AC_ARG_ENABLE(ldns-config, [ --disable-ldns-config     disable installation of ldns-config (default=enabled)],
+AC_ARG_ENABLE(ldns-config, AC_HELP_STRING([--disable-ldns-config], [disable installation of ldns-config (default=enabled)]),
        enable_ldns_config=$enableval, enable_ldns_config=yes)
 if test "x$enable_ldns_config" = xyes; then
        AC_SUBST(INSTALL_CONFIG, [install-config])
@@ -197,6 +197,16 @@ else
        AC_SUBST(UNINSTALL_CONFIG_MANPAGE, [""])
 fi
 
+# add option to disable library printing to stderr
+AC_ARG_ENABLE(stderr-msgs, AC_HELP_STRING([--disable-stderr-msgs], [Disable printing to stderr]), enable_stderr_msgs=$enableval, enable_stderr_msgs=yes)
+case "$enable_stderr_msgs" in
+    no)
+        ;;
+    *)  dnl default
+        AC_DEFINE_UNQUOTED([STDERR_MSGS], [1], [Define this to enable messages to stderr.])
+        ;;
+esac
+
 # check for python
 PYTHON_X_CFLAGS=""
 ldns_with_pyldns=no

diff --git a/dnssec.c b/dnssec.c
index f21429873199a1a3c6697342a15cfbf1695cba1b..a41a9f633c4e437eddbd86291631d620200c8893 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -997,7 +997,9 @@ ldns_nsec3_hash_name(ldns_rdf *name,
        /* prepare the owner name according to the draft section bla */
        cann = ldns_rdf_clone(name);
        if(!cann) {
+#ifdef STDERR_MSGS
                fprintf(stderr, "Memory error\n");
+#endif
                return NULL;
        }
        ldns_dname2canonical(cann);
@@ -1042,11 +1044,13 @@ ldns_nsec3_hash_name(ldns_rdf *name,
                 hashed_owner_b32,
                 ldns_b32_ntop_calculate_size(hashed_owner_str_len)+1);
        if (hashed_owner_b32_len < 1) {
+#ifdef STDERR_MSGS
                fprintf(stderr, "Error in base32 extended hex encoding ");
                fprintf(stderr, "of hashed owner name (name: ");
                ldns_rdf_print(stderr, name);
                fprintf(stderr, ", return code: %u)\n",
                        (unsigned int) hashed_owner_b32_len);
+#endif
                LDNS_FREE(hashed_owner_b32);
                return NULL;
        }
@@ -1054,7 +1058,9 @@ ldns_nsec3_hash_name(ldns_rdf *name,
 
        status = ldns_str2rdf_dname(&hashed_owner, hashed_owner_b32);
        if (status != LDNS_STATUS_OK) {
+#ifdef STDERR_MSGS
                fprintf(stderr, "Error creating rdf from %s\n", hashed_owner_b32);
+#endif
                LDNS_FREE(hashed_owner_b32);
                return NULL;
        }

diff --git a/dnssec_sign.c b/dnssec_sign.c
index d61354a3d0d7fe7ed9e0113ad179a90d15eddb5f..4af882a2845f9e383d5823471568a7cfb6579b4c 100644 (file)
--- a/dnssec_sign.c
+++ b/dnssec_sign.c
@@ -940,7 +940,9 @@ ldns_dnssec_remove_signatures( ldns_dnssec_rrs *signatures
                ldns_key_list_set_use(key_list, false);
                break;
                default:
+#ifdef STDERR_MSGS
                        fprintf(stderr, "[XX] unknown return value from callback\n");
+#endif
                        break;
                }
                return NULL;
@@ -992,7 +994,9 @@ ldns_dnssec_remove_signatures( ldns_dnssec_rrs *signatures
                        LDNS_FREE(cur_rr);
                        break;
                default:
+#ifdef STDERR_MSGS
                        fprintf(stderr, "[XX] unknown return value from callback\n");
+#endif
                        break;
                }
                cur_rr = next_rr;

diff --git a/host2str.c b/host2str.c
index 28b257e6f4c33b255d1b0105b851557c7dcac0c2..e2c936baf1ab34d008189ba3cea188f6d473546c 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -1995,10 +1995,12 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
                                        break;
 #endif
                                default:
+#ifdef STDERR_MSGS
                                        fprintf(stderr, "Warning: unknown signature ");
                                        fprintf(stderr,
                                                   "algorithm type %u\n",
                                                   ldns_key_algorithm(k));
+#endif
                                        ldns_buffer_printf(output,
                                                                    "Algorithm: %u (Unknown)\n",
                                                                    ldns_key_algorithm(k));

diff --git a/keys.c b/keys.c
index e16ac9153192335c0f955026dc623352cee9c3c3..46f6a3d0cb68955514bf974f69914ebf97a9b8ad 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -368,40 +368,50 @@ ldns_key_new_frm_fp_l(ldns_key **key, FILE *fp, int *line_nr)
 #ifdef USE_SHA2
                alg = LDNS_SIGN_RSASHA256;
 #else
+# ifdef STDERR_MSGS
                fprintf(stderr, "Warning: SHA256 not compiled into this ");
                fprintf(stderr, "version of ldns\n");
+# endif
 #endif
        }
        if (strncmp(d, "10 RSASHA512", 3) == 0) {
 #ifdef USE_SHA2
                alg = LDNS_SIGN_RSASHA512;
 #else
+# ifdef STDERR_MSGS
                fprintf(stderr, "Warning: SHA512 not compiled into this ");
                fprintf(stderr, "version of ldns\n");
+# endif
 #endif
        }
        if (strncmp(d, "12 ECC-GOST", 3) == 0) {
 #ifdef USE_GOST
                alg = LDNS_SIGN_ECC_GOST;
 #else
+# ifdef STDERR_MSGS
                fprintf(stderr, "Warning: ECC-GOST not compiled into this ");
                fprintf(stderr, "version of ldns, use --enable-gost\n");
+# endif
 #endif
        }
        if (strncmp(d, "13 ECDSAP256SHA256", 3) == 0) {
 #ifdef USE_ECDSA
                 alg = LDNS_SIGN_ECDSAP256SHA256;
 #else
+# ifdef STDERR_MSGS
                fprintf(stderr, "Warning: ECDSA not compiled into this ");
                fprintf(stderr, "version of ldns, use --enable-ecdsa\n");
+# endif
 #endif
         }
        if (strncmp(d, "14 ECDSAP384SHA384", 3) == 0) {
 #ifdef USE_ECDSA
                 alg = LDNS_SIGN_ECDSAP384SHA384;
 #else
+# ifdef STDERR_MSGS
                fprintf(stderr, "Warning: ECDSA not compiled into this ");
                fprintf(stderr, "version of ldns, use --enable-ecdsa\n");
+# endif
 #endif
         }
        if (strncmp(d, "157 HMAC-MD5", 4) == 0) {
@@ -1317,8 +1327,10 @@ ldns_key_dsa2bin(unsigned char *data, DSA *k, uint16_t *size)
        memcpy(data, &T, 1);
 
        if (T > 8) {
+#ifdef STDERR_MSGS
                fprintf(stderr, "DSA key with T > 8 (ie. > 1024 bits)");
                fprintf(stderr, " not implemented\n");
+#endif
                return false;
        }
 
@@ -1605,7 +1617,9 @@ ldns_read_anchor_file(const char *filename)
 
        fp = fopen(filename, "r");
        if (!fp) {
+#ifdef STDERR_MSGS
                fprintf(stderr, "Unable to open %s: %s\n", filename, strerror(errno));
+#endif
                LDNS_FREE(line);
                return NULL;
        }
@@ -1619,7 +1633,9 @@ ldns_read_anchor_file(const char *filename)
        fclose(fp);
        
        if (i <= 0) {
+#ifdef STDERR_MSGS
                fprintf(stderr, "nothing read from %s", filename);
+#endif
                LDNS_FREE(line);
                return NULL;
        } else {
@@ -1628,7 +1644,9 @@ ldns_read_anchor_file(const char *filename)
                        LDNS_FREE(line);
                        return r;
                } else {
+#ifdef STDERR_MSGS
                        fprintf(stderr, "Error creating DNSKEY or DS rr from %s: %s\n", filename, ldns_get_errorstr_by_id(status));
+#endif
                        LDNS_FREE(line);
                        return NULL;
                }

diff --git a/resolver.c b/resolver.c
index f5d760e78faf07e0545f7109df631f0a99afb6d2..16efc90f1a34638431e76b48e8f42d5826dc5bcd 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -1320,7 +1320,9 @@ ldns_axfr_next(ldns_resolver *resolver)
                resolver->_axfr_i = 0;
                if (status != LDNS_STATUS_OK) {
                        /* TODO: make status return type of this function (...api change) */
+#ifdef STDERR_MSGS
                        fprintf(stderr, "Error parsing rr during AXFR: %s\n", ldns_get_errorstr_by_id(status));
+#endif
 
                        /* we must now also close the socket, otherwise subsequent uses of the
                           same resolver structure will fail because the link is still open or
@@ -1335,6 +1337,7 @@ ldns_axfr_next(ldns_resolver *resolver)
                        return NULL;
                } else if (ldns_pkt_get_rcode(resolver->_cur_axfr_pkt) != 0) {
                        rcode = ldns_lookup_by_id(ldns_rcodes, (int) ldns_pkt_get_rcode(resolver->_cur_axfr_pkt));
+#ifdef STDERR_MSGS
                        if (rcode) {
                                fprintf(stderr, "Error in AXFR: %s\n", 
                                                rcode->name);
@@ -1343,6 +1346,7 @@ ldns_axfr_next(ldns_resolver *resolver)
                                                (int) ldns_pkt_get_rcode(
                                                resolver->_cur_axfr_pkt));
                        }
+#endif
 
                        /* we must now also close the socket, otherwise subsequent uses of the
                           same resolver structure will fail because the link is still open or