4025. [port] bsdi: failed to build. [RT #38047]

(cherry picked from commit 00bb9b88cecf7e2c365c9f008c049da3802ac415)

diff --git a/CHANGES b/CHANGES
index 0a9318a961bb58467c8fc993e447d30fb81dc455..8a853ed819eae81a12e1b4c83e843201b5aae3b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4025.  [port]          bsdi: failed to build. [RT #38047]
+
 4024.  [bug]           dns_rdata_opt_first, dns_rdata_opt_next,
                        dns_rdata_opt_current, dns_rdata_txt_first,
                        dns_rdata_txt_next and dns_rdata_txt_current were

diff --git a/config.h.in b/config.h.in
index 86639be2a481c728659bbcd7d8570ba44692adc6..006af0ff1e918e732fc8a0c359cce3576bf9ef90 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -221,6 +221,12 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `fseeko' function. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `ftello' function. */
+#undef HAVE_FTELLO
+
 /* Build with GeoIP support */
 #undef HAVE_GEOIP
 
@@ -461,6 +467,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to the flags type used by getnameinfo(3). */
 #undef IRS_GETNAMEINFO_FLAGS_T
 
+/* Define to the sockaddr length type used by getnameinfo(3). */
+#undef IRS_GETNAMEINFO_SOCKLEN_T
+
 /* Define to allow building of objects for dlopen(). */
 #undef ISC_DLZ_DLOPEN
 

diff --git a/configure b/configure
index e8c8a6d7854c9813832b9264f5ed329049f75f24..4bb583c63bd99d29b79e2a353a10c318242063e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -768,6 +768,7 @@ ISC_IPV6_C
 ISC_ISCIPV6_O
 ISC_IPV6_O
 ISC_IPV6_H
+ISC_PLATFORM_HAVESOCKADDRSTORAGE
 ISC_PLATFORM_FIXIN6ISADDR
 ISC_PLATFORM_HAVEIN6PKTINFO
 LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK
@@ -13026,6 +13027,20 @@ fi
 done
 
 
+# BSDI doesn't have ftello fseeko
+for ac_func in ftello fseeko
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 #
 # UnixWare 7.1.1 with the feature supplement to the UDK compiler
 # is reported to not support "static inline" (RT #1212).
@@ -17578,6 +17593,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                ;;
 esac
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+$isc_netinetin6_hack
+$isc_netinet6in6_hack
+
+int
+main ()
+{
+struct sockaddr_storage storage; return (0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ISC_PLATFORM_HAVESOCKADDRSTORAGE="#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ISC_PLATFORM_HAVESOCKADDRSTORAGE="#undef ISC_PLATFORM_HAVESOCKADDRSTORAGE"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
 
 
 
@@ -18115,6 +18160,9 @@ if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: socklen_t for buflen; u_int for flags" >&5
 $as_echo "socklen_t for buflen; u_int for flags" >&6; }
 
+$as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
+
+
 $as_echo "#define IRS_GETNAMEINFO_BUFLEN_T socklen_t" >>confdefs.h
 
 
@@ -18140,6 +18188,34 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t for buflen; int for flags" >&5
 $as_echo "size_t for buflen; int for flags" >&6; }
+        $as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
+
+        $as_echo "#define IRS_GETNAMEINFO_BUFLEN_T size_t" >>confdefs.h
+
+        $as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+int getnameinfo(const struct sockaddr *, size_t, char *,
+               size_t, char *, size_t, int);
+int
+main ()
+{
+ return (0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t for buflen; int for flags" >&5
+$as_echo "size_t for buflen; int for flags" >&6; }
+        $as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T size_t" >>confdefs.h
+
         $as_echo "#define IRS_GETNAMEINFO_BUFLEN_T size_t" >>confdefs.h
 
         $as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h
@@ -18147,6 +18223,8 @@ $as_echo "size_t for buflen; int for flags" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not match any subspecies; assume standard definition" >&5
 $as_echo "not match any subspecies; assume standard definition" >&6; }
+$as_echo "#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t" >>confdefs.h
+
 $as_echo "#define IRS_GETNAMEINFO_BUFLEN_T socklen_t" >>confdefs.h
 
 $as_echo "#define IRS_GETNAMEINFO_FLAGS_T int" >>confdefs.h
@@ -18155,6 +18233,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
 # ...and same for gai_strerror().
@@ -19145,7 +19225,9 @@ esac
 case $ac_cv_have_if_nametoindex in
 yes)
        ISC_PLATFORM_HAVEIFNAMETOINDEX="#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1"
-       $as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
+
+$as_echo "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
+
 
        ;;
 *)

diff --git a/configure.in b/configure.in
index 82817fc82acea040961d3b3cec61e9e22f026738..8738c07891ca5c3bdf053e4143194c57ec92445e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -486,6 +486,9 @@ AC_CHECK_FUNCS(mmap)
 AC_CHECK_FUNCS(seteuid setresuid)
 AC_CHECK_FUNCS(setegid setresgid)
 
+# BSDI doesn't have ftello fseeko
+AC_CHECK_FUNCS(ftello fseeko)
+
 #
 # UnixWare 7.1.1 with the feature supplement to the UDK compiler
 # is reported to not support "static inline" (RT #1212).
@@ -2718,6 +2721,19 @@ $isc_netinet6in6_hack
                ;;
 esac
 
+AC_MSG_CHECKING(for struct sockaddr_storage)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+$isc_netinetin6_hack
+$isc_netinet6in6_hack
+],
+[struct sockaddr_storage storage; return (0);],
+[AC_MSG_RESULT(yes)
+ISC_PLATFORM_HAVESOCKADDRSTORAGE="#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1"],
+[AC_MSG_RESULT(no)
+ISC_PLATFORM_HAVESOCKADDRSTORAGE="#undef ISC_PLATFORM_HAVESOCKADDRSTORAGE"])
+
 AC_SUBST(ISC_PLATFORM_HAVEIPV6)
 AC_SUBST(LWRES_PLATFORM_HAVEIPV6)
 AC_SUBST(ISC_PLATFORM_NEEDNETINETIN6H)
@@ -2732,6 +2748,7 @@ AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
 AC_SUBST(LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK)
 AC_SUBST(ISC_PLATFORM_HAVEIN6PKTINFO)
 AC_SUBST(ISC_PLATFORM_FIXIN6ISADDR)
+AC_SUBST(ISC_PLATFORM_HAVESOCKADDRSTORAGE)
 AC_SUBST(ISC_IPV6_H)
 AC_SUBST(ISC_IPV6_O)
 AC_SUBST(ISC_ISCIPV6_O)
@@ -2981,6 +2998,8 @@ int getnameinfo(const struct sockaddr *, socklen_t, char *,
                socklen_t, char *, socklen_t, unsigned int);],
 [ return (0);],
        [AC_MSG_RESULT(socklen_t for buflen; u_int for flags)
+        AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t,
+                  [Define to the sockaddr length type used by getnameinfo(3).])
         AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t,
                   [Define to the buffer length type used by getnameinfo(3).])
         AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, unsigned int,
@@ -2993,11 +3012,24 @@ int getnameinfo(const struct sockaddr *, socklen_t, char *,
                size_t, char *, size_t, int);],
 [ return (0);],
        [AC_MSG_RESULT(size_t for buflen; int for flags)
+        AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
+        AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
+        AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+int getnameinfo(const struct sockaddr *, size_t, char *,
+               size_t, char *, size_t, int);],
+[ return (0);],
+       [AC_MSG_RESULT(size_t for buflen; int for flags)
+        AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)
         AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
         AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
 [AC_MSG_RESULT(not match any subspecies; assume standard definition)
+AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t)
 AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
-AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)])])
+AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)])])])
 
 #
 # ...and same for gai_strerror().

diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index 526ad0918d7b10b98bed34dd23c7df9b377b7562..eb4e75a50310789b8712349fc06b8cbbb5c0cbeb 100644 (file)
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -143,9 +143,10 @@ static struct afd {
        } while (0)
 
 int
-getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
-           IRS_GETNAMEINFO_BUFLEN_T hostlen, char *serv,
-           IRS_GETNAMEINFO_BUFLEN_T servlen, IRS_GETNAMEINFO_FLAGS_T flags)
+getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
+           char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
+           char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
+           IRS_GETNAMEINFO_FLAGS_T flags)
 {
        struct afd *afd = NULL;
        struct servent *sp;

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 63897178f97f23d6ff5c70de02f8630c56c10b14..79d01369326b0038ee127a47c0fb8d962fe698cc 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -131,6 +131,11 @@
  */
 @ISC_PLATFORM_FIXIN6ISADDR@
 
+/*! \brief
+ * Define if the system has struct sockaddr_storage.
+ */
+@ISC_PLATFORM_HAVESOCKADDRSTORAGE@
+
 /*! \brief
  * Define if the system supports kqueue multiplexing
  */

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 05a0a734ed073d3bbc0fb86ef0d8ccb98514043a..7a41eb89eaf2f6f26256d02a6f63cd4aa15fc402 100644 (file)
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -37,6 +37,7 @@
  *\li          struct sockaddr
  *\li          struct sockaddr_in
  *\li          struct sockaddr_in6
+ *\li          struct sockaddr_storage
  *\li          in_port_t
  *
  * It ensures that the AF_ and PF_ macros are defined.
@@ -187,6 +188,33 @@ struct in6_pktinfo {
 };
 #endif
 
+
+#ifndef ISC_PLATFORM_HAVESOCKADDRSTORAGE
+#define _SS_MAXSIZE 128
+#define _SS_ALIGNSIZE  (sizeof (isc_uint64_t))
+#ifdef ISC_PLATFORM_HAVESALEN
+#define _SS_PAD1SIZE (_SS_ALIGNSIZE - (2 * sizeof(isc_uint8_t)))
+#define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \
+                       + 2 * sizeof(isc_uint8_t)))
+#else
+#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(isc_uint16_t))
+#define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \
+                        + sizeof(isc_uint16_t)))
+#endif
+
+struct sockaddr_storage {
+#ifdef ISC_PLATFORM_HAVESALEN
+       isc_uint8_t             ss_len;
+       isc_uint8_t             ss_family;
+#else
+       isc_uint16_t            ss_family;
+#endif
+       char                    __ss_pad1[_SS_PAD1SIZE];
+       isc_uint64_t            __ss_align;  /* field to force desired structure */
+       char                    __ss_pad2[_SS_PAD2SIZE];
+};
+#endif
+
 #if defined(ISC_PLATFORM_HAVEIPV6) && defined(ISC_PLATFORM_NEEDIN6ADDRANY)
 extern const struct in6_addr isc_net_in6addrany;
 /*%

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 31840ad644e0012761c8b1803f1689976f8337f9..0810e4a003d029ed80353efe2d904ca1f116d3b0 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -326,6 +326,7 @@ initialize_ipv6only(void) {
 #endif /* WANT_IPV6 */
 
 #ifdef ISC_PLATFORM_HAVEIN6PKTINFO
+#ifdef WANT_IPV6
 static void
 try_ipv6pktinfo(void) {
        int s, on;
@@ -377,6 +378,7 @@ initialize_ipv6pktinfo(void) {
        RUNTIME_CHECK(isc_once_do(&once_ipv6pktinfo,
                                  try_ipv6pktinfo) == ISC_R_SUCCESS);
 }
+#endif /* WANT_IPV6 */
 #endif /* ISC_PLATFORM_HAVEIN6PKTINFO */
 #endif /* ISC_PLATFORM_HAVEIPV6 */
 
@@ -620,7 +622,11 @@ try_dscp_v4(void) {
        hints.ai_family = AF_INET;
        hints.ai_socktype = SOCK_DGRAM;
        hints.ai_protocol = IPPROTO_UDP;
+#ifdef AI_NUMERICHOST
        hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
+#else
+       hints.ai_flags = AI_PASSIVE;
+#endif
 
        n = getaddrinfo("127.0.0.1", NULL, &hints, &res0);
        if (n != 0 || res0 == NULL) {
@@ -689,7 +695,11 @@ try_dscp_v6(void) {
        hints.ai_family = AF_INET6;
        hints.ai_socktype = SOCK_DGRAM;
        hints.ai_protocol = IPPROTO_UDP;
+#ifdef AI_NUMERICHOST
        hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
+#else
+       hints.ai_flags = AI_PASSIVE;
+#endif
 
        n = getaddrinfo("::1", NULL, &hints, &res0);
        if (n != 0 || res0 == NULL) {

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 37995aeb42d37d30bb52c70727fc0d04a7c594b3..2aae76f11801c01552a38cc8958e10786cf18636 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1388,7 +1388,7 @@ process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) {
                        || cmsgp->cmsg_type == IP_RECVTOS
 #endif
                        )) {
-                       dev->dscp = (int) *(uint8_t *)CMSG_DATA(cmsgp);
+                       dev->dscp = (int) *(unsigned char *)CMSG_DATA(cmsgp);
                        dev->dscp >>= 2;
                        dev->attributes |= ISC_SOCKEVENTATTR_DSCP;
                        goto next;

diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 90e3b2ab3079fa5557e6785a24064d5410a8c811..cd6375598683d6d988d2b92d5331f5acab388657 100644 (file)
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -54,7 +54,11 @@ isc_result_t
 isc_stdio_seek(FILE *f, off_t offset, int whence) {
        int r;
 
+#ifdef HAVE_FSEEKO
        r = fseeko(f, offset, whence);
+#else
+       r = fseek(f, offset, whence);
+#endif
        if (r == 0)
                return (ISC_R_SUCCESS);
        else
@@ -67,7 +71,11 @@ isc_stdio_tell(FILE *f, off_t *offsetp) {
 
        REQUIRE(offsetp != NULL);
 
+#ifdef HAVE_FTELLO
        r = ftello(f);
+#else
+       r = ftell(f);
+#endif
        if (r >= 0) {
                *offsetp = r;
                return (ISC_R_SUCCESS);

diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 9e56cc9336ad3f452d2c47d2e9a01b6bac2c451c..e86a6863533a6138d331abef05d0fcddeffd7004 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -39,6 +39,7 @@
 #undef MSG_TRUNC
 #define ISC_PLATFORM_NEEDNTOP
 #define ISC_PLATFORM_NEEDPTON
+#define ISC_PLATFORM_HAVESOCKADDRSTORAGE
 
 #define ISC_PLATFORM_QUADFORMAT "I64"
 

diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c
index 34964c7d7e9515a258f443665cf96b19555b78c4..b5ea343d125d968c8d395630384b406edbd32640 100644 (file)
--- a/lib/samples/sample-request.c
+++ b/lib/samples/sample-request.c
@@ -218,7 +218,9 @@ main(int argc, char *argv[]) {
        hints.ai_family = AF_UNSPEC;
        hints.ai_socktype = SOCK_DGRAM;
        hints.ai_protocol = IPPROTO_UDP;
+#ifdef AI_NUMERICHOST
        hints.ai_flags = AI_NUMERICHOST;
+#endif
        gai_error = getaddrinfo(argv[0], "53", &hints, &res);
        if (gai_error != 0) {
                fprintf(stderr, "getaddrinfo failed: %s\n",

diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c
index 0fb4bb31f4b4f95758395ad09fa26f73099d0f6e..5a8a9a0bb4e7a25587ad2deea49208a3c134db69 100644 (file)
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -185,7 +185,9 @@ main(int argc, char *argv[]) {
                hints.ai_family = AF_UNSPEC;
                hints.ai_socktype = SOCK_DGRAM;
                hints.ai_protocol = IPPROTO_UDP;
+#ifdef AI_NUMERICHOST
                hints.ai_flags = AI_NUMERICHOST;
+#endif
                gai_error = getaddrinfo(auth_server, "53", &hints, &res);
                if (gai_error != 0) {
                        fprintf(stderr, "getaddrinfo failed: %s\n",
@@ -207,7 +209,9 @@ main(int argc, char *argv[]) {
                hints.ai_family = AF_UNSPEC;
                hints.ai_socktype = SOCK_DGRAM;
                hints.ai_protocol = IPPROTO_UDP;
+#ifdef AI_NUMERICHOST
                hints.ai_flags = AI_NUMERICHOST;
+#endif
                gai_error = getaddrinfo(recursive_server, "53", &hints, &res);
                if (gai_error != 0) {
                        fprintf(stderr, "getaddrinfo failed: %s\n",