tag 1.6.4rc2

git-svn-id: file:///svn/unbound/tags/release-1.6.4rc2@4243 be551aaa-1e26-0410-a405-d3ace91eadb9
2026-08-17 21:25:50 +02:00 · 2017-06-22 12:10:08 +00:00
827 changed files with 3564 additions and 18074 deletions
@@ -426,7 +426,7 @@ libunbound/python/libunbound_wrap.c:	$(srcdir)/libunbound/python/libunbound.i un

 # Pyunbound python unbound wrapper
 _unbound.la:	libunbound_wrap.lo libunbound.la
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound

 util/config_file.c:	util/configparser.h
 util/configlexer.c:  $(srcdir)/util/configlexer.lex util/configparser.h
@@ -735,9 +735,9 @@ iter_utils.lo iter_utils.o: $(srcdir)/iterator/iter_utils.c config.h $(srcdir)/i
 $(srcdir)/sldns/str2wire.h
 listen_dnsport.lo listen_dnsport.o: $(srcdir)/services/listen_dnsport.c config.h \
 $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h  \
- $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/services/outside_network.h \
+ $(srcdir)/util/rbtree.h  $(srcdir)/util/log.h $(srcdir)/util/config_file.h \
+ $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h
 localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/services/localzone.h \
 $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \
 $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \
@@ -749,8 +749,8 @@ localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/serv
 $(srcdir)/util/as112.h
 mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \
 $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h \
 $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/dns.h $(srcdir)/util/net_help.h \
 $(srcdir)/util/regional.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/timehist.h $(srcdir)/util/fptr_wlist.h \
@@ -777,12 +777,12 @@ view.lo view.o: $(srcdir)/services/view.c config.h $(srcdir)/services/view.h $(s
 outbound_list.lo outbound_list.o: $(srcdir)/services/outbound_list.c config.h \
 $(srcdir)/services/outbound_list.h $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h 
+ $(srcdir)/dnscrypt/cert.h 
 outside_network.lo outside_network.o: $(srcdir)/services/outside_network.c config.h \
 $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h \
 $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/dnscrypt/cert.h \
- $(srcdir)/util/locks.h $(srcdir)/util/log.h  $(srcdir)/services/listen_dnsport.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h \
+  $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/infra.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \
 $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgencode.h \
 $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \
@@ -830,7 +830,7 @@ authzone.lo authzone.o: $(srcdir)/services/authzone.c config.h $(srcdir)/service
 $(srcdir)/validator/val_secalgo.h
 fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/fptr_wlist.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
 $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
 $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/mini_event.h \
@@ -851,8 +851,8 @@ locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdi
 log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h
 mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \
 $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
 $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
 $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
 $(srcdir)/services/modstack.h
@@ -860,8 +860,8 @@ module.lo module.o: $(srcdir)/util/module.c config.h $(srcdir)/util/module.h $(s
 $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
 netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h \
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
 $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
 $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \
@@ -876,7 +876,7 @@ net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_he
 random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h
 rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
 $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
 $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h
@@ -897,19 +897,19 @@ slabhash.lo slabhash.o: $(srcdir)/util/storage/slabhash.c config.h $(srcdir)/uti
 timehist.lo timehist.o: $(srcdir)/util/timehist.c config.h $(srcdir)/util/timehist.h $(srcdir)/util/log.h
 tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
 $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/mesh.h \
 $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/ub_event.h
 ub_event.lo ub_event.o: $(srcdir)/util/ub_event.c config.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
 ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c config.h $(srcdir)/util/ub_event.h \
 $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \
- $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
 $(srcdir)/services/modstack.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
 winsock_event.lo winsock_event.o: $(srcdir)/util/winsock_event.c config.h
 autotrust.lo autotrust.o: $(srcdir)/validator/autotrust.c config.h $(srcdir)/validator/autotrust.h \
@@ -1040,9 +1040,7 @@ checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/u
 $(srcdir)/testcode/checklocks.h
 dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h $(srcdir)/sldns/sbuffer.h \
 $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/dnscrypt/cert.h \
- $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/storage/lookup3.h
+ $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/dnscrypt/cert.h
 ipsecmod.lo ipsecmod.o: $(srcdir)/ipsecmod/ipsecmod.c config.h $(srcdir)/ipsecmod/ipsecmod.h \
 $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
 $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
@@ -1176,10 +1174,9 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
  $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \
 $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h \
 $(srcdir)/services/listen_dnsport.h $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \
- $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/iterator/iterator.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \
- $(srcdir)/validator/val_kcache.h
+ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
 unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \
 $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h  \
  $(srcdir)/daemon/remote.h \
@@ -1210,15 +1207,16 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr
 $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h
 testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \
 $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/daemon/remote.h \
- $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/daemon/daemon.h \
- $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h  \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h \
- $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/testcode/fake_event.h $(srcdir)/daemon/remote.h \
+ $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/util/log.h \
+ $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+  $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \
+ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
+ $(srcdir)/services/mesh.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
@@ -1268,19 +1266,17 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
  $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \
 $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h \
 $(srcdir)/services/listen_dnsport.h $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \
- $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/iterator/iterator.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \
- $(srcdir)/validator/val_kcache.h
+ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
 replay.lo replay.o: $(srcdir)/testcode/replay.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
 $(srcdir)/util/config_file.h $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
-  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \
- $(srcdir)/testcode/testpkts.h $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h \
- $(srcdir)/sldns/rrdef.h
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/testcode/testpkts.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h
 fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/testcode/fake_event.h \
 $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/dnscrypt/cert.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
 $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \
 $(srcdir)/util/data/dname.h $(srcdir)/util/config_file.h $(srcdir)/services/listen_dnsport.h \
 $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h  \
@@ -1313,8 +1309,7 @@ unbound-checkconf.lo unbound-checkconf.o: $(srcdir)/smallapp/unbound-checkconf.c
 $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \
 $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \
 $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/localzone.h \
- $(srcdir)/services/view.h $(srcdir)/respip/respip.h $(srcdir)/sldns/sbuffer.h $(PYTHONMOD_HEADER) \
- $(srcdir)/edns-subnet/subnet-whitelist.h
+ $(srcdir)/services/view.h $(srcdir)/respip/respip.h $(srcdir)/sldns/sbuffer.h $(PYTHONMOD_HEADER)
 worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c 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 \
 $(srcdir)/libunbound/unbound.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
@@ -9044,9 +9044,9 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
-
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -9320,74 +9320,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR

-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------
-dnl
-dnl Prepare a "--with-" configure option using the lowercase
-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
-dnl PKG_CHECK_MODULES in a single macro.
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-
-m4_pushdef([description],
-           [m4_default([$5], [build with ]with_arg[ support])])
-
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
-            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
-            [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
-     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
-    [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
-            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
-            [auto],[PKG_CHECK_MODULES([$1],[$2],
-                                        [m4_n([def_action_if_found]) $3],
-                                        [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-])dnl PKG_WITH_MODULES
-
-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl -----------------------------------------------
-dnl
-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
-dnl check._[VARIABLE-PREFIX] is exported as make variable.
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
-[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-
-AM_CONDITIONAL([HAVE_][$1],
-               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])dnl PKG_HAVE_WITH_MODULES
-
-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------------------
-dnl
-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
-dnl and preprocessor variable.
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
-        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])dnl PKG_HAVE_DEFINE_WITH_MODULES
-
 # AM_CONDITIONAL                                            -*- Autoconf -*-

 # Copyright (C) 1997-2014 Free Software Foundation, Inc.
@@ -688,8 +688,8 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                # check if -lwsock32 or -lgdi32 are needed.	
                BAKLIBS="$LIBS"
                BAKSSLLIBS="$LIBSSL_LIBS"
-		LIBS="$LIBS -lgdi32 -lws2_32"
-		LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32"
+                LIBS="$LIBS -lgdi32"
+                LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32"
                AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
                AC_TRY_LINK([], [
                    int HMAC_Update(void);
@@ -839,11 +839,7 @@ dnl see if on windows
 if test "$ac_cv_header_windows_h" = "yes"; then
 	AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used])
 	USE_WINSOCK="1"
-	if echo $LIBS | grep 'lws2_32' >/dev/null; then
-		:
-	else
-		LIBS="$LIBS -lws2_32"
-	fi
+	LIBS="$LIBS -lws2_32"
 fi
 ],
 dnl no quick getaddrinfo, try mingw32 and winsock2 library.
@@ -61,8 +61,6 @@
 /** the unit test testframe for cachedb, its module state contains
 * a cache for a couple queries (in memory). */
 struct testframe_moddata {
-	/** lock for mutex */
-	lock_basic_type lock;
 	/** key for single stored data element, NULL if none */
 	char* stored_key;
 	/** data for single stored data element, NULL if none */
@@ -74,18 +72,14 @@ struct testframe_moddata {
 static int
 testframe_init(struct module_env* env, struct cachedb_env* cachedb_env)
 {
-	struct testframe_moddata* d;
 	(void)env;
 	verbose(VERB_ALGO, "testframe_init");
-	d = (struct testframe_moddata*)calloc(1,
+	cachedb_env->backend_data = (void*)calloc(1,
 		sizeof(struct testframe_moddata));
-	cachedb_env->backend_data = (void*)d;
 	if(!cachedb_env->backend_data) {
 		log_err("out of memory");
 		return 0;
 	}
-	lock_basic_init(&d->lock);
-	lock_protect(&d->lock, d, sizeof(*d));
 	return 1;
 }

@@ -98,7 +92,6 @@ testframe_deinit(struct module_env* env, struct cachedb_env* cachedb_env)
 	verbose(VERB_ALGO, "testframe_deinit");
 	if(!d)
 		return;
-	lock_basic_destroy(&d->lock);
 	free(d->stored_key);
 	free(d->stored_data);
 	free(d);
@@ -112,22 +105,17 @@ testframe_lookup(struct module_env* env, struct cachedb_env* cachedb_env,
 		cachedb_env->backend_data;
 	(void)env;
 	verbose(VERB_ALGO, "testframe_lookup of %s", key);
-	lock_basic_lock(&d->lock);
 	if(d->stored_key && strcmp(d->stored_key, key) == 0) {
-		if(d->stored_datalen > sldns_buffer_capacity(result_buffer)) {
-			lock_basic_unlock(&d->lock);
+		if(d->stored_datalen > sldns_buffer_capacity(result_buffer))
 			return 0; /* too large */
-		}
 		verbose(VERB_ALGO, "testframe_lookup found %d bytes",
 			(int)d->stored_datalen);
 		sldns_buffer_clear(result_buffer);
 		sldns_buffer_write(result_buffer, d->stored_data,
 			d->stored_datalen);
 		sldns_buffer_flip(result_buffer);
-		lock_basic_unlock(&d->lock);
 		return 1;
 	}
-	lock_basic_unlock(&d->lock);
 	return 0;
 }

@@ -138,7 +126,6 @@ testframe_store(struct module_env* env, struct cachedb_env* cachedb_env,
 	struct testframe_moddata* d = (struct testframe_moddata*)
 		cachedb_env->backend_data;
 	(void)env;
-	lock_basic_lock(&d->lock);
 	verbose(VERB_ALGO, "testframe_store %s (%d bytes)", key, (int)data_len);

 	/* free old data element (if any) */
@@ -150,7 +137,6 @@ testframe_store(struct module_env* env, struct cachedb_env* cachedb_env,

 	d->stored_data = memdup(data, data_len);
 	if(!d->stored_data) {
-		lock_basic_unlock(&d->lock);
 		log_err("out of memory");
 		return;
 	}
@@ -160,10 +146,8 @@ testframe_store(struct module_env* env, struct cachedb_env* cachedb_env,
 		free(d->stored_data);
 		d->stored_data = NULL;
 		d->stored_datalen = 0;
-		lock_basic_unlock(&d->lock);
 		return;
 	}
-	lock_basic_unlock(&d->lock);
 	/* (key,data) successfully stored */
 }

@@ -186,17 +170,16 @@ cachedb_find_backend(const char* str)
 static int
 cachedb_apply_cfg(struct cachedb_env* cachedb_env, struct config_file* cfg)
 {
-	const char* backend_str = cfg->cachedb_backend;
-
-	/* If unspecified we use the in-memory test DB. */
-	if(!backend_str)
-		backend_str = "testframe";
-	cachedb_env->backend = cachedb_find_backend(backend_str);
-	if(!cachedb_env->backend) {
-		log_err("cachedb: cannot find backend name '%s'", backend_str);
-		return 0;
+	const char* backend_str = "testframe"; /* TODO get from cfg */
+	(void)cfg;     /* need this until the TODO is implemented */
+	if(backend_str && backend_str[0]) {
+		cachedb_env->backend = cachedb_find_backend(backend_str);
+		if(!cachedb_env->backend) {
+			log_err("cachedb: cannot find backend name '%s",
+				backend_str);
+			return 0;
+		}
 	}
-
 	/* TODO see if more configuration needs to be applied or not */
 	return 1;
 }
@@ -294,10 +277,9 @@ calc_hash(struct module_qstate* qstate, char* buf, size_t len)
 	size_t clen = 0;
 	uint8_t hash[CACHEDB_HASHSIZE/8];
 	const char* hex = "0123456789ABCDEF";
-	const char* secret = qstate->env->cfg->cachedb_secret ?
-		qstate->env->cfg->cachedb_secret : "default";
+	const char* secret = "default"; /* TODO: from qstate->env->cfg */
 	size_t i;
-
+	
 	/* copy the hash info into the clear buffer */
 	if(clen + qstate->qinfo.qname_len < sizeof(clear)) {
 		memmove(clear+clen, qstate->qinfo.qname,
@@ -347,13 +329,6 @@ prep_data(struct module_qstate* qstate, struct sldns_buffer* buf)

 	if(!qstate->return_msg || !qstate->return_msg->rep)
 		return 0;
-	/* We don't store the reply if its TTL is 0 unless serve-expired is
-	 * enabled.  Such a reply won't be reusable and simply be a waste for
-	 * the backend.  It's also compatible with the default behavior of
-	 * dns_cache_store_msg(). */
-	if(qstate->return_msg->rep->ttl == 0 &&
-		!qstate->env->cfg->serve_expired)
-		return 0;
 	if(verbosity >= VERB_ALGO)
 		log_dns_msg("cachedb encoding", &qstate->return_msg->qinfo,
 	                qstate->return_msg->rep);
@@ -394,37 +369,32 @@ good_expiry_and_qinfo(struct module_qstate* qstate, struct sldns_buffer* buf)
 		&expiry, sizeof(expiry));
 	expiry = be64toh(expiry);

-	if((time_t)expiry < *qstate->env->now &&
-		!qstate->env->cfg->serve_expired)
+	if((time_t)expiry < *qstate->env->now)
 		return 0;

 	return 1;
 }

-/* Adjust the TTL of the given RRset by 'subtract'.  If 'subtract' is
- * negative, set the TTL to 0. */
 static void
 packed_rrset_ttl_subtract(struct packed_rrset_data* data, time_t subtract)
 {
        size_t i;
        size_t total = data->count + data->rrsig_count;
-	if(subtract >= 0 && data->ttl > subtract)
+	if(data->ttl > subtract)
 		data->ttl -= subtract;
 	else	data->ttl = 0;
        for(i=0; i<total; i++) {
-		if(subtract >= 0 && data->rr_ttl[i] > subtract)
+		if(data->rr_ttl[i] > subtract)
                	data->rr_ttl[i] -= subtract;
                else	data->rr_ttl[i] = 0;
 	}
 }

-/* Adjust the TTL of a DNS message and its RRs by 'adjust'.  If 'adjust' is
- * negative, set the TTLs to 0. */
 static void
 adjust_msg_ttl(struct dns_msg* msg, time_t adjust)
 {
 	size_t i;
-	if(adjust >= 0 && msg->rep->ttl > adjust)
+	if(msg->rep->ttl > adjust)
 		msg->rep->ttl -= adjust;
 	else	msg->rep->ttl = 0;
 	msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl);
@@ -488,26 +458,10 @@ 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");
-		/* If serve-expired is enabled, we still use an expired message
-		 * setting the TTL to 0. */
-		if(qstate->env->cfg->serve_expired)
-			adjust = -1;
-		else
-			return 0; /* message expired */
+		return 0; /* message expired */
 	}
 	verbose(VERB_ALGO, "cachedb msg adjusted down by %d", (int)adjust);
 	adjust_msg_ttl(qstate->return_msg, adjust);
-
-	/* Similar to the unbound worker, if serve-expired is enabled and
-	 * the msg would be considered to be expired, mark the state so a
-	 * refetch will be scheduled.  The comparison between 'expiry' and
-	 * '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 &&
-		(adjust == -1 || (time_t)expiry < *qstate->env->now)) {
-		qstate->need_refetch = 1;
-	}
-
 	return 1;
 }

@@ -591,15 +545,11 @@ cachedb_intcache_lookup(struct module_qstate* qstate)
 static void
 cachedb_intcache_store(struct module_qstate* qstate)
 {
-	uint32_t store_flags = qstate->query_flags;
-
-	if(qstate->env->cfg->serve_expired)
-		store_flags |= DNSCACHE_STORE_ZEROTTL;
 	if(!qstate->return_msg)
 		return;
 	(void)dns_cache_store(qstate->env, &qstate->qinfo,
 		qstate->return_msg->rep, 0, qstate->prefetch_leeway, 0,
-		qstate->region, store_flags);
+		qstate->region, qstate->query_flags);
 }

 /**
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.

-timestamp='2016-10-02'
+timestamp='2013-06-10'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2016-10-02'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.


 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 	;;
 esac

@@ -168,29 +168,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
+	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		os=netbsdelf
-		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -207,13 +197,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -224,13 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
+	echo "${machine}-${os}${release}"
 	exit ;;
    *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -240,10 +223,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
    *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -256,9 +235,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
    alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -275,42 +251,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
+		UNAME_MACHINE="alpha" ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
+		UNAME_MACHINE="alpha" ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
+		UNAME_MACHINE="alpha" ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
+		UNAME_MACHINE="alphaev5" ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
+		UNAME_MACHINE="alphaev56" ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
+		UNAME_MACHINE="alphapca56" ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
+		UNAME_MACHINE="alphapca57" ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
+		UNAME_MACHINE="alphaev6" ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
+		UNAME_MACHINE="alphaev67" ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
+		UNAME_MACHINE="alphaev68" ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
+		UNAME_MACHINE="alphaev68" ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
+		UNAME_MACHINE="alphaev68" ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
+		UNAME_MACHINE="alphaev69" ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
+		UNAME_MACHINE="alphaev7" ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
+		UNAME_MACHINE="alphaev79" ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -383,16 +359,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH=i386
+	SUN_ARCH="i386"
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH=x86_64
+		SUN_ARCH="x86_64"
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -417,7 +393,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
    sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -603,9 +579,8 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -642,13 +617,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -687,11 +662,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
+	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
 	    eval $set_cc_for_build

@@ -704,12 +679,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23

-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH=hppa2.0w
+		HP_ARCH="hppa2.0w"
 	    else
-		HP_ARCH=hppa64
+		HP_ARCH="hppa64"
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -814,14 +789,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -851,7 +826,7 @@ EOF
    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    *:MSYS*:*)
+    i*:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
    i*:windows32*:*)
@@ -903,7 +878,7 @@ EOF
 	exit ;;
    *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -926,7 +901,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    arc:Linux:*:* | arceb:Linux:*:*)
@@ -957,9 +932,6 @@ EOF
    crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
    frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -972,9 +944,6 @@ EOF
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
-    k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
    m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -1000,13 +969,10 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    mips64el:Linux:*:*)
+    or1k:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
+    or32:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    padre:Linux:*:*)
@@ -1035,9 +1001,6 @@ EOF
    ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1057,7 +1020,7 @@ EOF
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
    xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1136,7 +1099,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
+	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1285,9 +1248,6 @@ EOF
    SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1300,32 +1260,22 @@ EOF
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
 	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
 	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
+	if test "$UNAME_PROCESSOR" = "x86"; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1356,7 +1306,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = 386; then
+	if test "$cputype" = "386"; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1398,7 +1348,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
    i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1409,25 +1359,171 @@ EOF
    x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
 esac

+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
 cat >&2 <<EOF
 $0: unable to guess system type

-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from

-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.

 config.guess timestamp = $timestamp

@@ -296,9 +296,6 @@
 /* Define to 1 if you have the <nettle/dsa-compat.h> header file. */
 #undef HAVE_NETTLE_DSA_COMPAT_H

-/* Define to 1 if you have the <nettle/eddsa.h> header file. */
-#undef HAVE_NETTLE_EDDSA_H
-
 /* Use libnss for crypto */
 #undef HAVE_NSS

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.

-timestamp='2016-09-05'
+timestamp='2013-08-10'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2016-09-05'
 # of the GNU General Public License, version 3 ("GPLv3").


-# Please send patches to <config-patches@gnu.org>.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@ timestamp='2016-09-05'
 # Otherwise, we print the canonical config type on stdout and succeed.

 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,7 +53,8 @@ timestamp='2016-09-05'
 me=`echo "$0" | sed -e 's,.*/,,'`

 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS

 Canonicalize a configuration name.

@@ -67,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -116,8 +117,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -254,18 +255,16 @@ case $basic_machine in
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
-	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
+	| epiphany \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -283,10 +282,8 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -298,14 +295,14 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
+	| open8 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -313,7 +310,6 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -328,10 +324,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -376,20 +369,18 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
+	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -409,10 +400,8 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -424,18 +413,16 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
-	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -443,7 +430,6 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
-	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -520,9 +506,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -643,14 +626,6 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -792,9 +767,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -850,10 +822,6 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1030,7 +998,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle)
+	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1038,9 +1006,9 @@ case $basic_machine in
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little)
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1386,28 +1354,27 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1539,8 +1506,6 @@ case $os in
 		;;
 	-nacl*)
 		;;
-	-ios)
-		;;
 	-none)
 		;;
 	*)
@@ -1627,6 +1592,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unbound 1.6.7.
+# Generated by GNU Autoconf 2.69 for unbound 1.6.4.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.6.7'
-PACKAGE_STRING='unbound 1.6.7'
+PACKAGE_VERSION='1.6.4'
+PACKAGE_STRING='unbound 1.6.4'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl'
 PACKAGE_URL=''

@@ -1437,7 +1437,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures unbound 1.6.7 to adapt to many kinds of systems.
+\`configure' configures unbound 1.6.4 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1502,7 +1502,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.6.7:";;
+     short | recursive ) echo "Configuration of unbound 1.6.4:";;
   esac
  cat <<\_ACEOF

@@ -1714,7 +1714,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-unbound configure 1.6.7
+unbound configure 1.6.4
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2423,7 +2423,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by unbound $as_me 1.6.7, which was
+It was created by unbound $as_me 1.6.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2775,11 +2775,11 @@ UNBOUND_VERSION_MAJOR=1

 UNBOUND_VERSION_MINOR=6

-UNBOUND_VERSION_MICRO=7
+UNBOUND_VERSION_MICRO=4


 LIBUNBOUND_CURRENT=7
-LIBUNBOUND_REVISION=6
+LIBUNBOUND_REVISION=3
 LIBUNBOUND_AGE=5
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2834,9 +2834,6 @@ LIBUNBOUND_AGE=5
 # 1.6.2 had 7:1:5
 # 1.6.3 had 7:2:5
 # 1.6.4 had 7:3:5
-# 1.6.5 had 7:4:5
-# 1.6.6 had 7:5:5
-# 1.6.7 had 7:6:5

 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -2852,7 +2849,7 @@ LIBUNBOUND_AGE=5
 # Current and Age.  Set Revision to 0, since this is the first
 # implementation of the new API.
 #
-# Otherwise, we're changing the binary API and breaking backward
+# Otherwise, we're changing the binary API and breaking bakward
 # compatibility with old binaries.  Increment Current.  Set Age to 0,
 # since we're backward compatible with no previous APIs.  Set Revision
 # to 0 too.
@@ -16466,9 +16463,7 @@ if test x"$ax_pthread_ok" = xyes; then

 $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h

-		if test -n "$PTHREAD_LIBS"; then
-		  LIBS="$PTHREAD_LIBS $LIBS"
-		fi
+		LIBS="$PTHREAD_LIBS $LIBS"
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 		CC="$PTHREAD_CC"
 		ub_have_pthreads=yes
@@ -16898,16 +16893,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

 $as_echo "#define HAVE_PYTHON 1" >>confdefs.h

-      if test -n "$LIBS"; then
-        LIBS="$PYTHON_LDFLAGS $LIBS"
-      else
-        LIBS="$PYTHON_LDFLAGS"
-      fi
-      if test -n "$CPPFLAGS"; then
-        CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-      else
-        CPPFLAGS="$PYTHON_CPPFLAGS"
-      fi
+      LIBS="$PYTHON_LDFLAGS $LIBS"
+      CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
      ub_have_python=yes
      PC_PY_DEPENDENCY="python"

@@ -17262,8 +17249,8 @@ $as_echo "no" >&6; }
                # check if -lwsock32 or -lgdi32 are needed.
                BAKLIBS="$LIBS"
                BAKSSLLIBS="$LIBSSL_LIBS"
-		LIBS="$LIBS -lgdi32 -lws2_32"
-		LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32"
+                LIBS="$LIBS -lgdi32"
+                LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32"
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32" >&5
 $as_echo_n "checking if -lcrypto needs -lgdi32... " >&6; }
                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18065,7 +18052,6 @@ case "$enable_dsa" in
      ;;
    *)
      # detect if DSA is supported, and turn it off if not.
-      if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
      ac_fn_c_check_func "$LINENO" "DSA_SIG_new" "ac_cv_func_DSA_SIG_new"
 if test "x$ac_cv_func_DSA_SIG_new" = xyes; then :

@@ -18080,13 +18066,6 @@ else
               fi
 fi

-      else
-
-cat >>confdefs.h <<_ACEOF
-#define USE_DSA 1
-_ACEOF
-
-      fi
      ;;
 esac

@@ -18116,6 +18095,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 if test $ac_have_decl = 1; then :

+
+cat >>confdefs.h <<_ACEOF
+#define USE_ED25519 1
+_ACEOF
+
      		use_ed25519="yes"

 else
@@ -18123,28 +18107,6 @@ else
 	      	fi
 fi

-      fi
-      if test $USE_NETTLE = "yes"; then
-		for ac_header in nettle/eddsa.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "nettle/eddsa.h" "ac_cv_header_nettle_eddsa_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_nettle_eddsa_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NETTLE_EDDSA_H 1
-_ACEOF
- use_ed25519="yes"
-fi
-
-done
-
-      fi
-      if test $use_ed25519 = "yes"; then
-
-cat >>confdefs.h <<_ACEOF
-#define USE_ED25519 1
-_ACEOF
-
      fi
      ;;
 esac
@@ -18658,12 +18620,7 @@ if test x_$enable_static_exe = x_yes; then
 	if test "$on_mingw" = yes; then
 		staticexe="-all-static"
 		# for static compile, include gdi32 and zlib here.
-		if echo $LIBS | grep 'lgdi32' >/dev/null; then
-			:
-		else
-			LIBS="$LIBS -lgdi32"
-		fi
-		LIBS="$LIBS -lz"
+		LIBS="$LIBS -lgdi32 -lz"
 	fi
 fi

@@ -19021,11 +18978,7 @@ if test "$ac_cv_header_windows_h" = "yes"; then
 $as_echo "#define USE_WINSOCK 1" >>confdefs.h

 	USE_WINSOCK="1"
-	if echo $LIBS | grep 'lws2_32' >/dev/null; then
-		:
-	else
-		LIBS="$LIBS -lws2_32"
-	fi
+	LIBS="$LIBS -lws2_32"
 fi

 else
@@ -20679,12 +20632,7 @@ $as_echo "#define OMITTED__D_LARGEFILE_SOURCE_1 1" >>confdefs.h
  fi


-if test -n "$LATE_LDFLAGS"; then
-  LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
-fi
-# remove start spaces
-LDFLAGS=`echo "$LDFLAGS"|sed -e 's/^ *//'`
-LIBS=`echo "$LIBS"|sed -e 's/^ *//'`
+LDFLAGS="$LATE_LDFLAGS $LDFLAGS"


 cat >>confdefs.h <<_ACEOF
@@ -20694,7 +20642,7 @@ _ACEOF



-version=1.6.7
+version=1.6.4

 date=`date +'%b %e, %Y'`

@@ -21213,7 +21161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unbound $as_me 1.6.7, which was
+This file was extended by unbound $as_me 1.6.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -21279,7 +21227,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unbound config.status 1.6.7
+unbound config.status 1.6.4
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4)
 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[6])
-m4_define([VERSION_MICRO],[7])
+m4_define([VERSION_MICRO],[4])
 AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound)
 AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])

 LIBUNBOUND_CURRENT=7
-LIBUNBOUND_REVISION=6
+LIBUNBOUND_REVISION=3
 LIBUNBOUND_AGE=5
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -73,9 +73,6 @@ LIBUNBOUND_AGE=5
 # 1.6.2 had 7:1:5
 # 1.6.3 had 7:2:5
 # 1.6.4 had 7:3:5
-# 1.6.5 had 7:4:5
-# 1.6.6 had 7:5:5
-# 1.6.7 had 7:6:5

 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -91,7 +88,7 @@ LIBUNBOUND_AGE=5
 # Current and Age.  Set Revision to 0, since this is the first
 # implementation of the new API.
 #
-# Otherwise, we're changing the binary API and breaking backward
+# Otherwise, we're changing the binary API and breaking bakward
 # compatibility with old binaries.  Increment Current.  Set Age to 0,
 # since we're backward compatible with no previous APIs.  Set Revision
 # to 0 too.
@@ -458,9 +455,7 @@ ub_have_pthreads=no
 if test x_$withval != x_no; then
 	AX_PTHREAD([
 		AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.])
-		if test -n "$PTHREAD_LIBS"; then
-		  LIBS="$PTHREAD_LIBS $LIBS"
-		fi
+		LIBS="$PTHREAD_LIBS $LIBS"
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 		CC="$PTHREAD_CC"
 		ub_have_pthreads=yes
@@ -562,16 +557,8 @@ if test x_$ub_test_python != x_no; then
      AC_SUBST(PY_MAJOR_VERSION)
      # Have Python
      AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])
-      if test -n "$LIBS"; then
-        LIBS="$PYTHON_LDFLAGS $LIBS"
-      else
-        LIBS="$PYTHON_LDFLAGS"
-      fi
-      if test -n "$CPPFLAGS"; then
-        CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-      else
-        CPPFLAGS="$PYTHON_CPPFLAGS"
-      fi
+      LIBS="$PYTHON_LDFLAGS $LIBS"
+      CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
      ub_have_python=yes
      PC_PY_DEPENDENCY="python"
      AC_SUBST(PC_PY_DEPENDENCY)
@@ -924,14 +911,10 @@ case "$enable_dsa" in
      ;;
    *)
      # detect if DSA is supported, and turn it off if not.
-      if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
      AC_CHECK_FUNC(DSA_SIG_new, [
      AC_DEFINE_UNQUOTED([USE_DSA], [1], [Define this to enable DSA support.])
      ], [if test "x$enable_dsa" = "xyes"; then AC_MSG_ERROR([OpenSSL does not support DSA and you used --enable-dsa.])
               fi ])
-      else
-      AC_DEFINE_UNQUOTED([USE_DSA], [1], [Define this to enable DSA support.])
-      fi
      ;;
 esac

@@ -943,18 +926,13 @@ case "$enable_ed25519" in
    *)
      if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
 	      AC_CHECK_DECLS([NID_ED25519], [
+      		AC_DEFINE_UNQUOTED([USE_ED25519], [1], [Define this to enable ED25519 support.])
      		use_ed25519="yes"
 	      ], [ if test "x$enable_ed25519" = "xyes"; then AC_MSG_ERROR([OpenSSL does not support ED25519 and you used --enable-ed25519.])
 	      	fi ], [AC_INCLUDES_DEFAULT
 #include <openssl/evp.h>
 	      ])
      fi
-      if test $USE_NETTLE = "yes"; then
-		AC_CHECK_HEADERS([nettle/eddsa.h], use_ed25519="yes",, [AC_INCLUDES_DEFAULT])
-      fi
-      if test $use_ed25519 = "yes"; then
-      		AC_DEFINE_UNQUOTED([USE_ED25519], [1], [Define this to enable ED25519 support.])
-      fi
      ;;
 esac

@@ -1127,12 +1105,7 @@ if test x_$enable_static_exe = x_yes; then
 	if test "$on_mingw" = yes; then
 		staticexe="-all-static"
 		# for static compile, include gdi32 and zlib here.
-		if echo $LIBS | grep 'lgdi32' >/dev/null; then
-			:
-		else
-			LIBS="$LIBS -lgdi32"
-		fi
-		LIBS="$LIBS -lz"
+		LIBS="$LIBS -lgdi32 -lz"
 	fi
 fi

@@ -1474,12 +1447,7 @@ AC_SUBST(ALLTARGET)
 AC_SUBST(INSTALLTARGET)

 ACX_STRIP_EXT_FLAGS
-if test -n "$LATE_LDFLAGS"; then
-  LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
-fi
-# remove start spaces 
-LDFLAGS=`echo "$LDFLAGS"|sed -e 's/^ *//'`
-LIBS=`echo "$LIBS"|sed -e 's/^ *//'`
+LDFLAGS="$LATE_LDFLAGS $LDFLAGS"

 AC_DEFINE_UNQUOTED([MAXSYSLOGMSGLEN], [10240], [Define to the maximum message length to pass to syslog.])

@@ -1,10 +1,10 @@
 Index: trunk/doc/unbound.conf.5.in
 ===================================================================
--- trunk/doc/unbound.conf.5.in	(revision 4357)
+--- trunk/doc/unbound.conf.5.in	(revision 3587)
 +++ trunk/doc/unbound.conf.5.in	(working copy)
-@@ -701,6 +701,13 @@
- this option in enabled. Only use if you know what you are doing.
- This option only has effect when qname-minimisation is enabled. Default is off.
+@@ -593,6 +593,13 @@
+ possible. Best effort approach, full QNAME and original QTYPE will be sent when
+ upstream replies with a RCODE other than NOERROR. Default is off.
 .TP
 +.B aaaa\-filter: \fI<yes or no>
 +Activate behavior similar to BIND's AAAA-filter.
@@ -18,7 +18,7 @@ Index: trunk/doc/unbound.conf.5.in
 on your private network, and are not allowed to be returned for
 Index: trunk/iterator/iter_scrub.c
 ===================================================================
--- trunk/iterator/iter_scrub.c	(revision 4357)
+--- trunk/iterator/iter_scrub.c	(revision 3587)
 +++ trunk/iterator/iter_scrub.c	(working copy)
@@ -617,6 +617,32 @@
 }
@@ -75,11 +75,10 @@ Index: trunk/iterator/iter_scrub.c
 	/* At this point, we brutally remove ALL rrsets that aren't 
 	 * children of the originating zone. The idea here is that, 
 	 * as far as we know, the server that we contacted is ONLY 
-@@ -680,6 +714,24 @@
- 	prev = NULL;
+@@ -681,6 +715,24 @@
 	rrset = msg->rrset_first;
 	while(rrset) {
-+
+ 
 +		/* ASN: For AAAA records only... */
 +		if((ie->aaaa_filter) && (rrset->type == LDNS_RR_TYPE_AAAA)) {
 +			/* ASN: If this is not a AAAA query, then remove AAAA
@@ -97,12 +96,13 @@ Index: trunk/iterator/iter_scrub.c
 +				LDNS_RR_TYPE_AAAA, qinfo->qclass);
 +		}
 +		/* ASN: End of added code */
- 
+
 		/* remove private addresses */
 		if( (rrset->type == LDNS_RR_TYPE_A || 
+ 			rrset->type == LDNS_RR_TYPE_AAAA)) {
 Index: trunk/iterator/iter_utils.c
 ===================================================================
--- trunk/iterator/iter_utils.c	(revision 4357)
+--- trunk/iterator/iter_utils.c	(revision 3587)
 +++ trunk/iterator/iter_utils.c	(working copy)
@@ -175,6 +175,7 @@
 	}
@@ -114,9 +114,9 @@ Index: trunk/iterator/iter_utils.c
 
 Index: trunk/iterator/iterator.c
 ===================================================================
--- trunk/iterator/iterator.c	(revision 4357)
+--- trunk/iterator/iterator.c	(revision 3587)
 +++ trunk/iterator/iterator.c	(working copy)
-@@ -1847,6 +1847,53 @@
+@@ -1776,6 +1776,53 @@
 
 	return 0;
 }
@@ -170,7 +170,7 @@ Index: trunk/iterator/iterator.c
 	
 /** 
  * This is the request event state where the request will be sent to one of
-@@ -1894,6 +1941,13 @@
+@@ -1823,6 +1870,13 @@
 		return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 	}
 	
@@ -184,7 +184,7 @@ Index: trunk/iterator/iterator.c
 	/* Make sure we have a delegation point, otherwise priming failed
 	 * or another failure occurred */
 	if(!iq->dp) {
-@@ -3095,6 +3149,61 @@
+@@ -2922,6 +2976,61 @@
 	return 0;
 }
 
@@ -244,9 +244,9 @@ Index: trunk/iterator/iterator.c
 +/* ASN: End of added code */
 +
 /*
-  * Return priming query results to interested super querystates.
+  * Return priming query results to interestes super querystates.
  * 
-@@ -3114,6 +3223,9 @@
+@@ -2941,6 +3050,9 @@
 	else if(super->qinfo.qtype == LDNS_RR_TYPE_DS && ((struct iter_qstate*)
 		super->minfo[id])->state == DSNS_FIND_STATE)
 		processDSNSResponse(qstate, id, super);
@@ -256,7 +256,7 @@ Index: trunk/iterator/iterator.c
 	else if(qstate->return_rcode != LDNS_RCODE_NOERROR)
 		error_supers(qstate, id, super);
 	else if(qstate->is_priming)
-@@ -3151,6 +3263,9 @@
+@@ -2978,6 +3090,9 @@
 			case INIT_REQUEST_3_STATE:
 				cont = processInitRequest3(qstate, iq, id);
 				break;
@@ -266,7 +266,7 @@ Index: trunk/iterator/iterator.c
 			case QUERYTARGETS_STATE:
 				cont = processQueryTargets(qstate, iq, ie, id);
 				break;
-@@ -3460,6 +3575,8 @@
+@@ -3270,6 +3385,8 @@
 		return "INIT REQUEST STATE (stage 2)";
 	case INIT_REQUEST_3_STATE:
 		return "INIT REQUEST STATE (stage 3)";
@@ -275,7 +275,7 @@ Index: trunk/iterator/iterator.c
 	case QUERYTARGETS_STATE :
 		return "QUERY TARGETS STATE";
 	case PRIME_RESP_STATE :
-@@ -3484,6 +3601,7 @@
+@@ -3294,6 +3411,7 @@
 		case INIT_REQUEST_STATE :
 		case INIT_REQUEST_2_STATE :
 		case INIT_REQUEST_3_STATE :
@@ -285,19 +285,19 @@ Index: trunk/iterator/iterator.c
 			return 0;
 Index: trunk/iterator/iterator.h
 ===================================================================
--- trunk/iterator/iterator.h	(revision 4357)
+--- trunk/iterator/iterator.h	(revision 3587)
 +++ trunk/iterator/iterator.h	(working copy)
-@@ -130,6 +130,9 @@
+@@ -113,6 +113,9 @@
 	 */
 	int* target_fetch_policy;
 
 +	/** ASN: AAAA-filter flag */
 +	int aaaa_filter;
 +
- 	/** lock on ratelimit counter */
- 	lock_basic_type queries_ratelimit_lock;
- 	/** number of queries that have been ratelimited */
-@@ -182,6 +185,14 @@
+ 	/** ip6.arpa dname in wireformat, used for qname-minimisation */
+ 	uint8_t* ip6arpa_dname;
+ };
+@@ -163,6 +166,14 @@
 	INIT_REQUEST_3_STATE,
 
 	/**
@@ -311,26 +311,26 @@ Index: trunk/iterator/iterator.h
 +	/**
 	 * Each time a delegation point changes for a given query or a 
 	 * query times out and/or wakes up, this state is (re)visited. 
- 	 * This state is responsible for iterating through a list of 
-@@ -364,6 +375,13 @@
- 	 * be used when creating the state. A higher one will be attempted.
+ 	 * This state is reponsible for iterating through a list of 
+@@ -346,6 +357,13 @@
 	 */
 	int refetch_glue;
-+
+ 
 +	/**
 +	 * ASN: This is a flag that, if true, means that this query is
 +	 * for fetching A records to populate cache and determine if we must
 +	 * return AAAA records or not.
 +	 */
 +	int fetch_a_for_aaaa;
- 
+
 	/** list of pending queries to authoritative servers. */
 	struct outbound_list outlist;
+ 
 Index: trunk/pythonmod/interface.i
 ===================================================================
--- trunk/pythonmod/interface.i	(revision 4357)
+--- trunk/pythonmod/interface.i	(revision 3587)
 +++ trunk/pythonmod/interface.i	(working copy)
-@@ -851,6 +851,7 @@
+@@ -632,6 +632,7 @@
    int harden_dnssec_stripped;
    int harden_referral_path;
    int use_caps_bits_for_id;
@@ -340,9 +340,9 @@ Index: trunk/pythonmod/interface.i
    size_t unwanted_threshold;
 Index: trunk/util/config_file.c
 ===================================================================
--- trunk/util/config_file.c	(revision 4357)
+--- trunk/util/config_file.c	(revision 3587)
 +++ trunk/util/config_file.c	(working copy)
-@@ -195,6 +195,7 @@
+@@ -176,6 +176,7 @@
 	cfg->harden_referral_path = 0;
 	cfg->harden_algo_downgrade = 0;
 	cfg->use_caps_bits_for_id = 0;
@@ -352,9 +352,9 @@ Index: trunk/util/config_file.c
 	cfg->private_domain = NULL;
 Index: trunk/util/config_file.h
 ===================================================================
--- trunk/util/config_file.h	(revision 4357)
+--- trunk/util/config_file.h	(revision 3587)
 +++ trunk/util/config_file.h	(working copy)
-@@ -209,6 +209,8 @@
+@@ -179,6 +179,8 @@
 	int harden_algo_downgrade;
 	/** use 0x20 bits in query as random ID bits */
 	int use_caps_bits_for_id;
@@ -365,9 +365,9 @@ Index: trunk/util/config_file.h
 	/** strip away these private addrs from answers, no DNS Rebinding */
 Index: trunk/util/configlexer.lex
 ===================================================================
--- trunk/util/configlexer.lex	(revision 4357)
+--- trunk/util/configlexer.lex	(revision 3587)
 +++ trunk/util/configlexer.lex	(working copy)
-@@ -279,6 +279,7 @@
+@@ -267,6 +267,7 @@
 use-caps-for-id{COLON}		{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
 caps-whitelist{COLON}		{ YDVAR(1, VAR_CAPS_WHITELIST) }
 unwanted-reply-threshold{COLON}	{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
@@ -377,9 +377,9 @@ Index: trunk/util/configlexer.lex
 prefetch-key{COLON}		{ YDVAR(1, VAR_PREFETCH_KEY) }
 Index: trunk/util/configparser.y
 ===================================================================
--- trunk/util/configparser.y	(revision 4357)
+--- trunk/util/configparser.y	(revision 3587)
 +++ trunk/util/configparser.y	(working copy)
-@@ -95,6 +95,7 @@
+@@ -92,6 +92,7 @@
 %token VAR_STATISTICS_CUMULATIVE VAR_OUTGOING_PORT_PERMIT 
 %token VAR_OUTGOING_PORT_AVOID VAR_DLV_ANCHOR_FILE VAR_DLV_ANCHOR
 %token VAR_NEG_CACHE_SIZE VAR_HARDEN_REFERRAL_PATH VAR_PRIVATE_ADDRESS
@@ -387,7 +387,7 @@ Index: trunk/util/configparser.y
 %token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE
 %token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE
 %token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE
-@@ -203,6 +204,7 @@
+@@ -169,6 +170,7 @@
 	server_dlv_anchor_file | server_dlv_anchor | server_neg_cache_size |
 	server_harden_referral_path | server_private_address |
 	server_private_domain | server_extended_statistics | 
@@ -395,12 +395,10 @@ Index: trunk/util/configparser.y
 	server_local_data_ptr | server_jostle_timeout | 
 	server_unwanted_reply_threshold | server_log_time_ascii | 
 	server_domain_insecure | server_val_sig_skew_min | 
-@@ -1183,6 +1185,15 @@
- 		OUTYY(("P(server_caps_whitelist:%s)\n", $2));
- 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, $2))
+@@ -893,6 +895,15 @@
 			yyerror("out of memory");
-+	}
-+	;
+ 	}
+ 	;
 +server_aaaa_filter: VAR_AAAA_FILTER STRING_ARG
 +	{
 +		OUTYY(("P(server_aaaa_filter:%s)\n", $2));
@@ -408,6 +406,8 @@ Index: trunk/util/configparser.y
 +			yyerror("expected yes or no.");
 +		else cfg_parser->cfg->aaaa_filter = (strcmp($2, "yes")==0);
 +		free($2);
- 	}
- 	;
+	}
+	;
 server_private_address: VAR_PRIVATE_ADDRESS STRING_ARG
+ 	{
+ 		OUTYY(("P(server_private_address:%s)\n", $2));
@@ -3263,15 +3263,15 @@ diff -u --unidirectional-new-file -r1.1 ./util/configparser.y
 %token VAR_RESPONSE_IP_TAG VAR_RESPONSE_IP VAR_RESPONSE_IP_DATA
 %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT
 %token VAR_DISABLE_DNSSEC_LAME_CHECK
-@@ -153,7 +154,7 @@
+@@ -150,7 +151,7 @@
 toplevelvar: serverstart contents_server | stubstart contents_stub |
 	forwardstart contents_forward | pythonstart contents_py | 
 	rcstart contents_rc | dtstart contents_dt | viewstart 
 -	contents_view |
 +	contents_view | rpzstart contents_rpz |
- 	dnscstart contents_dnsc |
- 	cachedbstart contents_cachedb
+ 	dnscstart contents_dnsc
 	;
+ 
@@ -2160,6 +2161,50 @@
 			(strcmp($2, "yes")==0);
 	}
@@ -91,7 +91,7 @@ while ( scalar keys %startstats < $numthreads || scalar keys %donestats < $numth
            $allstats{$inthread}->{outstandingexc} = $4;
        }
        elsif ( $line =~ m/info: average recursion processing time ([0-9\.]+) sec/ ) {
-            $allstats{$inthread}->{recursionavg} = int($1 * 1000); # change sec to millisec.
+            $allstats{$inthread}->{recursionavg} = int($1 * 1000); # change sec to milisec.
        }
        elsif ( $line =~ m/info: histogram of recursion processing times/ ) {
            next;
@@ -103,7 +103,7 @@ while ( scalar keys %startstats < $numthreads || scalar keys %donestats < $numth
        }
        elsif ( $line =~ m/info: lower\(secs\) upper\(secs\) recursions/ ) {
            # since after this line we're unsure if we get these numbers
-            # at all, we should consider this marker as the end of the
+            # at all, we sould consider this marker as the end of the
            # block. Chances that we're parsing a file halfway written
            # at this stage are small. Bold statement.
            $donestats{$inthread} = 1;
@@ -221,9 +221,7 @@ daemon_init(void)
 #  ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
 	ERR_load_crypto_strings();
 #  endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	ERR_load_SSL_strings();
-#endif
 #  ifdef USE_GOST
 	(void)sldns_key_EVP_load_gost_id();
 #  endif
@@ -241,7 +239,7 @@ daemon_init(void)
 #  if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	(void)SSL_library_init();
 #  else
-	(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+	(void)OPENSSL_init_ssl(0, NULL);
 #  endif
 #  if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)
 	if(!ub_openssl_lock_init())
@@ -423,8 +421,8 @@ daemon_create_workers(struct daemon* daemon)
 		daemon->rand = ub_initstate(seed, NULL);
 		if(!daemon->rand)
 			fatal_exit("could not init random generator");
-		hash_set_raninit((uint32_t)ub_random(daemon->rand));
 	}
+	hash_set_raninit((uint32_t)ub_random(daemon->rand));
 	shufport = (int*)calloc(65536, sizeof(int));
 	if(!shufport)
 		fatal_exit("out of memory during daemon init");
@@ -692,9 +690,6 @@ daemon_cleanup(struct daemon* daemon)
 	daemon->num = 0;
 #ifdef USE_DNSTAP
 	dt_delete(daemon->dtenv);
-#endif
-#ifdef USE_DNSCRYPT
-	dnsc_delete(daemon->dnscenv);
 #endif
 	daemon->cfg = NULL;
 }
@@ -229,10 +229,42 @@ daemon_remote_create(struct config_file* cfg)
 		free(rc);
 		return NULL;
 	}
-	if(!listen_sslctx_setup(rc->ctx)) {
+	/* no SSLv2, SSLv3 because has defects */
+	if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2)
+		!= SSL_OP_NO_SSLv2){
+		log_crypto_err("could not set SSL_OP_NO_SSLv2");
 		daemon_remote_delete(rc);
 		return NULL;
 	}
+	if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3)
+		!= SSL_OP_NO_SSLv3){
+		log_crypto_err("could not set SSL_OP_NO_SSLv3");
+		daemon_remote_delete(rc);
+		return NULL;
+	}
+#if defined(SSL_OP_NO_TLSv1) && defined(SSL_OP_NO_TLSv1_1)
+	/* if we have tls 1.1 disable 1.0 */
+	if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_TLSv1) & SSL_OP_NO_TLSv1)
+		!= SSL_OP_NO_TLSv1){
+		log_crypto_err("could not set SSL_OP_NO_TLSv1");
+		daemon_remote_delete(rc);
+		return NULL;
+	}
+#endif
+#if defined(SSL_OP_NO_TLSv1_1) && defined(SSL_OP_NO_TLSv1_2)
+	/* if we have tls 1.2 disable 1.1 */
+	if((SSL_CTX_set_options(rc->ctx, SSL_OP_NO_TLSv1_1) & SSL_OP_NO_TLSv1_1)
+		!= SSL_OP_NO_TLSv1_1){
+		log_crypto_err("could not set SSL_OP_NO_TLSv1_1");
+		daemon_remote_delete(rc);
+		return NULL;
+	}
+#endif
+#if defined(SHA256_DIGEST_LENGTH) && defined(USE_ECDSA)
+	/* if we have sha256, set the cipher list to have no known vulns */
+	if(!SSL_CTX_set_cipher_list(rc->ctx, "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256"))
+		log_crypto_err("could not set cipher list with SSL_CTX_set_cipher_list");
+#endif

 	if (cfg->remote_control_use_cert == 0) {
 		/* No certificates are requested */
@@ -282,7 +314,23 @@ daemon_remote_create(struct config_file* cfg)
 		log_crypto_err("Error in SSL_CTX check_private_key");
 		goto setup_error;
 	}
-	listen_sslctx_setup_2(rc->ctx);
+#if HAVE_DECL_SSL_CTX_SET_ECDH_AUTO
+	if(!SSL_CTX_set_ecdh_auto(rc->ctx,1)) {
+		log_crypto_err("Error in SSL_CTX_ecdh_auto, not enabling ECDHE");
+	}
+#elif defined(USE_ECDSA)
+	if(1) {
+		EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1);
+		if (!ecdh) {
+			log_crypto_err("could not find p256, not enabling ECDHE");
+		} else {
+			if (1 != SSL_CTX_set_tmp_ecdh (rc->ctx, ecdh)) {
+				log_crypto_err("Error in SSL_CTX_set_tmp_ecdh, not enabling ECDHE");
+			}
+			EC_KEY_free (ecdh);
+		}
+	}
+#endif
 	if(!SSL_CTX_load_verify_locations(rc->ctx, s_cert, NULL)) {
 		log_crypto_err("Error setting up SSL_CTX verify locations");
 	setup_error:
@@ -367,7 +415,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err,
 			if (cfg->username && cfg->username[0] &&
 				cfg_uid != (uid_t)-1) {
 				if(chown(ip, cfg_uid, cfg_gid) == -1)
-					verbose(VERB_QUERY, "cannot chown %u.%u %s: %s",
+					log_err("cannot chown %u.%u %s: %s",
 					  (unsigned)cfg_uid, (unsigned)cfg_gid,
 					  ip, strerror(errno));
 			}
@@ -793,7 +841,7 @@ print_stats(SSL* ssl, const char* nm, struct ub_stats_info* s)
 static int
 print_thread_stats(SSL* ssl, int i, struct ub_stats_info* s)
 {
-	char nm[32];
+	char nm[16];
 	snprintf(nm, sizeof(nm), "thread%d", i);
 	nm[sizeof(nm)-1]=0;
 	return print_stats(ssl, nm, s);
@@ -825,10 +873,6 @@ print_mem(SSL* ssl, struct worker* worker, struct daemon* daemon)
 #ifdef USE_IPSECMOD
 	size_t ipsecmod = 0;
 #endif /* USE_IPSECMOD */
-#ifdef USE_DNSCRYPT
-	size_t dnscrypt_shared_secret = 0;
-	size_t dnscrypt_nonce = 0;
-#endif /* USE_DNSCRYPT */
 	msg = slabhash_get_mem(daemon->env->msg_cache);
 	rrset = slabhash_get_mem(&daemon->env->rrset_cache->table);
 	val = mod_get_mem(&worker->env, "validator");
@@ -840,13 +884,6 @@ print_mem(SSL* ssl, struct worker* worker, struct daemon* daemon)
 #ifdef USE_IPSECMOD
 	ipsecmod = mod_get_mem(&worker->env, "ipsecmod");
 #endif /* USE_IPSECMOD */
-#ifdef USE_DNSCRYPT
-	if(daemon->dnscenv) {
-		dnscrypt_shared_secret = slabhash_get_mem(
-			daemon->dnscenv->shared_secrets_cache);
-		dnscrypt_nonce = slabhash_get_mem(daemon->dnscenv->nonces_cache);
-	}
-#endif /* USE_DNSCRYPT */

 	if(!print_longnum(ssl, "mem.cache.rrset"SQ, rrset))
 		return 0;
@@ -866,14 +903,6 @@ print_mem(SSL* ssl, struct worker* worker, struct daemon* daemon)
 	if(!print_longnum(ssl, "mem.mod.ipsecmod"SQ, ipsecmod))
 		return 0;
 #endif /* USE_IPSECMOD */
-#ifdef USE_DNSCRYPT
-	if(!print_longnum(ssl, "mem.cache.dnscrypt_shared_secret"SQ,
-			dnscrypt_shared_secret))
-		return 0;
-	if(!print_longnum(ssl, "mem.cache.dnscrypt_nonce"SQ,
-			dnscrypt_nonce))
-		return 0;
-#endif /* USE_DNSCRYPT */
 	return 1;
 }

@@ -1036,9 +1065,6 @@ print_ext(SSL* ssl, struct ub_stats_info* s)
 		if(!ssl_printf(ssl, "num.answer.rcode.nodata"SQ"%lu\n", 
 			(unsigned long)s->svr.ans_rcode_nodata)) return 0;
 	}
-	/* iteration */
-	if(!ssl_printf(ssl, "num.query.ratelimited"SQ"%lu\n", 
-		(unsigned long)s->svr.queries_ratelimited)) return 0;
 	/* validation */
 	if(!ssl_printf(ssl, "num.answer.secure"SQ"%lu\n", 
 		(unsigned long)s->svr.ans_secure)) return 0;
@@ -1060,16 +1086,6 @@ print_ext(SSL* ssl, struct ub_stats_info* s)
 		(unsigned)s->svr.infra_cache_count)) return 0;
 	if(!ssl_printf(ssl, "key.cache.count"SQ"%u\n",
 		(unsigned)s->svr.key_cache_count)) return 0;
-#ifdef USE_DNSCRYPT
-	if(!ssl_printf(ssl, "dnscrypt_shared_secret.cache.count"SQ"%u\n",
-		(unsigned)s->svr.shared_secret_cache_count)) return 0;
-	if(!ssl_printf(ssl, "dnscrypt_nonce.cache.count"SQ"%u\n",
-		(unsigned)s->svr.nonce_cache_count)) return 0;
-	if(!ssl_printf(ssl, "num.query.dnscrypt.shared_secret.cachemiss"SQ"%lu\n",
-		(unsigned long)s->svr.num_query_dnscrypt_secret_missed_cache)) return 0;
-	if(!ssl_printf(ssl, "num.query.dnscrypt.replay"SQ"%lu\n",
-		(unsigned long)s->svr.num_query_dnscrypt_replay)) return 0;
-#endif /* USE_DNSCRYPT */
 	return 1;
 }

@@ -1780,7 +1796,7 @@ negative_del_rrset(struct lruhash_entry* e, void* arg)
 	struct ub_packed_rrset_key* k = (struct ub_packed_rrset_key*)e->key;
 	struct packed_rrset_data* d = (struct packed_rrset_data*)e->data;
 	/* delete the parentside negative cache rrsets,
-	 * these are nameserver rrsets that failed lookup, rdata empty */
+	 * these are namerserver rrsets that failed lookup, rdata empty */
 	if((k->rk.flags & PACKED_RRSET_PARENT_SIDE) && d->count == 1 &&
 		d->rrsig_count == 0 && d->rr_len[0] == 0) {
 		d->ttl = inf->expired;
@@ -2373,16 +2389,10 @@ dump_infra_host(struct lruhash_entry* e, void* arg)
 	struct infra_data* d = (struct infra_data*)e->data;
 	char ip_str[1024];
 	char name[257];
-	int port;
 	if(a->ssl_failed)
 		return;
 	addr_to_str(&k->addr, k->addrlen, ip_str, sizeof(ip_str));
 	dname_str(k->zonename, name);
-	port = (int)ntohs(((struct sockaddr_in*)&k->addr)->sin_port);
-	if(port != UNBOUND_DNS_PORT) {
-		snprintf(ip_str+strlen(ip_str), sizeof(ip_str)-strlen(ip_str),
-			"@%d", port);
-	}
 	/* skip expired stuff (only backed off) */
 	if(d->ttl < a->now) {
 		if(d->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) {
@@ -56,7 +56,6 @@
 #include "util/timehist.h"
 #include "util/net_help.h"
 #include "validator/validator.h"
-#include "iterator/iterator.h"
 #include "sldns/sbuffer.h"
 #include "services/cache/rrset.h"
 #include "services/cache/infra.h"
@@ -124,7 +123,7 @@ void server_stats_log(struct ub_server_stats* stats, struct worker* worker,

 /** get rrsets bogus number from validator */
 static size_t
-get_rrset_bogus(struct worker* worker, int reset)
+get_rrset_bogus(struct worker* worker)
 {
 	int m = modstack_find(&worker->env.mesh->mods, "validator");
 	struct val_env* ve;
@@ -134,63 +133,12 @@ get_rrset_bogus(struct worker* worker, int reset)
 	ve = (struct val_env*)worker->env.modinfo[m];
 	lock_basic_lock(&ve->bogus_lock);
 	r = ve->num_rrset_bogus;
-	if(reset && !worker->env.cfg->stat_cumulative)
+	if(!worker->env.cfg->stat_cumulative)
 		ve->num_rrset_bogus = 0;
 	lock_basic_unlock(&ve->bogus_lock);
 	return r;
 }

-/** get number of ratelimited queries from iterator */
-static size_t
-get_queries_ratelimit(struct worker* worker, int reset)
-{
-	int m = modstack_find(&worker->env.mesh->mods, "iterator");
-	struct iter_env* ie;
-	size_t r;
-	if(m == -1)
-		return 0;
-	ie = (struct iter_env*)worker->env.modinfo[m];
-	lock_basic_lock(&ie->queries_ratelimit_lock);
-	r = ie->num_queries_ratelimited;
-	if(reset && !worker->env.cfg->stat_cumulative)
-		ie->num_queries_ratelimited = 0;
-	lock_basic_unlock(&ie->queries_ratelimit_lock);
-	return r;
-}
-
-#ifdef USE_DNSCRYPT
-/** get the number of shared secret cache miss */
-static size_t
-get_dnscrypt_cache_miss(struct worker* worker, int reset)
-{
-	size_t r;
-	struct dnsc_env* de = worker->daemon->dnscenv;
-	if(!de) return 0;
-
-	lock_basic_lock(&de->shared_secrets_cache_lock);
-	r = de->num_query_dnscrypt_secret_missed_cache;
-	if(reset && !worker->env.cfg->stat_cumulative)
-		de->num_query_dnscrypt_secret_missed_cache = 0;
-	lock_basic_unlock(&de->shared_secrets_cache_lock);
-	return r;
-}
-
-/** get the number of replayed queries */
-static size_t
-get_dnscrypt_replay(struct worker* worker, int reset)
-{
-	size_t r;
-	struct dnsc_env* de = worker->daemon->dnscenv;
-
-	lock_basic_lock(&de->nonces_cache_lock);
-	r = de->num_query_dnscrypt_replay;
-	if(reset && !worker->env.cfg->stat_cumulative)
-		de->num_query_dnscrypt_replay = 0;
-	lock_basic_unlock(&de->nonces_cache_lock);
-	return r;
-}
-#endif /* USE_DNSCRYPT */
-
 void
 server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 {
@@ -221,10 +169,7 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 	s->svr.qtcp_outgoing = (long long)worker->back->num_tcp_outgoing;

 	/* get and reset validator rrset bogus number */
-	s->svr.rrset_bogus = (long long)get_rrset_bogus(worker, reset);
-
-	/* get and reset iterator query ratelimit number */
-	s->svr.queries_ratelimited = (long long)get_queries_ratelimit(worker, reset);
+	s->svr.rrset_bogus = (long long)get_rrset_bogus(worker);

 	/* get cache sizes */
 	s->svr.msg_cache_count = (long long)count_slabhash_entries(worker->env.msg_cache);
@@ -234,29 +179,6 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 		s->svr.key_cache_count = (long long)count_slabhash_entries(worker->env.key_cache->slab);
 	else	s->svr.key_cache_count = 0;

-#ifdef USE_DNSCRYPT
-	if(worker->daemon->dnscenv) {
-		s->svr.num_query_dnscrypt_secret_missed_cache =
-			(long long)get_dnscrypt_cache_miss(worker, reset);
-		s->svr.shared_secret_cache_count = (long long)count_slabhash_entries(
-			worker->daemon->dnscenv->shared_secrets_cache);
-		s->svr.nonce_cache_count = (long long)count_slabhash_entries(
-			worker->daemon->dnscenv->nonces_cache);
-		s->svr.num_query_dnscrypt_replay =
-			(long long)get_dnscrypt_replay(worker, reset);
-	} else {
-		s->svr.num_query_dnscrypt_secret_missed_cache = 0;
-		s->svr.shared_secret_cache_count = 0;
-		s->svr.nonce_cache_count = 0;
-		s->svr.num_query_dnscrypt_replay = 0;
-	}
-#else
-	s->svr.num_query_dnscrypt_secret_missed_cache = 0;
-	s->svr.shared_secret_cache_count = 0;
-	s->svr.nonce_cache_count = 0;
-	s->svr.num_query_dnscrypt_replay = 0;
-#endif /* USE_DNSCRYPT */
-
 	/* get tcp accept usage */
 	s->svr.tcp_accept_usage = 0;
 	for(lp = worker->front->cps; lp; lp = lp->next) {
@@ -318,7 +240,7 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a)
 		a->svr.num_query_dnscrypt_cleartext;
 	total->svr.num_query_dnscrypt_crypted_malformed += \
 		a->svr.num_query_dnscrypt_crypted_malformed;
-#endif /* USE_DNSCRYPT */
+#endif
 	/* the max size reached is upped to higher of both */
 	if(a->svr.max_query_list_size > total->svr.max_query_list_size)
 		total->svr.max_query_list_size = a->svr.max_query_list_size;
@@ -344,6 +266,7 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a)
 		total->svr.zero_ttl_responses += a->svr.zero_ttl_responses;
 		total->svr.ans_secure += a->svr.ans_secure;
 		total->svr.ans_bogus += a->svr.ans_bogus;
+		total->svr.rrset_bogus += a->svr.rrset_bogus;
 		total->svr.unwanted_replies += a->svr.unwanted_replies;
 		total->svr.unwanted_queries += a->svr.unwanted_queries;
 		total->svr.tcp_accept_usage += a->svr.tcp_accept_usage;
@@ -128,9 +128,6 @@ static void usage(void)
 	for(m = module_list_avail(); *m; m++)
 		printf(" %s", *m);
 	printf("\n");
-#ifdef USE_DNSCRYPT
-	printf("DNSCrypt feature available\n");
-#endif
 	printf("BSD licensed, see LICENSE in source package for details.\n");
 	printf("Report bugs to %s\n", PACKAGE_BUGREPORT);
 	ub_event_base_free(base);
@@ -400,10 +397,10 @@ detach(void)
 #endif /* HAVE_DAEMON */
 }

-/** daemonize, drop user privileges and chroot if needed */
+/** daemonize, drop user priviliges and chroot if needed */
 static void
 perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
-	const char** cfgfile, int need_pidfile)
+	const char** cfgfile)
 {
 #ifdef HAVE_KILL
 	int pidinchroot;
@@ -447,13 +444,13 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,

 #ifdef HAVE_KILL
 	/* true if pidfile is inside chrootdir, or nochroot */
-	pidinchroot = need_pidfile && (!(cfg->chrootdir && cfg->chrootdir[0]) ||
+	pidinchroot = !(cfg->chrootdir && cfg->chrootdir[0]) ||
 				(cfg->chrootdir && cfg->chrootdir[0] &&
 				strncmp(cfg->pidfile, cfg->chrootdir,
-				strlen(cfg->chrootdir))==0));
+				strlen(cfg->chrootdir))==0);

 	/* check old pid file before forking */
-	if(cfg->pidfile && cfg->pidfile[0] && need_pidfile) {
+	if(cfg->pidfile && cfg->pidfile[0]) {
 		/* calculate position of pidfile */
 		if(cfg->pidfile[0] == '/')
 			daemon->pidfile = strdup(cfg->pidfile);
@@ -472,7 +469,7 @@ 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) {
+	if(cfg->pidfile && cfg->pidfile[0]) {
 		writepid(daemon->pidfile, getpid());
 		if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 &&
 			pidinchroot) {
@@ -487,7 +484,6 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 	}
 #else
 	(void)daemon;
-	(void)need_pidfile;
 #endif /* HAVE_KILL */

 	/* Set user context */
@@ -604,10 +600,9 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 *    These increase verbosity as specified in the config file.
 * @param debug_mode: if set, do not daemonize.
 * @param log_default_identity: Default identity to report in logs
- * @param need_pidfile: if false, no pidfile is checked or created.
 */
 static void 
-run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, const char* log_default_identity, int need_pidfile)
+run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, const char* log_default_identity)
 {
 	struct config_file* cfg = NULL;
 	struct daemon* daemon = NULL;
@@ -637,7 +632,7 @@ run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, const char*
 		if(!daemon_open_shared_ports(daemon))
 			fatal_exit("could not open ports");
 		if(!done_setup) { 
-			perform_setup(daemon, cfg, debug_mode, &cfgfile, need_pidfile);
+			perform_setup(daemon, cfg, debug_mode, &cfgfile);
 			done_setup = 1; 
 		} else {
 			/* reopen log after HUP to facilitate log rotation */
@@ -687,8 +682,6 @@ main(int argc, char* argv[])
 	const char* log_ident_default;
 	int cmdline_verbose = 0;
 	int debug_mode = 0;
-	int need_pidfile = 1;
-
 #ifdef UB_ON_WINDOWS
 	int cmdline_cfg = 0;
 #endif
@@ -697,7 +690,7 @@ main(int argc, char* argv[])
 	log_ident_default = strrchr(argv[0],'/')?strrchr(argv[0],'/')+1:argv[0];
 	log_ident_set(log_ident_default);
 	/* parse the options */
-	while( (c=getopt(argc, argv, "c:dhpvw:")) != -1) {
+	while( (c=getopt(argc, argv, "c:dhvw:")) != -1) {
 		switch(c) {
 		case 'c':
 			cfgfile = optarg;
@@ -709,9 +702,6 @@ main(int argc, char* argv[])
 			cmdline_verbose++;
 			verbosity++;
 			break;
-		case 'p':
-			need_pidfile = 0;
-			break;
 		case 'd':
 			debug_mode++;
 			break;
@@ -742,7 +732,7 @@ main(int argc, char* argv[])
 		return 1;
 	}

-	run_daemon(cfgfile, cmdline_verbose, debug_mode, log_ident_default, need_pidfile);
+	run_daemon(cfgfile, cmdline_verbose, debug_mode, log_ident_default);
 	log_init(NULL, 0, NULL); /* close logfile */
 	return 0;
 }
@@ -1009,7 +1009,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	struct query_info* lookup_qinfo = &qinfo;
 	struct query_info qinfo_tmp; /* placeholdoer for lookup_qinfo */
 	struct respip_client_info* cinfo = NULL, cinfo_tmp;
-	memset(&qinfo, 0, sizeof(qinfo));

 	if(error != NETEVENT_NOERROR) {
 		/* some bad tcp query DNS formats give these error calls */
@@ -1112,7 +1111,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	if(!query_info_parse(&qinfo, c->buffer)) {
 		verbose(VERB_ALGO, "worker parse request: formerror.");
 		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
-		memset(&qinfo, 0, sizeof(qinfo)); /* zero qinfo.qname */
 		if(worker_err_ratelimit(worker, LDNS_RCODE_FORMERR) == -1) {
 			comm_point_drop_reply(repinfo);
 			return 0;
@@ -1357,10 +1355,6 @@ lookup_cache:
 					lock_rw_unlock(&e->lock);
 					regional_free_all(worker->scratchpad);
 					goto send_reply;
-				} else {
-					/* Note that we've already released the
-					 * lock if we're here after prefetch. */
-					lock_rw_unlock(&e->lock);
 				}
 				/* We've found a partial reply ending with an
 				 * alias.  Replace the lookup qinfo for the
@@ -1368,6 +1362,7 @@ lookup_cache:
 				 * (possibly) complete the reply.  As we're
 				 * passing the "base" reply, there will be no
 				 * more alias chasing. */
+				lock_rw_unlock(&e->lock);
 				memset(&qinfo_tmp, 0, sizeof(qinfo_tmp));
 				get_cname_target(alias_rrset, &qinfo_tmp.qname,
 					&qinfo_tmp.qname_len);
@@ -1633,8 +1628,7 @@ worker_init(struct worker* worker, struct config_file *cfg,
 		cfg->use_caps_bits_for_id, worker->ports, worker->numports,
 		cfg->unwanted_threshold, cfg->outgoing_tcp_mss,
 		&worker_alloc_cleanup, worker,
-		cfg->do_udp || cfg->udp_upstream_without_downstream,
-		worker->daemon->connect_sslctx, cfg->delay_close,
+		cfg->do_udp, worker->daemon->connect_sslctx, cfg->delay_close,
 		dtenv);
 	if(!worker->back) {
 		log_err("could not create outgoing sockets");
@@ -1675,17 +1669,7 @@ worker_init(struct worker* worker, struct config_file *cfg,
 	worker->env.send_query = &worker_send_query;
 	worker->env.alloc = &worker->alloc;
 	worker->env.rnd = worker->rndstate;
-	/* If case prefetch is triggered, the corresponding mesh will clear
-	 * the scratchpad for the module env in the middle of request handling.
-	 * It would be prone to a use-after-free kind of bug, so we avoid
-	 * sharing it with worker's own scratchpad at the cost of having
-	 * one more pad per worker. */
-	worker->env.scratch = regional_create_custom(cfg->msg_buffer_size);
-	if(!worker->env.scratch) {
-		log_err("malloc failure");
-		worker_delete(worker);
-		return 0;
-	}
+	worker->env.scratch = worker->scratchpad;
 	worker->env.mesh = mesh_create(&worker->daemon->mods, &worker->env);
 	worker->env.detach_subs = &mesh_detach_subs;
 	worker->env.attach_sub = &mesh_attach_sub;
@@ -1774,7 +1758,6 @@ worker_delete(struct worker* worker)
 	comm_base_delete(worker->base);
 	ub_randfree(worker->rndstate);
 	alloc_clear(&worker->alloc);
-	regional_destroy(worker->env.scratch);
 	regional_destroy(worker->scratchpad);
 	free(worker);
 }
@@ -540,7 +540,6 @@ dns64_operate(struct module_qstate* qstate, enum module_ev event, int id,
 		case module_event_new:
 			/* Tag this query as being new and fall through. */
 			qstate->minfo[id] = (void*)DNS64_NEW_QUERY;
-  			/* fallthrough */
 		case module_event_pass:
 			qstate->ext_state[id] = handle_event_pass(qstate, id);
 			break;
@@ -792,10 +791,6 @@ dns64_inform_super(struct module_qstate* qstate, int id,
 					qstate->return_msg->rep))
 		return;

-	/* Use return code from A query in response to client. */
-	if (super->return_rcode != LDNS_RCODE_NOERROR)
-		super->return_rcode = qstate->return_rcode;
-
 	/* Generate a response suitable for the original query. */
 	if (qstate->qinfo.qtype == LDNS_RR_TYPE_A) {
 		dns64_adjust_a(id, super, qstate);
@@ -12,8 +12,6 @@
 #include "util/net_help.h"
 #include "util/netevent.h"
 #include "util/log.h"
-#include "util/storage/slabhash.h"
-#include "util/storage/lookup3.h"

 #include "dnscrypt/cert.h"
 #include "dnscrypt/dnscrypt.h"
@@ -21,15 +19,13 @@

 #include <ctype.h>

-
 /**
 * \file
 * dnscrypt functions for encrypting DNS packets.
 */

 #define DNSCRYPT_QUERY_BOX_OFFSET \
-    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_PUBLICKEYBYTES + \
-    crypto_box_HALF_NONCEBYTES)
+    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_PUBLICKEYBYTES + crypto_box_HALF_NONCEBYTES)

 //  8 bytes: magic header (CERT_MAGIC_HEADER)
 // 12 bytes: the client's nonce
@@ -37,202 +33,13 @@
 // 16 bytes: Poly1305 MAC (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)

 #define DNSCRYPT_REPLY_BOX_OFFSET \
-    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_HALF_NONCEBYTES + \
-    crypto_box_HALF_NONCEBYTES)
-
-
-/**
- * Shared secret cache key length.
- * secret key.
- * 1 byte: ES_VERSION[1]
- * 32 bytes: client crypto_box_PUBLICKEYBYTES
- * 32 bytes: server crypto_box_SECRETKEYBYTES
- */
-#define DNSCRYPT_SHARED_SECRET_KEY_LENGTH \
-    (1 + crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES)
-
-
-struct shared_secret_cache_key {
-    /** the hash table key */
-    uint8_t key[DNSCRYPT_SHARED_SECRET_KEY_LENGTH];
-    /** the hash table entry, data is uint8_t pointer of size crypto_box_BEFORENMBYTES which contains the shared secret. */
-    struct lruhash_entry entry;
-};
-
-
-struct nonce_cache_key {
-    /** the nonce used by the client */
-    uint8_t nonce[crypto_box_HALF_NONCEBYTES];
-    /** the client_magic used by the client, this is associated to 1 cert only */
-    uint8_t magic_query[DNSCRYPT_MAGIC_HEADER_LEN];
-    /** the client public key */
-    uint8_t client_publickey[crypto_box_PUBLICKEYBYTES];
-    /** the hash table entry, data is uint8_t */
-    struct lruhash_entry entry;
-};
-
-/**
- * Generate a key suitable to find shared secret in slabhash.
- * \param[in] key: a uint8_t pointer of size DNSCRYPT_SHARED_SECRET_KEY_LENGTH
- * \param[in] esversion: The es version least significant byte.
- * \param[in] pk: The public key of the client. uint8_t pointer of size
- * crypto_box_PUBLICKEYBYTES.
- * \param[in] sk: The secret key of the server matching the magic query number.
- * uint8_t pointer of size crypto_box_SECRETKEYBYTES.
- * \return the hash of the key.
- */
-static uint32_t
-dnsc_shared_secrets_cache_key(uint8_t* key,
-                              uint8_t esversion,
-                              uint8_t* pk,
-                              uint8_t* sk)
-{
-    key[0] = esversion;
-    memcpy(key + 1, pk, crypto_box_PUBLICKEYBYTES);
-    memcpy(key + 1 + crypto_box_PUBLICKEYBYTES, sk, crypto_box_SECRETKEYBYTES);
-    return hashlittle(key, DNSCRYPT_SHARED_SECRET_KEY_LENGTH, 0);
-}
-
-/**
- * Inserts a shared secret into the shared_secrets_cache slabhash.
- * The shared secret is copied so the caller can use it freely without caring
- * about the cache entry being evicted or not.
- * \param[in] cache: the slabhash in which to look for the key.
- * \param[in] key: a uint8_t pointer of size DNSCRYPT_SHARED_SECRET_KEY_LENGTH
- * which contains the key of the shared secret.
- * \param[in] hash: the hash of the key.
- * \param[in] nmkey: a uint8_t pointer of size crypto_box_BEFORENMBYTES which
- * contains the shared secret.
- */
-static void
-dnsc_shared_secret_cache_insert(struct slabhash *cache,
-                                uint8_t key[DNSCRYPT_SHARED_SECRET_KEY_LENGTH],
-                                uint32_t hash,
-                                uint8_t nmkey[crypto_box_BEFORENMBYTES])
-{
-    struct shared_secret_cache_key* k =
-        (struct shared_secret_cache_key*)calloc(1, sizeof(*k));
-    uint8_t* d = malloc(crypto_box_BEFORENMBYTES);
-    if(!k || !d) {
-        free(k);
-        free(d);
-        return;
-    }
-    memcpy(d, nmkey, crypto_box_BEFORENMBYTES);
-    lock_rw_init(&k->entry.lock);
-    memcpy(k->key, key, DNSCRYPT_SHARED_SECRET_KEY_LENGTH);
-    k->entry.hash = hash;
-    k->entry.key = k;
-    k->entry.data = d;
-    slabhash_insert(cache,
-                    hash, &k->entry,
-                    d,
-                    NULL);
-}
-
-/**
- * Lookup a record in shared_secrets_cache.
- * \param[in] cache: a pointer to shared_secrets_cache slabhash.
- * \param[in] key: a uint8_t pointer of size DNSCRYPT_SHARED_SECRET_KEY_LENGTH
- * containing the key to look for.
- * \param[in] hash: a hash of the key.
- * \return a pointer to the locked cache entry or NULL on failure.
- */
-static struct lruhash_entry*
-dnsc_shared_secrets_lookup(struct slabhash* cache,
-                           uint8_t key[DNSCRYPT_SHARED_SECRET_KEY_LENGTH],
-                           uint32_t hash)
-{
-    return slabhash_lookup(cache, hash, key, 0);
-}
-
-/**
- * Generate a key hash suitable to find a nonce in slabhash.
- * \param[in] nonce: a uint8_t pointer of size crypto_box_HALF_NONCEBYTES
- * \param[in] magic_query: a uint8_t pointer of size DNSCRYPT_MAGIC_HEADER_LEN
- * \param[in] pk: The public key of the client. uint8_t pointer of size
- * crypto_box_PUBLICKEYBYTES.
- * \return the hash of the key.
- */
-static uint32_t
-dnsc_nonce_cache_key_hash(const uint8_t nonce[crypto_box_HALF_NONCEBYTES],
-                          const uint8_t magic_query[DNSCRYPT_MAGIC_HEADER_LEN],
-                          const uint8_t pk[crypto_box_PUBLICKEYBYTES])
-{
-    uint32_t h = 0;
-    h = hashlittle(nonce, crypto_box_HALF_NONCEBYTES, h);
-    h = hashlittle(magic_query, DNSCRYPT_MAGIC_HEADER_LEN, h);
-    return hashlittle(pk, crypto_box_PUBLICKEYBYTES, h);
-}
-
-/**
- * Inserts a nonce, magic_query, pk tuple into the nonces_cache slabhash.
- * \param[in] cache: the slabhash in which to look for the key.
- * \param[in] nonce: a uint8_t pointer of size crypto_box_HALF_NONCEBYTES
- * \param[in] magic_query: a uint8_t pointer of size DNSCRYPT_MAGIC_HEADER_LEN
- * \param[in] pk: The public key of the client. uint8_t pointer of size
- * crypto_box_PUBLICKEYBYTES.
- * \param[in] hash: the hash of the key.
- */
-static void
-dnsc_nonce_cache_insert(struct slabhash *cache,
-                        const uint8_t nonce[crypto_box_HALF_NONCEBYTES],
-                        const uint8_t magic_query[DNSCRYPT_MAGIC_HEADER_LEN],
-                        const uint8_t pk[crypto_box_PUBLICKEYBYTES],
-                        uint32_t hash)
-{
-    struct nonce_cache_key* k =
-        (struct nonce_cache_key*)calloc(1, sizeof(*k));
-    if(!k) {
-        free(k);
-        return;
-    }
-    lock_rw_init(&k->entry.lock);
-    memcpy(k->nonce, nonce, crypto_box_HALF_NONCEBYTES);
-    memcpy(k->magic_query, magic_query, DNSCRYPT_MAGIC_HEADER_LEN);
-    memcpy(k->client_publickey, pk, crypto_box_PUBLICKEYBYTES);
-    k->entry.hash = hash;
-    k->entry.key = k;
-    k->entry.data = NULL;
-    slabhash_insert(cache,
-                    hash, &k->entry,
-                    NULL,
-                    NULL);
-}
-
-/**
- * Lookup a record in nonces_cache.
- * \param[in] cache: the slabhash in which to look for the key.
- * \param[in] nonce: a uint8_t pointer of size crypto_box_HALF_NONCEBYTES
- * \param[in] magic_query: a uint8_t pointer of size DNSCRYPT_MAGIC_HEADER_LEN
- * \param[in] pk: The public key of the client. uint8_t pointer of size
- * crypto_box_PUBLICKEYBYTES.
- * \param[in] hash: the hash of the key.
- * \return a pointer to the locked cache entry or NULL on failure.
- */
-static struct lruhash_entry*
-dnsc_nonces_lookup(struct slabhash* cache,
-                   const uint8_t nonce[crypto_box_HALF_NONCEBYTES],
-                   const uint8_t magic_query[DNSCRYPT_MAGIC_HEADER_LEN],
-                   const uint8_t pk[crypto_box_PUBLICKEYBYTES],
-                   uint32_t hash)
-{
-    struct nonce_cache_key k;
-    memset(&k, 0, sizeof(k));
-    k.entry.hash = hash;
-    memcpy(k.nonce, nonce, crypto_box_HALF_NONCEBYTES);
-    memcpy(k.magic_query, magic_query, DNSCRYPT_MAGIC_HEADER_LEN);
-    memcpy(k.client_publickey, pk, crypto_box_PUBLICKEYBYTES);
-
-    return slabhash_lookup(cache, hash, &k, 0);
-}
+    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_HALF_NONCEBYTES + crypto_box_HALF_NONCEBYTES)

 /**
 * Decrypt a query using the dnsccert that was found using dnsc_find_cert.
 * The client nonce will be extracted from the encrypted query and stored in
 * client_nonce, a shared secret will be computed and stored in nmkey and the
 * buffer will be decrypted inplace.
- * \param[in] env the dnscrypt environment.
 * \param[in] cert the cert that matches this encrypted query.
 * \param[in] client_nonce where the client nonce will be stored.
 * \param[in] nmkey where the shared secret key will be written.
@@ -240,8 +47,7 @@ dnsc_nonces_lookup(struct slabhash* cache,
 * \return 0 on success.
 */
 static int
-dnscrypt_server_uncurve(struct dnsc_env* env,
-                        const dnsccert *cert,
+dnscrypt_server_uncurve(const dnsccert *cert,
                        uint8_t client_nonce[crypto_box_HALF_NONCEBYTES],
                        uint8_t nmkey[crypto_box_BEFORENMBYTES],
                        struct sldns_buffer* buffer)
@@ -250,87 +56,26 @@ dnscrypt_server_uncurve(struct dnsc_env* env,
    uint8_t *const buf = sldns_buffer_begin(buffer);
    uint8_t nonce[crypto_box_NONCEBYTES];
    struct dnscrypt_query_header *query_header;
-    // shared secret cache
-    uint8_t key[DNSCRYPT_SHARED_SECRET_KEY_LENGTH];
-    struct lruhash_entry* entry;
-    uint32_t hash;
-
-    uint32_t nonce_hash;

    if (len <= DNSCRYPT_QUERY_HEADER_SIZE) {
        return -1;
    }

    query_header = (struct dnscrypt_query_header *)buf;
-
-    /* Detect replay attacks */
-    nonce_hash = dnsc_nonce_cache_key_hash(
-        query_header->nonce,
-        cert->magic_query,
-        query_header->publickey);
-
-    lock_basic_lock(&env->nonces_cache_lock);
-    entry = dnsc_nonces_lookup(
-        env->nonces_cache,
-        query_header->nonce,
-        cert->magic_query,
-        query_header->publickey,
-        nonce_hash);
-
-    if(entry) {
-        lock_rw_unlock(&entry->lock);
-        env->num_query_dnscrypt_replay++;
-        lock_basic_unlock(&env->nonces_cache_lock);
-        return -1;
-    }
-
-    dnsc_nonce_cache_insert(
-        env->nonces_cache,
-        query_header->nonce,
-        cert->magic_query,
-        query_header->publickey,
-        nonce_hash);
-    lock_basic_unlock(&env->nonces_cache_lock);
-
-    /* Find existing shared secret */
-    hash = dnsc_shared_secrets_cache_key(key,
-                                         cert->es_version[1],
-                                         query_header->publickey,
-                                         cert->keypair->crypt_secretkey);
-    entry = dnsc_shared_secrets_lookup(env->shared_secrets_cache,
-                                       key,
-                                       hash);
-
-    if(!entry) {
-        lock_basic_lock(&env->shared_secrets_cache_lock);
-        env->num_query_dnscrypt_secret_missed_cache++;
-        lock_basic_unlock(&env->shared_secrets_cache_lock);
-        if(cert->es_version[1] == 2) {
+    memcpy(nmkey, query_header->publickey, crypto_box_PUBLICKEYBYTES);
+    if(cert->es_version[1] == 2) {
 #ifdef USE_DNSCRYPT_XCHACHA20
-            if (crypto_box_curve25519xchacha20poly1305_beforenm(
-                        nmkey, query_header->publickey,
-                        cert->keypair->crypt_secretkey) != 0) {
-                return -1;
-            }
-#else
-            return -1;
-#endif
-    } else {
-        if (crypto_box_beforenm(nmkey,
-                                query_header->publickey,
-                                cert->keypair->crypt_secretkey) != 0) {
+        if (crypto_box_curve25519xchacha20poly1305_beforenm(
+                nmkey, nmkey, cert->keypair->crypt_secretkey) != 0) {
            return -1;
        }
-    }
-    // Cache the shared secret we just computed.
-    dnsc_shared_secret_cache_insert(env->shared_secrets_cache,
-                                    key,
-                                    hash,
-                                    nmkey);
+#else
+        return -1;
+#endif
    } else {
-        /* copy shared secret and unlock entry */
-        memcpy(nmkey, entry->data, crypto_box_BEFORENMBYTES);
-        lock_rw_unlock(&entry->lock);
+        if (crypto_box_beforenm(nmkey, nmkey, cert->keypair->crypt_secretkey) != 0) {
+            return -1;
+        }
    }

    memcpy(nonce, query_header->nonce, crypto_box_HALF_NONCEBYTES);
@@ -361,7 +106,7 @@ dnscrypt_server_uncurve(struct dnsc_env* env,
    len -= DNSCRYPT_QUERY_HEADER_SIZE;

    while (*sldns_buffer_at(buffer, --len) == 0)
-        ;
+	    ;

    if (*sldns_buffer_at(buffer, len) != 0x80) {
        return -1;
@@ -427,7 +172,7 @@ dnscrypt_hrtime(void)
    if (ret == 0) {
        ts = (uint64_t)tv.tv_sec * 1000000U + (uint64_t)tv.tv_usec;
    } else {
-        log_err("gettimeofday: %s", strerror(errno));
+	log_err("gettimeofday: %s", strerror(errno));
    }
    return ts;
 }
@@ -478,8 +223,7 @@ dnscrypt_server_curve(const dnsccert *cert,
                      size_t max_udp_size)
 {
    size_t dns_reply_len = sldns_buffer_limit(buffer);
-    size_t max_len = dns_reply_len + DNSCRYPT_MAX_PADDING \
-        + DNSCRYPT_REPLY_HEADER_SIZE;
+    size_t max_len = dns_reply_len + DNSCRYPT_MAX_PADDING + DNSCRYPT_REPLY_HEADER_SIZE;
    size_t max_reply_size = max_udp_size - 20U - 8U;
    uint8_t nonce[crypto_box_NONCEBYTES];
    uint8_t *boxed;
@@ -524,14 +268,8 @@ dnscrypt_server_curve(const dnsccert *cert,
        }
    }

-    sldns_buffer_write_at(buffer,
-                          0,
-                          DNSCRYPT_MAGIC_RESPONSE,
-                          DNSCRYPT_MAGIC_HEADER_LEN);
-    sldns_buffer_write_at(buffer,
-                          DNSCRYPT_MAGIC_HEADER_LEN,
-                          nonce,
-                          crypto_box_NONCEBYTES);
+    sldns_buffer_write_at(buffer, 0, DNSCRYPT_MAGIC_RESPONSE, DNSCRYPT_MAGIC_HEADER_LEN);
+    sldns_buffer_write_at(buffer, DNSCRYPT_MAGIC_HEADER_LEN, nonce, crypto_box_NONCEBYTES);
    sldns_buffer_set_limit(buffer, len + DNSCRYPT_REPLY_HEADER_SIZE);
    return 0;
 }
@@ -546,17 +284,17 @@ dnscrypt_server_curve(const dnsccert *cert,
 static int
 dnsc_read_from_file(char *fname, char *buf, size_t count)
 {
-    int fd;
-    fd = open(fname, O_RDONLY);
-    if (fd == -1) {
-        return -1;
-    }
-    if (read(fd, buf, count) != (ssize_t)count) {
-        close(fd);
-        return -2;
-    }
-    close(fd);
-    return 0;
+	int fd;
+	fd = open(fname, O_RDONLY);
+	if (fd == -1) {
+		return -1;
+	}
+	if (read(fd, buf, count) != (ssize_t)count) {
+		close(fd);
+		return -2;
+	}
+	close(fd);
+	return 0;
 }

 /**
@@ -570,12 +308,12 @@ dnsc_read_from_file(char *fname, char *buf, size_t count)
 static char *
 dnsc_chroot_path(struct config_file *cfg, char *path)
 {
-    char *nm;
-    nm = path;
-    if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm,
-        cfg->chrootdir, strlen(cfg->chrootdir)) == 0)
-        nm += strlen(cfg->chrootdir);
-    return nm;
+	char *nm;
+	nm = path;
+	if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm,
+		cfg->chrootdir, strlen(cfg->chrootdir)) == 0)
+		nm += strlen(cfg->chrootdir);
+	return nm;
 }

 /**
@@ -641,7 +379,7 @@ dnsc_key_to_fingerprint(char fingerprint[80U], const uint8_t * const key)

 /**
 * Find the cert matching a DNSCrypt query.
- * \param[in] dnscenv The DNSCrypt environment, which contains the list of certs
+ * \param[in] dnscenv The DNSCrypt enviroment, which contains the list of certs
 * supported by the server.
 * \param[in] buffer The encrypted DNS query.
 * \return a dnsccert * if we found a cert matching the magic_number of the
@@ -672,7 +410,7 @@ dnsc_find_cert(struct dnsc_env* dnscenv, struct sldns_buffer* buffer)
 * In order to be able to serve certs over TXT, we can reuse the local-zone and
 * local-data config option. The zone and qname are infered from the
 * provider_name and the content of the TXT record from the certificate content.
- * returns the number of certificate TXT record that were loaded.
+ * returns the number of certtificate TXT record that were loaded.
 * < 0 in case of error.
 */
 static int
@@ -712,7 +450,6 @@ dnsc_load_local_data(struct dnsc_env* dnscenv, struct config_file *cfg)
                snprintf(rr + strlen(rr), rrlen - 1 - strlen(rr), "\\%03d", c);
            }
        }
-        verbose(VERB_OPS, "DNSCrypt: adding local data to config: %s", rr);
        snprintf(rr + strlen(rr), rrlen - 1 - strlen(rr), "\"");
        cfg_strlist_insert(&cfg->local_data, strdup(rr));
        free(rr);
@@ -765,7 +502,7 @@ dnsc_parse_keys(struct dnsc_env *env, struct config_file *cfg)

 	env->keypairs = sodium_allocarray(env->keypairs_count,
 		sizeof *env->keypairs);
-	env->certs = sodium_allocarray(env->signed_certs_count,
+	env->certs = sodium_allocarray(env->signed_certs_count, 
 		sizeof *env->certs);

 	cert_id = 0U;
@@ -847,8 +584,7 @@ dnsc_handle_curved_request(struct dnsc_env* dnscenv,
    // to serve the certificate.
    verbose(VERB_ALGO, "handle request called on DNSCrypt socket");
    if ((repinfo->dnsc_cert = dnsc_find_cert(dnscenv, c->buffer)) != NULL) {
-        if(dnscrypt_server_uncurve(dnscenv,
-                                   repinfo->dnsc_cert,
+        if(dnscrypt_server_uncurve(repinfo->dnsc_cert,
                                   repinfo->client_nonce,
                                   repinfo->nmkey,
                                   c->buffer) != 0){
@@ -893,161 +629,23 @@ dnsc_create(void)
 		fatal_exit("dnsc_create: could not initialize libsodium.");
 	}
 	env = (struct dnsc_env *) calloc(1, sizeof(struct dnsc_env));
-	lock_basic_init(&env->shared_secrets_cache_lock);
-	lock_protect(&env->shared_secrets_cache_lock,
-                 &env->num_query_dnscrypt_secret_missed_cache,
-                 sizeof(env->num_query_dnscrypt_secret_missed_cache));
-	lock_basic_init(&env->nonces_cache_lock);
-	lock_protect(&env->nonces_cache_lock,
-                 &env->nonces_cache,
-                 sizeof(env->nonces_cache));
-	lock_protect(&env->nonces_cache_lock,
-                 &env->num_query_dnscrypt_replay,
-                 sizeof(env->num_query_dnscrypt_replay));
-
 	return env;
 }

 int
 dnsc_apply_cfg(struct dnsc_env *env, struct config_file *cfg)
 {
-    if(dnsc_parse_certs(env, cfg) <= 0) {
-        fatal_exit("dnsc_apply_cfg: no cert file loaded");
-    }
-    if(dnsc_parse_keys(env, cfg) <= 0) {
-        fatal_exit("dnsc_apply_cfg: no key file loaded");
-    }
-    randombytes_buf(env->hash_key, sizeof env->hash_key);
-    env->provider_name = cfg->dnscrypt_provider;
-
-    if(dnsc_load_local_data(env, cfg) <= 0) {
-        fatal_exit("dnsc_apply_cfg: could not load local data");
-    }
-    env->shared_secrets_cache = slabhash_create(
-        cfg->dnscrypt_shared_secret_cache_slabs,
-        HASH_DEFAULT_STARTARRAY,
-        cfg->dnscrypt_shared_secret_cache_size,
-        dnsc_shared_secrets_sizefunc,
-        dnsc_shared_secrets_compfunc,
-        dnsc_shared_secrets_delkeyfunc,
-        dnsc_shared_secrets_deldatafunc,
-        NULL
-    );
-    if(!env->shared_secrets_cache){
-        fatal_exit("dnsc_apply_cfg: could not create shared secrets cache.");
-    }
-    env->nonces_cache = slabhash_create(
-        cfg->dnscrypt_nonce_cache_slabs,
-        HASH_DEFAULT_STARTARRAY,
-        cfg->dnscrypt_nonce_cache_size,
-        dnsc_nonces_sizefunc,
-        dnsc_nonces_compfunc,
-        dnsc_nonces_delkeyfunc,
-        dnsc_nonces_deldatafunc,
-        NULL
-    );
-    return 0;
-}
-
-void
-dnsc_delete(struct dnsc_env *env)
-{
-	if(!env) {
-		return;
+	if(dnsc_parse_certs(env, cfg) <= 0) {
+		fatal_exit("dnsc_apply_cfg: no cert file loaded");
 	}
-	verbose(VERB_OPS, "DNSCrypt: Freeing environment.");
-	sodium_free(env->signed_certs);
-	sodium_free(env->certs);
-	sodium_free(env->keypairs);
-	slabhash_delete(env->shared_secrets_cache);
-	slabhash_delete(env->nonces_cache);
-	lock_basic_destroy(&env->shared_secrets_cache_lock);
-	lock_basic_destroy(&env->nonces_cache_lock);
-	free(env);
-}
-
-/**
- * #########################################################
- * ############# Shared secrets cache functions ############
- * #########################################################
- */
-
-size_t
-dnsc_shared_secrets_sizefunc(void *k, void* ATTR_UNUSED(d))
-{
-    struct shared_secret_cache_key* ssk = (struct shared_secret_cache_key*)k;
-    size_t key_size = sizeof(struct shared_secret_cache_key)
-        + lock_get_mem(&ssk->entry.lock);
-    size_t data_size = crypto_box_BEFORENMBYTES;
-    (void)ssk; /* otherwise ssk is unused if no threading, or fixed locksize */
-    return key_size + data_size;
-}
-
-int
-dnsc_shared_secrets_compfunc(void *m1, void *m2)
-{
-    return sodium_memcmp(m1, m2, DNSCRYPT_SHARED_SECRET_KEY_LENGTH);
-}
-
-void
-dnsc_shared_secrets_delkeyfunc(void *k, void* ATTR_UNUSED(arg))
-{
-    struct shared_secret_cache_key* ssk = (struct shared_secret_cache_key*)k;
-    lock_rw_destroy(&ssk->entry.lock);
-    free(ssk);
-}
-
-void
-dnsc_shared_secrets_deldatafunc(void* d, void* ATTR_UNUSED(arg))
-{
-    uint8_t* data = (uint8_t*)d;
-    free(data);
-}
-
-/**
- * #########################################################
- * ############### Nonces cache functions ##################
- * #########################################################
- */
-
-size_t
-dnsc_nonces_sizefunc(void *k, void* ATTR_UNUSED(d))
-{
-    struct nonce_cache_key* nk = (struct nonce_cache_key*)k;
-    size_t key_size = sizeof(struct nonce_cache_key)
-        + lock_get_mem(&nk->entry.lock);
-    (void)nk; /* otherwise ssk is unused if no threading, or fixed locksize */
-    return key_size;
-}
-
-int
-dnsc_nonces_compfunc(void *m1, void *m2)
-{
-    struct nonce_cache_key *k1 = m1, *k2 = m2;
-    return
-        sodium_memcmp(
-            k1->nonce,
-            k2->nonce,
-            crypto_box_HALF_NONCEBYTES) != 0 ||
-        sodium_memcmp(
-            k1->magic_query,
-            k2->magic_query,
-            DNSCRYPT_MAGIC_HEADER_LEN) != 0 ||
-        sodium_memcmp(
-            k1->client_publickey, k2->client_publickey,
-            crypto_box_PUBLICKEYBYTES) != 0;
-}
-
-void
-dnsc_nonces_delkeyfunc(void *k, void* ATTR_UNUSED(arg))
-{
-    struct nonce_cache_key* nk = (struct nonce_cache_key*)k;
-    lock_rw_destroy(&nk->entry.lock);
-    free(nk);
-}
-
-void
-dnsc_nonces_deldatafunc(void* ATTR_UNUSED(d), void* ATTR_UNUSED(arg))
-{
-    return;
+	if(dnsc_parse_keys(env, cfg) <= 0) {
+		fatal_exit("dnsc_apply_cfg: no key file loaded");
+	}
+	randombytes_buf(env->hash_key, sizeof env->hash_key);
+	env->provider_name = cfg->dnscrypt_provider;
+
+	if(dnsc_load_local_data(env, cfg) <= 0) {
+		fatal_exit("dnsc_apply_cfg: could not load local data");
+	}
+	return 0;
 }
@@ -26,7 +26,6 @@

 #include "config.h"
 #include "dnscrypt/cert.h"
-#include "util/locks.h"

 #define DNSCRYPT_QUERY_HEADER_SIZE \
    (DNSCRYPT_MAGIC_HEADER_LEN + crypto_box_PUBLICKEYBYTES + crypto_box_HALF_NONCEBYTES + crypto_box_MACBYTES)
@@ -39,7 +38,6 @@
 struct sldns_buffer;
 struct config_file;
 struct comm_reply;
-struct slabhash;

 typedef struct KeyPair_ {
    uint8_t crypt_publickey[crypto_box_PUBLICKEYBYTES];
@@ -54,7 +52,7 @@ typedef struct cert_ {

 struct dnsc_env {
 	struct SignedCert *signed_certs;
-	dnsccert *certs;
+    dnsccert *certs;
 	size_t signed_certs_count;
 	uint8_t provider_publickey[crypto_sign_ed25519_PUBLICKEYBYTES];
 	uint8_t provider_secretkey[crypto_sign_ed25519_SECRETKEYBYTES];
@@ -63,20 +61,6 @@ struct dnsc_env {
 	uint64_t nonce_ts_last;
 	unsigned char hash_key[crypto_shorthash_KEYBYTES];
 	char * provider_name;
-
-    /** Caches */
-	struct slabhash *shared_secrets_cache;
-	/** lock on shared secret cache counters */
-	lock_basic_type shared_secrets_cache_lock;
-	/** number of misses from shared_secrets_cache */
-	size_t num_query_dnscrypt_secret_missed_cache;
-
-	/** slabhash keeping track of nonce/cient pk/server sk pairs. */
-	struct slabhash *nonces_cache;
-	/** lock on nonces_cache, used to avoid race condition in updating the hash */
-	lock_basic_type nonces_cache_lock;
-	/** number of replayed queries */
-	size_t num_query_dnscrypt_replay;
 };

 struct dnscrypt_query_header {
@@ -87,7 +71,7 @@ struct dnscrypt_query_header {
 };

 /**
- * Initialize DNSCrypt environment.
+ * Initialize DNSCrypt enviroment.
 * Initialize sodium library and allocate the dnsc_env structure.
 * \return an uninitialized struct dnsc_env.
 */
@@ -104,12 +88,6 @@ struct dnsc_env * dnsc_create(void);
 */
 int dnsc_apply_cfg(struct dnsc_env *env, struct config_file *cfg);

-/**
- * Delete DNSCrypt environment
- *
- */
-void dnsc_delete(struct dnsc_env *env);
-
 /**
 * handle a crypted dnscrypt request.
 * Determine wether or not a query is coming over the dnscrypt listener and
@@ -127,47 +105,5 @@ int dnsc_handle_curved_request(struct dnsc_env* dnscenv,
 */

 int dnsc_handle_uncurved_request(struct comm_reply *repinfo);
-
-/**
- * Computes the size of the shared secret cache entry.
- */
-size_t dnsc_shared_secrets_sizefunc(void *k, void *d);
-
-/**
- * Compares two shared secret cache keys.
- */
-int dnsc_shared_secrets_compfunc(void *m1, void *m2);
-
-/**
- * Function to delete a shared secret cache key.
- */
-void dnsc_shared_secrets_delkeyfunc(void *k, void* arg);
-
-/**
- * Function to delete a share secret cache value.
- */
-void dnsc_shared_secrets_deldatafunc(void* d, void* arg);
-
-/**
- * Computes the size of the nonce cache entry.
- */
-size_t dnsc_nonces_sizefunc(void *k, void *d);
-
-/**
- * Compares two nonce cache keys.
- */
-int dnsc_nonces_compfunc(void *m1, void *m2);
-
-/**
- * Function to delete a nonce cache key.
- */
-void dnsc_nonces_delkeyfunc(void *k, void* arg);
-
-/**
- * Function to delete a nonce cache value.
- */
-void dnsc_nonces_deldatafunc(void* d, void* arg);
-
-
 #endif /* USE_DNSCRYPT */
 #endif
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-CERT_EXPIRE_DAYS="$(( 365 * 15 ))"
-DIR="$(dirname "$0")"
-
-
-if [[ "$PWD" != *tdir ]]
-then
-    echo "You should run this script with a .tdir directory"
-    exit 1
-fi
-
-for i in 1 2
-do
-    # Ephemeral key
-    rm -f "${i}.key"
-    dnscrypt-wrapper --gen-crypt-keypair \
-        --crypt-secretkey-file="${i}.key"  \
-        --provider-publickey-file="${DIR}/keys${i}/public.key" \
-        --provider-secretkey-file="${DIR}/keys${i}/secret.key"
-    # Cert file
-    for cipher in salsa chacha
-    do
-        rm -f "${i}_${cipher}.cert"
-        extraarg=""
-        if [ "${cipher}" == "chacha" ]
-        then
-             extraarg="-x"
-        fi
-
-        dnscrypt-wrapper ${extraarg} --gen-cert-file \
-            --provider-cert-file="${i}_${cipher}.cert" \
-            --crypt-secretkey-file="${i}.key" \
-            --provider-publickey-file="${DIR}/keys${i}/public.key" \
-            --provider-secretkey-file="${DIR}/keys${i}/secret.key" \
-            --cert-file-expire-days="${CERT_EXPIRE_DAYS}"
-    done
-done
@@ -1 +0,0 @@
-¸_A¡O#÷ÛÈfó—ÌoD¶_�eÅ¶)|'T¦éÜòO�
@@ -1 +0,0 @@
-&ç6\Uùõñh`^"…ºz/C9‚
óˆ¸_A¡O#÷ÛÈfó—ÌoD¶_�eÅ¶)|'T¦éÜòO�
@@ -1 +0,0 @@
-ΓR ς�ύeµτ{φl�ΑKΛ€Ξ:5r\±}KΣηƒ
@@ -1 +0,0 @@
-ηi%‚ 5fΝ™–νΙϋ�νBnκΝ―.Ί“ΓR ς�ύeµτ{φl�ΑKΛ€Ξ:5r\±}KΣηƒ
@@ -1,201 +1,3 @@
-10 October 2017: Wouter 
-	- tag 1.6.7
-
-6 October 2017: Wouter 
-	- Fix spelling in unbound-control man page.
-
-5 October 2017: Wouter 
-	- Fix trust-anchor-signaling works in libunbound.
-	- Fix some more crpls in testdata for different signaling default.
-	- tag 1.6.7rc1
-
-5 October 2017: Ralph 
-	- Set trust-anchor-signaling default to yes
-	- Use RCODE from A query on DNS64 synthesized answer.
-
-2 October 2017: Wouter
-	- Fix param unused warning for windows exportsymbol compile.
-
-25 September 2017: Ralph
-	- Fix #1450: Generate again patch contrib/aaaa-filter-iterator.patch
-	   (by Danilo G. Baio).
-
-21 September 2017: Ralph
-	- Log name of looping module
-
-19 September 2017: Wouter
-	- use a cachedb answer even if it's "expired" when serve-expired is yes
-	  (patch from Jinmei Tatuya).
-	- trigger refetching of the answer in that case (this will bypass
-	  cachedb lookup)
-	- allow storing a 0-TTL answer from cachedb in the in-memory message
-	  cache when serve-expired is yes
-	- Fix DNSCACHE_STORE_ZEROTTL to be bigger than 0xffff.
-
-18 September 2017: Ralph
-	- Fix #1400: allowing use of global cache on ECS-forwarding unless
-	  always-forward.
-
-18 September 2017: Wouter
-	- tag 1.6.6 (is 1.6.6rc2)
-	- Fix that looping modules always stop the query, and don't pass
-	  control.
-	- Fix #1435: Please allow UDP to be disabled separately upstream and
-	  downstream.
-	- Fix #1440: [dnscrypt] client nonce cache.
-
-15 September 2017: Wouter
-	- Fix unbound-host to report error for DNSSEC state of failed lookups.
-	- Spelling fixes, from Josh Soref.
-
-13 September 2017: Wouter
-	- tag 1.6.6rc2, became 1.6.6 on 18 sep.  trunk 1.6.7 in development.
-
-12 September 2017: Wouter
-	- Add dns64 for client-subnet in unbound-checkconf.
-
-4 September 2017: Ralph
-	- Fix #1412: QNAME minimisation strict mode not honored
-	- Fix #1434: Fix windows openssl 1.1.0 linking.
-
-4 September 2017: Wouter
-	- tag 1.6.6rc1
-	- makedist fix for windows binaries, with openssl 1.1.0 windres fix,
-	  and expat 2.2.4 install target fix.
-
-1 September 2017: Wouter
-	- Recommend 1472 buffer size in unbound.conf
-
-31 August 2017: Wouter
-	- Fix #1424: cachedb:testframe is not thread safe.
-	- For #1417: escape ; in dnscrypt tests.
-	- but reverted that, tests fails with that escape.
-	- Fix #1417: [dnscrypt] shared secret cache counters, and works when
-	  dnscrypt is not enabled.  And cache size configuration option.
-	- make depend
-	- Fix #1418: [ip ratelimit] initialize slabhash using
-	  ip-ratelimit-slabs.
-
-30 August 2017: Wouter
-	- updated contrib/fastrpz.patch to apply with configparser changes.
-	- Fix 1416: qname-minimisation breaks TLSA lookups with CNAMEs.
-
-29 August 2017: Wouter
-	- Fix #1414: fix segfault on parse failure and log_replies.
-	- zero qinfo in handle_request, this zeroes local_alias and also the
-	  qname member.
-	- new keys and certs for dnscrypt tests.
-	- fixup WKS test on buildhost without servicebyname.
-
-28 August 2017: Wouter
-	- Fix #1415: patch to free dnscrypt environment on reload.
-	- iana portlist update
-	- Fix #1415: [dnscrypt] shared secret cache, patch from
-	  Manu Bretelle.
-	- Small fixes for the shared secret cache patch.
-	- Fix WKS records on kvm autobuild host, with default protobyname
-	  entries for udp and tcp.
-
-23 August 2017: Wouter
-	- Fix #1407: Add ECS options check to unbound-checkconf.
-	- make depend
-	- Fix to reclaim tcp handler when it is closed due to dnscrypt buffer
-	  allocation failure.
-
-22 August 2017: Wouter
-	- Fix install of trust anchor when two anchors are present, makes both
-	  valid. Checks hash of DS but not signature of new key. This fixes
-	  the root.key file if created when unbound is installed between
-	  sep11 and oct11 2017.
-	- tag 1.6.5 with pointrelease 1.6.5 (1.6.4 plus 5011 fix).
-	- trunk version 1.6.6 in development.
-	- Fix issue on macOX 10.10 where TCP fast open is detected but not
-	  implemented causing TCP to fail. The fix allows fallback to regular
-	  TCP in this case and is also more robust for cases where connectx()
-	  fails for some reason.
-	- Fix #1402: squelch invalid argument error for fd_set_block on windows.
-
-10 August 2017: Wouter
-	- Patch to show DNSCrypt status in help output, from Carsten
-	  Strotmann.
-
-8 August 2017: Wouter
-	- Fix #1398: make cachedb secret configurable.
-	- Remove spaces from Makefile.
-
-7 August 2017: Wouter
-	- Fix #1397: Recursive DS lookups for AS112 zones names should recurse.
-
-3 August 2017: Ralph
-	- Remove unused iter_env member (ip6arpa_dname)
-	- Do not reset rrset.bogus stats when called using stats_noreset.
-	- Added stats for queries that have been ratelimited by domain
-	  recursion.
-	- Do not add rrset_bogus and query ratelimiting stats per thread, these
-	  module stats are global.
-
-3 August 2017: Wouter
-	- Fix #1394: mix of serve-expired and response-ip could cause a crash.
-
-24 July 2017: Wouter
-	- upgrade aclocal(pkg.m4 0.29.1), config.guess(2016-10-02),
-	  config.sub(2016-09-05).
-	- annotate case statement fallthrough for gcc 7.1.1.
-	- flex output from flex 2.6.1.
-	- snprintf of thread number does not warn about truncated string.
-	- squelch TCP fast open error on FreeBSD when kernel has it disabled,
-	  unless verbosity is high.
-	- remove warning from windows compile.
-	- Fix compile with libnettle
-	- Fix DSA configure switch (--disable dsa) for libnettle and libnss.
-	- Fix #1365: Add Ed25519 support using libnettle.
-	- iana portlist update
-
-17 July 2017: Wouter
-	- Fix #1350: make cachedb backend configurable (from JINMEI Tatuya).
-	- Fix #1349: allow suppression of pidfiles (from Daniel Kahn Gillmor).
-	  With the -p option unbound does not create a pidfile.
-
-11 July 2017: Wouter
-	- Fix #1344: RFC6761-reserved domains: test. and invalid.
-	- Redirect all localhost names to localhost address for RFC6761.
-
-6 July 2017: Wouter
-	- Fix tests to use .tdir (from Manu Bretelle) instead of .tpkg.
-	- Fix svn hooks for tdir (selected if testcode/mini_tdir.sh exists)..
-
-4 July 2017: Wouter
-	- Fix 1332: Bump verbosity of failed chown'ing of the control socket.
-
-3 July 2017: Wouter
-	- Fix for unbound-checkconf, check ipsecmod-hook if ipsecmod is turned
-	  on.
-	- Fix #1331: libunbound segfault in threaded mode when context is
-	  deleted.
-	- Fix pythonmod link line option flag.
-	- Fix openssl 1.1.0 load of ssl error strings from ssl init.
-
-29 June 2017: Wouter
-	- Fix python example0 return module wait instead of error for pass.
-	- iana portlist update
-	- enhancement for hardened-tls for DNS over TLS.  Removed duplicated
-	  security settings.
-
-27 June 2017: Wouter
-	- Tag 1.6.4 is created with the 1.6.4rc2 contents.
-	- Trunk contains 1.6.5, with changes from 26, 27 june.
-	- Remove signed unsigned warning from authzone.
-	- Fix that infra cache host hash does not change after reconfig.
-
-26 June 2017: Wouter
-	- (for 1.6.5)
-	  Better fixup of dnscrypt_cert_chacha test for different escapes.
-	- First fix for zero b64 and hex text zone format in sldns.
-	- unbound-control dump_infra prints port number for address if not 53.
-
-23 June 2017: Wouter
-	- (for 1.6.5): fixup of dnscrypt_cert_chacha test (from Manu Bretelle).
-
 22 June 2017: Wouter
 	- Tag 1.6.4rc2

@@ -116,7 +116,7 @@ server:
 	# ip-freebind: no

 	# EDNS reassembly buffer to advertise to UDP peers (the actual buffer
-	# is set with msg-buffer-size). 1472 can solve fragmentation (timeouts)
+	# is set with msg-buffer-size). 1480 can solve fragmentation (timeouts).
 	# edns-buffer-size: 4096

 	# Maximum UDP response size (not applied to TCP response).
@@ -199,10 +199,6 @@ server:
 	# upstream connections use TCP only (and no UDP), "yes" or "no"
 	# useful for tunneling scenarios, default no.
 	# tcp-upstream: no
-	
-	# upstream connections also use UDP (even if do-udp is no).
-	# useful if if you want UDP upstream, but don't provide UDP downstream.
-	# udp-upstream-without-downstream: no

 	# Maximum segment size (MSS) of TCP socket on which the server
 	# responds to queries. Default is 0, system default MSS.
@@ -453,7 +449,7 @@ server:
 	# auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"

 	# trust anchor signaling sends a RFC8145 key tag query after priming.
-	# trust-anchor-signaling: yes
+	# trust-anchor-signaling: no

 	# File with DLV trusted keys. Same format as trust-anchor-file.
 	# There can be only one DLV configured, it is trusted from root down.
@@ -516,7 +512,7 @@ server:
 	# that set CD but cannot validate themselves.
 	# ignore-cd-flag: no

-	# Serve expired responses from cache, with TTL 0 in the response,
+	# Serve expired reponses from cache, with TTL 0 in the response,
 	# and then attempt to fetch the data afresh.
 	# serve-expired: no

@@ -567,8 +563,6 @@ server:
 	# local-zone: "127.in-addr.arpa." nodefault
 	# local-zone: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa." nodefault
 	# local-zone: "onion." nodefault
-	# local-zone: "test." nodefault
-	# local-zone: "invalid." nodefault
 	# local-zone: "10.in-addr.arpa." nodefault
 	# local-zone: "16.172.in-addr.arpa." nodefault
 	# local-zone: "17.172.in-addr.arpa." nodefault
@@ -844,13 +838,3 @@ remote-control:
 #     dnscrypt-secret-key: /path/unbound-conf/keys2/1.key
 #     dnscrypt-provider-cert: /path/unbound-conf/keys1/1.cert
 #     dnscrypt-provider-cert: /path/unbound-conf/keys2/1.cert
-
-# CacheDB
-# Enable external backend DB as auxiliary cache.  Specify the backend name
-# (default is "testframe", which has no use other than for debugging and
-# testing) and backend-specific options.  The 'cachedb' module must be
-# included in module-config.
-# cachedb:
-#     backend: "testframe"
-#     # secret seed string to calculate hashed keys
-#     secret-seed: "default"
@@ -81,7 +81,7 @@ o Too many Features.

 5. Choices
 ----------
-o rfc2181 discourages duplicates RRs in RRsets. unbound does not create
+o rfc2181 decourages duplicates RRs in RRsets. unbound does not create
  duplicates, but when presented with duplicates on the wire from the
  authoritative servers, does not perform duplicate removal.
  It does do some rrsig duplicate removal, in the msgparser, for dnssec qtype
@@ -337,19 +337,6 @@ number of queries that were successfully answered using a cache lookup
 .I threadX.num.cachemiss
 number of queries that needed recursive processing
 .TP
-.I threadX.num.dnscrypt.crypted
-number of queries that were encrypted and successfully decapsulated by dnscrypt.
-.TP
-.I threadX.num.dnscrypt.cert
-number of queries that were requesting dnscrypt certificates.
-.TP
-.I threadX.num.dnscrypt.cleartext
-number of queries received on dnscrypt port that were cleartext and not a
-request for certificates.
-.TP
-.I threadX.num.dnscrypt.malformed
-number of request that were neither cleartext, not valid dnscrypt messages.
-.TP
 .I threadX.num.prefetch
 number of cache prefetches performed.  This number is included in
 cachehits, as the original query had the unprefetched answer from cache,
@@ -406,18 +393,6 @@ summed over threads.
 .I total.num.cachemiss
 summed over threads.
 .TP
-.I total.num.dnscrypt.crypted
-summed over threads.
-.TP
-.I total.num.dnscrypt.cert
-summed over threads.
-.TP
-.I total.num.dnscrypt.cleartext
-summed over threads.
-.TP
-.I total.num.dnscrypt.malformed
-summed over threads.
-.TP
 .I total.num.prefetch
 summed over threads.
 .TP
@@ -464,12 +439,6 @@ Memory in bytes in use by the RRset cache.
 .I mem.cache.message
 Memory in bytes in use by the message cache.
 .TP
-.I mem.cache.dnscrypt_shared_secret
-Memory in bytes in use by the dnscrypt shared secrets cache.
-.TP
-.I mem.cache.dnscrypt_nonce
-Memory in bytes in use by the dnscrypt nonce cache.
-.TP
 .I mem.mod.iterator
 Memory in bytes in use by the iterator module.
 .TP
@@ -524,18 +493,6 @@ number of queries that had an EDNS OPT record present.
 number of queries that had an EDNS OPT record with the DO (DNSSEC OK) bit set.
 These queries are also included in the num.query.edns.present number.
 .TP
-.I num.query.ratelimited
-The number of queries that are turned away from being send to nameserver due to
-ratelimiting.
-.TP
-.I num.query.dnscrypt.shared_secret.cachemiss
-The number of dnscrypt queries that did not find a shared secret in the cache.
-The can be use to compute the shared secret hitrate.
-.TP
-.I num.query.dnscrypt.replay
-The number of dnscrypt queries that found a nonce hit in the nonce cache and
-hence are considered a query replay.
-.TP
 .I num.answer.rcode.NXDOMAIN
 The number of answers to queries, from cache or from recursion, that had the
 return code NXDOMAIN. Also printed for the other return codes.
@@ -585,19 +542,6 @@ timing and protocol support information.
 .I key.cache.count
 The number of items in the key cache.  These are DNSSEC keys, one item
 per delegation point, and their validation status.
-.TP
-.I dnscrypt_shared_secret.cache.count
-The number of items in the shared secret cache. These are precomputed shared
-secrets for a given client public key/server secret key pair. Shared secrets
-are CPU intensive and this cache allows unbound to avoid recomputing the
-shared secret when multiple dnscrypt queries are sent from the same client.
-.TP
-.I dnscrypt_nonce.cache.count
-The number of items in the client nonce cache. This cache is used to prevent
-dnscrypt queries replay. The client nonce must be unique for each client public
-key/server secret key pair. This cache should be able to host QPS * `replay
-window` interval keys to prevent replay of a query during `replay window`
-seconds.
 .SH "FILES"
 .TP
 .I @ub_conf_file@
@@ -14,7 +14,6 @@
 .B unbound
 .RB [ \-h ]
 .RB [ \-d ]
-.RB [ \-p ]
 .RB [ \-v ]
 .RB [ \-c
 .IR cfgfile ]
@@ -68,11 +67,6 @@ the thread\-spawn time, so that most config and setup errors appear on
 stderr. If given twice or more, logging does not switch to the log file
 or to syslog, but the log messages are printed to stderr all the time.
 .TP
-.B \-p
-Don't use a pidfile.  This argument should only be used by supervision
-systems which can ensure that only one instance of unbound will run
-concurrently.
-.TP
 .B \-v
 Increase verbosity. If given multiple times, more information is logged.
 This is in addition to the verbosity (if any) from the config file.
@@ -197,7 +197,7 @@ This is the value put into datagrams over UDP towards peers.  The actual
 buffer size is determined by msg\-buffer\-size (both for TCP and UDP).  Do
 not set higher than that value.  Default is 4096 which is RFC recommended.
 If you have fragmentation reassembly problems, usually seen as timeouts,
-then a value of 1472 can fix it.  Setting to 512 bypasses even the most
+then a value of 1480 can fix it.  Setting to 512 bypasses even the most
 stringent path MTU problems, but is seen as extreme, since the amount
 of TCP fallback generated is excessive (probably also for this resolver,
 consider tuning the outgoing tcp number).
@@ -391,11 +391,6 @@ negotiation between Unbound and other servers.
 Enable or disable whether the upstream queries use TCP only for transport.
 Default is no.  Useful in tunneling scenarios.
 .TP
-.B udp\-upstream\-without\-downstream: \fI<yes or no>
-Enable udp upstream even if do-udp is no.  Default is no, and this does not
-change anything.  Useful for TLS service providers, that want no udp downstream
-but use udp to fetch data upstream.
-.TP
 .B ssl\-upstream: \fI<yes or no>
 Enabled or disable whether the upstream queries use SSL only for transport.
 Default is no.  Useful in tunneling scenarios.  The SSL contains plain DNS in
@@ -812,7 +807,7 @@ It is possible to use wildcards with this statement, the wildcard is
 expanded on start and on reload.
 .TP
 .B trust\-anchor\-signaling: \fI<yes or no>
-Send RFC8145 key tag query after trust anchor priming. Default is on.
+Send RFC8145 key tag query after trust anchor priming. Default is off.
 .TP
 .B dlv\-anchor\-file: \fI<filename>
 This option was used during early days DNSSEC deployment when no parent-side
@@ -1053,19 +1048,19 @@ has no other effect than turning off default contents for the
 given zone.  Use \fInodefault\fR if you use exactly that zone, if you want to
 use a subzone, use \fItransparent\fR.
 .P
-The default zones are localhost, reverse 127.0.0.1 and ::1, the onion, test,
-invalid and the AS112 zones. The AS112 zones are reverse DNS zones for
-private use and reserved IP addresses for which the servers on the internet
-cannot provide correct answers. They are configured by default to give
-nxdomain (no reverse information) answers. The defaults can be turned off
-by specifying your own local\-zone of that name, or using the 'nodefault'
-type. Below is a list of the default zone contents.
+The default zones are localhost, reverse 127.0.0.1 and ::1, the onion and
+the AS112 zones. The AS112 zones are reverse DNS zones for private use and
+reserved IP addresses for which the servers on the internet cannot provide
+correct answers. They are configured by default to give nxdomain (no reverse
+information) answers. The defaults can be turned off by specifying your
+own local\-zone of that name, or using the 'nodefault' type. Below is a
+list of the default zone contents.
 .TP 10
 \h'5'\fIlocalhost\fR
 The IP4 and IP6 localhost information is given. NS and SOA records are provided
 for completeness and to satisfy some DNS update tools. Default content:
 .nf
-local\-zone: "localhost." redirect
+local\-zone: "localhost." static
 local\-data: "localhost. 10800 IN NS localhost."
 local\-data: "localhost. 10800 IN
    SOA localhost. nobody.invalid. 1 3600 1200 604800 10800"
@@ -1109,24 +1104,6 @@ local\-data: "onion. 10800 IN
    SOA localhost. nobody.invalid. 1 3600 1200 604800 10800"
 .fi
 .TP 10
-\h'5'\fItest (RFC 7686)\fR
-Default content:
-.nf
-local\-zone: "test." static
-local\-data: "test. 10800 IN NS localhost."
-local\-data: "test. 10800 IN
-    SOA localhost. nobody.invalid. 1 3600 1200 604800 10800"
-.fi
-.TP 10
-\h'5'\fIinvalid (RFC 7686)\fR
-Default content:
-.nf
-local\-zone: "invalid." static
-local\-data: "invalid. 10800 IN NS localhost."
-local\-data: "invalid. 10800 IN
-    SOA localhost. nobody.invalid. 1 3600 1200 604800 10800"
-.fi
-.TP 10
 \h'5'\fIreverse RFC1918 local use zones\fR
 Reverse data for zones 10.in\-addr.arpa, 16.172.in\-addr.arpa to
 31.172.in\-addr.arpa, 168.192.in\-addr.arpa.
@@ -1484,7 +1461,7 @@ despite the presence of actual AAAA records.
 .LP
 The
 .B dnscrypt:
-clause gives the settings of the dnscrypt channel. While those options are
+clause give the settings of the dnscrypt channel. While those options are
 available, they are only meaningful if unbound was compiled with
 \fB\-\-enable\-dnscrypt\fR.
 Currently certificate and secret/public keys cannot be generated by unbound.
@@ -1512,28 +1489,6 @@ times.
 .B dnscrypt\-provider\-cert: \fI<path to cert file>\fR
 Path to the certificate related to the \fBdnscrypt\-secret\-key\fRs.
 This option may be specified multiple times.
-.TP
-.B dnscrypt\-shared\-secret\-cache\-size: \fI<memory size>
-Give the size of the data structure in which the shared secret keys are kept
-in.  Default 4m.  In bytes or use m(mega), k(kilo), g(giga).
-The shared secret cache is used when a same client is making multiple queries
-using the same public key. It saves a substantial amount of CPU.
-.TP
-.B dnscrypt\-shared\-secret\-cache\-slabs: \fI<number>
-Give power of 2 number of slabs, this is used to reduce lock contention
-in the dnscrypt shared secrets cache.  Close to the number of cpus is
-a fairly good setting.
-.TP
-.B dnscrypt\-nonce\-cache\-size: \fI<memory size>
-Give the size of the data structure in which the client nonces are kept in.
-Default 4m. In bytes or use m(mega), k(kilo), g(giga).
-The nonce cache is used to prevent dnscrypt message replaying. Client nonce
-should be unique for any pair of client pk/server sk.
-.TP
-.B dnscrypt\-nonce\-cache\-slabs: \fI<number>
-Give power of 2 number of slabs, this is used to reduce lock contention
-in the dnscrypt nonce cache.  Close to the number of cpus is
-a fairly good setting.
 .SS "EDNS Client Subnet Module Options"
 .LP
 The ECS module must be configured in the \fBmodule\-config:\fR "subnetcache
@@ -1547,7 +1502,7 @@ specialized cache. If the authority indicated no support, the response is
 stored in the regular cache.
 .LP
 Additionally, when a client includes the option in its queries, Unbound will
-forward the option to the authority if present in the whitelist, or
+forward the option to the authority if prensent in the whitelist, or
 \fBclient\-subnet\-always\-forward\fR is set to yes. In this case the lookup in
 the regular cache is skipped.
 .LP
@@ -1648,37 +1603,6 @@ A/AAAA query will be SERVFAIL.  Mainly used for testing.  Defaults to no.
 Whitelist the domain so that the module logic will be executed.  Can
 be given multiple times, for different domains.  If the option is not
 specified, all domains are treated as being whitelisted (default).
-.SS "Cache DB Module Options"
-.LP
-The Cache DB module must be configured in the \fBmodule\-config:\fR
-"validator cachedb iterator" directive and be compiled into the daemon
-with \fB\-\-enable\-cachedb\fR.
-If this module is enabled and configured, the specified backend database
-works as a second level cache:
-When Unbound cannot find an answer to a query in its built-in in-memory
-cache, it consults the specified backend.
-If it finds a valid answer in the backend, Unbound uses it to respond
-to the query without performing iterative DNS resolution.
-If Unbound cannot even find an answer in the backend, it resolves the
-query as usual, and stores the answer in the backend.
-The
-.B cachedb:
-clause gives custom settings of the cache DB module.
-.TP
-.B backend: \fI<backend name>\fR
-Specify the backend database name.
-Currently, only the in-memory "testframe" backend is supported.
-As the name suggests this backend is not of any practical use.
-This option defaults to "testframe".
-.TP
-.B secret-seed: \fI<"secret string">\fR
-Specify a seed to calculate a hash value from query information.
-This value will be used as the key of the corresponding answer for the
-backend database and can be customized if the hash should not be predictable
-operationally.
-If the backend database is shared by multiple Unbound instances,
-all instances must use the same secret seed.
-This option defaults to "default".
 .SH "MEMORY CONTROL EXAMPLE"
 In the example config settings below memory usage is reduced. Some service
 levels are lower, notable very large data and a high TCP load are no longer
@@ -108,7 +108,7 @@ struct addrnode {
 struct addredge {
 	/** address of connected node */
 	addrkey_t *str;
-	/** length in bits of str */
+	/** lenght in bits of str */
 	addrlen_t len;
 	/** child node this edge is connected to */
 	struct addrnode *node;
@@ -532,7 +532,7 @@ parse_subnet_option(struct edns_option* ecs_option, struct ecs_data* ecs)
 	ecs->subnet_addr_fam = sldns_read_uint16(ecs_option->opt_data);
 	ecs->subnet_source_mask = ecs_option->opt_data[2];
 	ecs->subnet_scope_mask = ecs_option->opt_data[3];
-	/* remaining bytes indicate address */
+	/* remaing bytes indicate address */
 	
 	/* validate input*/
 	/* option length matches calculated length? */
@@ -602,7 +602,7 @@ ecs_query_response(struct module_qstate* qstate, struct dns_msg* response,

 	if(sq->subnet_sent &&
 		FLAGS_GET_RCODE(response->rep->flags) == LDNS_RCODE_REFUSED) {
-		/* REFUSED response to ECS query, remove ECS option. */
+		/* REFUSED reponse to ECS query, remove ECS option. */
 		edns_opt_list_remove(&qstate->edns_opts_back_out,
 			qstate->env->cfg->client_subnet_opcode);
 		sq->subnet_sent = 0;
@@ -628,7 +628,7 @@ ecs_edns_back_parsed(struct module_qstate* qstate, int id,
 			sq->ecs_server_in.subnet_validdata)
 			/* Only skip global cache store if we sent an ECS option
 			 * and received one back. Answers from non-whitelisted
-			 * servers will end up in global cache. Answers for
+			 * servers will end up in global cache. Ansers for
 			 * queries with 0 source will not (unless nameserver
 			 * does not support ECS). */
 			qstate->no_cache_store = 1;
@@ -722,7 +722,6 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 		sq->ecs_server_out.subnet_scope_mask = 0;
 		sq->ecs_server_out.subnet_validdata = 1;
 		if(sq->ecs_server_out.subnet_source_mask != 0 &&
-			qstate->env->cfg->client_subnet_always_forward &&
 			sq->subnet_downstream)
 			/* ECS specific data required, do not look at the global
 			 * cache in other modules. */
@@ -119,7 +119,7 @@ int ecs_whitelist_check(struct query_info* qinfo, uint16_t flags,
 	socklen_t addrlen, uint8_t* zone, size_t zonelen,
 	struct regional* region, int id, void* cbargs);

-/** Check whether response from server contains ECS record, if so, skip cache
+/** Check whether reponse from server contains ECS record, if so, skip cache
 * store. Called just after parsing EDNS data from server. */
 int ecs_edns_back_parsed(struct module_qstate* qstate, int id, void* cbargs);

@@ -252,7 +252,7 @@ void caps_strip_reply(struct reply_info* rep);
 int caps_failed_rcode(struct reply_info* rep);

 /**
- * Store parent-side rrset in separate rrset cache entries for later 
+ * Store parent-side rrset in seperate rrset cache entries for later 
 * last-resort * lookups in case the child-side versions of this information 
 * fails.
 * @param env: environment with cache, time, ...
@@ -36,7 +36,7 @@
 /**
 * \file
 *
- * This file contains a module that performs recursive iterative DNS query
+ * This file contains a module that performs recusive iterative DNS query
 * processing.
 */

@@ -78,12 +78,6 @@ iter_init(struct module_env* env, int id)
 		return 0;
 	}
 	env->modinfo[id] = (void*)iter_env;
-
-	lock_basic_init(&iter_env->queries_ratelimit_lock);
-	lock_protect(&iter_env->queries_ratelimit_lock,
-			&iter_env->num_queries_ratelimited,
-		sizeof(iter_env->num_queries_ratelimited));
-
 	if(!iter_apply_cfg(iter_env, env->cfg)) {
 		log_err("iterator: could not apply configuration settings.");
 		return 0;
@@ -109,7 +103,6 @@ iter_deinit(struct module_env* env, int id)
 	if(!env || !env->modinfo[id])
 		return;
 	iter_env = (struct iter_env*)env->modinfo[id];
-	lock_basic_destroy(&iter_env->queries_ratelimit_lock);
 	free(iter_env->target_fetch_policy);
 	priv_delete(iter_env->priv);
 	donotq_delete(iter_env->donotq);
@@ -833,7 +826,7 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,

 /**
 * Generate A and AAAA checks for glue that is in-zone for the referral
- * we just got to obtain authoritative information on the addresses.
+ * we just got to obtain authoritative information on the adresses.
 *
 * @param qstate: the qtstate that triggered the need to prime.
 * @param iq: iterator query state.
@@ -1283,9 +1276,6 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 					"delegation point", iq->dp->name,
 					LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN);
 			} else {
-				lock_basic_lock(&ie->queries_ratelimit_lock);
-				ie->num_queries_ratelimited++;
-				lock_basic_unlock(&ie->queries_ratelimit_lock);
 				log_nametypeclass(VERB_ALGO, "ratelimit exceeded with "
 					"delegation point", iq->dp->name,
 					LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN);
@@ -1353,7 +1343,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
 * the same init processing as ones that do not. Request events that reach
 * this state must have a valid currentDelegationPoint set.
 *
- * This part is primarily handling stub zone priming. Events that reach this
+ * This part is primarly handling stub zone priming. Events that reach this
 * state must have a current delegation point.
 *
 * @param qstate: query state.
@@ -2074,9 +2064,6 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 	if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok) {
 		if(!infra_ratelimit_inc(qstate->env->infra_cache, iq->dp->name,
 			iq->dp->namelen, *qstate->env->now)) {
-			lock_basic_lock(&ie->queries_ratelimit_lock);
-			ie->num_queries_ratelimited++;
-			lock_basic_unlock(&ie->queries_ratelimit_lock);
 			verbose(VERB_ALGO, "query exceeded ratelimits");
 			return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 		}
@@ -2169,6 +2156,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		}
 	}
 	if(iq->minimisation_state == SKIP_MINIMISE_STATE) {
+		iq->minimise_timeout_count++;
 		if(iq->minimise_timeout_count < MAX_MINIMISE_TIMEOUT_COUNT)
 			/* Do not increment qname, continue incrementing next 
 			 * iteration */
@@ -2209,8 +2197,6 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok)
 		    infra_ratelimit_dec(qstate->env->infra_cache, iq->dp->name,
 			iq->dp->namelen, *qstate->env->now);
-		if(qstate->env->cfg->qname_minimisation)
-			iq->minimisation_state = SKIP_MINIMISE_STATE;
 		return next_state(iq, QUERYTARGETS_STATE);
 	}
 	outbound_list_insert(&iq->outlist, outq);
@@ -2260,10 +2246,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,

 	if(iq->response == NULL) {
 		/* Don't increment qname when QNAME minimisation is enabled */
-		if(qstate->env->cfg->qname_minimisation) {
-			iq->minimise_timeout_count++;
+		if(qstate->env->cfg->qname_minimisation)
 			iq->minimisation_state = SKIP_MINIMISE_STATE;
-		}
 		iq->chase_to_rd = 0;
 		iq->dnssec_lame_query = 0;
 		verbose(VERB_ALGO, "query response was timeout");
@@ -2396,7 +2380,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			if(FLAGS_GET_RCODE(iq->response->rep->flags) ==
 				LDNS_RCODE_NXDOMAIN) {
 				/* Stop resolving when NXDOMAIN is DNSSEC
-				 * signed. Based on assumption that nameservers
+				 * signed. Based on assumption that namservers
 				 * serving signed zones do not return NXDOMAIN
 				 * for empty-non-terminals. */
 				if(iq->dnssec_expected)
@@ -2753,7 +2737,7 @@ processPrimeResponse(struct module_qstate* qstate, int id)
 /** 
 * Do final processing on responses to target queries. Events reach this
 * state after the iterative resolution algorithm terminates. This state is
- * responsible for reactivating the original event, and housekeeping related
+ * responsible for reactiving the original event, and housekeeping related
 * to received target responses (caching, updating the current delegation
 * point, etc).
 * Callback from walk_supers for every super state that is interested in 
@@ -3096,7 +3080,7 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq,
 }

 /*
- * Return priming query results to interested super querystates.
+ * Return priming query results to interestes super querystates.
 * 
 * Sets the delegation point and delegation message (not nonRD queries).
 * This is a callback from walk_supers.
@@ -36,7 +36,7 @@
 /**
 * \file
 *
- * This file contains a module that performs recursive iterative DNS query
+ * This file contains a module that performs recusive iterative DNS query
 * processing.
 */

@@ -62,7 +62,7 @@ struct rbtree_type;
 /** max number of queries-sent-out.  Make sure large NS set does not loop */
 #define MAX_SENT_COUNT		32
 /** max number of queries for which to perform dnsseclameness detection,
- * (rrsigs missing detection) after that, just pick up that response */
+ * (rrsigs misssing detection) after that, just pick up that response */
 #define DNSSEC_LAME_DETECT_COUNT 4
 /**
 * max number of QNAME minimisation iterations. Limits number of queries for
@@ -130,10 +130,8 @@ struct iter_env {
 	 */
 	int* target_fetch_policy;

-	/** lock on ratelimit counter */
-	lock_basic_type queries_ratelimit_lock;
-	/** number of queries that have been ratelimited */
-	size_t num_queries_ratelimited;
+	/** ip6.arpa dname in wireformat, used for qname-minimisation */
+	uint8_t* ip6arpa_dname;
 };

 /**
@@ -142,11 +140,11 @@ struct iter_env {
 enum minimisation_state {
 	/**
 	 * (Re)start minimisation. Outgoing QNAME should be set to dp->name.
-	 * State entered on new query or after following referral or CNAME.
+	 * State entered on new query or after following refferal or CNAME.
 	 */
 	INIT_MINIMISE_STATE = 0,
 	/**
-	 * QNAME minimisation ongoing. Increase QNAME on every iteration.
+	 * QNAME minimisataion ongoing. Increase QNAME on every iteration.
 	 */
 	MINIMISE_STATE,
 	/**
@@ -184,7 +182,7 @@ enum iter_state {
 	/**
 	 * Each time a delegation point changes for a given query or a 
 	 * query times out and/or wakes up, this state is (re)visited. 
-	 * This state is responsible for iterating through a list of 
+	 * This state is reponsible for iterating through a list of 
 	 * nameserver targets.
 	 */
 	QUERYTARGETS_STATE,
@@ -378,7 +376,7 @@ struct iter_qstate {
 	struct query_info qinfo_out;

 	/**
-	 * Count number of QNAME minimisation iterations. Used to limit number of
+	 * Count number of QNAME minisation iterations. Used to limit number of
 	 * outgoing queries when QNAME minimisation is enabled.
 	 */
 	int minimise_count;
@@ -430,7 +428,7 @@ void iter_operate(struct module_qstate* qstate, enum module_ev event, int id,
 	struct outbound_entry* outbound);

 /**
- * Return priming query results to interested super querystates.
+ * Return priming query results to interestes super querystates.
 * 
 * Sets the delegation point and delegation message (not nonRD queries).
 * This is a callback from walk_supers.
@@ -90,7 +90,7 @@ struct ub_ctx {
 	int dothread;
 	/** next thread number for new threads */
 	int thr_next_num;
-	/** if logfile is overridden */
+	/** if logfile is overriden */
 	int logfile_override;
 	/** what logfile to use instead */
 	FILE* log_out;
@@ -37,7 +37,7 @@
 * \file
 *
 * This file contains functions to resolve DNS queries and 
- * validate the answers. Synchronously and asynchronously.
+ * validate the answers. Synchonously and asynchronously.
 *
 */

@@ -232,8 +232,8 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 		cfg->do_tcp?cfg->outgoing_num_tcp:0,
 		w->env->infra_cache, w->env->rnd, cfg->use_caps_bits_for_id,
 		ports, numports, cfg->unwanted_threshold,
-		cfg->outgoing_tcp_mss, &libworker_alloc_cleanup, w,
-		cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx,
+		cfg->outgoing_tcp_mss,
+		&libworker_alloc_cleanup, w, cfg->do_udp, w->sslctx,
 		cfg->delay_close, NULL);
 	if(!w->is_bg || w->is_bg_thread) {
 		lock_basic_unlock(&ctx->cfglock);
@@ -251,7 +251,6 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 	w->env->send_query = &libworker_send_query;
 	w->env->detach_subs = &mesh_detach_subs;
 	w->env->attach_sub = &mesh_attach_sub;
-	w->env->add_sub = &mesh_add_sub;
 	w->env->kill_sub = &mesh_state_delete;
 	w->env->detect_cycle = &mesh_detect_cycle;
 	comm_base_timept(w->base, &w->env->now, &w->env->now_tv);
@@ -295,7 +294,6 @@ libworker_do_cmd(struct libworker* w, uint8_t* msg, uint32_t len)
 			log_err("unknown command for bg worker %d", 
 				(int)context_serial_getcmd(msg, len));
 			/* and fall through to quit */
-			/* fallthrough */
 		case UB_LIBCMD_QUIT:
 			free(msg);
 			comm_base_exit(w->base);
@@ -751,7 +749,7 @@ libworker_bg_done_cb(void* arg, int rcode, sldns_buffer* buf, enum sec_status s,
 {
 	struct ctx_query* q = (struct ctx_query*)arg;

-	if(q->cancelled || q->w->back->want_to_quit) {
+	if(q->cancelled) {
 		if(q->w->is_bg_thread) {
 			/* delete it now */
 			struct ub_ctx* ctx = q->w->ctx;
@@ -23,7 +23,7 @@ IDN converted attributes
 The :class:`unbound.ub_data` class contains attributes suffix which converts
 the dname to UTF string. These attributes have the ``_idn`` suffix.

-Apart from this approach, two conversion functions exist
+Apart from this aproach, two conversion functions exist
 (:func:`unbound.idn2dname` and :func:`unbound.dname2idn`).

 Source code
@@ -37,7 +37,7 @@
 * \file
 *
 * This file contains functions to resolve DNS queries and 
- * validate the answers. Synchronously and asynchronously.
+ * validate the answers. Synchonously and asynchronously.
 *
 * Several ways to use this interface from an application wishing
 * to perform (validated) DNS lookups.
@@ -177,7 +177,7 @@ struct ub_result {
 	 * False, if validation failed or domain queried has no security info.
 	 *
 	 * It is possible to get a result with no data (havedata is false),
-	 * and secure is true. This means that the non-existence of the data
+	 * and secure is true. This means that the non-existance of the data
 	 * was cryptographically proven (with signatures).
 	 */
 	int secure;
@@ -622,8 +622,6 @@ struct ub_shm_stat_info {
 		long long subnet;
 		long long ipsecmod;
 		long long respip;
-		long long dnscrypt_shared_secret;
-		long long dnscrypt_nonce;
 	} mem;
 };

@@ -706,8 +704,6 @@ struct ub_server_stats {
 	long long ans_bogus;
 	/** rrsets marked bogus by validator */
 	long long rrset_bogus;
-	/** number of queries that have been ratelimited by domain recursion. */
-	long long queries_ratelimited;
 	/** unwanted traffic received on server-facing ports */
 	long long unwanted_replies;
 	/** unwanted traffic received on client-facing ports */
@@ -739,19 +735,11 @@ struct ub_server_stats {
 	long long num_query_dnscrypt_cleartext;
 	/** number of malformed encrypted queries */
 	long long num_query_dnscrypt_crypted_malformed;
-	/** number of queries which did not have a shared secret in cache */
-	long long num_query_dnscrypt_secret_missed_cache;
-	/** number of dnscrypt shared secret cache entries */
-	long long shared_secret_cache_count;
-	/** number of queries which are replays */
-	long long num_query_dnscrypt_replay;
-	/** number of dnscrypt nonces cache entries */
-	long long nonce_cache_count;
 };

 /** 
 * Statistics to send over the control pipe when asked
- * This struct is made to be memcopied, sent in binary.
+ * This struct is made to be memcpied, sent in binary.
 * shm mapped with (number+1) at num_threads+1, with first as total
 */
 struct ub_stats_info {
@@ -254,12 +254,12 @@ if [ "$DOWIN" = "yes" ]; then
 		# cross-compilation and it is not used anyway
 		# before 1.0.1i need --cross-compile-prefix=i686-w64-mingw32-
 		if test "$mw64" = "mingw64"; then
-			sslflags="no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64"
+			sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw64"
 		else
-			sslflags="no-shared no-asm -DOPENSSL_NO_CAPIENG mingw"
+			sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw"
 		fi
 		info "winssl: Configure $sslflags"
-		CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
+		CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib ./Configure --prefix="$sslinstall" $sslflags || error_cleanup "OpenSSL Configure failed"
 		info "winssl: make"
 		make || error_cleanup "OpenSSL crosscompile failed"
 		# only install sw not docs, which take a long time.
@@ -279,8 +279,8 @@ if [ "$DOWIN" = "yes" ]; then
 		$configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib"  || error_cleanup "libexpat configure failed"
 		#info "wxp: make"
 		#make || error_cleanup "libexpat crosscompile failed"
-		info "wxp: make install"
-		make install || error_cleanup "libexpat install failed"
+		info "wxp: make installlib"
+		make installlib || error_cleanup "libexpat install failed"
 		cross_flag="$cross_flag --with-libexpat=$wxpinstall"
 		cd ..
 	fi
@@ -24,7 +24,7 @@ def operate(id, event, qstate, qdata):

   if event == MODULE_EVENT_PASS:
      log_info("pythonmod: event_pass")
-      qstate.ext_state[id] = MODULE_WAIT_MODULE 
+      qstate.ext_state[id] = MODULE_ERROR 
      return True

   log_err("pythonmod: BAD event")
@@ -109,7 +109,7 @@ Script file must contain four compulsory functions:
         return True

      if event == MODULE_EVENT_PASS:
-         qstate.ext_state[id] = MODULE_WAIT_MODULE 
+         qstate.ext_state[id] = MODULE_ERROR 
         return True

      log_err("pythonmod: BAD event")
@@ -46,4 +46,4 @@ Dig produces the following output::
    ;; MSG SIZE  rcvd: 54

 As we handle (override) in the python module only queries ending with
-``localdomain.``, unbound can still resolve host names.
+``localdomain.``, unboud can still resolve host names.
@@ -10,7 +10,7 @@ As soon as the iterator module returns the response, we :
 3. rewrite the data in cache
 4. return modified packet

-Note that the steps 1 and 3 are necessary only in case, the python module is the first module in the processing chain.
+Note that the steps 1 and 3 are neccessary only in case, the python module is the first module in the processing chain.
 In other cases, the validator module guarantees updating data which are produced by iterator module.

 Complete source code
@@ -3,7 +3,7 @@ EDNS options

 This example shows how to interact with EDNS options.

-When querying unbound with the EDNS option ``65001`` and data ``0xc001`` we
+When quering unbound with the EDNS option ``65001`` and data ``0xc001`` we
 expect an answer with the same EDNS option code and data ``0xdeadbeef``.


@@ -146,7 +146,7 @@ and use a valid script path::

    python-script: "./examples/edns.py"

-Querying with EDNS option ``65001:0xc001``:
+Quering with EDNS option ``65001:0xc001``:

 ::

@@ -84,7 +84,7 @@ The callback function's prototype is the following:
        :param rep: reply_info struct;
        :param rcode: return code for the query;
        :param edns: edns_data sent from the client side. The list with the EDNS
-                     options is accessible through edns.opt_list. It SHOULD NOT be
+                     options is accesible through edns.opt_list. It SHOULD NOT be
                     altered;
        :param opt_list_out: the list with the EDNS options that will be sent as a
                             reply. It can be populated with EDNS options;
@@ -120,7 +120,7 @@ The callback function's prototype is the following:
        :param rep: reply_info struct;
        :param rcode: return code for the query;
        :param edns: edns_data sent from the client side. The list with the
-                     EDNS options is accessible through edns.opt_list. It
+                     EDNS options is accesible through edns.opt_list. It
                     SHOULD NOT be altered;
        :param opt_list_out: the list with the EDNS options that will be sent as a
                             reply. It can be populated with EDNS options;
@@ -24,7 +24,7 @@ Cache
   :param qstate: :class:`module_qstate`
   :param qinfo: :class:`query_info`
   :param msgrep: :class:`reply_info`
-   :param is_referral: integer
+   :param is_referal: integer
   :rtype: boolean

 .. function:: invalidateQueryInCache(qstate, qinfo)
@@ -108,7 +108,7 @@ query_info
   
   .. attribute:: qname_len
   
-      Length of question name (number of bytes).
+      Lenght of question name (number of bytes).
 	
   .. attribute:: qname_list[]
   
@@ -25,7 +25,7 @@ Controled by secured queries secured with private key.

 Dynamic translation service
 ---------------------------
-DNS request can be translated to virtually any answer, that's easy to implement in client side
+DNS request can be translated to virtualy any answer, that's easy to implement in client side
 because of many DNS libraries available.

 Examples :
@@ -77,7 +77,7 @@ def init_standard(id, env):
    The function's signature is the same as the C counterpart and allows for
    extra functionality during init.
    ..note:: This function is preferred by unbound over the old init function.
-    ..note:: The previously accessible configuration options can now be found in
+    ..note:: The previously accesible configuration options can now be found in
             env.cgf.
    """
    log_info("python: inited script {}".format(env.cfg.python_script))
@@ -94,7 +94,7 @@ def init(id, cfg):
    """Previous version init function.
    ..note:: This function is still supported for backwards compatibility when
             the init_standard function is missing. When init_standard is
-             present this function SHOULD be omitted to avoid confusion to the
+             present this function SHOULD be ommited to avoid confusion to the
             reader.
    """
    return True
@@ -99,7 +99,7 @@ def inplace_cache_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
    :param rep: reply_info struct;
    :param rcode: return code for the query;
    :param edns: edns_data sent from the client side. The list with the EDNS
-                 options is accessible through edns.opt_list. It SHOULD NOT be
+                 options is accesible through edns.opt_list. It SHOULD NOT be
                 altered;
    :param opt_list_out: the list with the EDNS options that will be sent as a
                         reply. It can be populated with EDNS options;
@@ -107,7 +107,7 @@ def inplace_cache_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
                   want to append a new option to opt_list_out.
    :return: True on success, False on failure.

-    For demonstration purposes we want to see if EDNS option 65002 is present
+    For demostration purposes we want to see if EDNS option 65002 is present
    and reply with a new value.
    """
    log_info("python: called back while answering from cache.")
@@ -142,7 +142,7 @@ def inplace_local_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
    :param rep: reply_info struct;
    :param rcode: return code for the query;
    :param edns: edns_data sent from the client side. The list with the
-                 EDNS options is accessible through edns.opt_list. It
+                 EDNS options is accesible through edns.opt_list. It
                 SHOULD NOT be altered;
    :param opt_list_out: the list with the EDNS options that will be sent as a
                         reply. It can be populated with EDNS options;
@@ -173,7 +173,7 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
                   want to append a new option to opt_list_out.
    :return: True on success, False on failure.

-    For demonstration purposes we want to reply with an empty EDNS code '65003'.
+    For demostration purposes we want to reply with an empty EDNS code '65003'.
    """
    log_info("python: called back while servfail.")
    b = bytearray.fromhex("")
@@ -186,7 +186,7 @@ def init_standard(id, env):
    The function's signature is the same as the C counterpart and allows for
    extra functionality during init.
    ..note:: This function is preferred by unbound over the old init function.
-    ..note:: The previously accessible configuration options can now be found in
+    ..note:: The previously accesible configuration options can now be found in
             env.cgf.
    """
    log_info("python: inited script {}".format(env.cfg.python_script))
@@ -218,7 +218,7 @@ def init(id, cfg):
    """Previous version init function.
    ..note:: This function is still supported for backwards compatibility when
             the init_standard function is missing. When init_standard is
-             present this function SHOULD be omitted to avoid confusion to the
+             present this function SHOULD be ommited to avoid confusion to the
             reader.
    """
    return True
@@ -1277,7 +1277,7 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n
   Functions
 * ************************************************************************************ */
 /******************************
- * Various debugging functions *
+ * Various debuging functions *
 ******************************/
 void verbose(enum verbosity_value level, const char* format, ...);
 void log_info(const char* format, ...);
@@ -628,7 +628,7 @@ rrset_add_rr(struct auth_rrset* rrset, uint32_t rr_ttl, uint8_t* rdata,
 		d->rr_len[d->count-1] = rdatalen;
 	else	d->rr_len[total-1] = rdatalen;
 	packed_rrset_ptr_fixup(d);
-	if((time_t)rr_ttl < d->ttl)
+	if(rr_ttl < d->ttl)
 		d->ttl = rr_ttl;

 	/* copy old values into new array */
@@ -99,9 +99,6 @@ store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
 				}
 			}
 			/* no break: also copy key item */
-			/* the line below is matched by gcc regex and silences
-			 * the fallthrough warning */
-			/* fallthrough */
 		case 1: /* ref updated, item inserted */
                        rep->rrsets[i] = rep->ref[i].key;
 		}
@@ -111,7 +108,7 @@ store_rrsets(struct module_env* env, struct reply_info* rep, time_t now,
 void 
 dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
 	hashvalue_type hash, struct reply_info* rep, time_t leeway, int pside,
-	struct reply_info* qrep, uint32_t flags, struct regional* region)
+	struct reply_info* qrep, struct regional* region)
 {
 	struct msgreply_entry* e;
 	time_t ttl = rep->ttl;
@@ -127,7 +124,7 @@ dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
 	 * unnecessary, because the cache gets locked per rrset. */
 	reply_info_set_ttls(rep, *env->now);
 	store_rrsets(env, rep, *env->now, leeway, pside, qrep, region);
-	if(ttl == 0 && !(flags & DNSCACHE_STORE_ZEROTTL)) {
+	if(ttl == 0) {
 		/* we do not store the message, but we did store the RRs,
 		 * which could be useful for delegation information */
 		verbose(VERB_ALGO, "TTL 0: dropped msg from cache");
@@ -845,7 +842,7 @@ dns_cache_lookup(struct module_env* env,
 int 
 dns_cache_store(struct module_env* env, struct query_info* msgqinf,
        struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
-	struct regional* region, uint32_t flags)
+	struct regional* region, uint16_t flags)
 {
 	struct reply_info* rep = NULL;
 	/* alloc, malloc properly (not in region, like msg is) */
@@ -890,9 +887,9 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf,
 		 * Not AA from cache. Not CD in cache (depends on client bit). */
 		rep->flags |= (BIT_RA | BIT_QR);
 		rep->flags &= ~(BIT_AA | BIT_CD);
-		h = query_info_hash(&qinf, (uint16_t)flags);
+		h = query_info_hash(&qinf, flags);
 		dns_cache_store_msg(env, &qinf, h, rep, leeway, pside, msgrep,
-			flags, region);
+			region);
 		/* qname is used inside query_info_entrysetup, and set to 
 		 * NULL. If it has not been used, free it. free(0) is safe. */
 		free(qinf.qname);
@@ -49,12 +49,6 @@ struct reply_info;
 struct regional;
 struct delegpt;

-/** Flags to control behavior of dns_cache_store() and dns_cache_store_msg().
- *  Must be an unsigned 32-bit value larger than 0xffff */
-
-/** Allow caching a DNS message with a zero TTL. */
-#define DNSCACHE_STORE_ZEROTTL 0x100000
-
 /**
 * Region allocated message reply
 */
@@ -86,13 +80,11 @@ struct dns_msg {
 * @param region: region to allocate better entries from cache into.
 *   (used when is_referral is false).
 * @param flags: flags with BIT_CD for AAAA queries in dns64 translation.
- *   The higher 16 bits are used internally to customize the cache policy.
- *   (See DNSCACHE_STORE_xxx flags).
 * @return 0 on alloc error (out of memory).
 */
 int dns_cache_store(struct module_env* env, struct query_info* qinf,
        struct reply_info* rep, int is_referral, time_t leeway, int pside,
-	struct regional* region, uint32_t flags);
+	struct regional* region, uint16_t flags); 

 /**
 * Store message in the cache. Stores in message cache and rrset cache.
@@ -111,12 +103,11 @@ int dns_cache_store(struct module_env* env, struct query_info* qinf,
 * 	from the parentside of the zonecut.  This means that the type NS
 * 	can be updated to full TTL even in prefetch situations.
 * @param qrep: message that can be altered with better rrs from cache.
- * @param flags: customization flags for the cache policy.
 * @param region: to allocate into for qmsg.
 */
 void dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
 	hashvalue_type hash, struct reply_info* rep, time_t leeway, int pside,
-	struct reply_info* qrep, uint32_t flags, struct regional* region);
+	struct reply_info* qrep, struct regional* region);

 /**
 * Find a delegation from the cache.
@@ -249,7 +249,7 @@ infra_create(struct config_file* cfg)
 		name_tree_init_parents(&infra->domain_limits);
 	}
 	infra_ip_ratelimit = cfg->ip_ratelimit;
-	infra->client_ip_rates = slabhash_create(cfg->ip_ratelimit_slabs,
+	infra->client_ip_rates = slabhash_create(cfg->ratelimit_slabs,
 	    INFRA_HOST_STARTSIZE, cfg->ip_ratelimit_size, &ip_rate_sizefunc,
 	    &ip_rate_compfunc, &ip_rate_delkeyfunc, &ip_rate_deldatafunc, NULL);
 	if(!infra->client_ip_rates) {
@@ -792,12 +792,7 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 #endif
 	if ((setsockopt(s, IPPROTO_TCP, TCP_FASTOPEN, &qlen, 
 		  sizeof(qlen))) == -1 ) {
-#ifdef ENOPROTOOPT
-		/* squelch ENOPROTOOPT: freebsd server mode with kernel support
-		   disabled, except when verbosity enabled for debugging */
-		if(errno != ENOPROTOOPT || verbosity >= 3)
-#endif
-		  log_err("Setting TCP Fast Open as server failed: %s", strerror(errno));
+		log_err("Setting TCP Fast Open as server failed: %s", strerror(errno));
 	}
 #endif
 	return s;
@@ -260,8 +260,7 @@ rrstr_get_rr_content(const char* str, uint8_t** nm, uint16_t* type,

 /** return name and class of rr; parses string */
 static int
-get_rr_nameclass(const char* str, uint8_t** nm, uint16_t* dclass,
-	uint16_t* dtype)
+get_rr_nameclass(const char* str, uint8_t** nm, uint16_t* dclass)
 {
 	uint8_t rr[LDNS_RR_BUF_SIZE];
 	size_t len = sizeof(rr), dname_len = 0;
@@ -275,7 +274,6 @@ get_rr_nameclass(const char* str, uint8_t** nm, uint16_t* dclass,
 	}
 	*nm = memdup(rr, dname_len);
 	*dclass = sldns_wirerr_get_class(rr, len, dname_len);
-	*dtype = sldns_wirerr_get_type(rr, len, dname_len);
 	if(!*nm) {
 		log_err("out of memory");
 		return 0;
@@ -524,18 +522,18 @@ static int
 lz_enter_rr_str(struct local_zones* zones, const char* rr)
 {
 	uint8_t* rr_name;
-	uint16_t rr_class, rr_type;
+	uint16_t rr_class;
 	size_t len;
 	int labs;
 	struct local_zone* z;
 	int r;
-	if(!get_rr_nameclass(rr, &rr_name, &rr_class, &rr_type)) {
+	if(!get_rr_nameclass(rr, &rr_name, &rr_class)) {
 		log_err("bad rr %s", rr);
 		return 0;
 	}
 	labs = dname_count_size_labels(rr_name, &len);
 	lock_rw_rdlock(&zones->lock);
-	z = local_zones_lookup(zones, rr_name, len, labs, rr_class, rr_type);
+	z = local_zones_lookup(zones, rr_name, len, labs, rr_class);
 	if(!z) {
 		lock_rw_unlock(&zones->lock);
 		fatal_exit("internal error: no zone for rr %s", rr);
@@ -721,9 +719,9 @@ lz_nodefault(struct config_file* cfg, const char* name)
 	return 0;
 }

-/** enter (AS112) empty default zone */
+/** enter AS112 default zone */
 static int
-add_empty_default(struct local_zones* zones, struct config_file* cfg,
+add_as112_default(struct local_zones* zones, struct config_file* cfg,
        const char* name)
 {
 	struct local_zone* z;
@@ -764,7 +762,7 @@ int local_zone_enter_defaults(struct local_zones* zones, struct config_file* cfg
 	/* localhost. zone */
 	if(!lz_exists(zones, "localhost.") &&
 		!lz_nodefault(cfg, "localhost.")) {
-		if(!(z=lz_enter_zone(zones, "localhost.", "redirect", 
+		if(!(z=lz_enter_zone(zones, "localhost.", "static", 
 			LDNS_RR_CLASS_IN)) ||
 		   !lz_enter_rr_into_zone(z,
 			"localhost. 10800 IN NS localhost.") ||
@@ -818,24 +816,26 @@ int local_zone_enter_defaults(struct local_zones* zones, struct config_file* cfg
 		lock_rw_unlock(&z->lock);
 	}
 	/* onion. zone (RFC 7686) */
-	if(!add_empty_default(zones, cfg, "onion.")) {
-		log_err("out of memory adding default zone");
-		return 0;
-	}
-	/* test. zone (RFC 7686) */
-	if(!add_empty_default(zones, cfg, "test.")) {
-		log_err("out of memory adding default zone");
-		return 0;
-	}
-	/* invalid. zone (RFC 7686) */
-	if(!add_empty_default(zones, cfg, "invalid.")) {
-		log_err("out of memory adding default zone");
-		return 0;
+	if(!lz_exists(zones, "onion.") &&
+		!lz_nodefault(cfg, "onion.")) {
+		if(!(z=lz_enter_zone(zones, "onion.", "static", 
+			LDNS_RR_CLASS_IN)) ||
+		   !lz_enter_rr_into_zone(z,
+			"onion. 10800 IN NS localhost.") ||
+		   !lz_enter_rr_into_zone(z,
+			"onion. 10800 IN SOA localhost. nobody.invalid. "
+			"1 3600 1200 604800 10800")) {
+			log_err("out of memory adding default zone");
+			if(z) { lock_rw_unlock(&z->lock); }
+			return 0;
+		}
+		lock_rw_unlock(&z->lock);
 	}
+
 	/* block AS112 zones, unless asked not to */
 	if(!cfg->unblock_lan_zones) {
 		for(zstr = as112_zones; *zstr; zstr++) {
-			if(!add_empty_default(zones, cfg, *zstr)) {
+			if(!add_as112_default(zones, cfg, *zstr)) {
 				log_err("out of memory adding default zone");
 				return 0;
 			}
@@ -913,17 +913,16 @@ lz_setup_implicit(struct local_zones* zones, struct config_file* cfg)
 	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;
+		uint16_t rr_class;
 		size_t len;
 		int labs;
-		if(!get_rr_nameclass(p->str, &rr_name, &rr_class, &rr_type)) {
+		if(!get_rr_nameclass(p->str, &rr_name, &rr_class)) {
 			log_err("Bad local-data RR %s", p->str);
 			return 0;
 		}
 		labs = dname_count_size_labels(rr_name, &len);
 		lock_rw_rdlock(&zones->lock);
-		if(!local_zones_lookup(zones, rr_name, len, labs, rr_class,
-			rr_type)) {
+		if(!local_zones_lookup(zones, rr_name, len, labs, rr_class)) {
 			if(!have_name) {
 				dclass = rr_class;
 				nm = rr_name;
@@ -1054,26 +1053,21 @@ local_zones_apply_cfg(struct local_zones* zones, struct config_file* cfg)

 struct local_zone* 
 local_zones_lookup(struct local_zones* zones,
-        uint8_t* name, size_t len, int labs, uint16_t dclass, uint16_t dtype)
+        uint8_t* name, size_t len, int labs, uint16_t dclass)
 {
 	return local_zones_tags_lookup(zones, name, len, labs,
-		dclass, dtype, NULL, 0, 1);
+		dclass, NULL, 0, 1);
 }

 struct local_zone* 
 local_zones_tags_lookup(struct local_zones* zones,
-        uint8_t* name, size_t len, int labs, uint16_t dclass, uint16_t dtype,
+        uint8_t* name, size_t len, int labs, uint16_t dclass,
 	uint8_t* taglist, size_t taglen, int ignoretags)
 {
 	rbnode_type* res = NULL;
 	struct local_zone *result;
 	struct local_zone key;
 	int m;
-	/* for type DS use a zone higher when on a zonecut */
-	if(dtype == LDNS_RR_TYPE_DS && !dname_is_root(name)) {
-		dname_remove_label(&name, &len);
-		labs--;
-	}
 	key.node.key = &key;
 	key.dclass = dclass;
 	key.name = name;
@@ -1589,7 +1583,7 @@ local_zones_answer(struct local_zones* zones, struct module_env* env,
 		if(view->local_zones &&
 			(z = local_zones_lookup(view->local_zones,
 			qinfo->qname, qinfo->qname_len, labs,
-			qinfo->qclass, qinfo->qtype))) {
+			qinfo->qclass))) {
 			verbose(VERB_ALGO, 
 				"using localzone from view: %s", 
 				view->name);
@@ -1606,8 +1600,8 @@ local_zones_answer(struct local_zones* zones, struct module_env* env,
 		/* try global local_zones tree */
 		lock_rw_rdlock(&zones->lock);
 		if(!(z = local_zones_tags_lookup(zones, qinfo->qname,
-			qinfo->qname_len, labs, qinfo->qclass, qinfo->qtype,
-			taglist, taglen, 0))) {
+			qinfo->qname_len, labs, qinfo->qclass, taglist,
+			taglen, 0))) {
 			lock_rw_unlock(&zones->lock);
 			return 0;
 		}
@@ -1762,19 +1756,19 @@ int
 local_zones_add_RR(struct local_zones* zones, const char* rr)
 {
 	uint8_t* rr_name;
-	uint16_t rr_class, rr_type;
+	uint16_t rr_class;
 	size_t len;
 	int labs;
 	struct local_zone* z;
 	int r;
-	if(!get_rr_nameclass(rr, &rr_name, &rr_class, &rr_type)) {
+	if(!get_rr_nameclass(rr, &rr_name, &rr_class)) {
 		return 0;
 	}
 	labs = dname_count_size_labels(rr_name, &len);
 	/* could first try readlock then get writelock if zone does not exist,
 	 * but we do not add enough RRs (from multiple threads) to optimize */
 	lock_rw_wrlock(&zones->lock);
-	z = local_zones_lookup(zones, rr_name, len, labs, rr_class, rr_type);
+	z = local_zones_lookup(zones, rr_name, len, labs, rr_class);
 	if(!z) {
 		z = local_zones_add_zone(zones, rr_name, len, labs, rr_class,
 			local_zone_transparent);
@@ -1826,47 +1820,14 @@ del_empty_term(struct local_zone* z, struct local_data* d,
 	}
 }

-/** find and remove type from list in domain struct */
-static void
-del_local_rrset(struct local_data* d, uint16_t dtype)
-{
-	struct local_rrset* prev=NULL, *p=d->rrsets;
-	while(p && ntohs(p->rrset->rk.type) != dtype) {
-		prev = p;
-		p = p->next;
-	}
-	if(!p) 
-		return; /* rrset type not found */
-	/* unlink it */
-	if(prev) prev->next = p->next;
-	else d->rrsets = p->next;
-	/* no memory recycling for zone deletions ... */
-}
-
 void local_zones_del_data(struct local_zones* zones, 
 	uint8_t* name, size_t len, int labs, uint16_t dclass)
 {
 	/* find zone */
 	struct local_zone* z;
 	struct local_data* d;
-
-	/* remove DS */
 	lock_rw_rdlock(&zones->lock);
-	z = local_zones_lookup(zones, name, len, labs, dclass, LDNS_RR_TYPE_DS);
-	if(z) {
-		lock_rw_wrlock(&z->lock);
-		d = lz_find_node(z, name, len, labs);
-		if(d) {
-			del_local_rrset(d, LDNS_RR_TYPE_DS);
-			del_empty_term(z, d, name, len, labs);
-		}
-		lock_rw_unlock(&z->lock);
-	}
-	lock_rw_unlock(&zones->lock);
-
-	/* remove other types */
-	lock_rw_rdlock(&zones->lock);
-	z = local_zones_lookup(zones, name, len, labs, dclass, 0);
+	z = local_zones_lookup(zones, name, len, labs, dclass);
 	if(!z) {
 		/* no such zone, we're done */
 		lock_rw_unlock(&zones->lock);
@@ -235,7 +235,6 @@ void local_zone_delete(struct local_zone* z);
 * @param len: length of name.
 * @param labs: labelcount of name.
 * @param dclass: class to lookup.
- * @param dtype: type to lookup, if type DS a zone higher is used for zonecuts.
 * @param taglist: taglist to lookup.
 * @param taglen: lenth of taglist.
 * @param ignoretags: lookup zone by name and class, regardless the
@@ -243,7 +242,7 @@ void local_zone_delete(struct local_zone* z);
 * @return closest local_zone or NULL if no covering zone is found.
 */
 struct local_zone* local_zones_tags_lookup(struct local_zones* zones, 
-	uint8_t* name, size_t len, int labs, uint16_t dclass, uint16_t dtype,
+	uint8_t* name, size_t len, int labs, uint16_t dclass, 
 	uint8_t* taglist, size_t taglen, int ignoretags);

 /**
@@ -254,12 +253,10 @@ struct local_zone* local_zones_tags_lookup(struct local_zones* zones,
 * @param len: length of name.
 * @param labs: labelcount of name.
 * @param dclass: class to lookup.
- * @param dtype: type of the record, if type DS then a zone higher up is found
- *   pass 0 to just plain find a zone for a name.
 * @return closest local_zone or NULL if no covering zone is found.
 */
 struct local_zone* local_zones_lookup(struct local_zones* zones, 
-	uint8_t* name, size_t len, int labs, uint16_t dclass, uint16_t dtype);
+	uint8_t* name, size_t len, int labs, uint16_t dclass);

 /**
 * Debug helper. Print all zones 
@@ -533,22 +533,8 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 	return 1;
 }

-static void mesh_schedule_prefetch(struct mesh_area* mesh,
-	struct query_info* qinfo, uint16_t qflags, time_t leeway, int run);
-
 void mesh_new_prefetch(struct mesh_area* mesh, struct query_info* qinfo,
        uint16_t qflags, time_t leeway)
-{
-	mesh_schedule_prefetch(mesh, qinfo, qflags, leeway, 1);
-}
-
-/* Internal backend routine of mesh_new_prefetch().  It takes one additional
- * parameter, 'run', which controls whether to run the prefetch state
- * immediately.  When this function is called internally 'run' could be
- * 0 (false), in which case the new state is only made runnable so it
- * will not be run recursively on top of the current state. */
-static void mesh_schedule_prefetch(struct mesh_area* mesh,
-	struct query_info* qinfo, uint16_t qflags, time_t leeway, int run)
 {
 	struct mesh_state* s = mesh_area_find(mesh, NULL, qinfo,
 		qflags&(BIT_RD|BIT_CD), 0, 0);
@@ -603,18 +589,6 @@ static void mesh_schedule_prefetch(struct mesh_area* mesh,
 			s->list_select = mesh_jostle_list;
 		}
 	}
-
-	if(!run) {
-#ifdef UNBOUND_DEBUG
-		n =
-#else
-		(void)
-#endif
-		rbtree_insert(&mesh->run, &s->run_node);
-		log_assert(n != NULL);
-		return;
-	}
-
 	mesh_run(mesh, s, module_event_new, NULL);
 }

@@ -692,8 +666,6 @@ mesh_state_create(struct module_env* env, struct query_info* qinfo,
 	mstate->s.prefetch_leeway = 0;
 	mstate->s.no_cache_lookup = 0;
 	mstate->s.no_cache_store = 0;
-	mstate->s.need_refetch = 0;
-
 	/* init modules */
 	for(i=0; i<env->mesh->mods.num; i++) {
 		mstate->s.minfo[i] = NULL;
@@ -1316,30 +1288,9 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns,
 	return 1;
 }

-/* Extract the query info and flags from 'mstate' into '*qinfop' and '*qflags'.
- * Since this is only used for internal refetch of otherwise-expired answer,
- * we simply ignore the rare failure mode when memory allocation fails. */
-static void
-mesh_copy_qinfo(struct mesh_state* mstate, struct query_info** qinfop,
-	uint16_t* qflags)
-{
-	struct regional* region = mstate->s.env->scratch;
-	struct query_info* qinfo;
-
-	qinfo = regional_alloc_init(region, &mstate->s.qinfo, sizeof(*qinfo));
-	if(!qinfo)
-		return;
-	qinfo->qname = regional_alloc_init(region, qinfo->qname,
-		qinfo->qname_len);
-	if(!qinfo->qname)
-		return;
-	*qinfop = qinfo;
-	*qflags = mstate->s.query_flags;
-}
-
 /**
 * Continue processing the mesh state at another module.
- * Handles module to modules transfer of control.
+ * Handles module to modules tranfer of control.
 * Handles module finished.
 * @param mesh: the mesh area.
 * @param mstate: currently active mesh state.
@@ -1359,8 +1310,7 @@ mesh_continue(struct mesh_area* mesh, struct mesh_state* mstate,
 	mstate->num_activated++;
 	if(mstate->num_activated > MESH_MAX_ACTIVATION) {
 		/* module is looping. Stop it. */
-		log_err("internal error: looping module (%s) stopped",
-			mesh->mods.mod[mstate->s.curmod]->name);
+		log_err("internal error: looping module stopped");
 		log_query_info(VERB_QUERY, "pass error for qstate",
 			&mstate->s.qinfo);
 		s = module_error;
@@ -1400,32 +1350,11 @@ mesh_continue(struct mesh_area* mesh, struct mesh_state* mstate,
 		/* error is bad, handle pass back up below */
 		mstate->s.return_rcode = LDNS_RCODE_SERVFAIL;
 	}
-	if(s == module_error) {
-		mesh_query_done(mstate);
-		mesh_walk_supers(mesh, mstate);
-		mesh_state_delete(&mstate->s);
-		return 0;
-	}
-	if(s == module_finished) {
+	if(s == module_error || s == module_finished) {
 		if(mstate->s.curmod == 0) {
-			struct query_info* qinfo = NULL;
-			uint16_t qflags;
-
 			mesh_query_done(mstate);
 			mesh_walk_supers(mesh, mstate);
-
-			/* If the answer to the query needs to be refetched
-			 * from an external DNS server, we'll need to schedule
-			 * a prefetch after removing the current state, so
-			 * we need to make a copy of the query info here. */
-			if(mstate->s.need_refetch)
-				mesh_copy_qinfo(mstate, &qinfo, &qflags);
-
 			mesh_state_delete(&mstate->s);
-			if(qinfo) {
-				mesh_schedule_prefetch(mesh, qinfo, qflags,
-					0, 1);
-			}
 			return 0;
 		}
 		/* pass along the locus of control */
@@ -268,13 +268,6 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 	if (connectx(s, &endpoints, SAE_ASSOCID_ANY,  
 	             CONNECT_DATA_IDEMPOTENT | CONNECT_RESUME_ON_READ_WRITE,
 	             NULL, 0, NULL, NULL) == -1) {
-		/* if fails, failover to connect for OSX 10.10 */
-#ifdef EINPROGRESS
-		if(errno != EINPROGRESS) {
-#else
-		if(1) {
-#endif
-			if(connect(s, (struct sockaddr*)&w->addr, w->addrlen) == -1) {
 #else /* USE_OSX_MSG_FASTOPEN*/
 #ifdef USE_MSG_FASTOPEN
 	pend->c->tcp_do_fastopen = 1;
@@ -309,10 +302,6 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 #ifdef USE_MSG_FASTOPEN
 	}
 #endif /* USE_MSG_FASTOPEN */
-#ifdef USE_OSX_MSG_FASTOPEN
-		}
-	}
-#endif /* USE_OSX_MSG_FASTOPEN */
 	if(w->outnet->sslctx && w->ssl_upstream) {
 		pend->c->ssl = outgoing_ssl_fd(w->outnet->sslctx, s);
 		if(!pend->c->ssl) {
@@ -364,9 +353,9 @@ use_free_buffer(struct outside_network* outnet)
 	}
 }

-/** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */
+/** decomission a tcp buffer, closes commpoint and frees waiting_tcp entry */
 static void
-decommission_pending_tcp(struct outside_network* outnet, 
+decomission_pending_tcp(struct outside_network* outnet, 
 	struct pending_tcp* pend)
 {
 	if(pend->c->ssl) {
@@ -406,7 +395,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	}
 	fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
 	(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
-	decommission_pending_tcp(outnet, pend);
+	decomission_pending_tcp(outnet, pend);
 	return 0;
 }

@@ -1416,7 +1405,7 @@ serviced_delete(struct serviced_query* sq)
 			struct waiting_tcp* p = (struct waiting_tcp*)
 				sq->pending;
 			if(p->pkt == NULL) {
-				decommission_pending_tcp(sq->outnet, 
+				decomission_pending_tcp(sq->outnet, 
 					(struct pending_tcp*)p->next_waiting);
 			} else {
 				waiting_list_remove(sq->outnet, p);
@@ -67,7 +67,7 @@ struct view {
 	/** rbtree node, key is name */
 	rbnode_type node;
 	/** view name.
-	 * Has to be right after rbnode_t due to pointer arithmetic in
+	 * Has to be right after rbnode_t due to pointer arithmatic in
 	 * view_create's lock protect */
 	char* name;
 	/** view specific local authority zones */
@@ -33,14 +33,14 @@ ssize_t
 sldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *line_nr)
 {
 	int c, prev_c;
-	int p; /* 0 -> no parentheses seen, >0 nr of ( seen */
+	int p; /* 0 -> no parenthese seen, >0 nr of ( seen */
 	int com, quoted;
 	char *t;
 	size_t i;
 	const char *d;
 	const char *del;

-	/* standard delimiters */
+	/* standard delimeters */
 	if (!delim) {
 		/* from isspace(3) */
 		del = LDNS_PARSE_NORMAL;
@@ -244,7 +244,7 @@ sldns_bget_token_par(sldns_buffer *b, char *token, const char *delim,
 	size_t limit, int* par, const char* skipw)
 {
 	int c, lc;
-	int p; /* 0 -> no parentheses seen, >0 nr of ( seen */
+	int p; /* 0 -> no parenthese seen, >0 nr of ( seen */
 	int com, quoted;
 	char *t;
 	size_t i;
@@ -103,9 +103,9 @@ ssize_t sldns_bget_token(struct sldns_buffer *b, char *token, const char *delim,
 * after the keyword + k_del until we hit d_del
 * \param[in] f file pointer to read from
 * \param[in] keyword keyword to look for
- * \param[in] k_del keyword delimiter 
+ * \param[in] k_del keyword delimeter 
 * \param[out] data the data found 
- * \param[in] d_del the data delimiter
+ * \param[in] d_del the data delimeter
 * \param[in] data_limit maximum size the the data buffer
 * \return the number of character read
 */
@@ -116,9 +116,9 @@ ssize_t sldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del,
 * after the keyword + k_del until we hit d_del
 * \param[in] f file pointer to read from
 * \param[in] keyword keyword to look for
- * \param[in] k_del keyword delimiter 
+ * \param[in] k_del keyword delimeter 
 * \param[out] data the data found 
- * \param[in] d_del the data delimiter
+ * \param[in] d_del the data delimeter
 * \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)
@@ -131,9 +131,9 @@ ssize_t sldns_fget_keyword_data_l(FILE *f, const char *keyword, const char *k_de
 * after the keyword + k_del until we hit d_del
 * \param[in] b buffer pointer to read from
 * \param[in] keyword keyword to look for
- * \param[in] k_del keyword delimiter 
+ * \param[in] k_del keyword delimeter 
 * \param[out] data the data found 
- * \param[in] d_del the data delimiter
+ * \param[in] d_del the data delimeter
 * \param[in] data_limit maximum size the the data buffer
 * \return the number of character read
 */
@@ -165,20 +165,20 @@ sldns_gmtime64_r(int64_t clock, struct tm *result)
 #endif /* SIZEOF_TIME_T <= 4 */

 static int64_t
-sldns_serial_arithmetics_time(int32_t time, time_t now)
+sldns_serial_arithmitics_time(int32_t time, time_t now)
 {
 	int32_t offset = time - (int32_t) now;
 	return (int64_t) now + offset;
 }

 struct tm *
-sldns_serial_arithmetics_gmtime_r(int32_t time, time_t now, struct tm *result)
+sldns_serial_arithmitics_gmtime_r(int32_t time, time_t now, struct tm *result)
 {
 #if SIZEOF_TIME_T <= 4
-	int64_t secs_since_epoch = sldns_serial_arithmetics_time(time, now);
+	int64_t secs_since_epoch = sldns_serial_arithmitics_time(time, now);
 	return  sldns_gmtime64_r(secs_since_epoch, result);
 #else
-	time_t  secs_since_epoch = sldns_serial_arithmetics_time(time, now);
+	time_t  secs_since_epoch = sldns_serial_arithmitics_time(time, now);
 	return  gmtime_r(&secs_since_epoch, result);
 #endif
 }
@@ -402,12 +402,10 @@ sldns_b32_ntop_base(const uint8_t* src, size_t src_sz, char* dst, size_t dst_sz,

 		/* ........ ........ ....4444 4....... ........ */
 			 c =  src[3]         >> 7 ;
-		/* fallthrough */
 	case 3: dst[4] = b32[(src[2] & 0x0f) << 1 | c];

 		/* ........ .......3 3333.... ........ ........ */
 			 c =  src[2]         >> 4 ;
-		/* fallthrough */
 	case 2:	dst[3] = b32[(src[1] & 0x01) << 4 | c];

 		/* ........ ..22222. ........ ........ ........ */
@@ -415,7 +413,6 @@ sldns_b32_ntop_base(const uint8_t* src, size_t src_sz, char* dst, size_t dst_sz,

 		/* .....111 11...... ........ ........ ........ */
 			 c =  src[1]         >> 6 ;
-		/* fallthrough */
 	case 1:	dst[1] = b32[(src[0] & 0x07) << 2 | c];

 		/* 00000... ........ ........ ........ ........ */
@@ -426,12 +423,9 @@ sldns_b32_ntop_base(const uint8_t* src, size_t src_sz, char* dst, size_t dst_sz,
 		switch (src_sz) {
 			case 1: dst[2] = '=';
 				dst[3] = '=';
-				/* fallthrough */
 			case 2: dst[4] = '=';
-				/* fallthrough */
 			case 3: dst[5] = '=';
 				dst[6] = '=';
-				/* fallthrough */
 			case 4: dst[7] = '=';
 		}
 	}
@@ -543,18 +537,15 @@ sldns_b32_pton_base(const char* src, size_t src_sz, uint8_t* dst, size_t dst_sz,
 			/* ........ ........ ........ .55555.. ........ */
 			/* ........ ........ ....4444 4....... ........ */
 			dst[3] = buf[4] << 7 | buf[5] << 2 | buf[6] >> 3;
-			/* fallthrough */

 		case 5: /* ........ ........ ....4444 4....... ........ */
 			/* ........ .......3 3333.... ........ ........ */
 			dst[2] = buf[3] << 4 | buf[4] >> 1;
-			/* fallthrough */

 		case 4: /* ........ .......3 3333.... ........ ........ */
 			/* ........ ..22222. ........ ........ ........ */
 			/* .....111 11...... ........ ........ ........ */
 			dst[1] = buf[1] << 6 | buf[2] << 1 | buf[3] >> 4;
-			/* fallthrough */

 		case 2: /* .....111 11...... ........ ........ ........ */
 			/* 00000... ........ ........ ........ ........ */
@@ -62,13 +62,13 @@ time_t sldns_mktime_from_utc(const struct tm *tm);
 * fields of RRSIG records.
 *
 * \param[in] time number of seconds since epoch (midnight, January 1st, 1970)
- *            to be interpreted as a serial arithmetics number relative to now.
+ *            to be intepreted as a serial arithmetics number relative to now.
 * \param[in] now number of seconds since epoch (midnight, January 1st, 1970)
 *            to which the time value is compared to determine the final value.
 * \param[out] result the struct with the broken-out time information
 * \return result on success or NULL on error
 */
-struct tm * sldns_serial_arithmetics_gmtime_r(int32_t time, time_t now, struct tm *result);
+struct tm * sldns_serial_arithmitics_gmtime_r(int32_t time, time_t now, struct tm *result);

 /**
 * converts a ttl value (like 5d2h) to a long.
@@ -331,13 +331,13 @@ enum sldns_enum_rdf_type
        LDNS_RDF_TYPE_NSEC3_NEXT_OWNER,

        /** 4 shorts represented as 4 * 16 bit hex numbers
-         *  separated by colons. For NID and L64.
+         *  seperated by colons. For NID and L64.
         */
        LDNS_RDF_TYPE_ILNP64,

-        /** 6 * 8 bit hex numbers separated by dashes. For EUI48. */
+        /** 6 * 8 bit hex numbers seperated by dashes. For EUI48. */
        LDNS_RDF_TYPE_EUI48,
-        /** 8 * 8 bit hex numbers separated by dashes. For EUI64. */
+        /** 8 * 8 bit hex numbers seperated by dashes. For EUI64. */
        LDNS_RDF_TYPE_EUI64,

        /** A non-zero sequence of US-ASCII letters and numbers in lower case.
@@ -497,7 +497,7 @@ sldns_buffer_set_at(sldns_buffer *buffer, size_t at, int c, size_t count)
 * writes count bytes of data to the current position of the buffer
 * \param[in] buffer the buffer
 * \param[in] data the data to write
- * \param[in] count the length of the data to write
+ * \param[in] count the lenght of the data to write
 */
 INLINE void
 sldns_buffer_write(sldns_buffer *buffer, const void *data, size_t count)
@@ -1190,10 +1190,6 @@ int sldns_str2wire_b64_buf(const char* str, uint8_t* rd, size_t* len)
 {
 	size_t sz = sldns_b64_pton_calculate_size(strlen(str));
 	int n;
-	if(strcmp(str, "0") == 0) {
-		*len = 0;
-		return LDNS_WIREPARSE_ERR_OK;
-	}
 	if(*len < sz)
 		return LDNS_WIREPARSE_ERR_BUFFER_TOO_SMALL;
 	n = sldns_b64_pton(str, rd, *len);
@@ -1227,10 +1223,6 @@ int sldns_str2wire_hex_buf(const char* str, uint8_t* rd, size_t* len)
 			s++;
 			continue;
 		}
-		if(dlen == 0 && *s == '0' && *(s+1) == 0) {
-			*len = 0;
-			return LDNS_WIREPARSE_ERR_OK;
-		}
 		if(!isxdigit((unsigned char)*s))
 			return RET_ERR(LDNS_WIREPARSE_ERR_SYNTAX_HEX, s-str);
 		if(*len < dlen/2 + 1)
@@ -1541,7 +1533,7 @@ int sldns_str2wire_loc_buf(const char* str, uint8_t* rd, size_t* len)
 		s = strtod(my_str, &my_str);
 	}

-	/* skip blanks before northerness */
+	/* skip blanks before norterness */
 	while (isblank((unsigned char) *my_str)) {
 		my_str++;
 	}
@@ -1693,15 +1685,12 @@ int sldns_str2wire_wks_buf(const char* str, uint8_t* rd, size_t* len)
 			struct protoent *p = getprotobyname(token);
 			have_proto = 1;
 			if(p) rd[0] = (uint8_t)p->p_proto;
-			else if(strcasecmp(token, "tcp")==0) rd[0]=6;
-			else if(strcasecmp(token, "udp")==0) rd[0]=17;
 			else rd[0] = (uint8_t)atoi(token);
 			(void)strlcpy(proto_str, token, sizeof(proto_str));
 		} else {
 			int serv_port;
 			struct servent *serv = getservbyname(token, proto_str);
 			if(serv) serv_port=(int)ntohs((uint16_t)serv->s_port);
-			else if(strcasecmp(token, "domain")==0) serv_port=53;
 			else {
 				serv_port = atoi(token);
 				if(serv_port == 0 && strcmp(token, "0") != 0) {
@@ -1220,17 +1220,11 @@ static int sldns_wire2str_b64_scan_num(uint8_t** d, size_t* dl, char** s,

 int sldns_wire2str_b64_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
 {
-	if(*dl == 0) {
-		return sldns_str_print(s, sl, "0");
-	}
 	return sldns_wire2str_b64_scan_num(d, dl, s, sl, *dl);
 }

 int sldns_wire2str_hex_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
 {
-	if(*dl == 0) {
-		return sldns_str_print(s, sl, "0");
-	}
 	return print_remainder_hex("", d, dl, s, sl);
 }

@@ -1335,7 +1329,7 @@ int sldns_wire2str_time_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
 	if(*dl < 4) return -1;
 	t = sldns_read_uint32(*d);
 	date_buf[15]=0;
-	if(sldns_serial_arithmetics_gmtime_r(t, time(NULL), &tm) &&
+	if(sldns_serial_arithmitics_gmtime_r(t, time(NULL), &tm) &&
 		strftime(date_buf, 15, "%Y%m%d%H%M%S", &tm)) {
 		(*d) += 4;
 		(*dl) -= 4;
@@ -1471,10 +1465,6 @@ int sldns_wire2str_wks_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
 	if(protocol && (protocol->p_name != NULL)) {
 		w += sldns_str_print(s, sl, "%s", protocol->p_name);
 		proto_name = protocol->p_name;
-	} else if(protocol_nr == 6) {
-		w += sldns_str_print(s, sl, "tcp");
-	} else if(protocol_nr == 17) {
-		w += sldns_str_print(s, sl, "udp");
 	} else	{
 		w += sldns_str_print(s, sl, "%u", (unsigned)protocol_nr);
 	}
@@ -669,7 +669,7 @@ wipe_ip_usage(struct ip_list* p)
 	}
 }

-/** count unused IPs */
+/** cound unused IPs */
 static int
 count_unused(struct ip_list* p)
 {
@@ -2326,9 +2326,7 @@ int main(int argc, char* argv[])
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
 	ERR_load_crypto_strings();
 #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	ERR_load_SSL_strings();
-#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
 	OpenSSL_add_all_algorithms();
 #else
@@ -2339,7 +2337,7 @@ int main(int argc, char* argv[])
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	(void)SSL_library_init();
 #else
-	(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+	(void)OPENSSL_init_ssl(0, NULL);
 #endif

 	if(dolist) do_list_builtin();
@@ -71,9 +71,6 @@
 #ifdef WITH_PYTHONMODULE
 #include "pythonmod/pythonmod.h"
 #endif
-#ifdef CLIENT_SUBNET
-#include "edns-subnet/subnet-whitelist.h"
-#endif

 /** Give checkconf usage, and exit (1). */
 static void
@@ -348,20 +345,6 @@ check_chroot_filelist_wild(const char* desc, struct config_strlist* list,
 	}
 }

-#ifdef CLIENT_SUBNET
-/** check ECS configuration */
-static void
-ecs_conf_checks(struct config_file* cfg)
-{
-	struct ecs_whitelist* whitelist = NULL;
-	if(!(whitelist = ecs_whitelist_create()))
-		fatal_exit("Could not create ednssubnet whitelist: out of memory");
-        if(!ecs_whitelist_apply_cfg(whitelist, cfg))
-		fatal_exit("Could not setup ednssubnet whitelist");
-	ecs_whitelist_delete(whitelist);
-}
-#endif /* CLIENT_SUBNET */
-
 /** check configuration for errors */
 static void
 morechecks(struct config_file* cfg, const char* fname)
@@ -444,11 +427,8 @@ morechecks(struct config_file* cfg, const char* fname)
 	check_chroot_string("dlv-anchor-file", &cfg->dlv_anchor_file,
 		cfg->chrootdir, cfg);
 #ifdef USE_IPSECMOD
-	if(cfg->ipsecmod_enabled && strstr(cfg->module_conf, "ipsecmod")) {
-		/* only check hook if enabled */
-		check_chroot_string("ipsecmod-hook", &cfg->ipsecmod_hook,
-			cfg->chrootdir, cfg);
-	}
+	check_chroot_string("ipsecmod-hook", &cfg->ipsecmod_hook, cfg->chrootdir,
+		cfg);
 #endif
 	/* remove chroot setting so that modules are not stripping pathnames*/
 	free(cfg->chrootdir);
@@ -494,8 +474,6 @@ morechecks(struct config_file* cfg, const char* fname)
 #ifdef CLIENT_SUBNET
 		&& strcmp(cfg->module_conf, "subnetcache iterator") != 0
 		&& strcmp(cfg->module_conf, "subnetcache validator iterator") != 0
-		&& strcmp(cfg->module_conf, "dns64 subnetcache iterator") != 0
-		&& strcmp(cfg->module_conf, "dns64 subnetcache validator iterator") != 0
 #endif
 #if defined(WITH_PYTHONMODULE) && defined(CLIENT_SUBNET)
 		&& strcmp(cfg->module_conf, "python subnetcache iterator") != 0
@@ -546,9 +524,6 @@ morechecks(struct config_file* cfg, const char* fname)

 	localzonechecks(cfg);
 	view_and_respipchecks(cfg);
-#ifdef CLIENT_SUBNET
-	ecs_conf_checks(cfg);
-#endif
 }

 /** check forwards */
@@ -207,7 +207,7 @@ static void pr_stats(const char* nm, struct ub_stats_info* s)
    PR_UL_NM("num.dnscrypt.cleartext", s->svr.num_query_dnscrypt_cleartext);
    PR_UL_NM("num.dnscrypt.malformed",
             s->svr.num_query_dnscrypt_crypted_malformed);
-#endif /* USE_DNSCRYPT */
+#endif
 	printf("%s.requestlist.avg"SQ"%g\n", nm,
 		(s->svr.num_queries_missed_cache+s->svr.num_queries_prefetch)?
 			(double)s->svr.sum_query_list_size/
@@ -251,12 +251,6 @@ static void print_mem(struct ub_shm_stat_info* shm_stat)
 #ifdef USE_IPSECMOD
 	PR_LL("mem.mod.ipsecmod", shm_stat->mem.ipsecmod);
 #endif
-#ifdef USE_DNSCRYPT
-	PR_LL("mem.cache.dnscrypt_shared_secret",
-		shm_stat->mem.dnscrypt_shared_secret);
-	PR_LL("mem.cache.dnscrypt_nonce",
-		shm_stat->mem.dnscrypt_nonce);
-#endif
 }

 /** print histogram */
@@ -343,8 +337,6 @@ static void print_extended(struct ub_stats_info* s)
 	if(!inhibit_zero || s->svr.ans_rcode_nodata) {
 		PR_UL("num.answer.rcode.nodata", s->svr.ans_rcode_nodata);
 	}
-	/* iteration */
-	PR_UL("num.query.ratelimited", s->svr.queries_ratelimited);
 	/* validation */
 	PR_UL("num.answer.secure", s->svr.ans_secure);
 	PR_UL("num.answer.bogus", s->svr.ans_bogus);
@@ -357,15 +349,6 @@ static void print_extended(struct ub_stats_info* s)
 	PR_UL("rrset.cache.count", s->svr.rrset_cache_count);
 	PR_UL("infra.cache.count", s->svr.infra_cache_count);
 	PR_UL("key.cache.count", s->svr.key_cache_count);
-#ifdef USE_DNSCRYPT
-	PR_UL("dnscrypt_shared_secret.cache.count",
-			 s->svr.shared_secret_cache_count);
-	PR_UL("num.query.dnscrypt.shared_secret.cachemiss",
-			 s->svr.num_query_dnscrypt_secret_missed_cache);
-	PR_UL("dnscrypt_nonce.cache.count", s->svr.nonce_cache_count);
-	PR_UL("num.query.dnscrypt.replay",
-			 s->svr.num_query_dnscrypt_replay);
-#endif /* USE_DNSCRYPT */
 }

 /** print statistics out of memory structures */
@@ -373,7 +356,7 @@ static void do_stats_shm(struct config_file* cfg, struct ub_stats_info* stats,
 	struct ub_shm_stat_info* shm_stat)
 {
 	int i;
-	char nm[32];
+	char nm[16];
 	for(i=0; i<cfg->num_threads; i++) {
 		snprintf(nm, sizeof(nm), "thread%d", i);
 		pr_stats(nm, &stats[i+1]);
@@ -726,7 +709,7 @@ int main(int argc, char* argv[])
 	WSADATA wsa_data;
 #endif
 #ifdef USE_THREAD_DEBUG
-	/* stop the file output from unbound-control, overwrites the servers */
+	/* stop the file output from unbound-control, overwites the servers */
 	extern int check_locking_order;
 	check_locking_order = 0;
 #endif /* USE_THREAD_DEBUG */
@@ -780,9 +763,7 @@ int main(int argc, char* argv[])
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
 	ERR_load_crypto_strings();
 #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	ERR_load_SSL_strings();
-#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
 	OpenSSL_add_all_algorithms();
 #else
@@ -793,7 +774,7 @@ int main(int argc, char* argv[])
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	(void)SSL_library_init();
 #else
-	(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+	(void)OPENSSL_init_ssl(0, NULL);
 #endif

 	if(!RAND_status()) {
@@ -209,7 +209,6 @@ massage_class(const char* c)
 static const char* 
 secure_str(struct ub_result* result)
 {
-	if(result->rcode != 0 && result->rcode != 3) return "(error)";
 	if(result->secure) return "(secure)";
 	if(result->bogus) return "(BOGUS (security failure))";
 	return "(insecure)";
@@ -182,7 +182,7 @@ struct checked_lock {
 * @param area: ptr to mem.
 * @param size: length of area.
 * You can call it multiple times with the same lock to give several areas.
- * Call it when you are done initializing the area, since it will be copied
+ * Call it when you are done initialising the area, since it will be copied
 * at this time and protected right away against unauthorised changes until 
 * the next lock() call is done.
 */
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 . testdata/common.sh

-NEED_SPLINT='00-lint.tdir'
-NEED_DOXYGEN='01-doc.tdir'
-NEED_XXD='fwd_compress_c00c.tdir fwd_zero.tdir'
-NEED_NC='fwd_compress_c00c.tdir fwd_zero.tdir'
-NEED_CURL='06-ianaports.tdir root_anchor.tdir'
-NEED_WHOAMI='07-confroot.tdir'
-NEED_IPV6='fwd_ancil.tdir fwd_tcp_tc6.tdir stub_udp6.tdir edns_cache.tdir'
-NEED_NOMINGW='tcp_sigpipe.tdir 07-confroot.tdir 08-host-lib.tdir fwd_ancil.tdir'
-NEED_DNSCRYPT_PROXY='dnscrypt_queries.tdir dnscrypt_queries_chacha.tdir'
+NEED_SPLINT='00-lint.tpkg'
+NEED_DOXYGEN='01-doc.tpkg'
+NEED_XXD='fwd_compress_c00c.tpkg fwd_zero.tpkg'
+NEED_NC='fwd_compress_c00c.tpkg fwd_zero.tpkg'
+NEED_CURL='06-ianaports.tpkg root_anchor.tpkg'
+NEED_WHOAMI='07-confroot.tpkg'
+NEED_IPV6='fwd_ancil.tpkg fwd_tcp_tc6.tpkg stub_udp6.tpkg edns_cache.tpkg'
+NEED_NOMINGW='tcp_sigpipe.tpkg 07-confroot.tpkg 08-host-lib.tpkg fwd_ancil.tpkg'
+NEED_DNSCRYPT_PROXY='dnscrypt_queries.tpkg dnscrypt_queries_chacha.tpkg'

 # test if dig and ldns-testns are available.
 test_tool_avail "dig"
@@ -30,9 +30,9 @@ else
 fi

 cd testdata;
-sh ../testcode/mini_tdir.sh clean
+sh ../testcode/mini_tpkg.sh clean
 rm -f .perfstats.txt
-for test in `ls -d *.tdir`; do
+for test in `ls *.tpkg`; do
 	SKIP=0
 	skip_if_in_list $test "$NEED_SPLINT" "splint"
 	skip_if_in_list $test "$NEED_DOXYGEN" "doxygen"
@@ -54,10 +54,10 @@ for test in `ls -d *.tdir`; do
 	fi
 	if test $SKIP -eq 0; then
 		echo $test
-		sh ../testcode/mini_tdir.sh -a ../.. exe $test
+		sh ../testcode/mini_tpkg.sh -a ../.. exe $test
 	else
 		echo "skip $test"
 	fi
 done
-sh ../testcode/mini_tdir.sh report
+sh ../testcode/mini_tpkg.sh report
 cat .perfstats.txt
@@ -1331,7 +1331,7 @@ int serviced_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b))
 	return 0;
 }

-/* timers in testbound for autotrust. statistics tested in tdir. */
+/* timers in testbound for autotrust. statistics tested in tpkg. */
 struct comm_timer* comm_timer_create(struct comm_base* base, 
 	void (*cb)(void*), void* cb_arg)
 {
@@ -1,171 +0,0 @@
-# tdir that only exes the files.
-args="../.."
-if test "$1" = "-a"; then
-	args=$2
-	shift
-	shift
-fi
-	
-if test "$1" = "clean"; then
-	echo "rm -f result.* .done* .tdir.var.master .tdir.var.test"
-	rm -f result.* .done* .tdir.var.master .tdir.var.test
-	exit 0
-fi
-if test "$1" = "fake"; then
-	echo "minitdir fake $2"
-	echo "fake" > .done-`basename $2 .tdir`
-	exit 0
-fi
-if test "$1" = "-f" && test "$2" = "report"; then
-	echo "Minitdir Long Report"
-	pass=0
-	fail=0
-	skip=0
-	echo "   STATUS    ELAPSED TESTNAME TESTDESCRIPTION"
-	for result in *.tdir; do
-		name=`basename $result .tdir`
-		timelen="     "
-		desc=""
-		if test -f "result.$name"; then
-			timestart=`grep ^DateRunStart: "result.$name" | sed -e 's/DateRunStart: //'`
-			timeend=`grep ^DateRunEnd: "result.$name" | sed -e 's/DateRunEnd: //'`
-			timesec=`expr $timeend - $timestart`
-			timelen=`printf %4ds $timesec`
-			if test $? -ne 0; then
-				timelen="$timesec""s"
-			fi
-			desc=`grep ^Description: "result.$name" | sed -e 's/Description: //'`
-		fi
-		if test -f ".done-$name"; then
-			if test "$1" != "-q"; then
-				echo "** PASSED ** $timelen $name: $desc"
-				pass=`expr $pass + 1`
-			fi
-		else
-			if test -f "result.$name"; then
-				echo "!! FAILED !! $timelen $name: $desc"
-				fail=`expr $fail + 1`
-			else
-				echo ".> SKIPPED<< $timelen $name: $desc"
-				skip=`expr $skip + 1`
-			fi
-		fi
-	done
-	echo ""
-	if test "$skip" = "0"; then
-		echo "$pass pass, $fail fail"
-	else
-		echo "$pass pass, $fail fail, $skip skip"
-	fi
-	echo ""
-	exit 0
-fi
-if test "$1" = "report" || test "$2" = "report"; then
-	echo "Minitdir Report"
-	for result in *.tdir; do
-		name=`basename $result .tdir`
-		if test -f ".done-$name"; then
-			if test "$1" != "-q"; then
-				echo "** PASSED ** : $name"
-			fi
-		else
-			if test -f "result.$name"; then
-				echo "!! FAILED !! : $name"
-			else
-				echo ">> SKIPPED<< : $name"
-			fi
-		fi
-	done
-	exit 0
-fi
-
-if test "$1" != 'exe'; then
-	# usage
-	echo "mini tdir. Reduced functionality for old shells."
-	echo "	tdir exe <file>"
-	echo "	tdir fake <file>"
-	echo "	tdir clean"
-	echo "	tdir [-q|-f] report"
-	exit 1
-fi
-shift
-
-# do not execute if the disk is too full
-#DISKLIMIT=100000
-# This check is not portable (to Solaris 10).
-#avail=`df . | tail -1 | awk '{print $4}'`
-#if test "$avail" -lt "$DISKLIMIT"; then
-	#echo "minitdir: The disk is too full! Only $avail."
-	#exit 1
-#fi
-
-name=`basename $1 .tdir`
-dir=$name.$$
-result=result.$name
-done=.done-$name
-success="no"
-if test -x "`which bash`"; then
-	shell="bash"
-else
-	shell="sh"
-fi
-
-# check already done
-if test -f .done-$name; then
-	echo "minitdir .done-$name exists. skip test."
-	exit 0
-fi
-
-# Copy
-echo "minitdir copy $1 to $dir"
-mkdir $dir
-cp -a $name.tdir/* $dir/
-cd $dir
-
-# EXE
-echo "minitdir exe $name" > $result
-grep "Description:" $name.dsc >> $result 2>&1
-echo "DateRunStart: "`date "+%s" 2>/dev/null` >> $result
-if test -f $name.pre; then
-	echo "minitdir exe $name.pre"
-	echo "minitdir exe $name.pre" >> $result
-	$shell $name.pre $args >> $result
-	if test $? -ne 0; then
-		echo "Warning: $name.pre did not exit successfully"
-	fi
-fi
-if test -f $name.test; then
-	echo "minitdir exe $name.test"
-	echo "minitdir exe $name.test" >> $result
-	$shell $name.test $args >>$result 2>&1
-	if test $? -ne 0; then
-		echo "$name: FAILED" >> $result
-		echo "$name: FAILED"
-		success="no"
-	else
-		echo "$name: PASSED" >> $result
-		echo "$name: PASSED" > ../.done-$name
-		echo "$name: PASSED"
-		success="yes"
-	fi
-fi
-if test -f $name.post; then
-	echo "minitdir exe $name.post"
-	echo "minitdir exe $name.post" >> $result
-	$shell $name.post $args >> $result
-	if test $? -ne 0; then
-		echo "Warning: $name.post did not exit successfully"
-	fi
-fi
-echo "DateRunEnd: "`date "+%s" 2>/dev/null` >> $result
-
-mv $result ..
-cd ..
-rm -rf $dir
-# compat for windows where deletion may not succeed initially (files locked
-# by processes that still have to exit).
-if test $? -eq 1; then
-	echo "minitdir waiting for processes to terminate"
-	sleep 2 # some time to exit, and try again
-	rm -rf $dir
-fi
@@ -643,9 +643,7 @@ int main(int argc, char* argv[])
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
 	ERR_load_crypto_strings();
 #endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	ERR_load_SSL_strings();
-#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
 	OpenSSL_add_all_algorithms();
 #else
@@ -656,7 +654,7 @@ int main(int argc, char* argv[])
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 	(void)SSL_library_init();
 #else
-	(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+	(void)OPENSSL_init_ssl(0, NULL);
 #endif

 	do_service(addr, port, key, cert);
@@ -1,7 +1,7 @@
 #!/usr/local/bin/bash
-# run tdir tests from within a VM.  Looks for loopback addr.
+# run tpkg tests from within a VM.  Looks for loopback addr.
 # if run not from within a VM, runs the tests as usual.
-# with one argument: run that tdir, otherwise, run all tdirs.
+# with one argument: run that tpkg, otherwise, run all tpkgs.

 get_lo0_ip4() {
        if test -x /sbin/ifconfig
@@ -23,12 +23,12 @@ else
        ALT_LOOPBACK=true
 fi
 cd testdata
-TPKG=../testcode/mini_tdir.sh
-#RUNLIST=`(ls -1d *.tdir|grep -v '^0[016]')`
-RUNLIST=`(ls -1d *.tdir)`
+TPKG=../testcode/mini_tpkg.sh
+#RUNLIST=`(ls -1 *.tpkg|grep -v '^0[016]')`
+RUNLIST=`(ls -1 *.tpkg)`
 if test "$#" = "1"; then RUNLIST="$1"; fi

-# fix up tdir that was edited on keyboard interrupt.
+# fix up tpkg that was edited on keyboard interrupt.
 cleanup() {
 	echo cleanup
 	if test -f "$t.bak"; then mv "$t.bak" "$t"; fi
@@ -44,15 +44,16 @@ do
 		continue
 	fi
 	# We have alternative 127.0.0.1 number
-	if ( echo $t | grep '6\.tdir$' ) # skip IPv6 tests
+	if ( echo $t | grep '6\.tpkg$' ) # skip IPv6 tests
 	then
 		continue
-       	elif test "$t" = "edns_cache.tdir" # This one is IPv6 too!
+       	elif test "$t" = "edns_cache.tpkg" # This one is IPv6 too!
 	then
 		continue
 	fi
-	cp -ap "$t" "$t.bak"
-	find "${t}" -type f \
+	cp -p "$t" "$t.bak"
+	tar xzf $t
+	find "${t%.tpkg}.dir" -type f \
 		-exec grep -q -e '127\.0\.0\.1' -e '@localhost' {} \; -print | {
 		while read f
 		do
@@ -62,14 +63,15 @@ do
 			mv "$f._" "$f"
 		done
 	}
-	find "${t}" -type d -name "127.0.0.1" -print | {
+	find "${t%.tpkg}.dir" -type d -name "127.0.0.1" -print | {
 		while read d
 		do
 			mv -v "$d" "${d%127.0.0.1}${LO0_IP4}"
 		done
 	}
+	tar czf $t "${t%.tpkg}.dir"
+	rm -fr "${t%.tpkg}.dir"
 	$TPKG exe $t
-	rm -fr "${t}"
 	mv "$t.bak" "$t"
 done
 # get out of testdata/
@@ -410,9 +410,7 @@ int main(int argc, char** argv)
 		return 1;
 	}
 	if(usessl) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 		ERR_load_SSL_strings();
-#endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO)
 		OpenSSL_add_all_algorithms();
 #else
@@ -423,7 +421,7 @@ int main(int argc, char** argv)
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL)
 		(void)SSL_library_init();
 #else
-		(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
+		(void)OPENSSL_init_ssl(0, NULL);
 #endif
 	}
 	send_em(svr, udp, usessl, noanswer, argc, argv);
@@ -86,7 +86,7 @@
 */

 /* what should we check?
- * X - is it balanced? (a node with 1 child should not have  
+ * X - is it balanced? (a node with 1 child shoudl not have  
 * a node with 1 child MUST have elem
 * child must be sub of parent
 * edge must be longer than parent edge
@@ -299,7 +299,6 @@ verifytest_file(const char* fname, const char* at_date)
 	struct module_env env;
 	struct val_env ve;
 	time_t now = time(NULL);
-	unit_show_func("signature verify", fname);

 	if(!list)
 		fatal_exit("could not read %s: %s", fname, strerror(errno));
@@ -342,7 +341,6 @@ dstest_file(const char* fname)
 	struct entry* e;
 	struct entry* list = read_datafile(fname, 1);
 	struct module_env env;
-	unit_show_func("DS verify", fname);

 	if(!list)
 		fatal_exit("could not read %s: %s", fname, strerror(errno));
@@ -476,7 +474,6 @@ nsec3_hash_test(const char* fname)
 	sldns_buffer* buf = sldns_buffer_new(65535);
 	struct entry* e;
 	struct entry* list = read_datafile(fname, 1);
-	unit_show_func("NSEC3 hash", fname);

 	if(!list)
 		fatal_exit("could not read %s: %s", fname, strerror(errno));
@@ -1,16 +0,0 @@
-BaseName: 00-lint
-Version: 1.0
-Description: Put source into lint.
-CreationDate: Wed Jan  3 14:12:02 CET 2007
-Maintainer: dr. W.C.A. Wijngaards
-Category: 
-Component:
-CmdDepends: 
-Depends: 
-Help:
-Pre:
-Post:
-Test: 00-lint.test
-AuxFiles: 
-Passed:
-Failure:
@@ -1,11 +0,0 @@
-# #-- 00-lint.test --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-. ../common.sh
-PRE="../.."
-get_make
-
-(cd $PRE ; $MAKE lint)
-
@@ -1,16 +0,0 @@
-BaseName: 01-doc
-Version: 1.0
-Description: Check documentation
-CreationDate: Wed Jan  3 15:15:01 CET 2007
-Maintainer: dr. W.C.A. Wijngaards
-Category: 
-Component:
-CmdDepends: 
-Depends: 
-Help:
-Pre:
-Post:
-Test: 01-doc.test
-AuxFiles: 
-Passed:
-Failure:
@@ -1,47 +0,0 @@
-# #-- 01-doc.test --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-. ../common.sh
-
-set_doxygen_path
-
-PRE="../.."
-get_make
-(cd $PRE ; $MAKE doc) > mylog 2>&1
-
-bad=0
-if grep -e "Warning" -e "warning" -e "Error" -e "error" mylog >/dev/null 2>&1;
-then
-	cat mylog
-	bad=1
-else
-	# "doxygen ok"
-	cat mylog
-fi
-
-(cd $PRE; find . -name "*.h" -print) >hlist
-(cd $PRE; find . -name "*.c" -print) >>hlist
-# filter out config.h
-fgrep -v -e "config.h" hlist > ilist; mv ilist hlist
-fgrep -v -e "util/configparser" hlist > ilist; mv ilist hlist
-fgrep -v -e "util/configlexer" hlist > ilist; mv ilist hlist
-fgrep -v -e "util/configyyrename" hlist > ilist; mv ilist hlist
-fgrep -v -e "util/locks.h" hlist > ilist; mv ilist hlist
-fgrep -v -e "util/storage/lookup3.c" hlist > ilist; mv ilist hlist
-fgrep -v -e "ldns-src/" hlist > ilist; mv ilist hlist
-fgrep -v -e "libunbound/python/libunbound_wrap.c" hlist > ilist; mv ilist hlist
-fgrep -v -e "pythonmod/interface.h" hlist > ilist; mv ilist hlist
-fgrep -v -e "dnstap" hlist > ilist; mv ilist hlist
-# filter out compat
-fgrep -v -e "compat/" hlist > ilist; mv ilist hlist
-for h in `cat hlist`; do
-	if fgrep "`basename $h`" $PRE/doc/html/files.html >/dev/null; then
-		: # ok
-	else
-		echo "Warning: $h has no documentation."
-		bad=1
-	fi
-done
-exit $bad
@@ -1,16 +0,0 @@
-BaseName: 02-unittest
-Version: 1.0
-Description: Unit tests.
-CreationDate: Thu Jan  4 16:32:42 CET 2007
-Maintainer: dr. W.C.A. Wijngaards
-Category: 
-Component:
-CmdDepends: 
-Depends: 
-Help:
-Pre:
-Post:
-Test: 02-unittest.test
-AuxFiles: 
-Passed:
-Failure:
@@ -1,26 +0,0 @@
-# #-- 02-unittest.test --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-
-. ../common.sh
-PRE="../.."
-get_make
-(cd $PRE ; $MAKE unittest; $MAKE lock-verify)
-
-if (cd $PRE; ./unittest); then
-	echo "unit test worked."
-else
-	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
-fi
-exit 0
@@ -1,16 +0,0 @@
-BaseName: 03-testbound
-Version: 1.0
-Description: Run testbound event replay scenarios.
-CreationDate: Tue Feb 13 16:36:18 CET 2007
-Maintainer: dr. W.C.A. Wijngaards
-Category: 
-Component:
-CmdDepends: 
-Depends: 
-Help:
-Pre:
-Post:
-Test: 03-testbound.test
-AuxFiles: 
-Passed:
-Failure:
@@ -1,123 +0,0 @@
-# #-- 03-testbound.test --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-
-. ../common.sh
-PRE="../.."
-get_make
-(cd $PRE ; $MAKE testbound)
-exitval=0
-# quiet="" to make verbose
-
-do_valgrind=no
-# valgrind mode for debug
-#if grep "staticexe=-static" $PRE/Makefile >/dev/null 2>&1; then
-#	if test -x "`which valgrind`"; then
-#		do_valgrind=yes
-#	fi
-#fi
-
-# self-test (unit test of testbound)
-if test $do_valgrind = "yes"; then
-	if (valgrind $PRE/testbound -s >tmpout 2>&1;); then
-		echo "selftest   OK  "
-	else
-		echo "selftest FAILED"
-		exit 1
-	fi
-	if grep "All heap blocks were freed -- no leaks are possible." tmpout >/dev/null 2>&1; then
-		:  # clean
-	else
-		echo "Memory leaked in selftest"
-		grep "in use at exit" tmpout
-		exit 1
-	fi
-else
-	if ($PRE/testbound -s >/dev/null 2>&1;); then
-		echo "selftest   OK  "
-	else
-		echo "selftest FAILED"
-		exit 1
-	fi
-fi
-
-
-# the .crpl are not always supported and need checking for SHA256 and GOST
-# support.
-# the .rpl should work on any system (portable).
-for input in $PRE/testdata/*.rpl $PRE/testdata/*.crpl; do
-	header=`grep SCENARIO_BEGIN $input | head -1 | sed -e 's/SCENARIO_BEGIN //'`
-	cleaninput=`echo $input | sed -e "s?$PRE/testdata/??"`
-
-	# detect if SHA256 is needed
-	if echo $cleaninput | grep sha2 >/dev/null 2>&1; then
-		if $PRE/testbound -2 >/dev/null 2>&1; then
-			: # the SHA256 is supported
-		else
-			continue
-		fi
-	fi
-
-	# detect if GOST is needed
-	if echo $cleaninput | grep gost >/dev/null 2>&1; then
-		if $PRE/testbound -g >/dev/null 2>&1; then
-			: # GOST is supported
-		else
-			continue
-		fi
-	fi
-
-	# detect if CLIENT_SUBNET is needed
-	if echo $cleaninput | grep subnet >/dev/null 2>&1; then
-		if $PRE/testbound -c >/dev/null 2>&1; then
-			: # CLIENT_SUBNET is supported
-		else
-			continue
-		fi
-	fi
-
-	# detect if IPSECMOD is needed
-	if echo $cleaninput | grep ipsecmod >/dev/null 2>&1; then
-		if $PRE/testbound -i >/dev/null 2>&1; then
-			: # IPSECMOD is supported
-		else
-			continue
-		fi
-	fi
-
-	if test $do_valgrind = "yes"; then
-		if (valgrind $PRE/testbound -p $input >tmpout 2>&1;); then
-			echo "  OK   $cleaninput: $header"
-		else
-			echo "FAILED $cleaninput: $header"
-			exitval=1
-		fi
-		if grep "All heap blocks were freed -- no leaks are possible." tmpout >/dev/null 2>&1; then
-			:  # clean
-		else
-			echo "Memory leaked in $cleaninput"
-			grep "in use at exit" tmpout
-			exitval=1
-		fi
-	else
-		# do valgrind=no
-		if ($PRE/testbound -p $input >/dev/null 2>&1;); then
-			echo "  OK   $cleaninput: $header"
-		else
-			echo "FAILED $cleaninput: $header"
-			exitval=1
-		fi
-	fi
-	if test -f ublocktrace.0; then
-        	if $PRE/lock-verify ublocktrace.*; then
-                	#echo "lock-verify test $input worked."
-			i=i
-        	else
-                	echo "lock-verify test $input failed."
-			exitval=1
-        	fi
-	fi
-done
-exit $exitval
@@ -1,16 +0,0 @@
-BaseName: 04-checkconf
-Version: 1.0
-Description: Test configuration checker.
-CreationDate: Fri Sep 28 15:46:27 CEST 2007
-Maintainer: dr. W.C.A. Wijngaards
-Category: 
-Component:
-CmdDepends: 
-Depends: 
-Help:
-Pre:
-Post:
-Test: 04-checkconf.test
-AuxFiles: 
-Passed:
-Failure:
@@ -1,72 +0,0 @@
-# #-- 04-checkconf.test --#
-# source the master var file when it's there
-[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
-# use .tpkg.var.test for in test variable passing
-[ -f .tpkg.var.test ] && source .tpkg.var.test
-
-PRE="../.."
-# test that failed exit code is used
-$PRE/unbound-checkconf bla bla bla>/dev/null
-if test $? != 1; then
-	echo "exit code for usage wrong"
-	exit 1
-fi
-$PRE/unbound-checkconf -h >/dev/null
-if test $? != 1; then
-	echo "exit code for usage wrong"
-	exit 1
-fi
-$PRE/unbound-checkconf notexist_file 
-if test $? != 1; then
-	echo "exit code for nofile wrong"
-	exit 1
-fi
-
-# detect windows
-if grep "define UB_ON_WINDOWS 1" ../../config.h; then
-	onwin=1
-else
-	onwin=0
-fi
-
-# test check of config files.
-for f in bad.*; do
-	echo
-	echo $PRE/unbound-checkconf $f
-	if test $f = "bad.user" -a $onwin -eq 1; then
-		echo "skipped on windows"
-		continue
-	fi
-
-	$PRE/unbound-checkconf $f
-	if test $? != 1; then
-		echo "exit code case $f wrong"
-		exit 1
-	fi
-done
-for f in good.*; do
-	echo
-	echo $PRE/unbound-checkconf $f
-	$PRE/unbound-checkconf $f
-	if test $? != 0; then
-		echo "exit code case $f wrong"
-		exit 1
-	fi
-done
-
-echo $PRE/unbound-checkconf warn.algo
-$PRE/unbound-checkconf warn.algo > outfile 2>&1
-if test $? != 0; then
-	cat outfile
-	echo "wrong exit code, warning should not fail with error"
-	exit 1
-fi
-cat outfile
-if grep "unsupported algo" outfile; then
-	echo "OK"
-else
-	echo "Failed, should print warning"
-	exit 1
-fi
-
-exit 0
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`¸_A¡O#÷ÛÈfó—ÌoD¶_�eÅ¶)\|'T¦éÜòO�`
				`@@ -1 +0,0 @@`
				-&ç6\Uùõñh`^"…ºz/C9‚ óˆ¸_A¡O#÷ÛÈfó—ÌoD¶_�eÅ¶)\|'T¦éÜòO�
				`@@ -1 +0,0 @@`
				`ΓR ς�ύeµτ{φl�ΑKΛ€Ξ:5r\±}KΣηƒ`
				`@@ -1 +0,0 @@`
				`ηi%‚ 5fΝ™–νΙϋ�νBnκΝ―.Ί“ΓR ς�ύeµτ{φl�ΑKΛ€Ξ:5r\±}KΣηƒ`