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

(cherry picked from commit 00bb9b88cecf7e2c365c9f008c049da3802ac415)

diff --git a/CHANGES b/CHANGES
index c0638640cce374cda8ef170df1f9cb052d4ca516..1c9d1e33c2fa681a7660b7513186e0f8efb010fa 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 15305b143f8d13daac69cd965d32742dbadd8594..f5aaf292d722759ff2631c0e2ae1b945258e19ee 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -217,6 +217,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
+
 /* Define to 1 if you have the <gssapi/gssapi.h> header file. */
 #undef HAVE_GSSAPI_GSSAPI_H
 
@@ -403,6 +409,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 7399377b9d150d995c5b39a41e388ff4fbd608be..b72384aba42ba34120c96260d244af0c8f3c0f2d 100755 (executable)
--- a/configure
+++ b/configure
@@ -767,6 +767,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
@@ -12859,6 +12860,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).
@@ -16504,6 +16519,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
+
+
 
 
 
@@ -17041,6 +17086,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
 
 
@@ -17066,6 +17114,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
@@ -17073,6 +17149,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
@@ -17081,6 +17159,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().
@@ -18070,7 +18150,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 fb91e682f9b8abf69e3005395b71400fc11aacfa..a1ed8a1db1b683fc0a0851d12b1aa9e1072ff40e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -409,6 +409,9 @@ AC_C_FLEXIBLE_ARRAY_MEMBER
 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).
@@ -2111,6 +2114,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)
@@ -2125,6 +2141,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)
@@ -2374,6 +2391,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,
@@ -2386,11 +2405,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/export/samples/sample-request.c b/lib/export/samples/sample-request.c
index 8d36a2cebde448c6367bdacb0c187f44fbf9fd98..e39c21e8e647749f7594cf48152c80c85a0c10c8 100644 (file)
--- a/lib/export/samples/sample-request.c
+++ b/lib/export/samples/sample-request.c
@@ -213,7 +213,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/export/samples/sample-update.c b/lib/export/samples/sample-update.c
index f7e7dcc765e2fb3f7a2e36d3857c56f894c84c17..acab0059067a66c34872b4753064849ba08fe936 100644 (file)
--- a/lib/export/samples/sample-update.c
+++ b/lib/export/samples/sample-update.c
@@ -181,7 +181,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",
@@ -203,7 +205,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",

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 07553e36b8985090044b9da2c864ab7effce3b74..69f81e0af11acfe9792025e69b96b85def8fa5fc 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 c9ceaf774e8970ef11e80335078ba739ce4d9eb7..78f5c5f2c59fab4d8bc5d9782e5fc5e5703a5db0 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 1fedbc438dedabd8ab44a091dd081f1602f799f3..26234bbeebb02e39567adb8cc884c029a0b31e1b 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -317,6 +317,7 @@ initialize_ipv6only(void) {
 #endif /* WANT_IPV6 */
 
 #ifdef ISC_PLATFORM_HAVEIN6PKTINFO
+#ifdef WANT_IPV6
 static void
 try_ipv6pktinfo(void) {
        int s, on;
@@ -368,6 +369,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 */
 

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 1abbbc01973ca03dffe81bb5618db9d22cadcd71..400f0f316f91619bbd44f70e295ceb1460d278ea 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"