We are not using libirs.

OK sthen

23 files changed, 5 insertions, 4250 deletions

diff --git a/usr.sbin/bind/configure b/usr.sbin/bind/configure
index 7fbadb4a028..44af44ea01e 100644
--- a/usr.sbin/bind/configure
+++ b/usr.sbin/bind/configure
@@ -670,7 +670,6 @@ BIND9_MAJOR
 BIND9_VERSION
 BIND9_DESCRIPTION
 BIND9_PRODUCT
-BIND9_IRS_BUILDINCLUDE
 BIND9_BIND9_BUILDINCLUDE
 BIND9_LWRES_BUILDINCLUDE
 BIND9_DNS_BUILDINCLUDE
@@ -717,7 +716,6 @@ ISC_PLATFORM_HAVESTDATOMIC
 ISC_PLATFORM_HAVEIFNAMETOINDEX
 ISC_PLATFORM_HAVESTRINGSH
 ISC_PLATFORM_BRACEPTHREADONCEINIT
-IRS_PLATFORM_USEDECLSPEC
 LWRES_PLATFORM_USEDECLSPEC
 ISC_PLATFORM_USEDECLSPEC
 ISC_PLATFORM_RLIMITTYPE
@@ -746,7 +744,6 @@ LWRES_PLATFORM_NEEDSTRTOUL
 ISC_PLATFORM_NEEDSTRTOUL
 ISC_PLATFORM_NEEDMEMMOVE
 ISC_PLATFORM_NEEDSTRSEP
-ISC_IRS_GETNAMEINFOSOCKLEN
 ISC_LWRES_GETNAMEINFOPROTO
 ISC_LWRES_GETADDRINFOPROTO
 ISC_LWRES_GETIPNODEPROTO
@@ -758,7 +755,6 @@ ISC_LWRES_GETNETBYADDRINADDR
 ISC_LWRES_ENDHOSTENTINT
 ISC_LWRES_SETHOSTENTINT
 ISC_LWRES_NEEDRRSETINFO
-ISC_IRS_NEEDADDRINFO
 ISC_LWRES_NEEDADDRINFO
 ISC_PLATFORM_NEEDPORTT
 ISC_PLATFORM_MSGHDRFLAVOR
@@ -984,7 +980,6 @@ LIBDNS_API
 LIBDNS_MAPAPI
 LIBBIND9_API
 LIBLWRES_API
-LIBIRS_API
 DLZ_DRIVER_RULES'
 ac_user_opts='
 enable_option_checking
@@ -18485,19 +18480,16 @@ if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO"
-	ISC_IRS_NEEDADDRINFO="#undef ISC_IRS_NEEDADDRINFO"
 	$as_echo "#define HAVE_ADDRINFO 1" >>confdefs.h
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1"
-	ISC_IRS_NEEDADDRINFO="#define ISC_IRS_NEEDADDRINFO 1"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-
 #
 # Check for rrsetinfo
 #
@@ -18711,142 +18703,6 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-#
-# Sadly, the definitions of system-supplied getnameinfo(3) vary.  Try to catch
-# known variations here:
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo prototype definitions" >&5
-$as_echo_n "checking for getnameinfo prototype definitions... " >&6; }
-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 *, socklen_t, char *,
-		socklen_t, char *, socklen_t, unsigned int);
-int
-main ()
-{
- return (0);
-  ;
-  return 0;
-}
-_ACEOF
-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
-
-
-$as_echo "#define IRS_GETNAMEINFO_FLAGS_T unsigned 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 *, socklen_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 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
-
-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
-
-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().
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror prototype definitions" >&5
-$as_echo_n "checking for gai_strerror prototype definitions... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-char *gai_strerror(int ecode);
-int
-main ()
-{
- return (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: returning char *" >&5
-$as_echo "returning char *" >&6; }
-
-$as_echo "#define IRS_GAISTRERROR_RETURN_T char *" >>confdefs.h
-
-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_GAISTRERROR_RETURN_T const char *" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
 ac_fn_c_check_func "$LINENO" "getipnodebyname" "ac_cv_func_getipnodebyname"
 if test "x$ac_cv_func_getipnodebyname" = xyes; then :
   ISC_LWRES_GETIPNODEPROTO="#undef ISC_LWRES_GETIPNODEPROTO"
@@ -18880,7 +18736,6 @@ fi
 
 
 
-
 # Check whether --enable-getifaddrs was given.
 if test "${enable_getifaddrs+set}" = set; then :
   enableval=$enable_getifaddrs; want_getifaddrs="$enableval"
@@ -19819,8 +19674,6 @@ ISC_PLATFORM_USEDECLSPEC="#undef ISC_PLATFORM_USEDECLSPEC"
 
 LWRES_PLATFORM_USEDECLSPEC="#undef LWRES_PLATFORM_USEDECLSPEC"
 
-IRS_PLATFORM_USEDECLSPEC="#undef IRS_PLATFORM_USEDECLSPEC"
-
 #
 # Random remaining OS-specific issues involving compiler warnings.
 # XXXDCL print messages to indicate some compensation is being done?
@@ -21616,7 +21469,6 @@ BIND9_TOP_BUILDDIR=`pwd`
 
 
 
-
 if test "X$srcdir" != "X"; then
 	BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
 	BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
@@ -21624,7 +21476,6 @@ if test "X$srcdir" != "X"; then
 	BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include"
 	BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include"
 	BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
-	BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include"
 else
 	BIND9_ISC_BUILDINCLUDE=""
 	BIND9_ISCCC_BUILDINCLUDE=""
@@ -21632,7 +21483,6 @@ else
 	BIND9_DNS_BUILDINCLUDE=""
 	BIND9_LWRES_BUILDINCLUDE=""
 	BIND9_BIND9_BUILDINCLUDE=""
-	BIND9_IRS_BUILDINCLUDE=""
 fi
 
 
@@ -21698,9 +21548,6 @@ LIBBIND9_API="$srcdir/lib/bind9/api"
 
 LIBLWRES_API="$srcdir/lib/lwres/api"
 
-
-LIBIRS_API="$srcdir/lib/irs/api"
-
 #
 # Configure any DLZ drivers.
 #
@@ -22057,7 +21904,7 @@ DNS_CRYPTO_LIBS="$NEWFLAGS"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/dig/Makefile lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/dig/Makefile lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile"
 
 
 #
@@ -23062,11 +22909,6 @@ do
     "lib/dns/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dns/include/Makefile" ;;
     "lib/dns/include/dns/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dns/include/dns/Makefile" ;;
     "lib/dns/include/dst/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dns/include/dst/Makefile" ;;
-    "lib/irs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/Makefile" ;;
-    "lib/irs/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/include/Makefile" ;;
-    "lib/irs/include/irs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/irs/include/irs/Makefile" ;;
-    "lib/irs/include/irs/netdb.h") CONFIG_FILES="$CONFIG_FILES lib/irs/include/irs/netdb.h" ;;
-    "lib/irs/include/irs/platform.h") CONFIG_FILES="$CONFIG_FILES lib/irs/include/irs/platform.h" ;;
     "lib/isc/$arch/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/$arch/Makefile" ;;
     "lib/isc/$arch/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/$arch/include/Makefile" ;;
     "lib/isc/$arch/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/$arch/include/isc/Makefile" ;;
diff --git a/usr.sbin/bind/configure.in b/usr.sbin/bind/configure.in
index 114b4937f52..46de7bae716 100644
--- a/usr.sbin/bind/configure.in
+++ b/usr.sbin/bind/configure.in
@@ -3272,13 +3272,10 @@ AC_TRY_COMPILE([
 [struct addrinfo a; return (0);],
 	[AC_MSG_RESULT(yes)
 	ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO"
-	ISC_IRS_NEEDADDRINFO="#undef ISC_IRS_NEEDADDRINFO"
 	AC_DEFINE(HAVE_ADDRINFO)],
 	[AC_MSG_RESULT(no)
-	ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1"
-	ISC_IRS_NEEDADDRINFO="#define ISC_IRS_NEEDADDRINFO 1"])
+	ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1"])
 AC_SUBST(ISC_LWRES_NEEDADDRINFO)
-AC_SUBST(ISC_IRS_NEEDADDRINFO)
 
 #
 # Check for rrsetinfo
@@ -3365,68 +3362,6 @@ AC_TRY_COMPILE([
 	ISC_LWRES_NEEDHERRNO="#define ISC_LWRES_NEEDHERRNO 1"])
 AC_SUBST(ISC_LWRES_NEEDHERRNO)
 
-#
-# Sadly, the definitions of system-supplied getnameinfo(3) vary.  Try to catch
-# known variations here:
-#
-AC_MSG_CHECKING(for getnameinfo prototype definitions)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-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,
-		   [Define to the flags type used by getnameinfo(3).])],
-[AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-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)])])])
-
-#
-# ...and same for gai_strerror().
-#
-AC_MSG_CHECKING(for gai_strerror prototype definitions)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-char *gai_strerror(int ecode);],
-[ return (0); ],
-	[AC_MSG_RESULT(returning char *)
-	 AC_DEFINE([IRS_GAISTRERROR_RETURN_T], [char *],
-	 [return type of gai_strerror])],
-[AC_MSG_RESULT(not match any subspecies; assume standard definition)
-AC_DEFINE([IRS_GAISTRERROR_RETURN_T], [const char *])])
-
 AC_CHECK_FUNC(getipnodebyname,
 	[ISC_LWRES_GETIPNODEPROTO="#undef ISC_LWRES_GETIPNODEPROTO"],
 	[ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1"])
@@ -3441,7 +3376,6 @@ AC_CHECK_FUNC(gai_strerror, AC_DEFINE(HAVE_GAISTRERROR))
 AC_SUBST(ISC_LWRES_GETIPNODEPROTO)
 AC_SUBST(ISC_LWRES_GETADDRINFOPROTO)
 AC_SUBST(ISC_LWRES_GETNAMEINFOPROTO)
-AC_SUBST(ISC_IRS_GETNAMEINFOSOCKLEN)
 
 AC_ARG_ENABLE(getifaddrs,
 	      AS_HELP_STRING([--enable-getifaddrs],
@@ -3892,8 +3826,6 @@ AC_SUBST(ISC_PLATFORM_USEDECLSPEC)
 ISC_PLATFORM_USEDECLSPEC="#undef ISC_PLATFORM_USEDECLSPEC"
 AC_SUBST(LWRES_PLATFORM_USEDECLSPEC)
 LWRES_PLATFORM_USEDECLSPEC="#undef LWRES_PLATFORM_USEDECLSPEC"
-AC_SUBST(IRS_PLATFORM_USEDECLSPEC)
-IRS_PLATFORM_USEDECLSPEC="#undef IRS_PLATFORM_USEDECLSPEC"
 
 #
 # Random remaining OS-specific issues involving compiler warnings.
@@ -4695,7 +4627,6 @@ AC_SUBST(BIND9_ISCCFG_BUILDINCLUDE)
 AC_SUBST(BIND9_DNS_BUILDINCLUDE)
 AC_SUBST(BIND9_LWRES_BUILDINCLUDE)
 AC_SUBST(BIND9_BIND9_BUILDINCLUDE)
-AC_SUBST(BIND9_IRS_BUILDINCLUDE)
 if test "X$srcdir" != "X"; then
 	BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include"
 	BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include"
@@ -4703,7 +4634,6 @@ if test "X$srcdir" != "X"; then
 	BIND9_DNS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns/include"
 	BIND9_LWRES_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/lwres/include"
 	BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
-	BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include"
 else
 	BIND9_ISC_BUILDINCLUDE=""
 	BIND9_ISCCC_BUILDINCLUDE=""
@@ -4711,7 +4641,6 @@ else
 	BIND9_DNS_BUILDINCLUDE=""
 	BIND9_LWRES_BUILDINCLUDE=""
 	BIND9_BIND9_BUILDINCLUDE=""
-	BIND9_IRS_BUILDINCLUDE=""
 fi
 
 AC_SUBST_FILE(BIND9_MAKE_INCLUDES)
@@ -4777,9 +4706,6 @@ LIBBIND9_API="$srcdir/lib/bind9/api"
 AC_SUBST_FILE(LIBLWRES_API)
 LIBLWRES_API="$srcdir/lib/lwres/api"
 
-AC_SUBST_FILE(LIBIRS_API)
-LIBIRS_API="$srcdir/lib/irs/api"
-
 #
 # Configure any DLZ drivers.
 #
@@ -5087,11 +5013,6 @@ AC_CONFIG_FILES([
 	lib/dns/include/Makefile
 	lib/dns/include/dns/Makefile
 	lib/dns/include/dst/Makefile
-	lib/irs/Makefile
-	lib/irs/include/Makefile
-	lib/irs/include/irs/Makefile
-	lib/irs/include/irs/netdb.h
-	lib/irs/include/irs/platform.h
 	lib/isc/$arch/Makefile
 	lib/isc/$arch/include/Makefile
 	lib/isc/$arch/include/isc/Makefile
diff --git a/usr.sbin/bind/lib/Makefile.in b/usr.sbin/bind/lib/Makefile.in
index 43d2c3223cf..9e61b5c7717 100644
--- a/usr.sbin/bind/lib/Makefile.in
+++ b/usr.sbin/bind/lib/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2019/12/20 04:07:45 deraadt Exp $
+# $Id: Makefile.in,v 1.7 2020/01/06 17:37:30 florian Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -22,7 +22,7 @@ top_srcdir =	@top_srcdir@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
 .NO_PARALLEL:
-SUBDIRS =	isc isccc dns isccfg bind9 lwres irs
+SUBDIRS =	isc isccc dns isccfg bind9 lwres
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff --git a/usr.sbin/bind/lib/irs/Atffile b/usr.sbin/bind/lib/irs/Atffile
deleted file mode 100644
index 1edb838c66c..00000000000
--- a/usr.sbin/bind/lib/irs/Atffile
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = bind9
-
-tp: tests
diff --git a/usr.sbin/bind/lib/irs/Makefile.in b/usr.sbin/bind/lib/irs/Makefile.in
deleted file mode 100644
index bb5b5f51934..00000000000
--- a/usr.sbin/bind/lib/irs/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.2 2019/12/17 01:46:34 sthen Exp $
-
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-top_srcdir =	@top_srcdir@
-
-VERSION=@BIND9_VERSION@
-
-@LIBIRS_API@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =	-I. -I./include -I${srcdir}/include \
-		${DNS_INCLUDES} ${ISC_INCLUDES} \
-		${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
-
-CDEFINES =	@CRYPTO@
-CWARNINGS =
-
-# Alphabetically
-OBJS =		context.@O@ \
-		dnsconf.@O@ \
-		gai_strerror.@O@ getaddrinfo.@O@ getnameinfo.@O@ \
-		resconf.@O@
-
-# Alphabetically
-SRCS =		context.c \
-		dnsconf.c \
-		gai_strerror.c getaddrinfo.c getnameinfo.c \
-		resconf.c
-
-LIBS =		@LIBS@
-
-SUBDIRS =	include
-TESTDIRS =	@UNITTESTS@
-TARGETS =	timestamp
-
-@BIND9_MAKE_RULES@
-
-version.@O@: version.c
-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-		-DVERSION=\"${VERSION}\" \
-		-DLIBINTERFACE=${LIBINTERFACE} \
-		-DLIBREVISION=${LIBREVISION} \
-		-DLIBAGE=${LIBAGE} \
-		-c ${srcdir}/version.c
-
-libirs.@SA@: ${OBJS} version.@O@
-	${AR} ${ARFLAGS} $@ ${OBJS} version.@O@
-	${RANLIB} $@
-
-libirs.la: ${OBJS} version.@O@
-	${LIBTOOL_MODE_LINK} \
-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la -rpath ${libdir} \
-		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-		${OBJS} version.@O@ ${LIBS}
-
-timestamp: libirs.@A@
-	touch timestamp
-
-testdirs: libirs.@A@
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
-
-install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libirs.@A@ ${DESTDIR}${libdir}
-
-uninstall::
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/libirs.@A@
-
-clean distclean::
-	rm -f libirs.@A@ libirs.la timestamp
diff --git a/usr.sbin/bind/lib/irs/api b/usr.sbin/bind/lib/irs/api
deleted file mode 100644
index a28187df4b8..00000000000
--- a/usr.sbin/bind/lib/irs/api
+++ /dev/null
@@ -1,13 +0,0 @@
-# LIBINTERFACE ranges
-# 9.6: 50-59, 110-119
-# 9.7: 60-79
-# 9.8: 80-89, 120-129
-# 9.9: 90-109, 170-179
-# 9.9-sub: 130-139, 150-159, 200-209
-# 9.10: 140-149, 190-199
-# 9.10-sub: 180-189
-# 9.11: 160-169,1100-1199
-# 9.12: 1200-1299
-LIBINTERFACE = 141
-LIBREVISION = 9
-LIBAGE = 0
diff --git a/usr.sbin/bind/lib/irs/context.c b/usr.sbin/bind/lib/irs/context.c
deleted file mode 100644
index cc8ad9ec547..00000000000
--- a/usr.sbin/bind/lib/irs/context.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: context.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-#include <config.h>
-
-#include <isc/app.h>
-#include <isc/lib.h>
-#include <isc/magic.h>
-#include <isc/mem.h>
-#include <isc/once.h>
-#include <isc/socket.h>
-#include <isc/task.h>
-#include <isc/thread.h>
-#include <isc/timer.h>
-#include <isc/util.h>
-
-#include <dns/client.h>
-#include <dns/lib.h>
-
-#include <irs/context.h>
-#include <irs/dnsconf.h>
-#include <irs/resconf.h>
-
-#define IRS_CONTEXT_MAGIC		ISC_MAGIC('I', 'R', 'S', 'c')
-#define IRS_CONTEXT_VALID(c)		ISC_MAGIC_VALID(c, IRS_CONTEXT_MAGIC)
-
-#ifndef RESOLV_CONF
-/*% location of resolve.conf */
-#define RESOLV_CONF "/etc/resolv.conf"
-#endif
-
-#ifndef DNS_CONF
-/*% location of dns.conf */
-#define DNS_CONF "/etc/dns.conf"
-#endif
-
-#ifndef ISC_PLATFORM_USETHREADS
-irs_context_t *irs_g_context = NULL;
-#else
-static isc_boolean_t thread_key_initialized = ISC_FALSE;
-static isc_mutex_t thread_key_mutex;
-static isc_thread_key_t irs_context_key;
-static isc_once_t once = ISC_ONCE_INIT;
-#endif
-
-
-struct irs_context {
-	/*
-	 * An IRS context is a thread-specific object, and does not need to
-	 * be locked.
-	 */
-	unsigned int			magic;
-	isc_mem_t			*mctx;
-	isc_appctx_t			*actx;
-	isc_taskmgr_t			*taskmgr;
-	isc_task_t			*task;
-	isc_socketmgr_t			*socketmgr;
-	isc_timermgr_t			*timermgr;
-	dns_client_t			*dnsclient;
-	irs_resconf_t			*resconf;
-	irs_dnsconf_t			*dnsconf;
-};
-
-static void
-ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp,
-	     isc_taskmgr_t **taskmgrp, isc_socketmgr_t **socketmgrp,
-	     isc_timermgr_t **timermgrp)
-{
-	if (taskmgrp != NULL)
-		isc_taskmgr_destroy(taskmgrp);
-
-	if (timermgrp != NULL)
-		isc_timermgr_destroy(timermgrp);
-
-	if (socketmgrp != NULL)
-		isc_socketmgr_destroy(socketmgrp);
-
-	if (actxp != NULL)
-		isc_appctx_destroy(actxp);
-
-	if (mctxp != NULL)
-		isc_mem_destroy(mctxp);
-}
-
-static isc_result_t
-ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp,
-	  isc_taskmgr_t **taskmgrp, isc_socketmgr_t **socketmgrp,
-	  isc_timermgr_t **timermgrp)
-{
-	isc_result_t result;
-
-	result = isc_mem_create(0, 0, mctxp);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	result = isc_appctx_create(*mctxp, actxp);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	result = isc_taskmgr_createinctx(*mctxp, *actxp, 1, 0, taskmgrp);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	result = isc_socketmgr_createinctx(*mctxp, *actxp, socketmgrp);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	result = isc_timermgr_createinctx(*mctxp, *actxp, timermgrp);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	return (ISC_R_SUCCESS);
-
- fail:
-	ctxs_destroy(mctxp, actxp, taskmgrp, socketmgrp, timermgrp);
-
-	return (result);
-}
-
-#ifdef ISC_PLATFORM_USETHREADS
-static void
-free_specific_context(void *arg) {
-	irs_context_t *context = arg;
-
-	irs_context_destroy(&context);
-
-	isc_thread_key_setspecific(irs_context_key, NULL);
-}
-
-static void
-thread_key_mutex_init(void) {
-	RUNTIME_CHECK(isc_mutex_init(&thread_key_mutex) == ISC_R_SUCCESS);
-}
-
-static isc_result_t
-thread_key_init(void) {
-	isc_result_t result;
-
-	result = isc_once_do(&once, thread_key_mutex_init);
-	if (result != ISC_R_SUCCESS)
-		return (result);
-
-	if (!thread_key_initialized) {
-		LOCK(&thread_key_mutex);
-
-		if (!thread_key_initialized &&
-		    isc_thread_key_create(&irs_context_key,
-					  free_specific_context) != 0) {
-			result = ISC_R_FAILURE;
-		} else
-			thread_key_initialized = ISC_TRUE;
-
-		UNLOCK(&thread_key_mutex);
-	}
-
-	return (result);
-}
-#endif /* ISC_PLATFORM_USETHREADS */
-
-isc_result_t
-irs_context_get(irs_context_t **contextp) {
-	irs_context_t *context;
-	isc_result_t result;
-
-	REQUIRE(contextp != NULL && *contextp == NULL);
-
-#ifndef ISC_PLATFORM_USETHREADS
-	if (irs_g_context == NULL) {
-		result = irs_context_create(&irs_g_context);
-		if (result != ISC_R_SUCCESS)
-			return (result);
-	}
-
-	context = irs_g_context;
-#else
-	result = thread_key_init();
-	if (result != ISC_R_SUCCESS)
-		return (result);
-
-	context = isc_thread_key_getspecific(irs_context_key);
-	if (context == NULL) {
-		result = irs_context_create(&context);
-		if (result != ISC_R_SUCCESS)
-			return (result);
-		result = isc_thread_key_setspecific(irs_context_key, context);
-		if (result != ISC_R_SUCCESS) {
-			irs_context_destroy(&context);
-			return (result);
-		}
-	}
-#endif /* ISC_PLATFORM_USETHREADS */
-
-	*contextp = context;
-
-	return (ISC_R_SUCCESS);
-}
-
-isc_result_t
-irs_context_create(irs_context_t **contextp) {
-	isc_result_t result;
-	irs_context_t *context;
-	isc_appctx_t *actx = NULL;
-	isc_mem_t *mctx = NULL;
-	isc_taskmgr_t *taskmgr = NULL;
-	isc_socketmgr_t *socketmgr = NULL;
-	isc_timermgr_t *timermgr = NULL;
-	dns_client_t *client = NULL;
-	isc_sockaddrlist_t *nameservers;
-	irs_dnsconf_dnskeylist_t *trustedkeys;
-	irs_dnsconf_dnskey_t *trustedkey;
-
-	isc_lib_register();
-	result = dns_lib_init();
-	if (result != ISC_R_SUCCESS)
-		return (result);
-
-	result = ctxs_init(&mctx, &actx, &taskmgr, &socketmgr, &timermgr);
-	if (result != ISC_R_SUCCESS)
-		return (result);
-
-	result = isc_app_ctxstart(actx);
-	if (result != ISC_R_SUCCESS) {
-		ctxs_destroy(&mctx, &actx, &taskmgr, &socketmgr, &timermgr);
-		return (result);
-	}
-
-	context = isc_mem_get(mctx, sizeof(*context));
-	if (context == NULL) {
-		ctxs_destroy(&mctx, &actx, &taskmgr, &socketmgr, &timermgr);
-		return (ISC_R_NOMEMORY);
-	}
-
-	context->mctx = mctx;
-	context->actx = actx;
-	context->taskmgr = taskmgr;
-	context->socketmgr = socketmgr;
-	context->timermgr = timermgr;
-	context->resconf = NULL;
-	context->dnsconf = NULL;
-	context->task = NULL;
-	result = isc_task_create(taskmgr, 0, &context->task);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	/* Create a DNS client object */
-	result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
-				    0, &client);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-	context->dnsclient = client;
-
-	/* Read resolver configuration file */
-	result = irs_resconf_load(mctx, RESOLV_CONF, &context->resconf);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-	/* Set nameservers */
-	nameservers = irs_resconf_getnameservers(context->resconf);
-	result = dns_client_setservers(client, dns_rdataclass_in, NULL,
-				       nameservers);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-
-	/* Read advanced DNS configuration (if any) */
-	result = irs_dnsconf_load(mctx, DNS_CONF, &context->dnsconf);
-	if (result != ISC_R_SUCCESS)
-		goto fail;
-	trustedkeys = irs_dnsconf_gettrustedkeys(context->dnsconf);
-	for (trustedkey = ISC_LIST_HEAD(*trustedkeys);
-	     trustedkey != NULL;
-	     trustedkey = ISC_LIST_NEXT(trustedkey, link)) {
-		result = dns_client_addtrustedkey(client, dns_rdataclass_in,
-						  trustedkey->keyname,
-						  trustedkey->keydatabuf);
-		if (result != ISC_R_SUCCESS)
-			goto fail;
-	}
-
-	context->magic = IRS_CONTEXT_MAGIC;
-	*contextp = context;
-
-	return (ISC_R_SUCCESS);
-
-  fail:
-	if (context->task != NULL)
-		isc_task_detach(&context->task);
-	if (context->resconf != NULL)
-		irs_resconf_destroy(&context->resconf);
-	if (context->dnsconf != NULL)
-		irs_dnsconf_destroy(&context->dnsconf);
-	if (client != NULL)
-		dns_client_destroy(&client);
-	ctxs_destroy(NULL, &actx, &taskmgr, &socketmgr, &timermgr);
-	isc_mem_putanddetach(&mctx, context, sizeof(*context));
-
-	return (result);
-}
-
-void
-irs_context_destroy(irs_context_t **contextp) {
-	irs_context_t *context;
-
-	REQUIRE(contextp != NULL);
-	context = *contextp;
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	isc_task_detach(&context->task);
-	irs_dnsconf_destroy(&context->dnsconf);
-	irs_resconf_destroy(&context->resconf);
-	dns_client_destroy(&context->dnsclient);
-
-	ctxs_destroy(NULL, &context->actx, &context->taskmgr,
-		     &context->socketmgr, &context->timermgr);
-
-	context->magic = 0;
-
-	isc_mem_putanddetach(&context->mctx, context, sizeof(*context));
-
-	*contextp = NULL;
-
-#ifndef ISC_PLATFORM_USETHREADS
-	irs_g_context = NULL;
-#else
-	(void)isc_thread_key_setspecific(irs_context_key, NULL);
-#endif
-}
-
-isc_mem_t *
-irs_context_getmctx(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->mctx);
-}
-
-isc_appctx_t *
-irs_context_getappctx(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->actx);
-}
-
-isc_taskmgr_t *
-irs_context_gettaskmgr(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->taskmgr);
-}
-
-isc_timermgr_t *
-irs_context_gettimermgr(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->timermgr);
-}
-
-isc_task_t *
-irs_context_gettask(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->task);
-}
-
-dns_client_t *
-irs_context_getdnsclient(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->dnsclient);
-}
-
-irs_resconf_t *
-irs_context_getresconf(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->resconf);
-}
-
-irs_dnsconf_t *
-irs_context_getdnsconf(irs_context_t *context) {
-	REQUIRE(IRS_CONTEXT_VALID(context));
-
-	return (context->dnsconf);
-}
diff --git a/usr.sbin/bind/lib/irs/dnsconf.c b/usr.sbin/bind/lib/irs/dnsconf.c
deleted file mode 100644
index bf873ce15c3..00000000000
--- a/usr.sbin/bind/lib/irs/dnsconf.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: dnsconf.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-#include <config.h>
-
-#include <string.h>
-
-#include <isc/base64.h>
-#include <isc/buffer.h>
-#include <isc/file.h>
-#include <isc/mem.h>
-#include <isc/util.h>
-
-#include <isccfg/dnsconf.h>
-
-#include <dns/fixedname.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdatastruct.h>
-
-#include <irs/dnsconf.h>
-
-#define IRS_DNSCONF_MAGIC		ISC_MAGIC('D', 'c', 'f', 'g')
-#define IRS_DNSCONF_VALID(c)		ISC_MAGIC_VALID(c, IRS_DNSCONF_MAGIC)
-
-/*!
- * configuration data structure
- */
-
-struct irs_dnsconf {
-	unsigned int magic;
-	isc_mem_t *mctx;
-	irs_dnsconf_dnskeylist_t trusted_keylist;
-};
-
-static isc_result_t
-configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj,
-		     dns_rdataclass_t rdclass)
-{
-	isc_mem_t *mctx = conf->mctx;
-	const cfg_obj_t *keys = NULL;
-	const cfg_obj_t *key, *keylist;
-	dns_fixedname_t fkeyname;
-	dns_name_t *keyname_base, *keyname;
-	const cfg_listelt_t *element, *element2;
-	isc_result_t result;
-	isc_uint32_t flags, proto, alg;
-	const char *keystr, *keynamestr;
-	unsigned char keydata[4096];
-	isc_buffer_t keydatabuf_base, *keydatabuf;
-	dns_rdata_dnskey_t keystruct;
-	unsigned char rrdata[4096];
-	isc_buffer_t rrdatabuf;
-	isc_region_t r;
-	isc_buffer_t namebuf;
-	irs_dnsconf_dnskey_t *keyent;
-
-	cfg_map_get(cfgobj, "trusted-keys", &keys);
-	if (keys == NULL)
-		return (ISC_R_SUCCESS);
-
-	for (element = cfg_list_first(keys);
-	     element != NULL;
-	     element = cfg_list_next(element)) {
-		keylist = cfg_listelt_value(element);
-		for (element2 = cfg_list_first(keylist);
-		     element2 != NULL;
-		     element2 = cfg_list_next(element2))
-		{
-			keydatabuf = NULL;
-			keyname = NULL;
-
-			key = cfg_listelt_value(element2);
-
-			flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags"));
-			proto = cfg_obj_asuint32(cfg_tuple_get(key,
-							       "protocol"));
-			alg = cfg_obj_asuint32(cfg_tuple_get(key,
-							     "algorithm"));
-			keynamestr = cfg_obj_asstring(cfg_tuple_get(key,
-								    "name"));
-
-			keystruct.common.rdclass = rdclass;
-			keystruct.common.rdtype = dns_rdatatype_dnskey;
-			keystruct.mctx = NULL;
-			ISC_LINK_INIT(&keystruct.common, link);
-
-			if (flags > 0xffff)
-				return (ISC_R_RANGE);
-			if (proto > 0xff)
-				return (ISC_R_RANGE);
-			if (alg > 0xff)
-				return (ISC_R_RANGE);
-			keystruct.flags = (isc_uint16_t)flags;
-			keystruct.protocol = (isc_uint8_t)proto;
-			keystruct.algorithm = (isc_uint8_t)alg;
-
-			isc_buffer_init(&keydatabuf_base, keydata,
-					sizeof(keydata));
-			isc_buffer_init(&rrdatabuf, rrdata, sizeof(rrdata));
-
-			/* Configure key value */
-			keystr = cfg_obj_asstring(cfg_tuple_get(key, "key"));
-			result = isc_base64_decodestring(keystr,
-							 &keydatabuf_base);
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			isc_buffer_usedregion(&keydatabuf_base, &r);
-			keystruct.datalen = r.length;
-			keystruct.data = r.base;
-
-			result = dns_rdata_fromstruct(NULL,
-						      keystruct.common.rdclass,
-						      keystruct.common.rdtype,
-						      &keystruct, &rrdatabuf);
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			isc_buffer_usedregion(&rrdatabuf, &r);
-			result = isc_buffer_allocate(mctx, &keydatabuf,
-						     r.length);
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			result = isc_buffer_copyregion(keydatabuf, &r);
-			if (result != ISC_R_SUCCESS)
-				goto cleanup;
-
-			/* Configure key name */
-			dns_fixedname_init(&fkeyname);
-			keyname_base = dns_fixedname_name(&fkeyname);
-			isc_buffer_constinit(&namebuf, keynamestr,
-					     strlen(keynamestr));
-			isc_buffer_add(&namebuf, strlen(keynamestr));
-			result = dns_name_fromtext(keyname_base, &namebuf,
-						   dns_rootname, 0, NULL);
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			keyname = isc_mem_get(mctx, sizeof(*keyname));
-			if (keyname == NULL) {
-				result = ISC_R_NOMEMORY;
-				goto cleanup;
-			}
-			dns_name_init(keyname, NULL);
-			result = dns_name_dup(keyname_base, mctx, keyname);
-			if (result != ISC_R_SUCCESS)
-				goto cleanup;
-
-			/* Add the key data to the list */
-			keyent = isc_mem_get(mctx, sizeof(*keyent));
-			if (keyent == NULL) {
-				dns_name_free(keyname, mctx);
-				result = ISC_R_NOMEMORY;
-				goto cleanup;
-			}
-			keyent->keyname = keyname;
-			keyent->keydatabuf = keydatabuf;
-
-			ISC_LIST_APPEND(conf->trusted_keylist, keyent, link);
-		}
-	}
-
-	return (ISC_R_SUCCESS);
-
- cleanup:
-	if (keydatabuf != NULL)
-		isc_buffer_free(&keydatabuf);
-	if (keyname != NULL)
-		isc_mem_put(mctx, keyname, sizeof(*keyname));
-
-	return (result);
-}
-
-isc_result_t
-irs_dnsconf_load(isc_mem_t *mctx, const char *filename, irs_dnsconf_t **confp)
-{
-	irs_dnsconf_t *conf;
-	cfg_parser_t *parser = NULL;
-	cfg_obj_t *cfgobj = NULL;
-	isc_result_t result = ISC_R_SUCCESS;
-
-	REQUIRE(confp != NULL && *confp == NULL);
-
-	conf = isc_mem_get(mctx, sizeof(*conf));
-	if (conf == NULL)
-		return (ISC_R_NOMEMORY);
-
-	conf->mctx = mctx;
-	ISC_LIST_INIT(conf->trusted_keylist);
-
-	/*
-	 * If the specified file does not exist, we'll simply with an empty
-	 * configuration.
-	 */
-	if (!isc_file_exists(filename))
-		goto cleanup;
-
-	result = cfg_parser_create(mctx, NULL, &parser);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
-
-	result = cfg_parse_file(parser, filename, &cfg_type_dnsconf,
-				&cfgobj);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
-
-	result = configure_dnsseckeys(conf, cfgobj, dns_rdataclass_in);
-
- cleanup:
-	if (parser != NULL) {
-		if (cfgobj != NULL)
-			cfg_obj_destroy(parser, &cfgobj);
-		cfg_parser_destroy(&parser);
-	}
-
-	conf->magic = IRS_DNSCONF_MAGIC;
-
-	if (result == ISC_R_SUCCESS)
-		*confp = conf;
-	else
-		irs_dnsconf_destroy(&conf);
-
-	return (result);
-}
-
-void
-irs_dnsconf_destroy(irs_dnsconf_t **confp) {
-	irs_dnsconf_t *conf;
-	irs_dnsconf_dnskey_t *keyent;
-
-	REQUIRE(confp != NULL);
-	conf = *confp;
-	REQUIRE(IRS_DNSCONF_VALID(conf));
-
-	while ((keyent = ISC_LIST_HEAD(conf->trusted_keylist)) != NULL) {
-		ISC_LIST_UNLINK(conf->trusted_keylist, keyent, link);
-
-		isc_buffer_free(&keyent->keydatabuf);
-		dns_name_free(keyent->keyname, conf->mctx);
-		isc_mem_put(conf->mctx, keyent->keyname, sizeof(dns_name_t));
-		isc_mem_put(conf->mctx, keyent, sizeof(*keyent));
-	}
-
-	isc_mem_put(conf->mctx, conf, sizeof(*conf));
-
-	*confp = NULL;
-}
-
-irs_dnsconf_dnskeylist_t *
-irs_dnsconf_gettrustedkeys(irs_dnsconf_t *conf) {
-	REQUIRE(IRS_DNSCONF_VALID(conf));
-
-	return (&conf->trusted_keylist);
-}
diff --git a/usr.sbin/bind/lib/irs/gai_strerror.c b/usr.sbin/bind/lib/irs/gai_strerror.c
deleted file mode 100644
index ff92d883e9c..00000000000
--- a/usr.sbin/bind/lib/irs/gai_strerror.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: gai_strerror.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file gai_strerror.c
- * gai_strerror() returns an error message corresponding to an
- * error code returned by getaddrinfo() and getnameinfo(). The following error
- * codes and their meaning are defined in
- * \link netdb.h include/irs/netdb.h.\endlink
- * This implementation is almost an exact copy of lwres/gai_sterror.c except
- * that it catches up the latest API standard, RFC3493.
- *
- * \li #EAI_ADDRFAMILY address family for hostname not supported
- * \li #EAI_AGAIN temporary failure in name resolution
- * \li #EAI_BADFLAGS invalid value for ai_flags
- * \li #EAI_FAIL non-recoverable failure in name resolution
- * \li #EAI_FAMILY ai_family not supported
- * \li #EAI_MEMORY memory allocation failure
- * \li #EAI_NODATA no address associated with hostname (obsoleted in RFC3493)
- * \li #EAI_NONAME hostname nor servname provided, or not known
- * \li #EAI_SERVICE servname not supported for ai_socktype
- * \li #EAI_SOCKTYPE ai_socktype not supported
- * \li #EAI_SYSTEM system error returned in errno
- * \li #EAI_BADHINTS Invalid value for hints (non-standard)
- * \li #EAI_PROTOCOL Resolved protocol is unknown (non-standard)
- * \li #EAI_OVERFLOW Argument buffer overflow
- * \li #EAI_INSECUREDATA Insecure Data (experimental)
- *
- * The message invalid error code is returned if ecode is out of range.
- *
- * ai_flags, ai_family and ai_socktype are elements of the struct
- * addrinfo used by lwres_getaddrinfo().
- *
- * \section gai_strerror_see See Also
- *
- * strerror(), getaddrinfo(), getnameinfo(), RFC3493.
- */
-#include <config.h>
-
-#include <isc/net.h>
-
-#include <irs/netdb.h>
-
-/*% Text of error messages. */
-static const char *gai_messages[] = {
-	"no error",
-	"address family for hostname not supported",
-	"temporary failure in name resolution",
-	"invalid value for ai_flags",
-	"non-recoverable failure in name resolution",
-	"ai_family not supported",
-	"memory allocation failure",
-	"no address associated with hostname",
-	"hostname nor servname provided, or not known",
-	"servname not supported for ai_socktype",
-	"ai_socktype not supported",
-	"system error returned in errno",
-	"bad hints",
-	"bad protocol",
-	"argument buffer overflow",
-	"insecure data provided"
-};
-
-/*%
- * Returns an error message corresponding to an error code returned by
- * getaddrinfo() and getnameinfo()
- */
-IRS_GAISTRERROR_RETURN_T
-gai_strerror(int ecode) {
-	union {
-		const char *const_ptr;
-		char *deconst_ptr;
-	} ptr;
-
-	if ((ecode < 0) ||
-	    (ecode >= (int)(sizeof(gai_messages)/sizeof(*gai_messages))))
-		ptr.const_ptr = "invalid error code";
-	else
-		ptr.const_ptr = gai_messages[ecode];
-	return (ptr.deconst_ptr);
-}
diff --git a/usr.sbin/bind/lib/irs/getaddrinfo.c b/usr.sbin/bind/lib/irs/getaddrinfo.c
deleted file mode 100644
index 96c3fe4b7b2..00000000000
--- a/usr.sbin/bind/lib/irs/getaddrinfo.c
+++ /dev/null
@@ -1,1316 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: getaddrinfo.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-/**
- *    getaddrinfo() is used to get a list of IP addresses and port
- *    numbers for host hostname and service servname as defined in RFC3493.
- *    hostname and servname are pointers to null-terminated strings
- *    or NULL. hostname is either a host name or a numeric host address
- *    string: a dotted decimal IPv4 address or an IPv6 address. servname is
- *    either a decimal port number or a service name as listed in
- *    /etc/services.
- *
- *    If the operating system does not provide a struct addrinfo, the
- *    following structure is used:
- *
- * \code
- * struct  addrinfo {
- *         int             ai_flags;       // AI_PASSIVE, AI_CANONNAME
- *         int             ai_family;      // PF_xxx
- *         int             ai_socktype;    // SOCK_xxx
- *         int             ai_protocol;    // 0 or IPPROTO_xxx for IPv4 and IPv6
- *         size_t          ai_addrlen;     // length of ai_addr
- *         char            *ai_canonname;  // canonical name for hostname
- *         struct sockaddr *ai_addr;       // binary address
- *         struct addrinfo *ai_next;       // next structure in linked list
- * };
- * \endcode
- *
- *
- *    hints is an optional pointer to a struct addrinfo. This structure can
- *    be used to provide hints concerning the type of socket that the caller
- *    supports or wishes to use. The caller can supply the following
- *    structure elements in *hints:
- *
- * <ul>
- *    <li>ai_family:
- *           The protocol family that should be used. When ai_family is set
- *           to PF_UNSPEC, it means the caller will accept any protocol
- *           family supported by the operating system.</li>
- *
- *    <li>ai_socktype:
- *           denotes the type of socket -- SOCK_STREAM, SOCK_DGRAM or
- *           SOCK_RAW -- that is wanted. When ai_socktype is zero the caller
- *           will accept any socket type.</li>
- *
- *    <li>ai_protocol:
- *           indicates which transport protocol is wanted: IPPROTO_UDP or
- *           IPPROTO_TCP. If ai_protocol is zero the caller will accept any
- *           protocol.</li>
- *
- *    <li>ai_flags:
- *           Flag bits. If the AI_CANONNAME bit is set, a successful call to
- *           getaddrinfo() will return a null-terminated string
- *           containing the canonical name of the specified hostname in
- *           ai_canonname of the first addrinfo structure returned. Setting
- *           the AI_PASSIVE bit indicates that the returned socket address
- *           structure is intended for used in a call to bind(2). In this
- *           case, if the hostname argument is a NULL pointer, then the IP
- *           address portion of the socket address structure will be set to
- *           INADDR_ANY for an IPv4 address or IN6ADDR_ANY_INIT for an IPv6
- *           address.<br /><br />
- *
- *           When ai_flags does not set the AI_PASSIVE bit, the returned
- *           socket address structure will be ready for use in a call to
- *           connect(2) for a connection-oriented protocol or connect(2),
- *           sendto(2), or sendmsg(2) if a connectionless protocol was
- *           chosen. The IP address portion of the socket address structure
- *           will be set to the loopback address if hostname is a NULL
- *           pointer and AI_PASSIVE is not set in ai_flags.<br /><br />
- *
- *           If ai_flags is set to AI_NUMERICHOST it indicates that hostname
- *           should be treated as a numeric string defining an IPv4 or IPv6
- *           address and no name resolution should be attempted.
- * </li></ul>
- *
- *    All other elements of the struct addrinfo passed via hints must be
- *    zero.
- *
- *    A hints of NULL is treated as if the caller provided a struct addrinfo
- *    initialized to zero with ai_familyset to PF_UNSPEC.
- *
- *    After a successful call to getaddrinfo(), *res is a pointer to a
- *    linked list of one or more addrinfo structures. Each struct addrinfo
- *    in this list cn be processed by following the ai_next pointer, until a
- *    NULL pointer is encountered. The three members ai_family, ai_socktype,
- *    and ai_protocol in each returned addrinfo structure contain the
- *    corresponding arguments for a call to socket(2). For each addrinfo
- *    structure in the list, the ai_addr member points to a filled-in socket
- *    address structure of length ai_addrlen.
- *
- *    All of the information returned by getaddrinfo() is dynamically
- *    allocated: the addrinfo structures, and the socket address structures
- *    and canonical host name strings pointed to by the addrinfostructures.
- *    Memory allocated for the dynamically allocated structures created by a
- *    successful call to getaddrinfo() is released by freeaddrinfo().
- *    ai is a pointer to a struct addrinfo created by a call to getaddrinfo().
- *
- * \section irsreturn RETURN VALUES
- *
- *    getaddrinfo() returns zero on success or one of the error codes
- *    listed in gai_strerror() if an error occurs. If both hostname and
- *    servname are NULL getaddrinfo() returns #EAI_NONAME.
- *
- * \section irssee SEE ALSO
- *
- *    getaddrinfo(), freeaddrinfo(),
- *    gai_strerror(), RFC3493, getservbyname(3), connect(2),
- *    sendto(2), sendmsg(2), socket(2).
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include <isc/app.h>
-#include <isc/buffer.h>
-#include <isc/lib.h>
-#include <isc/mem.h>
-#include <isc/print.h>
-#include <isc/sockaddr.h>
-#include <isc/string.h>
-#include <isc/util.h>
-#include <isc/mutex.h>
-
-#include <dns/client.h>
-#include <dns/fixedname.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataset.h>
-#include <dns/rdatastruct.h>
-#include <dns/rdatatype.h>
-#include <dns/result.h>
-
-#include <irs/context.h>
-#include <irs/netdb.h>
-#include <irs/resconf.h>
-
-#define SA(addr)	((struct sockaddr *)(addr))
-#define SIN(addr)	((struct sockaddr_in *)(addr))
-#define SIN6(addr)	((struct sockaddr_in6 *)(addr))
-#define SLOCAL(addr)	((struct sockaddr_un *)(addr))
-
-/*! \struct addrinfo
- */
-static struct addrinfo
-	*ai_concat(struct addrinfo *ai1, struct addrinfo *ai2),
-	*ai_reverse(struct addrinfo *oai),
-	*ai_clone(struct addrinfo *oai, int family),
-	*ai_alloc(int family, int addrlen);
-#ifdef AF_LOCAL
-static int get_local(const char *name, int socktype, struct addrinfo **res);
-#endif
-
-static int
-resolve_name(int family, const char *hostname, int flags,
-	     struct addrinfo **aip, int socktype, int port);
-
-static int add_ipv4(const char *hostname, int flags, struct addrinfo **aip,
-		    int socktype, int port);
-static int add_ipv6(const char *hostname, int flags, struct addrinfo **aip,
-		    int socktype, int port);
-static void set_order(int, int (**)(const char *, int, struct addrinfo **,
-				    int, int));
-static void _freeaddrinfo(struct addrinfo *ai);
-
-#define FOUND_IPV4	0x1
-#define FOUND_IPV6	0x2
-#define FOUND_MAX	2
-
-#define ISC_AI_MASK (AI_PASSIVE|AI_CANONNAME|AI_NUMERICHOST)
-/*%
- * Get a list of IP addresses and port numbers for host hostname and
- * service servname.
- */
-int
-getaddrinfo(const char *hostname, const char *servname,
-	    const struct addrinfo *hints, struct addrinfo **res)
-{
-	struct servent *sp;
-	const char *proto;
-	int family, socktype, flags, protocol;
-	struct addrinfo *ai, *ai_list;
-	int err = 0;
-	int port, i;
-	int (*net_order[FOUND_MAX+1])(const char *, int, struct addrinfo **,
-				      int, int);
-
-	if (hostname == NULL && servname == NULL)
-		return (EAI_NONAME);
-
-	proto = NULL;
-	if (hints != NULL) {
-		if ((hints->ai_flags & ~(ISC_AI_MASK)) != 0)
-			return (EAI_BADFLAGS);
-		if (hints->ai_addrlen || hints->ai_canonname ||
-		    hints->ai_addr || hints->ai_next) {
-			errno = EINVAL;
-			return (EAI_SYSTEM);
-		}
-		family = hints->ai_family;
-		socktype = hints->ai_socktype;
-		protocol = hints->ai_protocol;
-		flags = hints->ai_flags;
-		switch (family) {
-		case AF_UNSPEC:
-			switch (hints->ai_socktype) {
-			case SOCK_STREAM:
-				proto = "tcp";
-				break;
-			case SOCK_DGRAM:
-				proto = "udp";
-				break;
-			}
-			break;
-		case AF_INET:
-		case AF_INET6:
-			switch (hints->ai_socktype) {
-			case 0:
-				break;
-			case SOCK_STREAM:
-				proto = "tcp";
-				break;
-			case SOCK_DGRAM:
-				proto = "udp";
-				break;
-			case SOCK_RAW:
-				break;
-			default:
-				return (EAI_SOCKTYPE);
-			}
-			break;
-#ifdef	AF_LOCAL
-		case AF_LOCAL:
-			switch (hints->ai_socktype) {
-			case 0:
-				break;
-			case SOCK_STREAM:
-				break;
-			case SOCK_DGRAM:
-				break;
-			default:
-				return (EAI_SOCKTYPE);
-			}
-			break;
-#endif
-		default:
-			return (EAI_FAMILY);
-		}
-	} else {
-		protocol = 0;
-		family = 0;
-		socktype = 0;
-		flags = 0;
-	}
-
-#ifdef	AF_LOCAL
-	/*!
-	 * First, deal with AF_LOCAL.  If the family was not set,
-	 * then assume AF_LOCAL if the first character of the
-	 * hostname/servname is '/'.
-	 */
-
-	if (hostname != NULL &&
-	    (family == AF_LOCAL || (family == 0 && *hostname == '/')))
-		return (get_local(hostname, socktype, res));
-
-	if (servname != NULL &&
-	    (family == AF_LOCAL || (family == 0 && *servname == '/')))
-		return (get_local(servname, socktype, res));
-#endif
-
-	/*
-	 * Ok, only AF_INET and AF_INET6 left.
-	 */
-	ai_list = NULL;
-
-	/*
-	 * First, look up the service name (port) if it was
-	 * requested.  If the socket type wasn't specified, then
-	 * try and figure it out.
-	 */
-	if (servname != NULL) {
-		char *e;
-
-		port = strtol(servname, &e, 10);
-		if (*e == '\0') {
-			if (socktype == 0)
-				return (EAI_SOCKTYPE);
-			if (port < 0 || port > 65535)
-				return (EAI_SERVICE);
-			port = htons((unsigned short) port);
-		} else {
-			sp = getservbyname(servname, proto);
-			if (sp == NULL)
-				return (EAI_SERVICE);
-			port = sp->s_port;
-			if (socktype == 0) {
-				if (strcmp(sp->s_proto, "tcp") == 0)
-					socktype = SOCK_STREAM;
-				else if (strcmp(sp->s_proto, "udp") == 0)
-					socktype = SOCK_DGRAM;
-			}
-		}
-	} else
-		port = 0;
-
-	/*
-	 * Next, deal with just a service name, and no hostname.
-	 * (we verified that one of them was non-null up above).
-	 */
-	if (hostname == NULL && (flags & AI_PASSIVE) != 0) {
-		if (family == AF_INET || family == 0) {
-			ai = ai_alloc(AF_INET, sizeof(struct sockaddr_in));
-			if (ai == NULL)
-				return (EAI_MEMORY);
-			ai->ai_socktype = socktype;
-			ai->ai_protocol = protocol;
-			SIN(ai->ai_addr)->sin_port = port;
-			ai->ai_next = ai_list;
-			ai_list = ai;
-		}
-
-		if (family == AF_INET6 || family == 0) {
-			ai = ai_alloc(AF_INET6, sizeof(struct sockaddr_in6));
-			if (ai == NULL) {
-				_freeaddrinfo(ai_list);
-				return (EAI_MEMORY);
-			}
-			ai->ai_socktype = socktype;
-			ai->ai_protocol = protocol;
-			SIN6(ai->ai_addr)->sin6_port = port;
-			ai->ai_next = ai_list;
-			ai_list = ai;
-		}
-
-		*res = ai_list;
-		return (0);
-	}
-
-	/*
-	 * If the family isn't specified or AI_NUMERICHOST specified, check
-	 * first to see if it is a numeric address.
-	 * Though the gethostbyname2() routine will recognize numeric addresses,
-	 * it will only recognize the format that it is being called for.  Thus,
-	 * a numeric AF_INET address will be treated by the AF_INET6 call as
-	 * a domain name, and vice versa.  Checking for both numerics here
-	 * avoids that.
-	 */
-	if (hostname != NULL &&
-	    (family == 0 || (flags & AI_NUMERICHOST) != 0)) {
-		char abuf[sizeof(struct in6_addr)];
-		char nbuf[NI_MAXHOST];
-		int addrsize, addroff;
-#ifdef IRS_HAVE_SIN6_SCOPE_ID
-		char *p, *ep;
-		char ntmp[NI_MAXHOST];
-		isc_uint32_t scopeid;
-#endif
-
-#ifdef IRS_HAVE_SIN6_SCOPE_ID
-		/*
-		 * Scope identifier portion.
-		 */
-		ntmp[0] = '\0';
-		if (strchr(hostname, '%') != NULL) {
-			strlcpy(ntmp, hostname, sizeof(ntmp));
-			p = strchr(ntmp, '%');
-			ep = NULL;
-
-			/*
-			 * Vendors may want to support non-numeric
-			 * scopeid around here.
-			 */
-
-			if (p != NULL)
-				scopeid = (isc_uint32_t)strtoul(p + 1,
-								&ep, 10);
-			if (p != NULL && ep != NULL && ep[0] == '\0')
-				*p = '\0';
-			else {
-				ntmp[0] = '\0';
-				scopeid = 0;
-			}
-		} else
-			scopeid = 0;
-#endif
-
-		if (inet_pton(AF_INET, hostname, (struct in_addr *)abuf)
-		    == 1) {
-			if (family == AF_INET6) {
-				/*
-				 * Convert to a V4 mapped address.
-				 */
-				struct in6_addr *a6 = (struct in6_addr *)abuf;
-				memmove(&a6->s6_addr[12], &a6->s6_addr[0], 4);
-				memset(&a6->s6_addr[10], 0xff, 2);
-				memset(&a6->s6_addr[0], 0, 10);
-				goto inet6_addr;
-			}
-			addrsize = sizeof(struct in_addr);
-			addroff = offsetof(struct sockaddr_in, sin_addr);
-			family = AF_INET;
-			goto common;
-#ifdef IRS_HAVE_SIN6_SCOPE_ID
-		} else if (ntmp[0] != '\0' &&
-			   inet_pton(AF_INET6, ntmp, abuf) == 1) {
-			if (family && family != AF_INET6)
-				return (EAI_NONAME);
-			addrsize = sizeof(struct in6_addr);
-			addroff = offsetof(struct sockaddr_in6, sin6_addr);
-			family = AF_INET6;
-			goto common;
-#endif
-		} else if (inet_pton(AF_INET6, hostname, abuf) == 1) {
-			if (family != 0 && family != AF_INET6)
-				return (EAI_NONAME);
-		inet6_addr:
-			addrsize = sizeof(struct in6_addr);
-			addroff = offsetof(struct sockaddr_in6, sin6_addr);
-			family = AF_INET6;
-
-		common:
-			ai = ai_alloc(family,
-				      ((family == AF_INET6) ?
-				       sizeof(struct sockaddr_in6) :
-				       sizeof(struct sockaddr_in)));
-			if (ai == NULL)
-				return (EAI_MEMORY);
-			ai_list = ai;
-			ai->ai_socktype = socktype;
-			SIN(ai->ai_addr)->sin_port = port;
-			memmove((char *)ai->ai_addr + addroff, abuf, addrsize);
-			if ((flags & AI_CANONNAME) != 0) {
-#ifdef IRS_HAVE_SIN6_SCOPE_ID
-				if (ai->ai_family == AF_INET6)
-					SIN6(ai->ai_addr)->sin6_scope_id =
-						scopeid;
-#endif
-				if (getnameinfo(ai->ai_addr,
-						(socklen_t)ai->ai_addrlen,
-						nbuf, sizeof(nbuf), NULL, 0,
-						NI_NUMERICHOST) == 0) {
-					ai->ai_canonname = strdup(nbuf);
-					if (ai->ai_canonname == NULL) {
-						_freeaddrinfo(ai);
-						return (EAI_MEMORY);
-					}
-				} else {
-					/* XXX raise error? */
-					ai->ai_canonname = NULL;
-				}
-			}
-			goto done;
-		} else if ((flags & AI_NUMERICHOST) != 0) {
-			return (EAI_NONAME);
-		}
-	}
-
-	if (hostname == NULL && (flags & AI_PASSIVE) == 0) {
-		set_order(family, net_order);
-		for (i = 0; i < FOUND_MAX; i++) {
-			if (net_order[i] == NULL)
-				break;
-			err = (net_order[i])(hostname, flags, &ai_list,
-					     socktype, port);
-			if (err != 0) {
-				if (ai_list != NULL) {
-					_freeaddrinfo(ai_list);
-					ai_list = NULL;
-				}
-				break;
-			}
-		}
-	} else
-		err = resolve_name(family, hostname, flags, &ai_list,
-				   socktype, port);
-
-	if (ai_list == NULL) {
-		if (err == 0)
-			err = EAI_NONAME;
-		return (err);
-	}
-
-done:
-	ai_list = ai_reverse(ai_list);
-
-	*res = ai_list;
-	return (0);
-}
-
-typedef struct gai_restrans {
-	dns_clientrestrans_t	*xid;
-	isc_boolean_t		is_inprogress;
-	int			error;
-	struct addrinfo		ai_sentinel;
-	struct gai_resstate	*resstate;
-} gai_restrans_t;
-
-typedef struct gai_resstate {
-	isc_mem_t			*mctx;
-	struct gai_statehead		*head;
-	dns_fixedname_t			fixedname;
-	dns_name_t			*qname;
-	gai_restrans_t			*trans4;
-	gai_restrans_t			*trans6;
-	ISC_LINK(struct gai_resstate)	link;
-} gai_resstate_t;
-
-typedef struct gai_statehead {
-	int				ai_family;
-	int				ai_flags;
-	int				ai_socktype;
-	int				ai_port;
-	isc_appctx_t			*actx;
-	dns_client_t			*dnsclient;
-	isc_mutex_t			list_lock;
-	ISC_LIST(struct gai_resstate)	resstates;
-	unsigned int			activestates;
-} gai_statehead_t;
-
-static isc_result_t
-make_resstate(isc_mem_t *mctx, gai_statehead_t *head, const char *hostname,
-	      const char *domain, gai_resstate_t **statep)
-{
-	isc_result_t result;
-	gai_resstate_t *state;
-	dns_fixedname_t fixeddomain;
-	dns_name_t *qdomain;
-	unsigned int namelen;
-	isc_buffer_t b;
-	isc_boolean_t need_v4 = ISC_FALSE;
-	isc_boolean_t need_v6 = ISC_FALSE;
-
-	state = isc_mem_get(mctx, sizeof(*state));
-	if (state == NULL)
-		return (ISC_R_NOMEMORY);
-
-	/* Construct base domain name */
-	namelen = strlen(domain);
-	isc_buffer_constinit(&b, domain, namelen);
-	isc_buffer_add(&b, namelen);
-	dns_fixedname_init(&fixeddomain);
-	qdomain = dns_fixedname_name(&fixeddomain);
-	result = dns_name_fromtext(qdomain, &b, dns_rootname, 0, NULL);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(mctx, state, sizeof(*state));
-		return (result);
-	}
-
-	/* Construct query name */
-	namelen = strlen(hostname);
-	isc_buffer_constinit(&b, hostname, namelen);
-	isc_buffer_add(&b, namelen);
-	dns_fixedname_init(&state->fixedname);
-	state->qname = dns_fixedname_name(&state->fixedname);
-	result = dns_name_fromtext(state->qname, &b, qdomain, 0, NULL);
-	if (result != ISC_R_SUCCESS) {
-		isc_mem_put(mctx, state, sizeof(*state));
-		return (result);
-	}
-
-	if (head->ai_family == AF_UNSPEC || head->ai_family == AF_INET)
-		need_v4 = ISC_TRUE;
-	if (head->ai_family == AF_UNSPEC || head->ai_family == AF_INET6)
-		need_v6 = ISC_TRUE;
-
-	state->trans6 = NULL;
-	state->trans4 = NULL;
-	if (need_v4) {
-		state->trans4 = isc_mem_get(mctx, sizeof(gai_restrans_t));
-		if (state->trans4 == NULL) {
-			isc_mem_put(mctx, state, sizeof(*state));
-			return (ISC_R_NOMEMORY);
-		}
-		state->trans4->error = 0;
-		state->trans4->xid = NULL;
-		state->trans4->resstate = state;
-		state->trans4->is_inprogress = ISC_TRUE;
-		state->trans4->ai_sentinel.ai_next = NULL;
-	}
-	if (need_v6) {
-		state->trans6 = isc_mem_get(mctx, sizeof(gai_restrans_t));
-		if (state->trans6 == NULL) {
-			if (state->trans4 != NULL)
-				isc_mem_put(mctx, state->trans4,
-					    sizeof(*state->trans4));
-			isc_mem_put(mctx, state, sizeof(*state));
-			return (ISC_R_NOMEMORY);
-		}
-		state->trans6->error = 0;
-		state->trans6->xid = NULL;
-		state->trans6->resstate = state;
-		state->trans6->is_inprogress = ISC_TRUE;
-		state->trans6->ai_sentinel.ai_next = NULL;
-	}
-
-	state->mctx = mctx;
-	state->head = head;
-	ISC_LINK_INIT(state, link);
-
-	*statep = state;
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-make_resstates(isc_mem_t *mctx, const char *hostname, gai_statehead_t *head,
-	       irs_resconf_t *resconf)
-{
-	isc_result_t result;
-	irs_resconf_searchlist_t *searchlist;
-	irs_resconf_search_t *searchent;
-	gai_resstate_t *resstate, *resstate0;
-
-	resstate0 = NULL;
-	result = make_resstate(mctx, head, hostname, ".", &resstate0);
-	if (result != ISC_R_SUCCESS)
-		return (result);
-
-	searchlist = irs_resconf_getsearchlist(resconf);
-	for (searchent = ISC_LIST_HEAD(*searchlist); searchent != NULL;
-	     searchent = ISC_LIST_NEXT(searchent, link)) {
-		resstate = NULL;
-		result = make_resstate(mctx, head, hostname,
-				       (const char *)searchent->domain,
-				       &resstate);
-		if (result != ISC_R_SUCCESS)
-			break;
-
-		ISC_LIST_APPEND(head->resstates, resstate, link);
-		head->activestates++;
-	}
-
-	/*
-	 * Insert the original hostname either at the head or the tail of the
-	 * state list, depending on the number of labels contained in the
-	 * original name and the 'ndots' configuration parameter.
-	 */
-	if (dns_name_countlabels(resstate0->qname) >
-	    irs_resconf_getndots(resconf) + 1) {
-		ISC_LIST_PREPEND(head->resstates, resstate0, link);
-	} else
-		ISC_LIST_APPEND(head->resstates, resstate0, link);
-	head->activestates++;
-
-	if (result != ISC_R_SUCCESS) {
-		while ((resstate = ISC_LIST_HEAD(head->resstates)) != NULL) {
-			ISC_LIST_UNLINK(head->resstates, resstate, link);
-			if (resstate->trans4 != NULL) {
-				isc_mem_put(mctx, resstate->trans4,
-					    sizeof(*resstate->trans4));
-			}
-			if (resstate->trans6 != NULL) {
-				isc_mem_put(mctx, resstate->trans6,
-					    sizeof(*resstate->trans6));
-			}
-
-			isc_mem_put(mctx, resstate, sizeof(*resstate));
-		}
-	}
-
-	return (result);
-}
-
-static void
-process_answer(isc_task_t *task, isc_event_t *event) {
-	int error = 0, family;
-	gai_restrans_t *trans = event->ev_arg;
-	gai_resstate_t *resstate;
-	dns_clientresevent_t *rev = (dns_clientresevent_t *)event;
-	dns_rdatatype_t qtype;
-	dns_name_t *name;
-	isc_boolean_t wantcname;
-
-	REQUIRE(trans != NULL);
-	resstate = trans->resstate;
-	REQUIRE(resstate != NULL);
-	REQUIRE(task != NULL);
-
-	if (trans == resstate->trans4) {
-		family = AF_INET;
-		qtype = dns_rdatatype_a;
-	} else {
-		INSIST(trans == resstate->trans6);
-		family = AF_INET6;
-		qtype = dns_rdatatype_aaaa;
-	}
-
-	INSIST(trans->is_inprogress);
-	trans->is_inprogress = ISC_FALSE;
-
-	switch (rev->result) {
-	case ISC_R_SUCCESS:
-	case DNS_R_NCACHENXDOMAIN: /* treat this as a fatal error? */
-	case DNS_R_NCACHENXRRSET:
-		break;
-	default:
-		switch (rev->vresult) {
-		case DNS_R_SIGINVALID:
-		case DNS_R_SIGEXPIRED:
-		case DNS_R_SIGFUTURE:
-		case DNS_R_KEYUNAUTHORIZED:
-		case DNS_R_MUSTBESECURE:
-		case DNS_R_COVERINGNSEC:
-		case DNS_R_NOTAUTHORITATIVE:
-		case DNS_R_NOVALIDKEY:
-		case DNS_R_NOVALIDDS:
-		case DNS_R_NOVALIDSIG:
-			error = EAI_INSECUREDATA;
-			break;
-		default:
-			error = EAI_FAIL;
-		}
-		goto done;
-	}
-
-	wantcname = ISC_TF((resstate->head->ai_flags & AI_CANONNAME) != 0);
-
-	/* Parse the response and construct the addrinfo chain */
-	for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL;
-	     name = ISC_LIST_NEXT(name, link)) {
-		isc_result_t result;
-		dns_rdataset_t *rdataset;
-		char cname[1024];
-
-		if (wantcname) {
-			isc_buffer_t b;
-
-			isc_buffer_init(&b, cname, sizeof(cname));
-			result = dns_name_totext(name, ISC_TRUE, &b);
-			if (result != ISC_R_SUCCESS) {
-				error = EAI_FAIL;
-				goto done;
-			}
-			isc_buffer_putuint8(&b, '\0');
-		}
-
-		for (rdataset = ISC_LIST_HEAD(name->list);
-		     rdataset != NULL;
-		     rdataset = ISC_LIST_NEXT(rdataset, link)) {
-			if (!dns_rdataset_isassociated(rdataset))
-				continue;
-			if (rdataset->type != qtype)
-				continue;
-
-			for (result = dns_rdataset_first(rdataset);
-			     result == ISC_R_SUCCESS;
-			     result = dns_rdataset_next(rdataset)) {
-				struct addrinfo *ai;
-				dns_rdata_t rdata;
-				dns_rdata_in_a_t rdata_a;
-				dns_rdata_in_aaaa_t rdata_aaaa;
-
-				ai = ai_alloc(family,
-					      ((family == AF_INET6) ?
-					       sizeof(struct sockaddr_in6) :
-					       sizeof(struct sockaddr_in)));
-				if (ai == NULL) {
-					error = EAI_MEMORY;
-					goto done;
-				}
-				ai->ai_socktype = resstate->head->ai_socktype;
-				ai->ai_next = trans->ai_sentinel.ai_next;
-				trans->ai_sentinel.ai_next = ai;
-
-				/*
-				 * Set AF-specific parameters
-				 * (IPv4/v6 address/port)
-				 */
-				dns_rdata_init(&rdata);
-				switch (family) {
-				case AF_INET:
-					dns_rdataset_current(rdataset, &rdata);
-					result = dns_rdata_tostruct(&rdata,
-								    &rdata_a,
-								    NULL);
-					RUNTIME_CHECK(result == ISC_R_SUCCESS);
-					SIN(ai->ai_addr)->sin_port =
-						resstate->head->ai_port;
-					memmove(&SIN(ai->ai_addr)->sin_addr,
-						&rdata_a.in_addr, 4);
-					dns_rdata_freestruct(&rdata_a);
-					break;
-				case AF_INET6:
-					dns_rdataset_current(rdataset, &rdata);
-					result = dns_rdata_tostruct(&rdata,
-								    &rdata_aaaa,
-								    NULL);
-					RUNTIME_CHECK(result == ISC_R_SUCCESS);
-					SIN6(ai->ai_addr)->sin6_port =
-						resstate->head->ai_port;
-					memmove(&SIN6(ai->ai_addr)->sin6_addr,
-						&rdata_aaaa.in6_addr, 16);
-					dns_rdata_freestruct(&rdata_aaaa);
-					break;
-				}
-
-				if (wantcname) {
-					ai->ai_canonname = strdup(cname);
-					if (ai->ai_canonname == NULL) {
-						error = EAI_MEMORY;
-						goto done;
-					}
-				}
-			}
-		}
-	}
-
- done:
-	dns_client_freeresanswer(resstate->head->dnsclient, &rev->answerlist);
-	dns_client_destroyrestrans(&trans->xid);
-
-	isc_event_free(&event);
-
-	/* Make sure that error == 0 iff we have a non-empty list */
-	if (error == 0) {
-		if (trans->ai_sentinel.ai_next == NULL)
-			error = EAI_NONAME;
-	} else {
-		if (trans->ai_sentinel.ai_next != NULL) {
-			_freeaddrinfo(trans->ai_sentinel.ai_next);
-			trans->ai_sentinel.ai_next = NULL;
-		}
-	}
-	trans->error = error;
-
-	/* Check whether we are done */
-	if ((resstate->trans4 == NULL || !resstate->trans4->is_inprogress) &&
-	    (resstate->trans6 == NULL || !resstate->trans6->is_inprogress)) {
-		/*
-		 * We're done for this state.  If there is no other outstanding
-		 * state, we can exit.
-		 */
-		resstate->head->activestates--;
-		if (resstate->head->activestates == 0) {
-			isc_app_ctxsuspend(resstate->head->actx);
-			return;
-		}
-
-		/*
-		 * There are outstanding states, but if we are at the head
-		 * of the state list (i.e., at the highest search priority)
-		 * and have any answer, we can stop now by canceling the
-		 * others.
-		 */
-		LOCK(&resstate->head->list_lock);
-		if (resstate == ISC_LIST_HEAD(resstate->head->resstates)) {
-			if ((resstate->trans4 != NULL &&
-			     resstate->trans4->ai_sentinel.ai_next != NULL) ||
-			    (resstate->trans6 != NULL &&
-			     resstate->trans6->ai_sentinel.ai_next != NULL)) {
-				gai_resstate_t *rest;
-
-				for (rest = ISC_LIST_NEXT(resstate, link);
-				     rest != NULL;
-				     rest = ISC_LIST_NEXT(rest, link)) {
-					if (rest->trans4 != NULL &&
-					    rest->trans4->xid != NULL)
-						dns_client_cancelresolve(
-							rest->trans4->xid);
-					if (rest->trans6 != NULL &&
-					    rest->trans6->xid != NULL)
-						dns_client_cancelresolve(
-							rest->trans6->xid);
-				}
-			} else {
-				/*
-				 * This search fails, so we move to the tail
-				 * of the list so that the next entry will
-				 * have the highest priority.
-				 */
-				ISC_LIST_UNLINK(resstate->head->resstates,
-						resstate, link);
-				ISC_LIST_APPEND(resstate->head->resstates,
-						resstate, link);
-			}
-		}
-		UNLOCK(&resstate->head->list_lock);
-	}
-}
-
-static int
-resolve_name(int family, const char *hostname, int flags,
-	     struct addrinfo **aip, int socktype, int port)
-{
-	isc_result_t result;
-	irs_context_t *irsctx;
-	irs_resconf_t *conf;
-	isc_mem_t *mctx;
-	isc_appctx_t *actx;
-	isc_task_t *task;
-	int terror = 0;
-	int error = 0;
-	dns_client_t *client;
-	gai_resstate_t *resstate;
-	gai_statehead_t head;
-	isc_boolean_t all_fail = ISC_TRUE;
-
-	/* get IRS context and the associated parameters */
-	irsctx = NULL;
-	result = irs_context_get(&irsctx);
-	if (result != ISC_R_SUCCESS)
-		return (EAI_FAIL);
-	actx = irs_context_getappctx(irsctx);
-
-	mctx = irs_context_getmctx(irsctx);
-	task = irs_context_gettask(irsctx);
-	conf = irs_context_getresconf(irsctx);
-	client = irs_context_getdnsclient(irsctx);
-
-	/* construct resolution states */
-	head.activestates = 0;
-	head.ai_family = family;
-	head.ai_socktype = socktype;
-	head.ai_flags = flags;
-	head.ai_port = port;
-	head.actx = actx;
-	head.dnsclient = client;
-	result = isc_mutex_init(&head.list_lock);
-	if (result != ISC_R_SUCCESS) {
-		return (EAI_FAIL);
-	}
-
-	ISC_LIST_INIT(head.resstates);
-	result = make_resstates(mctx, hostname, &head, conf);
-	if (result != ISC_R_SUCCESS) {
-		DESTROYLOCK(&head.list_lock);
-		return (EAI_FAIL);
-	}
-
-	LOCK(&head.list_lock);
-	for (resstate = ISC_LIST_HEAD(head.resstates);
-	     resstate != NULL; resstate = ISC_LIST_NEXT(resstate, link)) {
-		if (resstate->trans4 != NULL) {
-			result = dns_client_startresolve(client,
-							 resstate->qname,
-							 dns_rdataclass_in,
-							 dns_rdatatype_a,
-							 0, task,
-							 process_answer,
-							 resstate->trans4,
-							 &resstate->trans4->xid);
-			if (result == ISC_R_SUCCESS) {
-				resstate->trans4->is_inprogress = ISC_TRUE;
-				all_fail = ISC_FALSE;
-			} else
-				resstate->trans4->is_inprogress = ISC_FALSE;
-		}
-		if (resstate->trans6 != NULL) {
-			result = dns_client_startresolve(client,
-							 resstate->qname,
-							 dns_rdataclass_in,
-							 dns_rdatatype_aaaa,
-							 0, task,
-							 process_answer,
-							 resstate->trans6,
-							 &resstate->trans6->xid);
-			if (result == ISC_R_SUCCESS) {
-				resstate->trans6->is_inprogress = ISC_TRUE;
-				all_fail = ISC_FALSE;
-			} else
-				resstate->trans6->is_inprogress= ISC_FALSE;
-		}
-	}
-	UNLOCK(&head.list_lock);
-
-	if (!all_fail) {
-		/* Start all the events */
-		isc_app_ctxrun(actx);
-	} else
-		error = EAI_FAIL;
-
-	/* Cleanup */
-	while ((resstate = ISC_LIST_HEAD(head.resstates)) != NULL) {
-		int terror4 = 0, terror6 = 0;
-
-		ISC_LIST_UNLINK(head.resstates, resstate, link);
-
-		if (*aip == NULL) {
-			struct addrinfo *sentinel4 = NULL;
-			struct addrinfo *sentinel6 = NULL;
-
-			if (resstate->trans4 != NULL) {
-				sentinel4 =
-					resstate->trans4->ai_sentinel.ai_next;
-				resstate->trans4->ai_sentinel.ai_next = NULL;
-			}
-			if (resstate->trans6 != NULL) {
-				sentinel6 =
-					resstate->trans6->ai_sentinel.ai_next;
-				resstate->trans6->ai_sentinel.ai_next = NULL;
-			}
-			*aip = ai_concat(sentinel4, sentinel6);
-		}
-
-		if (resstate->trans4 != NULL) {
-			INSIST(resstate->trans4->xid == NULL);
-			terror4 = resstate->trans4->error;
-			isc_mem_put(mctx, resstate->trans4,
-				    sizeof(*resstate->trans4));
-		}
-		if (resstate->trans6 != NULL) {
-			INSIST(resstate->trans6->xid == NULL);
-			terror6 = resstate->trans6->error;
-			isc_mem_put(mctx, resstate->trans6,
-				    sizeof(*resstate->trans6));
-		}
-
-		/*
-		 * If the entire lookup fails, we need to choose an appropriate
-		 * error code from individual codes.  We'll try to provide as
-		 * specific a code as possible.  In general, we are going to
-		 * find an error code other than EAI_NONAME (which is too
-		 * generic and may actually not be problematic in some cases).
-		 * EAI_NONAME will be set below if no better code is found.
-		 */
-		if (terror == 0 || terror == EAI_NONAME) {
-			if (terror4 != 0 && terror4 != EAI_NONAME)
-				terror = terror4;
-			else if (terror6 != 0 && terror6 != EAI_NONAME)
-				terror = terror6;
-		}
-
-		isc_mem_put(mctx, resstate, sizeof(*resstate));
-	}
-
-	if (*aip == NULL) {
-		error = terror;
-		if (error == 0)
-			error = EAI_NONAME;
-	}
-
-#if 1	/*  XXX: enabled for finding leaks.  should be cleaned up later. */
-	isc_app_ctxfinish(actx);
-	irs_context_destroy(&irsctx);
-#endif
-
-	DESTROYLOCK(&head.list_lock);
-	return (error);
-}
-
-static char *
-irs_strsep(char **stringp, const char *delim) {
-	char *string = *stringp;
-	char *s;
-	const char *d;
-	char sc, dc;
-
-	if (string == NULL)
-		return (NULL);
-
-	for (s = string; *s != '\0'; s++) {
-		sc = *s;
-		for (d = delim; (dc = *d) != '\0'; d++)
-			if (sc == dc) {
-				*s++ = '\0';
-				*stringp = s;
-				return (string);
-			}
-	}
-	*stringp = NULL;
-	return (string);
-}
-
-static void
-set_order(int family, int (**net_order)(const char *, int, struct addrinfo **,
-					int, int))
-{
-	char *order, *tok;
-	int found;
-
-	if (family) {
-		switch (family) {
-		case AF_INET:
-			*net_order++ = add_ipv4;
-			break;
-		case AF_INET6:
-			*net_order++ = add_ipv6;
-			break;
-		}
-	} else {
-		order = getenv("NET_ORDER");
-		found = 0;
-		while (order != NULL) {
-			/*
-			 * We ignore any unknown names.
-			 */
-			tok = irs_strsep(&order, ":");
-			if (strcasecmp(tok, "inet6") == 0) {
-				if ((found & FOUND_IPV6) == 0)
-					*net_order++ = add_ipv6;
-				found |= FOUND_IPV6;
-			} else if (strcasecmp(tok, "inet") == 0 ||
-			    strcasecmp(tok, "inet4") == 0) {
-				if ((found & FOUND_IPV4) == 0)
-					*net_order++ = add_ipv4;
-				found |= FOUND_IPV4;
-			}
-		}
-
-		/*
-		 * Add in anything that we didn't find.
-		 */
-		if ((found & FOUND_IPV4) == 0)
-			*net_order++ = add_ipv4;
-		if ((found & FOUND_IPV6) == 0)
-			*net_order++ = add_ipv6;
-	}
-	*net_order = NULL;
-	return;
-}
-
-static char v4_loop[4] = { 127, 0, 0, 1 };
-
-static int
-add_ipv4(const char *hostname, int flags, struct addrinfo **aip,
-	 int socktype, int port)
-{
-	struct addrinfo *ai;
-
-	UNUSED(hostname);
-	UNUSED(flags);
-
-	ai = ai_clone(*aip, AF_INET); /* don't use ai_clone() */
-	if (ai == NULL)
-		return (EAI_MEMORY);
-
-	*aip = ai;
-	ai->ai_socktype = socktype;
-	SIN(ai->ai_addr)->sin_port = port;
-	memmove(&SIN(ai->ai_addr)->sin_addr, v4_loop, 4);
-
-	return (0);
-}
-
-static char v6_loop[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
-
-static int
-add_ipv6(const char *hostname, int flags, struct addrinfo **aip,
-	 int socktype, int port)
-{
-	struct addrinfo *ai;
-
-	UNUSED(hostname);
-	UNUSED(flags);
-
-	ai = ai_clone(*aip, AF_INET6); /* don't use ai_clone() */
-	if (ai == NULL)
-		return (EAI_MEMORY);
-
-	*aip = ai;
-	ai->ai_socktype = socktype;
-	SIN6(ai->ai_addr)->sin6_port = port;
-	memmove(&SIN6(ai->ai_addr)->sin6_addr, v6_loop, 16);
-
-	return (0);
-}
-
-/*% Free address info. */
-void
-freeaddrinfo(struct addrinfo *ai) {
-	_freeaddrinfo(ai);
-}
-
-static void
-_freeaddrinfo(struct addrinfo *ai) {
-	struct addrinfo *ai_next;
-
-	while (ai != NULL) {
-		ai_next = ai->ai_next;
-		if (ai->ai_addr != NULL)
-			free(ai->ai_addr);
-		if (ai->ai_canonname)
-			free(ai->ai_canonname);
-		free(ai);
-		ai = ai_next;
-	}
-}
-
-#ifdef AF_LOCAL
-static int
-get_local(const char *name, int socktype, struct addrinfo **res) {
-	struct addrinfo *ai;
-	struct sockaddr_un *slocal;
-
-	if (socktype == 0)
-		return (EAI_SOCKTYPE);
-
-	ai = ai_alloc(AF_LOCAL, sizeof(*slocal));
-	if (ai == NULL)
-		return (EAI_MEMORY);
-
-	slocal = SLOCAL(ai->ai_addr);
-	strlcpy(slocal->sun_path, name, sizeof(slocal->sun_path));
-
-	ai->ai_socktype = socktype;
-	/*
-	 * ai->ai_flags, ai->ai_protocol, ai->ai_canonname,
-	 * and ai->ai_next were initialized to zero.
-	 */
-
-	*res = ai;
-	return (0);
-}
-#endif
-
-/*!
- * Allocate an addrinfo structure, and a sockaddr structure
- * of the specificed length.  We initialize:
- *	ai_addrlen
- *	ai_family
- *	ai_addr
- *	ai_addr->sa_family
- *	ai_addr->sa_len	(IRS_PLATFORM_HAVESALEN)
- * and everything else is initialized to zero.
- */
-static struct addrinfo *
-ai_alloc(int family, int addrlen) {
-	struct addrinfo *ai;
-
-	ai = (struct addrinfo *)calloc(1, sizeof(*ai));
-	if (ai == NULL)
-		return (NULL);
-
-	ai->ai_addr = SA(calloc(1, addrlen));
-	if (ai->ai_addr == NULL) {
-		free(ai);
-		return (NULL);
-	}
-	ai->ai_addrlen = addrlen;
-	ai->ai_family = family;
-	ai->ai_addr->sa_family = family;
-#ifdef IRS_PLATFORM_HAVESALEN
-	ai->ai_addr->sa_len = addrlen;
-#endif
-	return (ai);
-}
-
-static struct addrinfo *
-ai_clone(struct addrinfo *oai, int family) {
-	struct addrinfo *ai;
-
-	ai = ai_alloc(family, ((family == AF_INET6) ?
-	    sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)));
-
-	if (ai == NULL)
-		return (NULL);
-	if (oai == NULL)
-		return (ai);
-
-	ai->ai_flags = oai->ai_flags;
-	ai->ai_socktype = oai->ai_socktype;
-	ai->ai_protocol = oai->ai_protocol;
-	ai->ai_canonname = NULL;
-	ai->ai_next = oai;
-	return (ai);
-}
-
-static struct addrinfo *
-ai_reverse(struct addrinfo *oai) {
-	struct addrinfo *nai, *tai;
-
-	nai = NULL;
-
-	while (oai != NULL) {
-		/*
-		 * Grab one off the old list.
-		 */
-		tai = oai;
-		oai = oai->ai_next;
-		/*
-		 * Put it on the front of the new list.
-		 */
-		tai->ai_next = nai;
-		nai = tai;
-	}
-	return (nai);
-}
-
-
-static struct addrinfo *
-ai_concat(struct addrinfo *ai1, struct addrinfo *ai2) {
-	struct addrinfo *ai_tmp;
-
-	if (ai1 == NULL)
-		return (ai2);
-	else if (ai2 == NULL)
-		return (ai1);
-
-	for (ai_tmp = ai1; ai_tmp != NULL && ai_tmp->ai_next != NULL;
-	     ai_tmp = ai_tmp->ai_next)
-		;
-
-	ai_tmp->ai_next = ai2;
-
-	return (ai1);
-}
diff --git a/usr.sbin/bind/lib/irs/getnameinfo.c b/usr.sbin/bind/lib/irs/getnameinfo.c
deleted file mode 100644
index 44c264d5bec..00000000000
--- a/usr.sbin/bind/lib/irs/getnameinfo.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: getnameinfo.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/**
- *    getnameinfo() returns the hostname for the struct sockaddr sa which is
- *    salen bytes long. The hostname is of length hostlen and is returned via
- *    *host. The maximum length of the hostname is 1025 bytes: #NI_MAXHOST.
- *
- *    The name of the service associated with the port number in sa is
- *    returned in *serv. It is servlen bytes long. The maximum length of the
- *    service name is #NI_MAXSERV - 32 bytes.
- *
- *    The flags argument sets the following bits:
- *
- * \li   #NI_NOFQDN:
- *           A fully qualified domain name is not required for local hosts.
- *           The local part of the fully qualified domain name is returned
- *           instead.
- *
- * \li   #NI_NUMERICHOST
- *           Return the address in numeric form, as if calling inet_ntop(),
- *           instead of a host name.
- *
- * \li   #NI_NAMEREQD
- *           A name is required. If the hostname cannot be found in the DNS
- *           and this flag is set, a non-zero error code is returned. If the
- *           hostname is not found and the flag is not set, the address is
- *           returned in numeric form.
- *
- * \li   #NI_NUMERICSERV
- *           The service name is returned as a digit string representing the
- *           port number.
- *
- * \li   #NI_DGRAM
- *           Specifies that the service being looked up is a datagram
- *           service, and causes getservbyport() to be called with a second
- *           argument of "udp" instead of its default of "tcp". This is
- *           required for the few ports (512-514) that have different
- *           services for UDP and TCP.
- *
- * \section getnameinfo_return Return Values
- *
- *    getnameinfo() returns 0 on success or a non-zero error code if
- *    an error occurs.
- *
- * \section getname_see See Also
- *
- *    RFC3493, getservbyport(),
- *    getnamebyaddr(). inet_ntop().
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <isc/netaddr.h>
-#include <isc/print.h>
-#include <isc/sockaddr.h>
-#include <isc/string.h>
-#include <isc/util.h>
-
-#include <dns/byaddr.h>
-#include <dns/client.h>
-#include <dns/fixedname.h>
-#include <dns/name.h>
-#include <dns/rdata.h>
-#include <dns/rdataset.h>
-#include <dns/rdatastruct.h>
-#include <dns/result.h>
-
-#include <irs/context.h>
-#include <irs/netdb.h>
-
-#define SUCCESS 0
-
-/*% afd structure definition */
-static struct afd {
-	int a_af;
-	size_t a_addrlen;
-	size_t a_socklen;
-} afdl [] = {
-	/*!
-	 * First entry is linked last...
-	 */
-	{ AF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in) },
-	{ AF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6) },
-	{0, 0, 0},
-};
-
-/*!
- * The test against 0 is there to keep the Solaris compiler
- * from complaining about "end-of-loop code not reached".
- */
-#define ERR(code) \
-	do { result = (code);			\
-		if (result != 0) goto cleanup;	\
-	} while (0)
-
-int
-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;
-	unsigned short port = 0;
-#ifdef IRS_PLATFORM_HAVESALEN
-	size_t len;
-#endif
-	int family, i;
-	const void *addr = NULL;
-	char *p;
-#if 0
-	unsigned long v4a;
-	unsigned char pfx;
-#endif
-	char numserv[sizeof("65000")];
-	char numaddr[sizeof("abcd:abcd:abcd:abcd:abcd:abcd:255.255.255.255")
-		    + 1 + sizeof("4294967295")];
-	const char *proto;
-	int result = SUCCESS;
-
-	if (sa == NULL)
-		ERR(EAI_FAIL);
-
-#ifdef IRS_PLATFORM_HAVESALEN
-	len = sa->sa_len;
-	if (len != salen)
-		ERR(EAI_FAIL);
-#endif
-
-	family = sa->sa_family;
-	for (i = 0; afdl[i].a_af; i++)
-		if (afdl[i].a_af == family) {
-			afd = &afdl[i];
-			goto found;
-		}
-	ERR(EAI_FAMILY);
-
- found:
-	if (salen != afd->a_socklen)
-		ERR(EAI_FAIL);
-
-	switch (family) {
-	case AF_INET:
-		port = ((const struct sockaddr_in *)sa)->sin_port;
-		addr = &((const struct sockaddr_in *)sa)->sin_addr.s_addr;
-		break;
-
-	case AF_INET6:
-		port = ((const struct sockaddr_in6 *)sa)->sin6_port;
-		addr = ((const struct sockaddr_in6 *)sa)->sin6_addr.s6_addr;
-		break;
-
-	default:
-		INSIST(0);
-	}
-	proto = (flags & NI_DGRAM) ? "udp" : "tcp";
-
-	if (serv == NULL || servlen == 0U) {
-		/*
-		 * Caller does not want service.
-		 */
-	} else if ((flags & NI_NUMERICSERV) != 0 ||
-		   (sp = getservbyport(port, proto)) == NULL) {
-		snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
-		if ((strlen(numserv) + 1) > servlen)
-			ERR(EAI_OVERFLOW);
-		strlcpy(serv, numserv, servlen);
-	} else {
-		if ((strlen(sp->s_name) + 1) > servlen)
-			ERR(EAI_OVERFLOW);
-		strlcpy(serv, sp->s_name, servlen);
-	}
-
-#if 0
-	switch (sa->sa_family) {
-	case AF_INET:
-		v4a = ((struct sockaddr_in *)sa)->sin_addr.s_addr;
-		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
-			flags |= NI_NUMERICHOST;
-		v4a >>= IN_CLASSA_NSHIFT;
-		if (v4a == 0 || v4a == IN_LOOPBACKNET)
-			flags |= NI_NUMERICHOST;
-		break;
-
-	case AF_INET6:
-		pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0];
-		if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
-			flags |= NI_NUMERICHOST;
-		break;
-	}
-#endif
-
-	if (host == NULL || hostlen == 0U) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: RFC3493 says that host == NULL or hostlen == 0
-		 * means that the caller does not want the result.
-		 */
-	} else if ((flags & NI_NUMERICHOST) != 0) {
-		if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
-		    == NULL)
-			ERR(EAI_SYSTEM);
-#if defined(IRS_HAVE_SIN6_SCOPE_ID)
-		if (afd->a_af == AF_INET6 &&
-		    ((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
-			char *p = numaddr + strlen(numaddr);
-			const char *stringscope = NULL;
-#ifdef VENDOR_SPECIFIC
-			/*
-			 * Vendors may want to add support for
-			 * non-numeric scope identifier.
-			 */
-			stringscope = foo;
-#endif
-			if (stringscope == NULL) {
-				snprintf(p, sizeof(numaddr) - (p - numaddr),
-				    "%%%u",
-				    ((const struct sockaddr_in6 *)sa)->sin6_scope_id);
-			} else {
-				snprintf(p, sizeof(numaddr) - (p - numaddr),
-				    "%%%s", stringscope);
-			}
-		}
-#endif
-		if (strlen(numaddr) + 1 > hostlen)
-			ERR(EAI_OVERFLOW);
-		strlcpy(host, numaddr, hostlen);
-	} else {
-		isc_netaddr_t netaddr;
-		dns_fixedname_t ptrfname;
-		dns_name_t *ptrname;
-		irs_context_t *irsctx = NULL;
-		dns_client_t *client;
-		isc_boolean_t found = ISC_FALSE;
-		dns_namelist_t answerlist;
-		dns_rdataset_t *rdataset;
-		isc_region_t hostregion;
-		char hoststr[1024]; /* is this enough? */
-		isc_result_t iresult;
-
-		/* Get IRS context and the associated DNS client object */
-		iresult = irs_context_get(&irsctx);
-		if (iresult != ISC_R_SUCCESS)
-			ERR(EAI_FAIL);
-		client = irs_context_getdnsclient(irsctx);
-
-		/* Make query name */
-		isc_netaddr_fromsockaddr(&netaddr, (const isc_sockaddr_t *)sa);
-		dns_fixedname_init(&ptrfname);
-		ptrname = dns_fixedname_name(&ptrfname);
-		iresult = dns_byaddr_createptrname2(&netaddr, 0, ptrname);
-		if (iresult != ISC_R_SUCCESS)
-			ERR(EAI_FAIL);
-
-		/* Get the PTR RRset */
-		ISC_LIST_INIT(answerlist);
-		iresult = dns_client_resolve(client, ptrname,
-					     dns_rdataclass_in,
-					     dns_rdatatype_ptr,
-					     DNS_CLIENTRESOPT_ALLOWRUN,
-					     &answerlist);
-		switch (iresult) {
-		case ISC_R_SUCCESS:
-		/*
-		 * a 'non-existent' error is not necessarily fatal for
-		 * getnameinfo().
-		 */
-		case DNS_R_NCACHENXDOMAIN:
-		case DNS_R_NCACHENXRRSET:
-			break;
-		case DNS_R_SIGINVALID:
-		case DNS_R_SIGEXPIRED:
-		case DNS_R_SIGFUTURE:
-		case DNS_R_KEYUNAUTHORIZED:
-		case DNS_R_MUSTBESECURE:
-		case DNS_R_COVERINGNSEC:
-		case DNS_R_NOTAUTHORITATIVE:
-		case DNS_R_NOVALIDKEY:
-		case DNS_R_NOVALIDDS:
-		case DNS_R_NOVALIDSIG:
-			/*
-			 * Don't use ERR as GCC 7 wants to raise a
-			 * warning with ERR about possible falling
-			 * through which is impossible.
-			 */
-			result = EAI_INSECUREDATA;
-			goto cleanup;
-		default:
-			ERR(EAI_FAIL);
-		}
-
-		/* Parse the answer for the hostname */
-		for (ptrname = ISC_LIST_HEAD(answerlist); ptrname != NULL;
-		     ptrname = ISC_LIST_NEXT(ptrname, link)) {
-			for (rdataset = ISC_LIST_HEAD(ptrname->list);
-			     rdataset != NULL;
-			     rdataset = ISC_LIST_NEXT(rdataset, link)) {
-				if (!dns_rdataset_isassociated(rdataset))
-					continue;
-				if (rdataset->type != dns_rdatatype_ptr)
-					continue;
-
-				for (iresult = dns_rdataset_first(rdataset);
-				     iresult == ISC_R_SUCCESS;
-				     iresult = dns_rdataset_next(rdataset)) {
-					dns_rdata_t rdata;
-					dns_rdata_ptr_t rdata_ptr;
-					isc_buffer_t b;
-
-					dns_rdata_init(&rdata);
-					dns_rdataset_current(rdataset, &rdata);
-					dns_rdata_tostruct(&rdata, &rdata_ptr,
-							   NULL);
-
-					isc_buffer_init(&b, hoststr,
-							sizeof(hoststr));
-					iresult =
-						dns_name_totext(&rdata_ptr.ptr,
-								ISC_TRUE, &b);
-					dns_rdata_freestruct(&rdata_ptr);
-					if (iresult == ISC_R_SUCCESS) {
-						/*
-						 * We ignore the rest of the
-						 * answer.  After all,
-						 * getnameinfo() can return
-						 * at most one hostname.
-						 */
-						found = ISC_TRUE;
-						isc_buffer_usedregion(
-							&b, &hostregion);
-						goto ptrfound;
-					}
-
-				}
-			}
-		}
-	ptrfound:
-		dns_client_freeresanswer(client, &answerlist);
-		if (found) {
-			if ((flags & NI_NOFQDN) != 0) {
-				p = strchr(hoststr, '.');
-				if (p)
-					*p = '\0';
-			}
-			if (hostregion.length + 1 > hostlen)
-				ERR(EAI_OVERFLOW);
-			snprintf(host, hostlen, "%.*s",
-				 (int)hostregion.length,
-				 (char *)hostregion.base);
-		} else {
-			if ((flags & NI_NAMEREQD) != 0)
-				ERR(EAI_NONAME);
-			if (inet_ntop(afd->a_af, addr, numaddr,
-				      sizeof(numaddr)) == NULL)
-				ERR(EAI_SYSTEM);
-			if ((strlen(numaddr) + 1) > hostlen)
-				ERR(EAI_OVERFLOW);
-			strlcpy(host, numaddr, hostlen);
-		}
-	}
-	result = SUCCESS;
-
- cleanup:
-	return (result);
-}
diff --git a/usr.sbin/bind/lib/irs/include/Makefile.in b/usr.sbin/bind/lib/irs/include/Makefile.in
deleted file mode 100644
index 3ba19487bf2..00000000000
--- a/usr.sbin/bind/lib/irs/include/Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.2 2019/12/17 01:46:34 sthen Exp $
-
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-top_srcdir =	@top_srcdir@
-
-SUBDIRS =	irs
-TARGETS =
-
-@BIND9_MAKE_RULES@
diff --git a/usr.sbin/bind/lib/irs/include/irs/Makefile.in b/usr.sbin/bind/lib/irs/include/irs/Makefile.in
deleted file mode 100644
index 35c4e466771..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.2 2019/12/17 01:46:34 sthen Exp $
-
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-top_srcdir =	@top_srcdir@
-
-#
-# Only list headers that are to be installed and are not
-# machine generated.  The latter are handled specially in the
-# install target below.
-#
-HEADERS =	context.h dnsconf.h resconf.h types.h version.h
-
-SUBDIRS =
-TARGETS =
-
-@BIND9_MAKE_RULES@
-
-installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/irs
-
-install:: installdirs
-	for i in ${HEADERS}; do \
-		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/irs ; \
-	done
-	${INSTALL_DATA} netdb.h ${DESTDIR}${includedir}/irs
-	${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/irs
-
-uninstall::
-	rm -f ${DESTDIR}${includedir}/irs/platform.h
-	rm -f ${DESTDIR}${includedir}/irs/netdb.h
-	for i in ${HEADERS}; do \
-		rm -f ${DESTDIR}${includedir}/irs/$$i ; \
-	done
-
-distclean::
-	rm -f netdb.h platform.h
diff --git a/usr.sbin/bind/lib/irs/include/irs/context.h b/usr.sbin/bind/lib/irs/include/irs/context.h
deleted file mode 100644
index 0cf5b1b8ab5..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/context.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: context.h,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-#ifndef IRS_CONTEXT_H
-#define IRS_CONTEXT_H 1
-
-/*! \file
- *
- * \brief
- * The IRS context module provides an abstract interface to the DNS library
- * with an application.  An IRS context object initializes and holds various
- * resources used in the DNS library.
- */
-
-#include <dns/types.h>
-#include <irs/types.h>
-
-ISC_LANG_BEGINDECLS
-
-isc_result_t
-irs_context_create(irs_context_t **contextp);
-/*%<
- * Create an IRS context.  It internally initializes the ISC and DNS libraries
- * (if not yet), creates a DNS client object and initializes the client using
- * the configuration files parsed via the 'resconf' and 'dnsconf' IRS modules.
- * Some of the internally initialized objects can be used by the application
- * via irs_context_getxxx() functions (see below).
- *
- * Requires:
- *
- *\li	contextp != NULL && *contextp == NULL.
- */
-
-isc_result_t
-irs_context_get(irs_context_t **contextp);
-/*%<
- * Return an IRS context for the calling thread.  If no IRS context is
- * associated to the thread, this function creates a new one by calling
- * irs_context_create(), and associates it with the thread as a thread specific
- * data value.  This function is provided for standard libraries that are
- * expected to be thread-safe but do not accept an appropriate IRS context
- * as a library parameter, e.g., getaddrinfo().
- *
- * Requires:
- *
- *\li	contextp != NULL && *contextp == NULL.
- */
-
-void
-irs_context_destroy(irs_context_t **contextp);
-/*%<
- * Destroy an IRS context.
- *
- * Requires:
- *
- *\li	'*contextp' is a valid IRS context.
- *
- * Ensures:
- *\li	'*contextp' == NULL.
- */
-
-isc_mem_t *
-irs_context_getmctx(irs_context_t *context);
-/*%<
- * Return the memory context held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-isc_appctx_t *
-irs_context_getappctx(irs_context_t *context);
-/*%<
- * Return the application context held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-isc_taskmgr_t *
-irs_context_gettaskmgr(irs_context_t *context);
-/*%<
- * Return the task manager held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-isc_timermgr_t *
-irs_context_gettimermgr(irs_context_t *context);
-/*%<
- * Return the timer manager held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-isc_task_t *
-irs_context_gettask(irs_context_t *context);
-/*%<
- * Return the task object held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-dns_client_t *
-irs_context_getdnsclient(irs_context_t *context);
-/*%<
- * Return the DNS client object held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-irs_resconf_t *
-irs_context_getresconf(irs_context_t *context);
-/*%<
- * Return the resolver configuration object held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-irs_dnsconf_t *
-irs_context_getdnsconf(irs_context_t *context);
-/*%<
- * Return the advanced DNS configuration object held in the context.
- *
- * Requires:
- *
- *\li	'context' is a valid IRS context.
- */
-
-ISC_LANG_ENDDECLS
-
-#endif /* IRS_CONTEXT_H */
diff --git a/usr.sbin/bind/lib/irs/include/irs/dnsconf.h b/usr.sbin/bind/lib/irs/include/irs/dnsconf.h
deleted file mode 100644
index 37dd8573a3d..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/dnsconf.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: dnsconf.h,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-#ifndef IRS_DNSCONF_H
-#define IRS_DNSCONF_H 1
-
-/*! \file
- *
- * \brief
- * The IRS dnsconf module parses an "advanced" configuration file related to
- * the DNS library, such as trusted keys for DNSSEC validation, and creates
- * the corresponding configuration objects for the DNS library modules.
- *
- * Notes:
- * This module is very experimental and the configuration syntax or library
- * interfaces may change in future versions.  Currently, only the
- * 'trusted-keys' statement is supported, whose syntax is the same as the
- * same name of statement for named.conf.
- */
-
-#include <irs/types.h>
-
-/*%
- * A compound structure storing DNS key information mainly for DNSSEC
- * validation.  A dns_key_t object will be created using the 'keyname' and
- * 'keydatabuf' members with the dst_key_fromdns() function.
- */
-typedef struct irs_dnsconf_dnskey {
-	dns_name_t				*keyname;
-	isc_buffer_t				*keydatabuf;
-	ISC_LINK(struct irs_dnsconf_dnskey)	link;
-} irs_dnsconf_dnskey_t;
-
-typedef ISC_LIST(irs_dnsconf_dnskey_t) irs_dnsconf_dnskeylist_t;
-
-ISC_LANG_BEGINDECLS
-
-isc_result_t
-irs_dnsconf_load(isc_mem_t *mctx, const char *filename, irs_dnsconf_t **confp);
-/*%<
- * Load the "advanced" DNS configuration file 'filename' in the "dns.conf"
- * format, and create a new irs_dnsconf_t object from the configuration.
- *
- * Requires:
- *
- *\li	'mctx' is a valid memory context.
- *
- *\li	'filename' != NULL
- *
- *\li	'confp' != NULL && '*confp' == NULL
- */
-
-void
-irs_dnsconf_destroy(irs_dnsconf_t **confp);
-/*%<
- * Destroy the dnsconf object.
- *
- * Requires:
- *
- *\li	'*confp' is a valid dnsconf object.
- *
- * Ensures:
- *
- *\li	*confp == NULL
- */
-
-irs_dnsconf_dnskeylist_t *
-irs_dnsconf_gettrustedkeys(irs_dnsconf_t *conf);
-/*%<
- * Return a list of key information stored in 'conf'.
- *
- * Requires:
- *
- *\li	'conf' is a valid dnsconf object.
- */
-
-ISC_LANG_ENDDECLS
-
-#endif /* IRS_DNSCONF_H */
diff --git a/usr.sbin/bind/lib/irs/include/irs/netdb.h.in b/usr.sbin/bind/lib/irs/include/irs/netdb.h.in
deleted file mode 100644
index 48b7aecb6dd..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/netdb.h.in
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: netdb.h.in,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-#ifndef IRS_NETDB_H
-#define IRS_NETDB_H 1
-
-#include <stddef.h>	/* Required on FreeBSD (and  others?) for size_t. */
-#include <netdb.h>	/* Contractual provision. */
-
-/*
- * Define if <netdb.h> does not declare struct addrinfo.
- */
-@ISC_IRS_NEEDADDRINFO@
-
-#ifdef ISC_IRS_NEEDADDRINFO
-struct addrinfo {
-	int		ai_flags;      /* AI_PASSIVE, AI_CANONNAME */
-	int		ai_family;     /* PF_xxx */
-	int		ai_socktype;   /* SOCK_xxx */
-	int		ai_protocol;   /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-	size_t		ai_addrlen;    /* Length of ai_addr */
-	char		*ai_canonname; /* Canonical name for hostname */
-	struct sockaddr	*ai_addr;      /* Binary address */
-	struct addrinfo	*ai_next;      /* Next structure in linked list */
-};
-#endif
-
-/*
- * Undefine all #defines we are interested in as <netdb.h> may or may not have
- * defined them.
- */
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#undef	NETDB_INTERNAL
-#undef	NETDB_SUCCESS
-#undef	HOST_NOT_FOUND
-#undef	TRY_AGAIN
-#undef	NO_RECOVERY
-#undef	NO_DATA
-#undef	NO_ADDRESS
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritive Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-/*
- * Error return codes from getaddrinfo().  EAI_INSECUREDATA is our own extension
- * and it's very unlikely to be already defined, but undef it just in case; it
- * at least doesn't do any harm.
- */
-
-#undef	EAI_ADDRFAMILY
-#undef	EAI_AGAIN
-#undef	EAI_BADFLAGS
-#undef	EAI_FAIL
-#undef	EAI_FAMILY
-#undef	EAI_MEMORY
-#undef	EAI_NODATA
-#undef	EAI_NONAME
-#undef	EAI_SERVICE
-#undef	EAI_SOCKTYPE
-#undef	EAI_SYSTEM
-#undef	EAI_BADHINTS
-#undef	EAI_PROTOCOL
-#undef	EAI_OVERFLOW
-#undef	EAI_INSECUREDATA
-#undef	EAI_MAX
-
-#define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
-#define	EAI_AGAIN	 2	/* temporary failure in name resolution */
-#define	EAI_BADFLAGS	 3	/* invalid value for ai_flags */
-#define	EAI_FAIL	 4	/* non-recoverable failure in name resolution */
-#define	EAI_FAMILY	 5	/* ai_family not supported */
-#define	EAI_MEMORY	 6	/* memory allocation failure */
-#define	EAI_NODATA	 7	/* no address associated with hostname */
-#define	EAI_NONAME	 8	/* hostname nor servname provided, or not known */
-#define	EAI_SERVICE	 9	/* servname not supported for ai_socktype */
-#define	EAI_SOCKTYPE	10	/* ai_socktype not supported */
-#define	EAI_SYSTEM	11	/* system error returned in errno */
-#define EAI_BADHINTS	12
-#define EAI_PROTOCOL	13
-#define EAI_OVERFLOW	14
-#define EAI_INSECUREDATA 15
-#define EAI_MAX		16
-
-/*
- * Flag values for getaddrinfo()
- */
-#undef	AI_PASSIVE
-#undef	AI_CANONNAME
-#undef	AI_NUMERICHOST
-
-#define	AI_PASSIVE	0x00000001
-#define	AI_CANONNAME	0x00000002
-#define AI_NUMERICHOST	0x00000004
-
-/*
- * Flag values for getipnodebyname()
- */
-#undef AI_V4MAPPED
-#undef AI_ALL
-#undef AI_ADDRCONFIG
-#undef AI_DEFAULT
-
-#define AI_V4MAPPED	0x00000008
-#define AI_ALL		0x00000010
-#define AI_ADDRCONFIG	0x00000020
-#define AI_DEFAULT	(AI_V4MAPPED|AI_ADDRCONFIG)
-
-/*
- * Constants for lwres_getnameinfo()
- */
-#undef	NI_MAXHOST
-#undef	NI_MAXSERV
-
-#define	NI_MAXHOST	1025
-#define	NI_MAXSERV	32
-
-/*
- * Flag values for lwres_getnameinfo()
- */
-#undef	NI_NOFQDN
-#undef	NI_NUMERICHOST
-#undef	NI_NAMEREQD
-#undef	NI_NUMERICSERV
-#undef	NI_DGRAM
-#undef	NI_NUMERICSCOPE
-
-#define	NI_NOFQDN	0x00000001
-#define	NI_NUMERICHOST	0x00000002
-#define	NI_NAMEREQD	0x00000004
-#define	NI_NUMERICSERV	0x00000008
-#define	NI_DGRAM	0x00000010
-
-/*
- * Tell Emacs to use C mode on this file.
- * Local variables:
- * mode: c
- * End:
- */
-
-#endif /* IRS_NETDB_H */
diff --git a/usr.sbin/bind/lib/irs/include/irs/platform.h.in b/usr.sbin/bind/lib/irs/include/irs/platform.h.in
deleted file mode 100644
index 86dc8182c5c..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/platform.h.in
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: platform.h.in,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-#ifndef IRS_PLATFORM_H
-#define IRS_PLATFORM_H 1
-
-/*****
- ***** Platform-dependent defines.
- *****/
-
-#ifndef IRS_PLATFORM_USEDECLSPEC
-#define LIBIRS_EXTERNAL_DATA
-#else
-#ifdef LIBIRS_EXPORTS
-#define LIBIRS_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBIRS_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#endif
-
-/*
- * Tell Emacs to use C mode on this file.
- * Local Variables:
- * mode: c
- * End:
- */
-
-#endif /* IRS_PLATFORM_H */
diff --git a/usr.sbin/bind/lib/irs/include/irs/resconf.h b/usr.sbin/bind/lib/irs/include/irs/resconf.h
deleted file mode 100644
index dea4753aa2f..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/resconf.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: resconf.h,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-#ifndef IRS_RESCONF_H
-#define IRS_RESCONF_H 1
-
-/*! \file
- *
- * \brief
- * The IRS resconf module parses the legacy "/etc/resolv.conf" file and
- * creates the corresponding configuration objects for the DNS library
- * modules.
- */
-
-#include <irs/types.h>
-
-/*%
- * A DNS search list specified in the 'domain' or 'search' statements
- * in the "resolv.conf" file.
- */
-typedef struct irs_resconf_search {
-	char					*domain;
-	ISC_LINK(struct irs_resconf_search)	link;
-} irs_resconf_search_t;
-
-typedef ISC_LIST(irs_resconf_search_t) irs_resconf_searchlist_t;
-
-ISC_LANG_BEGINDECLS
-
-isc_result_t
-irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp);
-/*%<
- * Load the resolver configuration file 'filename' in the "resolv.conf" format,
- * and create a new irs_resconf_t object from the configuration.  If the file
- * is not found ISC_R_FILENOTFOUND is returned with the structure initialized
- * as if file contained only:
- *
- *	nameserver ::1
- *	nameserver 127.0.0.1
- *
- * Notes:
- *
- *\li	Currently, only the following options are supported:
- *	nameserver, domain, search, sortlist, ndots, and options.
- *	In addition, 'sortlist' is not actually effective; it's parsed, but
- *	the application cannot use the configuration.
- *
- * Returns:
- * \li	ISC_R_SUCCESS on success
- * \li  ISC_R_FILENOTFOUND if the file was not found. *confp will be valid.
- * \li  other on error.
- *
- * Requires:
- *
- *\li	'mctx' is a valid memory context.
- *
- *\li	'filename' != NULL
- *
- *\li	'confp' != NULL && '*confp' == NULL
- */
-
-void
-irs_resconf_destroy(irs_resconf_t **confp);
-/*%<
- * Destroy the resconf object.
- *
- * Requires:
- *
- *\li	'*confp' is a valid resconf object.
- *
- * Ensures:
- *
- *\li	*confp == NULL
- */
-
-isc_sockaddrlist_t *
-irs_resconf_getnameservers(irs_resconf_t *conf);
-/*%<
- * Return a list of name server addresses stored in 'conf'.
- *
- * Requires:
- *
- *\li	'conf' is a valid resconf object.
- */
-
-irs_resconf_searchlist_t *
-irs_resconf_getsearchlist(irs_resconf_t *conf);
-/*%<
- * Return the search list stored in 'conf'.
- *
- * Requires:
- *
- *\li	'conf' is a valid resconf object.
- */
-
-unsigned int
-irs_resconf_getndots(irs_resconf_t *conf);
-/*%<
- * Return the 'ndots' value stored in 'conf'.
- *
- * Requires:
- *
- *\li	'conf' is a valid resconf object.
- */
-
-ISC_LANG_ENDDECLS
-
-#endif /* IRS_RESCONF_H */
diff --git a/usr.sbin/bind/lib/irs/include/irs/types.h b/usr.sbin/bind/lib/irs/include/irs/types.h
deleted file mode 100644
index 11244cb10ec..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: types.h,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-#ifndef IRS_TYPES_H
-#define IRS_TYPES_H 1
-
-/* Core Types.  Alphabetized by defined type. */
-
-/*%< per-thread IRS context */
-typedef struct irs_context		irs_context_t;
-/*%< resolv.conf configuration information */
-typedef struct irs_resconf		irs_resconf_t;
-/*%< advanced DNS-related configuration information */
-typedef struct irs_dnsconf		irs_dnsconf_t;
-
-#endif /* IRS_TYPES_H */
diff --git a/usr.sbin/bind/lib/irs/include/irs/version.h b/usr.sbin/bind/lib/irs/include/irs/version.h
deleted file mode 100644
index 23c22a95c72..00000000000
--- a/usr.sbin/bind/lib/irs/include/irs/version.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: version.h,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-#include <irs/platform.h>
-
-LIBIRS_EXTERNAL_DATA extern const char irs_version[];
-
-LIBIRS_EXTERNAL_DATA extern const unsigned int irs_libinterface;
-LIBIRS_EXTERNAL_DATA extern const unsigned int irs_librevision;
-LIBIRS_EXTERNAL_DATA extern const unsigned int irs_libage;
diff --git a/usr.sbin/bind/lib/irs/resconf.c b/usr.sbin/bind/lib/irs/resconf.c
deleted file mode 100644
index 010ed37776b..00000000000
--- a/usr.sbin/bind/lib/irs/resconf.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: resconf.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file resconf.c */
-
-/**
- * Module for parsing resolv.conf files (largely derived from lwconfig.c).
- *
- *    irs_resconf_load() opens the file filename and parses it to initialize
- *    the configuration structure.
- *
- * \section lwconfig_return Return Values
- *
- *    irs_resconf_load() returns #IRS_R_SUCCESS if it successfully read and
- *    parsed filename. It returns a non-0 error code if filename could not be
- *    opened or contained incorrect resolver statements.
- *
- * \section lwconfig_see See Also
- *
- *    stdio(3), \link resolver resolver \endlink
- *
- * \section files Files
- *
- *    /etc/resolv.conf
- */
-
-#include <config.h>
-
-#ifndef WIN32
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <isc/magic.h>
-#include <isc/mem.h>
-#include <isc/netaddr.h>
-#include <isc/sockaddr.h>
-#include <isc/util.h>
-
-#include <irs/netdb.h>
-#include <irs/resconf.h>
-
-#define IRS_RESCONF_MAGIC		ISC_MAGIC('R', 'E', 'S', 'c')
-#define IRS_RESCONF_VALID(c)		ISC_MAGIC_VALID(c, IRS_RESCONF_MAGIC)
-
-/*!
- * protocol constants
- */
-
-#if ! defined(NS_INADDRSZ)
-#define NS_INADDRSZ	 4
-#endif
-
-#if ! defined(NS_IN6ADDRSZ)
-#define NS_IN6ADDRSZ	16
-#endif
-
-/*!
- * resolv.conf parameters
- */
-
-#define RESCONFMAXNAMESERVERS 3U	/*%< max 3 "nameserver" entries */
-#define RESCONFMAXSEARCH 8U		/*%< max 8 domains in "search" entry */
-#define RESCONFMAXLINELEN 256U		/*%< max size of a line */
-#define RESCONFMAXSORTLIST 10U		/*%< max 10 */
-
-/*!
- * configuration data structure
- */
-
-struct irs_resconf {
-	/*
-	 * The configuration data is a thread-specific object, and does not
-	 * need to be locked.
-	 */
-	unsigned int		magic;
-	isc_mem_t		*mctx;
-
-	isc_sockaddrlist_t	nameservers;
-	unsigned int		numns; /*%< number of configured servers */
-
-	char	       		*domainname;
-	char 	       		*search[RESCONFMAXSEARCH];
-	isc_uint8_t		searchnxt; /*%< index for next free slot */
-
-	irs_resconf_searchlist_t searchlist;
-
-	struct {
-		isc_netaddr_t	addr;
-		/*% mask has a non-zero 'family' if set */
-		isc_netaddr_t	mask;
-	} sortlist[RESCONFMAXSORTLIST];
-	isc_uint8_t		sortlistnxt;
-
-	/*%< non-zero if 'options debug' set */
-	isc_uint8_t		resdebug;
-	/*%< set to n in 'options ndots:n' */
-	isc_uint8_t		ndots;
-};
-
-static isc_result_t
-resconf_parsenameserver(irs_resconf_t *conf,  FILE *fp);
-static isc_result_t
-resconf_parsedomain(irs_resconf_t *conf,  FILE *fp);
-static isc_result_t
-resconf_parsesearch(irs_resconf_t *conf,  FILE *fp);
-static isc_result_t
-resconf_parsesortlist(irs_resconf_t *conf,  FILE *fp);
-static isc_result_t
-resconf_parseoption(irs_resconf_t *ctx,  FILE *fp);
-
-/*!
- * Eat characters from FP until EOL or EOF. Returns EOF or '\n'
- */
-static int
-eatline(FILE *fp) {
-	int ch;
-
-	ch = fgetc(fp);
-	while (ch != '\n' && ch != EOF)
-		ch = fgetc(fp);
-
-	return (ch);
-}
-
-/*!
- * Eats white space up to next newline or non-whitespace character (of
- * EOF). Returns the last character read. Comments are considered white
- * space.
- */
-static int
-eatwhite(FILE *fp) {
-	int ch;
-
-	ch = fgetc(fp);
-	while (ch != '\n' && ch != EOF && isspace((unsigned char)ch))
-		ch = fgetc(fp);
-
-	if (ch == ';' || ch == '#')
-		ch = eatline(fp);
-
-	return (ch);
-}
-
-/*!
- * Skip over any leading whitespace and then read in the next sequence of
- * non-whitespace characters. In this context newline is not considered
- * whitespace. Returns EOF on end-of-file, or the character
- * that caused the reading to stop.
- */
-static int
-getword(FILE *fp, char *buffer, size_t size) {
-	int ch;
-	char *p;
-
-	REQUIRE(buffer != NULL);
-	REQUIRE(size > 0U);
-
-	p = buffer;
-	*p = '\0';
-
-	ch = eatwhite(fp);
-
-	if (ch == EOF)
-		return (EOF);
-
-	do {
-		*p = '\0';
-
-		if (ch == EOF || isspace((unsigned char)ch))
-			break;
-		else if ((size_t) (p - buffer) == size - 1)
-			return (EOF);	/* Not enough space. */
-
-		*p++ = (char)ch;
-		ch = fgetc(fp);
-	} while (1);
-
-	return (ch);
-}
-
-static isc_result_t
-add_server(isc_mem_t *mctx, const char *address_str,
-	   isc_sockaddrlist_t *nameservers)
-{
-	int error;
-	isc_sockaddr_t *address = NULL;
-	struct addrinfo hints, *res;
-	isc_result_t result = ISC_R_SUCCESS;
-
-	res = NULL;
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_protocol = IPPROTO_UDP;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(address_str, "53", &hints, &res);
-	if (error != 0)
-		return (ISC_R_BADADDRESSFORM);
-
-	/* XXX: special case: treat all-0 IPv4 address as loopback */
-	if (res->ai_family == AF_INET) {
-		struct in_addr *v4;
-		unsigned char zeroaddress[] = {0, 0, 0, 0};
-		unsigned char loopaddress[] = {127, 0, 0, 1};
-
-		v4 = &((struct sockaddr_in *)res->ai_addr)->sin_addr;
-		if (memcmp(v4, zeroaddress, 4) == 0)
-			memmove(v4, loopaddress, 4);
-	}
-
-	address = isc_mem_get(mctx, sizeof(*address));
-	if (address == NULL) {
-		result = ISC_R_NOMEMORY;
-		goto cleanup;
-	}
-	if (res->ai_addrlen > sizeof(address->type)) {
-		isc_mem_put(mctx, address, sizeof(*address));
-		result = ISC_R_RANGE;
-		goto cleanup;
-	}
-	address->length = (unsigned int)res->ai_addrlen;
-	memmove(&address->type.ss, res->ai_addr, res->ai_addrlen);
-	ISC_LINK_INIT(address, link);
-	ISC_LIST_APPEND(*nameservers, address, link);
-
-  cleanup:
-	freeaddrinfo(res);
-
-	return (result);
-}
-
-static isc_result_t
-create_addr(const char *buffer, isc_netaddr_t *addr, int convert_zero) {
-	struct in_addr v4;
-	struct in6_addr v6;
-
-	if (inet_aton(buffer, &v4) == 1) {
-		if (convert_zero) {
-			unsigned char zeroaddress[] = {0, 0, 0, 0};
-			unsigned char loopaddress[] = {127, 0, 0, 1};
-			if (memcmp(&v4, zeroaddress, 4) == 0)
-				memmove(&v4, loopaddress, 4);
-		}
-		addr->family = AF_INET;
-		memmove(&addr->type.in, &v4, NS_INADDRSZ);
-		addr->zone = 0;
-	} else if (inet_pton(AF_INET6, buffer, &v6) == 1) {
-		addr->family = AF_INET6;
-		memmove(&addr->type.in6, &v6, NS_IN6ADDRSZ);
-		addr->zone = 0;
-	} else
-		return (ISC_R_BADADDRESSFORM); /* Unrecognised format. */
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-resconf_parsenameserver(irs_resconf_t *conf,  FILE *fp) {
-	char word[RESCONFMAXLINELEN];
-	int cp;
-	isc_result_t result;
-
-	if (conf->numns == RESCONFMAXNAMESERVERS)
-		return (ISC_R_SUCCESS);
-
-	cp = getword(fp, word, sizeof(word));
-	if (strlen(word) == 0U)
-		return (ISC_R_UNEXPECTEDEND); /* Nothing on line. */
-	else if (cp == ' ' || cp == '\t')
-		cp = eatwhite(fp);
-
-	if (cp != EOF && cp != '\n')
-		return (ISC_R_UNEXPECTEDTOKEN); /* Extra junk on line. */
-
-	result = add_server(conf->mctx, word, &conf->nameservers);
-	if (result != ISC_R_SUCCESS)
-		return (result);
-	conf->numns++;
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-resconf_parsedomain(irs_resconf_t *conf,  FILE *fp) {
-	char word[RESCONFMAXLINELEN];
-	int res;
-	unsigned int i;
-
-	res = getword(fp, word, sizeof(word));
-	if (strlen(word) == 0U)
-		return (ISC_R_UNEXPECTEDEND); /* Nothing else on line. */
-	else if (res == ' ' || res == '\t')
-		res = eatwhite(fp);
-
-	if (res != EOF && res != '\n')
-		return (ISC_R_UNEXPECTEDTOKEN); /* Extra junk on line. */
-
-	if (conf->domainname != NULL)
-		isc_mem_free(conf->mctx, conf->domainname);
-
-	/*
-	 * Search and domain are mutually exclusive.
-	 */
-	for (i = 0; i < RESCONFMAXSEARCH; i++) {
-		if (conf->search[i] != NULL) {
-			isc_mem_free(conf->mctx, conf->search[i]);
-			conf->search[i] = NULL;
-		}
-	}
-	conf->searchnxt = 0;
-
-	conf->domainname = isc_mem_strdup(conf->mctx, word);
-	if (conf->domainname == NULL)
-		return (ISC_R_NOMEMORY);
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-resconf_parsesearch(irs_resconf_t *conf,  FILE *fp) {
-	int delim;
-	unsigned int idx;
-	char word[RESCONFMAXLINELEN];
-
-	if (conf->domainname != NULL) {
-		/*
-		 * Search and domain are mutually exclusive.
-		 */
-		isc_mem_free(conf->mctx, conf->domainname);
-		conf->domainname = NULL;
-	}
-
-	/*
-	 * Remove any previous search definitions.
-	 */
-	for (idx = 0; idx < RESCONFMAXSEARCH; idx++) {
-		if (conf->search[idx] != NULL) {
-			isc_mem_free(conf->mctx, conf->search[idx]);
-			conf->search[idx] = NULL;
-		}
-	}
-	conf->searchnxt = 0;
-
-	delim = getword(fp, word, sizeof(word));
-	if (strlen(word) == 0U)
-		return (ISC_R_UNEXPECTEDEND); /* Nothing else on line. */
-
-	idx = 0;
-	while (strlen(word) > 0U) {
-		if (conf->searchnxt == RESCONFMAXSEARCH)
-			goto ignore; /* Too many domains. */
-
-		INSIST(idx < sizeof(conf->search)/sizeof(conf->search[0]));
-		conf->search[idx] = isc_mem_strdup(conf->mctx, word);
-		if (conf->search[idx] == NULL)
-			return (ISC_R_NOMEMORY);
-		idx++;
-		conf->searchnxt++;
-
-	ignore:
-		if (delim == EOF || delim == '\n')
-			break;
-		else
-			delim = getword(fp, word, sizeof(word));
-	}
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-resconf_parsesortlist(irs_resconf_t *conf,  FILE *fp) {
-	int delim, res;
-	unsigned int idx;
-	char word[RESCONFMAXLINELEN];
-	char *p;
-
-	delim = getword(fp, word, sizeof(word));
-	if (strlen(word) == 0U)
-		return (ISC_R_UNEXPECTEDEND); /* Empty line after keyword. */
-
-	while (strlen(word) > 0U) {
-		if (conf->sortlistnxt == RESCONFMAXSORTLIST)
-			return (ISC_R_QUOTA); /* Too many values. */
-
-		p = strchr(word, '/');
-		if (p != NULL)
-			*p++ = '\0';
-
-		idx = conf->sortlistnxt;
-		INSIST(idx < sizeof(conf->sortlist)/sizeof(conf->sortlist[0]));
-		res = create_addr(word, &conf->sortlist[idx].addr, 1);
-		if (res != ISC_R_SUCCESS)
-			return (res);
-
-		if (p != NULL) {
-			res = create_addr(p, &conf->sortlist[idx].mask, 0);
-			if (res != ISC_R_SUCCESS)
-				return (res);
-		} else {
-			/*
-			 * Make up a mask. (XXX: is this correct?)
-			 */
-			conf->sortlist[idx].mask = conf->sortlist[idx].addr;
-			memset(&conf->sortlist[idx].mask.type, 0xff,
-			       sizeof(conf->sortlist[idx].mask.type));
-		}
-
-		conf->sortlistnxt++;
-
-		if (delim == EOF || delim == '\n')
-			break;
-		else
-			delim = getword(fp, word, sizeof(word));
-	}
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-resconf_parseoption(irs_resconf_t *conf,  FILE *fp) {
-	int delim;
-	long ndots;
-	char *p;
-	char word[RESCONFMAXLINELEN];
-
-	delim = getword(fp, word, sizeof(word));
-	if (strlen(word) == 0U)
-		return (ISC_R_UNEXPECTEDEND); /* Empty line after keyword. */
-
-	while (strlen(word) > 0U) {
-		if (strcmp("debug", word) == 0) {
-			conf->resdebug = 1;
-		} else if (strncmp("ndots:", word, 6) == 0) {
-			ndots = strtol(word + 6, &p, 10);
-			if (*p != '\0') /* Bad string. */
-				return (ISC_R_UNEXPECTEDTOKEN);
-			if (ndots < 0 || ndots > 0xff) /* Out of range. */
-				return (ISC_R_RANGE);
-			conf->ndots = (isc_uint8_t)ndots;
-		}
-
-		if (delim == EOF || delim == '\n')
-			break;
-		else
-			delim = getword(fp, word, sizeof(word));
-	}
-
-	return (ISC_R_SUCCESS);
-}
-
-static isc_result_t
-add_search(irs_resconf_t *conf, char *domain) {
-	irs_resconf_search_t *entry;
-
-	entry = isc_mem_get(conf->mctx, sizeof(*entry));
-	if (entry == NULL)
-		return (ISC_R_NOMEMORY);
-
-	entry->domain = domain;
-	ISC_LINK_INIT(entry, link);
-	ISC_LIST_APPEND(conf->searchlist, entry, link);
-
-	return (ISC_R_SUCCESS);
-}
-
-/*% parses a file and fills in the data structure. */
-isc_result_t
-irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp)
-{
-	FILE *fp = NULL;
-	char word[256];
-	isc_result_t rval, ret = ISC_R_SUCCESS;
-	irs_resconf_t *conf;
-	unsigned int i;
-	int stopchar;
-
-	REQUIRE(mctx != NULL);
-	REQUIRE(filename != NULL);
-	REQUIRE(strlen(filename) > 0U);
-	REQUIRE(confp != NULL && *confp == NULL);
-
-	conf = isc_mem_get(mctx, sizeof(*conf));
-	if (conf == NULL)
-		return (ISC_R_NOMEMORY);
-
-	conf->mctx = mctx;
-	ISC_LIST_INIT(conf->nameservers);
-	ISC_LIST_INIT(conf->searchlist);
-	conf->numns = 0;
-	conf->domainname = NULL;
-	conf->searchnxt = 0;
-	conf->sortlistnxt = 0;
-	conf->resdebug = 0;
-	conf->ndots = 1;
-	for (i = 0; i < RESCONFMAXSEARCH; i++)
-		conf->search[i] = NULL;
-
-	errno = 0;
-	if ((fp = fopen(filename, "r")) != NULL) {
-		do {
-			stopchar = getword(fp, word, sizeof(word));
-			if (stopchar == EOF) {
-				rval = ISC_R_SUCCESS;
-				POST(rval);
-				break;
-			}
-
-			if (strlen(word) == 0U)
-				rval = ISC_R_SUCCESS;
-			else if (strcmp(word, "nameserver") == 0)
-				rval = resconf_parsenameserver(conf, fp);
-			else if (strcmp(word, "domain") == 0)
-				rval = resconf_parsedomain(conf, fp);
-			else if (strcmp(word, "search") == 0)
-				rval = resconf_parsesearch(conf, fp);
-			else if (strcmp(word, "sortlist") == 0)
-				rval = resconf_parsesortlist(conf, fp);
-			else if (strcmp(word, "options") == 0)
-				rval = resconf_parseoption(conf, fp);
-			else {
-				/* unrecognised word. Ignore entire line */
-				rval = ISC_R_SUCCESS;
-				stopchar = eatline(fp);
-				if (stopchar == EOF) {
-					break;
-				}
-			}
-			if (ret == ISC_R_SUCCESS && rval != ISC_R_SUCCESS)
-				ret = rval;
-		} while (1);
-
-		fclose(fp);
-	} else {
-		switch (errno) {
-		case ENOENT:
-			break;
-		default:
-			isc_mem_put(mctx, conf, sizeof(*conf));
-			return (ISC_R_INVALIDFILE);
-		}
-	}
-
-	if (ret != ISC_R_SUCCESS) {
-		goto error;
-	}
-
-	/* If we don't find a nameserver fall back to localhost */
-	if (conf->numns == 0U) {
-		INSIST(ISC_LIST_EMPTY(conf->nameservers));
-
-		/* XXX: should we catch errors? */
-		(void)add_server(conf->mctx, "127.0.0.1", &conf->nameservers);
-		(void)add_server(conf->mctx, "::1", &conf->nameservers);
-	}
-
-	/*
-	 * Construct unified search list from domain or configured
-	 * search list
-	 */
-	if (conf->domainname != NULL) {
-		ret = add_search(conf, conf->domainname);
-	} else if (conf->searchnxt > 0) {
-		for (i = 0; i < conf->searchnxt; i++) {
-			ret = add_search(conf, conf->search[i]);
-			if (ret != ISC_R_SUCCESS)
-				break;
-		}
-	}
-
- error:
-	conf->magic = IRS_RESCONF_MAGIC;
-
-	if (ret != ISC_R_SUCCESS)
-		irs_resconf_destroy(&conf);
-	else {
-		if (fp == NULL)
-			ret = ISC_R_FILENOTFOUND;
-		*confp = conf;
-	}
-
-	return (ret);
-}
-
-void
-irs_resconf_destroy(irs_resconf_t **confp) {
-	irs_resconf_t *conf;
-	isc_sockaddr_t *address;
-	irs_resconf_search_t *searchentry;
-	unsigned int i;
-
-	REQUIRE(confp != NULL);
-	conf = *confp;
-	REQUIRE(IRS_RESCONF_VALID(conf));
-
-	while ((searchentry = ISC_LIST_HEAD(conf->searchlist)) != NULL) {
-		ISC_LIST_UNLINK(conf->searchlist, searchentry, link);
-		isc_mem_put(conf->mctx, searchentry, sizeof(*searchentry));
-	}
-
-	while ((address = ISC_LIST_HEAD(conf->nameservers)) != NULL) {
-		ISC_LIST_UNLINK(conf->nameservers, address, link);
-		isc_mem_put(conf->mctx, address, sizeof(*address));
-	}
-
-	if (conf->domainname != NULL)
-		isc_mem_free(conf->mctx, conf->domainname);
-
-	for (i = 0; i < RESCONFMAXSEARCH; i++) {
-		if (conf->search[i] != NULL)
-			isc_mem_free(conf->mctx, conf->search[i]);
-	}
-
-	isc_mem_put(conf->mctx, conf, sizeof(*conf));
-
-	*confp = NULL;
-}
-
-isc_sockaddrlist_t *
-irs_resconf_getnameservers(irs_resconf_t *conf) {
-	REQUIRE(IRS_RESCONF_VALID(conf));
-
-	return (&conf->nameservers);
-}
-
-irs_resconf_searchlist_t *
-irs_resconf_getsearchlist(irs_resconf_t *conf) {
-	REQUIRE(IRS_RESCONF_VALID(conf));
-
-	return (&conf->searchlist);
-}
-
-unsigned int
-irs_resconf_getndots(irs_resconf_t *conf) {
-	REQUIRE(IRS_RESCONF_VALID(conf));
-
-	return ((unsigned int)conf->ndots);
-}
diff --git a/usr.sbin/bind/lib/irs/version.c b/usr.sbin/bind/lib/irs/version.c
deleted file mode 100644
index 08828addcdd..00000000000
--- a/usr.sbin/bind/lib/irs/version.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: version.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */
-
-/*! \file */
-
-#include <irs/version.h>
-
-const char irs_version[] = VERSION;
-
-const unsigned int irs_libinterface = LIBINTERFACE;
-const unsigned int irs_librevision = LIBREVISION;
-const unsigned int irs_libage = LIBAGE;
diff --git a/usr.sbin/bind/make/includes.in b/usr.sbin/bind/make/includes.in
index 53403712db0..81546dddb6e 100644
--- a/usr.sbin/bind/make/includes.in
+++ b/usr.sbin/bind/make/includes.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: includes.in,v 1.2 2019/12/16 16:16:29 deraadt Exp $
+# $Id: includes.in,v 1.3 2020/01/06 17:37:31 florian Exp $
 
 # Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).
@@ -37,9 +37,6 @@ ISCCFG_INCLUDES = @BIND9_ISCCFG_BUILDINCLUDE@ \
 DNS_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
 	-I${top_srcdir}/lib/dns/include
 
-IRS_INCLUDES = @BIND9_IRS_BUILDINCLUDE@ \
-	-I${top_srcdir}/lib/irs/include
-
 LWRES_INCLUDES = @BIND9_LWRES_BUILDINCLUDE@ \
 	-I${top_srcdir}/lib/lwres/unix/include \
 	-I${top_srcdir}/lib/lwres/include