Assume non-broken recvmsg

diff --git a/config.h.in b/config.h.in
index ae9a89cc7b572e336e39c8fc50599a33d4a12bdb..06188f2240a16545fb6be4cee86065ae0f45b8b6 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -92,10 +92,6 @@
 /* define if ATF unit tests are to be built. */
 #undef ATF_TEST
 
-/* Define if recvmsg() does not meet all of the BSD socket API specifications.
-   */
-#undef BROKEN_RECVMSG
-
 /* Define if you cannot bind() before connect() for TCP sockets. */
 #undef BROKEN_TCP_BIND_BEFORE_CONNECT
 

diff --git a/configure b/configure
index dff9c52199aaad242bc3276082cdf2209984f81f..9c500585cc5cfe5ce3b6e693e6dfb25b08509a8f 100755 (executable)
--- a/configure
+++ b/configure
@@ -729,12 +729,8 @@ DST_EXTRA_SRCS
 DST_EXTRA_OBJS
 USE_ISC_SPNEGO
 READLINE_LIB
-ISC_PLATFORM_NEEDSTRCASESTR
 ISC_PLATFORM_NEEDSTRLCAT
 ISC_PLATFORM_NEEDSTRLCPY
-GENRANDOMLIB
-ISC_PLATFORM_NEEDSTRTOUL
-ISC_PLATFORM_NEEDMEMMOVE
 ISC_PLATFORM_HAVETFO
 ISC_PLATFORM_HAVEIF_LADDRCONF
 ISC_PLATFORM_HAVEIF_LADDRREQ
@@ -17963,28 +17959,6 @@ esac
 #
 # Check for some other useful functions that are not ever-present.
 #
-
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
-  ISC_PLATFORM_NEEDMEMMOVE="#undef ISC_PLATFORM_NEEDMEMMOVE"
-else
-  ISC_PLATFORM_NEEDMEMMOVE="#define ISC_PLATFORM_NEEDMEMMOVE 1"
-fi
-
-
-
-ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
-if test "x$ac_cv_func_strtoul" = xyes; then :
-  ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
-        GENRANDOMLIB=""
-else
-  ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-        GENRANDOMLIB='${ISCLIBS}'
-fi
-
-
-
-
 ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
 if test "x$ac_cv_func_strlcpy" = xyes; then :
   ISC_PLATFORM_NEEDSTRLCPY="#undef ISC_PLATFORM_NEEDSTRLCPY"
@@ -18003,15 +17977,6 @@ fi
 
 
 
-ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
-if test "x$ac_cv_func_strcasestr" = xyes; then :
-  ISC_PLATFORM_NEEDSTRCASESTR="#undef ISC_PLATFORM_NEEDSTRCASESTR"
-else
-  ISC_PLATFORM_NEEDSTRCASESTR="#define ISC_PLATFORM_NEEDSTRCASESTR 1"
-fi
-
-
-
 
 
 # Check whether --with-readline was given.
@@ -18154,13 +18119,6 @@ done
 
 fi
 
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
-  $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
-
-fi
-
 #
 # Use our own SPNEGO implementation?
 #
@@ -18424,18 +18382,6 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-#
-# Some hosts need msg_namelen to match the size of the socket structure.
-# Some hosts don't set msg_namelen appropriately on return from recvmsg().
-#
-case $host in
-*os2*|*hp-mpeix*)
-
-$as_echo "#define BROKEN_RECVMSG 1" >>confdefs.h
-
-       ;;
-esac
-
 #
 # Microsoft has their own way of handling shared libraries that requires
 # additional qualifiers on extern variables.  Unix systems don't need it.

diff --git a/configure.in b/configure.in
index 072661392e08933d4af5bec3515ac7ebc5feb31a..7b58c42558d6020d4b5635e29b52bd86814240fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2193,17 +2193,6 @@ AC_TRY_COMPILE([#include <sys/fcntl.h>],[struct stat s; return(s.st_mtim.tv_nsec
        ISC_PLATFORM_HAVESTATNSEC="#undef ISC_PLATFORM_HAVESTATNSEC"])
 AC_SUBST(ISC_PLATFORM_HAVESTATNSEC)
 
-#
-# Some hosts need msg_namelen to match the size of the socket structure.
-# Some hosts don't set msg_namelen appropriately on return from recvmsg().
-#
-case $host in
-*os2*|*hp-mpeix*)
-       AC_DEFINE(BROKEN_RECVMSG, 1,
-                 [Define if recvmsg() does not meet all of the BSD socket API specifications.])
-       ;;
-esac
-
 #
 # Microsoft has their own way of handling shared libraries that requires
 # additional qualifiers on extern variables.  Unix systems don't need it.

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 1f3deaeda63d266929da95a604fccddc4c9cf213..2b5645a1ba8b30395ffb9a4089c87653761cba59 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1591,26 +1591,8 @@ build_msghdr_recv(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev,
 
        if (sock->type == isc_sockettype_udp) {
                memset(&dev->address, 0, sizeof(dev->address));
-#ifdef BROKEN_RECVMSG
-               if (sock->pf == AF_INET) {
-                       msg->msg_name = (void *)&dev->address.type.sin;
-                       msg->msg_namelen = sizeof(dev->address.type.sin6);
-               } else if (sock->pf == AF_INET6) {
-                       msg->msg_name = (void *)&dev->address.type.sin6;
-                       msg->msg_namelen = sizeof(dev->address.type.sin6);
-#ifdef ISC_PLATFORM_HAVESYSUNH
-               } else if (sock->pf == AF_UNIX) {
-                       msg->msg_name = (void *)&dev->address.type.sunix;
-                       msg->msg_namelen = sizeof(dev->address.type.sunix);
-#endif
-               } else {
-                       msg->msg_name = (void *)&dev->address.type.sa;
-                       msg->msg_namelen = sizeof(dev->address.type);
-               }
-#else
                msg->msg_name = (void *)&dev->address.type.sa;
                msg->msg_namelen = sizeof(dev->address.type);
-#endif
        } else { /* TCP */
                msg->msg_name = NULL;
                msg->msg_namelen = 0;