From: Willem Toorop <willem@NLnetLabs.nl>
Date: Tue, 9 Oct 2012 12:48:32 +0000 (+0000)
Subject: Bugfix 474: Define socklen_t when undefined.
X-Git-Tag: release-1.6.14rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd3a07dc2ecdce4bb8a3d6e55ad890631f15ae51;p=thirdparty%2Fldns.git

Bugfix 474: Define socklen_t when undefined.
Thanks Frank Denis
---

diff --git a/Changelog b/Changelog
index 4e6078a3..3e1a7c11 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 1.6.14
 	* DANE support (RFC6698), including ldns-dane example tool.
 	* A default key for drill when none is given
+	* bugfix #474: Define socklen_t when undefined (like in Win32)
 	* bugfix #473: Dead code removal and resource leak fix in drill
 	* bugfix #471: Let ldns_resolver_push_dnssec_anchor accept DS RR's too.
 	* Various bugfixes from code reviews from CZ.NIC and Paul Wouters
diff --git a/configure.ac b/configure.ac
index 32803f62..e64a819a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,6 +448,11 @@ AC_INCLUDES_DEFAULT
 fi
 
 ACX_TYPE_SOCKLEN_T
+if test "x$ac_cv_type_socklen_t" = xyes; then
+  AC_SUBST(ldns_build_config_have_socklen_t, 1)
+else
+  AC_SUBST(ldns_build_config_have_socklen_t, 0)
+fi
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_INTPTR_T
diff --git a/drill/drill_util.c b/drill/drill_util.c
index 1783e083..4d38a9c5 100644
--- a/drill/drill_util.c
+++ b/drill/drill_util.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 
 static int
-read_line(FILE *input, char *line, size_t len)
+read_line(FILE *input, char *line, int len)
 {
 	int i;
 	
diff --git a/ldns/common.h.in b/ldns/common.h.in
index 9977b6d9..beacdbeb 100644
--- a/ldns/common.h.in
+++ b/ldns/common.h.in
@@ -23,6 +23,7 @@
 #define LDNS_BUILD_CONFIG_HAVE_INTTYPES_H  @ldns_build_config_have_inttypes_h@
 #define LDNS_BUILD_CONFIG_HAVE_ATTR_FORMAT @ldns_build_config_have_attr_format@
 #define LDNS_BUILD_CONFIG_HAVE_ATTR_UNUSED @ldns_build_config_have_attr_unused@
+#define LDNS_BUILD_CONFIG_HAVE_SOCKLEN_T   @ldns_build_config_have_socklen_t@
 
 /*
  * HAVE_STDBOOL_H is not available when distributed as a library, but no build 
@@ -67,4 +68,8 @@ typedef bool _Bool;
 
 #define LDNS_TRUSTED_KEY_FILE "@LDNS_TRUSTED_KEY_FILE@"
 
+#if !LDNS_BUILD_CONFIG_HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
 #endif /* LDNS_COMMON_H */