Merge changes from vendor branch onto HEAD.

1 files changed, 42 insertions, 0 deletions

diff --git a/contrib/bind/port/freebsd/include/port_after.h b/contrib/bind/port/freebsd/include/port_after.h
index 6eb28ac..7c78b61 100644
--- a/contrib/bind/port/freebsd/include/port_after.h
+++ b/contrib/bind/port/freebsd/include/port_after.h
@@ -1,3 +1,6 @@
+/* $FreeBSD$ */
+#ifndef	PORT_AFTER_H
+#define	PORT_AFTER_H
 #define CAN_RECONNECT
 #define USE_POSIX
 #define POSIX_SIGNALS
@@ -14,6 +17,7 @@
 #define HAVE_MINIMUM_IFREQ
 #define HAVE_CHROOT
 #define CAN_CHANGE_ID
+#define MISSING_IN6ADDR_ANY
 
 #define _TIMEZONE timezone
 
@@ -24,6 +28,13 @@
 #define KMEM		"/dev/kmem"
 #define UDPSUM		"udpcksum"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/param.h>
+#if (!defined(BSD)) || (BSD < 199306)
+#include <sys/bitypes.h>
+#endif
+
 /*
  * We need to know the IPv6 address family number even on IPv4-only systems.
  * Note that this is NOT a protocol constant, and that if the system has its
@@ -34,4 +45,35 @@
  */
 #ifndef AF_INET6
 #define AF_INET6	24
+#else
+#define HAS_INET6_STRUCTS
+#define HAVE_SA_LEN
+#endif
+
+#ifndef	PF_INET6
+#define PF_INET6	AF_INET6
+#endif
+
+#include <port_ipv6.h>
+
+#ifndef HAS_INET6_STRUCTS
+/* Replace with structure from later rev of O/S if known. */
+struct in6_addr {
+	u_int8_t	s6_addr[16];
+};
+
+/* Replace with structure from later rev of O/S if known. */
+struct sockaddr_in6 {
+#ifdef	HAVE_SA_LEN
+	u_int8_t	sin6_len;	/* length of this struct */
+	u_int8_t	sin6_family;	/* AF_INET6 */
+#else
+	u_int16_t	sin6_family;	/* AF_INET6 */
 #endif
+	u_int16_t	sin6_port;	/* transport layer port # */
+	u_int32_t	sin6_flowinfo;	/* IPv6 flow information */
+	struct in6_addr	sin6_addr;	/* IPv6 address */
+	u_int32_t	sin6_scope_id;	/* set of interfaces for a scope */
+};
+#endif	/* HAS_INET6_STRUCTS */
+#endif /* ! PORT_AFTER_H */