From 3d4f037f53216fdc952edca0a64f0c670615ef5c Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 15 May 2012 14:50:21 +0000 Subject: [PATCH] - 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 --- configure | 6 ++++++ configure.ac | 6 ++++++ doc/Changelog | 4 ++++ makedist.sh | 2 +- util/tube.c | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bdfb8e698..14bd38173 100755 --- 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 +#endif +#ifdef HAVE_WS2TCPIP_H +# include +#endif #include " diff --git a/configure.ac b/configure.ac index b87feefd9..92877285d 100644 --- 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 +#endif +#ifdef HAVE_WS2TCPIP_H +# include +#endif #include ]) else diff --git a/doc/Changelog b/doc/Changelog index ea2d0eb45..3941383a7 100644 --- 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 c2e2f82ca..45addb33d 100755 --- 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 2fad1cafc..67294e056 100644 --- 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)) { -- 2.47.2