1731. [port] darwin: relax version test in ifconfig.sh.

                        [RT #12581]

1730.   [port]          Determine the length type used by the socket API.
                        [RT #12581]

diff --git a/CHANGES b/CHANGES
index 5f4a1d991466d4fe44fd497b938afc890c25978f..6384cbff797091b1ef3d7aa7c24a32a4acea58f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,9 +15,11 @@
 
 1732.  [placeholder]   rt12467
 
-1731.  [placeholder]   rt12581
+1731.  [port]          darwin: relax version test in ifconfig.sh.
+                       [RT #12581]
 
-1730.  [placeholder]   rt12581
+1730.  [port]          Determine the length type used by the socket API.
+                       [RT #12581]
 
 1729.  [placeholder]   rt12634
 

diff --git a/acconfig.h b/acconfig.h
index c44755fd4017a815cee732980fd6249c87ff3678..8bbbbcba4b8ec3cb90b23e6871a2263893122444 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acconfig.h,v 1.45 2004/05/21 08:09:27 marka Exp $ */
+/* $Id: acconfig.h,v 1.46 2004/10/05 03:17:16 marka Exp $ */
 
 /***
  *** This file is not to be included by any public header files, because
@@ -134,8 +134,11 @@ int sigwait(const unsigned int *set, int *sig);
 /* define if you have strerror in the C library. */
 #undef HAVE_STRERROR
 
-/* Define if you are running under Compaq TruCluster..  */
+/* Define if you are running under Compaq TruCluster. */
 #undef HAVE_TRUCLUSTER
 
 /* Define if OpenSSL includes DSA support */
 #undef HAVE_OPENSSL_DSA
+
+/* Define to the length type used by the socket API (socklen_t, size_t, int). */
+#undef ISC_SOCKADDR_LEN_T

diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 9624b55c69e93cc3ee43aeaeca5fb3f101c24537..165bda4a2b17d77b27f528a4a8442beecc4dc304 100644 (file)
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ifconfig.sh,v 1.48 2004/09/24 05:35:49 marka Exp $
+# $Id: ifconfig.sh,v 1.49 2004/10/05 03:17:17 marka Exp $
 
 #
 # Set up interface aliases for bind9 system tests.
@@ -106,7 +106,7 @@ case "$1" in
                    *-sco3.2v*)
                        ifconfig lo0 alias 10.53.0.$ns
                        ;;
-                   *-darwin5*)
+                   *-darwin*)
                        ifconfig lo0 alias 10.53.0.$ns
                        ;;
                    *)
@@ -166,7 +166,7 @@ case "$1" in
                    *-sco3.2v*)
                        ifconfig lo0 -alias 10.53.0.$ns
                        ;;
-                   *darwin5*)
+                   *darwin*)
                        ifconfig lo0 -alias 10.53.0.$ns
                        ;;
                    *)

diff --git a/config.h.in b/config.h.in
index 4bc0c9fe2ec8a11e5ca44bd5ff86d7af9c02ab49..d8963dd05c90d8f25fbc98e9e278b74942d9bec3 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.62 2004/09/01 07:25:51 marka Exp $ */
+/* $Id: config.h.in,v 1.63 2004/10/05 03:17:16 marka Exp $ */
 
 /***
  *** This file is not to be included by any public header files, because
@@ -134,12 +134,15 @@ int sigwait(const unsigned int *set, int *sig);
 /* define if you have strerror in the C library. */
 #undef HAVE_STRERROR
 
-/* Define if you are running under Compaq TruCluster..  */
+/* Define if you are running under Compaq TruCluster. */
 #undef HAVE_TRUCLUSTER
 
 /* Define if OpenSSL includes DSA support */
 #undef HAVE_OPENSSL_DSA
 
+/* Define to the length type used by the socket API (socklen_t, size_t, int). */
+#undef ISC_SOCKADDR_LEN_T
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 

diff --git a/configure.in b/configure.in
index 1dd2ed5c0e23d2c1ab4056b24f09ed2562d37def..7c059909138fa71c2296d3c630f5efd797c20336 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.362 $)
+AC_REVISION($Revision: 1.363 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -261,6 +261,23 @@ AC_TRY_COMPILE(, [
 
 AC_TYPE_SIZE_T
 AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPE(socklen_t,
+[AC_DEFINE(ISC_SOCKADDR_LEN_T, socklen_t)],
+[
+AC_TRY_COMPILE(
+[
+#include <sys/types.h>
+#include <sys/socket.h>
+int getsockname(int, struct sockaddr *, size_t *);
+],[],
+[AC_DEFINE(ISC_SOCKADDR_LEN_T, size_t)],
+[AC_DEFINE(ISC_SOCKADDR_LEN_T, int)])
+],
+[
+#include <sys/types.h>
+#include <sys/socket.h>
+])
+AC_SUBST(ISC_SOCKADDR_LEN_T)
 AC_HEADER_TIME
 AC_MSG_CHECKING(for long long)
 AC_TRY_COMPILE([],[long long i = 0; return (0);],

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 572f5856aebd620e493ba5132cfa3285ad9dd27b..e7ad2670c6b736032c324b2a59d0d617a47eabd5 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.241 2004/07/01 04:53:14 marka Exp $ */
+/* $Id: socket.c,v 1.242 2004/10/05 03:17:18 marka Exp $ */
 
 #include <config.h>
 
@@ -62,12 +62,8 @@
  * some as socklen_t.  This is here so it can be easily changed if needed.
  */
 #ifndef ISC_SOCKADDR_LEN_T
-#ifdef _BSD_SOCKLEN_T_
-#define ISC_SOCKADDR_LEN_T _BSD_SOCKLEN_T_
-#else
 #define ISC_SOCKADDR_LEN_T unsigned int
 #endif
-#endif
 
 /*
  * Define what the possible "soft" errors can be.  These are non-fatal returns