- Put back CFLAGS with linkers

- Fix potential uninitialized variable usage in ldns-update
- Fix issues with verbose_hex in ldns-testpkts.c

diff --git a/Makefile.in b/Makefile.in
index d4f1262e7fbb984ead77a590700c84da9979a3a3..66a5dde3fb73e0d1b946866e5450895a18dbbd65 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,9 +91,9 @@ EX_SSL_LOBJS  = examples/ldns-nsec3-hash.lo examples/ldns-revoke.lo examples/ldns
 
 COMPILE                = $(CC) $(CPPFLAGS) $(CFLAGS)
 COMP_LIB       = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
-LINK           = $(CC) $(LDFLAGS) $(LIBS)
-LINK_LIB       = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LIBS) -version-number $(version_info) -no-undefined
-LINK_EXE       = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LIBSSL_LDFLAGS)
+LINK           = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
+LINK_LIB       = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -version-number $(version_info) -no-undefined
+LINK_EXE       = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LIBSSL_LDFLAGS)
 
 .PHONY:        clean realclean docclean manpages doc lint all lib pyldns test
 .PHONY: install uninstall install-doc uninstall-doc uninstall-pyldns

diff --git a/examples/ldns-testpkts.c b/examples/ldns-testpkts.c
index f326ed89f73a6c804593dd53dd7743ff93e881dc..06fcc20bd910690fdb44cc350b6c2c526b394025 100644 (file)
--- a/examples/ldns-testpkts.c
+++ b/examples/ldns-testpkts.c
@@ -693,16 +693,14 @@ match_all(ldns_pkt* q, ldns_pkt* p, bool mttl)
 }
 
 /** Convert to hexstring and call verbose(), prepend with header */
-void
+static void
 verbose_hex(int lvl, uint8_t *data, size_t datalen, const char *header)
 {
-       size_t i;
-       char errmsg[strlen(header) + datalen*3];
-       strcpy(errmsg, header);
-       for(i = 0; i < datalen; i++)
-               snprintf(errmsg + strlen(header) + i*3, 4, "%02x ", (unsigned int)data[i]);
-       errmsg[strlen(header) + datalen*3 - 1] = 0;
-       verbose(lvl, "%s", errmsg);
+       verbose(lvl, "%s", header);
+       while (datalen-- > 0) {
+               verbose(lvl, " %02x", (unsigned int)*data++);
+       }
+       verbose(lvl, "\n");
 }
 
 /** Match q edns data to p raw edns data */
@@ -721,8 +719,8 @@ match_ednsdata(ldns_pkt* q, struct reply_packet* p)
        pd = ldns_buffer_begin(p->raw_ednsdata);
        if( qdlen == pdlen && 0 == memcmp(qd, pd, qdlen) ) return 1;
        verbose(3, "EDNS data does not match.\n");
-       verbose_hex(3, qd, qdlen, "q: ");
-       verbose_hex(3, pd, pdlen, "p: ");
+       verbose_hex(3, qd, qdlen, "q:");
+       verbose_hex(3, pd, pdlen, "p:");
        return 0;
 }
 

diff --git a/examples/ldns-update.c b/examples/ldns-update.c
index dca4cbe7a5ca9f0ca8d06a2d45bc2fd4d3544ebd..af4dd02a5438f0e06ae3d2dfbb897ac9dd369257 100644 (file)
--- a/examples/ldns-update.c
+++ b/examples/ldns-update.c
@@ -17,7 +17,7 @@ ldns_update_resolver_new(const char *fqdn, const char *zone,
     ldns_rr_class class, uint16_t port, ldns_tsig_credentials *tsig_cred, ldns_rdf **zone_rdf)
 {
         ldns_resolver   *r1, *r2;
-        ldns_pkt        *query = NULL, *resp;
+        ldns_pkt        *query = NULL, *resp = NULL;
         ldns_rr_list    *nslist, *iplist;
         ldns_rdf        *soa_zone, *soa_mname = NULL, *ns_name;
         size_t          i;