- Fix unbound-control-setup.cmd to have CA v3 basicConstraints,

like unbound-control-setup.sh has.
- Fix TTL of synthesized CNAME when a DNAME is used from cache.
2026-08-17 21:25:50 +02:00 · 2024-03-11 10:47:34 +01:00 · 2024-03-11 10:46:14 +01:00 · 2024-03-11 10:46:14 +01:00
207 changed files with 4413 additions and 18383 deletions
@@ -32,12 +32,12 @@ jobs:
          - name: OS X
            os: macos-latest
            install_expat: "yes"
-            config: "--enable-debug --disable-flto --with-ssl=/opt/homebrew/opt/openssl --with-libexpat=/opt/homebrew/opt/expat"
+            config: "--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat"
            make_test: "yes"
          - name: Clang on OS X
            os: macos-latest
            install_expat: "yes"
-            config: "CC=clang --enable-debug --disable-flto --with-ssl=/opt/homebrew/opt/openssl --with-libexpat=/opt/homebrew/opt/expat --disable-static"
+            config: "CC=clang --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat --disable-static"
            make_test: "yes"
            clang_analysis: "yes"
          - name: ubsan (gcc undefined behaviour sanitizer)
@@ -10,9 +10,6 @@
 /config.status
 /dnstap/dnstap_config.h
 /dnscrypt/dnscrypt_config.h
-/util/configlexer.c
-/util/configparser.c
-/util/configparser.h
 /clubsyms.def
 /doc/example.conf
 /doc/libunbound.3
@@ -58,7 +55,6 @@
 /pythonmod/unboundmodule.py
 /testdata/result.*
 /testdata/.done-*
-/testdata/.skip-*
 /testdata/.perfstats.txt
 /doc/html
 /doc/xml
@@ -439,8 +439,7 @@ unbound-control-setup:	smallapp/unbound-control-setup.sh
 dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h dnstap/dnstap_config.h \
 	dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h $(srcdir)/dnstap/dnstap.h \
 	$(srcdir)/util/config_file.h $(srcdir)/util/log.h \
-	$(srcdir)/util/netevent.h $(srcdir)/util/net_help.h \
-	$(srcdir)/util/locks.h
+	$(srcdir)/util/netevent.h $(srcdir)/util/net_help.h

 dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h: $(srcdir)/dnstap/dnstap.proto
 	@-if test ! -d dnstap; then $(INSTALL) -d dnstap; fi
@@ -1279,8 +1278,7 @@ daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h
 $(srcdir)/util/edns.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
 $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h \
 $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/respip/respip.h \
- $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h \
- $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
+ $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h
 remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \
 $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
@@ -1357,7 +1355,7 @@ testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/test
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
 $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \
 $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
- $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h $(srcdir)/daemon/worker.h
+ $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h
 testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcode/testpkts.h \
 $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h \
 $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h
@@ -1430,7 +1428,7 @@ fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/t
 $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \
 $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \
 $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \
- $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/daemon/remote.h $(srcdir)/util/storage/slabhash.h $(srcdir)/daemon/daemon.h
+ $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/daemon/remote.h
 lock_verify.lo lock_verify.o: $(srcdir)/testcode/lock_verify.c config.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \
 $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \
@@ -1486,8 +1484,7 @@ context.lo context.o: $(srcdir)/libunbound/context.c config.h $(srcdir)/libunbou
 $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
 $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h \
- $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/util/edns.h \
- $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
+ $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/util/edns.h
 libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbound/unbound.h \
 $(srcdir)/libunbound/unbound-event.h config.h $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h \
 $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
@@ -1499,8 +1496,7 @@ libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbou
 $(srcdir)/sldns/sbuffer.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h \
 $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/services/cache/rrset.h \
 $(srcdir)/util/storage/slabhash.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
- $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h \
- $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
+ $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h
 libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/libunbound/libworker.h \
 $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
 $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
@@ -1514,7 +1510,8 @@ libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/li
 $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h \
 $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h \
 $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/data/msgencode.h $(srcdir)/sldns/str2wire.h
+ $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
+ $(srcdir)/sldns/str2wire.h
 unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c config.h $(srcdir)/libunbound/unbound.h \
 $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
 asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \
@@ -1,43 +1,39 @@
 # ===========================================================================
-#       https://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
+#              http://autoconf-archive.cryp.to/ac_pkg_swig.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found])
+#   AC_PROG_SWIG([major.minor.micro])
 #
 # DESCRIPTION
 #
-#   This macro searches for a SWIG installation on your system. If found,
-#   then SWIG is AC_SUBST'd; if not found, then $SWIG is empty.  If SWIG is
-#   found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd.
+#   This macro searches for a SWIG installation on your system. If found you
+#   should call SWIG via $(SWIG). You can use the optional first argument to
+#   check if the version of the available SWIG is greater than or equal to
+#   the value of the argument. It should have the format: N[.N[.N]] (N is a
+#   number between 0 and 999. Only the first N is mandatory.)
 #
-#   You can use the optional first argument to check if the version of the
-#   available SWIG is greater than or equal to the value of the argument. It
-#   should have the format: N[.N[.N]] (N is a number between 0 and 999. Only
-#   the first N is mandatory.) If the version argument is given (e.g.
-#   1.3.17), AX_PKG_SWIG checks that the swig package is this version number
-#   or higher.
-#
-#   As usual, action-if-found is executed if SWIG is found, otherwise
-#   action-if-not-found is executed.
+#   If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that
+#   the swig package is this version number or higher.
 #
 #   In configure.in, use as:
 #
-#     AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ])
-#     AX_SWIG_ENABLE_CXX
-#     AX_SWIG_MULTI_MODULE_SUPPORT
-#     AX_SWIG_PYTHON
+#     AC_PROG_SWIG(1.3.17)
+#     SWIG_ENABLE_CXX
+#     SWIG_MULTI_MODULE_SUPPORT
+#     SWIG_PYTHON
 #
-# LICENSE
+# LAST MODIFICATION
+#
+#   2008-04-12
+#
+# COPYLEFT
 #
 #   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2008 Alan W. Irwin
+#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
 #   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2008 Andrew Collier
-#   Copyright (c) 2011 Murray Cumming <murrayc@openismus.com>
-#   Copyright (c) 2018 Reini Urban <rurban@cpan.org>
-#   Copyright (c) 2021 Vincent Danjean <Vincent.Danjean@ens-lyon.org>
+#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -50,7 +46,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -61,21 +57,17 @@
 #   all other use of the material that constitutes the Autoconf Macro.
 #
 #   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
+#   Macro released by the Autoconf Macro Archive. When you make and
+#   distribute a modified version of the Autoconf Macro, you may extend this
+#   special exception to the GPL to apply to your modified version as well.

-#serial 15
-
-AC_DEFUN([AX_PKG_SWIG],[
-        # Find path to the "swig" executable.
-        AC_PATH_PROGS([SWIG],[swig swig3.0 swig2.0])
+AC_DEFUN([AC_PROG_SWIG],[
+        AC_PATH_PROG([SWIG],[swig])
        if test -z "$SWIG" ; then
-                m4_ifval([$3],[$3],[:])
-        elif test -z "$1" ; then
-                m4_ifval([$2],[$2],[:])
-	else
-                AC_MSG_CHECKING([SWIG version])
+                AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+                SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+        elif test -n "$1" ; then
+                AC_MSG_CHECKING([for SWIG version])
                [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
                AC_MSG_RESULT([$swig_version])
                if test -n "$swig_version" ; then
@@ -85,12 +77,12 @@ AC_DEFUN([AX_PKG_SWIG],[
                        if test -z "$required_major" ; then
                                [required_major=0]
                        fi
-                        [required=`echo $required. | sed 's/[0-9]*[^0-9]//'`]
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
                        [required_minor=`echo $required | sed 's/[^0-9].*//'`]
                        if test -z "$required_minor" ; then
                                [required_minor=0]
                        fi
-                        [required=`echo $required. | sed 's/[0-9]*[^0-9]//'`]
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
                        [required_patch=`echo $required | sed 's/[^0-9].*//'`]
                        if test -z "$required_patch" ; then
                                [required_patch=0]
@@ -111,28 +103,30 @@ AC_DEFUN([AX_PKG_SWIG],[
                        if test -z "$available_patch" ; then
                                [available_patch=0]
                        fi
-                        # Convert the version tuple into a single number for easier comparison.
-                        # Using base 100 should be safe since SWIG internally uses BCD values
-                        # to encode its version number.
-                        required_swig_vernum=`expr $required_major \* 10000 \
-                            \+ $required_minor \* 100 \+ $required_patch`
-                        available_swig_vernum=`expr $available_major \* 10000 \
-                            \+ $available_minor \* 100 \+ $available_patch`
-
-                        if test $available_swig_vernum -lt $required_swig_vernum; then
-                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.])
-                                SWIG=''
-                                m4_ifval([$3],[$3],[])
+			[badversion=0]
+			if test $available_major -lt $required_major ; then
+				[badversion=1]
+			fi
+                        if test $available_major -eq $required_major \
+                                -a $available_minor -lt $required_minor ; then
+				[badversion=1]
+			fi
+                        if test $available_major -eq $required_major \
+                                -a $available_minor -eq $required_minor \
+                                -a $available_patch -lt $required_patch ; then
+				[badversion=1]
+			fi
+			if test $badversion -eq 1 ; then
+                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
                        else
-                                AC_MSG_CHECKING([for SWIG library])
-                                SWIG_LIB=`$SWIG -swiglib | tr '\r\n' '  '`
-                                AC_MSG_RESULT([$SWIG_LIB])
-                                m4_ifval([$2],[$2],[])
+                                AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+                                SWIG_LIB=`$SWIG -swiglib`
+                                AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
                        fi
                else
                        AC_MSG_WARN([cannot determine SWIG version])
-                        SWIG=''
-                        m4_ifval([$3],[$3],[])
+                        SWIG='echo "Error: Cannot determine SWIG version.  You should look at http://www.swig.org" ; false'
                fi
        fi
        AC_SUBST([SWIG_LIB])
@@ -9,7 +9,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[

        AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
        if test -z "$PYTHON"; then
-           AC_MSG_ERROR([Cannot find 'python$PYTHON_VERSION' in your system path. You can use the environment variable 'PYTHON_VERSION=version_number' for an explicit version.])
+           AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
           PYTHON_VERSION=""
        fi

@@ -1,5 +1,5 @@
 # ===========================================================================
-#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -14,28 +14,24 @@
 #   flags that are needed. (The user can also force certain compiler
 #   flags/libs to be tested by setting these environment variables.)
 #
-#   Also sets PTHREAD_CC and PTHREAD_CXX to any special C compiler that is
-#   needed for multi-threaded programs (defaults to the value of CC
-#   respectively CXX otherwise). (This is necessary on e.g. AIX to use the
-#   special cc_r/CC_r compiler alias.)
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
 #
 #   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
+#   but also link it with them as well. e.g. you should link with
 #   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#   $PTHREAD_CXX $CXXFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
 #
-#   If you are only building threaded programs, you may wish to use these
+#   If you are only building threads programs, you may wish to use these
 #   variables in your default LIBS, CFLAGS, and CC:
 #
 #     LIBS="$PTHREAD_LIBS $LIBS"
 #     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
 #     CC="$PTHREAD_CC"
-#     CXX="$PTHREAD_CXX"
 #
 #   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
 #
 #   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
 #   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
@@ -59,7 +55,6 @@
 #
 #   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 #   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
 #
 #   This program is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -72,7 +67,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -87,41 +82,35 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 31
+#serial 21

 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
 AC_DEFUN([AX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
 AC_LANG_PUSH([C])
 ax_pthread_ok=no

 # We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
+# requires special compiler flags (e.g. on True64 or Sequent).
 # It gets checked for in the link test anyway.

 # First of all, check if the user has set any of the PTHREAD_LIBS,
 # etcetera environment variables, and if threads linking works using
 # them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-        AS_IF([test "x$PTHREAD_CXX" != "x"], [CXX="$PTHREAD_CXX"])
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = "xno"; then
+        if test x"$ax_pthread_ok" = xno; then
                PTHREAD_LIBS=""
                PTHREAD_CFLAGS=""
        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
 fi

 # We must check for the threads library under a number of different
@@ -129,14 +118,12 @@ fi
 # (e.g. DEC) have both -lpthread and -lpthreads, where one of the
 # libraries is broken (non-POSIX).

-# Create a list of thread flags to try. Items with a "," contain both
-# C compiler flags (before ",") and linker flags (after ","). Other items
-# starting with a "-" are C compiler flags, and remaining items are
-# library names, except for "none" which indicates that we try without
-# any flags at all, and "pthread-config" which is a program returning
-# the flags for the Pth emulation library.
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.

-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"

 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
@@ -145,163 +132,82 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
 # none: in case threads are in libc; should be tried before -Kthread and
 #       other compiler flags to prevent continual compiler warnings
 # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
 # -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
 # pthread: Linux, etcetera
 # --thread-safe: KAI C++
 # pthread-config: use pthread-config program (for GNU Pth library)

-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-            [
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ],
-            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-        ;;
-
+case ${host_os} in
        solaris*)

        # On Solaris (at least, for some versions), libc contains stubbed
        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:

-        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
        ;;
 esac

-# Are we compiling with Clang?
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.

-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
+                  [AC_MSG_RESULT([yes])],
+                  [ax_pthread_extra_flags=
+                   AC_MSG_RESULT([no])])
+CFLAGS="$save_CFLAGS"

+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do

-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-# Note that for GCC and Clang -pthread generally implies -lpthread,
-# except when -nostdlib is passed.
-# This is problematic using libtool to build C++ shared libraries with pthread:
-# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
-# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
-# To solve this, first try -pthread together with -lpthread for GCC
-
-AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
-
-# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
-
-AS_IF([test "x$ax_pthread_clang" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread"])
-
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-      [ax_pthread_check_cond=0],
-      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
+        case $flag in
                none)
                AC_MSG_CHECKING([whether pthreads work without any flags])
                ;;

-                *,*)
-                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
-                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
-                ;;
-
                -*)
-                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
                ;;

                pthread-config)
                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                if test x"$ax_pthread_config" = xno; then continue; fi
                PTHREAD_CFLAGS="`pthread-config --cflags`"
                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
                ;;

                *)
-                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
                ;;
        esac

-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"

        # Check for various functions.  We must include pthread.h,
        # since some functions may be macros.  (On the Sequent, we
@@ -312,18 +218,8 @@ for ax_pthread_try_flag in $ax_pthread_flags; do
        # pthread_cleanup_push because it is one of the few pthread
        # functions on Solaris that doesn't have a non-functional libc stub.
        # We try pthread_create on general principles.
-
        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void *some_global = NULL;
-                        static void routine(void *a)
-                          {
-                             /* To avoid any unused-parameter or
-                                unused-but-set-parameter warning.  */
-                             some_global = a;
-                          }
+                        static void routine(void *a) { *((int*)a) = 0; }
                        static void *start_routine(void *a) { return a; }],
                       [pthread_t th; pthread_attr_t attr;
                        pthread_create(&th, 0, start_routine, 0);
@@ -331,187 +227,101 @@ for ax_pthread_try_flag in $ax_pthread_flags; do
                        pthread_attr_init(&attr);
                        pthread_cleanup_push(routine, 0);
                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
+                [ax_pthread_ok=yes],
+                [])

-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"

        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi

        PTHREAD_LIBS=""
        PTHREAD_CFLAGS=""
 done
 fi

-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`AS_ECHO(["$ac_link"]) | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                    [ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                         [break])
-                    ])
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            ])
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-
-
 # Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK([for joinable pthread attribute],
-            [ax_cv_PTHREAD_JOINABLE_ATTR],
-            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-                                [])
-             done
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-                                  [Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.])
-               ax_pthread_joinable_attr_defined=yes
-              ])
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT([$attr_name])
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi

-        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"],
-              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes])
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                # TODO: What about Clang on Solaris?
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT([$flag])
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi

        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT],
-            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = PTHREAD_PRIO_INHERIT;
-                                               return i;]])],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            [ax_cv_PTHREAD_PRIO_INHERIT], [
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-               ax_pthread_prio_inherit_defined=yes
-              ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])

-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"

        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
+        if test "x$GCC" != xyes; then
            case $host_os in
                aix*)
                AS_CASE(["x/$CC"],
-                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                    [#handle absolute path differently from PATH based program lookup
-                     AS_CASE(["x$CC"],
-                         [x/*],
-                         [
-			   AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
-			   AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
-			 ],
-                         [
-			   AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
-			   AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
-			 ]
-                     )
-                    ])
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
                ;;
            esac
        fi
 fi

 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"

 AC_SUBST([PTHREAD_LIBS])
 AC_SUBST([PTHREAD_CFLAGS])
 AC_SUBST([PTHREAD_CC])
-AC_SUBST([PTHREAD_CXX])

 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
+if test x"$ax_pthread_ok" = xyes; then
        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
        :
 else
@@ -50,8 +50,6 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgencode.h"
 #include "services/cache/dns.h"
-#include "services/mesh.h"
-#include "services/modstack.h"
 #include "validator/val_neg.h"
 #include "validator/val_secalgo.h"
 #include "iterator/iter_utils.h"
@@ -267,6 +265,15 @@ cachedb_init(struct module_env* env, int id)
 		return 0;
 	}
 	cachedb_env->enabled = 1;
+	if(env->cfg->serve_expired && env->cfg->serve_expired_reply_ttl)
+		log_warn(
+			"cachedb: serve-expired-reply-ttl is set but not working for data "
+			"originating from the external cache; 0 TTL is used for those.");
+	if(env->cfg->serve_expired && env->cfg->serve_expired_client_timeout)
+		log_warn(
+			"cachedb: serve-expired-client-timeout is set but not working for "
+			"data originating from the external cache; expired data are used "
+			"in the reply without first trying to refresh the data.");
 	return 1;
 }

@@ -322,30 +329,30 @@ error_response(struct module_qstate* qstate, int id, int rcode)

 /**
 * Hash the query name, type, class and dbacess-secret into lookup buffer.
- * @param qinfo: query info
- * @param env: with env->cfg with secret.
+ * @param qstate: query state with query info
+ * 	and env->cfg with secret.
 * @param buf: returned buffer with hash to lookup
 * @param len: length of the buffer.
 */
 static void
-calc_hash(struct query_info* qinfo, struct module_env* env, char* buf,
-	size_t len)
+calc_hash(struct module_qstate* qstate, char* buf, size_t len)
 {
 	uint8_t clear[1024];
 	size_t clen = 0;
 	uint8_t hash[CACHEDB_HASHSIZE/8];
 	const char* hex = "0123456789ABCDEF";
-	const char* secret = env->cfg->cachedb_secret;
+	const char* secret = qstate->env->cfg->cachedb_secret;
 	size_t i;

 	/* copy the hash info into the clear buffer */
-	if(clen + qinfo->qname_len < sizeof(clear)) {
-		memmove(clear+clen, qinfo->qname, qinfo->qname_len);
-		clen += qinfo->qname_len;
+	if(clen + qstate->qinfo.qname_len < sizeof(clear)) {
+		memmove(clear+clen, qstate->qinfo.qname,
+			qstate->qinfo.qname_len);
+		clen += qstate->qinfo.qname_len;
 	}
 	if(clen + 4 < sizeof(clear)) {
-		uint16_t t = htons(qinfo->qtype);
-		uint16_t c = htons(qinfo->qclass);
+		uint16_t t = htons(qstate->qinfo.qtype);
+		uint16_t c = htons(qstate->qinfo.qclass);
 		memmove(clear+clen, &t, 2);
 		memmove(clear+clen+2, &c, 2);
 		clen += 4;
@@ -504,38 +511,9 @@ adjust_msg_ttl(struct dns_msg* msg, time_t adjust)
 	}
 }

-/* Set the TTL of the given RRset to fixed value. */
-static void
-packed_rrset_ttl_set(struct packed_rrset_data* data, time_t ttl)
-{
-	size_t i;
-	size_t total = data->count + data->rrsig_count;
-	data->ttl = ttl;
-	for(i=0; i<total; i++) {
-		data->rr_ttl[i] = ttl;
-	}
-	data->ttl_add = 0;
-}
-
-/* Set the TTL of a DNS message and its RRs by to a fixed value. */
-static void
-set_msg_ttl(struct dns_msg* msg, time_t ttl)
-{
-	size_t i;
-	msg->rep->ttl = ttl;
-	msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl);
-	msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL;
-
-	for(i=0; i<msg->rep->rrset_count; i++) {
-		packed_rrset_ttl_set((struct packed_rrset_data*)msg->
-			rep->rrsets[i]->entry.data, ttl);
-	}
-}
-
 /** convert dns message in buffer to return_msg */
 static int
-parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
-	int* msg_expired)
+parse_data(struct module_qstate* qstate, struct sldns_buffer* buf)
 {
 	struct msg_parse* prs;
 	struct edns_data edns;
@@ -605,7 +583,6 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 	adjust = *qstate->env->now - (time_t)timestamp;
 	if(qstate->return_msg->rep->ttl < adjust) {
 		verbose(VERB_ALGO, "cachedb msg expired");
-		*msg_expired = 1;
 		/* If serve-expired is enabled, we still use an expired message
 		 * setting the TTL to 0. */
 		if(!qstate->env->cfg->serve_expired ||
@@ -628,7 +605,6 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 	 * 'now' should be redundant given how these values were calculated,
 	 * but we check it just in case as does good_expiry_and_qinfo(). */
 	if(qstate->env->cfg->serve_expired &&
-		!qstate->env->cfg->serve_expired_client_timeout &&
 		(adjust == -1 || (time_t)expiry < *qstate->env->now)) {
 		qstate->need_refetch = 1;
 	}
@@ -641,11 +617,10 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 * return true if lookup was successful.
 */
 static int
-cachedb_extcache_lookup(struct module_qstate* qstate, struct cachedb_env* ie,
-	int* msg_expired)
+cachedb_extcache_lookup(struct module_qstate* qstate, struct cachedb_env* ie)
 {
 	char key[(CACHEDB_HASHSIZE/8)*2+1];
-	calc_hash(&qstate->qinfo, qstate->env, key, sizeof(key));
+	calc_hash(qstate, key, sizeof(key));

 	/* call backend to fetch data for key into scratch buffer */
 	if( !(*ie->backend->lookup)(qstate->env, ie, key,
@@ -659,7 +634,7 @@ cachedb_extcache_lookup(struct module_qstate* qstate, struct cachedb_env* ie,
 	}

 	/* parse dns message into return_msg */
-	if( !parse_data(qstate, qstate->env->scratch_buffer, msg_expired) ) {
+	if( !parse_data(qstate, qstate->env->scratch_buffer) ) {
 		return 0;
 	}
 	return 1;
@@ -672,7 +647,7 @@ static void
 cachedb_extcache_store(struct module_qstate* qstate, struct cachedb_env* ie)
 {
 	char key[(CACHEDB_HASHSIZE/8)*2+1];
-	calc_hash(&qstate->qinfo, qstate->env, key, sizeof(key));
+	calc_hash(qstate, key, sizeof(key));

 	/* prepare data in scratch buffer */
 	if(!prep_data(qstate, qstate->env->scratch_buffer))
@@ -691,7 +666,6 @@ cachedb_extcache_store(struct module_qstate* qstate, struct cachedb_env* ie)
 static int
 cachedb_intcache_lookup(struct module_qstate* qstate, struct cachedb_env* cde)
 {
-	uint8_t dpname_storage[LDNS_MAX_DOMAINLEN+1];
 	uint8_t* dpname=NULL;
 	size_t dpnamelen=0;
 	struct dns_msg* msg;
@@ -700,7 +674,7 @@ cachedb_intcache_lookup(struct module_qstate* qstate, struct cachedb_env* cde)
 		return 0;
 	}
 	if(iter_stub_fwd_no_cache(qstate, &qstate->qinfo,
-		&dpname, &dpnamelen, dpname_storage, sizeof(dpname_storage)))
+		&dpname, &dpnamelen))
 		return 0; /* no cache for these queries */
 	msg = dns_cache_lookup(qstate->env, qstate->qinfo.qname,
 		qstate->qinfo.qname_len, qstate->qinfo.qtype,
@@ -731,43 +705,17 @@ cachedb_intcache_lookup(struct module_qstate* qstate, struct cachedb_env* cde)
 * Store query into the internal cache of unbound.
 */
 static void
-cachedb_intcache_store(struct module_qstate* qstate, int msg_expired)
+cachedb_intcache_store(struct module_qstate* qstate)
 {
 	uint32_t store_flags = qstate->query_flags;
-	int serve_expired = qstate->env->cfg->serve_expired;

 	if(qstate->env->cfg->serve_expired)
 		store_flags |= DNSCACHE_STORE_ZEROTTL;
 	if(!qstate->return_msg)
 		return;
-	if(serve_expired && msg_expired) {
-		/* Set TTLs to a value such that value + *env->now is
-		 * going to be now-3 seconds. Making it expired
-		 * in the cache. */
-		set_msg_ttl(qstate->return_msg, (time_t)-3);
-		/* The expired entry does not get checked by the validator
-		 * and we need a validation value for it. */
-		if(qstate->env->cfg->cachedb_check_when_serve_expired)
-			qstate->return_msg->rep->security = sec_status_insecure;
-	}
 	(void)dns_cache_store(qstate->env, &qstate->qinfo,
 		qstate->return_msg->rep, 0, qstate->prefetch_leeway, 0,
 		qstate->region, store_flags, qstate->qstarttime);
-	if(serve_expired && msg_expired) {
-		if(qstate->env->cfg->serve_expired_client_timeout) {
-			/* No expired response from the query state, the
-			 * query resolution needs to continue and it can
-			 * pick up the expired result after the timer out
-			 * of cache. */
-			return;
-		}
-		/* set TTLs to zero again */
-		adjust_msg_ttl(qstate->return_msg, -1);
-		/* Send serve expired responses based on the cachedb
-		 * returned message, that was just stored in the cache.
-		 * It can then continue to work on this query. */
-		mesh_respond_serve_expired(qstate->mesh_info);
-	}
 }

 /**
@@ -783,7 +731,6 @@ cachedb_handle_query(struct module_qstate* qstate,
 	struct cachedb_qstate* ATTR_UNUSED(iq),
 	struct cachedb_env* ie, int id)
 {
-	int msg_expired = 0;
 	qstate->is_cachedb_answer = 0;
 	/* check if we are enabled, and skip if so */
 	if(!ie->enabled) {
@@ -818,28 +765,20 @@ cachedb_handle_query(struct module_qstate* qstate,
 	}

 	/* ask backend cache to see if we have data */
-	if(cachedb_extcache_lookup(qstate, ie, &msg_expired)) {
+	if(cachedb_extcache_lookup(qstate, ie)) {
 		if(verbosity >= VERB_ALGO)
 			log_dns_msg(ie->backend->name,
 				&qstate->return_msg->qinfo,
 				qstate->return_msg->rep);
 		/* store this result in internal cache */
-		cachedb_intcache_store(qstate, msg_expired);
+		cachedb_intcache_store(qstate);
 		/* In case we have expired data but there is a client timer for expired
 		 * answers, pass execution to next module in order to try updating the
 		 * data first.
 		 * TODO: this needs revisit. The expired data stored from cachedb has
 		 * 0 TTL which is picked up by iterator later when looking in the cache.
-		 */
-		if(qstate->env->cfg->serve_expired && msg_expired) {
-			qstate->return_msg = NULL;
-			qstate->ext_state[id] = module_wait_module;
-			/* The expired reply is sent with
-			 * mesh_respond_serve_expired, and so
-			 * the need_refetch is not used. */
-			qstate->need_refetch = 0;
-			return;
-		}
+		 * Document that ext cachedb does not work properly with
+		 * serve_stale_reply_ttl yet. */
 		if(qstate->need_refetch && qstate->serve_expired_data &&
 			qstate->serve_expired_data->timer) {
 				qstate->return_msg = NULL;
@@ -852,14 +791,6 @@ cachedb_handle_query(struct module_qstate* qstate,
 		return;
 	}

-	if(qstate->serve_expired_data &&
-		qstate->env->cfg->cachedb_check_when_serve_expired &&
-		!qstate->env->cfg->serve_expired_client_timeout) {
-		/* Reply with expired data if any to client, because cachedb
-		 * also has no useful, current data */
-		mesh_respond_serve_expired(qstate->mesh_info);
-	}
-
 	/* no cache fetches */
 	/* pass request to next module */
 	qstate->ext_state[id] = module_wait_module;
@@ -983,7 +914,7 @@ cachedb_get_mem(struct module_env* env, int id)
 */
 static struct module_func_block cachedb_block = {
 	"cachedb",
-	NULL, NULL, &cachedb_init, &cachedb_deinit, &cachedb_operate,
+	&cachedb_init, &cachedb_deinit, &cachedb_operate,
 	&cachedb_inform_super, &cachedb_clear, &cachedb_get_mem
 };

@@ -992,41 +923,4 @@ cachedb_get_funcblock(void)
 {
 	return &cachedb_block;
 }
-
-int
-cachedb_is_enabled(struct module_stack* mods, struct module_env* env)
-{
-	struct cachedb_env* ie;
-	int id = modstack_find(mods, "cachedb");
-	if(id == -1)
-		return 0;
-	ie = (struct cachedb_env*)env->modinfo[id];
-	if(ie && ie->enabled)
-		return 1;
-	return 0;
-}
-
-void cachedb_msg_remove(struct module_qstate* qstate)
-{
-	cachedb_msg_remove_qinfo(qstate->env, &qstate->qinfo);
-}
-
-void cachedb_msg_remove_qinfo(struct module_env* env, struct query_info* qinfo)
-{
-	char key[(CACHEDB_HASHSIZE/8)*2+1];
-	int id = modstack_find(env->modstack, "cachedb");
-	struct cachedb_env* ie = (struct cachedb_env*)env->modinfo[id];
-
-	log_query_info(VERB_ALGO, "cachedb msg remove", qinfo);
-	calc_hash(qinfo, env, key, sizeof(key));
-	sldns_buffer_clear(env->scratch_buffer);
-	sldns_buffer_write_u32(env->scratch_buffer, 0);
-	sldns_buffer_flip(env->scratch_buffer);
-
-	/* call backend */
-	(*ie->backend->store)(env, ie, key,
-		sldns_buffer_begin(env->scratch_buffer),
-		sldns_buffer_limit(env->scratch_buffer),
-		0);
-}
 #endif /* USE_CACHEDB */
@@ -41,7 +41,6 @@
 */
 #include "util/module.h"
 struct cachedb_backend;
-struct module_stack;

 /**
 * The global variable environment contents for the cachedb
@@ -111,26 +110,3 @@ size_t cachedb_get_mem(struct module_env* env, int id);
 */
 struct module_func_block* cachedb_get_funcblock(void);

-/**
- * See if the cachedb is enabled.
- * @param mods: module stack. It finds the cachedb module environment.
- * @param env: module environment.
- * @return true if exists and enabled.
- */
-int cachedb_is_enabled(struct module_stack* mods, struct module_env* env);
-
-/**
- * Remove a message from the global cache. Because edns subnet has a more
- * specific entry, and if not removed when everything expires, the global
- * entry is used, instead of a fresh lookup of the edns subnet entry.
- * @param qstate: query state.
- */
-void cachedb_msg_remove(struct module_qstate* qstate);
-
-/**
- * Remove message from the cachedb cache, by query info.
- * @param env: module environment to look up cachedb state.
- * @param qinfo: the message to remove.
- */
-void cachedb_msg_remove_qinfo(struct module_env* env,
-	struct query_info* qinfo);
@@ -406,9 +406,6 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #undef HAVE_NET_IF_H

-/* Define to 1 if you have the <net/pfvar.h> header file. */
-#undef HAVE_NET_PFVAR_H
-
 /* Define this to use nghttp2 client. */
 #undef HAVE_NGHTTP2

@@ -569,9 +566,6 @@
   function. */
 #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB

-/* Define to 1 if you have the `SSL_CTX_set_tmp_ecdh' function. */
-#undef HAVE_SSL_CTX_SET_TMP_ECDH
-
 /* Define to 1 if you have the `SSL_get0_alpn_selected' function. */
 #undef HAVE_SSL_GET0_ALPN_SELECTED

@@ -4,21 +4,21 @@ AC_PREREQ([2.56])
 sinclude(acx_nlnetlabs.m4)
 sinclude(ax_pthread.m4)
 sinclude(acx_python.m4)
-sinclude(ax_pkg_swig.m4)
+sinclude(ac_pkg_swig.m4)
 sinclude(dnstap/dnstap.m4)
 sinclude(dnscrypt/dnscrypt.m4)

 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
-m4_define([VERSION_MINOR],[20])
-m4_define([VERSION_MICRO],[1])
+m4_define([VERSION_MINOR],[19])
+m4_define([VERSION_MICRO],[3])
 AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound])
 AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])

 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=28
+LIBUNBOUND_REVISION=26
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -112,8 +112,6 @@ LIBUNBOUND_AGE=1
 # 1.19.1 had 9:24:1
 # 1.19.2 had 9:25:1
 # 1.19.3 had 9:26:1
-# 1.20.0 had 9:27:1
-# 1.20.1 had 9:28:1

 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -275,9 +273,6 @@ AC_DEFINE(WINVER, 0x0502, [the version of the windows API enabled])
 ACX_RSRC_VERSION(wnvs)
 AC_DEFINE_UNQUOTED(RSRC_PACKAGE_VERSION, [$wnvs], [version number for resource files])

-# Check for 'grep -e' program, here, since ACX_CHECK_FLTO needs that.
-AC_PROG_GREP
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_LANG([C])
@@ -800,9 +795,9 @@ if test x_$ub_test_python != x_no; then
      ub_have_swig=no
      AC_ARG_ENABLE(swig-version-check, AS_HELP_STRING([--disable-swig-version-check],[Disable swig version check to build python modules with older swig even though that is unreliable]))
      if test "$enable_swig_version_check" = "yes"; then
-      	AX_PKG_SWIG(2.0.1)
+      	AC_PROG_SWIG(2.0.1)
      else
-      	AX_PKG_SWIG
+      	AC_PROG_SWIG
      fi
      AC_MSG_CHECKING(SWIG)
      if test ! -x "$SWIG"; then
@@ -944,7 +939,7 @@ else
 	AC_MSG_RESULT([no])
 fi
 AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h openssl/core_names.h openssl/param_build.h],,, [AC_INCLUDES_DEFAULT])
-AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_default_properties_is_fips_enabled EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback EVP_MAC_CTX_set_params OSSL_PARAM_BLD_new BIO_set_callback_ex SSL_CTX_set_tmp_ecdh])
+AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_default_properties_is_fips_enabled EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback EVP_MAC_CTX_set_params OSSL_PARAM_BLD_new BIO_set_callback_ex])

 # these check_funcs need -lssl
 BAKLIBS="$LIBS"
@@ -1181,17 +1176,8 @@ case "$enable_ecdsa" in
      ;;
    *)
      if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
-	      AC_CHECK_FUNC(EVP_PKEY_fromdata, [
-	          # with EVP_PKEY_fromdata, check if EC is not disabled
-	          AC_CHECK_DECL([OPENSSL_NO_EC], [AC_MSG_ERROR([OpenSSL does not support ECDSA: please upgrade or rerun with --disable-ecdsa])
-		  ], [], [AC_INCLUDES_DEFAULT
-#include <openssl/evp.h>
-		  ])
-		], [
-		  # without EVP_PKEY_fromdata, older openssl, check for support
-		  AC_CHECK_FUNC(ECDSA_sign, [], [AC_MSG_ERROR([OpenSSL does not support ECDSA: please upgrade or rerun with --disable-ecdsa])])
-		  AC_CHECK_FUNC(SHA384_Init, [], [AC_MSG_ERROR([OpenSSL does not support SHA384: please upgrade or rerun with --disable-ecdsa])])
-		])
+	      AC_CHECK_FUNC(ECDSA_sign, [], [AC_MSG_ERROR([OpenSSL does not support ECDSA: please upgrade or rerun with --disable-ecdsa])])
+	      AC_CHECK_FUNC(SHA384_Init, [], [AC_MSG_ERROR([OpenSSL does not support SHA384: please upgrade or rerun with --disable-ecdsa])])
 	      AC_CHECK_DECLS([NID_X9_62_prime256v1, NID_secp384r1], [], [AC_MSG_ERROR([OpenSSL does not support the ECDSA curves: please upgrade or rerun with --disable-ecdsa])], [AC_INCLUDES_DEFAULT
 #include <openssl/evp.h>
 	      ])
@@ -1931,17 +1917,15 @@ case "$enable_ipset" in
 		IPSET_OBJ="ipset.lo"
 		AC_SUBST(IPSET_OBJ)

-		# BSD's pf
-		AC_CHECK_HEADERS([net/pfvar.h], [], [
-		    # mnl
-		    AC_ARG_WITH(libmnl, AS_HELP_STRING([--with-libmnl=path],[specify explicit path for libmnl.]),
+		# mnl
+		AC_ARG_WITH(libmnl, AS_HELP_STRING([--with-libmnl=path],[specify explicit path for libmnl.]),
 			[ ],[ withval="yes" ])
-		    found_libmnl="no"
-		    AC_MSG_CHECKING(for libmnl)
-		    if test x_$withval = x_ -o x_$withval = x_yes; then
+		found_libmnl="no"
+		AC_MSG_CHECKING(for libmnl)
+		if test x_$withval = x_ -o x_$withval = x_yes; then
 			withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
-		    fi
-		    for dir in $withval ; do
+		fi
+		for dir in $withval ; do
 			if test -f "$dir/include/libmnl/libmnl.h" -o -f "$dir/include/libmnl/libmnl/libmnl.h"; then
 				found_libmnl="yes"
 				dnl assume /usr is in default path.
@@ -1959,14 +1943,10 @@ case "$enable_ipset" in
 				LIBS="$LIBS -lmnl"
 				break;
 			fi
-		    done
-		    if test x_$found_libmnl != x_yes; then
-			  AC_MSG_ERROR([Could not find libmnl, libmnl.h])
-		    fi
-		], [
-		  #include <netinet/in.h>
-		  #include <net/if.h>
-		])
+		done
+		if test x_$found_libmnl != x_yes; then
+			AC_MSG_ERROR([Could not find libmnl, libmnl.h])
+		fi
 		;;
    no|*)
    	# nothing
@@ -22,13 +22,4 @@ pidfile=${unbound_pidfile:-"/usr/local/etc/unbound/unbound.pid"}
 command_args=${unbound_flags:-"-c /usr/local/etc/unbound/unbound.conf"}
 extra_commands="reload"

-if test "$1" = "stop" ; then
-	run_rc_command "$1"
-	ret=$?
-	if test $ret -eq 0; then
-		rm -f "$pidfile"
-	fi
-	exit $ret
-fi
-
 run_rc_command "$1"
@@ -75,7 +75,6 @@ stop() {
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
-    [ $retval -eq 0 ] && rm -f $pidfile
    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
 	umount ${rootdir}/dev/log >/dev/null 2>&1
    fi;
@@ -58,7 +58,6 @@ stop() {
    killproc -p $pidfile unbound
    retval=$?
    [ $retval -eq 0 ] && rm -f $lockfile
-    [ $retval -eq 0 ] && rm -f $pidfile
    for mountfile in /dev/log /dev/urandom /etc/localtime /etc/resolv.conf /var/run/unbound
    do
    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}''${mountfile}'' /proc/mounts; then
@@ -75,7 +75,6 @@ stop() {
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
-    [ $retval -eq 0 ] && rm -f $pidfile
    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
 	umount ${rootdir}/dev/log >/dev/null 2>&1
    fi;
@@ -42,8 +42,8 @@
 [Unit]
 Description=Validating, recursive, and caching DNS resolver
 Documentation=man:unbound(8)
-After=network-online.target
-Before=nss-lookup.target
+After=network.target
+Before=network-online.target nss-lookup.target

 [Install]
 WantedBy=multi-user.target
@@ -14,8 +14,8 @@
 [Unit]
 Description=Validating, recursive, and caching DNS resolver
 Documentation=man:unbound(8)
-After=network-online.target
-Before=nss-lookup.target
+After=network.target
+Before=network-online.target nss-lookup.target
 Wants=nss-lookup.target

 [Install]
@@ -839,7 +839,6 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm,
 	char b[260];
 	struct query_info qinfo;
 	struct iter_hints_stub* stub;
-	int nolock = 0;
 	regional_free_all(region);
 	qinfo.qname = nm;
 	qinfo.qname_len = nmlen;
@@ -851,16 +850,13 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm,
 	if(!ssl_printf(ssl, "The following name servers are used for lookup "
 		"of %s\n", b)) 
 		return 0;
-
-	dp = forwards_lookup(worker->env.fwds, nm, qinfo.qclass, nolock);
+	
+	dp = forwards_lookup(worker->env.fwds, nm, qinfo.qclass);
 	if(dp) {
-		if(!ssl_printf(ssl, "forwarding request:\n")) {
-			lock_rw_unlock(&worker->env.fwds->lock);
+		if(!ssl_printf(ssl, "forwarding request:\n"))
 			return 0;
-		}
 		print_dp_main(ssl, dp, NULL);
 		print_dp_details(ssl, worker, dp);
-		lock_rw_unlock(&worker->env.fwds->lock);
 		return 1;
 	}
 	
@@ -896,26 +892,21 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm,
 					return 0;
 				continue;
 			}
-		}
+		} 
 		stub = hints_lookup_stub(worker->env.hints, nm, qinfo.qclass,
-			dp, nolock);
+			dp);
 		if(stub) {
 			if(stub->noprime) {
 				if(!ssl_printf(ssl, "The noprime stub servers "
-					"are used:\n")) {
-					lock_rw_unlock(&worker->env.hints->lock);
+					"are used:\n"))
 					return 0;
-				}
 			} else {
 				if(!ssl_printf(ssl, "The stub is primed "
-						"with servers:\n")) {
-					lock_rw_unlock(&worker->env.hints->lock);
+						"with servers:\n"))
 					return 0;
-				}
 			}
 			print_dp_main(ssl, stub->dp, NULL);
 			print_dp_details(ssl, worker, stub->dp);
-			lock_rw_unlock(&worker->env.hints->lock);
 		} else {
 			print_dp_main(ssl, dp, msg);
 			print_dp_details(ssl, worker, dp);
@@ -91,8 +91,6 @@
 #include "util/net_help.h"
 #include "sldns/keyraw.h"
 #include "respip/respip.h"
-#include "iterator/iter_fwd.h"
-#include "iterator/iter_hints.h"
 #include <signal.h>

 #ifdef HAVE_SYSTEMD
@@ -101,9 +99,6 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
-#ifdef USE_CACHEDB
-#include "cachedb/cachedb.h"
-#endif

 /** How many quit requests happened. */
 static int sig_record_quit = 0;
@@ -265,7 +260,6 @@ daemon_init(void)
 		free(daemon);
 		return NULL;
 	}
-	daemon->env->modstack = &daemon->mods;
 	/* init edns_known_options */
 	if(!edns_known_options_init(daemon->env)) {
 		free(daemon->env);
@@ -327,15 +321,17 @@ static int setup_acl_for_ports(struct acl_list* list,
 	struct listen_port* port_list)
 {
 	struct acl_addr* acl_node;
+	struct addrinfo* addr;
 	for(; port_list; port_list=port_list->next) {
 		if(!port_list->socket) {
 			/* This is mainly for testbound where port_list is
 			 * empty. */
 			continue;
 		}
+		addr = port_list->socket->addr;
 		if(!(acl_node = acl_interface_insert(list,
-			(struct sockaddr_storage*)port_list->socket->addr,
-			port_list->socket->addrlen,
+			(struct sockaddr_storage*)addr->ai_addr,
+			(socklen_t)addr->ai_addrlen,
 			acl_refuse))) {
 			return 0;
 		}
@@ -344,7 +340,7 @@ static int setup_acl_for_ports(struct acl_list* list,
 	return 1;
 }

-int
+int 
 daemon_open_shared_ports(struct daemon* daemon)
 {
 	log_assert(daemon);
@@ -444,19 +440,6 @@ daemon_open_shared_ports(struct daemon* daemon)
 	return 1;
 }

-int
-daemon_privileged(struct daemon* daemon)
-{
-	daemon->env->cfg = daemon->cfg;
-	daemon->env->alloc = &daemon->superalloc;
-	daemon->env->worker = NULL;
-	if(!modstack_call_startup(&daemon->mods, daemon->cfg->module_conf,
-		daemon->env)) {
-		fatal_exit("failed to startup modules");
-	}
-	return 1;
-}
-
 /**
 * Setup modules. setup module stack.
 * @param daemon: the daemon
@@ -466,15 +449,11 @@ static void daemon_setup_modules(struct daemon* daemon)
 	daemon->env->cfg = daemon->cfg;
 	daemon->env->alloc = &daemon->superalloc;
 	daemon->env->worker = NULL;
-	if(daemon->mods_inited) {
-		modstack_call_deinit(&daemon->mods, daemon->env);
-	}
 	daemon->env->need_to_validate = 0; /* set by module init below */
-	if(!modstack_call_init(&daemon->mods, daemon->cfg->module_conf,
+	if(!modstack_setup(&daemon->mods, daemon->cfg->module_conf, 
 		daemon->env)) {
-		fatal_exit("failed to init modules");
+		fatal_exit("failed to setup modules");
 	}
-	daemon->mods_inited = 1;
 	log_edns_known_options(VERB_ALGO, daemon->env);
 }

@@ -520,10 +499,7 @@ daemon_clear_allocs(struct daemon* daemon)
 {
 	int i;

-	/* daemon->num may be different during reloads (after configuration
-	 * read). Use old_num which has the correct value used to setup the
-	 * worker_allocs */
-	for(i=0; i<daemon->old_num; i++) {
+	for(i=0; i<daemon->num; i++) {
 		alloc_clear(daemon->worker_allocs[i]);
 		free(daemon->worker_allocs[i]);
 	}
@@ -740,12 +716,6 @@ daemon_fork(struct daemon* daemon)
 		fatal_exit("Could not create local zones: out of memory");
 	if(!local_zones_apply_cfg(daemon->local_zones, daemon->cfg))
 		fatal_exit("Could not set up local zones");
-	if(!(daemon->env->fwds = forwards_create()) ||
-		!forwards_apply_cfg(daemon->env->fwds, daemon->cfg))
-		fatal_exit("Could not set forward zones");
-	if(!(daemon->env->hints = hints_create()) ||
-		!hints_apply_cfg(daemon->env->hints, daemon->cfg))
-		fatal_exit("Could not set root or stub hints");

 	/* process raw response-ip configuration data */
 	if(!(daemon->respip_set = respip_set_create()))
@@ -770,10 +740,6 @@ daemon_fork(struct daemon* daemon)
 	if(!edns_strings_apply_cfg(daemon->env->edns_strings, daemon->cfg))
 		fatal_exit("Could not set up EDNS strings");

-#ifdef USE_CACHEDB
-	daemon->env->cachedb_enabled = cachedb_is_enabled(&daemon->mods,
-		daemon->env);
-#endif
 	/* response-ip-xxx options don't work as expected without the respip
 	 * module.  To avoid run-time operational surprise we reject such
 	 * configuration. */
@@ -866,10 +832,6 @@ daemon_cleanup(struct daemon* daemon)
 		slabhash_clear(daemon->env->msg_cache);
 	}
 	daemon->old_num = daemon->num; /* save the current num */
-	forwards_delete(daemon->env->fwds);
-	daemon->env->fwds = NULL;
-	hints_delete(daemon->env->hints);
-	daemon->env->hints = NULL;
 	local_zones_delete(daemon->local_zones);
 	daemon->local_zones = NULL;
 	respip_set_delete(daemon->respip_set);
@@ -878,7 +840,7 @@ daemon_cleanup(struct daemon* daemon)
 	daemon->views = NULL;
 	if(daemon->env->auth_zones)
 		auth_zones_cleanup(daemon->env->auth_zones);
-	/* key cache is cleared by module deinit during next daemon_fork() */
+	/* key cache is cleared by module desetup during next daemon_fork() */
 	daemon_remote_clear(daemon->rc);
 	for(i=0; i<daemon->num; i++)
 		worker_delete(daemon->workers[i]);
@@ -908,9 +870,7 @@ daemon_delete(struct daemon* daemon)
 	size_t i;
 	if(!daemon)
 		return;
-	modstack_call_deinit(&daemon->mods, daemon->env);
-	modstack_call_destartup(&daemon->mods, daemon->env);
-	modstack_free(&daemon->mods);
+	modstack_desetup(&daemon->mods, daemon->env);
 	daemon_remote_delete(daemon->rc);
 	for(i = 0; i < daemon->num_ports; i++)
 		listening_ports_free(daemon->ports[i]);
@@ -115,8 +115,6 @@ struct daemon {
 	struct module_env* env;
 	/** stack of module callbacks */
 	struct module_stack mods;
-	/** The module stack has been inited */
-	int mods_inited;
 	/** access control, which client IPs are allowed to connect */
 	struct acl_list* acl;
 	/** access control, which interfaces are allowed to connect */
@@ -164,15 +162,6 @@ struct daemon* daemon_init(void);
 */
 int daemon_open_shared_ports(struct daemon* daemon);

-/**
- * Do daemon setup that needs privileges
- * like opening privileged ports or opening device files.
- * The cfg member pointer must have been set for the daemon.
- * @param daemon: the daemon.
- * @return: false on error.
- */
-int daemon_privileged(struct daemon* daemon);
-
 /**
 * Fork workers and start service.
 * When the routine exits, it is no longer forked.
@@ -88,9 +88,6 @@
 #include "sldns/wire2str.h"
 #include "sldns/sbuffer.h"
 #include "util/timeval_func.h"
-#ifdef USE_CACHEDB
-#include "cachedb/cachedb.h"
-#endif

 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -110,10 +107,6 @@
 /** what to put on statistics lines between var and value, ": " or "=" */
 #define SQ "="

-/** Acceptable lengths of str lines */
-#define MAX_CMD_STRLINE 1024
-#define MAX_STDIN_STRLINE 2048
-
 static int
 remote_setup_ctx(struct daemon_remote* rc, struct config_file* cfg)
 {
@@ -640,25 +633,6 @@ static void send_ok(RES* ssl)
 	(void)ssl_printf(ssl, "ok\n");
 }

-/** tell other processes to execute the command */
-static void
-distribute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd)
-{
-	int i;
-	if(!cmd || !ssl)
-		return;
-	/* skip i=0 which is me */
-	for(i=1; i<rc->worker->daemon->num; i++) {
-		worker_send_cmd(rc->worker->daemon->workers[i],
-			worker_cmd_remote);
-		if(!tube_write_msg(rc->worker->daemon->workers[i]->cmd,
-			(uint8_t*)cmd, strlen(cmd)+1, 0)) {
-			(void)ssl_printf(ssl, "error could not distribute cmd\n");
-			return;
-		}
-	}
-}
-
 /** do the stop command */
 static void
 do_stop(RES* ssl, struct worker* worker)
@@ -1246,28 +1220,19 @@ do_zone_add(RES* ssl, struct local_zones* zones, char* arg)

 /** Do the local_zones command */
 static void
-do_zones_add(struct daemon_remote* rc, RES* ssl, struct worker* worker)
+do_zones_add(RES* ssl, struct local_zones* zones)
 {
-	char buf[MAX_CMD_STRLINE + MAX_STDIN_STRLINE] = "local_zone ";
+	char buf[2048];
 	int num = 0;
-	size_t cmd_len = strlen(buf);
-	while(ssl_read_line(ssl, buf+cmd_len, MAX_STDIN_STRLINE)) {
-		if(buf[0+cmd_len] == 0 ||
-			(buf[0+cmd_len] == 0x04 && buf[1+cmd_len] == 0))
+	while(ssl_read_line(ssl, buf, sizeof(buf))) {
+		if(buf[0] == 0 || (buf[0] == 0x04 && buf[1] == 0))
 			break; /* zero byte line or end of transmission */
-#ifdef THREADS_DISABLED
-		/* distribute single item command */
-		if(rc) distribute_cmd(rc, ssl, buf);
-#else
-		(void)rc; /* unused */
-#endif
-		if(!perform_zone_add(ssl, worker->daemon->local_zones,
-			buf+cmd_len)) {
-			if(!ssl_printf(ssl, "error for input line: %s\n",
-				buf+cmd_len))
+		if(!perform_zone_add(ssl, zones, buf)) {
+			if(!ssl_printf(ssl, "error for input line: %s\n", buf))
 				return;
 		}
-		else	num++;
+		else
+			num++;
 	}
 	(void)ssl_printf(ssl, "added %d zones\n", num);
 }
@@ -1304,28 +1269,19 @@ do_zone_remove(RES* ssl, struct local_zones* zones, char* arg)

 /** Do the local_zones_remove command */
 static void
-do_zones_remove(struct daemon_remote* rc, RES* ssl, struct worker* worker)
+do_zones_remove(RES* ssl, struct local_zones* zones)
 {
-	char buf[MAX_CMD_STRLINE + MAX_STDIN_STRLINE] = "local_zone_remove ";
+	char buf[2048];
 	int num = 0;
-	size_t cmd_len = strlen(buf);
-	while(ssl_read_line(ssl, buf+cmd_len, MAX_STDIN_STRLINE)) {
-		if(buf[0+cmd_len] == 0 ||
-			(buf[0+cmd_len] == 0x04 && buf[1+cmd_len] == 0))
+	while(ssl_read_line(ssl, buf, sizeof(buf))) {
+		if(buf[0] == 0 || (buf[0] == 0x04 && buf[1] == 0))
 			break; /* zero byte line or end of transmission */
-#ifdef THREADS_DISABLED
-		/* distribute single item command */
-		if(rc) distribute_cmd(rc, ssl, buf);
-#else
-		(void)rc; /* unused */
-#endif
-		if(!perform_zone_remove(ssl, worker->daemon->local_zones,
-			buf+cmd_len)) {
-			if(!ssl_printf(ssl, "error for input line: %s\n",
-				buf+cmd_len))
+		if(!perform_zone_remove(ssl, zones, buf)) {
+			if(!ssl_printf(ssl, "error for input line: %s\n", buf))
 				return;
 		}
-		else	num++;
+		else
+			num++;
 	}
 	(void)ssl_printf(ssl, "removed %d zones\n", num);
 }
@@ -1377,24 +1333,15 @@ do_data_add(RES* ssl, struct local_zones* zones, char* arg)

 /** Do the local_datas command */
 static void
-do_datas_add(struct daemon_remote* rc, RES* ssl, struct worker* worker)
+do_datas_add(RES* ssl, struct local_zones* zones)
 {
-	char buf[MAX_CMD_STRLINE + MAX_STDIN_STRLINE] = "local_data ";
+	char buf[2048];
 	int num = 0, line = 0;
-	size_t cmd_len = strlen(buf);
-	while(ssl_read_line(ssl, buf+cmd_len, MAX_STDIN_STRLINE)) {
-		if(buf[0+cmd_len] == 0 ||
-			(buf[0+cmd_len] == 0x04 && buf[1+cmd_len] == 0))
+	while(ssl_read_line(ssl, buf, sizeof(buf))) {
+		if(buf[0] == 0 || (buf[0] == 0x04 && buf[1] == 0))
 			break; /* zero byte line or end of transmission */
-#ifdef THREADS_DISABLED
-		/* distribute single item command */
-		if(rc) distribute_cmd(rc, ssl, buf);
-#else
-		(void)rc; /* unused */
-#endif
 		line++;
-		if(perform_data_add(ssl, worker->daemon->local_zones,
-			buf+cmd_len, line))
+		if(perform_data_add(ssl, zones, buf, line))
 			num++;
 	}
 	(void)ssl_printf(ssl, "added %d datas\n", num);
@@ -1426,28 +1373,19 @@ do_data_remove(RES* ssl, struct local_zones* zones, char* arg)

 /** Do the local_datas_remove command */
 static void
-do_datas_remove(struct daemon_remote* rc, RES* ssl, struct worker* worker)
+do_datas_remove(RES* ssl, struct local_zones* zones)
 {
-	char buf[MAX_CMD_STRLINE + MAX_STDIN_STRLINE] = "local_data_remove ";
+	char buf[2048];
 	int num = 0;
-	size_t cmd_len = strlen(buf);
-	while(ssl_read_line(ssl, buf+cmd_len, MAX_STDIN_STRLINE)) {
-		if(buf[0+cmd_len] == 0 ||
-			(buf[0+cmd_len] == 0x04 && buf[1+cmd_len] == 0))
+	while(ssl_read_line(ssl, buf, sizeof(buf))) {
+		if(buf[0] == 0 || (buf[0] == 0x04 && buf[1] == 0))
 			break; /* zero byte line or end of transmission */
-#ifdef THREADS_DISABLED
-		/* distribute single item command */
-		if(rc) distribute_cmd(rc, ssl, buf);
-#else
-		(void)rc; /* unused */
-#endif
-		if(!perform_data_remove(ssl, worker->daemon->local_zones,
-			buf+cmd_len)) {
-			if(!ssl_printf(ssl, "error for input line: %s\n",
-				buf+cmd_len))
+		if(!perform_data_remove(ssl, zones, buf)) {
+			if(!ssl_printf(ssl, "error for input line: %s\n", buf))
 				return;
 		}
-		else	num++;
+		else
+			num++;
 	}
 	(void)ssl_printf(ssl, "removed %d datas\n", num);
 }
@@ -1535,13 +1473,9 @@ do_view_data_add(RES* ssl, struct worker* worker, char* arg)

 /** Add new RR data from stdin to view */
 static void
-do_view_datas_add(struct daemon_remote* rc, RES* ssl, struct worker* worker,
-	char* arg)
+do_view_datas_add(RES* ssl, struct worker* worker, char* arg)
 {
 	struct view* v;
-	char buf[MAX_CMD_STRLINE + MAX_STDIN_STRLINE] = "view_local_data ";
-	size_t cmd_len;
-	int num = 0, line = 0;
 	v = views_find_view(worker->daemon->views,
 		arg, 1 /* get write lock*/);
 	if(!v) {
@@ -1555,25 +1489,8 @@ do_view_datas_add(struct daemon_remote* rc, RES* ssl, struct worker* worker,
 			return;
 		}
 	}
-	/* put the view name in the command buf */
-	(void)snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%s ", arg);
-	cmd_len = strlen(buf);
-	while(ssl_read_line(ssl, buf+cmd_len, MAX_STDIN_STRLINE)) {
-		if(buf[0+cmd_len] == 0 ||
-			(buf[0+cmd_len] == 0x04 && buf[1+cmd_len] == 0))
-			break; /* zero byte line or end of transmission */
-#ifdef THREADS_DISABLED
-		/* distribute single item command */
-		if(rc) distribute_cmd(rc, ssl, buf);
-#else
-		(void)rc; /* unused */
-#endif
-		line++;
-		if(perform_data_add(ssl, v->local_zones, buf+cmd_len, line))
-			num++;
-	}
+	do_datas_add(ssl, v->local_zones);
 	lock_rw_unlock(&v->lock);
-	(void)ssl_printf(ssl, "added %d datas\n", num);
 }

 /** Remove RR data from view */
@@ -1601,13 +1518,9 @@ do_view_data_remove(RES* ssl, struct worker* worker, char* arg)

 /** Remove RR data from stdin from view */
 static void
-do_view_datas_remove(struct daemon_remote* rc, RES* ssl, struct worker* worker,
-	char* arg)
+do_view_datas_remove(RES* ssl, struct worker* worker, char* arg)
 {
 	struct view* v;
-	char buf[MAX_CMD_STRLINE + MAX_STDIN_STRLINE] = "view_local_data_remove ";
-	int num = 0;
-	size_t cmd_len;
 	v = views_find_view(worker->daemon->views,
 		arg, 1 /* get write lock*/);
 	if(!v) {
@@ -1619,28 +1532,9 @@ do_view_datas_remove(struct daemon_remote* rc, RES* ssl, struct worker* worker,
 		ssl_printf(ssl, "removed 0 datas\n");
 		return;
 	}
-	/* put the view name in the command buf */
-	(void)snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%s ", arg);
-	cmd_len = strlen(buf);
-	while(ssl_read_line(ssl, buf+cmd_len, MAX_STDIN_STRLINE)) {
-		if(buf[0+cmd_len] == 0 ||
-			(buf[0+cmd_len] == 0x04 && buf[1+cmd_len] == 0))
-			break; /* zero byte line or end of transmission */
-#ifdef THREADS_DISABLED
-		/* distribute single item command */
-		if(rc) distribute_cmd(rc, ssl, buf);
-#else
-		(void)rc; /* unused */
-#endif
-		if(!perform_data_remove(ssl, v->local_zones, buf+cmd_len)) {
-			if(!ssl_printf(ssl, "error for input line: %s\n",
-				buf+cmd_len))
-				return;
-		}
-		else	num++;
-	}
+
+	do_datas_remove(ssl, v->local_zones);
 	lock_rw_unlock(&v->lock);
-	(void)ssl_printf(ssl, "removed %d datas\n", num);
 }

 /** cache lookup of nameservers */
@@ -1659,7 +1553,7 @@ do_lookup(RES* ssl, struct worker* worker, char* arg)
 /** flush something from rrset and msg caches */
 static void
 do_cache_remove(struct worker* worker, uint8_t* nm, size_t nmlen,
-	uint16_t t, uint16_t c, int remcachedb)
+	uint16_t t, uint16_t c)
 {
 	hashvalue_type h;
 	struct query_info k;
@@ -1679,29 +1573,6 @@ do_cache_remove(struct worker* worker, uint8_t* nm, size_t nmlen,
 		h = query_info_hash(&k, BIT_CD);
 		slabhash_remove(worker->env.msg_cache, h, &k);
 	}
-#ifdef USE_CACHEDB
-	if(remcachedb && worker->env.cachedb_enabled)
-		cachedb_msg_remove_qinfo(&worker->env, &k);
-#else
-	(void)remcachedb;
-#endif
-}
-
-/** parse '+c' option, modifies string to return remainder. */
-static int
-parse_remcachedb(RES* ssl, char** arg, int* pc)
-{
-	*arg = skipwhite(*arg);
-	if((*arg)[0] == '+' && (*arg)[1] == 'c') {
-		char* arg2;
-		*pc = 1;
-		if(!find_arg2(ssl, *arg, &arg2))
-			return 0;
-		*arg = arg2;
-		return 1;
-	}
-	/* The option was not found, no problem */
-	return 1;
 }

 /** flush a type */
@@ -1713,20 +1584,15 @@ do_flush_type(RES* ssl, struct worker* worker, char* arg)
 	size_t nmlen;
 	char* arg2;
 	uint16_t t;
-	int pc = 0; /* '+c' option */
-	if(!parse_remcachedb(ssl, &arg, &pc))
-		return;
 	if(!find_arg2(ssl, arg, &arg2))
 		return;
 	if(!parse_arg_name(ssl, arg, &nm, &nmlen, &nmlabs))
 		return;
 	t = sldns_get_rr_type_by_name(arg2);
 	if(t == 0 && strcmp(arg2, "TYPE0") != 0) {
-		(void)ssl_printf(ssl, "error parsing RRset type: '%s'\n", arg2);
-		free(nm);
 		return;
 	}
-	do_cache_remove(worker, nm, nmlen, t, LDNS_RR_CLASS_IN, pc);
+	do_cache_remove(worker, nm, nmlen, t, LDNS_RR_CLASS_IN);

 	free(nm);
 	send_ok(ssl);
@@ -1764,8 +1630,6 @@ struct del_info {
 	socklen_t addrlen;
 	/** socket address for host deletion */
 	struct sockaddr_storage addr;
-	/** if cachedb information should be flushed too */
-	int remcachedb;
 };

 /** callback to delete hosts in infra cache */
@@ -1817,7 +1681,6 @@ do_flush_infra(RES* ssl, struct worker* worker, char* arg)
 	inf.num_msgs = 0;
 	inf.num_keys = 0;
 	inf.addrlen = len;
-	inf.remcachedb = 0;
 	memmove(&inf.addr, &addr, len);
 	slabhash_traverse(worker->env.infra_cache->hosts, 1, &infra_del_host,
 		&inf);
@@ -1864,10 +1727,6 @@ zone_del_msg(struct lruhash_entry* e, void* arg)
 			d->serve_expired_ttl = inf->expired;
 			inf->num_msgs++;
 		}
-#ifdef USE_CACHEDB
-		if(inf->remcachedb && inf->worker->env.cachedb_enabled)
-			cachedb_msg_remove_qinfo(&inf->worker->env, &k->key);
-#endif
 	}
 }

@@ -1895,9 +1754,6 @@ do_flush_zone(RES* ssl, struct worker* worker, char* arg)
 	int nmlabs;
 	size_t nmlen;
 	struct del_info inf;
-	int pc = 0; /* '+c' option */
-	if(!parse_remcachedb(ssl, &arg, &pc))
-		return;
 	if(!parse_arg_name(ssl, arg, &nm, &nmlen, &nmlabs))
 		return;
 	/* delete all RRs and key entries from zone */
@@ -1911,7 +1767,6 @@ do_flush_zone(RES* ssl, struct worker* worker, char* arg)
 	inf.num_rrsets = 0;
 	inf.num_msgs = 0;
 	inf.num_keys = 0;
-	inf.remcachedb = pc;
 	slabhash_traverse(&worker->env.rrset_cache->table, 1,
 		&zone_del_rrset, &inf);

@@ -1953,11 +1808,6 @@ bogus_del_msg(struct lruhash_entry* e, void* arg)
 	if(d->security == sec_status_bogus) {
 		d->ttl = inf->expired;
 		inf->num_msgs++;
-#ifdef USE_CACHEDB
-		if(inf->remcachedb && inf->worker->env.cachedb_enabled)
-			cachedb_msg_remove_qinfo(&inf->worker->env,
-				&((struct msgreply_entry*)e->key)->key);
-#endif
 	}
 }

@@ -1976,12 +1826,9 @@ bogus_del_kcache(struct lruhash_entry* e, void* arg)

 /** remove all bogus rrsets, msgs and keys from cache */
 static void
-do_flush_bogus(RES* ssl, struct worker* worker, char* arg)
+do_flush_bogus(RES* ssl, struct worker* worker)
 {
 	struct del_info inf;
-	int pc = 0; /* '+c' option */
-	if(!parse_remcachedb(ssl, &arg, &pc))
-		return;
 	/* what we do is to set them all expired */
 	inf.worker = worker;
 	inf.expired = *worker->env.now;
@@ -1989,7 +1836,6 @@ do_flush_bogus(RES* ssl, struct worker* worker, char* arg)
 	inf.num_rrsets = 0;
 	inf.num_msgs = 0;
 	inf.num_keys = 0;
-	inf.remcachedb = pc;
 	slabhash_traverse(&worker->env.rrset_cache->table, 1,
 		&bogus_del_rrset, &inf);

@@ -2035,11 +1881,6 @@ negative_del_msg(struct lruhash_entry* e, void* arg)
 	if(FLAGS_GET_RCODE(d->flags) != 0 || d->an_numrrsets == 0) {
 		d->ttl = inf->expired;
 		inf->num_msgs++;
-#ifdef USE_CACHEDB
-		if(inf->remcachedb && inf->worker->env.cachedb_enabled)
-			cachedb_msg_remove_qinfo(&inf->worker->env,
-				&((struct msgreply_entry*)e->key)->key);
-#endif
 	}
 }

@@ -2060,12 +1901,9 @@ negative_del_kcache(struct lruhash_entry* e, void* arg)

 /** remove all negative(NODATA,NXDOMAIN), and servfail messages from cache */
 static void
-do_flush_negative(RES* ssl, struct worker* worker, char* arg)
+do_flush_negative(RES* ssl, struct worker* worker)
 {
 	struct del_info inf;
-	int pc = 0; /* '+c' option */
-	if(!parse_remcachedb(ssl, &arg, &pc))
-		return;
 	/* what we do is to set them all expired */
 	inf.worker = worker;
 	inf.expired = *worker->env.now;
@@ -2073,7 +1911,6 @@ do_flush_negative(RES* ssl, struct worker* worker, char* arg)
 	inf.num_rrsets = 0;
 	inf.num_msgs = 0;
 	inf.num_keys = 0;
-	inf.remcachedb = pc;
 	slabhash_traverse(&worker->env.rrset_cache->table, 1,
 		&negative_del_rrset, &inf);

@@ -2097,23 +1934,20 @@ do_flush_name(RES* ssl, struct worker* w, char* arg)
 	uint8_t* nm;
 	int nmlabs;
 	size_t nmlen;
-	int pc = 0; /* '+c' option */
-	if(!parse_remcachedb(ssl, &arg, &pc))
-		return;
 	if(!parse_arg_name(ssl, arg, &nm, &nmlen, &nmlabs))
 		return;
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_A, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_AAAA, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SOA, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_CNAME, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_DNAME, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_MX, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_PTR, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SRV, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_NAPTR, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SVCB, LDNS_RR_CLASS_IN, pc);
-	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_HTTPS, LDNS_RR_CLASS_IN, pc);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_A, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_AAAA, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SOA, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_CNAME, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_DNAME, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_MX, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_PTR, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SRV, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_NAPTR, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_SVCB, LDNS_RR_CLASS_IN);
+	do_cache_remove(w, nm, nmlen, LDNS_RR_TYPE_HTTPS, LDNS_RR_CLASS_IN);

 	free(nm);
 	send_ok(ssl);
@@ -2158,19 +1992,12 @@ static int
 print_root_fwds(RES* ssl, struct iter_forwards* fwds, uint8_t* root)
 {
 	struct delegpt* dp;
-	int nolock = 0;
-	dp = forwards_lookup(fwds, root, LDNS_RR_CLASS_IN, nolock);
-	if(!dp) {
+	dp = forwards_lookup(fwds, root, LDNS_RR_CLASS_IN);
+	if(!dp)
 		return ssl_printf(ssl, "off (using root hints)\n");
-	}
 	/* if dp is returned it must be the root */
 	log_assert(query_dname_compare(dp->name, root)==0);
-	if(!ssl_print_name_dp(ssl, NULL, root, LDNS_RR_CLASS_IN, dp)) {
-		lock_rw_unlock(&fwds->lock);
-		return 0;
-	}
-	lock_rw_unlock(&fwds->lock);
-	return 1;
+	return ssl_print_name_dp(ssl, NULL, root, LDNS_RR_CLASS_IN, dp);
 }

 /** parse args into delegpt */
@@ -2236,13 +2063,12 @@ parse_delegpt(RES* ssl, char* args, uint8_t* nm)
 	return dp;
 }

-/** do the forward command */
+/** do the status command */
 static void
 do_forward(RES* ssl, struct worker* worker, char* args)
 {
 	struct iter_forwards* fwd = worker->env.fwds;
 	uint8_t* root = (uint8_t*)"\000";
-	int nolock = 0;
 	if(!fwd) {
 		(void)ssl_printf(ssl, "error: structure not allocated\n");
 		return;
@@ -2256,12 +2082,12 @@ do_forward(RES* ssl, struct worker* worker, char* args)
 	/* delete all the existing queries first */
 	mesh_delete_all(worker->env.mesh);
 	if(strcmp(args, "off") == 0) {
-		forwards_delete_zone(fwd, LDNS_RR_CLASS_IN, root, nolock);
+		forwards_delete_zone(fwd, LDNS_RR_CLASS_IN, root);
 	} else {
 		struct delegpt* dp;
 		if(!(dp = parse_delegpt(ssl, args, root)))
 			return;
-		if(!forwards_add_zone(fwd, LDNS_RR_CLASS_IN, dp, nolock)) {
+		if(!forwards_add_zone(fwd, LDNS_RR_CLASS_IN, dp)) {
 			(void)ssl_printf(ssl, "error out of memory\n");
 			return;
 		}
@@ -2271,7 +2097,7 @@ do_forward(RES* ssl, struct worker* worker, char* args)

 static int
 parse_fs_args(RES* ssl, char* args, uint8_t** nm, struct delegpt** dp,
-	int* insecure, int* prime, int* tls)
+	int* insecure, int* prime)
 {
 	char* zonename;
 	char* rest;
@@ -2286,8 +2112,6 @@ parse_fs_args(RES* ssl, char* args, uint8_t** nm, struct delegpt** dp,
 				*insecure = 1;
 			else if(*args == 'p' && prime)
 				*prime = 1;
-			else if(*args == 't' && tls)
-				*tls = 1;
 			else {
 				(void)ssl_printf(ssl, "error: unknown option %s\n", args);
 				return 0;
@@ -2320,33 +2144,25 @@ static void
 do_forward_add(RES* ssl, struct worker* worker, char* args)
 {
 	struct iter_forwards* fwd = worker->env.fwds;
-	int insecure = 0, tls = 0;
+	int insecure = 0;
 	uint8_t* nm = NULL;
 	struct delegpt* dp = NULL;
-	int nolock = 1;
-	if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, NULL, &tls))
+	if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, NULL))
 		return;
-	if(tls)
-		dp->ssl_upstream = 1;
-	/* prelock forwarders for atomic operation with anchors */
-	lock_rw_wrlock(&fwd->lock);
 	if(insecure && worker->env.anchors) {
 		if(!anchors_add_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
 			nm)) {
-			lock_rw_unlock(&fwd->lock);
 			(void)ssl_printf(ssl, "error out of memory\n");
 			delegpt_free_mlc(dp);
 			free(nm);
 			return;
 		}
 	}
-	if(!forwards_add_zone(fwd, LDNS_RR_CLASS_IN, dp, nolock)) {
-		lock_rw_unlock(&fwd->lock);
+	if(!forwards_add_zone(fwd, LDNS_RR_CLASS_IN, dp)) {
 		(void)ssl_printf(ssl, "error out of memory\n");
 		free(nm);
 		return;
 	}
-	lock_rw_unlock(&fwd->lock);
 	free(nm);
 	send_ok(ssl);
 }
@@ -2358,16 +2174,12 @@ do_forward_remove(RES* ssl, struct worker* worker, char* args)
 	struct iter_forwards* fwd = worker->env.fwds;
 	int insecure = 0;
 	uint8_t* nm = NULL;
-	int nolock = 1;
-	if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL, NULL))
+	if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL))
 		return;
-	/* prelock forwarders for atomic operation with anchors */
-	lock_rw_wrlock(&fwd->lock);
 	if(insecure && worker->env.anchors)
 		anchors_delete_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
 			nm);
-	forwards_delete_zone(fwd, LDNS_RR_CLASS_IN, nm, nolock);
-	lock_rw_unlock(&fwd->lock);
+	forwards_delete_zone(fwd, LDNS_RR_CLASS_IN, nm);
 	free(nm);
 	send_ok(ssl);
 }
@@ -2377,53 +2189,38 @@ static void
 do_stub_add(RES* ssl, struct worker* worker, char* args)
 {
 	struct iter_forwards* fwd = worker->env.fwds;
-	int insecure = 0, prime = 0, tls = 0;
+	int insecure = 0, prime = 0;
 	uint8_t* nm = NULL;
 	struct delegpt* dp = NULL;
-	int nolock = 1;
-	if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, &prime, &tls))
+	if(!parse_fs_args(ssl, args, &nm, &dp, &insecure, &prime))
 		return;
-	if(tls)
-		dp->ssl_upstream = 1;
-	/* prelock forwarders and hints for atomic operation with anchors */
-	lock_rw_wrlock(&fwd->lock);
-	lock_rw_wrlock(&worker->env.hints->lock);
 	if(insecure && worker->env.anchors) {
 		if(!anchors_add_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
 			nm)) {
-			lock_rw_unlock(&fwd->lock);
-			lock_rw_unlock(&worker->env.hints->lock);
 			(void)ssl_printf(ssl, "error out of memory\n");
 			delegpt_free_mlc(dp);
 			free(nm);
 			return;
 		}
 	}
-	if(!forwards_add_stub_hole(fwd, LDNS_RR_CLASS_IN, nm, nolock)) {
+	if(!forwards_add_stub_hole(fwd, LDNS_RR_CLASS_IN, nm)) {
 		if(insecure && worker->env.anchors)
 			anchors_delete_insecure(worker->env.anchors,
 				LDNS_RR_CLASS_IN, nm);
-		lock_rw_unlock(&fwd->lock);
-		lock_rw_unlock(&worker->env.hints->lock);
 		(void)ssl_printf(ssl, "error out of memory\n");
 		delegpt_free_mlc(dp);
 		free(nm);
 		return;
 	}
-	if(!hints_add_stub(worker->env.hints, LDNS_RR_CLASS_IN, dp, !prime,
-		nolock)) {
+	if(!hints_add_stub(worker->env.hints, LDNS_RR_CLASS_IN, dp, !prime)) {
 		(void)ssl_printf(ssl, "error out of memory\n");
-		forwards_delete_stub_hole(fwd, LDNS_RR_CLASS_IN, nm, nolock);
+		forwards_delete_stub_hole(fwd, LDNS_RR_CLASS_IN, nm);
 		if(insecure && worker->env.anchors)
 			anchors_delete_insecure(worker->env.anchors,
 				LDNS_RR_CLASS_IN, nm);
-		lock_rw_unlock(&fwd->lock);
-		lock_rw_unlock(&worker->env.hints->lock);
 		free(nm);
 		return;
 	}
-	lock_rw_unlock(&fwd->lock);
-	lock_rw_unlock(&worker->env.hints->lock);
 	free(nm);
 	send_ok(ssl);
 }
@@ -2435,19 +2232,13 @@ do_stub_remove(RES* ssl, struct worker* worker, char* args)
 	struct iter_forwards* fwd = worker->env.fwds;
 	int insecure = 0;
 	uint8_t* nm = NULL;
-	int nolock = 1;
-	if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL, NULL))
+	if(!parse_fs_args(ssl, args, &nm, NULL, &insecure, NULL))
 		return;
-	/* prelock forwarders and hints for atomic operation with anchors */
-	lock_rw_wrlock(&fwd->lock);
-	lock_rw_wrlock(&worker->env.hints->lock);
 	if(insecure && worker->env.anchors)
 		anchors_delete_insecure(worker->env.anchors, LDNS_RR_CLASS_IN,
 			nm);
-	forwards_delete_stub_hole(fwd, LDNS_RR_CLASS_IN, nm, nolock);
-	hints_delete_stub(worker->env.hints, LDNS_RR_CLASS_IN, nm, nolock);
-	lock_rw_unlock(&fwd->lock);
-	lock_rw_unlock(&worker->env.hints->lock);
+	forwards_delete_stub_hole(fwd, LDNS_RR_CLASS_IN, nm);
+	hints_delete_stub(worker->env.hints, LDNS_RR_CLASS_IN, nm);
 	free(nm);
 	send_ok(ssl);
 }
@@ -2876,7 +2667,6 @@ do_list_forwards(RES* ssl, struct worker* worker)
 	struct iter_forward_zone* z;
 	struct trust_anchor* a;
 	int insecure;
-	lock_rw_rdlock(&fwds->lock);
 	RBTREE_FOR(z, struct iter_forward_zone*, fwds->tree) {
 		if(!z->dp) continue; /* skip empty marker for stub */

@@ -2891,12 +2681,9 @@ do_list_forwards(RES* ssl, struct worker* worker)
 		}

 		if(!ssl_print_name_dp(ssl, (insecure?"forward +i":"forward"),
-			z->name, z->dclass, z->dp)) {
-			lock_rw_unlock(&fwds->lock);
+			z->name, z->dclass, z->dp))
 			return;
-		}
 	}
-	lock_rw_unlock(&fwds->lock);
 }

 /** do the list_stubs command */
@@ -2907,7 +2694,6 @@ do_list_stubs(RES* ssl, struct worker* worker)
 	struct trust_anchor* a;
 	int insecure;
 	char str[32];
-	lock_rw_rdlock(&worker->env.hints->lock);
 	RBTREE_FOR(z, struct iter_hints_stub*, &worker->env.hints->tree) {

 		/* see if it is insecure */
@@ -2923,12 +2709,9 @@ do_list_stubs(RES* ssl, struct worker* worker)
 		snprintf(str, sizeof(str), "stub %sprime%s",
 			(z->noprime?"no":""), (insecure?" +i":""));
 		if(!ssl_print_name_dp(ssl, str, z->node.name,
-			z->node.dclass, z->dp)) {
-			lock_rw_unlock(&worker->env.hints->lock);
+			z->node.dclass, z->dp))
 			return;
-		}
 	}
-	lock_rw_unlock(&worker->env.hints->lock);
 }

 /** do the list_auth_zones command */
@@ -3195,6 +2978,25 @@ do_rpz_disable(RES* ssl, struct worker* worker, char* arg)
    do_rpz_enable_disable(ssl, worker, arg, 0);
 }

+/** tell other processes to execute the command */
+static void
+distribute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd)
+{
+	int i;
+	if(!cmd || !ssl)
+		return;
+	/* skip i=0 which is me */
+	for(i=1; i<rc->worker->daemon->num; i++) {
+		worker_send_cmd(rc->worker->daemon->workers[i],
+			worker_cmd_remote);
+		if(!tube_write_msg(rc->worker->daemon->workers[i]->cmd,
+			(uint8_t*)cmd, strlen(cmd)+1, 0)) {
+			ssl_printf(ssl, "error could not distribute cmd\n");
+			return;
+		}
+	}
+}
+
 /** check for name with end-of-string, space or tab after it */
 static int
 cmdcmp(char* p, const char* cmd, size_t len)
@@ -3228,23 +3030,9 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 		do_status(ssl, worker);
 		return;
 	} else if(cmdcmp(p, "dump_cache", 10)) {
-#ifdef THREADS_DISABLED
-		if(worker->daemon->num > 1) {
-			(void)ssl_printf(ssl, "dump_cache/load_cache is not "
-				"supported in multi-process operation\n");
-			return;
-		}
-#endif
 		(void)dump_cache(ssl, worker);
 		return;
 	} else if(cmdcmp(p, "load_cache", 10)) {
-#ifdef THREADS_DISABLED
-		if(worker->daemon->num > 1) {
-			/* The warning can't be printed when stdin is sending
-			 * data; just return */
-			return;
-		}
-#endif
 		if(load_cache(ssl, worker)) send_ok(ssl);
 		return;
 	} else if(cmdcmp(p, "list_forwards", 13)) {
@@ -3283,6 +3071,26 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 	} else if(cmdcmp(p, "auth_zone_transfer", 18)) {
 		do_auth_zone_transfer(ssl, worker, skipwhite(p+18));
 		return;
+	} else if(cmdcmp(p, "stub_add", 8)) {
+		/* must always distribute this cmd */
+		if(rc) distribute_cmd(rc, ssl, cmd);
+		do_stub_add(ssl, worker, skipwhite(p+8));
+		return;
+	} else if(cmdcmp(p, "stub_remove", 11)) {
+		/* must always distribute this cmd */
+		if(rc) distribute_cmd(rc, ssl, cmd);
+		do_stub_remove(ssl, worker, skipwhite(p+11));
+		return;
+	} else if(cmdcmp(p, "forward_add", 11)) {
+		/* must always distribute this cmd */
+		if(rc) distribute_cmd(rc, ssl, cmd);
+		do_forward_add(ssl, worker, skipwhite(p+11));
+		return;
+	} else if(cmdcmp(p, "forward_remove", 14)) {
+		/* must always distribute this cmd */
+		if(rc) distribute_cmd(rc, ssl, cmd);
+		do_forward_remove(ssl, worker, skipwhite(p+14));
+		return;
 	} else if(cmdcmp(p, "insecure_add", 12)) {
 		/* must always distribute this cmd */
 		if(rc) distribute_cmd(rc, ssl, cmd);
@@ -3293,6 +3101,11 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 		if(rc) distribute_cmd(rc, ssl, cmd);
 		do_insecure_remove(ssl, worker, skipwhite(p+15));
 		return;
+	} else if(cmdcmp(p, "forward", 7)) {
+		/* must always distribute this cmd */
+		if(rc) distribute_cmd(rc, ssl, cmd);
+		do_forward(ssl, worker, skipwhite(p+7));
+		return;
 	} else if(cmdcmp(p, "flush_stats", 11)) {
 		/* must always distribute this cmd */
 		if(rc) distribute_cmd(rc, ssl, cmd);
@@ -3306,27 +3119,6 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 	} else if(cmdcmp(p, "lookup", 6)) {
 		do_lookup(ssl, worker, skipwhite(p+6));
 		return;
-	/* The following are commands that read stdin.
-	 * Each line needs to be distributed if THREADS_DISABLED.
-	 */
-	} else if(cmdcmp(p, "local_zones_remove", 18)) {
-		do_zones_remove(rc, ssl, worker);
-		return;
-	} else if(cmdcmp(p, "local_zones", 11)) {
-		do_zones_add(rc, ssl, worker);
-		return;
-	} else if(cmdcmp(p, "local_datas_remove", 18)) {
-		do_datas_remove(rc, ssl, worker);
-		return;
-	} else if(cmdcmp(p, "local_datas", 11)) {
-		do_datas_add(rc, ssl, worker);
-		return;
-	} else if(cmdcmp(p, "view_local_datas_remove", 23)){
-		do_view_datas_remove(rc, ssl, worker, skipwhite(p+23));
-		return;
-	} else if(cmdcmp(p, "view_local_datas", 16)) {
-		do_view_datas_add(rc, ssl, worker, skipwhite(p+16));
-		return;
 	}

 #ifdef THREADS_DISABLED
@@ -3341,30 +3133,32 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 		do_verbosity(ssl, skipwhite(p+9));
 	} else if(cmdcmp(p, "local_zone_remove", 17)) {
 		do_zone_remove(ssl, worker->daemon->local_zones, skipwhite(p+17));
+	} else if(cmdcmp(p, "local_zones_remove", 18)) {
+		do_zones_remove(ssl, worker->daemon->local_zones);
 	} else if(cmdcmp(p, "local_zone", 10)) {
 		do_zone_add(ssl, worker->daemon->local_zones, skipwhite(p+10));
+	} else if(cmdcmp(p, "local_zones", 11)) {
+		do_zones_add(ssl, worker->daemon->local_zones);
 	} else if(cmdcmp(p, "local_data_remove", 17)) {
 		do_data_remove(ssl, worker->daemon->local_zones, skipwhite(p+17));
+	} else if(cmdcmp(p, "local_datas_remove", 18)) {
+		do_datas_remove(ssl, worker->daemon->local_zones);
 	} else if(cmdcmp(p, "local_data", 10)) {
 		do_data_add(ssl, worker->daemon->local_zones, skipwhite(p+10));
-	} else if(cmdcmp(p, "forward_add", 11)) {
-		do_forward_add(ssl, worker, skipwhite(p+11));
-	} else if(cmdcmp(p, "forward_remove", 14)) {
-		do_forward_remove(ssl, worker, skipwhite(p+14));
-	} else if(cmdcmp(p, "forward", 7)) {
-		do_forward(ssl, worker, skipwhite(p+7));
-	} else if(cmdcmp(p, "stub_add", 8)) {
-		do_stub_add(ssl, worker, skipwhite(p+8));
-	} else if(cmdcmp(p, "stub_remove", 11)) {
-		do_stub_remove(ssl, worker, skipwhite(p+11));
+	} else if(cmdcmp(p, "local_datas", 11)) {
+		do_datas_add(ssl, worker->daemon->local_zones);
 	} else if(cmdcmp(p, "view_local_zone_remove", 22)) {
 		do_view_zone_remove(ssl, worker, skipwhite(p+22));
 	} else if(cmdcmp(p, "view_local_zone", 15)) {
 		do_view_zone_add(ssl, worker, skipwhite(p+15));
 	} else if(cmdcmp(p, "view_local_data_remove", 22)) {
 		do_view_data_remove(ssl, worker, skipwhite(p+22));
+	} else if(cmdcmp(p, "view_local_datas_remove", 23)){
+		do_view_datas_remove(ssl, worker, skipwhite(p+23));
 	} else if(cmdcmp(p, "view_local_data", 15)) {
 		do_view_data_add(ssl, worker, skipwhite(p+15));
+	} else if(cmdcmp(p, "view_local_datas", 16)) {
+		do_view_datas_add(ssl, worker, skipwhite(p+16));
 	} else if(cmdcmp(p, "flush_zone", 10)) {
 		do_flush_zone(ssl, worker, skipwhite(p+10));
 	} else if(cmdcmp(p, "flush_type", 10)) {
@@ -3384,9 +3178,9 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 	} else if(cmdcmp(p, "get_option", 10)) {
 		do_get_option(ssl, worker, skipwhite(p+10));
 	} else if(cmdcmp(p, "flush_bogus", 11)) {
-		do_flush_bogus(ssl, worker, skipwhite(p+11));
+		do_flush_bogus(ssl, worker);
 	} else if(cmdcmp(p, "flush_negative", 14)) {
-		do_flush_negative(ssl, worker, skipwhite(p+14));
+		do_flush_negative(ssl, worker);
 	} else if(cmdcmp(p, "rpz_enable", 10)) {
 		do_rpz_enable(ssl, worker, skipwhite(p+10));
 	} else if(cmdcmp(p, "rpz_disable", 11)) {
@@ -3418,7 +3212,7 @@ handle_req(struct daemon_remote* rc, struct rc_state* s, RES* res)
 	int r;
 	char pre[10];
 	char magic[7];
-	char buf[MAX_CMD_STRLINE];
+	char buf[1024];
 #ifdef USE_WINSOCK
 	/* makes it possible to set the socket blocking again. */
 	/* basically removes it from winsock_event ... */
@@ -391,13 +391,6 @@ void server_stats_obtain(struct worker* worker, struct worker* who,
 	else 	worker_send_cmd(who, worker_cmd_stats_noreset);
 	verbose(VERB_ALGO, "wait for stats reply");
 	if(tube_wait_timeout(worker->cmd, STATS_THREAD_WAIT) == 0) {
-#if defined(HAVE_PTHREAD) && defined(SIZEOF_PTHREAD_T) && defined(SIZEOF_UNSIGNED_LONG)
-#  if SIZEOF_PTHREAD_T == SIZEOF_UNSIGNED_LONG
-		unsigned long pthid = 0;
-		if(verbosity >= VERB_OPS)
-			memcpy(&pthid, &who->thr_id, sizeof(unsigned long));
-#  endif
-#endif
 		verbose(VERB_OPS, "no response from thread %d"
 #ifdef HAVE_GETTID
 			" LWP %u"
@@ -414,7 +407,7 @@ void server_stats_obtain(struct worker* worker, struct worker* who,
 #endif
 #if defined(HAVE_PTHREAD) && defined(SIZEOF_PTHREAD_T) && defined(SIZEOF_UNSIGNED_LONG)
 #  if SIZEOF_PTHREAD_T == SIZEOF_UNSIGNED_LONG
-			, pthid
+			, (unsigned long)*((unsigned long*)&who->thr_id)
 #  endif
 #endif
 			);
@@ -366,8 +366,9 @@ readpid (const char* file)
 /** write pid to file. 
 * @param pidfile: file name of pid file.
 * @param pid: pid to write to file.
+ * @return false on failure
 */
-static void
+static int
 writepid (const char* pidfile, pid_t pid)
 {
 	int fd;
@@ -382,7 +383,7 @@ writepid (const char* pidfile, pid_t pid)
 		, 0644)) == -1) {
 		log_err("cannot open pidfile %s: %s", 
 			pidfile, strerror(errno));
-		return;
+		return 0;
 	}
 	while(count < strlen(pidbuf)) {
 		ssize_t r = write(fd, pidbuf+count, strlen(pidbuf)-count);
@@ -392,16 +393,17 @@ writepid (const char* pidfile, pid_t pid)
 			log_err("cannot write to pidfile %s: %s",
 				pidfile, strerror(errno));
 			close(fd);
-			return;
+			return 0;
 		} else if(r == 0) {
 			log_err("cannot write any bytes to pidfile %s: "
 				"write returns 0 bytes written", pidfile);
 			close(fd);
-			return;
+			return 0;
 		}
 		count += r;
 	}
 	close(fd);
+	return 1;
 }

 /**
@@ -473,11 +475,7 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 #endif
 #ifdef HAVE_GETPWNAM
 	struct passwd *pwd = NULL;
-#endif

-	if(!daemon_privileged(daemon))
-		fatal_exit("could not do privileged setup");
-#ifdef HAVE_GETPWNAM
 	if(cfg->username && cfg->username[0]) {
 		if((pwd = getpwnam(cfg->username)) == NULL)
 			fatal_exit("user '%s' does not exist.", cfg->username);
@@ -547,15 +545,7 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 				cfg, 1);
 		if(!daemon->pidfile)
 			fatal_exit("pidfile alloc: out of memory");
-		/* Check old pid if there is no username configured.
-		 * With a username, the assumption is that the privilege
-		 * drop makes a pidfile not removed when the server stopped
-		 * last time. The server does not chown the pidfile for it,
-		 * because that creates privilege escape problems, with the
-		 * pidfile writable by unprivileged users, but used by
-		 * privileged users. */
-		if(!(cfg->username && cfg->username[0]))
-			checkoldpid(daemon->pidfile, pidinchroot);
+		checkoldpid(daemon->pidfile, pidinchroot);
 	}
 #endif

@@ -567,7 +557,18 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 	/* write new pidfile (while still root, so can be outside chroot) */
 #ifdef HAVE_KILL
 	if(cfg->pidfile && cfg->pidfile[0] && need_pidfile) {
-		writepid(daemon->pidfile, getpid());
+		if(writepid(daemon->pidfile, getpid())) {
+			if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 &&
+				pidinchroot) {
+#  ifdef HAVE_CHOWN
+				if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) {
+					verbose(VERB_QUERY, "cannot chown %u.%u %s: %s",
+						(unsigned)cfg_uid, (unsigned)cfg_gid,
+						daemon->pidfile, strerror(errno));
+				}
+#  endif /* HAVE_CHOWN */
+			}
+		}
 	}
 #else
 	(void)daemon;
@@ -745,11 +746,7 @@ run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, int need_pi
 	if(daemon->pidfile) {
 		int fd;
 		/* truncate pidfile */
-		fd = open(daemon->pidfile, O_WRONLY | O_TRUNC
-#ifdef O_NOFOLLOW
-			| O_NOFOLLOW
-#endif
-			, 0644);
+		fd = open(daemon->pidfile, O_WRONLY | O_TRUNC, 0644);
 		if(fd != -1)
 			close(fd);
 		/* delete pidfile */
@@ -659,12 +659,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 	if(rep->ttl < timenow) {
 		/* Check if we need to serve expired now */
 		if(worker->env.cfg->serve_expired &&
-			!worker->env.cfg->serve_expired_client_timeout
-#ifdef USE_CACHEDB
-			&& !(worker->env.cachedb_enabled &&
-			  worker->env.cfg->cachedb_check_when_serve_expired)
-#endif
-			) {
+			!worker->env.cfg->serve_expired_client_timeout) {
 				if(worker->env.cfg->serve_expired_ttl &&
 					rep->serve_expired_ttl < timenow)
 					return 0;
@@ -1111,172 +1106,6 @@ answer_notify(struct worker* w, struct query_info* qinfo,
 	LDNS_OPCODE_SET(sldns_buffer_begin(pkt), LDNS_PACKET_NOTIFY);
 }

-static int
-make_ede_error(struct comm_point* c, struct worker* worker,
-		struct comm_reply* repinfo, int rcode, int16_t ede_code,
-		int ede, struct check_request_result* check_result)
-{
-	size_t opt_rr_mark;
-
-	if(worker->stats.extended)
-		worker->stats.unwanted_queries++;
-	worker_check_request(c->buffer, worker, check_result);
-	if(check_result->value != 0) {
-		if(check_result->value != -1) {
-			LDNS_QR_SET(sldns_buffer_begin(c->buffer));
-			LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
-				check_result->value);
-			return 1;
-		}
-		comm_point_drop_reply(repinfo);
-		return 0;
-	}
-	/* worker_check_request() above guarantees that the buffer contains at
-	 * least a header and that qdcount == 1
-	 */
-	log_assert(sldns_buffer_limit(c->buffer) >= LDNS_HEADER_SIZE
-		&& LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) == 1);
-
-	sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); /* skip header */
-
-	/* check additional section is present and that we respond with EDEs */
-	if(LDNS_ARCOUNT(sldns_buffer_begin(c->buffer)) != 1
-		|| !ede) {
-		LDNS_QDCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
-		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), rcode);
-		sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE);
-		sldns_buffer_flip(c->buffer);
-		return 1;
-	}
-
-	if (!query_dname_len(c->buffer)) {
-		LDNS_QDCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
-		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
-			LDNS_RCODE_FORMERR);
-		sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE);
-		sldns_buffer_flip(c->buffer);
-		return 1;
-	}
-	/* space available for query type and class? */
-	if (sldns_buffer_remaining(c->buffer) < 2 * sizeof(uint16_t)) {
-		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
-		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
-			 LDNS_RCODE_FORMERR);
-		LDNS_QDCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE);
-		sldns_buffer_flip(c->buffer);
-		return 1;
-	}
-	LDNS_QR_SET(sldns_buffer_begin(c->buffer));
-	LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), rcode);
-
-	sldns_buffer_skip(c->buffer, (ssize_t)sizeof(uint16_t)); /* skip qtype */
-
-	sldns_buffer_skip(c->buffer, (ssize_t)sizeof(uint16_t)); /* skip qclass */
-
-	/* The OPT RR to be returned should come directly after
-	 * the query, so mark this spot.
-	 */
-	opt_rr_mark = sldns_buffer_position(c->buffer);
-
-	/* Skip through the RR records */
-	if(LDNS_ANCOUNT(sldns_buffer_begin(c->buffer)) != 0 ||
-		LDNS_NSCOUNT(sldns_buffer_begin(c->buffer)) != 0) {
-		if(!skip_pkt_rrs(c->buffer,
-			((int)LDNS_ANCOUNT(sldns_buffer_begin(c->buffer)))+
-			((int)LDNS_NSCOUNT(sldns_buffer_begin(c->buffer))))) {
-			LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
-				LDNS_RCODE_FORMERR);
-			LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-			LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-			sldns_buffer_set_position(c->buffer, opt_rr_mark);
-			sldns_buffer_flip(c->buffer);
-			return 1;
-		}
-	}
-	/* Do we have a valid OPT RR here? If not return rcode (could be a valid TSIG or something so no FORMERR) */
-	/* domain name must be the root of length 1. */
-	if(sldns_buffer_remaining(c->buffer) < 1 || *sldns_buffer_current(c->buffer) != 0) {
-		LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		sldns_buffer_set_position(c->buffer, opt_rr_mark);
-		sldns_buffer_flip(c->buffer);
-		return 1;
-	} else {
-		sldns_buffer_skip(c->buffer, 1); /* skip root label */
-	}
-	if(sldns_buffer_remaining(c->buffer) < 2 ||
-		sldns_buffer_read_u16(c->buffer) != LDNS_RR_TYPE_OPT) {
-		LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		sldns_buffer_set_position(c->buffer, opt_rr_mark);
-		sldns_buffer_flip(c->buffer);
-		return 1;
-	}
-	/* Write OPT RR directly after the query,
-	 * so without the (possibly skipped) Answer and NS RRs
-	 */
-	LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-	LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-	sldns_buffer_clear(c->buffer); /* reset write limit */
-	sldns_buffer_set_position(c->buffer, opt_rr_mark);
-
-	/* Check if OPT record can be written
-	 * 17 == root label (1) + RR type (2) + UDP Size (2)
-	 *     + Fields (4) + rdata len (2) + EDE Option code (2)
-	 *     + EDE Option length (2) + EDE info-code (2)
-	 */
-	if (sldns_buffer_available(c->buffer, 17) == 0) {
-		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
-		sldns_buffer_flip(c->buffer);
-		return 1;
-	}
-
-	LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 1);
-
-	/* root label */
-	sldns_buffer_write_u8(c->buffer, 0);
-	sldns_buffer_write_u16(c->buffer, LDNS_RR_TYPE_OPT);
-	sldns_buffer_write_u16(c->buffer, EDNS_ADVERTISED_SIZE);
-
-	/* write OPT Record TTL Field */
-	sldns_buffer_write_u32(c->buffer, 0);
-
-	/* write rdata len: EDE option + length + info-code */
-	sldns_buffer_write_u16(c->buffer, 6);
-
-	/* write OPTIONS; add EDE option code */
-	sldns_buffer_write_u16(c->buffer, LDNS_EDNS_EDE);
-
-	/* write single EDE option length (for just 1 info-code) */
-	sldns_buffer_write_u16(c->buffer, 2);
-
-	/* write single EDE info-code */
-	sldns_buffer_write_u16(c->buffer, ede_code);
-
-	sldns_buffer_flip(c->buffer);
-
-	verbose(VERB_ALGO, "attached EDE code: %d", ede_code);
-
-	return 1;
-
-
-}
-
 static int
 deny_refuse(struct comm_point* c, enum acl_access acl,
 	enum acl_access deny, enum acl_access refuse,
@@ -1295,14 +1124,174 @@ deny_refuse(struct comm_point* c, enum acl_access acl,
 			worker->stats.unwanted_queries++;
 		return 0;
 	} else if(acl == refuse) {
+		size_t opt_rr_mark;
+
 		if(verbosity >= VERB_ALGO) {
 			log_acl_action("refused", &repinfo->client_addr,
 				repinfo->client_addrlen, acl, acladdr);
 			log_buf(VERB_ALGO, "refuse", c->buffer);
 		}
-		return make_ede_error(c, worker, repinfo, LDNS_RCODE_REFUSED,
-				LDNS_EDE_PROHIBITED, ede, check_result);
+
+		if(worker->stats.extended)
+			worker->stats.unwanted_queries++;
+		worker_check_request(c->buffer, worker, check_result);
+		if(check_result->value != 0) {
+			if(check_result->value != -1) {
+				LDNS_QR_SET(sldns_buffer_begin(c->buffer));
+				LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+					check_result->value);
+				return 1;
+			}
+			comm_point_drop_reply(repinfo);
+			return 0;
+		}
+		/* worker_check_request() above guarantees that the buffer contains at
+		 * least a header and that qdcount == 1
+		 */
+		log_assert(sldns_buffer_limit(c->buffer) >= LDNS_HEADER_SIZE
+			&& LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) == 1);
+
+		sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); /* skip header */
+
+		/* check additional section is present and that we respond with EDEs */
+		if(LDNS_ARCOUNT(sldns_buffer_begin(c->buffer)) != 1
+			|| !ede) {
+			LDNS_QDCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_QR_SET(sldns_buffer_begin(c->buffer));
+			LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+				LDNS_RCODE_REFUSED);
+			sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE);
+			sldns_buffer_flip(c->buffer);
+			return 1;
+		}
+
+		if (!query_dname_len(c->buffer)) {
+			LDNS_QDCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_QR_SET(sldns_buffer_begin(c->buffer));
+			LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+				LDNS_RCODE_FORMERR);
+			sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE);
+			sldns_buffer_flip(c->buffer);
+			return 1;
+		}
+		/* space available for query type and class? */
+		if (sldns_buffer_remaining(c->buffer) < 2 * sizeof(uint16_t)) {
+                        LDNS_QR_SET(sldns_buffer_begin(c->buffer));
+                        LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+				 LDNS_RCODE_FORMERR);
+			LDNS_QDCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE);
+                        sldns_buffer_flip(c->buffer);
+			return 1;
+		}
+		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
+		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+			LDNS_RCODE_REFUSED);
+
+		sldns_buffer_skip(c->buffer, (ssize_t)sizeof(uint16_t)); /* skip qtype */
+
+		sldns_buffer_skip(c->buffer, (ssize_t)sizeof(uint16_t)); /* skip qclass */
+
+		/* The OPT RR to be returned should come directly after
+		 * the query, so mark this spot.
+		 */
+		opt_rr_mark = sldns_buffer_position(c->buffer);
+
+		/* Skip through the RR records */
+		if(LDNS_ANCOUNT(sldns_buffer_begin(c->buffer)) != 0 ||
+			LDNS_NSCOUNT(sldns_buffer_begin(c->buffer)) != 0) {
+			if(!skip_pkt_rrs(c->buffer,
+				((int)LDNS_ANCOUNT(sldns_buffer_begin(c->buffer)))+
+				((int)LDNS_NSCOUNT(sldns_buffer_begin(c->buffer))))) {
+				LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+					LDNS_RCODE_FORMERR);
+				LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+				LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+				LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+				sldns_buffer_set_position(c->buffer, opt_rr_mark);
+				sldns_buffer_flip(c->buffer);
+				return 1;
+			}
+		}
+		/* Do we have a valid OPT RR here? If not return REFUSED (could be a valid TSIG or something so no FORMERR) */
+		/* domain name must be the root of length 1. */
+		if(sldns_buffer_remaining(c->buffer) < 1 || *sldns_buffer_current(c->buffer) != 0) {
+			LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			sldns_buffer_set_position(c->buffer, opt_rr_mark);
+			sldns_buffer_flip(c->buffer);
+			return 1;
+		} else {
+			sldns_buffer_skip(c->buffer, 1); /* skip root label */
+		}
+		if(sldns_buffer_remaining(c->buffer) < 2 ||
+			sldns_buffer_read_u16(c->buffer) != LDNS_RR_TYPE_OPT) {
+			LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			sldns_buffer_set_position(c->buffer, opt_rr_mark);
+			sldns_buffer_flip(c->buffer);
+			return 1;
+		}
+		/* Write OPT RR directly after the query,
+		 * so without the (possibly skipped) Answer and NS RRs
+		 */
+		LDNS_ANCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+		LDNS_NSCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+		sldns_buffer_clear(c->buffer); /* reset write limit */
+		sldns_buffer_set_position(c->buffer, opt_rr_mark);
+
+		/* Check if OPT record can be written
+		 * 17 == root label (1) + RR type (2) + UDP Size (2)
+		 *     + Fields (4) + rdata len (2) + EDE Option code (2)
+		 *     + EDE Option length (2) + EDE info-code (2)
+		 */
+		if (sldns_buffer_available(c->buffer, 17) == 0) {
+			LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 0);
+			sldns_buffer_flip(c->buffer);
+			return 1;
+		}
+
+		LDNS_ARCOUNT_SET(sldns_buffer_begin(c->buffer), 1);
+
+		/* root label */
+		sldns_buffer_write_u8(c->buffer, 0);
+		sldns_buffer_write_u16(c->buffer, LDNS_RR_TYPE_OPT);
+		sldns_buffer_write_u16(c->buffer, EDNS_ADVERTISED_SIZE);
+
+		/* write OPT Record TTL Field */
+		sldns_buffer_write_u32(c->buffer, 0);
+
+		/* write rdata len: EDE option + length + info-code */
+		sldns_buffer_write_u16(c->buffer, 6);
+
+		/* write OPTIONS; add EDE option code */
+		sldns_buffer_write_u16(c->buffer, LDNS_EDNS_EDE);
+
+		/* write single EDE option length (for just 1 info-code) */
+		sldns_buffer_write_u16(c->buffer, 2);
+
+		/* write single EDE info-code */
+		sldns_buffer_write_u16(c->buffer, LDNS_EDE_PROHIBITED);
+
+		sldns_buffer_flip(c->buffer);
+
+		verbose(VERB_ALGO, "attached EDE code: %d", LDNS_EDE_PROHIBITED);
+
+		return 1;
+
 	}
+
 	return -1;
 }

@@ -1465,8 +1454,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	 */
 	if(worker->dtenv.log_client_query_messages) {
 		log_addr(VERB_ALGO, "request from client", &repinfo->client_addr, repinfo->client_addrlen);
-		log_addr(VERB_ALGO, "to local addr", (void*)repinfo->c->socket->addr, repinfo->c->socket->addrlen);
-		dt_msg_send_client_query(&worker->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr, c->type, c->ssl, c->buffer,
+		log_addr(VERB_ALGO, "to local addr", (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->socket->addr->ai_addrlen);
+		dt_msg_send_client_query(&worker->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr->ai_addr, c->type, c->ssl, c->buffer,
 		((worker->env.cfg->sock_queue_timeout && timeval_isset(&c->recv_tv))?&c->recv_tv:NULL));
 	}
 #endif
@@ -1558,8 +1547,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		qinfo.qtype == LDNS_RR_TYPE_MAILA ||
 		qinfo.qtype == LDNS_RR_TYPE_MAILB ||
 		(qinfo.qtype >= 128 && qinfo.qtype <= 248)) {
-		size_t opt_rr_mark;
-
 		verbose(VERB_ALGO, "worker request: formerror for meta-type.");
 		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
 			repinfo->client_addrlen);
@@ -1567,12 +1554,14 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			comm_point_drop_reply(repinfo);
 			return 0;
 		}
-		if (make_ede_error(c, worker, repinfo, LDNS_RCODE_FORMERR,
-				LDNS_EDE_INVALID_QUERY_TYPE,
-				worker->env.cfg->ede, &check_result)) {
-			goto send_reply;
+		sldns_buffer_rewind(c->buffer);
+		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
+		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer),
+			LDNS_RCODE_FORMERR);
+		if(worker->stats.extended) {
+			worker->stats.qtype[qinfo.qtype]++;
 		}
-		return 0;
+		goto send_reply;
 	}
 	if((ret=parse_edns_from_query_pkt(
 			c->buffer, &edns, worker->env.cfg, c, repinfo,
@@ -1954,10 +1943,10 @@ send_reply_rc:
 	/*
 	 * sending src (client)/dst (local service) addresses over DNSTAP from send_reply code label (when we serviced local zone for ex.)
 	 */
-	if(worker->dtenv.log_client_response_messages && rc !=0) {
-		log_addr(VERB_ALGO, "from local addr", (void*)repinfo->c->socket->addr, repinfo->c->socket->addrlen);
+	if(worker->dtenv.log_client_response_messages) {
+		log_addr(VERB_ALGO, "from local addr", (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->socket->addr->ai_addrlen);
 		log_addr(VERB_ALGO, "response to client", &repinfo->client_addr, repinfo->client_addrlen);
-		dt_msg_send_client_response(&worker->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr, c->type, c->ssl, c->buffer);
+		dt_msg_send_client_response(&worker->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr->ai_addr, c->type, c->ssl, c->buffer);
 	}
 #endif
 	if(worker->env.cfg->log_replies)
@@ -1972,13 +1961,13 @@ send_reply_rc:
 			log_reply_info(NO_VERBOSE, &qinfo,
 				&repinfo->client_addr, repinfo->client_addrlen,
 				tv, 1, c->buffer,
-				(worker->env.cfg->log_destaddr?(void*)repinfo->c->socket->addr:NULL),
+				(worker->env.cfg->log_destaddr?(void*)repinfo->c->socket->addr->ai_addr:NULL),
 				c->type);
 		} else {
 			log_reply_info(NO_VERBOSE, &qinfo,
 				&repinfo->client_addr, repinfo->client_addrlen,
 				tv, 1, c->buffer,
-				(worker->env.cfg->log_destaddr?(void*)repinfo->c->socket->addr:NULL),
+				(worker->env.cfg->log_destaddr?(void*)repinfo->c->socket->addr->ai_addr:NULL),
 				c->type);
 		}
 	}
@@ -2272,6 +2261,18 @@ worker_init(struct worker* worker, struct config_file *cfg,
 		worker_delete(worker);
 		return 0;
 	}
+	if(!(worker->env.fwds = forwards_create()) ||
+		!forwards_apply_cfg(worker->env.fwds, cfg)) {
+		log_err("Could not set forward zones");
+		worker_delete(worker);
+		return 0;
+	}
+	if(!(worker->env.hints = hints_create()) ||
+		!hints_apply_cfg(worker->env.hints, cfg)) {
+		log_err("Could not set root or stub hints");
+		worker_delete(worker);
+		return 0;
+	}
 	/* one probe timer per process -- if we have 5011 anchors */
 	if(autr_get_num_anchors(worker->env.anchors) > 0
 #ifndef THREADS_DISABLED
@@ -2344,6 +2345,8 @@ worker_delete(struct worker* worker)
 	outside_network_quit_prepare(worker->back);
 	mesh_delete(worker->env.mesh);
 	sldns_buffer_free(worker->env.scratch_buffer);
+	forwards_delete(worker->env.fwds);
+	hints_delete(worker->env.hints);
 	listen_delete(worker->front);
 	outside_network_delete(worker->back);
 	comm_signal_delete(worker->comsig);
@@ -1044,8 +1044,8 @@ dns64_get_mem(struct module_env* env, int id)
 */
 static struct module_func_block dns64_block = {
 	"dns64",
-	NULL, NULL, &dns64_init, &dns64_deinit, &dns64_operate,
-	&dns64_inform_super, &dns64_clear, &dns64_get_mem
+	&dns64_init, &dns64_deinit, &dns64_operate, &dns64_inform_super,
+	&dns64_clear, &dns64_get_mem
 };

 /**
@@ -86,31 +86,6 @@ dt_pack(const Dnstap__Dnstap *d, void **buf, size_t *sz)
 	return 1;
 }

-/** See if the message is sent due to dnstap sample rate */
-static int
-dt_sample_rate_limited(struct dt_env* env)
-{
-	lock_basic_lock(&env->sample_lock);
-	/* Sampling is every [n] packets. Where n==1, every packet is sent */
-	if(env->sample_rate > 1) {
-		int submit = 0;
-		/* if sampling is engaged... */
-		if (env->sample_rate_count > env->sample_rate) {
-			/* once the count passes the limit */
-			/* submit the message */
-			submit = 1;
-			/* and reset the count */
-			env->sample_rate_count = 0;
-		}
-		/* increment count regardless */
-		env->sample_rate_count++;
-		lock_basic_unlock(&env->sample_lock);
-		return !submit;
-	}
-	lock_basic_unlock(&env->sample_lock);
-	return 0;
-}
-
 static void
 dt_send(const struct dt_env *env, void *buf, size_t len_buf)
 {
@@ -171,7 +146,6 @@ dt_create(struct config_file* cfg)
 	env = (struct dt_env *) calloc(1, sizeof(struct dt_env));
 	if (!env)
 		return NULL;
-	lock_basic_init(&env->sample_lock);

 	env->dtio = dt_io_thread_create();
 	if(!env->dtio) {
@@ -267,12 +241,6 @@ dt_apply_cfg(struct dt_env *env, struct config_file *cfg)
 	{
 		verbose(VERB_OPS, "dnstap Message/FORWARDER_RESPONSE enabled");
 	}
-	lock_basic_lock(&env->sample_lock);
-	if((env->sample_rate = (unsigned int)cfg->dnstap_sample_rate))
-	{
-		verbose(VERB_OPS, "dnstap SAMPLE_RATE enabled and set to \"%d\"", (int)env->sample_rate);
-	}
-	lock_basic_unlock(&env->sample_lock);
 }

 int
@@ -305,7 +273,6 @@ dt_delete(struct dt_env *env)
 	if (!env)
 		return;
 	dt_io_thread_delete(env->dtio);
-	lock_basic_destroy(&env->sample_lock);
 	free(env->identity);
 	free(env->version);
 	free(env);
@@ -442,9 +409,6 @@ dt_msg_send_client_query(struct dt_env *env,
 	struct dt_msg dm;
 	struct timeval qtime;

-	if(dt_sample_rate_limited(env))
-		return;
-
 	if(tstamp)
 		memcpy(&qtime, tstamp, sizeof(qtime));
 	else 	gettimeofday(&qtime, NULL);
@@ -483,9 +447,6 @@ dt_msg_send_client_response(struct dt_env *env,
 	struct dt_msg dm;
 	struct timeval rtime;

-	if(dt_sample_rate_limited(env))
-		return;
-
 	gettimeofday(&rtime, NULL);

 	/* type */
@@ -523,9 +484,6 @@ dt_msg_send_outside_query(struct dt_env *env,
 	struct timeval qtime;
 	uint16_t qflags;

-	if(dt_sample_rate_limited(env))
-		return;
-
 	gettimeofday(&qtime, NULL);
 	qflags = sldns_buffer_read_u16_at(qmsg, 2);

@@ -579,9 +537,6 @@ dt_msg_send_outside_response(struct dt_env *env,
 	struct dt_msg dm;
 	uint16_t qflags;

-	if(dt_sample_rate_limited(env))
-		return;
-
 	(void)qbuf_len; log_assert(qbuf_len >= sizeof(qflags));
 	memcpy(&qflags, qbuf, sizeof(qflags));
 	qflags = ntohs(qflags);
@@ -39,7 +39,6 @@

 #ifdef USE_DNSTAP

-#include "util/locks.h"
 struct config_file;
 struct sldns_buffer;
 struct dt_msg_queue;
@@ -76,13 +75,6 @@ struct dt_env {
 	unsigned log_forwarder_query_messages : 1;
 	/** whether to log Message/FORWARDER_RESPONSE */
 	unsigned log_forwarder_response_messages : 1;
-
-	/** lock on sample count */
-	lock_basic_type sample_lock;
-	/** rate limit value from config, samples 1/N messages */
-	unsigned int sample_rate;
-	/** rate limit counter */
-	unsigned int sample_rate_count;
 };

 /**
@@ -34,38 +34,41 @@ AC_DEFUN([dt_DNSTAP],
                LDFLAGS="$LDFLAGS -L$withval/lib"
            ],
            [
-                if test -n "$PKG_CONFIG"; then
-                    PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c],
-                        [
-                            CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS"
-                            LIBS="$LIBS $PROTOBUFC_LIBS"
-                        ],
-                        [
-                            # pkg-config failed; try falling back to known values
-                            # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
-                            if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
-                                CFLAGS="$CFLAGS -I/usr/include/google"
-                            else
-                                if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
-                                    CFLAGS="$CFLAGS -I/usr/local/include/google"
-                                    LDFLAGS="$LDFLAGS -L/usr/local/lib"
+                ifdef([PKG_CHECK_MODULES],
+                    [
+                        PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c],
+                            [
+                                CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS"
+                                LIBS="$LIBS $PROTOBUFC_LIBS"
+                            ],
+                            [
+                                # pkg-config failed; try falling back to known values
+                                # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
+                                if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
+                                    CFLAGS="$CFLAGS -I/usr/include/google"
                                else
-                                    AC_MSG_ERROR([The protobuf-c package was not found with pkg-config. Please install protobuf-c!])
+                                    if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
+                                        CFLAGS="$CFLAGS -I/usr/local/include/google"
+                                        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+                                    else
+                                        AC_MSG_ERROR([The protobuf-c package was not found with pkg-config. Please install protobuf-c!])
+                                    fi
                                fi
+                            ]
+                        )
+                    ],
+                    [
+                        # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
+                        if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
+                            CFLAGS="$CFLAGS -I/usr/include/google"
+                        else
+                            if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
+                                CFLAGS="$CFLAGS -I/usr/local/include/google"
+                                LDFLAGS="$LDFLAGS -L/usr/local/lib"
                            fi
-                        ]
-                    )
-                else
-                    # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
-                    if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
-                        CFLAGS="$CFLAGS -I/usr/include/google"
-                    else
-                        if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
-                            CFLAGS="$CFLAGS -I/usr/local/include/google"
-                            LDFLAGS="$LDFLAGS -L/usr/local/lib"
                        fi
-                    fi
-                fi
+                    ]
+                )
            ]
        )
        AC_SEARCH_LIBS([protobuf_c_message_pack], [protobuf-c], [],
@@ -176,7 +176,10 @@ void
 mq_wakeup_cb(void* arg)
 {
 	struct dt_msg_queue* mq = (struct dt_msg_queue*)arg;
-
+	/* even if the dtio is already active, because perhaps much
+	 * traffic suddenly, we leave the timer running to save on
+	 * managing it, the once a second timer is less work then
+	 * starting and stopping the timer frequently */
 	lock_basic_lock(&mq->dtio->wakeup_timer_lock);
 	mq->dtio->wakeup_timer_enabled = 0;
 	lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
@@ -207,8 +210,6 @@ dt_msg_queue_start_timer(struct dt_msg_queue* mq, int wakeupnow)
 	lock_basic_lock(&mq->dtio->wakeup_timer_lock);
 	if(mq->dtio->wakeup_timer_enabled) {
 		if(wakeupnow) {
-			tv.tv_sec = 0;
-			tv.tv_usec = 0;
 			comm_timer_set(mq->wakeup_timer, &tv);
 		}
 		lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
@@ -220,14 +221,8 @@ dt_msg_queue_start_timer(struct dt_msg_queue* mq, int wakeupnow)
 	if(!wakeupnow) {
 		tv.tv_sec = 1;
 		tv.tv_usec = 0;
-		/* If it is already set, keep it running. */
-		if(!comm_timer_is_set(mq->wakeup_timer))
-			comm_timer_set(mq->wakeup_timer, &tv);
-	} else {
-		tv.tv_sec = 0;
-		tv.tv_usec = 0;
-		comm_timer_set(mq->wakeup_timer, &tv);
 	}
+	comm_timer_set(mq->wakeup_timer, &tv);
 	lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
 }

@@ -265,9 +260,8 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)

 	/* acquire lock */
 	lock_basic_lock(&mq->lock);
-	/* if list was empty, start timer for (eventual) wakeup,
-	 * or if dtio is not writing now an eventual wakeup is needed. */
-	if(mq->first == NULL || !mq->dtio->event_added_is_write)
+	/* if list was empty, start timer for (eventual) wakeup */
+	if(mq->first == NULL)
 		wakeupstarttimer = 1;
 	/* if list contains more than wakeupnum elements, wakeup now,
 	 * or if list is (going to be) almost full */
@@ -1265,13 +1259,6 @@ static void dtio_sleep(struct dt_io_thread* dtio)
 	/* unregister the event polling for write, because there is
 	 * nothing to be written */
 	(void)dtio_add_output_event_read(dtio);
-
-	/* Set wakeuptimer enabled off; so that the next worker thread that
-	 * wants to log starts a timer if needed, since the writer thread
-	 * has gone to sleep. */
-	lock_basic_lock(&dtio->wakeup_timer_lock);
-	dtio->wakeup_timer_enabled = 0;
-	lock_basic_unlock(&dtio->wakeup_timer_lock);
 }

 #ifdef HAVE_SSL
@@ -1335,11 +1322,7 @@ static int dtio_ssl_check_peer(struct dt_io_thread* dtio)
 	if((SSL_get_verify_mode(dtio->ssl)&SSL_VERIFY_PEER)) {
 		/* verification */
 		if(SSL_get_verify_result(dtio->ssl) == X509_V_OK) {
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-			X509* x = SSL_get1_peer_certificate(dtio->ssl);
-#else
 			X509* x = SSL_get_peer_certificate(dtio->ssl);
-#endif
 			if(!x) {
 				verbose(VERB_ALGO, "dnstap io, %s, SSL "
 					"connection failed no certificate",
@@ -1364,11 +1347,7 @@ static int dtio_ssl_check_peer(struct dt_io_thread* dtio)
 #endif
 			X509_free(x);
 		} else {
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-			X509* x = SSL_get1_peer_certificate(dtio->ssl);
-#else
 			X509* x = SSL_get_peer_certificate(dtio->ssl);
-#endif
 			if(x) {
 				log_cert(VERB_ALGO, "dnstap io, peer "
 					"certificate", x);
@@ -1534,22 +1513,8 @@ void dtio_output_cb(int ATTR_UNUSED(fd), short bits, void* arg)
 					/* no messages on the first iteration,
 					 * the queues are all empty */
 					dtio_sleep(dtio);
-					/* After putting to sleep, see if
-					 * a message is in a message queue,
-					 * if so, resume service. Stops a
-					 * race condition where a thread could
-					 * have one message but the dtio
-					 * also just went to sleep. With the
-					 * message queued between the
-					 * dtio_find_msg and dtio_sleep
-					 * calls. */
-					if(dtio_find_msg(dtio)) {
-						if(!dtio_add_output_event_write(dtio))
-							return;
-					}
 				}
-				if(!dtio->cur_msg)
-					return; /* nothing to do */
+				return; /* nothing to do */
 			}
 		}

@@ -75,18 +75,17 @@
 static void usage(char* argv[])
 {
 	printf("usage: %s [options]\n", argv[0]);
-	printf("	Listen to dnstap messages\n");
+	printf(" 	Listen to dnstap messages\n");
 	printf("stdout has dnstap log, stderr has verbose server log\n");
-	printf("-u <socketpath>		listen to unix socket with this file name\n");
-	printf("-s <serverip[@port]>	listen for TCP on the IP and port\n");
-	printf("-t <serverip[@port]>	listen for TLS on IP and port\n");
-	printf("-x <server.key>		server key file for TLS service\n");
-	printf("-y <server.pem>		server cert file for TLS service\n");
-	printf("-z <verify.pem>		cert file to verify client connections\n");
-	printf("-l			long format for DNS printout\n");
-	printf("-v			more verbose log output\n");
-	printf("-c			internal unit test and exit\n");
-	printf("-h			this help text\n");
+	printf("-u <socketpath> listen to unix socket with this file name\n");
+	printf("-s <serverip[@port]> listen for TCP on the IP and port\n");
+	printf("-t <serverip[@port]> listen for TLS on IP and port\n");
+	printf("-x <server.key> server key file for TLS service\n");
+	printf("-y <server.pem> server cert file for TLS service\n");
+	printf("-z <verify.pem> cert file to verify client connections\n");
+	printf("-l 		long format for DNS printout\n");
+	printf("-v 		more verbose log output\n");
+	printf("-h 		this help text\n");
 	exit(1);
 }

@@ -103,14 +102,6 @@ struct main_tap_data {
 	struct tap_socket_list* acceptlist;
 };

-/* list of data */
-struct tap_data_list {
-	/** next in list */
-	struct tap_data_list* next;
-	/** the data */
-	struct tap_data* d;
-};
-
 /** tap callback variables */
 struct tap_data {
 	/** the fd */
@@ -137,10 +128,6 @@ struct tap_data {
 	uint8_t* frame;
 	/** length of this frame */
 	size_t len;
-	/** back pointer to the tap_data_list entry;
-	 * used to NULL the forward pointer to this data
-	 * when this data is freed. */
-	struct tap_data_list* data_list;
 };

 /** list of sockets */
@@ -169,82 +156,8 @@ struct tap_socket {
 	char* ip;
 	/** for a TLS socket, the tls context */
 	SSL_CTX* sslctx;
-	/** dumb way to deal with memory leaks:
-	 * tap_data was only freed on errors and not during exit leading to
-	 * false positives when testing for memory leaks. */
-	struct tap_data_list* data_list;
 };

-/** try to delete tail entries from the list if all of them have no data */
-static void tap_data_list_try_to_free_tail(struct tap_data_list* list)
-{
-	struct tap_data_list* current = list;
-	log_assert(!list->d);
-	if(!list->next) /* we are the last, we can't remove ourselves */
-		return;
-	list = list->next;
-	while(list) {
-		if(list->d) /* a tail entry still has data; return */
-			return;
-		list = list->next;
-	}
-	/* keep the next */
-	list = current->next;
-	/* the tail will be removed; but not ourselves */
-	current->next = NULL;
-	while(list) {
-		current = list;
-		list = list->next;
-		free(current);
-	}
-}
-
-/** delete the tap structure */
-static void tap_data_free(struct tap_data* data)
-{
-	ub_event_del(data->ev);
-	ub_event_free(data->ev);
-#ifdef HAVE_SSL
-	SSL_free(data->ssl);
-#endif
-	close(data->fd);
-	free(data->id);
-	free(data->frame);
-	data->data_list->d = NULL;
-	tap_data_list_try_to_free_tail(data->data_list);
-	free(data);
-}
-
-/** insert tap_data in the tap_data_list */
-static int tap_data_list_insert(struct tap_data_list** liststart,
-	struct tap_data* d)
-{
-	struct tap_data_list* entry = (struct tap_data_list*)
-		malloc(sizeof(*entry));
-	if(!entry)
-		return 0;
-	entry->next = *liststart;
-	entry->d = d;
-	d->data_list = entry;
-	*liststart = entry;
-	return 1;
-}
-
-/** delete the tap_data_list and free any remaining tap_data */
-static void tap_data_list_delete(struct tap_data_list* list)
-{
-	struct tap_data_list* e = list, *next;
-	while(e) {
-		next = e->next;
-		if(e->d) {
-			tap_data_free(e->d);
-			e->d = NULL;
-		}
-		free(e);
-		e = next;
-	}
-}
-
 /** del the tap event */
 static void tap_socket_delev(struct tap_socket* s)
 {
@@ -271,7 +184,6 @@ static void tap_socket_delete(struct tap_socket* s)
 #ifdef HAVE_SSL
 	SSL_CTX_free(s->sslctx);
 #endif
-	tap_data_list_delete(s->data_list);
 	ub_event_free(s->ev);
 	free(s->socketpath);
 	free(s->ip);
@@ -816,6 +728,20 @@ static ssize_t tap_receive(struct tap_data* data, void* buf, size_t len)
 	return receive_bytes(data, data->fd, buf, len);
 }

+/** delete the tap structure */
+static void tap_data_free(struct tap_data* data)
+{
+	ub_event_del(data->ev);
+	ub_event_free(data->ev);
+#ifdef HAVE_SSL
+	SSL_free(data->ssl);
+#endif
+	close(data->fd);
+	free(data->id);
+	free(data->frame);
+	free(data);
+}
+
 /** reply with ACCEPT control frame to bidirectional client,
 * returns 0 on error */
 static int reply_with_accept(struct tap_data* data)
@@ -916,11 +842,7 @@ static int tap_check_peer(struct tap_data* data)
 	if((SSL_get_verify_mode(data->ssl)&SSL_VERIFY_PEER)) {
 		/* verification */
 		if(SSL_get_verify_result(data->ssl) == X509_V_OK) {
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-			X509* x = SSL_get1_peer_certificate(data->ssl);
-#else
 			X509* x = SSL_get_peer_certificate(data->ssl);
-#endif
 			if(!x) {
 				if(verbosity) log_info("SSL connection %s"
 					" failed no certificate", data->id);
@@ -942,11 +864,7 @@ static int tap_check_peer(struct tap_data* data)
 #endif
 			X509_free(x);
 		} else {
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-			X509* x = SSL_get1_peer_certificate(data->ssl);
-#else
 			X509* x = SSL_get_peer_certificate(data->ssl);
-#endif
 			if(x) {
 				if(verbosity)
 					log_cert(VERB_ALGO, "peer certificate", x);
@@ -1128,6 +1046,7 @@ void dtio_tap_callback(int ATTR_UNUSED(fd), short ATTR_UNUSED(bits), void* arg)
 	data->len = 0;
 	data->len_done = 0;
 	data->data_done = 0;
+
 }

 /** callback for main listening file descriptor */
@@ -1210,8 +1129,6 @@ void dtio_mainfdcallback(int fd, short ATTR_UNUSED(bits), void* arg)
 		&dtio_tap_callback, data);
 	if(!data->ev) fatal_exit("could not ub_event_new");
 	if(ub_event_add(data->ev, NULL) != 0) fatal_exit("could not ub_event_add");
-	if(!tap_data_list_insert(&tap_sock->data_list, data))
-		fatal_exit("could not tap_data_list_insert");
 }

 /** setup local accept sockets */
@@ -1326,79 +1243,6 @@ setup_and_run(struct config_strlist_head* local_list,
 	free(maindata);
 }

-/* internal unit tests */
-static int internal_unittest()
-{
-	/* unit test tap_data_list_try_to_free_tail() */
-#define unit_tap_datas_max 5
-	struct tap_data* datas[unit_tap_datas_max];
-	struct tap_data_list* list;
-	struct tap_socket* socket = calloc(1, sizeof(*socket));
-	size_t i = 0;
-	log_assert(socket);
-	log_assert(unit_tap_datas_max>2); /* needed for the test */
-	for(i=0; i<unit_tap_datas_max; i++) {
-		datas[i] = calloc(1, sizeof(struct tap_data));
-		log_assert(datas[i]);
-		log_assert(tap_data_list_insert(&socket->data_list, datas[i]));
-	}
-	/* sanity base check */
-	list = socket->data_list;
-	for(i=0; list; i++) list = list->next;
-	log_assert(i==unit_tap_datas_max);
-
-	/* Free the last data, tail cannot be erased */
-	list = socket->data_list;
-	while(list->next) list = list->next;
-	free(list->d);
-	list->d = NULL;
-	tap_data_list_try_to_free_tail(list);
-	list = socket->data_list;
-	for(i=0; list; i++) list = list->next;
-	log_assert(i==unit_tap_datas_max);
-
-	/* Free the third to last data, tail cannot be erased */
-	list = socket->data_list;
-	for(i=0; i<unit_tap_datas_max-3; i++) list = list->next;
-	free(list->d);
-	list->d = NULL;
-	tap_data_list_try_to_free_tail(list);
-	list = socket->data_list;
-	for(i=0; list; i++) list = list->next;
-	log_assert(i==unit_tap_datas_max);
-
-	/* Free the second to last data, try to remove tail from the third
-	 * again, tail (last 2) should be removed */
-	list = socket->data_list;
-	for(i=0; i<unit_tap_datas_max-2; i++) list = list->next;
-	free(list->d);
-	list->d = NULL;
-	list = socket->data_list;
-	while(list->d) list = list->next;
-	tap_data_list_try_to_free_tail(list);
-	list = socket->data_list;
-	for(i=0; list; i++) list = list->next;
-	log_assert(i==unit_tap_datas_max-2);
-
-	/* Free all the remaining data, try to remove tail from the start,
-	 * only the start should remain */
-	list = socket->data_list;
-	while(list) {
-		free(list->d);
-		list->d = NULL;
-		list = list->next;
-	}
-	tap_data_list_try_to_free_tail(socket->data_list);
-	list = socket->data_list;
-	for(i=0; list; i++) list = list->next;
-	log_assert(i==1);
-
-	/* clean up */
-	tap_data_list_delete(socket->data_list);
-	free(socket);
-	return 0;
-}
-
 /** getopt global, in case header files fail to declare it. */
 extern int optind;
 /** getopt global, in case header files fail to declare it. */
@@ -1449,7 +1293,7 @@ int main(int argc, char** argv)
 #endif

 	/* command line options */
-	while( (c=getopt(argc, argv, "hcls:t:u:vx:y:z:")) != -1) {
+	while( (c=getopt(argc, argv, "hls:t:u:vx:y:z:")) != -1) {
 		switch(c) {
 			case 'u':
 				if(!cfg_strlist_append(&local_list,
@@ -1485,12 +1329,6 @@ int main(int argc, char** argv)
 			case 'v':
 				verbosity++;
 				break;
-			case 'c':
-#ifndef UNBOUND_DEBUG
-				fatal_exit("-c option needs compilation with "
-					"--enable-debug");
-#endif
-				return internal_unittest();
 			case 'h':
 			case '?':
 			default:
@@ -1,387 +1,15 @@
-19 July 2024: Wouter
-	- Add dnstap-sample-rate that logs only 1/N messages, for high volume
-	  server environments. Thanks Dan Luther.
-	- Fix dnstap wakeup, a running wakeup timer is left to expire and not
-	  increased, a timer is started when the dtio thread is sleeping,
-	  the timer set disabled when the dtio thread goes to sleep, and
-	  after sleep the thread checks to see if there are messages to log
-	  immediately.
-
-16 July 2024: Wouter
-	- For #1103: Fix to drop mesh state reference for the http2 stream
-	  associated with the reply, not the currently active stream. And
-	  it does not remove it twice on a mesh_send_reply call. The reply
-	  h2_stream is NULL when not in use, for more initialisation.
-
-15 July 2024: Wouter
-	- For #1103: fix to also drop mesh state reference when the discard
-	  limit is reached, when there is an error making a new recursion
-	  state and when the connection is dropped with is_drop.
-
-12 July 2024: Yorgos
-	- Add RPZ tag tests in acl_interface.tdir.
-	- For #1102: clearer text for using interface-* options for the
-	  loopback interface.
-
-12 July 2024: Wouter
-	- Fix #1103: unbound 1.20.0 segmentation fault with nghttp2.
-	- For #1103: fix to also drop mesh state reference when a h2 reply is
-	  dropped.
-
-10 July 2024: Wouter
-	- For #773: In contrib/unbound.service.in set unbound to start after
-	  network-online.target. Also for contrib/unbound_portable.service.in.
-
-9 July 2024: Yorgos
-	- Update list of known EDE codes.
-
-8 July 2024: Wouter
-	- Fix that validation reason failure that uses string print uses
-	  separate buffer that is passed, from the scratch validation buffer.
-	- Fixup algo_needs_reason string buffer length.
-	- Fix shadowed error string variable in validator dnskey handling.
-
-5 July 2024: Yorgos
-	- Don't check for message TTL changes if the RRsets remain the same.
-
-5 July 2024: Wouter
-	- Fix for neater printout for error for missing DS response.
-	- Fix neater printout.
-	- Fix #1099: Unbound core dump on SIGSEGV.
-	- Fix for #1099: Fix to check for deleted RRset when the contents
-	  is updated and fetched after it is stored, and also check for a
-	  changed RRset.
-
-4 July 2024: Wouter
-	- Fix to print details about the failure to lookup a DNSKEY record
-	  when validation fails due to the missing DNSKEY. Also for key prime
-	  and DS lookups.
-
-3 July 2024: Yorgos
-	- Fix for repeated use of a DNAME record: first overallocate and then
-	  move the exact size of the init value to avoid false positive heap
-	  overflow reads from address sanitizers.
-
-3 July 2024: Wouter
-	- Fix #144: Port ipset to BSD pf tables.
-	- Add unit test skip files and bison and flex output to gitignore.
-	- Fix to use modstack_init in zonemd unit test.
-	- Fix to remove unneeded linebreak in fptr_wlist.c.
-	- Fix compile warnings in fptr_wlist.c.
-
-2 July 2024: Wouter
-	- Fix to remove unused include from the readzone test program.
-	- Fix unused variable warning in do_cache_remove.
-	- Fix compile warning in worker pthread id printout.
-
-17 June 2024: Wouter
-	- Fix ip-ratelimit-cookie setting, it was not applied.
-
-26 June 2024: Yorgos
-	- Explicitly set the RD bit for the mesh query flags when prefetching.
-	  These queries have no waiting client but they need to be treated as
-	  recursive.
-
-21 June 2024: Yorgos
-	- Fix pkg-config availability check in dnstap/dnstap.m4 and
-	  systemd.m4.
-
-19 June 2024: Yorgos
-	- Fix #1092: Ubuntu 22.04 Jammy fails to compile unbound 1.20.0; by
-	  adding helpful text for the Python interpreter version and allowing
-	  the default pkg-config unavailability error message to be shown.
-
-17 June 2024: Wouter
-	- Fix #1091: Build fails with OpenSSL >= 3.0 built with
-	  OPENSSL_NO_DEPRECATED.
-
-7 June 2024: Wouter
-	- Add unit test for validation of repeated use of a DNAME record.
-
-6 June 2024: Wouter
-	- Fix memory leak in setup of dsa sig.
-	- Fix typos for 'the the' in text.
-	- Fix validation for repeated use of a DNAME record.
-
-4 June 2024: Yorgos
-	- Merge #1080: AddressSanitizer detection in tdir tests and memory leak
-	  fixes.
-	- Fix memory leak when reload_keep_cache is used and num-threads
-	  changes.
-	- Fix memory leak on exit for unbound-dnstap-socket; creates false
-	  negatives during testing.
-
-3 June 2024: Wouter
-	- Fix to squelch connection reset by peer errors from log. And fix
-	  that the tcp read errors are labeled as initial for the first calls.
-
-30 May 2024: Wouter
-	- Fix #1079: tags from tagged rpz zones are no longer honored after
-	  upgrade from 1.19.3 to 1.20.0.
-	- Fix for #1079: fix RPZ taglist in iterator callback that no client
-	  info is like no taglist intersection.
-
-29 May 2024: Wouter
-	- Merge #1078: Only check old pid if no username.
-
-27 May 2024: Wouter
-	- Fix to enable that SERVFAIL is cached, for a short period, for more
-	  cases. In the cases where limits are exceeded.
-	- Fix spelling of tcp-idle-timeout docs, from Michael Tokarev.
-
-27 May 2024: Yorgos
-	- Fix unused variable warning on compilation with no thread support.
-	- unbound-control-setup: check openssl availability before doing
-	  anything, patch from Michael Tokarev.
-	- Update patch to remove 'command' shell builtin and update error
-	  text.
-
-24 May 2024: Wouter
-	- Fix #1064: Unbound 1.20 Cachedb broken?
-
-24 May 2024: Yorgos
-	- Fix #1059: Intermittent DNS blocking failure with local-zone and
-	  always_nxdomain. Addition of local_zones dynamically via
-	  unbound-control was not finding the zone's parent correctly.
-
-21 May 2024: Wouter
-	- Merge #1073: fix null pointer dereference issue in function
-	  ub_ctx_set_fwd.
-	- Fix to print a parse error when config is read with no name for
-	  a forward-zone, stub-zone or view.
-	- Fix for parse end of forward-zone, stub-zone and view.
-	- Fix for #1064: Fix that cachedb expired messages are considered
-	  insecure, and thus can be served to clients when dnssec is enabled.
-
-17 May 2024: Yorgos
-	- Merge #1069: Fix unbound-control stdin commands for multi-process
-	  Unbounds.
-	- Fix unbound-control commands that read stdin in multi-process
-	  operation (local_zones_remove, local_zones, local_datas_remove,
-	  local_datas, view_local_datas_remove, view_local_datas). They will
-	  be properly distributed to all processes. dump_cache and load_cache
-	  are no longer supported in multi-process operation.
-	- Remove testdata/remote-threaded.tdir. testdata/09-unbound-control.tdir
-	  now checks both single and multi process/thread operation.
-
-16 May 2024: Yorgos
-	- Merge #1070: Fix rtt assignement for low values of
-	  infra-cache-max-rtt.
-
-16 May 2024: Wouter
-	- Fix #1071: [FR] Clear both in-memory and cachedb module cache with
-	  `unbound-control flush*` commands.
-
-15 May 2024: Yorgos
-	- Add missing common functions to tdir tests.
-
-10 May 2024: Wouter
-	- Fix when the mesh jostle is exceeded that nameserver targets are
-	  marked as resolved, so that the lookup is not stuck on the
-	  requestlist.
-
-8 May 2024: Wouter
-	- Fix to squelch udp connect errors in the log at low verbosity about
-	  invalid argument for IPv6 link local addresses.
-
-7 May 2024: Wouter
-	- Merge #1062: Fix potential overflow bug while parsing port in
-	  function cfg_mark_ports.
-	- Fix for #1062: declaration before statement, avoid print of null,
-	  and redundant check for array size.
-
-1 May 2024: Wouter
-	- Fix for the DNSBomb vulnerability CVE-2024-33655. Thanks to Xiang Li
-	  from the Network and Information Security Lab of Tsinghua University
-	  for reporting it.
-	- Set version number to 1.20.0 for release. This became the release
-	  on 8 may 2024, the repository continues with version 1.20.1.
-
-29 April 2024: Yorgos
-	- Cleanup unnecessary strdup calls for EDE strings.
-
-29 April 2024: Wouter
-	- Fix doxygen comment for errinf_to_str_bogus.
-
-26 April 2024: Wouter
-	- Fix cachedb with serve-expired-client-timeout disabled. The edns
-	  subnet module deletes global cache and cachedb cache when it
-	  stores a result, and serve-expired is enabled, so that the global
-	  reply, that is older than the ecs reply, does not return after
-	  the ecs reply expires.
-	- Add unit tests for cachedb and subnet cache expired data.
-	- Man page entry for unbound-checkconf -q.
-
-26 April 2024: Yorgos
-	- Fix #876: [FR] can unbound-checkconf be silenced when configuration
-	  is valid?
-
-25 April 2024: Wouter
-	- Fix configure flto check error, by finding grep for it.
-	- Merge #1041: Stub and Forward unshare. This has one structure
-	  for them and fixes #1038: fatal error: Could not initialize
-	  thread / error: reading root hints.
-	- Fix to disable fragmentation on systems with IP_DONTFRAG,
-	  with a nonzero value for the socket option argument.
-	- Fix doc unit test for out of directory build.
-
-24 April 2024: Wouter
-	- Fix ci workflow for macos for moved install locations.
-
-23 April 2024: Yorgos
-	- Merge #1053: Remove child delegations from cache when grandchild
-	  delegations are returned from parent.
-
-22 April 2024: Wouter
-	- Add checklock feature verbose_locking to trace locks and unlocks.
-	- Fix edns subnet to sort rrset references when storing messages
-	  in the cache. This fixes a race condition in the rrset locks.
-
-15 April 2024: Wouter
-	- Fix #1048: Update ax_pkg_swig.m4 and ax_pthread.m4.
-	- Fix configure, autoconf for #1048.
-
-15 April 2024: Yorgos
-	- Merge #1049 from Petr Menšík: Py_NoSiteFlag is not needed since
-	  Python 3.8
-
-12 April 2024: Wouter
-	- Fix cachedb for serve-expired with serve-expired-client-timeout.
-	- Fixup unit test for cachedb server expired client timeout with
-	  a check if response if from upstream or from cachedb.
-	- Fixup cachedb to not refetch when serve-expired-client-timeout is
-	  used.
-
-10 April 2024: Wouter
-	- Implement cachedb-check-when-serve-expired: yes option, default
-	  is enabled. When serve expired is enabled with cachedb, it first
-	  checks cachedb before serving the expired response.
-	- Fixup compile without cachedb.
-	- Add test for cachedb serve expired.
-	- Extended test for cachedb serve expired.
-	- Fix makefile dependencies for fake_event.c.
-	- Fix cachedb for serve-expired with serve-expired-reply-ttl.
-	- Fix to not reply serve expired unless enabled for cachedb.
-
-9 April 2024: Yorgos
-	- Merge #1043 from xiaoxiaoafeifei: Add loongarch support; updates
-	  config.guess(2024-01-01) and config.sub(2024-01-01), verified
-	  with upstream.
-
-8 April 2024: Yorgos
-	- Fix #595: unbound-anchor cannot deal with full disk; it will now
-	  first write out to a temp file before replacing the original one,
-	  like Unbound already does for auto-trust-anchor-file.
-
-5 April 2024: Wouter
-	- Fix comment syntax for view function views_find_view.
-
-5 April 2024: Yorgos
-	- Merge #1027: Introduce 'cache-min-negative-ttl' option.
-
-3 April 2024: Wouter
-	- Fix #1040: fix heap-buffer-overflow issue in function cfg_mark_ports
-	  of file util/config_file.c.
-	- For #1040: adjust error text and disallow negative ports in other
-	  parts of cfg_mark_ports.
-
-3 April 2024: Yorgos
-	- Fix #1035: Potential Bug while parsing port from the "stub-host"
-	  string; also affected forward-zones and remote-control host
-	  directives.
-	- Fix #369: dnstap showing extra responses; for client responses
-	  right from the cache when replying with expired data or
-	  prefetching.
-
-28 March 2024: Wouter
-	- Fix #1034: DoT forward-zone via unbound-control.
-	- Fix for crypto related failures to have a better error string.
-
-27 March 2024: Wouter
-	- Fix name of unit test for subnet cache response.
-	- Fix #1032: The size of subnet_msg_cache calculation mistake cause
-	  memory usage increased beyond expectations.
-	- Fix for #1032, add safeguard to make table space positive.
-	- Fix comment in lruhash space function.
-	- Fix to add unit test for lruhash space that exercises the routines.
-	- Fix that when the server truncates the pidfile, it does not follow
-	  symbolic links.
-	- Fix that the server does not chown the pidfile.
-
-25 March 2024: Yorgos
-	- Merge #831 from Pierre4012: Improve Windows NSIS installer
-	  script (setup.nsi).
-	- For #831: Format text, use exclamation icon and explicit label
-	  names.
-
-19 March 2024: Wouter
-	- Fix rpz so that rpz CNAME can apply after rpz CNAME. And fix that
-	  clientip and nsip can give a CNAME.
-	- Fix localdata and rpz localdata to match CNAME only if no direct
-	  type match is available.
-
-18 March 2024: Wouter
-	- Fix that rpz CNAME content is limited to the max number of cnames.
-	- Fix rpz, it follows iterator CNAMEs for nsip and nsdname and sets
-	  the reply query_info values, that is better for debug logging.
-	- Fix rpz that copies the cname override completely to the temp
-	  region, so there are no references to the rpz region.
-	- Add rpz unit test for nsip action override.
-	- Fix rpz for qtype CNAME after nameserver trigger.
-
-15 March 2024: Yorgos
-	- Merge #1030: Persist the openssl and expat directories for repeated
-	  Windows builds.
-
-15 March 2024: Wouter
-	- Fix that addrinfo is not kept around but copied and freed, so that
-	  log-destaddr uses a copy of the information, much like NSD does.
-
-13 March 2024: Wouter
-	- Fix #1029: rpz trigger clientip and action rpz-passthru not working
-	  as expected.
-	- Fix rpz that the rpz override is taken in case of clientip triggers.
-	  Fix that the clientip passthru action is logged. Fix that the
-	  clientip localdata action is logged. Fix rpz override action cname
-	  for the clientip trigger.
-	- Fix to unify codepath for local alias for rpz cname action override.
-	- Fix rpz for cname override action after nsdname and nsip triggers.
-
-12 March 2024: Yorgos
-	- Merge #1028: Clearer documentation for tcp-idle-timeout and
-	  edns-tcp-keepalive-timeout.
-
-11 March 2024: Wouter
-	- Fix #1021 Inconsistent Behavior with Changing rpz-cname-override
-	  and doing a unbound-control reload.
-
 8 March 2024: Wouter
 	- Fix unbound-control-setup.cmd to use 3072 bits so that certificates
-	  are long enough for newer OpenSSL versions. This fix is included
-	  in 1.19.3rc2.
-	- Fix TTL of synthesized CNAME when a DNAME is used from cache. This
-	  fix is included in 1.19.3rc2.
-	- Remove unused portion from iter_dname_ttl unit test.
-	- Fix validator classification of qtype DNAME for positive and
-	  redirection answers, and fix validator signature routine for dealing
-	  with the synthesized CNAME for a DNAME without previously
-	  encountering it and also for when the qtype is DNAME.
-	- Fix qname minimisation for reply with a DNAME for qtype CNAME that
-	  answers it.
-	- Fix doc test so it ignores but outputs unsupported doxygen options.
+	  are long enough for newer OpenSSL versions.
+	- Fix TTL of synthesized CNAME when a DNAME is used from cache.
 	- Fix unbound-control-setup.cmd to have CA v3 basicConstraints,
-	  like unbound-control-setup.sh has. This fix is included in 1.19.3rc2.
-
-8 March 2024: Yorgos
-	- Update doc/unbound.doxygen with 'doxygen -u'. Fixes option
-	  deprecation warnings and updates with newer defaults.
+	  like unbound-control-setup.sh has.

 7 March 2024: Wouter
 	- Version set to 1.19.3 for release. After 1.19.2 point release with
 	  security fix for CVE-2024-1931, Denial of service when trimming
 	  EDE text on positive replies. The code repo includes the fix and
-	  is for version 1.19.3. The code repo continues for version 1.19.4,
-	  but 1.19.3 includes the fixes in 1.19.3rc2 as well.
+	  is for version 1.19.3.

 5 March 2024: Wouter
 	- Fix for #1022: Fix ede prohibited in access control refused answers.
@@ -191,21 +191,6 @@ server:
 	# are behind a slow satellite link, to eg. 1128.
 	# unknown-server-time-limit: 376

-	# msec before recursion replies are dropped. The work item continues.
-	# discard-timeout: 1900
-
-	# Max number of replies waiting for recursion per IP address.
-	# wait-limit: 1000
-
-	# Max replies waiting for recursion for IP address with cookie.
-	# wait-limit-cookie: 10000
-
-	# Apart from the default, the wait limit can be set for a netblock.
-	# wait-limit-netblock: 192.0.2.0/24 50000
-
-	# Apart from the default, the wait limit with cookie can be adjusted.
-	# wait-limit-cookie-netblock: 192.0.2.0/24 50000
-
 	# the amount of memory to use for the RRset cache.
 	# plain value in bytes or you can append k, m or G. default is "4Mb".
 	# rrset-cache-size: 4m
@@ -226,11 +211,6 @@ server:
 	# the time to live (TTL) value cap for negative responses in the cache
 	# cache-max-negative-ttl: 3600

-	# the time to live (TTL) value lower bound, in seconds. Default 0.
-	# For negative responses in the cache. If disabled, default,
-	# cache-min-tll applies if configured.
-	# cache-min-negative-ttl: 0
-
 	# the time to live (TTL) value for cached roundtrip times, lameness and
 	# EDNS version information for hosts. In seconds.
 	# infra-host-ttl: 900
@@ -303,8 +283,7 @@ server:
 	# Enable EDNS TCP keepalive option.
 	# edns-tcp-keepalive: no

-	# Timeout for EDNS TCP keepalive, in msec. Overrides tcp-idle-timeout
-	# if edns-tcp-keepalive is set.
+	# Timeout for EDNS TCP keepalive, in msec.
 	# edns-tcp-keepalive-timeout: 120000

 	# UDP queries that have waited in the socket buffer for a long time
@@ -1268,9 +1247,6 @@ remote-control:
 #     secret-seed: "default"
 #     # if the backend should be read from, but not written to.
 #     cachedb-no-store: no
-#     # if the cachedb should be checked before a serve-expired response is
-#     # given, when serve-expired is enabled.
-#     cachedb-check-when-serve-expired: yes
 #
 #     # For "redis" backend:
 #     # (to enable, use --with-libhiredis to configure before compiling)
@@ -1329,8 +1305,6 @@ remote-control:
 # 	dnstap-identity: ""
 # 	# if "" it uses the package version.
 # 	dnstap-version: ""
-# 	# log only 1/N messages, if 0 it is disabled. default 0.
-# 	dnstap-sample-rate: 0
 # 	dnstap-log-resolver-query-messages: no
 # 	dnstap-log-resolver-response-messages: no
 # 	dnstap-log-client-query-messages: no
@@ -14,7 +14,6 @@ unbound\-checkconf
 .B unbound\-checkconf
 .RB [ \-h ]
 .RB [ \-f ]
-.RB [ \-q ]
 .RB [ \-o
 .IR option ]
 .RI [ cfgfile ]
@@ -38,9 +37,6 @@ Print full pathname, with chroot applied to it.  Use with the \-o option.
 If given, after checking the config file the value of this option is
 printed to stdout.  For "" (disabled) options an empty line is printed.
 .TP
-.B \-q
-Make the operation quiet, suppress output on success.
-.TP
 .I cfgfile
 The config file to read with settings for Unbound. It is checked.
 If omitted, the config file at the default location is checked.
@@ -121,38 +121,31 @@ Remove local data RRs read from stdin of unbound\-control. Input is one name per
 line. For bulk removals.
 .TP
 .B dump_cache
-The content of the cache is printed in a text format to stdout.
-You can redirect it to a file to store the cache in a file.
-Not supported in remote Unbounds in multi-process operation.
+The contents of the cache is printed in a text format to stdout. You can
+redirect it to a file to store the cache in a file.
 .TP
 .B load_cache
-The content of the cache is loaded from stdin.
-Uses the same format as dump_cache uses.
-Loading the cache with old, or wrong data can result in old or wrong data
-returned to clients.
-Loading data into the cache in this way is supported in order to aid with
-debugging.
-Not supported in remote Unbounds in multi-process operation.
+The contents of the cache is loaded from stdin.  Uses the same format as
+dump_cache uses.  Loading the cache with old, or wrong data can result
+in old or wrong data returned to clients.  Loading data into the cache
+in this way is supported in order to aid with debugging.
 .TP
 .B lookup \fIname
 Print to stdout the name servers that would be used to look up the
 name specified.
 .TP
-.B flush \fR[\fI+c\fR] \fIname
+.B flush \fIname
 Remove the name from the cache. Removes the types
 A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV, NAPTR, SVCB and HTTPS.
 Because that is fast to do. Other record types can be removed using
 .B flush_type
 or
 .B flush_zone\fR.
-.IP
-The '+c' option removes the items also from the cachedb cache. If
-cachedb is in use.
 .TP
-.B flush_type \fR[\fI+c\fR] \fIname\fR \fItype
+.B flush_type \fIname\fR \fItype
 Remove the name, type information from the cache.
 .TP
-.B flush_zone \fR[\fI+c\fR] \fIname
+.B flush_zone \fIname
 Remove all information at or below the name from the cache.
 The rrsets and key entries are removed so that new lookups will be performed.
 This needs to walk and inspect the entire cache, and is a slow operation.
@@ -160,10 +153,10 @@ The entries are set to expired in the implementation of this command (so,
 with serve\-expired enabled, it'll serve that information but schedule a
 prefetch for new information).
 .TP
-.B flush_bogus \fR[\fI+c\fR]
+.B flush_bogus
 Remove all bogus data from the cache.
 .TP
-.B flush_negative \fR[\fI+c\fR]
+.B flush_negative
 Remove all negative data from the cache.  This is nxdomain answers,
 nodata answers and servfail answers.  Also removes bad key entries
 (which could be due to failed lookups) from the dnssec key cache, and
@@ -246,24 +239,22 @@ still be bogus, use \fBflush_zone\fR to remove it), does not affect the config f
 .B insecure_remove \fIzone
 Removes domain\-insecure for the given zone.
 .TP
-.B forward_add \fR[\fI+it\fR] \fIzone addr ...
+.B forward_add \fR[\fI+i\fR] \fIzone addr ...
 Add a new forward zone to running Unbound.  With +i option also adds a
 \fIdomain\-insecure\fR for the zone (so it can resolve insecurely if you have
 a DNSSEC root trust anchor configured for other names).
 The addr can be IP4, IP6 or nameserver names, like \fIforward-zone\fR config
 in unbound.conf.
-The +t option sets it to use tls upstream, like \fIforward\-tls\-upstream\fR: yes.
 .TP
 .B forward_remove \fR[\fI+i\fR] \fIzone
 Remove a forward zone from running Unbound.  The +i also removes a
 \fIdomain\-insecure\fR for the zone.
 .TP
-.B stub_add \fR[\fI+ipt\fR] \fIzone addr ...
+.B stub_add \fR[\fI+ip\fR] \fIzone addr ...
 Add a new stub zone to running Unbound.  With +i option also adds a
 \fIdomain\-insecure\fR for the zone.  With +p the stub zone is set to prime,
 without it it is set to notprime.  The addr can be IP4, IP6 or nameserver
 names, like the \fIstub-zone\fR config in unbound.conf.
-The +t option sets it to use tls upstream, like \fIstub\-tls\-upstream\fR: yes.
 .TP
 .B stub_remove \fR[\fI+i\fR] \fIzone
 Remove a stub zone from running Unbound.  The +i also removes a
@@ -302,36 +302,6 @@ Increase this if you are behind a slow satellite link, to eg. 1128.
 That would then avoid re\-querying every initial query because it times out.
 Default is 376 msec.
 .TP
-.B discard\-timeout: \fI<msec>
-The wait time in msec where recursion requests are dropped. This is
-to stop a large number of replies from accumulating. They receive
-no reply, the work item continues to recurse. It is nice to be a bit
-larger than serve\-expired\-client\-timeout if that is enabled.
-A value of 1900 msec is suggested. The value 0 disables it.
-Default 1900 msec.
-.TP
-.B wait\-limit: \fI<number>
-The number of replies that can wait for recursion, for an IP address.
-This makes a ratelimit per IP address of waiting replies for recursion.
-It stops very large amounts of queries waiting to be returned to one
-destination. The value 0 disables wait limits. Default is 1000.
-.TP
-.B wait\-limit\-cookie: \fI<number>
-The number of replies that can wait for recursion, for an IP address
-that sent the query with a valid DNS cookie. Since the cookie validates
-the client address, the limit can be higher. Default is 10000.
-.TP
-.B wait\-limit\-netblock: \fI<netblock> <number>
-The wait limit for the netblock. If not given the wait\-limit value is
-used. The most specific netblock is used to determine the limit. Useful for
-overriding the default for a specific, group or individual, server.
-The value -1 disables wait limits for the netblock.
-.TP
-.B wait\-limit\-cookie\-netblock: \fI<netblock> <number>
-The wait limit for the netblock, when the query has a DNS cookie.
-If not given, the wait\-limit\-cookie value is used.
-The value -1 disables wait limits for the netblock.
-.TP
 .B so\-rcvbuf: \fI<number>
 If not 0, then set the SO_RCVBUF socket option to get more buffer
 space on UDP port 53 incoming queries.  So that short spikes on busy
@@ -418,15 +388,6 @@ Time to live maximum for negative responses, these have a SOA in the
 authority section that is limited in time.  Default is 3600.
 This applies to nxdomain and nodata answers.
 .TP
-.B cache\-min\-negative\-ttl: \fI<seconds>
-Time to live minimum for negative responses, these have a SOA in the
-authority section that is limited in time.
-Default is 0 (disabled).
-If this is disabled and \fBcache-min-ttl\fR is configured, it will take effect
-instead.
-In that case you can set this to 1 to honor the upstream TTL.
-This applies to nxdomain and nodata answers.
-.TP
 .B infra\-host\-ttl: \fI<seconds>
 Time to live for entries in the host cache. The host cache contains
 roundtrip timing, lameness and EDNS support information. Default is 900.
@@ -511,8 +472,6 @@ configured value if the number of free buffers falls below 35% of the
 total number configured, and finally to 0 if the number of free buffers
 falls below 20% of the total number configured. A minimum timeout of
 200 milliseconds is observed regardless of the option value used.
-It will be overridden by \fBedns\-tcp\-keepalive\-timeout\fR if
-\fBedns\-tcp\-keepalive\fR is enabled.
 .TP
 .B tcp-reuse-timeout: \fI<msec>\fR
 The period Unbound will keep TCP persistent connections open to
@@ -531,11 +490,20 @@ This option defaults to 3000 milliseconds.
 Enable or disable EDNS TCP Keepalive. Default is no.
 .TP
 .B edns-tcp-keepalive-timeout: \fI<msec>\fR
-Overrides \fBtcp\-idle\-timeout\fR when \fBedns\-tcp\-keepalive\fR is enabled.
-If the client supports the EDNS TCP Keepalive option,
+The period Unbound will wait for a query on a TCP connection when
+EDNS TCP Keepalive is active. If this timeout expires Unbound closes
+the connection. If the client supports the EDNS TCP Keepalive option,
 Unbound sends the timeout value to the client to encourage it to
 close the connection before the server times out.
 This option defaults to 120000 milliseconds.
+When the number of free incoming TCP buffers falls below 50% of
+the total number configured, the advertised timeout is progressively
+reduced to 1% of the configured value, then to 0.2% of the configured
+value if the number of free buffers falls below 35% of the total number
+configured, and finally to 0 if the number of free buffers falls below
+20% of the total number configured.
+A minimum actual timeout of 200 milliseconds is observed regardless of the
+advertised timeout.
 .TP
 .B sock\-queue\-timeout: \fI<sec>\fR
 UDP queries that have waited in the socket buffer for a long time can be
@@ -788,8 +756,7 @@ transports, regardless of the presence of an DNS Cookie and regardless of the
 UDP queries without a DNS Cookie receive REFUSED responses with the TC flag set,
 that may trigger fall back to TCP for those clients.
 .IP
-By default only localhost (the 127.0.0.0/8 IP netblock, not the loopback
-interface) is implicitly \fIallow\fRed, the rest is \fIrefuse\fRd.
+By default only localhost is \fIallow\fRed, the rest is \fIrefuse\fRd.
 The default is \fIrefuse\fRd, because that is protocol\-friendly. The DNS
 protocol is not designed to handle dropped packets due to policy, and
 dropping may result in (possibly excessive) retried queries.
@@ -825,12 +792,8 @@ Similar to \fBaccess\-control:\fR but for interfaces.
 .IP
 The action is the same as the ones defined under \fBaccess\-control:\fR.
 Interfaces are \fIrefuse\fRd by default.
-By default only localhost (the 127.0.0.0/8 IP netblock, not the loopback
-interface) is implicitly \fIallow\fRed through the default
-\fBaccess\-control:\fR behavior.
-This also means that any attempt to use the \fBinterface-*:\fR options for the
-loopback interface will not work as they will be overridden by the implicit
-default "\fBaccess\-control:\fR 127.0.0.0/8 allow" option.
+By default only localhost (the IP netblock, not the loopback interface) is
+\fIallow\fRed through the default \fBaccess\-control:\fR behavior.
 .IP
 Note that the interface needs to be already specified with \fBinterface:\fR
 and that any \fBaccess-control*:\fR setting overrides all \fBinterface-*:\fR
@@ -2675,7 +2638,11 @@ If Unbound cannot even find an answer in the backend, it resolves the
 query as usual, and stores the answer in the backend.
 .P
 This module interacts with the \fBserve\-expired\-*\fR options and will reply
-with expired data if Unbound is configured for that.
+with expired data if Unbound is configured for that.  Currently the use
+of \fBserve\-expired\-client\-timeout:\fR and
+\fBserve\-expired\-reply\-ttl:\fR is not consistent for data originating from
+the external cache as these will result in a reply with 0 TTL without trying to
+update the data first, ignoring the configured values.
 .P
 If Unbound was built with
 \fB\-\-with\-libhiredis\fR
@@ -2731,16 +2698,6 @@ This option defaults to "default".
 If the backend should be read from, but not written to. This makes this
 instance not store dns messages in the backend. But if data is available it
 is retrieved. The default is no.
-.TP
-.B cachedb-check-when-serve-expired: \fI<yes or no>\fR
-If enabled, the cachedb is checked before an expired response is returned.
-When \fBserve\-expired\fR is enabled, without \fBserve\-expired\-client\-timeout\fR, it then
-does not immediately respond with an expired response from cache, but instead
-first checks the cachedb for valid contents, and if so returns it. If the
-cachedb also has no valid contents, the serve expired response is sent.
-If also \fBserve\-expired\-client\-timeout\fR is enabled, the expired response
-is delayed until the timeout expires. Unless the lookup succeeds within the
-timeout. The default is yes.
 .P
 The following
 .B cachedb
@@ -2852,13 +2809,6 @@ Default is "".
 The version to send with messages, if "" the package version is used.
 Default is "".
 .TP
-.B dnstap-sample-rate: \fI<number>
-The sample rate for log of messages, it logs only 1/N messages. With 0 it
-is disabled. Default is 0. This is useful in a high volume environment,
-where log functionality would otherwise not be reliable. For example 10
-would spend only 1/10th time on logging, and 100 would only spend a
-hundredth of the time on logging.
-.TP
 .B dnstap-log-resolver-query-messages: \fI<yes or no>
 Enable to log resolver query messages.  Default is no.
 These are messages from Unbound to upstream servers.
@@ -297,8 +297,8 @@ inplace_cb_delete_wrapped(struct module_env* env, enum inplace_cb_list_type type
 */
 static struct module_func_block dynlibmod_block = {
   "dynlib",
-   NULL, NULL, &dynlibmod_init, &dynlibmod_deinit, &dynlibmod_operate,
-   &dynlibmod_inform_super, &dynlibmod_clear, &dynlibmod_get_mem
+   &dynlibmod_init, &dynlibmod_deinit, &dynlibmod_operate, &dynlibmod_inform_super,
+   &dynlibmod_clear, &dynlibmod_get_mem
 };

 struct module_func_block* dynlibmod_get_funcblock(void)
@@ -57,9 +57,6 @@
 #include "sldns/sbuffer.h"
 #include "sldns/wire2str.h"
 #include "iterator/iter_utils.h"
-#ifdef USE_CACHEDB
-#include "cachedb/cachedb.h"
-#endif

 /** externally called */
 void 
@@ -155,7 +152,7 @@ int ecs_whitelist_check(struct query_info* qinfo,

 	/* Cache by default, might be disabled after parsing EDNS option
 	 * received from nameserver. */
-	if(!iter_stub_fwd_no_cache(qstate, &qstate->qinfo, NULL, NULL, NULL, 0)) {
+	if(!iter_stub_fwd_no_cache(qstate, &qstate->qinfo, NULL, NULL)) {
 		qstate->no_cache_store = 0;
 	}

@@ -313,18 +310,9 @@ delfunc(void *envptr, void *elemptr) {
 static size_t
 sizefunc(void *elemptr) {
 	struct reply_info *elem  = (struct reply_info *)elemptr;
-	size_t s = sizeof (struct reply_info) - sizeof (struct rrset_ref)
+	return sizeof (struct reply_info) - sizeof (struct rrset_ref)
 		+ elem->rrset_count * sizeof (struct rrset_ref)
 		+ elem->rrset_count * sizeof (struct ub_packed_rrset_key *);
-	size_t i;
-	for (i = 0; i < elem->rrset_count; i++) {
-		struct ub_packed_rrset_key *key = elem->rrsets[i];
-		struct packed_rrset_data *data = key->entry.data;
-		s += ub_rrset_sizefunc(key, data);
-	}
-	if(elem->reason_bogus_str)
-		s += strlen(elem->reason_bogus_str)+1;
-	return s;
 }

 /**
@@ -364,7 +352,7 @@ update_cache(struct module_qstate *qstate, int id)
 	struct slabhash *subnet_msg_cache = sne->subnet_msg_cache;
 	struct ecs_data *edns = &sq->ecs_client_in;
 	size_t i;
-	int only_match_scope_zero, diff_size;
+	int only_match_scope_zero;

 	/* We already calculated hash upon lookup (lookup_and_reply) if we were
 	 * allowed to look in the ECS cache */
@@ -424,25 +412,19 @@ update_cache(struct module_qstate *qstate, int id)
 		rep->ref[i].id = rep->rrsets[i]->id;
 	}
 	reply_info_set_ttls(rep, *qstate->env->now);
-	reply_info_sortref(rep);
 	rep->flags |= (BIT_RA | BIT_QR); /* fix flags to be sensible for */
 	rep->flags &= ~(BIT_AA | BIT_CD);/* a reply based on the cache   */
 	if(edns->subnet_source_mask == 0 && edns->subnet_scope_mask == 0)
 		only_match_scope_zero = 1;
 	else only_match_scope_zero = 0;
-	diff_size = (int)tree->size_bytes;
 	addrtree_insert(tree, (addrkey_t*)edns->subnet_addr, 
 		edns->subnet_source_mask, sq->max_scope, rep,
 		rep->ttl, *qstate->env->now, only_match_scope_zero);
-	diff_size = (int)tree->size_bytes - diff_size;

 	lock_rw_unlock(&lru_entry->lock);
 	if (need_to_insert) {
 		slabhash_insert(subnet_msg_cache, h, lru_entry, lru_entry->data,
 			NULL);
-	} else {
-		slabhash_update_space_used(subnet_msg_cache, h, NULL,
-			diff_size);
 	}
 }

@@ -605,21 +587,7 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq)
 	}
 	sne->num_msg_nocache++;
 	lock_rw_unlock(&sne->biglock);
-
-	/* If there is an expired answer in the global cache, remove that,
-	 * because expired answers would otherwise resurface once the ecs data
-	 * expires, giving once in a while global data responses for ecs
-	 * domains, with serve expired enabled. */
-	if(qstate->env->cfg->serve_expired) {
-		msg_cache_remove(qstate->env, qstate->qinfo.qname,
-			qstate->qinfo.qname_len, qstate->qinfo.qtype,
-			qstate->qinfo.qclass, 0);
-#ifdef USE_CACHEDB
-		if(qstate->env->cachedb_enabled)
-			cachedb_msg_remove(qstate);
-#endif
-	}
-
+	
 	if (sq->subnet_downstream) {
 		/* Client wants to see the answer, echo option back
 		 * and adjust the scope. */
@@ -995,8 +963,7 @@ subnetmod_get_mem(struct module_env *env, int id)
 * The module function block 
 */
 static struct module_func_block subnetmod_block = {
-	"subnetcache",
-	NULL, NULL, &subnetmod_init, &subnetmod_deinit, &subnetmod_operate,
+	"subnetcache", &subnetmod_init, &subnetmod_deinit, &subnetmod_operate,
 	&subnetmod_inform_super, &subnetmod_clear, &subnetmod_get_mem
 };

@@ -615,7 +615,7 @@ ipsecmod_get_mem(struct module_env* env, int id)
 */
 static struct module_func_block ipsecmod_block = {
 	"ipsecmod",
-	NULL, NULL, &ipsecmod_init, &ipsecmod_deinit, &ipsecmod_operate,
+	&ipsecmod_init, &ipsecmod_deinit, &ipsecmod_operate,
 	&ipsecmod_inform_super, &ipsecmod_clear, &ipsecmod_get_mem
 };

@@ -17,19 +17,9 @@
 #include "sldns/wire2str.h"
 #include "sldns/parseutil.h"

-#ifdef HAVE_NET_PFVAR_H
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/pfvar.h>
-typedef intptr_t filter_dev;
-#else
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/ipset/ip_set.h>
-typedef struct mnl_socket * filter_dev;
-#endif

 #define BUFF_LEN 256

@@ -51,95 +41,24 @@ static int error_response(struct module_qstate* qstate, int id, int rcode) {
 	return 0;
 }

-#ifdef HAVE_NET_PFVAR_H
-static void * open_filter() {
-	filter_dev dev;
+static struct mnl_socket * open_mnl_socket() {
+	struct mnl_socket *mnl;

-	dev = open("/dev/pf", O_RDWR);
-	if (dev == -1) {
-		log_err("open(\"/dev/pf\") failed: %s", strerror(errno));
-		return NULL;
-	}
-	else
-		return (void *)dev;
-}
-#else
-static void * open_filter() {
-	filter_dev dev;
-
-	dev = mnl_socket_open(NETLINK_NETFILTER);
-	if (!dev) {
+	mnl = mnl_socket_open(NETLINK_NETFILTER);
+	if (!mnl) {
 		log_err("ipset: could not open netfilter.");
 		return NULL;
 	}

-	if (mnl_socket_bind(dev, 0, MNL_SOCKET_AUTOPID) < 0) {
-		mnl_socket_close(dev);
+	if (mnl_socket_bind(mnl, 0, MNL_SOCKET_AUTOPID) < 0) {
+		mnl_socket_close(mnl);
 		log_err("ipset: could not bind netfilter.");
 		return NULL;
 	}
-	return (void *)dev;
+	return mnl;
 }
-#endif

-#ifdef HAVE_NET_PFVAR_H
-static int add_to_ipset(filter_dev dev, const char *setname, const void *ipaddr, int af) {
-	struct pfioc_table io;
-	struct pfr_addr addr;
-	const char *p;
-	int i;
-
-	bzero(&io, sizeof(io));
-	bzero(&addr, sizeof(addr));
-
-	p = strrchr(setname, '/');
-	if (p) {
-		i = p - setname;
-		if (i >= PATH_MAX) {
-			errno = ENAMETOOLONG;
-			return -1;
-		}
-		memcpy(io.pfrio_table.pfrt_anchor, setname, i);
-		if (i < PATH_MAX)
-			io.pfrio_table.pfrt_anchor[i] = '\0';
-		p++;
-	}
-	else
-		p = setname;
-
-	if (strlen(p) >= PF_TABLE_NAME_SIZE) {
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-	strlcpy(io.pfrio_table.pfrt_name, p, PF_TABLE_NAME_SIZE);
-
-	io.pfrio_buffer = &addr;
-	io.pfrio_size = 1;
-	io.pfrio_esize = sizeof(addr);
-
-	switch (af) {
-		case AF_INET:
-			addr.pfra_ip4addr = *(struct in_addr *)ipaddr;
-			addr.pfra_net = 32;
-			break;
-		case AF_INET6:
-			addr.pfra_ip6addr = *(struct in6_addr *)ipaddr;
-			addr.pfra_net = 128;
-			break;
-		default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-	addr.pfra_af = af;
-
-	if (ioctl(dev, DIOCRADDADDRS, &io) == -1) {
-		log_err("ioctl failed: %s", strerror(errno));
-		return -1;
-	}
-	return 0;
-}
-#else
-static int add_to_ipset(filter_dev dev, const char *setname, const void *ipaddr, int af) {
+static int add_to_ipset(struct mnl_socket *mnl, const char *setname, const void *ipaddr, int af) {
 	struct nlmsghdr *nlh;
 	struct nfgenmsg *nfg;
 	struct nlattr *nested[2];
@@ -172,15 +91,14 @@ static int add_to_ipset(filter_dev dev, const char *setname, const void *ipaddr,
 	mnl_attr_nest_end(nlh, nested[1]);
 	mnl_attr_nest_end(nlh, nested[0]);

-	if (mnl_socket_sendto(dev, nlh, nlh->nlmsg_len) < 0) {
+	if (mnl_socket_sendto(mnl, nlh, nlh->nlmsg_len) < 0) {
 		return -1;
 	}
 	return 0;
 }
-#endif

 static void
-ipset_add_rrset_data(struct ipset_env *ie,
+ipset_add_rrset_data(struct ipset_env *ie, struct mnl_socket *mnl,
 	struct packed_rrset_data *d, const char* setname, int af,
 	const char* dname)
 {
@@ -205,16 +123,12 @@ ipset_add_rrset_data(struct ipset_env *ie,
 					snprintf(ip, sizeof(ip), "(inet_ntop_error)");
 				verbose(VERB_QUERY, "ipset: add %s to %s for %s", ip, setname, dname);
 			}
-			ret = add_to_ipset((filter_dev)ie->dev, setname, rr_data + 2, af);
+			ret = add_to_ipset(mnl, setname, rr_data + 2, af);
 			if (ret < 0) {
 				log_err("ipset: could not add %s into %s", dname, setname);

-#if HAVE_NET_PFVAR_H
-				/* don't close as we might not be able to open again due to dropped privs */
-#else
-				mnl_socket_close((filter_dev)ie->dev);
-				ie->dev = NULL;
-#endif
+				mnl_socket_close(mnl);
+				ie->mnl = NULL;
 				break;
 			}
 		}
@@ -223,8 +137,8 @@ ipset_add_rrset_data(struct ipset_env *ie,

 static int
 ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
-	struct ub_packed_rrset_key *rrset, const char *qname, int qlen,
-	const char *setname, int af)
+	struct mnl_socket *mnl, struct ub_packed_rrset_key *rrset,
+	const char *qname, const int qlen, const char *setname, int af)
 {
 	static char dname[BUFF_LEN];
 	const char *ds, *qs;
@@ -238,20 +152,11 @@ ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
 		log_err("bad domain name");
 		return -1;
 	}
-	if (dname[dlen - 1] == '.') {
-		dlen--;
-	}
-	if (qname[qlen - 1] == '.') {
-		qlen--;
-	}

 	for (p = env->cfg->local_zones_ipset; p; p = p->next) {
 		ds = NULL;
 		qs = NULL;
 		plen = strlen(p->str);
-		if (p->str[plen - 1] == '.') {
-			plen--;
-		}

 		if (dlen == plen || (dlen > plen && dname[dlen - plen - 1] == '.' )) {
 			ds = dname + (dlen - plen);
@@ -262,7 +167,8 @@ ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
 		if ((ds && strncasecmp(p->str, ds, plen) == 0)
 			|| (qs && strncasecmp(p->str, qs, plen) == 0)) {
 			d = (struct packed_rrset_data*)rrset->entry.data;
-			ipset_add_rrset_data(ie, d, setname, af, dname);
+			ipset_add_rrset_data(ie, mnl, d, setname,
+				af, dname);
 			break;
 		}
 	}
@@ -272,6 +178,7 @@ ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
 static int ipset_update(struct module_env *env, struct dns_msg *return_msg,
 	struct query_info qinfo, struct ipset_env *ie)
 {
+	struct mnl_socket *mnl;
 	size_t i;
 	const char *setname;
 	struct ub_packed_rrset_key *rrset;
@@ -279,17 +186,15 @@ static int ipset_update(struct module_env *env, struct dns_msg *return_msg,
 	static char qname[BUFF_LEN];
 	int qlen;

-#ifdef HAVE_NET_PFVAR_H
-#else
-	if (!ie->dev) {
+	mnl = (struct mnl_socket *)ie->mnl;
+	if (!mnl) {
 		/* retry to create mnl socket */
-		ie->dev = open_filter();
-		if (!ie->dev) {
-			log_warn("ipset open_filter failed");
+		mnl = open_mnl_socket();
+		if (!mnl) {
 			return -1;
 		}
+		ie->mnl = mnl;
 	}
-#endif

 	qlen = sldns_wire2str_dname_buf(qinfo.qname, qinfo.qname_len,
 		qname, BUFF_LEN);
@@ -312,8 +217,8 @@ static int ipset_update(struct module_env *env, struct dns_msg *return_msg,
 		}

 		if (setname) {
-			if(ipset_check_zones_for_rrset(env, ie, rrset, qname,
-				qlen, setname, af) == -1)
+			if(ipset_check_zones_for_rrset(env, ie, mnl, rrset,
+				qname, qlen, setname, af) == -1)
 				return -1;
 		}
 	}
@@ -321,7 +226,7 @@ static int ipset_update(struct module_env *env, struct dns_msg *return_msg,
 	return 0;
 }

-int ipset_startup(struct module_env* env, int id) {
+int ipset_init(struct module_env* env, int id) {
 	struct ipset_env *ipset_env;

 	ipset_env = (struct ipset_env *)calloc(1, sizeof(struct ipset_env));
@@ -332,43 +237,7 @@ int ipset_startup(struct module_env* env, int id) {

 	env->modinfo[id] = (void *)ipset_env;

-#ifdef HAVE_NET_PFVAR_H
-	ipset_env->dev = open_filter();
-	if (!ipset_env->dev) {
-		log_err("ipset open_filter failed");
-		return 0;
-	}
-#else
-	ipset_env->dev = NULL;
-#endif
-	return 1;
-}
-
-void ipset_destartup(struct module_env* env, int id) {
-	filter_dev dev;
-	struct ipset_env *ipset_env;
-
-	if (!env || !env->modinfo[id]) {
-		return;
-	}
-	ipset_env = (struct ipset_env*)env->modinfo[id];
-
-	dev = (filter_dev)ipset_env->dev;
-	if (dev) {
-#if HAVE_NET_PFVAR_H
-		close(dev);
-#else
-		mnl_socket_close(dev);
-#endif
-		ipset_env->dev = NULL;
-	}
-
-	free(ipset_env);
-	env->modinfo[id] = NULL;
-}
-
-int ipset_init(struct module_env* env, int id) {
-	struct ipset_env *ipset_env = env->modinfo[id];
+	ipset_env->mnl = NULL;

 	ipset_env->name_v4 = env->cfg->ipset_name_v4;
 	ipset_env->name_v6 = env->cfg->ipset_name_v6;
@@ -384,8 +253,24 @@ int ipset_init(struct module_env* env, int id) {
 	return 1;
 }

-void ipset_deinit(struct module_env *ATTR_UNUSED(env), int ATTR_UNUSED(id)) {
-	/* nothing */
+void ipset_deinit(struct module_env *env, int id) {
+	struct mnl_socket *mnl;
+	struct ipset_env *ipset_env;
+
+	if (!env || !env->modinfo[id]) {
+		return;
+	}
+
+	ipset_env = (struct ipset_env *)env->modinfo[id];
+
+	mnl = (struct mnl_socket *)ipset_env->mnl;
+	if (mnl) {
+		mnl_socket_close(mnl);
+		ipset_env->mnl = NULL;
+	}
+
+	free(ipset_env);
+	env->modinfo[id] = NULL;
 }

 static int ipset_new(struct module_qstate* qstate, int id) {
@@ -491,8 +376,8 @@ size_t ipset_get_mem(struct module_env *env, int id) {
 */
 static struct module_func_block ipset_block = {
 	"ipset",
-	&ipset_startup, &ipset_destartup, &ipset_init, &ipset_deinit,
-	&ipset_operate, &ipset_inform_super, &ipset_clear, &ipset_get_mem
+	&ipset_init, &ipset_deinit, &ipset_operate,
+	&ipset_inform_super, &ipset_clear, &ipset_get_mem
 };

 struct module_func_block * ipset_get_funcblock(void) {
@@ -37,7 +37,7 @@ extern "C" {
 #endif

 struct ipset_env {
-	void* dev;
+    void* mnl;

 	int v4_enabled;
 	int v6_enabled;
@@ -50,10 +50,6 @@ struct ipset_qstate {
 	int dummy;
 };

-/** Startup the ipset module */
-int ipset_startup(struct module_env* env, int id);
-/** Destartup the ipset module */
-void ipset_destartup(struct module_env* env, int id);
 /** Init the ipset module */
 int ipset_init(struct module_env* env, int id);
 /** Deinit the ipset module */
@@ -71,7 +71,6 @@ forwards_create(void)
 		sizeof(struct iter_forwards));
 	if(!fwd)
 		return NULL;
-	lock_rw_init(&fwd->lock);
 	return fwd;
 }

@@ -101,7 +100,6 @@ forwards_delete(struct iter_forwards* fwd)
 {
 	if(!fwd) 
 		return;
-	lock_rw_destroy(&fwd->lock);
 	fwd_del_tree(fwd);
 	free(fwd);
 }
@@ -334,64 +332,45 @@ make_stub_holes(struct iter_forwards* fwd, struct config_file* cfg)
 int 
 forwards_apply_cfg(struct iter_forwards* fwd, struct config_file* cfg)
 {
-	if(fwd->tree) {
-		lock_unprotect(&fwd->lock, fwd->tree);
-	}
 	fwd_del_tree(fwd);
 	fwd->tree = rbtree_create(fwd_cmp);
 	if(!fwd->tree)
 		return 0;
-	lock_protect(&fwd->lock, fwd->tree, sizeof(*fwd->tree));

-	lock_rw_wrlock(&fwd->lock);
 	/* read forward zones */
-	if(!read_forwards(fwd, cfg)) {
-		lock_rw_unlock(&fwd->lock);
+	if(!read_forwards(fwd, cfg))
 		return 0;
-	}
-	if(!make_stub_holes(fwd, cfg)) {
-		lock_rw_unlock(&fwd->lock);
+	if(!make_stub_holes(fwd, cfg))
 		return 0;
-	}
 	fwd_init_parents(fwd);
-	lock_rw_unlock(&fwd->lock);
 	return 1;
 }

 struct delegpt* 
-forwards_find(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
-	int nolock)
+forwards_find(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass)
 {
-	struct iter_forward_zone* res;
+	rbnode_type* res = NULL;
 	struct iter_forward_zone key;
-	int has_dp;
 	key.node.key = &key;
 	key.dclass = qclass;
 	key.name = qname;
 	key.namelabs = dname_count_size_labels(qname, &key.namelen);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&fwd->lock); }
-	res = (struct iter_forward_zone*)rbtree_search(fwd->tree, &key);
-	has_dp = res && res->dp;
-	if(!has_dp && !nolock) { lock_rw_unlock(&fwd->lock); }
-	return has_dp?res->dp:NULL;
+	res = rbtree_search(fwd->tree, &key);
+	if(res) return ((struct iter_forward_zone*)res)->dp;
+	return NULL;
 }

 struct delegpt* 
-forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
-	int nolock)
+forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass)
 {
 	/* lookup the forward zone in the tree */
 	rbnode_type* res = NULL;
 	struct iter_forward_zone *result;
 	struct iter_forward_zone key;
-	int has_dp;
 	key.node.key = &key;
 	key.dclass = qclass;
 	key.name = qname;
 	key.namelabs = dname_count_size_labels(qname, &key.namelen);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&fwd->lock); }
 	if(rbtree_find_less_equal(fwd->tree, &key, &res)) {
 		/* exact */
 		result = (struct iter_forward_zone*)res;
@@ -399,10 +378,8 @@ forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
 		/* smaller element (or no element) */
 		int m;
 		result = (struct iter_forward_zone*)res;
-		if(!result || result->dclass != qclass) {
-			if(!nolock) { lock_rw_unlock(&fwd->lock); }
+		if(!result || result->dclass != qclass)
 			return NULL;
-		}
 		/* count number of labels matched */
 		(void)dname_lab_cmp(result->name, result->namelabs, key.name,
 			key.namelabs, &m);
@@ -412,22 +389,20 @@ forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
 			result = result->parent;
 		}
 	}
-	has_dp = result && result->dp;
-	if(!has_dp && !nolock) { lock_rw_unlock(&fwd->lock); }
-	return has_dp?result->dp:NULL;
+	if(result)
+		return result->dp;
+	return NULL;
 }

 struct delegpt* 
-forwards_lookup_root(struct iter_forwards* fwd, uint16_t qclass, int nolock)
+forwards_lookup_root(struct iter_forwards* fwd, uint16_t qclass)
 {
 	uint8_t root = 0;
-	return forwards_lookup(fwd, &root, qclass, nolock);
+	return forwards_lookup(fwd, &root, qclass);
 }

-/* Finds next root item in forwards lookup tree.
- * Caller needs to handle locking of the forwards structure. */
-static int
-next_root_locked(struct iter_forwards* fwd, uint16_t* dclass)
+int
+forwards_next_root(struct iter_forwards* fwd, uint16_t* dclass)
 {
 	struct iter_forward_zone key;
 	rbnode_type* n;
@@ -444,7 +419,7 @@ next_root_locked(struct iter_forwards* fwd, uint16_t* dclass)
 		}
 		/* root not first item? search for higher items */
 		*dclass = p->dclass + 1;
-		return next_root_locked(fwd, dclass);
+		return forwards_next_root(fwd, dclass);
 	}
 	/* find class n in tree, we may get a direct hit, or if we don't
 	 * this is the last item of the previous class so rbtree_next() takes
@@ -472,21 +447,10 @@ next_root_locked(struct iter_forwards* fwd, uint16_t* dclass)
 		}
 		/* not a root node, return next higher item */
 		*dclass = p->dclass+1;
-		return next_root_locked(fwd, dclass);
+		return forwards_next_root(fwd, dclass);
 	}
 }

-int
-forwards_next_root(struct iter_forwards* fwd, uint16_t* dclass, int nolock)
-{
-	int ret;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&fwd->lock); }
-	ret = next_root_locked(fwd, dclass);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
-	return ret;
-}
-
 size_t 
 forwards_get_mem(struct iter_forwards* fwd)
 {
@@ -494,12 +458,10 @@ forwards_get_mem(struct iter_forwards* fwd)
 	size_t s;
 	if(!fwd)
 		return 0;
-	lock_rw_rdlock(&fwd->lock);
 	s = sizeof(*fwd) + sizeof(*fwd->tree);
 	RBTREE_FOR(p, struct iter_forward_zone*, fwd->tree) {
 		s += sizeof(*p) + p->namelen + delegpt_get_mem(p->dp);
 	}
-	lock_rw_unlock(&fwd->lock);
 	return s;
 }

@@ -515,78 +477,49 @@ fwd_zone_find(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 }

 int 
-forwards_add_zone(struct iter_forwards* fwd, uint16_t c, struct delegpt* dp,
-	int nolock)
+forwards_add_zone(struct iter_forwards* fwd, uint16_t c, struct delegpt* dp)
 {
 	struct iter_forward_zone *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
 	if((z=fwd_zone_find(fwd, c, dp->name)) != NULL) {
 		(void)rbtree_delete(fwd->tree, &z->node);
 		fwd_zone_free(z);
 	}
-	if(!forwards_insert(fwd, c, dp)) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(!forwards_insert(fwd, c, dp))
 		return 0;
-	}
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 	return 1;
 }

 void 
-forwards_delete_zone(struct iter_forwards* fwd, uint16_t c, uint8_t* nm,
-	int nolock)
+forwards_delete_zone(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 {
 	struct iter_forward_zone *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
-	if(!(z=fwd_zone_find(fwd, c, nm))) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(!(z=fwd_zone_find(fwd, c, nm)))
 		return; /* nothing to do */
-	}
 	(void)rbtree_delete(fwd->tree, &z->node);
 	fwd_zone_free(z);
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 }

 int
-forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm,
-	int nolock)
+forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 {
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
-	if(fwd_zone_find(fwd, c, nm) != NULL) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
-		return 1; /* already a stub zone there */
-	}
 	if(!fwd_add_stub_hole(fwd, c, nm)) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
 		return 0;
 	}
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 	return 1;
 }

 void
-forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock)
+forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 {
 	struct iter_forward_zone *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
-	if(!(z=fwd_zone_find(fwd, c, nm))) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(!(z=fwd_zone_find(fwd, c, nm)))
 		return; /* nothing to do */
-	}
-	if(z->dp != NULL) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(z->dp != NULL)
 		return; /* not a stub hole */
-	}
 	(void)rbtree_delete(fwd->tree, &z->node);
 	fwd_zone_free(z);
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 }
@@ -43,7 +43,6 @@
 #ifndef ITERATOR_ITER_FWD_H
 #define ITERATOR_ITER_FWD_H
 #include "util/rbtree.h"
-#include "util/locks.h"
 struct config_file;
 struct delegpt;

@@ -51,11 +50,6 @@ struct delegpt;
 * Iterator forward zones structure
 */
 struct iter_forwards {
-	/** lock on the forwards tree.
-	 * When grabbing both this lock and the anchors.lock, this lock
-	 * is grabbed first. When grabbing both this lock and the hints.lock
-	 * this lock is grabbed first. */
-	lock_rw_type lock;
 	/** 
 	 * Zones are stored in this tree. Sort order is specially chosen.
 	 * first sorted on qclass. Then on dname in nsec-like order, so that
@@ -112,65 +106,47 @@ int forwards_apply_cfg(struct iter_forwards* fwd, struct config_file* cfg);

 /**
 * Find forward zone exactly by name
- * The return value is contents of the forwards structure.
- * Caller should lock and unlock a readlock on the forwards structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the forwards structure if a
- * value was returned.
 * @param fwd: forward storage.
 * @param qname: The qname of the query.
 * @param qclass: The qclass of the query.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A delegation point or null.
 */
 struct delegpt* forwards_find(struct iter_forwards* fwd, uint8_t* qname,
-	uint16_t qclass, int nolock);
+	uint16_t qclass);

 /**
 * Find forward zone information
 * For this qname/qclass find forward zone information, returns delegation
 * point with server names and addresses, or NULL if no forwarding is needed.
- * The return value is contents of the forwards structure.
- * Caller should lock and unlock a readlock on the forwards structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the forwards structure if a
- * value was returned.
 *
 * @param fwd: forward storage.
 * @param qname: The qname of the query.
 * @param qclass: The qclass of the query.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A delegation point if the query has to be forwarded to that list,
 *         otherwise null.
 */
-struct delegpt* forwards_lookup(struct iter_forwards* fwd,
-	uint8_t* qname, uint16_t qclass, int nolock);
+struct delegpt* forwards_lookup(struct iter_forwards* fwd, 
+	uint8_t* qname, uint16_t qclass);

 /**
 * Same as forwards_lookup, but for the root only
 * @param fwd: forward storage.
 * @param qclass: The qclass of the query.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A delegation point if root forward exists, otherwise null.
 */
-struct delegpt* forwards_lookup_root(struct iter_forwards* fwd,
-	uint16_t qclass, int nolock);
+struct delegpt* forwards_lookup_root(struct iter_forwards* fwd, 
+	uint16_t qclass);

 /**
 * Find next root item in forwards lookup tree.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a readlock on the forwards structure.
 * @param fwd: the forward storage
 * @param qclass: class to look at next, or higher.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false if none found, or if true stored in qclass.
 */
-int forwards_next_root(struct iter_forwards* fwd, uint16_t* qclass,
-	int nolock);
+int forwards_next_root(struct iter_forwards* fwd, uint16_t* qclass);

 /**
 * Get memory in use by forward storage
- * Locks and unlocks the structure.
 * @param fwd: forward storage.
 * @return bytes in use
 */
@@ -182,56 +158,42 @@ int fwd_cmp(const void* k1, const void* k2);
 /**
 * Add zone to forward structure. For external use since it recalcs 
 * the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param dp: delegation point with name and target nameservers for new
 *	forward zone. malloced.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false on failure (out of memory);
 */
-int forwards_add_zone(struct iter_forwards* fwd, uint16_t c,
-	struct delegpt* dp, int nolock);
+int forwards_add_zone(struct iter_forwards* fwd, uint16_t c, 
+	struct delegpt* dp);

 /**
 * Remove zone from forward structure. For external use since it 
 * recalcs the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param nm: name of zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 */
-void forwards_delete_zone(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock);
+void forwards_delete_zone(struct iter_forwards* fwd, uint16_t c, uint8_t* nm);

 /**
 * Add stub hole (empty entry in forward table, that makes resolution skip
 * a forward-zone because the stub zone should override the forward zone).
 * Does not add one if not necessary.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param nm: name of zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false on failure (out of memory);
 */
-int forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock);
+int forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm);

 /**
 * Remove stub hole, if one exists.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param nm: name of zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 */
 void forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock);
+	uint8_t* nm);

 #endif /* ITERATOR_ITER_FWD_H */
@@ -57,8 +57,6 @@ hints_create(void)
 		sizeof(struct iter_hints));
 	if(!hints)
 		return NULL;
-	lock_rw_init(&hints->lock);
-	lock_protect(&hints->lock, &hints->tree, sizeof(hints->tree));
 	return hints;
 }

@@ -85,7 +83,6 @@ hints_delete(struct iter_hints* hints)
 {
 	if(!hints) 
 		return;
-	lock_rw_destroy(&hints->lock);
 	hints_del_tree(hints);
 	free(hints);
 }
@@ -441,70 +438,47 @@ read_root_hints_list(struct iter_hints* hints, struct config_file* cfg)
 int 
 hints_apply_cfg(struct iter_hints* hints, struct config_file* cfg)
 {
-	int nolock = 1;
-	lock_rw_wrlock(&hints->lock);
 	hints_del_tree(hints);
 	name_tree_init(&hints->tree);
-
+	
 	/* read root hints */
-	if(!read_root_hints_list(hints, cfg)) {
-		lock_rw_unlock(&hints->lock);
+	if(!read_root_hints_list(hints, cfg))
 		return 0;
-	}

 	/* read stub hints */
-	if(!read_stubs(hints, cfg)) {
-		lock_rw_unlock(&hints->lock);
+	if(!read_stubs(hints, cfg))
 		return 0;
-	}

 	/* use fallback compiletime root hints */
-	if(!hints_find_root(hints, LDNS_RR_CLASS_IN, nolock)) {
+	if(!hints_lookup_root(hints, LDNS_RR_CLASS_IN)) {
 		struct delegpt* dp = compile_time_root_prime(cfg->do_ip4,
 			cfg->do_ip6);
 		verbose(VERB_ALGO, "no config, using builtin root hints.");
-		if(!dp) {
-			lock_rw_unlock(&hints->lock);
+		if(!dp) 
 			return 0;
-		}
-		if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp, 0)) {
-			lock_rw_unlock(&hints->lock);
+		if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp, 0))
 			return 0;
-		}
 	}

 	name_tree_init_parents(&hints->tree);
-	lock_rw_unlock(&hints->lock);
 	return 1;
 }

-struct delegpt*
-hints_find(struct iter_hints* hints, uint8_t* qname, uint16_t qclass,
-	int nolock)
-{
-	struct iter_hints_stub *stub;
-	size_t len;
-	int has_dp;
-	int labs = dname_count_size_labels(qname, &len);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&hints->lock); }
-	stub = (struct iter_hints_stub*)name_tree_find(&hints->tree,
-		qname, len, labs, qclass);
-	has_dp = stub && stub->dp;
-	if(!has_dp && !nolock) { lock_rw_unlock(&hints->lock); }
-	return has_dp?stub->dp:NULL;
-}
-
-struct delegpt*
-hints_find_root(struct iter_hints* hints, uint16_t qclass, int nolock)
+struct delegpt* 
+hints_lookup_root(struct iter_hints* hints, uint16_t qclass)
 {
 	uint8_t rootlab = 0;
-	return hints_find(hints, &rootlab, qclass, nolock);
+	struct iter_hints_stub *stub;
+	stub = (struct iter_hints_stub*)name_tree_find(&hints->tree,
+		&rootlab, 1, 1, qclass);
+	if(!stub)
+		return NULL;
+	return stub->dp;
 }

 struct iter_hints_stub* 
-hints_lookup_stub(struct iter_hints* hints, uint8_t* qname,
-	uint16_t qclass, struct delegpt* cache_dp, int nolock)
+hints_lookup_stub(struct iter_hints* hints, uint8_t* qname, 
+	uint16_t qclass, struct delegpt* cache_dp)
 {
 	size_t len;
 	int labs;
@@ -512,20 +486,14 @@ hints_lookup_stub(struct iter_hints* hints, uint8_t* qname,

 	/* first lookup the stub */
 	labs = dname_count_size_labels(qname, &len);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&hints->lock); }
 	r = (struct iter_hints_stub*)name_tree_lookup(&hints->tree, qname,
 		len, labs, qclass);
-	if(!r) {
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
-		return NULL;
-	}
+	if(!r) return NULL;

 	/* If there is no cache (root prime situation) */
 	if(cache_dp == NULL) {
 		if(r->dp->namelabs != 1)
 			return r; /* no cache dp, use any non-root stub */
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
 		return NULL;
 	}

@@ -542,18 +510,12 @@ hints_lookup_stub(struct iter_hints* hints, uint8_t* qname,
 	if(dname_strict_subdomain(r->dp->name, r->dp->namelabs,
 		cache_dp->name, cache_dp->namelabs))
 		return r; /* need to prime this stub */
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
 	return NULL;
 }

-int hints_next_root(struct iter_hints* hints, uint16_t* qclass, int nolock)
+int hints_next_root(struct iter_hints* hints, uint16_t* qclass)
 {
-	int ret;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&hints->lock); }
-	ret = name_tree_next_root(&hints->tree, qclass);
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
-	return ret;
+	return name_tree_next_root(&hints->tree, qclass);
 }

 size_t 
@@ -562,52 +524,39 @@ hints_get_mem(struct iter_hints* hints)
 	size_t s;
 	struct iter_hints_stub* p;
 	if(!hints) return 0;
-	lock_rw_rdlock(&hints->lock);
 	s = sizeof(*hints);
 	RBTREE_FOR(p, struct iter_hints_stub*, &hints->tree) {
 		s += sizeof(*p) + delegpt_get_mem(p->dp);
 	}
-	lock_rw_unlock(&hints->lock);
 	return s;
 }

 int 
 hints_add_stub(struct iter_hints* hints, uint16_t c, struct delegpt* dp,
-	int noprime, int nolock)
+	int noprime)
 {
 	struct iter_hints_stub *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&hints->lock); }
 	if((z=(struct iter_hints_stub*)name_tree_find(&hints->tree,
 		dp->name, dp->namelen, dp->namelabs, c)) != NULL) {
 		(void)rbtree_delete(&hints->tree, &z->node);
 		hints_stub_free(z);
 	}
-	if(!hints_insert(hints, c, dp, noprime)) {
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
+	if(!hints_insert(hints, c, dp, noprime))
 		return 0;
-	}
 	name_tree_init_parents(&hints->tree);
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
 	return 1;
 }

 void 
-hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm,
-	int nolock)
+hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm)
 {
 	struct iter_hints_stub *z;
 	size_t len;
 	int labs = dname_count_size_labels(nm, &len);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&hints->lock); }
 	if(!(z=(struct iter_hints_stub*)name_tree_find(&hints->tree,
-		nm, len, labs, c))) {
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
+		nm, len, labs, c)))
 		return; /* nothing to do */
-	}
 	(void)rbtree_delete(&hints->tree, &z->node);
 	hints_stub_free(z);
 	name_tree_init_parents(&hints->tree);
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
 }
@@ -43,7 +43,6 @@
 #ifndef ITERATOR_ITER_HINTS_H
 #define ITERATOR_ITER_HINTS_H
 #include "util/storage/dnstree.h"
-#include "util/locks.h"
 struct iter_env;
 struct config_file;
 struct delegpt;
@@ -52,10 +51,6 @@ struct delegpt;
 * Iterator hints structure
 */
 struct iter_hints {
-	/** lock on the forwards tree.
-	 * When grabbing both this lock and the anchors.lock, this lock
-	 * is grabbed first. */
-	lock_rw_type lock;
 	/** 
 	 * Hints are stored in this tree. Sort order is specially chosen.
 	 * first sorted on qclass. Then on dname in nsec-like order, so that
@@ -100,70 +95,42 @@ void hints_delete(struct iter_hints* hints);
 int hints_apply_cfg(struct iter_hints* hints, struct config_file* cfg);

 /**
- * Find hints for the given class.
- * The return value is contents of the hints structure.
- * Caller should lock and unlock a readlock on the hints structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the hints structure if a
- * value was returned.
- * @param hints: hint storage.
- * @param qname: the qname that generated the delegation point.
- * @param qclass: class for which root hints are requested. host order.
- * @param nolock: Skip locking, locking is handled by the caller.
- * @return: NULL if no hints, or a ptr to stored hints.
- */
-struct delegpt* hints_find(struct iter_hints* hints, uint8_t* qname,
-	uint16_t qclass, int nolock);
-
-/**
- * Same as hints_lookup, but for the root only.
+ * Find root hints for the given class.
 * @param hints: hint storage.
 * @param qclass: class for which root hints are requested. host order.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: NULL if no hints, or a ptr to stored hints.
 */
-struct delegpt* hints_find_root(struct iter_hints* hints,
-	uint16_t qclass, int nolock);
+struct delegpt* hints_lookup_root(struct iter_hints* hints, uint16_t qclass);

 /**
 * Find next root hints (to cycle through all root hints).
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a readlock on the hints structure.
 * @param hints: hint storage
 * @param qclass: class for which root hints are sought.
 * 	0 means give the first available root hints class.
 * 	x means, give class x or a higher class if any.
 * 	returns the found class in this variable.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return true if a root hint class is found.
 * 	false if not root hint class is found (qclass may have been changed).
 */
-int hints_next_root(struct iter_hints* hints, uint16_t* qclass, int nolock);
+int hints_next_root(struct iter_hints* hints, uint16_t* qclass);

 /**
 * Given a qname/qclass combination, and the delegation point from the cache
 * for this qname/qclass, determine if this combination indicates that a
 * stub hint exists and must be primed.
- * The return value is contents of the hints structure.
- * Caller should lock and unlock a readlock on the hints structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the hints structure if a
- * value was returned.
 *
 * @param hints: hint storage.
 * @param qname: The qname that generated the delegation point.
 * @param qclass: The qclass that generated the delegation point.
 * @param dp: The cache generated delegation point.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A priming delegation point if there is a stub hint that must
 *         be primed, otherwise null.
 */
-struct iter_hints_stub* hints_lookup_stub(struct iter_hints* hints,
-	uint8_t* qname, uint16_t qclass, struct delegpt* dp, int nolock);
+struct iter_hints_stub* hints_lookup_stub(struct iter_hints* hints, 
+	uint8_t* qname, uint16_t qclass, struct delegpt* dp);

 /**
 * Get memory in use by hints
- * Locks and unlocks the structure.
 * @param hints: hint storage.
 * @return bytes in use
 */
@@ -172,30 +139,23 @@ size_t hints_get_mem(struct iter_hints* hints);
 /**
 * Add stub to hints structure. For external use since it recalcs 
 * the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the hints structure.
 * @param hints: the hints data structure
 * @param c: class of zone
 * @param dp: delegation point with name and target nameservers for new
 *	hints stub. malloced.
 * @param noprime: set noprime option to true or false on new hint stub.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false on failure (out of memory);
 */
 int hints_add_stub(struct iter_hints* hints, uint16_t c, struct delegpt* dp,
-	int noprime, int nolock);
+	int noprime);

 /**
 * Remove stub from hints structure. For external use since it 
 * recalcs the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the hints structure.
 * @param hints: the hints data structure
 * @param c: class of stub zone
 * @param nm: name of stub zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 */
-void hints_delete_stub(struct iter_hints* hints, uint16_t c,
-	uint8_t* nm, int nolock);
+void hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm);

 #endif /* ITERATOR_ITER_HINTS_H */
@@ -279,10 +279,9 @@ iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env,
 		name, namelen, qtype, &lame, &dnsseclame, &reclame,
 		&rtt, now)) {
 		log_addr(VERB_ALGO, "servselect", &a->addr, a->addrlen);
-		verbose(VERB_ALGO, "   rtt=%d%s%s%s%s%s", rtt,
+		verbose(VERB_ALGO, "   rtt=%d%s%s%s%s", rtt,
 			lame?" LAME":"",
 			dnsseclame?" DNSSEC_LAME":"",
-			a->dnsseclame?" ADDR_DNSSEC_LAME":"",
 			reclame?" REC_LAME":"",
 			a->lame?" ADDR_LAME":"");
 		if(lame)
@@ -1285,17 +1284,8 @@ iter_get_next_root(struct iter_hints* hints, struct iter_forwards* fwd,
 	uint16_t* c)
 {
 	uint16_t c1 = *c, c2 = *c;
-	int r1, r2;
-	int nolock = 1;
-
-	/* prelock both forwards and hints for atomic read. */
-	lock_rw_rdlock(&fwd->lock);
-	lock_rw_rdlock(&hints->lock);
-	r1 = hints_next_root(hints, &c1, nolock);
-	r2 = forwards_next_root(fwd, &c2, nolock);
-	lock_rw_unlock(&fwd->lock);
-	lock_rw_unlock(&hints->lock);
-
+	int r1 = hints_next_root(hints, &c1);
+	int r2 = forwards_next_root(fwd, &c2);
 	if(!r1 && !r2) /* got none, end of list */
 		return 0;
 	else if(!r1) /* got one, return that */
@@ -1460,21 +1450,15 @@ int iter_dp_cangodown(struct query_info* qinfo, struct delegpt* dp)

 int
 iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,
-	uint8_t** retdpname, size_t* retdpnamelen, uint8_t* dpname_storage,
-	size_t dpname_storage_len)
+	uint8_t** retdpname, size_t* retdpnamelen)
 {
 	struct iter_hints_stub *stub;
 	struct delegpt *dp;
-	int nolock = 1;

 	/* Check for stub. */
-	/* Lock both forwards and hints for atomic read. */
-	lock_rw_rdlock(&qstate->env->fwds->lock);
-	lock_rw_rdlock(&qstate->env->hints->lock);
 	stub = hints_lookup_stub(qstate->env->hints, qinf->qname,
-	    qinf->qclass, NULL, nolock);
-	dp = forwards_lookup(qstate->env->fwds, qinf->qname, qinf->qclass,
-		nolock);
+	    qinf->qclass, NULL);
+	dp = forwards_lookup(qstate->env->fwds, qinf->qname, qinf->qclass);

 	/* see if forward or stub is more pertinent */
 	if(stub && stub->dp && dp) {
@@ -1488,9 +1472,7 @@ iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,

 	/* check stub */
 	if (stub != NULL && stub->dp != NULL) {
-		int stub_no_cache = stub->dp->no_cache;
-		lock_rw_unlock(&qstate->env->fwds->lock);
-		if(stub_no_cache) {
+		if(stub->dp->no_cache) {
 			char qname[255+1];
 			char dpname[255+1];
 			dname_str(qinf->qname, qname);
@@ -1498,27 +1480,15 @@ iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,
 			verbose(VERB_ALGO, "stub for %s %s has no_cache", qname, dpname);
 		}
 		if(retdpname) {
-			if(stub->dp->namelen > dpname_storage_len) {
-				verbose(VERB_ALGO, "no cache stub dpname too long");
-				lock_rw_unlock(&qstate->env->hints->lock);
-				*retdpname = NULL;
-				*retdpnamelen = 0;
-				return stub_no_cache;
-			}
-			memmove(dpname_storage, stub->dp->name,
-				stub->dp->namelen);
-			*retdpname = dpname_storage;
+			*retdpname = stub->dp->name;
 			*retdpnamelen = stub->dp->namelen;
 		}
-		lock_rw_unlock(&qstate->env->hints->lock);
-		return stub_no_cache;
+		return (stub->dp->no_cache);
 	}

 	/* Check for forward. */
 	if (dp) {
-		int dp_no_cache = dp->no_cache;
-		lock_rw_unlock(&qstate->env->hints->lock);
-		if(dp_no_cache) {
+		if(dp->no_cache) {
 			char qname[255+1];
 			char dpname[255+1];
 			dname_str(qinf->qname, qname);
@@ -1526,22 +1496,11 @@ iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,
 			verbose(VERB_ALGO, "forward for %s %s has no_cache", qname, dpname);
 		}
 		if(retdpname) {
-			if(dp->namelen > dpname_storage_len) {
-				verbose(VERB_ALGO, "no cache dpname too long");
-				lock_rw_unlock(&qstate->env->fwds->lock);
-				*retdpname = NULL;
-				*retdpnamelen = 0;
-				return dp_no_cache;
-			}
-			memmove(dpname_storage, dp->name, dp->namelen);
-			*retdpname = dpname_storage;
+			*retdpname = dp->name;
 			*retdpnamelen = dp->namelen;
 		}
-		lock_rw_unlock(&qstate->env->fwds->lock);
-		return dp_no_cache;
+		return (dp->no_cache);
 	}
-	lock_rw_unlock(&qstate->env->fwds->lock);
-	lock_rw_unlock(&qstate->env->hints->lock);
 	if(retdpname) {
 		*retdpname = NULL;
 		*retdpnamelen = 0;
@@ -407,14 +407,10 @@ int iter_dp_cangodown(struct query_info* qinfo, struct delegpt* dp);
 * 	Used for NXDOMAIN checks, above that it is an nxdomain from a
 * 	different server and zone. You can pass NULL to not get it.
 * @param retdpnamelen: returns the length of the dpname.
- * @param dpname_storage: this is where the dpname buf is stored, if any.
- * 	So that caller can manage the buffer.
- * @param dpname_storage_len: size of dpname_storage buffer.
 * @return true if no_cache is set in stub or fwd.
 */
 int iter_stub_fwd_no_cache(struct module_qstate *qstate,
-	struct query_info *qinf, uint8_t** retdpname, size_t* retdpnamelen,
-	uint8_t* dpname_storage, size_t dpname_storage_len);
+	struct query_info *qinf, uint8_t** retdpname, size_t* retdpnamelen);

 /**
 * Set support for IP4 and IP6 depending on outgoing interfaces
@@ -52,7 +52,6 @@
 #include "iterator/iter_priv.h"
 #include "validator/val_neg.h"
 #include "services/cache/dns.h"
-#include "services/cache/rrset.h"
 #include "services/cache/infra.h"
 #include "services/authzone.h"
 #include "util/module.h"
@@ -679,40 +678,30 @@ errinf_reply(struct module_qstate* qstate, struct iter_qstate* iq)

 /** see if last resort is possible - does config allow queries to parent */
 static int
-can_have_last_resort(struct module_env* env, uint8_t* nm, size_t ATTR_UNUSED(nmlen),
-	uint16_t qclass, int* have_dp, struct delegpt** retdp,
-	struct regional* region)
+can_have_last_resort(struct module_env* env, uint8_t* nm, size_t nmlen,
+	uint16_t qclass, struct delegpt** retdp)
 {
-	struct delegpt* dp = NULL;
-	int nolock = 0;
+	struct delegpt* fwddp;
+	struct iter_hints_stub* stub;
+	int labs = dname_count_labels(nm);
 	/* do not process a last resort (the parent side) if a stub
 	 * or forward is configured, because we do not want to go 'above'
 	 * the configured servers */
-	if(!dname_is_root(nm) &&
-		(dp = hints_find(env->hints, nm, qclass, nolock)) &&
+	if(!dname_is_root(nm) && (stub = (struct iter_hints_stub*)
+		name_tree_find(&env->hints->tree, nm, nmlen, labs, qclass)) &&
 		/* has_parent side is turned off for stub_first, where we
 		 * are allowed to go to the parent */
-		dp->has_parent_side_NS) {
-		if(retdp) *retdp = delegpt_copy(dp, region);
-		lock_rw_unlock(&env->hints->lock);
-		if(have_dp) *have_dp = 1;
+		stub->dp->has_parent_side_NS) {
+		if(retdp) *retdp = stub->dp;
 		return 0;
 	}
-	if(dp) {
-		lock_rw_unlock(&env->hints->lock);
-		dp = NULL;
-	}
-	if((dp = forwards_find(env->fwds, nm, qclass, nolock)) &&
+	if((fwddp = forwards_find(env->fwds, nm, qclass)) &&
 		/* has_parent_side is turned off for forward_first, where
 		 * we are allowed to go to the parent */
-		dp->has_parent_side_NS) {
-		if(retdp) *retdp = delegpt_copy(dp, region);
-		lock_rw_unlock(&env->fwds->lock);
-		if(have_dp) *have_dp = 1;
+		fwddp->has_parent_side_NS) {
+		if(retdp) *retdp = fwddp;
 		return 0;
 	}
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(dp) { lock_rw_unlock(&env->fwds->lock); }
 	return 1;
 }

@@ -888,11 +877,10 @@ prime_root(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 {
 	struct delegpt* dp;
 	struct module_qstate* subq;
-	int nolock = 0;
 	verbose(VERB_DETAIL, "priming . %s NS", 
 		sldns_lookup_by_id(sldns_rr_classes, (int)qclass)?
 		sldns_lookup_by_id(sldns_rr_classes, (int)qclass)->name:"??");
-	dp = hints_find_root(qstate->env->hints, qclass, nolock);
+	dp = hints_lookup_root(qstate->env->hints, qclass);
 	if(!dp) {
 		verbose(VERB_ALGO, "Cannot prime due to lack of hints");
 		return 0;
@@ -902,7 +890,6 @@ prime_root(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 	if(!generate_sub_request((uint8_t*)"\000", 1, LDNS_RR_TYPE_NS, 
 		qclass, qstate, id, iq, QUERYTARGETS_STATE, PRIME_RESP_STATE,
 		&subq, 0, 0)) {
-		lock_rw_unlock(&qstate->env->hints->lock);
 		verbose(VERB_ALGO, "could not prime root");
 		return 0;
 	}
@@ -913,7 +900,6 @@ prime_root(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 		 * copy dp, it is now part of the root prime query. 
 		 * dp was part of in the fixed hints structure. */
 		subiq->dp = delegpt_copy(dp, subq->region);
-		lock_rw_unlock(&qstate->env->hints->lock);
 		if(!subiq->dp) {
 			log_err("out of memory priming root, copydp");
 			fptr_ok(fptr_whitelist_modenv_kill_sub(
@@ -925,8 +911,6 @@ prime_root(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 		subiq->num_target_queries = 0; 
 		subiq->dnssec_expected = iter_indicates_dnssec(
 			qstate->env, subiq->dp, NULL, subq->qinfo.qclass);
-	} else {
-		lock_rw_unlock(&qstate->env->hints->lock);
 	}
 	
 	/* this module stops, our submodule starts, and does the query. */
@@ -957,21 +941,18 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 	struct iter_hints_stub* stub;
 	struct delegpt* stub_dp;
 	struct module_qstate* subq;
-	int nolock = 0;

 	if(!qname) return 0;
-	stub = hints_lookup_stub(qstate->env->hints, qname, qclass, iq->dp,
-		nolock);
+	stub = hints_lookup_stub(qstate->env->hints, qname, qclass, iq->dp);
 	/* The stub (if there is one) does not need priming. */
-	if(!stub) return 0;
+	if(!stub)
+		return 0;
 	stub_dp = stub->dp;
 	/* if we have an auth_zone dp, and stub is equal, don't prime stub
 	 * yet, unless we want to fallback and avoid the auth_zone */
 	if(!iq->auth_zone_avoid && iq->dp && iq->dp->auth_dp && 
-		query_dname_compare(iq->dp->name, stub_dp->name) == 0) {
-		lock_rw_unlock(&qstate->env->hints->lock);
+		query_dname_compare(iq->dp->name, stub_dp->name) == 0)
 		return 0;
-	}

 	/* is it a noprime stub (always use) */
 	if(stub->noprime) {
@@ -980,14 +961,13 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 		/* copy the dp out of the fixed hints structure, so that
 		 * it can be changed when servicing this query */
 		iq->dp = delegpt_copy(stub_dp, qstate->region);
-		lock_rw_unlock(&qstate->env->hints->lock);
 		if(!iq->dp) {
 			log_err("out of memory priming stub");
 			errinf(qstate, "malloc failure, priming stub");
 			(void)error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 			return 1; /* return 1 to make module stop, with error */
 		}
-		log_nametypeclass(VERB_DETAIL, "use stub", iq->dp->name,
+		log_nametypeclass(VERB_DETAIL, "use stub", stub_dp->name, 
 			LDNS_RR_TYPE_NS, qclass);
 		return r;
 	}
@@ -1001,7 +981,6 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 	if(!generate_sub_request(stub_dp->name, stub_dp->namelen, 
 		LDNS_RR_TYPE_NS, qclass, qstate, id, iq,
 		QUERYTARGETS_STATE, PRIME_RESP_STATE, &subq, 0, 0)) {
-		lock_rw_unlock(&qstate->env->hints->lock);
 		verbose(VERB_ALGO, "could not prime stub");
 		errinf(qstate, "could not generate lookup for stub prime");
 		(void)error_response(qstate, id, LDNS_RCODE_SERVFAIL);
@@ -1014,7 +993,6 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 		/* Set the initial delegation point to the hint. */
 		/* make copy to avoid use of stub dp by different qs/threads */
 		subiq->dp = delegpt_copy(stub_dp, subq->region);
-		lock_rw_unlock(&qstate->env->hints->lock);
 		if(!subiq->dp) {
 			log_err("out of memory priming stub, copydp");
 			fptr_ok(fptr_whitelist_modenv_kill_sub(
@@ -1031,8 +1009,6 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
 		subiq->wait_priming_stub = 1;
 		subiq->dnssec_expected = iter_indicates_dnssec(
 			qstate->env, subiq->dp, NULL, subq->qinfo.qclass);
-	} else {
-		lock_rw_unlock(&qstate->env->hints->lock);
 	}
 	
 	/* this module stops, our submodule starts, and does the query. */
@@ -1205,7 +1181,7 @@ generate_ns_check(struct module_qstate* qstate, struct iter_qstate* iq, int id)
 	if(iq->depth == ie->max_dependency_depth)
 		return;
 	if(!can_have_last_resort(qstate->env, iq->dp->name, iq->dp->namelen,
-		iq->qchase.qclass, NULL, NULL, NULL))
+		iq->qchase.qclass, NULL))
 		return;
 	/* is this query the same as the nscheck? */
 	if(qstate->qinfo.qtype == LDNS_RR_TYPE_NS &&
@@ -1318,7 +1294,6 @@ forward_request(struct module_qstate* qstate, struct iter_qstate* iq)
 	struct delegpt* dp;
 	uint8_t* delname = iq->qchase.qname;
 	size_t delnamelen = iq->qchase.qname_len;
-	int nolock = 0;
 	if(iq->refetch_glue && iq->dp) {
 		delname = iq->dp->name;
 		delnamelen = iq->dp->namelen;
@@ -1327,13 +1302,12 @@ forward_request(struct module_qstate* qstate, struct iter_qstate* iq)
 	if( (iq->qchase.qtype == LDNS_RR_TYPE_DS || iq->refetch_glue)
 		&& !dname_is_root(iq->qchase.qname))
 		dname_remove_label(&delname, &delnamelen);
-	dp = forwards_lookup(qstate->env->fwds, delname, iq->qchase.qclass,
-		nolock);
-	if(!dp) return 0;
+	dp = forwards_lookup(qstate->env->fwds, delname, iq->qchase.qclass);
+	if(!dp) 
+		return 0;
 	/* send recursion desired to forward addr */
 	iq->chase_flags |= BIT_RD; 
 	iq->dp = delegpt_copy(dp, qstate->region);
-	lock_rw_unlock(&qstate->env->fwds->lock);
 	/* iq->dp checked by caller */
 	verbose(VERB_ALGO, "forwarding request");
 	return 1;
@@ -1361,7 +1335,6 @@ static int
 processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 	struct iter_env* ie, int id)
 {
-	uint8_t dpname_storage[LDNS_MAX_DOMAINLEN+1];
 	uint8_t* delname, *dpname=NULL;
 	size_t delnamelen, dpnamelen=0;
 	struct dns_msg* msg = NULL;
@@ -1378,7 +1351,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 			"restarts (eg. indirections)");
 		if(iq->qchase.qname)
 			errinf_dname(qstate, "stop at", iq->qchase.qname);
-		return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+		return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 	}

 	/* We enforce a maximum recursion/dependency depth -- in general, 
@@ -1408,7 +1381,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 	if (iq->refetch_glue &&
 	        iq->dp &&
 	        !can_have_last_resort(qstate->env, iq->dp->name,
-	             iq->dp->namelen, iq->qchase.qclass, NULL, NULL, NULL)) {
+	             iq->dp->namelen, iq->qchase.qclass, NULL)) {
 	    iq->refetch_glue = 0;
 	}

@@ -1416,61 +1389,8 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,

 	/* This either results in a query restart (CNAME cache response), a
 	 * terminating response (ANSWER), or a cache miss (null). */
-
-	/* Check RPZ for override */
-	if(qstate->env->auth_zones) {
-		/* apply rpz qname triggers, like after cname */
-		struct dns_msg* forged_response =
-			rpz_callback_from_iterator_cname(qstate, iq);
-		if(forged_response) {
-			uint8_t* sname = 0;
-			size_t slen = 0;
-			int count = 0;
-			while(forged_response && reply_find_rrset_section_an(
-				forged_response->rep, iq->qchase.qname,
-				iq->qchase.qname_len, LDNS_RR_TYPE_CNAME,
-				iq->qchase.qclass) &&
-				iq->qchase.qtype != LDNS_RR_TYPE_CNAME &&
-				count++ < ie->max_query_restarts) {
-				/* another cname to follow */
-				if(!handle_cname_response(qstate, iq, forged_response,
-					&sname, &slen)) {
-					errinf(qstate, "malloc failure, CNAME info");
-					return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
-				}
-				iq->qchase.qname = sname;
-				iq->qchase.qname_len = slen;
-				forged_response =
-					rpz_callback_from_iterator_cname(qstate, iq);
-			}
-			if(forged_response != NULL) {
-				qstate->ext_state[id] = module_finished;
-				qstate->return_rcode = LDNS_RCODE_NOERROR;
-				qstate->return_msg = forged_response;
-				iq->response = forged_response;
-				next_state(iq, FINISHED_STATE);
-				if(!iter_prepend(iq, qstate->return_msg, qstate->region)) {
-					log_err("rpz: after cached cname, prepend rrsets: out of memory");
-					return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
-				}
-				qstate->return_msg->qinfo = qstate->qinfo;
-				return 0;
-			}
-			/* Follow the CNAME response */
-			iq->dp = NULL;
-			iq->refetch_glue = 0;
-			iq->query_restart_count++;
-			iq->sent_count = 0;
-			iq->dp_target_count = 0;
-			sock_list_insert(&qstate->reply_origin, NULL, 0, qstate->region);
-			if(qstate->env->cfg->qname_minimisation)
-				iq->minimisation_state = INIT_MINIMISE_STATE;
-			return next_state(iq, INIT_REQUEST_STATE);
-		}
-	}
-
-	if (iter_stub_fwd_no_cache(qstate, &iq->qchase, &dpname, &dpnamelen,
-		dpname_storage, sizeof(dpname_storage))) {
+	
+	if (iter_stub_fwd_no_cache(qstate, &iq->qchase, &dpname, &dpnamelen)) {
 		/* Asked to not query cache. */
 		verbose(VERB_ALGO, "no-cache set, going to the network");
 		qstate->no_cache_lookup = 1;
@@ -1529,6 +1449,39 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 			}
 			iq->qchase.qname = sname;
 			iq->qchase.qname_len = slen;
+			if(qstate->env->auth_zones) {
+				/* apply rpz qname triggers after cname */
+				struct dns_msg* forged_response =
+					rpz_callback_from_iterator_cname(qstate, iq);
+				while(forged_response && reply_find_rrset_section_an(
+					forged_response->rep, iq->qchase.qname,
+					iq->qchase.qname_len, LDNS_RR_TYPE_CNAME,
+					iq->qchase.qclass)) {
+					/* another cname to follow */
+					if(!handle_cname_response(qstate, iq, forged_response,
+						&sname, &slen)) {
+						errinf(qstate, "malloc failure, CNAME info");
+						return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+					}
+					iq->qchase.qname = sname;
+					iq->qchase.qname_len = slen;
+					forged_response =
+						rpz_callback_from_iterator_cname(qstate, iq);
+				}
+				if(forged_response != NULL) {
+					qstate->ext_state[id] = module_finished;
+					qstate->return_rcode = LDNS_RCODE_NOERROR;
+					qstate->return_msg = forged_response;
+					iq->response = forged_response;
+					next_state(iq, FINISHED_STATE);
+					if(!iter_prepend(iq, qstate->return_msg, qstate->region)) {
+						log_err("rpz: after cached cname, prepend rrsets: out of memory");
+						return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+					}
+					qstate->return_msg->qinfo = qstate->qinfo;
+					return 0;
+				}
+			}
 			/* This *is* a query restart, even if it is a cheap 
 			 * one. */
 			iq->dp = NULL;
@@ -1541,6 +1494,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 				iq->minimisation_state = INIT_MINIMISE_STATE;
 			return next_state(iq, INIT_REQUEST_STATE);
 		}
+
 		/* if from cache, NULL, else insert 'cache IP' len=0 */
 		if(qstate->reply_origin)
 			sock_list_insert(&qstate->reply_origin, NULL, 0, qstate->region);
@@ -1601,7 +1555,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 	}
 	if(iq->qchase.qtype == LDNS_RR_TYPE_DS || iq->refetch_glue ||
 	   (iq->qchase.qtype == LDNS_RR_TYPE_NS && qstate->prefetch_leeway
-	   && can_have_last_resort(qstate->env, delname, delnamelen, iq->qchase.qclass, NULL, NULL, NULL))) {
+	   && can_have_last_resort(qstate->env, delname, delnamelen, iq->qchase.qclass, NULL))) {
 		/* remove first label from delname, root goes to hints,
 		 * but only to fetch glue, not for qtype=DS. */
 		/* also when prefetching an NS record, fetch it again from
@@ -1630,7 +1584,6 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 		 * root priming situation. */
 		if(iq->dp == NULL) {
 			int r;
-			int nolock = 0;
 			/* if under auth zone, no prime needed */
 			if(!auth_zone_delegpt(qstate, iq, delname, delnamelen))
 				return error_response(qstate, id, 
@@ -1644,21 +1597,19 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 				break; /* got noprime-stub-zone, continue */
 			else if(r)
 				return 0; /* stub prime request made */
-			if(forwards_lookup_root(qstate->env->fwds,
-				iq->qchase.qclass, nolock)) {
-				lock_rw_unlock(&qstate->env->fwds->lock);
+			if(forwards_lookup_root(qstate->env->fwds, 
+				iq->qchase.qclass)) {
 				/* forward zone root, no root prime needed */
 				/* fill in some dp - safety belt */
-				iq->dp = hints_find_root(qstate->env->hints,
-					iq->qchase.qclass, nolock);
+				iq->dp = hints_lookup_root(qstate->env->hints, 
+					iq->qchase.qclass);
 				if(!iq->dp) {
 					log_err("internal error: no hints dp");
 					errinf(qstate, "no hints for this class");
-					return error_response_cache(qstate, id,
+					return error_response(qstate, id, 
 						LDNS_RCODE_SERVFAIL);
 				}
 				iq->dp = delegpt_copy(iq->dp, qstate->region);
-				lock_rw_unlock(&qstate->env->hints->lock);
 				if(!iq->dp) {
 					log_err("out of memory in safety belt");
 					errinf(qstate, "malloc failure, in safety belt");
@@ -1698,13 +1649,15 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 		if(iter_dp_is_useless(&qstate->qinfo, qstate->query_flags,
 			iq->dp, ie->supports_ipv4, ie->supports_ipv6,
 			ie->use_nat64)) {
-			int have_dp = 0;
-			if(!can_have_last_resort(qstate->env, iq->dp->name, iq->dp->namelen, iq->qchase.qclass, &have_dp, &iq->dp, qstate->region)) {
-				if(have_dp) {
+			struct delegpt* retdp = NULL;
+			if(!can_have_last_resort(qstate->env, iq->dp->name, iq->dp->namelen, iq->qchase.qclass, &retdp)) {
+				if(retdp) {
 					verbose(VERB_QUERY, "cache has stub "
 						"or fwd but no addresses, "
 						"fallback to config");
-					if(have_dp && !iq->dp) {
+					iq->dp = delegpt_copy(retdp,
+						qstate->region);
+					if(!iq->dp) {
 						log_err("out of memory in "
 							"stub/fwd fallback");
 						errinf(qstate, "malloc failure, for fallback to config");
@@ -1724,11 +1677,10 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 			}
 			if(dname_is_root(iq->dp->name)) {
 				/* use safety belt */
-				int nolock = 0;
 				verbose(VERB_QUERY, "Cache has root NS but "
 				"no addresses. Fallback to the safety belt.");
-				iq->dp = hints_find_root(qstate->env->hints,
-					iq->qchase.qclass, nolock);
+				iq->dp = hints_lookup_root(qstate->env->hints, 
+					iq->qchase.qclass);
 				/* note deleg_msg is from previous lookup,
 				 * but RD is on, so it is not used */
 				if(!iq->dp) {
@@ -1737,7 +1689,6 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 						LDNS_RCODE_REFUSED);
 				}
 				iq->dp = delegpt_copy(iq->dp, qstate->region);
-				lock_rw_unlock(&qstate->env->hints->lock);
 				if(!iq->dp) {
 					log_err("out of memory in safety belt");
 					errinf(qstate, "malloc failure, in safety belt, for root");
@@ -1793,7 +1744,6 @@ processInitRequest2(struct module_qstate* qstate, struct iter_qstate* iq,
 	delnamelen = iq->qchase.qname_len;
 	if(iq->refetch_glue) {
 		struct iter_hints_stub* stub;
-		int nolock = 0;
 		if(!iq->dp) {
 			log_err("internal or malloc fail: no dp for refetch");
 			errinf(qstate, "malloc failure, no delegation info");
@@ -1803,14 +1753,12 @@ processInitRequest2(struct module_qstate* qstate, struct iter_qstate* iq,
 		 * this is above stub without stub-first. */
 		stub = hints_lookup_stub(
 			qstate->env->hints, iq->qchase.qname, iq->qchase.qclass,
-			iq->dp, nolock);
+			iq->dp);
 		if(!stub || !stub->dp->has_parent_side_NS || 
 			dname_subdomain_c(iq->dp->name, stub->dp->name)) {
 			delname = iq->dp->name;
 			delnamelen = iq->dp->namelen;
 		}
-		/* lock_() calls are macros that could be nothing, surround in {} */
-		if(stub) { lock_rw_unlock(&qstate->env->hints->lock); }
 	}
 	if(iq->qchase.qtype == LDNS_RR_TYPE_DS || iq->refetch_glue) {
 		if(!dname_is_root(delname))
@@ -1974,8 +1922,7 @@ generate_target_query(struct module_qstate* qstate, struct iter_qstate* iq,
 *	if it is negative, there is no maximum number of targets.
 * @param num: returns the number of queries generated and processed, 
 *	which may be zero if there were no missing targets.
- * @return 0 on success, nonzero on error. 1 means temporary failure and
- * 	2 means the failure can be cached.
+ * @return false on error.
 */
 static int
 query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
@@ -1998,13 +1945,13 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 	else	toget = maxtargets;
 	if(toget == 0) {
 		*num = 0;
-		return 0;
+		return 1;
 	}

 	/* now that we are sure that a target query is going to be made,
 	 * check the limits. */
 	if(iq->depth == ie->max_dependency_depth)
-		return 1;
+		return 0;
 	if(iq->depth > 0 && iq->target_count &&
 		iq->target_count[TARGET_COUNT_QUERIES] > MAX_TARGET_COUNT) {
 		char s[LDNS_MAX_DOMAINLEN+1];
@@ -2012,7 +1959,7 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 		verbose(VERB_QUERY, "request %s has exceeded the maximum "
 			"number of glue fetches %d", s,
 			iq->target_count[TARGET_COUNT_QUERIES]);
-		return 2;
+		return 0;
 	}
 	if(iq->dp_target_count > MAX_DP_TARGET_COUNT) {
 		char s[LDNS_MAX_DOMAINLEN+1];
@@ -2020,7 +1967,7 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 		verbose(VERB_QUERY, "request %s has exceeded the maximum "
 			"number of glue fetches %d to a single delegation point",
 			s, iq->dp_target_count);
-		return 2;
+		return 0;
 	}

 	/* select 'toget' items from the total of 'missing' items */
@@ -2049,7 +1996,7 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 				*num = query_count;
 				if(query_count > 0)
 					qstate->ext_state[id] = module_wait_subquery;
-				return 1;
+				return 0;
 			}
 			query_count++;
 			/* If the mesh query list is full, exit the loop here.
@@ -2058,16 +2005,8 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 			 * increase, because the spawned state uses cpu and a
 			 * socket while this state waits for that spawned
 			 * state. Next time we can look up further targets */
-			if(mesh_jostle_exceeded(qstate->env->mesh)) {
-				/* If no ip4 query is possible, that makes
-				 * this ns resolved. */
-				if(!((ie->supports_ipv4 || ie->use_nat64) &&
-					((ns->lame && !ns->done_pside4) ||
-					(!ns->lame && !ns->got4)))) {
-					ns->resolved = 1;
-				}
+			if(mesh_jostle_exceeded(qstate->env->mesh))
 				break;
-			}
 		}
 		/* Send the A request. */
 		if((ie->supports_ipv4 || ie->use_nat64) &&
@@ -2079,17 +2018,12 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 				*num = query_count;
 				if(query_count > 0)
 					qstate->ext_state[id] = module_wait_subquery;
-				return 1;
+				return 0;
 			}
 			query_count++;
 			/* If the mesh query list is full, exit the loop. */
-			if(mesh_jostle_exceeded(qstate->env->mesh)) {
-				/* With the ip6 query already checked for,
-				 * this makes the ns resolved. It is no longer
-				 * a missing target. */
-				ns->resolved = 1;
+			if(mesh_jostle_exceeded(qstate->env->mesh))
 				break;
-			}
 		}

 		/* mark this target as in progress. */
@@ -2103,7 +2037,7 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
 	if(query_count > 0)
 		qstate->ext_state[id] = module_wait_subquery;

-	return 0;
+	return 1;
 }

 /**
@@ -2128,7 +2062,7 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
 	log_assert(iq->dp);

 	if(!can_have_last_resort(qstate->env, iq->dp->name, iq->dp->namelen,
-		iq->qchase.qclass, NULL, NULL, NULL)) {
+		iq->qchase.qclass, NULL)) {
 		/* fail -- no more targets, no more hope of targets, no hope 
 		 * of a response. */
 		errinf(qstate, "all the configured stub or forward servers failed,");
@@ -2138,24 +2072,21 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
 		return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
 	}
 	if(!iq->dp->has_parent_side_NS && dname_is_root(iq->dp->name)) {
-		struct delegpt* dp;
-		int nolock = 0;
-		dp = hints_find_root(qstate->env->hints,
-			iq->qchase.qclass, nolock);
-		if(dp) {
+		struct delegpt* p = hints_lookup_root(qstate->env->hints,
+			iq->qchase.qclass);
+		if(p) {
 			struct delegpt_addr* a;
 			iq->chase_flags &= ~BIT_RD; /* go to authorities */
-			for(ns = dp->nslist; ns; ns=ns->next) {
+			for(ns = p->nslist; ns; ns=ns->next) {
 				(void)delegpt_add_ns(iq->dp, qstate->region,
 					ns->name, ns->lame, ns->tls_auth_name,
 					ns->port);
 			}
-			for(a = dp->target_list; a; a=a->next_target) {
+			for(a = p->target_list; a; a=a->next_target) {
 				(void)delegpt_add_addr(iq->dp, qstate->region,
 					&a->addr, a->addrlen, a->bogus,
 					a->lame, a->tls_auth_name, -1, NULL);
 			}
-			lock_rw_unlock(&qstate->env->hints->lock);
 		}
 		iq->dp->has_parent_side_NS = 1;
 	} else if(!iq->dp->has_parent_side_NS) {
@@ -2194,14 +2125,12 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
 	}
 	/* query for an extra name added by the parent-NS record */
 	if(delegpt_count_missing_targets(iq->dp, NULL) > 0) {
-		int qs = 0, ret;
+		int qs = 0;
 		verbose(VERB_ALGO, "try parent-side target name");
-		if((ret=query_for_targets(qstate, iq, ie, id, 1, &qs))!=0) {
+		if(!query_for_targets(qstate, iq, ie, id, 1, &qs)) {
 			errinf(qstate, "could not fetch nameserver");
 			errinf_dname(qstate, "at zone", iq->dp->name);
-			if(ret == 1)
-				return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
-			return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
 		iq->num_target_queries += qs;
 		target_count_increase(iq, qs);
@@ -2235,7 +2164,7 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq,
 		if( ((ie->supports_ipv6 && !ns->done_pside6) ||
 		    ((ie->supports_ipv4 || ie->use_nat64) && !ns->done_pside4)) &&
 		    !can_have_last_resort(qstate->env, ns->name, ns->namelen,
-			iq->qchase.qclass, NULL, NULL, NULL)) {
+			iq->qchase.qclass, NULL)) {
 			log_nametypeclass(VERB_ALGO, "cannot pside lookup ns "
 				"because it is also a stub/forward,",
 				ns->name, LDNS_RR_TYPE_NS, iq->qchase.qclass);
@@ -2430,13 +2359,13 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		verbose(VERB_QUERY, "request has exceeded the maximum "
 			"number of referrrals with %d", iq->referral_count);
 		errinf(qstate, "exceeded the maximum of referrals");
-		return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+		return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 	}
 	if(iq->sent_count > ie->max_sent_count) {
 		verbose(VERB_QUERY, "request has exceeded the maximum "
 			"number of sends with %d", iq->sent_count);
 		errinf(qstate, "exceeded the maximum number of sends");
-		return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+		return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 	}

 	/* Check if we reached MAX_TARGET_NX limit without a fallback activation. */
@@ -2466,7 +2395,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 				"already present for the delegation point, no "
 				"fallback possible");
 			errinf(qstate, "exceeded the maximum nameserver nxdomains");
-			return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
 		verbose(VERB_ALGO, "initiating parent-side fallback for "
 			"nxdomain nameserver lookups");
@@ -2509,7 +2438,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 				"lookups (%d) with %d", MAX_TARGET_NX_FALLBACK,
 				iq->target_count[TARGET_COUNT_NX]);
 			errinf(qstate, "exceeded the maximum nameserver nxdomains");
-			return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}

 		if(!iq->dp->has_parent_side_NS) {
@@ -2723,7 +2652,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		verbose(VERB_ALGO, "auth zone lookup failed, no fallback,"
 			" servfail");
 		errinf(qstate, "auth zone lookup failed, fallback is off");
-		return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+		return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 	}
 	if(iq->dp->auth_dp) {
 		/* we wanted to fallback, but had no delegpt, only the
@@ -2752,13 +2681,11 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,

 	/* if in 0x20 fallback get as many targets as possible */
 	if(iq->caps_fallback) {
-		int extra = 0, ret;
+		int extra = 0;
 		size_t naddr, nres, navail;
-		if((ret=query_for_targets(qstate, iq, ie, id, -1, &extra))!=0) {
+		if(!query_for_targets(qstate, iq, ie, id, -1, &extra)) {
 			errinf(qstate, "could not fetch nameservers for 0x20 fallback");
-			if(ret == 1)
-				return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
-			return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
 		iq->num_target_queries += extra;
 		target_count_increase(iq, extra);
@@ -2819,51 +2746,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 	delegpt_add_unused_targets(iq->dp);

 	if(qstate->env->auth_zones) {
-		uint8_t* sname = NULL;
-		size_t snamelen = 0;
-		/* apply rpz triggers at query time; nameserver IP and dname */
-		struct dns_msg* forged_response_after_cname;
+		/* apply rpz triggers at query time */
 		struct dns_msg* forged_response = rpz_callback_from_iterator_module(qstate, iq);
-		int count = 0;
-		while(forged_response && reply_find_rrset_section_an(
-			forged_response->rep, iq->qchase.qname,
-			iq->qchase.qname_len, LDNS_RR_TYPE_CNAME,
-			iq->qchase.qclass) &&
-			iq->qchase.qtype != LDNS_RR_TYPE_CNAME &&
-			count++ < ie->max_query_restarts) {
-			/* another cname to follow */
-			if(!handle_cname_response(qstate, iq, forged_response,
-				&sname, &snamelen)) {
-				errinf(qstate, "malloc failure, CNAME info");
-				return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
-			}
-			iq->qchase.qname = sname;
-			iq->qchase.qname_len = snamelen;
-			forged_response_after_cname =
-				rpz_callback_from_iterator_cname(qstate, iq);
-			if(forged_response_after_cname) {
-				forged_response = forged_response_after_cname;
-			} else {
-				/* Follow the CNAME with a query restart */
-				iq->deleg_msg = NULL;
-				iq->dp = NULL;
-				iq->dsns_point = NULL;
-				iq->auth_zone_response = 0;
-				iq->refetch_glue = 0;
-				iq->query_restart_count++;
-				iq->sent_count = 0;
-				iq->dp_target_count = 0;
-				if(qstate->env->cfg->qname_minimisation)
-					iq->minimisation_state = INIT_MINIMISE_STATE;
-				outbound_list_clear(&iq->outlist);
-				iq->num_current_queries = 0;
-				fptr_ok(fptr_whitelist_modenv_detach_subs(
-					qstate->env->detach_subs));
-				(*qstate->env->detach_subs)(qstate);
-				iq->num_target_queries = 0;
-				return next_state(iq, INIT_REQUEST_STATE);
-			}
-		}
 		if(forged_response != NULL) {
 			qstate->ext_state[id] = module_finished;
 			qstate->return_rcode = LDNS_RCODE_NOERROR;
@@ -2901,17 +2785,14 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 			 * to distinguish between generating (a) new target 
 			 * query, or failing. */
 			if(delegpt_count_missing_targets(iq->dp, NULL) > 0) {
-				int qs = 0, ret;
+				int qs = 0;
 				verbose(VERB_ALGO, "querying for next "
 					"missing target");
-				if((ret=query_for_targets(qstate, iq, ie, id, 
-					1, &qs))!=0) {
+				if(!query_for_targets(qstate, iq, ie, id, 
+					1, &qs)) {
 					errinf(qstate, "could not fetch nameserver");
 					errinf_dname(qstate, "at zone", iq->dp->name);
-					if(ret == 1)
-						return error_response(qstate, id,
-							LDNS_RCODE_SERVFAIL);
-					return error_response_cache(qstate, id,
+					return error_response(qstate, id,
 						LDNS_RCODE_SERVFAIL);
 				}
 				if(qs == 0 && 
@@ -2923,17 +2804,6 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 					 * so this is not a loop. */
 					return 1;
 				}
-				if(qs == 0) {
-					/* There should be targets now, and
-					 * if there are not, it should not
-					 * wait for no targets. Stop it from
-					 * waiting forever, or looping to
-					 * here, as a safeguard. */
-					errinf(qstate, "could not generate nameserver lookups");
-					errinf_dname(qstate, "at zone", iq->dp->name);
-					return error_response(qstate, id,
-						LDNS_RCODE_SERVFAIL);
-				}
 				iq->num_target_queries += qs;
 				target_count_increase(iq, qs);
 			}
@@ -3057,7 +2927,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 			qstate->was_ratelimited = 1;
 			errinf_dname(qstate, "exceeded ratelimit for zone",
 				iq->dp->name);
-			return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
 		log_addr(VERB_QUERY, "error sending query to auth server",
 			&real_addr, real_addrlen);
@@ -3212,8 +3082,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			/* DNAME to a subdomain loop; do not recurse */
 			type = RESPONSE_TYPE_ANSWER;
 		}
-	}
-	if(type == RESPONSE_TYPE_CNAME &&
+	} else if(type == RESPONSE_TYPE_CNAME &&
 		iq->qchase.qtype == LDNS_RR_TYPE_CNAME &&
 		iq->minimisation_state == MINIMISE_STATE &&
 		query_dname_compare(iq->qchase.qname, iq->qinfo_out.qname) == 0) {
@@ -3279,7 +3148,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 						iter_scrub_nxdomain(iq->response);
 						return final_state(iq);
 					}
-					return error_response_cache(qstate, id,
+					return error_response(qstate, id,
 						LDNS_RCODE_SERVFAIL);
 				}
 				/* Best effort qname-minimisation. 
@@ -3324,7 +3193,6 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		}
 		return final_state(iq);
 	} else if(type == RESPONSE_TYPE_REFERRAL) {
-		struct delegpt* old_dp = NULL;
 		/* REFERRAL type responses get a reset of the 
 		 * delegation point, and back to the QUERYTARGETS_STATE. */
 		verbose(VERB_DETAIL, "query response was REFERRAL");
@@ -3376,8 +3244,6 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		/* Reset the event state, setting the current delegation 
 		 * point to the referral. */
 		iq->deleg_msg = iq->response;
-		/* Keep current delegation point for label comparison */
-		old_dp = iq->dp;
 		iq->dp = delegpt_from_message(iq->response, qstate->region);
 		if (qstate->env->cfg->qname_minimisation)
 			iq->minimisation_state = INIT_MINIMISE_STATE;
@@ -3385,20 +3251,6 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			errinf(qstate, "malloc failure, for delegation point");
 			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
-		if(old_dp->namelabs + 1 < iq->dp->namelabs) {
-			/* We got a grandchild delegation (more than one label
-			 * difference) than expected. Check for in-between
-			 * delegations in the cache and remove them.
-			 * They could prove problematic when they expire
-			 * and rrset_expired_above() encounters them during
-			 * delegation cache lookups. */
-			uint8_t* qname = iq->dp->name;
-			size_t qnamelen = iq->dp->namelen;
-			rrset_cache_remove_above(qstate->env->rrset_cache,
-				&qname, &qnamelen, LDNS_RR_TYPE_NS,
-				iq->qchase.qclass, *qstate->env->now,
-				old_dp->name, old_dp->namelen);
-		}
 		if(!cache_fill_missing(qstate->env, iq->qchase.qclass, 
 			qstate->region, iq->dp)) {
 			errinf(qstate, "malloc failure, copy extra info into delegation point");
@@ -3489,13 +3341,10 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			/* apply rpz qname triggers after cname */
 			struct dns_msg* forged_response =
 				rpz_callback_from_iterator_cname(qstate, iq);
-			int count = 0;
 			while(forged_response && reply_find_rrset_section_an(
 				forged_response->rep, iq->qchase.qname,
 				iq->qchase.qname_len, LDNS_RR_TYPE_CNAME,
-				iq->qchase.qclass) &&
-				iq->qchase.qtype != LDNS_RR_TYPE_CNAME &&
-				count++ < ie->max_query_restarts) {
+				iq->qchase.qclass)) {
 				/* another cname to follow */
 				if(!handle_cname_response(qstate, iq, forged_response,
 					&sname, &snamelen)) {
@@ -3614,7 +3463,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 				" fallback possible, servfail");
 			errinf_dname(qstate, "response is bad, no fallback, "
 				"for auth zone", iq->dp->name);
-			return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL);
+			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
 		verbose(VERB_ALGO, "auth zone response was bad, "
 			"fallback enabled");
@@ -4022,7 +3871,7 @@ processCollectClass(struct module_qstate* qstate, int id)
 		if(iq->num_current_queries == 0) {
 			verbose(VERB_ALGO, "No root hints or fwds, giving up "
 				"on qclass ANY");
-			return error_response_cache(qstate, id, LDNS_RCODE_REFUSED);
+			return error_response(qstate, id, LDNS_RCODE_REFUSED);
 		}
 		/* return false, wait for queries to return */
 	}
@@ -4077,9 +3926,17 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq,
 		!qstate->env->cfg->val_log_squelch) {
 		char* err_str = errinf_to_str_misc(qstate);
 		if(err_str) {
+			size_t err_str_len = strlen(err_str);
 			verbose(VERB_ALGO, "iterator EDE: %s", err_str);
-			iq->response->rep->reason_bogus_str = err_str;
+			/* allocate space and store the error
+			 * string */
+			iq->response->rep->reason_bogus_str = regional_alloc(
+				qstate->region,
+				sizeof(char) * (err_str_len+1));
+			memcpy(iq->response->rep->reason_bogus_str,
+				err_str, err_str_len+1);
 		}
+		free(err_str);
 	}

 	/* we have finished processing this query */
@@ -4389,7 +4246,7 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
 					"getting different replies, failed");
 				outbound_list_remove(&iq->outlist, outbound);
 				errinf(qstate, "0x20 failed, then got different replies in fallback");
-				(void)error_response_cache(qstate, id,
+				(void)error_response(qstate, id, 
 					LDNS_RCODE_SERVFAIL);
 				return;
 			}
@@ -4489,8 +4346,8 @@ iter_get_mem(struct module_env* env, int id)
 */
 static struct module_func_block iter_block = {
 	"iterator",
-	NULL, NULL, &iter_init, &iter_deinit, &iter_operate,
-	&iter_inform_super, &iter_clear, &iter_get_mem
+	&iter_init, &iter_deinit, &iter_operate, &iter_inform_super, 
+	&iter_clear, &iter_get_mem
 };

 struct module_func_block* 
@@ -53,8 +53,6 @@
 #include "util/storage/slabhash.h"
 #include "util/edns.h"
 #include "sldns/sbuffer.h"
-#include "iterator/iter_fwd.h"
-#include "iterator/iter_hints.h"

 int 
 context_finalize(struct ub_ctx* ctx)
@@ -75,9 +73,7 @@ context_finalize(struct ub_ctx* ctx)
 	ctx->pipe_pid = getpid();
 	cfg_apply_local_port_policy(cfg, 65536);
 	config_apply(cfg);
-	if(!modstack_call_startup(&ctx->mods, cfg->module_conf, ctx->env))
-		return UB_INITFAIL;
-	if(!modstack_call_init(&ctx->mods, cfg->module_conf, ctx->env))
+	if(!modstack_setup(&ctx->mods, cfg->module_conf, ctx->env))
 		return UB_INITFAIL;
 	listen_setup_locks();
 	log_edns_known_options(VERB_ALGO, ctx->env);
@@ -89,12 +85,6 @@ context_finalize(struct ub_ctx* ctx)
 	if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1, &is_rpz,
 		ctx->env, &ctx->mods))
 		return UB_INITFAIL;
-	if(!(ctx->env->fwds = forwards_create()) ||
-		!forwards_apply_cfg(ctx->env->fwds, cfg))
-		return UB_INITFAIL;
-	if(!(ctx->env->hints = hints_create()) ||
-		!hints_apply_cfg(ctx->env->hints, cfg))
-		return UB_INITFAIL;
 	if(!edns_strings_apply_cfg(ctx->env->edns_strings, cfg))
 		return UB_INITFAIL;
 	if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size,
@@ -66,8 +66,6 @@
 #include "services/authzone.h"
 #include "services/listen_dnsport.h"
 #include "sldns/sbuffer.h"
-#include "iterator/iter_fwd.h"
-#include "iterator/iter_hints.h"
 #ifdef HAVE_PTHREAD
 #include <signal.h>
 #endif
@@ -173,7 +171,6 @@ static struct ub_ctx* ub_ctx_create_nopipe(void)
 	ctx->env->worker = NULL;
 	ctx->env->need_to_validate = 0;
 	modstack_init(&ctx->mods);
-	ctx->env->modstack = &ctx->mods;
 	rbtree_init(&ctx->queries, &context_query_cmp);
 	return ctx;
 }
@@ -188,9 +185,7 @@ ub_ctx_create(void)
 		int e = errno;
 		ub_randfree(ctx->seed_rnd);
 		config_delete(ctx->env->cfg);
-		modstack_call_deinit(&ctx->mods, ctx->env);
-		modstack_call_destartup(&ctx->mods, ctx->env);
-		modstack_free(&ctx->mods);
+		modstack_desetup(&ctx->mods, ctx->env);
 		listen_desetup_locks();
 		edns_known_options_delete(ctx->env);
 		edns_strings_delete(ctx->env->edns_strings);
@@ -204,9 +199,7 @@ ub_ctx_create(void)
 		tube_delete(ctx->qq_pipe);
 		ub_randfree(ctx->seed_rnd);
 		config_delete(ctx->env->cfg);
-		modstack_call_deinit(&ctx->mods, ctx->env);
-		modstack_call_destartup(&ctx->mods, ctx->env);
-		modstack_free(&ctx->mods);
+		modstack_desetup(&ctx->mods, ctx->env);
 		listen_desetup_locks();
 		edns_known_options_delete(ctx->env);
 		edns_strings_delete(ctx->env->edns_strings);
@@ -364,9 +357,7 @@ ub_ctx_delete(struct ub_ctx* ctx)
 	}
 	libworker_delete_event(ctx->event_worker);

-	modstack_call_deinit(&ctx->mods, ctx->env);
-	modstack_call_destartup(&ctx->mods, ctx->env);
-	modstack_free(&ctx->mods);
+	modstack_desetup(&ctx->mods, ctx->env);
 	a = ctx->alloc_list;
 	while(a) {
 		na = a->super;
@@ -388,8 +379,6 @@ ub_ctx_delete(struct ub_ctx* ctx)
 		config_delete(ctx->env->cfg);
 		edns_known_options_delete(ctx->env);
 		edns_strings_delete(ctx->env->edns_strings);
-		forwards_delete(ctx->env->fwds);
-		hints_delete(ctx->env->hints);
 		auth_zones_delete(ctx->env->auth_zones);
 		free(ctx->env);
 	}
@@ -987,8 +976,7 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 	if(!addr) {
 		/* disable fwd mode - the root stub should be first. */
 		if(ctx->env->cfg->forwards &&
-			(ctx->env->cfg->forwards->name &&
-			strcmp(ctx->env->cfg->forwards->name, ".") == 0)) {
+			strcmp(ctx->env->cfg->forwards->name, ".") == 0) {
 			s = ctx->env->cfg->forwards;
 			ctx->env->cfg->forwards = s->next;
 			s->next = NULL;
@@ -1008,8 +996,7 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 	/* it parses, add root stub in front of list */
 	lock_basic_lock(&ctx->cfglock);
 	if(!ctx->env->cfg->forwards ||
-		(ctx->env->cfg->forwards->name &&
-		strcmp(ctx->env->cfg->forwards->name, ".") != 0)) {
+		strcmp(ctx->env->cfg->forwards->name, ".") != 0) {
 		s = calloc(1, sizeof(*s));
 		if(!s) {
 			lock_basic_unlock(&ctx->cfglock);
@@ -1027,7 +1014,6 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 		ctx->env->cfg->forwards = s;
 	} else {
 		log_assert(ctx->env->cfg->forwards);
-		log_assert(ctx->env->cfg->forwards->name);
 		s = ctx->env->cfg->forwards;
 	}
 	dupl = strdup(addr);
@@ -70,6 +70,8 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgencode.h"
 #include "util/tube.h"
+#include "iterator/iter_fwd.h"
+#include "iterator/iter_hints.h"
 #include "sldns/sbuffer.h"
 #include "sldns/str2wire.h"
 #ifdef USE_DNSTAP
@@ -98,6 +100,8 @@ libworker_delete_env(struct libworker* w)
 			!w->is_bg || w->is_bg_thread);
 		sldns_buffer_free(w->env->scratch_buffer);
 		regional_destroy(w->env->scratch);
+		forwards_delete(w->env->fwds);
+		hints_delete(w->env->hints);
 		ub_randfree(w->env->rnd);
 		free(w->env);
 	}
@@ -155,19 +159,30 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 	}
 	w->env->scratch = regional_create_custom(cfg->msg_buffer_size);
 	w->env->scratch_buffer = sldns_buffer_new(cfg->msg_buffer_size);
+	w->env->fwds = forwards_create();
+	if(w->env->fwds && !forwards_apply_cfg(w->env->fwds, cfg)) { 
+		forwards_delete(w->env->fwds);
+		w->env->fwds = NULL;
+	}
+	w->env->hints = hints_create();
+	if(w->env->hints && !hints_apply_cfg(w->env->hints, cfg)) { 
+		hints_delete(w->env->hints);
+		w->env->hints = NULL;
+	}
 #ifdef HAVE_SSL
 	w->sslctx = connect_sslctx_create(NULL, NULL,
 		cfg->tls_cert_bundle, cfg->tls_win_cert);
 	if(!w->sslctx) {
 		/* to make the setup fail after unlock */
-		sldns_buffer_free(w->env->scratch_buffer);
-		w->env->scratch_buffer = NULL;
+		hints_delete(w->env->hints);
+		w->env->hints = NULL;
 	}
 #endif
 	if(!w->is_bg || w->is_bg_thread) {
 		lock_basic_unlock(&ctx->cfglock);
 	}
-	if(!w->env->scratch || !w->env->scratch_buffer) {
+	if(!w->env->scratch || !w->env->scratch_buffer || !w->env->fwds ||
+		!w->env->hints) {
 		libworker_delete(w);
 		return NULL;
 	}
@@ -45,24 +45,20 @@ usage () {
 Usage $0: [-h] [-s] [-u git_url] [-b git_branch] [-w ...args...]
 Generate a distribution tar file for unbound.

-    -h                  This usage information.
-    -s                  Build a snapshot distribution file.  The current date is
-                        automatically appended to the current unbound version number.
-    -rc <nr>            Build a release candidate, the given string will be added
-                        to the version number
-                        (which will then be unbound-<version>rc<number>)
-    -u git_url          Retrieve the source from the specified repository url.
-                        Detected from the working copy if not specified.
-    -b git_branch       Retrieve the specified branch or tag.
-                        Detected from the working copy if not specified.
+    -h           This usage information.
+    -s           Build a snapshot distribution file.  The current date is
+                 automatically appended to the current unbound version number.
+    -rc <nr>     Build a release candidate, the given string will be added
+                 to the version number 
+                 (which will then be unbound-<version>rc<number>)
+    -u git_url   Retrieve the source from the specified repository url.
+                 Detected from the working copy if not specified.
+    -b git_branch Retrieve the the specified branch or tag.
+                 Detected from the working copy if not specified.
    -wssl openssl.xx.tar.gz Also build openssl from tarball for windows dist.
    -wxp expat.xx.tar.gz Also build expat from tarball for windows dist.
-    -wdir directory     Build openssl and expat in a persistent directory for
-                        windows dist. If builds are already in that directory
-                        they are used right away. Useful when debuggin windows
-                        builds.
-    -w32                32bit windows compile.
-    -w ...              Build windows binary dist. last args passed to configure.
+    -w32	 32bit windows compile.
+    -w ...       Build windows binary dist. last args passed to configure.
 EOF
    exit 1
 }
@@ -147,16 +143,6 @@ create_temp_dir () {
    cd $temp_dir
 }

-activate_windebug_dir () {
-    info "Activating persistent directory for windows build."
-    if test ! -d "$WINDIR"; then
-        mkdir -p "$WINDIR"
-        info "Created $WINDIR persistent directory."
-    fi
-    cd "$WINDIR"
-    WINDIR="`pwd`"
-}
-
 # pass filename as $1 arg.
 # creates file.sha1 and file.sha256
 storehash () {
@@ -201,9 +187,7 @@ DOWIN="no"
 W64="yes"
 WINSSL=""
 WINEXPAT=""
-WINDIR=""
-# Use environment if set otherwise null
-MINJ="${MINJ:+$MINJ}"
+MINJ=""

 # Parse the command line arguments.
 while [ "$1" ]; do
@@ -230,10 +214,6 @@ while [ "$1" ]; do
 	    WINEXPAT="$2"
 	    shift
 	    ;;
-        "-wdir")
-	    WINDIR="$2"
-	    shift
-	    ;;
 	"-w32")
 	    W64="no"
 	    ;;
@@ -273,27 +253,8 @@ if [ "$DOWIN" = "yes" ]; then
 	shared_cross_flag=""

 	check_git_repo
+	create_temp_dir

-	if test -n "$WINDIR"; then
-		activate_windebug_dir
-	else
-		create_temp_dir
-	fi
-
-	if test -n "$WINSSL" \
-		-a -n "$WINDIR" \
-		-a -d "$WINDIR" \
-		-a -d "${WINDIR}/sslinstall" \
-		-a -d "${WINDIR}/openssl_shared" \
-		-a -d "${WINDIR}/sslsharedinstall"; then
-		info "Found already compiled openssl at $WINDIR/sslinstall; using that."
-		WINSSL=""
-		# Variables needed later on.
-		sslinstall="${WINDIR}/sslinstall"
-		cross_flag="$cross_flag --with-ssl=$sslinstall"
-		sslsharedinstall="${WINDIR}/sslsharedinstall"
-		shared_cross_flag="$shared_cross_flag --with-ssl=$sslsharedinstall"
-	fi
 	# crosscompile openssl for windows.
 	if test -n "$WINSSL"; then
 		info "Cross compile $WINSSL"
@@ -362,17 +323,6 @@ if [ "$DOWIN" = "yes" ]; then
 		cd ..
 	fi

-	if test -n "$WINEXPAT" \
-		-a -n "$WINDIR" \
-		-a -d "$WINDIR" \
-		-a -d "${WINDIR}/wxpinstall"; then
-		info "Found already compiled expat at $WINDIR/wxpinstall; using that."
-		WINEXPAT=""
-		# Variables needed later on.
-		wxpinstall="${WINDIR}/wxpinstall"
-		cross_flag="$cross_flag --with-libexpat=$wxpinstall"
-		shared_cross_flag="$shared_cross_flag --with-libexpat=$wxpinstall"
-	fi
 	if test -n "$WINEXPAT"; then
 		info "Cross compile $WINEXPAT"
 		info "wxp: tar unpack"
@@ -399,12 +349,8 @@ if [ "$DOWIN" = "yes" ]; then
 		cd ..
 	fi

-	if test -n "$WINDIR"; then
-		cd "$cwd"
-		create_temp_dir
-	fi
-	info "GITREPO   is $GITREPO"
-	info "GITBRANCH is $GITBRANCH"
+        info "GITREPO   is $GITREPO"
+        info "GITBRANCH is $GITBRANCH"
 	info "Exporting source from git."
 	info "git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound"
 	git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound || error_cleanup "git clone failed"
@@ -443,10 +389,7 @@ if [ "$DOWIN" = "yes" ]; then
    fi

    if test "`uname`" = "Linux"; then 
-	    cd ..
-	    cp -r unbound unbound_shared
-	    unbound_shared="`pwd`/unbound_shared"
-	    cd unbound
+	    (cd ..; cp -r unbound unbound_shared)
    fi

    # procedure for making unbound installer on mingw. 
@@ -460,15 +403,13 @@ if [ "$DOWIN" = "yes" ]; then
    fi
    if test "$W64" = "no"; then
 		# Disable stack-protector for 32-bit windows builds.
-		set -x
+		echo "$configure"' --enable-debug --enable-static-exe --disable-flto --disable-gost '"$* $cross_flag" "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector' LDFLAGS="-fno-stack-protector"
 		$configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector' LDFLAGS="-fno-stack-protector" \
 		|| error_cleanup "Could not configure"
-		set +x
    else
-		set -x
+		echo "$configure"' --enable-debug --enable-static-exe --disable-flto --disable-gost '"$* $cross_flag"
 		$configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag \
 		|| error_cleanup "Could not configure"
-		set +x
    fi
    info "Calling make"
 	make $MINJ || error_cleanup "Could not make"
@@ -476,18 +417,16 @@ if [ "$DOWIN" = "yes" ]; then

    if test "`uname`" = "Linux"; then 
    info "Make DLL"
-    cd $unbound_shared
+    cd ../unbound_shared
    if test "$W64" = "no"; then
 	# Disable stack-protector for 32-bit windows builds.
-		set -x
+		echo "$configure"' --enable-debug --disable-flto --disable-gost '"$* $shared_cross_flag" "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector' LDFLAGS="-fno-stack-protector"
 		$configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector' LDFLAGS="-fno-stack-protector" \
 		|| error_cleanup "Could not configure"
-		set +x
    else
-		set -x
-		$configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag \
+		echo "$configure"' --enable-debug --disable-flto --disable-gost '"$* $shared_cross_flag"
+        $configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag \
 		|| error_cleanup "Could not configure"
-		set +x
    fi
    info "Calling make for DLL"
 	make $MINJ || error_cleanup "Could not make DLL"
@@ -516,26 +455,17 @@ if [ "$DOWIN" = "yes" ]; then
    cp ../unbound.exe ../unbound-anchor.exe ../unbound-host.exe ../unbound-control.exe ../unbound-checkconf.exe ../unbound-service-install.exe ../unbound-service-remove.exe ../LICENSE ../winrc/unbound-control-setup.cmd ../winrc/unbound-website.url ../winrc/service.conf ../winrc/README.txt ../contrib/create_unbound_ad_servers.cmd ../contrib/warmup.cmd ../contrib/unbound_cache.cmd .
    mkdir libunbound
    # test to see if lib or lib64 (for openssl 3.0.0) needs to be used
-    if test -f $sslsharedinstall/lib/libcrypto.dll.a; then
-	cp $sslsharedinstall/lib/libcrypto.dll.a libunbound/.
+    if test -f ../../sslsharedinstall/lib/libcrypto.dll.a; then
+	cp ../../sslsharedinstall/lib/libcrypto.dll.a libunbound/.
    else
-	cp $sslsharedinstall/lib64/libcrypto.dll.a libunbound/.
+	cp ../../sslsharedinstall/lib64/libcrypto.dll.a libunbound/.
    fi
-    if test -f $sslsharedinstall/lib/libssl.dll.a; then
-	cp $sslsharedinstall/lib/libssl.dll.a libunbound/.
+    if test -f ../../sslsharedinstall/lib/libssl.dll.a; then
+	cp ../../sslsharedinstall/lib/libssl.dll.a libunbound/.
    else
-	cp $sslsharedinstall/lib64/libssl.dll.a libunbound/.
+	cp ../../sslsharedinstall/lib64/libssl.dll.a libunbound/.
    fi
-    cp $unbound_shared/unbound.h               \
-	$unbound_shared/.libs/libunbound*.dll  \
-	$unbound_shared/.libs/libunbound.dll.a \
-	$unbound_shared/.libs/libunbound.a     \
-	$unbound_shared/.libs/libunbound*.def  \
-	$sslsharedinstall/bin/libcrypto*.dll   \
-	$sslsharedinstall/bin/libssl*.dll      \
-	$wxpinstall/bin/libexpat*.dll          \
-	$wxpinstall/lib/libexpat.dll.a         \
-	libunbound/.
+    cp ../../unbound_shared/unbound.h ../../unbound_shared/.libs/libunbound*.dll ../../unbound_shared/.libs/libunbound.dll.a ../../unbound_shared/.libs/libunbound.a ../../unbound_shared/.libs/libunbound*.def ../../sslsharedinstall/bin/libcrypto*.dll ../../sslsharedinstall/bin/libssl*.dll ../../wxpinstall/bin/libexpat*.dll ../../wxpinstall/lib/libexpat.dll.a libunbound/.
    if test -f "$sspdll"; then
 	    cp "$sspdll" libunbound/.
    fi
@@ -565,11 +495,6 @@ if [ "$DOWIN" = "yes" ]; then
    storehash unbound-$version.zip
    ls -lG unbound_setup_$version.exe
    ls -lG unbound-$version.zip
-
-    echo "create signed versions with:"
-    echo "  gpg --armor --detach-sign --digest-algo SHA256 unbound_setup_$version.exe"
-    echo "  gpg --armor --detach-sign --digest-algo SHA256 unbound-$version.zip"
-
    info "Done"
    exit 0
 fi
@@ -1416,7 +1416,7 @@ struct delegpt* dns_cache_find_delegation(struct module_env* env,
 int iter_dp_is_useless(struct query_info* qinfo, uint16_t qflags,
        struct delegpt* dp, int supports_ipv4, int supports_ipv6, int use_nat64);
 struct iter_hints_stub* hints_lookup_stub(struct iter_hints* hints,
-        uint8_t* qname, uint16_t qclass, struct delegpt* dp, int nolock);
+        uint8_t* qname, uint16_t qclass, struct delegpt* dp);

 /* Custom function to perform logic similar to the one in daemon/cachedump.c */
 struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t nmlen);
@@ -1433,7 +1433,6 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n
    struct query_info qinfo;
    struct iter_hints_stub* stub;
    uint32_t timenow = *qstate->env->now;
-    int nolock = 0;

    regional_free_all(region);
    qinfo.qname = (uint8_t*)nm;
@@ -1456,12 +1455,9 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n
            dname_str((uint8_t*)nm, b);
            continue;
        }
-        stub = hints_lookup_stub(qstate->env->hints, qinfo.qname,
-            qinfo.qclass, dp, nolock);
+        stub = hints_lookup_stub(qstate->env->hints, qinfo.qname, qinfo.qclass, dp);
        if (stub) {
-            struct delegpt* stubdp = delegpt_copy(stub->dp, region);
-            lock_rw_unlock(&qstate->env->hints->lock);
-            return stubdp;
+            return stub->dp;
        } else {
            return dp;
        }
@@ -356,11 +356,11 @@ int pythonmod_init(struct module_env* env, int id)
 	return 0;
      }
 #endif
+      Py_NoSiteFlag = 1;
 #if PY_MAJOR_VERSION >= 3
      PyImport_AppendInittab(SWIG_name, (void*)SWIG_init);
 #endif
 #if PY_VERSION_HEX < 0x03080000
-      Py_NoSiteFlag = 1;
      Py_Initialize();
 #else
      PyConfig_InitPythonConfig(&config);
@@ -777,8 +777,8 @@ size_t pythonmod_get_mem(struct module_env* env, int id)
 */
 static struct module_func_block pythonmod_block = {
   "python",
-   NULL, NULL, &pythonmod_init, &pythonmod_deinit, &pythonmod_operate,
-   &pythonmod_inform_super, &pythonmod_clear, &pythonmod_get_mem
+   &pythonmod_init, &pythonmod_deinit, &pythonmod_operate, &pythonmod_inform_super,
+   &pythonmod_clear, &pythonmod_get_mem
 };

 struct module_func_block* pythonmod_get_funcblock(void)
@@ -1259,8 +1259,8 @@ respip_get_mem(struct module_env* env, int id)
 */
 static struct module_func_block respip_block = {
 	"respip",
-	NULL, NULL, &respip_init, &respip_deinit, &respip_operate,
-	&respip_inform_super, &respip_clear, &respip_get_mem
+	&respip_init, &respip_deinit, &respip_operate, &respip_inform_super,
+	&respip_clear, &respip_get_mem
 };

 struct module_func_block*
@@ -2152,16 +2152,6 @@ auth_zones_cfg(struct auth_zones* az, struct config_auth* c)
 		if(az->rpz_first)
 			az->rpz_first->rpz_az_prev = z;
 		az->rpz_first = z;
-	} else if(c->isrpz && z->rpz) {
-		if(!rpz_config(z->rpz, c)) {
-			log_err("Could not change rpz config");
-			if(x) {
-				lock_basic_unlock(&x->lock);
-			}
-			lock_rw_unlock(&z->lock);
-			lock_rw_unlock(&az->rpz_lock);
-			return 0;
-		}
 	}
 	if(c->isrpz) {
 		lock_rw_unlock(&az->rpz_lock);
@@ -7778,8 +7768,7 @@ static void auth_zone_log(uint8_t* name, enum verbosity_value level,
 static int zonemd_dnssec_verify_rrset(struct auth_zone* z,
 	struct module_env* env, struct module_stack* mods,
 	struct ub_packed_rrset_key* dnskey, struct auth_data* node,
-	struct auth_rrset* rrset, char** why_bogus, uint8_t* sigalg,
-	char* reasonbuf, size_t reasonlen)
+	struct auth_rrset* rrset, char** why_bogus, uint8_t* sigalg)
 {
 	struct ub_packed_rrset_key pk;
 	enum sec_status sec;
@@ -7809,7 +7798,7 @@ static int zonemd_dnssec_verify_rrset(struct auth_zone* z,
 			"zonemd: verify %s RRset with DNSKEY", typestr);
 	}
 	sec = dnskeyset_verify_rrset(env, ve, &pk, dnskey, sigalg, why_bogus, NULL,
-		LDNS_SECTION_ANSWER, NULL, &verified, reasonbuf, reasonlen);
+		LDNS_SECTION_ANSWER, NULL, &verified);
 	if(sec == sec_status_secure) {
 		return 1;
 	}
@@ -7852,8 +7841,7 @@ static int nsec3_of_param_has_type(struct auth_rrset* nsec3, int algo,
 static int zonemd_check_dnssec_absence(struct auth_zone* z,
 	struct module_env* env, struct module_stack* mods,
 	struct ub_packed_rrset_key* dnskey, struct auth_data* apex,
-	char** reason, char** why_bogus, uint8_t* sigalg, char* reasonbuf,
-	size_t reasonlen)
+	char** reason, char** why_bogus, uint8_t* sigalg)
 {
 	struct auth_rrset* nsec = NULL;
 	if(!apex) {
@@ -7865,7 +7853,7 @@ static int zonemd_check_dnssec_absence(struct auth_zone* z,
 		struct ub_packed_rrset_key pk;
 		/* dnssec verify the NSEC */
 		if(!zonemd_dnssec_verify_rrset(z, env, mods, dnskey, apex,
-			nsec, why_bogus, sigalg, reasonbuf, reasonlen)) {
+			nsec, why_bogus, sigalg)) {
 			*reason = "DNSSEC verify failed for NSEC RRset";
 			return 0;
 		}
@@ -7908,7 +7896,7 @@ static int zonemd_check_dnssec_absence(struct auth_zone* z,
 		}
 		/* dnssec verify the NSEC3 */
 		if(!zonemd_dnssec_verify_rrset(z, env, mods, dnskey, match,
-			nsec3, why_bogus, sigalg, reasonbuf, reasonlen)) {
+			nsec3, why_bogus, sigalg)) {
 			*reason = "DNSSEC verify failed for NSEC3 RRset";
 			return 0;
 		}
@@ -7930,7 +7918,7 @@ static int zonemd_check_dnssec_soazonemd(struct auth_zone* z,
 	struct module_env* env, struct module_stack* mods,
 	struct ub_packed_rrset_key* dnskey, struct auth_data* apex,
 	struct auth_rrset* zonemd_rrset, char** reason, char** why_bogus,
-	uint8_t* sigalg, char* reasonbuf, size_t reasonlen)
+	uint8_t* sigalg)
 {
 	struct auth_rrset* soa;
 	if(!apex) {
@@ -7943,12 +7931,12 @@ static int zonemd_check_dnssec_soazonemd(struct auth_zone* z,
 		return 0;
 	}
 	if(!zonemd_dnssec_verify_rrset(z, env, mods, dnskey, apex, soa,
-		why_bogus, sigalg, reasonbuf, reasonlen)) {
+		why_bogus, sigalg)) {
 		*reason = "DNSSEC verify failed for SOA RRset";
 		return 0;
 	}
 	if(!zonemd_dnssec_verify_rrset(z, env, mods, dnskey, apex,
-		zonemd_rrset, why_bogus, sigalg, reasonbuf, reasonlen)) {
+		zonemd_rrset, why_bogus, sigalg)) {
 		*reason = "DNSSEC verify failed for ZONEMD RRset";
 		return 0;
 	}
@@ -8016,7 +8004,6 @@ auth_zone_verify_zonemd_with_key(struct auth_zone* z, struct module_env* env,
 	struct module_stack* mods, struct ub_packed_rrset_key* dnskey,
 	int is_insecure, char** result, uint8_t* sigalg)
 {
-	char reasonbuf[256];
 	char* reason = NULL, *why_bogus = NULL;
 	struct auth_data* apex = NULL;
 	struct auth_rrset* zonemd_rrset = NULL;
@@ -8045,8 +8032,7 @@ auth_zone_verify_zonemd_with_key(struct auth_zone* z, struct module_env* env,
 	} else if(!zonemd_rrset && dnskey && !is_insecure) {
 		/* fetch, DNSSEC verify, and check NSEC/NSEC3 */
 		if(!zonemd_check_dnssec_absence(z, env, mods, dnskey, apex,
-			&reason, &why_bogus, sigalg, reasonbuf,
-			sizeof(reasonbuf))) {
+			&reason, &why_bogus, sigalg)) {
 			auth_zone_zonemd_fail(z, env, reason, why_bogus, result);
 			return;
 		}
@@ -8054,8 +8040,7 @@ auth_zone_verify_zonemd_with_key(struct auth_zone* z, struct module_env* env,
 	} else if(zonemd_rrset && dnskey && !is_insecure) {
 		/* check DNSSEC verify of SOA and ZONEMD */
 		if(!zonemd_check_dnssec_soazonemd(z, env, mods, dnskey, apex,
-			zonemd_rrset, &reason, &why_bogus, sigalg, reasonbuf,
-			sizeof(reasonbuf))) {
+			zonemd_rrset, &reason, &why_bogus, sigalg)) {
 			auth_zone_zonemd_fail(z, env, reason, why_bogus, result);
 			return;
 		}
@@ -8119,8 +8104,7 @@ static struct ub_packed_rrset_key*
 zonemd_get_dnskey_from_anchor(struct auth_zone* z, struct module_env* env,
 	struct module_stack* mods, struct trust_anchor* anchor,
 	int* is_insecure, char** why_bogus,
-	struct ub_packed_rrset_key* keystorage, char* reasonbuf,
-	size_t reasonlen)
+	struct ub_packed_rrset_key* keystorage)
 {
 	struct auth_data* apex;
 	struct auth_rrset* dnskey_rrset;
@@ -8156,8 +8140,7 @@ zonemd_get_dnskey_from_anchor(struct auth_zone* z, struct module_env* env,
 	auth_zone_log(z->name, VERB_QUERY,
 		"zonemd: verify DNSKEY RRset with trust anchor");
 	sec = val_verify_DNSKEY_with_TA(env, ve, keystorage, anchor->ds_rrset,
-		anchor->dnskey_rrset, NULL, why_bogus, NULL, NULL, reasonbuf,
-		reasonlen);
+		anchor->dnskey_rrset, NULL, why_bogus, NULL, NULL);
 	regional_free_all(env->scratch);
 	if(sec == sec_status_secure) {
 		/* success */
@@ -8180,8 +8163,7 @@ static struct ub_packed_rrset_key*
 auth_zone_verify_zonemd_key_with_ds(struct auth_zone* z,
 	struct module_env* env, struct module_stack* mods,
 	struct ub_packed_rrset_key* ds, int* is_insecure, char** why_bogus,
-	struct ub_packed_rrset_key* keystorage, uint8_t* sigalg,
-	char* reasonbuf, size_t reasonlen)
+	struct ub_packed_rrset_key* keystorage, uint8_t* sigalg)
 {
 	struct auth_data* apex;
 	struct auth_rrset* dnskey_rrset;
@@ -8217,7 +8199,7 @@ auth_zone_verify_zonemd_key_with_ds(struct auth_zone* z,
 	keystorage->rk.rrset_class = htons(z->dclass);
 	auth_zone_log(z->name, VERB_QUERY, "zonemd: verify zone DNSKEY with DS");
 	sec = val_verify_DNSKEY_with_DS(env, ve, keystorage, ds, sigalg,
-		why_bogus, NULL, NULL, reasonbuf, reasonlen);
+		why_bogus, NULL, NULL);
 	regional_free_all(env->scratch);
 	if(sec == sec_status_secure) {
 		/* success */
@@ -8243,7 +8225,6 @@ void auth_zonemd_dnskey_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
 {
 	struct auth_zone* z = (struct auth_zone*)arg;
 	struct module_env* env;
-	char reasonbuf[256];
 	char* reason = NULL, *ds_bogus = NULL, *typestr="DNSKEY";
 	struct ub_packed_rrset_key* dnskey = NULL, *ds = NULL;
 	int is_insecure = 0, downprot;
@@ -8355,8 +8336,7 @@ void auth_zonemd_dnskey_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
 	if(!reason && !is_insecure && !dnskey && ds) {
 		dnskey = auth_zone_verify_zonemd_key_with_ds(z, env,
 			&env->mesh->mods, ds, &is_insecure, &ds_bogus,
-			&keystorage, downprot?sigalg:NULL, reasonbuf,
-			sizeof(reasonbuf));
+			&keystorage, downprot?sigalg:NULL);
 		if(!dnskey && !is_insecure && !reason)
 			reason = "DNSKEY verify with DS failed";
 	}
@@ -8364,7 +8344,6 @@ void auth_zonemd_dnskey_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
 	if(reason) {
 		auth_zone_zonemd_fail(z, env, reason, ds_bogus, NULL);
 		lock_rw_unlock(&z->lock);
-		regional_free_all(env->scratch);
 		return;
 	}

@@ -8449,7 +8428,6 @@ zonemd_lookup_dnskey(struct auth_zone* z, struct module_env* env)
 void auth_zone_verify_zonemd(struct auth_zone* z, struct module_env* env,
 	struct module_stack* mods, char** result, int offline, int only_online)
 {
-	char reasonbuf[256];
 	char* reason = NULL, *why_bogus = NULL;
 	struct trust_anchor* anchor = NULL;
 	struct ub_packed_rrset_key* dnskey = NULL;
@@ -8484,8 +8462,7 @@ void auth_zone_verify_zonemd(struct auth_zone* z, struct module_env* env,
 		}
 		/* equal to trustanchor, no need for online lookups */
 		dnskey = zonemd_get_dnskey_from_anchor(z, env, mods, anchor,
-			&is_insecure, &why_bogus, &keystorage, reasonbuf,
-			sizeof(reasonbuf));
+			&is_insecure, &why_bogus, &keystorage);
 		lock_basic_unlock(&anchor->lock);
 		if(!dnskey && !reason && !is_insecure) {
 			reason = "verify DNSKEY RRset with trust anchor failed";
@@ -8511,7 +8488,6 @@ void auth_zone_verify_zonemd(struct auth_zone* z, struct module_env* env,

 	if(reason) {
 		auth_zone_zonemd_fail(z, env, reason, why_bogus, result);
-		regional_free_all(env->scratch);
 		return;
 	}

@@ -96,8 +96,7 @@ store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
 				struct ub_packed_rrset_key* ck;
 				lock_rw_rdlock(&rep->ref[i].key->entry.lock);
 				/* if deleted rrset, do not copy it */
-				if(rep->ref[i].key->id == 0 ||
-					rep->ref[i].id != rep->ref[i].key->id)
+				if(rep->ref[i].key->id == 0)
 					ck = NULL;
 				else 	ck = packed_rrset_copy_region(
 					rep->ref[i].key, region, now);
@@ -113,18 +112,11 @@ store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
 			/* fallthrough */
 		case 1: /* ref updated, item inserted */
 			rep->rrsets[i] = rep->ref[i].key;
-			/* ref was updated; make sure the message ttl is
-			 * updated to the minimum of the current rrsets. */
-			lock_rw_rdlock(&rep->ref[i].key->entry.lock);
-			/* if deleted, skip ttl update. */
-			if(rep->ref[i].key->id != 0 &&
-				rep->ref[i].id == rep->ref[i].key->id) {
-				ttl = ((struct packed_rrset_data*)
-				    rep->rrsets[i]->entry.data)->ttl;
-				if(ttl < min_ttl) min_ttl = ttl;
-			}
-			lock_rw_unlock(&rep->ref[i].key->entry.lock);
 		}
+		/* if ref was updated make sure the message ttl is updated to
+		 * the minimum of the current rrsets. */
+		ttl = ((struct packed_rrset_data*)rep->rrsets[i]->entry.data)->ttl;
+		if(ttl < min_ttl) min_ttl = ttl;
 	}
 	if(min_ttl < rep->ttl) {
 		rep->ttl = min_ttl;
@@ -201,6 +193,46 @@ dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
 	slabhash_insert(env->msg_cache, hash, &e->entry, rep, env->alloc);
 }

+/** see if an rrset is expired above the qname, return upper qname. */
+static int
+rrset_expired_above(struct module_env* env, uint8_t** qname, size_t* qnamelen,
+	uint16_t searchtype, uint16_t qclass, time_t now, uint8_t* expiretop,
+	size_t expiretoplen)
+{
+	struct ub_packed_rrset_key *rrset;
+	uint8_t lablen;
+
+	while(*qnamelen > 0) {
+		/* look one label higher */
+		lablen = **qname;
+		*qname += lablen + 1;
+		*qnamelen -= lablen + 1;
+		if(*qnamelen <= 0)
+			break;
+
+		/* looks up with a time of 0, to see expired entries */
+		if((rrset = rrset_cache_lookup(env->rrset_cache, *qname,
+			*qnamelen, searchtype, qclass, 0, 0, 0))) {
+			struct packed_rrset_data* data =
+				(struct packed_rrset_data*)rrset->entry.data;
+			if(now > data->ttl) {
+				/* it is expired, this is not wanted */
+				lock_rw_unlock(&rrset->entry.lock);
+				log_nametypeclass(VERB_ALGO, "this rrset is expired", *qname, searchtype, qclass);
+				return 1;
+			}
+			/* it is not expired, continue looking */
+			lock_rw_unlock(&rrset->entry.lock);
+		}
+
+		/* do not look above the expiretop. */
+		if(expiretop && *qnamelen == expiretoplen &&
+			query_dname_compare(*qname, expiretop)==0)
+			break;
+	}
+	return 0;
+}
+
 /** find closest NS or DNAME and returns the rrset (locked) */
 static struct ub_packed_rrset_key*
 find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen, 
@@ -234,12 +266,12 @@ find_closest_of_type(struct module_env* env, uint8_t* qname, size_t qnamelen,
 			/* check for expiry, but we have to let go of the rrset
 			 * for the lock ordering */
 			lock_rw_unlock(&rrset->entry.lock);
-			/* the rrset_cache_expired_above function always takes
-			 * off one label (if qnamelen>0) and returns the final
-			 * qname where it searched, so we can continue from
-			 * there turning the O N*N search into O N. */
-			if(!rrset_cache_expired_above(env->rrset_cache, &qname,
-				&qnamelen, searchtype, qclass, now, expiretop,
+			/* the expired_above function always takes off one
+			 * label (if qnamelen>0) and returns the final qname
+			 * where it searched, so we can continue from there
+			 * turning the O N*N search into O N. */
+			if(!rrset_expired_above(env, &qname, &qnamelen,
+				searchtype, qclass, now, expiretop,
 				expiretoplen)) {
 				/* we want to return rrset, but it may be
 				 * gone from cache, if so, just loop like
@@ -60,16 +60,6 @@
 * can do this number of packets (until those all timeout too) */
 #define TIMEOUT_COUNT_MAX 3

-/** Minus 1000 because that is outside of the RTTBAND, so
- * blacklisted servers stay blacklisted if this is chosen.
- * If USEFUL_SERVER_TOP_TIMEOUT is below 1000 (configured via RTT_MAX_TIMEOUT,
- * infra-cache-max-rtt) change it to just above the RTT_BAND. */
-#define STILL_USEFUL_TIMEOUT (				\
-	USEFUL_SERVER_TOP_TIMEOUT < 1000 ||		\
-	USEFUL_SERVER_TOP_TIMEOUT - 1000 <= RTT_BAND	\
-		?RTT_BAND + 1				\
-		:USEFUL_SERVER_TOP_TIMEOUT - 1000)
-
 /** ratelimit value for delegation point */
 int infra_dp_ratelimit = 0;

@@ -244,81 +234,6 @@ setup_domain_limits(struct infra_cache* infra, struct config_file* cfg)
 	return 1;
 }

-/** find or create element in wait limit netblock tree */
-static struct wait_limit_netblock_info*
-wait_limit_netblock_findcreate(struct infra_cache* infra, char* str,
-	int cookie)
-{
-	rbtree_type* tree;
-	struct sockaddr_storage addr;
-	int net;
-	socklen_t addrlen;
-	struct wait_limit_netblock_info* d;
-
-	if(!netblockstrtoaddr(str, 0, &addr, &addrlen, &net)) {
-		log_err("cannot parse wait limit netblock '%s'", str);
-		return 0;
-	}
-
-	/* can we find it? */
-	if(cookie)
-		tree = &infra->wait_limits_cookie_netblock;
-	else
-		tree = &infra->wait_limits_netblock;
-	d = (struct wait_limit_netblock_info*)addr_tree_find(tree, &addr,
-		addrlen, net);
-	if(d)
-		return d;
-
-	/* create it */
-	d = (struct wait_limit_netblock_info*)calloc(1, sizeof(*d));
-	if(!d)
-		return NULL;
-	d->limit = -1;
-	if(!addr_tree_insert(tree, &d->node, &addr, addrlen, net)) {
-		log_err("duplicate element in domainlimit tree");
-		free(d);
-		return NULL;
-	}
-	return d;
-}
-
-
-/** insert wait limit information into lookup tree */
-static int
-infra_wait_limit_netblock_insert(struct infra_cache* infra,
-	struct config_file* cfg)
-{
-	struct config_str2list* p;
-	struct wait_limit_netblock_info* d;
-	for(p = cfg->wait_limit_netblock; p; p = p->next) {
-		d = wait_limit_netblock_findcreate(infra, p->str, 0);
-		if(!d)
-			return 0;
-		d->limit = atoi(p->str2);
-	}
-	for(p = cfg->wait_limit_cookie_netblock; p; p = p->next) {
-		d = wait_limit_netblock_findcreate(infra, p->str, 1);
-		if(!d)
-			return 0;
-		d->limit = atoi(p->str2);
-	}
-	return 1;
-}
-
-/** setup wait limits tree (0 on failure) */
-static int
-setup_wait_limits(struct infra_cache* infra, struct config_file* cfg)
-{
-	addr_tree_init(&infra->wait_limits_netblock);
-	addr_tree_init(&infra->wait_limits_cookie_netblock);
-	if(!infra_wait_limit_netblock_insert(infra, cfg))
-		return 0;
-	addr_tree_init_parents(&infra->wait_limits_netblock);
-	addr_tree_init_parents(&infra->wait_limits_cookie_netblock);
-	return 1;
-}
-
 struct infra_cache* 
 infra_create(struct config_file* cfg)
 {
@@ -352,12 +267,7 @@ infra_create(struct config_file* cfg)
 		infra_delete(infra);
 		return NULL;
 	}
-	if(!setup_wait_limits(infra, cfg)) {
-		infra_delete(infra);
-		return NULL;
-	}
 	infra_ip_ratelimit = cfg->ip_ratelimit;
-	infra_ip_ratelimit_cookie = cfg->ip_ratelimit_cookie;
 	infra->client_ip_rates = slabhash_create(cfg->ip_ratelimit_slabs,
 	    INFRA_HOST_STARTSIZE, cfg->ip_ratelimit_size, &ip_rate_sizefunc,
 	    &ip_rate_compfunc, &ip_rate_delkeyfunc, &ip_rate_deldatafunc, NULL);
@@ -377,12 +287,6 @@ static void domain_limit_free(rbnode_type* n, void* ATTR_UNUSED(arg))
 	}
 }

-/** delete wait_limit_netblock_info entries */
-static void wait_limit_netblock_del(rbnode_type* n, void* ATTR_UNUSED(arg))
-{
-	free(n);
-}
-
 void 
 infra_delete(struct infra_cache* infra)
 {
@@ -392,10 +296,6 @@ infra_delete(struct infra_cache* infra)
 	slabhash_delete(infra->domain_rates);
 	traverse_postorder(&infra->domain_limits, domain_limit_free, NULL);
 	slabhash_delete(infra->client_ip_rates);
-	traverse_postorder(&infra->wait_limits_netblock,
-		wait_limit_netblock_del, NULL);
-	traverse_postorder(&infra->wait_limits_cookie_netblock,
-		wait_limit_netblock_del, NULL);
 	free(infra);
 }

@@ -409,7 +309,6 @@ infra_adjust(struct infra_cache* infra, struct config_file* cfg)
 	infra->infra_keep_probing = cfg->infra_keep_probing;
 	infra_dp_ratelimit = cfg->ratelimit;
 	infra_ip_ratelimit = cfg->ip_ratelimit;
-	infra_ip_ratelimit_cookie = cfg->ip_ratelimit_cookie;
 	maxmem = cfg->infra_cache_numhosts * (sizeof(struct infra_key)+
 		sizeof(struct infra_data)+INFRA_BYTES_NAME);
 	/* divide cachesize by slabs and multiply by slabs, because if the
@@ -668,7 +567,7 @@ infra_update_tcp_works(struct infra_cache* infra,
 	if(data->rtt.rto >= RTT_MAX_TIMEOUT)
 		/* do not disqualify this server altogether, it is better
 		 * than nothing */
-		data->rtt.rto = STILL_USEFUL_TIMEOUT;
+		data->rtt.rto = RTT_MAX_TIMEOUT-1000;
 	lock_rw_unlock(&e->lock);
 }

@@ -808,7 +707,7 @@ infra_get_lame_rtt(struct infra_cache* infra,
 		&& infra->infra_keep_probing) {
 		/* single probe, keep probing */
 		if(*rtt >= USEFUL_SERVER_TOP_TIMEOUT)
-			*rtt = STILL_USEFUL_TIMEOUT;
+			*rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
 	} else if(host->rtt.rto >= PROBE_MAXRTO && timenow < host->probedelay
 		&& rtt_notimeout(&host->rtt)*4 <= host->rtt.rto) {
 		/* single probe for this domain, and we are not probing */
@@ -816,23 +715,26 @@ infra_get_lame_rtt(struct infra_cache* infra,
 		if(qtype == LDNS_RR_TYPE_A) {
 			if(host->timeout_A >= TIMEOUT_COUNT_MAX)
 				*rtt = USEFUL_SERVER_TOP_TIMEOUT;
-			else	*rtt = STILL_USEFUL_TIMEOUT;
+			else	*rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
 		} else if(qtype == LDNS_RR_TYPE_AAAA) {
 			if(host->timeout_AAAA >= TIMEOUT_COUNT_MAX)
 				*rtt = USEFUL_SERVER_TOP_TIMEOUT;
-			else	*rtt = STILL_USEFUL_TIMEOUT;
+			else	*rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
 		} else {
 			if(host->timeout_other >= TIMEOUT_COUNT_MAX)
 				*rtt = USEFUL_SERVER_TOP_TIMEOUT;
-			else	*rtt = STILL_USEFUL_TIMEOUT;
+			else	*rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
 		}
 	}
 	/* expired entry */
 	if(timenow > host->ttl) {
+
 		/* see if this can be a re-probe of an unresponsive server */
+		/* minus 1000 because that is outside of the RTTBAND, so
+		 * blacklisted servers stay blacklisted if this is chosen */
 		if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) {
 			lock_rw_unlock(&e->lock);
-			*rtt = STILL_USEFUL_TIMEOUT;
+			*rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
 			*lame = 0;
 			*dnsseclame = 0;
 			*reclame = 0;
@@ -978,8 +880,7 @@ static void infra_create_ratedata(struct infra_cache* infra,

 /** create rate data item for ip address */
 static void infra_ip_create_ratedata(struct infra_cache* infra,
-	struct sockaddr_storage* addr, socklen_t addrlen, time_t timenow,
-	int mesh_wait)
+	struct sockaddr_storage* addr, socklen_t addrlen, time_t timenow)
 {
 	hashvalue_type h = hash_addr(addr, addrlen, 0);
 	struct ip_rate_key* k = (struct ip_rate_key*)calloc(1, sizeof(*k));
@@ -997,7 +898,6 @@ static void infra_ip_create_ratedata(struct infra_cache* infra,
 	k->entry.data = d;
 	d->qps[0] = 1;
 	d->timestamp[0] = timenow;
-	d->mesh_wait = mesh_wait;
 	slabhash_insert(infra->client_ip_rates, h, &k->entry, d, NULL);
 }

@@ -1221,81 +1121,6 @@ int infra_ip_ratelimit_inc(struct infra_cache* infra,
 	}

 	/* create */
-	infra_ip_create_ratedata(infra, addr, addrlen, timenow, 0);
+	infra_ip_create_ratedata(infra, addr, addrlen, timenow);
 	return 1;
 }
-
-int infra_wait_limit_allowed(struct infra_cache* infra, struct comm_reply* rep,
-	int cookie_valid, struct config_file* cfg)
-{
-	struct lruhash_entry* entry;
-	if(cfg->wait_limit == 0)
-		return 1;
-
-	entry = infra_find_ip_ratedata(infra, &rep->client_addr,
-		rep->client_addrlen, 0);
-	if(entry) {
-		rbtree_type* tree;
-		struct wait_limit_netblock_info* w;
-		struct rate_data* d = (struct rate_data*)entry->data;
-		int mesh_wait = d->mesh_wait;
-		lock_rw_unlock(&entry->lock);
-
-		/* have the wait amount, check how much is allowed */
-		if(cookie_valid)
-			tree = &infra->wait_limits_cookie_netblock;
-		else	tree = &infra->wait_limits_netblock;
-		w = (struct wait_limit_netblock_info*)addr_tree_lookup(tree,
-			&rep->client_addr, rep->client_addrlen);
-		if(w) {
-			if(w->limit != -1 && mesh_wait > w->limit)
-				return 0;
-		} else {
-			/* if there is no IP netblock specific information,
-			 * use the configured value. */
-			if(mesh_wait > (cookie_valid?cfg->wait_limit_cookie:
-				cfg->wait_limit))
-				return 0;
-		}
-	}
-	return 1;
-}
-
-void infra_wait_limit_inc(struct infra_cache* infra, struct comm_reply* rep,
-	time_t timenow, struct config_file* cfg)
-{
-	struct lruhash_entry* entry;
-	if(cfg->wait_limit == 0)
-		return;
-
-	/* Find it */
-	entry = infra_find_ip_ratedata(infra, &rep->client_addr,
-		rep->client_addrlen, 1);
-	if(entry) {
-		struct rate_data* d = (struct rate_data*)entry->data;
-		d->mesh_wait++;
-		lock_rw_unlock(&entry->lock);
-		return;
-	}
-
-	/* Create it */
-	infra_ip_create_ratedata(infra, &rep->client_addr,
-		rep->client_addrlen, timenow, 1);
-}
-
-void infra_wait_limit_dec(struct infra_cache* infra, struct comm_reply* rep,
-	struct config_file* cfg)
-{
-	struct lruhash_entry* entry;
-	if(cfg->wait_limit == 0)
-		return;
-
-	entry = infra_find_ip_ratedata(infra, &rep->client_addr,
-		rep->client_addrlen, 1);
-	if(entry) {
-		struct rate_data* d = (struct rate_data*)entry->data;
-		if(d->mesh_wait > 0)
-			d->mesh_wait--;
-		lock_rw_unlock(&entry->lock);
-	}
-}
@@ -122,10 +122,6 @@ struct infra_cache {
 	rbtree_type domain_limits;
 	/** hash table with query rates per client ip: ip_rate_key, ip_rate_data */
 	struct slabhash* client_ip_rates;
-	/** tree of addr_tree_node, with wait_limit_netblock_info information */
-	rbtree_type wait_limits_netblock;
-	/** tree of addr_tree_node, with wait_limit_netblock_info information */
-	rbtree_type wait_limits_cookie_netblock;
 };

 /** ratelimit, unless overridden by domain_limits, 0 is off */
@@ -188,22 +184,10 @@ struct rate_data {
 	/** what the timestamp is of the qps array members, counter is
 	 * valid for that timestamp.  Usually now and now-1. */
 	time_t timestamp[RATE_WINDOW];
-	/** the number of queries waiting in the mesh */
-	int mesh_wait;
 };

 #define ip_rate_data rate_data

-/**
- * Data to store the configuration per netblock for the wait limit
- */
-struct wait_limit_netblock_info {
-	/** The addr tree node, this must be first. */
-	struct addr_tree_node node;
-	/** the limit on the amount */
-	int limit;
-};
-
 /** infra host cache default hash lookup size */
 #define INFRA_HOST_STARTSIZE 32
 /** bytes per zonename reserved in the hostcache, dnamelen(zonename.com.) */
@@ -234,7 +218,7 @@ struct infra_cache* infra_adjust(struct infra_cache* infra,
 	struct config_file* cfg);

 /**
- * Plain find infra data function (used by the other functions)
+ * Plain find infra data function (used by the the other functions)
 * @param infra: infrastructure cache.
 * @param addr: host address.
 * @param addrlen: length of addr.
@@ -490,16 +474,4 @@ void ip_rate_delkeyfunc(void* d, void* arg);
 /* delete data */
 #define ip_rate_deldatafunc rate_deldatafunc

-/** See if the IP address can have another reply in the wait limit */
-int infra_wait_limit_allowed(struct infra_cache* infra, struct comm_reply* rep,
-	int cookie_valid, struct config_file* cfg);
-
-/** Increment number of waiting replies for IP */
-void infra_wait_limit_inc(struct infra_cache* infra, struct comm_reply* rep,
-	time_t timenow, struct config_file* cfg);
-
-/** Decrement number of waiting replies for IP */
-void infra_wait_limit_dec(struct infra_cache* infra, struct comm_reply* rep,
-	struct config_file* cfg);
-
 #endif /* SERVICES_CACHE_INFRA_H */
@@ -46,7 +46,6 @@
 #include "util/data/packed_rrset.h"
 #include "util/data/msgreply.h"
 #include "util/data/msgparse.h"
-#include "util/data/dname.h"
 #include "util/regional.h"
 #include "util/alloc.h"
 #include "util/net_help.h"
@@ -128,9 +127,6 @@ need_to_update_rrset(void* nd, void* cd, time_t timenow, int equal, int ns)
 {
 	struct packed_rrset_data* newd = (struct packed_rrset_data*)nd;
 	struct packed_rrset_data* cached = (struct packed_rrset_data*)cd;
-	/*	o if new data is expired, current data is better */
-	if( newd->ttl < timenow && cached->ttl >= timenow)
-		return 0;
 	/* 	o store if rrset has been validated 
 	 *  		everything better than bogus data 
 	 *  		secure is preferred */
@@ -444,89 +440,6 @@ rrset_check_sec_status(struct rrset_cache* r,
 	lock_rw_unlock(&e->lock);
 }

-void
-rrset_cache_remove_above(struct rrset_cache* r, uint8_t** qname, size_t*
-	qnamelen, uint16_t searchtype, uint16_t qclass, time_t now, uint8_t*
-	qnametop, size_t qnametoplen)
-{
-	struct ub_packed_rrset_key *rrset;
-	uint8_t lablen;
-
-	while(*qnamelen > 0) {
-		/* look one label higher */
-		lablen = **qname;
-		*qname += lablen + 1;
-		*qnamelen -= lablen + 1;
-		if(*qnamelen <= 0)
-			return;
-
-		/* stop at qnametop */
-		if(qnametop && *qnamelen == qnametoplen &&
-			query_dname_compare(*qname, qnametop)==0)
-			return;
-
-		if(verbosity >= VERB_ALGO) {
-			/* looks up with a time of 0, to see expired entries */
-			if((rrset = rrset_cache_lookup(r, *qname,
-				*qnamelen, searchtype, qclass, 0, 0, 0))) {
-				struct packed_rrset_data* data =
-					(struct packed_rrset_data*)rrset->entry.data;
-				int expired = (now > data->ttl);
-				lock_rw_unlock(&rrset->entry.lock);
-				if(expired)
-					log_nametypeclass(verbosity, "this "
-						"(grand)parent rrset will be "
-						"removed (expired)",
-						*qname, searchtype, qclass);
-				else	log_nametypeclass(verbosity, "this "
-						"(grand)parent rrset will be "
-						"removed",
-						*qname, searchtype, qclass);
-			}
-		}
-		rrset_cache_remove(r, *qname, *qnamelen, searchtype, qclass, 0);
-	}
-}
-
-int
-rrset_cache_expired_above(struct rrset_cache* r, uint8_t** qname, size_t*
-	qnamelen, uint16_t searchtype, uint16_t qclass, time_t now, uint8_t*
-	qnametop, size_t qnametoplen)
-{
-	struct ub_packed_rrset_key *rrset;
-	uint8_t lablen;
-
-	while(*qnamelen > 0) {
-		/* look one label higher */
-		lablen = **qname;
-		*qname += lablen + 1;
-		*qnamelen -= lablen + 1;
-		if(*qnamelen <= 0)
-			break;
-
-		/* looks up with a time of 0, to see expired entries */
-		if((rrset = rrset_cache_lookup(r, *qname,
-			*qnamelen, searchtype, qclass, 0, 0, 0))) {
-			struct packed_rrset_data* data =
-				(struct packed_rrset_data*)rrset->entry.data;
-			if(now > data->ttl) {
-				/* it is expired, this is not wanted */
-				lock_rw_unlock(&rrset->entry.lock);
-				log_nametypeclass(VERB_ALGO, "this rrset is expired", *qname, searchtype, qclass);
-				return 1;
-			}
-			/* it is not expired, continue looking */
-			lock_rw_unlock(&rrset->entry.lock);
-		}
-
-		/* do not look above the qnametop. */
-		if(qnametop && *qnamelen == qnametoplen &&
-			query_dname_compare(*qname, qnametop)==0)
-			break;
-	}
-	return 0;
-}
-
 void rrset_cache_remove(struct rrset_cache* r, uint8_t* nm, size_t nmlen,
 	uint16_t type, uint16_t dclass, uint32_t flags)
 {
@@ -231,37 +231,6 @@ void rrset_update_sec_status(struct rrset_cache* r,
 void rrset_check_sec_status(struct rrset_cache* r, 
 	struct ub_packed_rrset_key* rrset, time_t now);

-/**
- * Removes rrsets above the qname, returns upper qname.
- * @param r: the rrset cache.
- * @param qname: the start qname, also used as the output.
- * @param qnamelen: length of qname, updated when it returns.
- * @param searchtype: qtype to search for.
- * @param qclass: qclass to search for.
- * @param now: current time.
- * @param qnametop: the top qname to stop removal (it is not removed).
- * @param qnametoplen: length of qnametop.
- */
-void rrset_cache_remove_above(struct rrset_cache* r, uint8_t** qname,
-	size_t* qnamelen, uint16_t searchtype, uint16_t qclass, time_t now,
-	uint8_t* qnametop, size_t qnametoplen);
-
-/**
- * Sees if an rrset is expired above the qname, returns upper qname.
- * @param r: the rrset cache.
- * @param qname: the start qname, also used as the output.
- * @param qnamelen: length of qname, updated when it returns.
- * @param searchtype: qtype to search for.
- * @param qclass: qclass to search for.
- * @param now: current time.
- * @param qnametop: the top qname, don't look farther than that.
- * @param qnametoplen: length of qnametop.
- * @return true if there is an expired rrset above, false otherwise.
- */
-int rrset_cache_expired_above(struct rrset_cache* r, uint8_t** qname,
-	size_t* qnamelen, uint16_t searchtype, uint16_t qclass, time_t now,
-	uint8_t* qnametop, size_t qnametoplen);
-
 /**
 * Remove an rrset from the cache, by name and type and flags
 * @param r: rrset cache
@@ -140,11 +140,9 @@ void
 verbose_print_unbound_socket(struct unbound_socket* ub_sock)
 {
 	if(verbosity >= VERB_ALGO) {
-		char buf[256];
 		log_info("listing of unbound_socket structure:");
-		addr_to_str((void*)ub_sock->addr, ub_sock->addrlen, buf,
-			sizeof(buf));
-		log_info("%s s is: %d, fam is: %s, acl: %s", buf, ub_sock->s,
+		verbose_print_addr(ub_sock->addr);
+		log_info("s is: %d, fam is: %s, acl: %s", ub_sock->s,
 			ub_sock->fam == AF_INET?"AF_INET":"AF_INET6",
 			ub_sock->acl?"yes":"no");
 	}
@@ -612,9 +610,7 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  elif defined(IP_DONTFRAG) && !defined(__APPLE__)
 		/* the IP_DONTFRAG option if defined in the 11.0 OSX headers,
 		 * but does not work on that version, so we exclude it */
-		/* a nonzero value disables fragmentation, according to
-		 * docs.oracle.com for ip(4). */
-		int off = 1;
+		int off = 0;
 		if (setsockopt(s, IPPROTO_IP, IP_DONTFRAG,
 			&off, (socklen_t)sizeof(off)) < 0) {
 			log_err("setsockopt(..., IP_DONTFRAG, ...) failed: %s",
@@ -1051,22 +1047,7 @@ make_sock(int stype, const char* ifname, const char* port,
 		}
 	}

-	if(!res->ai_addr) {
-		log_err("getaddrinfo returned no address");
-		freeaddrinfo(res);
-		sock_close(s);
-		return -1;
-	}
-	ub_sock->addr = memdup(res->ai_addr, res->ai_addrlen);
-	ub_sock->addrlen = res->ai_addrlen;
-	if(!ub_sock->addr) {
-		log_err("out of memory: allocate listening address");
-		freeaddrinfo(res);
-		sock_close(s);
-		return -1;
-	}
-	freeaddrinfo(res);
-
+	ub_sock->addr = res;
 	ub_sock->s = s;
 	ub_sock->fam = hints->ai_family;
 	ub_sock->acl = NULL;
@@ -1296,7 +1277,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1,
 			&noip6, rcv, snd, reuseport, transparent,
 			tcp_mss, nodelay, freebind, use_systemd, dscp, ub_sock)) == -1) {
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			if(noip6) {
 				log_warn("IPv6 protocol not available");
@@ -1307,7 +1289,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		/* getting source addr packet info is highly non-portable */
 		if(!set_recvpktinfo(s, hints->ai_family)) {
 			sock_close(s);
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			return 0;
 		}
@@ -1318,7 +1301,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 			?listen_type_udpancil_dnscrypt:listen_type_udpancil,
 			is_pp2, ub_sock)) {
 			sock_close(s);
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			return 0;
 		}
@@ -1330,7 +1314,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1,
 			&noip6, rcv, snd, reuseport, transparent,
 			tcp_mss, nodelay, freebind, use_systemd, dscp, ub_sock)) == -1) {
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			if(noip6) {
 				log_warn("IPv6 protocol not available");
@@ -1347,7 +1332,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 				listen_type_udpancil:listen_type_udp),
 			is_pp2, ub_sock)) {
 			sock_close(s);
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			return 0;
 		}
@@ -1370,7 +1356,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		if((s = make_sock_port(SOCK_STREAM, ifname, port, hints, 1,
 			&noip6, 0, 0, reuseport, transparent, tcp_mss, nodelay,
 			freebind, use_systemd, dscp, ub_sock)) == -1) {
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			if(noip6) {
 				/*log_warn("IPv6 protocol not available");*/
@@ -1382,7 +1369,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 			verbose(VERB_ALGO, "setup TCP for SSL service");
 		if(!port_insert(list, s, port_type, is_pp2, ub_sock)) {
 			sock_close(s);
-			free(ub_sock->addr);
+			if(ub_sock->addr)
+				freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
 			return 0;
 		}
@@ -1964,7 +1952,8 @@ void listening_ports_free(struct listen_port* list)
 		}
 		/* rc_ports don't have ub_socket */
 		if(list->socket) {
-			free(list->socket->addr);
+			if(list->socket->addr)
+				freeaddrinfo(list->socket->addr);
 			free(list->socket);
 		}
 		free(list);
@@ -107,13 +107,11 @@ enum listen_type {
 * socket properties (just like NSD nsd_socket structure definition)
 */
 struct unbound_socket {
-	/** the address of the socket */
-	struct sockaddr* addr;
-	/** length of the address */
-	socklen_t addrlen;
+	/** socket-address structure */
+	struct addrinfo* addr;
 	/** socket descriptor returned by socket() syscall */
 	int s;
-	/** address family (AF_INET/AF_INET6) */
+	/** address family (AF_INET/IF_INET6) */
 	int fam;
 	/** ACL on the socket (listening interface) */
 	struct acl_addr* acl;
@@ -242,7 +242,7 @@ lz_enter_zone_dname(struct local_zones* zones, uint8_t* nm, size_t len,
 }

 /** enter a new zone */
-struct local_zone*
+static struct local_zone*
 lz_enter_zone(struct local_zones* zones, const char* name, const char* type,
 	uint16_t dclass)
 {
@@ -330,16 +330,14 @@ get_rr_nameclass(const char* str, uint8_t** nm, uint16_t* dclass,
 static struct local_rrset*
 local_data_find_type(struct local_data* data, uint16_t type, int alias_ok)
 {
-	struct local_rrset* p, *cname = NULL;
+	struct local_rrset* p;
 	type = htons(type);
 	for(p = data->rrsets; p; p = p->next) {
 		if(p->rrset->rk.type == type)
 			return p;
 		if(alias_ok && p->rrset->rk.type == htons(LDNS_RR_TYPE_CNAME))
-			cname = p;
+			return p;
 	}
-	if(alias_ok)
-		return cname;
 	return NULL;
 }

@@ -983,43 +981,40 @@ lz_enter_overrides(struct local_zones* zones, struct config_file* cfg)
 	return 1;
 }

-/* return closest parent in the tree, NULL if none */
-static struct local_zone* find_closest_parent(struct local_zone* curr,
-	struct local_zone* prev)
-{
-	struct local_zone* p;
-	int m;
-	if(!prev || prev->dclass != curr->dclass) return NULL;
-	(void)dname_lab_cmp(prev->name, prev->namelabs, curr->name,
-		curr->namelabs, &m); /* we know prev is smaller */
-	/* sort order like: . com. bla.com. zwb.com. net. */
-	/* find the previous, or parent-parent-parent */
-	for(p = prev; p; p = p->parent) {
-		/* looking for name with few labels, a parent */
-		if(p->namelabs <= m) {
-			/* ==: since prev matched m, this is closest*/
-			/* <: prev matches more, but is not a parent,
-			    * this one is a (grand)parent */
-			return p;
-		}
-	}
-	return NULL;
-}
-
 /** setup parent pointers, so that a lookup can be done for closest match */
-void
-lz_init_parents(struct local_zones* zones)
+static void
+init_parents(struct local_zones* zones)
 {
-	struct local_zone* node, *prev = NULL;
+        struct local_zone* node, *prev = NULL, *p;
+        int m;
 	lock_rw_wrlock(&zones->lock);
-	RBTREE_FOR(node, struct local_zone*, &zones->ztree) {
+        RBTREE_FOR(node, struct local_zone*, &zones->ztree) {
 		lock_rw_wrlock(&node->lock);
-		node->parent = find_closest_parent(node, prev);
-		prev = node;
+                node->parent = NULL;
+                if(!prev || prev->dclass != node->dclass) {
+                        prev = node;
+			lock_rw_unlock(&node->lock);
+                        continue;
+                }
+                (void)dname_lab_cmp(prev->name, prev->namelabs, node->name,
+                        node->namelabs, &m); /* we know prev is smaller */
+                /* sort order like: . com. bla.com. zwb.com. net. */
+                /* find the previous, or parent-parent-parent */
+                for(p = prev; p; p = p->parent)
+                        /* looking for name with few labels, a parent */
+                        if(p->namelabs <= m) {
+                                /* ==: since prev matched m, this is closest*/
+                                /* <: prev matches more, but is not a parent,
+                                 * this one is a (grand)parent */
+                                node->parent = p;
+                                break;
+                        }
+                prev = node;
+
 		if(node->override_tree)
 			addr_tree_init_parents(node->override_tree);
 		lock_rw_unlock(&node->lock);
-	}
+        }
 	lock_rw_unlock(&zones->lock);
 }

@@ -1039,7 +1034,7 @@ lz_setup_implicit(struct local_zones* zones, struct config_file* cfg)
 	int nmlabs = 0;
 	int match = 0; /* number of labels match count */

-	lz_init_parents(zones); /* to enable local_zones_lookup() */
+	init_parents(zones); /* to enable local_zones_lookup() */
 	for(p = cfg->local_data; p; p = p->next) {
 		uint8_t* rr_name;
 		uint16_t rr_class, rr_type;
@@ -1205,7 +1200,7 @@ local_zones_apply_cfg(struct local_zones* zones, struct config_file* cfg)
 	}

 	/* setup parent ptrs for lookup during data entry */
-	lz_init_parents(zones);
+	init_parents(zones);
 	/* insert local zone tags */
 	if(!lz_enter_zone_tags(zones, cfg)) {
 		return 0;
@@ -2031,9 +2026,7 @@ struct local_zone* local_zones_add_zone(struct local_zones* zones,
 	uint8_t* name, size_t len, int labs, uint16_t dclass,
 	enum localzone_type tp)
 {
-	int exact;
 	/* create */
-	struct local_zone *prev;
 	struct local_zone* z = local_zone_create(name, len, labs, tp, dclass);
 	if(!z) {
 		free(name);
@@ -2042,12 +2035,10 @@ struct local_zone* local_zones_add_zone(struct local_zones* zones,
 	lock_rw_wrlock(&z->lock);

 	/* find the closest parent */
-	prev = local_zones_find_le(zones, name, len, labs, dclass, &exact);
-	if(!exact)
-		z->parent = find_closest_parent(z, prev);
+	z->parent = local_zones_find(zones, name, len, labs, dclass);

 	/* insert into the tree */
-	if(exact||!rbtree_insert(&zones->ztree, &z->node)) {
+	if(!rbtree_insert(&zones->ztree, &z->node)) {
 		/* duplicate entry! */
 		lock_rw_unlock(&z->lock);
 		local_zone_delete(z);
@@ -641,23 +641,4 @@ local_zone_enter_rr(struct local_zone* z, uint8_t* nm, size_t nmlen,
 */
 struct local_data* 
 local_zone_find_data(struct local_zone* z, uint8_t* nm, size_t nmlen, int nmlabs);
-
-/** Enter a new zone; returns with WRlock
- *  Made public for unit testing
- *  @param zones: the local zones tree
- *  @param name: name of the zone
- *  @param type: type of the zone
- *  @param dclass: class of the zone
- *  @return local_zone (or duplicate), NULL on parse and malloc failures
- */
-struct local_zone*
-lz_enter_zone(struct local_zones* zones, const char* name, const char* type,
-	uint16_t dclass);
-
-/** Setup parent pointers, so that a lookup can be done for closest match
- *  Made public for unit testing
- *  @param zones: the local zones tree
- */
-void
-lz_init_parents(struct local_zones* zones);
 #endif /* SERVICES_LOCALZONE_H */
@@ -47,7 +47,6 @@
 #include "services/outbound_list.h"
 #include "services/cache/dns.h"
 #include "services/cache/rrset.h"
-#include "services/cache/infra.h"
 #include "util/log.h"
 #include "util/net_help.h"
 #include "util/module.h"
@@ -386,7 +385,7 @@ mesh_serve_expired_init(struct mesh_state* mstate, int timeout)
 		&mesh_serve_expired_lookup;

 	/* In case this timer already popped, start it again */
-	if(!mstate->s.serve_expired_data->timer && timeout != -1) {
+	if(!mstate->s.serve_expired_data->timer) {
 		mstate->s.serve_expired_data->timer = comm_timer_create(
 			mstate->s.env->worker_base, mesh_serve_expired_callback, mstate);
 		if(!mstate->s.serve_expired_data->timer)
@@ -413,20 +412,11 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 	int timeout = mesh->env->cfg->serve_expired?
 		mesh->env->cfg->serve_expired_client_timeout:0;
 	struct sldns_buffer* r_buffer = rep->c->buffer;
-	uint16_t mesh_flags = qflags&(BIT_RD|BIT_CD);
 	if(rep->c->tcp_req_info) {
 		r_buffer = rep->c->tcp_req_info->spool_buffer;
 	}
-	if(!infra_wait_limit_allowed(mesh->env->infra_cache, rep,
-		edns->cookie_valid, mesh->env->cfg)) {
-		verbose(VERB_ALGO, "Too many queries waiting from the IP. "
-			"dropping incoming query.");
-		comm_point_drop_reply(rep);
-		mesh->stats_dropped++;
-		return;
-	}
 	if(!unique)
-		s = mesh_area_find(mesh, cinfo, qinfo, mesh_flags, 0, 0);
+		s = mesh_area_find(mesh, cinfo, qinfo, qflags&(BIT_RD|BIT_CD), 0, 0);
 	/* does this create a new reply state? */
 	if(!s || s->list_select == mesh_no_list) {
 		if(!mesh_make_new_space(mesh, rep->c->buffer)) {
@@ -454,7 +444,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 		struct rbnode_type* n;
 #endif
 		s = mesh_state_create(mesh->env, qinfo, cinfo,
-			mesh_flags, 0, 0);
+			qflags&(BIT_RD|BIT_CD), 0, 0);
 		if(!s) {
 			log_err("mesh_state_create: out of memory; SERVFAIL");
 			if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL, NULL,
@@ -521,19 +511,6 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 		log_err("mesh_new_client: out of memory initializing serve expired");
 		goto servfail_mem;
 	}
-#ifdef USE_CACHEDB
-	if(!timeout && mesh->env->cfg->serve_expired &&
-		!mesh->env->cfg->serve_expired_client_timeout &&
-		(mesh->env->cachedb_enabled &&
-		 mesh->env->cfg->cachedb_check_when_serve_expired)) {
-		if(!mesh_serve_expired_init(s, -1)) {
-			log_err("mesh_new_client: out of memory initializing serve expired");
-			goto servfail_mem;
-		}
-	}
-#endif
-	infra_wait_limit_inc(mesh->env->infra_cache, rep, *mesh->env->now,
-		mesh->env->cfg);
 	/* update statistics */
 	if(was_detached) {
 		log_assert(mesh->num_detached_states > 0);
@@ -566,8 +543,6 @@ servfail_mem:
 			edns->opt_list_inplace_cb_out = NULL;
 	error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 		qinfo, qid, qflags, edns);
-	if(rep->c->use_h2)
-		http2_stream_remove_mesh_state(rep->c->h2_stream);
 	comm_point_send_reply(rep);
 	if(added)
 		mesh_state_delete(&s->s);
@@ -586,9 +561,8 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 	int was_detached = 0;
 	int was_noreply = 0;
 	int added = 0;
-	uint16_t mesh_flags = qflags&(BIT_RD|BIT_CD);
 	if(!unique)
-		s = mesh_area_find(mesh, NULL, qinfo, mesh_flags, 0, 0);
+		s = mesh_area_find(mesh, NULL, qinfo, qflags&(BIT_RD|BIT_CD), 0, 0);

 	/* there are no limits on the number of callbacks */

@@ -598,7 +572,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 		struct rbnode_type* n;
 #endif
 		s = mesh_state_create(mesh->env, qinfo, NULL,
-			mesh_flags, 0, 0);
+			qflags&(BIT_RD|BIT_CD), 0, 0);
 		if(!s) {
 			return 0;
 		}
@@ -642,18 +616,6 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 			mesh_state_delete(&s->s);
 		return 0;
 	}
-#ifdef USE_CACHEDB
-	if(!timeout && mesh->env->cfg->serve_expired &&
-		!mesh->env->cfg->serve_expired_client_timeout &&
-		(mesh->env->cachedb_enabled &&
-		 mesh->env->cfg->cachedb_check_when_serve_expired)) {
-		if(!mesh_serve_expired_init(s, -1)) {
-			if(added)
-				mesh_state_delete(&s->s);
-			return 0;
-		}
-	}
-#endif
 	/* update statistics */
 	if(was_detached) {
 		log_assert(mesh->num_detached_states > 0);
@@ -677,12 +639,8 @@ static void mesh_schedule_prefetch(struct mesh_area* mesh,
 	struct query_info* qinfo, uint16_t qflags, time_t leeway, int run,
 	int rpz_passthru)
 {
-	/* Explicitly set the BIT_RD regardless of the client's flags. This is
-	 * for a prefetch query (no client attached) but it needs to be treated
-	 * as a recursion query. */
-	uint16_t mesh_flags = BIT_RD|(qflags&BIT_CD);
 	struct mesh_state* s = mesh_area_find(mesh, NULL, qinfo,
-		mesh_flags, 0, 0);
+		qflags&(BIT_RD|BIT_CD), 0, 0);
 #ifdef UNBOUND_DEBUG
 	struct rbnode_type* n;
 #endif
@@ -702,7 +660,8 @@ static void mesh_schedule_prefetch(struct mesh_area* mesh,
 		return;
 	}

-	s = mesh_state_create(mesh->env, qinfo, NULL, mesh_flags, 0, 0);
+	s = mesh_state_create(mesh->env, qinfo, NULL,
+		qflags&(BIT_RD|BIT_CD), 0, 0);
 	if(!s) {
 		log_err("prefetch mesh_state_create: out of memory");
 		return;
@@ -763,17 +722,14 @@ static void mesh_schedule_prefetch_subnet(struct mesh_area* mesh,
 #ifdef UNBOUND_DEBUG
 	struct rbnode_type* n;
 #endif
-	/* Explicitly set the BIT_RD regardless of the client's flags. This is
-	 * for a prefetch query (no client attached) but it needs to be treated
-	 * as a recursion query. */
-	uint16_t mesh_flags = BIT_RD|(qflags&BIT_CD);
 	if(!mesh_make_new_space(mesh, NULL)) {
 		verbose(VERB_ALGO, "Too many queries. dropped prefetch.");
 		mesh->stats_dropped ++;
 		return;
 	}

-	s = mesh_state_create(mesh->env, qinfo, NULL, mesh_flags, 0, 0);
+	s = mesh_state_create(mesh->env, qinfo, NULL,
+		qflags&(BIT_RD|BIT_CD), 0, 0);
 	if(!s) {
 		log_err("prefetch_subnet mesh_state_create: out of memory");
 		return;
@@ -974,10 +930,6 @@ mesh_state_cleanup(struct mesh_state* mstate)
 		 * takes no time and also it does not do the mesh accounting */
 		mstate->reply_list = NULL;
 		for(; rep; rep=rep->next) {
-			infra_wait_limit_dec(mesh->env->infra_cache,
-				&rep->query_reply, mesh->env->cfg);
-			if(rep->query_reply.c->use_h2)
-				http2_stream_remove_mesh_state(rep->h2_stream);
 			comm_point_drop_reply(&rep->query_reply);
 			log_assert(mesh->num_reply_addrs > 0);
 			mesh->num_reply_addrs--;
@@ -1227,7 +1179,7 @@ mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep,
 		rcode = LDNS_RCODE_SERVFAIL;
 	if(!rcode && rep && (rep->security == sec_status_bogus ||
 		rep->security == sec_status_secure_sentinel_fail)) {
-		if(!(reason = errinf_to_str_bogus(&m->s, NULL)))
+		if(!(reason = errinf_to_str_bogus(&m->s)))
 			rcode = LDNS_RCODE_SERVFAIL;
 	}
 	/* send the reply */
@@ -1461,8 +1413,6 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		comm_point_send_reply(&r->query_reply);
 		m->reply_list = rlist;
 	}
-	infra_wait_limit_dec(m->s.env->infra_cache, &r->query_reply,
-		m->s.env->cfg);
 	/* account */
 	log_assert(m->s.env->mesh->num_reply_addrs > 0);
 	m->s.env->mesh->num_reply_addrs--;
@@ -1486,7 +1436,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		log_reply_info(NO_VERBOSE, &m->s.qinfo,
 			&r->query_reply.client_addr,
 			r->query_reply.client_addrlen, duration, 0, r_buffer,
-			(m->s.env->cfg->log_destaddr?(void*)r->query_reply.c->socket->addr:NULL),
+			(m->s.env->cfg->log_destaddr?(void*)r->query_reply.c->socket->addr->ai_addr:NULL),
 			r->query_reply.c->type);
 	}
 }
@@ -1514,34 +1464,12 @@ void mesh_query_done(struct mesh_state* mstate)
 		&& mstate->s.env->cfg->log_servfail
 		&& !mstate->s.env->cfg->val_log_squelch) {
 			char* err = errinf_to_str_servfail(&mstate->s);
-			if(err) { log_err("%s", err); }
+			if(err)
+				log_err("%s", err);
+			free(err);
 		}
 	}
 	for(r = mstate->reply_list; r; r = r->next) {
-		struct timeval old;
-		timeval_subtract(&old, mstate->s.env->now_tv, &r->start_time);
-		if(mstate->s.env->cfg->discard_timeout != 0 &&
-			((int)old.tv_sec)*1000+((int)old.tv_usec)/1000 >
-			mstate->s.env->cfg->discard_timeout) {
-			/* Drop the reply, it is too old */
-			/* briefly set the reply_list to NULL, so that the
-			 * tcp req info cleanup routine that calls the mesh
-			 * to deregister the meshstate for it is not done
-			 * because the list is NULL and also accounting is not
-			 * done there, but instead we do that here. */
-			struct mesh_reply* reply_list = mstate->reply_list;
-			verbose(VERB_ALGO, "drop reply, it is older than discard-timeout");
-			infra_wait_limit_dec(mstate->s.env->infra_cache,
-				&r->query_reply, mstate->s.env->cfg);
-			mstate->reply_list = NULL;
-			if(r->query_reply.c->use_h2)
-				http2_stream_remove_mesh_state(r->h2_stream);
-			comm_point_drop_reply(&r->query_reply);
-			mstate->reply_list = reply_list;
-			mstate->s.env->mesh->stats_dropped++;
-			continue;
-		}
-
 		i++;
 		tv = r->start_time;

@@ -1565,12 +1493,7 @@ void mesh_query_done(struct mesh_state* mstate)
 			 * because the list is NULL and also accounting is not
 			 * done there, but instead we do that here. */
 			struct mesh_reply* reply_list = mstate->reply_list;
-			infra_wait_limit_dec(mstate->s.env->infra_cache,
-				&r->query_reply, mstate->s.env->cfg);
 			mstate->reply_list = NULL;
-			if(r->query_reply.c->use_h2) {
-				http2_stream_remove_mesh_state(r->h2_stream);
-			}
 			comm_point_drop_reply(&r->query_reply);
 			mstate->reply_list = reply_list;
 		} else {
@@ -1585,8 +1508,6 @@ void mesh_query_done(struct mesh_state* mstate)
 				tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate);
 				r_buffer = NULL;
 			}
-			/* mesh_send_reply removed mesh state from
-			 * http2_stream. */
 			prev = r;
 			prev_buffer = r_buffer;
 		}
@@ -1739,7 +1660,6 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns,
 		return 0;
 	if(rep->c->use_h2)
 		r->h2_stream = rep->c->h2_stream;
-	else	r->h2_stream = NULL;

 	/* Data related to local alias stored in 'qinfo' (if any) is ephemeral
 	 * and can be different for different original queries (even if the
@@ -2105,8 +2025,6 @@ void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m,
 			/* delete it, but allocated in m region */
 			log_assert(mesh->num_reply_addrs > 0);
 			mesh->num_reply_addrs--;
-			infra_wait_limit_dec(mesh->env->infra_cache,
-				&n->query_reply, mesh->env->cfg);

 			/* prev = prev; */
 			n = n->next;
@@ -2247,30 +2165,6 @@ mesh_serve_expired_callback(void* arg)
 		log_dns_msg("Serve expired lookup", &qstate->qinfo, msg->rep);

 	for(r = mstate->reply_list; r; r = r->next) {
-		struct timeval old;
-		timeval_subtract(&old, mstate->s.env->now_tv, &r->start_time);
-		if(mstate->s.env->cfg->discard_timeout != 0 &&
-			((int)old.tv_sec)*1000+((int)old.tv_usec)/1000 >
-			mstate->s.env->cfg->discard_timeout) {
-			/* Drop the reply, it is too old */
-			/* briefly set the reply_list to NULL, so that the
-			 * tcp req info cleanup routine that calls the mesh
-			 * to deregister the meshstate for it is not done
-			 * because the list is NULL and also accounting is not
-			 * done there, but instead we do that here. */
-			struct mesh_reply* reply_list = mstate->reply_list;
-			verbose(VERB_ALGO, "drop reply, it is older than discard-timeout");
-			infra_wait_limit_dec(mstate->s.env->infra_cache,
-				&r->query_reply, mstate->s.env->cfg);
-			mstate->reply_list = NULL;
-			if(r->query_reply.c->use_h2)
-				http2_stream_remove_mesh_state(r->h2_stream);
-			comm_point_drop_reply(&r->query_reply);
-			mstate->reply_list = reply_list;
-			mstate->s.env->mesh->stats_dropped++;
-			continue;
-		}
-
 		i++;
 		tv = r->start_time;

@@ -2298,9 +2192,6 @@ mesh_serve_expired_callback(void* arg)
 			r, r_buffer, prev, prev_buffer);
 		if(r->query_reply.c->tcp_req_info)
 			tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate);
-		/* mesh_send_reply removed mesh state from http2_stream. */
-		infra_wait_limit_dec(mstate->s.env->infra_cache,
-			&r->query_reply, mstate->s.env->cfg);
 		prev = r;
 		prev_buffer = r_buffer;
 	}
@@ -2347,14 +2238,6 @@ mesh_serve_expired_callback(void* arg)
 	}
 }

-void
-mesh_respond_serve_expired(struct mesh_state* mstate)
-{
-	if(!mstate->s.serve_expired_data)
-		mesh_serve_expired_init(mstate, -1);
-	mesh_serve_expired_callback(mstate);
-}
-
 int mesh_jostle_exceeded(struct mesh_area* mesh)
 {
 	if(mesh->all.count < mesh->max_reply_states)
@@ -690,10 +690,4 @@ mesh_serve_expired_lookup(struct module_qstate* qstate,
 */
 int mesh_jostle_exceeded(struct mesh_area* mesh);

-/**
- * Give the serve expired responses.
- * @param mstate: mesh state for query that has serve_expired_data.
- */
-void mesh_respond_serve_expired(struct mesh_state* mstate);
-
 #endif /* SERVICES_MESH_H */
@@ -95,16 +95,6 @@ modstack_init(struct module_stack* stack)
 	stack->mod = NULL;
 }

-void
-modstack_free(struct module_stack* stack)
-{
-	if(!stack)
-		return;
-        stack->num = 0;
-        free(stack->mod);
-        stack->mod = NULL;
-}
-
 int
 modstack_config(struct module_stack* stack, const char* module_conf)
 {
@@ -232,59 +222,18 @@ module_func_block* module_factory(const char** str)
        return NULL;
 }

-int
-modstack_call_startup(struct module_stack* stack, const char* module_conf,
+int 
+modstack_setup(struct module_stack* stack, const char* module_conf,
 	struct module_env* env)
 {
        int i;
        if(stack->num != 0)
-		fatal_exit("unexpected already initialised modules");
+                modstack_desetup(stack, env);
        /* fixed setup of the modules */
        if(!modstack_config(stack, module_conf)) {
 		return 0;
        }
-        for(i=0; i<stack->num; i++) {
-		if(stack->mod[i]->startup == NULL)
-			continue;
-                verbose(VERB_OPS, "startup module %d: %s",
-                        i, stack->mod[i]->name);
-                fptr_ok(fptr_whitelist_mod_startup(stack->mod[i]->startup));
-                if(!(*stack->mod[i]->startup)(env, i)) {
-                        log_err("module startup for module %s failed",
-                                stack->mod[i]->name);
-			return 0;
-                }
-        }
-	return 1;
-}
-
-int
-modstack_call_init(struct module_stack* stack, const char* module_conf,
-	struct module_env* env)
-{
-        int i, changed = 0;
        env->need_to_validate = 0; /* set by module init below */
-        for(i=0; i<stack->num; i++) {
-		while(*module_conf && isspace(*module_conf))
-			module_conf++;
-                if(strncmp(stack->mod[i]->name, module_conf,
-			strlen(stack->mod[i]->name))) {
-			if(stack->mod[i]->startup || stack->mod[i]->destartup) {
-				log_err("changed module ordering during reload not supported, for module that needs startup");
-				return 0;
-			} else {
-				changed = 1;
-			}
-		}
-		module_conf += strlen(stack->mod[i]->name);
-	}
-	if(changed) {
-		modstack_free(stack);
-		if(!modstack_config(stack, module_conf)) {
-			return 0;
-		}
-	}
-
        for(i=0; i<stack->num; i++) {
                verbose(VERB_OPS, "init module %d: %s",
                        i, stack->mod[i]->name);
@@ -298,29 +247,20 @@ modstack_call_init(struct module_stack* stack, const char* module_conf,
 	return 1;
 }

-void
-modstack_call_deinit(struct module_stack* stack, struct module_env* env)
+void 
+modstack_desetup(struct module_stack* stack, struct module_env* env)
 {
        int i;
        for(i=0; i<stack->num; i++) {
                fptr_ok(fptr_whitelist_mod_deinit(stack->mod[i]->deinit));
                (*stack->mod[i]->deinit)(env, i);
        }
+        stack->num = 0;
+        free(stack->mod);
+        stack->mod = NULL;
 }

-void
-modstack_call_destartup(struct module_stack* stack, struct module_env* env)
-{
-        int i;
-        for(i=0; i<stack->num; i++) {
-		if(stack->mod[i]->destartup == NULL)
-			continue;
-                fptr_ok(fptr_whitelist_mod_destartup(stack->mod[i]->destartup));
-                (*stack->mod[i]->destartup)(env, i);
-        }
-}
-
-int
+int 
 modstack_find(struct module_stack* stack, const char* name)
 {
 	int i;
@@ -60,23 +60,6 @@ struct module_stack {
 */
 void modstack_init(struct module_stack* stack);

-/**
- * Free the stack of modules
- * @param stack: stack that frees up memory.
- */
-void modstack_free(struct module_stack* stack);
-
-/**
- * Initialises modules and assignes ids. Calls module_startup().
- * @param stack: Expected empty, filled according to module_conf
- * @param module_conf: string what modules to initialize
- * @param env: module environment which is inited by the modules.
- *	environment should have a superalloc, cfg,
- * @return on false a module init failed.
- */
-int modstack_call_startup(struct module_stack* stack, const char* module_conf,
-	struct module_env* env);
-
 /**
 * Read config file module settings and set up the modfunc block
 * @param stack: the stack of modules (empty before call). 
@@ -100,31 +83,24 @@ struct module_func_block* module_factory(const char** str);
 const char** module_list_avail(void);

 /**
- * Init modules. Calls module_init().
- * @param stack: It is modstack_setupped().
- * @param module_conf: module ordering to check against the ordering in stack.
- *	fails on changed ordering.
+ * Setup modules. Assigns ids and calls module_init.
+ * @param stack: if not empty beforehand, it will be desetup()ed.
+ *	It is then modstack_configged().
+ * @param module_conf: string what modules to insert.
 * @param env: module environment which is inited by the modules.
 *	environment should have a superalloc, cfg,
 *	env.need_to_validate is set by the modules.
 * @return on false a module init failed.
 */
-int modstack_call_init(struct module_stack* stack, const char* module_conf,
+int modstack_setup(struct module_stack* stack, const char* module_conf,
 	struct module_env* env);

 /**
- * Deinit the modules.
+ * Desetup the modules, deinit, delete.
 * @param stack: made empty.
 * @param env: module env for module deinit() calls.
 */
-void modstack_call_deinit(struct module_stack* stack, struct module_env* env);
-
-/**
- * Destartup the modules, close, delete.
- * @param stack: made empty.
- * @param env: module env for module destartup() calls.
- */
-void modstack_call_destartup(struct module_stack* stack, struct module_env* env);
+void modstack_desetup(struct module_stack* stack, struct module_env* env);

 /**
 * Find index of module by name.
@@ -2051,8 +2051,7 @@ select_id(struct outside_network* outnet, struct pending* pend,
 }

 /** return true is UDP connect error needs to be logged */
-static int udp_connect_needs_log(int err, struct sockaddr_storage* addr,
-	socklen_t addrlen)
+static int udp_connect_needs_log(int err)
 {
 	switch(err) {
 	case ECONNREFUSED:
@@ -2076,15 +2075,6 @@ static int udp_connect_needs_log(int err, struct sockaddr_storage* addr,
 		if(verbosity >= VERB_ALGO)
 			return 1;
 		return 0;
-	case EINVAL:
-		/* Stop 'Invalid argument for fe80::/10' addresses appearing
-		 * in the logs, at low verbosity. They cannot be sent to. */
-		if(addr_is_ip6linklocal(addr, addrlen)) {
-			if(verbosity >= VERB_ALGO)
-				return 1;
-			return 0;
-		}
-		break;
 	default:
 		break;
 	}
@@ -2151,8 +2141,7 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 				/* connect() to the destination */
 				if(connect(fd, (struct sockaddr*)&pend->addr,
 					pend->addrlen) < 0) {
-					if(udp_connect_needs_log(errno,
-						&pend->addr, pend->addrlen)) {
+					if(udp_connect_needs_log(errno)) {
 						log_err_addr("udp connect failed",
 							strerror(errno), &pend->addr,
 							pend->addrlen);
@@ -478,67 +478,6 @@ new_cname_override(struct regional* region, uint8_t* ct, size_t ctlen)
 	return rrset;
 }

-/** delete the cname override */
-static void
-delete_cname_override(struct rpz* r)
-{
-	if(r->cname_override) {
-		/* The cname override is what is allocated in the region. */
-		regional_free_all(r->region);
-		r->cname_override = NULL;
-	}
-}
-
-/** Apply rpz config elements to the rpz structure, false on failure. */
-static int
-rpz_apply_cfg_elements(struct rpz* r, struct config_auth* p)
-{
-	if(p->rpz_taglist && p->rpz_taglistlen) {
-		r->taglistlen = p->rpz_taglistlen;
-		r->taglist = memdup(p->rpz_taglist, r->taglistlen);
-		if(!r->taglist) {
-			log_err("malloc failure on RPZ taglist alloc");
-			return 0;
-		}
-	}
-
-	if(p->rpz_action_override) {
-		r->action_override = rpz_config_to_action(p->rpz_action_override);
-	}
-	else
-		r->action_override = RPZ_NO_OVERRIDE_ACTION;
-
-	if(r->action_override == RPZ_CNAME_OVERRIDE_ACTION) {
-		uint8_t nm[LDNS_MAX_DOMAINLEN+1];
-		size_t nmlen = sizeof(nm);
-
-		if(!p->rpz_cname) {
-			log_err("rpz: override with cname action found, but no "
-				"rpz-cname-override configured");
-			return 0;
-		}
-
-		if(sldns_str2wire_dname_buf(p->rpz_cname, nm, &nmlen) != 0) {
-			log_err("rpz: cannot parse cname override: %s",
-				p->rpz_cname);
-			return 0;
-		}
-		r->cname_override = new_cname_override(r->region, nm, nmlen);
-		if(!r->cname_override) {
-			return 0;
-		}
-	}
-	r->log = p->rpz_log;
-	r->signal_nxdomain_ra = p->rpz_signal_nxdomain_ra;
-	if(p->rpz_log_name) {
-		if(!(r->log_name = strdup(p->rpz_log_name))) {
-			log_err("malloc failure on RPZ log_name strdup");
-			return 0;
-		}
-	}
-	return 1;
-}
-
 struct rpz*
 rpz_create(struct config_auth* p)
 {
@@ -574,8 +513,42 @@ rpz_create(struct config_auth* p)
 		goto err;
 	}

-	if(!rpz_apply_cfg_elements(r, p))
-		goto err;
+	r->taglistlen = p->rpz_taglistlen;
+	r->taglist = memdup(p->rpz_taglist, r->taglistlen);
+	if(p->rpz_action_override) {
+		r->action_override = rpz_config_to_action(p->rpz_action_override);
+	}
+	else
+		r->action_override = RPZ_NO_OVERRIDE_ACTION;
+
+	if(r->action_override == RPZ_CNAME_OVERRIDE_ACTION) {
+		uint8_t nm[LDNS_MAX_DOMAINLEN+1];
+		size_t nmlen = sizeof(nm);
+
+		if(!p->rpz_cname) {
+			log_err("rpz: override with cname action found, but no "
+				"rpz-cname-override configured");
+			goto err;
+		}
+
+		if(sldns_str2wire_dname_buf(p->rpz_cname, nm, &nmlen) != 0) {
+			log_err("rpz: cannot parse cname override: %s",
+				p->rpz_cname);
+			goto err;
+		}
+		r->cname_override = new_cname_override(r->region, nm, nmlen);
+		if(!r->cname_override) {
+			goto err;
+		}
+	}
+	r->log = p->rpz_log;
+	r->signal_nxdomain_ra = p->rpz_signal_nxdomain_ra;
+	if(p->rpz_log_name) {
+		if(!(r->log_name = strdup(p->rpz_log_name))) {
+			log_err("malloc failure on RPZ log_name strdup");
+			goto err;
+		}
+	}
 	return r;
 err:
 	if(r) {
@@ -598,32 +571,6 @@ err:
 	return NULL;
 }

-int
-rpz_config(struct rpz* r, struct config_auth* p)
-{
-	/* If the zonefile changes, it is read later, after which
-	 * rpz_clear and rpz_finish_config is called. */
-
-	/* free taglist, if any */
-	if(r->taglist) {
-		free(r->taglist);
-		r->taglist = NULL;
-		r->taglistlen = 0;
-	}
-
-	/* free logname, if any */
-	if(r->log_name) {
-		free(r->log_name);
-		r->log_name = NULL;
-	}
-
-	delete_cname_override(r);
-
-	if(!rpz_apply_cfg_elements(r, p))
-		return 0;
-	return 1;
-}
-
 /**
 * Remove RPZ zone name from dname
 * Copy dname to newdname, without the originlen number of trailing bytes
@@ -1244,20 +1191,16 @@ rpz_find_zone(struct local_zones* zones, uint8_t* qname, size_t qname_len, uint1
 /** Find entry for RR type in the list of rrsets for the clientip. */
 static struct local_rrset*
 rpz_find_synthesized_rrset(uint16_t qtype,
-	struct clientip_synthesized_rr* data, int alias_ok)
+	struct clientip_synthesized_rr* data)
 {
-	struct local_rrset* cursor = data->data, *cname = NULL;
+	struct local_rrset* cursor = data->data;
 	while( cursor != NULL) {
 		struct packed_rrset_key* packed_rrset = &cursor->rrset->rk;
 		if(htons(qtype) == packed_rrset->type) {
 			return cursor;
 		}
-		if(ntohs(packed_rrset->type) == LDNS_RR_TYPE_CNAME && alias_ok)
-			cname = cursor;
 		cursor = cursor->next;
 	}
-	if(alias_ok)
-		return cname;
 	return NULL;
 }

@@ -1443,7 +1386,7 @@ static int rpz_remove_clientip_rr(struct clientip_synthesized_rr* node,
 	struct local_rrset* rrset;
 	struct packed_rrset_data* d;
 	size_t index;
-	rrset = rpz_find_synthesized_rrset(rr_type, node, 0);
+	rrset = rpz_find_synthesized_rrset(rr_type, node);
 	if(rrset == NULL)
 		return 0; /* type not found, ignore */
 	d = (struct packed_rrset_data*)rrset->rrset->entry.data;
@@ -1846,7 +1789,7 @@ rpz_apply_clientip_localdata_action(struct clientip_synthesized_rr* raddr,
 	}

 	/* check query type / rr type */
-	rrset = rpz_find_synthesized_rrset(qinfo->qtype, raddr, 1);
+	rrset = rpz_find_synthesized_rrset(qinfo->qtype, raddr);
 	if(rrset == NULL) {
 		verbose(VERB_ALGO, "rpz: unable to find local-data for query");
 		rrset_count = 0;
@@ -1880,28 +1823,6 @@ nodata:
 		rrset_count, rcode, rsoa);
 }

-/** Apply the cname override action, during worker request callback.
- * false on failure. */
-static int
-rpz_apply_cname_override_action(struct rpz* r,
-	struct query_info* qinfo, struct regional* temp)
-{
-	if(!r)
-		return 0;
-	qinfo->local_alias = regional_alloc_zero(temp,
-		sizeof(struct local_rrset));
-	if(qinfo->local_alias == NULL)
-		return 0; /* out of memory */
-	qinfo->local_alias->rrset = respip_copy_rrset(r->cname_override, temp);
-	if(qinfo->local_alias->rrset == NULL) {
-		qinfo->local_alias = NULL;
-		return 0; /* out of memory */
-	}
-	qinfo->local_alias->rrset->rk.dname = qinfo->qname;
-	qinfo->local_alias->rrset->rk.dname_len = qinfo->qname_len;
-	return 1;
-}
-
 /** add additional section SOA record to the reply.
 * Since this gets fed into the normal iterator answer creation, it
 * gets minimal-responses applied to it, that can remove the additional SOA
@@ -2012,7 +1933,6 @@ rpz_synthesize_localdata_from_rrset(struct rpz* ATTR_UNUSED(r), struct module_qs
 	msg = rpz_dns_msg_new(ms->region);
 	if(msg == NULL) { return NULL; }

-	msg->qinfo = *qi;
        new_reply_info = construct_reply_info_base(ms->region,
                                                   LDNS_RCODE_NOERROR | BIT_QR | BIT_AA | BIT_RA,
                                                   1, /* qd */
@@ -2055,42 +1975,40 @@ rpz_synthesize_localdata_from_rrset(struct rpz* ATTR_UNUSED(r), struct module_qs

 static inline struct dns_msg*
 rpz_synthesize_nsip_localdata(struct rpz* r, struct module_qstate* ms,
-	struct query_info* qi, struct clientip_synthesized_rr* data,
-	struct auth_zone* az)
+	struct clientip_synthesized_rr* data, struct auth_zone* az)
 {
+	struct query_info* qi = &ms->qinfo;
 	struct local_rrset* rrset;

-	rrset = rpz_find_synthesized_rrset(qi->qtype, data, 1);
+	rrset = rpz_find_synthesized_rrset(qi->qtype, data);
 	if(rrset == NULL) {
 		verbose(VERB_ALGO, "rpz: nsip: no matching local data found");
 		return NULL;
 	}

-	return rpz_synthesize_localdata_from_rrset(r, ms, qi, rrset, az);
+	return rpz_synthesize_localdata_from_rrset(r, ms, &ms->qinfo, rrset, az);
 }

 /* copy'n'paste from localzone.c */
 static struct local_rrset*
 local_data_find_type(struct local_data* data, uint16_t type, int alias_ok)
 {
-	struct local_rrset* p, *cname = NULL;
+	struct local_rrset* p;
 	type = htons(type);
 	for(p = data->rrsets; p; p = p->next) {
 		if(p->rrset->rk.type == type)
 			return p;
 		if(alias_ok && p->rrset->rk.type == htons(LDNS_RR_TYPE_CNAME))
-			cname = p;
+			return p;
 	}
-	if(alias_ok)
-		return cname;
 	return NULL;
 }

 /* based on localzone.c:local_data_answer() */
 static inline struct dns_msg*
 rpz_synthesize_nsdname_localdata(struct rpz* r, struct module_qstate* ms,
-	struct query_info* qi, struct local_zone* z,
-	struct matched_delegation_point const* match, struct auth_zone* az)
+	struct local_zone* z, struct matched_delegation_point const* match,
+	struct auth_zone* az)
 {
 	struct local_data key;
 	struct local_data* ld;
@@ -2111,13 +2029,13 @@ rpz_synthesize_nsdname_localdata(struct rpz* r, struct module_qstate* ms,
 		return NULL;
 	}

-	rrset = local_data_find_type(ld, qi->qtype, 1);
+	rrset = local_data_find_type(ld, ms->qinfo.qtype, 1);
 	if(rrset == NULL) {
 		verbose(VERB_ALGO, "rpz: nsdname: no matching local data found");
 		return NULL;
 	}

-	return rpz_synthesize_localdata_from_rrset(r, ms, qi, rrset, az);
+	return rpz_synthesize_localdata_from_rrset(r, ms, &ms->qinfo, rrset, az);
 }

 /* like local_data_answer for qname triggers after a cname */
@@ -2134,70 +2052,17 @@ rpz_synthesize_qname_localdata_msg(struct rpz* r, struct module_qstate* ms,
 	key.namelabs = dname_count_labels(qinfo->qname);
 	ld = (struct local_data*)rbtree_search(&z->data, &key.node);
 	if(ld == NULL) {
-		verbose(VERB_ALGO, "rpz: qname: name not found");
+		verbose(VERB_ALGO, "rpz: qname after cname: name not found");
 		return NULL;
 	}
 	rrset = local_data_find_type(ld, qinfo->qtype, 1);
 	if(rrset == NULL) {
-		verbose(VERB_ALGO, "rpz: qname: type not found");
+		verbose(VERB_ALGO, "rpz: qname after cname: type not found");
 		return NULL;
 	}
 	return rpz_synthesize_localdata_from_rrset(r, ms, qinfo, rrset, az);
 }

-/** Synthesize a CNAME message for RPZ action override */
-static struct dns_msg*
-rpz_synthesize_cname_override_msg(struct rpz* r, struct module_qstate* ms,
-	struct query_info* qinfo)
-{
-	struct dns_msg* msg = NULL;
-	struct reply_info* new_reply_info;
-	struct ub_packed_rrset_key* rp;
-
-	msg = rpz_dns_msg_new(ms->region);
-	if(msg == NULL) { return NULL; }
-
-	msg->qinfo = *qinfo;
-        new_reply_info = construct_reply_info_base(ms->region,
-                                                   LDNS_RCODE_NOERROR | BIT_QR | BIT_AA | BIT_RA,
-                                                   1, /* qd */
-                                                   0, /* ttl */
-                                                   0, /* prettl */
-                                                   0, /* expttl */
-                                                   1, /* an */
-                                                   0, /* ns */
-                                                   0, /* ar */
-                                                   1, /* total */
-                                                   sec_status_insecure,
-                                                   LDNS_EDE_NONE);
-	if(new_reply_info == NULL) {
-		log_err("out of memory");
-		return NULL;
-	}
-	new_reply_info->authoritative = 1;
-
-	rp = respip_copy_rrset(r->cname_override, ms->region);
-	if(rp == NULL) {
-		log_err("out of memory");
-		return NULL;
-	}
-	rp->rk.dname = qinfo->qname;
-	rp->rk.dname_len = qinfo->qname_len;
-	/* this rrset is from the rpz data, or synthesized.
-	 * It is not actually from the network, so we flag it with this
-	 * flags as a fake RRset. If later the cache is used to look up
-	 * rrsets, then the fake ones are not returned (if you look without
-	 * the flag). For like CNAME lookups from the iterator or A, AAAA
-	 * lookups for nameserver targets, it would use the without flag
-	 * actual data. So that the actual network data and fake data
-	 * are kept track of separately. */
-	rp->rk.flags |= PACKED_RRSET_RPZ;
-	new_reply_info->rrsets[0] = rp;
-
-	msg->rep = new_reply_info;
-	return msg;
-}
-
 static int
 rpz_synthesize_qname_localdata(struct module_env* env, struct rpz* r,
 	struct local_zone* z, enum localzone_type lzt, struct query_info* qinfo,
@@ -2207,8 +2072,17 @@ rpz_synthesize_qname_localdata(struct module_env* env, struct rpz* r,
 	struct local_data* ld = NULL;
 	int ret = 0;
 	if(r->action_override == RPZ_CNAME_OVERRIDE_ACTION) {
-		if(!rpz_apply_cname_override_action(r, qinfo, temp))
-			return 0;
+		qinfo->local_alias = regional_alloc_zero(temp, sizeof(struct local_rrset));
+		if(qinfo->local_alias == NULL) {
+			return 0; /* out of memory */
+		}
+		qinfo->local_alias->rrset = regional_alloc_init(temp, r->cname_override,
+								sizeof(*r->cname_override));
+		if(qinfo->local_alias->rrset == NULL) {
+			return 0; /* out of memory */
+		}
+		qinfo->local_alias->rrset->rk.dname = qinfo->qname;
+		qinfo->local_alias->rrset->rk.dname_len = qinfo->qname_len;
 		if(r->log) {
 			log_rpz_apply("qname", z->name, NULL, RPZ_CNAME_OVERRIDE_ACTION,
 				      qinfo, repinfo, NULL, r->log_name);
@@ -2260,9 +2134,8 @@ rpz_delegation_point_ipbased_trigger_lookup(struct rpz* rpz, struct iter_qstate*
 }

 static struct dns_msg*
-rpz_apply_nsip_trigger(struct module_qstate* ms, struct query_info* qchase,
-	struct rpz* r, struct clientip_synthesized_rr* raddr,
-	struct auth_zone* az)
+rpz_apply_nsip_trigger(struct module_qstate* ms, struct rpz* r,
+	struct clientip_synthesized_rr* raddr, struct auth_zone* az)
 {
 	enum rpz_action action = raddr->action;
 	struct dns_msg* ret = NULL;
@@ -2275,16 +2148,16 @@ rpz_apply_nsip_trigger(struct module_qstate* ms, struct query_info* qchase,

 	if(action == RPZ_LOCAL_DATA_ACTION && raddr->data == NULL) {
 		verbose(VERB_ALGO, "rpz: bug: nsip local data action but no local data");
-		ret = rpz_synthesize_nodata(r, ms, qchase, az);
+		ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az);
 		goto done;
 	}

 	switch(action) {
 	case RPZ_NXDOMAIN_ACTION:
-		ret = rpz_synthesize_nxdomain(r, ms, qchase, az);
+		ret = rpz_synthesize_nxdomain(r, ms, &ms->qinfo, az);
 		break;
 	case RPZ_NODATA_ACTION:
-		ret = rpz_synthesize_nodata(r, ms, qchase, az);
+		ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az);
 		break;
 	case RPZ_TCP_ONLY_ACTION:
 		/* basically a passthru here but the tcp-only will be
@@ -2293,20 +2166,17 @@ rpz_apply_nsip_trigger(struct module_qstate* ms, struct query_info* qchase,
 		ret = NULL;
 		break;
 	case RPZ_DROP_ACTION:
-		ret = rpz_synthesize_nodata(r, ms, qchase, az);
+		ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az);
 		ms->is_drop = 1;
 		break;
 	case RPZ_LOCAL_DATA_ACTION:
-		ret = rpz_synthesize_nsip_localdata(r, ms, qchase, raddr, az);
-		if(ret == NULL) { ret = rpz_synthesize_nodata(r, ms, qchase, az); }
+		ret = rpz_synthesize_nsip_localdata(r, ms, raddr, az);
+		if(ret == NULL) { ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az); }
 		break;
 	case RPZ_PASSTHRU_ACTION:
 		ret = NULL;
 		ms->rpz_passthru = 1;
 		break;
-	case RPZ_CNAME_OVERRIDE_ACTION:
-		ret = rpz_synthesize_cname_override_msg(r, ms, qchase);
-		break;
 	default:
 		verbose(VERB_ALGO, "rpz: nsip: bug: unhandled or invalid action: '%s'",
 			rpz_action_to_string(action));
@@ -2324,9 +2194,9 @@ done:
 }

 static struct dns_msg*
-rpz_apply_nsdname_trigger(struct module_qstate* ms, struct query_info* qchase,
-	struct rpz* r, struct local_zone* z,
-	struct matched_delegation_point const* match, struct auth_zone* az)
+rpz_apply_nsdname_trigger(struct module_qstate* ms, struct rpz* r,
+	struct local_zone* z, struct matched_delegation_point const* match,
+	struct auth_zone* az)
 {
 	struct dns_msg* ret = NULL;
 	enum rpz_action action = localzone_type_to_rpz_action(z->type);
@@ -2339,10 +2209,10 @@ rpz_apply_nsdname_trigger(struct module_qstate* ms, struct query_info* qchase,

 	switch(action) {
 	case RPZ_NXDOMAIN_ACTION:
-		ret = rpz_synthesize_nxdomain(r, ms, qchase, az);
+		ret = rpz_synthesize_nxdomain(r, ms, &ms->qinfo, az);
 		break;
 	case RPZ_NODATA_ACTION:
-		ret = rpz_synthesize_nodata(r, ms, qchase, az);
+		ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az);
 		break;
 	case RPZ_TCP_ONLY_ACTION:
 		/* basically a passthru here but the tcp-only will be
@@ -2351,22 +2221,19 @@ rpz_apply_nsdname_trigger(struct module_qstate* ms, struct query_info* qchase,
 		ret = NULL;
 		break;
 	case RPZ_DROP_ACTION:
-		ret = rpz_synthesize_nodata(r, ms, qchase, az);
+		ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az);
 		ms->is_drop = 1;
 		break;
 	case RPZ_LOCAL_DATA_ACTION:
-		ret = rpz_synthesize_nsdname_localdata(r, ms, qchase, z, match, az);
-		if(ret == NULL) { ret = rpz_synthesize_nodata(r, ms, qchase, az); }
+		ret = rpz_synthesize_nsdname_localdata(r, ms, z, match, az);
+		if(ret == NULL) { ret = rpz_synthesize_nodata(r, ms, &ms->qinfo, az); }
 		break;
 	case RPZ_PASSTHRU_ACTION:
 		ret = NULL;
 		ms->rpz_passthru = 1;
 		break;
-	case RPZ_CNAME_OVERRIDE_ACTION:
-		ret = rpz_synthesize_cname_override_msg(r, ms, qchase);
-		break;
 	default:
-		verbose(VERB_ALGO, "rpz: nsdname: bug: unhandled or invalid action: '%s'",
+		verbose(VERB_ALGO, "rpz: nsip: bug: unhandled or invalid action: '%s'",
 			rpz_action_to_string(action));
 		ret = NULL;
 	}
@@ -2435,10 +2302,11 @@ rpz_callback_from_iterator_module(struct module_qstate* ms, struct iter_qstate*
 	if(ms->env == NULL || ms->env->auth_zones == NULL) { return 0; }

 	az = ms->env->auth_zones;
-	lock_rw_rdlock(&az->rpz_lock);

 	verbose(VERB_ALGO, "rpz: iterator module callback: have_rpz=%d", az->rpz_first != NULL);

+	lock_rw_rdlock(&az->rpz_lock);
+
 	/* precedence of RPZ works, loosely, like this:
 	 * CNAMEs in order of the CNAME chain. rpzs in the order they are
 	 * configured. In an RPZ: first client-IP addr, then QNAME, then
@@ -2453,17 +2321,10 @@ rpz_callback_from_iterator_module(struct module_qstate* ms, struct iter_qstate*
 			lock_rw_unlock(&a->lock);
 			continue;
 		}
-		if(r->taglist && (!ms->client_info ||
-			!taglist_intersect(r->taglist, r->taglistlen,
-				ms->client_info->taglist,
-				ms->client_info->taglen))) {
-			lock_rw_unlock(&a->lock);
-			continue;
-		}

 		/* the nsdname has precedence over the nsip triggers */
 		z = rpz_delegation_point_zone_lookup(is->dp, r->nsdname_zones,
-						     is->qchase.qclass, &match);
+						     ms->qinfo.qclass, &match);
 		if(z != NULL) {
 			lock_rw_unlock(&a->lock);
 			break;
@@ -2486,9 +2347,9 @@ rpz_callback_from_iterator_module(struct module_qstate* ms, struct iter_qstate*
 		if(z) {
 			lock_rw_unlock(&z->lock);
 		}
-		return rpz_apply_nsip_trigger(ms, &is->qchase, r, raddr, a);
+		return rpz_apply_nsip_trigger(ms, r, raddr, a);
 	}
-	return rpz_apply_nsdname_trigger(ms, &is->qchase, r, z, &match, a);
+	return rpz_apply_nsdname_trigger(ms, r, z, &match, a);
 }

 struct dns_msg* rpz_callback_from_iterator_cname(struct module_qstate* ms,
@@ -2518,13 +2379,6 @@ struct dns_msg* rpz_callback_from_iterator_cname(struct module_qstate* ms,
 			lock_rw_unlock(&a->lock);
 			continue;
 		}
-		if(r->taglist && (!ms->client_info ||
-			!taglist_intersect(r->taglist, r->taglistlen,
-				ms->client_info->taglist,
-				ms->client_info->taglen))) {
-			lock_rw_unlock(&a->lock);
-			continue;
-		}
 		z = rpz_find_zone(r->local_zones, is->qchase.qname,
 			is->qchase.qname_len, is->qchase.qclass, 0, 0, 0);
 		if(z && r->action_override == RPZ_DISABLED_ACTION) {
@@ -2558,10 +2412,10 @@ struct dns_msg* rpz_callback_from_iterator_cname(struct module_qstate* ms,
 		dname_str(is->qchase.qname, nm);
 		dname_str(z->name, zn);
 		if(strcmp(zn, nm) != 0)
-			verbose(VERB_ALGO, "rpz: qname trigger %s on %s, with action=%s",
+			verbose(VERB_ALGO, "rpz: qname trigger after cname %s on %s, with action=%s",
 				zn, nm, rpz_action_to_string(localzone_type_to_rpz_action(lzt)));
 		else
-			verbose(VERB_ALGO, "rpz: qname trigger %s, with action=%s",
+			verbose(VERB_ALGO, "rpz: qname trigger after cname %s, with action=%s",
 				nm, rpz_action_to_string(localzone_type_to_rpz_action(lzt)));
 	}
 	switch(localzone_type_to_rpz_action(lzt)) {
@@ -2590,7 +2444,7 @@ struct dns_msg* rpz_callback_from_iterator_cname(struct module_qstate* ms,
 		ms->rpz_passthru = 1;
 		break;
 	default:
-		verbose(VERB_ALGO, "rpz: qname trigger: bug: unhandled or invalid action: '%s'",
+		verbose(VERB_ALGO, "rpz: qname trigger after cname: bug: unhandled or invalid action: '%s'",
 			rpz_action_to_string(localzone_type_to_rpz_action(lzt)));
 		ret = NULL;
 	}
@@ -2618,21 +2472,8 @@ rpz_apply_maybe_clientip_trigger(struct auth_zones* az, struct module_env* env,
 		az, qinfo, repinfo, taglist, taglen, stats, z_out, a_out, r_out);

 	client_action = ((node == NULL) ? RPZ_INVALID_ACTION : node->action);
-	if(node != NULL && *r_out &&
-		(*r_out)->action_override != RPZ_NO_OVERRIDE_ACTION) {
-		client_action = (*r_out)->action_override;
-	}
 	if(client_action == RPZ_PASSTHRU_ACTION) {
-		if(*r_out && (*r_out)->log)
-			log_rpz_apply(
-				(node?"clientip":"qname"),
-				((*z_out)?(*z_out)->name:NULL),
-				(node?&node->node:NULL),
-				client_action, qinfo, repinfo, NULL,
-				(*r_out)->log_name);
 		*passthru = 1;
-		ret = 0;
-		goto done;
 	}
 	if(*z_out == NULL || (client_action != RPZ_INVALID_ACTION &&
 			      client_action != RPZ_PASSTHRU_ACTION)) {
@@ -2647,15 +2488,14 @@ rpz_apply_maybe_clientip_trigger(struct auth_zones* az, struct module_env* env,
 		if(client_action == RPZ_LOCAL_DATA_ACTION) {
 			rpz_apply_clientip_localdata_action(node, env, qinfo,
 				edns, repinfo, buf, temp, *a_out);
-			ret = 1;
-		} else if(client_action == RPZ_CNAME_OVERRIDE_ACTION) {
-			if(!rpz_apply_cname_override_action(*r_out, qinfo,
-				temp)) {
-				ret = 0;
-				goto done;
-			}
-			ret = 0;
 		} else {
+			if(*r_out && (*r_out)->log)
+				log_rpz_apply(
+					(node?"clientip":"qname"),
+					((*z_out)?(*z_out)->name:NULL),
+					(node?&node->node:NULL),
+					client_action, qinfo, repinfo, NULL,
+					(*r_out)->log_name);
 			local_zones_zone_answer(*z_out /*likely NULL, no zone*/, env, qinfo, edns,
 				repinfo, buf, temp, 0 /* no local data used */,
 				rpz_action_to_localzone_type(client_action));
@@ -2663,15 +2503,8 @@ rpz_apply_maybe_clientip_trigger(struct auth_zones* az, struct module_env* env,
 				LDNS_RCODE_WIRE(sldns_buffer_begin(buf))
 				== LDNS_RCODE_NXDOMAIN)
 				LDNS_RA_CLR(sldns_buffer_begin(buf));
-			ret = 1;
 		}
-		if(*r_out && (*r_out)->log)
-			log_rpz_apply(
-				(node?"clientip":"qname"),
-				((*z_out)?(*z_out)->name:NULL),
-				(node?&node->node:NULL),
-				client_action, qinfo, repinfo, NULL,
-				(*r_out)->log_name);
+		ret = 1;
 		goto done;
 	}
 	ret = -1;
@@ -225,14 +225,6 @@ int rpz_clear(struct rpz* r);
 */
 struct rpz* rpz_create(struct config_auth* p);

-/**
- * Change config on rpz, after reload.
- * @param r: the rpz structure.
- * @param p: the config that was read.
- * @return false on failure.
- */
-int rpz_config(struct rpz* r, struct config_auth* p);
-
 /**
 * String for RPZ action enum
 * @param a: RPZ action to get string for
@@ -126,8 +126,7 @@ void view_delete(struct view* v);
 */
 void views_print(struct views* v);

-/**
- * Find a view by name.
+/* Find a view by name.
 * @param vs: views
 * @param name: name of the view we are looking for
 * @param write: 1 for obtaining write lock on found view, 0 for read lock
@@ -106,7 +106,7 @@ ssize_t sldns_bget_token(struct sldns_buffer *b, char *token, const char *delim,
 * \param[in] k_del keyword delimiter 
 * \param[out] data the data found 
 * \param[in] d_del the data delimiter
- * \param[in] data_limit maximum size the data buffer
+ * \param[in] data_limit maximum size the the data buffer
 * \return the number of character read
 */
 ssize_t sldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del, char *data, const char *d_del, size_t data_limit);
@@ -119,7 +119,7 @@ ssize_t sldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del,
 * \param[in] k_del keyword delimiter 
 * \param[out] data the data found 
 * \param[in] d_del the data delimiter
- * \param[in] data_limit maximum size the data buffer
+ * \param[in] data_limit maximum size the the data buffer
 * \param[in] line_nr pointer to an integer containing the current line number (for
 debugging purposes)
 * \return the number of character read
@@ -134,7 +134,7 @@ ssize_t sldns_fget_keyword_data_l(FILE *f, const char *keyword, const char *k_de
 * \param[in] k_del keyword delimiter 
 * \param[out] data the data found 
 * \param[in] d_del the data delimiter
- * \param[in] data_limit maximum size the data buffer
+ * \param[in] data_limit maximum size the the data buffer
 * \return the number of character read
 */
 ssize_t sldns_bget_keyword_data(struct sldns_buffer *b, const char *keyword, const char *k_del, char *data, const char *d_del, size_t data_limit);
@@ -470,12 +470,6 @@ enum sldns_enum_ede_code
 	LDNS_EDE_NO_REACHABLE_AUTHORITY = 22,
 	LDNS_EDE_NETWORK_ERROR = 23,
 	LDNS_EDE_INVALID_DATA = 24,
-	LDNS_EDE_SIGNATURE_EXPIRED_BEFORE_VALID = 25,
-	LDNS_EDE_TOO_EARLY = 26,
-	LDNS_EDE_UNSUPPORTED_NSEC3_ITERATIONS = 27,
-	LDNS_EDE_BADPROXYPOLICY = 28,
-	LDNS_EDE_SYNTHESIZED = 29,
-	LDNS_EDE_INVALID_QUERY_TYPE = 30
 };
 typedef enum sldns_enum_ede_code sldns_ede_code;

@@ -228,11 +228,6 @@ static sldns_lookup_table sldns_edns_ede_codes_data[] = {
 	{ LDNS_EDE_NO_REACHABLE_AUTHORITY, "No Reachable Authority" },
 	{ LDNS_EDE_NETWORK_ERROR, "Network Error" },
 	{ LDNS_EDE_INVALID_DATA, "Invalid Data" },
-	{ LDNS_EDE_SIGNATURE_EXPIRED_BEFORE_VALID, "Signature Expired Before Valid" },
-	{ LDNS_EDE_TOO_EARLY, "Non-Replayable Transactions Received in 0-RTT Data" },
-	{ LDNS_EDE_UNSUPPORTED_NSEC3_ITERATIONS, "Unsupported NSEC3 Iterations Value" },
-	{ LDNS_EDE_BADPROXYPOLICY, "Unable to Conform to Policy" },
-	{ LDNS_EDE_SYNTHESIZED, "Synthesized Answer" },
 	{ 0, NULL}
 };
 sldns_lookup_table* sldns_edns_ede_codes = sldns_edns_ede_codes_data;
@@ -151,7 +151,7 @@
 #define HTTPS_PORT 443

 #ifdef USE_WINSOCK
-/* sneakily reuse the wsa_strerror function, on windows */
+/* sneakily reuse the the wsa_strerror function, on windows */
 char* wsa_strerror(int err);
 #endif

@@ -805,11 +805,7 @@ TLS_initiate(SSL_CTX* sslctx, int fd, const char* urlname, int use_sni)
 		}
 		/* wants to be called again */
 	}
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-	x = SSL_get1_peer_certificate(ssl);
-#else
 	x = SSL_get_peer_certificate(ssl);
-#endif
 	if(!x) {
 		if(verb) printf("Server presented no peer certificate\n");
 		SSL_free(ssl);
@@ -1839,49 +1835,15 @@ verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust, const char* p7signer)
 	return secure;
 }

-/** open a temp file */
-static FILE*
-tempfile_open(char* tempf, size_t tempflen, const char* fname, const char* mode)
-{
-	snprintf(tempf, tempflen, "%s~", fname);
-	return fopen(tempf, mode);
-}
-
-/** close an open temp file and replace the original with it */
-static void
-tempfile_close(FILE* fd, const char* tempf, const char* fname)
-{
-	fflush(fd);
-#ifdef HAVE_FSYNC
-	fsync(fileno(fd));
-#else
-	FlushFileBuffers((HANDLE)_get_osfhandle(_fileno(fd)));
-#endif
-	if(fclose(fd) != 0) {
-		printf("could not complete write: %s: %s\n",
-			tempf, strerror(errno));
-		unlink(tempf);
-		return;
-	}
-	/* success; overwrite actual file */
-#ifdef USE_WINSOCK
-	(void)unlink(fname); /* windows does not replace file with rename() */
-#endif
-	if(rename(tempf, fname) < 0) {
-		printf("rename(%s to %s): %s", tempf, fname, strerror(errno));
-	}
-}
-
 /** write unsigned root anchor file, a 5011 revoked tp */
 static void
 write_unsigned_root(const char* root_anchor_file)
 {
 	FILE* out;
 	time_t now = time(NULL);
-	char tempf[2048];
-	out = tempfile_open(tempf, sizeof(tempf), root_anchor_file, "w");
+	out = fopen(root_anchor_file, "w");
 	if(!out) {
-		if(verb) printf("%s: %s\n", tempf, strerror(errno));
+		if(verb) printf("%s: %s\n", root_anchor_file, strerror(errno));
 		return;
 	}
 	if(fprintf(out, "; autotrust trust anchor file\n"
@@ -1896,7 +1858,13 @@ write_unsigned_root(const char* root_anchor_file)
 			root_anchor_file);
 		if(verb && errno != 0) printf("%s\n", strerror(errno));
 	}
-	tempfile_close(out, tempf, root_anchor_file);
+	fflush(out);
+#ifdef HAVE_FSYNC
+	fsync(fileno(out));
+#else
+	FlushFileBuffers((HANDLE)_get_osfhandle(_fileno(out)));
+#endif
+	fclose(out);
 }

 /** write root anchor file */
@@ -1906,24 +1874,29 @@ write_root_anchor(const char* root_anchor_file, BIO* ds)
 	char* pp = NULL;
 	int len;
 	FILE* out;
-	char tempf[2048];
 	(void)BIO_seek(ds, 0);
 	len = BIO_get_mem_data(ds, &pp);
 	if(!len || !pp) {
 		if(verb) printf("out of memory\n");
 		return;
 	}
-	out = tempfile_open(tempf, sizeof(tempf), root_anchor_file, "w");
+	out = fopen(root_anchor_file, "w");
 	if(!out) {
-		if(verb) printf("%s: %s\n", tempf, strerror(errno));
+		if(verb) printf("%s: %s\n", root_anchor_file, strerror(errno));
 		return;
 	}
 	if(fwrite(pp, (size_t)len, 1, out) != 1) {
 		if(verb) printf("failed to write all data to %s\n",
-			tempf);
+			root_anchor_file);
 		if(verb && errno != 0) printf("%s\n", strerror(errno));
 	}
-	tempfile_close(out, tempf, root_anchor_file);
+	fflush(out);
+#ifdef HAVE_FSYNC
+	fsync(fileno(out));
+#else
+	FlushFileBuffers((HANDLE)_get_osfhandle(_fileno(out)));
+#endif
+	fclose(out);
 }

 /** Perform the verification and update of the trustanchor file */
@@ -2067,19 +2040,18 @@ try_read_anchor(const char* file)
 static void
 write_builtin_anchor(const char* file)
 {
-	char tempf[2048];
 	const char* builtin_root_anchor = get_builtin_ds();
-	FILE* out = tempfile_open(tempf, sizeof(tempf), file, "w");
+	FILE* out = fopen(file, "w");
 	if(!out) {
 		printf("could not write builtin anchor, to file %s: %s\n",
-			tempf, strerror(errno));
+			file, strerror(errno));
 		return;
 	}
 	if(!fwrite(builtin_root_anchor, strlen(builtin_root_anchor), 1, out)) {
 		printf("could not complete write builtin anchor, to file %s: %s\n",
-			tempf, strerror(errno));
+			file, strerror(errno));
 	}
-	tempfile_close(out, tempf, file);
+	fclose(out);
 }

 /** 
@@ -88,7 +88,6 @@ usage(void)
 	printf("file	if omitted %s is used.\n", CONFIGFILE);
 	printf("-o option	print value of option to stdout.\n");
 	printf("-f 		output full pathname with chroot applied, eg. with -o pidfile.\n");
-	printf("-q 		quiet (suppress output on success).\n");
 	printf("-h		show this usage help.\n");
 	printf("Version %s\n", PACKAGE_VERSION);
 	printf("BSD licensed, see LICENSE in source package for details.\n");
@@ -140,13 +139,10 @@ check_mod(struct config_file* cfg, struct module_func_block* fb)
 		fatal_exit("out of memory");
 	if(!edns_known_options_init(&env))
 		fatal_exit("out of memory");
-	if(fb->startup && !(*fb->startup)(&env, 0))
-		fatal_exit("bad config during startup for %s module", fb->name);
-	if(!(*fb->init)(&env, 0))
-		fatal_exit("bad config during init for %s module", fb->name);
+	if(!(*fb->init)(&env, 0)) {
+		fatal_exit("bad config for %s module", fb->name);
+	}
 	(*fb->deinit)(&env, 0);
-	if(fb->destartup)
-		(*fb->destartup)(&env, 0);
 	sldns_buffer_free(env.scratch_buffer);
 	regional_destroy(env.scratch);
 	edns_known_options_delete(&env);
@@ -969,7 +965,7 @@ check_auth(struct config_file* cfg)

 /** check config file */
 static void
-checkconf(const char* cfgfile, const char* opt, int final, int quiet)
+checkconf(const char* cfgfile, const char* opt, int final)
 {
 	char oldwd[4096];
 	struct config_file* cfg = config_create();
@@ -1002,7 +998,7 @@ checkconf(const char* cfgfile, const char* opt, int final, int quiet)
 	check_fwd(cfg);
 	check_hints(cfg);
 	check_auth(cfg);
-	if(!quiet) { printf("unbound-checkconf: no errors in %s\n", cfgfile); }
+	printf("unbound-checkconf: no errors in %s\n", cfgfile);
 	config_delete(cfg);
 }

@@ -1016,7 +1012,6 @@ int main(int argc, char* argv[])
 {
 	int c;
 	int final = 0;
-	int quiet = 0;
 	const char* f;
 	const char* opt = NULL;
 	const char* cfgfile = CONFIGFILE;
@@ -1029,7 +1024,7 @@ int main(int argc, char* argv[])
 		cfgfile = CONFIGFILE;
 #endif /* USE_WINSOCK */
 	/* parse the options */
-	while( (c=getopt(argc, argv, "fhqo:")) != -1) {
+	while( (c=getopt(argc, argv, "fho:")) != -1) {
 		switch(c) {
 		case 'f':
 			final = 1;
@@ -1037,9 +1032,6 @@ int main(int argc, char* argv[])
 		case 'o':
 			opt = optarg;
 			break;
-		case 'q':
-			quiet = 1;
-			break;
 		case '?':
 		case 'h':
 		default:
@@ -1053,7 +1045,7 @@ int main(int argc, char* argv[])
 	if(argc == 1)
 		f = argv[0];
 	else	f = cfgfile;
-	checkconf(f, opt, final, quiet);
+	checkconf(f, opt, final);
 	checklock_stop();
 	return 0;
 }
@@ -104,10 +104,6 @@ while getopts 'd:hr' arg; do
 done
 shift $((OPTIND - 1))

-if ! openssl >/dev/null 2>&1; then
-    echo "$0 requires openssl to be installed for keys/certificates generation." >&2
-    exit 1
-fi

 echo "setup in directory $DESTDIR"
 cd "$DESTDIR"
@@ -122,27 +122,20 @@ usage(void)
 	printf("  local_data <RR data...>	add local data, for example\n");
 	printf("				local_data www.example.com A 192.0.2.1\n");
 	printf("  local_data_remove <name>	remove local RR data from name\n");
-	printf("  local_zones,\n");
-	printf("  local_zones_remove,\n");
-	printf("  local_datas,\n");
-	printf("  local_datas_remove		same, but read list from stdin\n");
+	printf("  local_zones, local_zones_remove, local_datas, local_datas_remove\n");
+	printf("  				same, but read list from stdin\n");
 	printf("  				(one entry per line).\n");
 	printf("  dump_cache			print cache to stdout\n");
-	printf("				(not supported in remote unbounds in\n");
-	printf("				multi-process operation)\n");
 	printf("  load_cache			load cache from stdin\n");
-	printf("				(not supported in remote unbounds in\n");
-	printf("				multi-process operation)\n");
 	printf("  lookup <name>			print nameservers for name\n");
-	printf("  flush [+c] <name>			flushes common types for name from cache\n");
+	printf("  flush <name>			flushes common types for name from cache\n");
 	printf("  				types:  A, AAAA, MX, PTR, NS,\n");
 	printf("					SOA, CNAME, DNAME, SRV, NAPTR\n");
-	printf("  flush_type [+c] <name> <type>	flush name, type from cache\n");
-	printf("		+c		remove from cachedb too\n");
-	printf("  flush_zone [+c] <name>	flush everything at or under name\n");
+	printf("  flush_type <name> <type>	flush name, type from cache\n");
+	printf("  flush_zone <name>		flush everything at or under name\n");
 	printf("  				from rr and dnssec caches\n");
-	printf("  flush_bogus [+c]		flush all bogus data\n");
-	printf("  flush_negative [+c]		flush all negative data\n");
+	printf("  flush_bogus			flush all bogus data\n");
+	printf("  flush_negative		flush all negative data\n");
 	printf("  flush_stats 			flush statistics, make zero\n");
 	printf("  flush_requestlist 		drop queries that are worked on\n");
 	printf("  dump_requestlist		show what is worked on by first thread\n");
@@ -157,13 +150,12 @@ usage(void)
 	printf("  list_local_data		list local-data RRs in use\n");
 	printf("  insecure_add zone 		add domain-insecure zone\n");
 	printf("  insecure_remove zone		remove domain-insecure zone\n");
-	printf("  forward_add [+it] zone addr..	add forward-zone with servers\n");
+	printf("  forward_add [+i] zone addr..	add forward-zone with servers\n");
 	printf("  forward_remove [+i] zone	remove forward zone\n");
-	printf("  stub_add [+ipt] zone addr..	add stub-zone with servers\n");
+	printf("  stub_add [+ip] zone addr..	add stub-zone with servers\n");
 	printf("  stub_remove [+i] zone		remove stub zone\n");
 	printf("		+i		also do dnssec insecure point\n");
 	printf("		+p		set stub to use priming\n");
-	printf("		+t		set to use tls upstream\n");
 	printf("  forward [off | addr ...]	without arg show forward setup\n");
 	printf("				or off to turn off root forwarding\n");
 	printf("				or give list of ip addresses\n");
@@ -759,11 +751,7 @@ setup_ssl(SSL_CTX* ctx, int fd)
 	/* check authenticity of server */
 	if(SSL_get_verify_result(ssl) != X509_V_OK)
 		ssl_err("SSL verification failed");
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-	x = SSL_get1_peer_certificate(ssl);
-#else
 	x = SSL_get_peer_certificate(ssl);
-#endif
 	if(!x)
 		ssl_err("Server presented no peer certificate");
 	X509_free(x);
@@ -2,19 +2,17 @@
 #   Copyright 2015, Sami Kerola, CloudFlare.
 #   BSD licensed.
 AC_ARG_ENABLE([systemd],
-	[AS_HELP_STRING([--enable-systemd], [compile with systemd support (requires libsystemd, pkg-config)])],
+	[AS_HELP_STRING([--enable-systemd], [compile with systemd support])],
 	[], [enable_systemd=no])
 have_systemd=no
 AS_IF([test "x$enable_systemd" != xno], [
-    if test -n "$PKG_CONFIG"; then
+    ifdef([PKG_CHECK_MODULES], [
 	dnl systemd v209 or newer
-	have_systemd=no
-	PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [])
+	PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no])
 	dnl old systemd library
 	AS_IF([test "x$have_systemd" != "xyes"], [
-		have_systemd_daemon=no
 		PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-			[have_systemd_daemon=yes], [])
+			[have_systemd_daemon=yes], [have_systemd_daemon=no])
 		AS_IF([test "x$have_systemd_daemon" = "xyes"],
 			[have_systemd=yes])
 	])
@@ -26,8 +24,8 @@ AS_IF([test "x$enable_systemd" != xno], [
 		LIBS="$LIBS $SYSTEMD_LIBS"
 		]
 	)
-    else
+    ], [
    	AC_MSG_ERROR([systemd enabled but need pkg-config to configure for it])
-    fi
+    ])
 ])
 AM_CONDITIONAL([USE_SYSTEMD], [test "x$have_systemd" = xyes])
@@ -68,17 +68,6 @@ static struct thr_check* thread_infos[THRDEBUG_MAX_THREADS];
 int check_locking_order = 1;
 /** the pid of this runset, reasonably unique. */
 static pid_t check_lock_pid;
-/**
- * Should checklocks print a trace of the lock and unlock calls.
- * It uses fprintf for that because the log function uses a lock and that
- * would loop otherwise.
- */
-static int verbose_locking = 0;
-/**
- * Assume lock 0 0 (create_thread, create_instance), is the log lock and
- * do not print for that. Otherwise the output is full of log lock accesses.
- */
-static int verbose_locking_not_loglock = 1;

 /** print all possible debug info on the state of the system */
 static void total_debug_info(void);
@@ -519,9 +508,6 @@ checklock_rdlock(enum check_lock_type type, struct checked_lock* lock,
 	if(key_deleted)
 		return;

-	if(verbose_locking && !(verbose_locking_not_loglock &&
-		lock->create_thread == 0 && lock->create_instance == 0))
-		fprintf(stderr, "checklock_rdlock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
 	log_assert(type == check_lock_rwlock);
 	checklock_lockit(type, lock, func, file, line,
 		try_rd, timed_rd, &lock->u.rwlock, 0, 0);
@@ -542,9 +528,6 @@ checklock_wrlock(enum check_lock_type type, struct checked_lock* lock,
 	if(key_deleted)
 		return;
 	log_assert(type == check_lock_rwlock);
-	if(verbose_locking && !(verbose_locking_not_loglock &&
-		lock->create_thread == 0 && lock->create_instance == 0))
-		fprintf(stderr, "checklock_wrlock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
 	checklock_lockit(type, lock, func, file, line,
 		try_wr, timed_wr, &lock->u.rwlock, 0, 1);
 }
@@ -582,9 +565,6 @@ checklock_lock(enum check_lock_type type, struct checked_lock* lock,
 	if(key_deleted)
 		return;
 	log_assert(type != check_lock_rwlock);
-	if(verbose_locking && !(verbose_locking_not_loglock &&
-		lock->create_thread == 0 && lock->create_instance == 0))
-		fprintf(stderr, "checklock_lock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
 	switch(type) {
 		case check_lock_mutex:
 			checklock_lockit(type, lock, func, file, line,
@@ -622,10 +602,6 @@ checklock_unlock(enum check_lock_type type, struct checked_lock* lock,
 	if(lock->hold_count <= 0)
 		lock_error(lock, func, file, line, "too many unlocks");

-	if(verbose_locking && !(verbose_locking_not_loglock &&
-		lock->create_thread == 0 && lock->create_instance == 0))
-		fprintf(stderr, "checklock_unlock lock %d %d %s:%d at %s:%d\n", lock->create_thread, lock->create_instance, lock->create_file, lock->create_line, file, line);
-
 	/* store this point as last touched by */
 	lock->holder = thr;
 	lock->hold_count --;
@@ -52,7 +52,6 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgencode.h"
 #include "util/data/dname.h"
-#include "util/storage/slabhash.h"
 #include "util/edns.h"
 #include "util/config_file.h"
 #include "services/listen_dnsport.h"
@@ -66,7 +65,6 @@
 #include "sldns/wire2str.h"
 #include "sldns/str2wire.h"
 #include "daemon/remote.h"
-#include "daemon/daemon.h"
 #include "util/timeval_func.h"
 #include <signal.h>
 struct worker;
@@ -156,8 +154,6 @@ repevt_string(enum replay_event_type t)
 	case repevt_assign:	 return "ASSIGN";
 	case repevt_traffic:	 return "TRAFFIC";
 	case repevt_infra_rtt:	 return "INFRA_RTT";
-	case repevt_flush_message: return "FLUSH_MESSAGE";
-	case repevt_expire_message: return "EXPIRE_MESSAGE";
 	default:		 return "UNKNOWN";
 	}
 }
@@ -695,66 +691,6 @@ do_infra_rtt(struct replay_runtime* runtime)
 	free(dp);
 }

-/** Flush message from message cache. */
-static void
-do_flush_message(struct replay_runtime* runtime)
-{
-	struct replay_moment* now = runtime->now;
-	uint8_t rr[1024];
-	size_t rr_len = sizeof(rr), dname_len = 0;
-	hashvalue_type h;
-	struct query_info k;
-
-	if(sldns_str2wire_rr_question_buf(now->string, rr, &rr_len,
-		&dname_len, NULL, 0, NULL, 0) != 0)
-		fatal_exit("could not parse '%s'", now->string);
-
-	log_info("remove message %s", now->string);
-	k.qname = rr;
-	k.qname_len = dname_len;
-	k.qtype = sldns_wirerr_get_type(rr, rr_len, dname_len);
-	k.qclass = sldns_wirerr_get_class(rr, rr_len, dname_len);
-	k.local_alias = NULL;
-	h = query_info_hash(&k, 0);
-	slabhash_remove(runtime->daemon->env->msg_cache, h, &k);
-}
-
-/** Expire message from message cache. */
-static void
-do_expire_message(struct replay_runtime* runtime)
-{
-	struct replay_moment* now = runtime->now;
-	uint8_t rr[1024];
-	size_t rr_len = sizeof(rr), dname_len = 0;
-	hashvalue_type h;
-	struct query_info k;
-	struct lruhash_entry* e;
-
-	if(sldns_str2wire_rr_question_buf(now->string, rr, &rr_len,
-		&dname_len, NULL, 0, NULL, 0) != 0)
-		fatal_exit("could not parse '%s'", now->string);
-
-	log_info("expire message %s", now->string);
-	k.qname = rr;
-	k.qname_len = dname_len;
-	k.qtype = sldns_wirerr_get_type(rr, rr_len, dname_len);
-	k.qclass = sldns_wirerr_get_class(rr, rr_len, dname_len);
-	k.local_alias = NULL;
-	h = query_info_hash(&k, 0);
-
-	e = slabhash_lookup(runtime->daemon->env->msg_cache, h, &k, 0);
-	if(e) {
-		struct msgreply_entry* msg = (struct msgreply_entry*)e->key;
-		struct reply_info* rep = (struct reply_info*)msg->entry.data;
-		time_t expired = runtime->now_secs;
-		expired -= 3;
-		rep->ttl = expired;
-		rep->prefetch_ttl = expired;
-		rep->serve_expired_ttl = expired;
-		lock_rw_unlock(&msg->entry.lock);
-	}
-}
-
 /** perform exponential backoff on the timeout */
 static void
 expon_timeout_backoff(struct replay_runtime* runtime)
@@ -860,14 +796,6 @@ do_moment_and_advance(struct replay_runtime* runtime)
 		do_infra_rtt(runtime);
 		advance_moment(runtime);
 		break;
-	case repevt_flush_message:
-		do_flush_message(runtime);
-		advance_moment(runtime);
-		break;
-	case repevt_expire_message:
-		do_expire_message(runtime);
-		advance_moment(runtime);
-		break;
 	default:
 		fatal_exit("testbound: unknown event type %d",
 			runtime->now->evt_type);
@@ -1655,12 +1583,6 @@ void comm_timer_set(struct comm_timer* timer, struct timeval* tv)
 	timeval_add(&t->tv, &t->runtime->now_tv);
 }

-int comm_timer_is_set(struct comm_timer* timer)
-{
-	struct fake_timer* t = (struct fake_timer*)timer;
-	return t->enabled;
-}
-
 void comm_timer_delete(struct comm_timer* timer)
 {
 	struct fake_timer* t = (struct fake_timer*)timer;
@@ -1984,8 +1906,4 @@ void http2_stream_add_meshstate(struct http2_stream* ATTR_UNUSED(h2_stream),
 {
 }

-void http2_stream_remove_mesh_state(struct http2_stream* ATTR_UNUSED(h2_stream))
-{
-}
-
 /*********** End of Dummy routines ***********/
@@ -127,7 +127,6 @@ dir=$name.$$
 result=result.$name
 done=.done-$name
 skip=.skip-$name
-asan_text="SUMMARY: AddressSanitizer"
 success="no"
 if test -x "`which bash`"; then
 	shell="bash"
@@ -201,16 +200,6 @@ if test -f $name.post -a ! -f ../$skip; then
 		echo "Warning: $name.post did not exit successfully"
 	fi
 fi
-# Check if there were any AddressSanitizer errors
-# if compiled with -fsanitize=address
-if grep "$asan_text" $result >/dev/null 2>&1; then
-	if test -f ../$done; then
-		rm ../$done
-	fi
-	echo "$name: FAILED (AddressSanitizer)" >> $result
-	echo "$name: FAILED (AddressSanitizer)"
-	success="no"
-fi
 echo "DateRunEnd: "`date "+%s" 2>/dev/null` >> $result

 mv $result ..
@@ -256,7 +256,7 @@ setup_ctx(char* key, char* cert)
 #if HAVE_DECL_SSL_CTX_SET_ECDH_AUTO
 	if (!SSL_CTX_set_ecdh_auto(ctx,1))
 		if(verb>=1) printf("failed to set_ecdh_auto, not enabling ECDHE\n");
-#elif defined(USE_ECDSA) && defined(HAVE_SSL_CTX_SET_TMP_ECDH)
+#elif defined(USE_ECDSA)
 	if(1) {
 		EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1);
 		if (!ecdh) {
@@ -45,6 +45,7 @@
 #include <string.h>
 #include <unistd.h>

+#include <stdint.h>
 #include "sldns/str2wire.h"
 #include "sldns/wire2str.h"

@@ -348,20 +348,6 @@ replay_moment_read(char* remain, FILE* in, const char* name,
 		mom->string = strdup(m);
 		if(!mom->string) fatal_exit("out of memory");
 		if(!mom->variable) fatal_exit("out of memory");
-	} else if(parse_keyword(&remain, "FLUSH_MESSAGE")) {
-		mom->evt_type = repevt_flush_message;
-		while(isspace((unsigned char)*remain))
-			remain++;
-		strip_end_white(remain);
-		mom->string = strdup(remain);
-		if(!mom->string) fatal_exit("out of memory");
-	} else if(parse_keyword(&remain, "EXPIRE_MESSAGE")) {
-		mom->evt_type = repevt_expire_message;
-		while(isspace((unsigned char)*remain))
-			remain++;
-		strip_end_white(remain);
-		mom->string = strdup(remain);
-		if(!mom->string) fatal_exit("out of memory");
 	} else {
 		log_err("%d: unknown event type %s", pstate->lineno, remain);
 		free(mom);
@@ -85,8 +85,6 @@
 *		The file contents is macro expanded before match.
 *	o CHECK_TEMPFILE [fname] - followed by FILE_BEGIN [to match] FILE_END
 *	o INFRA_RTT [ip] [dp] [rtt] - update infra cache entry with rtt.
- *	o FLUSH_MESSAGE name type class - flushes entry in message cache.
- *	o EXPIRE_MESSAGE name type class - expires entry in message cache.
 *	o ERROR
 * ; following entry starts on the next line, ENTRY_BEGIN.
 * ; more STEP items
@@ -150,7 +148,6 @@ struct fake_timer;
 struct replay_var;
 struct infra_cache;
 struct sldns_buffer;
-struct daemon;

 /**
 * A replay scenario.
@@ -215,10 +212,6 @@ struct replay_moment {
 		repevt_assign,
 		/** store infra rtt cache entry: addr and string (int) */
 		repevt_infra_rtt,
-		/** flush message cache entry */
-		repevt_flush_message,
-		/** expire message cache entry */
-		repevt_expire_message,
 		/** cause traffic to flow */
 		repevt_traffic
 	}
@@ -304,8 +297,6 @@ struct replay_runtime {

 	/** ref the infra cache (was passed to outside_network_create) */
 	struct infra_cache* infra;
-	/** the daemon structure passed in worker call to remote accept open */
-	struct daemon* daemon;

 	/** the current time in seconds */
 	time_t now_secs;
@@ -471,11 +471,7 @@ send_em(const char* svr, const char* pp2_client, int udp, int usessl,
 			}
 		}
 		if(1) {
-#ifdef HAVE_SSL_GET1_PEER_CERTIFICATE
-			X509* x = SSL_get1_peer_certificate(ssl);
-#else
 			X509* x = SSL_get_peer_certificate(ssl);
-#endif
 			if(!x) printf("SSL: no peer certificate\n");
 			else {
 				X509_print_fp(stdout, x);
@@ -48,7 +48,6 @@
 #include "testcode/fake_event.h"
 #include "daemon/remote.h"
 #include "libunbound/worker.h"
-#include "daemon/worker.h"
 #include "util/config_file.h"
 #include "sldns/keyraw.h"
 #ifdef UB_ON_WINDOWS
@@ -533,10 +532,9 @@ void daemon_remote_clear(struct daemon_remote* ATTR_UNUSED(rc))
 }

 int daemon_remote_open_accept(struct daemon_remote* ATTR_UNUSED(rc),
-        struct listen_port* ATTR_UNUSED(ports), struct worker* worker)
+        struct listen_port* ATTR_UNUSED(ports), 
+	struct worker* ATTR_UNUSED(worker))
 {
-	struct replay_runtime* runtime = (struct replay_runtime*)worker->base;
-	runtime->daemon = worker->daemon;
 	return 1;
 }

@@ -1252,109 +1252,6 @@ static void edns_ede_answer_encode_test(void)
 	regional_destroy(region);
 }

-#include "services/localzone.h"
-/* Utility function that compares two localzone trees */
-static void compare_localzone_trees(struct local_zones* z1,
-	struct local_zones* z2)
-{
-	struct local_zone *node1, *node2;
-	lock_rw_rdlock(&z1->lock);
-	lock_rw_rdlock(&z2->lock);
-	/* size should be the same */
-	unit_assert(z1->ztree.count == z2->ztree.count);
-	for(node1=(struct local_zone*)rbtree_first(&z1->ztree),
-		node2=(struct local_zone*)rbtree_first(&z2->ztree);
-		(rbnode_type*)node1 != RBTREE_NULL &&
-		(rbnode_type*)node2 != RBTREE_NULL;
-		node1=(struct local_zone*)rbtree_next((rbnode_type*)node1),
-		node2=(struct local_zone*)rbtree_next((rbnode_type*)node2)) {
-		int labs;
-		/* the same zone should be at the same nodes */
-		unit_assert(!dname_lab_cmp(
-			node1->name, node1->namelabs,
-			node2->name, node2->namelabs,
-			&labs));
-		/* the zone's parent should be the same on both nodes */
-		unit_assert(
-			(node1->parent == NULL && node2->parent == NULL) ||
-			(node1->parent != NULL && node2->parent != NULL));
-		if(node1->parent) {
-			unit_assert(!dname_lab_cmp(
-				node1->parent->name, node1->parent->namelabs,
-				node2->parent->name, node2->parent->namelabs,
-				&labs));
-		}
-	}
-	lock_rw_unlock(&z1->lock);
-	lock_rw_unlock(&z2->lock);
-}
-
-/* test that zone addition results in the same tree from both the configuration
- * file and the unbound-control commands */
-static void localzone_parents_test(void)
-{
-	struct local_zones *z1, *z2;
-	size_t i;
-	char* zone_data[] = {
-		"one",
-		"a.b.c.one",
-		"b.c.one",
-		"c.one",
-		"two",
-		"c.two",
-		"b.c.two",
-		"a.b.c.two",
-		"a.b.c.three",
-		"b.c.three",
-		"c.three",
-		"three",
-		"c.four",
-		"b.c.four",
-		"a.b.c.four",
-		"four",
-		"."
-	};
-	unit_show_feature("localzones parent calculation");
-	z1 = local_zones_create();
-	z2 = local_zones_create();
-	/* parse test data */
-	for(i=0; i<sizeof(zone_data)/sizeof(zone_data[0]); i++) {
-		uint8_t* nm;
-		int nmlabs;
-		size_t nmlen;
-		struct local_zone* z;
-
-		/* This is the config way */
-		z = lz_enter_zone(z1, zone_data[i], "always_nxdomain",
-			LDNS_RR_CLASS_IN);
-		(void)z;  /* please compiler when no threading and no lock
-		code; the following line disappears and z stays unused */
-		lock_rw_unlock(&z->lock);
-		lz_init_parents(z1);
-
-		/* This is the unbound-control way */
-		nm = sldns_str2wire_dname(zone_data[i], &nmlen);
-		if(!nm) unit_assert(0);
-		nmlabs = dname_count_size_labels(nm, &nmlen);
-		lock_rw_wrlock(&z2->lock);
-		local_zones_add_zone(z2, nm, nmlen, nmlabs, LDNS_RR_CLASS_IN,
-			local_zone_always_nxdomain);
-		lock_rw_unlock(&z2->lock);
-	}
-	/* The trees should be the same, iterate and check the nodes */
-	compare_localzone_trees(z1, z2);
-
-	/* cleanup */
-	local_zones_delete(z1);
-	local_zones_delete(z2);
-}
-
-/** localzone unit tests */
-static void localzone_test(void)
-{
-	localzone_parents_test();
-}
-
 void unit_show_func(const char* file, const char* func)
 {
 	printf("test %s:%s\n", file, func);
@@ -1428,7 +1325,6 @@ main(int argc, char* argv[])
 	tcpreuse_test();
 	msgparse_test();
 	edns_ede_answer_encode_test();
-	localzone_test();
 #ifdef CLIENT_SUBNET
 	ecs_test();
 #endif /* CLIENT_SUBNET */
@@ -178,7 +178,6 @@ verifytest_rrset(struct module_env* env, struct val_env* ve,
 	struct query_info* qinfo)
 {
 	enum sec_status sec;
-	char reasonbuf[256];
 	char* reason = NULL;
 	uint8_t sigalg[ALGO_NEEDS_MAX+1];
 	int verified = 0;
@@ -189,9 +188,8 @@ verifytest_rrset(struct module_env* env, struct val_env* ve,
 	}
 	setup_sigalg(dnskey, sigalg); /* check all algorithms in the dnskey */
 	/* ok to give null as qstate here, won't be used for answer section. */
-	sec = dnskeyset_verify_rrset(env, ve, rrset, dnskey, sigalg, &reason,
-		NULL, LDNS_SECTION_ANSWER, NULL, &verified, reasonbuf,
-		sizeof(reasonbuf));
+	sec = dnskeyset_verify_rrset(env, ve, rrset, dnskey, sigalg, &reason, NULL,
+		LDNS_SECTION_ANSWER, NULL, &verified);
 	if(vsig) {
 		printf("verify outcome is: %s %s\n", sec_status_to_string(sec),
 			reason?reason:"");
@@ -256,6 +256,7 @@ static void zonemd_verify_test(char* zname, char* zfile, char* tastr,
 	struct auth_zone* z;

 	/* setup test harness */
+	memset(&mods, 0, sizeof(mods));
 	memset(&env, 0, sizeof(env));
 	env.scratch = regional_create();
 	if(!env.scratch)
@@ -287,10 +288,8 @@ static void zonemd_verify_test(char* zname, char* zfile, char* tastr,
 	if(!env.auth_zones)
 		fatal_exit("out of memory");
 	modstack_init(&mods);
-	if(!modstack_call_startup(&mods, env.cfg->module_conf, &env))
-		fatal_exit("could not modstack_startup");
-	if(!modstack_call_init(&mods, env.cfg->module_conf, &env))
-		fatal_exit("could not modstack_call_init");
+	if(!modstack_setup(&mods, env.cfg->module_conf, &env))
+		fatal_exit("could not modstack_setup");
 	env.mesh = mesh_create(&mods, &env);
 	if(!env.mesh)
 		fatal_exit("out of memory");
@@ -328,9 +327,7 @@ static void zonemd_verify_test(char* zname, char* zfile, char* tastr,

 	/* desetup test harness */
 	mesh_delete(env.mesh);
-	modstack_call_deinit(&mods, &env);
-	modstack_call_destartup(&mods, &env);
-	modstack_free(&mods);
+	modstack_desetup(&mods, &env);
 	auth_zones_delete(env.auth_zones);
 	anchors_delete(env.anchors);
 	config_delete(env.cfg);
@@ -12,9 +12,6 @@ get_make
 (cd $PRE ; $MAKE doc) > mylog 2>&1

 bad=0
-# filter out doxygen warnings about unsupported tags in the config, print first
-grep -e "warning: ignoring unsupported tag.*file .*/doc/unbound.doxygen" mylog
-grep -v -e "warning: ignoring unsupported tag.*file .*/doc/unbound.doxygen" mylog > ilog; mv ilog mylog
 if grep -e "Warning" -e "warning" -e "Error" -e "error" mylog >/dev/null 2>&1;
 then
 	cat mylog
@@ -7,69 +7,57 @@
 . ../common.sh
 PRE="../.."
 get_make
-(cd $PRE ; $MAKE unittest; $MAKE lock-verify; $MAKE unbound-dnstap-socket)
+(cd $PRE ; $MAKE unittest; $MAKE lock-verify)

 if test -f $PRE/unbound_do_valgrind_in_test; then
-	DO_VALGRIND=yes
+	do_valgrind=yes
 else
-	DO_VALGRIND=no
+	do_valgrind=no
 fi
 VALGRIND_FLAGS="--leak-check=full --show-leak-kinds=all"

-# Run a unit test; it exits on failure
-# $1: the command to start the unit test
-run_unittest () {
-	unit_cmd=$1
-	echo "> testing $unit_cmd"
-	if test $DO_VALGRIND = "yes"; then
-		echo "valgrind yes"
-		echo
-		tmpout=/tmp/tmpout.$$
-		if (cd $PRE; valgrind $VALGRIND_FLAGS ./$unit_cmd >$tmpout 2>&1); then
-			echo "unit test worked."
-		else
-			echo "unit test failed."
-			exit 1
-		fi
-		if grep "All heap blocks were freed -- no leaks are possible" $tmpout; then
-			:  # clean
-		else
-			cat $tmpout
-			echo "Memory leaked in unit test"
-			grep "in use at exit" $tmpout
-			exit 1
-		fi
-		if grep "ERROR SUMMARY: 0 errors from 0 contexts" $tmpout; then
-			:  # clean
-		else
-			cat $tmpout
-			echo "Errors in unit test"
-			grep "ERROR SUMMARY" $tmpout
-			exit 1
-		fi
-		rm -f $tmpout
+if test $do_valgrind = "yes"; then
+	echo "valgrind yes"
+	echo
+	tmpout=/tmp/tmpout.$$
+	if (cd $PRE; valgrind $VALGRIND_FLAGS ./unittest >$tmpout 2>&1); then
+		echo "unit test worked."
 	else
-		# without valgrind
-		if (cd $PRE; ./$unit_cmd); then
-			echo "unit test worked."
-		else
-			echo "unit test failed."
-			exit 1
-		fi
+		echo "unit test failed."
+		exit 1
 	fi
-	if test -f $PRE/ublocktrace.0; then
-		if (cd $PRE; ./lock-verify ublocktrace.*); then
-			echo "lock-verify test worked."
-		else
-			echo "lock-verify test failed."
-			exit 1
-		fi
+	if grep "All heap blocks were freed -- no leaks are possible" $tmpout; then
+		:  # clean
+	else
+		cat $tmpout
+		echo "Memory leaked in unittest"
+		grep "in use at exit" $tmpout
+		exit 1
+	fi
+	if grep "ERROR SUMMARY: 0 errors from 0 contexts" $tmpout; then
+		:  # clean
+	else
+		cat $tmpout
+		echo "Errors in unittest"
+		grep "ERROR SUMMARY" $tmpout
+		exit 1
+	fi
+	rm -f $tmpout
+else
+	# without valgrind
+	if (cd $PRE; ./unittest); then
+		echo "unit test worked."
+	else
+		echo "unit test failed."
+		exit 1
+	fi
+fi
+if test -f $PRE/ublocktrace.0; then
+	if (cd $PRE; ./lock-verify ublocktrace.*); then
+		echo "lock-verify test worked."
+	else
+		echo "lock-verify test failed."
+		exit 1
 	fi
-}
-
-run_unittest "unittest"
-if grep "define UNBOUND_DEBUG" $PRE/config.h >/dev/null;  then
-	run_unittest "unbound-dnstap-socket -c"
 fi
-
 exit 0
@@ -4,7 +4,6 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test

-. ../common.sh
 PRE="../.."

 if uname | grep "MINGW" >/dev/null; then
@@ -1,7 +1,8 @@
 server:
-	verbosity: 5
-	num-threads: 1  # This is dynamically handled by the test when needed
-	interface: 127.0.0.1@@PORT@
+	verbosity: 2
+	num-threads: 1
+	interface: 127.0.0.1
+	port: @PORT@
 	use-syslog: no
 	directory: ""
 	pidfile: "unbound.pid"
@@ -9,13 +10,9 @@ server:
 	username: ""
 	do-not-query-localhost: no
 	access-control: 127.0.0.1 allow_snoop
-	access-control-view: 127.0.0.1 testview
 	msg-cache-size: 4m
 	rrset-cache-size: 4m
 	minimal-responses: yes
-view:
-	name: testview
-	view-first: yes  # Allow falling back to global local data
 remote-control:
 	control-enable: yes
 	control-interface: 127.0.0.1
@@ -30,3 +30,4 @@ echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 cat .tpkg.var.test
 wait_ldns_testns_up fwd.log
 wait_unbound_up unbound.log
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
W.C.A. Wijngaards	48b6c60a24	- Fix unbound-control-setup.cmd to have CA v3 basicConstraints, like unbound-control-setup.sh has.	2024-03-11 10:47:34 +01:00
W.C.A. Wijngaards	0c967e079c	- Fix TTL of synthesized CNAME when a DNAME is used from cache.	2024-03-11 10:46:14 +01:00
W.C.A. Wijngaards	d79f11dccc	- Fix unbound-control-setup.cmd to use 3072 bits so that certificates are long enough for newer OpenSSL versions.	2024-03-11 10:46:14 +01:00