- fix configure ECDSA support in ldns detection for windows compile.

- fix possible uninitialised variable in windows pipe implementation.

git-svn-id: file:///svn/unbound/trunk@2667 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index bdfb8e698073de3f957ae3d2276dbb6a26f294f3..14bd38173d6e904409cfdf502fe6e8d3b5ef6bef 100755 (executable)
--- a/configure
+++ b/configure
@@ -17892,6 +17892,12 @@ fi
 if test x$use_ecdsa = xyes; then
     ac_fn_c_check_decl "$LINENO" "LDNS_ECDSAP384SHA384" "ac_cv_have_decl_LDNS_ECDSAP384SHA384" "
 $ac_includes_default
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#  include <ws2tcpip.h>
+#endif
 #include <ldns/ldns.h>
 
 "

diff --git a/configure.ac b/configure.ac
index b87feefd967be2f30854e5b51d39c9f932cae729..92877285d478c7c0a7fcae0e0fb82fbecb02dd54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1002,6 +1002,12 @@ fi
 if test x$use_ecdsa = xyes; then
     AC_CHECK_DECL([LDNS_ECDSAP384SHA384], [], [], [
 AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#  include <ws2tcpip.h>
+#endif
 #include <ldns/ldns.h>
     ])
 else

diff --git a/doc/Changelog b/doc/Changelog
index ea2d0eb45c910155b3472bf6ca5c2a3f98d31b16..3941383a73f8e512a9d1de60614e749cc95045d6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 May 2012: Wouter
+       - fix configure ECDSA support in ldns detection for windows compile.
+       - fix possible uninitialised variable in windows pipe implementation.
+
 9 May 2012: Wouter
        - Fix alignment problem in util/random on sparc64/freebsd.
 

diff --git a/makedist.sh b/makedist.sh
index c2e2f82cae4a4b12f5bbcb1d60f1642147ec11b3..45addb33d606f12d358f76d38e9c98f463ded98c 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -93,7 +93,7 @@ cleanup () {
 
 error_cleanup () {
     echo "$0: error: $1" >&2
-    cleanup
+    ##cleanup
     exit 1
 }
 

diff --git a/util/tube.c b/util/tube.c
index 2fad1cafcce8bbd461d3109b3b462fce8098dcac..67294e056c4b5c2fab364645b930e5f43cb65367 100644 (file)
--- a/util/tube.c
+++ b/util/tube.c
@@ -712,7 +712,7 @@ void tube_handle_signal(int ATTR_UNUSED(fd), short ATTR_UNUSED(events),
 {
        struct tube* tube = (struct tube*)arg;
        uint8_t* buf;
-       uint32_t len;
+       uint32_t len = 0;
        verbose(VERB_ALGO, "tube handle_signal");
        while(tube_poll(tube)) {
                if(tube_read_msg(tube, &buf, &len, 1)) {