diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2017-06-01 20:18:45 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2017-06-01 20:18:45 +0000 |
| commit | 434fa0a0fb1c7b391d113256320d452c5c323dc1 (patch) | |
| tree | 28e633117a77d228aeed57bc8843543becf68095 /usr.sbin/bind | |
| parent | 5b1839548e793966daf6ab053fe33282e6569f7f (diff) | |
Revert 1.16 ("add a workaround for the rebound portjacking hijinks"),
it breaks at least nslookup, host, dig +tcp.
Diffstat (limited to 'usr.sbin/bind')
| -rw-r--r-- | usr.sbin/bind/bin/dig/dighost.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/usr.sbin/bind/bin/dig/dighost.c b/usr.sbin/bind/bin/dig/dighost.c index 4c8ff67b2f0..dcdb1deb8b0 100644 --- a/usr.sbin/bind/bin/dig/dighost.c +++ b/usr.sbin/bind/bin/dig/dighost.c @@ -34,8 +34,6 @@ #include <string.h> #include <limits.h> -#include <sys/sysctl.h> - #ifdef HAVE_LOCALE_H #include <locale.h> #endif @@ -2780,15 +2778,6 @@ recv_done(isc_task_t *task, isc_event_t *event) { isc_region_t r; isc_buffer_t *buf = NULL; #endif - static int checked_jackport; - static int jackport; - - if (!checked_jackport) { - int dnsjacking[2] = { CTL_KERN, KERN_DNSJACKPORT }; - size_t portlen = sizeof(jackport); - sysctl(dnsjacking, 2, &jackport, &portlen, NULL, 0); - checked_jackport = 1; - } UNUSED(task); INSIST(!free_now); @@ -2865,7 +2854,6 @@ recv_done(isc_task_t *task, isc_event_t *event) { * sent to 0.0.0.0, :: or to a multicast addresses. * XXXMPA broadcast needs to be handled here as well. */ - if (jackport == 0) if ((!isc_sockaddr_eqaddr(&query->sockaddr, &any) && !isc_sockaddr_ismulticast(&query->sockaddr)) || isc_sockaddr_getport(&query->sockaddr) != |