libisc has a global variable called "isc_bind9" that indicates the program-family

(bind, dig, nslookup, host..) the library is being used by, this flag is cleared
using a constructor-like mechanism in a .c file which is not compiled nor called.
if the flag is cleared, the library acts differently in 40+ functions.
Imagine if our libc had such a global variable??
delete all of that.
ok florian

8 files changed, 76 insertions, 403 deletions

diff --git a/usr.sbin/bind/lib/isc/Makefile.in b/usr.sbin/bind/lib/isc/Makefile.in
index a135334e854..1a4d672eea3 100644
--- a/usr.sbin/bind/lib/isc/Makefile.in
+++ b/usr.sbin/bind/lib/isc/Makefile.in
@@ -44,11 +44,11 @@ THREADOBJS =	nothreads/thread.@O@
 # Alphabetically
 OBJS =		@ISC_EXTRA_OBJS@ @ISC_PK11_O@ @ISC_PK11_RESULT_O@ \
 		aes.@O@ assertions.@O@ base32.@O@ base64.@O@ \
-		bind9.@O@ buffer.@O@ bufferlist.@O@ \
+		buffer.@O@ bufferlist.@O@ \
 		commandline.@O@ error.@O@ event.@O@ \
 		hash.@O@ heap.@O@ hex.@O@ hmacmd5.@O@ hmacsha.@O@ \
 		inet_aton.@O@ iterated_hash.@O@ \
-		lex.@O@ lib.@O@ log.@O@ \
+		lex.@O@ log.@O@ \
 		md5.@O@ mutexblock.@O@ \
 		netaddr.@O@ netscope.@O@ \
 		parseint.@O@ \
@@ -61,11 +61,11 @@ OBJS =		@ISC_EXTRA_OBJS@ @ISC_PK11_O@ @ISC_PK11_RESULT_O@ \
 
 # Alphabetically
 SRCS =		@ISC_EXTRA_SRCS@ @ISC_PK11_C@ @ISC_PK11_RESULT_C@ \
-		aes.c assertions.c base32.c base64.c bind9.c \
+		aes.c assertions.c base32.c base64.c \
 		buffer.c bufferlist.c commandline.c \
 		error.c event.c heap.c hex.c hmacmd5.c hmacsha.c \
 		inet_aton.c iterated_hash.c \
-		lex.c lib.c log.c \
+		lex.c log.c \
 		md5.c mutexblock.c \
 		netaddr.c netscope.c \
 		parseint.c \
diff --git a/usr.sbin/bind/lib/isc/app_api.c b/usr.sbin/bind/lib/isc/app_api.c
index ad6cd24b7d0..eff52b5154c 100644
--- a/usr.sbin/bind/lib/isc/app_api.c
+++ b/usr.sbin/bind/lib/isc/app_api.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app_api.c,v 1.3 2020/01/20 18:51:53 florian Exp $ */
+/* $Id: app_api.c,v 1.4 2020/01/21 10:11:09 deraadt Exp $ */
 
 #include <config.h>
 
@@ -56,29 +56,14 @@ isc_app_register(isc_appctxcreatefunc_t createfunc) {
 
 isc_result_t
 isc_appctx_create(isc_appctx_t **ctxp) {
-	isc_result_t result;
-
-	if (isc_bind9)
-		return (isc__appctx_create(ctxp));
-
-	LOCK(&createlock);
-
-	REQUIRE(appctx_createfunc != NULL);
-	result = (*appctx_createfunc)(ctxp);
-
-	UNLOCK(&createlock);
-
-	return (result);
+	return (isc__appctx_create(ctxp));
 }
 
 void
 isc_appctx_destroy(isc_appctx_t **ctxp) {
 	REQUIRE(ctxp != NULL && ISCAPI_APPCTX_VALID(*ctxp));
 
-	if (isc_bind9)
-		isc__appctx_destroy(ctxp);
-	else
-		(*ctxp)->methods->ctxdestroy(ctxp);
+	isc__appctx_destroy(ctxp);
 
 	ENSURE(*ctxp == NULL);
 }
@@ -87,20 +72,14 @@ isc_result_t
 isc_app_ctxstart(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
-	if (isc_bind9)
-		return (isc__app_ctxstart(ctx));
-
-	return (ctx->methods->ctxstart(ctx));
+	return (isc__app_ctxstart(ctx));
 }
 
 isc_result_t
 isc_app_ctxrun(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
-	if (isc_bind9)
-		return (isc__app_ctxrun(ctx));
-
-	return (ctx->methods->ctxrun(ctx));
+	return (isc__app_ctxrun(ctx));
 }
 
 isc_result_t
@@ -110,38 +89,28 @@ isc_app_ctxonrun(isc_appctx_t *ctx,
 {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
-	if (isc_bind9)
-		return (isc__app_ctxonrun(ctx, task, action, arg));
-
-	return (ctx->methods->ctxonrun(ctx, task, action, arg));
+	return (isc__app_ctxonrun(ctx, task, action, arg));
 }
 
 isc_result_t
 isc_app_ctxsuspend(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
-	if (isc_bind9)
-		return (isc__app_ctxsuspend(ctx));
-
-	return (ctx->methods->ctxsuspend(ctx));
+	return (isc__app_ctxsuspend(ctx));
 }
 
 isc_result_t
 isc_app_ctxshutdown(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
-	if (isc_bind9)
-		return (isc__app_ctxshutdown(ctx));
-
-	return (ctx->methods->ctxshutdown(ctx));
+	return (isc__app_ctxshutdown(ctx));
 }
 
 void
 isc_app_ctxfinish(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
-	if (isc_bind9)
-		isc__app_ctxfinish(ctx);
+	isc__app_ctxfinish(ctx);
 
 	ctx->methods->ctxfinish(ctx);
 }
@@ -151,8 +120,7 @@ isc_appctx_settaskmgr(isc_appctx_t *ctx, isc_taskmgr_t *taskmgr) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 	REQUIRE(taskmgr != NULL);
 
-	if (isc_bind9)
-		isc__appctx_settaskmgr(ctx, taskmgr);
+	isc__appctx_settaskmgr(ctx, taskmgr);
 
 	ctx->methods->settaskmgr(ctx, taskmgr);
 }
@@ -162,8 +130,7 @@ isc_appctx_setsocketmgr(isc_appctx_t *ctx, isc_socketmgr_t *socketmgr) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 	REQUIRE(socketmgr != NULL);
 
-	if (isc_bind9)
-		isc__appctx_setsocketmgr(ctx, socketmgr);
+	isc__appctx_setsocketmgr(ctx, socketmgr);
 
 	ctx->methods->setsocketmgr(ctx, socketmgr);
 }
@@ -173,43 +140,31 @@ isc_appctx_settimermgr(isc_appctx_t *ctx, isc_timermgr_t *timermgr) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 	REQUIRE(timermgr != NULL);
 
-	if (isc_bind9)
-		isc__appctx_settimermgr(ctx, timermgr);
+	isc__appctx_settimermgr(ctx, timermgr);
 
 	ctx->methods->settimermgr(ctx, timermgr);
 }
 
 isc_result_t
 isc_app_start(void) {
-	if (isc_bind9)
-		return (isc__app_start());
-
-	return (ISC_R_NOTIMPLEMENTED);
+	return (isc__app_start());
 }
 
 isc_result_t
 isc_app_onrun(isc_task_t *task,
 	       isc_taskaction_t action, void *arg)
 {
-	if (isc_bind9)
-		return (isc__app_onrun(task, action, arg));
-
-	return (ISC_R_NOTIMPLEMENTED);
+	return (isc__app_onrun(task, action, arg));
 }
 
 isc_result_t
 isc_app_run() {
-	if (isc_bind9) {
-		isc_result_t result;
-
-		is_running = ISC_TRUE;
-		result = isc__app_run();
-		is_running = ISC_FALSE;
-
-		return (result);
-	}
+	isc_result_t result;
 
-	return (ISC_R_NOTIMPLEMENTED);
+	is_running = ISC_TRUE;
+	result = isc__app_run();
+	is_running = ISC_FALSE;
+	return (result);
 }
 
 isc_boolean_t
@@ -219,40 +174,25 @@ isc_app_isrunning() {
 
 isc_result_t
 isc_app_shutdown(void) {
-	if (isc_bind9)
-		return (isc__app_shutdown());
-
-	return (ISC_R_NOTIMPLEMENTED);
+	return (isc__app_shutdown());
 }
 
 isc_result_t
 isc_app_reload(void) {
-	if (isc_bind9)
-		return (isc__app_reload());
-
-	return (ISC_R_NOTIMPLEMENTED);
+	return (isc__app_reload());
 }
 
 void
 isc_app_finish(void) {
-	if (!isc_bind9)
-		return;
-
 	isc__app_finish();
 }
 
 void
 isc_app_block(void) {
-	if (!isc_bind9)
-		return;
-
 	isc__app_block();
 }
 
 void
 isc_app_unblock(void) {
-	if (!isc_bind9)
-		return;
-
 	isc__app_unblock();
 }
diff --git a/usr.sbin/bind/lib/isc/bind9.c b/usr.sbin/bind/lib/isc/bind9.c
deleted file mode 100644
index e96b6e5ea73..00000000000
--- a/usr.sbin/bind/lib/isc/bind9.c
+++ /dev/null
@@ -1,30 +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.
- */
-
-/*! \file */
-
-#include <config.h>
-
-#include <isc/bind9.h>
-
-/*
- * This determines whether we are using the libisc/libdns libraries
- * in BIND9 or in some other application. It is initialized to ISC_TRUE
- * and remains unchanged for BIND9 and related tools; export library
- * clients will run isc_lib_register(), which sets it to ISC_FALSE,
- * overriding certain BIND9 behaviors.
- */
-isc_boolean_t isc_bind9 = ISC_TRUE;
diff --git a/usr.sbin/bind/lib/isc/lib.c b/usr.sbin/bind/lib/isc/lib.c
deleted file mode 100644
index 997a5f9ef8b..00000000000
--- a/usr.sbin/bind/lib/isc/lib.c
+++ /dev/null
@@ -1,65 +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: lib.c,v 1.7 2020/01/20 18:51:53 florian Exp $ */
-
-/*! \file */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <isc/app.h>
-#include <isc/lib.h>
-
-#include <isc/msgs.h>
-#include <isc/once.h>
-
-#include <isc/socket.h>
-#include <isc/task.h>
-#include <isc/timer.h>
-#include <isc/util.h>
-
-/***
- *** Globals
- ***/
-
-/***
- *** Private
- ***/
-
-/***
- *** Functions
- ***/
-
-static isc_once_t		register_once = ISC_ONCE_INIT;
-
-static void
-do_register(void) {
-	isc_bind9 = ISC_FALSE;
-
-	RUNTIME_CHECK(isc__app_register() == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc__task_register() == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc__socket_register() == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc__timer_register() == ISC_R_SUCCESS);
-}
-
-void
-isc_lib_register(void) {
-	RUNTIME_CHECK(isc_once_do(&register_once, do_register)
-		      == ISC_R_SUCCESS);
-}
diff --git a/usr.sbin/bind/lib/isc/socket_api.c b/usr.sbin/bind/lib/isc/socket_api.c
index 4f113cd517b..82c3ff81a2f 100644
--- a/usr.sbin/bind/lib/isc/socket_api.c
+++ b/usr.sbin/bind/lib/isc/socket_api.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket_api.c,v 1.4 2020/01/20 18:51:53 florian Exp $ */
+/* $Id: socket_api.c,v 1.5 2020/01/21 10:11:09 deraadt Exp $ */
 
 #include <config.h>
 
@@ -71,29 +71,14 @@ isc_socketmgr_createinctx(isc_appctx_t *actx,
 
 isc_result_t
 isc_socketmgr_create(isc_socketmgr_t **managerp) {
-	isc_result_t result;
-
-	if (isc_bind9)
-		return (isc__socketmgr_create(managerp));
-
-	LOCK(&createlock);
-
-	REQUIRE(socketmgr_createfunc != NULL);
-	result = (*socketmgr_createfunc)(managerp);
-
-	UNLOCK(&createlock);
-
-	return (result);
+	return (isc__socketmgr_create(managerp));
 }
 
 void
 isc_socketmgr_destroy(isc_socketmgr_t **managerp) {
 	REQUIRE(managerp != NULL && ISCAPI_SOCKETMGR_VALID(*managerp));
 
-	if (isc_bind9)
-		isc__socketmgr_destroy(managerp);
-	else
-		(*managerp)->methods->destroy(managerp);
+	isc__socketmgr_destroy(managerp);
 
 	ENSURE(*managerp == NULL);
 }
@@ -104,10 +89,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 {
 	REQUIRE(ISCAPI_SOCKETMGR_VALID(manager));
 
-	if (isc_bind9)
-		return (isc__socket_create(manager, pf, type, socketp));
-
-	return (manager->methods->socketcreate(manager, pf, type, socketp));
+	return (isc__socket_create(manager, pf, type, socketp));
 }
 
 void
@@ -115,10 +97,7 @@ isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 	REQUIRE(socketp != NULL && *socketp == NULL);
 
-	if (isc_bind9)
-		isc__socket_attach(sock, socketp);
-	else
-		sock->methods->attach(sock, socketp);
+	isc__socket_attach(sock, socketp);
 
 	ENSURE(*socketp == sock);
 }
@@ -127,10 +106,7 @@ void
 isc_socket_detach(isc_socket_t **socketp) {
 	REQUIRE(socketp != NULL && ISCAPI_SOCKET_VALID(*socketp));
 
-	if (isc_bind9)
-		isc__socket_detach(socketp);
-	else
-		(*socketp)->methods->detach(socketp);
+	isc__socket_detach(socketp);
 
 	ENSURE(*socketp == NULL);
 }
@@ -141,10 +117,7 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr,
 {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_bind(sock, sockaddr, options));
-
-	return (sock->methods->bind(sock, sockaddr, options));
+	return (isc__socket_bind(sock, sockaddr, options));
 }
 
 isc_result_t
@@ -154,12 +127,8 @@ isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task,
 {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_sendto(sock, region, task,
-					   action, arg, address, pktinfo));
-
-	return (sock->methods->sendto(sock, region, task, action, arg, address,
-				      pktinfo));
+	return (isc__socket_sendto(sock, region, task,
+			   action, arg, address, pktinfo));
 }
 
 isc_result_t
@@ -168,10 +137,7 @@ isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr, isc_task_t *task,
 {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_connect(sock, addr, task, action, arg));
-
-	return (sock->methods->connect(sock, addr, task, action, arg));
+	return (isc__socket_connect(sock, addr, task, action, arg));
 }
 
 isc_result_t
@@ -180,41 +146,29 @@ isc_socket_recv(isc_socket_t *sock, isc_region_t *region, unsigned int minimum,
 {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_recv(sock, region, minimum,
+	return (isc__socket_recv(sock, region, minimum,
 					 task, action, arg));
-
-	return (sock->methods->recv(sock, region, minimum, task, action, arg));
 }
 
 void
 isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		isc__socket_cancel(sock, task, how);
-	else
-		sock->methods->cancel(sock, task, how);
+	isc__socket_cancel(sock, task, how);
 }
 
 isc_result_t
 isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_getsockname(sock, addressp));
-
-	return (sock->methods->getsockname(sock, addressp));
+	return (isc__socket_getsockname(sock, addressp));
 }
 
 void
 isc_socket_ipv6only(isc_socket_t *sock, isc_boolean_t yes) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		isc__socket_ipv6only(sock, yes);
-	else
-		sock->methods->ipv6only(sock, yes);
+	isc__socket_ipv6only(sock, yes);
 }
 
 void
@@ -228,10 +182,7 @@ isc_sockettype_t
 isc_socket_gettype(isc_socket_t *sock) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_gettype(sock));
-
-	return (sock->methods->gettype(sock));
+	return (isc__socket_gettype(sock));
 }
 
 void
@@ -250,14 +201,9 @@ isc_socket_fdwatchcreate(isc_socketmgr_t *manager, int fd, int flags,
 {
 	REQUIRE(ISCAPI_SOCKETMGR_VALID(manager));
 
-	if (isc_bind9)
-		return (isc__socket_fdwatchcreate(manager, fd, flags,
+	return (isc__socket_fdwatchcreate(manager, fd, flags,
 						  callback, cbarg,
 						  task, socketp));
-
-	return (manager->methods->fdwatchcreate(manager, fd, flags,
-						callback, cbarg, task,
-						socketp));
 }
 
 isc_result_t
@@ -265,10 +211,7 @@ isc_socket_fdwatchpoke(isc_socket_t *sock, int flags)
 {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_fdwatchpoke(sock, flags));
-
-	return (sock->methods->fdwatchpoke(sock, flags));
+	return (isc__socket_fdwatchpoke(sock, flags));
 }
 
 isc_result_t
@@ -276,20 +219,14 @@ isc_socket_dup(isc_socket_t *sock, isc_socket_t **socketp) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 	REQUIRE(socketp != NULL && *socketp == NULL);
 
-	if (isc_bind9)
-		return (isc__socket_dup(sock, socketp));
-
-	return (sock->methods->dup(sock, socketp));
+	return (isc__socket_dup(sock, socketp));
 }
 
 int
 isc_socket_getfd(isc_socket_t *sock) {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
-	if (isc_bind9)
-		return (isc__socket_getfd(sock));
-
-	return (sock->methods->getfd(sock));
+	return (isc__socket_getfd(sock));
 }
 
 isc_result_t
diff --git a/usr.sbin/bind/lib/isc/task.c b/usr.sbin/bind/lib/isc/task.c
index 3dfe266b81c..fc4b64bd9b5 100644
--- a/usr.sbin/bind/lib/isc/task.c
+++ b/usr.sbin/bind/lib/isc/task.c
@@ -1511,30 +1511,14 @@ isc_result_t
 isc_taskmgr_create(unsigned int workers,
 		   unsigned int default_quantum, isc_taskmgr_t **managerp)
 {
-	isc_result_t result;
-
-	if (isc_bind9)
-		return (isc__taskmgr_create(workers,
-					    default_quantum, managerp));
-	LOCK(&createlock);
-
-	REQUIRE(taskmgr_createfunc != NULL);
-	result = (*taskmgr_createfunc)(workers, default_quantum,
-				       managerp);
-
-	UNLOCK(&createlock);
-
-	return (result);
+	return (isc__taskmgr_create(workers, default_quantum, managerp));
 }
 
 void
 isc_taskmgr_destroy(isc_taskmgr_t **managerp) {
 	REQUIRE(managerp != NULL && ISCAPI_TASKMGR_VALID(*managerp));
 
-	if (isc_bind9)
-		isc__taskmgr_destroy(managerp);
-	else
-		(*managerp)->methods->destroy(managerp);
+	isc__taskmgr_destroy(managerp);
 
 	ENSURE(*managerp == NULL);
 }
@@ -1543,20 +1527,14 @@ void
 isc_taskmgr_setmode(isc_taskmgr_t *manager, isc_taskmgrmode_t mode) {
 	REQUIRE(ISCAPI_TASKMGR_VALID(manager));
 
-	if (isc_bind9)
-		isc__taskmgr_setmode(manager, mode);
-	else
-		manager->methods->setmode(manager, mode);
+	isc__taskmgr_setmode(manager, mode);
 }
 
 isc_taskmgrmode_t
 isc_taskmgr_mode(isc_taskmgr_t *manager) {
 	REQUIRE(ISCAPI_TASKMGR_VALID(manager));
 
-	if (isc_bind9)
-		return (isc__taskmgr_mode(manager));
-
-	return (manager->methods->mode(manager));
+	return (isc__taskmgr_mode(manager));
 }
 
 isc_result_t
@@ -1566,10 +1544,7 @@ isc_task_create(isc_taskmgr_t *manager, unsigned int quantum,
 	REQUIRE(ISCAPI_TASKMGR_VALID(manager));
 	REQUIRE(taskp != NULL && *taskp == NULL);
 
-	if (isc_bind9)
-		return (isc__task_create(manager, quantum, taskp));
-
-	return (manager->methods->taskcreate(manager, quantum, taskp));
+	return (isc__task_create(manager, quantum, taskp));
 }
 
 void
@@ -1577,10 +1552,7 @@ isc_task_attach(isc_task_t *source, isc_task_t **targetp) {
 	REQUIRE(ISCAPI_TASK_VALID(source));
 	REQUIRE(targetp != NULL && *targetp == NULL);
 
-	if (isc_bind9)
-		isc__task_attach(source, targetp);
-	else
-		source->methods->attach(source, targetp);
+	isc__task_attach(source, targetp);
 
 	ENSURE(*targetp == source);
 }
@@ -1589,10 +1561,7 @@ void
 isc_task_detach(isc_task_t **taskp) {
 	REQUIRE(taskp != NULL && ISCAPI_TASK_VALID(*taskp));
 
-	if (isc_bind9)
-		isc__task_detach(taskp);
-	else
-		(*taskp)->methods->detach(taskp);
+	isc__task_detach(taskp);
 
 	ENSURE(*taskp == NULL);
 }
@@ -1602,12 +1571,7 @@ isc_task_send(isc_task_t *task, isc_event_t **eventp) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 	REQUIRE(eventp != NULL && *eventp != NULL);
 
-	if (isc_bind9)
-		isc__task_send(task, eventp);
-	else {
-		task->methods->send(task, eventp);
-		ENSURE(*eventp == NULL);
-	}
+	isc__task_send(task, eventp);
 }
 
 void
@@ -1615,12 +1579,7 @@ isc_task_sendanddetach(isc_task_t **taskp, isc_event_t **eventp) {
 	REQUIRE(taskp != NULL && ISCAPI_TASK_VALID(*taskp));
 	REQUIRE(eventp != NULL && *eventp != NULL);
 
-	if (isc_bind9)
-		isc__task_sendanddetach(taskp, eventp);
-	else {
-		(*taskp)->methods->sendanddetach(taskp, eventp);
-		ENSURE(*eventp == NULL);
-	}
+	isc__task_sendanddetach(taskp, eventp);
 
 	ENSURE(*taskp == NULL);
 }
@@ -1631,10 +1590,7 @@ isc_task_unsend(isc_task_t *task, void *sender, isc_eventtype_t type,
 {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		return (isc__task_unsend(task, sender, type, tag, events));
-
-	return (task->methods->unsend(task, sender, type, tag, events));
+	return (isc__task_unsend(task, sender, type, tag, events));
 }
 
 isc_result_t
@@ -1642,27 +1598,18 @@ isc_task_onshutdown(isc_task_t *task, isc_taskaction_t action, void *arg)
 {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		return (isc__task_onshutdown(task, action, arg));
-
-	return (task->methods->onshutdown(task, action, arg));
+	return (isc__task_onshutdown(task, action, arg));
 }
 
 void
 isc_task_shutdown(isc_task_t *task) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		isc__task_shutdown(task);
-	else
-		task->methods->shutdown(task);
+	isc__task_shutdown(task);
 }
 
 void
 isc_task_destroy(isc_task_t **taskp) {
-	if (!isc_bind9)
-		return;
-
 	isc__task_destroy(taskp);
 }
 
@@ -1670,10 +1617,7 @@ void
 isc_task_setname(isc_task_t *task, const char *name, void *tag) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		isc__task_setname(task, name, tag);
-	else
-		task->methods->setname(task, name, tag);
+	isc__task_setname(task, name, tag);
 }
 
 unsigned int
@@ -1681,57 +1625,39 @@ isc_task_purge(isc_task_t *task, void *sender, isc_eventtype_t type, void *tag)
 {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		return (isc__task_purge(task, sender, type, tag));
-
-	return (task->methods->purgeevents(task, sender, type, tag));
+	return (isc__task_purge(task, sender, type, tag));
 }
 
 isc_result_t
 isc_task_beginexclusive(isc_task_t *task) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		return (isc__task_beginexclusive(task));
-
-	return (task->methods->beginexclusive(task));
+	return (isc__task_beginexclusive(task));
 }
 
 void
 isc_task_endexclusive(isc_task_t *task) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		isc__task_endexclusive(task);
-	else
-		task->methods->endexclusive(task);
+	isc__task_endexclusive(task);
 }
 
 void
 isc_task_setprivilege(isc_task_t *task, isc_boolean_t priv) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		isc__task_setprivilege(task, priv);
-	else
-		task->methods->setprivilege(task, priv);
+	isc__task_setprivilege(task, priv);
 }
 
 isc_boolean_t
 isc_task_privilege(isc_task_t *task) {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		return (isc__task_privilege(task));
-
-	return (task->methods->privilege(task));
+	return (isc__task_privilege(task));
 }
 
 void
 isc_task_getcurrenttime(isc_task_t *task, isc_stdtime_t *t) {
-	if (!isc_bind9)
-		return;
-
 	isc__task_getcurrenttime(task, t);
 }
 
@@ -1745,8 +1671,5 @@ isc_task_purgerange(isc_task_t *task, void *sender, isc_eventtype_t first,
 {
 	REQUIRE(ISCAPI_TASK_VALID(task));
 
-	if (isc_bind9)
-		return (isc__task_purgerange(task, sender, first, last, tag));
-
-	return (task->methods->purgerange(task, sender, first, last, tag));
+	return (isc__task_purgerange(task, sender, first, last, tag));
 }
diff --git a/usr.sbin/bind/lib/isc/timer.c b/usr.sbin/bind/lib/isc/timer.c
index ef2a6efc730..19fc60e2b10 100644
--- a/usr.sbin/bind/lib/isc/timer.c
+++ b/usr.sbin/bind/lib/isc/timer.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.12 2020/01/20 18:51:53 florian Exp $ */
+/* $Id: timer.c,v 1.13 2020/01/21 10:11:09 deraadt Exp $ */
 
 /*! \file */
 
@@ -876,29 +876,14 @@ isc_timermgr_createinctx(isc_appctx_t *actx,
 
 isc_result_t
 isc_timermgr_create(isc_timermgr_t **managerp) {
-	isc_result_t result;
-
-	if (isc_bind9)
-		return (isc__timermgr_create(managerp));
-
-	LOCK(&createlock);
-
-	REQUIRE(timermgr_createfunc != NULL);
-	result = (*timermgr_createfunc)(managerp);
-
-	UNLOCK(&createlock);
-
-	return (result);
+	return (isc__timermgr_create(managerp));
 }
 
 void
 isc_timermgr_destroy(isc_timermgr_t **managerp) {
 	REQUIRE(*managerp != NULL && ISCAPI_TIMERMGR_VALID(*managerp));
 
-	if (isc_bind9)
-		isc__timermgr_destroy(managerp);
-	else
-		(*managerp)->methods->destroy(managerp);
+	isc__timermgr_destroy(managerp);
 
 	ENSURE(*managerp == NULL);
 }
@@ -911,13 +896,8 @@ isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type,
 {
 	REQUIRE(ISCAPI_TIMERMGR_VALID(manager));
 
-	if (isc_bind9)
-		return (isc__timer_create(manager, type, expires, interval,
-					  task, action, arg, timerp));
-
-	return (manager->methods->timercreate(manager, type, expires,
-					      interval, task, action, arg,
-					      timerp));
+	return (isc__timer_create(manager, type, expires, interval,
+				  task, action, arg, timerp));
 }
 
 void
@@ -925,10 +905,7 @@ isc_timer_attach(isc_timer_t *timer, isc_timer_t **timerp) {
 	REQUIRE(ISCAPI_TIMER_VALID(timer));
 	REQUIRE(timerp != NULL && *timerp == NULL);
 
-	if (isc_bind9)
-		isc__timer_attach(timer, timerp);
-	else
-		timer->methods->attach(timer, timerp);
+	isc__timer_attach(timer, timerp);
 
 	ENSURE(*timerp == timer);
 }
@@ -937,10 +914,7 @@ void
 isc_timer_detach(isc_timer_t **timerp) {
 	REQUIRE(timerp != NULL && ISCAPI_TIMER_VALID(*timerp));
 
-	if (isc_bind9)
-		isc__timer_detach(timerp);
-	else
-		(*timerp)->methods->detach(timerp);
+	isc__timer_detach(timerp);
 
 	ENSURE(*timerp == NULL);
 }
@@ -952,19 +926,13 @@ isc_timer_reset(isc_timer_t *timer, isc_timertype_t type,
 {
 	REQUIRE(ISCAPI_TIMER_VALID(timer));
 
-	if (isc_bind9)
-		return (isc__timer_reset(timer, type, expires,
-					 interval, purge));
-
-	return (timer->methods->reset(timer, type, expires, interval, purge));
+	return (isc__timer_reset(timer, type, expires,
+				 interval, purge));
 }
 
 isc_result_t
 isc_timer_touch(isc_timer_t *timer) {
 	REQUIRE(ISCAPI_TIMER_VALID(timer));
 
-	if (isc_bind9)
-		return (isc__timer_touch(timer));
-
-	return (timer->methods->touch(timer));
+	return (isc__timer_touch(timer));
 }
diff --git a/usr.sbin/bind/lib/isc/unix/app.c b/usr.sbin/bind/lib/isc/unix/app.c
index bf820a89ace..96e6553e1b9 100644
--- a/usr.sbin/bind/lib/isc/unix/app.c
+++ b/usr.sbin/bind/lib/isc/unix/app.c
@@ -518,7 +518,7 @@ isc__app_ctxrun(isc_appctx_t *ctx0) {
 
 	UNLOCK(&ctx->lock);
 
-	if (isc_bind9 && ctx == &isc_g_appctx) {
+	if (ctx == &isc_g_appctx) {
 		result = handle_signal(SIGHUP, reload_action);
 		if (result != ISC_R_SUCCESS)
 			return (ISC_R_SUCCESS);
@@ -553,7 +553,7 @@ isc__app_ctxshutdown(isc_appctx_t *ctx0) {
 	UNLOCK(&ctx->lock);
 
 	if (want_kill) {
-		if (isc_bind9 && ctx != &isc_g_appctx)
+		if (ctx != &isc_g_appctx)
 			/* BIND9 internal, but using multiple contexts */
 			ctx->want_shutdown = ISC_TRUE;
 		else {
@@ -589,7 +589,7 @@ isc__app_ctxsuspend(isc_appctx_t *ctx0) {
 	UNLOCK(&ctx->lock);
 
 	if (want_kill) {
-		if (isc_bind9 && ctx != &isc_g_appctx)
+		if (ctx != &isc_g_appctx)
 			/* BIND9 internal, but using multiple contexts */
 			ctx->want_reload = ISC_TRUE;
 		else {