diff options
| author |   deraadt <deraadt@openbsd.org> | 2020-01-21 10:11:09 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2020-01-21 10:11:09 +0000 |
| commit | 6d802d26e17a128c64af7f9a9eb887d8d05127b9 (patch) | |
| tree | 6915359576ac9397d18042527ffcb4d4101414b8 /usr.sbin/bind/lib/isc/unix | |
| parent | Get rid of isccfg/log.c by pulling in the tiny bits needed into (diff) | |
| download | wireguard-openbsd-6d802d26e17a128c64af7f9a9eb887d8d05127b9.tar.xz wireguard-openbsd-6d802d26e17a128c64af7f9a9eb887d8d05127b9.zip | |
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
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/app.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |