From 8dae5d9f81a179bdbb5fdcc730df4e8875f85cd2 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 7 May 2020 16:36:26 +0200
Subject: [PATCH 001/108] - Add DNS-over-HTTPS support

---
 Makefile.in               |   49 +-
 config.h.in               |   23 +-
 configure                 |  123 +-
 configure.ac              |   37 +-
 daemon/remote.c           |    2 +-
 daemon/worker.c           |    5 +-
 doc/example.conf.in       |    6 +-
 doc/unbound.conf.5.in     |   23 +-
 services/listen_dnsport.c |  740 +++++-
 services/listen_dnsport.h |   35 +-
 services/mesh.c           |    8 +
 services/mesh.h           |    2 +
 sldns/parseutil.c         |   45 +-
 sldns/parseutil.h         |    3 +-
 testcode/fake_event.c     |    6 +
 util/config_file.c        |    3 +
 util/config_file.h        |    2 +
 util/configlexer.c        | 4844 +++++++++++++++++++------------------
 util/configlexer.lex      |    1 +
 util/configparser.c       | 3499 ++++++++++++++-------------
 util/configparser.h       |  593 +++--
 util/configparser.y       |   11 +
 util/iana_ports.inc       |    1 +
 util/net_help.c           |   21 +
 util/netevent.c           |  535 +++-
 util/netevent.h           |  135 +-
 26 files changed, 6188 insertions(+), 4564 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 51a13836b..3a63c97be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -663,7 +663,7 @@ dns.lo dns.o: $(srcdir)/services/cache/dns.c config.h $(srcdir)/iterator/iter_de
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
  $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/cache/dns.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/util/data/dname.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/module.h \
  $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
 infra.lo infra.o: $(srcdir)/services/cache/infra.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h \
  $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/services/cache/infra.h \
@@ -704,10 +704,11 @@ msgreply.lo msgreply.o: $(srcdir)/util/data/msgreply.c config.h $(srcdir)/util/d
  $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \
  $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/respip/respip.h
-packed_rrset.lo packed_rrset.o: $(srcdir)/util/data/packed_rrset.c config.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h \
- $(srcdir)/util/net_help.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h
+packed_rrset.lo packed_rrset.o: $(srcdir)/util/data/packed_rrset.c config.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/data/packed_rrset.h $(srcdir)/util/data/dname.h \
+ $(srcdir)/util/storage/lookup3.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h
 iterator.lo iterator.o: $(srcdir)/iterator/iterator.c config.h $(srcdir)/iterator/iterator.h \
  $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \
@@ -776,7 +777,7 @@ 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)/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 $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/services/mesh.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/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
@@ -799,10 +800,10 @@ mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(srcdir)/services/mesh.h $(s
  $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \
  $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \
  $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.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/fptr_wlist.h $(srcdir)/util/tube.h \
- $(srcdir)/util/alloc.h $(srcdir)/util/edns.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/data/dname.h \
- $(srcdir)/services/listen_dnsport.h
+ $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \
+ $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/alloc.h \
+ $(srcdir)/util/edns.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/data/dname.h $(srcdir)/services/listen_dnsport.h
 modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/services/modstack.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 \
@@ -903,7 +904,7 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h \
  $(srcdir)/services/outside_network.h  $(srcdir)/services/cache/infra.h \
  $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/dns64/dns64.h \
  $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \
@@ -914,15 +915,7 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/
  $(srcdir)/libunbound/worker.h
 locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
 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)/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)/services/rpz.h \
- $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \
- $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h
+mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h
 module.lo module.o: $(srcdir)/util/module.c config.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 $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
@@ -994,7 +987,7 @@ tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/u
  $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.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)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
+ $(srcdir)/util/tube.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)/util/log.h $(srcdir)/util/fptr_wlist.h \
@@ -1004,7 +997,7 @@ ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
+ $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.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 \
  $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
@@ -1273,7 +1266,8 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr
  $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/edns.h \
  $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \
  $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h \
- $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h
+ $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h \
+ $(srcdir)/dnstap/dtstream.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)/util/rbtree.h $(srcdir)/testcode/fake_event.h \
@@ -1307,7 +1301,8 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr
  $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/edns.h \
  $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \
  $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h \
- $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h
+ $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h \
+ $(srcdir)/dnstap/dtstream.h
 acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \
  $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \
@@ -1470,6 +1465,12 @@ unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c confi
 unbound-anchor.lo unbound-anchor.o: $(srcdir)/smallapp/unbound-anchor.c config.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h
 petal.lo petal.o: $(srcdir)/testcode/petal.c config.h
+unbound-dnstap-socket.lo unbound-dnstap-socket.o: $(srcdir)/dnstap/unbound-dnstap-socket.c config.h \
+ $(srcdir)/dnstap/dtstream.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/dnstap/dnstap_fstrm.h \
+ $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h \
+ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/config_file.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
 pythonmod_utils.lo pythonmod_utils.o: $(srcdir)/pythonmod/pythonmod_utils.c config.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 $(srcdir)/sldns/pkthdr.h \
diff --git a/config.h.in b/config.h.in
index 3c46e3f3e..258352f3e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -28,6 +28,9 @@
 /* Whether daemon is deprecated */
 #undef DEPRECATED_DAEMON
 
+/* Define this to enable kernel based UDP source port randomization. */
+#undef DISABLE_EXPLICIT_PORT_RANDOMISATION
+
 /* default dnstap socket path */
 #undef DNSTAP_SOCKET_PATH
 
@@ -110,6 +113,10 @@
    don't. */
 #undef HAVE_DECL_INET_PTON
 
+/* Define to 1 if you have the declaration of `nghttp2_session_server_new',
+   and to 0 if you don't. */
+#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW
+
 /* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you
    don't. */
 #undef HAVE_DECL_NID_ED25519
@@ -368,6 +375,12 @@
 /* Define to 1 if you have the <nettle/eddsa.h> header file. */
 #undef HAVE_NETTLE_EDDSA_H
 
+/* Define this to use nghttp2 client. */
+#undef HAVE_NGHTTP2
+
+/* Define to 1 if you have the <nghttp2/nghttp2.h> header file. */
+#undef HAVE_NGHTTP2_NGHTTP2_H
+
 /* Use libnss for crypto */
 #undef HAVE_NSS
 
@@ -491,6 +504,9 @@
 /* Define if you have the SSL libraries installed. */
 #undef HAVE_SSL
 
+/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */
+#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
+
 /* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */
 #undef HAVE_SSL_CTX_SET_CIPHERSUITES
 
@@ -811,9 +827,8 @@
 /* Define to 1 to use ipset support */
 #undef USE_IPSET
 
-/* Define to 1 to disable explict UDP source port randomisation and rely on the
-   kernel to provide random source ports */
-#undef DISABLE_EXPLICIT_PORT_RANDOMISATION
+/* Define if you enable libevent */
+#undef USE_LIBEVENT
 
 /* Define if you want to use internal select based events */
 #undef USE_MINI_EVENT
@@ -1349,6 +1364,8 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file,
 #define UNBOUND_DNS_PORT 53
 /** default port for DNS over TLS traffic. */
 #define UNBOUND_DNS_OVER_TLS_PORT 853
+/** default port for DNS over HTTPS traffic. */
+#define UNBOUND_DNS_OVER_HTTPS_PORT 443
 /** default port for unbound control traffic, registered port with IANA,
     ub-dns-control  8953/tcp    unbound dns nameserver control */
 #define UNBOUND_CONTROL_PORT 8953
diff --git a/configure b/configure
index d9355009c..107eedc11 100755
--- a/configure
+++ b/configure
@@ -804,6 +804,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -877,6 +878,7 @@ enable_tfo_server
 with_libevent
 with_libexpat
 with_libhiredis
+with_libnghttp2
 enable_static_exe
 enable_fully_static
 enable_lock_checks
@@ -951,6 +953,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1203,6 +1206,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1340,7 +1352,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1493,6 +1505,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1635,6 +1648,7 @@ Optional Packages:
                           outgoing port ranges.
   --with-libexpat=path    specify explicit path for libexpat.
   --with-libhiredis=path  specify explicit path for libhiredis.
+  --with-libnghttp2=path  specify explicit path for libnghttp2.
   --with-dnstap-socket-path=pathname
                           set default dnstap socket path
   --with-protobuf-c=path  Path where protobuf-c is installed, for dnstap
@@ -15666,7 +15680,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15712,7 +15726,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15736,7 +15750,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15781,7 +15795,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15805,7 +15819,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -18306,7 +18320,7 @@ done
 # these check_funcs need -lssl
 BAKLIBS="$LIBS"
 LIBS="-lssl $LIBS"
-for ac_func in OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites
+for ac_func in OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites SSL_CTX_set_alpn_select_cb
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -19124,31 +19138,34 @@ esac
 if test "${with_libevent+set}" = set; then :
   withval=$with_libevent;
 else
-   withval="no"
+   with_libevent="no"
 fi
 
-if test x_$withval = x_yes -o x_$withval != x_no; then
+if test "x_$with_libevent" != x_no; then
+
+$as_echo "#define USE_LIBEVENT 1" >>confdefs.h
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent" >&5
 $as_echo_n "checking for libevent... " >&6; }
-        if test x_$withval = x_ -o x_$withval = x_yes; then
-            withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
+        if test "x_$with_libevent" = x_ -o "x_$with_libevent" = x_yes; then
+            with_libevent="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
         fi
-        for dir in $withval; do
+        for dir in $with_libevent; do
             thedir="$dir"
             if test -f "$dir/include/event.h" -o -f "$dir/include/event2/event.h"; then
                 found_libevent="yes"
-				if test "$thedir" != "/usr"; then
-                    CPPFLAGS="$CPPFLAGS -I$thedir/include"
-		fi
-                break;
-            fi
+								if test "$thedir" != "/usr"; then
+				    CPPFLAGS="$CPPFLAGS -I$thedir/include"
+				fi
+				break;
+		    fi
         done
         if test x_$found_libevent != x_yes; then
 		if test -f "$dir/event.h" -a \( -f "$dir/libevent.la" -o -f "$dir/libev.la" \) ; then
 			# libevent source directory
-            		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $thedir" >&5
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $thedir" >&5
 $as_echo "found in $thedir" >&6; }
-                	CPPFLAGS="$CPPFLAGS -I$thedir -I$thedir/include"
+			CPPFLAGS="$CPPFLAGS -I$thedir -I$thedir/include"
 			BAK_LDFLAGS_SET="1"
 			BAK_LDFLAGS="$LDFLAGS"
 			# remove evdns from linking
@@ -19161,10 +19178,10 @@ $as_echo "found in $thedir" >&6; }
 			cp $ev_files_o build/libevent
 			cp $ev_files_lo build/libevent
 			cp $ev_files_libso build/libevent/.libs
-            		LATE_LDFLAGS="build/libevent/*.lo -lm"
+			LATE_LDFLAGS="build/libevent/*.lo -lm"
 			LDFLAGS="build/libevent/*.o $LDFLAGS -lm"
 		else
-            		as_fn_error $? "Cannot find the libevent library in $withval
+            as_fn_error $? "Cannot find the libevent library in $with_libevent
 You can restart ./configure --with-libevent=no to use a builtin alternative.
 Please note that this alternative is not as capable as libevent when using
 large outgoing port ranges.  " "$LINENO" 5
@@ -19615,6 +19632,70 @@ _ACEOF
 
 fi
 
+# nghttp2
+
+# Check whether --with-libnghttp2 was given.
+if test "${with_libnghttp2+set}" = set; then :
+  withval=$with_libnghttp2;
+else
+   withval="no"
+fi
+
+found_libnghttp2="no"
+if test x_$withval = x_yes -o x_$withval != x_no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnghttp2" >&5
+$as_echo_n "checking for libnghttp2... " >&6; }
+   if test x_$withval = x_ -o x_$withval = x_yes; then
+            withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
+   fi
+   for dir in $withval ; do
+            if test -f "$dir/include/nghttp2/nghttp2.h"; then
+		found_libnghttp2="yes"
+				if test "$dir" != "/usr"; then
+                    CPPFLAGS="$CPPFLAGS -I$dir/include"
+		    LDFLAGS="$LDFLAGS -L$dir/lib"
+		fi
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $dir" >&5
+$as_echo "found in $dir" >&6; }
+
+$as_echo "#define HAVE_NGHTTP2 1" >>confdefs.h
+
+		LIBS="$LIBS -lnghttp2"
+                break;
+            fi
+    done
+    if test x_$found_libnghttp2 != x_yes; then
+	as_fn_error $? "Could not find libnghttp2, nghttp2.h" "$LINENO" 5
+    fi
+    for ac_header in nghttp2/nghttp2.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "nghttp2/nghttp2.h" "ac_cv_header_nghttp2_nghttp2_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_nghttp2_nghttp2_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NGHTTP2_NGHTTP2_H 1
+_ACEOF
+
+fi
+
+done
+
+    ac_fn_c_check_decl "$LINENO" "nghttp2_session_server_new" "ac_cv_have_decl_nghttp2_session_server_new" "$ac_includes_default
+    #include <nghttp2/nghttp2.h>
+
+"
+if test "x$ac_cv_have_decl_nghttp2_session_server_new" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW $ac_have_decl
+_ACEOF
+
+fi
+
 # set static linking for uninstalled libraries if requested
 
 staticexe=""
diff --git a/configure.ac b/configure.ac
index e71bc5888..6b761974a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -830,7 +830,7 @@ AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_C
 # these check_funcs need -lssl
 BAKLIBS="$LIBS"
 LIBS="-lssl $LIBS"
-AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites])
+AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites SSL_CTX_set_alpn_select_cb])
 LIBS="$BAKLIBS"
 
 AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [
@@ -1369,6 +1369,39 @@ if test x_$withval = x_yes -o x_$withval != x_no; then
     ])
 fi
 
+# nghttp2
+AC_ARG_WITH(libnghttp2, AC_HELP_STRING([--with-libnghttp2=path],
+    [specify explicit path for libnghttp2.]),
+    [ ],[ withval="no" ])
+found_libnghttp2="no"
+if test x_$withval = x_yes -o x_$withval != x_no; then
+   AC_MSG_CHECKING(for libnghttp2)
+   if test x_$withval = x_ -o x_$withval = x_yes; then
+            withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
+   fi
+   for dir in $withval ; do
+            if test -f "$dir/include/nghttp2/nghttp2.h"; then
+		found_libnghttp2="yes"
+		dnl assume /usr is in default path.
+		if test "$dir" != "/usr"; then
+                    CPPFLAGS="$CPPFLAGS -I$dir/include"
+		    LDFLAGS="$LDFLAGS -L$dir/lib"
+		fi
+		AC_MSG_RESULT(found in $dir)
+		AC_DEFINE([HAVE_NGHTTP2], [1], [Define this to use nghttp2 client.])
+		LIBS="$LIBS -lnghttp2"
+                break;
+            fi
+    done
+    if test x_$found_libnghttp2 != x_yes; then
+	AC_ERROR([Could not find libnghttp2, nghttp2.h])
+    fi
+    AC_CHECK_HEADERS([nghttp2/nghttp2.h],,, [AC_INCLUDES_DEFAULT])
+    AC_CHECK_DECLS([nghttp2_session_server_new], [], [], [AC_INCLUDES_DEFAULT
+    #include <nghttp2/nghttp2.h>
+    ])
+fi
+
 # set static linking for uninstalled libraries if requested
 AC_SUBST(staticexe)
 staticexe=""
@@ -2105,6 +2138,8 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file,
 #define UNBOUND_DNS_PORT 53
 /** default port for DNS over TLS traffic. */
 #define UNBOUND_DNS_OVER_TLS_PORT 853
+/** default port for DNS over HTTPS traffic. */
+#define UNBOUND_DNS_OVER_HTTPS_PORT 443
 /** default port for unbound control traffic, registered port with IANA,
     ub-dns-control  8953/tcp    unbound dns nameserver control */
 #define UNBOUND_CONTROL_PORT 8953
diff --git a/daemon/remote.c b/daemon/remote.c
index f4b7298cb..5eb829859 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -329,7 +329,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err,
 
 		/* open fd */
 		fd = create_tcp_accept_sock(res, 1, &noproto, 0,
-			cfg->ip_transparent, 0, cfg->ip_freebind, cfg->use_systemd);
+			cfg->ip_transparent, 0, 0, cfg->ip_freebind, cfg->use_systemd);
 		freeaddrinfo(res);
 	}
 
diff --git a/daemon/worker.c b/daemon/worker.c
index cec6bcd66..24fb3f30e 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1109,7 +1109,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	struct respip_client_info* cinfo = NULL, cinfo_tmp;
 	memset(&qinfo, 0, sizeof(qinfo));
 
-	if(error != NETEVENT_NOERROR || !repinfo) {
+	if((error != NETEVENT_NOERROR && error != NETEVENT_DONE)|| !repinfo) {
 		/* some bad tcp query DNS formats give these error calls */
 		verbose(VERB_ALGO, "handle request called with err=%d", error);
 		return 0;
@@ -1797,7 +1797,8 @@ worker_init(struct worker* worker, struct config_file *cfg,
 		cfg->do_tcp_keepalive
 			? cfg->tcp_keepalive_timeout
 			: cfg->tcp_idle_timeout,
-			worker->daemon->tcl,
+		cfg->harden_large_queries,
+		worker->daemon->tcl,
 		worker->daemon->listen_sslctx,
 		dtenv, worker_handle_request, worker);
 	if(!worker->front) {
diff --git a/doc/example.conf.in b/doc/example.conf.in
index dbc30a48c..dbcb97cec 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -729,12 +729,14 @@ server:
 	# add a netblock specific override to a localzone, with zone type
 	# local-zone-override: "example.com" 192.0.2.0/24 refuse
 
-	# service clients over TLS (on the TCP sockets), with plain DNS inside
-	# the TLS stream.  Give the certificate to use and private key.
+	# service clients over TLS (on the TCP sockets) with plain DNS inside
+	# the TLS stream, and over HTTPS using HTTP/2 as specified in RFC8484.
+	# Give the certificate to use and private key.
 	# default is "" (disabled).  requires restart to take effect.
 	# tls-service-key: "path/to/privatekeyfile.key"
 	# tls-service-pem: "path/to/publiccertfile.pem"
 	# tls-port: 853
+	# https-port: 443
 
 	# cipher setting for TLSv1.2
 	# tls-ciphers: "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256"
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 43159666d..3f14061c9 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -469,15 +469,16 @@ Alternate syntax for \fBtls\-upstream\fR.  If both are present in the config
 file the last is used.
 .TP
 .B tls\-service\-key: \fI<file>
-If enabled, the server provides TLS service on the TCP ports marked
-implicitly or explicitly for TLS service with tls\-port.  The file must
-contain the private key for the TLS session, the public certificate is in
-the tls\-service\-pem file and it must also be specified if tls\-service\-key
-is specified.  The default is "", turned off.  Enabling or disabling
-this service requires a restart (a reload is not enough), because the
-key is read while root permissions are held and before chroot (if any).
-The ports enabled implicitly or explicitly via \fBtls\-port:\fR do not provide
-normal DNS TCP service.
+If enabled, the server provides DNS-over-TLS or DNS-over-HTTPS service on the
+TCP ports marked implicitly or explicitly for these services with tls\-port or
+https\-port. The file must contain the private key for the TLS session, the
+public certificate is in the tls\-service\-pem file and it must also be
+specified if tls\-service\-key is specified.  The default is "", turned off.
+Enabling or disabling this service requires a restart (a reload is not enough),
+because the key is read while root permissions are held and before chroot (if any).
+The ports enabled implicitly or explicitly via \fBtls\-port:\fR and
+\fBhttps\-port:\fR do not provide normal DNS TCP service. Unbound needs to be
+compiled with libnghttp2 in order to provide DNS-over-HTTPS.
 .TP
 .B ssl\-service\-key: \fI<file>
 Alternate syntax for \fBtls\-service\-key\fR.
@@ -493,6 +494,10 @@ Alternate syntax for \fBtls\-service\-pem\fR.
 The port number on which to provide TCP TLS service, default 853, only
 interfaces configured with that port number as @number get the TLS service.
 .TP
+.B https\-port: \fI<number>
+The port number on which to provide DNS-over-HTTPS service, default 443, only
+interfaces configured with that port number as @number get the HTTPS service.
+.TP
 .B ssl\-port: \fI<number>
 Alternate syntax for \fBtls\-port\fR.
 .TP
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 7e2afd843..fdfed0a40 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -53,6 +53,7 @@
 #include "util/config_file.h"
 #include "util/net_help.h"
 #include "sldns/sbuffer.h"
+#include "sldns/parseutil.h"
 #include "services/mesh.h"
 #include "util/fptr_wlist.h"
 #include "util/locks.h"
@@ -638,7 +639,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 
 int
 create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
-	int* reuseport, int transparent, int mss, int freebind, int use_systemd)
+	int* reuseport, int transparent, int mss, int nodelay, int freebind,
+	int use_systemd)
 {
 	int s;
 #if defined(SO_REUSEADDR) || defined(SO_REUSEPORT) || defined(IPV6_V6ONLY) || defined(IP_TRANSPARENT) || defined(IP_BINDANY) || defined(IP_FREEBIND) || defined(SO_BINDANY)
@@ -685,6 +687,36 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 #endif
 		return -1;
 	}
+	if(nodelay) {
+#if defined(IPPROTO_TCP) && defined(TCP_NODELAY)
+		if(setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (void*)&on,
+			(socklen_t)sizeof(on)) < 0) {
+			#ifndef USE_WINSOCK
+			log_err(" setsockopt(.. TCP_NODELAY ..) failed: %s",
+				strerror(errno));
+			#else
+			log_err(" setsockopt(.. TCP_NODELAY ..) failed: %s",
+				wsa_strerror(WSAGetLastError()));
+			#endif
+		}
+#else
+		log_warn(" setsockopt(TCP_NODELAY) unsupported");
+#endif /* defined(IPPROTO_TCP) && defined(TCP_NODELAY) */
+#if defined(IPPROTO_TCP) && defined(TCP_QUICKACK)
+		if(setsockopt(s, IPPROTO_TCP, TCP_QUICKACK, (void*)&on,
+			(socklen_t)sizeof(on)) < 0) {
+			#ifndef USE_WINSOCK
+			log_err(" setsockopt(.. TCP_QUICKACK ..) failed: %s",
+				strerror(errno));
+			#else
+			log_err(" setsockopt(.. TCP_QUICKACK ..) failed: %s",
+				wsa_strerror(WSAGetLastError()));
+			#endif
+		}
+#else
+		log_warn(" setsockopt(TCP_QUICKACK) unsupported");
+#endif /* defined(IPPROTO_TCP) && defined(TCP_QUICKACK) */
+	}
 	if (mss > 0) {
 #if defined(IPPROTO_TCP) && defined(TCP_MAXSEG)
 		if(setsockopt(s, IPPROTO_TCP, TCP_MAXSEG, (void*)&mss,
@@ -952,7 +984,8 @@ err:
 static int
 make_sock(int stype, const char* ifname, const char* port, 
 	struct addrinfo *hints, int v6only, int* noip6, size_t rcv, size_t snd,
-	int* reuseport, int transparent, int tcp_mss, int freebind, int use_systemd)
+	int* reuseport, int transparent, int tcp_mss, int nodelay, int freebind,
+	int use_systemd)
 {
 	struct addrinfo *res = NULL;
 	int r, s, inuse, noproto;
@@ -988,7 +1021,7 @@ make_sock(int stype, const char* ifname, const char* port,
 		}
 	} else	{
 		s = create_tcp_accept_sock(res, v6only, &noproto, reuseport,
-			transparent, tcp_mss, freebind, use_systemd);
+			transparent, tcp_mss, nodelay, freebind, use_systemd);
 		if(s == -1 && noproto && hints->ai_family == AF_INET6){
 			*noip6 = 1;
 		}
@@ -1001,7 +1034,8 @@ make_sock(int stype, const char* ifname, const char* port,
 static int
 make_sock_port(int stype, const char* ifname, const char* port, 
 	struct addrinfo *hints, int v6only, int* noip6, size_t rcv, size_t snd,
-	int* reuseport, int transparent, int tcp_mss, int freebind, int use_systemd)
+	int* reuseport, int transparent, int tcp_mss, int nodelay, int freebind,
+	int use_systemd)
 {
 	char* s = strchr(ifname, '@');
 	if(s) {
@@ -1023,10 +1057,11 @@ make_sock_port(int stype, const char* ifname, const char* port,
 		(void)strlcpy(p, s+1, sizeof(p));
 		p[strlen(s+1)]=0;
 		return make_sock(stype, newif, p, hints, v6only, noip6,
-			rcv, snd, reuseport, transparent, tcp_mss, freebind, use_systemd);
+			rcv, snd, reuseport, transparent, tcp_mss, nodelay,
+			freebind, use_systemd);
 	}
 	return make_sock(stype, ifname, port, hints, v6only, noip6, rcv, snd,
-		reuseport, transparent, tcp_mss, freebind, use_systemd);
+		reuseport, transparent, tcp_mss, nodelay, freebind, use_systemd);
 }
 
 /**
@@ -1125,6 +1160,18 @@ if_is_ssl(const char* ifname, const char* port, int ssl_port,
 	return 0;
 }
 
+/** see if interface is https, its port number == the https port number */
+static int
+if_is_https(const char* ifname, const char* port, int https_port)
+{
+	char* p = strchr(ifname, '@');
+	if(!p && atoi(port) == https_port)
+		return 1;
+	if(p && atoi(p+1) == https_port)
+		return 1;
+	return 0;
+}
+
 /**
  * Helper for ports_open. Creates one interface (or NULL for default).
  * @param ifname: The interface ip address.
@@ -1139,6 +1186,7 @@ if_is_ssl(const char* ifname, const char* port, int ssl_port,
  * @param snd: send buffer size for UDP
  * @param ssl_port: ssl service port number
  * @param tls_additional_port: list of additional ssl service port numbers.
+ * @param https_port: DoH service port number
  * @param reuseport: try to set SO_REUSEPORT if nonNULL and true.
  * 	set to false on exit if reuseport failed due to no kernel support.
  * @param transparent: set IP_TRANSPARENT socket option.
@@ -1152,11 +1200,13 @@ static int
 ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp, 
 	struct addrinfo *hints, const char* port, struct listen_port** list,
 	size_t rcv, size_t snd, int ssl_port,
-	struct config_strlist* tls_additional_port, int* reuseport,
-	int transparent, int tcp_mss, int freebind, int use_systemd,
-	int dnscrypt_port)
+	struct config_strlist* tls_additional_port, int https_port,
+	int* reuseport, int transparent, int tcp_mss, int freebind,
+	int use_systemd, int dnscrypt_port)
 {
 	int s, noip6=0;
+	int is_https = if_is_https(ifname, port, https_port);
+	int nodelay = is_https; /* TODO make config option */
 #ifdef USE_DNSCRYPT
 	int is_dnscrypt = ((strchr(ifname, '@') && 
 			atoi(strchr(ifname, '@')+1) == dnscrypt_port) ||
@@ -1171,7 +1221,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 	if(do_auto) {
 		if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1, 
 			&noip6, rcv, snd, reuseport, transparent,
-			tcp_mss, freebind, use_systemd)) == -1) {
+			tcp_mss, nodelay, freebind, use_systemd)) == -1) {
 			if(noip6) {
 				log_warn("IPv6 protocol not available");
 				return 1;
@@ -1200,7 +1250,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		/* regular udp socket */
 		if((s = make_sock_port(SOCK_DGRAM, ifname, port, hints, 1, 
 			&noip6, rcv, snd, reuseport, transparent,
-			tcp_mss, freebind, use_systemd)) == -1) {
+			tcp_mss, nodelay, freebind, use_systemd)) == -1) {
 			if(noip6) {
 				log_warn("IPv6 protocol not available");
 				return 1;
@@ -1220,8 +1270,17 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 	if(do_tcp) {
 		int is_ssl = if_is_ssl(ifname, port, ssl_port,
 			tls_additional_port);
+		enum listen_type port_type;
+		if(is_ssl)
+			port_type = listen_type_ssl;
+		else if(is_https)
+			port_type = listen_type_http;
+		else if(is_dnscrypt)
+			port_type = listen_type_tcp_dnscrypt;
+		else
+			port_type = listen_type_tcp;
 		if((s = make_sock_port(SOCK_STREAM, ifname, port, hints, 1, 
-			&noip6, 0, 0, reuseport, transparent, tcp_mss,
+			&noip6, 0, 0, reuseport, transparent, tcp_mss, nodelay,
 			freebind, use_systemd)) == -1) {
 			if(noip6) {
 				/*log_warn("IPv6 protocol not available");*/
@@ -1231,8 +1290,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		}
 		if(is_ssl)
 			verbose(VERB_ALGO, "setup TCP for SSL service");
-		if(!port_insert(list, s, is_ssl?listen_type_ssl:
-			(is_dnscrypt?listen_type_tcp_dnscrypt:listen_type_tcp))) {
+		if(!port_insert(list, s, port_type)) {
 #ifndef USE_WINSOCK
 			close(s);
 #else
@@ -1266,7 +1324,7 @@ listen_cp_insert(struct comm_point* c, struct listen_dnsport* front)
 struct listen_dnsport* 
 listen_create(struct comm_base* base, struct listen_port* ports,
 	size_t bufsize, int tcp_accept_count, int tcp_idle_timeout,
-	struct tcl_list* tcp_conn_limit, void* sslctx,
+	int harden_large_queries, struct tcl_list* tcp_conn_limit, void* sslctx,
 	struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg)
 {
 	struct listen_dnsport* front = (struct listen_dnsport*)
@@ -1298,14 +1356,35 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 				ports->ftype == listen_type_tcp_dnscrypt)
 			cp = comm_point_create_tcp(base, ports->fd, 
 				tcp_accept_count, tcp_idle_timeout,
+				harden_large_queries,
 				tcp_conn_limit, bufsize, front->udp_buff,
-				cb, cb_arg);
-		else if(ports->ftype == listen_type_ssl) {
+				ports->ftype, cb, cb_arg);
+		else if(ports->ftype == listen_type_ssl ||
+			ports->ftype == listen_type_http) {
 			cp = comm_point_create_tcp(base, ports->fd, 
 				tcp_accept_count, tcp_idle_timeout,
+				harden_large_queries,
 				tcp_conn_limit, bufsize, front->udp_buff,
-				cb, cb_arg);
+				ports->ftype, cb, cb_arg);
 			cp->ssl = sslctx;
+			if(ports->ftype == listen_type_http) {
+				if(!sslctx) {
+				log_warn("HTTPS port configured, but no TLS "
+					"tls-service-key or tls-service-pem "
+					"set");
+				}
+#ifndef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
+				log_warn("Unbound is not compiled with an "
+					"OpenSSL version supporting ALPN "
+					" (OpenSSL >= 1.0.2). This is required "
+					"to use DNS-over-HTTPS");
+#endif
+#ifndef HAVE_NGHTTP2_NGHTTP2_H
+				log_warn("Unbound is not compiled with "
+					"nghttp2. This is required to use "
+					"DNS-over-HTTPS.");
+#endif
+			}
 		} else if(ports->ftype == listen_type_udpancil ||
 				  ports->ftype == listen_type_udpancil_dnscrypt)
 			cp = comm_point_create_udp_ancil(base, ports->fd, 
@@ -1419,6 +1498,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				&hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
+				cfg->https_port,
 				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
 				cfg->dnscrypt_port)) {
@@ -1433,6 +1513,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				&hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
+				cfg->https_port,
 				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
 				cfg->dnscrypt_port)) {
@@ -1449,6 +1530,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				do_tcp, &hints, portbuf, &list, 
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
+				cfg->https_port,
 				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
 				cfg->dnscrypt_port)) {
@@ -1463,6 +1545,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				do_tcp, &hints, portbuf, &list, 
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
+				cfg->https_port,
 				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
 				cfg->dnscrypt_port)) {
@@ -1906,3 +1989,624 @@ size_t tcp_req_info_get_stream_buffer_size(void)
 	lock_basic_unlock(&stream_wait_count_lock);
 	return s;
 }
+
+#ifdef HAVE_NGHTTP2
+/** nghttp2 callback. Used to copy response from rbuffer to nghttp2 session */
+static ssize_t http2_submit_response_read_callback(
+	nghttp2_session* ATTR_UNUSED(session),
+	int32_t stream_id, uint8_t* buf, size_t length, uint32_t* data_flags,
+	nghttp2_data_source* source, void* ATTR_UNUSED(cb_arg))
+{
+	struct http2_stream* h2_stream;
+	struct http2_session* h2_session = source->ptr;
+	size_t copylen = length;
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		h2_session->session, stream_id))) {
+		verbose(VERB_QUERY, "http2: cannot get stream data, closing "
+			"stream");
+		return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+	}
+	if(!h2_stream->rbuffer ||
+		sldns_buffer_remaining(h2_stream->rbuffer) == 0) {
+		verbose(VERB_QUERY, "http2: cannot submit buffer. No data "
+			"available in rbuffer");
+		sldns_buffer_free(h2_stream->rbuffer);
+		h2_stream->rbuffer = NULL;
+		return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+	}
+
+	if(copylen > sldns_buffer_remaining(h2_stream->rbuffer))
+		copylen = sldns_buffer_remaining(h2_stream->rbuffer);
+	if(copylen > SSIZE_MAX)
+		copylen = SSIZE_MAX; /* will probably never happen */
+
+	memcpy(buf, sldns_buffer_current(h2_stream->rbuffer), copylen);
+	sldns_buffer_skip(h2_stream->rbuffer, copylen);
+
+	if(sldns_buffer_remaining(h2_stream->rbuffer) == 0) {
+		*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+		sldns_buffer_free(h2_stream->rbuffer);
+		h2_stream->rbuffer = NULL;
+	}
+
+	return copylen;
+}
+
+/**
+ * DNS response ready to be submitted to nghttp2, to be prepared for sending
+ * out. Response is stored in c->buffer. Copy to rbuffer because the c->buffer
+ * might be used before this will bne send out.
+ * @param h2_session: http2 session, containing c->buffer which contains answer
+ * @return 0 on error, 1 otherwise
+ */
+int http2_submit_dns_response(struct http2_session* h2_session)
+{
+	int ret;
+	nghttp2_data_provider data_prd;
+	char status[4];
+	nghttp2_nv headers[2];
+	struct http2_stream* h2_stream = h2_session->c->h2_stream;
+
+	if(h2_stream->rbuffer) {
+		log_err("http2 submit response error: rbuffer already "
+			"exists");
+		return 0;
+	}
+	if(sldns_buffer_remaining(h2_session->c->buffer) == 0) {
+		log_err("http2 submit response error: c->buffer not complete");
+		return 0;
+	}
+
+	if(!(h2_stream->rbuffer = sldns_buffer_new(
+		sldns_buffer_remaining(h2_session->c->buffer)))) {
+		log_err("http2 submit response error: malloc failure");
+		return 0;
+	}
+
+	if(snprintf(status, 4, "%d", h2_stream->status) != 3) {
+		verbose(VERB_QUERY, "http2: submit response error: "
+			"invalid status");
+		return 0;
+	}
+	headers[0].name = (uint8_t*)":status";
+	headers[0].namelen = 7;
+	headers[0].value = (uint8_t*)status;
+	headers[0].valuelen = 3;
+	headers[0].flags = NGHTTP2_NV_FLAG_NONE;
+
+	headers[1].name = (uint8_t*)"content-type";
+	headers[1].namelen = 12;
+	headers[1].value = (uint8_t*)"application/dns-message";
+	headers[1].valuelen = 23;
+	headers[1].flags = NGHTTP2_NV_FLAG_NONE;
+
+	/*TODO be nice and add the content-length header
+	headers[2].name = (uint8_t*)"content-length";
+	headers[2].namelen = 14;
+	headers[2].value = 
+	headers[2].valuelen = 
+	headers[2].flags = NGHTTP2_NV_FLAG_NONE;
+	*/
+
+	sldns_buffer_write(h2_stream->rbuffer,
+		sldns_buffer_current(h2_session->c->buffer),
+		sldns_buffer_remaining(h2_stream->rbuffer));
+	sldns_buffer_flip(h2_stream->rbuffer);
+
+	data_prd.source.ptr = h2_session;
+	data_prd.read_callback = http2_submit_response_read_callback;
+	ret = nghttp2_submit_response(h2_session->session, h2_stream->stream_id,
+		headers, 2, &data_prd);
+	if(ret) {
+		verbose(VERB_QUERY, "http2: set_stream_user_data failed, "
+			"error: %s", nghttp2_strerror(ret));
+		return 0;
+	}
+	return 1;
+}
+#else
+int http2_submit_dns_response(void* ATTR_UNUSED(v))
+{
+	return 0;
+}
+#endif
+
+#ifdef HAVE_NGHTTP2
+/** HTTP status to descriptive string */
+static char* http_status_to_str(enum http_status s)
+{
+	switch(s) {
+		case HTTP_STATUS_OK:
+			return "OK";
+		case HTTP_STATUS_BAD_REQUEST:
+			return "Bad Request";
+		case HTTP_STATUS_NOT_FOUND:
+			return "Not Found";
+		case HTTP_STATUS_PAYLOAD_TOO_LARGE:
+			return "Payload Too Large";
+		case HTTP_STATUS_URI_TOO_LONG:
+			return "URI Too Long";
+		case HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE:
+			return "Unsupported Media Type";
+		case HTTP_STATUS_NOT_IMPLEMENTED:
+			return "Not Implemented";
+	}
+	return "Status Unknown";
+}
+
+/** nghttp2 callback. Used to copy error message to nghttp2 session */
+static ssize_t http2_submit_error_read_callback(
+	nghttp2_session* ATTR_UNUSED(session),
+	int32_t stream_id, uint8_t* buf, size_t length, uint32_t* data_flags,
+	nghttp2_data_source* source, void* ATTR_UNUSED(cb_arg))
+{
+	struct http2_stream* h2_stream;
+	struct http2_session* h2_session = source->ptr;
+	char* msg;
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		h2_session->session, stream_id))) {
+		verbose(VERB_QUERY, "http2: cannot get stream data, closing "
+			"stream");
+		return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+	}
+	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+	msg = http_status_to_str(h2_stream->status);
+	if(length < strlen(msg))
+		return 0; /* not worth trying over multiple frames */
+	memcpy(buf, msg, strlen(msg));
+	return strlen(msg);
+
+}
+
+/**
+ * HTTP error response ready to be submitted to nghttp2, to be prepared for
+ * sending out. Message body will contain descriptive string for HTTP status.
+ * @param h2_session: http2 session to submit to
+ * @param h2_stream: http2 stream containing HTTP status to use for error
+ * @return 0 on error, 1 otherwise
+ */
+static int http2_submit_error(struct http2_session* h2_session,
+	struct http2_stream* h2_stream)
+{
+	int ret;
+	char status[4];
+	nghttp2_data_provider data_prd;
+	nghttp2_nv headers[1]; /* will be copied by nghttp */
+	if(snprintf(status, 4, "%d", h2_stream->status) != 3) {
+		verbose(VERB_QUERY, "http2: submit error failed, "
+			"invalid status");
+		return 0;
+	}
+	headers[0].name = (uint8_t*)":status";
+	headers[0].namelen = 7;
+	headers[0].value = (uint8_t*)status;
+	headers[0].valuelen = 3;
+	headers[0].flags = NGHTTP2_NV_FLAG_NONE;
+
+	data_prd.source.ptr = h2_session;
+	data_prd.read_callback = http2_submit_error_read_callback;
+
+	ret = nghttp2_submit_response(h2_session->session, h2_stream->stream_id,
+		headers, 1, &data_prd);
+	if(ret) {
+		verbose(VERB_QUERY, "http2: submit error failed, "
+			"error: %s", nghttp2_strerror(ret));
+		return 0;
+	}
+	return 1;
+}
+
+/**
+ * Start query handling. Query is stored in the stream, and will be free'd here.
+ * @param h2_session: http2 session, containing comm point
+ * @param h2_stream: stream containing buffered query
+ * @return: -1 on error, 1 if answer is stored in c->buffer, 0 if there is no
+ * reply available (yet).
+ */
+static int http2_query_read_done(struct http2_session* h2_session,
+	struct http2_stream* h2_stream)
+{
+	log_assert(h2_stream->qbuffer);
+
+	if(h2_session->c->h2_stream) {
+		verbose(VERB_ALGO, "http2_query_read_done failure: shared "
+			"buffer already assigned to stream");
+		return -1;
+	}
+	if(sldns_buffer_remaining(h2_session->c->buffer) <
+		sldns_buffer_remaining(h2_stream->qbuffer)) {
+		sldns_buffer_free(h2_stream->qbuffer);
+		h2_stream->qbuffer = NULL;
+		sldns_buffer_clear(h2_session->c->buffer);
+		verbose(VERB_ALGO, "http2_query_read_done failure: can't fit "
+			"qbuffer in c->buffer");
+		return -1;
+	}
+
+	sldns_buffer_write(h2_session->c->buffer,
+		sldns_buffer_current(h2_stream->qbuffer),
+		sldns_buffer_remaining(h2_stream->qbuffer));
+
+	sldns_buffer_free(h2_stream->qbuffer);
+	h2_stream->qbuffer = NULL;
+
+	sldns_buffer_flip(h2_session->c->buffer);
+	h2_session->c->h2_stream = h2_stream;
+	fptr_ok(fptr_whitelist_comm_point(h2_session->c->callback));
+	if((*h2_session->c->callback)(h2_session->c, h2_session->c->cb_arg,
+		NETEVENT_NOERROR, &h2_session->c->repinfo)) {
+		return 1; /* answer in c->buffer */
+	}
+	sldns_buffer_clear(h2_session->c->buffer);
+	h2_session->c->h2_stream = NULL;
+	return 0; /* mesh state added, or dropped */
+}
+
+/** nghttp2 callback. Used to check if the received frame indicates the end of a
+ * stream. Gather collected request data and start query handling. */
+static int http2_req_frame_recv_cb(nghttp2_session* session,
+	const nghttp2_frame* frame, void* cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	struct http2_stream* h2_stream;
+	int query_read_done;
+
+	if((frame->hd.type != NGHTTP2_DATA &&
+		frame->hd.type != NGHTTP2_HEADERS) ||
+		!(frame->hd.flags & NGHTTP2_FLAG_END_STREAM)) {
+			return 0;
+	}
+
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		session, frame->hd.stream_id)))
+		return 0;
+
+	if(h2_stream->invalid_endpoint) {
+		h2_stream->status = HTTP_STATUS_NOT_FOUND;
+		goto submit_http_error;
+	}
+
+	if(h2_stream->invalid_content_type) {
+		h2_stream->status = HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE;
+		goto submit_http_error;
+	}
+
+	if(h2_stream->http_method != HTTP_METHOD_GET &&
+		h2_stream->http_method != HTTP_METHOD_POST) {
+		h2_stream->status = HTTP_STATUS_NOT_IMPLEMENTED;
+		goto submit_http_error;
+	}
+
+	if(h2_stream->query_too_large) {
+		if(h2_stream->http_method == HTTP_METHOD_POST)
+			h2_stream->status = HTTP_STATUS_PAYLOAD_TOO_LARGE;
+		else
+			h2_stream->status = HTTP_STATUS_URI_TOO_LONG;
+		goto submit_http_error;
+	}
+
+	if(!h2_stream->qbuffer) {
+		h2_stream->status = HTTP_STATUS_BAD_REQUEST;
+		goto submit_http_error;
+	}
+
+	if(h2_stream->status) {
+submit_http_error:
+		verbose(VERB_QUERY, "http2 request invalid, returning :status="
+			"%d", h2_stream->status);
+		if(!http2_submit_error(h2_session, h2_stream)) {
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		}
+		return 0;
+	}
+	h2_stream->status = HTTP_STATUS_OK;
+
+	sldns_buffer_flip(h2_stream->qbuffer);
+	h2_session->postpone_drop = 1;
+	query_read_done = http2_query_read_done(h2_session, h2_stream);
+	if(query_read_done < 0)
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	else if(!query_read_done) {
+		if(h2_session->is_drop) {
+			/* connection needs to be closed. Return failure to make
+			 * sure no other action are taken anymore on comm point.
+			 * failure will result in reclaiming (and closing)
+			 * of comm point. */
+			verbose(VERB_QUERY, "http2 query dropped in worker cb");
+			h2_session->postpone_drop = 0;
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		}
+		/* nothing to submit right now, query added to mesh. */
+		h2_session->postpone_drop = 0;
+		return 0;
+	}
+	if(!http2_submit_dns_response(h2_session)) {
+		sldns_buffer_clear(h2_session->c->buffer);
+		h2_session->c->h2_stream = NULL;
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+	verbose(VERB_QUERY, "http2 query submitted to session");
+	sldns_buffer_clear(h2_session->c->buffer);
+	h2_session->c->h2_stream = NULL;
+	return 0;
+}
+
+/** nghttp2 callback. Used to detect start of new streams. */
+static int http2_req_begin_headers_cb(nghttp2_session* session,
+	const nghttp2_frame* frame, void* cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	struct http2_stream* h2_stream;
+	int ret;
+	if(frame->hd.type != NGHTTP2_HEADERS ||
+		frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
+		/* only interrested in request headers */
+		return 0;
+	}
+	if(!(h2_stream = http2_stream_create(frame->hd.stream_id))) {
+		log_err("malloc failure while creating http2 stream");
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+	http2_session_add_stream(h2_session, h2_stream);
+	ret = nghttp2_session_set_stream_user_data(session,
+		frame->hd.stream_id, h2_stream);
+	if(ret) {
+		/* stream does not exist */
+		verbose(VERB_QUERY, "http2: set_stream_user_data failed, "
+			"error: %s", nghttp2_strerror(ret));
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+
+	return 0;
+}
+
+/**
+ * base64url decode, store in qbuffer
+ * @param h2_session: http2 session
+ * @param h2_stream: http2 stream
+ * @param start: start of the base64 string
+ * @param length: length of the base64 string
+ * @return: 0 on error, 1 otherwise. query will be stored in h2_stram->qbuffer,
+ * buffer will be NULL is unparseble.
+ */
+static int http2_buffer_uri_query(struct http2_session* h2_session,
+	struct http2_stream* h2_stream, const uint8_t* start, size_t length)
+{
+	size_t expectb64len;
+	int b64len;
+	if(h2_stream->http_method == HTTP_METHOD_POST)
+		return 1;
+	if(length == 0)
+		return 1;
+	if(h2_stream->qbuffer) {
+		verbose(VERB_ALGO, "http2_req_header fail, "
+			"qbuffer already set");
+		return 0;
+	}
+
+	/* calculate size, might be a bit bigger than the real
+	 * decoded buffer size */
+	expectb64len = sldns_b64_pton_calculate_size(length);
+	log_assert(expectb64len > 0);
+	if(expectb64len >
+		h2_session->c->http2_max_qbuffer_size) {
+		h2_stream->query_too_large = 1;
+		return 1;
+	}
+
+	if(!(h2_stream->qbuffer = sldns_buffer_new(expectb64len))) {
+		log_err("http2_req_header fail, qbuffer "
+			"malloc failure");
+		return 0;
+	}
+
+	if(!(b64len = sldns_b64url_pton(
+		(char const *)start, length,
+		sldns_buffer_current(h2_stream->qbuffer),
+		expectb64len)) || b64len < 0) {
+		sldns_buffer_free(h2_stream->qbuffer);
+		h2_stream->qbuffer = NULL;
+		/* return without error, method can be an
+		 * unknown POST */
+		return 1;
+	}
+	sldns_buffer_skip(h2_stream->qbuffer, (size_t)b64len);
+	return 1;
+}
+
+/** nghttp2 callback. Used to parse headers from HEADER frames. */
+static int http2_req_header_cb(nghttp2_session* session,
+	const nghttp2_frame* frame, const uint8_t* name, size_t namelen,
+	const uint8_t* value, size_t valuelen, uint8_t ATTR_UNUSED(flags),
+	void* cb_arg)
+{
+	struct http2_stream* h2_stream = NULL;
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	/* nghttp2 deals with CONTINUATION frames and provides them as part of
+	 * the HEADER */
+	if(frame->hd.type != NGHTTP2_HEADERS ||
+		frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
+		/* only interrested in request headers */
+		return 0;
+	}
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(session,
+		frame->hd.stream_id)))
+		return 0;
+
+	/* earlier checks already indicate we can stop handling this query */
+	if(h2_stream->http_method == HTTP_METHOD_UNSUPPORTED ||
+		h2_stream->invalid_content_type ||
+		h2_stream->invalid_endpoint)
+		return 0;
+
+
+	/* nghttp2 performs some sanity checks in the headers, including:
+	 * name and value are guaranteed to be null terminated
+	 * name is guaranteed to be lowercase
+	 * content-length value is guaranteed to contain digits
+	 */
+
+	if(!h2_stream->http_method && namelen  == 7 &&
+		memcmp(":method", name, namelen) == 0) {
+		/* Case insensitive check on :method value to be on the safe
+		 * side. I failed to find text about case sentitivity in specs.
+		 */
+		if(valuelen == 3 && strcasecmp("GET", (const char*)value) == 0)
+			h2_stream->http_method = HTTP_METHOD_GET;
+		else if(valuelen == 4 &&
+			strcasecmp("POST", (const char*)value) == 0) {
+			h2_stream->http_method = HTTP_METHOD_POST;
+			if(h2_stream->qbuffer) {
+				/* POST method uses query from DATA frames */
+				sldns_buffer_free(h2_stream->qbuffer);
+				h2_stream->qbuffer = NULL;
+			}
+		} else
+			h2_stream->http_method = HTTP_METHOD_UNSUPPORTED;
+		return 0;
+	}
+	if(namelen == 5 && memcmp(":path", name, namelen) == 0) {
+		/* Hard coded /dns-query endpoint, might be nice to make
+		 * configurable.
+		 * :path may contain DNS query, depending on method. Method might
+		 * not be known yet here, so check after finishing receiving
+		 * stream. */
+#define HTTP_ENDPOINT "/dns-query"
+#define	HTTP_QUERY_PARAM "?dns="
+		size_t el = sizeof(HTTP_ENDPOINT) - 1;
+		size_t qpl = sizeof(HTTP_QUERY_PARAM) - 1;
+
+		if(valuelen < el || memcmp(HTTP_ENDPOINT, value, el) != 0) {
+			h2_stream->invalid_endpoint = 1;
+			return 0;
+		}
+		/* larger than endpoint only allowed if it is for the query
+		 * parameter */
+		if(valuelen <= el+qpl ||
+			memcmp(HTTP_QUERY_PARAM, value+el, qpl) != 0) {
+			if(valuelen != el)
+				h2_stream->invalid_endpoint = 1;
+			return 0;
+		}
+
+		if(!http2_buffer_uri_query(h2_session, h2_stream,
+			value+(el+qpl), valuelen-(el+qpl))) {
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		}
+		return 0;
+	}
+	/* Content type is a SHOULD (rfc7231#section-3.1.1.5) when using POST,
+	 * and not needed when using GET. Don't enfore.
+	 * If set only allow lowercase "application/dns-message".
+	 *
+	 * Clients SHOULD (rfc8484#section-4.1) set an accept header, but MUST
+	 * be able to handle "application/dns-message". Since that is the only
+	 * content-type supported we can ignore the accept header.
+	 */
+	if((namelen == 12 && memcmp("content-type", name, namelen) == 0)) {
+		if(valuelen != 23 || memcmp("application/dns-message", value,
+			valuelen) != 0) {
+			h2_stream->invalid_content_type = 1;
+		}
+	}
+
+	/* Only interested in content-lentg for POST (on not yet known) method.
+	 */
+	if((!h2_stream->http_method ||
+		h2_stream->http_method == HTTP_METHOD_POST) &&
+		!h2_stream->content_length && namelen  == 14 &&
+		memcmp("content-length", name, namelen) == 0) {
+		if(valuelen > 5) {
+			h2_stream->query_too_large = 1;
+			return 0;
+		}
+		/* guaranteed to only contian digits and be null terminated */
+		h2_stream->content_length = atoi((const char*)value);
+		if(h2_stream->content_length >
+			h2_session->c->http2_max_qbuffer_size) {
+			h2_stream->query_too_large = 1;
+			return 0;
+		}
+	}
+	return 0;
+}
+
+/** nghttp2 callback. Used to get data from DATA frames, which can contain
+ * queries in POST requests. */
+static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
+	uint8_t ATTR_UNUSED(flags), int32_t stream_id, const uint8_t* data,
+	size_t len, void* cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	struct http2_stream* h2_stream;
+
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		h2_session->session, stream_id))) {
+		return 0;
+	}
+
+	if(h2_stream->query_too_large)
+		return 0;
+
+	if(!h2_stream->qbuffer) {
+		if(h2_stream->content_length) {
+			if(h2_stream->content_length < len)
+				/* getting more data in DATA frame than
+				 * advertised in content-length header. */
+				return NGHTTP2_ERR_CALLBACK_FAILURE;
+			h2_stream->qbuffer = sldns_buffer_new(
+				h2_stream->content_length);
+		} else if(len <= h2_session->c->http2_max_qbuffer_size) {
+			/* setting this to msg-buffer-size can result in a lot
+			 * of memory consuption. Most queries should fit in a
+			 * single DATA frame, and most POST queries will
+			 * containt content-length which does not impose this
+			 * limit. */
+			h2_stream->qbuffer = sldns_buffer_new(len);
+		}
+	}
+
+	if(!h2_stream->qbuffer ||
+		sldns_buffer_remaining(h2_stream->qbuffer) < len) {
+		verbose(VERB_ALGO, "http2 data_chunck_recv failed. Not enough "
+			"buffer space for POST query. Can happen on multi "
+			"frame requests without content-length header");
+		h2_stream->query_too_large = 1;
+		return 0;
+	}
+
+	sldns_buffer_write(h2_stream->qbuffer, data, len);
+
+	return 0;
+}
+
+nghttp2_session_callbacks* http2_req_callbacks_create()
+{
+	nghttp2_session_callbacks *callbacks;
+	if(nghttp2_session_callbacks_new(&callbacks) == NGHTTP2_ERR_NOMEM) {
+		log_err("failed to initialize nghttp2 callback");
+		return NULL;
+	}
+	/* reception of header block started, used to create h2_stream */
+	nghttp2_session_callbacks_set_on_begin_headers_callback(callbacks,
+		http2_req_begin_headers_cb);
+	/* complete frame received, used to get data from stream if frame
+	 * has end stream flag, and start processing query */
+	nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+		http2_req_frame_recv_cb);
+	/* get request info from headers */
+	nghttp2_session_callbacks_set_on_header_callback(callbacks,
+		http2_req_header_cb);
+	/* get data from DATA frames, containing POST query */
+	nghttp2_session_callbacks_set_on_data_chunk_recv_callback(callbacks,
+		http2_req_data_chunk_recv_cb);
+
+	/* generic HTTP2 callbacks */
+	nghttp2_session_callbacks_set_recv_callback(callbacks, http2_recv_cb);
+	nghttp2_session_callbacks_set_send_callback(callbacks, http2_send_cb);
+	nghttp2_session_callbacks_set_on_stream_close_callback(callbacks,
+		http2_stream_close_cb);
+
+	return callbacks;
+}
+#endif /* HAVE_NGHTTP2 */
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index ad84d8322..6b5a85822 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -43,6 +43,9 @@
 #define LISTEN_DNSPORT_H
 
 #include "util/netevent.h"
+#ifdef HAVE_NGHTTP2_NGHTTP2_H
+#include <nghttp2/nghttp2.h>
+#endif
 struct listen_list;
 struct config_file;
 struct addrinfo;
@@ -94,8 +97,9 @@ enum listen_type {
 	/** tcp type + dnscrypt */
 	listen_type_tcp_dnscrypt,
 	/** udp ipv6 (v4mapped) for use with ancillary data + dnscrypt*/
-	listen_type_udpancil_dnscrypt
-
+	listen_type_udpancil_dnscrypt,
+	/** HTTP(2) over TLS over TCP */
+	listen_type_http
 };
 
 /**
@@ -139,6 +143,7 @@ void listening_ports_free(struct listen_port* list);
  * @param tcp_accept_count: max number of simultaneous TCP connections 
  * 	from clients.
  * @param tcp_idle_timeout: idle timeout for TCP connections in msec.
+ * @param harden_large_queries: whether query size should be limited.
  * @param tcp_conn_limit: TCP connection limit info.
  * @param sslctx: nonNULL if ssl context.
  * @param dtenv: nonNULL if dnstap enabled.
@@ -149,7 +154,7 @@ void listening_ports_free(struct listen_port* list);
  */
 struct listen_dnsport* listen_create(struct comm_base* base,
 	struct listen_port* ports, size_t bufsize,
-	int tcp_accept_count, int tcp_idle_timeout,
+	int tcp_accept_count, int tcp_idle_timeout, int harden_large_queries,
 	struct tcl_list* tcp_conn_limit, void* sslctx,
 	struct dt_env *dtenv, comm_point_callback_type* cb, void* cb_arg);
 
@@ -220,12 +225,14 @@ int create_udp_sock(int family, int socktype, struct sockaddr* addr,
  * 	listening UDP port.  Set to false on return if it failed to do so.
  * @param transparent: set IP_TRANSPARENT socket option.
  * @param mss: maximum segment size of the socket. if zero, leaves the default. 
+ * @param nodelay: if true set TCP_NODELAY and TCP_QUICKACK socket options.
  * @param freebind: set IP_FREEBIND socket option.
  * @param use_systemd: if true, fetch sockets from systemd.
  * @return: the socket. -1 on error.
  */
 int create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
-	int* reuseport, int transparent, int mss, int freebind, int use_systemd);
+	int* reuseport, int transparent, int mss, int nodelay, int freebind,
+	int use_systemd);
 
 /**
  * Create and bind local listening socket
@@ -367,4 +374,24 @@ int tcp_req_info_handle_read_close(struct tcp_req_info* req);
 /** get the size of currently used tcp stream wait buffers (in bytes) */
 size_t tcp_req_info_get_stream_buffer_size(void);
 
+#ifdef HAVE_NGHTTP2
+/** 
+ * Create nghttp2 callbacks to handle HTTP2 requests.
+ * @return malloc'ed struct, NULL on failure
+ */
+nghttp2_session_callbacks* http2_req_callbacks_create();
+
+/**
+ * DNS response ready to be submitted to nghttp2, to be prepared for sending
+ * out. Response is stored in c->buffer. Copy to rbuffer because the c->buffer
+ * might be used before this will be send out.
+ * @param h2_session: http2 session, containing c->buffer which contains answer
+ * @param h2_stream: http2 stream, containing buffer to store answer in
+ * @return 0 on error, 1 otherwise
+ */
+int http2_submit_dns_response(struct http2_session* h2_session);
+#else
+int http2_submit_dns_response(void* v);
+#endif /* HAVE_NGHTTP2 */
+
 #endif /* LISTEN_DNSPORT_H */
diff --git a/services/mesh.c b/services/mesh.c
index 09c51a2be..4234fd8af 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -551,6 +551,9 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			goto servfail_mem;
 		}
 	}
+	if(rep->c->alpn_h2) {
+		http2_stream_add_meshstate(rep->c->h2_stream, mesh, s);
+	}
 	/* add serve expired timer if required and not already there */
 	if(timeout && !mesh_serve_expired_init(s, timeout)) {
 		log_err("mesh_new_client: out of memory initializing serve expired");
@@ -1207,6 +1210,9 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 	else	secure = 0;
 	if(!rep && rcode == LDNS_RCODE_NOERROR)
 		rcode = LDNS_RCODE_SERVFAIL;
+	if(r->query_reply.c->alpn_h2) {
+		r->query_reply.c->h2_stream = r->h2_stream;
+	}
 	/* send the reply */
 	/* We don't reuse the encoded answer if either the previous or current
 	 * response has a local alias.  We could compare the alias records
@@ -1488,6 +1494,8 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns,
 		s->s.qinfo.qname_len);
 	if(!r->qname)
 		return 0;
+	if(rep->c->alpn_h2)
+		r->h2_stream = rep->c->h2_stream;
 
 	/* Data related to local alias stored in 'qinfo' (if any) is ephemeral
 	 * and can be different for different original queries (even if the
diff --git a/services/mesh.h b/services/mesh.h
index df2972ac3..d0a4b5fb3 100644
--- a/services/mesh.h
+++ b/services/mesh.h
@@ -230,6 +230,8 @@ struct mesh_reply {
 	uint8_t* qname;
 	/** same as that in query_info. */
 	struct local_rrset* local_alias;
+	/** send query to this http2 stream, if set */
+	struct http2_stream* h2_stream;
 };
 
 /** 
diff --git a/sldns/parseutil.c b/sldns/parseutil.c
index 82dbc0fe1..b51a0709d 100644
--- a/sldns/parseutil.c
+++ b/sldns/parseutil.c
@@ -674,14 +674,17 @@ size_t sldns_b64_pton_calculate_size(size_t srcsize)
 	return (((((srcsize + 3) / 4) * 3)) + 1);
 }
 
-int sldns_b64_pton(char const *src, uint8_t *target, size_t targsize)
+/* padding not required if srcsize is set */
+static int sldns_b64_pton_base(char const *src, size_t srcsize, uint8_t *target,
+	size_t targsize, int base64url)
 {
 	const uint8_t pad64 = 64; /* is 64th in the b64 array */
 	const char* s = src;
 	uint8_t in[4];
 	size_t o = 0, incount = 0;
+	int check_padding = (srcsize) ? 0 : 1;
 
-	while(*s) {
+	while(*s && (check_padding || srcsize)) {
 		/* skip any character that is not base64 */
 		/* conceptually we do:
 		const char* b64 =      pad'=' is appended to array
@@ -690,30 +693,40 @@ int sldns_b64_pton(char const *src, uint8_t *target, size_t targsize)
 		and use d-b64;
 		*/
 		char d = *s++;
+		srcsize--;
 		if(d <= 'Z' && d >= 'A')
 			d -= 'A';
 		else if(d <= 'z' && d >= 'a')
 			d = d - 'a' + 26;
 		else if(d <= '9' && d >= '0')
 			d = d - '0' + 52;
-		else if(d == '+')
+		else if(!base64url && d == '+')
 			d = 62;
-		else if(d == '/')
+		else if(base64url && d == '-')
+			d = 62;
+		else if(!base64url && d == '/')
 			d = 63;
-		else if(d == '=')
+		else if(base64url && d == '_')
+			d = 63;
+		else if(!base64url && d == '=')
 			d = 64;
 		else	continue;
 		in[incount++] = (uint8_t)d;
-		if(incount != 4)
+		/* work on block of 4, unless padding is not used and there are
+		 * less than 4 chars left */
+		if(incount != 4 && (check_padding || srcsize))
 			continue;
+		assert(!check_padding || incount==4);
 		/* process whole block of 4 characters into 3 output bytes */
-		if(in[3] == pad64 && in[2] == pad64) { /* A B = = */
+		if((incount == 2 ||
+			(incount == 4 && in[3] == pad64 && in[2] == pad64))) { /* A B = = */
 			if(o+1 > targsize)
 				return -1;
 			target[o] = (in[0]<<2) | ((in[1]&0x30)>>4);
 			o += 1;
 			break; /* we are done */
-		} else if(in[3] == pad64) { /* A B C = */
+		} else if(incount == 3 ||
+			(incount == 4 && in[3] == pad64)) { /* A B C = */
 			if(o+2 > targsize)
 				return -1;
 			target[o] = (in[0]<<2) | ((in[1]&0x30)>>4);
@@ -721,7 +734,7 @@ int sldns_b64_pton(char const *src, uint8_t *target, size_t targsize)
 			o += 2;
 			break; /* we are done */
 		} else {
-			if(o+3 > targsize)
+			if(incount != 4 || o+3 > targsize)
 				return -1;
 			/* write xxxxxxyy yyyyzzzz zzwwwwww */
 			target[o] = (in[0]<<2) | ((in[1]&0x30)>>4);
@@ -733,3 +746,17 @@ int sldns_b64_pton(char const *src, uint8_t *target, size_t targsize)
 	}
 	return (int)o;
 }
+
+int sldns_b64_pton(char const *src, uint8_t *target, size_t targsize)
+{
+	return sldns_b64_pton_base(src, 0, target, targsize, 0);
+}
+
+int sldns_b64url_pton(char const *src, size_t srcsize, uint8_t *target,
+	size_t targsize)
+{
+	if(!srcsize) {
+		return 0;
+	}
+	return sldns_b64_pton_base(src, srcsize, target, targsize, 1);
+}
diff --git a/sldns/parseutil.h b/sldns/parseutil.h
index 10a2630a9..852ad3fb5 100644
--- a/sldns/parseutil.h
+++ b/sldns/parseutil.h
@@ -97,8 +97,9 @@ int sldns_b64_ntop(uint8_t const *src, size_t srclength,
  * calculates the size needed to store the result of sldns_b64_pton
  */
 size_t sldns_b64_pton_calculate_size(size_t srcsize);
-
 int sldns_b64_pton(char const *src, uint8_t *target, size_t targsize);
+int sldns_b64url_pton(char const *src, size_t srcsize, uint8_t *target,
+	size_t targsize);
 
 /**
  * calculates the size needed to store the result of b32_ntop
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index d6e904a4d..6222003bc 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -868,6 +868,7 @@ struct listen_dnsport*
 listen_create(struct comm_base* base, struct listen_port* ATTR_UNUSED(ports),
 	size_t bufsize, int ATTR_UNUSED(tcp_accept_count),
 	int ATTR_UNUSED(tcp_idle_timeout),
+	int ATTR_UNUSED(harden_large_queries),
 	struct tcl_list* ATTR_UNUSED(tcp_conn_limit),
 	void* ATTR_UNUSED(sslctx), struct dt_env* ATTR_UNUSED(dtenv),
 	comm_point_callback_type* cb, void* cb_arg)
@@ -1823,4 +1824,9 @@ tcp_req_info_get_stream_buffer_size(void)
 	return 0;
 }
 
+void http2_stream_add_meshstate(struct http2_stream* ATTR_UNUSED(h2_stream),
+	struct mesh_area* ATTR_UNUSED(mesh), struct mesh_state* ATTR_UNUSED(m))
+{
+}
+
 /*********** End of Dummy routines ***********/
diff --git a/util/config_file.c b/util/config_file.c
index 814d9f436..050db3175 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -116,6 +116,7 @@ config_create(void)
 	cfg->ssl_upstream = 0;
 	cfg->tls_cert_bundle = NULL;
 	cfg->tls_win_cert = 0;
+	cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT;
 	cfg->use_syslog = 1;
 	cfg->log_identity = NULL; /* changed later with argv[0] */
 	cfg->log_time_ascii = 0;
@@ -505,6 +506,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_STRLIST_APPEND("tls-session-ticket-keys:", tls_session_ticket_keys)
 	else S_STR("tls-ciphers:", tls_ciphers)
 	else S_STR("tls-ciphersuites:", tls_ciphersuites)
+	else S_NUMBER_NONZERO("https-port:", https_port)
 	else S_YNO("interface-automatic:", if_automatic)
 	else S_YNO("use-systemd:", use_systemd)
 	else S_YNO("do-daemonize:", do_daemonize)
@@ -957,6 +959,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_LST(opt, "tls-session-ticket-keys", tls_session_ticket_keys.first)
 	else O_STR(opt, "tls-ciphers", tls_ciphers)
 	else O_STR(opt, "tls-ciphersuites", tls_ciphersuites)
+	else O_DEC(opt, "https-port", https_port)
 	else O_YNO(opt, "use-systemd", use_systemd)
 	else O_YNO(opt, "do-daemonize", do_daemonize)
 	else O_STR(opt, "chroot", chrootdir)
diff --git a/util/config_file.h b/util/config_file.h
index bd6e884eb..30e552803 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -128,6 +128,8 @@ struct config_file {
 	char* tls_ciphers;
 	/** TLS chiphersuites (TLSv1.3) */
 	char* tls_ciphersuites;
+	/** port on which to provide DNS over HTTPS service */
+	int https_port;
 
 	/** outgoing port range number of ports (per thread) */
 	int outgoing_num_ports;
diff --git a/util/configlexer.c b/util/configlexer.c
index 601cd78bf..abbc7198c 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1,7 +1,7 @@
 #include "config.h"
 #include "util/configyyrename.h"
 
-#line 2 "<stdout>"
+#line 3 "<stdout>"
 
 #define  YY_INT_ALIGNED short int
 
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 309
-#define YY_END_OF_BUFFER 310
+#define YY_NUM_RULES 310
+#define YY_END_OF_BUFFER 311
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,343 +363,344 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3044] =
+static const flex_int16_t yy_accept[3054] =
     {   0,
-        1,    1,  291,  291,  295,  295,  299,  299,  303,  303,
-        1,    1,  310,  307,    1,  289,  289,  308,    2,  308,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  291,  292,  292,  293,  308,  295,  296,  296,
-      297,  308,  302,  299,  300,  300,  301,  308,  303,  304,
-      304,  305,  308,  306,  290,    2,  294,  308,  306,  307,
-        0,    1,    2,    2,    2,    2,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+        1,    1,  292,  292,  296,  296,  300,  300,  304,  304,
+        1,    1,  311,  308,    1,  290,  290,  309,    2,  309,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  292,  293,  293,  294,  309,  296,  297,  297,
+      298,  309,  303,  300,  301,  301,  302,  309,  304,  305,
+      305,  306,  309,  307,  291,    2,  295,  309,  307,  308,
+        0,    1,    2,    2,    2,    2,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      291,    0,  295,    0,  302,    0,  299,  303,    0,  306,
-        0,    2,    2,  306,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  292,    0,  296,    0,  303,    0,  300,  304,    0,
+      307,    0,    2,    2,  307,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  306,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  307,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  113,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  121,  307,  307,  307,  307,
-      307,  307,  307,  306,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  114,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  122,  308,
+      308,  308,  308,  308,  308,  308,  307,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,   97,  307,
-      307,  307,  307,  307,  307,    8,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  114,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  126,  307,  306,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,   98,  308,  308,  308,  308,  308,  308,    8,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  115,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  127,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  284,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      307,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  285,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  306,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,   55,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  223,  307,   14,   15,  307,   19,   18,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,   56,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  224,  308,   14,   15,
+      308,   19,   18,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  120,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  207,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-        3,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  121,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  208,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,    3,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  306,  307,  307,  307,  307,  307,  307,
-      307,  279,  307,  307,  278,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      298,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  307,
+      308,  308,  308,  308,  308,  308,  308,  280,  308,  308,
+      279,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  299,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,   58,  307,  253,  307,  307,  307,
-      307,  307,  307,  307,  307,  285,  286,  307,  307,  307,
-      307,  307,   59,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  117,  307,
-      307,  307,  307,  307,  307,  307,  307,  196,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,   21,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  145,  307,  307,  298,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,   59,  308,  254,  308,  308,  308,  308,  308,  308,
+      308,  308,  286,  287,  308,  308,  308,  308,  308,   60,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  118,  308,  308,  308,  308,
+      308,  308,  308,  308,  197,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,   21,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-       95,  307,  307,  307,  307,  307,  307,  307,  261,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  168,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  144,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  146,  308,  308,  299,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,   96,  308,  308,
+      308,  308,  308,  308,  308,  262,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      169,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  145,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,   94,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,   32,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,   33,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,   56,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  119,  307,
-      307,  307,  307,  307,  112,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,   57,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,   95,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,   32,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,   33,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,   57,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  120,  308,  308,  308,
+      308,  308,  113,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  226,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  169,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,   46,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,   58,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  227,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  170,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,   47,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  244,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-       50,  307,   51,  307,  307,  307,  307,  307,   98,  307,
-       99,  307,  307,  307,  307,   96,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,    7,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  216,  307,  307,  307,  307,  147,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  245,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,   51,
+      308,   52,  308,  308,  308,  308,  308,   99,  308,  100,
+      308,  308,  308,  308,   97,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,    7,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  217,  308,  308,  308,  308,  148,  308,  308,  308,
 
-      307,  307,  307,  227,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,   47,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  188,  307,  187,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,   16,   17,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,   60,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  228,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,   44,  308,  308,  308,  308,  308,  308,  308,   48,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  189,  308,  188,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,   16,   17,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  195,  307,
-      307,  307,  307,  307,  307,  101,  307,  100,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  179,  307,
-      307,  307,  307,  307,  307,  307,  307,  127,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,   79,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,   61,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  196,  308,
+      308,  308,  308,  308,  308,  102,  308,  101,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  180,  308,
+      308,  308,  308,  308,  308,  308,  308,  128,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,   80,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,   83,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,   54,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  182,  183,  307,  307,  307,  255,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,    6,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      259,  307,  307,  307,  307,  307,  307,  280,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,   84,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,   55,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  183,  184,  308,  308,  308,  256,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,    6,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      260,  308,  308,  308,  308,  308,  308,  281,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,   42,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,   44,  307,  307,  307,  307,  307,  307,  307,  307,
-      175,  307,  307,  307,  122,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  200,  307,  176,  307,  307,
-      307,  213,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,   45,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  124,  106,  307,  107,  307,  307,  307,  105,  307,
-      307,  307,  307,  307,  307,  307,  307,  142,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,   42,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,   45,  308,  308,  308,  308,  308,  308,  308,  308,
+      176,  308,  308,  308,  123,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  201,  308,  177,  308,  308,
+      308,  214,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,   46,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  125,  107,  308,  108,  308,  308,  308,  106,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  243,
-      307,  307,  307,  307,  307,  307,  307,  307,  177,  307,
-      307,  307,  307,  307,  180,  307,  186,  307,  307,  307,
-      307,  307,  212,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,   93,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  118,  307,  307,  307,  307,
-      307,  307,   52,  307,  307,  307,   26,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,   20,  307,  307,  307,
-      307,  307,  307,   27,   36,  307,  152,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  143,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  244,
+      308,  308,  308,  308,  308,  308,  308,  308,  178,  308,
+      308,  308,  308,  308,  181,  308,  187,  308,  308,  308,
+      308,  308,  213,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,   94,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  119,  308,  308,  308,  308,
+      308,  308,   53,  308,  308,  308,   26,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,   20,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,   68,   70,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  263,  307,  307,  307,  224,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  108,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  141,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  274,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,   27,   36,  308,  153,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,   69,   71,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  264,  308,  308,  308,  225,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  109,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  142,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  275,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  146,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  206,  307,  307,  307,
-      307,  307,  307,  307,  307,  283,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  163,  307,  307,
-      307,  307,  307,  307,  307,  307,  102,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  158,  307,  170,  307,
-      307,  307,  307,  307,  130,  307,  307,  307,  307,  307,
-       89,  307,  307,  307,  307,  198,  307,  307,  307,  307,
-      307,  307,  214,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  147,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  207,  308,  308,  308,
+      308,  308,  308,  308,  308,  284,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  164,  308,  308,
+      308,  308,  308,  308,  308,  308,  103,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  159,  308,  171,  308,
+      308,  308,  308,  308,  131,  308,  308,  308,  308,  308,
+       90,  308,  308,  308,  308,  199,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  235,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  123,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  162,
-      307,  307,  307,  307,  307,   71,   72,  307,  307,  307,
-      307,  307,   53,  307,  307,  307,  307,  307,   78,  171,
-      307,  189,  307,  217,  307,  307,  181,  256,  307,  307,
-      307,  307,  307,   64,  307,  173,  307,  307,  307,  307,
-      307,    9,  307,  307,  307,   92,  307,  307,  307,  307,
-      248,  307,  307,  307,  197,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  215,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  236,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  124,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  163,
+      308,  308,  308,  308,  308,   72,   73,  308,  308,  308,
+      308,  308,   54,  308,  308,  308,  308,  308,   79,  172,
+      308,  190,  308,  218,  308,  308,  182,  257,  308,  308,
+      308,  308,  308,   65,  308,  174,  308,  308,  308,  308,
+      308,    9,  308,  308,  308,   93,  308,  308,  308,  308,
+      249,  308,  308,  308,  198,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  161,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  148,  307,  262,  307,  307,
-      307,  307,  234,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  208,  307,  307,  307,  307,  254,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  277,  307,  172,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  162,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  149,  308,  263,  308,  308,
+      308,  308,  235,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  209,  308,  308,  308,  308,  255,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,   63,   65,  307,  307,  307,  307,
-      307,  307,  307,   91,  307,  307,  307,  307,  246,  307,
-      307,  307,  258,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  202,   34,   28,   30,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,   35,  307,   29,
-       31,  307,  307,  307,  307,  307,  307,  307,  307,   88,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  204,  201,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,   62,  307,  307,  125,
+      308,  308,  308,  308,  278,  308,  173,  308,  308,  308,
+      308,  308,  308,  308,   64,   66,  308,  308,  308,  308,
+      308,  308,  308,   92,  308,  308,  308,  308,  247,  308,
+      308,  308,  259,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  203,   34,   28,   30,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,   35,  308,   29,
+       31,  308,  308,  308,  308,  308,  308,  308,  308,   89,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  205,  202,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  109,  307,  307,  307,  307,  307,  307,  307,  307,
-      143,   13,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  272,  307,  275,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,   12,  307,  307,   22,  307,  307,
-      307,  252,  307,  307,  307,  260,  307,  307,  307,   66,
-      307,  210,  307,  307,  307,  307,  203,  307,  307,   61,
-      307,  307,  307,  307,   23,  307,   43,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  157,
-      156,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      205,  199,  307,  215,  307,  307,  264,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,   63,  308,  308,  126,
+      308,  110,  308,  308,  308,  308,  308,  308,  308,  308,
+      144,   13,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  273,  308,  276,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,   12,  308,  308,   22,  308,  308,
+      308,  253,  308,  308,  308,  261,  308,  308,  308,   67,
+      308,  211,  308,  308,  308,  308,  204,  308,  308,   62,
+      308,  308,  308,  308,   23,  308,   43,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  158,
+      157,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,   73,  307,  307,  307,  247,  307,
-      307,  307,  307,  185,  307,  307,  307,  307,  209,  307,
-      307,  307,  307,  307,  307,  307,  307,  281,  282,  154,
-      307,  307,   67,  307,  307,  307,  307,  164,  307,  307,
-      103,  104,  307,  307,  307,  307,  149,  307,  151,  307,
-      190,  307,  307,  307,  307,  155,  307,  307,  218,  307,
-      307,  307,  307,  307,  307,  307,  132,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  225,  307,
+      206,  200,  308,  216,  308,  308,  265,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,   74,  308,  308,  308,  248,  308,
+      308,  308,  308,  186,  308,  308,  308,  308,  210,  308,
+      308,  308,  308,  308,  308,  308,  308,  282,  283,  155,
+      308,  308,   68,  308,  308,  308,  308,  165,  308,  308,
+      104,  105,  308,  308,  308,  308,  150,  308,  152,  308,
+      191,  308,  308,  308,  308,  156,  308,  308,  219,  308,
+      308,  308,  308,  308,  308,  308,  133,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,   24,  307,  257,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      191,  307,  307,  245,  307,  276,  307,  184,  307,  307,
-      307,  307,   48,  307,  307,  307,  307,    4,  307,  307,
-      307,  116,  131,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  221,   37,   38,  307,  307,  307,  307,  307,  307,
-      307,  265,  307,  307,  307,  307,  307,  307,  233,  307,
-      307,  307,  307,  307,  307,  307,  194,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,   76,  307,   49,  251,
+      308,  308,  308,  308,  308,  308,  308,  308,  226,  308,
+      308,  308,  308,  308,  308,  308,   24,  308,  258,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      192,  308,  308,  246,  308,  277,  308,  185,  308,  308,
+      308,  308,   49,  308,  308,  308,  308,    4,  308,  308,
+      308,  117,  132,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  222,   37,   38,  308,  308,  308,  308,  308,  308,
+      308,  266,  308,  308,  308,  308,  308,  308,  234,  308,
+      308,  308,  308,  308,  308,  308,  195,  308,  308,  308,
 
-      307,  222,  307,  307,  307,  307,   11,  307,  307,  307,
-      307,  307,  115,  307,  307,  307,  307,  192,   80,  307,
-       40,  307,  307,  307,  307,  307,  307,  307,  307,  160,
-      307,  307,  307,  307,  307,  134,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  232,  307,  307,  307,  307,
-      128,  307,  307,  110,  111,  307,  307,  307,   82,   86,
-       81,  307,   74,  307,  307,  307,  307,  307,   10,  307,
-      307,  307,  249,  307,  307,  307,  307,  288,   39,  307,
-      307,  307,  307,  307,  159,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,   77,  308,   50,  252,
+      308,  223,  308,  308,  308,  308,   11,  308,  308,  308,
+      308,  308,  116,  308,  308,  308,  308,  193,   81,  308,
+       40,  308,  308,  308,  308,  308,  308,  308,  308,  161,
+      308,  308,  308,  308,  308,  135,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  233,  308,  308,  308,  308,
+      129,  308,  308,  111,  112,  308,  308,  308,   83,   87,
+       82,  308,   75,  308,  308,  308,  308,  308,   10,  308,
+      308,  308,  250,  308,  308,  308,  308,  289,   39,  308,
+      308,  308,  308,  308,  160,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,   87,   85,  307,
-       75,  273,  307,  307,  307,  307,  307,  307,  307,  178,
-      307,  307,  307,  307,  307,  193,  307,  307,  307,  307,
-      307,  307,  307,  307,  150,   69,  307,  307,  307,  307,
-      307,  266,  307,  307,  307,  307,  307,  307,  307,  229,
-      307,  307,  228,  129,  307,   84,  135,  136,  139,  140,
-      137,  138,   77,  307,  250,  307,  307,  307,  307,  153,
-      307,  307,  307,  307,  307,  220,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  166,  165,   41,  307,  307,  307,  307,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,   88,   86,  308,
+       76,  274,  308,  308,  308,  308,  308,  308,  308,  179,
+      308,  308,  308,  308,  308,  194,  308,  308,  308,  308,
+      308,  308,  308,  308,  151,   70,  308,  308,  308,  308,
+      308,  267,  308,  308,  308,  308,  308,  308,  308,  230,
+      308,  308,  229,  130,  308,   85,  136,  137,  140,  141,
+      138,  139,   78,  308,  251,  308,  308,  308,  308,  154,
+      308,  308,  308,  308,  308,  221,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-       90,  307,  219,  307,  242,  270,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,    5,  307,
-      307,  211,  307,  307,  271,  307,  307,  307,  307,  307,
-      307,  307,  307,  307,  230,   25,  307,  307,  307,  307,
-      307,  307,  307,  307,  307,  307,  307,  307,  231,  307,
-      307,  307,  133,  307,  307,  307,  307,  307,  307,  307,
-      307,  167,  307,  174,  307,  307,  307,  307,  307,  307,
-      307,  307,  307,  267,  307,  307,  307,  307,  307,  307,
+      308,  308,  308,  167,  166,   41,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+       91,  308,  220,  308,  243,  271,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,    5,  308,
+      308,  212,  308,  308,  272,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  231,   25,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  232,  308,
+      308,  308,  134,  308,  308,  308,  308,  308,  308,  308,
+      308,  168,  308,  175,  308,  308,  308,  308,  308,  308,
 
-      307,  307,  307,  307,  307,  307,  307,  307,  307,  307,
-      307,  287,  307,  307,  238,  307,  307,  307,  307,  307,
-      268,  307,  307,  307,  307,  307,  307,  269,  307,  307,
-      307,  236,  307,  239,  240,  307,  307,  307,  307,  307,
-      237,  241,    0
+      308,  308,  308,  268,  308,  308,  308,  308,  308,  308,
+      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      308,  288,  308,  308,  239,  308,  308,  308,  308,  308,
+      269,  308,  308,  308,  308,  308,  308,  270,  308,  308,
+      308,  237,  308,  240,  241,  308,  308,  308,  308,  308,
+      238,  242,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -742,687 +743,689 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3058] =
+static const flex_int16_t yy_base[3068] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112, 3212, 2720,   81, 5927, 5927, 5927,   96,   52,
+       90,  112, 2338, 2174,   81, 5953, 5953, 5953,   96,   52,
       106,   63,  107,  111,   70,  128,  130,  133,   57,   88,
-       76,  135,  141,  117,  148,  145,  160,  164,  185,  177,
-      189,  152, 2544, 5927, 5927, 5927,  107, 2459, 5927, 5927,
-     5927,  165, 2157, 2047, 5927, 5927, 5927,  211, 1913, 5927,
-     5927, 5927,  180, 1568, 5927,  217, 5927,  221,  168, 1529,
-      225,  231,    0,  237,    0,    0,  226,  231,   85,  180,
-      114,  238,  239,  156,  234,  206,  240,  232,  200,  132,
-      253,  244,  245,  248,  256,  257,  264,  271,  249,  277,
+       76,  144,  141,  114,  151,  124,  167,  173,  186,  161,
+      190,  117, 1854, 5953, 5953, 5953,  107, 1734, 5953, 5953,
+     5953,  162, 1567, 1365, 5953, 5953, 5953,  212, 1315, 5953,
+     5953, 5953,  167, 1197, 5953,  218, 5953,  222,  134, 1088,
+      226,  182,    0,  233,    0,    0,  194,  227,   85,  184,
+      220,  234,  235,  136,  230,  222,  241,  242,  207,  243,
+      250,  245,  228,  246,  249,  252,  264,  254,  266,  269,
 
-      279,  262,  282,  285,  270,  272,  291,  293,  290,  299,
-      301,  284,  302,  305,  310,  312,  311,  315,  313,  319,
-      322,  318,  324,  327,  326,  193,  221,  334,  329,  340,
-      342,  325,  348,  349,  350,  353,  354,  357,  363,  359,
-     1432,  379, 1075,  381,  915,  388,  450,  365,  392,  278,
-      396,  400,    0,  377,  392,  401,  367,  394,  396,  402,
-      261,  398,  399,  403,  405,  406,  418,  407,  416,  422,
-      426,  430,  427,  434,  424,  437,  439,  440,  429,  451,
-      453,  454,  446,  455,  456,  458,  461,  462,  463,  472,
-      465,  473,  484,  479,  488,  492,  475,  493,  496,  491,
+      272,  279,  276,  277,  281,  286,  280,  285,  164,  287,
+      290,  293,  296,  299,  303,  301,  309,  308,  311,  313,
+      321,  315,  320,  322,  324,  323,  332,  331,  344,  348,
+      335,  337,  329,  347,  357,  349,  353,  352,  354,  369,
+      367,  947,  380,  811,  383,  784,  394,  734,  687,  387,
+      339,  398,  402,    0,  394,  396,  404,  399,  360,  400,
+      403,  410,  405,  406,  407,  409,  411,  422,  419,  425,
+      426,  434,  433,  437,  438,  435,  440,  442,  443,  432,
+      456,  379,  459,  449,  448,  460,  461,  463,  466,  467,
+      468,  477,  470,  478,  489,  484,  493,  497,  480,  498,
 
-      503,  499,  506,  507,  502,  498,  508,  510,  513,  515,
-      516,  518,  517,  520,  521,  523,  525,  533,  535,  526,
-      534,  528,  547,  542,  549,  546,  548,  552,  551,  555,
-      563,  564,  556,  565,  567,  568,  571,  574,  583,  584,
-      585,  569,  576,  586,  580,  588,  589,  590,  591,  600,
-      603,  602,  605,  612,  593,  611,  613,  615,  616,  617,
-      626,  618,  628,  622,  635,  619,  633,  638,  627,  636,
-      641,  645,  646,  653,  640,  656,  657,  658,  660,  661,
-      663,  671,  666,  667,  648,  670,  672,  674,  675,  676,
-      678,  687,  679,  689,  682,  690,  695,  691,  710,  699,
+      501,  496,  508,  504,  511,  512,  507,  503,  513,  515,
+      518,  520,  521,  523,  522,  525,  526,  528,  530,  538,
+      540,  531,  539,  533,  552,  547,  554,  551,  553,  557,
+      556,  560,  568,  569,  561,  570,  572,  573,  576,  579,
+      588,  589,  590,  574,  581,  591,  585,  593,  594,  595,
+      596,  605,  608,  607,  610,  617,  598,  616,  618,  620,
+      621,  622,  631,  623,  633,  627,  640,  624,  638,  643,
+      632,  641,  646,  650,  651,  658,  645,  661,  662,  663,
+      665,  666,  668,  676,  653,  671,  674,  675,  677,  678,
+      680,  681,  684,  682,  693,  685,  695,  689,  708,  704,
 
-      700,  701,  702,  711,  704,  712,  713,  726,  731,  721,
-      732,  733,  735,  737,  740,  748,  739,  746,  743,  750,
-      752,  753,  762,  758, 5927,  757,  760,  773,  766,  774,
-      775,  776,  781,  782,  763,  789,  787,  788,  792,  814,
-      796,  798,  794,  803,  806, 5927,  804,  808,  838,  810,
-      812,  832,  828,  824,  827,  829,  839,  836,  849,  842,
-      847,  851,  862,  858,  859,  860,  861,  864,  863,  877,
-      872,  870,  799,  874,  889,  875,  882,  886,  887,  892,
-      893,  894,  897,  899,  902,  903,  895,  904,  905,  908,
-      913,  914,  916,  917,  927,  929,  921,  940,  918,  935,
+      697,  716,  705,  706,  712,  718,  710,  719,  726,  727,
+      743,  741,  731,  740,  711,  745,  747,  752,  749,  753,
+      756,  758,  759,  760,  762,  769,  764, 5953,  766,  774,
+      781,  782,  783,  790,  771,  789,  791,  772,  802,  798,
+      799,  803,  825,  801,  809,  807,  814,  813, 5953,  815,
+      817,  849,  820,  823,  839,  836,  819,  837,  843,  845,
+      847,  859,  850,  855,  857,  873,  860,  862,  869,  870,
+      874,  872,  884,  880,  886,  888,  890,  897,  892,  893,
+      894,  898,  901,  902,  903,  908,  905,  910,  911,  912,
+      916,  923,  920,  924,  926,  928,  933,  932,  929,  939,
 
-      942,  943,  937,  944,  947,  950,  951,  952,  953,  961,
-      958,  959,  963,  964,  966,  967,  970,  972,  973,  975,
-      977,  979,  978,  985,  988,  981,  994,  989, 5927,  996,
-      998,  999, 1000, 1001, 1003, 5927, 1004, 1005, 1006, 1014,
-     1017, 1016, 1013, 1023, 1027, 1028, 1029, 1030, 1039, 1012,
-     1041, 1040, 1036, 1042, 1046, 1048, 1049, 1051, 1052, 1054,
-     1055, 1057, 1060, 1077, 5927, 1061, 1064, 1062, 1063, 1070,
-     1080, 1089, 1072, 1090, 1088, 1065, 1105, 1092, 1106, 1100,
-     1101, 1111, 1102, 1113, 1107, 1116, 1115, 1117, 1118, 1119,
-     1120, 1125, 1126, 1131, 5927, 1133, 1134, 1145, 1135, 1143,
+      944,  951,  931,  949,  954,  956,  946,  959,  957,  963,
+      964,  965,  967,  977,  972,  973,  974,  975,  979,  981,
+      985,  983,  986,  987,  989,  994,  993, 1000,  991, 1002,
+     1006, 1008, 5953, 1009, 1011, 1012, 1013, 1014, 1015, 5953,
+     1017, 1016, 1019, 1024, 1029, 1031, 1021, 1028, 1039, 1040,
+     1041, 1044, 1051, 1046, 1049, 1054, 1053, 1056, 1057, 1060,
+     1058, 1063, 1065, 1064, 1070, 1071, 1074, 1091, 5953, 1073,
+     1083, 1078, 1075, 1084, 1085, 1103, 1101, 1104, 1102, 1106,
+     1119, 1114, 1120, 1121, 1076, 1125, 1122, 1127, 1131, 1129,
+     1133, 1132, 1134, 1135, 1136, 1138, 1137, 1143, 5953, 1150,
 
-     1132, 1146, 1148, 1149, 1150, 1152, 1153, 1156, 1162, 1172,
-     1157, 1174, 1159, 1170, 1175, 1176, 1177, 1178, 1179, 1180,
-     1193, 1184, 1186, 1200, 1207, 1203, 1205, 1212, 1190, 1210,
-     1209, 1208, 1215, 1216, 1217, 1218, 1220, 1221, 1230, 1228,
-     1226, 1229, 1231, 1242, 1233, 1235, 1240, 1237, 1245, 1247,
-     1253, 1254, 1250, 1256, 5927, 1263, 1260, 1267, 1262, 1268,
-     1272, 1274, 1261, 1276, 1278, 1280, 1281, 1282, 1284, 1287,
-     1289, 1290, 1291, 1292, 1301, 1297, 1307, 1314, 1313, 1315,
-     1299, 1305, 1324, 1321, 1328, 1327, 1329, 1337, 1325, 1332,
-     1323, 1339, 1335, 1340, 1341, 1344, 1347, 1350, 1352, 1359,
+     1154, 1161, 1153, 1160, 1162, 1163, 1164, 1077, 1166, 1167,
+     1169, 1168, 1173, 1184, 1174, 1188, 1183, 1139, 1185, 1187,
+     1189, 1190, 1191, 1192, 1204, 1196, 1206, 1212, 1219, 1215,
+     1217, 1224, 1201, 1220, 1221, 1225, 1227, 1228, 1229, 1230,
+     1232, 1233, 1242, 1239, 1238, 1240, 1241, 1246, 1254, 1247,
+     1249, 1259, 1250, 1260, 1255, 1264, 1265, 1258, 1274, 5953,
+     1281, 1276, 1277, 1278, 1279, 1283, 1287, 1290, 1291, 1288,
+     1294, 1293, 1296, 1300, 1301, 1302, 1297, 1303, 1305, 1314,
+     1318, 1319, 1328, 1320, 1327, 1311, 1330, 1337, 1333, 1340,
+     1336, 1341, 1348, 1343, 1345, 1335, 1357, 1349, 1350, 1360,
 
-     1351, 1356, 1366, 1367, 1358, 1369, 1362, 1372, 1373, 1375,
-     1376, 1377, 1378, 1385, 1380, 1386, 1382, 1387, 1388, 1389,
-     1392, 1390, 1407, 1399, 1400, 1403, 1409, 1410, 1411, 1415,
-     1416, 1417, 1418, 1419, 1420, 1423, 1424, 1183, 1425, 1440,
-     1426, 1430, 1438, 1441, 1447, 1446, 1450, 1454, 1444, 1456,
-     1457, 1458, 1460, 1461, 1465, 1464, 1471, 1468, 1474, 1476,
-     1478, 1477, 1480, 1484, 1487, 1481, 5927, 1488, 1495, 1494,
-     1496, 1497, 1499, 1501, 1508, 1503, 1505, 1504, 1506, 1510,
-     1532, 5927, 1513, 5927, 5927, 1516, 5927, 5927, 1517, 1515,
-     1518, 1523, 1535, 1538, 1298, 1525, 1542, 1520, 1553, 1557,
+     1352, 1361, 1363, 1364, 1375, 1366, 1371, 1380, 1383, 1373,
+     1385, 1377, 1386, 1381, 1389, 1390, 1391, 1392, 1400, 1393,
+     1395, 1401, 1402, 1403, 1405, 1406, 1411, 1415, 1413, 1419,
+     1414, 1420, 1425, 1422, 1428, 1423, 1430, 1432, 1436, 1434,
+     1438, 1437, 1443, 1445, 1447, 1446, 1453, 1455, 1457, 1458,
+     1460, 1461, 1465, 1469, 1471, 1473, 1474, 1475, 1477, 1476,
+     1480, 1486, 1479, 1485, 1491, 1495, 1492, 1497, 1498, 1501,
+     1502, 5953, 1503, 1510, 1505, 1508, 1514, 1515, 1516, 1523,
+     1519, 1521, 1518, 1520, 1524, 1546, 5953, 1532, 5953, 5953,
+     1531, 5953, 5953, 1529, 1533, 1537, 1550, 1541, 1556, 1549,
 
-     1545, 1546, 1548, 1549, 1560, 1571, 1555, 1572, 1565, 1577,
-     1579, 1582, 1581, 1587, 1583, 1588, 1590, 1591, 1593, 1592,
-     1596, 1598, 1601, 1602, 1599, 1604, 1605, 1614, 1618, 1610,
-     1625, 5927, 1621, 1628, 1635, 1631, 1638, 1630, 1634, 1637,
-     1642, 1644, 1639, 1646, 1648, 1649, 1650, 1652, 1654, 1657,
-     1661, 1658, 5927, 1659, 1662, 1667, 1666, 1670, 1674, 1606,
-     1660, 1678, 1676, 1692, 1680, 1682, 1683, 1684, 1688, 1695,
-     5927, 1694, 1700, 1690, 1703, 1701, 1704, 1705, 1707, 1710,
-     1709, 1713, 1715, 1714, 1716, 1723, 1728, 1721, 1720, 1726,
-     1738, 1727, 1742, 1746, 1731, 1734, 1748, 1749, 1750, 1752,
+     1543, 1559, 1552, 1569, 1574, 1530, 1562, 1564, 1570, 1571,
+     1577, 1588, 1584, 1589, 1579, 1597, 1595, 1599, 1601, 1603,
+     1604, 1607, 1608, 1609, 1611, 1610, 1613, 1617, 1619, 1620,
+     1622, 1615, 1623, 1631, 1634, 1636, 1643, 5953, 1641, 1644,
+     1653, 1649, 1656, 1648, 1652, 1655, 1660, 1662, 1657, 1664,
+     1666, 1667, 1668, 1670, 1672, 1675, 1679, 1676, 5953, 1677,
+     1680, 1685, 1684, 1688, 1692, 1694, 1678, 1696, 1698, 1707,
+     1699, 1702, 1704, 1709,  177, 1710, 5953, 1712, 1716, 1719,
+     1720, 1722, 1724, 1726, 1727, 1728, 1729, 1730, 1624, 1732,
+     1733, 1737, 1736, 1735, 1739, 1741, 1751, 1742, 1754, 1761,
 
-     1753, 1755, 1760, 1759, 1762, 1758, 1767, 1769, 1776, 1764,
-     1765, 1766, 1779, 1781, 1790, 1786, 1787, 1788, 1797, 1792,
-     1794, 1795, 1798, 1807, 1796, 1804, 1809, 1799, 1802, 1814,
-     1815, 5927, 1816, 1817, 5927, 1818, 1820, 1842, 1823, 1825,
-     1828, 1827, 1830, 1832, 1833, 1835, 1839, 1846, 1862, 1850,
-     1865, 1837, 1867, 1854, 1868, 1857, 1859, 1870, 1877, 1885,
-     1892, 1875, 1893, 1895, 1876, 1878, 1887, 1906, 1890, 1891,
-     1894, 1899, 1900, 1904, 1910, 1903, 1915, 1916, 1922, 1919,
-     5927, 1930, 1928, 1927, 1929, 1939, 1936, 1937, 1938, 1940,
-     1943, 1950, 1945, 1948, 1952, 1951, 1955, 1953, 1958, 1963,
+     1762, 1763, 1764, 1765, 1766, 1767, 1768, 1770, 1775, 1771,
+     1780, 1776, 1783, 1794, 1791, 1778, 1781, 1798, 1779, 1804,
+     1808, 1806, 1792, 1799, 1813, 1811, 1815, 1816, 1817, 1819,
+     1820, 1821, 1823, 1826, 1827, 1828, 1830, 5953, 1829, 1832,
+     5953, 1836, 1837, 1859, 1838, 1840, 1842, 1851, 1841, 1861,
+     1845, 1855, 1867, 1863, 1879, 1871, 1882, 1874, 1876, 1883,
+     1887, 1888, 1884, 1890, 1893, 1900, 1903, 1907, 1901, 1914,
+     1909, 1910, 1912, 1932, 1911, 1913, 1920, 1915, 1916, 1919,
+     1928, 1921, 1922, 1925, 1937, 1943, 1945, 5953, 1953, 1954,
+     1948, 1926, 1956, 1959, 1960, 1843, 1961, 1962, 1969, 1965,
 
-     1965, 1960, 1961, 1968, 5927, 1964, 5927, 1975, 1976, 1979,
-     1977, 1981, 1982, 1983, 1985, 5927, 5927, 1987, 1984, 1994,
-     2006, 2001, 5927, 1986, 2009, 2011, 2004, 2005, 2010, 2013,
-     2016, 2017, 2024, 2020, 2027, 2022, 2023, 2025, 5927, 2033,
-     2026, 2038, 2041, 2034, 2044, 2048, 2042, 5927, 2045, 2052,
-     2055, 2062, 2058, 2060, 2059, 2063, 2064, 2067, 2070, 2071,
-     2072, 2073, 2080, 2082, 2078, 2079, 2087, 2094, 5927, 2081,
-     2090, 2101, 2093, 2097, 2100, 2102, 2103, 2104, 2105, 2106,
-     2112, 2113, 2114, 2122, 2124, 2119, 2115, 2127, 2123, 2129,
-     2128, 2135, 2132, 2136, 2137, 2138, 5927, 2139, 2147,  124,
+     1966, 1968, 1971, 1972, 1975, 1976, 1980, 1981, 1977, 1982,
+     1993, 5953, 1984, 5953, 1992, 1994, 1996, 1997, 1998, 2002,
+     2003, 2004, 5953, 5953, 2005, 2012, 2018, 2007, 2013, 5953,
+     2020, 2028, 2029, 2031, 2023, 2024, 2025, 2032, 2035, 2046,
+     2038, 2047, 2039, 2048, 2042, 5953, 2049, 2051, 2055, 2057,
+     2059, 2061, 2063, 2064, 5953, 2065, 2067, 2073, 2080, 2070,
+     2077, 2078, 2081, 2087, 2082, 2085, 2089, 2090, 2092, 2097,
+     2101, 2094, 2098, 2102, 2112, 5953, 2108, 2110, 2117, 2113,
+     2115, 2116, 2119, 2120, 2121, 2129, 2122, 2123, 2127, 2131,
+     2140, 2142, 2137, 2143, 2145, 2135, 2146, 2147, 2153, 2151,
 
-     2141, 2144, 2148, 2149, 2152, 2165, 2151, 2168, 2172, 2169,
-     2173, 2176, 2153, 2170, 2177, 2178, 2179, 2180, 2185, 2183,
-     5927, 2189, 2190, 2191, 2186, 2197, 2192, 2194, 5927, 2195,
-     2206, 2215, 2216, 2205, 2217, 2207, 2218, 2221, 2222, 2224,
-     2228, 2229, 2225, 5927, 2232, 2234, 2237, 2235, 2241, 2245,
-     2238, 2248, 2250, 2251, 2252, 2253, 2254, 2257, 2256, 2258,
-     2259, 2260, 2267, 2271, 2272, 2274, 5927, 2284, 2262, 2273,
-     2280, 2285, 2286, 2294, 2287, 2289, 2295, 2296, 2309, 2299,
-     2301, 2311, 2315, 2302, 2304, 2325, 2321, 2324, 2330, 2320,
-     2333, 2335, 2323, 2327, 2337, 2336, 2339, 2347, 2342, 2354,
+     2155, 2156, 2157, 5953, 2158, 2162,  256, 2165, 2163, 2168,
+     2166, 2167, 2173, 2170, 2187, 2189, 2186, 2192, 2188, 2184,
+     2185, 2195, 2196, 2197, 2201, 2202, 2203, 5953, 2205, 2206,
+     2207, 2209, 2212, 2210, 2221, 5953, 2213, 2223, 2232, 2227,
+     2215, 2233, 2219, 2239, 2241, 2242, 2243, 2244, 2245, 2246,
+     5953, 2252, 2248, 2254, 2255, 2258, 2260, 2261, 2266, 2267,
+     2268, 2271, 2269, 2272, 2273, 2274, 2276, 2277, 2280, 2288,
+     2278, 2289, 2290, 2291, 5953, 2300, 2292, 2296, 2301, 2302,
+     2305, 2314, 2310, 2312, 2315, 2318, 2330, 2320, 2316, 2337,
+     2322, 2327, 2336, 2340, 2341, 2342, 2350, 2344, 2354, 2356,
 
-     2355, 2352, 2358, 2350, 2371, 2376, 2367, 5927, 2365, 2375,
-     2363, 2377, 2385, 2380, 2382, 2383, 2389, 2388, 2391, 2392,
-     2399, 2394, 2396, 2400, 2403, 2401, 2409, 2405, 2411, 2412,
-     2420, 2413, 2422, 2351, 5927, 2424, 2425, 2416, 2429, 2432,
-     2426, 2434, 2439, 2437, 2441, 2443, 2445, 2447, 2448, 2449,
-     2450, 2452, 2454, 2453, 5927, 2457, 2458, 2463, 2465, 2466,
-     2472, 2475, 2478, 2476, 2482, 2483, 2484, 2485, 5927, 2492,
-     2493, 2490, 2494, 2496, 2497, 2499, 2502, 2503, 5927, 2504,
-     2506, 2513, 2514, 2509, 5927, 2517, 2512, 2518, 2519, 2520,
-     2521, 2527, 2522, 2525, 2530, 2535, 2537, 2533, 2541, 5927,
+     2348, 2352, 2357, 2358, 2362, 2360, 2363, 2375, 2377, 2379,
+     2372, 2373, 2385, 2397, 2388, 5953, 2392, 2383, 2390, 2400,
+     2407, 2380, 2405, 2403, 2404, 2411, 2412, 2414, 2421, 2418,
+     2416, 2420, 2422, 2423, 2426, 2425, 2429, 2433, 2440, 2432,
+     2442, 2444, 5953, 2445, 2450, 2449, 2451, 2453, 2436, 2458,
+     2461, 2459, 2463, 2465, 2467, 2469, 2470, 2471, 2472, 2474,
+     2476, 2475, 5953, 2479, 2480, 2485, 2487, 2488, 2494, 2497,
+     2500, 2498, 2504, 2505, 2506, 2507, 5953, 2514, 2515, 2512,
+     2516, 2518, 2519, 2521, 2524, 2525, 5953, 2526, 2528, 2535,
+     2536, 2531, 5953, 2539, 2534, 2540, 2541, 2542, 2543, 2549,
 
-     2543, 2553, 2545, 2549, 2551, 2554, 2555, 2557, 2561, 2565,
-     2560, 5927, 2577, 2576, 2573, 2587, 2564, 2578, 2579, 2585,
-     2582, 2588, 2589, 5927, 2591, 2592, 2594, 2595, 2598, 2599,
-     2601, 2613, 2603, 2606, 2608, 2611, 2614, 2616, 2618, 2621,
-     2619, 2627, 2630, 2631, 2633, 2634, 2636, 2637, 2644, 2647,
-     2649, 2651, 5927, 2654, 2655, 2656, 2643, 2646, 2658, 2662,
-     2663, 2666, 2667, 2671, 2668, 2670, 2678, 2680, 2681, 2683,
-     2685, 2687, 2688, 2690, 2691, 2692, 2693, 2700, 2698, 2696,
-     2705, 2702, 2707, 2714, 2709, 2715, 2716, 2717, 2718, 2719,
-     2723, 2724, 2726, 2727, 2731, 2742, 2743, 2733, 2744, 2745,
+     2544, 2547, 2552, 2557, 2559, 2555, 2563, 5953, 2565, 2575,
+     2567, 2571, 2573, 2576, 2577, 2579, 2583, 2587, 2582, 5953,
+     2599, 2598, 2595, 2609, 2586, 2600, 2601, 2607, 2604, 2610,
+     2611, 5953, 2613, 2614, 2616, 2617, 2620, 2621, 2623, 2635,
+     2625, 2628, 2630, 2633, 2636, 2638, 2640, 2643, 2641, 2649,
+     2652, 2653, 2655, 2659, 2656, 2660, 2663, 2671, 2672, 2673,
+     2675, 5953, 2678, 2679, 2680, 2664, 2684, 2685, 2686, 2687,
+     2690, 2691, 2692, 2694, 2695, 2702, 2712, 2703, 2704, 2707,
+     2709, 2713, 2715, 2716, 2717, 2718, 2725, 2724, 2721, 2733,
+     2730, 2732, 2740, 2731, 2739, 2741, 2742, 2743, 2744, 2748,
 
-     2746, 2747, 5927, 2750, 2752, 2751, 2756, 2761, 2758, 2768,
-     2764, 2765, 2769, 2773, 2776, 2770, 2775, 2781, 2788, 2784,
-     5927, 2785, 5927, 2786, 2787, 2794, 2797, 2789, 5927, 2799,
-     5927, 2802, 2811, 2796, 2800, 5927, 2814, 2804, 2806, 2818,
-     2808, 2813, 2820, 2821, 2822, 2827, 2825, 2829, 2830, 2831,
-     2833, 2835, 2837, 2841, 2846, 2848, 2838, 2849, 2840, 2854,
-     2857, 2851, 2859, 5927, 2867, 2860, 2863, 2868, 2869, 2871,
-     2872, 2874, 2875, 2880, 2876, 2881, 2882, 2889, 2892, 2890,
-     2893, 2904, 5927, 2894, 2906, 2899, 2901, 5927, 2909, 2903,
-     2910, 2915, 2912, 2917, 2919, 2920, 2921, 2924, 2925, 2937,
+     2745, 2751, 2752, 2756, 2767, 2768, 2770, 2759, 2753, 2769,
+     2775, 5953, 2771, 2778, 2779, 2780, 2784, 2785, 2792, 2787,
+     2788, 2795, 2803, 2804, 2789, 2797, 2791, 2812, 2814, 5953,
+     2798, 5953, 2805, 2817, 2818, 2827, 2810, 5953, 2824, 5953,
+     2825, 2832, 2820, 2829, 5953, 2834, 2833, 2835, 2838, 2840,
+     2841, 2842, 2843, 2846, 2849, 2847, 2851, 2852, 2856, 2854,
+     2858, 2859, 2863, 2870, 2867, 2872, 2873, 2875, 2879, 2880,
+     2881, 2882, 5953, 2886, 2883, 2888, 2889, 2891, 2893, 2894,
+     2898, 2896, 2899, 2904, 2906, 2907, 2910, 2915, 2923, 2914,
+     2928, 5953, 2921, 2925, 2926, 2930, 5953, 2932, 2929, 2938,
 
-     2938, 2928, 2939, 5927, 2941, 2944, 2929, 2948, 2952, 2956,
-     2930, 2959, 2953, 2957, 2963, 2964, 2965, 2966, 2967, 2974,
-     2975, 2972, 2979, 2971, 2978, 2981, 2985, 2987, 2988, 2989,
-     2992, 2993, 2991, 2997, 3001, 2996, 2998, 2999, 3000, 5927,
-     3012, 3002, 3014, 3023, 3015, 3017, 3004, 3020, 3025, 3026,
-     3029, 3033, 3027, 5927, 3032, 5927, 3035, 3037, 3049, 3051,
-     3044, 3039, 3055, 3054, 3046, 3061, 3062, 3063, 3064, 3065,
-     3066, 3069, 3070, 3076, 3077, 3073, 3074, 3078, 3084, 3086,
-     3087, 3089, 5927, 5927, 3090, 3092, 3095, 3093, 3097, 3099,
-     3107, 3105, 3098, 3111, 3112, 3119, 5927, 3120, 3121, 3123,
+     2940, 2933, 2931, 2942, 2943, 2950, 2944, 2948, 2952, 2960,
+     2959, 2962, 5953, 2963, 2961, 2967, 2971, 2975, 2973, 2976,
+     2979, 2988, 2984, 2983, 2985, 2986, 2987, 2990, 2997, 3000,
+     2999, 3001, 2998, 3006, 3009, 3010, 3002, 3012, 3013, 3014,
+     3016, 5953, 3017, 3018, 3025, 3022, 3023, 3024, 3026, 5953,
+     3035, 3036, 3039, 3040, 3037, 3045, 3027, 3046, 3048, 3050,
+     3053, 3049, 3054, 5953, 3062, 5953, 3055, 3063, 3068, 3072,
+     3069, 3073, 3075, 3084, 3074, 3076, 3085, 3088, 3079, 3086,
+     3092, 3089, 3094, 3096, 3110, 3100, 3097, 3107, 3109, 3111,
+     3112, 3114, 5953, 5953, 3113, 3115, 3118, 3116, 3121, 3124,
 
-     3124, 3131, 3126, 3128, 3139, 3135, 3143, 3141, 5927, 3138,
-     3142, 3152, 3148, 3150, 3155, 5927, 3154, 5927, 3151, 3157,
-     3160, 3163, 3164, 3165, 3166, 3167, 3174, 3175, 3185, 3171,
-     3182, 3183, 3186, 3187, 3194, 3189, 3190, 3191, 5927, 3193,
-     3196, 3199, 3207, 3208, 3210, 3214, 3197, 5927, 3204, 3218,
-     3221, 3222, 3224, 3226, 3227, 3228, 3230, 3232, 3229, 3231,
-     3239, 3237, 3236, 3246, 3256, 3247, 3258, 5927, 3259, 3253,
-     3266, 3268, 3261, 3263, 3269, 3270, 3271, 3274, 3276, 3275,
-     3277, 3279, 3281, 3278, 3288, 3282, 3295, 3284, 3298, 3304,
-     3305, 3285, 3301, 3308, 3309, 3312, 3311, 3315, 3318, 3322,
+     3122, 3131, 3134, 3135, 3136, 3145, 5953, 3141, 3142, 3146,
+     3148, 3164, 3147, 3150, 3166, 3162, 3169, 3170, 5953, 3151,
+     3159, 3178, 3161, 3177, 3181, 5953, 3179, 5953, 3182, 3183,
+     3184, 3185, 3190, 3191, 3193, 3195, 3189, 3205, 3206, 3198,
+     3196, 3197, 3208, 3212, 3219, 3214, 3217, 3220, 5953, 3222,
+     3223, 3224, 3226, 3229, 3230, 3232, 3237, 5953, 3239, 3245,
+     3240, 3246, 3242, 3248, 3249, 3250, 3252, 3253, 3251, 3255,
+     3262, 3266, 3267, 3268, 3272, 3273, 3280, 5953, 3277, 3281,
+     3289, 3287, 3284, 3291, 3292, 3288, 3294, 3297, 3299, 3298,
+     3300, 3301, 3304, 3302, 3305, 3306, 3318, 3320, 3321, 3311,
 
-     3319, 3331, 3332, 3323, 3326, 3335, 3336, 3343, 3338, 5927,
-     3348, 3328, 3351, 3349, 3350, 3355, 3356, 3358, 3359, 3360,
-     3361, 3368, 3363, 5927, 3370, 3365, 3375, 3376, 3367, 3390,
-     3385, 3366, 3388, 3392, 3389, 3395, 3393, 3397, 3398, 3401,
-     3402, 5927, 5927, 3404, 3405, 3407, 5927, 3408, 3406, 3418,
-     3411, 3414, 3421, 3238, 3420, 3423, 3424, 3426, 3428, 5927,
-     3432, 3439, 3431, 3434, 3446, 3448, 3454, 3438, 3447, 3445,
-     3450, 3455, 3457, 3458, 3459, 3461, 3470, 3463, 3466, 3468,
-     5927, 3471, 3473, 3474, 3478, 3475, 3482, 5927, 3480, 3486,
-     3487, 3489, 3501, 3492, 3502, 3504, 3484, 3506, 3507, 3509,
+     3328, 3312, 3324, 3329, 3331, 3332, 3338, 3339, 3342, 3347,
+     3335, 3349, 3356, 3337, 3344, 3360, 3362, 3367, 3350, 5953,
+     3369, 3364, 3374, 3370, 3372, 3377, 3378, 3386, 3371, 3373,
+     3381, 3394, 3387, 5953, 3397, 3389, 3398, 3399, 3402, 3411,
+     3404, 3392, 3406, 3409, 3414, 3415, 3418, 3419, 3420, 3423,
+     3424, 5953, 5953, 3426, 3428, 3430, 5953, 3433, 3429, 3437,
+     3435, 3436, 3432, 3445, 3446, 3443, 3448, 3451, 3454, 5953,
+     3456, 3464, 3459, 3460, 3468, 3471, 3473, 3475, 3474, 3466,
+     3463, 3476, 3478, 3484, 3485, 3489, 3493, 3492, 3491, 3494,
+     5953, 3495, 3496, 3499, 3501, 3497, 3505, 5953, 3503, 3509,
 
-     3508, 3510, 3517, 3512, 3516, 3523, 3524, 3515, 5927, 3529,
-     3531, 3532, 3534, 3536, 3545, 3543, 3546, 3541, 3548, 3549,
-     3556, 5927, 3551, 3554, 3557, 3555, 3565, 3560, 3568, 3564,
-     5927, 3566, 3570, 3572, 5927, 3571, 3583, 3586, 3588, 3573,
-     3581, 3590, 3592, 3594, 3595, 5927, 3598, 5927, 3599, 3579,
-     3605, 5927, 3601, 3607, 3609, 3611, 3608, 3615, 3616, 3623,
-     3612, 3618, 3624, 3625, 3626, 3628, 3635, 3631, 3634, 3636,
-     3637, 5927, 3638, 3640, 3646, 3647, 3652, 3641, 3645, 3657,
-     3656, 5927, 5927, 3660, 5927, 3664, 3663, 3665, 5927, 3668,
-     3670, 3677, 3672, 3673, 3676, 3686, 3680, 5927, 3675, 3687,
+     3517, 3510, 3508, 3521, 3524, 3527, 3528, 3529, 3531, 3532,
+     3533, 3534, 3536, 3541, 3539, 3546, 3547, 3538, 5953, 3551,
+     3552, 3555, 3558, 3562, 3565, 3572, 3573, 3569, 3571, 3570,
+     3580, 5953, 3577, 3579, 3578, 3581, 3591, 3586, 3593, 3584,
+     5953, 3588, 3592, 3594, 5953, 3598, 3602, 3605, 3610, 3597,
+     3613, 3612, 3614, 3615, 3616, 5953, 3622, 5953, 3620, 3624,
+     3628, 5953, 3626, 3630, 3632, 3634, 3631, 3639, 3641, 3648,
+     3635, 3643, 3645, 3649, 3650, 3651, 3659, 3657, 3658, 3660,
+     3662, 5953, 3665, 3661, 3664, 3669, 3671, 3672, 3674, 3681,
+     3683, 5953, 5953, 3688, 5953, 3682, 3689, 3690, 5953, 3692,
 
-     3690, 3692, 3693, 3694, 3696, 3697, 3695, 3698, 3699, 5927,
-     3700, 3703, 3711, 3704, 3712, 3716, 3723, 3717, 5927, 3724,
-     3725, 3726, 3730, 3731, 5927, 3733, 5927, 3734, 3736, 3739,
-     3741, 3740, 5927, 3746, 3747, 3750, 3753, 3755, 3754, 3757,
-     3758, 3764, 3765, 3772, 3768, 3767, 3769, 5927, 3770, 3774,
-     3776, 3783, 3771, 3778, 3787, 3790, 3791, 3792, 3797, 3794,
-     3801, 3803, 3805, 3807, 3799, 5927, 3809, 3811, 3810, 3825,
-     3820, 3815, 5927, 3816, 3830, 3832, 5927, 3823, 3822, 3834,
-     3839, 3826, 3833, 3840, 3841, 3845, 5927, 3846, 3847, 3848,
-     3849, 3852, 3853, 5927, 5927, 3861, 5927, 3863, 3850, 3864,
+     3694, 3697, 3693, 3698, 3700, 3704, 3701, 5953, 3711, 3712,
+     3713, 3715, 3716, 3717, 3719, 3721, 3720, 3723, 3722, 5953,
+     3725, 3727, 3735, 3726, 3730, 3740, 3742, 3736, 5953, 3748,
+     3749, 3752, 3754, 3755, 5953, 3757, 5953, 3758, 3760, 3761,
+     3763, 3764, 5953, 3772, 3767, 3778, 3768, 3775, 3782, 3785,
+     3786, 3771, 3779, 3793, 3792, 3788, 3795, 5953, 3796, 3798,
+     3805, 3806, 3802, 3800, 3814, 3811, 3819, 3810, 3823, 3813,
+     3827, 3829, 3824, 3831, 3832, 5953, 3834, 3835, 3838, 3845,
+     3840, 3841, 5953, 3842, 3847, 3851, 5953, 3848, 3855, 3857,
+     3863, 3858, 3860, 3864, 3865, 3867, 5953, 3869, 3871, 3868,
 
-     3865, 3866, 3872, 3871, 3875, 3877, 3874, 3878, 3885, 3886,
-     3895, 3898, 3902, 3897, 3901, 3887, 5927, 5927, 3904, 3905,
-     3908, 3911, 3912, 3914, 3915, 3922, 3918, 3924, 3928, 3929,
-     3936, 5927, 3935, 3921, 3938, 5927, 3919, 3932, 3940, 3943,
-     3945, 3946, 3949, 3947, 3948, 3951, 3955, 3952, 3957, 3961,
-     3959, 3962, 3960, 3970, 3968, 3969, 3977, 5927, 3978, 3971,
-     3980, 3982, 3983, 3984, 3988, 3989, 3991, 5927, 3993, 3995,
-     3997, 3998, 3992, 4002, 4013, 4017, 4019, 4010, 4020, 4021,
-     4023, 4027, 4024, 5927, 4031, 4028, 4030, 4034, 4038, 4040,
-     4041, 4043, 4044, 4052, 4049, 4053, 4055, 4057, 4045, 4061,
+     3872, 3884, 3885, 5953, 5953, 3886, 5953, 3887, 3873, 3891,
+     3890, 3870, 3898, 3900, 3901, 3903, 3897, 3909, 3912, 3911,
+     3920, 3921, 3928, 3923, 3925, 3918, 5953, 5953, 3930, 3931,
+     3927, 3935, 3939, 3937, 3941, 3948, 3945, 3943, 3952, 3953,
+     3960, 5953, 3961, 3947, 3962, 5953, 3955, 3963, 3956, 3969,
+     3970, 3964, 3971, 3972, 3973, 3974, 3977, 3981, 3983, 3986,
+     3988, 3989, 3990, 3994, 3993, 3995, 4003, 5953, 3997, 4000,
+     4004, 4007, 4008, 4010, 4012, 4015, 4016, 5953, 4011, 4018,
+     4021, 4022, 4020, 4025, 4039, 4042, 4044, 4031, 4036, 4047,
+     4045, 4051, 4053, 5953, 4055, 4052, 4056, 4059, 4062, 4064,
 
-     4063, 4047, 5927, 4067, 4069, 4065, 4074, 4071, 4075, 4076,
-     4082, 4086, 4078, 4080, 4087, 4091, 5927, 4088, 4092, 4094,
-     4096, 4102, 4093, 4099, 4103, 5927, 4105, 4107, 4110, 4111,
-     4113, 4116, 4119, 4120, 4123, 4122, 4126, 5927, 4128, 4130,
-     4133, 4136, 4137, 4139, 4142, 4141, 5927, 4143, 4149, 4151,
-     4158, 4153, 4162, 4159, 4163, 4155, 4157, 4169, 4173, 4175,
-     4176, 4177, 4165, 4187, 4189, 4188, 5927, 4171, 5927, 4190,
-     4193, 4201, 4196, 4178, 5927, 4202, 4203, 4207, 4208, 4204,
-     5927, 4209, 4210, 4212, 4216, 5927, 4211, 4215, 4217, 4222,
-     4225, 4229, 5927, 4232, 4233, 4235, 4244, 4245, 4242, 4243,
+     4065, 4067, 4068, 4070, 4073, 4074, 4078, 4081, 4075, 4082,
+     4083, 4085, 5953, 4087, 4094, 4090, 4096, 4098, 4099, 4100,
+     4101, 4107, 4108, 4110, 4111, 4113, 5953, 4114, 4115, 4118,
+     4119, 4121, 4122, 4124, 4128, 5953, 4132, 4126, 4129, 4135,
+     4137, 4140, 4142, 4144, 4147, 4148, 4151, 5953, 4152, 4157,
+     4160, 4153, 4159, 4161, 4170, 4163, 5953, 4174, 4176, 4173,
+     4183, 4166, 4186, 4185, 4191, 4167, 4184, 4195, 4193, 4194,
+     4199, 4200, 4201, 4210, 4211, 4212, 5953, 4206, 5953, 4213,
+     4217, 4220, 4223, 4207, 5953, 4219, 4221, 4231, 4225, 4233,
+     5953, 4234, 4228, 4236, 4238, 5953, 4245, 4247, 4239, 4241,
 
-     4246, 4248, 4249, 4250, 4251, 4259, 4254, 4256, 5927, 4258,
-     4264, 4266, 4270, 4271, 4272, 4273, 4279, 4274, 5927, 4276,
-     4282, 4283, 4284, 4285, 4286, 4288, 4296, 4291, 4294, 5927,
-     4295, 4299, 4307, 3996, 4308, 5927, 5927, 4300, 4315, 4317,
-     4305, 4318, 5927, 4309, 4327, 4322, 4324, 4326, 5927, 5927,
-     4329, 5927, 4325, 5927, 4330, 4332, 5927, 5927, 4333, 4336,
-     4337, 4340, 4347, 5927, 4350, 5927, 4357, 4352, 4339, 4341,
-     4354, 5927, 4356, 4358, 4361, 5927, 4364, 4371, 4366, 4367,
-     5927, 4369, 4372, 4374, 5927, 4376, 4379, 4380, 4381, 4386,
-     4383, 4387, 4390, 4393, 4394, 4396, 4397, 4398, 4409, 4411,
+     4255, 4256, 5953, 4261, 4262, 4258, 4249, 4270, 4267, 4268,
+     4271, 4269, 4273, 4274, 4275, 4283, 4278, 4279, 5953, 4285,
+     4288, 4295, 4296, 4290, 4280, 4298, 4304, 4297, 5953, 4306,
+     4305, 4307, 4308, 4309, 4312, 4314, 4321, 4317, 4316, 5953,
+     4320, 4324, 4337, 4318, 4328, 5953, 5953, 4333, 4338, 4340,
+     4335, 4341, 5953, 4344, 4351, 4346, 4350, 4353, 5953, 5953,
+     4355, 5953, 4352, 5953, 4357, 4356, 5953, 5953, 4359, 4360,
+     4363, 4369, 4366, 5953, 4376, 5953, 4373, 4377, 4379, 4380,
+     4382, 5953, 4381, 4384, 4389, 5953, 4383, 4391, 4390, 4394,
+     5953, 4398, 4393, 4399, 5953, 4403, 4406, 4410, 4401, 4407,
 
-     4413, 4415, 4416, 4400, 4419, 4420, 4422, 4425, 4426, 4427,
-     4429, 4431, 4432, 4434, 4436, 4439, 4440, 4441, 4442, 4443,
-     4444, 4446, 4453, 4456, 4458, 4457, 4459, 4461, 4460, 4462,
-     4464, 4468, 4470, 4471, 5927, 4469, 4472, 4475, 4402, 4478,
-     4488, 4490, 4481, 4497, 4499, 5927, 4501, 5927, 4503, 4489,
-     4505, 4491, 5927, 4506, 4509, 4508, 4511, 4512, 4513, 4515,
-     4514, 4518, 4519, 4522, 5927, 4525, 4520, 4529, 4540, 5927,
-     4532, 4544, 4528, 4535, 4545, 4547, 4548, 4549, 4554, 4550,
-     4556, 4558, 4565, 4560, 4561, 4563, 4568, 4551, 4564, 4572,
-     4579, 4575, 4583, 4587, 5927, 4580, 5927, 4588, 4589, 4590,
+     4413, 4420, 4411, 4414, 4421, 4424, 4423, 4426, 4435, 4437,
+     4439, 4441, 4430, 4427, 4444, 4446, 4450, 4448, 4452, 4453,
+     4454, 4456, 4457, 4459, 4462, 4463, 4465, 4468, 4466, 4467,
+     4479, 4469, 4471, 4481, 4483, 4472, 4482, 4486, 4485, 4490,
+     4493, 4488, 4495, 4496, 5953, 4500, 4501, 4503, 4505, 4506,
+     4507, 4514, 4516, 4522, 4524, 5953, 4527, 5953, 4529, 4513,
+     4532, 4517, 5953, 4533, 4534, 4535, 4538, 4537, 4539, 4540,
+     4541, 4544, 4545, 4547, 5953, 4550, 4551, 4555, 4566, 5953,
+     4560, 4568, 4554, 4556, 4570, 4571, 4575, 4576, 4579, 4578,
+     4581, 4583, 4590, 4585, 4587, 4588, 4591, 4589, 4592, 4599,
 
-     4591, 4593, 4592, 4594, 5927, 5927, 4595, 4600, 4605, 4601,
-     4596, 4607, 4617, 5927, 4609, 4618, 4620, 4610, 5927, 4625,
-     4626, 4628, 5927, 4629, 4630, 4631, 4633, 4634, 4637, 4638,
-     4640, 4642, 4644, 4648, 5927, 5927, 5927, 5927, 4650, 4652,
-     4655, 4657, 4659, 4660, 4662, 4664, 4661, 5927, 4666, 5927,
-     5927, 4668, 4675, 4667, 4677, 4678, 4679, 4683, 4685, 5927,
-     4684, 4689, 4690, 4687, 4697, 4701, 4703, 4704, 4688, 4705,
-     4713, 4711, 4714, 4712, 4717, 4719, 4721, 5927, 5927, 4724,
-     4726, 4728, 4735, 4733, 4736, 4745, 4740, 4742, 4743, 4746,
-     4748, 4730, 4755, 4759, 4757, 4754, 5927, 4758, 4764, 5927,
+     4598, 4606, 4608, 4614, 5953, 4601, 5953, 4615, 4611, 4616,
+     4617, 4618, 4619, 4621, 5953, 5953, 4622, 4626, 4632, 4633,
+     4625, 4635, 4641, 5953, 4636, 4646, 4653, 4644, 5953, 4627,
+     4638, 4655, 5953, 4649, 4656, 4659, 4667, 4660, 4669, 4670,
+     4662, 4664, 4672, 4674, 5953, 5953, 5953, 5953, 4676, 4678,
+     4682, 4683, 4685, 4686, 4688, 4690, 4687, 5953, 4692, 5953,
+     5953, 4694, 4701, 4693, 4703, 4704, 4705, 4709, 4711, 5953,
+     4710, 4715, 4716, 4713, 4723, 4727, 4729, 4730, 4714, 4731,
+     4739, 4737, 4740, 4738, 4743, 4745, 4747, 5953, 5953, 4750,
+     4752, 4754, 4761, 4759, 4762, 4771, 4766, 4768, 4769, 4772,
 
-     4760, 5927, 4765, 4768, 4732, 4769, 4771, 4774, 4775, 4777,
-     5927, 5927, 4778, 4779, 4781, 4785, 4787, 4789, 4788, 4791,
-     4792, 5927, 4793, 5927, 4794, 4801, 4796, 4802, 4810, 4813,
-     4815, 4817, 4812, 4818, 5927, 4819, 4821, 5927, 4822, 4824,
-     4825, 5927, 4829, 4832, 4836, 5927, 4842, 4833, 4839, 5927,
-     4846, 5927, 4843, 4847, 4848, 4855, 5927, 4850, 4856, 5927,
-     4859, 4862, 4864, 4853, 5927, 4851, 5927, 4865, 4872, 4873,
-     4876, 4868, 4878, 4879, 4880, 4881, 4888, 4887, 4889, 5927,
-     5927, 4897, 4884, 4890, 4894, 4899, 4906, 4901, 4904, 4903,
-     5927, 5927, 4911, 5927, 4909, 4912, 5927, 4913, 4918, 4919,
+     4774, 4756, 4781, 4785, 4783, 4780, 5953, 4784, 4790, 5953,
+     4786, 5953, 4791, 4794, 4758, 4795, 4797, 4800, 4801, 4803,
+     5953, 5953, 4804, 4805, 4807, 4811, 4813, 4815, 4814, 4817,
+     4818, 5953, 4819, 5953, 4820, 4827, 4822, 4828, 4836, 4839,
+     4841, 4843, 4838, 4844, 5953, 4845, 4847, 5953, 4848, 4850,
+     4851, 5953, 4855, 4858, 4862, 5953, 4868, 4859, 4865, 5953,
+     4872, 5953, 4869, 4873, 4874, 4881, 5953, 4876, 4882, 5953,
+     4885, 4888, 4890, 4879, 5953, 4877, 5953, 4891, 4898, 4899,
+     4902, 4894, 4904, 4905, 4906, 4907, 4914, 4913, 4915, 5953,
+     5953, 4923, 4910, 4916, 4920, 4925, 4932, 4927, 4930, 4929,
 
-     4920, 4922, 4923, 4927, 4929, 4930, 4931, 4932, 4933, 4939,
-     4951, 4935, 4949, 4955, 4957, 4959, 4961, 4953, 4963, 4964,
-     4965, 4966, 4967, 4970, 5927, 4972, 4973, 4974, 5927, 4978,
-     4979, 4981, 4983, 5927, 4994, 4989, 4995, 4996, 5927, 4982,
-     5002, 4999, 4997, 5007, 5014, 5010, 5009, 5927, 5927, 5927,
-     5011, 5020, 5927, 5025, 5012, 5015, 5017, 5927, 5021, 5027,
-     5927, 5927, 5028, 5029, 5031, 5042, 5927, 5032, 5927, 5033,
-     5927, 5041, 5043, 5049, 5047, 5927, 5052, 5058, 5927, 5061,
-     5064, 5066, 5067, 5055, 5068, 5069, 5927, 5077, 5073, 5079,
-     5081, 5070, 5072, 5085, 5082, 5089, 5086, 5092, 5927, 5094,
+     5953, 5953, 4937, 5953, 4935, 4938, 5953, 4939, 4944, 4945,
+     4946, 4948, 4949, 4953, 4955, 4956, 4957, 4958, 4959, 4965,
+     4977, 4961, 4975, 4981, 4983, 4985, 4987, 4979, 4989, 4990,
+     4991, 4992, 4993, 4996, 5953, 4998, 4999, 5000, 5953, 5004,
+     5005, 5007, 5009, 5953, 5020, 5015, 5021, 5022, 5953, 5008,
+     5028, 5025, 5023, 5033, 5040, 5036, 5035, 5953, 5953, 5953,
+     5037, 5046, 5953, 5051, 5038, 5041, 5043, 5953, 5047, 5053,
+     5953, 5953, 5054, 5055, 5057, 5068, 5953, 5058, 5953, 5059,
+     5953, 5067, 5069, 5075, 5073, 5953, 5078, 5084, 5953, 5087,
+     5090, 5092, 5093, 5081, 5094, 5095, 5953, 5103, 5099, 5105,
 
-     5096, 5097, 5103, 5095, 5105, 5099, 5927, 5107, 5927, 5108,
-     5109, 5112, 5115, 5110, 5113, 5037, 5118, 5117, 5128, 5125,
-     5927, 5130, 5134, 5927, 5131, 5927, 5136, 5927, 5137, 5138,
-     5139, 5140, 5927, 5142, 5146, 5147, 5148, 5927, 5149, 5151,
-     5157, 5927, 5927, 5158, 5168, 5159, 5160, 5172, 5174, 5161,
-     5176, 5169, 5177, 5163, 5185, 5184, 5187, 5188, 5190, 5191,
-     5192, 5927, 5927, 5927, 5197, 5196, 5204, 5201, 5202, 5212,
-     5207, 5927, 5210, 5213, 5211, 5220, 5217, 5222, 5927, 5219,
-     5223, 5224, 5226, 5228, 5229, 5233, 5927, 5237, 5244, 5240,
-     5232, 5247, 5251, 5254, 5256, 5257, 5927, 5259, 5927, 5927,
+     5107, 5096, 5098, 5111, 5108, 5115, 5112, 5118, 5953, 5120,
+     5122, 5123, 5129, 5121, 5131, 5125, 5953, 5133, 5953, 5134,
+     5135, 5138, 5141, 5136, 5139, 5063, 5144, 5143, 5154, 5151,
+     5953, 5156, 5160, 5953, 5157, 5953, 5162, 5953, 5163, 5164,
+     5165, 5166, 5953, 5168, 5172, 5173, 5174, 5953, 5175, 5177,
+     5183, 5953, 5953, 5184, 5194, 5185, 5186, 5198, 5200, 5187,
+     5202, 5195, 5203, 5189, 5211, 5210, 5213, 5214, 5216, 5217,
+     5218, 5953, 5953, 5953, 5223, 5222, 5230, 5227, 5228, 5238,
+     5233, 5953, 5236, 5239, 5237, 5246, 5243, 5248, 5953, 5245,
+     5249, 5250, 5252, 5254, 5255, 5259, 5953, 5263, 5270, 5266,
 
-     5260, 5927, 5261, 5263, 5264, 5265, 5927, 5268, 5270, 5269,
-     5271, 5273, 5927, 5281, 5274, 5276, 5277, 5927, 5927, 5288,
-     5927, 5291, 5292, 5293, 5302, 5298, 5300, 5304, 5301, 5927,
-     5299, 5305, 5309, 5311, 5312, 5927, 5313, 5315, 5316, 5317,
-     5320, 5324, 5326, 5327, 5328, 5927, 5330, 5322, 5345, 5341,
-     5927, 5329, 5347, 5927, 5927, 5332, 5351, 5352, 5927, 5927,
-     5927, 5354, 5927, 5358, 5364, 5368, 5372, 5355, 5927, 5374,
-     5363, 5371, 5927, 5367, 5375, 5377, 5379, 5927, 5927, 5376,
-     5383, 5380, 5388, 5389, 5927, 5391, 5393, 5398, 5406, 5408,
-     5396, 5410, 5412, 5419, 5392, 5400, 5414, 5416, 5417, 5423,
+     5258, 5273, 5277, 5280, 5282, 5283, 5953, 5285, 5953, 5953,
+     5286, 5953, 5287, 5289, 5290, 5291, 5953, 5294, 5296, 5295,
+     5297, 5299, 5953, 5307, 5300, 5302, 5303, 5953, 5953, 5314,
+     5953, 5317, 5318, 5319, 5328, 5324, 5326, 5330, 5327, 5953,
+     5325, 5331, 5335, 5337, 5338, 5953, 5339, 5341, 5342, 5343,
+     5346, 5350, 5352, 5353, 5354, 5953, 5356, 5348, 5371, 5367,
+     5953, 5355, 5373, 5953, 5953, 5358, 5377, 5378, 5953, 5953,
+     5953, 5380, 5953, 5384, 5390, 5394, 5398, 5381, 5953, 5400,
+     5389, 5397, 5953, 5393, 5401, 5403, 5405, 5953, 5953, 5402,
+     5409, 5406, 5414, 5415, 5953, 5417, 5419, 5424, 5432, 5434,
 
-     5420, 5427, 5436, 5432, 5434, 5441, 5442, 5927, 5927, 5444,
-     5927, 5927, 5446, 5449, 5451, 5453, 5455, 5457, 5459, 5927,
-     5394, 5461, 5462, 5463, 5464, 5927, 5466, 5468, 5465, 5469,
-     5474, 5472, 5476, 5478, 5927, 5927, 5470, 5487, 5479, 5492,
-     5481, 5927, 5494, 5489, 5495, 5496, 5498, 5500, 5503, 5927,
-     5502, 5504, 5927, 5927, 5506, 5927, 5927, 5927, 5927, 5927,
-     5927, 5927, 5927, 5507, 5927, 5511, 5515, 5523, 5526, 5927,
-     5512, 5520, 5431, 5516, 5527, 5927, 5528, 5531, 5532, 5538,
-     5530, 5533, 5539, 5543, 5546, 5544, 5547, 5548, 5549, 5553,
-     5550, 5554, 5556, 5927, 5927, 5927, 5555, 5557, 5567, 5559,
+     5422, 5436, 5438, 5445, 5418, 5426, 5440, 5442, 5443, 5449,
+     5446, 5453, 5462, 5458, 5460, 5467, 5468, 5953, 5953, 5470,
+     5953, 5953, 5472, 5475, 5477, 5479, 5481, 5483, 5485, 5953,
+     5420, 5487, 5488, 5489, 5490, 5953, 5492, 5494, 5491, 5495,
+     5500, 5498, 5502, 5504, 5953, 5953, 5496, 5513, 5505, 5518,
+     5507, 5953, 5520, 5515, 5521, 5522, 5524, 5526, 5529, 5953,
+     5528, 5530, 5953, 5953, 5532, 5953, 5953, 5953, 5953, 5953,
+     5953, 5953, 5953, 5533, 5953, 5537, 5541, 5549, 5552, 5953,
+     5538, 5546, 5457, 5542, 5553, 5953, 5554, 5557, 5558, 5564,
+     5556, 5559, 5565, 5569, 5572, 5570, 5573, 5574, 5575, 5579,
 
-     5576, 5578, 5581, 5583, 5570, 5573, 5584, 5585, 5586, 5588,
-     5592, 5600, 5595, 5596, 5597, 5598, 5604, 5599, 5601, 5606,
-     5927, 5610, 5927, 5611, 5927, 5927, 5616, 5621, 5619, 5612,
-     5623, 5630, 5626, 5628, 5632, 5633, 5635, 5637, 5927, 5639,
-     5642, 5927, 5643, 5644, 5927, 5645, 5647, 5649, 5646, 5650,
-     5653, 5656, 5664, 5655, 5927, 5927, 5658, 5666, 5667, 5671,
-     5674, 5681, 5676, 5680, 5682, 5683, 5673, 5695, 5927, 5691,
-     5693, 5697, 5927, 5699, 5694, 5700, 5701, 5702, 5710, 5705,
-     5706, 5927, 5708, 5927, 5712, 5714, 5717, 5715, 5716, 5718,
-     5727, 5725, 5729, 5927, 5732, 5736, 5733, 5738, 5740, 5743,
+     5576, 5580, 5582, 5953, 5953, 5953, 5581, 5583, 5593, 5585,
+     5602, 5604, 5607, 5609, 5596, 5599, 5610, 5611, 5612, 5614,
+     5618, 5626, 5621, 5622, 5623, 5624, 5630, 5625, 5627, 5632,
+     5953, 5636, 5953, 5637, 5953, 5953, 5642, 5647, 5645, 5638,
+     5649, 5656, 5652, 5654, 5658, 5659, 5661, 5663, 5953, 5665,
+     5668, 5953, 5669, 5670, 5953, 5671, 5673, 5675, 5672, 5676,
+     5679, 5682, 5690, 5681, 5953, 5953, 5684, 5692, 5693, 5697,
+     5700, 5707, 5702, 5706, 5708, 5709, 5699, 5721, 5953, 5717,
+     5719, 5723, 5953, 5725, 5720, 5726, 5727, 5728, 5736, 5731,
+     5732, 5953, 5734, 5953, 5738, 5740, 5743, 5741, 5742, 5744,
 
-     5744, 5745, 5747, 5749, 5753, 5757, 5759, 5760, 5750, 5763,
-     5761, 5927, 5771, 5762, 5927, 5772, 5773, 5765, 5774, 5775,
-     5927, 5783, 5779, 5785, 5786, 5789, 5790, 5927, 5792, 5795,
-     5796, 5927, 5800, 5927, 5927, 5801, 5799, 5802, 5808, 5810,
-     5927, 5927, 5927, 5835, 5842, 5849, 5856, 5863,   88, 5870,
-     5877, 5884, 5891, 5898, 5905, 5912, 5919
+     5753, 5751, 5755, 5953, 5758, 5762, 5759, 5764, 5766, 5769,
+     5770, 5771, 5773, 5775, 5779, 5783, 5785, 5786, 5776, 5789,
+     5787, 5953, 5797, 5788, 5953, 5798, 5799, 5791, 5800, 5801,
+     5953, 5809, 5805, 5811, 5812, 5815, 5816, 5953, 5818, 5821,
+     5822, 5953, 5826, 5953, 5953, 5827, 5825, 5828, 5834, 5836,
+     5953, 5953, 5953, 5861, 5868, 5875, 5882, 5889,   88, 5896,
+     5903, 5910, 5917, 5924, 5931, 5938, 5945
     } ;
 
-static const flex_int16_t yy_def[3058] =
+static const flex_int16_t yy_def[3068] =
     {   0,
-     3043,    1, 3044, 3044, 3045, 3045, 3046, 3046, 3047, 3047,
-     3048, 3048, 3043, 3049, 3043, 3043, 3043, 3043, 3050, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3051, 3043, 3043, 3043, 3051, 3052, 3043, 3043,
-     3043, 3052, 3053, 3043, 3043, 3043, 3043, 3053, 3054, 3043,
-     3043, 3043, 3054, 3055, 3043, 3056, 3043, 3055, 3055, 3049,
-     3049, 3043, 3057, 3050, 3057, 3050, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3053,    1, 3054, 3054, 3055, 3055, 3056, 3056, 3057, 3057,
+     3058, 3058, 3053, 3059, 3053, 3053, 3053, 3053, 3060, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3061, 3053, 3053, 3053, 3061, 3062, 3053, 3053,
+     3053, 3062, 3063, 3053, 3053, 3053, 3053, 3063, 3064, 3053,
+     3053, 3053, 3064, 3065, 3053, 3066, 3053, 3065, 3065, 3059,
+     3059, 3053, 3067, 3060, 3067, 3060, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3051, 3051, 3052, 3052, 3053, 3053, 3043, 3054, 3054, 3055,
-     3055, 3056, 3056, 3055, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3061, 3061, 3062, 3062, 3063, 3063, 3053, 3064, 3064,
+     3065, 3065, 3066, 3066, 3065, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3055, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3065, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3055, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3065, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3055, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3065, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3055, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3043, 3043, 3049, 3043, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3065,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3053,
+     3059, 3053, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3055, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3065,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3043, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3055,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3053, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3053, 3059, 3059, 3065, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3043, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3043, 3049, 3043, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3053, 3059, 3053, 3059, 3059, 3059, 3053, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3043, 3049, 3043, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3053, 3053, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3043, 3043, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3043, 3043,
-     3049, 3043, 3049, 3043, 3049, 3049, 3043, 3043, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3053, 3053, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3053, 3053,
+     3059, 3053, 3059, 3053, 3059, 3059, 3053, 3053, 3059, 3059,
+     3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3043, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3043, 3043, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3043,
+     3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3053, 3053, 3053, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3043, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3043,
-     3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3043, 3049, 3043, 3049, 3049, 3043, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3053,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3053, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3053, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3053,
+     3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3043, 3043,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3043, 3043, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049,
-     3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
+     3053, 3053, 3059, 3053, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3053, 3053,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3053, 3053, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059,
+     3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3043, 3049, 3043, 3049, 3043, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3043, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3043, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3043, 3043,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3053, 3059, 3053, 3059, 3053, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3053, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3053, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
 
-     3049, 3043, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3043, 3049,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3043, 3043, 3049, 3049, 3049, 3043, 3043,
-     3043, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3043, 3043, 3049,
-     3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3053, 3053,
+     3059, 3053, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053, 3053, 3059,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3053, 3053, 3059, 3059, 3059, 3053, 3053,
+     3053, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3053, 3053, 3059,
+     3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3043, 3049,
-     3043, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3043, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3043, 3043, 3049, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3049, 3043, 3049, 3049, 3049, 3049, 3043,
-     3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3043, 3043, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3053, 3059,
+     3053, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3053, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3053, 3053, 3059, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3059, 3053, 3059, 3059, 3059, 3059, 3053,
+     3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3043, 3049, 3043, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3043, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3043, 3043, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049,
-     3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049, 3049,
+     3059, 3059, 3059, 3053, 3053, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3053, 3059, 3053, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3053, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3053, 3053, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059,
+     3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
 
-     3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049, 3049,
-     3049, 3043, 3049, 3049, 3043, 3049, 3049, 3049, 3049, 3049,
-     3043, 3049, 3049, 3049, 3049, 3049, 3049, 3043, 3049, 3049,
-     3049, 3043, 3049, 3043, 3043, 3049, 3049, 3049, 3049, 3049,
-     3043, 3043,    0, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043
+     3059, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059, 3059,
+     3059, 3053, 3059, 3059, 3053, 3059, 3059, 3059, 3059, 3059,
+     3053, 3059, 3059, 3059, 3059, 3059, 3059, 3053, 3059, 3059,
+     3059, 3053, 3059, 3053, 3053, 3059, 3059, 3059, 3059, 3059,
+     3053, 3053,    0, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053
     } ;
 
-static const flex_int16_t yy_nxt[5968] =
+static const flex_int16_t yy_nxt[5994] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   14,   18,   20,   21,   22,   23,   24,   25,   26,
@@ -1432,657 +1435,661 @@ static const flex_int16_t yy_nxt[5968] =
        51,   47,   51,   70,   47,   70,   70,   52,   70,   52,
        54,   55,   56,   57,   70,   18,   54,   55,   56,   57,
        71,   18,   58,   60,   61,   62,   71,   82,   58,   60,
-       61,   62,   72,   71,   63,  102,   73,   92,   70,   71,
+       61,   62,   72,   71,   63,  103,   73,   92,   70,   71,
        63,   15,   16,   17,   65,   66,   67,   75,   71,   75,
 
-       75,   71,   75,   68,  104,  157,  103,   93,   75,   76,
-      141,  141,   69,   15,   16,   17,   65,   66,   67,   71,
+       75,   71,   75,   68,  105,  158,  104,   93,   75,   76,
+      142,  142,   69,   15,   16,   17,   65,   66,   67,   71,
        71,   83,   77,   78,   71,   68,   79,   71,   84,   87,
-       71,   80,   85,   88,   69,   86,   89,  151,   90,   91,
-       81,   71,   94,   71,   96,   71,   71,  159,   71,  105,
-       98,  112,   97,   99,   71,  109,   95,  106,   71,  110,
-      100,   71,  101,  107,  172,   71,  113,  108,  143,   71,
-      114,  143,  118,   71,  119,  111,  115,   71,  120,  116,
-      140,  151,  124,  148,  148,  125,  117,  163,  121,  122,
-       71,  123,  126,   71,  133,  154,  127,  128,   71,  129,
+       71,   80,   85,   88,   69,   86,   89,   71,   90,   91,
+       81,   71,   94,   71,   96,  141,   71,  152,  113,   71,
+       99,  119,   97,  100,   71,  110,   95,   71,  106,  111,
+      101,  155,  102,   98,   71,  144,  107,  164,  144,  114,
+      149,  149,  108,  115,   71,  112,  109,   71,  134,  116,
+       71,  120,  117,   72,  203,  121,   71,   73,  135,  118,
+       71,  125,  136,  137,  126,  122,  123,   71,  124,   71,
 
-      224,  130,   71,  137,  134,  158,   71,  138,  135,  136,
-      131,  139,  145,   71,  145,  145,  132,  145,   75,   71,
-       75,   75,  150,   75,  150,  150,   70,  150,   70,   70,
-      153,   70,   72,  165,   71,  171,   73,   70,   75,   71,
-       75,   75,  155,   75,   71,   71,  225,   71,  156,   75,
-       76,   71,   71,   71,  160,  161,  164,   71,   71,  166,
-      173,   71,   71,  169,  170,  167,   71,  168,  162,   71,
-       71,  175,  177,  178,   71,   71,  184,   71,  176,  174,
-      179,  182,  253,   71,   71,   71,  189,  180,  181,  183,
-       71,  151,   71,  185,  191,   71,  186,   71,   71,  199,
+      130,  127,  131,   71,  138,  128,  129,   71,  139,  159,
+      156,  132,  140,  146,  951,  146,  146,  133,  146,   75,
+       71,   75,   75,  151,   75,  151,  151,   70,  151,   70,
+       70,  154,   70,   71,   75,   71,   75,   75,   70,   75,
+       71,   71,  172,   71,  157,   75,   76,   71,   71,  166,
+      161,  162,  165,  160,   71,   71,   71,  174,   71,   71,
+      167,  177,   71,   71,  163,   71,  168,   71,  169,  152,
+      178,  179,  176,  170,  171,  173,  175,   71,  180,   71,
+      181,  183,   71,  182,  185,   71,  191,  184,  187,   71,
+       71,  188,   71,   71,   71,  194,  186,  196,   71,   71,
 
-      192,  194,  197,   71,   71,  195,   71,  198,  200,  187,
-      188,  190,   71,  201,   71,   71,  202,  205,   71,  203,
-      193,  196,  207,   71,   71,   71,   71,  204,   71,  212,
-      209,   71,   71,  206,  210,   71,  214,   71,   71,   71,
-       71,  208,   71,  220,  211,  215,  213,   71,  226,  229,
-      217,  216,  223,   71,  221,   71,  219,  218,  222,  233,
-      230,   71,   71,   71,  235,  227,   71,   71,  228,  231,
-       71,  239,   71,  236,  232,  238,   71,  234,  149,  240,
-       71,  242,  141,  141,  143,  237,  243,  143,  241,  145,
-      151,  145,  145,  244,  145,  148,  148,  150,  248,  150,
+       71,  197,  202,   71,  189,  190,   71,  201,  193,   71,
+      205,  192,   71,  204,   71,  195,   71,  198,  199,  206,
+      209,   71,   71,  200,   71,  214,   71,  211,   71,  207,
+      208,  212,  210,   71,   71,   71,   71,   71,  216,  226,
+      222,  213,   71,  219,   71,   71,  215,  217,   71,  225,
+       71,  223,  152,  218,  221,  224,  227,   71,  228,  220,
+       71,   71,   71,  235,  233,   71,   71,   71,  231,  234,
+       71,  241,  237,   71,  240,  229,  236,  242,  230,  232,
+       71,  238,   71,  142,  142,  243,  144,  244,  251,  144,
+      149,  149,   71,  239,  245,  146,  283,  146,  146,  151,
 
-      150,   75,  150,   75,   75,   71,   75,   71,  246,   71,
-      245,   71,   71,  153,   71,   71,   71,  250,   71,   71,
-       71,  256,  249,  247,  251,  259,  252,  255,  258,   71,
-      254,   71,  260,  264,  262,   71,  263,   71,  257,   71,
-       71,  265,   71,   71,  268,  261,  266,   71,  273,  269,
-       71,  147,   71,   71,  270,  275,  274,  276,  279,   71,
-      271,  272,  278,  267,   71,  277,   71,   71,   71,   71,
-      281,   71,  282,  283,   71,   71,   71,  290,   71,  288,
-      289,  285,  291,  284,  286,   71,   71,  280,   71,  287,
-      294,  297,   71,  298,  292,  299,  293,   71,  295,  301,
+      146,  151,  151,   75,  151,   75,   75,  152,   75,   71,
+      246,  248,   71,   71,  247,  154,   71,   71,   71,   71,
+       71,  252,   71,   71,   71,  258,  249,  254,  253,  261,
+      250,  255,   71,  260,  257,   71,  262,  256,   71,   71,
+      265,  266,  259,  264,  267,   71,   71,   71,   71,  268,
+       71,   71,  275,   71,  270,   71,   71,  263,  277,  271,
+      278,   71,   71,  281,  272,  280,  269,  276,  279,   71,
+      273,  274,   71,   71,   71,  286,   71,  284,  285,   71,
+       71,   71,  293,   71,  291,  292,  288,  294,  287,  289,
+       71,   71,  282,   71,  290,  297,  300,   71,  301,  295,
 
-      303,   71,  296,  304,   71,   71,   71,  300,  302,   71,
-      307,   71,   71,  309,  310,   71,   71,  308,  305,   71,
-       71,   71,  311,   71,  312,  306,   71,  313,   71,   71,
-       71,   71,  315,   71,   71,  319,   71,  317,   71,   71,
-      324,   71,  320,  314,  318,  325,   71,   71,   71,  321,
-      316,  328,  322,  326,  330,   71,  333,  327,  323,   71,
-       71,   71,   71,  329,   71,   71,  335,  336,   71,   71,
-      339,  340,  342,  331,  332,  338,   71,   71,   71,  334,
-       71,   71,   71,  337,   71,  345,  346,   71,  341,   71,
-      347,  349,  343,   71,  353,  344,   71,   71,   71,  151,
+      302,  296,   71,  298,  304,  306,   71,  299,  307,   71,
+       71,   71,  303,  305,   71,  310,   71,   71,  312,  313,
+       71,   71,  311,  308,   71,   71,   71,  314,   71,  315,
+      309,   71,  316,   71,   71,   71,   71,  318,   71,   71,
+      322,   71,  320,   71,   71,  327,   71,  323,  317,  321,
+      328,   71,   71,   71,  324,  319,  331,  325,  329,  333,
+       71,  336,  330,  326,   71,   71,   71,   71,  332,   71,
+       71,  338,  339,   71,   71,  342,  343,  345,  334,  335,
+      341,   71,   71,   71,  337,   71,   71,   71,  340,   71,
+      348,  349,   71,  344,   71,  350,  352,  346,   71,  356,
 
-      350,   71,   71,   71,   71,  352,   71,  360,  358,  356,
-      361,  354,  355,   71,  348,   71,   71,  351,   71,  364,
-      362,  365,  357,  363,   71,   71,   71,  359,   71,   71,
-       71,   71,   71,  371,  372,   71,  374,  369,  366,   71,
-       71,   71,  368,  373,  367,  375,   71,  377,   71,   71,
-      376,   71,  378,   71,   71,  370,  379,  381,   71,   71,
-      384,   71,  382,  386,  380,  388,   71,  385,  383,   71,
-       71,   71,  387,   71,   71,  391,   71,  389,  393,   71,
-       71,  392,  396,   71,   71,   71,  398,   71,   71,   71,
-      399,   71,   71,  401,  390,   71,  397,  408,  395,  394,
+      347,   71,   71,   71,  152,  353,   71,   71,   71,   71,
+      355,   71,  363,  361,  359,  364,  357,  358,   71,  351,
+       71,   71,  354,   71,  367,  365,  368,  360,  366,   71,
+       71,   71,  362,   71,   71,   71,   71,   71,  374,  375,
+       71,  377,  372,  369,   71,   71,   71,  371,  376,  370,
+      378,   71,  380,   71,   71,  379,   71,  381,   71,   71,
+      373,  382,  384,   71,   71,  387,   71,  385,  389,  383,
+      391,   71,  388,  386,   71,   71,   71,  390,   71,   71,
+      394,   71,  392,  396,   71,  397,  395,   71,   71,   71,
+       71,   71,  402,   71,   71,   71,  403,   71,   71,  393,
 
-       71,  403,   71,   71,   71,  405,  400,  407,   71,  402,
-      404,  409,   71,   71,   71,   71,  410,   71,  420,  419,
-      421,  417,  406,   71,   71,   71,   71,  423,  426,  427,
-      424,  418,  411,  428,   71,  412,  422,  425,  429,   71,
-      413,  414,  415,  416,   71,   71,   71,  430,   71,  436,
-       71,  431,   71,   71,  432,  434,   71,  435,  437,   71,
-      433,   71,  438,   71,  440,   71,   71,  439,  441,  445,
-       71,   71,  446,   71,  447,   71,   71,  463,  450,   71,
-      451,  444,  442,  448,  452,  443,   71,   71,   71,   71,
-      449,  455,  453,  456,   71,   71,  464,  458,  454,  465,
+      150,  405,   71,  401,  398,  399,   71,  407,   71,  400,
+       71,  409,  404,  406,  411,  412,  408,   71,   71,   71,
+      413,   71,  414,   71,   71,   71,  427,  421,  410,   71,
+      423,   71,   71,  438,  424,  148,  425,  422,  415,   71,
+       71,  416,  430,  431,   71,  428,  417,  418,  419,  420,
+      432,  429,  426,   71,   71,  433,   71,  434,   71,  440,
+       71,  435,   71,  442,  436,   71,   71,  439,  437,   71,
+      441,   71,   71,   71,  444,   71,  449,   71,  450,   71,
+      451,  443,   71,  445,   71,   71,  467,   71,  455,  452,
+      448,  446,  454,  447,   71,   71,   71,  147,  461,  453,
 
-       71,   71,   71,  457,  462,   71,  466,   71,  467,   71,
-      459,   71,   71,  460,  468,  461,   71,   71,  469,   71,
-      482,   71,  479,   71,  517,   71,  470,   71,  471,  477,
-      472,  480,  478,  481,  493,  484,  483,  151,  492,  494,
-       71,   71,   71,  473,  495,   71,  474,  496,  475,   71,
-      476,   71,   71,  485,  486,   71,  502,  499,  497,  498,
-       71,  500,   71,  487,   71,  488,  489,  490,  501,  506,
-      491,   71,   71,   71,   71,   71,   71,   71,  505,  507,
-      504,  503,  512,   71,  514,   71,  515,   71,   71,  511,
-       71,  513,  509,  510,  508,   71,  519,  523,  524,   71,
+      456,  457,   71,   71,   71,  462,  459,  458,  460,  468,
+      469,   71,   71,  466,   71,   71,   71,  470,  463,  471,
+       71,  464,   71,  465,  145,  472,   71,   71,   71,  473,
+       71,  486,  152,   71,  481,  483,   71,  474,   71,  475,
+      485,  476,  484,  482,  488,  497,  498,  487,  496,   71,
+       71,  499,   71,  501,  477,  500,   71,  478,   71,  479,
+       71,  480,   71,   71,  489,  490,  506,  504,   71,  502,
+       71,  503,   71,   71,  491,   71,  492,  493,  494,  505,
+      510,  495,   71,   71,  509,   71,   71,   71,  508,  507,
+      511,  518,  516,   71,  519,  513,  512,   71,  515,   71,
 
-       71,  518,   71,  516,  522,   71,   71,   71,   71,  534,
-       71,  521,   71,  520,  529,   71,   71,   71,   71,  531,
-      532,   71,  526,  527,  528,  525,   71,   71,  146,   71,
-       71,   71,  530,  536,   71,  533,  535,  537,  540,  543,
-       71,  539,   71,  546,  538,  544,  545,  547,   71,  541,
-       71,  542,  548,   71,  549,   71,   71,   71,  553,  550,
-       71,  551,  555,   71,   71,   71,   71,  558,  559,  556,
-      552,   71,   71,  554,   71,  560,   71,   71,  557,   71,
-       71,  565,  563,   71,  564,   71,   71,  561,   71,  566,
-       71,   71,   71,  571,   71,  567,  572,  562,   71,  574,
+      517,   71,  514,   71,  523,   71,   71,   71,  527,  528,
+       71,   71,  526,  521,   71,   71,   71,  522,   71,  520,
+      533,   71,  525,   71,   71,   71,  538,  535,  536,   71,
+      524,  530,  531,   71,  529,  532,   71,   71,  534,   71,
+      547,   71,   71,  537,   71,   71,   71,  549,  539,  541,
+      544,  540,   71,  543,  548,  542,  550,   71,  552,   71,
+      143,  545,   71,  546,   71,  553,  551,   71,  554,   71,
+       71,  555,   71,  558,  556,  560,   71,   71,   71,  557,
+       71,  563,  561,  559,  564,   71,   71,   71,   71,  565,
+       71,  562,   71,  568,   71,  570,   71,  569,   71,   71,
 
-      570,   71,   71,  573,  569,  568,  575,   71,  577,   71,
-      579,   71,   71,   71,   71,  576,   71,   71,   71,   71,
-      581,  589,  582,  591,  578,   71,   71,   71,  584,   71,
-       71,  592,  580,  588,  583,  585,   71,  586,  587,  590,
-       71,   71,   71,   71,  596,  600,  599,  602,  594,   71,
-      593,  595,   71,   71,   71,   71,  597,  601,  598,   71,
-      605,   71,   71,  604,   71,   71,  608,   71,   71,  609,
-       71,  603,  611,   71,   71,   71,   71,   71,   71,  625,
-      610,  606,  607,   71,  612,   71,  614,  634,  144,  613,
-       71,  615,  624,   71,  623,  626,  616,  628,  617,  627,
+       71,  566,   71,  571,   71,  576,   71,   71,  567,  580,
+      572,  577,  575,   71,  579,   71,  573,  574,  578,   71,
+      582,   71,   71,  584,   71,   71,   71,   71,   71,   71,
+       71,  594,   71,  586,   71,  587,  581,   71,  596,  597,
+      589,   71,   71,  583,   71,  585,  593,  588,  590,  592,
+      591,  595,   71,   71,   71,  598,  601,   71,  604,   71,
+      599,  607,   71,  600,   71,  606,   71,   71,  602,   71,
+       71,   71,  603,   71,  610,  613,   71,   71,   71,  605,
+      609,  614,  616,   71,   71,  608,   71,   71,   71,   71,
+       71,   71,  611,  615,  612,  630,   71,   71,   71,  617,
 
-      631,   71,   71,   71,  618,   71,  619,  629,  632,  620,
-      621,  630,  635,   71,   71,   71,  622,  633,   71,   71,
-       71,  637,  638,  636,   71,  641,   71,  643,   71,   71,
-       71,   71,   71,   71,  640,  644,  639,  649,   71,   71,
-      642,  645,  650,  646,   71,   71,   71,  151,   71,  647,
-      653,  655,  656,  648,  652,  654,   71,  651,   71,   71,
-      657,   71,   71,   71,  659,   71,   71,  663,  665,   71,
-       71,  658,   71,  660,  667,   71,  661,  666,  664,  668,
-      662,  670,  669,   71,  671,   71,  672,   71,   71,   71,
-       71,   71,   71,   71,  676,  675,   71,   71,  684,   71,
+      619,   71,  633,  618,   71,  620,  628,  631,  667,  645,
+      621,  629,  622,  632,   71,   71,   71,   71,  623,   71,
+      624,  634,  637,  625,  626,  635,  640,   71,  639,  636,
+      627,  638,   71,   71,   71,   71,  643,  641,   71,  646,
+       71,  648,   71,  642,   71,   71,   71,   71,   71,   71,
+       71,   71,   71,  654,  650,  677,   71,  644,  655,  649,
+      647,  651,  658,   71,  652,  657,   71,  152,  661,  653,
+      656,  660,  659,   71,   71,   71,   71,   71,  662,   71,
+       71,   71,   71,  668,  670,  672,   71,   71,  663,  671,
+      665,  673,  666,  669,  664,  675,   71,   71,   71,  674,
 
-      681,  677,  673,   71,  674,  682,   71,  807,  678,  680,
-      683,  679,  685,   71,  686,  687,   71,  688,   71,  689,
-       71,   71,   71,   71,  690,   71,  691,  692,   71,   71,
-       71,   71,  695,   71,   71,  696,  694,  700,  699,   71,
-      693,   71,   71,   71,   71,  701,   71,  703,   71,  705,
-       71,  706,  698,   71,  697,   71,  708,  702,   71,  712,
-       71,  709,  707,   71,  704,  710,   71,   71,  711,   71,
-      718,  714,  715,   71,   71,   71,   71,  716,  713,  721,
-       71,   71,  719,  720,  717,   71,  723,   71,  724,   71,
-      726,   71,  725,   71,   71,   71,  732,   71,  728,  730,
+       71,   71,   71,   71,   71,   71,  681,  680,  676,   71,
+      152,  686,  678,  682,   71,  679,  687,   71,  689,   71,
+      683,  685,  688,  684,  690,   71,  691,  692,   71,  693,
+       71,  694,   71,   71,   71,  695,  696,   71,   71,  697,
+       71,   71,   71,   71,  700,   71,   71,  701,  699,  705,
+      704,   71,   71,   71,   71,   71,  706,  698,  708,   71,
+       71,  711,   71,   71,  703,  712,  702,   71,   71,  707,
+      709,   71,   71,   71,  718,  714,  713,   71,   71,  710,
+      715,  717,  720,  721,  716,  722,  719,   71,  724,   71,
+       71,   71,   71,  726,   71,  727,   71,  729,  725,  730,
 
-       71,  722,   71,   71,   71,   71,  729,  727,  738,  733,
-       71,   71,   71,  736,   71,  731,  739,  737,   71,  735,
-       71,  734,  864,  740,  741,  742,   71,   71,   71,  743,
-      745,  747,  746,  744,   71,  749,   71,   71,   71,  748,
-       71,   71,   71,  750,  752,   71,  758,  751,   71,  753,
-       71,  754,   71,   71,   71,  756,  757,   71,  755,  761,
-       71,  763,  760,   71,   71,   71,  767,  759,  765,   71,
-      764,   71,   71,  770,  769,   71,  768,  762,  771,   71,
-       71,  772,   71,  766,  774,   71,   71,  776,   71,   71,
-       71,   71,  782,   71,  775,   71,  773,  783,   71,   71,
+       71,   71,  723,   71,   71,  731,   71,   71,  734,   71,
+       71,  736,  738,   71,   71,   71,   71,  728,   71,  732,
+      735,  744,  733,  739,   71,  742,  741,   71,  150,  737,
+      743,   71,   71,   71,  740,  746,  749,  745,  747,  748,
+       71,   71,  751,   71,  753,  750,   71,  755,   71,   71,
+       71,  754,  756,   71,   71,  758,   71,  752,   71,  757,
+      759,   71,   71,   71,  764,   71,  148,  762,  763,  760,
+       71,  761,  766,   71,   71,  769,   71,   71,  767,   71,
+      771,  765,  773,  770,   71,  768,   71,  776,   71,  775,
+       71,  774,  777,   71,   71,  772,   71,  778,   71,   71,
 
-       71,   71,   71,   71,  777,   71,  778,  779,  784,  780,
-      785,  781,   71,   71,  791,  786,   71,  789,  790,  787,
-       71,  788,   71,   71,   71,  793,  792,  796,   71,   71,
-       71,   71,   71,   71,  804,  794,   71,   71,   71,   71,
-      805,  795,  797,   71,  798,  142,  803,  799,  800,  801,
-      802,   71,  808,   71,   71,  810,  806,   71,  809,   71,
-       71,  813,  811,   71,  812,  814,  815,   71,  816,   71,
-       71,   71,  817,   71,   71,  818,  819,   71,  151,  820,
-      825,   71,  822,  824,   71,  821,  823,   71,  826,   71,
-       71,   71,  832,   71,   71,  827,  828,   71,  833,  835,
+      780,  782,   71,   71,   71,   71,   71,  788,   71,  781,
+      789,  779,  783,   71,   71,   71,   71,  790,   71,   71,
+      784,  785,  797,  786,   71,  787,   71,   71,   71,  791,
+      792,  795,   71,   71,  793,   71,   71,  794,   71,  796,
+      798,   71,  802,   71,  799,   71,  800,   71,  810,   71,
+       71,   71,  801,  803,  805,  811,   71,  804,   71,   71,
+       71,  806,  807,  809,  808,  815,   71,  813,   71,  812,
+       71,   71,  814,   71,   71,  816,  820,  819,   71,  822,
+      821,  818,   71,  823,   71,  817,   71,   71,   71,  152,
+       71,  825,   71,   71,  830,  826,  831,  828,   71,   71,
 
-       71,   71,  838,  836,  829,  830,  834,   71,   71,   71,
-       71,  831,   71,  840,   71,  844,   71,   71,   71,   71,
-      837,   71,  841,   71,  845,  846,   71,  839,   71,   71,
-       71,   71,  843,   71,  859,  847,   71,  842,   71,  858,
-      861,  856,   71,  849,  848,   71,  857,  860,   71,  862,
-      850,   71,  863,  867,  851,   71,  865,  852,   71,   71,
-      868,   71,   71,  876,  853,  854,   71,  855,   71,  866,
-       71,  869,  870,   71,  871,  882,  880,  872,   71,  878,
-      877,  151,  873,  881,   71,   71,  883,  879,  874,  875,
-       71,  885,   71,  884,   71,   71,   71,  886,  887,  888,
+      824,  827,  829,  832,   71,   71,  833,  834,   71,  838,
+       71,   71,  839,  841,   71,   71,   71,  844,   71,  835,
+      840,   71,  836,   71,  842,  846,  837,   71,   71,   71,
+      850,   71,   71,   71,   71,  843,   71,   71,  845,  847,
+      851,  852,   71,   71,   71,   71,   71,  849,  882,  853,
+       71,  864,  865,  848,   71,  868,   71,  855,  854,   71,
+      862,  863,   71,   71,  856,   71,  866,  867,  857,   71,
+      869,  858,   71,  870,  871,   71,  874,   71,  859,  860,
+      147,  861,   71,   71,   71,  873,  872,   71,  875,  876,
+       71,  877,   71,  887,  878,  884,  883,   71,  885,  879,
 
-       71,   71,  889,   71,   71,   71,   71,  892,  890,   71,
-      896,   71,   71,  895,   71,   71,  899,   71,   71,   71,
-      891,  903,  905,   71,  893,  894,  897,   71,  898,  901,
-      900,   71,  906,  934,   71,  909,  904,  907,   71,  908,
-      902,   71,  910,   71,   71,  912,  913,   71,   71,  911,
-       71,   71,   71,  914,  916,   71,  917,   71,  915,   71,
-      918,   71,   71,   71,  923,   71,  920,   71,  926,  921,
-       71,   71,   71,   71,   71,   71,  924,  919,  925,   71,
-       71,  928,  922,   71,  929,  930,  932,   71,  931,   71,
-      927,   71,  933,   71,  940,   71,   71,   71,  935,  938,
+      888,   71,   71,  890,  889,  880,  881,  891,   71,  886,
+       71,  892,   71,  893,   71,  894,   71,   71,  896,  895,
+       71,   71,   71,   71,   71,  899,   71,  903,   71,  897,
+       71,  902,   71,   71,  906,   71,   71,   71,  910,  898,
+      908,  965,  900,  901,   71,  904,  905,   71,  912,   71,
+      913,  916,  911,  907,   71,  914,   71,   71,  909,  915,
+      917,   71,   71,  919,  920,   71,   71,  918,   71,   71,
+       71,  921,  923,   71,  924,   71,  922,   71,  925,   71,
+       71,   71,  930,   71,  927,   71,  933,  928,   71,   71,
+       71,   71,   71,   71,  931,  926,  932,   71,   71,  935,
 
-      936,   71,  937,   71,  939,   71,  943,   71,   71,  947,
-      941,  945,  948,   71,   71,  942,   71,   71,   71,  946,
-       71,  950,   71,   71,  949,  944,   71,   71,   71,   71,
-      961,  956,  958,   71,   71,  951,   71,  952,  953,   71,
-       71,   71,  954,  955,   71,  959,  963,   71,  960,  957,
-      962,   71,  964,  965,  967,   71,  971,  966,  969,   71,
-      968,   71,   71,   71,  970,   71,   71,  978,   71,  980,
-      973,   71,   71,   71,  982,   71,  983,   71,   71,   71,
-       71,  972,   71,  974,  988,  976,  979,  975,  977,   71,
-      986,  981,   71,  984,   71,  990,  985,  991,  987,   71,
+      929,   71,  936,  937,  939,   71,  938,   71,  934,   71,
+      940,   71,   71,  947,  945,   71,  942,   71,  943,  946,
+       71,  941,   71,   71,  944,   71,  952,  954,  955,   71,
+      948,  950,   71,   71,  953,   71,  949,   71,  957,   71,
+       71,   71,   71,   71,  968,   71,   71,  145,   71,   71,
+       71,  963,   71,  956,   71,   71,  958,  959,  969,  960,
+      970,  962,  961,  966,   71,  967,  964,   71,  972,  974,
+      973,  971,  975,  976,   71,   71,   71,   71,   71,   71,
+       71,   71,  985,   71,   71,  978,  980,  987,   71,   71,
+      989,   71,   71,   71,   71,  977,   71,  979,  986,  981,
 
-       71,   71,  992,   71,  995,   71,  997,   71,   71,   71,
-       71,   71,   71,  989,  994,   71,  999,   71,  993, 1000,
-      151, 1002,   71, 1003, 1001,  996,  998,   71,   71,   71,
-       71,   71, 1006,   71, 1004, 1005,   71, 1018,   71, 1021,
-       71,   71, 1019,   71, 1009,   71,   71, 1007,   71, 1023,
-       71, 1010,   71, 1008, 1011,   71, 1020, 1026, 1012,   71,
-     1013, 1024, 1025,   71, 1014, 1033, 1015,   71, 1022, 1028,
-       71, 1016,   71, 1027, 1029,   71, 1017, 1030,   71, 1036,
-       71,   71, 1031,   71, 1038, 1034, 1037, 1044,   71,   71,
-       71,   71, 1042, 1039, 1032, 1035, 1041, 1040,   71, 1043,
+      983,  990,  982,  984,   71,   71,  993,   71,  991,  988,
+      992,   71,   71,  996,  994,  998,  995,   71,  997,   71,
+     1002,   71,  999, 1000,   71, 1001,   71, 1004,   71,   71,
+       71, 1007,  152,   71,   71, 1006,   71, 1010, 1009,   71,
+       71,   71,   71,   71, 1003,   71, 1013, 1005, 1008,   71,
+       71,   71, 1025,   71,   71,   71,   71, 1026,   71, 1016,
+     1012, 1011, 1014, 1028,   71, 1084, 1015,  143,   71, 1017,
+     1027, 1018,   71, 1031,   71, 1019,   71, 1020, 1030, 1029,
+       71, 1021, 1032, 1022,   71, 1033, 1035,   71, 1023,   71,
+     1034, 1036,   71, 1024, 1041,   71,   71,   71, 1037, 1038,
 
-       71, 1045, 1046,   71,   71,   71,   71,   71,   71, 1058,
-     1048, 1047,   71,   71, 1061, 1057,   71,   71, 1049,   71,
-     1050, 1059, 1062,   71, 1060, 1051,  149, 1052,   71,   71,
-     1064, 1063,   71, 1053, 1067,   71, 1068, 1069, 1054, 1055,
-       71,   71,   71,   71, 1070, 1056, 1073, 1065, 1066,   71,
-       71,   71,   71,   71, 1074, 1072,   71, 1079,   71, 1071,
-     1076,   71, 1077,   71,   71,   71,   71, 1080,   71, 1075,
-     1082,   71, 1078,   71,   71, 1091,   71,   71,   71, 1089,
-     1081,   71, 1084, 1086, 1083, 1087, 1085, 1088,   71,   71,
-       71, 1090,   71, 1092,   71,   71,   71,   71,   71,   71,
+       71,   71, 1040,   71, 1042, 1044,   71, 1049, 1043, 1052,
+     1050, 1039, 1048,   71,   71, 1045,   71, 1047, 1046, 1051,
+       71, 1053,   71,   71,   71,   71,   71,   71,   71,   71,
+     1068, 1065,   71,   71,   71,   71, 1064, 1069,   71,   71,
+     1067,   71, 1055, 1056, 1054,   71, 1057, 1066, 1071, 1070,
+       71, 1058, 1080, 1059, 1072, 1075,   71, 1073,   71, 1060,
+     1077,   71, 1076, 1081, 1061, 1062,   71,   71, 1074,   71,
+     1078, 1063,   71,   71,   71,   71, 1087, 1082,   71,   71,
+     1079,   71,   71, 1085,   71,   71, 1090, 1088,   71,   71,
+       71, 1086, 1083,   71,   71,   71, 1097,   71, 1089, 1092,
 
-       71, 1099, 1093, 1100, 1096, 1101, 1102,   71, 1103, 1094,
-     1098, 1095, 1097, 1104,   71, 1106, 1107,   71,   71,   71,
-     1111, 1108,   71,   71,   71, 1109,   71, 1105, 1110,   71,
-       71, 1117, 1112,   71, 1119,   71,   71,   71,   71,   71,
-       71, 1121, 1115, 1113, 1114, 1116,   71,   71,  147, 1123,
-     1120,   71, 1122, 1118,   71,   71, 1125,   71,   71, 1126,
-     1124,   71, 1128, 1127, 1131,   71, 1129, 1130,   71, 1134,
-     1135,   71,   71,   71, 1133,   71,   71,   71, 1139, 1138,
-       71, 1132, 1136,   71,   71,   71,   71, 1145, 1143, 1146,
-     1137,   71,   71,   71,   71,   71, 1147, 1148, 1140, 1144,
+     1099, 1094, 1095, 1096, 1091,   71,   71,   71, 1093,   71,
+       71,   71, 1098, 1100, 1112,   71,   71,   71,   71, 1101,
+       71, 1107, 1108, 1109, 1104,   71,   71, 1102, 1103, 1105,
+     1106,   71, 1111,   71, 1110, 1115,   71,   71,   71, 1113,
+     1116,   71,   71, 1117,   71,   71, 1118, 1119,   71, 1114,
+     1120,   71,   71, 1125, 1127,   71, 1122, 1121, 1123,   71,
+       71,   71,   71, 1124,   71, 1131, 1129, 1128,   71, 1130,
+       71, 1126,   71, 1133,   71, 1134,   71,   71,   71, 1136,
+       71, 1137, 1143,   71, 1139, 1132,   71, 1142, 1135, 1138,
+       71,   71, 1141,   71,   71,   71, 1140, 1146,   71, 1144,
 
-       71, 1150, 1141,   71, 1142, 1149,   71,   71, 1153, 1155,
-       71, 1154, 1151,   71,   71,   71,   71,   71,   71,   71,
-     1159, 1160, 1156, 1152, 1157,   71,   71,   71,   71, 1165,
-     1161, 1166,   71, 1168, 1158,   71,   71,   71, 1163, 1169,
-       71,   71,   71, 1162, 1173,   71, 1164, 1167,   71,   71,
-       71,   71,   71, 1172,   71, 1170, 1171,   71, 1175, 1179,
-       71,   71,   71, 1174,   71,   71,   71, 1183, 1180, 1176,
-      146, 1178, 1181, 1182, 1184, 1187, 1177, 1185,   71, 1188,
-     1192,   71,   71,   71, 1186,   71,   71, 1189, 1190,   71,
-       71,   71,   71,   71, 1191, 1194,   71, 1193,   71,   71,
+       71, 1147,   71,   71, 1153,   71, 1151,   71, 1154, 1145,
+       71,   71, 1155, 1148,   71,   71, 1156, 1149, 1152, 1158,
+     1157,   71, 1150,   71, 1161,   71,   71, 1163,   71,   71,
+       71, 1162,   71,   71,   71,   71,   71, 1167, 1164, 1159,
+       71, 1165,   71, 1160,   71, 1168, 1169, 1173,   71, 1174,
+       71, 1166, 1171,   71, 1170,   71,   71, 1177,   71,   71,
+       71, 1176, 1181, 1172,   71, 1175,   71, 1178,   71,   71,
+       71,   71, 1180, 1179, 1187,   71,   71, 1183,   71,   71,
+       71,   71, 1182,   71, 1191, 1193,   71,   71, 1184, 1192,
+     1186, 1189, 1188, 1190, 1195, 1185, 1196,   71,   71,   71,
 
-     1197, 1200,   71,   71,   71,   71, 1195,   71,   71, 1210,
-       71, 1196, 1206, 1198, 1203, 1199, 1204, 1201,   71,   71,
-       71, 1207, 1202, 1208, 1211, 1205, 1209, 1212,   71,   71,
-       71,   71, 1214, 1215,   71,   71, 1213,   71,   71, 1216,
-     1219,   71,   71, 1218, 1224,   71, 1221,   71,   71, 1217,
-       71,   71, 1225, 1222,   71, 1226, 1220, 1223,   71, 1228,
-     1230,   71, 1229,   71,   71,   71,   71,   71, 1227,   71,
-       71,   71,   71,   71, 1236,   71, 1231, 1234, 1232, 1241,
-       71, 1235, 1237, 1233,   71,   71,   71,   71, 1238, 1247,
-     1240, 1246, 1239,   71, 1248, 1242, 1245,   71,   71,   71,
+       71,   71,   71, 1194, 1197,   71, 1199, 1198,   71,   71,
+       71, 1200, 1201, 1202,   71,   71,   71, 1208,   71,   71,
+       71, 1205,   71,   71, 1203,   71,   71, 1218,   71, 1204,
+     1206, 1212,   71, 1209,   71, 1207,   71, 1211, 1210, 1214,
+       71, 1219, 1222, 1213, 1220,   71,   71, 1221, 1215, 1223,
+     1216, 1224,   71, 1217,   71,   71,   71,   71,   71,   71,
+     1227,   71, 1229, 1226, 1232,   71, 1233,   71,   71, 1230,
+     1225,   71, 1234,   71,   71, 1228, 1236, 1237, 1231,   71,
+       71,   71,   71, 1238,   71,   71,   71,   71, 1235,   71,
+       71,   71, 1244,   71, 1239, 1240, 1242, 1243, 1245, 1249,
 
-       71, 1252,   71, 1250, 1243, 1244, 1253,   71,   71,   71,
-     1257, 1251,   71, 1249,   71,   71, 1255,   71, 1266, 1254,
-     1268, 1256,   71, 1265,   71, 1264, 1269, 1258,   71, 1267,
-     1259, 1260, 1270,   71,   71, 1261,   71,   71,   71, 1271,
-       71, 1262, 1272,   71, 1273, 1263,   71, 1275,   71,   71,
-       71, 1276,   71, 1277, 1274,   71, 1278, 1282, 1279, 1280,
-       71, 1285, 1286,   71,   71,   71, 1324,   71,   71, 1281,
-     1287,   71, 1289, 1284, 1283, 1288,   71, 1290,   71, 1291,
-       71, 1292, 1298, 1293,   71, 1294, 1295, 1296,   71,   71,
-       71, 1297, 1302,   71, 1300,   71,   71, 1303,   71, 1301,
+     1241,   71,   71,   71,   71,   71, 1246, 1255, 1248,   71,
+     1247, 1251, 1253,   71,   71,   71, 1250, 1257,   71, 1256,
+     1259, 1261, 1252,   71, 1254,   71, 1262,   71,   71,   71,
+     1260,   71, 1266,   71, 1258,   71, 1276, 3053, 1274, 1264,
+       71, 1265, 1263,   71, 1275, 1277, 1273, 1279, 1267,   71,
+       71, 1268, 1269,   71,   71,   71, 1270,   71, 1278, 1280,
+     1281,   71, 1271,   71, 1282,   71, 1272,   71, 1284,   71,
+       71,   71, 1285,   71, 1286,   71,   71, 3053, 1283, 1289,
+     1291, 1287, 1294, 1288, 1295,   71,   71, 1292,   71, 1297,
+       71, 1290,   71,   71, 1293, 1298,   71, 1296,   71, 1303,
 
-     1305,   71,   71, 1299,   71,   71, 1311,   71, 1312,   71,
-     1306, 1307,   71,   71,   71, 1304,   71, 1313,   71, 1310,
-     1308, 1315,   71, 1309,   71,   71,   71, 1314, 1316,   71,
-     1320, 1317, 1321,   71, 1323,   71, 1318,   71,   71,   71,
-     1325, 1322,   71, 1326, 1329,   71, 1331,   71, 1327, 1319,
-       71, 1328,   71, 1332,   71, 1333,   71, 1336,   71, 1330,
-       71,   71,   71,   71, 1338,   71,   71,   71, 1340, 1342,
-       71,   71,  144, 1344, 1341, 1334,   71, 1335,   71,   71,
-     1337, 1346, 1339, 1347, 1343,   71, 1345, 1348,   71,   71,
-     1349,   71, 1351, 1350, 1352,   71,   71,   71,   71, 1357,
+     1299,   71, 1300,   71, 1301,   71, 1302, 1304, 1305, 1307,
+       71, 1308, 1306,   71, 1311, 1313,   71,   71,   71, 1312,
+       71, 1309, 1310, 1314,   71,   71, 1316,   71, 1320,   71,
+     1315,   71, 1321,   71,   71,   71,   71, 1322,   71,   71,
+     1324, 1319,   71, 1317, 1318,   71,   71, 1323, 1326,   71,
+     1325, 1329, 1330,   71, 1332,   71, 1327,   71,   71, 1333,
+     1331, 1334,   71,   71,   71, 1338,   71, 1328, 1335, 1339,
+     1340,   71,   71, 1337,   71, 1341,   71, 1342,   71, 1345,
+       71, 1336,   71,   71,   71,   71, 1347,   71,   71,   71,
+     1349, 1351,   71,   71, 3053, 1353, 1350, 1343,   71, 1344,
 
-     1358, 1360, 1354,   71, 1355,   71,   71,   71, 1359,   71,
-       71, 1356,   71, 1353, 1364,   71,   71,   71, 1361,   71,
-     1368, 1369,   71, 1363, 1371,   71,   71,   71, 1370, 1362,
-       71,   71,   71,   71,   71,   71, 1365, 1366,   71, 1372,
-       71, 1378, 1367,   71, 1375, 1373,   71, 1376,   71, 1383,
-       71, 1374, 1377, 1382,   71, 1379,   71,  142,   71, 1385,
-     1387, 1381,   71, 1380,   71, 1388,   71,   71,   71, 1384,
-       71, 1390, 1391,   71,   71, 1386, 1389,   71,   71, 1396,
-     1398, 1392, 1397, 1393, 1400, 1394,   71, 1399, 1395,   71,
-       71,   71,   71, 1401, 1403,   71, 1405, 1402,   71, 1404,
+       71,   71, 1346, 1355, 1348, 1356, 1352,   71, 1354, 1357,
+       71,   71, 1358,   71, 1360, 1359, 1361,   71,   71,   71,
+       71, 1366, 1367, 1369, 1363,   71, 1364,   71,   71,   71,
+     1368,   71,   71, 1365,   71, 1362, 1373,   71,   71,   71,
+     1370,   71, 1377, 1378,   71, 1372, 1380,   71,   71,   71,
+     1379, 1371,   71,   71,   71,   71,   71,   71, 1374, 1375,
+       71, 1381,   71, 1387, 1376,   71, 1384, 1382,   71, 1385,
+       71, 1392,   71, 1383, 1386, 1391,   71, 1388,   71, 3053,
+       71, 1394, 1396, 1390,   71, 1389,   71, 1397,   71,   71,
+       71, 1393,   71, 1399, 1400,   71,   71, 1395, 1398,   71,
 
-       71,   71,   71, 1408,   71,   71, 1410,   71,   71, 1415,
-     1407,   71,   71, 1409,   71, 1416,   71, 1406, 1412,   71,
-     1419,   71, 1411, 1413,   71, 1414,   71,   71, 1420,   71,
-     1417,   71,   71, 1418,   71, 1422, 1426, 1428, 1421, 1423,
-       71, 1427, 1424,   71,   71, 1431,   71,   71, 1425,   71,
-       71, 1436, 1430, 1433, 1437, 1435,   71,   71, 1429,   71,
-       71, 1432,   71, 1438,   71, 1439, 1440,   71,   71,   71,
-     1434,   71, 1441, 1444, 1443,   71,   71, 1447, 1442,   71,
-       71,   71, 1446,   71,   71, 1453, 1445, 1455, 1449, 1450,
-     1454,   71, 1456,   71,   71, 1451,   71, 1458,   71, 1448,
+       71, 1405, 1407, 1401, 1406, 1402, 1409, 1403,   71, 1408,
+     1404,   71,   71,   71,   71, 1410, 1412,   71, 1414, 1411,
+       71, 1413,   71,   71,   71, 1417,   71,   71, 1419,   71,
+       71, 1424, 1416,   71,   71, 1418,   71, 1425,   71, 1415,
+     1421,   71, 1428,   71, 1420, 1422,   71, 1423,   71,   71,
+     1429,   71, 1426,   71,   71, 1427,   71, 1431, 1435, 1437,
+     1430, 1432,   71, 1436, 1433,   71,   71, 1440,   71,   71,
+     1434, 1442,   71,   71, 1439, 1443,   71,   71, 1446, 1447,
+     1438, 1445, 3053, 1441,   71,   71,   71, 1448,   71, 1449,
+     1450,   71,   71,   71, 1444, 1453, 1451,   71,   71,   71,
 
-       71,   71, 1452,   71,   71,   71,   71, 1466, 1462,   71,
-     1461,   71, 1469,   71, 1457,   71, 1467, 1459,   71, 1460,
-       71, 1472,   71, 1463, 1465, 1464, 1471,   71,   71,   71,
-       71,   71,   71,   71, 1470, 1468,   71,   71, 1480,   71,
-       71, 1473, 1481, 1483,   71, 1477,   71, 1474, 1475, 1476,
-     1486, 1479, 1482, 1478, 1484,   71,   71,   71,   71,   71,
-       71, 1485, 1490,   71,   71,   71, 1491, 1488, 1493,   71,
-     1487,   71, 1489, 1497,   71, 1499, 1498,   71,   71, 1492,
-     1494,   71,   71,   71, 1495, 1496,   71, 1502,   71,   71,
-     1503, 1501, 1500, 1504,   71, 1508, 1509,   71,   71,   71,
+       71, 1457, 1452,   71,   71,   71, 1456,   71,   71, 1463,
+     1460, 1454, 1459, 1455, 1464,   71,   71,   71, 1468, 1465,
+       71, 1461,   71, 1458, 1466,   71,   71, 1462,   71,   71,
+       71,   71, 1476, 1472,   71, 1471, 1467,   71,   71, 1469,
+     1479, 1470, 1477,   71,   71,   71,   71, 1482, 1473, 1475,
+     1474, 1481,   71,   71,   71,   71,   71,   71,   71, 1490,
+     1478,   71, 1480, 1483,   71,   71,   71, 1491, 1493,   71,
+     1487, 1484,   71, 1485, 1486, 1498, 1489, 1492, 1488, 1494,
+       71,   71,   71,   71,   71, 1497, 1495, 1496,   71, 1503,
+     1500,   71,   71,   71, 1501, 1499, 1507,   71,   71, 1509,
 
-       71,   71,   71, 1505, 1514, 1512, 1506,   71, 1513,   71,
-       71, 1516,   71,   71, 1507,   71, 1510,   71, 1517,   71,
-     1511,   71, 1515, 1518,   71, 1519,   71,   71, 1523, 1520,
-     1521,   71, 1524,   71,   71,   71, 1525, 1522,   71, 1528,
-       71, 1530,   71,   71,   71, 1534,   71, 1526,   71, 1529,
-       71,   71, 1527,   71,   71, 1537, 1531, 1532, 1539,   71,
-     1535,   71,   71, 1542,   71, 1540, 1536,   71, 1533, 1538,
-       71, 1541,   71,   71, 1545, 1543,   71, 1547, 1544, 1548,
-       71,   71,   71, 1546,   71,   71, 1555,   71,   71,   71,
-     1550, 1549, 1556,   71,   71,   71, 1553, 1564, 1559, 1560,
+       71,   71,   71, 1508,   71,   71, 1504, 1502,   71, 1506,
+       71,   71, 1505, 1512, 1511, 1510,   71,   71,   71, 1518,
+     1513, 1514, 1515,   71, 1517,   71, 1519,   71, 1516, 1520,
+       71,   71, 1523,   71, 1524, 1522, 1526,   71,   71, 1521,
+       71, 1527,   71, 1525, 1528,   71,   71,   71,   71, 1529,
+     1531,   71, 1534,   71,   71,   71,   71, 1533, 1530,   71,
+       71, 1538,   71, 1540,   71,   71, 1532,   71, 1535,   71,
+     1544,   71,   71, 1539, 1537, 1536,   71, 1547, 1541, 1542,
+       71, 1545, 1549,   71, 1550,   71,   71, 1552,   71, 1546,
+     1543, 1548,   71,   71,   71,   71,   71, 1555, 1558,   71,
 
-     1551, 1552,   71,   71, 1562,   71,   71,   71, 1557, 1554,
-     1563, 1566,   71, 1558,   71, 1561,   71,   71, 1568,   71,
-     1570, 1567,   71,   71, 1573,   71, 1565, 1571,   71, 1574,
-       71, 1569,   71,   71,   71, 1579, 1578,   71,   71, 1575,
-     1572,   71,   71,   71, 1595, 1585, 1586, 1577, 1576, 1580,
-       71,   71,   71, 1582,   71, 1587, 1583,   71, 1581, 1593,
-     1597,   71, 1590, 1589, 1592,   71,   71, 1591, 1584,   71,
-       71, 1588,   71, 1596, 1594, 1598,   71,   71,   71,   71,
-       71, 1604, 1605, 1603,   71,   71, 1607,   71,   71, 1599,
-     1606,   71,   71, 1610,   71, 1600, 1609, 1601,   71, 1602,
+     1557,   71,   71, 1554,   71, 1551,   71,   71, 1565,   71,
+     1553,   71,   71, 1556, 1559, 1560, 1566,   71, 1563,   71,
+       71, 1561, 1562,   71, 1570, 1572, 1569,   71,   71, 1567,
+     1574, 1564, 1568, 1573,   71, 1576,   71, 1578,   71,   71,
+     1571,   71,   71,   71,   71,   71,   71, 1575, 1577, 1580,
+     1581,   71, 1583,   71, 1584,   71,   71,   71, 1579, 1588,
+     1585,   71, 1586,   71, 1589,   71, 1582, 1595, 1592, 1590,
+     1587, 1593,   71,   71,   71,   71,   71, 1596, 1597, 1600,
+       71, 1591, 1603, 1594,   71, 1599,   71, 1602,   71,   71,
+     1605, 1604,   71, 1606, 1598, 1607,   71,   71,   71,   71,
 
-       71,   71,   71, 1611,   71,   71,   71, 1608, 1619,   71,
-       71,   71,   71,   71,   71,   71, 1617,   71, 1612, 1615,
-     1616, 1613, 1614, 1618, 1624,   71, 1622,   71,   71, 1620,
-       71, 1621, 1626,   71, 1623, 1625,   71, 1627,   71,   71,
-       71, 1630,   71, 1628, 1629,   71,   71, 1632,   71, 1634,
-       71, 1631,   71, 1641, 1633, 1635, 1637,   71, 1636,   71,
-     1638, 1642,   71, 1643,   71, 1639, 1647,   71,   71, 1644,
-     1645, 1646, 1648, 1640,   71,   71,   71,   71,   71,   71,
-     1650, 1651,   71,   71, 1659, 1660,   71,   71, 1654,   71,
-       71,   71, 1656, 1649, 1653, 1657, 1652,   71, 1658,   71,
+       71,   71, 1608,   71, 1614, 1601, 1613, 1615, 1617, 1609,
+       71,   71,   71,   71,   71,   71, 1610, 1616, 1611,   71,
+     1612, 1620,   71,   71, 1619,   71,   71,   71, 1621,   71,
+       71,   71, 1629, 1622, 1618,   71,   71,   71,   71,   71,
+       71, 1625, 1627, 1626, 1628, 1623, 1624, 1634,   71,   71,
+       71, 1632,   71,   71, 1637, 1630, 1631, 1636,   71,   71,
+     1633,   71,   71,   71, 1640, 1638,   71,   71,   71, 1635,
+     1642, 1645, 1639, 1644, 1646,   71,   71, 1641, 1643, 1651,
+     1652,   71,   71, 1647, 1653,   71,   71,   71,   71,   71,
+     1648, 1656,   71, 1650, 1654, 1649, 1657,   71,   71,   71,
 
-       71, 1655,   71,   71, 1662,   71,   71, 1661,   71, 1669,
-       71,   71,   71, 1664, 1666, 1663, 1665, 1672,   71, 1671,
-       71, 1673, 1670, 1668,   71,   71, 1680, 1675, 1667, 1677,
-     1676, 1681,   71,   71,   71, 1674,   71,   71, 1686,   71,
-     1688,   71, 1685, 1679,   71, 1678, 1689, 1682,   71, 1683,
-     1691,   71,   71, 1690,   71,   71,   71, 1687, 1684, 1695,
-     1692,   71, 1699,   71,   71,   71, 1697,   71,   71, 1694,
-       71, 1693, 1698,   71, 1696, 1700,   71,   71,   71,   71,
-       71, 1703, 1711, 1701,   71, 1704, 1709,   71,   71, 1702,
-     1705, 1706, 1712, 1707, 1708,   71,   71, 1713,   71,   71,
+     1658,   71,   71, 1660, 1655,   71, 1661,   71, 1659,   71,
+       71, 1662, 1670,   71, 1664, 1663, 1666, 1669, 1668, 1667,
+       71, 1665,   71,   71,   71,   71,   71,   71,   71,   71,
+     1671,   71, 1679, 1672,   71,   71, 1683,   71, 1674, 1676,
+     1673, 1675, 1682, 1681,   71, 1680, 1678,   71,   71,   71,
+     1684, 1677, 1690, 1685,   71,   71, 1686, 1691,   71,   71,
+       71,   71, 1698,   71,   71, 1687, 1695, 1689, 1692, 1688,
+     1693, 1696,   71, 1699,   71,   71, 1701,   71, 1697,   71,
+     1700, 1694,   71,   71, 1703, 1705, 1704, 1706, 1709, 1702,
+       71,   71,   71, 1707,   71,   71,   71,   71,   71, 1708,
 
-       71, 1718,   71,   71,   71, 1722,   71,   71, 1710,   71,
-       71, 3043,   71, 1717, 1715, 1714, 1724,   71, 1716, 1720,
-       71,   71, 1721,   71, 1719, 1725, 1726,   71, 1727, 1723,
-     1731,   71, 1730, 1729,   71,   71, 1728,   71, 1735,   71,
-       71,   71,   71,   71,   71,   71, 1742, 1733, 1737,   71,
-       71,   71,   71, 1732, 1736, 1738, 1734, 1739, 1836,   71,
-       71, 1740, 1743, 1747, 1741, 1745,   71, 1744, 1746,   71,
-     1748,   71,   71, 1751,   71, 1750,   71, 1749, 1754,   71,
-     1752,   71,   71,   71,   71, 1755, 1753,   71,   71,   71,
-       71,   71,   71, 1760,   71,   71, 1764,   71,   71, 1761,
+     1710, 1719,   71,   71,   71, 1713,   71, 1714,   71,   71,
+       71,   71, 1721, 1722, 1711, 1712, 1715, 1716,   71,   71,
+     1717,   71, 1718, 1720, 1723,   71, 1728,   71, 1725, 1724,
+       71, 3053,   71,   71, 1732,   71,   71,   71, 1727,   71,
+     1726, 1734,   71,   71, 1735,   71, 1730, 1736, 1737, 1729,
+       71, 1731,   71,   71, 1738,   71, 1733, 1741,   71,   71,
+     1745,   71,   71,   71,   71,   71,   71, 1740,   71, 1752,
+     1747, 1743, 1742, 1739, 1744,   71, 1746, 1748, 1749,   71,
+       71,   71, 3053, 1750, 1756,   71,   71, 1755, 1751, 1757,
+       71, 1753, 1758,   71,   71, 1759, 1761,   71, 1754, 1762,
 
-     3043,   71, 1770, 1756, 1762, 1758, 1757, 1759,   71, 1763,
-     1765,   71, 1773, 1768,   71, 1767, 1772,   71,   71, 1774,
-     1769,   71,   71, 1766,   71,   71, 1771, 1778,   71, 1781,
-     1782,   71,   71, 1775, 1783,   71,   71, 1776, 1779,   71,
-     1780,   71, 1777, 1785,   71,   71, 1786, 1789,   71,   71,
-     1791,   71, 1784, 1790, 1792, 1793,   71, 1787, 1795, 1794,
-     1788,   71,   71,   71,   71, 1800, 1797, 1798,   71,   71,
-     1799,   71,   71,   71,   71, 1807,   71, 1809,   71,   71,
-       71,   71, 1810,   71, 1801, 1802, 1803, 1796,   71,   71,
-     1812, 1804, 1811, 1805, 1806, 1814, 1808, 1815,   71, 1817,
+       71,   71,   71, 1760,   71,   71, 1764,   71, 1765, 1763,
+       71,   71,   71,   71,   71,   71, 1770,   71,   71,   71,
+     1774, 1766, 1771, 1782,   71,   71, 1772, 1775, 1768, 1767,
+     1769,   71, 1773,   71,   71, 1783, 1778,   71, 1780, 1777,
+     1776,   71,   71, 1779,   71,   71, 1784, 1788,   71, 1781,
+       71,   71,   71, 1791, 1792,   71, 1785,   71, 1786, 1793,
+       71, 1795,   71,   71, 1787, 1789, 1802, 1790, 1794,   71,
+     1796, 1797, 1799,   71, 1801,   71, 1803,   71, 1798, 1800,
+       71, 1805,   71,   71,   71,   71,   71,   71, 1807, 1808,
+       71,   71, 1809, 1810,   71, 1804, 1811, 1812, 1813,   71,
 
-     1813,   71,   71,   71, 1819,   71,   71, 1816,   71, 1821,
-       71,   71, 1824, 1825,   71,   71, 1827,   71,   71,   71,
-       71,   71, 1818, 1833,   71, 1832, 1822,   71, 1820, 1829,
-     1830,   71, 1823,   71,   71, 1826,   71,   71, 1839,   71,
-     1831,   71, 1837, 1828,   71,   71, 1843,   71, 1834, 1835,
-     1842,   71,   71, 1846, 1845, 1847, 1849, 1841,   71,   71,
-       71,   71, 1838,   71, 1844, 1840, 1848,   71,   71, 1850,
-       71,   71,   71, 1854,   71, 1857,   71, 1858, 1851,   71,
-     1853,   71, 1852,   71,   71, 1861,   71,   71,   71, 1855,
-     1866,   71, 1865,   71, 1860,   71, 1859,   71, 1856,   71,
+       71, 1817,   71, 1814, 1819,   71, 1815,   71, 1806, 1820,
+       71,   71,   71, 1822, 1816,   71, 1821,   71, 1825,   71,
+     1818, 1829,   71, 1823,   71, 1827, 1826,   71,   71, 1831,
+     1824,   71,   71,   71, 1834, 1835,   71,   71, 1837,   71,
+     1828,   71,   71,   71, 1842,   71,   71, 1843,   71,   71,
+       71, 1832, 1839, 1830, 1833, 1840,   71, 1836,   71,   71,
+     1845,   71, 1849, 1841,   71, 1846, 1838,   71, 1847,   71,
+     1844, 1853,   71,   71, 1852, 1856,   71,   71, 1857,   71,
+     1855,   71, 1848, 1851,   71, 1858,   71,   71,   71,   71,
+     1850,   71, 1854, 1859, 1864, 1862, 1860,   71,   71, 1861,
 
-       71, 1862,   71, 1870, 1863,   71, 1871, 1867, 1864, 1874,
-     1868, 1872, 1869, 1873,   71,   71, 1877,   71, 1878,   71,
-       71,   71,   71,   71, 1884,   71, 1875, 1881,   71,   71,
-       71, 1876, 1889, 1879, 1886, 1887,   71,   71, 1888, 1880,
-     1885, 1882,   71, 1883,   71,   71, 1894,   71, 1895,   71,
-     1898, 1890, 1896, 1899,   71, 1891,   71, 1897,   71,   71,
-     1892,   71,   71, 1903,   71, 1893, 1901,   71,   71,   71,
-       71, 1905, 1908,   71, 1902, 1910, 1904,   71,   71,   71,
-     1900,   71, 1906,   71,   71,   71,   71, 1915, 1920, 1911,
-     1914, 1912,   71, 1907,   71, 1909,   71, 1916, 1917,   71,
+     1868, 1863,   71, 1867,   71,   71,   71,   71,   71,   71,
+       71, 1871,   71, 1876,   71, 1865,   71, 1875,   71, 1870,
+     1883,   71,   71,   71, 1866, 1869, 1880, 1872, 1873, 1877,
+       71, 1874, 1882, 1878,   71, 1879, 1881,   71, 1884, 1887,
+       71,   71,   71, 1894,   71,   71,   71,   71, 1885,   71,
+     1891,   71,   71, 1886,   71, 1899, 1889, 1896, 1897,   71,
+       71, 1898, 1888, 1890,   71,   71, 1892, 1893,   71, 1895,
+     1904,   71, 1906, 1900, 1905,   71, 1901, 1907,   71, 1908,
+     1909, 1902,   71,   71,   71,   71,   71, 1913, 1903, 1911,
+       71,   71,   71,   71,   71, 1912, 1915,   71, 1918,   71,
 
-     1918,   71, 1913,   71, 1927,   71, 1919,   71,   71, 1921,
-     1922,   71,   71, 1923,   71, 1926, 1925, 1924,   71, 1928,
-       71,   71,   71, 1932,   71,   71, 1929, 1931,   71,   71,
-     1933,   71, 1930, 1934, 1935, 1936,   71,   71,   71,   71,
-     1938,   71, 1943, 1941,   71, 1937, 1942,   71,   71,   71,
-       71,   71, 1948,   71,   71, 1939, 1945, 1940,   71,   71,
-       71, 1952, 1944, 1949, 1947,   71, 1954, 1946, 1951,   71,
-       71, 1950, 1958,   71, 1953, 1956,   71,   71,   71, 1955,
-     1959,   71, 1957,   71, 1964,   71,   71, 1966,   71,   71,
-       71, 1967, 1960,   71, 1961, 1970, 1962, 1963, 1968,   71,
+     1920,   71, 1914, 1916,   71,   71,   71,   71, 1910, 1921,
+       71,   71, 1924, 1922, 1925,   71, 1926, 1927,   71, 1917,
+     1930, 1919, 1928,   71, 1923,   71,   71,   71,   71,   71,
+     1929, 1931, 1932,   71, 1933,   71, 1936,   71, 1934,   71,
+     1935,   71, 1938,   71,   71,   71, 1942,   71,   71, 1937,
+     1941, 1939,   71, 1943,   71, 1940,   71, 1944,   71, 1945,
+     1946,   71,   71,   71,   71, 1948, 1953, 1951, 1947, 1952,
+       71,   71,   71,   71,   71,   71, 1949,   71,   71, 1958,
+     1955, 1950,   71, 1962,   71,   71, 1961,   71, 1954, 1957,
+     1959, 1956, 1960, 1963,   71,   71,   71, 1964, 1969, 1966,
 
-       71, 1969, 1965,   71, 1972,   71,   71,   71,   71,   71,
-       71,   71,   71,   71, 1973, 3043,   71,   71, 1980, 1975,
-     1971, 1976, 1977, 1984,   71,   71, 1979, 1974, 1983,   71,
-       71, 1981, 1987, 1982, 1978, 1985,   71,   71,   71,   71,
-     1991, 1988, 1990,   71,   71, 1986,   71,   71, 1993,   71,
-     1989, 1994,   71,   71,   71, 1995, 1999, 1992, 1997,   71,
-       71, 2001, 2003,   71, 1998, 1996,   71,   71,   71, 2006,
-       71,   71, 2000, 2005, 2002, 2007, 2008,   71,   71, 2011,
-       71,   71,   71,   71,   71,   71, 2012,   71, 2017,   71,
-     2014,   71, 2004, 2013, 2021, 2009,   71, 2018, 2010, 2019,
+     1968,   71,   71,   71, 1974,   71,   71,   71, 1965, 1967,
+       71,   71, 1976,   71,   71, 1977, 1978,   71, 1970, 1971,
+     1972, 1973, 1979, 1975,   71,   71,   71, 1982,   71,   71,
+       71, 1980,   71,   71,   71,   71,   71, 1983,   71,   71,
+       71, 1990, 1985,   71, 1986, 1981, 1987, 1994,   71,   71,
+     1984, 1989, 1993,   71, 1991,   71, 1997, 1995, 1992, 1988,
+     1998,   71,   71, 1996, 2001,   71, 2000,   71,   71, 1999,
+       71,   71, 2003,   71,   71, 2004,   71,   71, 2009, 2005,
+       71,   71, 2007, 2002,   71,   71, 2008, 2011,   71, 2006,
+     2013,   71,   71, 2015, 2012,   71, 2010, 2016,   71,   71,
 
-       71, 2016, 2015,   71,   71,   71, 2023,   71, 2022, 2026,
-       71, 2020,   71, 2024,   71, 2028,   71, 2029,   71, 2027,
-       71, 2025,   71,   71,   71, 2031, 2035, 2030,   71,   71,
-     2032, 2033, 2037,   71, 2034,   71,   71, 2038,   71,   71,
-     2040, 2041, 2039,   71, 2036,   71,   71,   71, 2042, 2044,
-     2043, 2047,   71,   71,   71, 2045, 2046, 2048,   71,   71,
-       71,   71,   71,   71, 2049,   71,   71, 2056, 2051, 2050,
-     2057, 2053, 2054, 2052,   71, 2058,   71,   71,   71,   71,
-     2059, 2055, 2061, 2067,   71,   71, 2062,   71,   71, 2069,
-       71,   71, 2063, 2060, 2066, 2071, 2064, 2068,   71,   71,
+     2021,   71, 2019, 2017, 2018,   71,   71, 2014,   71,   71,
+     2022,   71, 2020,   71, 2023,   71, 2024, 2027,   71,   71,
+     2028, 2031, 3053,   71,   71, 2026,   71,   71, 2025, 2032,
+     2029, 2034,   71, 2030, 2033, 2036,   71,   71, 2037, 2035,
+       71, 2038,   71, 2039,   71,   71, 2040,   71,   71, 2041,
+     2045,   71, 2047,   71,   71,   71, 2043, 2048,   71, 2044,
+       71,   71, 2049, 2042,   71, 2052, 2050, 2051,   71, 2053,
+       71,   71, 2046,   71, 2054, 2057,   71,   71,   71, 2056,
+       71,   71,   71,   71,   71,   71,   71, 3053, 2055, 2058,
+     2066, 2059, 2061, 2060, 2063, 2062, 2064,   71,   71,   71,
 
-       71, 3043, 2074, 2072, 2065, 2076, 2070, 2075,   71, 2077,
-       71,   71, 2073, 2078,   71,   71, 2081,   71,   71, 2082,
-     2080,   71, 2079, 2086,   71,   71, 2087,   71,   71, 2090,
-     2085,   71,   71, 2083,   71,   71, 2091,   71, 2092, 2088,
-     2093,   71,   71, 2095, 2084,   71, 2089, 2094,   71,   71,
-     2100,   71, 2096,   71, 2097, 2098,   71, 2099,   71,   71,
-       71,   71,   71, 2103,   71,   71, 2107, 2109,   71, 2110,
-       71, 2102,   71,   71,   71,   71, 2101, 2104, 2105, 2112,
-     2106,   71,   71,   71,   71, 2111, 2108, 2114, 2116, 2119,
-       71,   71, 2115,   71, 2117,   71,   71,   71, 2113, 2120,
+       71, 2065, 2067,   71,   71, 2069, 2071, 2068, 2075, 2072,
+       71,   71, 2077,   71,   71, 2079,   71, 3053, 2070, 2073,
+     2076, 2074,   71, 2078,   71,   71, 2081, 2084, 2086, 2080,
+     2082,   71, 2085,   71,   71, 2087,   71, 2083,   71, 2088,
+       71,   71, 2091,   71,   71, 2092, 2089, 2096,   71, 2095,
+       71, 2090,   71, 2097,   71, 2100,   71, 2102,   71, 2093,
+       71,   71, 2098, 2101, 2103,   71,   71, 2105,   71,   71,
+     2094, 2104, 2099,   71,   71,   71,   71,   71, 2106, 2108,
+     2107, 2110,   71,   71,   71,   71,   71,   71, 2113, 2119,
+       71, 2117, 2111, 2109,   71, 2114,   71, 2112, 2120,   71,
 
-     2118,   71,   71, 2121,   71,   71,   71, 2130,   71,   71,
-       71,   71, 2122, 2131, 2127,   71, 2125, 2285, 2123, 2133,
-     2124, 2129, 2126,   71, 2132, 2128,   71, 2135, 2134, 2136,
-       71, 2137,   71,   71,   71, 2140,   71,   71, 2138, 2143,
-       71,   71, 2144,   71,   71, 2141, 2139,   71, 2142, 2145,
-     2149,   71, 2150,   71,   71, 2152,   71,   71,   71, 2148,
-       71, 2146,   71, 2147, 2154,   71,   71, 2157,   71, 2158,
-       71, 2156, 2159, 2151,   71, 2153,   71, 2155,   71, 2162,
-       71, 2164,   71, 2160,   71, 2163, 2166,   71,   71,   71,
-     2161,   71, 2169,   71, 2168,   71, 2170, 2165, 2172,   71,
+     2115,   71,   71,   71, 2122, 2116,   71,   71,   71, 2118,
+       71, 2121, 2126,   71, 2124, 2129,   71,   71, 2130, 2127,
+       71,   71, 2125,   71,   71,   71, 2128, 2123,   71,   71,
+     2140,   71, 2131,   71,   71,   71, 2132, 2141,   71, 2139,
+     2137, 3053, 2135, 2133,   71, 2134, 2136, 2143, 2142,   71,
+     2138, 2144,   71, 2145, 2146,   71, 2147,   71,   71, 2148,
+       71, 2150, 2149, 2153,   71,   71,   71, 2151,   71,   71,
+     2152, 2154,   71, 2155, 2159,   71, 2160,   71,   71, 2162,
+       71,   71, 2164,   71, 2158, 2156,   71,   71,   71, 2157,
+     2167,   71, 2166, 2168,   71,   71,   71, 2161,   71, 2163,
 
-       71,   71, 2167, 2176,   71,   71,   71,   71, 2174,   71,
-     2173, 2171,   71, 2180, 2181,   71,   71, 2185,   71, 2175,
-       71, 2177, 2179,   71,   71, 2182,   71, 2183, 2178,   71,
-     2187, 2184,   71,   71, 2192,   71,   71, 2194, 2188,   71,
-     2186,   71, 2195,   71, 2189, 2193,   71, 2190, 2199,   71,
-       71, 2200,   71, 2198,   71,   71,   71, 2196, 2191, 2197,
-     2204, 2206,   71, 2202,   71, 2209,   71, 2207,   71, 2211,
-       71,   71,   71, 2203, 2201,   71,   71, 2212,   71, 2208,
-     2205, 2213,   71, 2215,   71, 2216,   71, 2210,   71,   71,
-       71,   71, 2221, 2214, 2222, 2217, 2223, 2218, 2219, 2220,
+       71, 2165, 2169,   71, 2170, 2173, 2174,   71, 2176,   71,
+     2171,   71,   71,   71,   71, 2180, 2179, 2172, 2178, 2182,
+       71,   71, 2175,   71,   71, 2186,   71,   71,   71, 2177,
+     2181,   71,   71, 2191,   71,   71, 2190,   71, 2184,   71,
+     2183,   71,   71, 2185, 2195,   71, 2189, 2187,   71, 2197,
+       71, 2188, 2193,   71, 2192,   71, 2194,   71, 2202, 2196,
+       71,   71, 2198, 2204,   71,   71,   71, 2205, 2199, 2203,
+       71, 2200,   71,   71,   71, 2209,   71, 2208, 2210,   71,
+       71, 2201, 2206,   71, 2207, 2212,   71,   71, 2214,   71,
+     2219, 2211, 2216, 2221, 2217, 2213,   71,   71,   71,   71,
 
-       71,   71,   71,   71, 2225, 2224,   71, 2227, 2228,   71,
-     2229, 2231, 2226, 2232,   71,   71,   71,   71, 2230, 2235,
-       71,   71,   71,   71,   71,   71, 2237, 2242,   71,   71,
-       71, 2233, 2234, 2243, 2238,   71, 2236, 2246,   71, 2239,
-     2240, 2241,   71, 2247, 2248,   71,   71, 2245,   71, 2249,
-     2244, 2251, 2252, 2250, 2253,   71,   71,   71,   71,   71,
-     2255,   71,   71,   71,   71, 2259, 2260,   71, 3043,   71,
-     2254,   71,   71, 2256, 2262, 2263, 2257,   71, 2265,   71,
-     2264, 2261, 2258,   71,   71,   71,   71,   71, 2266,   71,
-     2269, 2270,   71, 2267, 2272,   71,   71,   71,   71,   71,
+     2220, 2218, 2215, 2222,   71, 2224,   71,   71,   71, 2223,
+     2225, 2226,   71,   71,   71, 2227, 2228, 2232, 2233,   71,
+       71, 2229, 2230,   71,   71,   71,   71, 2238, 2231, 2234,
+       71, 2237,   71,   71,   71, 2236,   71, 2239,   71, 2235,
+     2241,   71, 2242, 2245,   71, 2240,   71,   71, 2243,   71,
+     2244,   71,   71, 2246,   71, 2247, 2261, 2249,   71, 2248,
+       71, 2252,   71, 2251, 2250, 2253, 2255, 2256,   71,   71,
+     2257,   71, 2254, 2258,   71,   71, 2260, 2262, 2259, 2263,
+       71,   71,   71,   71,   71, 2265,   71,   71,   71, 2269,
+     2270,   71,   71,   71, 2266, 2264,   71, 2272,   71, 3053,
 
-     2271,   71, 2276, 2279,   71, 2268, 2278,   71,   71,   71,
-     2280, 2275,   71,   71, 2284, 2273, 2274, 2283,   71, 2277,
-       71,   71,   71, 2286, 2282, 2281, 2292, 2287,   71, 2288,
-       71,   71, 2291, 2289, 2293,   71, 2295,   71,   71,   71,
-       71, 2297,   71,   71, 2290,   71,   71, 2294, 2296,   71,
-       71, 2301,   71,   71,   71, 2303, 2298, 2299, 2304, 2305,
-       71, 2300, 2306,   71, 2307,   71, 2308,   71, 2309,   71,
-       71,   71, 2311, 2314,   71, 2302, 2310,   71, 2316,   71,
-       71, 2319,   71, 2313,   71,   71, 2315,   71, 2312,   71,
-     2322, 2323,   71,   71,   71, 2318,   71, 2317, 2324,   71,
+     2267,   71, 2273,   71, 2274, 2271, 2268, 2275,   71,   71,
+       71,   71, 2277, 2278, 2276, 2279, 2280,   71,   71,   71,
+       71,   71,   71, 2281, 2282,   71, 2286,   71, 2289,   71,
+       71,   71, 2288,   71,   71, 2285, 2290,   71, 2283, 2295,
+     2284,   71, 2293, 2296, 2294, 2287,   71, 2291,   71, 2292,
+       71,   71, 2298,   71,   71, 2301, 2299,   71, 2303,   71,
+     2297, 2302, 2305,   71,   71,   71,   71, 2307,   71,   71,
+       71, 2304,   71,   71, 2300, 2306,   71, 2311, 2315,   71,
+     2317, 2313,   71, 2308, 2309, 2310,   71, 2314, 2316,   71,
+       71, 2318,   71,   71,   71,   71,   71,   71, 2326, 2312,
 
-       71, 2327, 2328,   71, 2320, 2321,   71,   71, 2326,   71,
-       71,   71, 2325,   71, 2332,   71, 2334, 2329, 2374, 2331,
-     2330, 2335,   71, 2336,   71, 2337,   71, 2338,   71,   71,
-     2333, 2340,   71,   71, 2342,   71, 2343, 2341,   71,   71,
-       71, 2339,   71, 2348,   71,   71, 2350,   71, 2351,   71,
-     2344, 2345,   71,   71,   71,   71,   71,   71, 2347,   71,
-     2346, 2354, 2357, 2352, 2349, 2353,   71, 2355, 2360,   71,
-       71,   71,   71,   71,   71,   71, 2356,   71, 2367, 2358,
-     2361,   71,   71,   71,   71,   71, 2359, 2364,   71, 2366,
-     2368,   71, 2363, 2378,   71, 3043, 2362, 2365, 2369, 2370,
+     2321, 2324,   71,   71,   71, 2325,   71,   71, 2319, 2323,
+     2329,   71,   71, 2322,   71, 2320,   71, 2332, 2333,   71,
+       71, 2327, 2328,   71,   71, 2330,   71,   71, 2334, 2336,
+     2331, 2337, 2335,   71,   71, 2338,   71,   71, 2339,   71,
+       71, 2340, 2342,   71, 2344, 3053, 2341, 2345,   71, 2346,
+       71, 2347,   71, 2348,   71, 2349, 2343,   71, 2350,   71,
+     2352,   71, 2351,   71, 2353,   71,   71,   71, 2358,   71,
+       71, 2360,   71, 2354, 2361,   71,   71, 2355,   71,   71,
+       71,   71,   71, 2357,   71,   71, 2356, 2362, 2364, 2359,
+     2363, 2365,   71, 2370,   71,   71,   71, 2367,   71,   71,
 
-     2371,   71,   71,   71,   71, 2375, 2376, 2372, 2377, 2379,
-       71, 2373,   71, 2380,   71, 2381,   71, 2382,   71,   71,
-     2383,   71,   71, 2385,   71,   71,   71,   71,   71, 2384,
-     2392,   71,   71,   71, 2390,   71, 2396, 2397,   71, 2386,
-     2387,   71,   71, 2388, 2389,   71, 2391, 2393,   71, 2394,
-     2395, 2399, 2400,   71, 2401, 2398, 2402,   71,   71, 2403,
-       71,   71,   71,   71,   71, 2405, 2404,   71, 2411,   71,
-     2412,   71, 2413,   71,   71, 2406,   71,   71,   71, 2407,
-     2408,   71, 2410, 2409, 2418,   71, 2417, 2422,   71, 2415,
-     2420, 2414,   71,   71, 2421, 2416,   71, 2419, 2423, 2424,
+     2366,   71, 2368,   71, 2369, 2371,   71, 2377,   71,   71,
+     2378, 2372, 2374,   71,   71, 2373,   71, 2376,   71,   71,
+       71, 2384, 2375, 2379, 2380, 2386,   71,   71, 2388,   71,
+       71, 2381, 2387, 2385, 2389,   71, 2382,   71, 2390, 2383,
+       71, 2391,   71, 2392, 2393,   71,   71,   71,   71, 2395,
+       71,   71,   71,   71,   71, 2402, 2394,   71,   71, 2400,
+       71, 2406, 2407,   71,   71, 2397, 2396,   71,   71,   71,
+     2398, 2399, 2401,   71, 2403, 2404, 2405, 2409, 2410,   71,
+     2412,   71, 2411,   71,   71, 2413, 2408, 2414,   71,   71,
+     2415,   71,   71, 2421,   71, 2422,   71, 2423,   71, 2416,
 
-       71,   71,   71,   71,   71,   71,   71,   71,   71,   71,
-     2426, 2430, 2425,   71,   71, 2428, 2434, 2435,   71, 2438,
-       71, 2427,   71,   71, 2429, 2431, 2432, 2437, 2433, 2436,
-       71,   71, 2442,   71, 2439, 2441, 2443, 2440,   71,   71,
-     2446,   71,   71,   71,   71, 2450,   71,   71, 2449, 2452,
-       71,   71, 2448,   71, 2447,   71, 2453,   71, 2444, 2445,
-     2457,   71, 2454,   71, 2458,   71, 2451, 2460,   71, 2456,
-       71, 2455,   71,   71,   71,   71, 2465,   71, 2467,   71,
-       71,   71, 2463, 2461, 2464, 2462, 2468, 2459,   71, 2466,
-       71,   71,   71, 2469, 2470, 2471,   71,   71,   71, 2472,
+       71,   71,   71,   71,   71,   71, 2417, 2418, 2419, 2427,
+     2420,   71,   71, 2431,   71, 2425, 2424, 2430, 2432,   71,
+     2426,   71, 2428, 2433,   71, 2429, 2434,   71,   71,   71,
+       71,   71,   71, 2435,   71,   71, 2440, 2436,   71,   71,
+       71, 2438, 2444, 2437, 2445,   71,   71, 2448,   71,   71,
+     2439,   71, 2441, 2442,   71, 2443, 2447,   71, 2449,   71,
+     2454, 2446,   71, 2451, 2450, 2452,   71, 2456,   71,   71,
+     2453, 2455,   71,   71, 2457,   71, 2459,   71, 2458, 2460,
+       71, 2462,   71,   71, 2464,   71, 2467,   71, 2463,   71,
+     2468,   71, 2461, 2465, 2470,   71,   71, 2466,   71,   71,
 
-       71,   71,   71,   71, 3043, 2474, 2475, 2477, 2478, 2480,
-       71, 2473, 2476, 2481,   71, 2479,   71,   71,   71, 2484,
-     2486, 3043, 2483, 2482,   71,   71,   71,   71, 2488, 2487,
-       71, 2491,   71, 2492,   71, 2490, 2485,   71, 2494,   71,
-     2489,   71, 2496,   71, 2495,   71,   71, 2497,   71,   71,
-     2493, 2498, 2500,   71, 2499,   71,   71, 2501,   71,   71,
-     2502,   71, 2507, 2516, 2506, 2503, 2508,   71,   71, 2505,
-       71,   71,   71,   71, 2504, 2509, 2511,   71,   71, 2510,
-     2512,   71,   71, 2514,   71, 2513, 2515,   71,   71, 2520,
-       71,   71,   71, 2518,   71, 2517, 2519, 2525,   71, 2521,
+       71,   71, 2475,   71, 2477,   71,   71,   71, 2473, 2471,
+     2474, 2472, 2478, 2469,   71, 2476,   71,   71,   71, 2479,
+     2480, 2481,   71,   71,   71, 2482,   71,   71,   71,   71,
+     3053, 2484, 2485, 2487, 2488, 2490,   71, 2483, 2486, 2491,
+       71, 2489,   71,   71,   71, 2494, 2496, 3053, 2493, 2492,
+       71,   71,   71,   71, 2498, 2497,   71, 2501,   71, 2502,
+       71, 2500, 2495,   71, 2504,   71, 2499,   71, 2506,   71,
+     2505,   71,   71, 2507,   71,   71, 2503, 2508, 2510,   71,
+     2509,   71,   71, 2511,   71,   71, 2512,   71, 2517, 2526,
+     2516, 2513, 2518,   71,   71, 2515,   71,   71,   71,   71,
 
-       71,   71,   71, 2529,   71,   71,   71,   71, 2534,   71,
-     2522, 2527, 2523, 2524,   71,   71, 2528, 2536, 2533, 2526,
-     2537, 2531, 2538,   71, 2530,   71,   71, 2532,   71, 2539,
-       71,   71,   71, 2540,   71,   71, 2541,   71,   71, 2544,
-     2535, 2542,   71, 2547, 2548,   71,   71, 2543, 2549,   71,
-     2551, 2545,   71, 2546, 2550,   71,   71, 2552, 2553,   71,
-       71,   71, 2557,   71,   71, 2555,   71, 2558,   71,   71,
-     2560, 2561,   71, 2556, 2562,   71, 2554,   71,   71, 2564,
-     2563,   71, 2565, 2559, 2567,   71,   71, 2568, 2569,   71,
-     2571,   71,   71,   71,   71, 2575, 2570,   71, 2566, 2576,
+     2514, 2519, 2521,   71,   71, 2520, 2522,   71,   71, 2524,
+       71, 2523, 2525,   71,   71, 2530,   71,   71,   71, 2528,
+       71, 2527, 2529, 2535,   71, 2531,   71,   71,   71, 2539,
+       71,   71,   71,   71, 2544,   71, 2532, 2537, 2533, 2534,
+       71,   71, 2538, 2546, 2543, 2536, 2547, 2541, 2548,   71,
+     2540,   71,   71, 2542,   71, 2549,   71,   71,   71, 2550,
+       71,   71, 2551,   71,   71, 2554, 2545, 2552,   71, 2557,
+     2558,   71,   71, 2553, 2559,   71, 2561, 2555,   71, 2556,
+     2560,   71,   71, 2562, 2563,   71,   71,   71, 2567,   71,
+       71, 2565,   71, 2568,   71,   71, 2570, 2571,   71, 2566,
 
-       71,   71,   71,   71, 2578, 2572, 2577,   71, 2574, 2579,
-       71, 2573,   71, 2584,   71, 2587,   71,   71, 2583,   71,
-     2580, 2586,   71, 2581,   71,   71,   71, 2582, 2590, 2588,
-     2589,   71,   71,   71, 2592,   71,   71, 3043, 2595, 2585,
-       71, 2599,   71,   71,   71,   71,   71, 2601,   71, 2593,
-     2594, 2591,   71, 2596, 2598, 2602, 2597, 2600, 2606, 2603,
-     2605, 2609,   71, 2607,   71, 2604,   71, 2608,   71, 2610,
-       71, 2611,   71, 2612,   71, 2613,   71,   71,   71,   71,
-       71, 2615, 2614,   71, 2621,   71,   71,   71, 2618, 2622,
-     2624,   71,   71, 2626,   71,   71,   71, 2616, 3043, 2625,
+     2572,   71, 2564,   71,   71, 2574, 2573,   71, 2575, 2569,
+     2577,   71,   71, 2578, 2579,   71, 2581,   71,   71,   71,
+       71, 2585, 2580,   71, 2576, 2586,   71,   71,   71,   71,
+     2588, 2582, 2587,   71, 2584, 2589,   71, 2583,   71, 2594,
+       71, 2597,   71,   71, 2593,   71, 2590, 2596,   71, 2591,
+       71,   71,   71, 2592, 2600, 2598, 2599,   71,   71,   71,
+     2602,   71,   71, 3053, 2605, 2595,   71, 2609,   71,   71,
+       71,   71,   71, 2611,   71, 2603, 2604, 2601,   71, 2606,
+     2608, 2612, 2607, 2610, 2616, 2613, 2615, 2619,   71, 2617,
+       71, 2614,   71, 2618,   71, 2620,   71, 2621,   71, 2622,
 
-     2619, 2627,   71, 2620, 2617, 2623, 2628,   71,   71,   71,
-       71, 2629,   71, 2632, 2633,   71, 2634, 2630, 2631, 2635,
-       71, 2637,   71,   71,   71,   71, 2638,   71,   71, 2641,
-       71, 2640, 2642,   71,   71, 2636, 2639, 2643,   71, 2644,
-       71,   71,   71, 2647,   71,   71,   71, 3043, 2646, 2652,
-       71, 2650, 2648, 2645,   71,   71,   71, 2653, 2694, 2655,
-       71, 2656,   71, 2657, 2651,   71, 2649, 2654,   71, 2658,
-     2659,   71, 2660, 2662,   71, 2661, 2663,   71, 2664,   71,
-       71,   71,   71,   71, 2669,   71,   71, 2668, 2666, 2665,
-       71, 2670,   71, 2672,   71,   71, 2677, 2671,   71,   71,
+       71, 2623,   71,   71,   71,   71,   71, 2625, 2624,   71,
+     2631,   71,   71,   71, 2628, 2632, 2634,   71,   71, 2636,
+       71,   71,   71, 2626, 3053, 2635, 2629, 2637,   71, 2630,
+     2627, 2633, 2638,   71,   71,   71,   71, 2639,   71, 2642,
+     2643,   71, 2644, 2640, 2641, 2645,   71, 2647,   71,   71,
+       71,   71, 2648,   71,   71, 2651,   71, 2650, 2652,   71,
+       71, 2646, 2649, 2653,   71, 2654,   71,   71,   71, 2657,
+       71,   71,   71, 3053, 2656, 2662,   71, 2660, 2658, 2655,
+       71,   71,   71, 2663, 2704, 2665,   71, 2666,   71, 2667,
+     2661,   71, 2659, 2664,   71, 2668, 2669,   71, 2670, 2672,
 
-     2667, 2673,   71, 2675, 2679,   71, 2674,   71,   71,   71,
-       71, 2680,   71, 2676, 2681, 2682,   71, 2683,   71, 2687,
-       71,   71,   71,   71, 2678,   71,   71, 2684,   71, 2690,
-       71,   71, 2686, 2685, 2688, 2689, 2695, 2691,   71, 2692,
-     2697,   71, 2699,   71,   71, 2693, 2700,   71, 2702,   71,
-       71,   71,   71,   71, 2707,   71, 2696, 2698, 2706,   71,
-       71,   71,   71, 2711,   71, 2701, 2703, 2704, 2705, 2713,
-       71,   71,   71,   71,   71, 2715,   71, 2716, 2712, 2708,
-     2710,   71,   71, 2709, 2718,   71, 2719,   71, 2721,   71,
-       71, 2714, 2726, 2723, 2720, 2717, 2725,   71,   71, 2724,
+       71, 2671, 2673,   71, 2674,   71,   71,   71,   71,   71,
+     2679,   71,   71, 2678, 2676, 2675,   71, 2680,   71, 2682,
+       71,   71, 2687, 2681,   71,   71, 2677, 2683,   71, 2685,
+     2689,   71, 2684,   71,   71,   71,   71, 2690,   71, 2686,
+     2691, 2692,   71, 2693,   71, 2697,   71,   71,   71,   71,
+     2688,   71,   71, 2694,   71, 2700,   71,   71, 2696, 2695,
+     2698, 2699, 2705, 2701,   71, 2702, 2707,   71, 2709,   71,
+       71, 2703, 2710,   71, 2712,   71,   71,   71,   71,   71,
+     2717,   71, 2706, 2708, 2716,   71,   71,   71,   71, 2721,
+       71, 2711, 2713, 2714, 2715, 2723,   71,   71,   71,   71,
 
-       71,   71, 2730,   71,   71,   71, 2732, 2731, 2722,   71,
-       71, 2735, 2728, 2736,   71,   71, 2727,   71, 2737, 2738,
-       71, 2729, 2733,   71,   71,   71,   71, 2743, 2740, 2734,
-       71, 2741,   71,   71, 2746,   71,   71,   71, 2739,   71,
-     2751,   71,   71, 2742, 2747,   71,   71, 2744, 2745, 2754,
-       71, 3043, 2750,   71, 2748, 2753, 2755,   71, 2756, 2757,
-       71, 2752, 2749, 2759,   71, 2758, 2760,   71, 2761,   71,
-       71, 2763,   71,   71,   71, 2762,   71,   71,   71, 2768,
-     2769,   71,   71,   71,   71, 2773,   71,   71, 2774,   71,
-       71, 3043, 2764, 2772,   71, 2777, 2765, 2770, 2766, 2767,
+       71, 2725,   71, 2726, 2722, 2718, 2720,   71,   71, 2719,
+     2728,   71, 2729,   71, 2731,   71,   71, 2724, 2736, 2733,
+     2730, 2727, 2735,   71,   71, 2734,   71,   71, 2740,   71,
+       71,   71, 2742, 2741, 2732,   71,   71, 2745, 2738, 2746,
+       71,   71, 2737,   71, 2747, 2748,   71, 2739, 2743,   71,
+       71,   71,   71, 2753, 2750, 2744,   71, 2751,   71,   71,
+     2756,   71,   71,   71, 2749,   71, 2761,   71,   71, 2752,
+     2757,   71,   71, 2754, 2755, 2764,   71, 3053, 2760,   71,
+     2758, 2763, 2765,   71, 2766, 2767,   71, 2762, 2759, 2769,
+       71, 2768, 2770,   71, 2771,   71,   71, 2773,   71,   71,
 
-     2778,   71, 2771, 2779,   71,   71,   71, 2775, 2776, 2782,
-     2780,   71,   71,   71,   71,   71, 2785,   71,   71, 2786,
-     2781, 2784,   71, 2783,   71,   71,   71, 2789,   71,   71,
-       71, 2791, 2787,   71, 2792,   71, 2790,   71, 2788,   71,
-       71,   71,   71,   71, 2808,   71, 2801, 2793, 2802, 2794,
-     2795, 2796, 2804, 2797,   71, 2803, 2798, 2799,   71, 2805,
-       71, 2800, 2806, 2809,   71,   71, 2811,   71,   71, 2810,
-     2812,   71, 2819, 2807, 2813, 2814,   71,   71, 2815, 2816,
-       71,   71, 2817, 2818,   71,   71, 2820,   71,   71,   71,
-       71, 2826,   71,   71, 2821, 2825,   71, 2829, 2822, 2843,
+       71, 2772,   71,   71,   71, 2778, 2779,   71,   71,   71,
+       71, 2783,   71,   71, 2784,   71,   71, 3053, 2774, 2782,
+       71, 2787, 2775, 2780, 2776, 2777, 2788,   71, 2781, 2789,
+       71,   71,   71, 2785, 2786, 2792, 2790,   71,   71,   71,
+       71,   71, 2795,   71,   71, 2796, 2791, 2794,   71, 2793,
+       71,   71,   71, 2799,   71,   71,   71, 2801, 2797,   71,
+     2802,   71, 2800,   71, 2798,   71,   71,   71,   71,   71,
+     2818,   71, 2811, 2803, 2812, 2804, 2805, 2806, 2814, 2807,
+       71, 2813, 2808, 2809,   71, 2815,   71, 2810, 2816, 2819,
+       71,   71, 2821,   71,   71, 2820, 2822,   71, 2829, 2817,
 
-     2823,   71,   71, 2828,   71,   71,   71,   71, 2824,   71,
-     2830,   71, 2834,   71, 2827, 2833, 2864, 2831, 2835,   71,
-     2836,   71, 2832,   71, 2837,   71, 2841,   71, 2838,   71,
-       71, 2842,   71,   71, 2839, 2847,   71, 2840, 2844, 2850,
-       71, 2848, 2845, 2851,   71,   71, 2853,   71, 2899,   71,
-     2846, 2852, 2849, 2854,   71,   71, 2856,   71, 2857,   71,
-     2855, 2858,   71, 2859,   71, 2860,   71, 2861,   71, 2862,
-       71, 2863,   71, 2865,   71,   71,   71,   71,   71,   71,
-     2870,   71,   71,   71, 2866,   71, 2874,   71, 2867,   71,
-     2876,   71,   71, 2871,   71, 2872, 2883, 2868, 2869, 2873,
+     2823, 2824,   71,   71, 2825, 2826,   71,   71, 2827, 2828,
+       71,   71, 2830,   71,   71,   71,   71, 2836,   71,   71,
+     2831, 2835,   71, 2839, 2832, 2853, 2833,   71,   71, 2838,
+       71,   71,   71,   71, 2834,   71, 2840,   71, 2844,   71,
+     2837, 2843, 2874, 2841, 2845,   71, 2846,   71, 2842,   71,
+     2847,   71, 2851,   71, 2848,   71,   71, 2852,   71,   71,
+     2849, 2857,   71, 2850, 2854, 2860,   71, 2858, 2855, 2861,
+       71,   71, 2863,   71, 2909,   71, 2856, 2862, 2859, 2864,
+       71,   71, 2866,   71, 2867,   71, 2865, 2868,   71, 2869,
+       71, 2870,   71, 2871,   71, 2872,   71, 2873,   71, 2875,
 
-       71, 2877,   71, 2878, 2875,   71, 2880,   71,   71,   71,
-     2882,   71, 2881,   71, 2885,   71,   71,   71, 2879,   71,
-       71, 2889, 2884, 2892,   71,   71, 2890, 2894,   71,   71,
-     2886, 2887, 2888,   71, 2891, 2895,   71, 2893, 2896,   71,
-       71,   71, 2898,   71,   71,   71,   71, 2907, 2897, 2900,
-     2904,   71,   71, 2905, 2901, 2903,   71,   71, 2906,   71,
-       71,   71,   71,   71, 2902, 2908,   71,   71,   71,   71,
-       71, 2914,   71, 2911, 2918, 2909, 2913, 2910, 2915, 2921,
-       71, 2922, 2919,   71, 2916, 2912,   71, 2917, 2923,   71,
-     2920,   71, 2924, 2925,   71, 2926,   71,   71,   71,   71,
+       71,   71,   71,   71,   71,   71, 2880,   71,   71,   71,
+     2876,   71, 2884,   71, 2877,   71, 2886,   71,   71, 2881,
+       71, 2882, 2893, 2878, 2879, 2883,   71, 2887,   71, 2888,
+     2885,   71, 2890,   71,   71,   71, 2892,   71, 2891,   71,
+     2895,   71,   71,   71, 2889,   71,   71, 2899, 2894, 2902,
+       71,   71, 2900, 2904,   71,   71, 2896, 2897, 2898,   71,
+     2901, 2905,   71, 2903, 2906,   71,   71,   71, 2908,   71,
+       71,   71,   71, 2917, 2907, 2910, 2914,   71,   71, 2915,
+     2911, 2913,   71,   71, 2916,   71,   71,   71,   71,   71,
+     2912, 2918,   71,   71,   71,   71,   71, 2924,   71, 2921,
 
-     2929,   71, 2927, 2930, 2931,   71, 2928, 2934,   71,   71,
-       71,   71,   71,   71,   71, 2937, 2939,   71, 2942,   71,
-     2933, 2936, 2935,   71,   71,   71, 2932, 2940, 2945,   71,
-     2949, 2938,   71, 2941,   71, 2946,   71, 2950, 2943,   71,
-     2947,   71, 2944,   71, 2948,   71,   71, 2955,   71, 2956,
-       71, 2954,   71, 2951, 2952,   71,   71,   71,   71,   71,
-       71, 2960,   71,   71, 2953, 2962,   71, 2969,   71,   71,
-     2959,   71, 2964, 2957, 2967, 2958, 2965,   71, 2961,   71,
-       71, 2963, 2968, 2973,   71, 2966,   71,   71, 2975,   71,
-     2976, 2970, 2974,   71,   71,   71,   71, 2971, 2977, 2972,
+     2928, 2919, 2923, 2920, 2925, 2931,   71, 2932, 2929,   71,
+     2926, 2922,   71, 2927, 2933,   71, 2930,   71, 2934, 2935,
+       71, 2936,   71,   71,   71,   71, 2939,   71, 2937, 2940,
+     2941,   71, 2938, 2944,   71,   71,   71,   71,   71,   71,
+       71, 2947, 2949,   71, 2952,   71, 2943, 2946, 2945,   71,
+       71,   71, 2942, 2950, 2955,   71, 2959, 2948,   71, 2951,
+       71, 2956,   71, 2960, 2953,   71, 2957,   71, 2954,   71,
+     2958,   71,   71, 2965,   71, 2966,   71, 2964,   71, 2961,
+     2962,   71,   71,   71,   71,   71,   71, 2970,   71,   71,
+     2963, 2972,   71, 2979,   71,   71, 2969,   71, 2974, 2967,
 
-     2978, 2979, 2981, 2982,   71, 2980,   71,   71,   71, 2984,
-       71, 2983,   71,   71,   71,   71, 2985, 2990,   71,   71,
-     2987,   71, 2993,   71, 2994,   71, 2986,   71,   71,   71,
-       71,   71, 2992, 2988, 2989, 2997, 2995, 2991,   71, 2996,
-       71, 3001,   71, 3002, 3000,   71,   71, 2998, 2999,   71,
-     3005,   71, 3007,   71, 3008, 3003,   71,   71,   71, 3012,
-       71, 3009,   71,   71, 3010, 3006,   71, 3013, 3014, 3015,
-       71, 3004,   71,   71,   71,   71,   71, 3011,   71, 3016,
-     3017, 3019, 3018, 3021,   71,   71,   71,   71,   71, 3027,
-     3023, 3024,   71, 3020, 3022, 3028,   71, 3025,   71,   71,
+     2977, 2968, 2975,   71, 2971,   71,   71, 2973, 2978, 2983,
+       71, 2976,   71,   71, 2985,   71, 2986, 2980, 2984,   71,
+       71,   71,   71, 2981, 2987, 2982, 2988, 2989, 2991, 2992,
+       71, 2990,   71,   71,   71, 2994,   71, 2993,   71,   71,
+       71,   71, 2995, 3000,   71,   71, 2997,   71, 3003,   71,
+     3004,   71, 2996,   71,   71,   71,   71,   71, 3002, 2998,
+     2999, 3007, 3005, 3001,   71, 3006,   71, 3011,   71, 3012,
+     3010,   71,   71, 3008, 3009,   71, 3015,   71, 3017,   71,
+     3018, 3013,   71,   71,   71, 3022,   71, 3019,   71,   71,
+     3020, 3016,   71, 3023, 3024, 3025,   71, 3014,   71,   71,
 
-     3031, 3032,   71,   71, 3034,   71, 3026, 3035,   71,   71,
-     3033, 3029,   71,   71,   71,   71, 3036, 3030, 3037, 3038,
-     3041,   71, 3042,   71, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3039, 3043, 3043, 3040,   43,   43,   43,   43,   43,
-       43,   43,   48,   48,   48,   48,   48,   48,   48,   53,
-       53,   53,   53,   53,   53,   53,   59,   59,   59,   59,
-       59,   59,   59,   64,   64,   64,   64,   64,   64,   64,
-       74,   74, 3043,   74,   74,   74,   74,  141,  141, 3043,
-     3043, 3043,  141,  141,  143,  143, 3043, 3043,  143, 3043,
-      143,  145, 3043, 3043, 3043, 3043, 3043,  145,  148,  148,
+       71,   71,   71, 3021,   71, 3026, 3027, 3029, 3028, 3031,
+       71,   71,   71,   71,   71, 3037, 3033, 3034,   71, 3030,
+     3032, 3038,   71, 3035,   71,   71, 3041, 3042,   71,   71,
+     3044,   71, 3036, 3045,   71,   71, 3043, 3039,   71,   71,
+       71,   71, 3046, 3040, 3047, 3048, 3051,   71, 3052,   71,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3049, 3053, 3053,
+     3050,   43,   43,   43,   43,   43,   43,   43,   48,   48,
+       48,   48,   48,   48,   48,   53,   53,   53,   53,   53,
+       53,   53,   59,   59,   59,   59,   59,   59,   59,   64,
+       64,   64,   64,   64,   64,   64,   74,   74, 3053,   74,
+
+       74,   74,   74,  142,  142, 3053, 3053, 3053,  142,  142,
+      144,  144, 3053, 3053,  144, 3053,  144,  146, 3053, 3053,
+     3053, 3053, 3053,  146,  149,  149, 3053, 3053, 3053,  149,
+      149,  151, 3053, 3053, 3053, 3053, 3053,  151,  153,  153,
+     3053,  153,  153,  153,  153,   75,   75, 3053,   75,   75,
+       75,   75,   13, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053
 
-     3043, 3043, 3043,  148,  148,  150, 3043, 3043, 3043, 3043,
-     3043,  150,  152,  152, 3043,  152,  152,  152,  152,   75,
-       75, 3043,   75,   75,   75,   75,   13, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043
     } ;
 
-static const flex_int16_t yy_chk[5968] =
+static const flex_int16_t yy_chk[5994] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2092,654 +2099,658 @@ static const flex_int16_t yy_chk[5968] =
         5,    3,    6,   20,    4,   20,   20,    5,   20,    6,
         7,    7,    7,    7,   20,    7,    8,    8,    8,    8,
        29,    8,    7,    9,    9,    9,   22,   22,    8,   10,
-       10,   10,   15,   25,    9,   29,   15,   25, 3049,   31,
+       10,   10,   15,   25,    9,   29,   15,   25, 3059,   31,
        10,   11,   11,   11,   11,   11,   11,   19,   79,   19,
 
        19,   30,   19,   11,   31,   79,   30,   25,   19,   19,
        47,   47,   11,   12,   12,   12,   12,   12,   12,   21,
-       23,   23,   21,   21,   24,   12,   21,   81,   23,   24,
-       34,   21,   23,   24,   12,   23,   24, 1000,   24,   24,
-       21,   26,   26,   27,   27,   90,   28,   81,   32,   32,
-       28,   34,   27,   28,   33,   33,   26,   32,   36,   33,
-       28,   35,   28,   32,   90,   42,   35,   32,   52,   84,
-       35,   52,   36,   37,   37,   33,   35,   38,   37,   35,
-       42,   69,   38,   63,   63,   38,   35,   84,   37,   37,
-       40,   37,   38,   80,   40,   69,   38,   38,   39,   39,
+       23,   23,   21,   21,   24,   12,   21,   34,   23,   24,
+       42,   21,   23,   24,   12,   23,   24,   36,   24,   24,
+       21,   26,   26,   27,   27,   42,   28,   69,   34,   84,
+       28,   36,   27,   28,   33,   33,   26,   32,   32,   33,
+       28,   69,   28,   27,   35,   52,   32,   84,   52,   35,
+       63,   63,   32,   35,   40,   33,   32,  109,   40,   35,
+       37,   37,   35,   72,  109,   37,   38,   72,   40,   35,
+      775,   38,   40,   40,   38,   37,   37,   80,   37,   39,
 
-      126,   39,   41,   41,   40,   80,  126,   41,   40,   40,
-       39,   41,   58,   89,   58,   58,   39,   58,   66,   86,
-       66,   66,   68,   66,   68,   68,   71,   68,   71,   71,
-       66,   71,   72,   86,  127,   89,   72,   71,   74,   77,
-       74,   74,   77,   74,   78,   88,  127,   85,   78,   74,
-       74,   82,   83,   87,   82,   83,   85,   92,   93,   87,
-       91,   94,   99,   88,   88,   87,   91,   87,   83,   95,
-       96,   92,   94,   94,  161,  102,   99,   97,   93,   91,
-       94,   97,  161,  105,   98,  106,  101,   95,   96,   98,
-      100,  150,  101,  100,  102,  103,  100,  112,  104,  106,
+       39,   38,   39,   41,   41,   38,   38,   77,   41,   80,
+       77,   39,   41,   58,  775,   58,   58,   39,   58,   66,
+       89,   66,   66,   68,   66,   68,   68,   71,   68,   71,
+       71,   66,   71,   81,   74,   86,   74,   74,   71,   74,
+       78,   93,   89,   85,   78,   74,   74,   82,   83,   86,
+       82,   83,   85,   81,   87,   88,   90,   91,   92,   94,
+       87,   93,   95,   91,   83,   96,   87,   98,   87, 1007,
+       94,   94,   92,   88,   88,   90,   91,   97,   94,   99,
+       95,   97,  100,   96,   99,  101,  102,   98,  101,  103,
+      104,  101,  102,  107,  105,  104,  100,  105,  108,  106,
 
-      103,  104,  105,  109,  107,  104,  108,  105,  107,  100,
-      100,  101,  110,  108,  111,  113,  109,  112,  114,  110,
-      103,  104,  114,  115,  117,  116,  119,  111,  118,  118,
-      116,  122,  120,  113,  116,  121,  120,  123,  132,  125,
-      124,  115,  129,  124,  117,  120,  119,  128,  128,  129,
-      121,  120,  125,  130,  124,  131,  123,  122,  124,  132,
-      129,  133,  134,  135,  134,  128,  136,  137,  128,  130,
-      138,  136,  140,  134,  131,  135,  139,  133,  148,  137,
-      157,  139,  142,  142,  144,  134,  140,  144,  138,  146,
-      154,  146,  146,  154,  146,  149,  149,  151,  157,  151,
+      110,  105,  108,  111,  101,  101,  112,  107,  103,  113,
+      111,  102,  114,  110,  116,  104,  115,  105,  106,  112,
+      115,  118,  117,  106,  119,  119,  120,  117,  122,  113,
+      114,  117,  116,  123,  121,  124,  126,  125,  121,  127,
+      125,  118,  133,  122,  128,  127,  120,  121,  131,  126,
+      132,  125,  151,  121,  124,  125,  128,  129,  129,  123,
+      134,  130,  136,  133,  131,  138,  137,  139,  130,  132,
+      135,  137,  135,  159,  136,  129,  134,  138,  129,  130,
+      141,  135,  140,  143,  143,  139,  145,  140,  159,  145,
+      150,  150,  182,  135,  141,  147,  182,  147,  147,  152,
 
-      151,  152,  151,  152,  152,  155,  152,  158,  156,  159,
-      155,  162,  163,  152,  156,  160,  164,  159,  165,  166,
-      168,  164,  158,  156,  159,  167,  160,  163,  166,  169,
-      162,  167,  167,  171,  169,  170,  170,  175,  165,  171,
-      173,  172,  179,  172,  173,  168,  172,  174,  174,  173,
-      176,  147,  177,  178,  173,  176,  175,  177,  180,  183,
-      173,  173,  179,  172,  180,  178,  181,  182,  184,  185,
-      181,  186,  182,  183,  187,  188,  189,  189,  191,  187,
-      188,  185,  189,  184,  185,  190,  192,  180,  197,  186,
-      190,  193,  194,  194,  189,  195,  189,  193,  191,  196,
+      147,  152,  152,  153,  152,  153,  153,  155,  153,  156,
+      155,  157,  158,  160,  156,  153,  161,  157,  163,  164,
+      165,  160,  166,  162,  167,  165,  157,  161,  160,  168,
+      158,  162,  169,  167,  164,  168,  168,  163,  170,  171,
+      171,  172,  166,  170,  173,  180,  173,  172,  176,  173,
+      174,  175,  175,  177,  174,  178,  179,  169,  177,  174,
+      178,  185,  184,  181,  174,  180,  173,  176,  179,  181,
+      174,  174,  183,  186,  187,  185,  188,  183,  184,  189,
+      190,  191,  191,  193,  189,  190,  187,  191,  186,  187,
+      192,  194,  181,  199,  188,  192,  195,  196,  196,  191,
 
-      198,  195,  192,  199,  200,  196,  198,  195,  197,  199,
-      201,  206,  202,  203,  204,  205,  201,  202,  199,  203,
-      204,  207,  205,  208,  206,  200,  209,  207,  210,  211,
-      213,  212,  209,  214,  215,  213,  216,  211,  217,  220,
-      218,  222,  214,  208,  212,  218,  218,  221,  219,  215,
-      210,  221,  216,  219,  223,  224,  225,  220,  217,  226,
-      223,  227,  225,  222,  229,  228,  227,  228,  230,  233,
-      231,  232,  234,  224,  224,  230,  231,  232,  234,  226,
-      235,  236,  242,  229,  237,  237,  238,  238,  233,  243,
-      239,  240,  235,  245,  243,  236,  239,  240,  241,  244,
+      197,  191,  195,  193,  198,  200,  197,  194,  201,  202,
+      198,  200,  197,  199,  201,  203,  208,  204,  205,  206,
+      207,  203,  204,  201,  205,  206,  209,  207,  210,  208,
+      202,  211,  209,  212,  213,  215,  214,  211,  216,  217,
+      215,  218,  213,  219,  222,  220,  224,  216,  210,  214,
+      220,  220,  223,  221,  217,  212,  223,  218,  221,  225,
+      226,  227,  222,  219,  228,  225,  229,  227,  224,  231,
+      230,  229,  230,  232,  235,  233,  234,  236,  226,  226,
+      232,  233,  234,  236,  228,  237,  238,  244,  231,  239,
+      239,  240,  240,  235,  245,  241,  242,  237,  247,  245,
 
-      241,  246,  247,  248,  249,  242,  255,  250,  248,  246,
-      251,  244,  245,  250,  239,  252,  251,  241,  253,  254,
-      252,  255,  247,  253,  256,  254,  257,  249,  258,  259,
-      260,  262,  266,  261,  262,  264,  264,  259,  256,  261,
-      269,  263,  258,  263,  257,  265,  267,  267,  265,  270,
-      266,  268,  268,  275,  271,  260,  269,  271,  272,  273,
-      274,  285,  272,  276,  270,  278,  274,  275,  273,  276,
-      277,  278,  277,  279,  280,  280,  281,  279,  282,  283,
-      284,  281,  285,  286,  282,  287,  287,  288,  289,  290,
-      288,  291,  293,  290,  279,  295,  286,  296,  284,  283,
+      238,  241,  242,  243,  246,  243,  248,  249,  250,  251,
+      244,  257,  252,  250,  248,  253,  246,  247,  252,  241,
+      254,  253,  243,  255,  256,  254,  257,  249,  255,  258,
+      256,  259,  251,  260,  261,  262,  264,  268,  263,  264,
+      266,  266,  261,  258,  263,  271,  265,  260,  265,  259,
+      267,  269,  269,  267,  272,  268,  270,  270,  277,  273,
+      262,  271,  273,  274,  275,  276,  285,  274,  278,  272,
+      280,  276,  277,  275,  278,  279,  280,  279,  281,  282,
+      282,  283,  281,  284,  286,  285,  283,  287,  288,  284,
+      289,  290,  290,  291,  292,  294,  291,  293,  296,  281,
 
-      292,  292,  294,  296,  298,  294,  289,  295,  297,  291,
-      293,  297,  300,  301,  302,  303,  298,  305,  303,  302,
-      303,  300,  294,  299,  304,  306,  307,  304,  307,  307,
-      305,  301,  299,  308,  310,  299,  303,  306,  308,  308,
-      299,  299,  299,  299,  309,  311,  312,  309,  313,  314,
-      314,  310,  317,  315,  310,  312,  319,  313,  315,  318,
-      311,  316,  316,  320,  318,  321,  322,  317,  319,  323,
-      326,  324,  324,  327,  324,  323,  335,  335,  327,  329,
-      328,  322,  320,  324,  329,  321,  328,  330,  331,  332,
-      326,  331,  330,  331,  333,  334,  336,  333,  330,  337,
+      149,  293,  298,  289,  286,  287,  295,  295,  297,  288,
+      301,  297,  292,  294,  298,  299,  296,  300,  303,  304,
+      300,  299,  301,  307,  315,  305,  307,  303,  297,  302,
+      305,  306,  308,  315,  306,  148,  306,  304,  302,  309,
+      310,  302,  310,  310,  313,  308,  302,  302,  302,  302,
+      311,  309,  306,  314,  312,  311,  311,  312,  316,  317,
+      317,  313,  319,  319,  313,  318,  320,  316,  314,  321,
+      318,  322,  323,  324,  321,  325,  326,  327,  327,  329,
+      327,  320,  326,  322,  335,  338,  338,  330,  331,  327,
+      325,  323,  330,  324,  331,  332,  333,  146,  335,  329,
 
-      337,  338,  336,  332,  334,  339,  338,  343,  339,  341,
-      333,  342,  373,  333,  339,  333,  344,  347,  339,  345,
-      347,  348,  343,  350,  373,  351,  339,  340,  340,  341,
-      340,  344,  342,  345,  351,  348,  347,  354,  350,  352,
-      355,  353,  356,  340,  352,  352,  340,  353,  340,  358,
-      340,  349,  357,  349,  349,  360,  359,  356,  354,  355,
-      361,  357,  359,  349,  362,  349,  349,  349,  358,  363,
-      349,  364,  365,  366,  367,  363,  369,  368,  362,  363,
-      361,  360,  368,  372,  370,  371,  371,  374,  376,  367,
-      370,  369,  365,  366,  364,  377,  375,  379,  379,  378,
+      332,  333,  336,  334,  337,  336,  334,  333,  334,  339,
+      340,  340,  341,  337,  344,  339,  342,  341,  336,  342,
+      346,  336,  345,  336,  144,  342,  348,  347,  350,  342,
+      351,  350,  357,  353,  344,  346,  354,  342,  343,  343,
+      348,  343,  347,  345,  351,  354,  355,  350,  353,  356,
+      358,  355,  355,  357,  343,  356,  359,  343,  360,  343,
+      361,  343,  352,  363,  352,  352,  362,  360,  364,  358,
+      365,  359,  362,  367,  352,  368,  352,  352,  352,  361,
+      366,  352,  369,  370,  365,  372,  366,  371,  364,  363,
+      366,  373,  371,  374,  374,  368,  367,  373,  370,  375,
 
-      379,  374,  375,  372,  378,  380,  381,  382,  387,  387,
-      383,  377,  384,  376,  384,  385,  386,  388,  389,  385,
-      386,  390,  381,  382,  383,  380,  391,  392,  145,  393,
-      394,  399,  384,  389,  397,  386,  388,  390,  393,  394,
-      395,  392,  396,  397,  391,  395,  396,  398,  400,  393,
-      403,  393,  399,  398,  400,  401,  402,  404,  404,  401,
-      405,  402,  406,  406,  407,  408,  409,  409,  410,  407,
-      403,  411,  412,  405,  410,  411,  413,  414,  408,  415,
-      416,  416,  414,  417,  415,  418,  419,  412,  420,  416,
-      421,  423,  422,  421,  426,  417,  422,  413,  424,  424,
+      372,  376,  369,  377,  378,  379,  380,  381,  382,  382,
+      378,  382,  381,  376,  383,  384,  385,  377,  387,  375,
+      387,  386,  380,  388,  389,  390,  390,  388,  389,  391,
+      379,  384,  385,  393,  383,  386,  392,  394,  387,  395,
+      397,  396,  399,  389,  403,  398,  397,  399,  391,  393,
+      396,  392,  400,  395,  398,  394,  400,  401,  402,  407,
+      142,  396,  404,  396,  402,  403,  401,  405,  404,  406,
+      409,  405,  408,  408,  406,  410,  410,  411,  412,  407,
+      413,  413,  411,  409,  414,  415,  416,  417,  418,  415,
+      414,  412,  419,  418,  420,  420,  422,  419,  421,  423,
 
-      420,  425,  428,  423,  419,  418,  425,  427,  427,  430,
-      430,  431,  432,  433,  434,  426,  435,  437,  438,  439,
-      432,  440,  433,  442,  428,  450,  443,  440,  435,  442,
-      441,  443,  431,  439,  434,  437,  444,  437,  438,  441,
-      445,  446,  447,  448,  446,  450,  449,  452,  445,  453,
-      444,  445,  449,  452,  451,  454,  447,  451,  448,  455,
-      454,  456,  457,  453,  458,  459,  457,  460,  461,  458,
-      462,  452,  460,  463,  466,  468,  469,  467,  476,  468,
-      459,  455,  456,  470,  461,  473,  463,  476,  143,  462,
-      464,  464,  467,  471,  466,  469,  464,  471,  464,  470,
+      424,  416,  425,  420,  429,  425,  427,  426,  417,  429,
+      421,  426,  424,  428,  428,  430,  422,  423,  427,  431,
+      431,  432,  434,  434,  435,  436,  437,  438,  439,  442,
+      441,  444,  443,  436,  447,  437,  430,  444,  446,  447,
+      439,  448,  445,  432,  446,  435,  443,  438,  441,  442,
+      441,  445,  449,  450,  451,  448,  450,  452,  453,  454,
+      449,  456,  455,  449,  453,  455,  457,  456,  451,  458,
+      459,  461,  452,  460,  458,  461,  462,  464,  463,  454,
+      457,  462,  464,  465,  466,  456,  470,  467,  473,  485,
+      508,  472,  459,  463,  460,  472,  471,  474,  475,  465,
 
-      473,  475,  472,  474,  464,  478,  464,  472,  474,  464,
-      464,  472,  477,  480,  481,  483,  464,  475,  477,  479,
-      485,  478,  479,  477,  482,  482,  484,  484,  487,  486,
-      488,  489,  490,  491,  481,  485,  480,  490,  492,  493,
-      483,  486,  491,  487,  494,  501,  496,  497,  499,  488,
-      494,  497,  498,  489,  493,  496,  500,  492,  498,  502,
-      499,  503,  504,  505,  501,  506,  507,  505,  507,  508,
-      511,  500,  513,  502,  509,  509,  503,  508,  506,  510,
-      504,  512,  511,  514,  513,  510,  514,  512,  515,  516,
-      517,  518,  519,  520,  518,  517,  638,  522,  523,  523,
+      467,   70,  475,  466,  468,  468,  470,  473,  508,  485,
+      468,  471,  468,  474,  477,  479,  476,  478,  468,  480,
+      468,  476,  478,  468,  468,  476,  481,  482,  480,  477,
+      468,  479,  481,  483,  484,  487,  483,  481,  486,  486,
+      488,  488,  490,  482,  489,  492,  491,  493,  494,  495,
+      497,  496,  518,  494,  490,  518,  498,  484,  495,  489,
+      487,  491,  498,  500,  492,  497,  503,  501,  502,  493,
+      496,  501,  500,  504,  502,  505,  506,  507,  503,  509,
+      510,  512,  511,  509,  511,  513,  513,  515,  504,  512,
+      506,  514,  507,  510,  505,  516,  517,  514,  519,  515,
 
-      521,  519,  515,  529,  516,  521,  521,  638,  519,  520,
-      522,  519,  524,  524,  525,  526,  526,  527,  527,  528,
-      525,  532,  531,  530,  529,  528,  530,  531,  533,  534,
-      535,  536,  534,  537,  538,  535,  533,  539,  538,  541,
-      532,  540,  542,  539,  543,  540,  545,  542,  546,  544,
-      548,  545,  537,  547,  536,  544,  547,  541,  549,  549,
-      550,  547,  546,  553,  543,  547,  551,  552,  548,  554,
-      556,  551,  552,  557,  563,  559,  556,  553,  550,  559,
-      558,  560,  557,  558,  554,  561,  560,  562,  561,  564,
-      563,  565,  562,  566,  567,  568,  569,  569,  565,  567,
+      520,  516,  521,  522,  523,  524,  522,  521,  517,  526,
+       64,  525,  519,  523,  533,  520,  525,  525,  527,  527,
+      523,  524,  526,  523,  528,  528,  529,  530,  530,  531,
+      531,  532,  529,  534,  535,  533,  534,  532,  536,  535,
+      537,  538,  539,  540,  538,  541,  542,  539,  537,  543,
+      542,  545,  544,  546,  547,  543,  544,  536,  546,  548,
+      550,  549,  551,  553,  541,  550,  540,  549,  555,  545,
+      547,  558,  552,  554,  554,  552,  551,  556,  557,  548,
+      552,  553,  556,  557,  552,  558,  555,  559,  561,  562,
+      563,  564,  565,  563,  561,  564,  566,  565,  562,  566,
 
-      570,  559,  571,  572,  573,  574,  566,  564,  575,  570,
-      576,  695,  581,  573,  575,  568,  576,  574,  582,  572,
-      577,  571,  695,  577,  578,  578,  579,  578,  580,  579,
-      581,  583,  582,  580,  584,  585,  591,  583,  589,  584,
-      586,  585,  587,  586,  588,  590,  592,  587,  593,  588,
-      588,  589,  592,  594,  595,  591,  591,  596,  590,  595,
-      597,  597,  594,  598,  601,  599,  600,  593,  599,  602,
-      598,  605,  600,  603,  602,  607,  601,  596,  603,  603,
-      604,  604,  606,  599,  606,  608,  609,  608,  610,  611,
-      612,  613,  614,  615,  607,  617,  605,  615,  614,  616,
+      567,  570,  559,  568,  569,  567,  572,  571,  570,  573,
+      577,  572,  574,  574,  575,  576,  578,  564,  579,  568,
+      571,  580,  569,  575,  586,  578,  577,  580,   59,  573,
+      579,  581,  582,  584,  576,  582,  584,  581,  583,  583,
+      585,  583,  586,  587,  588,  585,  589,  590,  596,  591,
+      588,  589,  591,  590,  592,  593,  594,  587,  595,  592,
+      593,  593,  598,  599,  597,  601,   54,  596,  596,  594,
+      597,  595,  599,  600,  602,  602,  603,  604,  600,  606,
+      604,  598,  605,  603,  607,  601,  610,  608,  605,  607,
+      612,  606,  608,  608,  614,  604,  609,  609,  611,  613,
 
-      618,  619,  620,  622,  609,  621,  610,  611,  616,  612,
-      617,  613,  624,  625,  623,  618,  626,  621,  622,  619,
-      623,  620,  627,  628,  629,  625,  624,  628,  630,  631,
-      632,  633,  634,  635,  635,  626,  636,  637,  639,  641,
-      636,  627,  629,  642,  630,  141,  634,  631,  632,  632,
-      633,  643,  639,  640,  644,  641,  637,  649,  640,  646,
-      645,  644,  642,  647,  643,  645,  646,  648,  647,  650,
-      651,  652,  648,  653,  654,  649,  650,  656,  655,  651,
-      656,  658,  653,  655,  657,  652,  654,  659,  657,  660,
-      662,  661,  663,  663,  666,  658,  659,  664,  664,  665,
+      611,  613,  615,  616,  617,  618,  620,  619,  621,  612,
+      620,  610,  614,  619,  622,  623,  624,  621,  625,  626,
+      615,  616,  628,  617,  627,  618,  629,  631,  628,  622,
+      623,  626,  630,  632,  624,  634,  636,  625,  633,  627,
+      629,  635,  633,  637,  630,  638,  631,  640,  640,  639,
+      642,  641,  632,  634,  636,  641,  643,  635,  644,  646,
+      645,  637,  637,  639,  638,  645,  647,  643,  648,  642,
+      649,  650,  644,  651,  652,  646,  650,  649,  653,  652,
+      651,  648,  654,  653,  655,  647,  656,  657,  658,  660,
+      659,  655,  663,  661,  660,  656,  661,  658,  664,  662,
 
-      665,  668,  669,  666,  660,  661,  664,  670,  669,  671,
-      672,  662,  673,  671,  674,  675,  676,  678,  677,  679,
-      668,  675,  672,  680,  676,  677,  683,  670,  690,  686,
-      689,  691,  674,  698,  690,  678,  692,  673,  696,  689,
-      692,  683,   70,  680,  679,  681,  686,  691,  693,  693,
-      681,  694,  694,  698,  681,  697,  696,  681,  701,  702,
-      699,  703,  704,  701,  681,  681,  699,  681,  707,  697,
-      700,  700,  700,  705,  700,  707,  705,  700,  709,  703,
-      702,   64,  700,  706,  706,  708,  708,  704,  700,  700,
-      710,  710,  711,  709,  713,  712,  715,  711,  712,  713,
+      654,  657,  659,  662,  665,  667,  663,  664,  666,  668,
+      668,  669,  669,  670,  670,  671,  673,  674,  675,  665,
+      669,  676,  666,  674,  671,  676,  667,  677,  678,  679,
+      680,  683,  681,  684,  682,  673,  680,  685,  675,  677,
+      681,  682,  694,  706,  691,  688,  695,  679,  706,  683,
+      696,  694,  695,  678,  698,  698,  701,  685,  684,  686,
+      688,  691,  700,  697,  686,  703,  696,  697,  686,  699,
+      699,  686,  702,  700,  701,  707,  704,  708,  686,  686,
+       53,  686,  704,  709,  710,  703,  702,  705,  705,  705,
+      711,  705,  715,  711,  705,  708,  707,  713,  709,  705,
 
-      714,  716,  714,  717,  718,  720,  719,  717,  715,  721,
-      721,  722,  725,  720,  723,  724,  724,  726,  727,  760,
-      716,  728,  730,  730,  718,  719,  722,  728,  723,  726,
-      725,  729,  731,  760,  733,  734,  729,  731,  731,  733,
-      727,  734,  735,  738,  736,  737,  738,  739,  735,  736,
-      740,  737,  743,  739,  741,  741,  742,  742,  740,  744,
-      743,  745,  746,  747,  748,  748,  745,  749,  751,  746,
-      750,  752,  754,  761,  751,  755,  749,  744,  750,  757,
-      756,  754,  747,  758,  755,  756,  758,  759,  757,  763,
-      752,  762,  759,  765,  765,  766,  767,  768,  761,  764,
+      712,  712,  714,  714,  713,  705,  705,  715,  717,  710,
+      716,  716,  718,  717,  719,  718,  720,  721,  720,  719,
+      722,  723,  724,  726,  725,  723,  727,  727,  732,  721,
+      728,  726,  729,  730,  730,  731,  733,  789,  734,  722,
+      732,  789,  724,  725,  734,  728,  729,  735,  736,  736,
+      737,  740,  735,  731,  739,  737,  737,  740,  733,  739,
+      741,  744,  742,  743,  744,  745,  741,  742,  746,  743,
+      749,  745,  747,  747,  748,  748,  746,  750,  749,  751,
+      752,  753,  754,  754,  751,  755,  757,  752,  756,  758,
+      760,  767,  757,  761,  755,  750,  756,  763,  762,  760,
 
-      762,  769,  763,  774,  764,  764,  768,  772,  770,  772,
-      766,  770,  773,  773,  776,  767,  775,  777,  778,  770,
-      779,  775,  781,  780,  774,  769,  782,  784,  783,  785,
-      786,  781,  783,  789,  788,  776,  786,  777,  778,  790,
-      792,  787,  779,  780,  795,  784,  788,  796,  785,  782,
-      787,  791,  789,  790,  792,  793,  796,  791,  794,  794,
-      793,  797,  798,  799,  795,  800,  801,  803,  802,  805,
-      798,  806,  804,  803,  807,  805,  808,  810,  811,  812,
-      807,  797,  808,  799,  812,  801,  804,  800,  802,  809,
-      811,  806,  813,  809,  814,  814,  810,  815,  811,  816,
+      753,  764,  761,  762,  764,  765,  763,  766,  758,  768,
+      765,  769,  771,  771,  770,  772,  767,  773,  768,  770,
+      770,  766,  774,  776,  769,  778,  776,  778,  779,  779,
+      772,  774,  780,  781,  776,  782,  773,  783,  781,  784,
+      785,  786,  787,  788,  792,  790,  791,   48,  794,  793,
+      792,  787,  795,  780,  796,  798,  782,  783,  793,  784,
+      794,  786,  785,  790,  797,  791,  788,  799,  796,  798,
+      797,  795,  799,  800,  800,  801,  802,  803,  804,  805,
+      806,  807,  809,  808,  810,  802,  804,  811,  809,  812,
+      813,  816,  819,  811,  817,  801,  813,  803,  810,  805,
 
-      817,  818,  816,  815,  819,  820,  821,  821,  822,  825,
-      819,  823,  828,  813,  818,  829,  823,  826,  817,  824,
-      824,  826,  827,  827,  825,  820,  822,  830,  831,  833,
-      834,  836,  830,  837,  828,  829,  839,  839,  840,  842,
-      842,  841,  840,  843,  834,  844,  845,  831,  846,  844,
-      852,  836,  847,  833,  837,  838,  841,  847,  838,  848,
-      838,  845,  846,  850,  838,  852,  838,  854,  843,  849,
-      856,  838,  857,  848,  849,  849,  838,  850,  851,  854,
-      853,  855,  851,  858,  856,  853,  855,  862,  862,  865,
-      859,  866,  860,  857,  851,  853,  859,  858,  860,  861,
+      807,  814,  806,  808,  815,  823,  817,  814,  815,  812,
+      816,  818,  824,  819,  817,  821,  818,  820,  820,  822,
+      825,  821,  822,  823,  826,  824,  825,  827,  827,  828,
+      829,  830,  830,  831,  832,  829,  833,  833,  832,  834,
+      835,  836,  839,  837,  826,  840,  836,  828,  831,  842,
+      843,  845,  845,  846,  849,  847,  896,  846,  851,  840,
+      835,  834,  837,  848,  848,  896,  839,   43,  852,  842,
+      847,  843,  844,  851,  850,  844,  854,  844,  850,  849,
+      853,  844,  852,  844,  856,  853,  855,  858,  844,  859,
+      854,  855,  855,  844,  859,  857,  860,  863,  856,  857,
 
-      867,  863,  864,  869,  870,  861,  863,  871,  864,  870,
-      866,  865,  872,  873,  873,  869,  876,  874,  867,  868,
-      868,  871,  874,  875,  872,  868,   59,  868,  877,  878,
-      876,  875,  880,  868,  879,  879,  880,  882,  868,  868,
-      884,  883,  885,  882,  883,  868,  886,  877,  878,  887,
-      888,  889,  886,  890,  887,  885,  891,  892,  893,  884,
-      889,  894,  890,  892,  896,  895,  898,  893,  897,  888,
-      895,  899,  891,  902,  903,  904,  900,  906,  901,  902,
-      894,  904,  897,  899,  896,  900,  898,  901,  908,  909,
-      911,  903,  910,  906,  912,  913,  914,  919,  915,  924,
+      861,  862,  858,  864,  859,  861,  865,  866,  860,  869,
+      867,  857,  865,  866,  869,  862,  867,  864,  863,  868,
+      868,  870,  871,  872,  875,  873,  876,  870,  878,  879,
+      879,  876,  880,  877,  882,  883,  875,  880,  884,  892,
+      878,  881,  872,  873,  871,  874,  874,  877,  882,  881,
+      885,  874,  892,  874,  883,  886,  886,  884,  887,  874,
+      889,  891,  887,  893,  874,  874,  889,  890,  885,  893,
+      890,  874,  894,  895,  897,  898,  899,  894,  900,  901,
+      891,  902,  899,  897,  903,  904,  902,  900,  905,  906,
+      909,  898,  895,  907,  908,  910,  909,  913,  901,  904,
 
-      918,  914,  908,  915,  911,  918,  919,  920,  920,  909,
-      913,  910,  912,  921,  922,  924,  925,  927,  928,  921,
-      927,  925,  925,  929,  926,  926,  930,  922,  926,  931,
-      932,  933,  928,  934,  935,  936,  937,  933,  938,  941,
-      935,  937,  931,  929,  930,  932,  940,  944,   54,  940,
-      936,  942,  938,  934,  943,  947,  942,  945,  949,  943,
-      941,  946,  945,  944,  949,  950,  946,  947,  951,  952,
-      953,  953,  955,  954,  951,  952,  956,  957,  957,  956,
-      958,  950,  954,  959,  960,  961,  962,  963,  961,  964,
-      955,  965,  966,  963,  970,  964,  965,  966,  958,  962,
+      911,  906,  907,  908,  903,  915,  911,  916,  905,  917,
+      918,  919,  910,  913,  928,  920,  921,  922,  925,  915,
+      928,  921,  922,  925,  918,  926,  929,  916,  917,  919,
+      920,  927,  927,  931,  926,  932,  935,  936,  937,  929,
+      932,  932,  933,  933,  934,  938,  933,  934,  939,  931,
+      935,  941,  943,  940,  942,  945,  937,  936,  938,  940,
+      942,  944,  947,  939,  948,  947,  944,  943,  949,  945,
+      950,  941,  951,  949,  952,  950,  953,  954,  956,  952,
+      957,  953,  960,  960,  956,  948,  958,  959,  951,  954,
+      961,  962,  958,  959,  963,  965,  957,  963,  966,  961,
 
-      967,  968,  959,  971,  960,  967,  973,  968,  972,  974,
-      974,  973,  970,  975,  972,  976,  977,  978,  979,  980,
-      978,  979,  975,  971,  976,  981,  982,  983,  987,  984,
-      980,  985,  986,  987,  977,  984,  989,  985,  982,  988,
-      988,  991,  990,  981,  992,  993,  983,  986,  992,  994,
-      995,  996,  998,  991, 1001,  989,  990, 1002,  994,  999,
-      999, 1003, 1004,  993, 1007, 1005, 1013, 1004, 1001,  995,
-       53,  998, 1002, 1003, 1005, 1008,  996, 1006, 1006, 1009,
-     1013, 1008, 1010, 1014, 1007, 1009, 1011, 1010, 1011, 1012,
-     1015, 1016, 1017, 1018, 1012, 1015, 1020, 1014, 1019, 1025,
+      964,  964,  967,  968,  970,  969,  968,  972,  971,  962,
+      970,  973,  972,  965,  971,  974,  973,  966,  969,  975,
+      974,  977,  967,  978,  979,  975,  980,  981,  981,  982,
+      979,  980,  983,  984,  985,  987,  988,  985,  982,  977,
+      989,  983,  986,  978,  990,  986,  987,  991,  996,  992,
+      993,  984,  989,  991,  988,  992,  994,  995,  995,  997,
+      998,  994,  999,  990, 1000,  993,  999,  996, 1001, 1002,
+     1003, 1005,  998,  997, 1006, 1006, 1009, 1001, 1008, 1011,
+     1012, 1010, 1000, 1014, 1011, 1013, 1013,   14, 1002, 1012,
+     1005, 1009, 1008, 1010, 1015, 1003, 1016, 1020, 1021, 1017,
 
-     1018, 1022, 1022, 1023, 1024, 1027, 1016, 1028, 1030, 1030,
-     1026, 1017, 1028, 1019, 1025, 1020, 1026, 1023, 1034, 1031,
-     1036, 1028, 1024, 1028, 1031, 1027, 1028, 1032, 1032, 1033,
-     1035, 1037, 1034, 1035, 1038, 1039, 1033, 1040, 1043, 1036,
-     1039, 1041, 1042, 1038, 1045, 1045, 1041, 1046, 1048, 1037,
-     1047, 1051, 1046, 1042, 1049, 1047, 1040, 1043, 1050, 1049,
-     1051, 1052, 1050, 1053, 1054, 1055, 1056, 1057, 1048, 1059,
-     1058, 1060, 1061, 1062, 1057, 1069, 1052, 1055, 1053, 1062,
-     1063, 1056, 1058, 1054, 1064, 1065, 1070, 1066, 1059, 1069,
-     1061, 1068, 1060, 1071, 1070, 1063, 1066, 1068, 1072, 1073,
+     1015, 1019, 1016, 1014, 1017, 1018, 1019, 1018, 1022, 1023,
+     1024, 1020, 1021, 1022, 1025, 1026, 1027, 1029, 1029, 1030,
+     1031, 1025, 1032, 1034, 1023, 1033, 1037, 1037, 1041, 1024,
+     1026, 1033, 1043, 1030, 1035, 1027, 1038, 1032, 1031, 1035,
+     1040, 1038, 1041, 1034, 1039, 1039, 1042, 1040, 1035, 1042,
+     1035, 1043, 1044, 1035, 1045, 1046, 1047, 1048, 1049, 1050,
+     1046, 1053, 1048, 1045, 1052, 1052, 1053, 1054, 1055, 1049,
+     1044, 1056, 1054, 1057, 1058, 1047, 1056, 1057, 1050, 1059,
+     1060, 1061, 1063, 1058, 1062, 1064, 1065, 1066, 1055, 1067,
+     1068, 1071, 1064, 1069, 1059, 1060, 1062, 1063, 1065, 1069,
 
-     1075, 1074, 1076, 1072, 1064, 1065, 1074, 1074, 1077, 1078,
-     1078, 1073, 1080, 1071, 1081, 1084, 1076, 1085, 1082, 1075,
-     1084, 1077, 1079, 1081, 1082, 1080, 1085, 1079, 1083, 1083,
-     1079, 1079, 1086, 1090, 1087, 1079, 1093, 1088, 1086, 1087,
-     1094, 1079, 1088, 1089, 1089, 1079, 1091, 1091, 1092, 1096,
-     1095, 1092, 1097, 1092, 1090, 1099, 1093, 1097, 1094, 1095,
-     1098, 1100, 1101, 1104, 1134, 1102, 1134, 1100, 1101, 1096,
-     1102, 1103, 1104, 1099, 1098, 1103, 1111, 1104, 1109, 1104,
-     1107, 1104, 1109, 1104, 1105, 1105, 1106, 1106, 1110, 1106,
-     1112, 1107, 1113, 1114, 1111, 1115, 1116, 1113, 1113, 1112,
+     1061, 1070, 1072, 1073, 1074, 1077, 1066, 1076, 1068, 1078,
+     1067, 1071, 1073, 1076, 1079, 1080, 1070, 1078, 1081, 1077,
+     1080, 1082, 1072, 1083, 1074, 1084, 1082, 1082, 1085, 1089,
+     1081, 1086, 1086, 1088, 1079, 1091, 1091,   13, 1089, 1084,
+     1092, 1085, 1083, 1087, 1090, 1092, 1088, 1094, 1087, 1093,
+     1090, 1087, 1087, 1094, 1095, 1096, 1087, 1098, 1093, 1095,
+     1096, 1101, 1087, 1097, 1097, 1102, 1087, 1099, 1099, 1100,
+     1103, 1104, 1100, 1106, 1100, 1105, 1107,    0, 1098, 1103,
+     1105, 1101, 1108, 1102, 1109, 1111, 1112, 1106, 1108, 1111,
+     1109, 1104, 1110, 1122, 1107, 1112, 1118, 1110, 1113, 1113,
 
-     1115, 1118, 1117, 1110, 1119, 1120, 1121, 1122, 1122, 1123,
-     1116, 1117, 1121, 1124, 1126, 1114, 1125, 1123, 1128, 1120,
-     1118, 1125, 1127, 1119, 1129, 1130, 1132, 1124, 1126, 1138,
-     1130, 1127, 1131, 1131, 1133, 1133, 1128, 1136, 1137, 1141,
-     1136, 1132, 1139, 1137, 1140, 1140, 1142, 1142, 1138, 1129,
-     1144, 1139, 1143, 1143, 1145, 1144, 1146, 1147, 1147, 1141,
-     1148, 1149, 1150, 1151, 1149, 1152, 1154, 1153, 1151, 1153,
-     1156, 1157,   48, 1156, 1152, 1145, 1158, 1146, 1159, 1160,
-     1148, 1158, 1150, 1159, 1154, 1161, 1157, 1160, 1162, 1164,
-     1161, 1163, 1163, 1162, 1164, 1165, 1166, 1167, 1168, 1170,
+     1112, 1115, 1112, 1119, 1112, 1117, 1112, 1114, 1114, 1117,
+     1114, 1118, 1115, 1120, 1121, 1122, 1124, 1125, 1123, 1121,
+     1121, 1119, 1120, 1123, 1126, 1127, 1125, 1128, 1129, 1131,
+     1124, 1130, 1130, 1132, 1129, 1133, 1134, 1131, 1136, 1135,
+     1133, 1128, 1137, 1126, 1127, 1140, 1138, 1132, 1135, 1149,
+     1134, 1138, 1139, 1139, 1141, 1141, 1136, 1142, 1144, 1142,
+     1140, 1144, 1146, 1145, 1147, 1148, 1148, 1137, 1145, 1149,
+     1150, 1150, 1152, 1147, 1151, 1151, 1153, 1152, 1154, 1155,
+     1155, 1146, 1156, 1157, 1158, 1159, 1157, 1160, 1162, 1161,
+     1159, 1161, 1164, 1165,    0, 1164, 1160, 1153, 1166, 1154,
 
-     1171, 1173, 1166, 1172, 1167, 1170, 1171, 1173, 1172, 1174,
-     1175, 1168, 1176, 1165, 1177, 1177, 1178, 1180, 1174, 1181,
-     1182, 1183, 1184, 1176, 1186, 1187, 1182, 1183, 1184, 1175,
-     1186, 1188, 1189, 1190, 1191, 1193, 1178, 1180, 1194, 1187,
-     1192, 1192, 1181, 1195, 1189, 1187, 1198, 1190, 1196, 1197,
-     1197, 1188, 1191, 1196, 1199, 1193, 1201,   43, 1203, 1199,
-     1202, 1195, 1204, 1194, 1205, 1202, 1202, 1206, 1207, 1198,
-     1208, 1204, 1205, 1211, 1209, 1201, 1203, 1217, 1210, 1209,
-     1210, 1206, 1209, 1207, 1213, 1208, 1215, 1211, 1208, 1214,
-     1213, 1218, 1219, 1214, 1216, 1221, 1217, 1215, 1220, 1216,
+     1167, 1168, 1156, 1166, 1158, 1167, 1162, 1169, 1165, 1168,
+     1170, 1172, 1169, 1171, 1171, 1170, 1172, 1173, 1174, 1175,
+     1176, 1178, 1179, 1181, 1174, 1180, 1175, 1178, 1179, 1181,
+     1180, 1182, 1183, 1176, 1184, 1173, 1185, 1185, 1186, 1188,
+     1182, 1189, 1190, 1191, 1192, 1184, 1194, 1195, 1190, 1191,
+     1192, 1183, 1194, 1196, 1197, 1198, 1199, 1201, 1186, 1188,
+     1202, 1195, 1200, 1200, 1189, 1203, 1197, 1195, 1206, 1198,
+     1204, 1205, 1205, 1196, 1199, 1204, 1207, 1201, 1209,    0,
+     1211, 1207, 1210, 1203, 1212, 1202, 1213, 1210, 1210, 1214,
+     1215, 1206, 1216, 1212, 1213, 1219, 1217, 1209, 1211, 1225,
 
-     1216, 1222, 1223, 1220, 1225, 1226, 1222, 1227, 1228, 1228,
-     1219, 1229, 1230, 1221, 1231, 1229, 1233, 1218, 1225, 1234,
-     1232, 1235, 1223, 1226, 1236, 1227, 1232, 1237, 1233, 1238,
-     1230, 1239, 1241, 1231, 1240, 1235, 1239, 1241, 1234, 1236,
-     1242, 1240, 1237, 1243, 1244, 1244, 1245, 1246, 1238, 1247,
-     1248, 1249, 1243, 1246, 1250, 1248, 1257, 1249, 1242, 1258,
-     1250, 1245, 1251, 1251, 1252, 1252, 1254, 1254, 1255, 1256,
-     1247, 1259, 1255, 1258, 1257, 1260, 1261, 1261, 1256, 1262,
-     1263, 1265, 1260, 1266, 1264, 1267, 1259, 1268, 1263, 1264,
-     1267, 1267, 1268, 1268, 1269, 1265, 1270, 1270, 1271, 1262,
+     1218, 1217, 1218, 1214, 1217, 1215, 1221, 1216, 1223, 1219,
+     1216, 1222, 1221, 1226, 1227, 1222, 1224, 1229, 1225, 1223,
+     1228, 1224, 1224, 1230, 1231, 1228, 1233, 1234, 1230, 1235,
+     1236, 1236, 1227, 1237, 1238, 1229, 1239, 1237, 1241, 1226,
+     1233, 1242, 1240, 1243, 1231, 1234, 1244, 1235, 1240, 1245,
+     1241, 1246, 1238, 1247, 1249, 1239, 1248, 1243, 1247, 1249,
+     1242, 1244, 1250, 1248, 1245, 1251, 1252, 1252, 1253, 1255,
+     1246, 1254, 1254, 1256, 1251, 1255, 1257, 1266, 1258, 1259,
+     1250, 1257,    0, 1253, 1258, 1259, 1260, 1260, 1261, 1261,
+     1263, 1263, 1264, 1265, 1256, 1266, 1264, 1267, 1268, 1269,
 
-     1272, 1273, 1266, 1274, 1275, 1276, 1277, 1278, 1274, 1280,
-     1273, 1279, 1281, 1278, 1269, 1282, 1279, 1271, 1281, 1272,
-     1283, 1284, 1285, 1275, 1277, 1276, 1283, 1284, 1286, 1287,
-     1288, 1289, 1290,   14, 1282, 1280, 1291, 1292, 1292, 1293,
-     1294, 1285, 1293, 1295, 1295, 1289, 1298, 1286, 1287, 1288,
-     1298, 1291, 1294, 1290, 1296, 1296, 1297, 1299, 1300, 1301,
-     1302, 1297, 1302, 1304, 1306, 1305, 1302, 1300, 1304, 1307,
-     1299, 1309, 1301, 1308, 1308, 1310, 1309, 1311, 1312, 1302,
-     1305, 1310, 1313, 1316, 1306, 1307, 1314, 1313, 1317, 1315,
-     1314, 1312, 1311, 1315, 1318, 1319, 1320, 1320, 1322, 1324,
+     1270, 1270, 1265, 1271, 1272, 1273, 1269, 1274, 1275, 1276,
+     1273, 1267, 1272, 1268, 1276, 1276, 1278, 1279, 1279, 1277,
+     1280, 1274, 1281, 1271, 1277, 1277, 1282, 1275, 1283, 1284,
+     1285, 1286, 1287, 1283, 1289, 1282, 1278, 1288, 1287, 1280,
+     1290, 1281, 1288, 1291, 1294, 1292, 1290, 1293, 1284, 1286,
+     1285, 1292, 1295, 1293, 1296, 1297, 1298, 1299, 1301, 1301,
+     1289, 1300, 1291, 1294, 1302, 1303, 1309, 1302, 1304, 1304,
+     1298, 1295, 1308, 1296, 1297, 1309, 1300, 1303, 1299, 1305,
+     1305, 1306, 1310, 1307, 1313, 1308, 1306, 1307, 1311, 1313,
+     1311, 1314, 1315, 1316, 1311, 1310, 1317, 1317, 1318, 1319,
 
-     1325, 1319, 1328, 1316, 1327, 1325, 1317, 1326, 1326, 1334,
-     1327, 1330, 1330, 1335, 1318, 1332, 1322, 1338, 1332, 1339,
-     1324, 1341, 1328, 1333, 1333, 1334, 1342, 1337, 1339, 1335,
-     1337, 1340, 1340, 1343, 1344, 1345, 1341, 1338, 1347, 1344,
-     1346, 1346, 1348, 1349, 1350, 1350, 1351, 1342, 1352, 1345,
-     1353, 1357, 1343, 1359, 1354, 1353, 1347, 1348, 1355, 1355,
-     1351, 1356, 1358, 1358, 1362, 1356, 1352, 1360, 1349, 1354,
-     1361, 1357, 1363, 1366, 1361, 1359, 1367, 1363, 1360, 1365,
-     1365, 1368, 1369, 1362, 1370, 1371, 1371, 1372, 1373, 1375,
-     1367, 1366, 1372, 1374, 1376, 1377, 1369, 1380, 1375, 1376,
+     1320, 1321, 1325, 1318, 1327, 1319, 1314, 1311, 1322, 1316,
+     1326, 1331, 1315, 1322, 1321, 1320, 1323, 1324, 1333, 1328,
+     1323, 1324, 1325, 1337, 1327, 1328, 1329, 1329, 1326, 1331,
+     1334, 1335, 1335, 1343, 1336, 1334, 1339, 1339, 1341, 1333,
+     1336, 1341, 1344, 1337, 1342, 1342, 1347, 1346, 1348, 1343,
+     1346, 1349, 1349, 1350, 1351, 1352, 1353, 1348, 1344, 1354,
+     1356, 1353, 1355, 1355, 1357, 1358, 1347, 1360, 1350, 1359,
+     1359, 1361, 1362, 1354, 1352, 1351, 1363, 1362, 1356, 1357,
+     1365, 1360, 1364, 1364, 1365, 1366, 1367, 1367, 1368, 1361,
+     1358, 1363, 1369, 1370, 1371, 1372, 1375, 1370, 1374, 1374,
 
-     1368, 1368, 1378, 1380, 1378, 1379, 1381, 1384, 1373, 1370,
-     1379, 1382, 1386, 1374, 1387, 1377, 1390, 1382, 1385, 1385,
-     1387, 1384, 1389, 1391, 1391, 1393, 1381, 1389, 1392, 1392,
-     1394, 1386, 1395, 1396, 1397, 1397, 1396, 1398, 1399, 1393,
-     1390, 1402, 1407, 1411, 1411, 1401, 1402, 1395, 1394, 1398,
-     1400, 1401, 1403, 1400, 1405, 1403, 1400, 1406, 1399, 1409,
-     1413, 1408, 1406, 1405, 1408, 1409, 1413, 1407, 1400, 1410,
-     1414, 1403, 1412, 1412, 1410, 1414, 1415, 1416, 1417, 1418,
-     1419, 1420, 1421, 1419, 1424, 1422, 1423, 1420, 1421, 1415,
-     1422, 1425, 1423, 1426, 1426, 1416, 1425, 1417, 1427, 1418,
+     1372, 1376, 1377, 1369, 1378, 1366, 1379, 1380, 1380, 1382,
+     1368, 1381, 1383, 1371, 1375, 1376, 1381, 1384, 1378, 1385,
+     1386, 1377, 1377, 1387, 1385, 1387, 1384, 1390, 1388, 1382,
+     1389, 1379, 1383, 1388, 1393, 1391, 1389, 1394, 1394, 1395,
+     1386, 1391, 1399, 1396, 1403, 1398, 1402, 1390, 1393, 1396,
+     1398, 1400, 1400, 1401, 1401, 1404, 1405, 1407, 1395, 1405,
+     1402, 1408, 1403, 1406, 1406, 1409, 1399, 1410, 1409, 1407,
+     1404, 1409, 1411, 1410, 1415, 1412, 1414, 1411, 1412, 1415,
+     1416, 1408, 1418, 1409, 1417, 1414, 1419, 1417, 1418, 1420,
+     1420, 1419, 1421, 1421, 1412, 1422, 1424, 1423, 1425, 1426,
 
-     1428, 1429, 1430, 1427, 1433, 1431, 1432, 1424, 1435, 1436,
-     1434, 1437, 1438, 1439, 1435, 1442, 1433, 1447, 1428, 1431,
-     1432, 1429, 1430, 1434, 1441, 1441, 1438, 1443, 1445, 1436,
-     1446, 1437, 1443, 1448, 1439, 1442, 1444, 1444, 1449, 1450,
-     1453, 1447, 1451, 1445, 1446, 1455, 1452, 1449, 1457, 1451,
-     1458, 1448, 1462, 1458, 1450, 1452, 1453, 1461, 1452, 1465,
-     1455, 1459, 1459, 1460, 1460, 1455, 1464, 1464, 1463, 1461,
-     1462, 1463, 1465, 1457, 1466, 1467, 1468, 1469, 1470, 1471,
-     1467, 1468, 1472, 1473, 1475, 1476, 1476, 1477, 1471, 1474,
-     1475, 1478, 1473, 1466, 1470, 1473, 1469, 1479, 1474, 1480,
+     1427, 1422, 1423, 1428, 1429, 1416, 1428, 1430, 1432, 1424,
+     1429, 1433, 1431, 1430, 1432, 1437, 1425, 1431, 1426, 1434,
+     1427, 1435, 1435, 1436, 1434, 1438, 1439, 1440, 1436, 1441,
+     1443, 1444, 1445, 1437, 1433, 1446, 1447, 1448, 1445, 1449,
+     1457, 1440, 1443, 1441, 1444, 1438, 1439, 1451, 1451, 1452,
+     1455, 1448, 1453, 1454, 1454, 1446, 1447, 1453, 1456, 1458,
+     1449, 1459, 1462, 1460, 1457, 1455, 1461, 1463, 1467, 1452,
+     1459, 1462, 1456, 1461, 1462, 1465, 1468, 1458, 1460, 1468,
+     1469, 1469, 1471, 1463, 1470, 1470, 1472, 1475, 1473, 1476,
+     1465, 1473, 1479, 1467, 1471, 1465, 1474, 1474, 1477, 1480,
 
-     1481, 1472, 1482, 1485, 1478, 1486, 1488, 1477, 1487, 1487,
-     1489, 1493, 1490, 1480, 1482, 1479, 1481, 1490, 1492, 1489,
-     1491, 1491, 1488, 1486, 1494, 1495, 1496, 1492, 1485, 1493,
-     1492, 1496, 1496, 1498, 1499, 1491, 1500, 1501, 1502, 1503,
-     1504, 1504, 1501, 1495, 1502, 1494, 1505, 1498, 1506, 1499,
-     1507, 1510, 1505, 1506, 1508, 1511, 1507, 1503, 1500, 1512,
-     1508, 1513, 1515, 1514, 1519, 1512, 1514, 1517, 1515, 1511,
-     1520, 1510, 1514, 1521, 1513, 1517, 1522, 1523, 1524, 1525,
-     1526, 1521, 1528, 1519, 1530, 1522, 1527, 1527, 1528, 1520,
-     1523, 1524, 1529, 1525, 1526, 1531, 1532, 1530, 1529, 1533,
+     1475, 1478, 1482, 1477, 1472, 1481, 1478, 1483, 1476, 1484,
+     1487, 1479, 1486, 1486, 1481, 1480, 1483, 1485, 1484, 1483,
+     1488, 1482, 1489, 1485, 1490, 1491, 1495, 1492, 1496, 1498,
+     1487, 1497, 1497, 1488, 1499, 1501, 1501, 1500, 1490, 1492,
+     1489, 1491, 1500, 1499, 1502, 1498, 1496, 1503, 1504, 1505,
+     1501, 1495, 1506, 1502, 1508, 1509, 1502, 1506, 1506, 1510,
+     1513, 1511, 1514, 1514, 1520, 1503, 1511, 1505, 1508, 1504,
+     1509, 1512, 1521, 1515, 1523, 1516, 1517, 1512, 1513, 1515,
+     1516, 1510, 1517, 1518, 1520, 1522, 1521, 1523, 1525, 1518,
+     1524, 1522, 1527, 1524, 1525, 1529, 1530, 1531, 1532, 1524,
 
-     1534, 1535, 1536, 1537, 1538, 1540, 1540, 1535, 1527, 1541,
-     1547,   13, 1542, 1534, 1532, 1531, 1542, 1549, 1533, 1537,
-     1543, 1544, 1538, 1545, 1536, 1543, 1544, 1546, 1545, 1541,
-     1550, 1550, 1549, 1547, 1551, 1552, 1546, 1553, 1554, 1554,
-     1555, 1556, 1559, 1557, 1560, 1558, 1561, 1552, 1556, 1563,
-     1562, 1654, 1561, 1551, 1555, 1557, 1553, 1558, 1654, 1564,
-     1566, 1559, 1562, 1566, 1560, 1564, 1570, 1563, 1565, 1565,
-     1567, 1567, 1569, 1571, 1573, 1570, 1574, 1569, 1574, 1571,
-     1572, 1572, 1575, 1576, 1577, 1575, 1573, 1578, 1580, 1579,
-     1581, 1584, 1582, 1580, 1583, 1586, 1584, 1588, 1592, 1581,
+     1527, 1537, 1537, 1533, 1534, 1531, 1535, 1532, 1536, 1541,
+     1542, 1540, 1538, 1539, 1529, 1530, 1533, 1534, 1538, 1539,
+     1535, 1543, 1536, 1537, 1540, 1544, 1545, 1546, 1542, 1541,
+     1547,    0, 1545, 1548, 1550, 1550, 1551, 1552, 1544, 1553,
+     1543, 1552, 1554, 1555, 1553, 1556, 1547, 1554, 1555, 1546,
+     1557, 1548, 1559, 1561, 1556, 1563, 1551, 1560, 1560, 1562,
+     1564, 1564, 1565, 1566, 1569, 1567, 1568, 1559, 1570, 1571,
+     1566, 1562, 1561, 1557, 1563, 1571, 1565, 1567, 1568, 1572,
+     1573, 1574,    0, 1569, 1575, 1575, 1576, 1574, 1570, 1576,
+     1579, 1572, 1577, 1577, 1580, 1579, 1581, 1583, 1573, 1582,
 
-        0, 1585, 1588, 1576, 1582, 1578, 1577, 1579, 1587, 1583,
-     1585, 1589, 1591, 1587, 1593, 1586, 1590, 1590, 1591, 1592,
-     1587, 1594, 1595, 1585, 1597, 1596, 1589, 1596, 1598, 1598,
-     1599, 1599, 1601, 1593, 1600, 1600, 1604, 1594, 1597, 1605,
-     1597, 1612, 1595, 1602, 1602, 1603, 1603, 1606, 1606, 1607,
-     1608, 1609, 1601, 1607, 1609, 1611, 1608, 1604, 1613, 1612,
-     1605, 1611, 1614, 1615, 1613, 1618, 1615, 1616, 1616, 1617,
-     1617, 1618, 1619, 1620, 1621, 1622, 1623, 1625, 1626, 1632,
-     1629, 1622, 1625, 1625, 1619, 1619, 1619, 1614, 1627, 1628,
-     1627, 1619, 1626, 1620, 1621, 1629, 1623, 1630, 1631, 1632,
+     1582, 1586, 1581, 1580, 1584, 1585, 1584, 1587, 1585, 1583,
+     1588, 1590, 1589, 1591, 1592, 1594, 1590, 1593, 1595, 1596,
+     1594, 1586, 1591, 1600, 1600, 1602, 1592, 1595, 1588, 1587,
+     1589, 1597, 1593, 1598, 1599, 1601, 1597, 1603, 1598, 1596,
+     1595, 1601, 1604, 1597, 1605, 1606, 1602, 1606, 1611, 1599,
+     1614, 1607, 1608, 1608, 1609, 1609, 1603, 1615, 1604, 1610,
+     1610, 1612, 1612, 1619, 1605, 1607, 1619, 1607, 1611, 1613,
+     1613, 1614, 1616, 1616, 1618, 1617, 1621, 1622, 1615, 1617,
+     1618, 1623, 1621, 1624, 1629, 1625, 1630, 1623, 1625, 1626,
+     1626, 1627, 1627, 1628, 1631, 1622, 1629, 1629, 1629, 1628,
 
-     1628, 1633, 1635, 1630, 1634, 1634, 1637, 1631, 1636, 1636,
-     1638, 1639, 1639, 1640, 1640, 1641, 1644, 1644, 1645, 1649,
-     1646, 1648, 1633, 1651, 1651, 1650, 1637, 1652, 1635, 1646,
-     1648, 1650, 1638, 1655, 1653, 1641, 1656, 1657, 1657, 1658,
-     1649, 1659, 1655, 1645, 1663, 1661, 1662, 1664, 1652, 1653,
-     1661, 1668, 1662, 1665, 1664, 1666, 1668, 1659, 1670, 1665,
-     1669, 1666, 1656, 1671, 1663, 1658, 1667, 1667, 1672, 1669,
-     1673, 1674, 1675, 1673, 1676, 1676, 1678, 1677, 1670, 1679,
-     1672, 1680, 1671, 1677, 1682, 1680, 1683, 1684, 1686, 1674,
-     1685, 1685, 1684, 1689, 1679, 1687, 1678, 1697, 1675, 1690,
+     1633, 1632, 1636, 1629, 1635, 1642, 1630, 1632, 1624, 1635,
+     1635, 1637, 1638, 1637, 1631, 1639, 1636, 1641, 1640, 1643,
+     1633, 1644, 1644, 1638, 1640, 1642, 1641, 1645, 1646, 1646,
+     1639, 1647, 1648, 1649, 1649, 1650, 1650, 1651, 1654, 1654,
+     1643, 1655, 1659, 1656, 1660, 1663, 1658, 1661, 1661, 1662,
+     1660, 1647, 1656, 1645, 1648, 1658, 1666, 1651, 1664, 1665,
+     1663, 1667, 1667, 1659, 1668, 1664, 1655, 1669, 1665, 1671,
+     1662, 1672, 1673, 1674, 1671, 1675, 1681, 1672, 1676, 1680,
+     1674, 1675, 1666, 1669, 1676, 1677, 1677, 1679, 1678, 1682,
+     1668, 1683, 1673, 1678, 1683, 1681, 1679, 1684, 1685, 1680,
 
-     1691, 1680, 1692, 1690, 1682, 1694, 1691, 1686, 1683, 1694,
-     1687, 1692, 1689, 1693, 1693, 1695, 1696, 1696, 1697, 1698,
-     1699, 1701, 1700, 1702, 1703, 1704, 1695, 1700, 1708, 1705,
-     1703, 1695, 1708, 1698, 1705, 1706, 1706, 1707, 1707, 1699,
-     1704, 1701, 1710, 1702, 1711, 1712, 1713, 1713, 1714, 1714,
-     1716, 1710, 1715, 1717, 1718, 1711, 1716, 1715, 1715, 1717,
-     1711, 1719, 1720, 1721, 1723, 1712, 1719, 1724, 1726, 1721,
-     1725, 1724, 1727, 1728, 1720, 1729, 1723, 1730, 1727, 1732,
-     1718, 1729, 1725, 1733, 1736, 1734, 1740, 1736, 1741, 1730,
-     1734, 1732, 1750, 1726, 1741, 1728, 1737, 1737, 1738, 1738,
+     1687, 1682, 1686, 1686, 1689, 1688, 1687, 1690, 1692, 1693,
+     1696, 1690, 1694, 1695, 1695, 1684, 1699, 1694, 1697, 1689,
+     1703, 1703, 1700, 1702, 1685, 1688, 1700, 1690, 1692, 1696,
+     1701, 1693, 1702, 1697, 1704, 1699, 1701, 1705, 1704, 1706,
+     1706, 1707, 1708, 1713, 1709, 1710, 1711, 1712, 1705, 1713,
+     1710, 1718, 1715, 1705, 1714, 1718, 1708, 1715, 1716, 1716,
+     1717, 1717, 1707, 1709, 1720, 1721, 1711, 1712, 1722, 1714,
+     1723, 1723, 1725, 1720, 1724, 1724, 1721, 1725, 1725, 1726,
+     1727, 1721, 1728, 1730, 1729, 1726, 1727, 1731, 1722, 1729,
+     1733, 1735, 1734, 1731, 1736, 1730, 1734, 1740, 1737, 1738,
 
-     1739, 1739, 1733, 1742, 1750, 1743, 1740, 1744, 1745, 1742,
-     1743, 1747, 1749, 1744, 1753, 1749, 1747, 1745, 1751, 1751,
-     1754, 1757, 1755, 1756, 1756, 1761, 1753, 1755, 1758, 1759,
-     1757, 1762, 1754, 1758, 1759, 1760, 1760, 1763, 1764, 1765,
-     1762, 1766, 1767, 1765, 1768, 1761, 1766, 1769, 1767, 1770,
-     1771, 1773, 1773, 1774, 1778, 1763, 1769, 1764, 1779, 1775,
-     1776, 1776, 1768, 1773, 1771, 1777, 1778, 1770, 1775, 1781,
-     1780, 1774, 1784, 1784, 1777, 1780, 1787, 1786, 1788, 1779,
-     1786, 1790, 1781, 1791, 1792, 1793, 1794, 1794, 1799, 1795,
-     1792, 1795, 1787, 1797, 1788, 1799, 1790, 1791, 1796, 1796,
+     1739, 1742, 1733, 1735, 1737, 1743, 1739, 1744, 1728, 1740,
+     1750, 1746, 1744, 1742, 1746, 1747, 1747, 1748, 1748, 1736,
+     1751, 1738, 1749, 1749, 1743, 1752, 1751, 1753, 1754, 1755,
+     1750, 1752, 1753, 1759, 1754, 1757, 1759, 1760, 1755, 1763,
+     1757, 1761, 1761, 1764, 1767, 1765, 1766, 1766, 1771, 1760,
+     1765, 1763, 1768, 1767, 1769, 1764, 1772, 1768, 1773, 1769,
+     1770, 1770, 1774, 1775, 1776, 1772, 1777, 1775, 1771, 1776,
+     1778, 1779, 1777, 1780, 1784, 1781, 1773, 1785, 1783, 1783,
+     1779, 1774, 1786, 1786, 1787, 1788, 1785, 1789, 1778, 1781,
+     1783, 1780, 1784, 1787, 1790, 1796, 1791, 1788, 1796, 1790,
 
-     1800, 1797, 1793, 1801, 1801, 1802, 1803, 1804, 1807, 1805,
-     1806, 1808, 1809, 1811, 1802,    0, 1812, 1814, 1809, 1804,
-     1800, 1805, 1806, 1813, 1813, 1815, 1808, 1803, 1812, 1816,
-     1818, 1809, 1816, 1811, 1807, 1814, 1817, 1820, 1821, 1822,
-     1821, 1817, 1820, 1823, 1824, 1815, 1826, 1828, 1823, 1829,
-     1818, 1824, 1830, 1832, 1831, 1826, 1831, 1822, 1829, 1834,
-     1835, 1834, 1836, 1836, 1830, 1828, 1837, 1839, 1838, 1839,
-     1840, 1841, 1832, 1838, 1835, 1840, 1841, 1842, 1843, 1844,
-     1846, 1845, 1847, 1849, 1853, 1844, 1845, 1850, 1851, 1851,
-     1847, 1854, 1837, 1846, 1855, 1842, 1852, 1852, 1843, 1853,
+     1794, 1794, 1797, 1798, 1802, 1800, 1803, 1801, 1789, 1791,
+     1802, 1804, 1804, 1805, 1807, 1805, 1806, 1806, 1797, 1798,
+     1800, 1801, 1807, 1803, 1809, 1810, 1811, 1811, 1812, 1813,
+     1814, 1809, 1815, 1817, 1816, 1819, 1818, 1812, 1821, 1824,
+     1822, 1819, 1814, 1825, 1815, 1810, 1816, 1823, 1823, 1828,
+     1813, 1818, 1822, 1826, 1819, 1827, 1826, 1824, 1821, 1817,
+     1827, 1830, 1831, 1825, 1831, 1832, 1830, 1833, 1834, 1828,
+     1836, 1838, 1833, 1839, 1840, 1834, 1841, 1842, 1841, 1836,
+     1845, 1847, 1839, 1832, 1852, 1844, 1840, 1844, 1848, 1838,
+     1846, 1846, 1853, 1848, 1845, 1849, 1842, 1849, 1850, 1851,
 
-     1855, 1850, 1849, 1856, 1857, 1858, 1857, 1860, 1856, 1859,
-     1859, 1854, 1865, 1858, 1861, 1861, 1862, 1862, 1863, 1860,
-     1864, 1858, 1867, 1869, 1868, 1864, 1868, 1863, 1872, 1874,
-     1865, 1867, 1870, 1871, 1867, 1879, 1878, 1870, 1870, 1882,
-     1872, 1874, 1871, 1875, 1869, 1876, 1883, 1880, 1875, 1878,
-     1876, 1881, 1881, 1884, 1885, 1879, 1880, 1882, 1886, 1888,
-     1889, 1890, 1891, 1899, 1883, 1892, 1893, 1891, 1885, 1884,
-     1892, 1888, 1889, 1886, 1896, 1893, 1898, 1900, 1901, 1902,
-     1896, 1890, 1898, 1904, 1904, 1903, 1899, 1907, 1905, 1906,
-     1906, 1908, 1900, 1896, 1903, 1908, 1901, 1905, 1909, 1910,
+     1854, 1856, 1852, 1850, 1851, 1855, 1854, 1847, 1857, 1859,
+     1855, 1860, 1853, 1864, 1856, 1863, 1857, 1861, 1861, 1862,
+     1862, 1865,    0, 1868, 1866, 1860, 1870, 1865, 1859, 1866,
+     1863, 1868, 1867, 1864, 1867, 1869, 1869, 1873, 1870, 1868,
+     1871, 1871, 1872, 1872, 1874, 1875, 1873, 1877, 1878, 1874,
+     1878, 1879, 1880, 1881, 1882, 1884, 1877, 1880, 1880, 1877,
+     1885, 1888, 1881, 1875, 1886, 1885, 1882, 1884, 1889, 1886,
+     1890, 1892, 1879, 1893, 1888, 1891, 1891, 1894, 1895, 1890,
+     1896, 1900, 1898, 1912, 1899, 1901, 1909,    0, 1889, 1892,
+     1901, 1893, 1895, 1894, 1898, 1896, 1899, 1902, 1903, 1906,
 
-     1916,    0, 1911, 1909, 1902, 1912, 1907, 1911, 1911, 1913,
-     1914, 1912, 1910, 1914, 1915, 1913, 1919, 1919, 1920, 1920,
-     1916, 1921, 1915, 1922, 1922, 1923, 1923, 1924, 1925, 1926,
-     1921, 1927, 1937, 1920, 1934, 1926, 1927, 1928, 1928, 1924,
-     1929, 1929, 1930, 1931, 1920, 1938, 1925, 1930, 1933, 1931,
-     1938, 1935, 1933, 1939, 1934, 1935, 1940, 1937, 1941, 1942,
-     1944, 1945, 1943, 1941, 1946, 1948, 1945, 1947, 1947, 1948,
-     1949, 1940, 1951, 1953, 1950, 1952, 1939, 1942, 1943, 1950,
-     1944, 1955, 1956, 1954, 1960, 1949, 1946, 1952, 1954, 1957,
-     1957, 1959, 1953, 1961, 1955, 1962, 1963, 1964, 1951, 1959,
+     1908, 1900, 1902, 1911, 1910, 1906, 1908, 1903, 1912, 1909,
+     1917, 1913, 1914, 1914, 1915, 1916, 1916,    0, 1906, 1910,
+     1913, 1911, 1918, 1915, 1920, 1919, 1918, 1921, 1922, 1917,
+     1919, 1926, 1921, 1921, 1922, 1923, 1924, 1920, 1925, 1924,
+     1931, 1923, 1929, 1929, 1930, 1930, 1925, 1932, 1932, 1931,
+     1934, 1926, 1933, 1933, 1935, 1936, 1938, 1938, 1937, 1930,
+     1944, 1936, 1934, 1937, 1939, 1939, 1940, 1941, 1947, 1949,
+     1930, 1940, 1935, 1941, 1943, 1945, 1948, 1952, 1943, 1945,
+     1944, 1948, 1950, 1951, 1953, 1954, 1955, 1956, 1951, 1957,
+     1957, 1955, 1949, 1947, 1958, 1952, 1959, 1950, 1958, 1960,
 
-     1956, 1965, 1966, 1960, 1967, 1973, 1969, 1970, 1970, 2134,
-     1971, 1972, 1961, 1971, 1966, 1974, 1964, 2134, 1962, 1973,
-     1963, 1969, 1965, 1978, 1972, 1967, 1975, 1975, 1974, 1976,
-     1976, 1977, 1977, 1979, 1980, 1980, 1981, 1983, 1978, 1982,
-     1982, 1986, 1983, 1987, 1985, 1981, 1979, 1988, 1981, 1985,
-     1989, 1989, 1990, 1990, 1991, 1992, 1992, 1993, 1999, 1988,
-     2002, 1986, 1995, 1987, 1994, 1994, 1996, 1997, 1997, 1998,
-     1998, 1996, 1999, 1991, 2000, 1993, 2001, 1995, 2006, 2002,
-     2004, 2005, 2005, 2000, 2008, 2004, 2007, 2007, 2009, 2010,
-     2001, 2013, 2010, 2014, 2009, 2011, 2011, 2006, 2012, 2012,
+     1953, 1961, 1962, 1963, 1960, 1954, 1965, 1964, 1966, 1956,
+     1969, 1959, 1964, 1970, 1962, 1967, 1967, 1971, 1969, 1965,
+     1972, 1973, 1963, 1974, 1979, 1975, 1966, 1961, 1976, 1977,
+     1980, 1980, 1970, 1983, 1981, 1982, 1971, 1981, 1984, 1979,
+     1976,    0, 1974, 1972, 1988, 1973, 1975, 1983, 1982, 1989,
+     1977, 1984, 1985, 1985, 1986, 1986, 1987, 1987, 1991, 1988,
+     1990, 1990, 1989, 1992, 1992, 1996, 1993, 1991, 1995, 1997,
+     1991, 1993, 1998, 1995, 1999, 1999, 2000, 2000, 2001, 2002,
+     2002, 2003, 2004, 2004, 1998, 1996, 2005, 2006, 2009, 1997,
+     2007, 2007, 2006, 2008, 2008, 2010, 2011, 2001, 2012, 2003,
 
-     2015, 2018, 2008, 2016, 2016, 2019, 2023, 2020, 2014, 2021,
-     2013, 2011, 2024, 2021, 2022, 2022, 2025, 2027, 2027, 2015,
-     2028, 2018, 2020, 2029, 2030, 2023, 2031, 2024, 2019, 2032,
-     2029, 2025, 2033, 2034, 2034, 2036, 2035, 2036, 2030, 2037,
-     2028, 2039, 2037, 2040, 2031, 2035, 2041, 2032, 2040, 2042,
-     2043, 2041, 2044, 2039, 2046, 2045, 2048, 2037, 2033, 2037,
-     2045, 2048, 2049, 2043, 2050, 2051, 2052, 2049, 2056, 2053,
-     2057, 2051, 2054, 2044, 2042, 2053, 2055, 2054, 2063, 2050,
-     2046, 2055, 2058, 2057, 2068, 2058, 2059, 2052, 2060, 2061,
-     2062, 2074, 2063, 2056, 2064, 2059, 2065, 2060, 2061, 2062,
+     2014, 2005, 2009, 2016, 2010, 2014, 2015, 2015, 2017, 2017,
+     2011, 2018, 2019, 2020, 2021, 2021, 2020, 2012, 2019, 2022,
+     2022, 2023, 2016, 2024, 2025, 2026, 2026, 2028, 2029, 2018,
+     2021, 2030, 2031, 2032, 2032, 2033, 2031, 2034, 2024, 2038,
+     2023, 2035, 2039, 2025, 2037, 2037, 2030, 2028, 2040, 2039,
+     2041, 2029, 2034, 2042, 2033, 2043, 2035, 2044, 2044, 2038,
+     2045, 2046, 2040, 2046, 2047, 2049, 2052, 2047, 2041, 2045,
+     2050, 2042, 2053, 2051, 2054, 2050, 2056, 2049, 2051, 2062,
+     2066, 2043, 2047, 2055, 2047, 2053, 2060, 2058, 2055, 2059,
+     2061, 2052, 2058, 2063, 2059, 2054, 2061, 2067, 2064, 2063,
 
-     2064, 2066, 2065, 2070, 2068, 2066, 2071, 2071, 2072, 2073,
-     2073, 2074, 2070, 2074, 2072, 2076, 2077, 2080, 2073, 2078,
-     2078, 2079, 2082, 2083, 2087, 2084, 2080, 2087, 2088, 2085,
-     2089, 2076, 2077, 2088, 2082, 2090, 2079, 2091, 2091, 2083,
-     2084, 2085, 2092, 2092, 2094, 2094, 2095, 2090, 2096, 2095,
-     2089, 2097, 2098, 2096, 2099, 2099, 2100, 2097, 2098, 2101,
-     2101, 2102, 2103, 2104, 2105, 2105, 2106, 2107,    0, 2108,
-     2100, 2110, 2106, 2102, 2108, 2110, 2103, 2111, 2112, 2112,
-     2111, 2107, 2104, 2113, 2114, 2115, 2116, 2118, 2113, 2120,
-     2116, 2117, 2117, 2114, 2120, 2121, 2122, 2123, 2124, 2125,
+     2062, 2060, 2056, 2064, 2065, 2066, 2069, 2070, 2068, 2065,
+     2067, 2068, 2071, 2072, 2073, 2069, 2070, 2074, 2075, 2078,
+     2084, 2071, 2072, 2074, 2075, 2076, 2080, 2082, 2073, 2076,
+     2081, 2081, 2086, 2082, 2087, 2080, 2083, 2083, 2089, 2078,
+     2084, 2093, 2084, 2088, 2088, 2083, 2090, 2092, 2086, 2094,
+     2087, 2095, 2099, 2089, 2100, 2090, 2107, 2093, 2097, 2092,
+     2098, 2097, 2107, 2095, 2094, 2098, 2100, 2101, 2101, 2102,
+     2102, 2106, 2099, 2104, 2104, 2105, 2106, 2108, 2105, 2109,
+     2109, 2110, 2112, 2108, 2111, 2111, 2113, 2114, 2115, 2115,
+     2116, 2117, 2118, 2125, 2112, 2110, 2116, 2118, 2120,    0,
 
-     2118, 2126, 2124, 2127, 2128, 2115, 2126, 2129, 2131, 2127,
-     2128, 2123, 2132, 2138, 2133, 2121, 2122, 2132, 2141, 2125,
-     2133, 2135, 2144, 2135, 2131, 2129, 2144, 2138, 2139, 2139,
-     2140, 2142, 2142, 2140, 2145, 2146, 2147, 2147, 2153, 2148,
-     2145, 2151, 2151, 2155, 2141, 2156, 2159, 2146, 2148, 2160,
-     2161, 2159, 2169, 2162, 2170, 2161, 2153, 2155, 2162, 2163,
-     2163, 2156, 2165, 2165, 2167, 2168, 2168, 2171, 2169, 2173,
-     2167, 2174, 2171, 2175, 2175, 2160, 2170, 2177, 2178, 2179,
-     2180, 2182, 2182, 2174, 2178, 2183, 2177, 2184, 2173, 2186,
-     2186, 2187, 2187, 2188, 2189, 2180, 2191, 2179, 2188, 2190,
+     2113, 2121, 2120, 2124, 2121, 2117, 2114, 2122, 2122, 2123,
+     2128, 2126, 2124, 2125, 2123, 2126, 2127, 2127, 2131, 2130,
+     2132, 2133, 2134, 2128, 2130, 2135, 2134, 2136, 2137, 2139,
+     2138, 2144, 2136, 2141, 2137, 2133, 2138, 2142, 2131, 2144,
+     2132, 2145, 2142, 2145, 2143, 2135, 2148, 2139, 2151, 2141,
+     2143, 2149, 2149, 2150, 2152, 2152, 2150, 2154, 2155, 2156,
+     2148, 2154, 2157, 2157, 2155, 2163, 2158, 2161, 2161, 2166,
+     2165, 2156, 2169, 2170, 2151, 2158, 2171, 2169, 2173, 2173,
+     2177, 2171, 2172, 2163, 2165, 2166, 2177, 2172, 2175, 2175,
+     2178, 2178, 2179, 2180, 2183, 2181, 2187, 2184, 2188, 2170,
 
-     2192, 2191, 2192, 2193, 2183, 2184, 2194, 2195, 2190, 2196,
-     2197, 2198, 2189, 2204, 2196, 2239, 2198, 2193, 2239, 2195,
-     2194, 2199, 2199, 2200, 2200, 2201, 2201, 2202, 2202, 2203,
-     2197, 2204, 2205, 2206, 2206, 2207, 2207, 2205, 2208, 2209,
-     2210, 2203, 2211, 2212, 2212, 2213, 2214, 2214, 2215, 2215,
-     2208, 2209, 2216, 2217, 2218, 2219, 2220, 2221, 2211, 2222,
-     2210, 2218, 2221, 2216, 2213, 2217, 2223, 2219, 2224, 2224,
-     2226, 2225, 2227, 2229, 2228, 2230, 2220, 2231, 2231, 2222,
-     2225, 2232, 2236, 2233, 2234, 2237, 2223, 2228, 2238, 2230,
-     2232, 2240, 2227, 2243, 2243,    0, 2226, 2229, 2233, 2234,
+     2181, 2185, 2185, 2189, 2188, 2187, 2193, 2190, 2179, 2184,
+     2192, 2192, 2194, 2183, 2199, 2180, 2196, 2196, 2197, 2197,
+     2200, 2189, 2190, 2198, 2203, 2193, 2201, 2204, 2198, 2200,
+     2194, 2201, 2199, 2202, 2205, 2202, 2207, 2206, 2203, 2208,
+     2214, 2204, 2206, 2213, 2208,    0, 2205, 2209, 2209, 2210,
+     2210, 2211, 2211, 2212, 2212, 2213, 2207, 2215, 2214, 2216,
+     2216, 2218, 2215, 2217, 2217, 2219, 2220, 2221, 2222, 2222,
+     2223, 2224, 2224, 2218, 2225, 2225, 2226, 2219, 2227, 2229,
+     2230, 2228, 2232, 2221, 2233, 2236, 2220, 2226, 2228, 2223,
+     2227, 2229, 2231, 2234, 2234, 2237, 2235, 2231, 2239, 2238,
 
-     2236, 2241, 2250, 2242, 2252, 2240, 2241, 2237, 2242, 2244,
-     2244, 2238, 2245, 2245, 2247, 2247, 2249, 2249, 2251, 2254,
-     2250, 2256, 2255, 2252, 2257, 2258, 2259, 2261, 2260, 2251,
-     2260, 2262, 2263, 2267, 2258, 2264, 2264, 2266, 2266, 2254,
-     2255, 2273, 2268, 2256, 2257, 2271, 2259, 2261, 2274, 2262,
-     2263, 2268, 2269, 2269, 2271, 2267, 2272, 2272, 2275, 2273,
-     2276, 2277, 2278, 2280, 2288, 2275, 2274, 2279, 2281, 2281,
-     2282, 2282, 2283, 2284, 2285, 2276, 2286, 2289, 2283, 2277,
-     2278, 2287, 2280, 2279, 2288, 2290, 2287, 2292, 2292, 2285,
-     2290, 2284, 2291, 2296, 2291, 2286, 2293, 2289, 2293, 2294,
+     2230, 2242, 2232, 2240, 2233, 2235, 2241, 2241, 2243, 2244,
+     2242, 2236, 2238, 2246, 2247, 2237, 2248, 2240, 2249, 2250,
+     2251, 2249, 2239, 2243, 2244, 2251, 2260, 2252, 2253, 2253,
+     2262, 2246, 2252, 2250, 2254, 2254, 2247, 2255, 2255, 2248,
+     2257, 2257, 2259, 2259, 2260, 2261, 2264, 2265, 2266, 2262,
+     2268, 2267, 2269, 2270, 2271, 2270, 2261, 2272, 2273, 2268,
+     2274, 2274, 2276, 2276, 2277, 2265, 2264, 2283, 2278, 2284,
+     2266, 2267, 2269, 2281, 2271, 2272, 2273, 2278, 2279, 2279,
+     2282, 2282, 2281, 2285, 2286, 2283, 2277, 2284, 2287, 2288,
+     2285, 2290, 2289, 2291, 2291, 2292, 2292, 2293, 2294, 2286,
 
-     2294, 2298, 2299, 2300, 2301, 2303, 2302, 2304, 2307, 2311,
-     2298, 2302, 2296, 2308, 2310, 2300, 2308, 2309, 2309, 2312,
-     2312, 2299, 2315, 2318, 2301, 2303, 2304, 2311, 2307, 2310,
-     2313, 2316, 2317, 2317, 2313, 2316, 2318, 2315, 2320, 2321,
-     2322, 2322, 2324, 2325, 2326, 2327, 2327, 2328, 2326, 2329,
-     2329, 2330, 2325, 2331, 2324, 2332, 2330, 2333, 2320, 2321,
-     2334, 2334, 2331, 2339, 2339, 2340, 2328, 2341, 2341, 2333,
-     2342, 2332, 2343, 2344, 2347, 2345, 2346, 2346, 2349, 2349,
-     2354, 2352, 2344, 2342, 2345, 2343, 2352, 2340, 2353, 2347,
-     2355, 2356, 2357, 2353, 2354, 2355, 2358, 2361, 2359, 2356,
+     2295, 2296, 2298, 2293, 2297, 2299, 2287, 2288, 2289, 2297,
+     2290, 2301, 2300, 2301, 2306, 2295, 2294, 2300, 2302, 2302,
+     2296, 2303, 2298, 2303, 2309, 2299, 2304, 2304, 2308, 2310,
+     2311, 2312, 2313, 2306, 2314, 2317, 2312, 2308, 2321, 2318,
+     2330, 2310, 2318, 2309, 2319, 2319, 2320, 2322, 2322, 2325,
+     2311, 2331, 2313, 2314, 2323, 2317, 2321, 2328, 2323, 2326,
+     2330, 2320, 2334, 2326, 2325, 2327, 2327, 2332, 2332, 2335,
+     2328, 2331, 2336, 2338, 2334, 2341, 2336, 2342, 2335, 2337,
+     2337, 2339, 2339, 2340, 2341, 2343, 2344, 2344, 2340, 2349,
+     2349, 2350, 2338, 2342, 2351, 2351, 2352, 2343, 2353, 2354,
 
-     2364, 2369, 2362, 2363,    0, 2358, 2359, 2362, 2363, 2365,
-     2365, 2357, 2361, 2366, 2366, 2364, 2367, 2368, 2370, 2369,
-     2371,    0, 2368, 2367, 2372, 2374, 2371, 2373, 2373, 2372,
-     2375, 2376, 2376, 2377, 2377, 2375, 2370, 2380, 2381, 2381,
-     2374, 2382, 2383, 2392, 2382, 2405, 2384, 2383, 2383, 2385,
-     2380, 2384, 2386, 2387, 2385, 2388, 2389, 2387, 2386, 2390,
-     2388, 2391, 2393, 2405, 2392, 2389, 2394, 2396, 2393, 2391,
-     2395, 2398, 2394, 2401, 2390, 2395, 2398, 2399, 2403, 2396,
-     2399, 2404, 2406, 2403, 2407, 2401, 2404, 2408, 2409, 2409,
-     2410, 2413, 2414, 2407, 2415, 2406, 2408, 2416, 2416, 2410,
+     2357, 2355, 2356, 2356, 2359, 2359, 2364, 2362, 2354, 2352,
+     2355, 2353, 2362, 2350, 2363, 2357, 2365, 2366, 2367, 2363,
+     2364, 2365, 2368, 2371, 2369, 2366, 2374, 2379, 2372, 2373,
+        0, 2368, 2369, 2372, 2373, 2375, 2375, 2367, 2371, 2376,
+     2376, 2374, 2377, 2378, 2380, 2379, 2381,    0, 2378, 2377,
+     2382, 2384, 2381, 2383, 2383, 2382, 2385, 2386, 2386, 2387,
+     2387, 2385, 2380, 2390, 2391, 2391, 2384, 2392, 2393, 2402,
+     2392, 2415, 2394, 2393, 2393, 2395, 2390, 2394, 2396, 2397,
+     2395, 2398, 2399, 2397, 2396, 2400, 2398, 2401, 2403, 2415,
+     2402, 2399, 2404, 2406, 2403, 2401, 2405, 2408, 2404, 2411,
 
-     2417, 2419, 2418, 2420, 2420, 2421, 2423, 2425, 2427, 2427,
-     2413, 2418, 2414, 2415, 2426, 2428, 2419, 2429, 2426, 2417,
-     2430, 2423, 2431, 2429, 2421, 2433, 2430, 2425, 2431, 2432,
-     2432, 2434, 2436, 2433, 2437, 2439, 2434, 2440, 2441, 2439,
-     2428, 2436, 2443, 2443, 2444, 2444, 2448, 2437, 2445, 2445,
-     2448, 2440, 2449, 2441, 2447, 2447, 2453, 2449, 2451, 2451,
-     2454, 2455, 2456, 2458, 2466, 2454, 2464, 2456, 2456, 2459,
-     2459, 2461, 2461, 2455, 2462, 2462, 2453, 2463, 2468, 2464,
-     2463, 2472, 2466, 2458, 2469, 2469, 2470, 2470, 2471, 2471,
-     2473, 2473, 2474, 2475, 2476, 2477, 2472, 2483, 2468, 2478,
+     2400, 2405, 2408, 2409, 2413, 2406, 2409, 2414, 2416, 2413,
+     2417, 2411, 2414, 2418, 2419, 2419, 2420, 2423, 2424, 2417,
+     2425, 2416, 2418, 2426, 2426, 2420, 2427, 2429, 2428, 2430,
+     2430, 2431, 2433, 2435, 2437, 2437, 2423, 2428, 2424, 2425,
+     2436, 2438, 2429, 2439, 2436, 2427, 2440, 2433, 2441, 2439,
+     2431, 2443, 2440, 2435, 2441, 2442, 2442, 2444, 2446, 2443,
+     2447, 2449, 2444, 2450, 2451, 2449, 2438, 2446, 2453, 2453,
+     2454, 2454, 2458, 2447, 2455, 2455, 2458, 2450, 2459, 2451,
+     2457, 2457, 2463, 2459, 2461, 2461, 2464, 2465, 2466, 2468,
+     2476, 2464, 2474, 2466, 2466, 2469, 2469, 2471, 2471, 2465,
 
-     2478, 2477, 2479, 2484, 2482, 2474, 2479, 2485, 2476, 2482,
-     2482, 2475, 2486, 2487, 2488, 2490, 2490, 2489, 2486, 2487,
-     2483, 2489, 2495, 2484, 2493, 2496, 2498, 2485, 2496, 2493,
-     2495, 2499, 2500, 2501, 2499, 2502, 2503,    0, 2501, 2488,
-     2504, 2505, 2505, 2506, 2507, 2508, 2509, 2507, 2512, 2500,
-     2500, 2498, 2510, 2502, 2504, 2507, 2503, 2506, 2511, 2508,
-     2510, 2513, 2513, 2511, 2511, 2509, 2518, 2512, 2514, 2514,
-     2515, 2515, 2516, 2516, 2517, 2517, 2519, 2520, 2521, 2522,
-     2523, 2519, 2518, 2524, 2526, 2526, 2527, 2528, 2522, 2527,
-     2530, 2530, 2531, 2532, 2532, 2540, 2533, 2520,    0, 2531,
+     2472, 2472, 2463, 2473, 2478, 2474, 2473, 2482, 2476, 2468,
+     2479, 2479, 2480, 2480, 2481, 2481, 2483, 2483, 2484, 2485,
+     2486, 2487, 2482, 2493, 2478, 2488, 2488, 2487, 2489, 2494,
+     2492, 2484, 2489, 2495, 2486, 2492, 2492, 2485, 2496, 2497,
+     2498, 2500, 2500, 2499, 2496, 2497, 2493, 2499, 2505, 2494,
+     2503, 2506, 2508, 2495, 2506, 2503, 2505, 2509, 2510, 2511,
+     2509, 2512, 2513,    0, 2511, 2498, 2514, 2515, 2515, 2516,
+     2517, 2518, 2519, 2517, 2522, 2510, 2510, 2508, 2520, 2512,
+     2514, 2517, 2513, 2516, 2521, 2518, 2520, 2523, 2523, 2521,
+     2521, 2519, 2528, 2522, 2524, 2524, 2525, 2525, 2526, 2526,
 
-     2523, 2533, 2536, 2524, 2521, 2528, 2535, 2535, 2537, 2538,
-     2543, 2536, 2542, 2540, 2541, 2541, 2542, 2537, 2538, 2543,
-     2544, 2545, 2547, 2546, 2551, 2555, 2545, 2545, 2556, 2551,
-     2557, 2547, 2552, 2552, 2559, 2544, 2546, 2554, 2554, 2555,
-     2560, 2563, 2564, 2559, 2565, 2568, 2570,    0, 2557, 2566,
-     2616, 2564, 2560, 2556, 2572, 2566, 2573, 2568, 2616, 2572,
-     2575, 2573, 2574, 2574, 2565, 2577, 2563, 2570, 2584, 2575,
-     2577, 2578, 2578, 2580, 2580, 2578, 2581, 2581, 2582, 2582,
-     2583, 2585, 2586, 2592, 2588, 2593, 2589, 2586, 2584, 2583,
-     2588, 2589, 2590, 2591, 2591, 2595, 2596, 2590, 2594, 2597,
+     2527, 2527, 2529, 2530, 2531, 2532, 2533, 2529, 2528, 2534,
+     2536, 2536, 2537, 2538, 2532, 2537, 2540, 2540, 2541, 2542,
+     2542, 2550, 2543, 2530,    0, 2541, 2533, 2543, 2546, 2534,
+     2531, 2538, 2545, 2545, 2547, 2548, 2553, 2546, 2552, 2550,
+     2551, 2551, 2552, 2547, 2548, 2553, 2554, 2555, 2557, 2556,
+     2561, 2565, 2555, 2555, 2566, 2561, 2567, 2557, 2562, 2562,
+     2569, 2554, 2556, 2564, 2564, 2565, 2570, 2573, 2574, 2569,
+     2575, 2578, 2580,    0, 2567, 2576, 2626, 2574, 2570, 2566,
+     2582, 2576, 2583, 2578, 2626, 2582, 2585, 2583, 2584, 2584,
+     2575, 2587, 2573, 2580, 2594, 2585, 2587, 2588, 2588, 2590,
 
-     2585, 2592, 2596, 2594, 2598, 2598, 2593, 2600, 2604, 2601,
-     2602, 2600, 2606, 2595, 2601, 2602, 2603, 2603, 2605, 2608,
-     2608, 2610, 2611, 2614, 2597, 2612, 2615, 2604, 2613, 2612,
-     2618, 2617, 2606, 2605, 2610, 2611, 2617, 2613, 2620, 2614,
-     2619, 2619, 2622, 2622, 2625, 2615, 2623, 2623, 2627, 2627,
-     2629, 2630, 2631, 2632, 2634, 2634, 2618, 2620, 2632, 2635,
-     2636, 2637, 2639, 2639, 2640, 2625, 2629, 2630, 2631, 2641,
-     2641, 2644, 2646, 2647, 2650, 2645, 2654, 2646, 2640, 2635,
-     2637, 2645, 2652, 2636, 2648, 2648, 2649, 2649, 2651, 2651,
-     2653, 2644, 2655, 2652, 2650, 2647, 2654, 2656, 2655, 2653,
+     2590, 2588, 2591, 2591, 2592, 2592, 2593, 2595, 2596, 2602,
+     2598, 2603, 2599, 2596, 2594, 2593, 2598, 2599, 2600, 2601,
+     2601, 2605, 2606, 2600, 2604, 2607, 2595, 2602, 2606, 2604,
+     2608, 2608, 2603, 2610, 2614, 2611, 2612, 2610, 2616, 2605,
+     2611, 2612, 2613, 2613, 2615, 2618, 2618, 2620, 2621, 2624,
+     2607, 2622, 2625, 2614, 2623, 2622, 2628, 2627, 2616, 2615,
+     2620, 2621, 2627, 2623, 2630, 2624, 2629, 2629, 2632, 2632,
+     2635, 2625, 2633, 2633, 2637, 2637, 2639, 2640, 2641, 2642,
+     2644, 2644, 2628, 2630, 2642, 2645, 2646, 2647, 2649, 2649,
+     2650, 2635, 2639, 2640, 2641, 2651, 2651, 2654, 2656, 2657,
 
-     2657, 2658, 2659, 2659, 2660, 2661, 2661, 2660, 2651, 2666,
-     2665, 2667, 2657, 2668, 2668, 2669, 2656, 2667, 2669, 2670,
-     2671, 2658, 2665, 2673, 2675, 2670, 2674, 2676, 2673, 2666,
-     2677, 2674, 2680, 2676, 2678, 2678, 2681, 2682, 2671, 2683,
-     2684, 2684, 2685, 2675, 2680, 2691, 2686, 2677, 2677, 2688,
-     2688,    0, 2683, 2690, 2681, 2686, 2689, 2689, 2690, 2691,
-     2692, 2685, 2682, 2693, 2693, 2692, 2694, 2694, 2695, 2695,
-     2696, 2698, 2698, 2701, 2703, 2696, 2704, 2705, 2706, 2706,
-     2708, 2708, 2710, 2709, 2711, 2712, 2712, 2715, 2714, 2716,
-     2717,    0, 2701, 2711, 2714, 2717, 2703, 2709, 2704, 2705,
+     2660, 2655, 2664, 2656, 2650, 2645, 2647, 2655, 2662, 2646,
+     2658, 2658, 2659, 2659, 2661, 2661, 2663, 2654, 2665, 2662,
+     2660, 2657, 2664, 2666, 2665, 2663, 2667, 2668, 2669, 2669,
+     2670, 2671, 2671, 2670, 2661, 2676, 2675, 2677, 2667, 2678,
+     2678, 2679, 2666, 2677, 2679, 2680, 2681, 2668, 2675, 2683,
+     2685, 2680, 2684, 2686, 2683, 2676, 2687, 2684, 2690, 2686,
+     2688, 2688, 2691, 2692, 2681, 2693, 2694, 2694, 2695, 2685,
+     2690, 2701, 2696, 2687, 2687, 2698, 2698,    0, 2693, 2700,
+     2691, 2696, 2699, 2699, 2700, 2701, 2702, 2695, 2692, 2703,
+     2703, 2702, 2704, 2704, 2705, 2705, 2706, 2708, 2708, 2711,
 
-     2720, 2720, 2710, 2722, 2722, 2723, 2724, 2715, 2716, 2725,
-     2723, 2726, 2731, 2727, 2729, 2725, 2728, 2728, 2732, 2729,
-     2724, 2727, 2733, 2726, 2734, 2735, 2737, 2733, 2738, 2739,
-     2740, 2735, 2731, 2741, 2737, 2748, 2734, 2742, 2732, 2743,
-     2744, 2745, 2752, 2747, 2756, 2756, 2745, 2738, 2747, 2739,
-     2740, 2741, 2749, 2742, 2750, 2748, 2743, 2743, 2749, 2750,
-     2753, 2744, 2752, 2757, 2757, 2758, 2762, 2762, 2768, 2758,
-     2764, 2764, 2768, 2753, 2765, 2765, 2771, 2765, 2766, 2766,
-     2774, 2766, 2767, 2767, 2772, 2767, 2770, 2770, 2775, 2780,
-     2776, 2777, 2777, 2782, 2771, 2776, 2781, 2782, 2772, 2795,
+     2713, 2706, 2714, 2715, 2716, 2716, 2718, 2718, 2720, 2719,
+     2721, 2722, 2722, 2725, 2724, 2726, 2727,    0, 2711, 2721,
+     2724, 2727, 2713, 2719, 2714, 2715, 2730, 2730, 2720, 2732,
+     2732, 2733, 2734, 2725, 2726, 2735, 2733, 2736, 2741, 2737,
+     2739, 2735, 2738, 2738, 2742, 2739, 2734, 2737, 2743, 2736,
+     2744, 2745, 2747, 2743, 2748, 2749, 2750, 2745, 2741, 2751,
+     2747, 2758, 2744, 2752, 2742, 2753, 2754, 2755, 2762, 2757,
+     2766, 2766, 2755, 2748, 2757, 2749, 2750, 2751, 2759, 2752,
+     2760, 2758, 2753, 2753, 2759, 2760, 2763, 2754, 2762, 2767,
+     2767, 2768, 2772, 2772, 2778, 2768, 2774, 2774, 2778, 2763,
 
-     2774, 2783, 2784, 2781, 2786, 2795, 2787, 2821, 2775, 2791,
-     2783, 2788, 2788, 2796, 2780, 2787, 2821, 2784, 2789, 2789,
-     2790, 2790, 2786, 2792, 2791, 2793, 2794, 2797, 2792, 2798,
-     2799, 2794, 2794, 2801, 2793, 2799, 2800, 2793, 2796, 2802,
-     2802, 2800, 2797, 2803, 2873, 2804, 2805, 2805, 2873, 2803,
-     2798, 2804, 2801, 2806, 2806, 2807, 2810, 2810, 2813, 2813,
-     2807, 2814, 2814, 2815, 2815, 2816, 2816, 2817, 2817, 2818,
-     2818, 2819, 2819, 2822, 2822, 2823, 2824, 2825, 2829, 2827,
-     2828, 2828, 2830, 2837, 2823, 2832, 2832, 2831, 2824, 2833,
-     2834, 2834, 2839, 2829, 2841, 2830, 2844, 2825, 2827, 2831,
+     2775, 2775, 2781, 2775, 2776, 2776, 2784, 2776, 2777, 2777,
+     2782, 2777, 2780, 2780, 2785, 2790, 2786, 2787, 2787, 2792,
+     2781, 2786, 2791, 2792, 2782, 2805, 2784, 2793, 2794, 2791,
+     2796, 2805, 2797, 2831, 2785, 2801, 2793, 2798, 2798, 2806,
+     2790, 2797, 2831, 2794, 2799, 2799, 2800, 2800, 2796, 2802,
+     2801, 2803, 2804, 2807, 2802, 2808, 2809, 2804, 2804, 2811,
+     2803, 2809, 2810, 2803, 2806, 2812, 2812, 2810, 2807, 2813,
+     2883, 2814, 2815, 2815, 2883, 2813, 2808, 2814, 2811, 2816,
+     2816, 2817, 2820, 2820, 2823, 2823, 2817, 2824, 2824, 2825,
+     2825, 2826, 2826, 2827, 2827, 2828, 2828, 2829, 2829, 2832,
 
-     2838, 2837, 2844, 2838, 2833, 2840, 2840, 2843, 2845, 2846,
-     2843, 2847, 2841, 2848, 2846, 2851, 2849, 2852, 2839, 2855,
-     2864, 2851, 2845, 2864, 2866, 2871, 2852, 2867, 2867, 2874,
-     2847, 2848, 2849, 2872, 2855, 2868, 2868, 2866, 2869, 2869,
-     2875, 2877, 2872, 2881, 2878, 2879, 2882, 2882, 2871, 2874,
-     2879, 2880, 2883, 2880, 2875, 2878, 2884, 2886, 2881, 2885,
-     2887, 2888, 2889, 2891, 2877, 2883, 2890, 2892, 2897, 2893,
-     2898, 2889, 2900, 2886, 2893, 2884, 2888, 2885, 2890, 2899,
-     2899, 2900, 2897, 2905, 2891, 2887, 2906, 2892, 2901, 2901,
-     2898, 2902, 2902, 2903, 2903, 2904, 2904, 2907, 2908, 2909,
+     2832, 2833, 2834, 2835, 2839, 2837, 2838, 2838, 2840, 2847,
+     2833, 2842, 2842, 2841, 2834, 2843, 2844, 2844, 2849, 2839,
+     2851, 2840, 2854, 2835, 2837, 2841, 2848, 2847, 2854, 2848,
+     2843, 2850, 2850, 2853, 2855, 2856, 2853, 2857, 2851, 2858,
+     2856, 2861, 2859, 2862, 2849, 2865, 2874, 2861, 2855, 2874,
+     2876, 2881, 2862, 2877, 2877, 2884, 2857, 2858, 2859, 2882,
+     2865, 2878, 2878, 2876, 2879, 2879, 2885, 2887, 2882, 2891,
+     2888, 2889, 2892, 2892, 2881, 2884, 2889, 2890, 2893, 2890,
+     2885, 2888, 2894, 2896, 2891, 2895, 2897, 2898, 2899, 2901,
+     2887, 2893, 2900, 2902, 2907, 2903, 2908, 2899, 2910, 2896,
 
-     2907, 2910, 2905, 2908, 2909, 2911, 2906, 2912, 2913, 2914,
-     2915, 2916, 2918, 2912, 2919, 2915, 2917, 2917, 2920, 2920,
-     2911, 2914, 2913, 2922, 2924, 2930, 2910, 2918, 2927, 2927,
-     2931, 2916, 2929, 2919, 2928, 2928, 2931, 2932, 2922, 2933,
-     2929, 2934, 2924, 2932, 2930, 2935, 2936, 2937, 2937, 2938,
-     2938, 2936, 2940, 2933, 2934, 2941, 2943, 2944, 2946, 2949,
-     2947, 2944, 2948, 2950, 2935, 2947, 2951, 2954, 2954, 2952,
-     2943, 2957, 2949, 2940, 2952, 2941, 2950, 2953, 2946, 2958,
-     2959, 2948, 2953, 2960, 2960, 2951, 2967, 2961, 2962, 2963,
-     2963, 2957, 2961, 2964, 2962, 2965, 2966, 2958, 2964, 2959,
+     2903, 2894, 2898, 2895, 2900, 2909, 2909, 2910, 2907, 2915,
+     2901, 2897, 2916, 2902, 2911, 2911, 2908, 2912, 2912, 2913,
+     2913, 2914, 2914, 2917, 2918, 2919, 2917, 2920, 2915, 2918,
+     2919, 2921, 2916, 2922, 2923, 2924, 2925, 2926, 2928, 2922,
+     2929, 2925, 2927, 2927, 2930, 2930, 2921, 2924, 2923, 2932,
+     2934, 2940, 2920, 2928, 2937, 2937, 2941, 2926, 2939, 2929,
+     2938, 2938, 2941, 2942, 2932, 2943, 2939, 2944, 2934, 2942,
+     2940, 2945, 2946, 2947, 2947, 2948, 2948, 2946, 2950, 2943,
+     2944, 2951, 2953, 2954, 2956, 2959, 2957, 2954, 2958, 2960,
+     2945, 2957, 2961, 2964, 2964, 2962, 2953, 2967, 2959, 2950,
 
-     2965, 2966, 2968, 2970, 2970, 2967, 2971, 2975, 2968, 2972,
-     2972, 2971, 2974, 2976, 2977, 2978, 2974, 2979, 2980, 2981,
-     2976, 2983, 2983, 2979, 2985, 2985, 2975, 2986, 2988, 2989,
-     2987, 2990, 2981, 2977, 2978, 2987, 2986, 2980, 2992, 2986,
-     2991, 2991, 2993, 2992, 2990, 2995, 2997, 2988, 2989, 2996,
-     2996, 2998, 2998, 2999, 2999, 2993, 3000, 3001, 3002, 3003,
-     3003, 3000, 3004, 3009, 3001, 2997, 3005, 3004, 3005, 3006,
-     3006, 2995, 3007, 3008, 3011, 3014, 3010, 3002, 3018, 3007,
-     3008, 3010, 3009, 3013, 3013, 3016, 3017, 3019, 3020, 3020,
-     3016, 3017, 3023, 3011, 3014, 3022, 3022, 3018, 3024, 3025,
+     2962, 2951, 2960, 2963, 2956, 2968, 2969, 2958, 2963, 2970,
+     2970, 2961, 2977, 2971, 2972, 2973, 2973, 2967, 2971, 2974,
+     2972, 2975, 2976, 2968, 2974, 2969, 2975, 2976, 2978, 2980,
+     2980, 2977, 2981, 2985, 2978, 2982, 2982, 2981, 2984, 2986,
+     2987, 2988, 2984, 2989, 2990, 2991, 2986, 2993, 2993, 2989,
+     2995, 2995, 2985, 2996, 2998, 2999, 2997, 3000, 2991, 2987,
+     2988, 2997, 2996, 2990, 3002, 2996, 3001, 3001, 3003, 3002,
+     3000, 3005, 3007, 2998, 2999, 3006, 3006, 3008, 3008, 3009,
+     3009, 3003, 3010, 3011, 3012, 3013, 3013, 3010, 3014, 3019,
+     3011, 3007, 3015, 3014, 3015, 3016, 3016, 3005, 3017, 3018,
 
-     3025, 3026, 3026, 3027, 3029, 3029, 3019, 3030, 3030, 3031,
-     3027, 3023, 3037, 3033, 3036, 3038, 3031, 3024, 3033, 3036,
-     3039, 3039, 3040, 3040,    0,    0,    0,    0,    0,    0,
-        0, 3037,    0,    0, 3038, 3044, 3044, 3044, 3044, 3044,
-     3044, 3044, 3045, 3045, 3045, 3045, 3045, 3045, 3045, 3046,
-     3046, 3046, 3046, 3046, 3046, 3046, 3047, 3047, 3047, 3047,
-     3047, 3047, 3047, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3050, 3050,    0, 3050, 3050, 3050, 3050, 3051, 3051,    0,
-        0,    0, 3051, 3051, 3052, 3052,    0,    0, 3052,    0,
-     3052, 3053,    0,    0,    0,    0,    0, 3053, 3054, 3054,
+     3021, 3024, 3020, 3012, 3028, 3017, 3018, 3020, 3019, 3023,
+     3023, 3026, 3027, 3029, 3030, 3030, 3026, 3027, 3033, 3021,
+     3024, 3032, 3032, 3028, 3034, 3035, 3035, 3036, 3036, 3037,
+     3039, 3039, 3029, 3040, 3040, 3041, 3037, 3033, 3047, 3043,
+     3046, 3048, 3041, 3034, 3043, 3046, 3049, 3049, 3050, 3050,
+        0,    0,    0,    0,    0,    0,    0, 3047,    0,    0,
+     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3055, 3055,
+     3055, 3055, 3055, 3055, 3055, 3056, 3056, 3056, 3056, 3056,
+     3056, 3056, 3057, 3057, 3057, 3057, 3057, 3057, 3057, 3058,
+     3058, 3058, 3058, 3058, 3058, 3058, 3060, 3060,    0, 3060,
+
+     3060, 3060, 3060, 3061, 3061,    0,    0,    0, 3061, 3061,
+     3062, 3062,    0,    0, 3062,    0, 3062, 3063,    0,    0,
+        0,    0,    0, 3063, 3064, 3064,    0,    0,    0, 3064,
+     3064, 3065,    0,    0,    0,    0,    0, 3065, 3066, 3066,
+        0, 3066, 3066, 3066, 3066, 3067, 3067,    0, 3067, 3067,
+     3067, 3067, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053, 3053,
+     3053, 3053, 3053
 
-        0,    0,    0, 3054, 3054, 3055,    0,    0,    0,    0,
-        0, 3055, 3056, 3056,    0, 3056, 3056, 3056, 3056, 3057,
-     3057,    0, 3057, 3057, 3057, 3057, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043, 3043,
-     3043, 3043, 3043, 3043, 3043, 3043, 3043
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2938,7 +2949,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 2939 "<stdout>"
+#line 2951 "<stdout>"
 #define YY_NO_INPUT 1
 #line 184 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -2947,9 +2958,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 2948 "<stdout>"
+#line 2960 "<stdout>"
 
-#line 2950 "<stdout>"
+#line 2962 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3171,7 +3182,7 @@ YY_DECL
 	{
 #line 204 "./util/configlexer.lex"
 
-#line 3172 "<stdout>"
+#line 3184 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3204,13 +3215,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3044 )
+				if ( yy_current_state >= 3054 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 5927 );
+		while ( yy_base[yy_current_state] != 5953 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3455,17 +3466,17 @@ YY_RULE_SETUP
 case 44:
 YY_RULE_SETUP
 #line 251 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSTEMD) }
+{ YDVAR(1, VAR_HTTPS_PORT) }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 252 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_DAEMONIZE) }
+{ YDVAR(1, VAR_USE_SYSTEMD) }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 253 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE) }
+{ YDVAR(1, VAR_DO_DAEMONIZE) }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
@@ -3475,282 +3486,282 @@ YY_RULE_SETUP
 case 48:
 YY_RULE_SETUP
 #line 255 "./util/configlexer.lex"
-{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
+{ YDVAR(1, VAR_INTERFACE) }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 256 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
+{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 257 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_RCVBUF) }
+{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 258 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_SNDBUF) }
+{ YDVAR(1, VAR_SO_RCVBUF) }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 259 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_REUSEPORT) }
+{ YDVAR(1, VAR_SO_SNDBUF) }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 260 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_TRANSPARENT) }
+{ YDVAR(1, VAR_SO_REUSEPORT) }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 261 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_FREEBIND) }
+{ YDVAR(1, VAR_IP_TRANSPARENT) }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 262 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CHROOT) }
+{ YDVAR(1, VAR_IP_FREEBIND) }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 263 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USERNAME) }
+{ YDVAR(1, VAR_CHROOT) }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 264 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DIRECTORY) }
+{ YDVAR(1, VAR_USERNAME) }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 265 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOGFILE) }
+{ YDVAR(1, VAR_DIRECTORY) }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 266 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PIDFILE) }
+{ YDVAR(1, VAR_LOGFILE) }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 267 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_HINTS) }
+{ YDVAR(1, VAR_PIDFILE) }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 268 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STREAM_WAIT_SIZE) }
+{ YDVAR(1, VAR_ROOT_HINTS) }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 269 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
+{ YDVAR(1, VAR_STREAM_WAIT_SIZE) }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 270 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
+{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 271 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
+{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 272 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
+{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 273 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
+{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 274 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
+{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 275 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MAX_TTL) }
+{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 276 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) }
+{ YDVAR(1, VAR_CACHE_MAX_TTL) }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 277 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MIN_TTL) }
+{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 278 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_HOST_TTL) }
+{ YDVAR(1, VAR_CACHE_MIN_TTL) }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 279 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_LAME_TTL) }
+{ YDVAR(1, VAR_INFRA_HOST_TTL) }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 280 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
+{ YDVAR(1, VAR_INFRA_LAME_TTL) }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 281 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
+{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 282 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
+{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 283 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
+{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 284 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
+{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 285 "./util/configlexer.lex"
-{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
+{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 286 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DELAY_CLOSE) }
+{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 287 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
+{ YDVAR(1, VAR_DELAY_CLOSE) }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 288 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
+{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 289 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
+{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 290 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_GLUE) }
+{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 291 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
+{ YDVAR(1, VAR_HARDEN_GLUE) }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 292 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
+{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 293 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
+{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 294 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
+{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 295 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
+{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 296 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CAPS_WHITELIST) }
+{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 297 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
+{ YDVAR(1, VAR_CAPS_WHITELIST) }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 298 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
+{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 299 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
+{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 300 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH_KEY) }
+{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 301 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH) }
+{ YDVAR(1, VAR_PREFETCH_KEY) }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 302 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DENY_ANY) }
+{ YDVAR(1, VAR_PREFETCH) }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 303 "./util/configlexer.lex"
-{ YDVAR(0, VAR_STUB_ZONE) }
+{ YDVAR(1, VAR_DENY_ANY) }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 304 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NAME) }
+{ YDVAR(0, VAR_STUB_ZONE) }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 305 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_ADDR) }
+{ YDVAR(1, VAR_NAME) }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 306 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_HOST) }
+{ YDVAR(1, VAR_STUB_ADDR) }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 307 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_PRIME) }
+{ YDVAR(1, VAR_STUB_HOST) }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 308 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_FIRST) }
+{ YDVAR(1, VAR_STUB_PRIME) }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 309 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_NO_CACHE) }
+{ YDVAR(1, VAR_STUB_FIRST) }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 310 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_NO_CACHE) }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
@@ -3760,32 +3771,32 @@ YY_RULE_SETUP
 case 105:
 YY_RULE_SETUP
 #line 312 "./util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 313 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 314 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 315 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_FIRST) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 316 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 317 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
@@ -3795,731 +3806,731 @@ YY_RULE_SETUP
 case 112:
 YY_RULE_SETUP
 #line 319 "./util/configlexer.lex"
-{ YDVAR(0, VAR_AUTH_ZONE) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 320 "./util/configlexer.lex"
-{ YDVAR(0, VAR_RPZ) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 321 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TAGS) }
+{ YDVAR(0, VAR_RPZ) }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 322 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
+{ YDVAR(1, VAR_TAGS) }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
+{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG) }
+{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG_NAME) }
+{ YDVAR(1, VAR_RPZ_LOG) }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 326 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEFILE) }
+{ YDVAR(1, VAR_RPZ_LOG_NAME) }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 327 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MASTER) }
+{ YDVAR(1, VAR_ZONEFILE) }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 328 "./util/configlexer.lex"
-{ YDVAR(1, VAR_URL) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 329 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ALLOW_NOTIFY) }
+{ YDVAR(1, VAR_URL) }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+{ YDVAR(1, VAR_ALLOW_NOTIFY) }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_UPSTREAM) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FALLBACK_ENABLED) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 333 "./util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(1, VAR_FALLBACK_ENABLED) }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 334 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(0, VAR_VIEW) }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 336 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 337 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 338 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 340 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 344 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 346 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_IDENTITY) }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_VERSION) }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_MODULE_CONF) }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 383 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 382 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 384 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 385 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 388 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 389 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 397 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 398 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 399 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 422 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 423 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 424 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 425 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 426 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 427 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 428 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 429 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 430 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(1, VAR_DNSTAP_IP) }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(1, VAR_DNSTAP_TLS) }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 438 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
-#line 440 "./util/configlexer.lex"
+#line 439 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
-#line 442 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 441 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 443 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
 #line 444 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
 #line 445 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
 #line 446 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
-#line 448 "./util/configlexer.lex"
+#line 447 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
-#line 450 "./util/configlexer.lex"
+#line 449 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
-#line 452 "./util/configlexer.lex"
+#line 451 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
-#line 454 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
-#line 456 "./util/configlexer.lex"
+#line 455 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
-#line 458 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 457 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
 #line 459 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
 #line 460 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
 #line 461 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
 #line 462 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
 #line 463 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
 #line 464 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
 #line 465 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
 #line 466 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
 #line 467 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
 #line 468 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
 #line 469 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
 #line 470 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(1, VAR_LOW_RTT) }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
 #line 471 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
@@ -4534,195 +4545,200 @@ YY_RULE_SETUP
 case 258:
 YY_RULE_SETUP
 #line 474 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 475 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
 #line 476 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 261:
 YY_RULE_SETUP
 #line 477 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 262:
 YY_RULE_SETUP
 #line 478 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
 #line 479 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
 #line 480 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 481 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 482 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 483 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
 #line 484 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 269:
 YY_RULE_SETUP
-#line 486 "./util/configlexer.lex"
+#line 485 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 270:
 YY_RULE_SETUP
-#line 488 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 487 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 271:
 YY_RULE_SETUP
 #line 489 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 272:
 YY_RULE_SETUP
 #line 490 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 273:
 YY_RULE_SETUP
 #line 491 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
 #line 492 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 493 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 494 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 495 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 503 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(0, VAR_IPSET) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 504 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 505 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 506 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 	YY_BREAK
 case 289:
-/* rule 289 can match eol */
 YY_RULE_SETUP
 #line 507 "./util/configlexer.lex"
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+	YY_BREAK
+case 290:
+/* rule 290 can match eol */
+YY_RULE_SETUP
+#line 508 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 290:
+case 291:
 YY_RULE_SETUP
-#line 510 "./util/configlexer.lex"
+#line 511 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 511 "./util/configlexer.lex"
+#line 512 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 291:
-YY_RULE_SETUP
-#line 516 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 292:
-/* rule 292 can match eol */
 YY_RULE_SETUP
 #line 517 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 293:
+/* rule 293 can match eol */
+YY_RULE_SETUP
+#line 518 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 293:
+case 294:
 YY_RULE_SETUP
-#line 519 "./util/configlexer.lex"
+#line 520 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4735,34 +4751,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 294:
+case 295:
 YY_RULE_SETUP
-#line 531 "./util/configlexer.lex"
+#line 532 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 532 "./util/configlexer.lex"
+#line 533 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 295:
-YY_RULE_SETUP
-#line 537 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 296:
-/* rule 296 can match eol */
 YY_RULE_SETUP
 #line 538 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 297:
+/* rule 297 can match eol */
+YY_RULE_SETUP
+#line 539 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 297:
+case 298:
 YY_RULE_SETUP
-#line 540 "./util/configlexer.lex"
+#line 541 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4775,38 +4791,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 298:
+case 299:
 YY_RULE_SETUP
-#line 552 "./util/configlexer.lex"
+#line 553 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 554 "./util/configlexer.lex"
+#line 555 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 299:
-YY_RULE_SETUP
-#line 558 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 300:
-/* rule 300 can match eol */
 YY_RULE_SETUP
 #line 559 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 301:
+/* rule 301 can match eol */
 YY_RULE_SETUP
 #line 560 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 302:
 YY_RULE_SETUP
 #line 561 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 303:
+YY_RULE_SETUP
+#line 562 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext);
@@ -4814,27 +4830,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 566 "./util/configlexer.lex"
+#line 567 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 303:
-YY_RULE_SETUP
-#line 570 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 304:
-/* rule 304 can match eol */
 YY_RULE_SETUP
 #line 571 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 305:
+/* rule 305 can match eol */
+YY_RULE_SETUP
+#line 572 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 305:
+case 306:
 YY_RULE_SETUP
-#line 573 "./util/configlexer.lex"
+#line 574 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -4844,7 +4860,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 579 "./util/configlexer.lex"
+#line 580 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -4856,33 +4872,33 @@ case YY_STATE_EOF(val):
 	}
 }
 	YY_BREAK
-case 306:
+case 307:
 YY_RULE_SETUP
-#line 590 "./util/configlexer.lex"
+#line 591 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 307:
+case 308:
 YY_RULE_SETUP
-#line 594 "./util/configlexer.lex"
+#line 595 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 308:
+case 309:
 YY_RULE_SETUP
-#line 598 "./util/configlexer.lex"
+#line 599 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 309:
+case 310:
 YY_RULE_SETUP
-#line 602 "./util/configlexer.lex"
+#line 603 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 4883 "<stdout>"
+#line 4900 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5177,7 +5193,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3044 )
+			if ( yy_current_state >= 3054 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5205,11 +5221,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3044 )
+		if ( yy_current_state >= 3054 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3043);
+	yy_is_jam = (yy_current_state == 3053);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -5848,6 +5864,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 602 "./util/configlexer.lex"
+#line 603 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 1d7a38681..c445c433b 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -248,6 +248,7 @@ tls-additional-port{COLON}	{ YDVAR(1, VAR_TLS_ADDITIONAL_PORT) }
 tls-session-ticket-keys{COLON}	{ YDVAR(1, VAR_TLS_SESSION_TICKET_KEYS) }
 tls-ciphers{COLON}		{ YDVAR(1, VAR_TLS_CIPHERS) }
 tls-ciphersuites{COLON}		{ YDVAR(1, VAR_TLS_CIPHERSUITES) }
+https-port{COLON}		{ YDVAR(1, VAR_HTTPS_PORT) }
 use-systemd{COLON}		{ YDVAR(1, VAR_USE_SYSTEMD) }
 do-daemonize{COLON}		{ YDVAR(1, VAR_DO_DAEMONIZE) }
 interface{COLON}		{ YDVAR(1, VAR_INTERFACE) }
diff --git a/util/configparser.c b/util/configparser.c
index 6d792c698..830b79915 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.1.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
-   Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,14 +40,11 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
-
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.4.1"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -65,8 +61,8 @@
 
 
 
-/* First part of user prologue.  */
-#line 38 "./util/configparser.y"
+/* Copy the first part of user declarations.  */
+#line 38 "./util/configparser.y" /* yacc.c:339  */
 
 #include "config.h"
 
@@ -95,17 +91,13 @@ extern struct config_parser_state* cfg_parser;
 #endif
 
 
-#line 99 "util/configparser.c"
+#line 95 "util/configparser.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
-#  if defined __cplusplus
-#   if 201103L <= __cplusplus
-#    define YY_NULLPTR nullptr
-#   else
-#    define YY_NULLPTR 0
-#   endif
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
 #  else
-#   define YY_NULLPTR ((void*)0)
+#   define YY_NULLPTR 0
 #  endif
 # endif
 
@@ -117,8 +109,8 @@ extern struct config_parser_state* cfg_parser;
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Use api.header.include to #include this header
-   instead of duplicating it here.  */
+/* In a future release of Bison, this section will be replaced
+   by #include "configparser.h".  */
 #ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
 # define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
 /* Debug traces.  */
@@ -272,150 +264,151 @@ extern int yydebug;
     VAR_STUB_SSL_UPSTREAM = 393,
     VAR_FORWARD_SSL_UPSTREAM = 394,
     VAR_TLS_CERT_BUNDLE = 395,
-    VAR_STUB_FIRST = 396,
-    VAR_MINIMAL_RESPONSES = 397,
-    VAR_RRSET_ROUNDROBIN = 398,
-    VAR_MAX_UDP_SIZE = 399,
-    VAR_DELAY_CLOSE = 400,
-    VAR_UNBLOCK_LAN_ZONES = 401,
-    VAR_INSECURE_LAN_ZONES = 402,
-    VAR_INFRA_CACHE_MIN_RTT = 403,
-    VAR_DNS64_PREFIX = 404,
-    VAR_DNS64_SYNTHALL = 405,
-    VAR_DNS64_IGNORE_AAAA = 406,
-    VAR_DNSTAP = 407,
-    VAR_DNSTAP_ENABLE = 408,
-    VAR_DNSTAP_SOCKET_PATH = 409,
-    VAR_DNSTAP_IP = 410,
-    VAR_DNSTAP_TLS = 411,
-    VAR_DNSTAP_TLS_SERVER_NAME = 412,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 413,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415,
-    VAR_DNSTAP_SEND_IDENTITY = 416,
-    VAR_DNSTAP_SEND_VERSION = 417,
-    VAR_DNSTAP_IDENTITY = 418,
-    VAR_DNSTAP_VERSION = 419,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425,
-    VAR_RESPONSE_IP_TAG = 426,
-    VAR_RESPONSE_IP = 427,
-    VAR_RESPONSE_IP_DATA = 428,
-    VAR_HARDEN_ALGO_DOWNGRADE = 429,
-    VAR_IP_TRANSPARENT = 430,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 431,
-    VAR_IP_RATELIMIT = 432,
-    VAR_IP_RATELIMIT_SLABS = 433,
-    VAR_IP_RATELIMIT_SIZE = 434,
-    VAR_RATELIMIT = 435,
-    VAR_RATELIMIT_SLABS = 436,
-    VAR_RATELIMIT_SIZE = 437,
-    VAR_RATELIMIT_FOR_DOMAIN = 438,
-    VAR_RATELIMIT_BELOW_DOMAIN = 439,
-    VAR_IP_RATELIMIT_FACTOR = 440,
-    VAR_RATELIMIT_FACTOR = 441,
-    VAR_SEND_CLIENT_SUBNET = 442,
-    VAR_CLIENT_SUBNET_ZONE = 443,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 444,
-    VAR_CLIENT_SUBNET_OPCODE = 445,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 446,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 447,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 448,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 449,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 450,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 451,
-    VAR_CAPS_WHITELIST = 452,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 453,
-    VAR_PERMIT_SMALL_HOLDDOWN = 454,
-    VAR_QNAME_MINIMISATION = 455,
-    VAR_QNAME_MINIMISATION_STRICT = 456,
-    VAR_IP_FREEBIND = 457,
-    VAR_DEFINE_TAG = 458,
-    VAR_LOCAL_ZONE_TAG = 459,
-    VAR_ACCESS_CONTROL_TAG = 460,
-    VAR_LOCAL_ZONE_OVERRIDE = 461,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 462,
-    VAR_ACCESS_CONTROL_TAG_DATA = 463,
-    VAR_VIEW = 464,
-    VAR_ACCESS_CONTROL_VIEW = 465,
-    VAR_VIEW_FIRST = 466,
-    VAR_SERVE_EXPIRED = 467,
-    VAR_SERVE_EXPIRED_TTL = 468,
-    VAR_SERVE_EXPIRED_TTL_RESET = 469,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 470,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 471,
-    VAR_FAKE_DSA = 472,
-    VAR_FAKE_SHA1 = 473,
-    VAR_LOG_IDENTITY = 474,
-    VAR_HIDE_TRUSTANCHOR = 475,
-    VAR_TRUST_ANCHOR_SIGNALING = 476,
-    VAR_AGGRESSIVE_NSEC = 477,
-    VAR_USE_SYSTEMD = 478,
-    VAR_SHM_ENABLE = 479,
-    VAR_SHM_KEY = 480,
-    VAR_ROOT_KEY_SENTINEL = 481,
-    VAR_DNSCRYPT = 482,
-    VAR_DNSCRYPT_ENABLE = 483,
-    VAR_DNSCRYPT_PORT = 484,
-    VAR_DNSCRYPT_PROVIDER = 485,
-    VAR_DNSCRYPT_SECRET_KEY = 486,
-    VAR_DNSCRYPT_PROVIDER_CERT = 487,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 488,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 489,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 490,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 491,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 492,
-    VAR_IPSECMOD_ENABLED = 493,
-    VAR_IPSECMOD_HOOK = 494,
-    VAR_IPSECMOD_IGNORE_BOGUS = 495,
-    VAR_IPSECMOD_MAX_TTL = 496,
-    VAR_IPSECMOD_WHITELIST = 497,
-    VAR_IPSECMOD_STRICT = 498,
-    VAR_CACHEDB = 499,
-    VAR_CACHEDB_BACKEND = 500,
-    VAR_CACHEDB_SECRETSEED = 501,
-    VAR_CACHEDB_REDISHOST = 502,
-    VAR_CACHEDB_REDISPORT = 503,
-    VAR_CACHEDB_REDISTIMEOUT = 504,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 505,
-    VAR_FOR_UPSTREAM = 506,
-    VAR_AUTH_ZONE = 507,
-    VAR_ZONEFILE = 508,
-    VAR_MASTER = 509,
-    VAR_URL = 510,
-    VAR_FOR_DOWNSTREAM = 511,
-    VAR_FALLBACK_ENABLED = 512,
-    VAR_TLS_ADDITIONAL_PORT = 513,
-    VAR_LOW_RTT = 514,
-    VAR_LOW_RTT_PERMIL = 515,
-    VAR_FAST_SERVER_PERMIL = 516,
-    VAR_FAST_SERVER_NUM = 517,
-    VAR_ALLOW_NOTIFY = 518,
-    VAR_TLS_WIN_CERT = 519,
-    VAR_TCP_CONNECTION_LIMIT = 520,
-    VAR_FORWARD_NO_CACHE = 521,
-    VAR_STUB_NO_CACHE = 522,
-    VAR_LOG_SERVFAIL = 523,
-    VAR_DENY_ANY = 524,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 525,
-    VAR_LOG_TAG_QUERYREPLY = 526,
-    VAR_STREAM_WAIT_SIZE = 527,
-    VAR_TLS_CIPHERS = 528,
-    VAR_TLS_CIPHERSUITES = 529,
-    VAR_IPSET = 530,
-    VAR_IPSET_NAME_V4 = 531,
-    VAR_IPSET_NAME_V6 = 532,
-    VAR_TLS_SESSION_TICKET_KEYS = 533,
-    VAR_RPZ = 534,
-    VAR_TAGS = 535,
-    VAR_RPZ_ACTION_OVERRIDE = 536,
-    VAR_RPZ_CNAME_OVERRIDE = 537,
-    VAR_RPZ_LOG = 538,
-    VAR_RPZ_LOG_NAME = 539
+    VAR_HTTPS_PORT = 396,
+    VAR_STUB_FIRST = 397,
+    VAR_MINIMAL_RESPONSES = 398,
+    VAR_RRSET_ROUNDROBIN = 399,
+    VAR_MAX_UDP_SIZE = 400,
+    VAR_DELAY_CLOSE = 401,
+    VAR_UNBLOCK_LAN_ZONES = 402,
+    VAR_INSECURE_LAN_ZONES = 403,
+    VAR_INFRA_CACHE_MIN_RTT = 404,
+    VAR_DNS64_PREFIX = 405,
+    VAR_DNS64_SYNTHALL = 406,
+    VAR_DNS64_IGNORE_AAAA = 407,
+    VAR_DNSTAP = 408,
+    VAR_DNSTAP_ENABLE = 409,
+    VAR_DNSTAP_SOCKET_PATH = 410,
+    VAR_DNSTAP_IP = 411,
+    VAR_DNSTAP_TLS = 412,
+    VAR_DNSTAP_TLS_SERVER_NAME = 413,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 414,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 415,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 416,
+    VAR_DNSTAP_SEND_IDENTITY = 417,
+    VAR_DNSTAP_SEND_VERSION = 418,
+    VAR_DNSTAP_IDENTITY = 419,
+    VAR_DNSTAP_VERSION = 420,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 421,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 422,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 423,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 424,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 425,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 426,
+    VAR_RESPONSE_IP_TAG = 427,
+    VAR_RESPONSE_IP = 428,
+    VAR_RESPONSE_IP_DATA = 429,
+    VAR_HARDEN_ALGO_DOWNGRADE = 430,
+    VAR_IP_TRANSPARENT = 431,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 432,
+    VAR_IP_RATELIMIT = 433,
+    VAR_IP_RATELIMIT_SLABS = 434,
+    VAR_IP_RATELIMIT_SIZE = 435,
+    VAR_RATELIMIT = 436,
+    VAR_RATELIMIT_SLABS = 437,
+    VAR_RATELIMIT_SIZE = 438,
+    VAR_RATELIMIT_FOR_DOMAIN = 439,
+    VAR_RATELIMIT_BELOW_DOMAIN = 440,
+    VAR_IP_RATELIMIT_FACTOR = 441,
+    VAR_RATELIMIT_FACTOR = 442,
+    VAR_SEND_CLIENT_SUBNET = 443,
+    VAR_CLIENT_SUBNET_ZONE = 444,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445,
+    VAR_CLIENT_SUBNET_OPCODE = 446,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 447,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 448,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 449,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 450,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 451,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 452,
+    VAR_CAPS_WHITELIST = 453,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 454,
+    VAR_PERMIT_SMALL_HOLDDOWN = 455,
+    VAR_QNAME_MINIMISATION = 456,
+    VAR_QNAME_MINIMISATION_STRICT = 457,
+    VAR_IP_FREEBIND = 458,
+    VAR_DEFINE_TAG = 459,
+    VAR_LOCAL_ZONE_TAG = 460,
+    VAR_ACCESS_CONTROL_TAG = 461,
+    VAR_LOCAL_ZONE_OVERRIDE = 462,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 463,
+    VAR_ACCESS_CONTROL_TAG_DATA = 464,
+    VAR_VIEW = 465,
+    VAR_ACCESS_CONTROL_VIEW = 466,
+    VAR_VIEW_FIRST = 467,
+    VAR_SERVE_EXPIRED = 468,
+    VAR_SERVE_EXPIRED_TTL = 469,
+    VAR_SERVE_EXPIRED_TTL_RESET = 470,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 471,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472,
+    VAR_FAKE_DSA = 473,
+    VAR_FAKE_SHA1 = 474,
+    VAR_LOG_IDENTITY = 475,
+    VAR_HIDE_TRUSTANCHOR = 476,
+    VAR_TRUST_ANCHOR_SIGNALING = 477,
+    VAR_AGGRESSIVE_NSEC = 478,
+    VAR_USE_SYSTEMD = 479,
+    VAR_SHM_ENABLE = 480,
+    VAR_SHM_KEY = 481,
+    VAR_ROOT_KEY_SENTINEL = 482,
+    VAR_DNSCRYPT = 483,
+    VAR_DNSCRYPT_ENABLE = 484,
+    VAR_DNSCRYPT_PORT = 485,
+    VAR_DNSCRYPT_PROVIDER = 486,
+    VAR_DNSCRYPT_SECRET_KEY = 487,
+    VAR_DNSCRYPT_PROVIDER_CERT = 488,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 489,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 490,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 491,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 492,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 493,
+    VAR_IPSECMOD_ENABLED = 494,
+    VAR_IPSECMOD_HOOK = 495,
+    VAR_IPSECMOD_IGNORE_BOGUS = 496,
+    VAR_IPSECMOD_MAX_TTL = 497,
+    VAR_IPSECMOD_WHITELIST = 498,
+    VAR_IPSECMOD_STRICT = 499,
+    VAR_CACHEDB = 500,
+    VAR_CACHEDB_BACKEND = 501,
+    VAR_CACHEDB_SECRETSEED = 502,
+    VAR_CACHEDB_REDISHOST = 503,
+    VAR_CACHEDB_REDISPORT = 504,
+    VAR_CACHEDB_REDISTIMEOUT = 505,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 506,
+    VAR_FOR_UPSTREAM = 507,
+    VAR_AUTH_ZONE = 508,
+    VAR_ZONEFILE = 509,
+    VAR_MASTER = 510,
+    VAR_URL = 511,
+    VAR_FOR_DOWNSTREAM = 512,
+    VAR_FALLBACK_ENABLED = 513,
+    VAR_TLS_ADDITIONAL_PORT = 514,
+    VAR_LOW_RTT = 515,
+    VAR_LOW_RTT_PERMIL = 516,
+    VAR_FAST_SERVER_PERMIL = 517,
+    VAR_FAST_SERVER_NUM = 518,
+    VAR_ALLOW_NOTIFY = 519,
+    VAR_TLS_WIN_CERT = 520,
+    VAR_TCP_CONNECTION_LIMIT = 521,
+    VAR_FORWARD_NO_CACHE = 522,
+    VAR_STUB_NO_CACHE = 523,
+    VAR_LOG_SERVFAIL = 524,
+    VAR_DENY_ANY = 525,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 526,
+    VAR_LOG_TAG_QUERYREPLY = 527,
+    VAR_STREAM_WAIT_SIZE = 528,
+    VAR_TLS_CIPHERS = 529,
+    VAR_TLS_CIPHERSUITES = 530,
+    VAR_IPSET = 531,
+    VAR_IPSET_NAME_V4 = 532,
+    VAR_IPSET_NAME_V6 = 533,
+    VAR_TLS_SESSION_TICKET_KEYS = 534,
+    VAR_RPZ = 535,
+    VAR_TAGS = 536,
+    VAR_RPZ_ACTION_OVERRIDE = 537,
+    VAR_RPZ_CNAME_OVERRIDE = 538,
+    VAR_RPZ_LOG = 539,
+    VAR_RPZ_LOG_NAME = 540
   };
 #endif
 /* Tokens.  */
@@ -557,162 +550,164 @@ extern int yydebug;
 #define VAR_STUB_SSL_UPSTREAM 393
 #define VAR_FORWARD_SSL_UPSTREAM 394
 #define VAR_TLS_CERT_BUNDLE 395
-#define VAR_STUB_FIRST 396
-#define VAR_MINIMAL_RESPONSES 397
-#define VAR_RRSET_ROUNDROBIN 398
-#define VAR_MAX_UDP_SIZE 399
-#define VAR_DELAY_CLOSE 400
-#define VAR_UNBLOCK_LAN_ZONES 401
-#define VAR_INSECURE_LAN_ZONES 402
-#define VAR_INFRA_CACHE_MIN_RTT 403
-#define VAR_DNS64_PREFIX 404
-#define VAR_DNS64_SYNTHALL 405
-#define VAR_DNS64_IGNORE_AAAA 406
-#define VAR_DNSTAP 407
-#define VAR_DNSTAP_ENABLE 408
-#define VAR_DNSTAP_SOCKET_PATH 409
-#define VAR_DNSTAP_IP 410
-#define VAR_DNSTAP_TLS 411
-#define VAR_DNSTAP_TLS_SERVER_NAME 412
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 413
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 414
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 415
-#define VAR_DNSTAP_SEND_IDENTITY 416
-#define VAR_DNSTAP_SEND_VERSION 417
-#define VAR_DNSTAP_IDENTITY 418
-#define VAR_DNSTAP_VERSION 419
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 420
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 421
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 422
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 423
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 424
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 425
-#define VAR_RESPONSE_IP_TAG 426
-#define VAR_RESPONSE_IP 427
-#define VAR_RESPONSE_IP_DATA 428
-#define VAR_HARDEN_ALGO_DOWNGRADE 429
-#define VAR_IP_TRANSPARENT 430
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 431
-#define VAR_IP_RATELIMIT 432
-#define VAR_IP_RATELIMIT_SLABS 433
-#define VAR_IP_RATELIMIT_SIZE 434
-#define VAR_RATELIMIT 435
-#define VAR_RATELIMIT_SLABS 436
-#define VAR_RATELIMIT_SIZE 437
-#define VAR_RATELIMIT_FOR_DOMAIN 438
-#define VAR_RATELIMIT_BELOW_DOMAIN 439
-#define VAR_IP_RATELIMIT_FACTOR 440
-#define VAR_RATELIMIT_FACTOR 441
-#define VAR_SEND_CLIENT_SUBNET 442
-#define VAR_CLIENT_SUBNET_ZONE 443
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 444
-#define VAR_CLIENT_SUBNET_OPCODE 445
-#define VAR_MAX_CLIENT_SUBNET_IPV4 446
-#define VAR_MAX_CLIENT_SUBNET_IPV6 447
-#define VAR_MIN_CLIENT_SUBNET_IPV4 448
-#define VAR_MIN_CLIENT_SUBNET_IPV6 449
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 450
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 451
-#define VAR_CAPS_WHITELIST 452
-#define VAR_CACHE_MAX_NEGATIVE_TTL 453
-#define VAR_PERMIT_SMALL_HOLDDOWN 454
-#define VAR_QNAME_MINIMISATION 455
-#define VAR_QNAME_MINIMISATION_STRICT 456
-#define VAR_IP_FREEBIND 457
-#define VAR_DEFINE_TAG 458
-#define VAR_LOCAL_ZONE_TAG 459
-#define VAR_ACCESS_CONTROL_TAG 460
-#define VAR_LOCAL_ZONE_OVERRIDE 461
-#define VAR_ACCESS_CONTROL_TAG_ACTION 462
-#define VAR_ACCESS_CONTROL_TAG_DATA 463
-#define VAR_VIEW 464
-#define VAR_ACCESS_CONTROL_VIEW 465
-#define VAR_VIEW_FIRST 466
-#define VAR_SERVE_EXPIRED 467
-#define VAR_SERVE_EXPIRED_TTL 468
-#define VAR_SERVE_EXPIRED_TTL_RESET 469
-#define VAR_SERVE_EXPIRED_REPLY_TTL 470
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 471
-#define VAR_FAKE_DSA 472
-#define VAR_FAKE_SHA1 473
-#define VAR_LOG_IDENTITY 474
-#define VAR_HIDE_TRUSTANCHOR 475
-#define VAR_TRUST_ANCHOR_SIGNALING 476
-#define VAR_AGGRESSIVE_NSEC 477
-#define VAR_USE_SYSTEMD 478
-#define VAR_SHM_ENABLE 479
-#define VAR_SHM_KEY 480
-#define VAR_ROOT_KEY_SENTINEL 481
-#define VAR_DNSCRYPT 482
-#define VAR_DNSCRYPT_ENABLE 483
-#define VAR_DNSCRYPT_PORT 484
-#define VAR_DNSCRYPT_PROVIDER 485
-#define VAR_DNSCRYPT_SECRET_KEY 486
-#define VAR_DNSCRYPT_PROVIDER_CERT 487
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 488
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 489
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 490
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 491
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 492
-#define VAR_IPSECMOD_ENABLED 493
-#define VAR_IPSECMOD_HOOK 494
-#define VAR_IPSECMOD_IGNORE_BOGUS 495
-#define VAR_IPSECMOD_MAX_TTL 496
-#define VAR_IPSECMOD_WHITELIST 497
-#define VAR_IPSECMOD_STRICT 498
-#define VAR_CACHEDB 499
-#define VAR_CACHEDB_BACKEND 500
-#define VAR_CACHEDB_SECRETSEED 501
-#define VAR_CACHEDB_REDISHOST 502
-#define VAR_CACHEDB_REDISPORT 503
-#define VAR_CACHEDB_REDISTIMEOUT 504
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 505
-#define VAR_FOR_UPSTREAM 506
-#define VAR_AUTH_ZONE 507
-#define VAR_ZONEFILE 508
-#define VAR_MASTER 509
-#define VAR_URL 510
-#define VAR_FOR_DOWNSTREAM 511
-#define VAR_FALLBACK_ENABLED 512
-#define VAR_TLS_ADDITIONAL_PORT 513
-#define VAR_LOW_RTT 514
-#define VAR_LOW_RTT_PERMIL 515
-#define VAR_FAST_SERVER_PERMIL 516
-#define VAR_FAST_SERVER_NUM 517
-#define VAR_ALLOW_NOTIFY 518
-#define VAR_TLS_WIN_CERT 519
-#define VAR_TCP_CONNECTION_LIMIT 520
-#define VAR_FORWARD_NO_CACHE 521
-#define VAR_STUB_NO_CACHE 522
-#define VAR_LOG_SERVFAIL 523
-#define VAR_DENY_ANY 524
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 525
-#define VAR_LOG_TAG_QUERYREPLY 526
-#define VAR_STREAM_WAIT_SIZE 527
-#define VAR_TLS_CIPHERS 528
-#define VAR_TLS_CIPHERSUITES 529
-#define VAR_IPSET 530
-#define VAR_IPSET_NAME_V4 531
-#define VAR_IPSET_NAME_V6 532
-#define VAR_TLS_SESSION_TICKET_KEYS 533
-#define VAR_RPZ 534
-#define VAR_TAGS 535
-#define VAR_RPZ_ACTION_OVERRIDE 536
-#define VAR_RPZ_CNAME_OVERRIDE 537
-#define VAR_RPZ_LOG 538
-#define VAR_RPZ_LOG_NAME 539
+#define VAR_HTTPS_PORT 396
+#define VAR_STUB_FIRST 397
+#define VAR_MINIMAL_RESPONSES 398
+#define VAR_RRSET_ROUNDROBIN 399
+#define VAR_MAX_UDP_SIZE 400
+#define VAR_DELAY_CLOSE 401
+#define VAR_UNBLOCK_LAN_ZONES 402
+#define VAR_INSECURE_LAN_ZONES 403
+#define VAR_INFRA_CACHE_MIN_RTT 404
+#define VAR_DNS64_PREFIX 405
+#define VAR_DNS64_SYNTHALL 406
+#define VAR_DNS64_IGNORE_AAAA 407
+#define VAR_DNSTAP 408
+#define VAR_DNSTAP_ENABLE 409
+#define VAR_DNSTAP_SOCKET_PATH 410
+#define VAR_DNSTAP_IP 411
+#define VAR_DNSTAP_TLS 412
+#define VAR_DNSTAP_TLS_SERVER_NAME 413
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 414
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 415
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 416
+#define VAR_DNSTAP_SEND_IDENTITY 417
+#define VAR_DNSTAP_SEND_VERSION 418
+#define VAR_DNSTAP_IDENTITY 419
+#define VAR_DNSTAP_VERSION 420
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 421
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 422
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 423
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 424
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 425
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 426
+#define VAR_RESPONSE_IP_TAG 427
+#define VAR_RESPONSE_IP 428
+#define VAR_RESPONSE_IP_DATA 429
+#define VAR_HARDEN_ALGO_DOWNGRADE 430
+#define VAR_IP_TRANSPARENT 431
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 432
+#define VAR_IP_RATELIMIT 433
+#define VAR_IP_RATELIMIT_SLABS 434
+#define VAR_IP_RATELIMIT_SIZE 435
+#define VAR_RATELIMIT 436
+#define VAR_RATELIMIT_SLABS 437
+#define VAR_RATELIMIT_SIZE 438
+#define VAR_RATELIMIT_FOR_DOMAIN 439
+#define VAR_RATELIMIT_BELOW_DOMAIN 440
+#define VAR_IP_RATELIMIT_FACTOR 441
+#define VAR_RATELIMIT_FACTOR 442
+#define VAR_SEND_CLIENT_SUBNET 443
+#define VAR_CLIENT_SUBNET_ZONE 444
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 445
+#define VAR_CLIENT_SUBNET_OPCODE 446
+#define VAR_MAX_CLIENT_SUBNET_IPV4 447
+#define VAR_MAX_CLIENT_SUBNET_IPV6 448
+#define VAR_MIN_CLIENT_SUBNET_IPV4 449
+#define VAR_MIN_CLIENT_SUBNET_IPV6 450
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 451
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 452
+#define VAR_CAPS_WHITELIST 453
+#define VAR_CACHE_MAX_NEGATIVE_TTL 454
+#define VAR_PERMIT_SMALL_HOLDDOWN 455
+#define VAR_QNAME_MINIMISATION 456
+#define VAR_QNAME_MINIMISATION_STRICT 457
+#define VAR_IP_FREEBIND 458
+#define VAR_DEFINE_TAG 459
+#define VAR_LOCAL_ZONE_TAG 460
+#define VAR_ACCESS_CONTROL_TAG 461
+#define VAR_LOCAL_ZONE_OVERRIDE 462
+#define VAR_ACCESS_CONTROL_TAG_ACTION 463
+#define VAR_ACCESS_CONTROL_TAG_DATA 464
+#define VAR_VIEW 465
+#define VAR_ACCESS_CONTROL_VIEW 466
+#define VAR_VIEW_FIRST 467
+#define VAR_SERVE_EXPIRED 468
+#define VAR_SERVE_EXPIRED_TTL 469
+#define VAR_SERVE_EXPIRED_TTL_RESET 470
+#define VAR_SERVE_EXPIRED_REPLY_TTL 471
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 472
+#define VAR_FAKE_DSA 473
+#define VAR_FAKE_SHA1 474
+#define VAR_LOG_IDENTITY 475
+#define VAR_HIDE_TRUSTANCHOR 476
+#define VAR_TRUST_ANCHOR_SIGNALING 477
+#define VAR_AGGRESSIVE_NSEC 478
+#define VAR_USE_SYSTEMD 479
+#define VAR_SHM_ENABLE 480
+#define VAR_SHM_KEY 481
+#define VAR_ROOT_KEY_SENTINEL 482
+#define VAR_DNSCRYPT 483
+#define VAR_DNSCRYPT_ENABLE 484
+#define VAR_DNSCRYPT_PORT 485
+#define VAR_DNSCRYPT_PROVIDER 486
+#define VAR_DNSCRYPT_SECRET_KEY 487
+#define VAR_DNSCRYPT_PROVIDER_CERT 488
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 489
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 490
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 491
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 492
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 493
+#define VAR_IPSECMOD_ENABLED 494
+#define VAR_IPSECMOD_HOOK 495
+#define VAR_IPSECMOD_IGNORE_BOGUS 496
+#define VAR_IPSECMOD_MAX_TTL 497
+#define VAR_IPSECMOD_WHITELIST 498
+#define VAR_IPSECMOD_STRICT 499
+#define VAR_CACHEDB 500
+#define VAR_CACHEDB_BACKEND 501
+#define VAR_CACHEDB_SECRETSEED 502
+#define VAR_CACHEDB_REDISHOST 503
+#define VAR_CACHEDB_REDISPORT 504
+#define VAR_CACHEDB_REDISTIMEOUT 505
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 506
+#define VAR_FOR_UPSTREAM 507
+#define VAR_AUTH_ZONE 508
+#define VAR_ZONEFILE 509
+#define VAR_MASTER 510
+#define VAR_URL 511
+#define VAR_FOR_DOWNSTREAM 512
+#define VAR_FALLBACK_ENABLED 513
+#define VAR_TLS_ADDITIONAL_PORT 514
+#define VAR_LOW_RTT 515
+#define VAR_LOW_RTT_PERMIL 516
+#define VAR_FAST_SERVER_PERMIL 517
+#define VAR_FAST_SERVER_NUM 518
+#define VAR_ALLOW_NOTIFY 519
+#define VAR_TLS_WIN_CERT 520
+#define VAR_TCP_CONNECTION_LIMIT 521
+#define VAR_FORWARD_NO_CACHE 522
+#define VAR_STUB_NO_CACHE 523
+#define VAR_LOG_SERVFAIL 524
+#define VAR_DENY_ANY 525
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 526
+#define VAR_LOG_TAG_QUERYREPLY 527
+#define VAR_STREAM_WAIT_SIZE 528
+#define VAR_TLS_CIPHERS 529
+#define VAR_TLS_CIPHERSUITES 530
+#define VAR_IPSET 531
+#define VAR_IPSET_NAME_V4 532
+#define VAR_IPSET_NAME_V6 533
+#define VAR_TLS_SESSION_TICKET_KEYS 534
+#define VAR_RPZ 535
+#define VAR_TAGS 536
+#define VAR_RPZ_ACTION_OVERRIDE 537
+#define VAR_RPZ_CNAME_OVERRIDE 538
+#define VAR_RPZ_LOG 539
+#define VAR_RPZ_LOG_NAME 540
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
 union YYSTYPE
 {
-#line 66 "./util/configparser.y"
+#line 66 "./util/configparser.y" /* yacc.c:355  */
 
 	char*	str;
 
-#line 714 "util/configparser.c"
-
+#line 709 "util/configparser.c" /* yacc.c:355  */
 };
+
 typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -725,7 +720,9 @@ int yyparse (void);
 
 #endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
 
+/* Copy the second part of user declarations.  */
 
+#line 726 "util/configparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -746,13 +743,13 @@ typedef signed char yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short yytype_uint16;
+typedef unsigned short int yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short yytype_int16;
+typedef short int yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -764,7 +761,7 @@ typedef short yytype_int16;
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned
+#  define YYSIZE_T unsigned int
 # endif
 #endif
 
@@ -800,6 +797,15 @@ typedef short yytype_int16;
 # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
 #endif
 
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # define YYUSE(E) ((void) (E))
@@ -807,7 +813,7 @@ typedef short yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -827,8 +833,6 @@ typedef short yytype_int16;
 #endif
 
 
-#define YY_ASSERT(E) ((void) (0 && (E)))
-
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -960,27 +964,27 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   604
+#define YYLAST   606
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  285
+#define YYNTOKENS  286
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  308
+#define YYNNTS  309
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  594
+#define YYNRULES  596
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  884
+#define YYNSTATES  887
 
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   539
+#define YYMAXUTOK   540
 
-/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
-  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex.  */
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint16 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1036,73 +1040,74 @@ static const yytype_uint16 yytranslate[] =
      245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
      255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   177,   177,   177,   178,   178,   179,   179,   180,   180,
-     180,   181,   181,   182,   182,   183,   187,   192,   193,   194,
-     194,   194,   195,   195,   196,   196,   196,   197,   197,   198,
-     198,   198,   199,   199,   200,   200,   200,   201,   201,   201,
-     202,   202,   203,   203,   204,   204,   205,   205,   206,   206,
-     207,   207,   208,   208,   209,   209,   210,   210,   210,   211,
-     211,   211,   212,   212,   212,   213,   213,   214,   214,   215,
-     215,   216,   216,   217,   217,   217,   218,   218,   219,   219,
-     220,   220,   220,   221,   221,   222,   222,   223,   223,   224,
-     224,   224,   225,   225,   226,   226,   227,   227,   228,   228,
-     229,   229,   230,   230,   230,   231,   231,   232,   232,   232,
-     233,   233,   233,   234,   234,   234,   235,   235,   235,   235,
-     236,   237,   237,   237,   238,   238,   238,   239,   239,   240,
-     240,   241,   241,   241,   242,   242,   243,   243,   243,   244,
-     244,   245,   245,   246,   247,   247,   248,   248,   249,   249,
-     250,   251,   251,   252,   252,   253,   253,   254,   254,   255,
-     255,   256,   256,   256,   257,   257,   258,   258,   259,   259,
-     260,   260,   261,   261,   262,   262,   263,   263,   263,   264,
-     264,   264,   265,   265,   265,   266,   266,   267,   268,   268,
-     269,   269,   270,   270,   271,   271,   272,   272,   272,   273,
-     273,   273,   274,   274,   274,   275,   275,   276,   276,   277,
-     277,   279,   291,   292,   293,   293,   293,   293,   293,   294,
-     294,   296,   308,   309,   310,   310,   310,   310,   311,   311,
-     313,   327,   328,   329,   329,   329,   329,   330,   330,   330,
-     332,   349,   350,   351,   351,   351,   351,   352,   352,   352,
-     353,   356,   375,   392,   400,   410,   418,   435,   436,   437,
-     437,   437,   437,   437,   438,   438,   438,   439,   439,   441,
-     450,   459,   470,   479,   488,   497,   508,   517,   529,   543,
-     558,   569,   586,   603,   620,   637,   652,   667,   680,   695,
-     704,   713,   722,   731,   740,   749,   758,   767,   776,   785,
-     794,   803,   812,   821,   834,   843,   856,   865,   874,   883,
-     890,   897,   906,   913,   922,   930,   937,   944,   952,   961,
-     970,   984,   993,  1002,  1011,  1020,  1029,  1038,  1045,  1052,
-    1078,  1086,  1093,  1100,  1107,  1114,  1122,  1130,  1138,  1145,
-    1156,  1167,  1174,  1183,  1192,  1201,  1208,  1215,  1223,  1231,
-    1241,  1251,  1261,  1269,  1282,  1293,  1301,  1314,  1323,  1332,
-    1341,  1351,  1361,  1369,  1382,  1391,  1399,  1408,  1416,  1429,
-    1438,  1445,  1455,  1465,  1475,  1485,  1495,  1505,  1515,  1525,
-    1532,  1539,  1546,  1555,  1564,  1573,  1582,  1589,  1599,  1619,
-    1626,  1644,  1657,  1670,  1679,  1688,  1697,  1706,  1716,  1726,
-    1737,  1746,  1755,  1764,  1773,  1782,  1791,  1804,  1817,  1826,
-    1833,  1842,  1851,  1860,  1869,  1877,  1890,  1898,  1939,  1946,
-    1961,  1971,  1981,  1988,  1995,  2002,  2011,  2019,  2033,  2054,
-    2075,  2087,  2099,  2111,  2120,  2141,  2151,  2160,  2168,  2176,
-    2189,  2202,  2217,  2232,  2241,  2250,  2256,  2265,  2274,  2284,
-    2294,  2307,  2320,  2332,  2346,  2358,  2372,  2382,  2389,  2396,
-    2405,  2414,  2424,  2434,  2444,  2451,  2458,  2467,  2476,  2486,
-    2496,  2503,  2510,  2517,  2525,  2535,  2545,  2555,  2565,  2604,
-    2614,  2622,  2630,  2645,  2654,  2659,  2660,  2661,  2661,  2661,
-    2662,  2662,  2662,  2663,  2663,  2665,  2675,  2684,  2691,  2698,
-    2705,  2712,  2719,  2726,  2731,  2732,  2733,  2733,  2734,  2734,
-    2734,  2735,  2736,  2736,  2737,  2737,  2738,  2738,  2739,  2740,
-    2741,  2742,  2743,  2744,  2746,  2755,  2762,  2769,  2778,  2785,
-    2792,  2799,  2806,  2815,  2824,  2831,  2838,  2848,  2858,  2868,
-    2878,  2888,  2898,  2903,  2904,  2905,  2907,  2913,  2923,  2930,
-    2939,  2947,  2952,  2953,  2955,  2955,  2955,  2956,  2956,  2957,
-    2958,  2959,  2960,  2961,  2963,  2973,  2982,  2989,  2998,  3005,
-    3014,  3022,  3035,  3043,  3056,  3061,  3062,  3063,  3063,  3064,
-    3064,  3064,  3066,  3078,  3090,  3102,  3117,  3130,  3141,  3146,
-    3147,  3148,  3148,  3150,  3165
+       0,   178,   178,   178,   179,   179,   180,   180,   181,   181,
+     181,   182,   182,   183,   183,   184,   188,   193,   194,   195,
+     195,   195,   196,   196,   197,   197,   197,   198,   198,   199,
+     199,   199,   200,   200,   201,   201,   201,   202,   202,   202,
+     203,   203,   204,   204,   205,   205,   206,   206,   207,   207,
+     208,   208,   209,   209,   210,   210,   211,   211,   211,   212,
+     212,   212,   213,   213,   213,   214,   214,   215,   215,   216,
+     216,   217,   217,   218,   218,   218,   219,   219,   220,   220,
+     221,   221,   221,   222,   222,   223,   223,   224,   224,   225,
+     225,   225,   226,   226,   227,   227,   228,   228,   229,   229,
+     230,   230,   231,   231,   231,   232,   232,   233,   233,   233,
+     234,   234,   234,   235,   235,   235,   236,   236,   236,   236,
+     237,   238,   238,   238,   239,   240,   240,   240,   241,   241,
+     242,   242,   243,   243,   243,   244,   244,   245,   245,   245,
+     246,   246,   247,   247,   248,   249,   249,   250,   250,   251,
+     251,   252,   253,   253,   254,   254,   255,   255,   256,   256,
+     257,   257,   258,   258,   258,   259,   259,   260,   260,   261,
+     261,   262,   262,   263,   263,   264,   264,   265,   265,   265,
+     266,   266,   266,   267,   267,   267,   268,   268,   269,   270,
+     270,   271,   271,   272,   272,   273,   273,   274,   274,   274,
+     275,   275,   275,   276,   276,   276,   277,   277,   278,   278,
+     279,   279,   281,   293,   294,   295,   295,   295,   295,   295,
+     296,   296,   298,   310,   311,   312,   312,   312,   312,   313,
+     313,   315,   329,   330,   331,   331,   331,   331,   332,   332,
+     332,   334,   351,   352,   353,   353,   353,   353,   354,   354,
+     354,   355,   358,   377,   394,   402,   412,   420,   437,   438,
+     439,   439,   439,   439,   439,   440,   440,   440,   441,   441,
+     443,   452,   461,   472,   481,   490,   499,   510,   519,   531,
+     545,   560,   571,   588,   605,   622,   639,   654,   669,   682,
+     697,   706,   715,   724,   733,   742,   751,   760,   769,   778,
+     787,   796,   805,   814,   823,   836,   845,   858,   867,   876,
+     885,   892,   899,   908,   915,   924,   932,   939,   946,   954,
+     963,   972,   981,   995,  1004,  1013,  1022,  1031,  1040,  1049,
+    1056,  1063,  1089,  1097,  1104,  1111,  1118,  1125,  1133,  1141,
+    1149,  1156,  1167,  1178,  1185,  1194,  1203,  1212,  1219,  1226,
+    1234,  1242,  1252,  1262,  1272,  1280,  1293,  1304,  1312,  1325,
+    1334,  1343,  1352,  1362,  1372,  1380,  1393,  1402,  1410,  1419,
+    1427,  1440,  1449,  1456,  1466,  1476,  1486,  1496,  1506,  1516,
+    1526,  1536,  1543,  1550,  1557,  1566,  1575,  1584,  1593,  1600,
+    1610,  1630,  1637,  1655,  1668,  1681,  1690,  1699,  1708,  1717,
+    1727,  1737,  1748,  1757,  1766,  1775,  1784,  1793,  1802,  1815,
+    1828,  1837,  1844,  1853,  1862,  1871,  1880,  1888,  1901,  1909,
+    1950,  1957,  1972,  1982,  1992,  1999,  2006,  2013,  2022,  2030,
+    2044,  2065,  2086,  2098,  2110,  2122,  2131,  2152,  2162,  2171,
+    2179,  2187,  2200,  2213,  2228,  2243,  2252,  2261,  2267,  2276,
+    2285,  2295,  2305,  2318,  2331,  2343,  2357,  2369,  2383,  2393,
+    2400,  2407,  2416,  2425,  2435,  2445,  2455,  2462,  2469,  2478,
+    2487,  2497,  2507,  2514,  2521,  2528,  2536,  2546,  2556,  2566,
+    2576,  2615,  2625,  2633,  2641,  2656,  2665,  2670,  2671,  2672,
+    2672,  2672,  2673,  2673,  2673,  2674,  2674,  2676,  2686,  2695,
+    2702,  2709,  2716,  2723,  2730,  2737,  2742,  2743,  2744,  2744,
+    2745,  2745,  2745,  2746,  2747,  2747,  2748,  2748,  2749,  2749,
+    2750,  2751,  2752,  2753,  2754,  2755,  2757,  2766,  2773,  2780,
+    2789,  2796,  2803,  2810,  2817,  2826,  2835,  2842,  2849,  2859,
+    2869,  2879,  2889,  2899,  2909,  2914,  2915,  2916,  2918,  2924,
+    2934,  2941,  2950,  2958,  2963,  2964,  2966,  2966,  2966,  2967,
+    2967,  2968,  2969,  2970,  2971,  2972,  2974,  2984,  2993,  3000,
+    3009,  3016,  3025,  3033,  3046,  3054,  3067,  3072,  3073,  3074,
+    3074,  3075,  3075,  3075,  3077,  3089,  3101,  3113,  3128,  3141,
+    3152,  3157,  3158,  3159,  3159,  3161,  3176
 };
 #endif
 
@@ -1155,16 +1160,16 @@ static const char *const yytname[] =
   "VAR_LOG_REPLIES", "VAR_LOG_LOCAL_ACTIONS", "VAR_TCP_UPSTREAM",
   "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM",
   "VAR_SSL_PORT", "VAR_FORWARD_FIRST", "VAR_STUB_SSL_UPSTREAM",
-  "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_STUB_FIRST",
-  "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE",
-  "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES",
-  "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL",
-  "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE",
-  "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP", "VAR_DNSTAP_TLS",
-  "VAR_DNSTAP_TLS_SERVER_NAME", "VAR_DNSTAP_TLS_CERT_BUNDLE",
-  "VAR_DNSTAP_TLS_CLIENT_KEY_FILE", "VAR_DNSTAP_TLS_CLIENT_CERT_FILE",
-  "VAR_DNSTAP_SEND_IDENTITY", "VAR_DNSTAP_SEND_VERSION",
-  "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION",
+  "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_HTTPS_PORT",
+  "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN",
+  "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES",
+  "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX",
+  "VAR_DNS64_SYNTHALL", "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP",
+  "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP",
+  "VAR_DNSTAP_TLS", "VAR_DNSTAP_TLS_SERVER_NAME",
+  "VAR_DNSTAP_TLS_CERT_BUNDLE", "VAR_DNSTAP_TLS_CLIENT_KEY_FILE",
+  "VAR_DNSTAP_TLS_CLIENT_CERT_FILE", "VAR_DNSTAP_SEND_IDENTITY",
+  "VAR_DNSTAP_SEND_VERSION", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION",
   "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES",
   "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES",
   "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES",
@@ -1244,9 +1249,9 @@ static const char *const yytname[] =
   "server_tls_cert_bundle", "server_tls_win_cert",
   "server_tls_additional_port", "server_tls_ciphers",
   "server_tls_ciphersuites", "server_tls_session_ticket_keys",
-  "server_use_systemd", "server_do_daemonize", "server_use_syslog",
-  "server_log_time_ascii", "server_log_queries", "server_log_replies",
-  "server_log_tag_queryreply", "server_log_servfail",
+  "server_https_port", "server_use_systemd", "server_do_daemonize",
+  "server_use_syslog", "server_log_time_ascii", "server_log_queries",
+  "server_log_replies", "server_log_tag_queryreply", "server_log_servfail",
   "server_log_local_actions", "server_chroot", "server_username",
   "server_directory", "server_logfile", "server_pidfile",
   "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor",
@@ -1377,14 +1382,14 @@ static const yytype_uint16 yytoknum[] =
      505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   537,   538,   539
+     535,   536,   537,   538,   539,   540
 };
 # endif
 
-#define YYPACT_NINF -269
+#define YYPACT_NINF -271
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-269)))
+  (!!((Yystate) == (-271)))
 
 #define YYTABLE_NINF -1
 
@@ -1395,95 +1400,95 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -269,     0,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,   268,   -42,
-     -37,   -41,   -21,   -43,   -44,   -87,  -106,  -204,  -228,  -268,
-       2,     3,     4,    12,    24,    25,    26,    27,    28,    31,
+    -271,     0,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,   269,   -42,
+     -38,   -41,   -21,   -43,   -44,   -88,  -103,  -205,  -230,  -270,
+       2,     3,    11,    12,    24,    25,    26,    27,    28,    31,
       32,    33,    34,    36,    37,    38,    39,    40,    50,    51,
       52,    53,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    87,    88,    91,    93,    94,    95,    96,
+      82,    83,    84,    87,    88,    92,    93,    94,    95,    96,
       97,    98,    99,   100,   102,   103,   104,   105,   106,   107,
      108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   123,   124,   125,   126,   127,   128,   129,
+     118,   119,   120,   121,   124,   125,   126,   127,   128,   129,
      130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   161,
+     140,   141,   142,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
      162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
      182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,   197,   198,   203,   204,   205,
-     206,   207,   208,   209,   211,   212,   213,   214,   216,   218,
-     221,   233,   235,   236,   237,   238,   239,   240,   241,   243,
+     192,   193,   194,   195,   196,   197,   198,   199,   204,   205,
+     206,   207,   208,   209,   210,   212,   213,   214,   215,   217,
+     220,   222,   234,   236,   237,   238,   239,   240,   241,   242,
      244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
      254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   266,   267,   302,   303,   304,   305,   309,   310,   311,
-     353,   354,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,   355,   356,   357,   358,   359,
-     360,   361,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-     365,   369,   370,   395,   396,   397,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,   399,   410,   411,   412,   413,   414,   415,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,   416,   417,
-     418,   419,   420,   421,   422,   423,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,   424,   425,   426,   427,   428,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,   467,   469,   485,   486,   487,   488,   489,   490,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,   491,   492,
-     493,   494,   495,   502,   503,   504,   505,   506,   507,   509,
-     510,   511,   512,   513,   514,   515,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,   518,  -269,  -269,   521,   524,
-     525,   533,   534,   535,   537,   538,   539,   540,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,   541,
-     542,   543,   544,   545,  -269,  -269,  -269,  -269,  -269,  -269,
-     546,   547,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,   548,   549,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,   550,   551,   552,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,   553,   554,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,   555,   556,   557,   558,   559,
-     560,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,   561,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,   562,  -269,  -269,   563,   564,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,   565,   566,   567,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269
+     264,   265,   267,   268,   303,   304,   305,   306,   310,   311,
+     312,   354,   355,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,   356,   357,   358,
+     359,   360,   361,   362,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,   366,   370,   371,   396,   397,   398,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,   401,   412,   413,   414,   415,
+     416,   417,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+     418,   419,   420,   421,   422,   423,   424,   425,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,   426,   427,   428,
+     429,   430,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,   469,   471,   487,   488,   489,   490,   491,
+     492,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+     493,   494,   495,   496,   497,   504,   505,   506,   507,   508,
+     509,   511,   512,   513,   514,   515,   516,   517,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,   520,  -271,  -271,
+     523,   526,   527,   535,   536,   537,   539,   540,   541,   542,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,   543,   544,   545,   546,   547,  -271,  -271,  -271,  -271,
+    -271,  -271,   548,   549,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,   550,   551,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,   552,   553,   554,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,   555,   556,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,   557,   558,
+     559,   560,   561,   562,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,   563,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,   564,  -271,  -271,   565,   566,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,   567,   568,   569,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1491,9 +1496,9 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    16,   211,   221,   484,   542,   503,   230,
-     551,   574,   240,   588,   256,     3,    18,   213,   223,   232,
-     242,   258,   486,   505,   544,   553,   576,   590,     4,     5,
+       2,     0,     1,    16,   212,   222,   486,   544,   505,   231,
+     553,   576,   241,   590,   257,     3,    18,   214,   224,   233,
+     243,   259,   488,   507,   546,   555,   578,   592,     4,     5,
        6,    10,    14,    15,     8,     9,     7,    11,    12,    13,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1514,144 +1519,144 @@ static const yytype_uint16 yydefact[] =
        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,     0,    17,    19,    20,    83,    86,    95,   182,   183,
-      21,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,    34,    74,    22,    87,    88,    45,    67,    82,    23,
-      24,    27,    28,    25,    26,    29,    30,    31,    32,    33,
-     118,   194,   119,   121,   122,   123,   196,   201,   197,   208,
-     209,   210,   178,    84,    73,    99,   116,   117,   206,   203,
-     120,    35,    36,    37,    38,    39,    75,    89,    90,   105,
-      61,    71,    62,   186,   187,   100,    55,    56,   185,    57,
-      58,   109,   113,   127,   136,   161,   207,   110,    68,    40,
-      41,    42,    97,   128,   129,   130,    43,    44,    46,    47,
-      49,    50,    48,   134,    51,    52,    53,    59,    78,   114,
-      92,   135,    85,   157,    93,    94,   111,   112,   204,    98,
-      54,    76,    79,    60,    63,   101,   102,    77,   158,   103,
-      64,    65,    66,   195,   115,   171,   172,   173,   174,   175,
-     176,   184,   104,    72,   106,   107,   108,   159,    69,    70,
-      91,    80,    81,    96,   124,   125,   205,   126,   131,   132,
-     133,   162,   163,   165,   167,   168,   166,   169,   179,   137,
-     138,   141,   142,   139,   140,   143,   144,   146,   145,   198,
-     200,   199,   160,   170,   188,   190,   189,   191,   192,   193,
-     164,   177,   180,   181,   202,     0,     0,     0,     0,     0,
-       0,     0,   212,   214,   215,   216,   218,   219,   220,   217,
-       0,     0,     0,     0,     0,     0,   222,   224,   225,   226,
-     227,   228,   229,     0,     0,     0,     0,     0,     0,     0,
-     231,   233,   234,   237,   238,   235,   239,   236,     0,     0,
-       0,     0,     0,     0,     0,     0,   241,   243,   244,   245,
-     246,   250,   247,   248,   249,     0,     0,     0,     0,     0,
-     261,   265,   266,   267,   268,   257,   259,   260,   262,   263,
-     264,     0,     0,     0,     0,     0,     0,     0,     0,   485,
-     487,   489,   488,   494,   490,   491,   492,   493,     0,     0,
+       0,     0,     0,    17,    19,    20,    83,    86,    95,   183,
+     184,    21,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,    34,    74,    22,    87,    88,    45,    67,    82,
+      23,    24,    27,    28,    25,    26,    29,    30,    31,    32,
+      33,   118,   195,   119,   121,   122,   123,   197,   202,   198,
+     209,   210,   211,   124,   179,    84,    73,    99,   116,   117,
+     207,   204,   120,    35,    36,    37,    38,    39,    75,    89,
+      90,   105,    61,    71,    62,   187,   188,   100,    55,    56,
+     186,    57,    58,   109,   113,   128,   137,   162,   208,   110,
+      68,    40,    41,    42,    97,   129,   130,   131,    43,    44,
+      46,    47,    49,    50,    48,   135,    51,    52,    53,    59,
+      78,   114,    92,   136,    85,   158,    93,    94,   111,   112,
+     205,    98,    54,    76,    79,    60,    63,   101,   102,    77,
+     159,   103,    64,    65,    66,   196,   115,   172,   173,   174,
+     175,   176,   177,   185,   104,    72,   106,   107,   108,   160,
+      69,    70,    91,    80,    81,    96,   125,   126,   206,   127,
+     132,   133,   134,   163,   164,   166,   168,   169,   167,   170,
+     180,   138,   139,   142,   143,   140,   141,   144,   145,   147,
+     146,   199,   201,   200,   161,   171,   189,   191,   190,   192,
+     193,   194,   165,   178,   181,   182,   203,     0,     0,     0,
+       0,     0,     0,     0,   213,   215,   216,   217,   219,   220,
+     221,   218,     0,     0,     0,     0,     0,     0,   223,   225,
+     226,   227,   228,   229,   230,     0,     0,     0,     0,     0,
+       0,     0,   232,   234,   235,   238,   239,   236,   240,   237,
+       0,     0,     0,     0,     0,     0,     0,     0,   242,   244,
+     245,   246,   247,   251,   248,   249,   250,     0,     0,     0,
+       0,     0,   262,   266,   267,   268,   269,   258,   260,   261,
+     263,   264,   265,     0,     0,     0,     0,     0,     0,     0,
+       0,   487,   489,   491,   490,   496,   492,   493,   494,   495,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   504,   506,   507,   508,
+       0,     0,     0,     0,     0,     0,     0,     0,   506,   508,
      509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,     0,   543,   545,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   552,   554,
-     555,   556,   558,   559,   557,   560,   561,   562,   563,     0,
-       0,     0,     0,     0,   575,   577,   578,   579,   580,   581,
-       0,     0,   589,   591,   592,   270,   269,   276,   289,   287,
-     299,   295,   296,   300,   297,   298,   301,   302,   303,   304,
-     305,   327,   328,   329,   330,   331,   355,   356,   357,   362,
-     363,   292,   364,   365,   368,   366,   367,   370,   371,   372,
-     386,   342,   343,   345,   346,   373,   389,   336,   338,   390,
-     396,   397,   398,   293,   354,   414,   415,   337,   409,   320,
-     288,   332,   387,   393,   374,     0,     0,   418,   294,   271,
-     319,   378,   272,   290,   291,   333,   334,   416,   376,   380,
-     381,   273,   419,   358,   385,   321,   341,   391,   392,   395,
-     408,   335,   412,   410,   411,   347,   353,   382,   383,   348,
-     349,   375,   400,   322,   323,   326,   306,   308,   309,   310,
-     311,   312,   420,   421,   423,   359,   360,   361,   369,   424,
-     425,   426,     0,     0,     0,   377,   350,   547,   435,   439,
-     437,   436,   440,   438,     0,     0,   443,   444,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   379,   394,
-     413,   448,   449,   351,   427,     0,     0,     0,     0,     0,
-       0,   401,   402,   403,   404,   405,   406,   407,   548,   344,
-     339,   399,   318,   274,   275,   340,   450,   452,   451,   453,
-     454,   455,   307,   314,   445,   447,   446,   313,     0,   325,
-     384,   422,   324,   352,   315,   316,   317,   456,   457,   458,
-     462,   461,   459,   460,   463,   464,   465,   466,   468,   467,
-     477,     0,   481,   482,     0,     0,   483,   469,   475,   470,
-     471,   472,   474,   476,   473,   251,   252,   253,   254,   255,
-     495,   497,   496,   499,   500,   501,   502,   498,   524,   525,
-     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
-     536,   537,   538,   539,   540,   541,   546,   564,   565,   566,
-     569,   567,   568,   570,   571,   572,   573,   582,   583,   584,
-     585,   586,   593,   594,   388,   417,   434,   549,   550,   441,
-     442,   428,   429,     0,     0,     0,   433,   587,   478,   479,
-     480,   432,   430,   431
+     519,   520,   521,   522,   523,   524,   525,     0,   545,   547,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     554,   556,   557,   558,   560,   561,   559,   562,   563,   564,
+     565,     0,     0,     0,     0,     0,   577,   579,   580,   581,
+     582,   583,     0,     0,   591,   593,   594,   271,   270,   277,
+     290,   288,   300,   296,   297,   301,   298,   299,   302,   303,
+     304,   305,   306,   329,   330,   331,   332,   333,   357,   358,
+     359,   364,   365,   293,   366,   367,   370,   368,   369,   372,
+     373,   374,   388,   344,   345,   347,   348,   375,   391,   338,
+     340,   392,   398,   399,   400,   294,   356,   416,   417,   339,
+     411,   322,   289,   334,   389,   395,   376,     0,     0,   420,
+     295,   272,   321,   380,   273,   291,   292,   335,   336,   418,
+     378,   382,   383,   274,   421,   360,   387,   323,   343,   393,
+     394,   397,   410,   337,   414,   412,   413,   349,   355,   384,
+     385,   350,   351,   377,   402,   324,   325,   328,   307,   309,
+     310,   311,   312,   313,   319,   422,   423,   425,   361,   362,
+     363,   371,   426,   427,   428,     0,     0,     0,   379,   352,
+     549,   437,   441,   439,   438,   442,   440,     0,     0,   445,
+     446,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   381,   396,   415,   450,   451,   353,   429,     0,     0,
+       0,     0,     0,     0,   403,   404,   405,   406,   407,   408,
+     409,   550,   346,   341,   401,   320,   275,   276,   342,   452,
+     454,   453,   455,   456,   457,   308,   315,   447,   449,   448,
+     314,     0,   327,   386,   424,   326,   354,   316,   317,   318,
+     458,   459,   460,   464,   463,   461,   462,   465,   466,   467,
+     468,   470,   469,   479,     0,   483,   484,     0,     0,   485,
+     471,   477,   472,   473,   474,   476,   478,   475,   252,   253,
+     254,   255,   256,   497,   499,   498,   501,   502,   503,   504,
+     500,   526,   527,   528,   529,   530,   531,   532,   533,   534,
+     535,   536,   537,   538,   539,   540,   541,   542,   543,   548,
+     566,   567,   568,   571,   569,   570,   572,   573,   574,   575,
+     584,   585,   586,   587,   588,   595,   596,   390,   419,   436,
+     551,   552,   443,   444,   430,   431,     0,     0,     0,   435,
+     589,   480,   481,   482,   434,   432,   433
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,   -23,   568,   569,   570,
-     571,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269,
-    -269,  -269,  -269,  -269,  -269,  -269,  -269,  -269
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,   -23,   570,   571,
+     572,   573,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,
+    -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271,  -271
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    15,    16,    28,   232,    17,    29,   432,    18,
-      30,   446,    19,    31,   460,    20,    32,   476,   490,   491,
-     492,   493,   494,    21,    33,   495,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     397,   398,   399,   400,   401,   402,   403,   404,   405,   406,
-     407,   408,   409,   410,   411,   412,   413,   414,   415,   416,
-     417,   418,   419,   433,   434,   435,   436,   437,   438,   439,
-     447,   448,   449,   450,   451,   452,   477,   478,   479,   480,
-     481,   482,   483,   484,   461,   462,   463,   464,   465,   466,
-     467,    22,    34,   509,   510,   511,   512,   513,   514,   515,
-     516,   517,    23,    35,   536,   537,   538,   539,   540,   541,
-     542,   543,   544,   545,   546,   547,   548,   549,   550,   551,
-     552,   553,   554,    24,    36,   556,   557,   420,   421,   422,
-     423,    25,    37,   568,   569,   570,   571,   572,   573,   574,
-     575,   576,   577,   578,    26,    38,   584,   585,   586,   587,
-     588,   589,   424,    27,    39,   592,   593,   594
+      -1,     1,    15,    16,    28,   233,    17,    29,   434,    18,
+      30,   448,    19,    31,   462,    20,    32,   478,   492,   493,
+     494,   495,   496,    21,    33,   497,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
+     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     418,   419,   420,   421,   435,   436,   437,   438,   439,   440,
+     441,   449,   450,   451,   452,   453,   454,   479,   480,   481,
+     482,   483,   484,   485,   486,   463,   464,   465,   466,   467,
+     468,   469,    22,    34,   511,   512,   513,   514,   515,   516,
+     517,   518,   519,    23,    35,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
+     553,   554,   555,   556,    24,    36,   558,   559,   422,   423,
+     424,   425,    25,    37,   570,   571,   572,   573,   574,   575,
+     576,   577,   578,   579,   580,    26,    38,   586,   587,   588,
+     589,   590,   591,   426,    27,    39,   594,   595,   596
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1659,142 +1664,142 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   468,   425,   453,   426,   427,   555,   440,   590,   591,
-     496,     3,   595,   596,   597,   441,   442,   579,   580,   581,
-     582,   583,   598,   468,   558,   559,   560,   561,   562,   563,
-     564,   565,   566,   567,   599,   600,   601,   602,   603,   454,
-     455,   604,   605,   606,   607,     4,   608,   609,   610,   611,
-     612,     5,   501,   502,   503,   504,   505,   506,   507,   508,
-     613,   614,   615,   616,   456,   428,   518,   519,   520,   521,
-     522,   523,   524,   525,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   617,   618,   619,   620,   621,   622,
-     623,   624,   625,   626,   627,     6,   429,   628,   629,   430,
-     443,   630,   444,   631,   632,   633,   634,   635,   636,   637,
-     638,     7,   639,   640,   641,   642,   643,   644,   645,   646,
-     647,   648,   649,   650,   651,   652,   653,   654,   655,   656,
-     657,   457,   458,   658,   659,   660,   661,   662,   663,   664,
-     665,   666,   667,   668,   669,   670,   671,   672,   673,   674,
-     675,   676,     8,   677,   678,   679,   680,   681,   682,   683,
-     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
-     459,   694,   695,   696,   697,   698,   699,   700,   701,   702,
-     703,   704,   705,   706,   707,   708,   709,   710,   711,   712,
-     713,   714,   715,   716,   717,   718,   719,   720,   721,   722,
-     723,   724,   725,   726,   727,   728,   729,   730,   731,     9,
-     470,   471,   472,   732,   733,   734,   735,   736,   737,   738,
-     475,   739,   740,   741,   742,   431,   743,    10,   744,   445,
-     469,   745,   470,   471,   472,   473,   474,   485,   486,   487,
-     488,   489,   475,   746,    11,   747,   748,   749,   750,   751,
-     752,   753,    12,   754,   755,   756,   757,   758,   759,   760,
-     761,   762,   763,   764,   765,   766,   767,   768,   769,   770,
-     771,   772,   773,   774,   775,    13,   776,   777,     0,    14,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,   778,   779,   780,   781,    72,    73,    74,   782,
-     783,   784,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   785,   786,   787,   788,   789,   790,   791,
-     792,   793,   116,   117,   118,   794,   119,   120,   121,   795,
-     796,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   797,   798,   799,   146,   800,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     801,   802,   803,   804,   805,   806,   807,   808,   809,   810,
-     811,   812,   813,   814,   815,   816,   817,   818,   819,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   820,   195,   821,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   822,   823,   824,   825,   826,
-     827,   828,   829,   830,   831,   832,   211,   212,   213,   214,
-     215,   216,   833,   834,   835,   836,   837,   838,   217,   839,
-     840,   841,   842,   843,   844,   845,   218,   219,   846,   220,
-     221,   847,   222,   223,   848,   849,   224,   225,   226,   227,
-     228,   229,   230,   850,   851,   852,   231,   853,   854,   855,
-     856,   857,   858,   859,   860,   861,   862,   863,   864,   865,
-     866,   867,   868,   869,   870,   871,   872,   873,   874,   875,
-     876,   877,   878,   879,   880,   881,   882,   883,     0,     0,
+       2,   470,   427,   455,   428,   429,   442,   592,   593,   557,
+     498,     3,   597,   598,   443,   444,   581,   582,   583,   584,
+     585,   599,   600,   470,   560,   561,   562,   563,   564,   565,
+     566,   567,   568,   569,   601,   602,   603,   604,   605,   456,
+     457,   606,   607,   608,   609,     4,   610,   611,   612,   613,
+     614,     5,   503,   504,   505,   506,   507,   508,   509,   510,
+     615,   616,   617,   618,   458,   430,   520,   521,   522,   523,
+     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
+     534,   535,   536,   537,   619,   620,   621,   622,   623,   624,
+     625,   626,   627,   628,   629,     6,   431,   630,   631,   445,
+     432,   446,   632,   633,   634,   635,   636,   637,   638,   639,
+     640,     7,   641,   642,   643,   644,   645,   646,   647,   648,
+     649,   650,   651,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   459,   460,   661,   662,   663,   664,   665,   666,
+     667,   668,   669,   670,   671,   672,   673,   674,   675,   676,
+     677,   678,   679,     8,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   693,   694,   695,
+     696,   461,   697,   698,   699,   700,   701,   702,   703,   704,
+     705,   706,   707,   708,   709,   710,   711,   712,   713,   714,
+     715,   716,   717,   718,   719,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   733,   734,
+       9,   472,   473,   474,   735,   736,   737,   738,   739,   740,
+     741,   477,   742,   743,   744,   745,   433,   746,    10,   447,
+     747,   471,   748,   472,   473,   474,   475,   476,   487,   488,
+     489,   490,   491,   477,   749,    11,   750,   751,   752,   753,
+     754,   755,   756,    12,   757,   758,   759,   760,   761,   762,
+     763,   764,   765,   766,   767,   768,   769,   770,   771,   772,
+     773,   774,   775,   776,   777,   778,    13,   779,   780,     0,
+      14,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    71,   781,   782,   783,   784,    72,    73,    74,
+     785,   786,   787,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   788,   789,   790,   791,   792,   793,
+     794,   795,   796,   116,   117,   118,   797,   119,   120,   121,
+     798,   799,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   800,   801,   802,   146,
+     147,   803,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   804,   805,   806,   807,   808,   809,   810,   811,
+     812,   813,   814,   815,   816,   817,   818,   819,   820,   821,
+     822,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   823,
+     196,   824,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   825,   826,   827,
+     828,   829,   830,   831,   832,   833,   834,   835,   212,   213,
+     214,   215,   216,   217,   836,   837,   838,   839,   840,   841,
+     218,   842,   843,   844,   845,   846,   847,   848,   219,   220,
+     849,   221,   222,   850,   223,   224,   851,   852,   225,   226,
+     227,   228,   229,   230,   231,   853,   854,   855,   232,   856,
+     857,   858,   859,   860,   861,   862,   863,   864,   865,   866,
+     867,   868,   869,   870,   871,   872,   873,   874,   875,   876,
+     877,   878,   879,   880,   881,   882,   883,   884,   885,   886,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   497,   498,   499,   500
+       0,     0,     0,   499,   500,   501,   502
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    44,    44,    44,    46,    47,   112,    44,   276,   277,
-      33,    11,    10,    10,    10,    52,    53,   245,   246,   247,
-     248,   249,    10,    44,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,    10,    10,    10,    10,    10,    80,
+       0,    44,    44,    44,    46,    47,    44,   277,   278,   112,
+      33,    11,    10,    10,    52,    53,   246,   247,   248,   249,
+     250,    10,    10,    44,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,    10,    10,    10,    10,    10,    80,
       81,    10,    10,    10,    10,    45,    10,    10,    10,    10,
       10,    51,    96,    97,    98,    99,   100,   101,   102,   103,
-      10,    10,    10,    10,   105,   107,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    95,   138,    10,    10,   141,
-     137,    10,   139,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,   105,   107,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    95,   138,    10,    10,   137,
+     142,   139,    10,    10,    10,    10,    10,    10,    10,    10,
       10,   111,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,   172,   173,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,   173,   174,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   152,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,   153,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-     211,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,   212,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   209,
-     253,   254,   255,    10,    10,    10,    10,    10,    10,    10,
-     263,    10,    10,    10,    10,   267,    10,   227,    10,   266,
-     251,    10,   253,   254,   255,   256,   257,   280,   281,   282,
-     283,   284,   263,    10,   244,    10,    10,    10,    10,    10,
-      10,    10,   252,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,   275,    10,    10,    -1,   279,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    10,    10,    10,    10,    48,    49,    50,    10,
-      10,    10,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   104,   105,   106,    10,   108,   109,   110,    10,
-      10,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,    10,    10,    10,   140,    10,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
+     210,   254,   255,   256,    10,    10,    10,    10,    10,    10,
+      10,   264,    10,    10,    10,    10,   268,    10,   228,   267,
+      10,   252,    10,   254,   255,   256,   257,   258,   281,   282,
+     283,   284,   285,   264,    10,   245,    10,    10,    10,    10,
+      10,    10,    10,   253,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,   276,    10,    10,    -1,
+     280,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    10,    10,    10,    10,    48,    49,    50,
+      10,    10,    10,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,   104,   105,   106,    10,   108,   109,   110,
+      10,    10,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,    10,    10,    10,   140,
+     141,    10,   143,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,    10,
+     211,    10,   213,   214,   215,   216,   217,   218,   219,   220,
+     221,   222,   223,   224,   225,   226,   227,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,   239,   240,
+     241,   242,   243,   244,    10,    10,    10,    10,    10,    10,
+     251,    10,    10,    10,    10,    10,    10,    10,   259,   260,
+      10,   262,   263,    10,   265,   266,    10,    10,   269,   270,
+     271,   272,   273,   274,   275,    10,    10,    10,   279,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,    10,   210,    10,
-     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,   224,   225,   226,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,   238,   239,   240,   241,
-     242,   243,    10,    10,    10,    10,    10,    10,   250,    10,
-      10,    10,    10,    10,    10,    10,   258,   259,    10,   261,
-     262,    10,   264,   265,    10,    10,   268,   269,   270,   271,
-     272,   273,   274,    10,    10,    10,   278,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    33,    33,    33,    33
+      -1,    -1,    -1,    33,    33,    33,    33
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   286,     0,    11,    45,    51,    95,   111,   152,   209,
-     227,   244,   252,   275,   279,   287,   288,   291,   294,   297,
-     300,   308,   526,   537,   558,   566,   579,   588,   289,   292,
-     295,   298,   301,   309,   527,   538,   559,   567,   580,   589,
+       0,   287,     0,    11,    45,    51,    95,   111,   153,   210,
+     228,   245,   253,   276,   280,   288,   289,   292,   295,   298,
+     301,   309,   528,   539,   560,   568,   581,   590,   290,   293,
+     296,   299,   302,   310,   529,   540,   561,   569,   582,   591,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
@@ -1805,16 +1810,16 @@ static const yytype_uint16 yystos[] =
       89,    90,    91,    92,    93,    94,   104,   105,   106,   108,
      109,   110,   113,   114,   115,   116,   117,   118,   119,   120,
      121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   140,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   171,   172,   173,
+     131,   132,   133,   134,   135,   136,   140,   141,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   172,   173,
      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
      184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
      194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   210,   212,   213,   214,   215,
+     204,   205,   206,   207,   208,   209,   211,   213,   214,   215,
      216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   238,   239,   240,   241,   242,   243,   250,   258,   259,
-     261,   262,   264,   265,   268,   269,   270,   271,   272,   273,
-     274,   278,   290,   311,   312,   313,   314,   315,   316,   317,
+     226,   227,   239,   240,   241,   242,   243,   244,   251,   259,
+     260,   262,   263,   265,   266,   269,   270,   271,   272,   273,
+     274,   275,   279,   291,   312,   313,   314,   315,   316,   317,
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
      328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
      338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
@@ -1833,24 +1838,24 @@ static const yytype_uint16 yystos[] =
      468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
      478,   479,   480,   481,   482,   483,   484,   485,   486,   487,
      488,   489,   490,   491,   492,   493,   494,   495,   496,   497,
-     562,   563,   564,   565,   587,    44,    46,    47,   107,   138,
-     141,   267,   293,   498,   499,   500,   501,   502,   503,   504,
-      44,    52,    53,   137,   139,   266,   296,   505,   506,   507,
-     508,   509,   510,    44,    80,    81,   105,   172,   173,   211,
-     299,   519,   520,   521,   522,   523,   524,   525,    44,   251,
-     253,   254,   255,   256,   257,   263,   302,   511,   512,   513,
-     514,   515,   516,   517,   518,   280,   281,   282,   283,   284,
-     303,   304,   305,   306,   307,   310,   511,   512,   513,   514,
-     515,    96,    97,    98,    99,   100,   101,   102,   103,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   539,   540,   541,   542,
+     498,   499,   564,   565,   566,   567,   589,    44,    46,    47,
+     107,   138,   142,   268,   294,   500,   501,   502,   503,   504,
+     505,   506,    44,    52,    53,   137,   139,   267,   297,   507,
+     508,   509,   510,   511,   512,    44,    80,    81,   105,   173,
+     174,   212,   300,   521,   522,   523,   524,   525,   526,   527,
+      44,   252,   254,   255,   256,   257,   258,   264,   303,   513,
+     514,   515,   516,   517,   518,   519,   520,   281,   282,   283,
+     284,   285,   304,   305,   306,   307,   308,   311,   513,   514,
+     515,   516,   517,    96,    97,    98,    99,   100,   101,   102,
+     103,   530,   531,   532,   533,   534,   535,   536,   537,   538,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   541,   542,
      543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
-     553,   554,   555,   556,   557,   112,   560,   561,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   568,   569,
-     570,   571,   572,   573,   574,   575,   576,   577,   578,   245,
-     246,   247,   248,   249,   581,   582,   583,   584,   585,   586,
-     276,   277,   590,   591,   592,    10,    10,    10,    10,    10,
+     553,   554,   555,   556,   557,   558,   559,   112,   562,   563,
+     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+     570,   571,   572,   573,   574,   575,   576,   577,   578,   579,
+     580,   246,   247,   248,   249,   250,   583,   584,   585,   586,
+     587,   588,   277,   278,   592,   593,   594,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1879,39 +1884,39 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   285,   286,   286,   287,   287,   287,   287,   287,   287,
-     287,   287,   287,   287,   287,   287,   288,   289,   289,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   291,   292,   292,   293,   293,   293,   293,   293,   293,
-     293,   294,   295,   295,   296,   296,   296,   296,   296,   296,
-     297,   298,   298,   299,   299,   299,   299,   299,   299,   299,
-     300,   301,   301,   302,   302,   302,   302,   302,   302,   302,
-     302,   303,   304,   305,   306,   307,   308,   309,   309,   310,
-     310,   310,   310,   310,   310,   310,   310,   310,   310,   311,
+       0,   286,   287,   287,   288,   288,   288,   288,   288,   288,
+     288,   288,   288,   288,   288,   288,   289,   290,   290,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   292,   293,   293,   294,   294,   294,   294,   294,
+     294,   294,   295,   296,   296,   297,   297,   297,   297,   297,
+     297,   298,   299,   299,   300,   300,   300,   300,   300,   300,
+     300,   301,   302,   302,   303,   303,   303,   303,   303,   303,
+     303,   303,   304,   305,   306,   307,   308,   309,   310,   310,
+     311,   311,   311,   311,   311,   311,   311,   311,   311,   311,
      312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
      322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
      332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
@@ -1933,18 +1938,18 @@ static const yytype_uint16 yyr1[] =
      492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
      502,   503,   504,   505,   506,   507,   508,   509,   510,   511,
      512,   513,   514,   515,   516,   517,   518,   519,   520,   521,
-     522,   523,   524,   525,   526,   527,   527,   528,   528,   528,
-     528,   528,   528,   528,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,   537,   538,   538,   539,   539,   539,   539,
-     539,   539,   539,   539,   539,   539,   539,   539,   539,   539,
-     539,   539,   539,   539,   540,   541,   542,   543,   544,   545,
+     522,   523,   524,   525,   526,   527,   528,   529,   529,   530,
+     530,   530,   530,   530,   530,   530,   530,   531,   532,   533,
+     534,   535,   536,   537,   538,   539,   540,   540,   541,   541,
+     541,   541,   541,   541,   541,   541,   541,   541,   541,   541,
+     541,   541,   541,   541,   541,   541,   542,   543,   544,   545,
      546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
-     556,   557,   558,   559,   559,   560,   561,   562,   563,   564,
-     565,   566,   567,   567,   568,   568,   568,   568,   568,   568,
-     568,   568,   568,   568,   569,   570,   571,   572,   573,   574,
-     575,   576,   577,   578,   579,   580,   580,   581,   581,   581,
-     581,   581,   582,   583,   584,   585,   586,   587,   588,   589,
-     589,   590,   590,   591,   592
+     556,   557,   558,   559,   560,   561,   561,   562,   563,   564,
+     565,   566,   567,   568,   569,   569,   570,   570,   570,   570,
+     570,   570,   570,   570,   570,   570,   571,   572,   573,   574,
+     575,   576,   577,   578,   579,   580,   581,   582,   582,   583,
+     583,   583,   583,   583,   584,   585,   586,   587,   588,   589,
+     590,   591,   591,   592,   592,   593,   594
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1971,45 +1976,45 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
        1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
        1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     2,     2,     2,     2,     1,     2,     0,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
-       4,     4,     4,     3,     3,     2,     2,     2,     2,     2,
-       2,     3,     3,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
-       3,     2,     2,     2,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
-       2,     2,     2,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     2,     2,     2,     2,     2,     1,     2,     0,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     1,     2,     0,     1,     2,     2,     2,     3,
-       3,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     3,     1,     2,
-       0,     1,     1,     2,     2
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     3,     4,     4,     4,     3,     3,     2,     2,     2,
+       2,     2,     2,     3,     3,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     3,     3,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     1,     2,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     1,     2,     0,     1,     2,     2,
+       2,     3,     3,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     3,
+       1,     2,     0,     1,     1,     2,     2
 };
 
 
@@ -2025,22 +2030,22 @@ static const yytype_uint8 yyr2[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                    \
-  do                                                              \
-    if (yychar == YYEMPTY)                                        \
-      {                                                           \
-        yychar = (Token);                                         \
-        yylval = (Value);                                         \
-        YYPOPSTACK (yylen);                                       \
-        yystate = *yyssp;                                         \
-        goto yybackup;                                            \
-      }                                                           \
-    else                                                          \
-      {                                                           \
-        yyerror (YY_("syntax error: cannot back up")); \
-        YYERROR;                                                  \
-      }                                                           \
-  while (0)
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
 /* Error token number */
 #define YYTERROR        1
@@ -2080,37 +2085,37 @@ do {                                                                      \
 } while (0)
 
 
-/*-----------------------------------.
-| Print this symbol's value on YYO.  |
-`-----------------------------------*/
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 {
-  FILE *yyoutput = yyo;
-  YYUSE (yyoutput);
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
 # endif
   YYUSE (yytype);
 }
 
 
-/*---------------------------.
-| Print this symbol on YYO.  |
-`---------------------------*/
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
 
 static void
-yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 {
-  YYFPRINTF (yyo, "%s %s (",
+  YYFPRINTF (yyoutput, "%s %s (",
              yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyo, yytype, yyvaluep);
-  YYFPRINTF (yyo, ")");
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -2144,7 +2149,7 @@ do {                                                            \
 static void
 yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
-  unsigned long yylno = yyrline[yyrule];
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -2155,7 +2160,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
                        yystos[yyssp[yyi + 1 - yynrhs]],
-                       &yyvsp[(yyi + 1) - (yynrhs)]
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
                                               );
       YYFPRINTF (stderr, "\n");
     }
@@ -2259,10 +2264,7 @@ yytnamerr (char *yyres, const char *yystr)
           case '\\':
             if (*++yyp != '\\')
               goto do_not_strip_quotes;
-            else
-              goto append;
-
-          append:
+            /* Fall through.  */
           default:
             if (yyres)
               yyres[yyn] = *yyp;
@@ -2280,7 +2282,7 @@ yytnamerr (char *yyres, const char *yystr)
   if (! yyres)
     return yystrlen (yystr);
 
-  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
+  return yystpcpy (yyres, yystr) - yyres;
 }
 # endif
 
@@ -2358,10 +2360,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yyarg[yycount++] = yytname[yyx];
                 {
                   YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                    yysize = yysize1;
-                  else
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                     return 2;
+                  yysize = yysize1;
                 }
               }
         }
@@ -2373,7 +2375,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
       case N:                               \
         yyformat = S;                       \
       break
-    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -2385,10 +2386,9 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 
   {
     YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-      yysize = yysize1;
-    else
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
       return 2;
+    yysize = yysize1;
   }
 
   if (*yymsg_alloc < yysize)
@@ -2514,33 +2514,23 @@ yyparse (void)
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
-
 /*------------------------------------------------------------.
-| yynewstate -- push a new state, which is found in yystate.  |
+| yynewstate -- Push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
-yynewstate:
+ yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
-
-/*--------------------------------------------------------------------.
-| yynewstate -- set current state (the top of the stack) to yystate.  |
-`--------------------------------------------------------------------*/
-yysetstate:
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
-  *yyssp = (yytype_int16) yystate;
+ yysetstate:
+  *yyssp = yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
-#if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    goto yyexhaustedlab;
-#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
-# if defined yyoverflow
+#ifdef yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
@@ -2556,10 +2546,14 @@ yysetstate:
                     &yyss1, yysize * sizeof (*yyssp),
                     &yyvs1, yysize * sizeof (*yyvsp),
                     &yystacksize);
+
         yyss = yyss1;
         yyvs = yyvs1;
       }
-# else /* defined YYSTACK_RELOCATE */
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
         goto yyexhaustedlab;
@@ -2575,33 +2569,35 @@ yysetstate:
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+#  undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
 # endif
+#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
-#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   if (yystate == YYFINAL)
     YYACCEPT;
 
   goto yybackup;
 
-
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
+
   /* Do appropriate processing given the current state.  Read a
      lookahead token if we need one and don't already have one.  */
 
@@ -2659,6 +2655,7 @@ yybackup:
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
+
   goto yynewstate;
 
 
@@ -2673,7 +2670,7 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- do a reduction.  |
+| yyreduce -- Do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
@@ -2693,16 +2690,16 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-  case 16:
-#line 188 "./util/configparser.y"
+        case 16:
+#line 189 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(server:)\n")); 
 	}
-#line 2702 "util/configparser.c"
+#line 2699 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 211:
-#line 280 "./util/configparser.y"
+  case 212:
+#line 282 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2713,11 +2710,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2717 "util/configparser.c"
+#line 2714 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 221:
-#line 297 "./util/configparser.y"
+  case 222:
+#line 299 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2728,11 +2725,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2732 "util/configparser.c"
+#line 2729 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 230:
-#line 314 "./util/configparser.y"
+  case 231:
+#line 316 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
@@ -2745,11 +2742,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2749 "util/configparser.c"
+#line 2746 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 240:
-#line 333 "./util/configparser.y"
+  case 241:
+#line 335 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
@@ -2765,11 +2762,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2769 "util/configparser.c"
+#line 2766 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 357 "./util/configparser.y"
+  case 252:
+#line 359 "./util/configparser.y" /* yacc.c:1646  */
     {
 		uint8_t* bitlist;
 		size_t len = 0;
@@ -2786,11 +2783,11 @@ yyreduce:
 
 		}
 	}
-#line 2790 "util/configparser.c"
+#line 2787 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 376 "./util/configparser.y"
+  case 253:
+#line 378 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
@@ -2805,21 +2802,21 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2809 "util/configparser.c"
+#line 2806 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 253:
-#line 393 "./util/configparser.y"
+  case 254:
+#line 395 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2819 "util/configparser.c"
+#line 2816 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 401 "./util/configparser.y"
+  case 255:
+#line 403 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2827,21 +2824,21 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2831 "util/configparser.c"
+#line 2828 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 411 "./util/configparser.y"
+  case 256:
+#line 413 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 2841 "util/configparser.c"
+#line 2838 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 419 "./util/configparser.y"
+  case 257:
+#line 421 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
@@ -2857,11 +2854,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2861 "util/configparser.c"
+#line 2858 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 269:
-#line 442 "./util/configparser.y"
+  case 270:
+#line 444 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2869,11 +2866,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2873 "util/configparser.c"
+#line 2870 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 270:
-#line 451 "./util/configparser.y"
+  case 271:
+#line 453 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2881,11 +2878,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2885 "util/configparser.c"
+#line 2882 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 271:
-#line 460 "./util/configparser.y"
+  case 272:
+#line 462 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2895,11 +2892,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2899 "util/configparser.c"
+#line 2896 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 471 "./util/configparser.y"
+  case 273:
+#line 473 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2907,11 +2904,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2911 "util/configparser.c"
+#line 2908 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 480 "./util/configparser.y"
+  case 274:
+#line 482 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2919,11 +2916,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2923 "util/configparser.c"
+#line 2920 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 489 "./util/configparser.y"
+  case 275:
+#line 491 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2931,11 +2928,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2935 "util/configparser.c"
+#line 2932 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 498 "./util/configparser.y"
+  case 276:
+#line 500 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2945,11 +2942,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2949 "util/configparser.c"
+#line 2946 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 509 "./util/configparser.y"
+  case 277:
+#line 511 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2957,11 +2954,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2961 "util/configparser.c"
+#line 2958 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 518 "./util/configparser.y"
+  case 278:
+#line 520 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -2972,11 +2969,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 2976 "util/configparser.c"
+#line 2973 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 530 "./util/configparser.y"
+  case 279:
+#line 532 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -2988,11 +2985,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 2992 "util/configparser.c"
+#line 2989 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 279:
-#line 544 "./util/configparser.y"
+  case 280:
+#line 546 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -3006,11 +3003,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3010 "util/configparser.c"
+#line 3007 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 280:
-#line 559 "./util/configparser.y"
+  case 281:
+#line 561 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -3020,11 +3017,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3024 "util/configparser.c"
+#line 3021 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 281:
-#line 570 "./util/configparser.y"
+  case 282:
+#line 572 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3040,11 +3037,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3044 "util/configparser.c"
+#line 3041 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 587 "./util/configparser.y"
+  case 283:
+#line 589 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3060,11 +3057,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3064 "util/configparser.c"
+#line 3061 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 604 "./util/configparser.y"
+  case 284:
+#line 606 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3080,11 +3077,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3084 "util/configparser.c"
+#line 3081 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 621 "./util/configparser.y"
+  case 285:
+#line 623 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3100,11 +3097,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3104 "util/configparser.c"
+#line 3101 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 638 "./util/configparser.y"
+  case 286:
+#line 640 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3118,11 +3115,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3122 "util/configparser.c"
+#line 3119 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 653 "./util/configparser.y"
+  case 287:
+#line 655 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3136,11 +3133,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3140 "util/configparser.c"
+#line 3137 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 668 "./util/configparser.y"
+  case 288:
+#line 670 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -3152,11 +3149,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3156 "util/configparser.c"
+#line 3153 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 681 "./util/configparser.y"
+  case 289:
+#line 683 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -3170,11 +3167,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3174 "util/configparser.c"
+#line 3171 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 696 "./util/configparser.y"
+  case 290:
+#line 698 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3182,11 +3179,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3186 "util/configparser.c"
+#line 3183 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 705 "./util/configparser.y"
+  case 291:
+#line 707 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
@@ -3194,11 +3191,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3198 "util/configparser.c"
+#line 3195 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 714 "./util/configparser.y"
+  case 292:
+#line 716 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
@@ -3206,11 +3203,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3210 "util/configparser.c"
+#line 3207 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 723 "./util/configparser.y"
+  case 293:
+#line 725 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3218,11 +3215,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3222 "util/configparser.c"
+#line 3219 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 732 "./util/configparser.y"
+  case 294:
+#line 734 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3230,11 +3227,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3234 "util/configparser.c"
+#line 3231 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 741 "./util/configparser.y"
+  case 295:
+#line 743 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3242,11 +3239,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3246 "util/configparser.c"
+#line 3243 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 750 "./util/configparser.y"
+  case 296:
+#line 752 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3254,11 +3251,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3258 "util/configparser.c"
+#line 3255 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 759 "./util/configparser.y"
+  case 297:
+#line 761 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3266,11 +3263,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3270 "util/configparser.c"
+#line 3267 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 768 "./util/configparser.y"
+  case 298:
+#line 770 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3278,11 +3275,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3282 "util/configparser.c"
+#line 3279 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 777 "./util/configparser.y"
+  case 299:
+#line 779 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3290,11 +3287,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3294 "util/configparser.c"
+#line 3291 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 786 "./util/configparser.y"
+  case 300:
+#line 788 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3302,11 +3299,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3306 "util/configparser.c"
+#line 3303 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 795 "./util/configparser.y"
+  case 301:
+#line 797 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3314,11 +3311,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3318 "util/configparser.c"
+#line 3315 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 804 "./util/configparser.y"
+  case 302:
+#line 806 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3326,11 +3323,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3330 "util/configparser.c"
+#line 3327 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 813 "./util/configparser.y"
+  case 303:
+#line 815 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3338,11 +3335,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3342 "util/configparser.c"
+#line 3339 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 822 "./util/configparser.y"
+  case 304:
+#line 824 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3354,11 +3351,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3358 "util/configparser.c"
+#line 3355 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 835 "./util/configparser.y"
+  case 305:
+#line 837 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3366,11 +3363,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3370 "util/configparser.c"
+#line 3367 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 844 "./util/configparser.y"
+  case 306:
+#line 846 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3382,11 +3379,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3386 "util/configparser.c"
+#line 3383 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 857 "./util/configparser.y"
+  case 307:
+#line 859 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3394,11 +3391,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3398 "util/configparser.c"
+#line 3395 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 866 "./util/configparser.y"
+  case 308:
+#line 868 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3406,11 +3403,11 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3410 "util/configparser.c"
+#line 3407 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 875 "./util/configparser.y"
+  case 309:
+#line 877 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3418,31 +3415,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3422 "util/configparser.c"
+#line 3419 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 884 "./util/configparser.y"
+  case 310:
+#line 886 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3432 "util/configparser.c"
+#line 3429 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 891 "./util/configparser.y"
+  case 311:
+#line 893 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3442 "util/configparser.c"
+#line 3439 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 898 "./util/configparser.y"
+  case 312:
+#line 900 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3450,21 +3447,21 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3454 "util/configparser.c"
+#line 3451 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 907 "./util/configparser.y"
+  case 313:
+#line 909 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3464 "util/configparser.c"
+#line 3461 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 914 "./util/configparser.y"
+  case 314:
+#line 916 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3472,53 +3469,65 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3476 "util/configparser.c"
+#line 3473 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 923 "./util/configparser.y"
+  case 315:
+#line 925 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3487 "util/configparser.c"
+#line 3484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 931 "./util/configparser.y"
+  case 316:
+#line 933 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3497 "util/configparser.c"
+#line 3494 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 938 "./util/configparser.y"
+  case 317:
+#line 940 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3507 "util/configparser.c"
+#line 3504 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 945 "./util/configparser.y"
+  case 318:
+#line 947 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3518 "util/configparser.c"
+#line 3515 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 953 "./util/configparser.y"
+  case 319:
+#line 955 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
+		if(atoi((yyvsp[0].str)) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
+		free((yyvsp[0].str));
+	}
+#line 3527 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 320:
+#line 964 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3526,11 +3535,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3530 "util/configparser.c"
+#line 3539 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 962 "./util/configparser.y"
+  case 321:
+#line 973 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3538,11 +3547,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3542 "util/configparser.c"
+#line 3551 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 971 "./util/configparser.y"
+  case 322:
+#line 982 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3555,11 +3564,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3559 "util/configparser.c"
+#line 3568 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 985 "./util/configparser.y"
+  case 323:
+#line 996 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3567,11 +3576,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3571 "util/configparser.c"
+#line 3580 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 994 "./util/configparser.y"
+  case 324:
+#line 1005 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3579,11 +3588,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3583 "util/configparser.c"
+#line 3592 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 1003 "./util/configparser.y"
+  case 325:
+#line 1014 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3591,11 +3600,11 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3595 "util/configparser.c"
+#line 3604 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 1012 "./util/configparser.y"
+  case 326:
+#line 1023 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3603,11 +3612,11 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3607 "util/configparser.c"
+#line 3616 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 1021 "./util/configparser.y"
+  case 327:
+#line 1032 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3615,11 +3624,11 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3619 "util/configparser.c"
+#line 3628 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 1030 "./util/configparser.y"
+  case 328:
+#line 1041 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3627,31 +3636,31 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3631 "util/configparser.c"
+#line 3640 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 1039 "./util/configparser.y"
+  case 329:
+#line 1050 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3641 "util/configparser.c"
+#line 3650 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 1046 "./util/configparser.y"
+  case 330:
+#line 1057 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3651 "util/configparser.c"
+#line 3660 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 1053 "./util/configparser.y"
+  case 331:
+#line 1064 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3676,105 +3685,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3680 "util/configparser.c"
+#line 3689 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 1079 "./util/configparser.y"
+  case 332:
+#line 1090 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3691 "util/configparser.c"
+#line 3700 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 1087 "./util/configparser.y"
+  case 333:
+#line 1098 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3701 "util/configparser.c"
+#line 3710 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 1094 "./util/configparser.y"
+  case 334:
+#line 1105 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3711 "util/configparser.c"
+#line 3720 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 1101 "./util/configparser.y"
+  case 335:
+#line 1112 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dlv_anchor_file);
 		cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
 	}
-#line 3721 "util/configparser.c"
+#line 3730 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 1108 "./util/configparser.y"
+  case 336:
+#line 1119 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3731 "util/configparser.c"
+#line 3740 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 1115 "./util/configparser.y"
+  case 337:
+#line 1126 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3742 "util/configparser.c"
+#line 3751 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 1123 "./util/configparser.y"
+  case 338:
+#line 1134 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3753 "util/configparser.c"
+#line 3762 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 1131 "./util/configparser.y"
+  case 339:
+#line 1142 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3764 "util/configparser.c"
+#line 3773 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 1139 "./util/configparser.y"
+  case 340:
+#line 1150 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3774 "util/configparser.c"
+#line 3783 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 1146 "./util/configparser.y"
+  case 341:
+#line 1157 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3784,11 +3793,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3788 "util/configparser.c"
+#line 3797 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 1157 "./util/configparser.y"
+  case 342:
+#line 1168 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3798,21 +3807,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3802 "util/configparser.c"
+#line 3811 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 1168 "./util/configparser.y"
+  case 343:
+#line 1179 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3812 "util/configparser.c"
+#line 3821 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 1175 "./util/configparser.y"
+  case 344:
+#line 1186 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3820,11 +3829,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3824 "util/configparser.c"
+#line 3833 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 1184 "./util/configparser.y"
+  case 345:
+#line 1195 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3832,11 +3841,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3836 "util/configparser.c"
+#line 3845 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 344:
-#line 1193 "./util/configparser.y"
+  case 346:
+#line 1204 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3844,53 +3853,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3848 "util/configparser.c"
+#line 3857 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 1202 "./util/configparser.y"
+  case 347:
+#line 1213 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 3858 "util/configparser.c"
+#line 3867 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 346:
-#line 1209 "./util/configparser.y"
+  case 348:
+#line 1220 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 3868 "util/configparser.c"
+#line 3877 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 347:
-#line 1216 "./util/configparser.y"
+  case 349:
+#line 1227 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3879 "util/configparser.c"
+#line 3888 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 348:
-#line 1224 "./util/configparser.y"
+  case 350:
+#line 1235 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3890 "util/configparser.c"
+#line 3899 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 1232 "./util/configparser.y"
+  case 351:
+#line 1243 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3899,11 +3908,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3903 "util/configparser.c"
+#line 3912 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 1242 "./util/configparser.y"
+  case 352:
+#line 1253 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3912,11 +3921,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3916 "util/configparser.c"
+#line 3925 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 351:
-#line 1252 "./util/configparser.y"
+  case 353:
+#line 1263 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3925,22 +3934,22 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3929 "util/configparser.c"
+#line 3938 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 1262 "./util/configparser.y"
+  case 354:
+#line 1273 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3940 "util/configparser.c"
+#line 3949 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 1270 "./util/configparser.y"
+  case 355:
+#line 1281 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3952,11 +3961,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3956 "util/configparser.c"
+#line 3965 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 1283 "./util/configparser.y"
+  case 356:
+#line 1294 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3966,22 +3975,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3970 "util/configparser.c"
+#line 3979 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 355:
-#line 1294 "./util/configparser.y"
+  case 357:
+#line 1305 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3981 "util/configparser.c"
+#line 3990 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 1302 "./util/configparser.y"
+  case 358:
+#line 1313 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3993,11 +4002,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3997 "util/configparser.c"
+#line 4006 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 1315 "./util/configparser.y"
+  case 359:
+#line 1326 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4005,11 +4014,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4009 "util/configparser.c"
+#line 4018 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 1324 "./util/configparser.y"
+  case 360:
+#line 1335 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4017,11 +4026,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4021 "util/configparser.c"
+#line 4030 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 1333 "./util/configparser.y"
+  case 361:
+#line 1344 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4029,11 +4038,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4033 "util/configparser.c"
+#line 4042 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 1342 "./util/configparser.y"
+  case 362:
+#line 1353 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4042,11 +4051,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4046 "util/configparser.c"
+#line 4055 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 1352 "./util/configparser.y"
+  case 363:
+#line 1363 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4055,22 +4064,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4059 "util/configparser.c"
+#line 4068 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 1362 "./util/configparser.y"
+  case 364:
+#line 1373 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4070 "util/configparser.c"
+#line 4079 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 1370 "./util/configparser.y"
+  case 365:
+#line 1381 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4082,11 +4091,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4086 "util/configparser.c"
+#line 4095 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 1383 "./util/configparser.y"
+  case 366:
+#line 1394 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4094,22 +4103,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4098 "util/configparser.c"
+#line 4107 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 1392 "./util/configparser.y"
+  case 367:
+#line 1403 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4109 "util/configparser.c"
+#line 4118 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 366:
-#line 1400 "./util/configparser.y"
+  case 368:
+#line 1411 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4117,22 +4126,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4121 "util/configparser.c"
+#line 4130 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 1409 "./util/configparser.y"
+  case 369:
+#line 1420 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4132 "util/configparser.c"
+#line 4141 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 1417 "./util/configparser.y"
+  case 370:
+#line 1428 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4144,11 +4153,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4148 "util/configparser.c"
+#line 4157 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 1430 "./util/configparser.y"
+  case 371:
+#line 1441 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4156,21 +4165,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4160 "util/configparser.c"
+#line 4169 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 370:
-#line 1439 "./util/configparser.y"
+  case 372:
+#line 1450 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4170 "util/configparser.c"
+#line 4179 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 371:
-#line 1446 "./util/configparser.y"
+  case 373:
+#line 1457 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4179,11 +4188,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4183 "util/configparser.c"
+#line 4192 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 1456 "./util/configparser.y"
+  case 374:
+#line 1467 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4192,11 +4201,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4196 "util/configparser.c"
+#line 4205 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 1466 "./util/configparser.y"
+  case 375:
+#line 1477 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4205,11 +4214,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4209 "util/configparser.c"
+#line 4218 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 374:
-#line 1476 "./util/configparser.y"
+  case 376:
+#line 1487 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4218,11 +4227,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4222 "util/configparser.c"
+#line 4231 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 1486 "./util/configparser.y"
+  case 377:
+#line 1497 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4231,11 +4240,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4235 "util/configparser.c"
+#line 4244 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 376:
-#line 1496 "./util/configparser.y"
+  case 378:
+#line 1507 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4244,11 +4253,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4248 "util/configparser.c"
+#line 4257 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 1506 "./util/configparser.y"
+  case 379:
+#line 1517 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4257,11 +4266,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4261 "util/configparser.c"
+#line 4270 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 1516 "./util/configparser.y"
+  case 380:
+#line 1527 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4270,41 +4279,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4274 "util/configparser.c"
+#line 4283 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 1526 "./util/configparser.y"
+  case 381:
+#line 1537 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4284 "util/configparser.c"
+#line 4293 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 380:
-#line 1533 "./util/configparser.y"
+  case 382:
+#line 1544 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4294 "util/configparser.c"
+#line 4303 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 381:
-#line 1540 "./util/configparser.y"
+  case 383:
+#line 1551 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4304 "util/configparser.c"
+#line 4313 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 382:
-#line 1547 "./util/configparser.y"
+  case 384:
+#line 1558 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4312,11 +4321,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4316 "util/configparser.c"
+#line 4325 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 383:
-#line 1556 "./util/configparser.y"
+  case 385:
+#line 1567 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4324,11 +4333,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4328 "util/configparser.c"
+#line 4337 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 384:
-#line 1565 "./util/configparser.y"
+  case 386:
+#line 1576 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4336,11 +4345,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4340 "util/configparser.c"
+#line 4349 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 385:
-#line 1574 "./util/configparser.y"
+  case 387:
+#line 1585 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4348,21 +4357,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4352 "util/configparser.c"
+#line 4361 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 386:
-#line 1583 "./util/configparser.y"
+  case 388:
+#line 1594 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4362 "util/configparser.c"
+#line 4371 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 387:
-#line 1590 "./util/configparser.y"
+  case 389:
+#line 1601 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4371,11 +4380,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4375 "util/configparser.c"
+#line 4384 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 388:
-#line 1600 "./util/configparser.y"
+  case 390:
+#line 1611 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -4394,21 +4403,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4398 "util/configparser.c"
+#line 4407 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 389:
-#line 1620 "./util/configparser.y"
+  case 391:
+#line 1631 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4408 "util/configparser.c"
+#line 4417 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 390:
-#line 1627 "./util/configparser.y"
+  case 392:
+#line 1638 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4425,11 +4434,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4429 "util/configparser.c"
+#line 4438 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 391:
-#line 1645 "./util/configparser.y"
+  case 393:
+#line 1656 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4441,11 +4450,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4445 "util/configparser.c"
+#line 4454 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 392:
-#line 1658 "./util/configparser.y"
+  case 394:
+#line 1669 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4457,11 +4466,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4461 "util/configparser.c"
+#line 4470 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 1671 "./util/configparser.y"
+  case 395:
+#line 1682 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4469,11 +4478,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4473 "util/configparser.c"
+#line 4482 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 1680 "./util/configparser.y"
+  case 396:
+#line 1691 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4481,11 +4490,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4485 "util/configparser.c"
+#line 4494 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 1689 "./util/configparser.y"
+  case 397:
+#line 1700 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4493,11 +4502,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4497 "util/configparser.c"
+#line 4506 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 1698 "./util/configparser.y"
+  case 398:
+#line 1709 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4505,11 +4514,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4509 "util/configparser.c"
+#line 4518 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 1707 "./util/configparser.y"
+  case 399:
+#line 1718 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4518,11 +4527,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4522 "util/configparser.c"
+#line 4531 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 398:
-#line 1717 "./util/configparser.y"
+  case 400:
+#line 1728 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4531,11 +4540,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4535 "util/configparser.c"
+#line 4544 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 399:
-#line 1727 "./util/configparser.y"
+  case 401:
+#line 1738 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4545,11 +4554,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4549 "util/configparser.c"
+#line 4558 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 400:
-#line 1738 "./util/configparser.y"
+  case 402:
+#line 1749 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4557,11 +4566,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4561 "util/configparser.c"
+#line 4570 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 401:
-#line 1747 "./util/configparser.y"
+  case 403:
+#line 1758 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4569,11 +4578,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4573 "util/configparser.c"
+#line 4582 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 402:
-#line 1756 "./util/configparser.y"
+  case 404:
+#line 1767 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4581,11 +4590,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4585 "util/configparser.c"
+#line 4594 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 403:
-#line 1765 "./util/configparser.y"
+  case 405:
+#line 1776 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4593,11 +4602,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4597 "util/configparser.c"
+#line 4606 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 404:
-#line 1774 "./util/configparser.y"
+  case 406:
+#line 1785 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4605,11 +4614,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4609 "util/configparser.c"
+#line 4618 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 405:
-#line 1783 "./util/configparser.y"
+  case 407:
+#line 1794 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4617,11 +4626,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4621 "util/configparser.c"
+#line 4630 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 406:
-#line 1792 "./util/configparser.y"
+  case 408:
+#line 1803 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4633,11 +4642,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4637 "util/configparser.c"
+#line 4646 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 407:
-#line 1805 "./util/configparser.y"
+  case 409:
+#line 1816 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4649,11 +4658,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4653 "util/configparser.c"
+#line 4662 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 408:
-#line 1818 "./util/configparser.y"
+  case 410:
+#line 1829 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4661,21 +4670,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4665 "util/configparser.c"
+#line 4674 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 409:
-#line 1827 "./util/configparser.y"
+  case 411:
+#line 1838 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4675 "util/configparser.c"
+#line 4684 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 410:
-#line 1834 "./util/configparser.y"
+  case 412:
+#line 1845 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4683,11 +4692,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4687 "util/configparser.c"
+#line 4696 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 411:
-#line 1843 "./util/configparser.y"
+  case 413:
+#line 1854 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4695,11 +4704,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4699 "util/configparser.c"
+#line 4708 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 412:
-#line 1852 "./util/configparser.y"
+  case 414:
+#line 1863 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4707,11 +4716,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4711 "util/configparser.c"
+#line 4720 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 1861 "./util/configparser.y"
+  case 415:
+#line 1872 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4720,22 +4729,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4724 "util/configparser.c"
+#line 4733 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 414:
-#line 1870 "./util/configparser.y"
+  case 416:
+#line 1881 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4735 "util/configparser.c"
+#line 4744 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 1878 "./util/configparser.y"
+  case 417:
+#line 1889 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4747,22 +4756,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4751 "util/configparser.c"
+#line 4760 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 416:
-#line 1891 "./util/configparser.y"
+  case 418:
+#line 1902 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4762 "util/configparser.c"
+#line 4771 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 1899 "./util/configparser.y"
+  case 419:
+#line 1910 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4802,21 +4811,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4806 "util/configparser.c"
+#line 4815 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 1940 "./util/configparser.y"
+  case 420:
+#line 1951 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 4816 "util/configparser.c"
+#line 4825 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 1947 "./util/configparser.y"
+  case 421:
+#line 1958 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -4830,11 +4839,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4834 "util/configparser.c"
+#line 4843 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 1962 "./util/configparser.y"
+  case 422:
+#line 1973 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4843,11 +4852,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4847 "util/configparser.c"
+#line 4856 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 1972 "./util/configparser.y"
+  case 423:
+#line 1983 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4856,41 +4865,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4860 "util/configparser.c"
+#line 4869 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 422:
-#line 1982 "./util/configparser.y"
+  case 424:
+#line 1993 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4870 "util/configparser.c"
+#line 4879 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 423:
-#line 1989 "./util/configparser.y"
+  case 425:
+#line 2000 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4880 "util/configparser.c"
+#line 4889 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 424:
-#line 1996 "./util/configparser.y"
+  case 426:
+#line 2007 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 4890 "util/configparser.c"
+#line 4899 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 425:
-#line 2003 "./util/configparser.y"
+  case 427:
+#line 2014 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4898,22 +4907,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4902 "util/configparser.c"
+#line 4911 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 426:
-#line 2012 "./util/configparser.y"
+  case 428:
+#line 2023 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 4913 "util/configparser.c"
+#line 4922 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 427:
-#line 2020 "./util/configparser.y"
+  case 429:
+#line 2031 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -4926,11 +4935,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4930 "util/configparser.c"
+#line 4939 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 428:
-#line 2034 "./util/configparser.y"
+  case 430:
+#line 2045 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -4950,11 +4959,11 @@ yyreduce:
 			}
 		}
 	}
-#line 4954 "util/configparser.c"
+#line 4963 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 2055 "./util/configparser.y"
+  case 431:
+#line 2066 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -4974,11 +4983,11 @@ yyreduce:
 			}
 		}
 	}
-#line 4978 "util/configparser.c"
+#line 4987 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 2076 "./util/configparser.y"
+  case 432:
+#line 2087 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -4989,11 +4998,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4993 "util/configparser.c"
+#line 5002 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 431:
-#line 2088 "./util/configparser.y"
+  case 433:
+#line 2099 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -5004,11 +5013,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5008 "util/configparser.c"
+#line 5017 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 2100 "./util/configparser.y"
+  case 434:
+#line 2111 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -5019,11 +5028,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5023 "util/configparser.c"
+#line 5032 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 2112 "./util/configparser.y"
+  case 435:
+#line 2123 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -5031,11 +5040,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5035 "util/configparser.c"
+#line 5044 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 2121 "./util/configparser.y"
+  case 436:
+#line 2132 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5055,11 +5064,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5059 "util/configparser.c"
+#line 5068 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 435:
-#line 2142 "./util/configparser.y"
+  case 437:
+#line 2153 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5067,11 +5076,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5071 "util/configparser.c"
+#line 5080 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 436:
-#line 2152 "./util/configparser.y"
+  case 438:
+#line 2163 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5079,33 +5088,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5083 "util/configparser.c"
+#line 5092 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 437:
-#line 2161 "./util/configparser.y"
+  case 439:
+#line 2172 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5094 "util/configparser.c"
+#line 5103 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 438:
-#line 2169 "./util/configparser.y"
+  case 440:
+#line 2180 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5105 "util/configparser.c"
+#line 5114 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 439:
-#line 2177 "./util/configparser.y"
+  case 441:
+#line 2188 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5117,11 +5126,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5121 "util/configparser.c"
+#line 5130 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 440:
-#line 2190 "./util/configparser.y"
+  case 442:
+#line 2201 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5133,11 +5142,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5137 "util/configparser.c"
+#line 5146 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 441:
-#line 2203 "./util/configparser.y"
+  case 443:
+#line 2214 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5151,11 +5160,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5155 "util/configparser.c"
+#line 5164 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 442:
-#line 2218 "./util/configparser.y"
+  case 444:
+#line 2229 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5169,11 +5178,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5173 "util/configparser.c"
+#line 5182 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 443:
-#line 2233 "./util/configparser.y"
+  case 445:
+#line 2244 "./util/configparser.y" /* yacc.c:1646  */
     { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5181,11 +5190,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5185 "util/configparser.c"
+#line 5194 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 444:
-#line 2242 "./util/configparser.y"
+  case 446:
+#line 2253 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5193,20 +5202,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5197 "util/configparser.c"
+#line 5206 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 445:
-#line 2251 "./util/configparser.y"
+  case 447:
+#line 2262 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5206 "util/configparser.c"
+#line 5215 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 446:
-#line 2257 "./util/configparser.y"
+  case 448:
+#line 2268 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5214,11 +5223,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5218 "util/configparser.c"
+#line 5227 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 447:
-#line 2266 "./util/configparser.y"
+  case 449:
+#line 2277 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5226,11 +5235,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5230 "util/configparser.c"
+#line 5239 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 448:
-#line 2275 "./util/configparser.y"
+  case 450:
+#line 2286 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5239,11 +5248,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5243 "util/configparser.c"
+#line 5252 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 449:
-#line 2285 "./util/configparser.y"
+  case 451:
+#line 2296 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5252,11 +5261,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5256 "util/configparser.c"
+#line 5265 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 450:
-#line 2295 "./util/configparser.y"
+  case 452:
+#line 2306 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5268,11 +5277,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5272 "util/configparser.c"
+#line 5281 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 451:
-#line 2308 "./util/configparser.y"
+  case 453:
+#line 2319 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5284,11 +5293,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5288 "util/configparser.c"
+#line 5297 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 452:
-#line 2321 "./util/configparser.y"
+  case 454:
+#line 2332 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5299,11 +5308,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5303 "util/configparser.c"
+#line 5312 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 453:
-#line 2333 "./util/configparser.y"
+  case 455:
+#line 2344 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5316,11 +5325,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5320 "util/configparser.c"
+#line 5329 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 454:
-#line 2347 "./util/configparser.y"
+  case 456:
+#line 2358 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5331,11 +5340,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5335 "util/configparser.c"
+#line 5344 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 455:
-#line 2359 "./util/configparser.y"
+  case 457:
+#line 2370 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5348,11 +5357,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5352 "util/configparser.c"
+#line 5361 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 456:
-#line 2373 "./util/configparser.y"
+  case 458:
+#line 2384 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5361,31 +5370,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5365 "util/configparser.c"
+#line 5374 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 457:
-#line 2383 "./util/configparser.y"
+  case 459:
+#line 2394 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5375 "util/configparser.c"
+#line 5384 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 458:
-#line 2390 "./util/configparser.y"
+  case 460:
+#line 2401 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5385 "util/configparser.c"
+#line 5394 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 459:
-#line 2397 "./util/configparser.y"
+  case 461:
+#line 2408 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5393,11 +5402,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5397 "util/configparser.c"
+#line 5406 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 460:
-#line 2406 "./util/configparser.y"
+  case 462:
+#line 2417 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5405,11 +5414,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5409 "util/configparser.c"
+#line 5418 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 461:
-#line 2415 "./util/configparser.y"
+  case 463:
+#line 2426 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5418,11 +5427,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5422 "util/configparser.c"
+#line 5431 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 462:
-#line 2425 "./util/configparser.y"
+  case 464:
+#line 2436 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5431,11 +5440,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5435 "util/configparser.c"
+#line 5444 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 463:
-#line 2435 "./util/configparser.y"
+  case 465:
+#line 2446 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5444,31 +5453,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5448 "util/configparser.c"
+#line 5457 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 464:
-#line 2445 "./util/configparser.y"
+  case 466:
+#line 2456 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5458 "util/configparser.c"
+#line 5467 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 465:
-#line 2452 "./util/configparser.y"
+  case 467:
+#line 2463 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5468 "util/configparser.c"
+#line 5477 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 466:
-#line 2459 "./util/configparser.y"
+  case 468:
+#line 2470 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5476,11 +5485,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5480 "util/configparser.c"
+#line 5489 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 467:
-#line 2468 "./util/configparser.y"
+  case 469:
+#line 2479 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5488,11 +5497,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5492 "util/configparser.c"
+#line 5501 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 468:
-#line 2477 "./util/configparser.y"
+  case 470:
+#line 2488 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5501,11 +5510,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5505 "util/configparser.c"
+#line 5514 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 469:
-#line 2487 "./util/configparser.y"
+  case 471:
+#line 2498 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5514,52 +5523,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5518 "util/configparser.c"
+#line 5527 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 470:
-#line 2497 "./util/configparser.y"
+  case 472:
+#line 2508 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5528 "util/configparser.c"
+#line 5537 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 471:
-#line 2504 "./util/configparser.y"
+  case 473:
+#line 2515 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5538 "util/configparser.c"
+#line 5547 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 472:
-#line 2511 "./util/configparser.y"
+  case 474:
+#line 2522 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5548 "util/configparser.c"
+#line 5557 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 473:
-#line 2518 "./util/configparser.y"
+  case 475:
+#line 2529 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5559 "util/configparser.c"
+#line 5568 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 474:
-#line 2526 "./util/configparser.y"
+  case 476:
+#line 2537 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5568,11 +5577,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5572 "util/configparser.c"
+#line 5581 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 475:
-#line 2536 "./util/configparser.y"
+  case 477:
+#line 2547 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5581,11 +5590,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5585 "util/configparser.c"
+#line 5594 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 476:
-#line 2546 "./util/configparser.y"
+  case 478:
+#line 2557 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5594,11 +5603,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5598 "util/configparser.c"
+#line 5607 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 477:
-#line 2556 "./util/configparser.y"
+  case 479:
+#line 2567 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5607,11 +5616,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5611 "util/configparser.c"
+#line 5620 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 478:
-#line 2566 "./util/configparser.y"
+  case 480:
+#line 2577 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5649,11 +5658,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5653 "util/configparser.c"
+#line 5662 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 479:
-#line 2605 "./util/configparser.y"
+  case 481:
+#line 2616 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5662,33 +5671,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5666 "util/configparser.c"
+#line 5675 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 480:
-#line 2615 "./util/configparser.y"
+  case 482:
+#line 2626 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5677 "util/configparser.c"
+#line 5686 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 481:
-#line 2623 "./util/configparser.y"
+  case 483:
+#line 2634 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5688 "util/configparser.c"
+#line 5697 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 482:
-#line 2631 "./util/configparser.y"
+  case 484:
+#line 2642 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5702,11 +5711,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5706 "util/configparser.c"
+#line 5715 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 483:
-#line 2646 "./util/configparser.y"
+  case 485:
+#line 2657 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5714,19 +5723,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5718 "util/configparser.c"
+#line 5727 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 484:
-#line 2655 "./util/configparser.y"
+  case 486:
+#line 2666 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5726 "util/configparser.c"
+#line 5735 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 495:
-#line 2666 "./util/configparser.y"
+  case 497:
+#line 2677 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5735,11 +5744,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5739 "util/configparser.c"
+#line 5748 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 496:
-#line 2676 "./util/configparser.y"
+  case 498:
+#line 2687 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5747,79 +5756,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5751 "util/configparser.c"
+#line 5760 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 497:
-#line 2685 "./util/configparser.y"
+  case 499:
+#line 2696 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5761 "util/configparser.c"
+#line 5770 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 498:
-#line 2692 "./util/configparser.y"
+  case 500:
+#line 2703 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5771 "util/configparser.c"
+#line 5780 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 499:
-#line 2699 "./util/configparser.y"
+  case 501:
+#line 2710 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 5781 "util/configparser.c"
+#line 5790 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 500:
-#line 2706 "./util/configparser.y"
+  case 502:
+#line 2717 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 5791 "util/configparser.c"
+#line 5800 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 501:
-#line 2713 "./util/configparser.y"
+  case 503:
+#line 2724 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 5801 "util/configparser.c"
+#line 5810 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 502:
-#line 2720 "./util/configparser.y"
+  case 504:
+#line 2731 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 5811 "util/configparser.c"
+#line 5820 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 503:
-#line 2727 "./util/configparser.y"
+  case 505:
+#line 2738 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 5819 "util/configparser.c"
+#line 5828 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 524:
-#line 2747 "./util/configparser.y"
+  case 526:
+#line 2758 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5827,31 +5836,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5831 "util/configparser.c"
+#line 5840 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 525:
-#line 2756 "./util/configparser.y"
+  case 527:
+#line 2767 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 5841 "util/configparser.c"
+#line 5850 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 526:
-#line 2763 "./util/configparser.y"
+  case 528:
+#line 2774 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 5851 "util/configparser.c"
+#line 5860 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 527:
-#line 2770 "./util/configparser.y"
+  case 529:
+#line 2781 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5859,51 +5868,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5863 "util/configparser.c"
+#line 5872 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 528:
-#line 2779 "./util/configparser.y"
+  case 530:
+#line 2790 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 5873 "util/configparser.c"
+#line 5882 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 529:
-#line 2786 "./util/configparser.y"
+  case 531:
+#line 2797 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 5883 "util/configparser.c"
+#line 5892 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 530:
-#line 2793 "./util/configparser.y"
+  case 532:
+#line 2804 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 5893 "util/configparser.c"
+#line 5902 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 531:
-#line 2800 "./util/configparser.y"
+  case 533:
+#line 2811 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 5903 "util/configparser.c"
+#line 5912 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 532:
-#line 2807 "./util/configparser.y"
+  case 534:
+#line 2818 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5911,11 +5920,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5915 "util/configparser.c"
+#line 5924 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 533:
-#line 2816 "./util/configparser.y"
+  case 535:
+#line 2827 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5923,31 +5932,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5927 "util/configparser.c"
+#line 5936 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 534:
-#line 2825 "./util/configparser.y"
+  case 536:
+#line 2836 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 5937 "util/configparser.c"
+#line 5946 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 535:
-#line 2832 "./util/configparser.y"
+  case 537:
+#line 2843 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 5947 "util/configparser.c"
+#line 5956 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 536:
-#line 2839 "./util/configparser.y"
+  case 538:
+#line 2850 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5956,11 +5965,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5960 "util/configparser.c"
+#line 5969 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 537:
-#line 2849 "./util/configparser.y"
+  case 539:
+#line 2860 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5969,11 +5978,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5973 "util/configparser.c"
+#line 5982 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 538:
-#line 2859 "./util/configparser.y"
+  case 540:
+#line 2870 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5982,11 +5991,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5986 "util/configparser.c"
+#line 5995 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 539:
-#line 2869 "./util/configparser.y"
+  case 541:
+#line 2880 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5995,11 +6004,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5999 "util/configparser.c"
+#line 6008 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 540:
-#line 2879 "./util/configparser.y"
+  case 542:
+#line 2890 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6008,11 +6017,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6012 "util/configparser.c"
+#line 6021 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 541:
-#line 2889 "./util/configparser.y"
+  case 543:
+#line 2900 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6021,29 +6030,29 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6025 "util/configparser.c"
+#line 6034 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 542:
-#line 2899 "./util/configparser.y"
+  case 544:
+#line 2910 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6033 "util/configparser.c"
+#line 6042 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 546:
-#line 2908 "./util/configparser.y"
+  case 548:
+#line 2919 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6043 "util/configparser.c"
+#line 6052 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 547:
-#line 2914 "./util/configparser.y"
+  case 549:
+#line 2925 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6052,21 +6061,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6056 "util/configparser.c"
+#line 6065 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 548:
-#line 2924 "./util/configparser.y"
+  case 550:
+#line 2935 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6066 "util/configparser.c"
+#line 6075 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 549:
-#line 2931 "./util/configparser.y"
+  case 551:
+#line 2942 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6074,30 +6083,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6078 "util/configparser.c"
+#line 6087 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 550:
-#line 2940 "./util/configparser.y"
+  case 552:
+#line 2951 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6089 "util/configparser.c"
+#line 6098 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 551:
-#line 2948 "./util/configparser.y"
+  case 553:
+#line 2959 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6097 "util/configparser.c"
+#line 6106 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 564:
-#line 2964 "./util/configparser.y"
+  case 566:
+#line 2975 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6105,11 +6114,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6109 "util/configparser.c"
+#line 6118 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 565:
-#line 2974 "./util/configparser.y"
+  case 567:
+#line 2985 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6117,21 +6126,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6121 "util/configparser.c"
+#line 6130 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 566:
-#line 2983 "./util/configparser.y"
+  case 568:
+#line 2994 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6131 "util/configparser.c"
+#line 6140 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 567:
-#line 2990 "./util/configparser.y"
+  case 569:
+#line 3001 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6139,21 +6148,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6143 "util/configparser.c"
+#line 6152 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 568:
-#line 2999 "./util/configparser.y"
+  case 570:
+#line 3010 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6153 "util/configparser.c"
+#line 6162 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 569:
-#line 3006 "./util/configparser.y"
+  case 571:
+#line 3017 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6161,22 +6170,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6165 "util/configparser.c"
+#line 6174 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 570:
-#line 3015 "./util/configparser.y"
+  case 572:
+#line 3026 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6176 "util/configparser.c"
+#line 6185 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 571:
-#line 3023 "./util/configparser.y"
+  case 573:
+#line 3034 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6188,22 +6197,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6192 "util/configparser.c"
+#line 6201 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 572:
-#line 3036 "./util/configparser.y"
+  case 574:
+#line 3047 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6203 "util/configparser.c"
+#line 6212 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 573:
-#line 3044 "./util/configparser.y"
+  case 575:
+#line 3055 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6215,19 +6224,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6219 "util/configparser.c"
+#line 6228 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 574:
-#line 3057 "./util/configparser.y"
+  case 576:
+#line 3068 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6227 "util/configparser.c"
+#line 6236 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 582:
-#line 3067 "./util/configparser.y"
+  case 584:
+#line 3078 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6238,11 +6247,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6242 "util/configparser.c"
+#line 6251 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 583:
-#line 3079 "./util/configparser.y"
+  case 585:
+#line 3090 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6253,11 +6262,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6257 "util/configparser.c"
+#line 6266 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 584:
-#line 3091 "./util/configparser.y"
+  case 586:
+#line 3102 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6268,11 +6277,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6272 "util/configparser.c"
+#line 6281 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 585:
-#line 3103 "./util/configparser.y"
+  case 587:
+#line 3114 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6286,11 +6295,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6290 "util/configparser.c"
+#line 6299 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 586:
-#line 3118 "./util/configparser.y"
+  case 588:
+#line 3129 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6302,11 +6311,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6306 "util/configparser.c"
+#line 6315 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 587:
-#line 3131 "./util/configparser.y"
+  case 589:
+#line 3142 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6316,19 +6325,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6320 "util/configparser.c"
+#line 6329 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 588:
-#line 3142 "./util/configparser.y"
+  case 590:
+#line 3153 "./util/configparser.y" /* yacc.c:1646  */
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6328 "util/configparser.c"
+#line 6337 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 593:
-#line 3151 "./util/configparser.y"
+  case 595:
+#line 3162 "./util/configparser.y" /* yacc.c:1646  */
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6342,11 +6351,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6346 "util/configparser.c"
+#line 6355 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 594:
-#line 3166 "./util/configparser.y"
+  case 596:
+#line 3177 "./util/configparser.y" /* yacc.c:1646  */
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6360,12 +6369,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6364 "util/configparser.c"
+#line 6373 "util/configparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 6368 "util/configparser.c"
-
+#line 6377 "util/configparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -6390,13 +6398,14 @@ yyreduce:
   /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-  {
-    const int yylhs = yyr1[yyn] - YYNTOKENS;
-    const int yyi = yypgoto[yylhs] + *yyssp;
-    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
-               ? yytable[yyi]
-               : yydefgoto[yylhs]);
-  }
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
@@ -6479,10 +6488,12 @@ yyerrlab:
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
-  /* Pacify compilers when the user code never invokes YYERROR and the
-     label yyerrorlab therefore never appears in user code.  */
-  if (0)
-    YYERROR;
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -6544,7 +6555,6 @@ yyacceptlab:
   yyresult = 0;
   goto yyreturn;
 
-
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
@@ -6552,7 +6562,6 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-
 #if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
@@ -6563,10 +6572,6 @@ yyexhaustedlab:
   /* Fall through.  */
 #endif
 
-
-/*-----------------------------------------------------.
-| yyreturn -- parsing is finished, return the result.  |
-`-----------------------------------------------------*/
 yyreturn:
   if (yychar != YYEMPTY)
     {
@@ -6596,7 +6601,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3180 "./util/configparser.y"
+#line 3191 "./util/configparser.y" /* yacc.c:1906  */
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index aaf822223..117b1e5fe 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.1.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
-   Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,9 +30,6 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
-
 #ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
 # define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
 /* Debug traces.  */
@@ -187,150 +183,151 @@ extern int yydebug;
     VAR_STUB_SSL_UPSTREAM = 393,
     VAR_FORWARD_SSL_UPSTREAM = 394,
     VAR_TLS_CERT_BUNDLE = 395,
-    VAR_STUB_FIRST = 396,
-    VAR_MINIMAL_RESPONSES = 397,
-    VAR_RRSET_ROUNDROBIN = 398,
-    VAR_MAX_UDP_SIZE = 399,
-    VAR_DELAY_CLOSE = 400,
-    VAR_UNBLOCK_LAN_ZONES = 401,
-    VAR_INSECURE_LAN_ZONES = 402,
-    VAR_INFRA_CACHE_MIN_RTT = 403,
-    VAR_DNS64_PREFIX = 404,
-    VAR_DNS64_SYNTHALL = 405,
-    VAR_DNS64_IGNORE_AAAA = 406,
-    VAR_DNSTAP = 407,
-    VAR_DNSTAP_ENABLE = 408,
-    VAR_DNSTAP_SOCKET_PATH = 409,
-    VAR_DNSTAP_IP = 410,
-    VAR_DNSTAP_TLS = 411,
-    VAR_DNSTAP_TLS_SERVER_NAME = 412,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 413,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415,
-    VAR_DNSTAP_SEND_IDENTITY = 416,
-    VAR_DNSTAP_SEND_VERSION = 417,
-    VAR_DNSTAP_IDENTITY = 418,
-    VAR_DNSTAP_VERSION = 419,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425,
-    VAR_RESPONSE_IP_TAG = 426,
-    VAR_RESPONSE_IP = 427,
-    VAR_RESPONSE_IP_DATA = 428,
-    VAR_HARDEN_ALGO_DOWNGRADE = 429,
-    VAR_IP_TRANSPARENT = 430,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 431,
-    VAR_IP_RATELIMIT = 432,
-    VAR_IP_RATELIMIT_SLABS = 433,
-    VAR_IP_RATELIMIT_SIZE = 434,
-    VAR_RATELIMIT = 435,
-    VAR_RATELIMIT_SLABS = 436,
-    VAR_RATELIMIT_SIZE = 437,
-    VAR_RATELIMIT_FOR_DOMAIN = 438,
-    VAR_RATELIMIT_BELOW_DOMAIN = 439,
-    VAR_IP_RATELIMIT_FACTOR = 440,
-    VAR_RATELIMIT_FACTOR = 441,
-    VAR_SEND_CLIENT_SUBNET = 442,
-    VAR_CLIENT_SUBNET_ZONE = 443,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 444,
-    VAR_CLIENT_SUBNET_OPCODE = 445,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 446,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 447,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 448,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 449,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 450,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 451,
-    VAR_CAPS_WHITELIST = 452,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 453,
-    VAR_PERMIT_SMALL_HOLDDOWN = 454,
-    VAR_QNAME_MINIMISATION = 455,
-    VAR_QNAME_MINIMISATION_STRICT = 456,
-    VAR_IP_FREEBIND = 457,
-    VAR_DEFINE_TAG = 458,
-    VAR_LOCAL_ZONE_TAG = 459,
-    VAR_ACCESS_CONTROL_TAG = 460,
-    VAR_LOCAL_ZONE_OVERRIDE = 461,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 462,
-    VAR_ACCESS_CONTROL_TAG_DATA = 463,
-    VAR_VIEW = 464,
-    VAR_ACCESS_CONTROL_VIEW = 465,
-    VAR_VIEW_FIRST = 466,
-    VAR_SERVE_EXPIRED = 467,
-    VAR_SERVE_EXPIRED_TTL = 468,
-    VAR_SERVE_EXPIRED_TTL_RESET = 469,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 470,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 471,
-    VAR_FAKE_DSA = 472,
-    VAR_FAKE_SHA1 = 473,
-    VAR_LOG_IDENTITY = 474,
-    VAR_HIDE_TRUSTANCHOR = 475,
-    VAR_TRUST_ANCHOR_SIGNALING = 476,
-    VAR_AGGRESSIVE_NSEC = 477,
-    VAR_USE_SYSTEMD = 478,
-    VAR_SHM_ENABLE = 479,
-    VAR_SHM_KEY = 480,
-    VAR_ROOT_KEY_SENTINEL = 481,
-    VAR_DNSCRYPT = 482,
-    VAR_DNSCRYPT_ENABLE = 483,
-    VAR_DNSCRYPT_PORT = 484,
-    VAR_DNSCRYPT_PROVIDER = 485,
-    VAR_DNSCRYPT_SECRET_KEY = 486,
-    VAR_DNSCRYPT_PROVIDER_CERT = 487,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 488,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 489,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 490,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 491,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 492,
-    VAR_IPSECMOD_ENABLED = 493,
-    VAR_IPSECMOD_HOOK = 494,
-    VAR_IPSECMOD_IGNORE_BOGUS = 495,
-    VAR_IPSECMOD_MAX_TTL = 496,
-    VAR_IPSECMOD_WHITELIST = 497,
-    VAR_IPSECMOD_STRICT = 498,
-    VAR_CACHEDB = 499,
-    VAR_CACHEDB_BACKEND = 500,
-    VAR_CACHEDB_SECRETSEED = 501,
-    VAR_CACHEDB_REDISHOST = 502,
-    VAR_CACHEDB_REDISPORT = 503,
-    VAR_CACHEDB_REDISTIMEOUT = 504,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 505,
-    VAR_FOR_UPSTREAM = 506,
-    VAR_AUTH_ZONE = 507,
-    VAR_ZONEFILE = 508,
-    VAR_MASTER = 509,
-    VAR_URL = 510,
-    VAR_FOR_DOWNSTREAM = 511,
-    VAR_FALLBACK_ENABLED = 512,
-    VAR_TLS_ADDITIONAL_PORT = 513,
-    VAR_LOW_RTT = 514,
-    VAR_LOW_RTT_PERMIL = 515,
-    VAR_FAST_SERVER_PERMIL = 516,
-    VAR_FAST_SERVER_NUM = 517,
-    VAR_ALLOW_NOTIFY = 518,
-    VAR_TLS_WIN_CERT = 519,
-    VAR_TCP_CONNECTION_LIMIT = 520,
-    VAR_FORWARD_NO_CACHE = 521,
-    VAR_STUB_NO_CACHE = 522,
-    VAR_LOG_SERVFAIL = 523,
-    VAR_DENY_ANY = 524,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 525,
-    VAR_LOG_TAG_QUERYREPLY = 526,
-    VAR_STREAM_WAIT_SIZE = 527,
-    VAR_TLS_CIPHERS = 528,
-    VAR_TLS_CIPHERSUITES = 529,
-    VAR_IPSET = 530,
-    VAR_IPSET_NAME_V4 = 531,
-    VAR_IPSET_NAME_V6 = 532,
-    VAR_TLS_SESSION_TICKET_KEYS = 533,
-    VAR_RPZ = 534,
-    VAR_TAGS = 535,
-    VAR_RPZ_ACTION_OVERRIDE = 536,
-    VAR_RPZ_CNAME_OVERRIDE = 537,
-    VAR_RPZ_LOG = 538,
-    VAR_RPZ_LOG_NAME = 539
+    VAR_HTTPS_PORT = 396,
+    VAR_STUB_FIRST = 397,
+    VAR_MINIMAL_RESPONSES = 398,
+    VAR_RRSET_ROUNDROBIN = 399,
+    VAR_MAX_UDP_SIZE = 400,
+    VAR_DELAY_CLOSE = 401,
+    VAR_UNBLOCK_LAN_ZONES = 402,
+    VAR_INSECURE_LAN_ZONES = 403,
+    VAR_INFRA_CACHE_MIN_RTT = 404,
+    VAR_DNS64_PREFIX = 405,
+    VAR_DNS64_SYNTHALL = 406,
+    VAR_DNS64_IGNORE_AAAA = 407,
+    VAR_DNSTAP = 408,
+    VAR_DNSTAP_ENABLE = 409,
+    VAR_DNSTAP_SOCKET_PATH = 410,
+    VAR_DNSTAP_IP = 411,
+    VAR_DNSTAP_TLS = 412,
+    VAR_DNSTAP_TLS_SERVER_NAME = 413,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 414,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 415,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 416,
+    VAR_DNSTAP_SEND_IDENTITY = 417,
+    VAR_DNSTAP_SEND_VERSION = 418,
+    VAR_DNSTAP_IDENTITY = 419,
+    VAR_DNSTAP_VERSION = 420,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 421,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 422,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 423,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 424,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 425,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 426,
+    VAR_RESPONSE_IP_TAG = 427,
+    VAR_RESPONSE_IP = 428,
+    VAR_RESPONSE_IP_DATA = 429,
+    VAR_HARDEN_ALGO_DOWNGRADE = 430,
+    VAR_IP_TRANSPARENT = 431,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 432,
+    VAR_IP_RATELIMIT = 433,
+    VAR_IP_RATELIMIT_SLABS = 434,
+    VAR_IP_RATELIMIT_SIZE = 435,
+    VAR_RATELIMIT = 436,
+    VAR_RATELIMIT_SLABS = 437,
+    VAR_RATELIMIT_SIZE = 438,
+    VAR_RATELIMIT_FOR_DOMAIN = 439,
+    VAR_RATELIMIT_BELOW_DOMAIN = 440,
+    VAR_IP_RATELIMIT_FACTOR = 441,
+    VAR_RATELIMIT_FACTOR = 442,
+    VAR_SEND_CLIENT_SUBNET = 443,
+    VAR_CLIENT_SUBNET_ZONE = 444,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445,
+    VAR_CLIENT_SUBNET_OPCODE = 446,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 447,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 448,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 449,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 450,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 451,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 452,
+    VAR_CAPS_WHITELIST = 453,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 454,
+    VAR_PERMIT_SMALL_HOLDDOWN = 455,
+    VAR_QNAME_MINIMISATION = 456,
+    VAR_QNAME_MINIMISATION_STRICT = 457,
+    VAR_IP_FREEBIND = 458,
+    VAR_DEFINE_TAG = 459,
+    VAR_LOCAL_ZONE_TAG = 460,
+    VAR_ACCESS_CONTROL_TAG = 461,
+    VAR_LOCAL_ZONE_OVERRIDE = 462,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 463,
+    VAR_ACCESS_CONTROL_TAG_DATA = 464,
+    VAR_VIEW = 465,
+    VAR_ACCESS_CONTROL_VIEW = 466,
+    VAR_VIEW_FIRST = 467,
+    VAR_SERVE_EXPIRED = 468,
+    VAR_SERVE_EXPIRED_TTL = 469,
+    VAR_SERVE_EXPIRED_TTL_RESET = 470,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 471,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472,
+    VAR_FAKE_DSA = 473,
+    VAR_FAKE_SHA1 = 474,
+    VAR_LOG_IDENTITY = 475,
+    VAR_HIDE_TRUSTANCHOR = 476,
+    VAR_TRUST_ANCHOR_SIGNALING = 477,
+    VAR_AGGRESSIVE_NSEC = 478,
+    VAR_USE_SYSTEMD = 479,
+    VAR_SHM_ENABLE = 480,
+    VAR_SHM_KEY = 481,
+    VAR_ROOT_KEY_SENTINEL = 482,
+    VAR_DNSCRYPT = 483,
+    VAR_DNSCRYPT_ENABLE = 484,
+    VAR_DNSCRYPT_PORT = 485,
+    VAR_DNSCRYPT_PROVIDER = 486,
+    VAR_DNSCRYPT_SECRET_KEY = 487,
+    VAR_DNSCRYPT_PROVIDER_CERT = 488,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 489,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 490,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 491,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 492,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 493,
+    VAR_IPSECMOD_ENABLED = 494,
+    VAR_IPSECMOD_HOOK = 495,
+    VAR_IPSECMOD_IGNORE_BOGUS = 496,
+    VAR_IPSECMOD_MAX_TTL = 497,
+    VAR_IPSECMOD_WHITELIST = 498,
+    VAR_IPSECMOD_STRICT = 499,
+    VAR_CACHEDB = 500,
+    VAR_CACHEDB_BACKEND = 501,
+    VAR_CACHEDB_SECRETSEED = 502,
+    VAR_CACHEDB_REDISHOST = 503,
+    VAR_CACHEDB_REDISPORT = 504,
+    VAR_CACHEDB_REDISTIMEOUT = 505,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 506,
+    VAR_FOR_UPSTREAM = 507,
+    VAR_AUTH_ZONE = 508,
+    VAR_ZONEFILE = 509,
+    VAR_MASTER = 510,
+    VAR_URL = 511,
+    VAR_FOR_DOWNSTREAM = 512,
+    VAR_FALLBACK_ENABLED = 513,
+    VAR_TLS_ADDITIONAL_PORT = 514,
+    VAR_LOW_RTT = 515,
+    VAR_LOW_RTT_PERMIL = 516,
+    VAR_FAST_SERVER_PERMIL = 517,
+    VAR_FAST_SERVER_NUM = 518,
+    VAR_ALLOW_NOTIFY = 519,
+    VAR_TLS_WIN_CERT = 520,
+    VAR_TCP_CONNECTION_LIMIT = 521,
+    VAR_FORWARD_NO_CACHE = 522,
+    VAR_STUB_NO_CACHE = 523,
+    VAR_LOG_SERVFAIL = 524,
+    VAR_DENY_ANY = 525,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 526,
+    VAR_LOG_TAG_QUERYREPLY = 527,
+    VAR_STREAM_WAIT_SIZE = 528,
+    VAR_TLS_CIPHERS = 529,
+    VAR_TLS_CIPHERSUITES = 530,
+    VAR_IPSET = 531,
+    VAR_IPSET_NAME_V4 = 532,
+    VAR_IPSET_NAME_V6 = 533,
+    VAR_TLS_SESSION_TICKET_KEYS = 534,
+    VAR_RPZ = 535,
+    VAR_TAGS = 536,
+    VAR_RPZ_ACTION_OVERRIDE = 537,
+    VAR_RPZ_CNAME_OVERRIDE = 538,
+    VAR_RPZ_LOG = 539,
+    VAR_RPZ_LOG_NAME = 540
   };
 #endif
 /* Tokens.  */
@@ -472,162 +469,164 @@ extern int yydebug;
 #define VAR_STUB_SSL_UPSTREAM 393
 #define VAR_FORWARD_SSL_UPSTREAM 394
 #define VAR_TLS_CERT_BUNDLE 395
-#define VAR_STUB_FIRST 396
-#define VAR_MINIMAL_RESPONSES 397
-#define VAR_RRSET_ROUNDROBIN 398
-#define VAR_MAX_UDP_SIZE 399
-#define VAR_DELAY_CLOSE 400
-#define VAR_UNBLOCK_LAN_ZONES 401
-#define VAR_INSECURE_LAN_ZONES 402
-#define VAR_INFRA_CACHE_MIN_RTT 403
-#define VAR_DNS64_PREFIX 404
-#define VAR_DNS64_SYNTHALL 405
-#define VAR_DNS64_IGNORE_AAAA 406
-#define VAR_DNSTAP 407
-#define VAR_DNSTAP_ENABLE 408
-#define VAR_DNSTAP_SOCKET_PATH 409
-#define VAR_DNSTAP_IP 410
-#define VAR_DNSTAP_TLS 411
-#define VAR_DNSTAP_TLS_SERVER_NAME 412
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 413
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 414
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 415
-#define VAR_DNSTAP_SEND_IDENTITY 416
-#define VAR_DNSTAP_SEND_VERSION 417
-#define VAR_DNSTAP_IDENTITY 418
-#define VAR_DNSTAP_VERSION 419
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 420
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 421
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 422
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 423
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 424
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 425
-#define VAR_RESPONSE_IP_TAG 426
-#define VAR_RESPONSE_IP 427
-#define VAR_RESPONSE_IP_DATA 428
-#define VAR_HARDEN_ALGO_DOWNGRADE 429
-#define VAR_IP_TRANSPARENT 430
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 431
-#define VAR_IP_RATELIMIT 432
-#define VAR_IP_RATELIMIT_SLABS 433
-#define VAR_IP_RATELIMIT_SIZE 434
-#define VAR_RATELIMIT 435
-#define VAR_RATELIMIT_SLABS 436
-#define VAR_RATELIMIT_SIZE 437
-#define VAR_RATELIMIT_FOR_DOMAIN 438
-#define VAR_RATELIMIT_BELOW_DOMAIN 439
-#define VAR_IP_RATELIMIT_FACTOR 440
-#define VAR_RATELIMIT_FACTOR 441
-#define VAR_SEND_CLIENT_SUBNET 442
-#define VAR_CLIENT_SUBNET_ZONE 443
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 444
-#define VAR_CLIENT_SUBNET_OPCODE 445
-#define VAR_MAX_CLIENT_SUBNET_IPV4 446
-#define VAR_MAX_CLIENT_SUBNET_IPV6 447
-#define VAR_MIN_CLIENT_SUBNET_IPV4 448
-#define VAR_MIN_CLIENT_SUBNET_IPV6 449
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 450
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 451
-#define VAR_CAPS_WHITELIST 452
-#define VAR_CACHE_MAX_NEGATIVE_TTL 453
-#define VAR_PERMIT_SMALL_HOLDDOWN 454
-#define VAR_QNAME_MINIMISATION 455
-#define VAR_QNAME_MINIMISATION_STRICT 456
-#define VAR_IP_FREEBIND 457
-#define VAR_DEFINE_TAG 458
-#define VAR_LOCAL_ZONE_TAG 459
-#define VAR_ACCESS_CONTROL_TAG 460
-#define VAR_LOCAL_ZONE_OVERRIDE 461
-#define VAR_ACCESS_CONTROL_TAG_ACTION 462
-#define VAR_ACCESS_CONTROL_TAG_DATA 463
-#define VAR_VIEW 464
-#define VAR_ACCESS_CONTROL_VIEW 465
-#define VAR_VIEW_FIRST 466
-#define VAR_SERVE_EXPIRED 467
-#define VAR_SERVE_EXPIRED_TTL 468
-#define VAR_SERVE_EXPIRED_TTL_RESET 469
-#define VAR_SERVE_EXPIRED_REPLY_TTL 470
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 471
-#define VAR_FAKE_DSA 472
-#define VAR_FAKE_SHA1 473
-#define VAR_LOG_IDENTITY 474
-#define VAR_HIDE_TRUSTANCHOR 475
-#define VAR_TRUST_ANCHOR_SIGNALING 476
-#define VAR_AGGRESSIVE_NSEC 477
-#define VAR_USE_SYSTEMD 478
-#define VAR_SHM_ENABLE 479
-#define VAR_SHM_KEY 480
-#define VAR_ROOT_KEY_SENTINEL 481
-#define VAR_DNSCRYPT 482
-#define VAR_DNSCRYPT_ENABLE 483
-#define VAR_DNSCRYPT_PORT 484
-#define VAR_DNSCRYPT_PROVIDER 485
-#define VAR_DNSCRYPT_SECRET_KEY 486
-#define VAR_DNSCRYPT_PROVIDER_CERT 487
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 488
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 489
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 490
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 491
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 492
-#define VAR_IPSECMOD_ENABLED 493
-#define VAR_IPSECMOD_HOOK 494
-#define VAR_IPSECMOD_IGNORE_BOGUS 495
-#define VAR_IPSECMOD_MAX_TTL 496
-#define VAR_IPSECMOD_WHITELIST 497
-#define VAR_IPSECMOD_STRICT 498
-#define VAR_CACHEDB 499
-#define VAR_CACHEDB_BACKEND 500
-#define VAR_CACHEDB_SECRETSEED 501
-#define VAR_CACHEDB_REDISHOST 502
-#define VAR_CACHEDB_REDISPORT 503
-#define VAR_CACHEDB_REDISTIMEOUT 504
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 505
-#define VAR_FOR_UPSTREAM 506
-#define VAR_AUTH_ZONE 507
-#define VAR_ZONEFILE 508
-#define VAR_MASTER 509
-#define VAR_URL 510
-#define VAR_FOR_DOWNSTREAM 511
-#define VAR_FALLBACK_ENABLED 512
-#define VAR_TLS_ADDITIONAL_PORT 513
-#define VAR_LOW_RTT 514
-#define VAR_LOW_RTT_PERMIL 515
-#define VAR_FAST_SERVER_PERMIL 516
-#define VAR_FAST_SERVER_NUM 517
-#define VAR_ALLOW_NOTIFY 518
-#define VAR_TLS_WIN_CERT 519
-#define VAR_TCP_CONNECTION_LIMIT 520
-#define VAR_FORWARD_NO_CACHE 521
-#define VAR_STUB_NO_CACHE 522
-#define VAR_LOG_SERVFAIL 523
-#define VAR_DENY_ANY 524
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 525
-#define VAR_LOG_TAG_QUERYREPLY 526
-#define VAR_STREAM_WAIT_SIZE 527
-#define VAR_TLS_CIPHERS 528
-#define VAR_TLS_CIPHERSUITES 529
-#define VAR_IPSET 530
-#define VAR_IPSET_NAME_V4 531
-#define VAR_IPSET_NAME_V6 532
-#define VAR_TLS_SESSION_TICKET_KEYS 533
-#define VAR_RPZ 534
-#define VAR_TAGS 535
-#define VAR_RPZ_ACTION_OVERRIDE 536
-#define VAR_RPZ_CNAME_OVERRIDE 537
-#define VAR_RPZ_LOG 538
-#define VAR_RPZ_LOG_NAME 539
+#define VAR_HTTPS_PORT 396
+#define VAR_STUB_FIRST 397
+#define VAR_MINIMAL_RESPONSES 398
+#define VAR_RRSET_ROUNDROBIN 399
+#define VAR_MAX_UDP_SIZE 400
+#define VAR_DELAY_CLOSE 401
+#define VAR_UNBLOCK_LAN_ZONES 402
+#define VAR_INSECURE_LAN_ZONES 403
+#define VAR_INFRA_CACHE_MIN_RTT 404
+#define VAR_DNS64_PREFIX 405
+#define VAR_DNS64_SYNTHALL 406
+#define VAR_DNS64_IGNORE_AAAA 407
+#define VAR_DNSTAP 408
+#define VAR_DNSTAP_ENABLE 409
+#define VAR_DNSTAP_SOCKET_PATH 410
+#define VAR_DNSTAP_IP 411
+#define VAR_DNSTAP_TLS 412
+#define VAR_DNSTAP_TLS_SERVER_NAME 413
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 414
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 415
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 416
+#define VAR_DNSTAP_SEND_IDENTITY 417
+#define VAR_DNSTAP_SEND_VERSION 418
+#define VAR_DNSTAP_IDENTITY 419
+#define VAR_DNSTAP_VERSION 420
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 421
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 422
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 423
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 424
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 425
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 426
+#define VAR_RESPONSE_IP_TAG 427
+#define VAR_RESPONSE_IP 428
+#define VAR_RESPONSE_IP_DATA 429
+#define VAR_HARDEN_ALGO_DOWNGRADE 430
+#define VAR_IP_TRANSPARENT 431
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 432
+#define VAR_IP_RATELIMIT 433
+#define VAR_IP_RATELIMIT_SLABS 434
+#define VAR_IP_RATELIMIT_SIZE 435
+#define VAR_RATELIMIT 436
+#define VAR_RATELIMIT_SLABS 437
+#define VAR_RATELIMIT_SIZE 438
+#define VAR_RATELIMIT_FOR_DOMAIN 439
+#define VAR_RATELIMIT_BELOW_DOMAIN 440
+#define VAR_IP_RATELIMIT_FACTOR 441
+#define VAR_RATELIMIT_FACTOR 442
+#define VAR_SEND_CLIENT_SUBNET 443
+#define VAR_CLIENT_SUBNET_ZONE 444
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 445
+#define VAR_CLIENT_SUBNET_OPCODE 446
+#define VAR_MAX_CLIENT_SUBNET_IPV4 447
+#define VAR_MAX_CLIENT_SUBNET_IPV6 448
+#define VAR_MIN_CLIENT_SUBNET_IPV4 449
+#define VAR_MIN_CLIENT_SUBNET_IPV6 450
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 451
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 452
+#define VAR_CAPS_WHITELIST 453
+#define VAR_CACHE_MAX_NEGATIVE_TTL 454
+#define VAR_PERMIT_SMALL_HOLDDOWN 455
+#define VAR_QNAME_MINIMISATION 456
+#define VAR_QNAME_MINIMISATION_STRICT 457
+#define VAR_IP_FREEBIND 458
+#define VAR_DEFINE_TAG 459
+#define VAR_LOCAL_ZONE_TAG 460
+#define VAR_ACCESS_CONTROL_TAG 461
+#define VAR_LOCAL_ZONE_OVERRIDE 462
+#define VAR_ACCESS_CONTROL_TAG_ACTION 463
+#define VAR_ACCESS_CONTROL_TAG_DATA 464
+#define VAR_VIEW 465
+#define VAR_ACCESS_CONTROL_VIEW 466
+#define VAR_VIEW_FIRST 467
+#define VAR_SERVE_EXPIRED 468
+#define VAR_SERVE_EXPIRED_TTL 469
+#define VAR_SERVE_EXPIRED_TTL_RESET 470
+#define VAR_SERVE_EXPIRED_REPLY_TTL 471
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 472
+#define VAR_FAKE_DSA 473
+#define VAR_FAKE_SHA1 474
+#define VAR_LOG_IDENTITY 475
+#define VAR_HIDE_TRUSTANCHOR 476
+#define VAR_TRUST_ANCHOR_SIGNALING 477
+#define VAR_AGGRESSIVE_NSEC 478
+#define VAR_USE_SYSTEMD 479
+#define VAR_SHM_ENABLE 480
+#define VAR_SHM_KEY 481
+#define VAR_ROOT_KEY_SENTINEL 482
+#define VAR_DNSCRYPT 483
+#define VAR_DNSCRYPT_ENABLE 484
+#define VAR_DNSCRYPT_PORT 485
+#define VAR_DNSCRYPT_PROVIDER 486
+#define VAR_DNSCRYPT_SECRET_KEY 487
+#define VAR_DNSCRYPT_PROVIDER_CERT 488
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 489
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 490
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 491
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 492
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 493
+#define VAR_IPSECMOD_ENABLED 494
+#define VAR_IPSECMOD_HOOK 495
+#define VAR_IPSECMOD_IGNORE_BOGUS 496
+#define VAR_IPSECMOD_MAX_TTL 497
+#define VAR_IPSECMOD_WHITELIST 498
+#define VAR_IPSECMOD_STRICT 499
+#define VAR_CACHEDB 500
+#define VAR_CACHEDB_BACKEND 501
+#define VAR_CACHEDB_SECRETSEED 502
+#define VAR_CACHEDB_REDISHOST 503
+#define VAR_CACHEDB_REDISPORT 504
+#define VAR_CACHEDB_REDISTIMEOUT 505
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 506
+#define VAR_FOR_UPSTREAM 507
+#define VAR_AUTH_ZONE 508
+#define VAR_ZONEFILE 509
+#define VAR_MASTER 510
+#define VAR_URL 511
+#define VAR_FOR_DOWNSTREAM 512
+#define VAR_FALLBACK_ENABLED 513
+#define VAR_TLS_ADDITIONAL_PORT 514
+#define VAR_LOW_RTT 515
+#define VAR_LOW_RTT_PERMIL 516
+#define VAR_FAST_SERVER_PERMIL 517
+#define VAR_FAST_SERVER_NUM 518
+#define VAR_ALLOW_NOTIFY 519
+#define VAR_TLS_WIN_CERT 520
+#define VAR_TCP_CONNECTION_LIMIT 521
+#define VAR_FORWARD_NO_CACHE 522
+#define VAR_STUB_NO_CACHE 523
+#define VAR_LOG_SERVFAIL 524
+#define VAR_DENY_ANY 525
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 526
+#define VAR_LOG_TAG_QUERYREPLY 527
+#define VAR_STREAM_WAIT_SIZE 528
+#define VAR_TLS_CIPHERS 529
+#define VAR_TLS_CIPHERSUITES 530
+#define VAR_IPSET 531
+#define VAR_IPSET_NAME_V4 532
+#define VAR_IPSET_NAME_V6 533
+#define VAR_TLS_SESSION_TICKET_KEYS 534
+#define VAR_RPZ 535
+#define VAR_TAGS 536
+#define VAR_RPZ_ACTION_OVERRIDE 537
+#define VAR_RPZ_CNAME_OVERRIDE 538
+#define VAR_RPZ_LOG 539
+#define VAR_RPZ_LOG_NAME 540
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
 union YYSTYPE
 {
-#line 66 "./util/configparser.y"
+#line 66 "./util/configparser.y" /* yacc.c:1909  */
 
 	char*	str;
 
-#line 629 "util/configparser.h"
-
+#line 628 "util/configparser.h" /* yacc.c:1909  */
 };
+
 typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
diff --git a/util/configparser.y b/util/configparser.y
index 206f2f946..7498ab4f9 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -111,6 +111,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM
 %token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST
 %token VAR_STUB_SSL_UPSTREAM VAR_FORWARD_SSL_UPSTREAM VAR_TLS_CERT_BUNDLE
+%token VAR_HTTPS_PORT
 %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN
 %token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE
 %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES
@@ -235,6 +236,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_log_queries | server_log_replies | server_tcp_upstream | server_ssl_upstream |
 	server_log_local_actions |
 	server_ssl_service_key | server_ssl_service_pem | server_ssl_port |
+	server_https_port |
 	server_minimal_responses | server_rrset_roundrobin | server_max_udp_size |
 	server_so_reuseport | server_delay_close |
 	server_unblock_lan_zones | server_insecure_lan_zones |
@@ -949,6 +951,15 @@ server_tls_session_ticket_keys: VAR_TLS_SESSION_TICKET_KEYS STRING_ARG
 			yyerror("out of memory");
 	}
 	;
+server_https_port: VAR_HTTPS_PORT STRING_ARG
+	{
+		OUTYY(("P(server_https_port:%s)\n", $2));
+		if(atoi($2) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->https_port = atoi($2);
+		free($2);
+	}
+	;
 server_use_systemd: VAR_USE_SYSTEMD STRING_ARG
 	{
 		OUTYY(("P(server_use_systemd:%s)\n", $2));
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index b26677efb..0e01394bf 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -3771,6 +3771,7 @@
 4188,
 4191,
 4192,
+4195,
 4197,
 4199,
 4300,
diff --git a/util/net_help.c b/util/net_help.c
index 135d33427..82d37f489 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -58,6 +58,9 @@
 #ifdef USE_WINSOCK
 #include <wincrypt.h>
 #endif
+#ifdef HAVE_NGHTTP2_NGHTTP2_H
+#include <nghttp2/nghttp2.h>
+#endif
 
 /** max length of an IP address (the address portion) that we allow */
 #define MAX_ADDR_STRLEN 128 /* characters */
@@ -855,6 +858,21 @@ log_cert(unsigned level, const char* str, void* cert)
 }
 #endif /* HAVE_SSL */
 
+#if defined(HAVE_SSL) && defined(HAVE_NGHTTP2)
+static int alpn_select_cb(SSL* ATTR_UNUSED(ssl), const unsigned char** out,
+	unsigned char* outlen, const unsigned char* in, unsigned int inlen,
+	void* ATTR_UNUSED(arg))
+{
+	int rv = nghttp2_select_next_protocol((unsigned char **)out, outlen, in,
+		inlen);
+	if(rv == -1) {
+		return SSL_TLSEXT_ERR_NOACK;
+	}
+	/* either http/1.1 or h2 selected */
+	return SSL_TLSEXT_ERR_OK;
+}
+#endif
+
 int
 listen_sslctx_setup(void* ctxt)
 {
@@ -913,6 +931,9 @@ listen_sslctx_setup(void* ctxt)
 #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
 	SSL_CTX_set_security_level(ctx, 0);
 #endif
+#if defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB) && defined(HAVE_NGHTTP2)
+	SSL_CTX_set_alpn_select_cb(ctx, alpn_select_cb, NULL);
+#endif
 #else
 	(void)ctxt;
 #endif /* HAVE_SSL */
diff --git a/util/netevent.c b/util/netevent.c
index 090238384..d3802e4f6 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -733,7 +733,7 @@ static void
 setup_tcp_handler(struct comm_point* c, int fd, int cur, int max) 
 {
 	int handler_usage;
-	log_assert(c->type == comm_tcp);
+	log_assert(c->type == comm_tcp || c->type == comm_http);
 	log_assert(c->fd == -1);
 	sldns_buffer_clear(c->buffer);
 #ifdef USE_DNSCRYPT
@@ -908,6 +908,41 @@ comm_point_tcp_win_bio_cb(struct comm_point* c, void* thessl)
 }
 #endif
 
+#ifdef HAVE_NGHTTP2
+/** Create http2 session server.  Per connection, after TCP accepted.*/
+static int http2_session_server_create(struct http2_session* h2_session)
+{
+	log_assert(h2_session->callbacks);
+	h2_session->is_drop = 0;
+	if(nghttp2_session_server_new(&h2_session->session,
+			h2_session->callbacks,
+		h2_session) == NGHTTP2_ERR_NOMEM) {
+		log_err("failed to create nghttp2 session server");
+		return 0;
+	}
+
+	return 1;
+}
+
+/** Submit http2 setting to session. Once per session. */
+static int http2_submit_settings(struct http2_session* h2_session)
+{
+	int ret;
+	nghttp2_settings_entry settings[1] = {
+		{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
+
+	ret = nghttp2_submit_settings(h2_session->session, NGHTTP2_FLAG_NONE,
+		settings, 1);
+	if(ret) {
+		verbose(VERB_QUERY, "http2: submit_settings failed, "
+			"error: %s", nghttp2_strerror(ret));
+		return 0;
+	}
+	return 1;
+}
+#endif /* HAVE_NGHTTP2 */
+
+
 void 
 comm_point_tcp_accept_callback(int fd, short event, void* arg)
 {
@@ -929,7 +964,28 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
 	/* clear leftover flags from previous use, and then set the
 	 * correct event base for the event structure for libevent */
 	ub_event_free(c_hdl->ev->ev);
-	c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1, UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT, comm_point_tcp_handle_callback, c_hdl);
+
+#ifdef HAVE_NGHTTP2
+	if(c_hdl->type == comm_http && c_hdl->h2_session) {
+		if(!http2_session_server_create(c_hdl->h2_session)) {
+			log_warn("failed to create nghttp2");
+			return;
+		}
+		if(!http2_submit_settings(c_hdl->h2_session)) {
+			log_warn("failed to submit http2 settings");
+			return;
+		}
+		c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1,
+			UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT,
+			comm_point_http_handle_callback, c_hdl);
+	} else {
+#endif
+		c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1,
+			UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT,
+			comm_point_tcp_handle_callback, c_hdl);
+#ifdef HAVE_NGHTTP2
+	}
+#endif
 	if(!c_hdl->ev->ev) {
 		log_warn("could not ub_event_new, dropped tcp");
 		return;
@@ -1163,6 +1219,18 @@ ssl_handshake(struct comm_point* c)
 			c->repinfo.addrlen);
 	}
 
+	/* check if http2 use is negotiated */
+	if(c->type == comm_http && c->h2_session) {
+		const unsigned char *alpn;
+		unsigned int alpnlen = 0;
+		SSL_get0_alpn_selected(c->ssl, &alpn, &alpnlen);
+		if(alpnlen == 2 && memcmp("h2", alpn, 2) == 0) {
+			/* connection upgraded to HTTP2 */
+			c->tcp_do_toggle_rw = 0;
+			c->alpn_h2 = 1;
+		}
+	}
+
 	/* setup listen rw correctly */
 	if(c->tcp_is_reading) {
 		if(c->ssl_shake_state != comm_ssl_shake_read)
@@ -2180,11 +2248,210 @@ http_chunked_segment(struct comm_point* c)
 	return 1;
 }
 
+#ifdef HAVE_NGHTTP2
+/** Create new http2 session. Called when creating handling comm point. */
+struct http2_session* http2_session_create(struct comm_point* c)
+{
+	struct http2_session* session = calloc(1, sizeof(*session));
+	if(!session) {
+		log_err("malloc failure while creating http2 session");
+		return NULL;
+	}
+	session->c = c;
+
+	return session;
+}
+#endif
+
+/** Delete http2 session. After closing connection or on error */
+void http2_session_delete(struct http2_session* h2_session)
+{
+#ifdef HAVE_NGHTTP2
+	if(h2_session->callbacks)
+		nghttp2_session_callbacks_del(h2_session->callbacks);
+	free(h2_session);
+#else
+	(void)h2_session;
+#endif
+}
+
+#ifdef HAVE_NGHTTP2
+struct http2_stream* http2_stream_create(int32_t stream_id)
+{
+	struct http2_stream* h2_stream = calloc(1, sizeof(*h2_stream));
+	if(!h2_stream) {
+		log_err("malloc failure while creating http2 stream");
+		return NULL;
+	}
+	h2_stream->stream_id = stream_id;
+	return h2_stream;
+}
+
+/** Delete http2 stream. After session delete or stream close callback */
+void http2_stream_delete(struct http2_session* h2_session,
+	struct http2_stream* h2_stream)
+{
+	if(h2_stream->mesh_state) {
+		mesh_state_remove_reply(h2_stream->mesh, h2_stream->mesh_state,
+			h2_session->c);
+	}
+	if(h2_stream->qbuffer)
+		sldns_buffer_free(h2_stream->qbuffer);
+	if(h2_stream->rbuffer)
+		sldns_buffer_free(h2_stream->rbuffer);
+	free(h2_stream);
+}
+#endif
+
+void http2_stream_add_meshstate(struct http2_stream* h2_stream,
+	struct mesh_area* mesh, struct mesh_state* m)
+{
+	h2_stream->mesh = mesh;
+	h2_stream->mesh_state = m;
+}
+
+/** delete http2 session server. After closing connection. */
+static void http2_session_server_delete(struct http2_session* h2_session)
+{
+#ifdef HAVE_NGHTTP2
+	struct http2_stream* h2_stream, *next;
+	nghttp2_session_del(h2_session->session); /* NULL input is fine */
+	h2_session->session = NULL;
+	for(h2_stream = h2_session->first_stream; h2_stream;) {
+		next = h2_stream->next;
+		http2_stream_delete(h2_session, h2_stream);
+		h2_stream = next;
+	}
+	h2_session->first_stream = NULL;
+	h2_session->is_drop = 0;
+	h2_session->postpone_drop = 0;
+	h2_session->c->h2_stream = NULL;
+#endif
+	(void)h2_session;
+}
+
+#ifdef HAVE_NGHTTP2
+void http2_session_add_stream(struct http2_session* h2_session,
+	struct http2_stream* h2_stream)
+{
+	if(h2_session->first_stream)
+		h2_session->first_stream->prev = h2_stream;
+	h2_stream->next = h2_session->first_stream;
+	h2_session->first_stream = h2_stream;
+}
+
+/** remove stream from session linked list. After stream close callback or
+ * closing connection */
+void http2_session_remove_stream(struct http2_session* h2_session,
+	struct http2_stream* h2_stream)
+{
+	if(h2_stream->prev)
+		h2_stream->prev->next = h2_stream->next;
+	else
+		h2_session->first_stream = h2_stream->next;
+	if(h2_stream->next)
+		h2_stream->next->prev = h2_stream->prev;
+
+}
+
+int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session),
+	int32_t stream_id, uint32_t ATTR_UNUSED(error_code), void* cb_arg)
+{
+	struct http2_stream* h2_stream;
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		h2_session->session, stream_id))) {
+		return 0;
+	}
+	http2_session_remove_stream(h2_session, h2_stream);
+	http2_stream_delete(h2_session, h2_stream);
+	return 0;
+}
+
+ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf,
+	size_t len, int ATTR_UNUSED(flags), void* cb_arg)
+{
+#ifdef HAVE_SSL
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	int r;
+
+	log_assert(h2_session->c->type == comm_http);
+	log_assert(h2_session->c->h2_session);
+
+	if(!h2_session->c->ssl)
+		return 0;
+
+	ERR_clear_error();
+	r = SSL_read(h2_session->c->ssl, buf, len);
+	if(r <= 0) {
+		int want = SSL_get_error(h2_session->c->ssl, r);
+		if(want == SSL_ERROR_ZERO_RETURN) {
+			return NGHTTP2_ERR_EOF;
+		} else if(want == SSL_ERROR_WANT_READ) {
+			return NGHTTP2_ERR_WOULDBLOCK;
+		} else if(want == SSL_ERROR_WANT_WRITE) {
+			h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write;
+			comm_point_listen_for_rw(h2_session->c, 0, 1);
+			return NGHTTP2_ERR_WOULDBLOCK;
+		} else if(want == SSL_ERROR_SYSCALL) {
+#ifdef ECONNRESET
+			if(errno == ECONNRESET && verbosity < 2)
+				return NGHTTP2_ERR_CALLBACK_FAILURE;
+#endif
+			if(errno != 0)
+				log_err("SSL_read syscall: %s",
+					strerror(errno));
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		}
+		log_crypto_err("could not SSL_read");
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+	return r;
+#else
+	(void)buf;
+	(void)len;
+	(void)cb_arg;
+	return -1;
+#endif
+}
+#endif /* HAVE_NGHTTP2 */
+
+/** Handle http2 read */
+static int
+comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c)
+{
+#ifdef HAVE_NGHTTP2
+	int ret;
+	log_assert(c->h2_session);
+	log_assert(c->ssl);
+
+	/* reading until recv cb returns NGHTTP2_ERR_WOULDBLOCK */
+	ret = nghttp2_session_recv(c->h2_session->session);
+	if(ret) {
+		if(ret != NGHTTP2_ERR_EOF) {
+			verbose(VERB_QUERY, "http2: session_recv failed, "
+				"error: %s", nghttp2_strerror(ret));
+		}
+		return 0;
+	}
+	if(nghttp2_session_want_write(c->h2_session->session)) {
+		c->tcp_is_reading = 0;
+		comm_point_stop_listening(c);
+		comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+	} else if(!nghttp2_session_want_read(c->h2_session->session))
+		return 0; /* connection can be closed */
+	return 1;
+#else
+	(void)c;
+	return 0;
+#endif
+}
+
 /**
- * Handle http reading callback. 
+ * Handle http reading callback.
  * @param fd: file descriptor of socket.
  * @param c: comm point to read from into buffer.
- * @return: 0 on error 
+ * @return: 0 on error
  */
 static int
 comm_point_http_handle_read(int fd, struct comm_point* c)
@@ -2204,6 +2471,18 @@ comm_point_http_handle_read(int fd, struct comm_point* c)
 
 	if(!c->tcp_is_reading)
 		return 1;
+
+	if(c->alpn_h2) {
+		return comm_point_http2_handle_read(fd, c);
+	}
+
+	/* http version is <= http/1.1 */
+
+	if(c->http_min_version >= http_version_2) {
+		/* HTTP/2 failed, not allowed to use lower version. */
+		return 0;
+	}
+
 	/* read more data */
 	if(c->ssl) {
 		if(!ssl_http_read_more(c))
@@ -2214,7 +2493,9 @@ comm_point_http_handle_read(int fd, struct comm_point* c)
 	}
 
 	sldns_buffer_flip(c->buffer);
+
 	while(sldns_buffer_remaining(c->buffer) > 0) {
+		/* Handle HTTP/1.x data */
 		/* if we are reading headers, read more headers */
 		if(c->http_in_headers || c->http_in_chunk_headers) {
 			/* if header is done, process the header */
@@ -2376,6 +2657,83 @@ http_write_more(int fd, struct comm_point* c)
 	return 1;
 }
 
+#ifdef HAVE_NGHTTP2
+ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf,
+	size_t len, int ATTR_UNUSED(flags), void* cb_arg)
+{
+#ifdef HAVE_SSL
+	int r;
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	log_assert(h2_session->c->type == comm_http);
+	log_assert(h2_session->c->h2_session);
+
+	if(!h2_session->c->ssl)
+		return 0;
+
+	ERR_clear_error();
+	r = SSL_write(h2_session->c->ssl, buf, len);
+	if(r <= 0) {
+		int want = SSL_get_error(h2_session->c->ssl, r);
+		if(want == SSL_ERROR_ZERO_RETURN) {
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		} else if(want == SSL_ERROR_WANT_READ) {
+			h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read;
+			comm_point_listen_for_rw(h2_session->c, 1, 0);
+			return NGHTTP2_ERR_WOULDBLOCK;
+		} else if(want == SSL_ERROR_WANT_WRITE) {
+			return NGHTTP2_ERR_WOULDBLOCK;
+		} else if(want == SSL_ERROR_SYSCALL) {
+#ifdef EPIPE
+			if(errno == EPIPE && verbosity < 2)
+				return NGHTTP2_ERR_CALLBACK_FAILURE;
+#endif
+			if(errno != 0)
+				log_err("SSL_write syscall: %s",
+					strerror(errno));
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		}
+		log_crypto_err("could not SSL_write");
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+	return r;
+#else
+	(void)buf;
+	(void)len;
+	(void)cb_arg;
+	return -1;
+#endif
+}
+#endif /* HAVE_NGHTTP2 */
+
+/** Handle http2 writing */
+static int
+comm_point_http2_handle_write(int ATTR_UNUSED(fd), struct comm_point* c)
+{
+#ifdef HAVE_NGHTTP2
+	int ret;
+	log_assert(c->h2_session);
+	log_assert(c->ssl);
+
+	ret = nghttp2_session_send(c->h2_session->session);
+	if(ret) {
+		verbose(VERB_QUERY, "http2: session_send failed, "
+			"error: %s", nghttp2_strerror(ret));
+		return 0;
+	}
+
+	if(nghttp2_session_want_read(c->h2_session->session)) {
+		c->tcp_is_reading = 1;
+		comm_point_stop_listening(c);
+		comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+	} else if(!nghttp2_session_want_write(c->h2_session->session))
+		return 0; /* connection can be closed */
+	return 1;
+#else
+	(void)c;
+	return 0;
+#endif
+}
+
 /** 
  * Handle http writing callback. 
  * @param fd: file descriptor of socket.
@@ -2407,6 +2765,18 @@ comm_point_http_handle_write(int fd, struct comm_point* c)
 #endif /* HAVE_SSL */
 	if(c->tcp_is_reading)
 		return 1;
+
+	if(c->alpn_h2) {
+		return comm_point_http2_handle_write(fd, c);
+	}
+
+	/* http version is <= http/1.1 */
+
+	if(c->http_min_version >= http_version_2) {
+		/* HTTP/2 failed, not allowed to use lower version. */
+		return 0;
+	}
+
 	/* if we are writing, write more */
 	if(c->ssl) {
 		if(!ssl_http_write_more(c))
@@ -2718,11 +3088,116 @@ comm_point_create_tcp_handler(struct comm_base *base,
 	return c;
 }
 
+static struct comm_point* 
+comm_point_create_http_handler(struct comm_base *base, 
+	struct comm_point* parent, size_t bufsize, int harden_large_queries,
+	comm_point_callback_type* callback, void* callback_arg)
+{
+	struct comm_point* c = (struct comm_point*)calloc(1,
+		sizeof(struct comm_point));
+	short evbits;
+	if(!c)
+		return NULL;
+	c->ev = (struct internal_event*)calloc(1,
+		sizeof(struct internal_event));
+	if(!c->ev) {
+		free(c);
+		return NULL;
+	}
+	c->ev->base = base;
+	c->fd = -1;
+	c->buffer = sldns_buffer_new(bufsize);
+	if(!c->buffer) {
+		free(c->ev);
+		free(c);
+		return NULL;
+	}
+	c->timeout = (struct timeval*)malloc(sizeof(struct timeval));
+	if(!c->timeout) {
+		sldns_buffer_free(c->buffer);
+		free(c->ev);
+		free(c);
+		return NULL;
+	}
+	c->tcp_is_reading = 0;
+	c->tcp_byte_count = 0;
+	c->tcp_parent = parent;
+	c->tcp_timeout_msec = parent->tcp_timeout_msec;
+	c->tcp_conn_limit = parent->tcp_conn_limit;
+	c->tcl_addr = NULL;
+	c->tcp_keepalive = 0;
+	c->max_tcp_count = 0;
+	c->cur_tcp_count = 0;
+	c->tcp_handlers = NULL;
+	c->tcp_free = NULL;
+	c->type = comm_http;
+	c->tcp_do_close = 1;
+	c->do_not_close = 0;
+	c->tcp_do_toggle_rw = 1; /* will be set to 0 after http2 upgrade */
+	c->tcp_check_nb_connect = 0;
+#ifdef USE_MSG_FASTOPEN
+	c->tcp_do_fastopen = 0;
+#endif
+#ifdef USE_DNSCRYPT
+	c->dnscrypt = 0;
+	c->dnscrypt_buffer = NULL;
+#endif
+	c->repinfo.c = c;
+	c->callback = callback;
+	c->cb_arg = callback_arg;
+
+	c->http_min_version = http_version_2;
+	c->http2_max_qbuffer_size = bufsize;
+	if(harden_large_queries && bufsize > 512)
+		c->http2_max_qbuffer_size = 512;
+	c->alpn_h2 = 0;
+#ifdef HAVE_NGHTTP2
+	if(!(c->h2_session = http2_session_create(c))) {
+		log_err("could not create http2 session");
+		sldns_buffer_free(c->buffer);
+		free(c->timeout);
+		free(c->ev);
+		free(c);
+		return NULL;
+	}
+	if(!(c->h2_session->callbacks = http2_req_callbacks_create())) {
+		log_err("could not create http2 callbacks");
+		http2_session_delete(c->h2_session);
+		sldns_buffer_free(c->buffer);
+		free(c->timeout);
+		free(c->ev);
+		free(c);
+		return NULL;
+	}
+#endif
+	
+	/* add to parent free list */
+	c->tcp_free = parent->tcp_free;
+	parent->tcp_free = c;
+	/* ub_event stuff */
+	evbits = UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT;
+	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
+		comm_point_http_handle_callback, c);
+	if(c->ev->ev == NULL)
+	{
+		log_err("could not set http handler event");
+		parent->tcp_free = c->tcp_free;
+		http2_session_delete(c->h2_session);
+		sldns_buffer_free(c->buffer);
+		free(c->timeout);
+		free(c->ev);
+		free(c);
+		return NULL;
+	}
+	return c;
+}
+
 struct comm_point* 
 comm_point_create_tcp(struct comm_base *base, int fd, int num,
-	int idle_timeout, struct tcl_list* tcp_conn_limit, size_t bufsize,
-	struct sldns_buffer* spoolbuf, comm_point_callback_type* callback,
-	void* callback_arg)
+	int idle_timeout, int harden_large_queries,
+	struct tcl_list* tcp_conn_limit, size_t bufsize,
+	struct sldns_buffer* spoolbuf, enum listen_type port_type,
+	comm_point_callback_type* callback, void* callback_arg)
 {
 	struct comm_point* c = (struct comm_point*)calloc(1,
 		sizeof(struct comm_point));
@@ -2786,10 +3261,23 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num,
 		comm_point_delete(c);
 		return NULL;
 	}
-	/* now prealloc the tcp handlers */
+	/* now prealloc the handlers */
 	for(i=0; i<num; i++) {
-		c->tcp_handlers[i] = comm_point_create_tcp_handler(base,
-			c, bufsize, spoolbuf, callback, callback_arg);
+		if(port_type == listen_type_tcp ||
+			port_type == listen_type_ssl ||
+			port_type == listen_type_tcp_dnscrypt) {
+			c->tcp_handlers[i] = comm_point_create_tcp_handler(base,
+				c, bufsize, spoolbuf, callback, callback_arg);
+		} else if(port_type == listen_type_http) {
+			c->tcp_handlers[i] = comm_point_create_http_handler(
+				base, c, bufsize, harden_large_queries,
+				callback, callback_arg);
+		}
+		else {
+			log_err("could not create tcp handler, unknown listen "
+				"type");
+			return NULL;
+		}
 		if(!c->tcp_handlers[i]) {
 			comm_point_delete(c);
 			return NULL;
@@ -3073,6 +3561,9 @@ comm_point_close(struct comm_point* c)
 	tcl_close_connection(c->tcl_addr);
 	if(c->tcp_req_info)
 		tcp_req_info_clear(c->tcp_req_info);
+	if(c->h2_session)
+		http2_session_server_delete(c->h2_session);
+
 	/* close fd after removing from event lists, or epoll.. is messed up */
 	if(c->fd != -1 && !c->do_not_close) {
 		if(c->type == comm_tcp || c->type == comm_http) {
@@ -3119,6 +3610,9 @@ comm_point_delete(struct comm_point* c)
 		if(c->tcp_req_info) {
 			tcp_req_info_delete(c->tcp_req_info);
 		}
+		if(c->h2_session) {
+			http2_session_delete(c->h2_session);
+		}
 	}
 	ub_event_free(c->ev->ev);
 	free(c->ev);
@@ -3161,6 +3655,17 @@ comm_point_send_reply(struct comm_reply *repinfo)
 #endif
 		if(repinfo->c->tcp_req_info) {
 			tcp_req_info_send_reply(repinfo->c->tcp_req_info);
+		} else if(repinfo->c->alpn_h2) {
+			if(!http2_submit_dns_response(repinfo->c->h2_session)) {
+				comm_point_drop_reply(repinfo);
+				return;
+			}
+			repinfo->c->h2_stream = NULL;
+			repinfo->c->tcp_is_reading = 0;
+			comm_point_stop_listening(repinfo->c);
+			comm_point_start_listening(repinfo->c, -1,
+				repinfo->c->tcp_timeout_msec);
+			return;
 		} else {
 			comm_point_start_listening(repinfo->c, -1,
 				repinfo->c->tcp_timeout_msec);
@@ -3179,6 +3684,16 @@ comm_point_drop_reply(struct comm_reply* repinfo)
 		return;
 	if(repinfo->c->tcp_req_info)
 		repinfo->c->tcp_req_info->is_drop = 1;
+	if(repinfo->c->type == comm_http) {
+		if(repinfo->c->h2_session) {
+			repinfo->c->h2_session->is_drop = 1;
+			if(!repinfo->c->h2_session->postpone_drop)
+				reclaim_http_handler(repinfo->c);
+			return;
+		}
+		reclaim_http_handler(repinfo->c);
+		return;
+	}
 	reclaim_tcp_handler(repinfo->c);
 }
 
diff --git a/util/netevent.h b/util/netevent.h
index bb2cd1e53..8664a61b6 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -61,6 +61,9 @@
 #define NET_EVENT_H
 
 #include "dnscrypt/dnscrypt.h"
+#ifdef HAVE_NGHTTP2_NGHTTP2_H
+#include <nghttp2/nghttp2.h>
+#endif
 
 struct sldns_buffer;
 struct comm_point;
@@ -68,11 +71,16 @@ struct comm_reply;
 struct tcl_list;
 struct ub_event_base;
 
+struct mesh_state;
+struct mesh_area;
+
 /* internal event notification data storage structure. */
 struct internal_event;
 struct internal_base;
 struct internal_timer; /* A sub struct of the comm_timer super struct */
 
+enum listen_type;
+
 /** callback from communication point function type */
 typedef int comm_point_callback_type(struct comm_point*, void*, int, 
 	struct comm_reply*);
@@ -205,6 +213,13 @@ struct comm_point {
 	} ssl_shake_state;
 
 	/* -------- HTTP ------- */
+	/** Do not allow connection to use HTTP version lower than this. 0=no
+	 * minimum. */
+	enum {
+		http_version_none = 0,
+		http_version_2 = 2
+	} http_min_version;
+	/* -------- HTTP/1.1 ------- */
 	/** Currently reading in http headers */
 	int http_in_headers;
 	/** Currently reading in chunk headers, 0=not, 1=firstline, 2=unused
@@ -216,6 +231,15 @@ struct comm_point {
 	struct sldns_buffer* http_temp;
 	/** http stored content in buffer */
 	size_t http_stored;
+	/* -------- HTTP/2 ------- */
+	/** http2 session */
+	struct http2_session* h2_session;
+	/** set to 1 if h2 is negatiated using alpn */
+	int alpn_h2;
+	/** maximum allowed query buffer size */
+	size_t http2_max_qbuffer_size;
+	/** stream currently being handled */
+	struct http2_stream* h2_stream;
 
 	/* -------- dnstap ------- */
 	/** the dnstap environment */
@@ -456,10 +480,13 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base,
  * @param num: becomes max_tcp_count, the routine allocates that
  *	many tcp handler commpoints.
  * @param idle_timeout: TCP idle timeout in ms.
+ * @param harden_large_queries: whether query size should be limited.
  * @param tcp_conn_limit: TCP connection limit info.
  * @param bufsize: size of buffer to create for handlers.
  * @param spoolbuf: shared spool buffer for tcp_req_info structures.
  * 	or NULL to not create those structures in the tcp handlers.
+ * @param port_type: the type of port we are creating a TCP listener for. Used
+ * 	to select handler type to use.
  * @param callback: callback function pointer for TCP handlers.
  * @param callback_arg: will be passed to your callback function.
  * @return: returns the TCP listener commpoint. You can find the
@@ -468,8 +495,10 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base,
  * Inits timeout to NULL. All handlers are on the free list.
  */
 struct comm_point* comm_point_create_tcp(struct comm_base* base,
-	int fd, int num, int idle_timeout, struct tcl_list* tcp_conn_limit,
+	int fd, int num, int idle_timeout, int harden_large_queries,
+	struct tcl_list* tcp_conn_limit,
 	size_t bufsize, struct sldns_buffer* spoolbuf,
+	enum listen_type port_type,
 	comm_point_callback_type* callback, void* callback_arg);
 
 /**
@@ -723,6 +752,110 @@ void comm_point_tcp_handle_callback(int fd, short event, void* arg);
  */
 void comm_point_http_handle_callback(int fd, short event, void* arg);
 
+/**
+ * HTTP2 session.  HTTP2 related info per comm point.
+ */
+struct http2_session {
+	/** first item in list of streams */
+	struct http2_stream* first_stream;
+#ifdef HAVE_NGHTTP2
+	/** nghttp2 session */
+	nghttp2_session *session;
+	/** store nghttp2 callbacks for easy reuse */
+	nghttp2_session_callbacks* callbacks;
+#endif
+	/** comm point containing buffer used to build answer in worker or
+	 * module */
+	struct comm_point* c;
+	/** session is instructed to get dropped (comm port will be closed) */
+	int is_drop;
+	/** postpone dropping the session, can be used to prevent dropping
+	 * while being in a callback */
+	int postpone_drop;
+};
+
+/** enum of HTTP status */
+enum http_status {
+	HTTP_STATUS_OK = 200,
+	HTTP_STATUS_BAD_REQUEST = 400,
+	HTTP_STATUS_NOT_FOUND = 404,
+	HTTP_STATUS_PAYLOAD_TOO_LARGE = 413,
+	HTTP_STATUS_URI_TOO_LONG = 414,
+	HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
+	HTTP_STATUS_NOT_IMPLEMENTED = 501
+};
+
+/**
+ * HTTP stream. Part of list of HTTP2 streams per session.
+ */
+struct http2_stream {
+	/** next stream in list per session */
+	struct http2_stream* next;
+	/** previous stream in list per session */
+	struct http2_stream* prev;
+	/** HTTP2 stream ID is an unsigned 31-bit integer */
+	int32_t stream_id;
+	/** HTTP method used for this stream */
+	enum {
+		HTTP_METHOD_POST = 1,
+		HTTP_METHOD_GET,
+		HTTP_METHOD_UNSUPPORTED
+	} http_method;
+	/** message contains invalid content type */
+	int invalid_content_type;
+	/** message body content type */
+	size_t content_length;
+	/** HTTP response status */
+	enum http_status status;
+	/** request for non existing endpoint */
+	int invalid_endpoint;
+	/** query in request is too large */
+	int query_too_large;
+	/** buffer to store query into. Can't use session shared buffer as query
+	 * can arrive in parts, intertwined with frames for other queries. */
+	struct sldns_buffer* qbuffer;
+	/** buffer to store response into. Can't use shared buffer as a next
+	 * query read callback can overwrite it before it is send out. */
+	struct sldns_buffer* rbuffer;
+	/** mesh area containing mesh state */
+	struct mesh_area* mesh;
+	/** mesh state for query. Used to remove mesh reply before closing
+	 * stream. */
+	struct mesh_state* mesh_state;
+};
+
+#ifdef HAVE_NGHTTP2
+/** nghttp2 receive cb. Read from SSL connection into nghttp2 buffer */
+ssize_t http2_recv_cb(nghttp2_session* session, uint8_t* buf,
+	size_t len, int flags, void* cb_arg);
+/** nghttp2 send callback. Send from nghttp2 buffer to ssl socket */
+ssize_t http2_send_cb(nghttp2_session* session, const uint8_t* buf,
+	size_t len, int flags, void* cb_arg);
+/** nghttp2 callback on closing stream */
+int http2_stream_close_cb(nghttp2_session* session, int32_t stream_id,
+	uint32_t error_code, void* cb_arg);
+#endif
+
+/**
+ * Create new http2 stream
+ * @param stream_id: ID for stream to create.
+ * @return malloc'ed stream, NULL on error
+ */
+struct http2_stream* http2_stream_create(int32_t stream_id);
+
+/**
+ * Add new stream to session linked list
+ * @param h2_session: http2 session to add stream to
+ * @param h2_stream: stream to add to session list
+ */
+void http2_session_add_stream(struct http2_session* h2_session,
+	struct http2_stream* h2_stream);
+
+/** Add mesh state to stream. To be able to remove mesh reply on stream closure
+ */
+void http2_stream_add_meshstate(struct http2_stream* h2_stream,
+	struct mesh_area* mesh, struct mesh_state* m);
+
 /**
  * This routine is published for checks and tests, and is only used internally.
  * handle libevent callback for timer comm.

From 723980fe77e327780d1bc80256ab3cf25f4d47db Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Fri, 8 May 2020 12:14:17 +0200
Subject: [PATCH 002/108] - Add query.num.https counter

---
 daemon/remote.c            | 2 ++
 daemon/stats.c             | 3 +++
 doc/unbound-control.8.in   | 5 +++++
 libunbound/unbound.h       | 2 ++
 smallapp/unbound-control.c | 1 +
 5 files changed, 13 insertions(+)

diff --git a/daemon/remote.c b/daemon/remote.c
index 83eef7af2..09f3ae88f 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -979,6 +979,8 @@ print_ext(RES* ssl, struct ub_stats_info* s)
 		(unsigned long)s->svr.qtls_resume)) return 0;
 	if(!ssl_printf(ssl, "num.query.ipv6"SQ"%lu\n", 
 		(unsigned long)s->svr.qipv6)) return 0;
+	if(!ssl_printf(ssl, "num.query.https"SQ"%lu\n",
+		(unsigned long)s->svr.qhttps)) return 0;
 	/* flags */
 	if(!ssl_printf(ssl, "num.query.flags.QR"SQ"%lu\n", 
 		(unsigned long)s->svr.qbit_QR)) return 0;
diff --git a/daemon/stats.c b/daemon/stats.c
index a568ba070..2b88eb097 100644
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -421,6 +421,7 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a)
 		total->svr.qtcp_outgoing += a->svr.qtcp_outgoing;
 		total->svr.qtls += a->svr.qtls;
 		total->svr.qtls_resume += a->svr.qtls_resume;
+		total->svr.qhttps += a->svr.qhttps;
 		total->svr.qipv6 += a->svr.qipv6;
 		total->svr.qbit_QR += a->svr.qbit_QR;
 		total->svr.qbit_AA += a->svr.qbit_AA;
@@ -484,6 +485,8 @@ void server_stats_insquery(struct ub_server_stats* stats, struct comm_point* c,
 			if(SSL_session_reused(c->ssl)) 
 				stats->qtls_resume++;
 #endif
+			if(c->type == comm_http)
+				stats->qhttps++;
 		}
 	}
 	if(repinfo && addr_is_ip6(&repinfo->addr, repinfo->addrlen))
diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in
index 74d06cfd9..42eb8ea14 100644
--- a/doc/unbound-control.8.in
+++ b/doc/unbound-control.8.in
@@ -545,6 +545,11 @@ These are also counted in num.query.tcp, because TLS uses TCP.
 Number of TLS session resumptions, these are queries over TLS towards
 the unbound server where the client negotiated a TLS session resumption key.
 .TP
+.I num.query.https
+Number of queries that were made using HTTPS towards the unbound server.
+These are also counted in num.query.tcp and num.query.tls, because HTTPS
+uses TLS and TCP.
+.TP
 .I num.query.ipv6
 Number of queries that were made using IPv6 towards the unbound server.
 .TP
diff --git a/libunbound/unbound.h b/libunbound/unbound.h
index ca9592d62..2fad02f2c 100644
--- a/libunbound/unbound.h
+++ b/libunbound/unbound.h
@@ -696,6 +696,8 @@ struct ub_server_stats {
 	long long qtcp_outgoing;
 	/** number of queries over (DNS over) TLS */
 	long long qtls;
+	/** number of queries over (DNS over) HTTPS */
+	long long qhttps;
 	/** number of queries over IPv6 */
 	long long qipv6;
 	/** number of queries with QR bit */
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 4e5ce1e4b..ee5e44d2f 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -338,6 +338,7 @@ static void print_extended(struct ub_stats_info* s)
 	PR_UL("num.query.tcpout", s->svr.qtcp_outgoing);
 	PR_UL("num.query.tls", s->svr.qtls);
 	PR_UL("num.query.tls_resume", s->svr.qtls_resume);
+	PR_UL("num.query.https", s->svr.qhttps);
 	PR_UL("num.query.ipv6", s->svr.qipv6);
 
 	/* flags */

From 6cc761f6b2db8b03dfc61468c9893d55e4f874c4 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Fri, 8 May 2020 14:19:44 +0200
Subject: [PATCH 003/108]  - Add base64 decode unit test

---
 testcode/unitldns.c | 52 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/testcode/unitldns.c b/testcode/unitldns.c
index 66f756170..22c9ed945 100644
--- a/testcode/unitldns.c
+++ b/testcode/unitldns.c
@@ -44,6 +44,7 @@
 #include "sldns/sbuffer.h"
 #include "sldns/str2wire.h"
 #include "sldns/wire2str.h"
+#include "sldns/parseutil.h"
 
 /** verbose this unit test */
 static int vbmp = 0; 
@@ -220,9 +221,60 @@ rr_tests(void)
 		SRCDIRSTR "/testdata/test_ldnsrr.c5");
 }
 
+/** test various base64 decoding options */
+static void
+b64_test(void)
+{
+	/* "normal" b64 alphabet, with padding */
+	char* p1 = "aGVsbG8="; /* "hello" */
+	char* p2 = "aGVsbG8+"; /* "hello>" */
+	char* p3 = "aGVsbG8/IQ=="; /* "hello?!" */
+	char* p4 = "aGVsbG8"; /* "hel" + extra garbage */
+
+	/* base64 url, without padding */
+	char* u1 = "aGVsbG8"; /* "hello" */
+	char* u2 = "aGVsbG8-"; /* "hello>" */
+	char* u3 = "aGVsbG8_IQ"; /* "hello?!" */
+	char* u4 = "aaaaa"; /* garbage */
+
+	char target[128];
+	size_t tarsize = 128;
+	int result;
+
+	memset(target, 0, sizeof(target));
+	result = sldns_b64_pton(p1, (uint8_t*)target, tarsize);
+	unit_assert(result == strlen("hello") && strcmp(target, "hello") == 0);
+	memset(target, 0, sizeof(target));
+	result = sldns_b64_pton(p2, (uint8_t*)target, tarsize);
+	unit_assert(result == strlen("hello>") && strcmp(target, "hello>") == 0);
+	memset(target, 0, sizeof(target));
+	result = sldns_b64_pton(p3, (uint8_t*)target, tarsize);
+	unit_assert(result == strlen("hello?!") && strcmp(target, "hello?!") == 0);
+	memset(target, 0, sizeof(target));
+	result = sldns_b64_pton(p4, (uint8_t*)target, tarsize);
+	/* when padding is used everything that is not a block of 4 will be
+	 * ignored */
+	unit_assert(result == strlen("hel") && strcmp(target, "hel") == 0);
+
+	memset(target, 0, sizeof(target));
+	result = sldns_b64url_pton(u1, strlen(u1), (uint8_t*)target, tarsize);
+	unit_assert(result == strlen("hello") && strcmp(target, "hello") == 0);
+	memset(target, 0, sizeof(target));
+	result = sldns_b64url_pton(u2, strlen(u2), (uint8_t*)target, tarsize);
+	unit_assert(result == strlen("hello>") && strcmp(target, "hello>") == 0);
+	memset(target, 0, sizeof(target));
+	result = sldns_b64url_pton(u3, strlen(u3), (uint8_t*)target, tarsize);
+	unit_assert(result == strlen("hello+/") && strcmp(target, "hello?!") == 0);
+	/* one item in block of four is not allowed */
+	memset(target, 0, sizeof(target));
+	result = sldns_b64url_pton(u4, strlen(u4), (uint8_t*)target, tarsize);
+	unit_assert(result == -1);
+}
+
 void
 ldns_test(void)
 {
 	unit_show_feature("sldns");
 	rr_tests();
+	b64_test();
 }

From 8fc2320b5cadc491ea34f3073685579d70e7a8b5 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Tue, 12 May 2020 18:12:19 +0200
Subject: [PATCH 004/108] - Add mem.http.query_buffer and
 mem.http.response_buffer stats - Add configurable limits for
 http-query-buffer-size and   http-response-buffer-size - Make http endpoint,
 max_streams, and TCP_NODELAY for HTTP sockets   configurable.

---
 Makefile.in                |   19 +-
 daemon/remote.c            |    6 +
 daemon/stats.c             |    4 +
 daemon/worker.c            |    4 +-
 doc/unbound-control.8.in   |    8 +
 libunbound/unbound.h       |    4 +
 services/listen_dnsport.c  |  227 +-
 services/listen_dnsport.h  |   21 +-
 smallapp/unbound-control.c |    2 +
 testcode/fake_event.c      |   16 +-
 util/config_file.c         |   26 +-
 util/config_file.h         |   19 +-
 util/configlexer.c         | 4753 ++++++++++++++++++------------------
 util/configlexer.lex       |    7 +-
 util/configparser.c        | 3444 +++++++++++++-------------
 util/configparser.h        |  600 ++---
 util/configparser.y        |   68 +-
 util/netevent.c            |   33 +-
 util/netevent.h            |   12 +-
 19 files changed, 4869 insertions(+), 4404 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3a63c97be..f2b9ac76d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -904,7 +904,7 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h \
+ $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \
  $(srcdir)/services/outside_network.h  $(srcdir)/services/cache/infra.h \
  $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/dns64/dns64.h \
  $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \
@@ -915,7 +915,15 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/
  $(srcdir)/libunbound/worker.h
 locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
 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
+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)/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)/services/rpz.h \
+ $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \
+ $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h
 module.lo module.o: $(srcdir)/util/module.c config.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 $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
@@ -987,7 +995,7 @@ tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/u
  $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.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)/util/tube.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)/util/log.h $(srcdir)/util/fptr_wlist.h \
@@ -997,7 +1005,7 @@ ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h
+ $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.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 \
  $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
@@ -1160,7 +1168,8 @@ testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcod
  $(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
 unitldns.lo unitldns.o: $(srcdir)/testcode/unitldns.c config.h $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h \
+ $(srcdir)/sldns/parseutil.h
 unitecs.lo unitecs.o: $(srcdir)/testcode/unitecs.c config.h
 unitauth.lo unitauth.o: $(srcdir)/testcode/unitauth.c config.h $(srcdir)/services/authzone.h \
  $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h \
diff --git a/daemon/remote.c b/daemon/remote.c
index 09f3ae88f..465665d6f 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -853,6 +853,12 @@ print_mem(RES* ssl, struct worker* worker, struct daemon* daemon,
 	if(!print_longnum(ssl, "mem.streamwait"SQ,
 		(size_t)s->svr.mem_stream_wait))
 		return 0;
+	if(!print_longnum(ssl, "mem.http.query_buffer"SQ,
+		(size_t)s->svr.mem_http2_query_buffer))
+		return 0;
+	if(!print_longnum(ssl, "mem.http.response_buffer"SQ,
+		(size_t)s->svr.mem_http2_response_buffer))
+		return 0;
 	return 1;
 }
 
diff --git a/daemon/stats.c b/daemon/stats.c
index 2b88eb097..bb7b4232f 100644
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -335,6 +335,10 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 	}
 	s->svr.mem_stream_wait =
 		(long long)tcp_req_info_get_stream_buffer_size();
+	s->svr.mem_http2_query_buffer =
+		(long long)http2_get_query_buffer_size();
+	s->svr.mem_http2_response_buffer =
+		(long long)http2_get_response_buffer_size();
 
 	/* Set neg cache usage numbers */
 	set_neg_cache_stats(worker, &s->svr, reset);
diff --git a/daemon/worker.c b/daemon/worker.c
index f6043c3ae..e1d64bceb 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1797,8 +1797,8 @@ worker_init(struct worker* worker, struct config_file *cfg,
 		cfg->do_tcp_keepalive
 			? cfg->tcp_keepalive_timeout
 			: cfg->tcp_idle_timeout,
-		cfg->harden_large_queries,
-		worker->daemon->tcl,
+		cfg->harden_large_queries, cfg->http_max_streams,
+		cfg->http_endpoint, worker->daemon->tcl,
 		worker->daemon->listen_sslctx,
 		dtenv, worker_handle_request, worker);
 	if(!worker->front) {
diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in
index 42eb8ea14..97972ff27 100644
--- a/doc/unbound-control.8.in
+++ b/doc/unbound-control.8.in
@@ -506,6 +506,14 @@ negative cache.
 Memory in bytes in used by the TCP and TLS stream wait buffers.  These are
 answers waiting to be written back to the clients.
 .TP
+.I mem.http.query_buffer
+Memory in bytes used by the HTTP/2 query buffers. Containing (partial) DNS
+queries waiting for request stream completion.
+.TP
+.I mem.http.response_buffer
+Memory in bytes used by the HTTP/2 response buffers. Containing DNS responses
+waiting to be written back to the clients.
+.TP
 .I histogram.<sec>.<usec>.to.<sec>.<usec>
 Shows a histogram, summed over all threads. Every element counts the
 recursive queries whose reply time fit between the lower and upper bound.
diff --git a/libunbound/unbound.h b/libunbound/unbound.h
index 2fad02f2c..0f9d78c7c 100644
--- a/libunbound/unbound.h
+++ b/libunbound/unbound.h
@@ -788,6 +788,10 @@ struct ub_server_stats {
 	long long num_query_subnet_cache;
 	/** number of bytes in the stream wait buffers */
 	long long mem_stream_wait;
+	/** number of bytes in the HTTP2 query buffers */
+	long long mem_http2_query_buffer;
+	/** number of bytes in the HTTP2 response buffers */
+	long long mem_http2_response_buffer;
 	/** number of TLS connection resume */
 	long long qtls_resume;
 	/** RPZ action stats */
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 656663b42..076cac646 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -80,11 +80,23 @@
 #ifndef THREADS_DISABLED
 /** lock on the counter of stream buffer memory */
 static lock_basic_type stream_wait_count_lock;
+/** lock on the counter of HTTP2 query buffer memory */
+static lock_basic_type http2_query_buffer_count_lock;
+/** lock on the counter of HTTP2 response buffer memory */
+static lock_basic_type http2_response_buffer_count_lock;
 #endif
 /** size (in bytes) of stream wait buffers */
 static size_t stream_wait_count = 0;
 /** is the lock initialised for stream wait buffers */
 static int stream_wait_lock_inited = 0;
+/** size (in bytes) of HTTP2 query buffers */
+static size_t http2_query_buffer_count = 0;
+/** is the lock initialised for HTTP2 query buffers */
+static int http2_query_buffer_lock_inited = 0;
+/** size (in bytes) of HTTP2 response buffers */
+static size_t http2_response_buffer_count = 0;
+/** is the lock initialised for HTTP2 response buffers */
+static int http2_response_buffer_lock_inited = 0;
 
 /**
  * Debug print of the getaddrinfo returned address.
@@ -707,20 +719,6 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 #else
 		log_warn(" setsockopt(TCP_NODELAY) unsupported");
 #endif /* defined(IPPROTO_TCP) && defined(TCP_NODELAY) */
-#if defined(IPPROTO_TCP) && defined(TCP_QUICKACK)
-		if(setsockopt(s, IPPROTO_TCP, TCP_QUICKACK, (void*)&on,
-			(socklen_t)sizeof(on)) < 0) {
-			#ifndef USE_WINSOCK
-			log_err(" setsockopt(.. TCP_QUICKACK ..) failed: %s",
-				strerror(errno));
-			#else
-			log_err(" setsockopt(.. TCP_QUICKACK ..) failed: %s",
-				wsa_strerror(WSAGetLastError()));
-			#endif
-		}
-#else
-		log_warn(" setsockopt(TCP_QUICKACK) unsupported");
-#endif /* defined(IPPROTO_TCP) && defined(TCP_QUICKACK) */
 	}
 	if (mss > 0) {
 #if defined(IPPROTO_TCP) && defined(TCP_MAXSEG)
@@ -1251,6 +1249,7 @@ if_is_https(const char* ifname, const char* port, int https_port)
  * @param transparent: set IP_TRANSPARENT socket option.
  * @param tcp_mss: maximum segment size of tcp socket. default if zero.
  * @param freebind: set IP_FREEBIND socket option.
+ * @param http2_nodelay: set TCP_NODELAY on HTTP/2 connection
  * @param use_systemd: if true, fetch sockets from systemd.
  * @param dnscrypt_port: dnscrypt service port number
  * @param dscp: DSCP to use.
@@ -1262,11 +1261,11 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 	size_t rcv, size_t snd, int ssl_port,
 	struct config_strlist* tls_additional_port, int https_port,
 	int* reuseport, int transparent, int tcp_mss, int freebind,
-	int use_systemd, int dnscrypt_port, int dscp)
+	int http2_nodelay, int use_systemd, int dnscrypt_port, int dscp)
 {
 	int s, noip6=0;
 	int is_https = if_is_https(ifname, port, https_port);
-	int nodelay = is_https; /* TODO make config option */
+	int nodelay = is_https && http2_nodelay;
 #ifdef USE_DNSCRYPT
 	int is_dnscrypt = ((strchr(ifname, '@') && 
 			atoi(strchr(ifname, '@')+1) == dnscrypt_port) ||
@@ -1384,7 +1383,8 @@ listen_cp_insert(struct comm_point* c, struct listen_dnsport* front)
 struct listen_dnsport* 
 listen_create(struct comm_base* base, struct listen_port* ports,
 	size_t bufsize, int tcp_accept_count, int tcp_idle_timeout,
-	int harden_large_queries, struct tcl_list* tcp_conn_limit, void* sslctx,
+	int harden_large_queries, uint32_t http_max_streams,
+	char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx,
 	struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg)
 {
 	struct listen_dnsport* front = (struct listen_dnsport*)
@@ -1404,6 +1404,14 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 		lock_basic_init(&stream_wait_count_lock);
 		stream_wait_lock_inited = 1;
 	}
+	if(!http2_query_buffer_lock_inited) {
+		lock_basic_init(&http2_query_buffer_count_lock);
+		http2_query_buffer_lock_inited = 1;
+	}
+	if(!http2_response_buffer_lock_inited) {
+		lock_basic_init(&http2_response_buffer_count_lock);
+		http2_response_buffer_lock_inited = 1;
+	}
 
 	/* create comm points as needed */
 	while(ports) {
@@ -1416,7 +1424,7 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 				ports->ftype == listen_type_tcp_dnscrypt)
 			cp = comm_point_create_tcp(base, ports->fd, 
 				tcp_accept_count, tcp_idle_timeout,
-				harden_large_queries,
+				harden_large_queries, 0, NULL,
 				tcp_conn_limit, bufsize, front->udp_buff,
 				ports->ftype, cb, cb_arg);
 		else if(ports->ftype == listen_type_ssl ||
@@ -1424,6 +1432,7 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 			cp = comm_point_create_tcp(base, ports->fd, 
 				tcp_accept_count, tcp_idle_timeout,
 				harden_large_queries,
+				http_max_streams, http_endpoint,
 				tcp_conn_limit, bufsize, front->udp_buff,
 				ports->ftype, cb, cb_arg);
 			cp->ssl = sslctx;
@@ -1518,6 +1527,14 @@ listen_delete(struct listen_dnsport* front)
 		stream_wait_lock_inited = 0;
 		lock_basic_destroy(&stream_wait_count_lock);
 	}
+	if(http2_query_buffer_lock_inited) {
+		http2_query_buffer_lock_inited = 0;
+		lock_basic_destroy(&http2_query_buffer_count_lock);
+	}
+	if(http2_response_buffer_lock_inited) {
+		http2_response_buffer_lock_inited = 0;
+		lock_basic_destroy(&http2_response_buffer_count_lock);
+	}
 }
 
 struct listen_port* 
@@ -1558,9 +1575,9 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				&hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port,
-				reuseport, cfg->ip_transparent,
-				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
+				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->tcp_mss, cfg->ip_freebind,
+				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
 				listening_ports_free(list);
 				return NULL;
@@ -1573,9 +1590,9 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				&hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port,
-				reuseport, cfg->ip_transparent,
-				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
+				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->tcp_mss, cfg->ip_freebind,
+				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
 				listening_ports_free(list);
 				return NULL;
@@ -1590,9 +1607,9 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				do_tcp, &hints, portbuf, &list, 
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port,
-				reuseport, cfg->ip_transparent,
-				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
+				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->tcp_mss, cfg->ip_freebind,
+				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
 				listening_ports_free(list);
 				return NULL;
@@ -1605,9 +1622,9 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				do_tcp, &hints, portbuf, &list, 
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port,
-				reuseport, cfg->ip_transparent,
-				cfg->tcp_mss, cfg->ip_freebind, cfg->use_systemd,
+				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->tcp_mss, cfg->ip_freebind,
+				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
 				listening_ports_free(list);
 				return NULL;
@@ -2050,6 +2067,28 @@ size_t tcp_req_info_get_stream_buffer_size(void)
 	return s;
 }
 
+size_t http2_get_query_buffer_size(void)
+{
+	size_t s;
+	if(!http2_query_buffer_lock_inited)
+		return http2_query_buffer_count;
+	lock_basic_lock(&http2_query_buffer_count_lock);
+	s = http2_query_buffer_count;
+	lock_basic_unlock(&http2_query_buffer_count_lock);
+	return s;
+}
+
+size_t http2_get_response_buffer_size(void)
+{
+	size_t s;
+	if(!http2_response_buffer_lock_inited)
+		return http2_response_buffer_count;
+	lock_basic_lock(&http2_response_buffer_count_lock);
+	s = http2_response_buffer_count;
+	lock_basic_unlock(&http2_response_buffer_count_lock);
+	return s;
+}
+
 #ifdef HAVE_NGHTTP2
 /** nghttp2 callback. Used to copy response from rbuffer to nghttp2 session */
 static ssize_t http2_submit_response_read_callback(
@@ -2070,8 +2109,7 @@ static ssize_t http2_submit_response_read_callback(
 		sldns_buffer_remaining(h2_stream->rbuffer) == 0) {
 		verbose(VERB_QUERY, "http2: cannot submit buffer. No data "
 			"available in rbuffer");
-		sldns_buffer_free(h2_stream->rbuffer);
-		h2_stream->rbuffer = NULL;
+		/* rbuffer will be free'd in frame close cb */
 		return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
 	}
 
@@ -2085,6 +2123,10 @@ static ssize_t http2_submit_response_read_callback(
 
 	if(sldns_buffer_remaining(h2_stream->rbuffer) == 0) {
 		*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+		lock_basic_lock(&http2_response_buffer_count_lock);
+		http2_response_buffer_count -=
+			sldns_buffer_capacity(h2_stream->rbuffer);
+		lock_basic_unlock(&http2_response_buffer_count_lock);
 		sldns_buffer_free(h2_stream->rbuffer);
 		h2_stream->rbuffer = NULL;
 	}
@@ -2092,6 +2134,26 @@ static ssize_t http2_submit_response_read_callback(
 	return copylen;
 }
 
+/**
+ * Send RST_STREAM frame for stream.
+ * @param h2_session: http2 session to submit frame to
+ * @param h2_stream: http2 stream containing frame ID to use in RST_STREAM
+ * @return 0 on error, 1 otherwise
+ */
+static int http2_submit_rst_stream(struct http2_session* h2_session,
+		struct http2_stream* h2_stream)
+{
+	int ret = nghttp2_submit_rst_stream(h2_session->session,
+		NGHTTP2_FLAG_NONE, h2_stream->stream_id,
+		NGHTTP2_INTERNAL_ERROR);
+	if(ret) {
+		verbose(VERB_QUERY, "http2: nghttp2_submit_rst_stream failed, "
+			"error: %s", nghttp2_strerror(ret));
+		return 0;
+	}
+	return 1;
+}
+
 /**
  * DNS response ready to be submitted to nghttp2, to be prepared for sending
  * out. Response is stored in c->buffer. Copy to rbuffer because the c->buffer
@@ -2106,6 +2168,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	char status[4];
 	nghttp2_nv headers[2];
 	struct http2_stream* h2_stream = h2_session->c->h2_stream;
+	size_t rlen;
 
 	if(h2_stream->rbuffer) {
 		log_err("http2 submit response error: rbuffer already "
@@ -2117,17 +2180,28 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 		return 0;
 	}
 
-	if(!(h2_stream->rbuffer = sldns_buffer_new(
-		sldns_buffer_remaining(h2_session->c->buffer)))) {
-		log_err("http2 submit response error: malloc failure");
-		return 0;
-	}
-
 	if(snprintf(status, 4, "%d", h2_stream->status) != 3) {
 		verbose(VERB_QUERY, "http2: submit response error: "
 			"invalid status");
 		return 0;
 	}
+
+	rlen = sldns_buffer_remaining(h2_session->c->buffer);
+	lock_basic_lock(&http2_response_buffer_count_lock);
+	if(http2_response_buffer_count + rlen > http2_response_buffer_max) {
+		lock_basic_unlock(&http2_response_buffer_count_lock);
+		verbose(VERB_ALGO, "reset HTTP2 stream, no space left, "
+			"in https-response-buffer-size");
+		return http2_submit_rst_stream(h2_session, h2_stream);
+	}
+	if(!(h2_stream->rbuffer = sldns_buffer_new(rlen))) {
+		lock_basic_unlock(&http2_response_buffer_count_lock);
+		log_err("http2 submit response error: malloc failure");
+		return 0;
+	}
+	http2_response_buffer_count += rlen;
+	lock_basic_unlock(&http2_response_buffer_count_lock);
+
 	headers[0].name = (uint8_t*)":status";
 	headers[0].namelen = 7;
 	headers[0].value = (uint8_t*)status;
@@ -2275,8 +2349,7 @@ static int http2_query_read_done(struct http2_session* h2_session,
 	}
 	if(sldns_buffer_remaining(h2_session->c->buffer) <
 		sldns_buffer_remaining(h2_stream->qbuffer)) {
-		sldns_buffer_free(h2_stream->qbuffer);
-		h2_stream->qbuffer = NULL;
+		/* qbuffer will be free'd in frame close cb */
 		sldns_buffer_clear(h2_session->c->buffer);
 		verbose(VERB_ALGO, "http2_query_read_done failure: can't fit "
 			"qbuffer in c->buffer");
@@ -2287,6 +2360,9 @@ static int http2_query_read_done(struct http2_session* h2_session,
 		sldns_buffer_current(h2_stream->qbuffer),
 		sldns_buffer_remaining(h2_stream->qbuffer));
 
+	lock_basic_lock(&http2_query_buffer_count_lock);
+	http2_query_buffer_count -= sldns_buffer_capacity(h2_stream->qbuffer);
+	lock_basic_unlock(&http2_query_buffer_count_lock);
 	sldns_buffer_free(h2_stream->qbuffer);
 	h2_stream->qbuffer = NULL;
 
@@ -2449,21 +2525,34 @@ static int http2_buffer_uri_query(struct http2_session* h2_session,
 	expectb64len = sldns_b64_pton_calculate_size(length);
 	log_assert(expectb64len > 0);
 	if(expectb64len >
-		h2_session->c->http2_max_qbuffer_size) {
+		h2_session->c->http2_stream_max_qbuffer_size) {
 		h2_stream->query_too_large = 1;
 		return 1;
 	}
 
+	lock_basic_lock(&http2_query_buffer_count_lock);
+	if(http2_query_buffer_count + expectb64len > http2_query_buffer_max) {
+		lock_basic_unlock(&http2_query_buffer_count_lock);
+		verbose(VERB_ALGO, "reset HTTP2 stream, no space left, "
+			"in http2-query-buffer-size");
+		return http2_submit_rst_stream(h2_session, h2_stream);
+	}
 	if(!(h2_stream->qbuffer = sldns_buffer_new(expectb64len))) {
+		lock_basic_unlock(&http2_query_buffer_count_lock);
 		log_err("http2_req_header fail, qbuffer "
 			"malloc failure");
 		return 0;
 	}
+	http2_query_buffer_count += expectb64len;
+	lock_basic_unlock(&http2_query_buffer_count_lock);
 
 	if(!(b64len = sldns_b64url_pton(
 		(char const *)start, length,
 		sldns_buffer_current(h2_stream->qbuffer),
 		expectb64len)) || b64len < 0) {
+		lock_basic_lock(&http2_query_buffer_count_lock);
+		http2_query_buffer_count -= expectb64len;
+		lock_basic_unlock(&http2_query_buffer_count_lock);
 		sldns_buffer_free(h2_stream->qbuffer);
 		h2_stream->qbuffer = NULL;
 		/* return without error, method can be an
@@ -2518,6 +2607,10 @@ static int http2_req_header_cb(nghttp2_session* session,
 			h2_stream->http_method = HTTP_METHOD_POST;
 			if(h2_stream->qbuffer) {
 				/* POST method uses query from DATA frames */
+				lock_basic_lock(&http2_query_buffer_count_lock);
+				http2_query_buffer_count -=
+					sldns_buffer_capacity(h2_stream->qbuffer);
+				lock_basic_unlock(&http2_query_buffer_count_lock);
 				sldns_buffer_free(h2_stream->qbuffer);
 				h2_stream->qbuffer = NULL;
 			}
@@ -2526,17 +2619,15 @@ static int http2_req_header_cb(nghttp2_session* session,
 		return 0;
 	}
 	if(namelen == 5 && memcmp(":path", name, namelen) == 0) {
-		/* Hard coded /dns-query endpoint, might be nice to make
-		 * configurable.
-		 * :path may contain DNS query, depending on method. Method might
+		/* :path may contain DNS query, depending on method. Method might
 		 * not be known yet here, so check after finishing receiving
 		 * stream. */
-#define HTTP_ENDPOINT "/dns-query"
 #define	HTTP_QUERY_PARAM "?dns="
-		size_t el = sizeof(HTTP_ENDPOINT) - 1;
+		size_t el = strlen(h2_session->c->http_endpoint);
 		size_t qpl = sizeof(HTTP_QUERY_PARAM) - 1;
 
-		if(valuelen < el || memcmp(HTTP_ENDPOINT, value, el) != 0) {
+		if(valuelen < el || memcmp(h2_session->c->http_endpoint,
+			value, el) != 0) {
 			h2_stream->invalid_endpoint = 1;
 			return 0;
 		}
@@ -2583,7 +2674,7 @@ static int http2_req_header_cb(nghttp2_session* session,
 		/* guaranteed to only contian digits and be null terminated */
 		h2_stream->content_length = atoi((const char*)value);
 		if(h2_stream->content_length >
-			h2_session->c->http2_max_qbuffer_size) {
+			h2_session->c->http2_stream_max_qbuffer_size) {
 			h2_stream->query_too_large = 1;
 			return 0;
 		}
@@ -2599,6 +2690,7 @@ static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 {
 	struct http2_session* h2_session = (struct http2_session*)cb_arg;
 	struct http2_stream* h2_stream;
+	size_t qlen = 0;
 
 	if(!(h2_stream = nghttp2_session_get_stream_user_data(
 		h2_session->session, stream_id))) {
@@ -2614,17 +2706,28 @@ static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 				/* getting more data in DATA frame than
 				 * advertised in content-length header. */
 				return NGHTTP2_ERR_CALLBACK_FAILURE;
-			h2_stream->qbuffer = sldns_buffer_new(
-				h2_stream->content_length);
-		} else if(len <= h2_session->c->http2_max_qbuffer_size) {
+			qlen = h2_stream->content_length;
+		} else if(len <= h2_session->c->http2_stream_max_qbuffer_size) {
 			/* setting this to msg-buffer-size can result in a lot
 			 * of memory consuption. Most queries should fit in a
 			 * single DATA frame, and most POST queries will
 			 * containt content-length which does not impose this
 			 * limit. */
-			h2_stream->qbuffer = sldns_buffer_new(len);
+			qlen = len;
 		}
 	}
+	if(!h2_stream->qbuffer && qlen) {
+		lock_basic_lock(&http2_query_buffer_count_lock);
+		if(http2_query_buffer_count + qlen > http2_query_buffer_max) {
+			lock_basic_unlock(&http2_query_buffer_count_lock);
+			verbose(VERB_ALGO, "reset HTTP2 stream, no space left, "
+				"in http2-query-buffer-size");
+			return http2_submit_rst_stream(h2_session, h2_stream);
+		}
+		if((h2_stream->qbuffer = sldns_buffer_new(qlen)))
+			http2_query_buffer_count += qlen;
+		lock_basic_unlock(&http2_query_buffer_count_lock);
+	}
 
 	if(!h2_stream->qbuffer ||
 		sldns_buffer_remaining(h2_stream->qbuffer) < len) {
@@ -2640,6 +2743,26 @@ static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 	return 0;
 }
 
+void http2_req_stream_clear(struct http2_stream* h2_stream)
+{
+	if(h2_stream->qbuffer) {
+		lock_basic_lock(&http2_query_buffer_count_lock);
+		http2_query_buffer_count -=
+			sldns_buffer_capacity(h2_stream->qbuffer);
+		lock_basic_unlock(&http2_query_buffer_count_lock);
+		sldns_buffer_free(h2_stream->qbuffer);
+		h2_stream->qbuffer = NULL;
+	}
+	if(h2_stream->rbuffer) {
+		lock_basic_lock(&http2_response_buffer_count_lock);
+		http2_response_buffer_count -=
+			sldns_buffer_capacity(h2_stream->rbuffer);
+		lock_basic_unlock(&http2_response_buffer_count_lock);
+		sldns_buffer_free(h2_stream->rbuffer);
+		h2_stream->rbuffer = NULL;
+	}
+}
+
 nghttp2_session_callbacks* http2_req_callbacks_create()
 {
 	nghttp2_session_callbacks *callbacks;
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index 603b1388d..0b1d90f33 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -144,6 +144,8 @@ void listening_ports_free(struct listen_port* list);
  * 	from clients.
  * @param tcp_idle_timeout: idle timeout for TCP connections in msec.
  * @param harden_large_queries: whether query size should be limited.
+ * @param http_max_streams: maximum number of HTTP/2 streams per connection.
+ * @param http_endpoint: HTTP endpoint to service queries on
  * @param tcp_conn_limit: TCP connection limit info.
  * @param sslctx: nonNULL if ssl context.
  * @param dtenv: nonNULL if dnstap enabled.
@@ -152,11 +154,12 @@ void listening_ports_free(struct listen_port* list);
  * @param cb_arg: user data argument for callback function.
  * @return: the malloced listening structure, ready for use. NULL on error.
  */
-struct listen_dnsport* listen_create(struct comm_base* base,
-	struct listen_port* ports, size_t bufsize,
-	int tcp_accept_count, int tcp_idle_timeout, int harden_large_queries,
-	struct tcl_list* tcp_conn_limit, void* sslctx,
-	struct dt_env *dtenv, comm_point_callback_type* cb, void* cb_arg);
+struct listen_dnsport*
+listen_create(struct comm_base* base, struct listen_port* ports,
+	size_t bufsize, int tcp_accept_count, int tcp_idle_timeout,
+	int harden_large_queries, uint32_t http_max_streams,
+	char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx,
+	struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg);
 
 /**
  * delete the listening structure
@@ -376,6 +379,11 @@ int tcp_req_info_handle_read_close(struct tcp_req_info* req);
 /** get the size of currently used tcp stream wait buffers (in bytes) */
 size_t tcp_req_info_get_stream_buffer_size(void);
 
+/** get the size of currently used HTTP2 query buffers (in bytes) */
+size_t http2_get_query_buffer_size(void);
+/** get the size of currently used HTTP2 response buffers (in bytes) */
+size_t http2_get_response_buffer_size(void);
+
 #ifdef HAVE_NGHTTP2
 /** 
  * Create nghttp2 callbacks to handle HTTP2 requests.
@@ -383,6 +391,9 @@ size_t tcp_req_info_get_stream_buffer_size(void);
  */
 nghttp2_session_callbacks* http2_req_callbacks_create();
 
+/** Free http2 stream buffers and decrease buffer counters */
+void http2_req_stream_clear(struct http2_stream* h2_stream);
+
 /**
  * DNS response ready to be submitted to nghttp2, to be prepared for sending
  * out. Response is stored in c->buffer. Copy to rbuffer because the c->buffer
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index ee5e44d2f..597744758 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -275,6 +275,8 @@ static void print_mem(struct ub_shm_stat_info* shm_stat,
 		shm_stat->mem.dnscrypt_nonce);
 #endif
 	PR_LL("mem.streamwait", s->svr.mem_stream_wait);
+	PR_LL("mem.http.query_buffer", s->svr.mem_http2_query_buffer);
+	PR_LL("mem.http.response_buffer", s->svr.mem_http2_response_buffer);
 }
 
 /** print histogram */
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 3bdfa343c..d2d5bbe5c 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -869,9 +869,11 @@ listen_create(struct comm_base* base, struct listen_port* ATTR_UNUSED(ports),
 	size_t bufsize, int ATTR_UNUSED(tcp_accept_count),
 	int ATTR_UNUSED(tcp_idle_timeout),
 	int ATTR_UNUSED(harden_large_queries),
+	uint32_t ATTR_UNUSED(http_max_streams),
+	char* ATTR_UNUSED(http_endpoint),
 	struct tcl_list* ATTR_UNUSED(tcp_conn_limit),
 	void* ATTR_UNUSED(sslctx), struct dt_env* ATTR_UNUSED(dtenv),
-	comm_point_callback_type* cb, void* cb_arg)
+	comm_point_callback_type* cb, void *cb_arg)
 {
 	struct replay_runtime* runtime = (struct replay_runtime*)base;
 	struct listen_dnsport* l= calloc(1, sizeof(struct listen_dnsport));
@@ -1826,6 +1828,18 @@ tcp_req_info_get_stream_buffer_size(void)
 	return 0;
 }
 
+size_t
+http2_get_query_buffer_size(void)
+{
+	return 0;
+}
+
+size_t
+http2_get_response_buffer_size(void)
+{
+	return 0;
+}
+
 void http2_stream_add_meshstate(struct http2_stream* ATTR_UNUSED(h2_stream),
 	struct mesh_area* ATTR_UNUSED(mesh), struct mesh_state* ATTR_UNUSED(m))
 {
diff --git a/util/config_file.c b/util/config_file.c
index 1406158c8..3ec25d196 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -78,6 +78,8 @@ gid_t cfg_gid = (gid_t)-1;
 int autr_permit_small_holddown = 0;
 /** size (in bytes) of stream wait buffers max */
 size_t stream_wait_max = 4 * 1024 * 1024;
+size_t http2_query_buffer_max = 4 * 1024 * 1024;
+size_t http2_response_buffer_max = 4 * 1024 * 1024;
 
 /** global config during parsing */
 struct config_parser_state* cfg_parser = 0;
@@ -116,8 +118,13 @@ config_create(void)
 	cfg->ssl_upstream = 0;
 	cfg->tls_cert_bundle = NULL;
 	cfg->tls_win_cert = 0;
-	cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT;
 	cfg->tls_use_sni = 1;
+	cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT;
+	if(!(cfg->http_endpoint = strdup("/dns-query"))) goto error_exit;
+	cfg->http_max_streams = 100;
+	cfg->http_query_buffer_size = 4*1024*1024;
+	cfg->http_response_buffer_size = 4*1024*1024;
+	cfg->http_nodelay = 1;
 	cfg->use_syslog = 1;
 	cfg->log_identity = NULL; /* changed later with argv[0] */
 	cfg->log_time_ascii = 0;
@@ -509,8 +516,13 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_STRLIST_APPEND("tls-session-ticket-keys:", tls_session_ticket_keys)
 	else S_STR("tls-ciphers:", tls_ciphers)
 	else S_STR("tls-ciphersuites:", tls_ciphersuites)
-	else S_NUMBER_NONZERO("https-port:", https_port)
 	else S_YNO("tls-use-sni:", tls_use_sni)
+	else S_NUMBER_NONZERO("https-port:", https_port)
+	else S_STR("http-endpoint", http_endpoint)
+	else S_NUMBER_NONZERO("http-max-streams", http_max_streams)
+	else S_MEMSIZE("http-query-buffer-size", http_query_buffer_size)
+	else S_MEMSIZE("http-response-buffer-size", http_response_buffer_size)
+	else S_YNO("http-nodelay", http_nodelay)
 	else S_YNO("interface-automatic:", if_automatic)
 	else S_YNO("use-systemd:", use_systemd)
 	else S_YNO("do-daemonize:", do_daemonize)
@@ -965,8 +977,13 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_LST(opt, "tls-session-ticket-keys", tls_session_ticket_keys.first)
 	else O_STR(opt, "tls-ciphers", tls_ciphers)
 	else O_STR(opt, "tls-ciphersuites", tls_ciphersuites)
-	else O_DEC(opt, "https-port", https_port)
 	else O_YNO(opt, "tls-use-sni", tls_use_sni)
+	else O_DEC(opt, "https-port", https_port)
+	else O_STR(opt, "http-endpoint", http_endpoint)
+	else O_UNS(opt, "http-max-streams", http_max_streams)
+	else O_MEM(opt, "http-query-buffer-size", http_query_buffer_size)
+	else O_MEM(opt, "http-response-buffer-size", http_response_buffer_size)
+	else O_YNO(opt, "http-nodelay", http_nodelay)
 	else O_YNO(opt, "use-systemd", use_systemd)
 	else O_YNO(opt, "do-daemonize", do_daemonize)
 	else O_STR(opt, "chroot", chrootdir)
@@ -1431,6 +1448,7 @@ config_delete(struct config_file* cfg)
 	config_delstrlist(cfg->tls_session_ticket_keys.first);
 	free(cfg->tls_ciphers);
 	free(cfg->tls_ciphersuites);
+	free(cfg->http_endpoint);
 	if(cfg->log_identity) {
 		log_ident_revert_to_default();
 		free(cfg->log_identity);
@@ -2039,6 +2057,8 @@ config_apply(struct config_file* config)
 	log_set_time_asc(config->log_time_ascii);
 	autr_permit_small_holddown = config->permit_small_holddown;
 	stream_wait_max = config->stream_wait_size;
+	http2_query_buffer_max = config->http_query_buffer_size;
+	http2_response_buffer_max = config->http_response_buffer_size;
 }
 
 void config_lookup_uid(struct config_file* cfg)
diff --git a/util/config_file.h b/util/config_file.h
index 24d3e4dc1..b6282de80 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -128,11 +128,22 @@ struct config_file {
 	char* tls_ciphers;
 	/** TLS chiphersuites (TLSv1.3) */
 	char* tls_ciphersuites;
-	/** port on which to provide DNS over HTTPS service */
-	int https_port;
 	/** if SNI is to be used */
 	int tls_use_sni;
 
+	/** port on which to provide DNS over HTTPS service */
+	int https_port;
+	/** endpoint for HTTP service */
+	char* http_endpoint;
+	/** MAX_CONCURRENT_STREAMS HTTP/2 setting */
+	uint32_t http_max_streams;
+	/** maximum size of all HTTP2 query buffers combined. */
+	size_t http_query_buffer_size;
+	/** maximum size of all HTTP2 response buffers combined. */
+	size_t http_response_buffer_size;
+	/** set TCP_NODELAY option for http sockets */
+	int http_nodelay;
+
 	/** outgoing port range number of ports (per thread) */
 	int outgoing_num_ports;
 	/** number of outgoing tcp buffers per (per thread) */
@@ -622,6 +633,10 @@ extern gid_t cfg_gid;
 extern int autr_permit_small_holddown;
 /** size (in bytes) of stream wait buffers max */
 extern size_t stream_wait_max;
+/** size (in bytes) of all total HTTP2 query buffers max */
+extern size_t http2_query_buffer_max;
+/** size (in bytes) of all total HTTP2 response buffers max */
+extern size_t http2_response_buffer_max;
 
 /**
  * Stub config options
diff --git a/util/configlexer.c b/util/configlexer.c
index c6cadaa8b..776e93f64 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 313
-#define YY_END_OF_BUFFER 314
+#define YY_NUM_RULES 318
+#define YY_END_OF_BUFFER 319
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,346 +363,354 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3081] =
+static const flex_int16_t yy_accept[3150] =
     {   0,
-        1,    1,  295,  295,  299,  299,  303,  303,  307,  307,
-        1,    1,  314,  311,    1,  293,  293,  312,    2,  312,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  295,  296,  296,  297,  312,  299,  300,  300,
-      301,  312,  306,  303,  304,  304,  305,  312,  307,  308,
-      308,  309,  312,  310,  294,    2,  298,  312,  310,  311,
-        0,    1,    2,    2,    2,    2,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+        1,    1,  300,  300,  304,  304,  308,  308,  312,  312,
+        1,    1,  319,  316,    1,  298,  298,  317,    2,  317,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  300,  301,  301,  302,  317,  304,  305,  305,
+      306,  317,  311,  308,  309,  309,  310,  317,  312,  313,
+      313,  314,  317,  315,  299,    2,  303,  317,  315,  316,
+        0,    1,    2,    2,    2,    2,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  295,    0,  299,    0,  306,    0,  303,  307,    0,
-      310,    0,    2,    2,  310,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  300,    0,  304,    0,  311,    0,  308,  312,    0,
+      315,    0,    2,    2,  315,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  310,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  315,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  116,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  124,
-      311,  311,  311,  311,  311,  311,  311,  310,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  121,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  129,
+      316,  316,  316,  316,  316,  316,  316,  315,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  100,  311,  311,  311,  311,  311,
-      311,    8,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      117,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  105,  316,  316,  316,  316,
+      316,  316,    8,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  122,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      129,  311,  310,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  288,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  134,  316,  315,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  293,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  310,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   58,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      226,  311,   14,   15,  311,   19,   18,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  315,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,   63,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  231,  316,   14,   15,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  123,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  210,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,    3,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,   19,   18,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  128,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  215,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,    3,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  310,  311,  311,  311,
-      311,  311,  311,  311,  282,  311,  311,  281,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  302,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  315,  316,  316,
+      316,  316,  316,  316,  316,  287,  316,  316,  286,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,   57,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,   61,
-      311,  256,  311,  311,  311,  311,  311,  311,  311,  311,
-      289,  290,  311,  311,  311,  311,  311,   62,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  120,  311,  311,  311,  311,  311,
-      311,  311,  311,  199,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,   21,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      307,  316,  316,  316,  316,  316,  316,  316,   62,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,   66,  316,  261,  316,  316,
+      316,  316,  316,  316,  316,  316,  294,  295,  316,  316,
+      316,  316,  316,   67,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      125,  316,  316,  316,  316,  316,  316,  316,  316,  204,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  148,  311,  311,  302,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,   98,  311,  311,
-      311,  311,  311,  311,  311,  264,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      171,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  147,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+       21,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  153,
+      316,  316,  307,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  103,  316,  316,  316,  316,  316,  316,
+      316,  269,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  176,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   97,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,   32,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,   33,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,   59,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  122,  311,
+      316,  316,  316,  316,  316,  152,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  102,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,   32,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,   33,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  115,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,   60,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  229,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  172,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,   48,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,   64,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  127,
+      316,  316,  316,  316,  316,  120,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+       65,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  234,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  177,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,   53,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  247,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,   52,  311,   53,  311,  311,  311,  311,  311,
-      101,  311,  102,  311,  311,  311,  311,   99,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,    7,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  252,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,   57,  316,
+       58,  316,  316,  316,  316,  316,  106,  316,  107,  316,
+      316,  316,  316,  104,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  219,  311,  311,  311,  311,
-      150,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  230,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   44,  311,  311,  311,  311,
-      311,  311,  311,   49,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  191,  311,  190,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,    7,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  224,  316,  316,  316,  316,  155,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  235,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,   45,  316,  316,  316,
+      316,  316,  316,  316,   54,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,   16,   17,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,   63,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  198,  311,  311,  311,  311,  311,  311,
-      104,  311,  103,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  182,  311,  311,  311,  311,  311,
-      311,  311,  311,  130,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,   82,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  196,  316,
+      195,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,   16,   17,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,   68,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  203,  316,  316,  316,  316,  316,
+      316,  109,  316,  108,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  187,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   86,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,   56,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  185,  186,  311,
-      311,  311,  258,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,    6,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  135,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,   87,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,   91,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,   61,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  262,  311,  311,
-      311,  311,  311,  311,  283,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   42,  311,  311,  311,  311,
-       45,  311,  311,  311,  311,  311,  311,  311,  311,   46,
-      311,  311,  311,  311,  311,  311,  311,  311,  178,  311,
-      311,  311,  125,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  203,  311,  179,  311,  311,  311,  216,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,   47,
+      316,  316,  316,  190,  191,  316,  316,  316,  263,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,    6,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  267,  316,  316,  316,  316,  316,  316,
+      288,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,   42,  316,  316,  316,  316,   44,  316,  316,  316,
+      316,  316,  316,  316,  316,   51,  316,  316,  316,  316,
+      316,  316,  316,  316,  183,  316,  316,  316,  130,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  127,
-      109,  311,  110,  311,  311,  311,  108,  311,  311,  311,
-      311,  311,  311,  311,  311,  145,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  246,  311,  311,
-      311,  311,  311,  311,  311,  311,  180,  311,  311,  311,
-      311,  311,  183,  311,  189,  311,  311,  311,  311,  311,
-      215,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   96,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  121,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  208,
+      316,  184,  316,  316,  316,  221,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,   52,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  132,  114,  316,  115,  316,
+      316,  316,  113,  316,  316,  316,  316,  316,  316,  316,
+      316,  150,  316,  316,   50,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  251,  316,
+      316,  316,  316,  316,  316,  316,  316,  185,  316,  316,
+      316,  316,  316,  188,  316,  194,  316,  316,  316,  316,
 
-      311,   54,  311,  311,  311,   26,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   20,  311,  311,  311,  311,
-      311,  311,   27,   36,  311,  155,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,   71,   73,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      266,  311,  311,  311,  227,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  111,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  144,  311,  311,  311,
+      316,  220,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  101,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  126,  316,  316,  316,  316,
+      316,  316,   59,  316,  316,  316,   26,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,   20,  316,  316,  316,
+      316,  316,  316,   27,   36,  316,  160,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,   76,   78,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  277,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  149,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  209,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  286,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  166,  311,  311,
-      311,  311,  311,  311,  311,  311,  105,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  161,  311,  173,  311,
+      316,  271,  316,  316,  316,  232,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  116,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  149,  316,   46,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  282,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  154,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      214,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  133,  311,  311,  311,  311,  311,
-       92,  311,  311,  311,  311,  201,  311,  311,  311,  311,
-      311,  311,  217,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  238,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  126,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  165,
-      311,  311,  311,  311,  311,   74,   75,  311,  311,  311,
-      311,  311,   55,  311,  311,  311,  311,  311,   81,  174,
-      311,  192,  311,  220,  311,  311,  184,  259,  311,  311,
-      311,  311,  311,   67,  311,  176,  311,  311,  311,  311,
+      291,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  171,  316,  316,  316,  316,  316,  316,  316,
+      316,  110,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  166,  316,  178,  316,  316,  316,  316,  316,  138,
+      316,  316,  316,  316,  316,   97,  316,  316,  316,  316,
+      206,  316,  316,  316,  316,  316,  316,  222,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  243,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  131,  316,  316,  316,  316,  316,  316,
 
-      311,    9,  311,  311,  311,   95,  311,  311,  311,  311,
-      251,  311,  311,  311,  311,  200,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  164,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  151,  311,  265,  311,
-      311,  311,  311,  237,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  211,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  170,  316,  316,
+      316,  316,  316,   79,   80,  316,  316,  316,  316,  316,
+       60,  316,  316,  316,  316,  316,   86,  179,  316,  197,
+      316,  225,  316,  316,  189,  264,  316,  316,  316,  316,
+      316,   72,  316,  181,  316,  316,  316,  316,  316,    9,
+      316,  316,  316,  100,  316,  316,  316,  316,  256,  316,
+      316,  316,  316,  205,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      257,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  280,  311,  175,  311,  311,
-      311,  311,  311,  311,  311,   66,   68,  311,  311,  311,
-      311,  311,  311,  311,   94,  311,  311,  311,  311,  249,
-      311,  311,  311,  311,  261,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  205,   34,   28,   30,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,   35,
-      311,   29,   31,  311,  311,  311,  311,  311,  311,  311,
-      311,   91,  311,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  169,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  156,  316,  270,  316,  316,  316,
+      316,  242,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  216,  316,  316,  316,  316,  262,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  285,  316,  180,  316,
+      316,  316,  316,  316,  316,  316,   71,   73,  316,  316,
+      316,  316,  316,  316,  316,   99,  316,  316,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  207,
-      204,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,   65,  311,
-      311,  128,  311,  112,  311,  311,  311,  311,  311,  311,
-      311,  311,  146,   13,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  275,  311,  278,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,   12,  311,  311,   22,
-      311,  311,  311,  255,  311,  311,  311,  311,  263,  311,
-      311,  311,   69,  311,  213,  311,  311,  311,  311,  206,
-      311,  311,   64,  311,  311,  311,  311,   23,  311,   43,
+      254,  316,  316,  316,  316,  266,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  210,   34,   28,
+       30,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+       35,  316,   29,   31,  316,  316,  316,  316,  316,  316,
+      316,  316,   96,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      212,  209,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,   70,
+      316,  316,  133,  316,  117,  316,  316,  316,  316,  316,
+      316,  316,  316,  151,   47,  316,  316,   13,  316,  316,
 
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  160,  159,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  208,  202,  311,  218,  311,  311,  267,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,   76,  311,  311,
-      311,  250,  311,  311,  311,  311,  188,  311,  311,  311,
-      311,  212,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  284,  285,  157,  311,  311,   70,  311,  311,  311,
-      311,  167,  311,  311,  106,  107,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,  316,  280,  316,  283,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+       12,  316,  316,   22,  316,  316,  316,  260,  316,  316,
+      316,  316,  268,  316,  316,  316,   74,  316,  218,  316,
+      316,  316,  316,  211,  316,  316,   69,  316,  316,  316,
+      316,   23,  316,   43,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  165,  164,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  213,  207,  316,
+      223,  316,  316,  272,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      152,  311,  154,  311,  193,  311,  311,  311,  311,  158,
-      311,  311,  221,  311,  311,  311,  311,  311,  311,  311,
-      135,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  228,  311,  311,  311,  311,  311,  311,  311,
-       24,  311,  260,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  194,  311,  311,  248,  311,  279,
-      311,  187,  311,  311,  311,  311,   50,  311,  311,  311,
-      311,    4,  311,  311,  311,  311,  119,  134,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  224,   37,   38,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,   81,  316,  316,  316,  255,  316,  316,
+      316,  316,  193,  316,  316,  316,  316,  217,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  289,  290,  162,
+      316,  316,   75,  316,  316,  316,  316,  172,  316,  316,
+      111,  112,  316,  316,  316,  316,  157,  316,  159,  316,
+      198,  316,  316,  316,  316,  163,  316,  316,  226,  316,
+      316,  316,  316,  316,  316,  316,  140,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  233,  316,
+      316,  316,  316,  316,  316,  316,   24,  316,  265,  316,
 
-      311,  311,  311,  311,  311,  311,  268,  311,  311,  311,
-      311,  311,  311,  236,  311,  311,  311,  311,  311,  311,
-      311,  197,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,   79,  311,   51,  254,  311,  225,  311,  311,  311,
-      311,   11,  311,  311,  311,  311,  311,  311,  118,  311,
-      311,  311,  311,  195,   83,  311,   40,  311,  311,  311,
-      311,  311,  311,  311,  311,  163,  311,  311,  311,  311,
-      311,  137,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  235,  311,  311,  311,  311,  131,  311,  311,  113,
-      114,  311,  311,  311,   85,   89,   84,  311,   77,  311,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  199,  316,  316,  253,  316,  284,  316,  192,
+      316,  316,  316,  316,   55,  316,  316,  316,  316,    4,
+      316,  316,  316,  316,  124,  139,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  229,   37,   38,  316,  316,  316,
+      316,  316,  316,  316,  273,  316,  316,  316,  316,  316,
+      316,  241,  316,  316,  316,  316,  316,  316,  316,  202,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,   84,  316,   56,  259,  316,  230,  316,  316,  316,
 
-      311,  311,  311,  311,   10,  311,  311,  311,  252,  287,
-      311,  311,  311,  311,  292,   39,  311,  311,  311,  311,
-      311,  162,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,   90,   88,  311,   78,  276,  311,
-      311,  311,  311,  311,  311,  311,  181,  311,  311,  311,
-      311,  311,  196,  311,  311,  311,  311,  311,  311,  311,
-      311,  153,   72,  311,  311,  311,  311,  311,  269,  311,
-      311,  311,  311,  311,  311,  311,  232,  311,  311,  231,
-      132,  311,   87,  138,  139,  142,  143,  140,  141,   80,
+      316,   11,  316,  316,  316,  316,  316,  316,  123,  316,
+      316,  316,  316,  200,   88,  316,   40,  316,  316,  316,
+      316,  316,  316,  316,  316,  168,  316,  316,  316,  316,
+      316,  142,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  240,  316,  316,  316,  316,  136,  316,  316,  118,
+      119,  316,  316,  316,   90,   94,   89,  316,  316,  316,
+       82,  316,  316,  316,  316,  316,   10,  316,  316,  316,
+      257,  292,  316,  316,  316,  316,  297,   39,  316,  316,
+      316,  316,  316,  167,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
 
-      311,  253,  311,  311,  311,  311,  156,  311,  311,  311,
-      311,  311,  223,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      169,  168,   41,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,   93,  311,  222,
-      311,  245,  273,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,    5,  311,  311,  214,  311,
-      311,  274,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  233,   25,  311,  311,  311,  311,  311,  311,  311,
+      316,  316,  316,  316,  316,  316,   95,   93,  316,  316,
+      316,   83,  281,  316,  316,  316,  316,  316,  316,  316,
+      186,  316,  316,  316,  316,  316,  201,  316,  316,  316,
+      316,  316,  316,  316,  316,  158,   77,  316,  316,  316,
+      316,  316,  274,  316,  316,  316,  316,  316,  316,  316,
+      237,  316,  316,  236,  137,  316,   92,   48,  316,  143,
+      144,  147,  148,  145,  146,   85,  316,  258,  316,  316,
+      316,  316,  161,  316,  316,  316,  316,  316,  228,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  174,  173,   41,
 
-      311,  311,  311,  311,  311,  234,  311,  311,  311,  136,
-      311,  311,  311,  311,  311,  311,  311,  311,  170,  311,
-      177,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      270,  311,  311,  311,  311,  311,  311,  311,  311,  311,
-      311,  311,  311,  311,  311,  311,  311,  311,  291,  311,
-      311,  241,  311,  311,  311,  311,  311,  271,  311,  311,
-      311,  311,  311,  311,  272,  311,  311,  311,  239,  311,
-      242,  243,  311,  311,  311,  311,  311,  240,  244,    0
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,   98,  316,  227,  316,  250,
+      278,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,   49,    5,  316,  316,  219,  316,  316,
+      279,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      238,   25,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  239,  316,  316,  316,  141,  316,
+      316,  316,  316,  316,  316,  316,  316,  175,  316,  182,
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  275,
+
+      316,  316,  316,  316,  316,  316,  316,  316,  316,  316,
+      316,  316,  316,  316,  316,  316,  316,  296,  316,  316,
+      246,  316,  316,  316,  316,  316,  276,  316,  316,  316,
+      316,  316,  316,  277,  316,  316,  316,  244,  316,  247,
+      248,  316,  316,  316,  316,  316,  245,  249,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -745,15 +753,15 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3095] =
+static const flex_int16_t yy_base[3164] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112, 2247, 2197,   81, 6009, 6009, 6009,   96,   52,
+       90,  112, 2455, 2233,   81, 6134, 6134, 6134,   96,   52,
       106,   63,  107,  111,   70,  128,  130,  133,   57,   88,
        76,  144,  141,  114,  151,  124,  167,  173,  186,  161,
-      190,  117, 1869, 6009, 6009, 6009,  107, 1639, 6009, 6009,
-     6009,  162, 1581, 1486, 6009, 6009, 6009,  212, 1444, 6009,
-     6009, 6009,  167, 1373, 6009,  218, 6009,  222,  134, 1256,
+      190,  117, 2110, 6134, 6134, 6134,  107, 1933, 6134, 6134,
+     6134,  162, 1672, 1627, 6134, 6134, 6134,  212, 1563, 6134,
+     6134, 6134,  167, 1102, 6134,  218, 6134,  222,  134,  856,
       226,  182,    0,  233,    0,    0,  194,  227,   85,  184,
       220,  234,  235,  136,  230,  222,  241,  242,  207,  243,
       250,  245,  228,  246,  249,  252,  264,  254,  266,  269,
@@ -762,7 +770,7 @@ static const flex_int16_t yy_base[3095] =
       290,  293,  296,  299,  303,  301,  309,  308,  311,  313,
       321,  315,  320,  322,  324,  323,  332,  331,  344,  348,
       335,  337,  329,  347,  357,  349,  353,  352,  354,  369,
-      367, 1200,  380, 1091,  383,  782,  394,  612,  508,  387,
+      367,  821,  380,  731,  383,  656,  394,  612,  508,  387,
       339,  398,  402,    0,  394,  396,  404,  399,  360,  400,
       403,  410,  405,  406,  407,  409,  411,  422,  419,  425,
       426,  434,  433,  437,  438,  435,  440,  442,  443,  432,
@@ -777,665 +785,679 @@ static const flex_int16_t yy_base[3095] =
       597,  605,  615,  612,  613,  625,  614,  610,  621,  622,
       623,  601,  633,  632,  628,  637,  643,  634,  641,  644,
       646,  648,  647,  649,  651,  661,  654,  664,  657,  671,
-      666,  672,  669,  681,  667,  656,  677,  678,  679,  682,
-      685,  680,  689,  684,  690,  696,  691,  701,  694,  711,
+      666,  672,  669,  681,  682,  677,  667,  678,  679,  683,
+      686,  680,  690,  688,  691,  695,  693,  700,  702,  710,
 
-      707,  700,  722,  714,  702,  713,  724,  716,  715,  725,
-      730,  744,  746,  735,  736,  717,  747,  754,  757,  758,
-      748,  760,  761,  750,  764,  766,  774,  775, 6009,  770,
-      767,  777,  780,  783,  786,  779,  792,  796,  797,  806,
-      802,  799,  807,  829,  803,  812,  809,  819,  817, 6009,
-      818,  822,  853,  825,  826,  844,  841,  839,  827,  842,
-      849,  851,  877,  854,  859,  861,  882,  862,  863,  864,
-      866,  873,  874,  893,  814,  888,  890,  891,  898,  894,
-      895,  896,  906,  897,  899,  900,  907,  910,  909,  914,
-      922,  920,  925,  926,  927,  924,  928,  935,  932,  931,
+      705,  706,  721,  713,  716,  712,  723,  724,  719,  725,
+      743,  748,  749,  736,  735,  751,  754,  758,  759,  761,
+      755,  766,  765,  767,  768,  769,  778,  773, 6134,  775,
+      782,  789,  791,  792,  799,  715,  790,  798,  779,  800,
+      813,  805,  814,  836,  781,  808,  815,  816,  818, 6134,
+      819,  820,  860,  825,  824,  847,  842,  828,  826,  843,
+      844,  850,  867,  851,  864,  854,  886,  865,  871,  873,
+      866,  878,  870,  895,  896,  882,  887,  892,  900,  898,
+      901,  903,  907,  909,  910,  911,  914,  913,  912,  918,
+      919,  921,  924,  925,  930,  931,  934,  944,  938,  942,
 
-      943,  944,  952,  934,  951,  954,  956,  960,  949,  961,
-      963,  967,  968,  964,  970,  978,  975,  974,  980,  981,
-      982,  983,  985,  988,  991,  990,  993,  994,  995,  999,
-     1005, 1003, 1011, 1004, 6009, 1013, 1006, 1015, 1016, 1017,
-     1018, 6009, 1020, 1019, 1021, 1028, 1032, 1042, 1029, 1031,
-     1043, 1044, 1046, 1033, 1055, 1050, 1053, 1058, 1057, 1059,
-     1061, 1063, 1062, 1067, 1065, 1068, 1069, 1074, 1075, 1094,
-     6009, 1077, 1081, 1078, 1079, 1087, 1086, 1106, 1089, 1107,
-     1105, 1092, 1122, 1109, 1123, 1117, 1099, 1128, 1118, 1130,
-     1132, 1133, 1134, 1135, 1136, 1137, 1139, 1138, 1141, 1144,
+      947,  946,  955,  959,  960,  963,  966,  965,  967,  971,
+      935,  973,  975,  977,  976,  978,  990,  983,  980,  985,
+      988,  992,  998,  996,  994, 1000, 1001, 1002, 1011, 1004,
+     1009, 1012, 1003, 1019, 1021, 6134, 1022, 1025, 1026, 1027,
+     1028, 1029, 6134, 1031, 1030, 1033, 1038, 1035, 1045, 1037,
+     1040, 1052, 1053, 1055, 1057, 1064, 1059, 1062, 1067, 1066,
+     1068, 1070, 1074, 1071, 1076, 1078, 1077, 1083, 1084, 1087,
+     1104, 6134, 1086, 1094, 1097, 1088, 1098, 1111, 1108, 1116,
+     1091, 1119, 1125, 1127, 1126, 1133, 1122, 1128, 1089, 1129,
+     1139, 1137, 1141, 1143, 1144, 1146, 1150, 1147, 1151, 1149,
 
-     6009, 1146, 1159, 1166, 1152, 1153, 1151, 1161, 1162, 1165,
-     1167, 1169, 1172, 1173, 1179, 1186, 1176, 1190, 1185, 1189,
-     1187, 1191, 1193, 1196, 1194, 1195, 1208, 1204, 1215, 1219,
-     1222, 1221, 1224, 1231, 1205, 1209, 1227, 1228, 1229, 1230,
-     1234, 1235, 1236, 1238, 1246, 1241, 1243, 1244, 1248, 1250,
-     1257, 1254, 1252, 1260, 1253, 1273, 1262, 1265, 1277, 1278,
-     1275, 1269, 6009, 1285, 1267, 1287, 1288, 1286, 1293, 1294,
-     1295, 1297, 1298, 1300, 1301, 1302, 1304, 1307, 1308, 1309,
-     1310, 1312, 1323, 1320, 1318, 1331, 1330, 1332, 1334, 1335,
-     1342, 1338, 1345, 1341, 1346, 1354, 1347, 1350, 1356, 1364,
+     1159, 6134, 1157, 1167, 1175, 1160, 1161, 1162, 1173, 1174,
+     1177, 1178, 1179, 1183, 1180, 1191, 1199, 1184, 1200, 1186,
+     1201, 1197, 1202, 1203, 1206, 1205, 1207, 1216, 1212, 1219,
+     1227, 1228, 1230, 1232, 1239, 1213, 1235, 1236, 1237, 1240,
+     1242, 1244, 1220, 1246, 1247, 1258, 1250, 1253, 1255, 1259,
+     1261, 1257, 1263, 1264, 1266, 1267, 1274, 1270, 1276, 1277,
+     1278, 1291, 1279, 1283, 1281, 1288, 1294, 1295, 6134, 1304,
+     1300, 1302, 1303, 1301, 1311, 1312, 1315, 1316, 1313, 1319,
+     1318, 1321, 1325, 1326, 1327, 1322, 1328, 1330, 1339, 1343,
+     1344, 1353, 1345, 1352, 1336, 1355, 1362, 1358, 1365, 1361,
 
-     1340, 1357, 1362, 1365, 1368, 1370, 1371, 1378, 1379, 1381,
-     1388, 1383, 1355, 1390, 1393, 1394, 1395, 1397, 1398, 1399,
-     1400, 1407, 1402, 1405, 1404, 1408, 1403, 1409, 1410, 1411,
-     1430, 1417, 1425, 1427, 1429, 1432, 1433, 1434, 1435, 1438,
-     1439, 1440, 1441, 1442, 1459, 1447, 1449, 1454, 1462, 1461,
-     1452, 1465, 1469, 1470, 1472, 1480, 1481, 1464, 1483, 1484,
-     1473, 1488, 1489, 1491, 1492, 1494, 1499, 1500, 1502, 1504,
-     1503, 1506, 1507, 1511, 1512, 6009, 1514, 1525, 1515, 1522,
-     1520, 1523, 1527, 1534, 1529, 1531, 1536, 1530, 1539, 1560,
-     6009, 1541, 6009, 6009, 1540, 6009, 6009, 1542, 1543, 1546,
+     1366, 1373, 1368, 1370, 1374, 1382, 1377, 1375, 1380, 1340,
+     1386, 1388, 1389, 1397, 1378, 1398, 1405, 1400, 1402, 1406,
+     1409, 1410, 1411, 1413, 1414, 1415, 1416, 1423, 1418, 1421,
+     1420, 1424, 1419, 1425, 1426, 1433, 1446, 1441, 1442, 1443,
+     1445, 1447, 1449, 1450, 1452, 1453, 1456, 1458, 1459, 1460,
+     1465, 1457, 1468, 1474, 1477, 1478, 1480, 1483, 1484, 1481,
+     1485, 1490, 1493, 1487, 1497, 1500, 1489, 1501, 1502, 1506,
+     1512, 1513, 1507, 1516, 1508, 1518, 1519, 1527, 1528, 1531,
+     1524, 6134, 1520, 1541, 1522, 1534, 1536, 1543, 1544, 1551,
+     1546, 1549, 1547, 1550, 1552, 1576, 6134, 1555, 6134, 6134,
 
-     1563, 1552, 1570, 1547, 1550, 1561, 1544, 1583, 1584, 1573,
-     1566, 1574, 1589, 1576, 1590, 1595, 1598, 1599, 1597, 1606,
-     1608, 1611, 1610, 1617, 1618, 1609, 1619, 1622, 1623, 1625,
-     1624, 1627, 1630, 1633, 1634, 1631, 1629, 1636, 1646, 1637,
-     1651, 1654, 6009, 1652, 1661, 1662, 1659, 1666, 1665, 1663,
-     1667, 1671, 1673, 1674, 1676, 1678, 1677, 1679, 1681, 1686,
-     1685, 1696, 1687, 6009, 1688, 1691,  177, 1699, 1692, 1702,
-     1703, 1707, 1689, 1709, 1710, 1717, 1712, 1715, 1719, 1720,
-     1722, 1724, 6009, 1726, 1732, 1733, 1734, 1736, 1725, 1740,
-     1737, 1741, 1742, 1743, 1744, 1747, 1749, 1756, 1753, 1752,
+     1557, 6134, 6134, 1558, 1553, 1561, 1560, 1578, 1582, 1569,
+     1566, 1573, 1571, 1592, 1599, 1589, 1593, 1590, 1605,  177,
+     1612, 1597, 1604, 1607, 1610, 1621, 1620, 1625, 1626, 1613,
+     1629, 1631, 1634, 1633, 1640, 1641, 1642, 1644, 1645, 1646,
+     1648, 1647, 1650, 1653, 1656, 1657, 1659, 1652, 1660, 1671,
+     1669, 1662, 1679, 6134, 1675, 1687, 1689, 1685, 1692, 1688,
+     1693, 1676, 1695, 1697, 1698, 1700, 1702, 1701, 1703, 1705,
+     1710, 1709, 1720, 1711, 6134, 1712, 1715, 1713, 1723, 1716,
+     1726, 1727, 1731, 1733, 1734, 1735, 1742, 1738, 1740, 1744,
+     1747, 1746, 1749, 6134, 1751, 1762, 1750, 1754, 1757, 1764,
 
-     1755, 1758, 1763, 1767, 1770, 1777, 1771, 1773, 1778, 1779,
-     1780, 1783, 1784, 1786, 1794, 1795, 1785, 1796, 1792, 1807,
-     1808, 1793, 1804, 1809, 1810, 1811, 1813, 1822, 1817, 1818,
-     1824, 1825, 1826, 1828, 1830, 1833, 1835, 1839, 1840, 1841,
-     1831, 1843, 1845, 1847, 6009, 1849, 1851, 6009, 1852, 1855,
-     1877, 1856, 1858, 1859, 1861, 1864, 1867, 1868, 1870, 1885,
-     1878, 1897, 1881, 1899, 1879, 1901, 1875, 1900, 1904, 1902,
-     1907, 1908, 1917, 1919, 1910, 1925, 1928, 1912, 1924, 1926,
-     1945, 1927, 1930, 1933, 1929, 1931, 1937, 1940, 1936, 1938,
-     1949, 1952, 1955, 1956, 6009, 1967, 1963, 1958, 1962, 1978,
+     1765, 1766, 1767, 1768, 1769, 1772, 1773, 1774, 1781, 1780,
+     1782, 1779, 1783, 1790, 1786, 1799, 1802, 1795, 1803, 1805,
+     1806, 1807, 1808, 1809, 1811, 1816, 1819, 1818, 1823, 1820,
+     1835, 1839, 1822, 1824, 1834, 1836, 1821, 1837, 1850, 1845,
+     1847, 1849, 1857, 1852, 1856, 1853, 1858, 1860, 1861, 1864,
+     1866, 1869, 1870, 1873, 1874, 6134, 1875, 1880, 6134, 1877,
+     1879, 1901, 1881, 1883, 1888, 1885, 1886, 1892, 1898, 1895,
+     1902, 1905, 1921, 1914, 1923, 1916, 1925, 1924, 1929, 1918,
+     1926, 1935, 1937, 1944, 1948, 1946, 1955, 1957, 1941, 1889,
+     1952, 1971, 1953, 1954, 1960, 1956, 1961, 1964, 1958, 1967,
 
-     1969, 1973, 6009, 1976, 1979, 1980, 1987, 1982, 1983, 1984,
-     1986, 1990, 1993, 1995, 1994, 1999, 2005, 1997, 2015, 6009,
-     2000, 6009, 1998, 2001, 2010, 2017, 2018, 2019, 2020, 2022,
-     6009, 6009, 2023, 2024, 2037, 2032, 2030, 6009, 2035, 2045,
-     2046, 2049, 2040, 2041, 2042, 2048, 2055, 2056, 2059, 2057,
-     2069, 2060, 2062, 2064, 6009, 2070, 2065, 2074, 2076, 2072,
-     2080, 2082, 2083, 6009, 2084, 2089, 2091, 2098, 2094, 2099,
-     2096, 2100, 2101, 2104, 2106, 2107, 2109, 2110, 2117, 2119,
-     2115, 2116, 2124, 2132, 6009, 2118, 2128, 2137, 2130, 2134,
-     2138, 2140, 2139, 2141, 2142, 2143, 2144, 2150, 2151, 2152,
+     1973, 1975, 1980, 1982, 1978, 1984, 1987, 1986, 1989, 1995,
+     6134, 2006, 1998, 1993, 2005, 2013, 2009, 2008, 6134, 2010,
+     2011, 2015, 2022, 2017, 2021, 2023, 2024, 2025, 2029, 2030,
+     2032, 2034, 2045, 2033, 2052, 6134, 2037, 6134, 2047, 2035,
+     2038, 2048, 2036, 2056, 2058, 2059, 6134, 6134, 2060, 2066,
+     2067, 2076, 2069, 6134, 2072, 2079, 2080, 2074, 2083, 2085,
+     2086, 2089, 2087, 2091, 2096, 2092, 2099, 2094, 2098, 2101,
+     6134, 2108, 2095, 2113, 2114, 2104, 2117, 2121, 2123, 6134,
+     2124, 2125, 2127, 2134, 2132, 2129, 2136, 2137, 2142, 2139,
+     2144, 2145, 2146, 2147, 2156, 2158, 2148, 2159, 2161, 2168,
 
-     2159, 2162, 2154, 2161, 2165, 2158, 2167, 2170, 2176, 2173,
-     2174, 2175, 2178, 6009, 2179, 2185,  256, 2186, 2180, 2187,
-     2188, 2192, 2190, 2196, 2208, 2210, 2206, 2205, 2209, 2212,
-     2213, 2215, 2217, 2218, 2221, 2219, 2222, 6009, 2224, 2225,
-     2229, 2230, 2236, 2231, 2238, 6009, 2248, 2235, 2256, 2246,
-     2244, 2259, 2250, 2260, 2261, 2263, 2264, 2266, 2265, 2267,
-     6009, 2273, 2274, 2275, 2277, 2282, 2281, 2284, 2288, 2289,
-     2290, 2294, 2292, 2291, 2296, 2295, 2299, 2300, 2305, 2301,
-     2302, 2310, 2312, 2313, 6009, 2323, 2315, 2319, 2324, 2326,
-     2325, 2340, 2328, 2332, 2335, 2341, 2349, 2338, 2336, 2356,
+     6134, 2151, 2155, 2173, 2171, 2178, 2170, 2172, 2174, 2180,
+     2182, 2183, 2184, 2187, 2188, 2189, 2196, 2197, 2194, 2193,
+     2202, 2203, 2204, 2207, 2210, 2211, 2212, 2213, 2214, 6134,
+     2215, 2217,  256, 2223, 2220, 2224, 2225, 2231, 2227, 2228,
+     2244, 2247, 2245, 2249, 2252, 2242, 2246, 2253, 2254, 2243,
+     2259, 2255, 2261, 6134, 2264, 2265, 2267, 2268, 2271, 2272,
+     2281, 6134, 2273, 2282, 2276, 2284, 2288, 2290, 2289, 2278,
+     2294, 2299, 2298, 2301, 2305, 2307, 6134, 2310, 2313, 2314,
+     2311, 2315, 2321, 2323, 2312, 2322, 2324, 2328, 2329, 2334,
+     2330, 2333, 2335, 2336, 2339, 2338, 2346, 2347, 2348, 2349,
 
-     2352, 2355, 2361, 2365, 2364, 2366, 2373, 2363, 2375, 2377,
-     2367, 2378, 2379, 2381, 2385, 2383, 2386, 2395, 2398, 2394,
-     2402, 2391, 2412, 2417, 2408, 6009, 2416, 2403, 2410, 2421,
-     2432, 2424, 2422, 2429, 2423, 2427, 2435, 2438, 2425, 2446,
-     2441, 2443, 2445, 2447, 2448, 2449, 2450, 2453, 2455, 2464,
-     2456, 2466, 2467, 6009, 2470, 2472, 2461, 2474, 2476, 2479,
-     2482, 2484, 2486, 2487, 2488, 2490, 2492, 2493, 2494, 2495,
-     2497, 2501, 2498, 6009, 2502, 2504, 2510, 2507, 2513, 2517,
-     2522, 2523, 2529, 2526, 2520, 2533, 2534, 2511, 6009, 2542,
-     2543, 2535, 2550, 2545, 2532, 2546, 2548, 2549, 6009, 2552,
+     2350, 2351, 2355, 2358, 2359, 6134, 2368, 2360, 2370, 2361,
+     2371, 2365, 2388, 2372, 2375, 2383, 2384, 2397, 2386, 2392,
+     2400, 2403, 2390, 2398, 2414, 2412, 2413, 2421, 2409, 2423,
+     2426, 2415, 2393, 2419, 2425, 2427, 2433, 2434, 2442, 2443,
+     2439, 2446, 2440, 2461, 2466, 2448, 6134, 2451, 2438, 2457,
+     2465, 2473, 2468, 2469, 2471, 2470, 2478, 2479, 2480, 2481,
+     2488, 2485, 2489, 2490, 2496, 2492, 2493, 2494, 2483, 2500,
+     2510, 2503, 2514, 2515, 6134, 2516, 2520, 2507, 2521, 2523,
+     2511, 2528, 2532, 2524, 2534, 2535, 2537, 2538, 2539, 2540,
+     2541, 2543, 2545, 2544, 6134, 2548, 2549, 2554, 2553, 2561,
 
-     2553, 2561, 2562, 2558, 6009, 2565, 2560, 2563, 2566, 2567,
-     2568, 2570, 2573, 2575, 2577, 2579, 2588, 2582, 2585, 6009,
-     2589, 2597, 2592, 2594, 2598, 2599, 2601, 2602, 2604, 2619,
-     2611, 6009, 2624, 2622, 2623, 2633, 2628, 2614, 2630, 2631,
-     2635, 2637, 2629, 6009, 2638, 2639, 2641, 2643, 2646, 2645,
-     2651, 2660, 2655, 2656, 2658, 2661, 2662, 2664, 2666, 2673,
-     2669, 2668, 2678, 2681, 2679, 2685, 2689, 2688, 2691, 2698,
-     2699, 2700, 2702, 6009, 2705, 2706, 2707, 2690, 2697, 2712,
-     2713, 2714, 2717, 2607, 2718, 2719, 2721, 2730, 2732, 2722,
-     2734, 2725, 2728, 2736, 2738, 2739, 2741, 2746, 2754, 2750,
+     2557, 2563, 2569, 2570, 2572, 2573, 2575, 2576, 2579, 6134,
+     2584, 2586, 2582, 2594, 2589, 2585, 2590, 2596, 2593, 6134,
+     2597, 2599, 2606, 2608, 2603, 6134, 2611, 2607, 2610, 2612,
+     2614, 2615, 2618, 2616, 2620, 2623, 2626, 2635, 2625, 2632,
+     6134, 2638, 2650, 2629, 2642, 2646, 2639, 2640, 2643, 2659,
+     2660, 2652, 6134, 2669, 2668, 2665, 2679, 2656, 2670, 2671,
+     2677, 2674, 2680, 2681, 6134, 2683, 2684, 2686, 2687, 2690,
+     2691, 2693, 2705, 2695, 2698, 2700, 2703, 2706, 2708, 2710,
+     2713, 2711, 2719, 2722, 2723, 2725, 2726, 2728, 2729, 2738,
+     2733, 2742, 2739, 2734, 2744, 2752, 2756, 2753, 2757, 6134,
 
-     2749, 2757, 2752, 2753, 2762, 2760, 2763, 2765, 2766, 2767,
-     2768, 2772, 2769, 2773, 2774, 2778, 2791, 2783, 2792, 2780,
-     2794, 2795, 2798, 6009, 2797, 2801, 2799, 2802, 2805, 2810,
-     2807, 2819, 2811, 2816, 2818, 2820, 2827, 2825, 2828, 2830,
-     2838, 2834, 6009, 2835, 6009, 2836, 2837, 2839, 2847, 2843,
-     6009, 2849, 6009, 2851, 2856, 2844, 2852, 6009, 2858, 2859,
-     2862, 2864, 2866, 2867, 2870, 2869, 2872, 2875, 2873, 2877,
-     2878, 2880, 2883, 2885, 2890, 2887, 2891, 2897, 2894, 2900,
-     2901, 2903, 2904, 2907, 2909, 2912, 6009, 2914, 2916, 2910,
-     2918, 2919, 2921, 2922, 2926, 2927, 2929, 2930, 2935, 2932,
+     2760, 2761, 2762, 2751, 2763, 2764, 2736, 2766, 2768, 2770,
+     2775, 2772, 2773, 2782, 2790, 2774, 2795, 2783, 2785, 2791,
+     2793, 2787, 2797, 2801, 2805, 2803, 2807, 2815, 2810, 2812,
+     2820, 2811, 2813, 2816, 2821, 2822, 2823, 2824, 2825, 2828,
+     2834, 2838, 2842, 2843, 2845, 2847, 2850, 2851, 2852, 6134,
+     2855, 2856, 2853, 2857, 2862, 2866, 2867, 2869, 2870, 2874,
+     2875, 2879, 2882, 2876, 2881, 2884, 2894, 2890, 6134, 2891,
+     6134, 2892, 2893, 2900, 2903, 2895, 6134, 2906, 6134, 2907,
+     2912, 2902, 2908, 6134, 2914, 2916, 2919, 2920, 2922, 2923,
+     2926, 2925, 2927, 2931, 2929, 2933, 2934, 2935, 2939, 2942,
 
-     2941, 2945, 2942, 2944, 2954, 6009, 2951, 2956, 2953, 2957,
-     6009, 2961, 2958, 2959, 2967, 2962, 2969, 2970, 2971, 2977,
-     2979, 2973, 2980, 2981, 2984, 2992, 6009, 2988, 2994, 2990,
-     3000, 3002, 3001, 3004, 3007, 3016, 3009, 3012, 3013, 3017,
-     3018, 3019, 3026, 3027, 3023, 3030, 3029, 3032, 3034, 3035,
-     3039, 3041, 3042, 3044, 3045, 6009, 3043, 3047, 3054, 3046,
-     3049, 3050, 3051, 6009, 3068, 3053, 3065, 3074, 3056, 3063,
-     3076, 3078, 3079, 3080, 3082, 3081, 3083, 6009, 3086, 6009,
-     3084, 3091, 3098, 3103, 3092, 3087, 3107, 3112, 3108, 3113,
-     3114, 3115, 3116, 3117, 3118, 3122, 3125, 3129, 3130, 3140,
+     2943, 2947, 2948, 2954, 2946, 2955, 2957, 2959, 2962, 2964,
+     2965, 2966, 6134, 2970, 2967, 2972, 2974, 2976, 2977, 2978,
+     2982, 2980, 2983, 2988, 2991, 2989, 2999, 3005, 2998, 2995,
+     3012, 6134, 3004, 3008, 3011, 3013, 6134, 3016, 3014, 3022,
+     3024, 3017, 3026, 3020, 3029, 3027, 3033, 3034, 3037, 3042,
+     3041, 3047, 6134, 3039, 3051, 3049, 3057, 3058, 3059, 3061,
+     3067, 3069, 3065, 3071, 3072, 3073, 3075, 3076, 3083, 3086,
+     3082, 3091, 3078, 3088, 3097, 3089, 3081, 3098, 3100, 3102,
+     3103, 3105, 3104, 3106, 3107, 3108, 6134, 3111, 3112, 3121,
+     3110, 3113, 3114, 3124, 6134, 3135, 3126, 3132, 3138, 3129,
 
-     3123, 3131, 3128, 3136, 3126, 3145, 6009, 6009, 3147, 3148,
-     3151, 3149, 3153, 3154, 3155, 3164, 3158, 3160, 3161, 3167,
-     3175, 6009, 3177, 3168, 3171, 3179, 3186, 3181, 3188, 3195,
-     3192, 3196, 3194, 6009, 3198, 3201, 3208, 3203, 3204, 3211,
-     6009, 3206, 6009, 3209, 3210, 3212, 3217, 3219, 3221, 3222,
-     3223, 3225, 3233, 3241, 3230, 3239, 3231, 3240, 3242, 3244,
-     3253, 3245, 3248, 3250, 6009, 3255, 3249, 3252, 3260, 3266,
-     3270, 3263, 3259, 6009, 3262, 3274, 3276, 3278, 3279, 3281,
-     3283, 3284, 3287, 3288, 3285, 3286, 3302, 3289, 3292, 3303,
-     3294, 3305, 3312, 6009, 3313, 3307, 3320, 3322, 3315, 3317,
+     3136, 3140, 3141, 3142, 3143, 3147, 3148, 3149, 6134, 3152,
+     6134, 3153, 3163, 3156, 3162, 3168, 3169, 3170, 3175, 3171,
+     3176, 3177, 3181, 3179, 3183, 3185, 3188, 3191, 3192, 3196,
+     3205, 3189, 3193, 3197, 3202, 3208, 3210, 6134, 6134, 3211,
+     3212, 3213, 3217, 3218, 3220, 3228, 3223, 3221, 3219, 3231,
+     3238, 3240, 6134, 3241, 3242, 3244, 3245, 3253, 3246, 3249,
+     3260, 3258, 3265, 3261, 6134, 3251, 3262, 3274, 3269, 3270,
+     3278, 6134, 3275, 6134, 3277, 3280, 3281, 3284, 3285, 3287,
+     3288, 3290, 3292, 3301, 3303, 3294, 3306, 3308, 3309, 3310,
+     3311, 3318, 3314, 3315, 3316, 6134, 3320, 3317, 3321, 3330,
 
-     3323, 3324, 3325, 3328, 3330, 3329, 3331, 3333, 3335, 3332,
-     3342, 3336, 3349, 3338, 3352, 3358, 3359, 3339, 3355, 3362,
-     3363, 3366, 3365, 3369, 3372, 3376, 3373, 3385, 3386, 3377,
-     3380, 3389, 3390, 3397, 3392, 6009, 3402, 3382, 3405, 3403,
-     3404, 3409, 3410, 3412, 3413, 3414, 3415, 3422, 3417, 6009,
-     3424, 3419, 3429, 3430, 3421, 3444, 3439, 3420, 3442, 3446,
-     3443, 3449, 3447, 3451, 3452, 3455, 3456, 6009, 6009, 3458,
-     3459, 3461, 6009, 3462, 3460, 3472, 3465, 3468, 3475, 3478,
-     3474, 3477, 3479, 3482, 3486, 6009, 3487, 3494, 3491, 3493,
-     3501, 3504, 3497, 3505, 3506, 3499, 3507, 3509, 3513, 3512,
+     3333, 3339, 3323, 3322, 6134, 3326, 3343, 3340, 3346, 3347,
+     3349, 3350, 3353, 3351, 3355, 3352, 3354, 3362, 3357, 3361,
+     3370, 3373, 3365, 3378, 6134, 3375, 3381, 3388, 3384, 3385,
+     3387, 3391, 3386, 3392, 3393, 3395, 3396, 3398, 3400, 3402,
+     3399, 3409, 3403, 3410, 3416, 3405, 3425, 3432, 3408, 3419,
+     3427, 3428, 3433, 3430, 3436, 3440, 3442, 3434, 3450, 3451,
+     3445, 3447, 3456, 3453, 3464, 3459, 6134, 3467, 3460, 3469,
+     3465, 3470, 3472, 3474, 3475, 3477, 3479, 3481, 3482, 3491,
+     3484, 3487, 3488, 3495, 3492, 6134, 3505, 3501, 3509, 3502,
+     3506, 3516, 3514, 3517, 3518, 3520, 3522, 3524, 3526, 3527,
 
-     3514, 3517, 3528, 3529, 3524, 3520, 3527, 6009, 3525, 3532,
-     3533, 3537, 3534, 3541, 6009, 3539, 3542, 3543, 3548, 3551,
-     3555, 3552, 3561, 3562, 3564, 3565, 3566, 3567, 3569, 3576,
-     3573, 3572, 3575, 3579, 3581, 6009, 3582, 3586, 3590, 3593,
-     6009, 3595, 3604, 3605, 3606, 3596, 3607, 3601, 3614, 6009,
-     3609, 3611, 3616, 3617, 3624, 3619, 3626, 3623, 6009, 3625,
-     3627, 3629, 6009, 3630, 3631, 3639, 3644, 3636, 3651, 3647,
-     3649, 3652, 3648, 6009, 3650, 6009, 3659, 3660, 3663, 6009,
-     3661, 3665, 3666, 3668, 3669, 3670, 3674, 3681, 3676, 3682,
-     3683, 3684, 3685, 3687, 3694, 3686, 3690, 3693, 3695, 6009,
+     3528, 3531, 3532, 6134, 6134, 3534, 3535, 3536, 6134, 3538,
+     3540, 3550, 3542, 3543, 3551, 3555, 3554, 3553, 3556, 3558,
+     3559, 6134, 3565, 3573, 3568, 3569, 3577, 3578, 3581, 3582,
+     3574, 3585, 3589, 3586, 3590, 3591, 3592, 3594, 3602, 3603,
+     3599, 3600, 3606, 6134, 3601, 3607, 3611, 3613, 3604, 3617,
+     6134, 3614, 3620, 3622, 3625, 3631, 3635, 3627, 3637, 3640,
+     3641, 3644, 3642, 3645, 3646, 3654, 3649, 3651, 3653, 3657,
+     3667, 6134, 3650, 3662, 3660, 3669, 6134, 3675, 3682, 3683,
+     3685, 3670, 3684, 3686, 3693, 6134, 3688, 3690, 3691, 3672,
+     3701, 3692, 3705, 3704, 6134, 3706, 3702, 3707, 6134, 3708,
 
-     3705, 3697, 3698, 3712, 3710, 3702, 3700, 3718, 3716, 6009,
-     6009, 3725, 6009, 3727, 3720, 3722, 6009, 3726, 3728, 3737,
-     3732, 3733, 3743, 3740, 3744, 6009, 3746, 3735, 3747, 3750,
-     3751, 3754, 3756, 3757, 3758, 3760, 3761, 6009, 3762, 3764,
-     3771, 3763, 3765, 3774, 3773, 3779, 6009, 3783, 3787, 3786,
-     3790, 3791, 6009, 3792, 6009, 3793, 3794, 3796, 3800, 3797,
-     6009, 3805, 3806, 3810, 3812, 3813, 3815, 3814, 3821, 3822,
-     3823, 3830, 3827, 3828, 3825, 6009, 3829, 3831, 3835, 3836,
-     3839, 3842, 3850, 3846, 3847, 3852, 3853, 3856, 3859, 3857,
-     3863, 3865, 3867, 3860, 6009, 3868, 3873, 3866, 3882, 3879,
+     3709, 3720, 3723, 3713, 3730, 3725, 3727, 3728, 3717, 6134,
+     3735, 6134, 3736, 3729, 3737, 6134, 3742, 3743, 3744, 3746,
+     3747, 3748, 3752, 3751, 3758, 3759, 3761, 3762, 3760, 3765,
+     3769, 3766, 3767, 3771, 3772, 6134, 3773, 3775, 3782, 3787,
+     3783, 3790, 3777, 3794, 3795, 6134, 6134, 3797, 6134, 3800,
+     3801, 3804, 6134, 3806, 3805, 3813, 3809, 3810, 3812, 3816,
+     3822, 6134, 3824, 3827, 6134, 3825, 3835, 3832, 3818, 3833,
+     3836, 3837, 3840, 3841, 3842, 3843, 3844, 3849, 6134, 3846,
+     3848, 3851, 3847, 3856, 3861, 3857, 3863, 6134, 3867, 3871,
+     3870, 3874, 3875, 6134, 3877, 6134, 3878, 3880, 3881, 3885,
 
-     3883, 6009, 3884, 3885, 3886, 6009, 3889, 3892, 3894, 3898,
-     3893, 3899, 3900, 3901, 3904, 6009, 3906, 3908, 3905, 3909,
-     3921, 3913, 6009, 6009, 3923, 6009, 3924, 3910, 3928, 3927,
-     3907, 3931, 3935, 3937, 3939, 3936, 3944, 3947, 3941, 3957,
-     3959, 3964, 3960, 3961, 3950, 6009, 6009, 3966, 3967, 3962,
-     3973, 3974, 3976, 3977, 3984, 3980, 3986, 3990, 3991, 3998,
-     6009, 3979, 3981, 3999, 6009, 3994, 3997, 4000, 4005, 4004,
-     4006, 4010, 4007, 4008, 4011, 4015, 4012, 4017, 4025, 4018,
-     4022, 4021, 4031, 4028, 4029, 4038, 6009, 4035, 4039, 4042,
-     4045, 4046, 4048, 4050, 4051, 4052, 6009, 4049, 4054, 4056,
+     3884, 6134, 3890, 3891, 3895, 3897, 3899, 3898, 3901, 3902,
+     3908, 3909, 3916, 3912, 3911, 3913, 6134, 3914, 3918, 3920,
+     3927, 3915, 3922, 3931, 3934, 3935, 3936, 3940, 3944, 3938,
+     3945, 3951, 3949, 3955, 3941, 6134, 3953, 3961, 3947, 3970,
+     3957, 3967, 6134, 3971, 3972, 3973, 6134, 3974, 3975, 3976,
+     3981, 3982, 3984, 3988, 3989, 3986, 6134, 3993, 3994, 3990,
+     3991, 3992, 3998, 6134, 6134, 4008, 6134, 4009, 3999, 4011,
+     4012, 4013, 4016, 4018, 4019, 4021, 4023, 4029, 4031, 4024,
+     4040, 4041, 4049, 4044, 4045, 4032, 6134, 6134, 4051, 4054,
+     4048, 4059, 4060, 4056, 4046, 4071, 4062, 4072, 4075, 4076,
 
-     4062, 4055, 4065, 4076, 4080, 4082, 4057, 4074, 4083, 4085,
-     4089, 4086, 6009, 4090, 4092, 4093, 4096, 4099, 4101, 4102,
-     4104, 4105, 4107, 4109, 4110, 4117, 4119, 4111, 4120, 4114,
-     4122, 6009, 4126, 4133, 4127, 4135, 4130, 4060, 4136, 4137,
-     4143, 4140, 4145, 4144, 4150, 6009, 4147, 4151, 4154, 4152,
-     4158, 4161, 4165, 4162, 4164, 6009, 4172, 4155, 4166, 4168,
-     4176, 4178, 4181, 4183, 4186, 4185, 4188, 6009, 4189, 4192,
-     4193, 4190, 4199, 4200, 4204, 4202, 6009, 4205, 4211, 4203,
-     4219, 4214, 4223, 4220, 4222, 4224, 4226, 4229, 4231, 4233,
-     4234, 4236, 4230, 4247, 4252, 4250, 6009, 4237, 6009, 4251,
+     4083, 6134, 4066, 4078, 4082, 6134, 4063, 4079, 4085, 4087,
+     4089, 4091, 4090, 4092, 4095, 4093, 4097, 4099, 4101, 4105,
+     4104, 4107, 4113, 4117, 4111, 4118, 4121, 6134, 4123, 4114,
+     4125, 4126, 4127, 4128, 4129, 4134, 4135, 6134, 4137, 6134,
+     4140, 4139, 4141, 4155, 4157, 4148, 4158, 4162, 4163, 4166,
+     4168, 4159, 4169, 4170, 4176, 4178, 4179, 6134, 4181, 4173,
+     4180, 4183, 4190, 4192, 4187, 4197, 4194, 4199, 4201, 4202,
+     4204, 4209, 4205, 4211, 4210, 4213, 6134, 4217, 4215, 4218,
+     4226, 4221, 4223, 4227, 4233, 4236, 4228, 4231, 4238, 4241,
+     6134, 4242, 4243, 4244, 4138, 4251, 4245, 4248, 4252, 4254,
 
-     4255, 4259, 4261, 4258, 6009, 4248, 4263, 4266, 4267, 4268,
-     6009, 4269, 4271, 4273, 4272, 6009, 4283, 4285, 4274, 4289,
-     4276, 4291, 6009, 4296, 4297, 4293, 4305, 4308, 4304, 4306,
-     4309, 4307, 4311, 4312, 4313, 4321, 4316, 4317, 6009, 4323,
-     4326, 4333, 4334, 4328, 4318, 4336, 4342, 4335, 6009, 4344,
-     4343, 4345, 4346, 4347, 4350, 4352, 4359, 4355, 4354, 6009,
-     4358, 4362, 4375, 4356, 4366, 6009, 6009, 4371, 4376, 4378,
-     4373, 4379, 6009, 4382, 4389, 4384, 4388, 4391, 6009, 6009,
-     4393, 6009, 4390, 6009, 4395, 4394, 6009, 6009, 4397, 4398,
-     4401, 4407, 4404, 6009, 4414, 6009, 4411, 4415, 4417, 4418,
+     6134, 4256, 4258, 4261, 4260, 4263, 4265, 4270, 4271, 4273,
+     4275, 4284, 6134, 4276, 4280, 4286, 4289, 4279, 4290, 4293,
+     4294, 6134, 4295, 4301, 4297, 4305, 4303, 4313, 4310, 4316,
+     4308, 4309, 4323, 4318, 4319, 4325, 4329, 4317, 4336, 4341,
+     4339, 6134, 4332, 6134, 4337, 4344, 4348, 4349, 4340, 6134,
+     4347, 4351, 4354, 4355, 4356, 6134, 4357, 4359, 4361, 4366,
+     6134, 4368, 4372, 4364, 4373, 4380, 4381, 6134, 4387, 4388,
+     4389, 4396, 4398, 4400, 4383, 4401, 4393, 4395, 4403, 4406,
+     4410, 4411, 4408, 6134, 4412, 4414, 4419, 4415, 4421, 4423,
+     4424, 4427, 4429, 6134, 4431, 4432, 4433, 4434, 4435, 4437,
 
-     4420, 6009, 4419, 4422, 4427, 6009, 4421, 4429, 4428, 4432,
-     6009, 4436, 4439, 4431, 4437, 6009, 4443, 4449, 4451, 4441,
-     4445, 4452, 4458, 4453, 4461, 4462, 4463, 4464, 4465, 4472,
-     4477, 4479, 4481, 4473, 4469, 4483, 4489, 4491, 4482, 4486,
-     4493, 4495, 4497, 4499, 4501, 4503, 4504, 4505, 4507, 4508,
-     4506, 4516, 4509, 4510, 4523, 4519, 4512, 4524, 4527, 4525,
-     4531, 4532, 4534, 4535, 4536, 6009, 4537, 4539, 4541, 4553,
-     4546, 4542, 4552, 4559, 4563, 4565, 6009, 4567, 6009, 4569,
-     4554, 4571, 4573, 6009, 4574, 4575, 4576, 4577, 4578, 4579,
-     4581, 4580, 4584, 4585, 4588, 6009, 4591, 4586, 4595, 4606,
+     4440, 4444, 4441, 4446, 4449, 4450, 4451, 6134, 4454, 4456,
+     4465, 4458, 4460, 6134, 6134, 4463, 4473, 4475, 4467, 4479,
+     6134, 4481, 4482, 4471, 4487, 4488, 6134, 6134, 4490, 6134,
+     4484, 6134, 4491, 4492, 6134, 6134, 4494, 4469, 4496, 4498,
+     4507, 6134, 4510, 6134, 4517, 4512, 4500, 4504, 4514, 6134,
+     4515, 4518, 4521, 6134, 4522, 4529, 4524, 4525, 6134, 4528,
+     4532, 4533, 4536, 6134, 4537, 4544, 4541, 4539, 4547, 4545,
+     4549, 4548, 4553, 4558, 4555, 4559, 4561, 4564, 4569, 4572,
+     4574, 4565, 4575, 4576, 4582, 4584, 4578, 4580, 4586, 4587,
+     4589, 4591, 4595, 4597, 4598, 4599, 4600, 4601, 4602, 4612,
 
-     6009, 4601, 4612, 4596, 4607, 4609, 4613, 4615, 4617, 4618,
-     4619, 4621, 4623, 4630, 4626, 4627, 4629, 4631, 4632, 4637,
-     4640, 4639, 4647, 4649, 4654, 6009, 4643, 6009, 4650, 4655,
-     4656, 4658, 4660, 4661, 4663, 6009, 6009, 4664, 4666, 4671,
-     4672, 4667, 4676, 4673, 6009, 4679, 4686, 4689, 4680, 6009,
-     4683, 4691, 4692, 4696, 6009, 4697, 4699, 4700, 4702, 4703,
-     4706, 4710, 4707, 4713, 4714, 4718, 6009, 6009, 6009, 6009,
-     4719, 4721, 4724, 4725, 4727, 4728, 4730, 4732, 4733, 6009,
-     4735, 6009, 6009, 4736, 4742, 4744, 4745, 4746, 4749, 4751,
-     4753, 6009, 4752, 4757, 4759, 4755, 4766, 4772, 4756, 4769,
+     4604, 4605, 4615, 4618, 4608, 4616, 4619, 4620, 4621, 4628,
+     4630, 4623, 4626, 6134, 4631, 4633, 4637, 4640, 4642, 4645,
+     4646, 4648, 4653, 4657, 6134, 4661, 6134, 4663, 4654, 4659,
+     4665, 6134, 4666, 4667, 4668, 4669, 4671, 4673, 4674, 4675,
+     4678, 4679, 4681, 6134, 4688, 4677, 4683, 4701, 6134, 4694,
+     4705, 4691, 4698, 4706, 4702, 4707, 4708, 4711, 4710, 4715,
+     4719, 4712, 4722, 4721, 4737, 4723, 4724, 4732, 4733, 4734,
+     4735, 4740, 4742, 4747, 4748, 4753, 6134, 4743, 6134, 4749,
+     4756, 4757, 4759, 4760, 4761, 4763, 6134, 6134, 4764, 4767,
+     4772, 4768, 4773, 4777, 4774, 6134, 4780, 4785, 4787, 4788,
 
-     4773, 4775, 4782, 4778, 4779, 4777, 4781, 4785, 4788, 6009,
-     6009, 4789, 4795, 4796, 4804, 4800, 4801, 4813, 4808, 4809,
-     4810, 4811, 4815, 4797, 4822, 4827, 4820, 4817, 6009, 4828,
-     4831, 6009, 4824, 6009, 4830, 4832, 4838, 4839, 4840, 4841,
-     4842, 4844, 6009, 6009, 4845, 4846, 4848, 4855, 4851, 4859,
-     4847, 4858, 4860, 6009, 4861, 6009, 4863, 4865, 4872, 4873,
-     4880, 4881, 4884, 4886, 4882, 4887, 6009, 4888, 4889, 6009,
-     4891, 4893, 4894, 6009, 4899, 4896, 4904, 4906, 6009, 4911,
-     4908, 4913, 6009, 4916, 6009, 4901, 4917, 4919, 4926, 6009,
-     4923, 4927, 6009, 4930, 4933, 4934, 4935, 6009, 4924, 6009,
+     6134, 4790, 4792, 4793, 4797, 6134, 4794, 4798, 4799, 4809,
+     4800, 4811, 4815, 4814, 4802, 4804, 4822, 6134, 6134, 6134,
+     6134, 4824, 4817, 4827, 4828, 4829, 4831, 4834, 4833, 4830,
+     6134, 4836, 6134, 6134, 4844, 4846, 4838, 4848, 4847, 4837,
+     4850, 4854, 6134, 4857, 4858, 4860, 4861, 4867, 4869, 4864,
+     4870, 4873, 4874, 4883, 4879, 4880, 4878, 4882, 4886, 4889,
+     6134, 6134, 4890, 4895, 4896, 4906, 4897, 4904, 4907, 4908,
+     4910, 4911, 4898, 4914, 4916, 4923, 4924, 4921, 4919, 6134,
+     4925, 4929, 6134, 4927, 6134, 4928, 4935, 4934, 4936, 4938,
+     4941, 4942, 4944, 6134, 6134, 4951, 4948, 6134, 4946, 4955,
 
-     4936, 4939, 4940, 4945, 4946, 4950, 4947, 4951, 4952, 4959,
-     4955, 4958, 6009, 6009, 4971, 4957, 4963, 4964, 4967, 4974,
-     4972, 4975, 4977, 6009, 6009, 4981, 6009, 4982, 4985, 6009,
-     4978, 4989, 4987, 4991, 4993, 4994, 4995, 4999, 5001, 5007,
-     5002, 5000, 5012, 5023, 5006, 5027, 5028, 5030, 5032, 5034,
-     5008, 5036, 5037, 5013, 5038, 5040, 5042, 6009, 5044, 5045,
-     5046, 6009, 5050, 5051, 5053, 5054, 6009, 5056, 5061, 5063,
-     5065, 6009, 5066, 5068, 5069, 5071, 5075, 5082, 5078, 5077,
-     5079, 6009, 6009, 6009, 5087, 5089, 6009, 5094, 5085, 5095,
-     5096, 6009, 5097, 5098, 6009, 6009, 5100, 5102, 5101, 5109,
+     4957, 4959, 4960, 4961, 4956, 4963, 4964, 6134, 4966, 6134,
+     4967, 4968, 4974, 4969, 4984, 4986, 4988, 4990, 4977, 4991,
+     6134, 4992, 4993, 6134, 4995, 4997, 4998, 6134, 5002, 5000,
+     5005, 5008, 6134, 5010, 5012, 5014, 6134, 5021, 6134, 5015,
+     5017, 5024, 5029, 6134, 5025, 5026, 6134, 5031, 5033, 5034,
+     5038, 6134, 5039, 6134, 5040, 5042, 5043, 5047, 5048, 5050,
+     5052, 5053, 5054, 5061, 5059, 5062, 6134, 6134, 5070, 5056,
+     5067, 5072, 5074, 5081, 5073, 5078, 5077, 6134, 6134, 5083,
+     6134, 5085, 5086, 6134, 5084, 5091, 5090, 5095, 5096, 5097,
+     5099, 5102, 5104, 5112, 5105, 5103, 5116, 5126, 5110, 5128,
 
-     6009, 5104, 6009, 5105, 6009, 5107, 5108, 5117, 5115, 6009,
-     5122, 5128, 6009, 5131, 5134, 5136, 5137, 5119, 5123, 5138,
-     6009, 5147, 5140, 5144, 5151, 5148, 5152, 5153, 5154, 5161,
-     5156, 5160, 6009, 5163, 5157, 5164, 5170, 5165, 5168, 5174,
-     6009, 5176, 6009, 5177, 5178, 5182, 5179, 5180, 5185, 5187,
-     5192, 5189, 5199, 5193, 6009, 5201, 5203, 6009, 5205, 6009,
-     5207, 6009, 5208, 5209, 5211, 5213, 6009, 5217, 5210, 5214,
-     5219, 6009, 5220, 5222, 5223, 5229, 6009, 6009, 5231, 5239,
-     5235, 5232, 5244, 5246, 5241, 5248, 5249, 5250, 5252, 5262,
-     5234, 5257, 5255, 5264, 5265, 5270, 6009, 6009, 6009, 5266,
+     5130, 5132, 5134, 5136, 5138, 5106, 5121, 5139, 5140, 5142,
+     5143, 5144, 5146, 6134, 5149, 5150, 5145, 6134, 5156, 5151,
+     5161, 5157, 6134, 5168, 5169, 5170, 5171, 6134, 5172, 5174,
+     5177, 5175, 5176, 5188, 5183, 5185, 5189, 6134, 6134, 6134,
+     5192, 5199, 6134, 5201, 5195, 5186, 5202, 6134, 5203, 5204,
+     6134, 6134, 5205, 5206, 5207, 5214, 6134, 5210, 6134, 5213,
+     6134, 5218, 5219, 5225, 5228, 6134, 5231, 5238, 6134, 5233,
+     5241, 5244, 5245, 5229, 5246, 5247, 6134, 5256, 5248, 5255,
+     5258, 5217, 5251, 5259, 5261, 5268, 5263, 5267, 6134, 5269,
+     5270, 5271, 5277, 5274, 5280, 5281, 6134, 5283, 6134, 5284,
 
-     5273, 5280, 5277, 5279, 5287, 5283, 6009, 5284, 5285, 5286,
-     5294, 5291, 5296, 6009, 5292, 5297, 5298, 5299, 5303, 5300,
-     5307, 6009, 5311, 5314, 5317, 5306, 5321, 5325, 5328, 5330,
-     5331, 6009, 5333, 6009, 6009, 5318, 6009, 5334, 5335, 5338,
-     5339, 6009, 5342, 5344, 5343, 5345, 5347, 5349, 6009, 5359,
-     5350, 5352, 5361, 6009, 6009, 5365, 6009, 5368, 5369, 5362,
-     5378, 5373, 5375, 5380, 5377, 6009, 5381, 5384, 5386, 5387,
-     5388, 6009, 5389, 5390, 5392, 5393, 5396, 5395, 5398, 5400,
-     5402, 6009, 5403, 5405, 5423, 5419, 6009, 5406, 5418, 6009,
-     6009, 5428, 5430, 5351, 6009, 6009, 6009, 5433, 6009, 5435,
+     5285, 5286, 5287, 5289, 5291, 5292, 5294, 5302, 5303, 5304,
+     5307, 5308, 6134, 5313, 5315, 6134, 5316, 6134, 5318, 6134,
+     5309, 5319, 5320, 5323, 6134, 5332, 5322, 5324, 5326, 6134,
+     5333, 5329, 5338, 5340, 6134, 6134, 5341, 5350, 5346, 5348,
+     5353, 5355, 5349, 5359, 5356, 5362, 5360, 5372, 5363, 5364,
+     5365, 5374, 5381, 5386, 6134, 6134, 6134, 5377, 5368, 5396,
+     5392, 5394, 5399, 5383, 6134, 5395, 5398, 5402, 5410, 5405,
+     5407, 6134, 5408, 5409, 5411, 5412, 5414, 5415, 5417, 6134,
+     5419, 5429, 5430, 5424, 5432, 5440, 5442, 5444, 5431, 5451,
+     5447, 6134, 5449, 6134, 6134, 5446, 6134, 5433, 5450, 5453,
 
-     5439, 5443, 5447, 5438, 6009, 5449, 5446, 5451, 6009, 6009,
-     5450, 5452, 5453, 5455, 6009, 6009, 5456, 5459, 5457, 5460,
-     5462, 6009, 5467, 5471, 5473, 5476, 5479, 5468, 5482, 5484,
-     5492, 5494, 5489, 5490, 5495, 5497, 5498, 5499, 5501, 5510,
-     5506, 5508, 5520, 5517, 6009, 6009, 5524, 6009, 6009, 5526,
-     5528, 5530, 5532, 5534, 5536, 5538, 6009, 5539, 5541, 5542,
-     5410, 5543, 6009, 5545, 5547, 5544, 5549, 5509, 5552, 5550,
-     5555, 6009, 6009, 5556, 5557, 5558, 5566, 5561, 6009, 5568,
-     5575, 5572, 5573, 5570, 5576, 5577, 6009, 5581, 5582, 6009,
-     6009, 5580, 6009, 6009, 6009, 6009, 6009, 6009, 6009, 6009,
+     5458, 6134, 5461, 5454, 5456, 5462, 5464, 5467, 6134, 5479,
+     5469, 5474, 5477, 6134, 6134, 5481, 6134, 5484, 5485, 5478,
+     5494, 5486, 5487, 5497, 5499, 6134, 5491, 5500, 5501, 5502,
+     5503, 6134, 5505, 5507, 5508, 5510, 5515, 5516, 5517, 5518,
+     5519, 6134, 5522, 5521, 5529, 5531, 6134, 5525, 5537, 6134,
+     6134, 5543, 5547, 5375, 6134, 6134, 6134, 5544, 5538, 5552,
+     6134, 5554, 5558, 5562, 5566, 5561, 6134, 5568, 5569, 5570,
+     6134, 6134, 5571, 5572, 5573, 5575, 6134, 6134, 5576, 5579,
+     5577, 5580, 5582, 6134, 5585, 5590, 5593, 5596, 5605, 5583,
+     5602, 5600, 5614, 5616, 5606, 5611, 5615, 5617, 5618, 5619,
 
-     5585, 6009, 5583, 5598, 5600, 5602, 6009, 5590, 5603, 5511,
-     5604, 5592, 6009, 5605, 5607, 5609, 5608, 5611, 5615, 5617,
-     5619, 5621, 5620, 5622, 5625, 5623, 5629, 5627, 5631, 5637,
-     6009, 6009, 6009, 5635, 5633, 5644, 5645, 5656, 5657, 5660,
-     5662, 5646, 5650, 5663, 5664, 5667, 5652, 5668, 5679, 5671,
-     5674, 5675, 5676, 5682, 5678, 5684, 5688, 6009, 5689, 6009,
-     5690, 6009, 6009, 5692, 5694, 5697, 5698, 5706, 5707, 5699,
-     5702, 5709, 5711, 5719, 5721, 6009, 5710, 5712, 6009, 5722,
-     5723, 6009, 5714, 5724, 5725, 5726, 5730, 5733, 5735, 5737,
-     5746, 6009, 6009, 5738, 5741, 5747, 5749, 5750, 5757, 5753,
+     5621, 5630, 5627, 5629, 5635, 5632, 6134, 6134, 5640, 5642,
+     5643, 6134, 6134, 5645, 5647, 5649, 5651, 5654, 5656, 5658,
+     6134, 5659, 5661, 5662, 5663, 5664, 6134, 5666, 5670, 5665,
+     5673, 5667, 5676, 5672, 5682, 6134, 6134, 5674, 5688, 5678,
+     5689, 5683, 6134, 5693, 5700, 5695, 5697, 5698, 5703, 5699,
+     6134, 5705, 5707, 6134, 6134, 5708, 6134, 6134, 5706, 6134,
+     6134, 6134, 6134, 6134, 6134, 6134, 5710, 6134, 5712, 5719,
+     5727, 5729, 6134, 5714, 5722, 5720, 5730, 5733, 6134, 5734,
+     5735, 5736, 5738, 5739, 5742, 5745, 5744, 5748, 5749, 5751,
+     5752, 5753, 5756, 5759, 5755, 5761, 5764, 6134, 6134, 6134,
 
-     5756, 5760, 5762, 5763, 5770, 6009, 5769, 5771, 5773, 6009,
-     5774, 5775, 5777, 5779, 5780, 5787, 5783, 5788, 6009, 5785,
-     6009, 5790, 5791, 5792, 5793, 5795, 5796, 5804, 5806, 5807,
-     6009, 5808, 5815, 5810, 5817, 5821, 5819, 5823, 5813, 5826,
-     5828, 5835, 5839, 5836, 5840, 5827, 5844, 5831, 6009, 5842,
-     5845, 6009, 5848, 5851, 5852, 5854, 5857, 6009, 5860, 5855,
-     5861, 5862, 5866, 5868, 6009, 5870, 5877, 5872, 6009, 5878,
-     6009, 6009, 5881, 5882, 5884, 5888, 5890, 6009, 6009, 6009,
-     5917, 5924, 5931, 5938, 5945,   88, 5952, 5959, 5966, 5973,
-     5980, 5987, 5994, 6001
+     5770, 5771, 5773, 5774, 5778, 5785, 5788, 5790, 5775, 5779,
+     5792, 5793, 5796, 5782, 5797, 5806, 5802, 5803, 5804, 5805,
+     5811, 5814, 5808, 5817, 5819, 6134, 5820, 6134, 5821, 6134,
+     6134, 5827, 5828, 5540, 5822, 5830, 5837, 5832, 5834, 5833,
+     5838, 5845, 5849, 6134, 6134, 5840, 5842, 6134, 5850, 5851,
+     6134, 5853, 5854, 5856, 5857, 5858, 5860, 5863, 5867, 5866,
+     6134, 6134, 5869, 5874, 5876, 5878, 5880, 5887, 5882, 5886,
+     5888, 5894, 5884, 5896, 6134, 5898, 5900, 5902, 6134, 5904,
+     5906, 5907, 5909, 5910, 5917, 5912, 5913, 6134, 5915, 6134,
+     5919, 5921, 5922, 5920, 5923, 5924, 5934, 5936, 5932, 6134,
 
+     5938, 5943, 5940, 5946, 5948, 5950, 5951, 5952, 5954, 5956,
+     5960, 5966, 5963, 5967, 5957, 5968, 5969, 6134, 5978, 5972,
+     6134, 5975, 5979, 5981, 5982, 5985, 6134, 5990, 5983, 5987,
+     5992, 5995, 5996, 6134, 5998, 6005, 6007, 6134, 6008, 6134,
+     6134, 6010, 5999, 6009, 6012, 6017, 6134, 6134, 6134, 6042,
+     6049, 6056, 6063, 6070,   88, 6077, 6084, 6091, 6098, 6105,
+     6112, 6119, 6126
     } ;
 
-static const flex_int16_t yy_def[3095] =
+static const flex_int16_t yy_def[3164] =
     {   0,
-     3080,    1, 3081, 3081, 3082, 3082, 3083, 3083, 3084, 3084,
-     3085, 3085, 3080, 3086, 3080, 3080, 3080, 3080, 3087, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3088, 3080, 3080, 3080, 3088, 3089, 3080, 3080,
-     3080, 3089, 3090, 3080, 3080, 3080, 3080, 3090, 3091, 3080,
-     3080, 3080, 3091, 3092, 3080, 3093, 3080, 3092, 3092, 3086,
-     3086, 3080, 3094, 3087, 3094, 3087, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3149,    1, 3150, 3150, 3151, 3151, 3152, 3152, 3153, 3153,
+     3154, 3154, 3149, 3155, 3149, 3149, 3149, 3149, 3156, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3157, 3149, 3149, 3149, 3157, 3158, 3149, 3149,
+     3149, 3158, 3159, 3149, 3149, 3149, 3149, 3159, 3160, 3149,
+     3149, 3149, 3160, 3161, 3149, 3162, 3149, 3161, 3161, 3155,
+     3155, 3149, 3163, 3156, 3163, 3156, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3088, 3088, 3089, 3089, 3090, 3090, 3080, 3091, 3091,
-     3092, 3092, 3093, 3093, 3092, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3157, 3157, 3158, 3158, 3159, 3159, 3149, 3160, 3160,
+     3161, 3161, 3162, 3162, 3161, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3092, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3092, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3080, 3086, 3092, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3149, 3155, 3161, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3092, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3080, 3080, 3086, 3080, 3080, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3161,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3149,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3149, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3092, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3080, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3092, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3161, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3080, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
+     3155, 3155, 3155, 3149, 3149, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3080, 3086, 3080, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3149, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3149, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3149, 3155, 3155, 3155, 3155,
 
-     3086, 3080, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3080, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3149, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3080, 3086,
+     3155, 3149, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3080, 3080, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3080, 3080,
-     3086, 3080, 3086, 3080, 3086, 3086, 3080, 3080, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3080, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3080, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3149, 3149, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3149,
+     3155, 3149, 3155, 3155, 3149, 3149, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3080, 3080, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3086, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3080,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086, 3080,
+     3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3149,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3149, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3149, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3149, 3155, 3155, 3149, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3080, 3086, 3080, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3080, 3080, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3080, 3080, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155, 3149, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3149, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155,
+     3149, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3080, 3086, 3080, 3086, 3080, 3086, 3086, 3086, 3086, 3080,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3080, 3086, 3080,
-     3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3080, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3080, 3080, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3149,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3149, 3149, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155,
+     3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155,
 
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3080, 3080, 3086, 3080, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3086, 3080, 3080, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3080,
-     3080, 3086, 3086, 3086, 3080, 3080, 3080, 3086, 3080, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3149, 3155, 3149, 3155, 3149,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3149, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3149, 3149, 3155, 3149, 3155, 3155, 3155,
 
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3080, 3080,
-     3086, 3086, 3086, 3086, 3080, 3080, 3086, 3086, 3086, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3080, 3086, 3080, 3080, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3080,
-     3080, 3086, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3149, 3149, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3149, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3149,
+     3149, 3155, 3155, 3155, 3149, 3149, 3149, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3149, 3149, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3086, 3080, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086,
-     3086, 3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3080,
-     3086, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3080, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3080, 3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
+     3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155,
+     3155, 3149, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3149, 3155, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3155, 3155, 3149, 3149, 3155, 3149, 3149, 3155, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3155, 3149, 3155, 3155,
+     3155, 3155, 3149, 3155, 3155, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3149, 3149,
 
-     3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3080,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3080, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3086, 3086, 3086, 3086, 3086, 3086, 3080, 3086,
-     3086, 3080, 3086, 3086, 3086, 3086, 3086, 3080, 3086, 3086,
-     3086, 3086, 3086, 3086, 3080, 3086, 3086, 3086, 3080, 3086,
-     3080, 3080, 3086, 3086, 3086, 3086, 3086, 3080, 3080,    0,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149, 3155, 3149,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3149, 3155, 3155, 3149, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3149, 3149, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3149,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149,
 
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155,
+     3149, 3155, 3155, 3155, 3155, 3155, 3149, 3155, 3155, 3155,
+     3155, 3155, 3155, 3149, 3155, 3155, 3155, 3149, 3155, 3149,
+     3149, 3155, 3155, 3155, 3155, 3155, 3149, 3149,    0, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149
     } ;
 
-static const flex_int16_t yy_nxt[6050] =
+static const flex_int16_t yy_nxt[6175] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   14,   18,   20,   21,   22,   23,   24,   25,   26,
@@ -1460,7 +1482,7 @@ static const flex_int16_t yy_nxt[6050] =
        71,  125,  136,  137,  126,  122,  123,   71,  124,   71,
 
       130,  127,  131,   71,  138,  128,  129,   71,  139,  159,
-      156,  132,  140,  146,  945,  146,  146,  133,  146,   75,
+      156,  132,  140,  146,  904,  146,  146,  133,  146,   75,
        71,   75,   75,  151,   75,  151,  151,   70,  151,   70,
        70,  154,   70,   71,   75,   71,   75,   75,   70,   75,
        71,   71,  172,   71,  157,   75,   76,   71,   71,  166,
@@ -1509,602 +1531,616 @@ static const flex_int16_t yy_nxt[6050] =
       366,  367,  368,  363,   71,   71,   71,  370,   71,  374,
       375,   71,  369,  377,  373,   71,   71,   71,  376,  372,
        71,  378,  371,  379,   71,  381,   71,   71,  382,   71,
-       71,   71,   71,  385,   71,  380,  386,   71,  388,   71,
+       71,   71,   71,  385,   71,  380,  386,   71,  388,  147,
        71,  390,  391,  387,   71,  383,  384,   71,  392,   71,
-       71,  389,   71,  393,   71,   71,  395,  396,  397,  399,
-       71,   71,   71,   71,   71,   71,  403,   71,   71,  398,
+       71,  389,   71,  393,   71,   71,  395,  396,  397,  398,
+       71,   71,   71,   71,   71,   71,   71,  404,  401,   71,
 
-      394,  404,   71,   71,   71,  402,  406,   71,  400,   71,
-      409,  405,  401,   71,   71,   71,  407,  411,  414,  413,
-       71,  408,  410,  415,   71,  416,   71,   71,   71,   71,
-       71,  425,  429,  424,  412,   71,  423,   71,   71,  440,
-      426,  430,  427,   71,  417,  432,  433,  418,   71,   71,
-      431,  434,  419,  420,  421,  422,  435,   71,  428,   71,
-       71,   71,  436,   71,  439,  437,  442,   71,  438,  441,
-       71,   71,  444,   71,   71,  443,  445,   71,  446,   71,
-       71,  451,  448,   71,  457,  456,  447,   71,   71,  452,
-       71,  453,   71,   71,  450,  147,   71,  449,  458,   71,
+      394,   71,  405,   71,   71,  403,   71,  407,   71,  410,
+      400,  406,  402,   71,  399,   71,  412,  415,   71,   71,
+      408,  416,  409,   71,  411,   71,   71,  414,   71,   71,
+      426,  417,   71,  413,   71,  424,   71,   71,   71,  427,
+      430,  428,  464,  418,  145,  431,  419,  425,   71,   71,
+      432,  420,  421,  422,  423,  435,   71,  429,  433,  434,
+      436,   71,   71,  440,   71,  437,  438,   71,   71,  439,
+      443,   71,   71,  441,   71,  445,  442,  444,   71,   71,
+       71,   71,   71,  446,  447,  452,   71,  453,   71,  454,
+      448,   71,   71,  470,   71,   71,  458,  451,  455,  449,
 
-      454,  459,  461,  455,  462,   71,  463,  460,  464,   71,
-       71,  469,   71,  470,  471,   71,   71,  472,  468,   71,
-       71,  465,   71,  473,  466,   71,  467,   71,  521,  474,
-       71,   71,   71,  475,  488,   71,  483,  485,   71,   71,
-       71,  476,   71,  477,  487,  478,  484,  486,  499,  490,
-      489,  500,  152,  498,   71,   71,  501,   71,  479,  504,
-      502,  480,   71,  481,   71,  482,   71,   71,  491,  492,
-      505,  506,   71,  503,   71,   71,   71,   71,  493,   71,
-      494,  495,  496,  507,  508,  497,   71,   71,  511,  512,
-       71,  518,  510,  509,  517,   71,  515,  516,  514,  513,
+      457,  450,   71,   71,   71,   71,  465,  471,  456,  459,
+      460,   71,   71,   71,  484,  462,  461,  463,   71,  466,
+      469,   71,  467,  473,  468,  472,   71,   71,   71,   71,
+      474,   71,   71,   71,  143,  489,  475,   71,   71,   71,
+      476,  152,  485,  486,  487,  488,  500,  491,  477,   71,
+      478,  490,  479,  499,  501,   71,   71,   71,  505,  502,
+       71,  503,  504,   71,   71,  480,  507,   71,  481,   71,
+      482,  506,  483,   71,  509,  492,  493,   71,   71,   71,
+       71,  512,  508,   71,   71,  494,   71,  495,  496,  497,
+      510,   71,  498,  513,  518,   71,  519,  511,  520,   71,
 
-      520,   71,  519,   71,   71,  525,   71,   71,   71,   71,
-       71,   71,   71,   71,  528,  523,  529,  530,  524,   71,
-       71,  522,   71,   71,  527,  535,  537,   71,  532,  533,
-      531,  538,  526,   71,  534,   71,  540,   71,   71,   71,
-       71,   71,  549,  536,   71,   71,  539,   71,   71,  551,
-      546,  545,  541,  542,  550,  543,   71,   71,  544,  554,
-      552,  547,   71,  548,   71,   71,  553,   71,  555,   71,
-      556,  557,  558,   71,   71,  561,   71,   71,  559,  563,
-       71,   71,  560,   71,  566,  567,  564,   71,   71,  562,
-      565,   71,  568,   71,   71,   71,   71,  573,   71,  571,
+       71,  515,  521,  514,  516,   71,  517,  526,   71,   71,
+      522,   71,  524,   71,   71,  523,   71,  530,  531,  525,
+       71,  529,   71,   71,   71,   71,   71,   71,  536,  538,
+      528,   71,   71,  541,   71,  539,  527,   71,   71,  533,
+      534,  535,  532,   71,   71,  555,  537,   71,   71,  567,
+      540,   71,  543,  542,  544,   71,  547,   71,  546,   71,
+       71,  545,  550,  558,  556,  557,  560,  548,   71,  549,
+      551,  552,   71,   71,  553,  554,   71,  559,   71,   71,
+       71,  564,  562,  563,   71,  565,   71,  569,   71,   71,
+       71,   71,  572,   71,  561,  570,   71,  573,   71,  568,
 
-      572,   71,  569,   71,   71,  574,   71,   71,   71,  579,
-      575,  580,   71,  582,  570,  578,   71,   71,   71,   71,
-      581,  576,  577,  583,   71,  585,   71,  587,   71,   71,
-       71,   71,   71,   71,   71,  597,  589,  584,  590,  586,
-      588,   71,   71,  592,   71,   71,   71,  600,  596,  599,
-      591,  593,  595,  594,  598,   71,   71,   71,  601,   71,
-      604,  606,  607,   71,  602,  610,   71,  603,   71,  609,
-       71,   71,   71,  605,   71,   71,   71,  613,   71,  616,
-       71,   71,   71,  608,  612,  617,  619,   71,   71,  611,
-       71,   71,   71,  618,   71,  633,  614,  615,  620,   71,
+      574,   71,  571,   71,  566,   71,  577,   71,  575,   71,
+      578,   71,  579,   71,   71,   71,   71,   71,  585,  576,
+      580,  581,   71,  588,   71,   71,  584,  582,  586,  587,
+      589,  583,   71,  591,   71,   71,  593,  590,   71,   71,
+       71,   71,   71,   71,   71,  603,   71,  595,   71,  596,
+       71,   71,  605,   71,  598,  606,  592,  604,   71,  594,
+      602,  597,  599,  601,  600,   71,   71,  607,   71,  610,
+       71,  613,   71,  608,  616,   71,  609,   71,  615,   71,
+       71,   71,  611,   71,   71,  612,  619,   71,  622,   71,
+       71,   71,  614,  618,  623,  625,   71,   71,  617,   71,
 
-       71,  622,   71,  636,  145,   71,  621,   71,  623,  632,
-      631,  634,   71,  624,  643,  625,  635,  639,   71,   71,
-       71,  626,   71,  627,  637,  640,  628,  629,  638,  644,
-       71,   71,  649,  630,  641,   71,   71,  642,  646,  647,
-      645,   71,  650,   71,  652,   71,   71,   71,   71,   71,
-       71,   71,   71,  648,   71,  658,  651,   71,  654,   71,
-      653,  659,  655,  662,   71,   71,   71,  656,  663,  661,
-      660,  657,  152,  665,   71,   71,  664,  666,   71,   71,
-       71,  667,   71,  668,  672,   71,   71,  674,  669,   71,
-      670,  676,   71,  677,  675,  673,  671,  679,   71,   71,
+       71,   71,   71,  656,   71,  620,  624,   71,  621,  646,
+       71,   71,  626,  628,  639,  152,  627,   71,  629,  637,
+      640,   71,  638,  630,   71,  631,  643,  641,  642,   71,
+      644,  632,   71,  633,  650,   71,  634,  635,   71,   71,
+       71,   71,   71,  636,  645,  651,   71,  649,  647,  653,
+       71,  648,   71,  658,   71,  652,   71,   71,  654,   71,
+       71,  655,   71,   71,   71,  659,  660,  657,  664,  665,
+       71,  661,   71,   71,   71,   71,  662,  667,  668,  669,
+      152,  663,  671,  666,  670,  672,   71,   71,   71,  673,
+       71,   71,   71,   71,  674,  678,   71,   71,  680,   71,
 
-       71,  678,   71,   71,   71,  681,   71,   71,   71,   71,
-      680,  684,  685,  143,  682,  690,  686,   71,   71,  683,
-      691,   71,   71,  687,  689,  700,  688,  693,   71,  695,
-      692,  694,   71,  696,   71,   71,  697,   71,  698,  699,
-       71,   71,   71,   71,   71,  701,  704,   71,   71,   71,
-      703,   71,  705,  709,   71,  708,   71,   71,  710,   71,
-      702,   71,  712,   71,  715,   71,   71,   71,  707,   71,
-       71,  706,  716,   71,  711,   71,  718,  713,   71,  717,
-       71,  719,   71,  714,  721,  720,   71,  722,   71,  730,
-       71,   71,  729,  723,  724,  725,  726,  728,   71,   71,
+      675,  681,  676,  682,   71,  679,  683,  685,  677,  684,
+       71,  686,   71,   71,   71,   71,   71,  687,   71,   71,
+       71,  690,  691,  696,  688,   71,   71,  692,  697,   71,
+      689,  699,   71,   71,  693,  701,  695,  694,  698,  700,
+       71,   71,  702,   71,  703,   71,  704,  705,   71,   71,
+       71,  706,   71,   71,  707,   71,  712,   71,  710,   71,
+       71,  709,  711,   71,  714,  715,   71,  716,   71,  708,
+       71,   71,   71,  718,   71,  720,   71,   71,  713,   71,
+       71,  726,  723,   71,  717,  721,  719,   71,  727,   71,
+       71,   71,   71,  729,   71,  724,   71,  722,  730,  736,
 
-       71,   71,  727,  731,  734,  732,   71,   71,   71,  735,
-       71,   71,  736,   71,   71,   71,  743,   71,  739,  741,
-       71,   71,   71,   71,  737,   71,  740,  733,  738,  744,
-      749,   71,  747,   71,  751,  742,   71,  748,  746,  750,
-      745,  752,  753,   71,   71,   71,  754,   71,   71,  758,
-      755,   71,  760,   71,   71,   71,  759,  761,   71,   71,
-       71,  763,  757,   71,  762,  756,  764,   71,   71,   71,
-       71,  770,  771,  765,  767,   71,  766,   71,   71,  772,
-      773,   71,  775,   71,   71,  779,  152,  777,  768,  769,
-      776,   71,   71,  785,   71,  782,   71,  784,  774,  781,
+      725,   71,  731,  728,   71,  733,  737,   71,   71,  732,
+      734,  740,  735,   71,   71,   71,   71,   71,  742,  745,
+      743,  738,  741,  739,   71,   71,   71,  746,   71,   71,
+      747,   71,   71,  750,   71,   71,  752,  754,   71,   71,
+       71,   71,  744,   71,  748,  751,  760,  749,  755,   71,
+      758,  757,   71,   71,  753,  759,   71,   71,   71,  756,
+      762,  765,  761,  763,  764,   71,   71,  767,   71,  769,
+      766,   71,  771,  785,   71,   71,  770,  772,   71,   71,
+      774,   71,  768,   71,  773,  775,   71,   71,   71,  781,
+       71,   71,  778,   71,  776,   71,  777,  783,  784,   71,
 
-      783,   71,  778,   71,  780,  786,   71,   71,   71,  788,
-       71,   71,   71,   71,  794,   71,   71,   71,   71,  795,
-       71,   71,   71,   71,   71,  787,  789,  796,  790,  791,
-       71,  792,  797,  793,  799,  801,  798,  803,   71,  802,
-       71,  800,   71,   71,  804,   71,   71,   71,   71,  808,
-      805,   71,   71,   71,   71,   71,  817,  150,  815,  806,
-       71,  807,   71,  810,  809,   71,  811,   71,  816,  812,
-      813,  814,   71,  820,   71,   71,  818,   71,   71,  819,
-      822,  821,   71,   71,  824,   71,   71,  148,  827,  826,
-      823,  825,  828,   71,   71,  831,   71,   71,  829,  830,
+      786,   71,   71,  791,  790,  788,  779,  780,  787,  782,
+       71,   71,  793,   71,  795,   71,  792,  794,   71,   71,
+      789,  797,   71,   71,   71,  799,   71,   71,   71,   71,
+      805,   71,   71,   71,   71,  806,   71,   71,   71,   71,
+      796,  798,  800,  807,  801,  802,   71,  803,  808,  804,
+      810,  812,  809,  814,   71,   71,   71,  811,   71,   71,
+       71,  813,   71,   71,  819,   71,   71,  816,  815,   71,
+       71,   71,   71,   71,  828,  817,  826,  818,   71,  821,
+      820,   71,  829,  822,  823,  824,  827,   71,  825,  830,
+       71,   71,  831,   71,   71,  833,   71,   71,   71,  838,
 
-      834,   71,   71,  832,  152,   71,  833,   71,  838,  837,
-      835,  839,   71,   71,  836,   71,   71,   71,  845,   71,
-       71,  846,  841,  848,   71,   71,  840,   71,   71,  847,
-      842,  843,  851,   71,  849,   71,   71,  844,   71,  853,
-       71,  857,   71,   71,   71,  854,  850,   71,  852,   71,
-      858,  859,   71,   71,   71,   71,   71,   71,  856,   71,
-       71,  855,  872,   71,  871,   71,  875,  860,  861,  869,
-      870,  877,  862,   71,   71,  873,   71,  880,  863,   71,
-      874,  878,  864,   71,  876,  865,   71,   71,  879,   71,
-      881,  889,  866,  867,  147,  868,   71,   71,  882,  883,
+       71,  832,   71,   71,  837,  839,   71,  834,  840,  836,
+       71,  841,  835,   71,   71,   71,  845,  843,  842,  152,
+       71,   71,  844,  846,  848,   71,   71,  847,  849,   71,
+      850,   71,   71,   71,  851,   71,  853,   71,  852,  856,
+       71,   71,  857,  859,   71,  854,  860,   71,  862,   71,
+      858,  864,  861,  855,   71,  863,   71,   71,  868,   71,
+       71,  865,   71,   71,   71,   71,   71,  869,   71,  870,
+       71,   71,  883,   71,   71,  867,  150,  885,  871,   71,
+      882,  866,   71,  880,   71,  873,   71,  881,  872,   71,
+      884,   71,  886,  888,  874,   71,  887,  889,  875,  892,
 
-      890,  884,   71,   71,  885,  891,  894,  895,   71,  886,
-       71,   71,   71,  897,  893,  887,  888,  892,  896,   71,
-      899,   71,   71,   71,   71,  898,  900,  901,  902,  903,
-       71,   71,   71,  904,  905,   71,   71,   71,   71,  907,
-       71,  911,   71,   71,   71,  910,   71,   71,  914,   71,
-       71,  906,  145,  918,  916,  919,  908,  909,  912,   71,
-      913,  921,  915,  920,   71,   71,  922,   71,  924,  925,
-      923,  917,   71,  927,   71,   71,   71,  926,   71,   71,
-       71,  928,  929,  931,   71,  932,   71,   71,  930,   71,
-       71,   71,   71,  938,   71,  933,  935,  936,   71,   71,
+      890,  876,   71,   71,  891,   71,   71,  900,  877,  878,
+       71,  879,   71,  893,  894,  906,  895,   71,   71,  896,
+       71,  902,  903,   71,  897,   71,   71,  901,  148,  905,
+      898,  899,  911,   71,   71,  908,  907,  910,   71,   71,
+      913,  914,   71,  915,   71,  912,   71,   71,  909,  916,
+      917,  918,  919,   71,   71,   71,  920,   71,   71,   71,
+       71,   71,  923,   71,  927,   71,   71,  921,  926,   71,
+       71,  930,   71,   71,  936,   71,  922,  932,  934,  924,
+      925,  928,   71,  929,   71,  147,  937,  935,   71,   71,
+      931,  938,   71,  939,  940,  933,  941,  946,   71,  943,
 
-       71,   71,   71,  941,   71,   71,  940,  934,  939,   71,
-      943,  937,   71,  944,  947,   71,   71,  946,  948,  942,
-       71,  949,   71,   71,  954,   71,  956,  951,   71,  955,
-       71,  952,   71,   71,  950,   71,  953,   71,   71,   71,
-      961,  963,  959,  957,  964,   71,   71,   71,  962,   71,
-       71,  958,  966,   71,   71,   71,   71,   71,  968,  960,
-       71,  974,   71,  977,  972,   71,   71,  965,   71,   71,
-      967,   71,  970,  969,  971,  978,   71,  979,  975,  973,
-       71,  976,  982,   71,   71,  981,   71,  980,  984,  985,
-       71,   71,   71,   71,  983,  987,   71,   71,   71,   71,
+       71,   71,   71,  942,  944,   71,   71,  947,   71,  948,
+       71,   71,  945,   71,   71,   71,   71,  954,   71,  949,
+      951,  952,   71,   71,   71,   71,   71,  957,   71,   71,
+      956,  950,  955,   71,  959,  953,   71,  960,  963,   71,
+       71,  962,  964,  958,   71,  965,   71,   71,   71,  970,
+      961,   71,  972,   71,  971,   71,  968,   71,  966,   71,
+       71,  969,   71,   71,   71,  977,  979,   71,  973,  975,
+       71,  967,  982,  978,  980,   71,  974,   71,   71,   71,
+       71,   71,   71,  976,  981,   71,   71,   71,  993,  990,
+      988,  983,   71,   71,   71,   71,   71,  984,  985,   71,
 
-      989,  994,  995,  997,  986,   71,   71,   71,   71,   71,
-     1001,  988,  996,  990,  999, 1000,  992,   71,  991,  993,
-       71,   71,   71,   71,   71,  998,   71, 1007, 1005, 1008,
-       71,   71, 1012, 1009, 1003,   71, 1002,   71,   71,   71,
-     1014,   71, 1004,   71,   71, 1006,   71, 1017,  152, 1010,
-     1011, 1016,   71,   71,   71, 1020,   71, 1019,   71, 1013,
-       71, 1015,   71, 1023,   71,   71, 1021, 1018,   71,   71,
-     1035,   71,   71, 1038,   71, 1036, 1022,   71, 1026, 1024,
-       71,   71,  143,   71, 1040, 1027, 1025, 1037,   71, 1028,
-       71,   71,   71, 1029,   71, 1030, 1041, 1042,   71, 1031,
+      987,  986,  994,   71,  991,  989,  992,  995,   71,  998,
+      997,  996,   71,  999, 1001,   71,   71, 1000,   71,   71,
+       71,   71,   71, 1010,   71, 1003, 1011, 1005, 1002,   71,
+     1013,   71,   71,   71,   71,   71,   71,   71, 1004, 1017,
+     1006, 1008, 1015, 1007, 1009, 1012, 1016,   71,   71,   71,
+       71, 1023,   71, 1014, 1021, 1022, 1018, 1024,   71, 1019,
+       71, 1025,   71,   71, 1028,   71,   71, 1020, 1030,   71,
+       71,   71, 1033,  152,   71, 1027, 1032,   71, 1026,   71,
+     1036, 1035,   71,   71, 1031, 1029,   71,   71,   71, 1034,
+       71, 1039,   71,   71,   71, 1051,   71, 1054,   71,   71,
 
-     1053, 1032, 1039, 1043, 1045, 1044, 1033, 1050, 1047, 1046,
-       71, 1034,   71,   71,   71,   71, 1048,   71, 1054, 1051,
-       71,   71, 1061,   71, 1059,   71, 1060, 1058, 1049, 1052,
-       71, 1055,   71, 1062, 1057, 1063, 1056,   71,   71,   71,
-       71,   71,   71,   71,   71, 1078,   71, 1064, 1075,   71,
-       71,   71, 1074,   71, 1077, 1079, 1065, 1066,   71, 1067,
-     1076, 1080,   71, 1081, 1068,   71, 1069, 1085,   71,   71,
-     1082,   71, 1070, 1086, 1087,   71,   71, 1071, 1072, 1088,
-       71, 1083,   71, 1084, 1073, 1091,   71, 1092, 1090,   71,
-     1089,   71,   71,   71, 1097,   71,   71,   71, 1094,   71,
+     1052,   71,   71, 1038, 1037,   71, 1040, 1042,   71, 1056,
+     1043,   71, 1041, 1044,   71,   71, 1053, 1045,   71, 1046,
+     1059, 1081, 1058, 1047, 1055, 1048, 1057,   71, 1061,   71,
+     1049,   71, 1060, 1062,   71, 1050,   71,   71,   71,   71,
+     1064, 1063,   71, 1067, 1066, 1071,  145, 1070,   71, 1069,
+       71, 1075, 1065, 1068,   71, 1076, 1074,   71, 1077,   71,
+     1072,   71, 1073, 1078, 1079,   71,   71,   71,   71,   71,
+       71,   71, 1091,   71,   71, 1094, 1080,   71, 1090, 1096,
+       71, 1093, 1095, 1082,   71, 1083,   71, 1092,   71, 1101,
+     1084,   71, 1085,   71, 1097,   71, 1102,   71, 1086,   71,
 
-       71, 1095, 1100,   71, 1098, 1093,   71,   71,   71, 1096,
-       71,   71,   71,   71,   71, 1099, 1105, 1102,   71, 1101,
-     1104, 1106, 1109,   71, 1107, 1111, 1103, 1108,   71, 1110,
-       71,   71,   71,   71, 1112,   71,   71,   71, 1117, 1122,
-     1118, 1119, 1113,   71, 1114,   71, 1120, 1116,   71, 1115,
-       71, 1121, 1125,   71,   71,   71, 1123, 1126,   71,   71,
-     1127,   71,   71, 1128, 1124, 1129, 1136, 1130,   71,   71,
-       71, 1132,   71,   71, 1131,   71, 1138,   71,   71, 1133,
-     1140, 1134,   71,   71, 1135,   71, 1142,   71, 1139,   71,
-     1137, 1141, 1144,   71, 1145,   71,   71,   71, 1147, 1143,
+       71, 1106,   71, 1087, 1088, 1098,   71, 1099,   71, 1100,
+     1089,   71, 1107, 1108, 1109, 1103, 1104, 1105,   71,   71,
+     1112,   71,   71,   71,   71, 1110,   71, 1113,   71, 1118,
+       71, 1111, 1115, 1116,   71,   71,   71,   71,   71, 1119,
+     1114, 1121,   71,   71, 1117,   71,   71,   71,   71,   71,
+       71,   71, 1123, 1120, 1126, 1125, 1127, 1122,   71, 1130,
+       71,   71, 1124, 1129, 1128,   71, 1131, 1136, 1133,   71,
+     1134,   71,   71,   71, 1132, 1135, 1138, 1139, 1140,   71,
+       71, 1142,   71, 1143, 1137,   71, 1146,   71, 1141,   71,
+     1150, 1147,   71,   71, 1148, 1144,   71, 1149,   71,   71,
 
-     1148, 1146,   71, 1150,   71, 1153, 1154,   71, 1149,   71,
-     1152,   71,   71,   71,   71, 1158, 1157,   71, 1151,   71,
-       71, 1155,   71,   71, 1164, 1162, 1165, 1156,   71,   71,
-       71,   71,   71, 1166, 1167, 1159, 1163,   71, 1160, 1169,
-     1161,   71, 1168,   71, 1172,   71, 1174,   71, 1173, 1170,
-       71,   71,   71,   71,   71,   71,   71,   71, 1179, 1180,
-     1175, 1171, 1176,   71,   71,   71, 1185,   71, 1181, 1186,
-     1177,   71,   71, 1178,   71,   71, 1183, 1189,   71, 1188,
-       71, 1182, 1187,   71, 1184, 1193,   71,   71,   71,   71,
-     1190,   71,   71,   71, 1191, 1192, 1195, 1199,   71,   71,
+       71, 1145,   71, 1157,   71,   71, 1159,   71,   71,   71,
+     1151,   71,   71, 1155,   71, 1153, 1161,   71, 1152, 1156,
+     1154,   71, 1160,  143, 1163, 1158,   71,   71, 1162, 1164,
+       71, 1165, 1166, 1167,   71, 1168,   71,   71,   71, 1169,
+       71, 1174,   71, 1171, 1175,   71, 1173,   71, 1170,   71,
+       71, 1176,   71, 1178, 1172,   71, 1179,   71,   71,   71,
+       71,   71, 1183, 1185,   71, 1186, 1187, 1177,   71,   71,
+     1180,   71,   71, 1184,   71, 1190, 1181, 1188, 1182, 1189,
+     1193,   71, 1191,   71,   71,   71,   71,   71, 1192, 1194,
+     1195,   71, 1196,   71, 1197,   71,   71,   71, 1200, 1201,
 
-       71,   71, 1205,   71, 1194,   71, 1203, 1196, 1201,   71,
-       71, 1198, 1202, 1200, 1204, 1207, 1197, 1208,   71,   71,
-     1210,   71,   71,   71, 1209,   71,   71, 1211,   71, 1206,
-       71,   71,   71, 1214,   71,   71, 1220,   71,   71, 1212,
-     1213, 1217,   71,   71,   71, 1215, 3080, 1218,   71,   71,
-     1216,   71, 1221, 1231, 1219, 1224, 1226,   71, 1223,   71,
-     1222,   71, 1230,   71, 1225, 1227, 1233, 1228, 1232,   71,
-     1229, 1234,   71,   71,   71, 1235,   71,   71,   71,   71,
-       71, 1239, 1236, 1238, 1241, 1244,   71,   71,   71, 1242,
-       71, 1237, 1245, 1246,   71,   71, 1240,   71, 1249, 1243,
+       71,   71,   71, 1206, 1207, 1198,   71,   71, 1202,   71,
+       71, 1209, 1199, 1204, 1210,   71,   71,   71, 1203, 1214,
+       71, 1205, 1208,   71,   71,   71,   71,   71,   71, 1220,
+       71, 1212, 1213,   71, 1216, 1211,   71,   71,   71, 1226,
+       71,   71, 1215, 1224,   71, 1217,   71, 1219, 1222, 1223,
+     1221, 1228, 1218, 1225, 1229,   71,   71,   71,   71,   71,
+       71, 1227,   71, 1230, 1231,   71,   71,   71,   71, 1233,
+     1232, 1235,   71, 1234,   71, 1237, 1241,   71,   71, 1238,
+       71,   71, 1236, 1239,   71,   71,   71, 1251, 1253,   71,
+     1245,   71, 1242, 1240,   71,   71, 1244,   71, 1243, 1247,
 
-     1248,   71,   71,   71,   71,   71, 1250,   71,   71,   71,
-     1247, 1256,   71,   71,   71,   71, 1251, 1252,   71, 1254,
-     1255, 1257, 1253,   71, 1261,   71,   71, 1258,   71, 1262,
-     1267, 1260,   71, 1259, 1265, 1263,   71,   71,   71,   71,
-     1269,   71, 1268, 1264, 1271,   71, 1266, 1273,   71,   71,
-     1272,   71, 1274,   71,   71, 1278, 3080, 1270, 1286, 1276,
-     1275, 1277,   71, 1287, 1285,   71, 1288, 1279,   71,   71,
-     1280, 1281, 1291, 1289,   71, 1282,   71,   71,   71,   71,
-       71, 1283, 1292, 1290, 1293, 1284,   71, 1294,   71, 1296,
-       71,   71,   71, 1297,   71, 1298,   71, 1295,   71,   71,
+     1252,   71,   71,   71, 1254, 1246, 1256,   71, 1248, 1258,
+     1249,   71,   71, 1250,   71, 1255, 1259, 1260,   71, 1262,
+       71, 1257, 1265,   71,   71,   71,   71,   71,   71, 1263,
+     1261, 1266, 1267, 1269,   71,   71,   71,   71, 1270, 1264,
+     1272,   71,   71,   71, 1268, 1271,   71,   71,   71,   71,
+     1273,   71,   71, 1275, 1277, 1278, 1274, 1276, 1282,   71,
+       71,   71,   71,   71,   71, 1279, 1283, 1281,   71, 1280,
+     1286,   71,   71,   71,   71, 1293, 1289, 1287,   71, 1284,
+     1285,   71, 1288,   71,   71,   71, 1291, 1294,   71, 1297,
+     1298, 1295, 1292, 1290, 1296, 1299,   71,   71, 1304,   71,
 
-     1299, 1301, 1306, 1303,   71, 1307, 3080,   71,   71, 1300,
-     1304,   71, 1308, 1310, 1302,   71,   71, 1305, 1311, 1309,
-     1312,   71, 1313,   71, 1314,   71, 1315, 1316, 1317,   71,
-       71, 1320, 1318, 1319,   71,   71,   71,   71,   71, 1323,
-       71, 1321,   71, 1322, 1324,   71, 1325, 1327,   71, 1329,
-     1328,   71, 1332, 1333,   71, 1334,   71, 1326,   71,   71,
-       71,   71,   71,   71, 1335, 1337,   71, 1330,   71,   71,
-     1331, 1339, 1336, 1342,   71, 1338, 1343,   71, 1345,   71,
-       71, 1340, 1346,   71, 1344,   71, 1347,   71, 1351,   71,
-     1348, 1341,   71, 1349, 1353,   71, 1350,   71, 1354,   71,
+     1300,   71, 1302,   71, 1301,   71,   71, 1313, 1315, 1303,
+       71,   71, 1311,   71, 1312, 1305,   71, 1314, 1306, 1307,
+     1316, 1317,   71, 1308, 1326,   71,   71,   71,   71, 1309,
+     1318, 1319,   71, 1310,   71, 1320,   71, 1322,   71,   71,
+       71, 1327, 1323, 1321, 1324, 1329,   71,   71, 1325, 1332,
+     1333,   71,   71,   71, 3149,   71,   71, 1334, 1328,   71,
+     1330,   71, 1336, 1335,   71, 1331, 1346, 1337, 1345, 1338,
+       71, 1339, 1344, 1340,   71, 1341, 1342, 1343,   71,   71,
+     1349,   71,   71,   71,   71, 1350,   71, 1348, 1347, 1353,
+     1351,   71,   71,   71,   71, 1359,   71, 1354,   71, 1360,
 
-       71,   71, 1358,   71, 1355,   71,   71,   71,   71, 1360,
-       71,   71, 1352, 1362,   71,   71, 1364,   71, 1366, 1363,
-       71, 1356, 1357,   71,   71, 1359,   71, 1361, 1368, 1365,
-       71, 1370, 1367,   71, 1369,   71,   71, 1379, 1371,   71,
-     1372, 1373,   71, 1374, 1375,   71,   71,   71,   71, 1380,
-     1381, 1376, 1377, 1382, 1378,   71,   71, 1383,   71,   71,
-     1387,   71,   71,   71, 1385,   71,   71, 1384, 1391, 1392,
-     1386,   71, 1394,   71,   71,   71,   71, 1393,   71,   71,
-       71,   71, 1388,   71, 1401, 1389,   71, 1395,   71, 1390,
-       71, 1398,   71, 1396, 1399,   71, 1397, 1405,   71, 1400,
+     1355,   71,   71,   71, 1352,   71,   71,   71, 1358,   71,
+     1361, 1356, 1357,   71, 1363, 1365,   71, 1362, 1368, 1364,
+       71, 1367, 1369,   71,   71, 1366, 1371,   71,   71,   71,
+     1372, 1370, 1373,   71,   71, 1377,   71,   71, 1374, 1375,
+     1379,   71, 1381, 1376, 1378,   71, 1380,   71,   71, 1384,
+       71,   71,   71,   71,   71, 1386,   71,   71,   71, 1388,
+     1390,   71,   71, 3149, 1392, 1389,   71,   71, 1382, 1383,
+       71, 1385, 1394, 1387,   71, 1391,   71, 1393, 1397, 1396,
+     1395, 1398,   71,   71, 1400,   71,   71, 1399,   71,   71,
+     1401, 1406,   71, 1407, 1403,   71, 1404,   71,   71,   71,
 
-     1406,   71,   71, 1408, 1410,   71, 1402,   71, 1404, 1411,
-       71,   71,   71, 1403,   71,   71, 1413,   71, 1407, 1414,
-       71, 1409, 1419, 1412,   71, 1420, 1415,   71, 1473, 1416,
-     1417, 1423,   71, 1418, 1421,   71,   71,   71, 1422, 1424,
-     1426,   71,   71,   71,   71, 1427,   71, 1425,   71, 1431,
-       71,   71,   71, 1429,   71, 1433,   71, 1438,   71,   71,
-     1428, 1430, 1434, 1439,   71, 1435, 1432, 1442,   71,   71,
-     1436,   71, 1437,   71,   71,   71, 1440,   71, 3080,   71,
-     1443,   71,   71, 1441, 1449, 1445,   71, 1451, 1444, 1446,
-     1447,   71,   71, 1450,   71, 1454, 1448, 1456,   71, 1452,
+     1408, 1409,   71,   71, 1402, 1405,   71,   71, 1413,   71,
+       71, 1410,   71, 1417, 1412, 1418,   71, 1411, 1420,   71,
+       71,   71, 1419,   71,   71,   71, 1414,   71,   71,   71,
+     1415,   71, 1427,   71, 1421, 1416,   71, 1424,   71,   71,
+     1422, 1425,   71, 1423, 1431,   71, 1426, 1432,   71, 1428,
+     1434,   71,   71,   71, 1430,   71,   71, 1436, 1429,   71,
+     1438, 1433, 1437,   71, 1439,   71, 1441, 1440, 1442,   71,
+     1435, 1443,   71,   71, 1444, 1447, 1449, 1445,   71, 1448,
+     1446,   71,   71,   71,   71, 1450, 1452,   71, 1454, 1451,
+       71, 1453,   71,   71,   71, 1457,   71,   71, 1459,   71,
 
-     1453,   71,   71,   71,   71, 1460, 1461, 1455, 1457, 1459,
-       71,   71,   71,   71, 1462,   71, 1463, 1464,   71,   71,
-       71, 1467, 1458, 1465, 1468,   71,   71,   71, 1471, 1466,
-       71,   71,   71, 1470,   71,   71, 1474, 1477,   71, 1479,
-     1469,   71, 1478,   71, 1480,   71, 1475,   71, 1482,   71,
-     1472,   71,   71, 1476,   71, 1481, 1486, 1483, 1485,   71,
-     1484, 1490,   71,   71, 1493,   71,   71,   71, 1491, 1496,
-       71, 1487, 1495,   71, 1488,   71,   71, 1489,   71,   71,
-       71,   71,   71, 1504, 1494,   71,   71,   71, 1492, 1505,
-     1507,   71, 1497,   71, 1501, 1498,   71, 1499, 1500, 1506,
+       71, 1464, 1456,   71,   71, 1458,   71, 1465,   71, 1455,
+     1461,   71, 1468,   71, 1460, 1462,   71, 1463,   71,   71,
+     1469,   71, 1466,   71,   71, 1467,   71, 1471, 1475, 1477,
+     1470, 1472,   71, 1476, 1473,   71,   71, 1480,   71,   71,
+     1474,   71,   71, 1484, 1479, 1485,   71,   71, 1482,   71,
+     1478,   71,   71, 1481, 1487,   71, 1501,   71, 1488, 1491,
+     1486, 1483, 1490, 1492,   71,   71,   71, 1493, 1489,   71,
+       71, 1494, 1495,   71,   71,   71,   71,   71, 1496,   71,
+     1502,   71, 1498,   71, 1497,   71,   71,   71,   71, 1508,
+     1499, 1504, 1500, 1505, 1509,   71,   71, 1510,   71, 1506,
 
-     1503, 1509, 1502, 1508,   71,   71, 1511,   71,   71, 1510,
-       71,   71,   71, 1514,   71,   71, 1512, 1515,   71, 1518,
-       71, 1513, 1522,   71,   71, 1523, 1524, 1519, 1517,   71,
-     1516,   71,   71,   71, 1521, 1520, 1527, 1528,   71, 1525,
-       71,   71, 1526,   71, 1529, 1533, 1534,   71,   71,   71,
-       71,   71,   71, 1538, 1539, 1537,   71,   71, 1530, 1531,
-       71, 1541,   71, 1532,   71,   71, 1535, 1542, 1543,   71,
-     1536,   71,   71, 1544, 1546,   71, 1540,   71, 1549,   71,
-       71, 1545,   71,   71, 1548,   71,   71, 1553,   71, 1555,
-       71,   71, 1547,   71, 1550, 1556,   71, 1560,   71, 1554,
+       71, 1503, 1511,   71,   71, 1507,   71, 1512,   71, 1513,
+       71, 1517, 1521, 1516,   71, 1514,   71, 1515,   71, 1518,
+       71, 1522, 1524,   71,   71,   71,   71, 1527,   71,   71,
+     1519, 1526, 1520,   71,   71,   71,   71,   71,   71, 1535,
+     3149,   71, 1525, 1528, 1536, 1529, 1523,   71, 1530, 1532,
+     1538,   71, 1534, 1531, 1539,   71,   71, 1533,   71, 1537,
+       71, 1540, 1541,   71,   71,   71,   71, 1545,   71,   71,
+       71, 1546, 1543, 1542, 1549,   71, 1555, 1544, 1553,   71,
+       71, 1550,   71,   71, 1547, 1554, 1548,   71,   71,   71,
+     1551, 1552,   71, 1558,   71,   71, 1559,   71, 1556, 1560,
 
-       71, 1551, 1552,   71,   71, 1563, 1558,   71, 1557, 1565,
-       71, 1566, 1561,   71,   71, 1568,   71,   71, 1559, 1564,
-       71, 1562,   71,   71, 1571,   71, 1574,   71, 1570,   71,
-     1573,   71,   71, 1567,   71,   71, 1581, 1576, 1569,   71,
-       71, 1572,   71,   71, 1582,   71, 1579, 1575,   71, 1590,
-     1577, 1578, 1585, 1586,   71,   71, 1588,   71,   71, 1580,
-     1583, 1592, 1584, 1589,   71, 1587,   71,   71, 1594,   71,
-       71,   71,   71, 1599,   71,   71, 1596, 1591, 1593, 1597,
-       71, 1600,   71,   71,   71, 1595,   71, 1604, 1611, 1601,
-       71, 1605,   71,   71,   71, 1598, 1608,   71, 1603, 1609,
+     1557, 1564, 1565,   71,   71,   71,   71,   71,   71, 1561,
+     1570, 1568, 1562,   71, 1569,   71,   71, 1563, 1572,   71,
+       71,   71, 1566, 1573, 1574,   71, 1567,   71, 1571,   71,
+     1577, 1575,   71,   71, 1580,   71,   71, 1576,   71,   71,
+       71, 1579,   71, 1584,   71, 1586,   71,   71,   71, 1578,
+     1581, 1587,   71, 1591, 1585,   71,   71, 1582, 1583,   71,
+       71,   71, 1589, 1597, 1588, 1594, 1596,   71,   71, 1592,
+       71, 1599,   71, 1590, 1593,   71, 1595,   71,   71,   71,
+       71, 1602, 1605,   71, 1604,   71, 1601,   71, 1598,   71,
+       71,   71, 1612,   71, 1600,   71,   71, 1603, 1606, 1607,
 
-     1602,   71, 1612,   71, 1606,   71, 1607,   71, 1613, 1619,
-     1615, 1610, 1616,   71,   71,   71, 1618,   71, 1621, 1620,
-       71, 1622,   71, 1623, 1614,   71,   71, 1624, 1617,   71,
-       71,   71,   71, 1630, 1631, 1629,   71, 1633, 1625,   71,
-       71, 1632,   71,   71, 1626,   71, 1636,   71,   71, 1627,
-     1635, 1628,   71, 1637,   71,   71,   71,   71,   71,   71,
-       71, 1645,   71,   71,   71, 1634,   71,   71, 1643,   71,
-     1638, 1641, 1642, 1644, 1639, 1640,   71, 1648,   71, 1646,
-     1650,   71, 1647, 1652, 1654, 1649, 1651,   71, 1653,   71,
-     1655,   71,   71,   71,   71,   71,   71,   71, 3080,   71,
+     1613,   71,   71, 1610,   71, 1621, 1608, 1609,   71, 1617,
+     1616,   71,   71, 1614, 1619, 1611, 1615,   71,   71, 1623,
+     1625,   71, 1618, 1620,   71,   71,   71,   71, 1622,   71,
+       71, 1624, 1627,   71, 1628,   71, 1630,   71, 1631,   71,
+       71, 1636,   71, 1626, 1632, 1635,   71,   71, 1634, 1642,
+       71, 1629,   71, 1639,   71,   71, 1640, 1633, 1637, 1643,
+       71, 1646,   71, 1644,   71, 1650, 3149, 1638, 1641, 1647,
+       71,   71,   71, 1649,   71, 1652, 1654, 1651,   71, 1645,
+       71, 1653,   71, 1655,   71,   71,   71, 1648,   71,   71,
+     1661,   71, 1660, 1662,   71,   71,   71, 1656, 1664,   71,
 
-       71, 1658, 1660, 1661,   71,   71, 1662, 1667, 1659, 1657,
-     1668,   71, 1663, 1656, 1664, 1669,   71, 1670, 1671, 1665,
-       71,   71, 1666, 1672, 1673,   71,   71,   71,   71,   71,
-       71,   71, 1676, 1677, 1674,   71,   71, 1685,   71,   71,
-     1680,   71,   71,   71,   71, 1675, 1679, 1682, 1678,   71,
-     1683, 1684, 1686,   71, 1681, 1691, 1687, 1688,   71, 1689,
-       71,   71,   71, 1690,   71, 1695,   71,   71,   71, 1699,
-     1692,   71, 1698,   71,   71, 1697, 1703,   71, 1696, 1694,
-       71,   71, 1707, 1700,   71, 1693, 1701, 1708,   71, 1702,
-       71, 1704,   71, 1713,   71, 1705, 1710, 1712, 1706,   71,
+     1663,   71,   71, 1657,   71, 1658, 1666, 1668, 1659, 1667,
+       71,   71, 1669,   71, 1665,   71,   71,   71,   71,   71,
+       71,   71, 1677,   71,   71,   71,   71,   71, 1681, 1672,
+     1673, 1670, 1674, 1671,   71, 1675, 1679,   71, 1680,   71,
+     1678, 1684,   71, 1682, 1676,   71, 1683, 1686,   71,   71,
+     1688,   71, 1689,   71,   71,   71,   71, 1690, 1685, 1687,
+       71,   71,   71, 1691, 1694,   71,   71, 1696, 1704,   71,
+     1697, 1695, 1693, 1698, 1705,   71,   71, 1692, 1699, 1703,
+     1700,   71,   71,   71,   71, 1701, 1708, 1709,   71,   71,
+       71, 1702,   71, 1706,   71, 1712,   71, 1710,   71, 1713,
 
-     1715,   71, 1716, 1718, 1709,   71, 1711,   71,   71,   71,
-     1717,   71, 1714, 1719,   71, 1722,   71,   71, 1726,   71,
-     1724,   71,   71,   71,   71,   71, 1725, 1727, 1721, 1723,
-       71, 1720,   71, 1730,   71,   71,   71, 1736,   71, 1731,
-     1738, 1728, 1729,   71,   71, 1732,   71, 1733, 1739, 1734,
-     1735, 1741,   71,   71,   71,   71, 1740,   71,   71, 1737,
-     1746,   71,   71,   71, 1742,   71,   71, 1750,   71, 1752,
-     1745, 1743,   71,   71, 1744,   71,   71, 1748, 1753,   71,
-     1747, 1749, 1751,   71, 1754, 1756, 1759,   71, 1755,   71,
-     1758,   71,   71, 1763,   71, 1757,   71,   71,   71,   71,
+     1707,   71,   71, 1721,   71,   71,   71, 1716, 1711,   71,
+       71, 1714, 1715, 1718, 1720,   71, 1719, 1722,   71, 1724,
+     1717,   71, 1723,   71,   71,   71,   71, 1731, 1725, 1726,
+       71,   71,   71,   71,   71, 1728,   71, 1727, 1734, 1739,
+     1733,   71, 1735, 1730,   71, 1737, 1732, 1743, 1738, 1729,
+     1740,   71, 1744,   71,   71,   71, 1736,   71,   71,   71,
+     1749, 1751,   71, 1748,   71, 1741,   71, 1752, 1745, 1742,
+     1746,   71, 1754,   71,   71,   71, 1753, 1750,   71, 1747,
+     1755, 1758,   71,   71, 1756, 1762, 1760,   71,   71, 1757,
+       71,   71, 1761,   71,   71, 1759, 1763,   71,   71, 3149,
 
-       71,   71,   71, 1761, 1765,   71, 1774,   71, 1760, 1770,
-     1764, 1762, 1766, 1767, 1771,   71,   71, 1768,   71, 1769,
-       71, 1775, 1773, 1772, 1776,   71,   71, 1779,   71, 1778,
-       71, 1777, 1782,   71, 1780,   71,   71,   71,   71, 1783,
-     1781,   71,   71,   71,   71,   71,   71, 1788,   71,   71,
-     1792,   71,   71, 1789, 3080,   71, 1798, 1784, 1790, 1786,
-     1785, 1787,   71, 1791, 1793,   71, 1801, 1796,   71, 1795,
-     1800,   71,   71, 1802, 1797,   71,   71, 1794,   71,   71,
-     1799, 1806,   71, 1809, 1810,   71,   71, 1803, 1811,   71,
-       71, 1804, 1807,   71, 1808,   71, 1805, 1813,   71,   71,
+       71,   71, 1766,   71, 1772,   71, 1767,   71, 1774, 1764,
+     1775, 1768, 1765, 1769,   71, 1770,   71, 1771, 1777,   71,
+     1776,   71,   71,   71,   71, 1782, 1773,   71,   71,   71,
+       71,   71, 1786,   71,   71,   71,   71, 1781, 1788,   71,
+     1779, 1778, 1780,   71, 1784, 1792,   71, 1785, 1789, 1783,
+     1787, 1790,   71,   71, 1794, 1795,   71, 1791, 1793,   71,
+       71, 1799,   71,   71,   71,   71,   71,   71,   71, 1806,
+       71, 1797, 1796, 1801,   71,   71, 1802, 1800,   71, 1798,
+     1803, 1811, 1807,   71, 1804, 1810,   71, 1805,   71, 1809,
+     1812,   71, 1808, 1813,   71, 1815, 1816,   71,   71,   71,
 
-     1814, 1817,   71,   71, 1819,   71, 1812, 1818, 1820, 1821,
-       71, 1815, 1823, 1822, 1816,   71,   71,   71,   71, 1828,
-     1825, 1826,   71,   71, 1827,   71,   71,   71,   71, 1835,
-       71, 1837,   71,   71,   71,   71, 1838,   71, 1829, 1830,
-     1831, 1824,   71,   71, 1840, 1832, 1839, 1833, 1834, 1842,
-     1836, 1843,   71, 1845, 1841,   71,   71,   71, 1847,   71,
-       71, 1844,   71, 1849,   71,   71, 1852, 1853,   71,   71,
-     1855,   71,   71,   71,   71,   71, 1846, 1861,   71, 1860,
-     1850,   71, 1848, 1857, 1858,   71, 1851,   71,   71, 1854,
-       71,   71,   71, 1867, 1859,   71, 1865, 1856, 1864,   71,
+       71,   71, 1818, 1814,   71,   71,   71, 1819,   71,   71,
+     1817,   71,   71,   71, 1824,   71,   71, 1828,   71, 1820,
+     1825,   71,   71,   71, 1822, 1826, 1823, 1821, 1832,   71,
+     1827, 1829,   71, 1835, 1834, 1833, 1831, 1836,   71, 1837,
+       71,   71, 1838,   71, 1830,   71,   71,   71, 1842,   71,
+     1845, 1839, 1846,   71, 1847,   71, 1840, 1843,   71, 1844,
+       71, 1841, 1849,   71,   71, 1850,   71, 1848, 1853,   71,
+     1854, 1855,   71,   71, 1857, 1856, 1859,   71,   71, 1851,
+       71, 1852,   71,   71, 1862,   71, 1861,   71,   71, 1865,
+       71, 1858,   71, 1864,   71,   71, 1868,   71, 1869, 1867,
 
-       71, 1871, 1862, 1863,   71, 1870,   71,   71, 1874, 1876,
-       71, 1875,   71, 1873,   71, 1869, 1866,   71,   71,   71,
-       71, 1868,   71, 1877, 1872,   71,   71,   71, 1878, 1882,
-       71, 1885, 1879,   71, 1881, 1886, 1887,   71,   71, 1880,
-       71,   71,   71, 1883, 1890,   71,   71,   71, 1889, 1895,
-       71, 1894,   71, 1884,   71,   71,   71, 1888, 1892, 1899,
-     1891,   71, 1900, 1902,   71,   71, 1896, 1893,   71, 1897,
-     1901, 1898, 1903, 1906,   71,   71, 1904,   71,   71,   71,
-       71, 1905,   71, 1913, 1910,   71,   71, 1916,   71,   71,
-     1915, 1908,   71, 1917,   71,   71, 1907, 1909, 1918,   71,
+       71,   71, 1876, 1860,   71,   71, 3149, 1863,   71, 1870,
+     1871, 1872, 1878, 1866,   71,   71, 1873, 1879,   71,   71,
+     1874, 1875,   71, 1884, 1881, 1877, 1882,   71, 1880,   71,
+       71,   71, 1888,   71, 1883,   71, 1885,   71, 1890,   71,
+       71,   71, 1893, 1894,   71,   71, 1896,   71,   71,   71,
+     1886,   71, 1887,   71, 1902,   71,   71, 1901, 1898, 1891,
+     1899, 1889, 1892,   71,   71, 1895,   71,   71,   71,   71,
+     1908,   71,   71, 1897, 1900, 1905, 1906, 1903,   71, 1904,
+     1912,   71,   71, 1911, 1915, 1916,   71,   71, 1910, 1914,
+       71,   71, 1907, 1917,   71,   71, 1919, 1909,   71,   71,
 
-     1911, 1914, 1912,   71, 1919, 1923,   71, 1924,   71,   71,
-     1920, 1925, 1927, 1928,   71, 1921, 1926,   71,   71,   71,
-       71, 1932,   71, 1922,   71, 1930, 1931,   71, 1934,   71,
-       71, 1937,   71, 1939, 1933, 1929,   71,   71,   71,   71,
-       71, 1935,   71,   71,   71, 1945, 1944, 1943, 1940,   71,
-     1941, 1946,   71, 3080, 1938, 1936, 1947,   71, 1949, 1942,
-       71,   71,   71,   71,   71,   71, 1950, 1951, 1954, 1948,
-     1953, 1952,   71,   71,   71, 1955,   71, 1957,   71,   71,
-     1961,   71,   71,   71, 1960, 1956, 1958,   71, 1963,   71,
-     1959, 1962, 1964, 1965,   71,   71,   71,   71,   71,   71,
+     1918, 1913,   71,   71,   71,   71, 1923,   71, 1926, 1927,
+     1928, 1922,   71,   71,   71,   71,   71,   71, 1920,   71,
+       71, 1921, 1924, 1931,   71, 1936,   71,   71, 1930, 1935,
+       71, 1925, 1929,   71, 1933,   71, 1937, 1940,   71, 1932,
+       71, 1941, 1934, 1943,   71, 1938, 1939, 1942,   71, 1947,
+       71, 1945, 1944,   71,   71,   71, 1946,   71,   71,   71,
+     1951, 1954,   71,   71,   71, 1957,   71,   71, 1949, 1956,
+       71, 1958, 1960,   71, 1948,   71, 1950, 1955, 1952, 1953,
+       71, 1964,   71,   71, 1959,   71, 1961, 1965,   71, 1966,
+     1968, 1962, 1969, 1963, 1967,   71,   71,   71,   71,   71,
 
-       71, 1972, 1970,   71, 1967, 1971,   71,   71,   71, 1966,
-       71,   71, 1974,   71, 1968,   71, 1969, 1973,   71, 1977,
-     1980, 3080, 1976,   71, 1975,   71, 1981, 1983, 1979,   71,
-     1978,   71, 1982,   71, 1984,   71, 1985, 1987,   71,   71,
-       71,   71, 1986, 1988, 1993,   71,   71, 1995,   71, 1989,
-       71, 1990, 1997,   71, 1991, 1992,   71,   71, 1996,   71,
-       71, 2001, 1994,   71,   71, 1998, 1999,   71, 2000,   71,
-       71,   71, 2002,   71,   71,   71,   71,   71,   71, 2004,
-     2009, 2005, 2006, 2013,   71, 2003,   71,   71, 2008, 2012,
-     2016, 2017,   71, 2010, 2014, 2011,   71, 2007, 2015,   71,
+     1973,   71, 1971,   71,   71,   71,   71, 1975, 1978, 1970,
+     1977, 1972, 1980, 1974,   71,   71, 1976,   71,   71,   71,
+       71,   71,   71, 1986, 1985, 1984,   71, 1979, 3149, 1981,
+       71, 1982, 1987,   71, 1983, 1988,   71, 1990,   71, 1994,
+       71,   71,   71,   71, 1991, 1992, 1989, 1993,   71,   71,
+       71, 1998, 1996, 1995, 1997,   71,   71,   71, 2002,   71,
+       71,   71, 2001, 2006,   71,   71, 2004, 1999, 2000, 2003,
+     2005,   71,   71,   71,   71,   71, 2013, 2011,   71,   71,
+       71, 2008,   71, 2012,   71,   71,   71, 2018,   71, 2015,
+       71, 2007, 2009, 3149, 2010,   71,   71, 2014, 2019, 2017,
 
-       71, 2019, 2020,   71,   71,   71,   71,   71, 2022,   71,
-       71, 2023, 2018,   71, 2024, 2028, 2026, 2021,   71,   71,
-     2030, 2027, 2032,   71, 2025,   71,   71,   71,   71, 2029,
-     2035, 2034, 2036, 2031,   71,   71,   71, 2040,   71, 2037,
-       71,   71,   71,   71,   71, 2041, 2043, 2046,   71,   71,
-     2047, 2033,   71, 2038, 2042,   71, 2039, 2050, 2045,   71,
-       71, 2044, 2052,   71, 2051,   71,   71, 2048, 2056,   71,
-       71, 2058,   71,   71, 2054, 2049,   71, 2059,   71,   71,
-       71,   71, 2055, 2053, 2057, 2061,   71, 2060, 2065, 2067,
-     2063, 2062,   71, 2064, 2068,   71,   71,   71,   71,   71,
+       71, 2022, 2016,   71, 2021, 2023, 2020,   71,   71, 2028,
+       71, 2025, 2026,   71,   71, 2024, 2029,   71,   71,   71,
+     2034, 2027,   71,   71, 2036,   71,   71, 2037, 2038,   71,
+     2030,   71, 2033, 2031, 2032,   71, 2040,   71,   71, 2035,
+       71, 2041, 2043, 2039, 2042,   71,   71, 2046,   71,   71,
+       71, 2045, 2044,   71,   71,   71,   71,   71, 2047,   71,
+       71,   71,   71, 2058,   71, 2049, 2050, 2051, 2054,   71,
+       71, 2048, 2053, 2057,   71, 2062,   71, 2061, 2059, 2056,
+       71, 2055, 2052,   71,   71, 2064, 2065,   71,   71, 2060,
+       71,   71, 2067,   71,   71, 2068, 2063,   71,   71, 2069,
 
-     2066, 2069,   71, 2072, 2073,   71,   71,   71, 2070, 2071,
-     2077,   71,   71,   71,   71, 2074, 2076,   71,   71,   71,
-       71,   71,   71,   71, 2078, 2075,   71, 2086, 2081, 2080,
-     2079, 2083, 2082, 2084,   71, 2088,   71,   71, 2085, 2087,
-       71,   71, 2089, 2091,   71, 2095, 2092, 2097,   71,   71,
-       71, 2099,   71, 2096,   71, 2090, 2093,   71, 2094, 2098,
-       71, 2101, 3080,   71, 2104, 2102, 2106, 2103, 2100, 2105,
-       71, 2107,   71,   71,   71,   71, 2108,   71, 2111,   71,
-       71, 2112, 2109, 2110, 2115, 2116,   71,   71, 2117,   71,
-       71, 2120,   71,   71,   71, 2113, 2126,   71, 2121,   71,
+     2073, 2066, 2071,   71,   71, 2075, 2072, 2077,   71, 2070,
+       71,   71,   71, 2080,   71,   71, 2074, 2079, 2076, 2081,
+     2082,   71,   71, 2085,   71,   71,   71,   71,   71,   71,
+     2086,   71, 2091,   71, 2088,   71, 2078, 2087, 2095, 2083,
+       71, 2092, 2084, 2093,   71, 2090, 2089,   71,   71,   71,
+     2097,   71, 2096,   71,   71, 2094, 2101,   71,   71, 2103,
+       71, 2099,   71, 2102,   71, 2104,   71, 2098,   71, 2100,
+       71, 2105, 2107, 2106,   71, 2108, 2110, 2112, 2109, 2114,
+       71, 2111, 2113,   71,   71,   71,   71,   71,   71,   71,
+     2117, 2118, 2115, 2122,   71,   71, 2116,   71, 2121,   71,
 
-     2122, 2118, 2123,   71,   71, 2125, 2114,   71, 2119, 2124,
-       71,   71,   71,   71, 2127, 2130, 2128,   71,   71,   71,
-       71,   71, 2133,   71,   71,   71, 2137, 2139,   71, 2140,
-       71,   71, 2129, 2132,   71,   71, 2131, 2134,   71, 2135,
-     2136,   71,   71, 2142,   71, 2141, 2138, 2144,   71, 2146,
-     2149,   71,   71, 2145, 2147,   71, 2150, 2143,   71,   71,
-     2148,   71,   71,   71,   71,   71, 2160,   71,   71,   71,
-       71, 2151, 2161,   71, 2152,   71, 2157, 2159,   71, 2198,
-     2155, 2153, 2163, 2154, 2156, 2168, 2158,   71, 2162,   71,
-     2165, 2164, 2166,   71, 2167,   71,   71, 2170,   71,   71,
+     2119,   71,   71,   71,   71,   71,   71,   71, 2120, 2131,
+     2132,   71,   71, 2123, 2127, 2124, 2126, 2125, 2128, 2129,
+     2133,   71,   71, 2130,   71,   71,   71, 2134, 2136,   71,
+     2142,   71,   71, 2144,   71, 2137,   71,   71, 2141, 2138,
+     2135, 2143,   71, 2139,   71,   71, 2146, 2149, 2151, 2147,
+     2148, 2140, 2150,   71,   71, 2145, 2152,   71,   71,   71,
+     2153,   71,   71, 2156,   71, 2155, 2154,   71, 2157,   71,
+     2160, 2161,   71,   71, 2162,   71,   71, 2164, 2165,   71,
+     2166, 2163, 2158, 2171,   71,   71, 2167, 2168,   71,   71,
+     2170,   71,   71, 2159, 2169,   71,   71, 2175,   71, 2173,
 
-     2169, 2173,   71,   71, 2174,   71,   71, 2171, 2175,   71,
-     2172, 2179,   71, 2180,   71,   71, 2182,   71,   71, 2184,
-       71, 2178,   71,   71,   71, 2176, 2177,   71, 2186, 2187,
-       71, 2188,   71,   71, 2181,   71, 2183, 2185, 2189,   71,
-       71, 2191, 2190,   71, 2193, 2194,   71, 2196,   71,   71,
-       71, 2200, 2199,   71, 2192, 2202,   71,   71,   71, 2195,
-       71, 2197, 2206,   71,   71,   71, 2201,   71,   71, 2210,
-     2211,   71, 2203, 2204,   71,   71, 2205,   71,   71,   71,
-     2207,   71, 2209, 2213, 2216,   71, 2218, 2208, 2217,   71,
-     2214,   71, 2215, 2212,   71, 2219,   71, 2223,   71,   71,
+       71, 2174,   71,   71,   71,   71,   71, 2178,   71, 2184,
+       71, 2172,   71, 2182,   71, 2177, 2185,   71,   71, 2180,
+       71, 2176, 2179, 2187,   71, 2181,   71,   71, 2183, 2186,
+       71,   71, 2189, 2194,   71, 2191,   71, 2192,   71,   71,
+       71,   71,   71, 2188, 2195, 2190, 2196,   71,   71, 2193,
+       71,   71,   71,   71,   71, 2258, 2207, 2197, 2206, 2202,
+     2200,   71, 2198, 2201, 2199, 2204, 2205, 2208,   71, 2203,
+       71,   71,   71, 2209, 2210,   71,   71, 2213, 2214,   71,
+     2215,   71,   71,   71, 2218, 2211,   71, 2216, 2212,   71,
+     2221,   71,   71,   71,   71, 2217,   71, 2222, 2219, 2223,
 
-     2225,   71,   71,   71, 2226,   71,   71, 2220, 2224, 2221,
-     2230, 2231,   71,   71, 2229,   71,   71,   71,   71, 2227,
-     2222, 2228, 2235, 2237,   71, 2233, 2240,   71, 2232, 2238,
-     2242, 2239,   71,   71, 2234,   71,   71,   71, 2243,   71,
-     2244, 2236,   71,   71,   71, 2247,   71,   71, 2241,   71,
-       71, 3080, 2246, 2248, 2253, 2249, 2250, 2252, 2251, 2254,
-       71,   71, 2245,   71,   71,   71, 2259, 2255,   71, 2258,
-     2256,   71,   71, 2257,   71, 2260,   71, 2264, 2266,   71,
-       71,   71,   71, 2261,   71,   71,   71,   71, 2277,   71,
-     2268, 2262, 2265, 2263, 2269, 2267,   71, 2272,   71, 2273,
+       71, 2220, 2227,   71, 2228,   71, 2224,   71, 2226, 2230,
+       71, 2232,   71, 2225,   71,   71, 2235,   71,   71, 2229,
+     2234, 2236,   71,   71,   71, 2231,   71, 2242,   71, 2233,
+       71,   71, 2237, 2238,   71, 2241,   71, 2239, 2244,   71,
+       71,   71, 2246, 2247,   71, 2240,   71, 2248, 2250,   71,
+     2243,   71, 2245, 2254,   71,   71,   71,   71,   71, 2252,
+     2251,   71, 2249, 2259,   71,   71, 2261,   71, 2264,   71,
+     2253,   71, 2257,   71,   71, 2255,   71, 2260,   71, 2256,
+     2262, 2266, 2263,   71,   71, 2271,   71, 2267,   71,   71,
+     2273, 2265,   71,   71, 2268, 2272, 2269,   71, 2278,   71,
 
-     2270, 2271,   71, 2274,   71, 2278,   71, 2275, 2279,   71,
-       71, 2281, 2282, 2280, 2276, 2283, 2284,   71,   71,   71,
-       71,   71,   71, 2286,   71,   71,   71, 2290, 2291,   71,
-       71,   71, 2287, 2285,   71, 2293,   71, 3080, 2288,   71,
-     2294,   71, 2295, 2292, 2289, 2296,   71,   71,   71,   71,
-     2298, 2299, 2297, 2300, 2301,   71,   71,   71,   71,   71,
-       71, 2302, 2303,   71, 2307,   71, 2310,   71,   71,   71,
-     2309,   71,   71, 2306, 2311,   71, 2304, 2316, 2305,   71,
-     2314, 2317, 2315, 2308,   71, 2312,   71, 2313,   71,   71,
-     2319,   71,   71, 2322, 2320,   71, 2324,   71, 2318, 2323,
+     2274, 2277,   71,   71, 2279, 2281,   71,   71,   71, 2270,
+       71, 2283, 2288, 2285,   71, 2275,   71, 2276,   71, 2286,
+     2290,   71,   71,   71, 2282, 2287,   71, 2280, 2291,   71,
+       71,   71,   71, 2284, 2292, 2294,   71, 2289,   71, 2295,
+     2296, 2297,   71, 2301, 2300,   71, 2293, 2298, 2302,   71,
+       71, 2299,   71,   71,   71, 2307, 2303,   71, 2306, 2305,
+       71,   71,   71, 2308,   71, 2304, 2314,   71,   71,   71,
+       71, 2309,   71, 2310,   71, 2311, 2312,   71, 2316,   71,
+     2313,   71, 2317, 2315, 2321,   71,   71, 3149, 2318, 2319,
+     2322, 2320, 2325,   71,   71, 2326,   71, 2323, 2324, 2327,
 
-     2326,   71,   71,   71,   71, 2328,   71,   71,   71, 2325,
-       71,   71, 2321, 2327,   71, 2332, 2336,   71, 2338, 2334,
-       71, 2329, 2330, 2331,   71, 2335, 2337,   71,   71, 2339,
-       71,   71,   71,   71,   71,   71, 2347, 2333, 2342, 2345,
-       71,   71,   71, 2346,   71,   71, 2340, 2344, 2350,   71,
-       71, 2343,   71, 2341,   71, 2351,   71, 2354,   71, 2348,
-     2349, 2355,   71, 2352,   71,   71,   71, 2358, 2353, 2356,
-     2359,   71, 2357, 2360,   71,   71,   71,   71,   71, 3080,
-     2361, 2364,   71, 2366, 2367,   71,   71, 2363, 2362, 2368,
-       71, 2369,   71, 2370,   71,   71,   71, 2365, 2371,   71,
+       71,   71,   71, 2330, 2328, 2331,   71, 2329,   71,   71,
+     2333,   71, 2332,   71,   71, 2334,   71, 2339, 2335,   71,
+     2338,   71, 2336,   71,   71,   71, 2341,   71,   71, 2342,
+     2343, 2344,   71, 2345,   71, 2337,   71,   71, 2340, 2349,
+       71, 2348,   71, 2346,   71,   71,   71,   71,   71, 2351,
+       71, 2358, 2355,   71,   71, 2350, 2347,   71, 2357,   71,
+     2359, 2354,   71,   71,   71, 2352, 2353,   71, 2362,   71,
+     2356,   71, 2366,   71, 2365, 2368,   71, 2360,   71, 2367,
+       71, 2361,   71, 2364,   71, 2363,   71, 2370,   71, 2375,
+     2369, 2371,   71, 2373,   71,   71, 2376,   71, 2374, 2377,
 
-     2372, 2373,   71, 2374,   71, 2375,   71, 2376,   71, 2380,
-       71, 2377,   71, 2382,   71, 2383,   71,   71,   71,   71,
-       71,   71,   71,   71, 2379,   71, 2378, 2386, 2384,   71,
-     2385, 2381,   71, 2387, 2389, 2392,   71,   71,   71, 2388,
-       71, 2393, 2390, 2391,   71,   71, 2399,   71,   71,   71,
-       71, 2394,   71, 2396,   71,   71, 2400, 2395, 2398,   71,
-     2408, 3080, 2397, 2401, 2402,   71,   71,   71, 2403, 2406,
-     2409, 2410,   71, 2407, 2404, 2411,   71, 2405,   71, 2412,
-       71, 2413,   71, 2414,   71, 2415,   71,   71,   71,   71,
-       71,   71,   71,   71,   71, 2416, 2424,   71,   71,   71,
+       71,   71, 2379,   71,   71,   71, 2372,   71, 2384,   71,
+     2378,   71, 2383,   71, 2385, 2380, 2386,   71, 2381, 2387,
+       71, 2382, 2388,   71, 2389,   71, 2390,   71,   71, 2391,
+       71,   71, 2393, 2396,   71,   71, 2398,   71,   71, 2392,
+     2401,   71,   71, 2395, 2397,   71,   71, 2394, 2402,   71,
+       71, 2405,   71, 2400,   71, 2399, 2406,   71,   71, 2407,
+       71,   71,   71, 2410, 2411, 2403,   71, 2404,   71, 2409,
+     2408,   71,   71, 2415,   71, 2412, 2418,   71,   71, 2417,
+     2413, 2419,   71, 2414, 2420,   71, 2421,   71,   71,   71,
+     2422,   71, 2416,   71, 2424,   71, 2425,   71, 2426,   71,
 
-     2422,   71, 2428, 2429,   71, 2417, 2419, 2418,   71,   71,
-     2421, 2420, 2423, 2425,   71, 2426, 2427, 2431, 2432,   71,
-       71, 2430,   71, 2433, 2434,   71,   71, 2435,   71, 2437,
-       71,   71,   71, 2443,   71, 2444,   71, 2445, 2436,   71,
-       71, 2438,   71,   71,   71,   71, 2439, 2441, 2440, 2449,
-       71, 2442,   71,   71, 2453, 2447,   71, 2446, 2452, 2454,
-       71, 2448,   71,   71, 2455, 2450, 2456,   71,   71,   71,
-     2451,   71, 2458,   71,   71, 2457,   71,   71, 2462,   71,
-       71, 2460, 2466, 2467,   71,   71,   71, 2459, 2470,   71,
-     2471, 2461,   71,   71, 2463, 2464,   71, 2465, 2469,   71,
+       71, 2431,   71, 2427,   71, 2428, 2423, 2433,   71, 2434,
+       71,   71,   71,   71,   71,   71, 2430,   71,   71, 2429,
+     2437,   71, 2435, 2432, 2436,   71, 2438, 2443,   71,   71,
+     2440,   71,   71,   71,   71, 2439,   71, 2441, 2442,   71,
+     2444,   71, 2450,   71,   71, 2447,   71, 2445, 2449, 2446,
+       71, 2452, 2451,   71, 2453,   71, 2457, 2448,   71,   71,
+     2461,   71, 2454, 2459, 2460, 2462,   71,   71, 2455, 2458,
+       71, 2463,   71, 2456,   71, 2464,   71, 2465,   71,   71,
+       71,   71,   71, 2467,   71, 2466,   71,   71,   71, 2475,
+       71,   71,   71, 2473,   71, 2479,   71, 2468, 2470, 2469,
 
-     2468, 2474,   71, 2473,   71,   71, 2475, 2472, 2479,   71,
-       71, 2476,   71,   71, 2483,   71,   71, 2482, 2485,   71,
-       71, 2481, 2480,   71, 2477, 2478,   71,   71, 2486, 2487,
-     2490,   71,   71, 2491,   71, 2484, 2493,   71,   71, 2489,
-       71,   71, 2488,   71, 2498,   71,   71, 2500,   71,   71,
-     2496, 2494, 2497, 2495, 2501,   71, 2492,   71,   71,   71,
-     2502, 2499,   71, 2504,   71,   71,   71, 2505,   71,   71,
-       71, 2503,   71, 2507, 2508, 2510, 2515, 2511, 2513,   71,
-     2509, 2506,   71, 2512, 2514,   71,   71, 2516,   71, 2519,
-       71,   71,   71, 2521,   71,   71, 2520, 2524,   71, 2523,
+     2480,   71, 2472, 2471,   71, 2482, 2474,   71, 2476, 2477,
+     2478,   71, 2481, 2483,   71,   71, 2484, 2485,   71,   71,
+       71,   71, 2486,   71,   71,   71, 2488, 2494,   71, 2487,
+     2489, 2495,   71, 2498,   71,   71,   71,   71, 2490, 2491,
+     2492, 2497, 2493, 2496, 2499,   71,   71,   71,   71, 3149,
+       71, 2503, 2501,   71, 2500,   71,   71, 2507, 2506, 2508,
+       71,   71,   71, 2509, 2502, 2510,   71, 2504, 2505,   71,
+       71, 2512,   71,   71,   71, 2511,   71,   71, 2516, 3149,
+       71,   71, 2514, 2520, 2521,   71,   71,   71, 2513, 2524,
+       71, 2525, 2515,   71, 2517, 2518, 2522, 2519,   71, 2528,
 
-     2525,   71,   71, 3080, 2517, 2522, 2518, 2527,   71,   71,
-       71, 2529, 2528,   71,   71, 2526, 2530,   71, 2531, 2532,
-     2533,   71,   71,   71,   71, 2534,   71, 2535,   71, 2540,
-       71, 2539, 2536,   71, 2541,   71, 2538,   71, 2542, 2537,
-       71,   71, 2543,   71,   71,   71, 2544, 2545, 2547, 2546,
-     2548,   71,   71,   71,   71,   71, 2553,   71,   71,   71,
-       71,   71, 2551, 2552,   71, 2550, 2554, 2558,   71, 2549,
-     2562,   71,   71,   71,   71, 2561,   71, 2555,   71, 2556,
-     2557, 2560, 2566, 2559, 2567,   71,   71, 2569, 2570, 2564,
-     3080, 2571, 2563,   71,   71,   71, 2565,   71, 2572,   71,
+       71,   71, 2527,   71, 2523,   71,   71,   71, 2526, 2533,
+       71,   71,   71,   71, 2529,   71, 2536,   71, 2530, 2534,
+     2535, 2537,   71, 2539,   71, 2531, 2532,   71,   71, 2543,
+       71, 2542, 2538, 2540, 2544,   71, 2541,   71, 2545, 2547,
+       71,   71,   71,   71,   71, 2552,   71,   71, 2554,   71,
+       71,   71, 2546, 2550, 2548, 2549, 2551,   71, 2553,   71,
+       71,   71, 2555,   71, 2556, 2557, 2558,   71, 2559, 2560,
+       71,   71, 2561,   71,   71, 2562, 2564,   71, 2565, 2567,
+       71, 2568,   71,   71, 2569, 2563,   71,   71, 2570, 2566,
+     2573,   71,   71,   71, 2575,   71,   71, 2574, 2578,   71,
 
-       71,   71,   71, 2573,   71, 2574,   71,   71, 2577,   71,
-     2575, 2568,   71, 2580,   71, 2576, 2582,   71, 2583,   71,
-     2578,   71, 2579, 2584,   71, 2585,   71, 2581, 2587,   71,
-       71, 2586,   71, 2591, 2588, 2589,   71,   71, 2592,   71,
-       71, 2594, 2595,   71, 2590, 2596,   71,   71,   71,   71,
-     2597, 2601,   71,   71, 2602, 2599, 2593, 2603,   71,   71,
-       71, 2598, 2605,   71,   71,   71, 2609, 2610,   71, 2600,
-       71,   71,   71, 2606, 2604, 2611,   71,   71, 2612, 2608,
-       71, 2618, 2607, 2613,   71,   71, 2617,   71,   71, 2621,
-       71,   71, 2620, 2614,   71,   71, 2615, 2616,   71, 2622,
+     2577, 2579,   71,   71, 2571, 2572, 2576, 2581,   71,   71,
+       71,   71, 2582, 2583, 2587, 2585, 2580,   71, 2584,   71,
+       71,   71, 2586,   71,   71, 2588, 2591,   71, 2589,   71,
+     2594, 2595,   71, 2590,   71, 2592,   71,   71,   71, 2596,
+       71,   71,   71, 2598, 2597, 2599, 2601,   71,   71,   71,
+     2593,   71, 2600, 2602,   71,   71, 2607,   71, 2609,   71,
+     2605,   71, 2604, 2606,   71, 2603, 2608, 2610,   71,   71,
+       71, 2614,   71,   71,   71, 2618,   71,   71, 2611,   71,
+       71,   71,   71, 2616, 2617, 2622, 2623,   71, 2612, 2613,
+       71, 2625, 2615, 2626, 2620, 2627, 2619,   71, 2629,   71,
 
-       71, 2624,   71, 2623,   71, 2626,   71,   71,   71, 2629,
-     2619, 2633,   71,   71,   71,   71, 2625, 2627, 2628,   71,
-       71,   71, 2632, 2635, 2630,   71,   71, 2631, 2634, 2637,
-     2640, 2636, 2638, 2639, 3080, 2641,   71, 2648, 2642, 2643,
-       71,   71, 2644,   71, 2645,   71, 2646,   71, 2647,   71,
-       71,   71, 2651,   71, 2649,   71, 2655,   71,   71,   71,
-     2652, 2656, 2658,   71,   71, 2660,   71,   71, 2662,   71,
-     2650, 2659, 2661, 2653,   71, 2654,   71, 2657,   71,   71,
-     2667,   71,   71, 2663,   71, 2664, 2668, 2665,   71, 2671,
-       71,   71,   71, 2669, 2672,   71, 2675, 2666,   71, 2674,
+     2621,   71, 2628,   71,   71,   71,   71, 2624,   71, 2630,
+       71,   71, 2633,   71, 2631,   71, 2636, 2638,   71, 2632,
+     2639,   71, 2640,   71, 2634,   71, 2635,   71,   71, 2641,
+       71, 2637, 2642, 2643,   71, 2645, 2647,   71,   71,   71,
+     2650, 2648,   71, 2651,   71, 2652,   71,   71, 2644, 2646,
+     2653,   71,   71,   71, 2657,   71,   71, 2658, 2649, 2659,
+       71,   71, 2661,   71, 2654,   71,   71,   71, 2665,   71,
+     2655, 2666,   71, 2656,   71,   71, 2660, 2668, 2662, 2667,
+       71, 2664, 2669,   71, 2663,   71,   71,   71, 2674, 2677,
+       71,   71, 2670, 2673,   71, 2676,   71,   71,   71,   71,
 
-       71, 2677,   71, 2670, 2673, 2676, 2678,   71,   71,   71,
-       71,   71, 2679,   71,   71,   71, 2687,   71,   71, 2682,
-       71,   71,   71, 2683, 2685, 2690, 2691, 2681,   71, 2688,
-       71, 2692,   71, 2680, 2686,   71,   71, 2693, 2684, 2689,
-     2694,   71, 2695, 2697,   71, 2696, 2698,   71, 2699,   71,
-       71,   71, 2701,   71, 2704, 2702, 2703,   71, 2705, 2700,
-       71,   71, 2706, 2707,   71,   71,   71,   71, 2712,   71,
-       71, 2710, 2714,   71,   71, 2716,   71,   71,   71, 2708,
-     2715,   71, 2717,   71, 2718, 2711, 2709,   71, 2722,   71,
-       71,   71,   71,   71, 2713,   71, 2720, 2719,   71, 2725,
+     2671, 2678, 2680,   71,   71, 2672, 2679, 2682,   71,   71,
+       71, 2675,   71, 2685, 2689,   71,   71,   71,   71,   71,
+     2683, 2684, 2681,   71, 2705,   71, 2688, 2686, 2691,   71,
+     2687, 2690, 2693, 2696,   71, 2694, 2692, 2695, 2697,   71,
+     2699,   71, 2698,   71, 2700,   71, 2701,   71, 2702,   71,
+     2703,   71,   71,   71, 2706,   71,   71,   71,   71,   71,
+     2709, 2713,   71,   71,   71, 2710, 2714, 2704, 2716,   71,
+       71, 2717, 2708, 2718,   71, 2719, 2715, 2711, 2707, 2712,
+     2720,   71,   71,   71,   71,   71, 2725,   71,   71,   71,
+       71, 2721, 2722, 2723, 2726, 2729,   71, 2727,   71,   71,
 
-       71, 2726,   71, 2723, 2724,   71,   71, 2721, 2729, 2727,
-     2730, 2732,   71, 2734,   71, 2735,   71, 2728,   71, 2737,
-       71,   71,   71,   71,   71, 2733,   71,   71, 2731, 2742,
-       71, 2741,   71,   71, 2746,   71,   71, 2738, 2739, 2736,
-     2740, 2749,   71, 2743,   71,   71, 2751,   71,   71, 2747,
-     2744, 2745,   71, 2752,   71, 2748, 2754,   71, 2755,   71,
-     2757,   71,   71,   71, 2750,   71, 2763, 2753,   71, 2762,
-       71, 3080, 2760, 2759, 2756,   71, 2766,   71,   71,   71,
-     2758, 2767, 2764,   71, 2768, 2761,   71, 2771, 2765, 2772,
-       71, 2769,   71,   71, 2774, 2773,   71,   71,   71,   71,
+     2730,   71,   71, 2724, 2728,   71, 2733, 2732,   71, 2731,
+     2734, 2735,   71, 2736,   71,   71,   71,   71,   71,   71,
+       71, 2745, 2737,   71, 2738, 2740,   71,   71, 2743, 2741,
+       71,   71,   71, 2739, 3149, 2746, 2748, 2749,   71, 2750,
+     2744,   71,   71, 2742,   71, 2755,   71, 2747, 2766, 2752,
+     2751,   71, 2753, 2756,   71, 2754, 2757,   71,   71,   71,
+       71,   71, 2759, 2762,   71, 2761, 2763, 2758,   71,   71,
+     2765,   71,   71, 2764,   71, 2770,   71, 2768, 2760, 2772,
+       71,   71,   71,   71,   71, 2767, 2773,   71, 2774, 2775,
+       71, 2776, 2769,   71,   71, 2780,   71,   71,   71,   71,
 
-       71, 2779, 2776, 2777,   71,   71, 2770,   71, 2782,   71,
-       71,   71,   71,   71, 2775, 2787,   71, 2783, 2778,   71,
-       71, 2780, 2781, 2790,   71, 2786, 2791,   71, 2784, 2789,
-       71,   71, 2788, 2793,   71, 2792, 2785, 2795,   71, 2794,
-     2796,   71, 2797,   71,   71, 2799,   71,   71,   71, 2798,
-     2800,   71,   71, 2804, 2805,   71,   71,   71,   71, 2809,
-       71, 2810,   71,   71,   71,   71, 2811, 2808, 2847, 2801,
-     2802, 2806,   71, 2803,   71,   71, 2807, 2815,   71, 2814,
-     2816,   71,   71, 2812, 2813, 2819,   71, 2817,   71, 2818,
-       71,   71, 2822,   71,   71, 2823, 2821,   71, 2820,   71,
+       71, 2771,   71, 2783,   71,   71, 2777,   71, 2778, 2784,
+     2781, 2782, 2788, 2787, 2779,   71,   71,   71, 2785, 2792,
+       71,   71,   71, 2786, 2789, 2794,   71, 2795,   71,   71,
+     2797,   71,   71,   71, 2790,   71,   71,   71, 2798,   71,
+     2793, 2801,   71, 2791, 2802,   71,   71, 2806, 2799, 2800,
+     2796,   71, 2809,   71,   71, 2803, 2807, 2811, 2805,   71,
+     2804,   71,   71,   71, 2812, 2814,   71, 2815,   71,   71,
+     2808, 2817,   71,   71, 2810,   71,   71,   71,   71, 2822,
+     2819,   71, 2816, 2813, 2820,   71, 2826,   71,   71, 2824,
+       71, 2818, 2909, 2821,   71, 2823,   71, 2827, 2825,   71,
 
-       71,   71,   71,   71, 2826,   71,   71, 2828,   71,   71,
-     2829,   71, 2827,   71, 2824,   71,   71, 2825,   71,   71,
-     2838, 2839, 2830,   71, 2834, 2831, 2832, 2833, 2835, 2836,
-     2841,   71,   71, 3080, 2837, 2904,   71, 2842, 2840, 2843,
-     2845,   71, 2846,   71, 2844, 2848,   71, 2849,   71, 2850,
-     2851,   71,   71, 2852, 2853, 2856,   71, 2854, 2855,   71,
-       71, 2857,   71,   71,   71,   71,   71, 2863,   71,   71,
-       71, 2862,   71,   71, 2866,   71, 3080, 2858, 2859, 2865,
-       71,   71, 2867, 2860,   71, 2861,   71, 2871, 2872,   71,
-     2868, 2873,   71, 2870, 2864,   71, 2874,   71, 2869, 2878,
+     2828, 2830, 2829, 2831, 2832,   71, 2834,   71,   71,   71,
+     2833,   71,   71, 2836, 2835,   71, 2837, 2839,   71, 2842,
+       71,   71,   71,   71,   71,   71, 2847,   71,   71, 3149,
+       71, 2850,   71, 2843, 2838, 2840, 2841,   71, 2846, 2849,
+     2844, 2851,   71,   71,   71,   71,   71, 2848, 2852, 2845,
+     2854, 2853, 2855,   71, 2856,   71, 2857,   71, 2859,   71,
+       71, 2861,   71,   71,   71, 2860,   71,   71, 2863,   71,
+     2858,   71, 2866, 2867,   71,   71, 2871,   71, 2862, 2872,
+       71, 2868,   71, 3149, 2870, 2864, 2873,   71, 2865, 2869,
+       71,   71,   71, 2877,   71, 2876, 2878,   71,   71,   71,
 
-     2875, 2880,   71,   71, 2879,   71, 2876,   71,   71, 2877,
-       71,   71,   71, 2887,   71, 2884, 2885, 2888, 2882,   71,
-     2890,   71,   71,   71,   71, 2889, 3080, 2881, 2936, 2883,
-       71, 2886, 2891,   71, 2910, 2892, 2893,   71, 2894,   71,
-     2895,   71, 2896,   71, 2897,   71, 2898,   71, 2899,   71,
-     2900,   71,   71, 2902,   71,   71,   71,   71,   71, 2907,
-       71, 2901,   71,   71, 2903,   71, 2911, 2913,   71,   71,
-       71,   71, 2908, 2915,   71, 2909, 2905, 2906, 2912,   71,
-     2917,   71, 2920,   71, 2919,   71,   71, 2914,   71,   71,
-       71, 2922, 2918,   71,   71,   71,   71, 2916,   71, 2921,
+       71, 2881, 2874, 2879,   71, 2880, 2875,   71, 2883, 2884,
+       71, 2882,   71,   71,   71,   71,   71, 2885,   71, 2888,
+       71,   71, 2890,   71, 2886, 3149, 2891, 2889,   71,   71,
+       71,   71,   71, 2887,   71,   71, 2903, 2900,   71, 2892,
+     2901, 2893,   71, 2894,   71, 2896, 2895, 2897, 2898, 2904,
+       71,   71, 2899,   71, 2902, 2907,   71,   71, 2905, 2908,
+       71, 3053, 2910, 2906, 2912,   71, 2913,   71, 2914, 2915,
+     2911,   71, 2916, 2917,   71,   71, 2918, 2919, 2920,   71,
+     2921,   71,   71,   71,   71,   71,   71, 2927,   71,   71,
+       71, 2926,   71,   71, 2930,   71,   71, 2923,   71, 2929,
 
-     2926, 2929, 2923,   71, 2927,   71, 2925, 2924, 2928, 2930,
-     2931,   71, 2932,   71, 2933,   71,   71,   71,   71, 2938,
-       71,   71,   71, 2942,   71, 2935, 2934, 2941,   71, 2944,
-       71, 2940,   71,   71,   71,   71,   71, 2937,   71, 2943,
-       71, 2939,   71, 2945,   71, 2951,   71, 3080,   71, 2948,
-       71, 2946, 2947, 2950, 2952, 2955, 2958,   71,   71,   71,
-     2949, 2953, 2956,   71, 2954,   71, 2957, 2959, 2960,   71,
-       71, 2961, 2962,   71, 2963,   71,   71,   71, 2964, 2966,
-       71,   71, 2967, 2965,   71, 2968, 2971,   71,   71,   71,
-     2969,   71,   71, 2974, 2976,   71, 2970,   71, 2972, 2973,
+     2922, 3149, 2931,   71, 2924, 2925,   71, 2935, 2936,   71,
+     2932, 2938, 2934,   71, 2928,   71, 2933, 2937,   71,   71,
+     2939, 2942, 2940, 2944,   71, 2941, 2943,   71,   71,   71,
+       71,   71,   71, 2951,   71, 2948, 2949, 2952, 3149, 2946,
+       71, 2954,   71,   71, 2945,   71, 2953, 2955,   71, 2947,
+     2956, 2950, 2957,   71, 2958,   71,   71, 2960,   71, 2961,
+       71, 2962,   71, 2963,   71, 2959, 2964,   71, 2965,   71,
+     2966,   71,   71, 2968,   71,   71,   71,   71,   71,   71,
+       71, 2967, 2973,   71, 2969,   71,   71,   71, 2970,   71,
+     2977,   71, 2976, 2974, 2979,   71,   71, 2971, 2972, 2975,
 
-     2979,   71,   71,   71, 2982,   71, 2977,   71, 2983, 2975,
-       71,   71,   71, 2986, 2987,   71, 2978, 2980, 2984,   71,
-       71, 2981,   71,   71,   71,   71, 2988,   71, 2989, 2991,
-     2985, 2992,   71, 2993,   71,   71,   71,   71,   71,   71,
-     2997, 2990, 2999,   71, 2994, 2995,   71, 2998,   71, 2996,
-       71,   71, 3001, 3004,   71, 3005, 3002, 3000, 3006,   71,
-       71, 3010,   71,   71, 3012, 3003,   71, 3013, 3011,   71,
-       71, 3007, 3008,   71, 3014,   71,   71, 3018, 3015, 3009,
-     3016, 3019,   71,   71,   71, 3021,   71,   71,   71, 3020,
-       71, 3022,   71,   71, 3027, 3017,   71, 3024,   71, 3030,
+     2978,   71,   71, 2983, 2981, 2980,   71, 2986,   71, 2985,
+       71,   71,   71,   71, 2984, 2988,   71, 2982,   71,   71,
+       71,   71, 2987,   71, 2992,   71, 2996,   71, 2991, 2993,
+     2989, 2998,   71,   71, 2990,   71, 2994, 3003, 2997, 2999,
+       71, 3000,   71,   71, 3002, 2995,   71,   71,   71,   71,
+     3001,   71,   71, 3009, 3008,   71, 3011,   71,   71, 3007,
+     3005,   71,   71, 3004,   71,   71,   71, 3010,   71,   71,
+     3006, 3012,   71, 3021,   71, 3018, 3013,   71, 3015, 3014,
+     3017, 3019, 3023,   71,   71, 3026,   71,   71,   71, 3016,
+     3028,   71,   71, 3020, 3022,   71, 3027, 3024,   71, 3029,
 
-       71,   71, 3031,   71,   71,   71,   71, 3023,   71,   71,
-     3034, 3025, 3026, 3032, 3029, 3028, 3033,   71, 3038,   71,
-       71,   71, 3037,   71, 3039, 3035,   71, 3036,   71, 3042,
-       71, 3044,   71, 3040,   71, 3045,   71, 3046, 3049,   71,
-       71,   71, 3043, 3047,   71, 3048, 3050, 3041,   71,   71,
-     3051, 3052,   71,   71, 3058,   71, 3053,   71,   71, 3055,
-     3054,   71, 3056, 3057,   71,   71, 3060,   71,   71, 3061,
-       71, 3064, 3065,   71,   71,   71, 3068, 3059, 3069,   71,
-     3080,   71, 3071,   71, 3062,   71, 3063, 3066, 3070, 3072,
-       71,   71, 3073, 3067,   71,   71, 3074,   71, 3080, 3075,
+     3030,   71, 3031,   71, 3025,   71,   71, 3032, 3034,   71,
+       71, 3035, 3033, 3039, 3036,   71,   71,   71,   71,   71,
+     3037,   71, 3042, 3044,   71, 3038, 3045,   71, 3041, 3040,
+       71, 3048,   71,   71,   71,   71, 3046, 3055, 3043, 3051,
+       71,   71, 3052,   71, 3056,   71,   71,   71, 3049, 3047,
+       71,   71, 3050,   71, 3054,   71, 3060, 3061,   71, 3057,
+     3058, 3062,   71,   71,   71, 3059,   71,   71, 3066,   71,
+       71,   71, 3068,   71, 3063, 3064,   71, 3065, 3075,   71,
+       71, 3073,   71, 3070, 3071, 3074, 3067,   71, 3069,   71,
+     3079,   71, 3072,   71, 3081,   71, 3082,   71, 3080,   71,
 
-     3078,   71, 3079,   71, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3076, 3080, 3077,   43,   43,   43,
-       43,   43,   43,   43,   48,   48,   48,   48,   48,   48,
-       48,   53,   53,   53,   53,   53,   53,   53,   59,   59,
-       59,   59,   59,   59,   59,   64,   64,   64,   64,   64,
-       64,   64,   74,   74, 3080,   74,   74,   74,   74,  142,
-      142, 3080, 3080, 3080,  142,  142,  144,  144, 3080, 3080,
-      144, 3080,  144,  146, 3080, 3080, 3080, 3080, 3080,  146,
-      149,  149, 3080, 3080, 3080,  149,  149,  151, 3080, 3080,
-     3080, 3080, 3080,  151,  153,  153, 3080,  153,  153,  153,
+       71,   71, 3076, 3087, 3083, 3077, 3084,   71, 3078,   71,
+     3088,   71, 3085,   71, 3090,   71, 3086,   71, 3089,   71,
+       71, 3091,   71,   71, 3096,   71,   71, 3093,   71, 3099,
+       71, 3100,   71,   71,   71,   71,   71,   71, 3092, 3098,
+     3103, 3094, 3095, 3101, 3097,   71, 3102,   71, 3107,   71,
+     3106,   71, 3104,   71, 3108, 3105,   71, 3111, 3109,   71,
+     3113,   71, 3114,   71,   71,   71, 3118,   71, 3115,   71,
+       71, 3116, 3112,   71, 3119, 3120,   71, 3110, 3121,   71,
+       71,   71,   71, 3122, 3117,   71, 3125, 3123,   71, 3124,
+     3127,   71,   71, 3129,   71,   71,   71, 3130,   71, 3133,
 
-      153,   75,   75, 3080,   75,   75,   75,   75,   13, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080
+       71, 3126, 3134,   71, 3128,   71, 3137, 3138,   71,   71,
+     3140,   71,   71, 3131, 3132, 3135, 3139, 3141,   71, 3136,
+       71,   71,   71,   71, 3147,   71, 3143, 3142, 3144, 3148,
+       71, 3145, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3146,   43,   43,   43,   43,   43,   43,   43,   48,
+       48,   48,   48,   48,   48,   48,   53,   53,   53,   53,
+       53,   53,   53,   59,   59,   59,   59,   59,   59,   59,
+       64,   64,   64,   64,   64,   64,   64,   74,   74, 3149,
+       74,   74,   74,   74,  142,  142, 3149, 3149, 3149,  142,
+      142,  144,  144, 3149, 3149,  144, 3149,  144,  146, 3149,
+
+     3149, 3149, 3149, 3149,  146,  149,  149, 3149, 3149, 3149,
+      149,  149,  151, 3149, 3149, 3149, 3149, 3149,  151,  153,
+      153, 3149,  153,  153,  153,  153,   75,   75, 3149,   75,
+       75,   75,   75,   13, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149
     } ;
 
-static const flex_int16_t yy_chk[6050] =
+static const flex_int16_t yy_chk[6175] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2114,7 +2150,7 @@ static const flex_int16_t yy_chk[6050] =
         5,    3,    6,   20,    4,   20,   20,    5,   20,    6,
         7,    7,    7,    7,   20,    7,    8,    8,    8,    8,
        29,    8,    7,    9,    9,    9,   22,   22,    8,   10,
-       10,   10,   15,   25,    9,   29,   15,   25, 3086,   31,
+       10,   10,   15,   25,    9,   29,   15,   25, 3155,   31,
        10,   11,   11,   11,   11,   11,   11,   19,   79,   19,
 
        19,   30,   19,   11,   31,   79,   30,   25,   19,   19,
@@ -2126,15 +2162,15 @@ static const flex_int16_t yy_chk[6050] =
        28,   69,   28,   27,   35,   52,   32,   84,   52,   35,
        63,   63,   32,   35,   40,   33,   32,  109,   40,   35,
        37,   37,   35,   72,  109,   37,   38,   72,   40,   35,
-      767,   38,   40,   40,   38,   37,   37,   80,   37,   39,
+      720,   38,   40,   40,   38,   37,   37,   80,   37,   39,
 
        39,   38,   39,   41,   41,   38,   38,   77,   41,   80,
-       77,   39,   41,   58,  767,   58,   58,   39,   58,   66,
+       77,   39,   41,   58,  720,   58,   58,   39,   58,   66,
        89,   66,   66,   68,   66,   68,   68,   71,   68,   71,
        71,   66,   71,   81,   74,   86,   74,   74,   71,   74,
        78,   93,   89,   85,   78,   74,   74,   82,   83,   86,
        82,   83,   85,   81,   87,   88,   90,   91,   92,   94,
-       87,   93,   95,   91,   83,   96,   87,   98,   87, 1017,
+       87,   93,   95,   91,   83,   96,   87,   98,   87, 1033,
        94,   94,   92,   88,   88,   90,   91,   97,   94,   99,
        95,   97,  100,   96,   99,  101,  102,   98,  101,  103,
       104,  101,  102,  107,  105,  104,  100,  105,  108,  106,
@@ -2178,599 +2214,613 @@ static const flex_int16_t yy_chk[6050] =
       254,  255,  256,  251,  259,  260,  261,  258,  256,  262,
       263,  265,  257,  265,  261,  264,  263,  268,  264,  260,
       266,  266,  259,  267,  269,  269,  267,  270,  270,  271,
-      273,  272,  274,  273,  275,  268,  274,  277,  276,  286,
+      273,  272,  274,  273,  275,  268,  274,  277,  276,  146,
       279,  278,  279,  275,  276,  271,  272,  278,  280,  281,
-      285,  277,  283,  281,  280,  282,  282,  283,  284,  286,
-      287,  288,  289,  292,  284,  290,  290,  294,  291,  285,
+      287,  277,  283,  281,  280,  282,  282,  283,  284,  285,
+      286,  288,  289,  292,  284,  285,  290,  290,  287,  291,
 
-      281,  291,  293,  295,  297,  289,  293,  299,  287,  296,
-      296,  292,  288,  302,  298,  305,  294,  298,  300,  299,
-      301,  295,  297,  301,  300,  302,  306,  304,  309,  308,
-      316,  306,  308,  305,  298,  303,  304,  307,  310,  316,
-      307,  309,  307,  311,  303,  311,  311,  303,  314,  315,
-      310,  312,  303,  303,  303,  303,  312,  312,  307,  313,
-      317,  321,  313,  324,  315,  314,  318,  318,  314,  317,
-      319,  320,  320,  322,  323,  319,  321,  325,  322,  326,
-      331,  327,  324,  330,  332,  331,  323,  327,  328,  328,
-      332,  328,  336,  333,  326,  146,  334,  325,  333,  335,
+      281,  294,  291,  293,  295,  289,  297,  293,  296,  296,
+      286,  292,  288,  298,  285,  299,  298,  300,  301,  302,
+      294,  301,  295,  300,  297,  306,  304,  299,  336,  305,
+      306,  302,  309,  298,  303,  304,  307,  308,  310,  307,
+      308,  307,  336,  303,  144,  309,  303,  305,  315,  314,
+      310,  303,  303,  303,  303,  312,  311,  307,  311,  311,
+      312,  312,  313,  315,  316,  313,  314,  317,  321,  314,
+      318,  318,  319,  316,  320,  320,  317,  319,  323,  322,
+      324,  325,  326,  321,  322,  327,  328,  328,  330,  328,
+      323,  327,  339,  339,  345,  331,  332,  326,  328,  324,
 
-      328,  334,  335,  330,  335,  337,  336,  334,  337,  338,
-      339,  339,  342,  340,  341,  341,  345,  342,  338,  340,
-      343,  337,  347,  343,  337,  346,  337,  375,  375,  343,
-      349,  351,  348,  343,  351,  352,  345,  347,  354,  355,
-      359,  343,  344,  344,  349,  344,  346,  348,  355,  352,
-      351,  356,  358,  354,  357,  360,  356,  356,  344,  359,
-      357,  344,  361,  344,  362,  344,  353,  364,  353,  353,
-      360,  361,  365,  358,  366,  368,  369,  370,  353,  371,
-      353,  353,  353,  362,  363,  353,  372,  373,  366,  367,
-      363,  372,  365,  364,  371,  367,  369,  370,  368,  367,
+      331,  325,  332,  337,  333,  334,  337,  340,  330,  333,
+      334,  338,  335,  340,  345,  335,  334,  335,  342,  337,
+      338,  346,  337,  342,  337,  341,  341,  343,  347,  348,
+      343,  349,  351,  352,  142,  351,  343,  355,  354,  359,
+      343,  358,  346,  347,  348,  349,  355,  352,  343,  344,
+      344,  351,  344,  354,  356,  357,  360,  361,  359,  356,
+      356,  357,  358,  362,  364,  344,  361,  366,  344,   70,
+      344,  360,  344,  353,  363,  353,  353,  365,  368,  371,
+      363,  366,  362,  373,  369,  353,  370,  353,  353,  353,
+      364,  372,  353,  367,  371,  376,  372,  365,  373,  367,
 
-      374,  376,  373,  377,  378,  379,  374,  380,  381,  382,
-      384,  379,  385,  386,  382,  377,  383,  383,  378,  383,
-      387,  376,  389,  388,  381,  388,  389,  390,  385,  386,
-      384,  390,  380,  392,  387,  391,  391,  396,  393,  394,
-      395,  397,  398,  388,  400,  399,  390,  404,  398,  400,
-      397,  396,  392,  393,  399,  394,  401,  402,  395,  403,
-      401,  397,  409,  397,  405,  403,  402,  406,  404,  407,
-      405,  406,  407,  408,  410,  410,  411,  414,  408,  412,
-      412,  413,  409,  415,  415,  416,  413,  418,  417,  411,
-      414,  416,  417,  419,  420,  421,  422,  422,  423,  420,
+      377,  368,  374,  367,  369,  378,  370,  379,  374,  375,
+      375,  380,  377,  379,  381,  376,  382,  383,  383,  378,
+      383,  382,  384,  385,  386,  389,  388,  387,  388,  389,
+      381,  390,  391,  391,  392,  390,  380,  393,  394,  385,
+      386,  387,  384,  395,  396,  399,  388,  397,  411,  411,
+      390,  399,  393,  392,  394,  400,  397,  398,  396,  402,
+      401,  395,  398,  402,  400,  401,  404,  397,  403,  397,
+      398,  398,  404,  405,  398,  398,  406,  403,  408,  407,
+      409,  408,  406,  407,  410,  409,  412,  413,  413,  415,
+      414,  416,  416,  419,  405,  414,  418,  417,  420,  412,
 
-      421,  424,  418,  426,  425,  422,  427,  428,  429,  427,
-      423,  428,  430,  430,  419,  426,  432,  434,  431,  437,
-      429,  424,  425,  431,  433,  433,  436,  436,  438,  439,
-      440,  441,  444,  443,  445,  446,  438,  432,  439,  434,
-      437,  446,  449,  441,  450,  447,  454,  449,  445,  448,
-      440,  443,  444,  443,  447,  448,  451,  452,  450,  453,
-      452,  454,  455,  456,  451,  458,  457,  451,  455,  457,
-      459,  458,  460,  453,  461,  463,  462,  460,  465,  463,
-      464,  466,  467,  456,  459,  464,  466,  468,  469,  458,
-      472,  474,  475,  465,  473,  474,  461,  462,  467,  477,
+      418,  421,  415,  417,  410,  422,  421,  425,  419,  424,
+      422,  423,  423,  426,  427,  428,  433,  430,  428,  420,
+      423,  424,  431,  431,  429,  432,  427,  425,  429,  430,
+      432,  426,  434,  434,  435,  437,  437,  433,  438,  439,
+      440,  441,  442,  445,  444,  447,  446,  439,  448,  440,
+      450,  447,  449,  451,  442,  450,  435,  448,  449,  438,
+      446,  441,  444,  445,  444,  452,  453,  451,  454,  453,
+      455,  456,  457,  452,  459,  458,  452,  456,  458,  460,
+      459,  461,  454,  462,  464,  455,  461,  463,  464,  465,
+      467,  466,  457,  460,  465,  467,  468,  469,  459,  473,
 
-      476,  469,  479,  477,  144,  482,  468,  470,  470,  473,
-      472,  475,  487,  470,  482,  470,  476,  479,  481,  478,
-      480,  470,  484,  470,  478,  480,  470,  470,  478,  483,
-      486,  489,  487,  470,  481,  483,  485,  481,  484,  485,
-      483,  488,  488,  490,  490,  491,  492,  493,  494,  495,
-      496,  498,  497,  486,  499,  496,  489,  500,  492,  502,
-      491,  497,  493,  500,  507,  505,  506,  494,  502,  499,
-      498,  495,  503,  504,  508,  509,  503,  505,  510,  504,
-      511,  506,  512,  507,  511,  513,  514,  513,  508,  517,
-      509,  515,  515,  516,  514,  512,  510,  518,  519,  516,
+      470,  476,  489,  489,  481,  462,  466,  474,  463,  481,
+      475,  477,  468,  470,  475,   64,  469,  471,  471,  473,
+      476,  479,  474,  471,  478,  471,  479,  477,  478,  480,
+      479,  471,  482,  471,  484,  487,  471,  471,  483,  485,
+      484,  488,  490,  471,  480,  484,  486,  483,  482,  486,
+      492,  482,  491,  491,  493,  485,  494,  495,  487,  496,
+      498,  488,  500,  497,  499,  492,  493,  490,  497,  498,
+      503,  494,  501,  506,  507,  508,  495,  500,  501,  503,
+      504,  496,  505,  499,  504,  506,  509,  510,  505,  507,
+      511,  512,  513,  515,  508,  512,  514,  518,  514,  520,
 
-      521,  517,  520,  518,  522,  520,  523,  525,  526,  524,
-      519,  523,  524,  142,  521,  527,  525,  528,  535,  522,
-      527,  527,  536,  525,  526,  536,  525,  529,  529,  531,
-      528,  530,  530,  532,  532,  531,  533,  533,  534,  535,
-      537,  538,  539,  540,  534,  537,  540,  541,  542,  543,
-      539,  544,  541,  545,  546,  544,  547,  548,  546,  545,
-      538,  549,  548,  550,  551,  553,  555,  552,  543,   70,
-      551,  542,  552,  554,  547,  557,  554,  549,  558,  553,
-      565,  554,  562,  550,  555,  554,  556,  556,  561,  565,
-      559,  560,  564,  557,  558,  559,  560,  562,  564,  568,
+      509,  515,  510,  516,  516,  513,  517,  519,  511,  518,
+      522,  520,  517,  519,  521,  523,  524,  521,  526,  525,
+      527,  524,  525,  528,  522,  529,  536,  526,  528,  528,
+      523,  530,  530,  543,  526,  532,  527,  526,  529,  531,
+      531,  532,  533,  533,  534,  534,  535,  536,  537,  538,
+      539,  537,  535,  540,  538,  541,  543,  542,  541,  544,
+      545,  540,  542,  547,  545,  546,  548,  547,  549,  539,
+      552,  546,  550,  549,  551,  551,  553,  554,  544,  555,
+      556,  557,  554,  558,  548,  552,  550,  557,  558,  559,
+      560,  561,  563,  560,  565,  555,  564,  553,  560,  565,
 
-      566,  567,  561,  566,  568,  567,  569,  570,  571,  569,
-      572,  573,  570,  574,  575,  576,  577,  577,  573,  575,
-      578,  579,  580,  581,  571,  582,  574,  567,  572,  578,
-      583,  585,  581,  584,  585,  576,  583,  582,  580,  584,
-      579,  586,  586,  587,  586,  588,  587,  589,  590,  591,
-      588,  592,  593,  601,  594,  591,  592,  594,  593,  595,
-      597,  596,  590,  598,  595,  589,  596,  596,  613,  599,
-      602,  600,  601,  597,  599,  603,  598,  600,  604,  602,
-      603,  605,  605,  606,  607,  608,   64,  607,  599,  599,
-      606,  608,  609,  613,  610,  611,  612,  612,  604,  610,
+      556,  566,  560,  559,  562,  562,  566,  567,  568,  561,
+      563,  570,  564,  571,  574,  572,  573,  570,  572,  574,
+      573,  567,  571,  568,  575,  576,  579,  575,  577,  578,
+      576,  581,  580,  579,  582,  586,  581,  583,  583,  584,
+      585,  587,  573,  588,  577,  580,  589,  578,  584,  595,
+      587,  586,  589,  610,  582,  588,  590,  591,  593,  585,
+      591,  593,  590,  592,  592,  594,  592,  595,  596,  597,
+      594,  598,  599,  610,  600,  597,  598,  600,  599,  601,
+      602,  603,  596,  604,  601,  602,  602,  605,  608,  606,
+      607,  615,  605,  609,  603,  606,  604,  608,  609,  611,
 
-      611,  611,  607,  614,  609,  614,  615,  616,  617,  616,
-      618,  619,  620,  621,  622,  623,  627,  625,  624,  623,
-      622,  626,  628,  629,  630,  615,  617,  624,  618,  619,
-      632,  620,  625,  621,  627,  629,  626,  631,  633,  630,
-      634,  628,  635,  631,  632,  636,  637,  638,  639,  636,
-      633,  640,  641,  642,  643,  644,  644,   59,  642,  634,
-      646,  635,  647,  638,  637,  651,  639,  648,  643,  640,
-      640,  641,  645,  647,  650,  649,  645,  658,  652,  646,
-      649,  648,  653,  654,  651,  655,  661,   54,  654,  653,
-      650,  652,  655,  656,  657,  658,  659,  660,  656,  657,
+      611,  612,  613,  615,  614,  613,  605,  605,  612,  607,
+      614,  616,  617,  618,  618,  619,  616,  617,  617,  620,
+      613,  620,  621,  622,  623,  622,  624,  625,  626,  627,
+      628,  629,  633,  631,  630,  629,  628,  632,  634,  635,
+      619,  621,  623,  630,  624,  625,  636,  626,  631,  627,
+      633,  635,  632,  637,  638,  639,  640,  634,  641,  637,
+      642,  636,  643,  644,  642,  645,  646,  639,  638,  647,
+      652,  648,  649,  650,  650,  640,  648,  641,  651,  644,
+      643,  653,  651,  645,  646,  646,  649,  654,  647,  652,
+      655,  656,  653,  657,  660,  655,  658,  659,  661,  660,
 
-      661,  662,  663,  659,  664,  665,  660,  666,  665,  664,
-      662,  666,  667,  668,  663,  669,  671,  670,  672,  672,
-      673,  673,  668,  674,  674,  675,  667,  677,  679,  673,
-      669,  670,  678,  681,  675,  680,  682,  671,  678,  680,
-      683,  684,  685,  688,  686,  681,  677,  684,  679,  687,
-      685,  686,  689,  695,  692,  698,  699,  707,  683,  700,
-      704,  682,  699,  705,  698,  702,  702,  687,  688,  692,
-      695,  704,  689,  690,  706,  700,  701,  707,  690,  711,
-      701,  705,  690,  703,  703,  690,  710,  712,  706,  714,
-      708,  710,  690,  690,   53,  690,  708,  709,  709,  709,
+      664,  654,  667,  662,  659,  661,  663,  656,  662,  658,
+      665,  663,  657,  666,  668,  669,  667,  665,  664,  670,
+      673,  675,  666,  668,  670,  671,  672,  669,  671,  674,
+      672,  676,  677,  683,  673,  685,  675,  681,  674,  678,
+      678,  679,  679,  680,  680,  676,  681,  686,  684,  687,
+      679,  686,  683,  677,  684,  685,  688,  689,  690,  691,
+      693,  687,  692,  694,  690,  695,  705,  691,  698,  692,
+      701,  704,  705,  707,  706,  689,   59,  707,  693,  711,
+      704,  688,  710,  698,  713,  695,  712,  701,  694,  696,
+      706,  708,  708,  710,  696,  709,  709,  711,  696,  714,
 
-      711,  709,  713,  715,  709,  712,  715,  716,  716,  709,
-      719,  717,  718,  718,  714,  709,  709,  713,  717,  720,
-      720,  721,  726,  723,  722,  719,  721,  722,  723,  724,
-      724,  725,  727,  725,  726,  728,  729,  731,  730,  728,
-      732,  732,  737,  733,  736,  731,  734,  735,  735,  738,
-      740,  727,   48,  739,  737,  740,  729,  730,  733,  739,
-      734,  742,  736,  741,  741,  744,  742,  742,  745,  746,
-      744,  738,  747,  748,  745,  746,  750,  747,  749,  748,
-      751,  749,  750,  752,  752,  753,  753,  754,  751,  755,
-      757,  756,  758,  759,  759,  754,  756,  757,  761,  760,
+      712,  696,  716,  718,  713,  714,  717,  716,  696,  696,
+      722,  696,  715,  715,  715,  722,  715,  723,  719,  715,
+      724,  718,  719,  725,  715,  721,  730,  717,   54,  721,
+      715,  715,  727,  727,  726,  724,  723,  726,  728,  729,
+      729,  730,  731,  731,  732,  728,  734,  733,  725,  732,
+      733,  734,  735,  735,  736,  737,  736,  738,  739,  740,
+      742,  741,  739,  743,  743,  748,  744,  737,  742,  745,
+      746,  746,  747,  749,  752,  752,  738,  748,  750,  740,
+      741,  744,  751,  745,  750,   53,  753,  751,  755,  762,
+      747,  753,  753,  755,  756,  749,  757,  762,  758,  759,
 
-      763,  765,  773,  762,  766,  769,  761,  755,  760,  762,
-      765,  758,  768,  766,  769,  770,  771,  768,  770,  763,
-      772,  771,  774,  775,  776,  777,  777,  773,  778,  776,
-      776,  774,  779,  780,  772,  781,  775,  782,  789,  784,
-      782,  784,  780,  778,  785,  785,  786,  787,  782,  788,
-      791,  779,  787,  790,  792,  793,  794,  795,  789,  781,
-      796,  795,  797,  798,  793,  800,  799,  786,  801,  798,
-      788,  802,  791,  790,  792,  799,  803,  800,  796,  794,
-      804,  797,  803,  805,  807,  802,  808,  801,  805,  806,
-      806,  809,  810,  811,  804,  808,  812,  813,  817,  814,
+      756,  760,  757,  758,  760,  759,  761,  763,  763,  764,
+      764,  765,  761,  766,  768,  767,  769,  770,  770,  765,
+      767,  768,  772,  771,  774,  776,  778,  773,  777,  780,
+      772,  766,  771,  773,  776,  769,  779,  777,  780,  781,
+      782,  779,  781,  774,  783,  782,  784,  785,  786,  787,
+      778,  788,  788,  789,  787,  787,  785,  790,  783,  792,
+      791,  786,  793,  797,  795,  793,  795,  798,  789,  791,
+      799,  784,  798,  793,  796,  796,  790,  800,  801,  802,
+      803,  804,  805,  792,  797,  806,  807,  808,  809,  806,
+      804,  799,  812,  810,  809,  811,  813,  800,  801,  815,
 
-      810,  815,  816,  818,  807,  819,  822,  815,  816,  818,
-      822,  809,  817,  811,  820,  821,  813,  823,  812,  814,
-      820,  821,  824,  825,  826,  819,  827,  827,  825,  828,
-      829,  830,  832,  829,  824,  828,  823,  831,  832,  833,
-      834,  834,  824,  835,  841,  826,  836,  837,  837,  830,
-      831,  836,  838,  839,  840,  840,  842,  839,  843,  833,
-      844,  835,  846,  843,  847,  849,  841,  838,  850,  852,
-      852,  853,  854,  855,  855,  853,  842,  856,  847,  844,
-      857,  858,   43,  859,  857,  849,  846,  854,  867,  850,
-      851,  861,  865,  851,  863,  851,  858,  859,  860,  851,
+      803,  802,  810,  814,  807,  805,  808,  811,  818,  814,
+      813,  812,  816,  815,  817,  817,  819,  816,  820,  821,
+      822,  823,  824,  826,  825,  819,  827,  821,  818,  826,
+      829,  828,  827,  830,  837,  833,  829,  834,  820,  833,
+      822,  824,  831,  823,  825,  828,  832,  835,  831,  836,
+      838,  838,  832,  830,  836,  837,  834,  839,  840,  835,
+      841,  840,  842,  839,  843,  844,  846,  835,  845,  845,
+      843,  847,  848,  848,  849,  842,  847,  850,  841,  851,
+      851,  850,  852,  853,  846,  844,  854,  855,  857,  849,
+      860,  854,  861,  858,  863,  863,  864,  866,  866,  867,
 
-      867,  851,  856,  860,  862,  861,  851,  865,  863,  862,
-      862,  851,  864,  868,  866,  870,  864,  869,  868,  866,
-      871,  872,  875,  875,  873,  878,  874,  872,  864,  866,
-      873,  869,  874,  876,  871,  877,  870,  879,  876,  880,
-      882,  877,  885,  883,  886,  886,  884,  878,  883,  889,
-      887,  890,  882,  888,  885,  887,  879,  880,  881,  881,
-      884,  888,  891,  889,  881,  892,  881,  893,  893,  894,
-      890,  898,  881,  894,  896,  899,  897,  881,  881,  897,
-      896,  891,  901,  892,  881,  900,  902,  901,  899,  904,
-      898,  900,  905,  906,  907,  908,  909,  910,  904,  911,
+      864,  865,  890,  853,  852,  868,  855,  858,  870,  868,
+      860,  869,  857,  861,  862,  871,  865,  862,  872,  862,
+      871,  890,  870,  862,  867,  862,  869,  874,  873,  876,
+      862,  880,  872,  873,  873,  862,  875,  878,  877,  881,
+      875,  874,  879,  877,  876,  880,   48,  879,  882,  878,
+      883,  884,  875,  877,  889,  885,  883,  884,  886,  886,
+      881,  885,  882,  887,  888,  891,  893,  894,  887,  896,
+      888,  899,  894,  895,  897,  897,  889,  898,  893,  899,
+      900,  896,  898,  891,  892,  892,  901,  895,  902,  904,
+      892,  905,  892,  903,  900,  904,  905,  906,  892,  908,
 
-      907,  905,  910,  912,  908,  902,  913,  915,  914,  906,
-      918,  923,  916,  921,  924,  909,  915,  912,  917,  911,
-      914,  916,  919,  925,  917,  923,  913,  918,  919,  921,
-      926,  927,  928,  929,  924,  930,  933,  934,  929,  936,
-      930,  933,  925,  937,  926,  936,  934,  928,  939,  927,
-      935,  935,  940,  943,  944,  945,  937,  940,  940,  941,
-      941,  946,  942,  941,  939,  942,  949,  943,  947,  948,
-      950,  945,  949,  952,  944,  953,  951,  954,  957,  946,
-      953,  947,  951,  956,  948,  960,  956,  958,  952,  959,
-      950,  954,  958,  961,  959,  962,  963,  965,  961,  957,
+      907,  909,  909,  892,  892,  901,  914,  902,  910,  903,
+      892,  913,  910,  912,  913,  906,  907,  908,  915,  912,
+      916,  918,  917,  920,  921,  914,  916,  917,  922,  923,
+      924,  915,  920,  921,  925,  923,  926,  927,  928,  924,
+      918,  926,  929,  930,  922,  931,  934,  932,  940,  943,
+      937,  941,  928,  925,  931,  930,  932,  927,  933,  935,
+      939,  942,  929,  934,  933,  935,  937,  943,  940,  944,
+      941,  945,  946,  949,  939,  942,  945,  946,  949,  950,
+      951,  951,  953,  952,  944,  955,  956,  958,  950,  952,
+      958,  956,  956,  957,  957,  953,  959,  957,  960,  961,
 
-      962,  960,  966,  965,  967,  968,  969,  969,  963,  971,
-      967,  968,  970,  972,  973,  973,  972,  974,  966,  975,
-      976,  970,  977,  978,  979,  977,  980,  971,  981,  982,
-      979,  986,  980,  981,  982,  974,  978,  983,  975,  984,
-      976,  987,  983,  989,  988,  984,  990,  990,  989,  986,
-      988,  991,  993,  992,  994,  995,  996,  997,  995,  996,
-      991,  987,  992,  998,  999, 1000, 1001, 1003,  997, 1002,
-      993, 1006, 1001,  994, 1004, 1002,  999, 1005, 1005, 1004,
-     1007,  998, 1003, 1008, 1000, 1009, 1010, 1011, 1012, 1009,
-     1006, 1013, 1015, 1019, 1007, 1008, 1011, 1016, 1016, 1018,
+      963,  955,  962,  965,  964,  966,  967,  968,  973,  965,
+      959,  969,  967,  963,  970,  961,  969,  976,  960,  964,
+      962,  972,  968,   43,  972,  966,  974,  975,  970,  973,
+      977,  974,  975,  976,  978,  977,  979,  981,  982,  978,
+      983,  984,  986,  981,  985,  985,  983,  984,  979,  987,
+      988,  986,  990,  988,  982,  989,  989,  991,  992,  993,
+      994,  997,  993,  995, 1002,  996,  997,  987, 1003,  995,
+      990,  996,  998,  994,  999, 1000,  991,  998,  992,  999,
+     1004, 1000, 1002, 1007, 1005, 1008, 1004, 1009, 1003, 1005,
+     1006, 1006, 1007, 1010, 1008, 1011, 1012, 1013, 1011, 1012,
 
-     1020, 1021, 1023, 1023, 1010, 1022, 1021, 1012, 1019, 1024,
-       14, 1015, 1020, 1018, 1022, 1025, 1013, 1026, 1028, 1027,
-     1028, 1025, 1029, 1026, 1027, 1030, 1031, 1029, 1032, 1024,
-     1033, 1034, 1036, 1032, 1035, 1037, 1039, 1039, 1040, 1030,
-     1031, 1035, 1041, 1042, 1044, 1033,   13, 1036, 1048, 1043,
-     1034, 1045, 1040, 1048, 1037, 1043, 1045, 1051, 1042, 1050,
-     1041, 1047, 1047, 1053, 1044, 1045, 1050, 1045, 1049, 1049,
-     1045, 1051, 1052, 1054, 1055, 1052, 1056, 1057, 1059, 1058,
-     1060, 1056, 1053, 1055, 1058, 1062, 1062, 1063, 1064, 1059,
-     1065, 1054, 1063, 1064, 1067, 1066, 1057, 1068, 1067, 1060,
+     1014, 1015, 1016, 1017, 1018, 1009, 1020, 1019, 1013, 1017,
+     1018, 1020, 1010, 1015, 1021, 1021, 1022, 1023, 1014, 1025,
+     1024, 1016, 1019, 1025, 1026, 1027, 1028, 1029, 1031, 1032,
+     1032, 1023, 1024, 1035, 1027, 1022, 1034, 1036, 1037, 1039,
+     1039, 1040, 1026, 1037, 1038, 1028,   14, 1031, 1035, 1036,
+     1034, 1041, 1029, 1038, 1042, 1046, 1050, 1041, 1043, 1047,
+     1042, 1040, 1044, 1043, 1044, 1045, 1048, 1049, 1052, 1046,
+     1045, 1048, 1051, 1047, 1053, 1050, 1055, 1055, 1056, 1051,
+     1057, 1058, 1049, 1052, 1059, 1060, 1063, 1063, 1065, 1065,
+     1059, 1070, 1056, 1053, 1061, 1064, 1058, 1066, 1057, 1061,
 
-     1066, 1069, 1070, 1071, 1074, 1073, 1068, 1072, 1076, 1075,
-     1065, 1074, 1077, 1078, 1080, 1081, 1069, 1070, 1079, 1072,
-     1073, 1075, 1071, 1082, 1079, 1083, 1084, 1076, 1087, 1080,
-     1086, 1078, 1088, 1077, 1083, 1081, 1086, 1089, 1091, 1090,
-     1088, 1093, 1087, 1082, 1090, 1094, 1084, 1092, 1095, 1099,
-     1091, 1098, 1092, 1092, 1096, 1096,    0, 1089, 1099, 1094,
-     1093, 1095, 1097, 1100, 1098, 1101, 1101, 1097, 1102, 1100,
-     1097, 1097, 1104, 1102, 1103, 1097, 1108, 1105, 1104, 1106,
-     1111, 1097, 1105, 1103, 1106, 1097, 1107, 1107, 1109, 1109,
-     1110, 1112, 1113, 1110, 1114, 1110, 1116, 1108, 1115, 1117,
+     1064, 1067, 1069, 1068, 1066, 1060, 1068, 1071, 1061, 1070,
+     1061, 1073, 1072, 1061, 1074, 1067, 1071, 1072, 1075, 1074,
+     1076, 1069, 1078, 1078, 1081, 1085, 1079, 1080, 1082, 1075,
+     1073, 1079, 1080, 1082, 1083, 1086, 1084, 1087, 1083, 1076,
+     1085, 1088, 1089, 1091, 1081, 1084, 1092, 1090, 1093, 1094,
+     1086, 1096, 1095, 1088, 1090, 1091, 1087, 1089, 1095, 1097,
+     1098, 1099, 1100, 1101, 1102, 1092, 1096, 1094, 1103, 1093,
+     1099, 1104, 1105, 1108, 1110, 1107, 1102, 1100, 1112, 1097,
+     1098, 1107, 1101, 1109, 1111, 1114, 1104, 1108, 1115, 1111,
+     1112, 1109, 1105, 1103, 1110, 1113, 1116, 1117, 1117, 1119,
 
-     1111, 1113, 1118, 1115, 1122, 1119,    0, 1120, 1118, 1112,
-     1116, 1119, 1120, 1122, 1114, 1121, 1128, 1117, 1122, 1121,
-     1122, 1125, 1122, 1129, 1122, 1123, 1123, 1124, 1124, 1127,
-     1124, 1128, 1125, 1127, 1130, 1133, 1135, 1132, 1139, 1131,
-     1136, 1129, 1134, 1130, 1131, 1131, 1132, 1134, 1137, 1136,
-     1135, 1138, 1139, 1140, 1141, 1141, 1142, 1133, 1143, 1140,
-     1144, 1145, 1146, 1147, 1142, 1144, 1148, 1137, 1149, 1151,
-     1138, 1146, 1143, 1149, 1157, 1145, 1150, 1150, 1152, 1152,
-     1153, 1147, 1153, 1155, 1151, 1156, 1155, 1158, 1159, 1159,
-     1156, 1148, 1160, 1157, 1161, 1161, 1158, 1162, 1162, 1163,
+     1113, 1113, 1115, 1123, 1114, 1120, 1133, 1121, 1123, 1116,
+     1118, 1124, 1119, 1121, 1120, 1118, 1122, 1122, 1118, 1118,
+     1124, 1125, 1129, 1118, 1133, 1126, 1127, 1125, 1132, 1118,
+     1126, 1127, 1134, 1118, 1128, 1128, 1130, 1130, 1135, 1131,
+     1136, 1134, 1131, 1129, 1131, 1136, 1137, 1138, 1132, 1139,
+     1140, 1149, 1141, 1143,   13, 1139, 1140, 1141, 1135, 1142,
+     1137, 1146, 1143, 1142, 1148, 1138, 1149, 1143, 1148, 1143,
+     1150, 1143, 1146, 1143, 1144, 1144, 1145, 1145, 1151, 1145,
+     1152, 1153, 1154, 1156, 1155, 1152, 1152, 1151, 1150, 1155,
+     1153, 1157, 1158, 1159, 1160, 1161, 1169, 1156, 1162, 1162,
 
-     1164, 1165, 1166, 1166, 1163, 1167, 1168, 1169, 1170, 1168,
-     1171, 1173, 1160, 1170, 1172, 1175, 1172, 1176, 1175, 1171,
-     1178, 1164, 1165, 1177, 1188, 1167, 1179, 1169, 1177, 1173,
-     1180, 1179, 1176, 1185, 1178, 1181, 1182, 1188, 1180, 1184,
-     1181, 1182, 1183, 1183, 1184, 1195, 1186, 1187, 1192, 1190,
-     1191, 1185, 1186, 1192, 1187, 1190, 1191, 1193, 1194, 1196,
-     1197, 1197, 1198, 1193, 1195, 1200, 1201, 1194, 1202, 1203,
-     1196, 1204, 1206, 1207, 1202, 1203, 1208, 1204, 1206, 1209,
-     1210, 1211, 1198, 1212, 1212, 1200, 1213, 1207, 1214, 1201,
-     1215, 1209, 1216, 1207, 1210, 1218, 1208, 1216, 1219, 1211,
+     1157, 1161, 1163, 1164, 1154, 1166, 1167, 1168, 1160, 1165,
+     1163, 1158, 1159, 1170, 1165, 1167, 1172, 1164, 1170, 1166,
+     1178, 1169, 1171, 1171, 1181, 1168, 1173, 1173, 1174, 1176,
+     1174, 1172, 1176, 1177, 1179, 1180, 1180, 1184, 1177, 1178,
+     1182, 1182, 1184, 1179, 1181, 1183, 1183, 1185, 1186, 1187,
+     1187, 1188, 1189, 1190, 1191, 1189, 1192, 1194, 1193, 1191,
+     1193, 1196, 1197,    0, 1196, 1192, 1199, 1198, 1185, 1186,
+     1201, 1188, 1198, 1190, 1200, 1194, 1202, 1197, 1201, 1200,
+     1199, 1202, 1203, 1204, 1204, 1205, 1206, 1203, 1207, 1208,
+     1205, 1211, 1209, 1212, 1207, 1213, 1208, 1211, 1216, 1212,
 
-     1217, 1217, 1221, 1219, 1222, 1223, 1213, 1224, 1215, 1222,
-     1222, 1225, 1226, 1214, 1227, 1228, 1224, 1229, 1218, 1225,
-     1284, 1221, 1229, 1223, 1231, 1229, 1226, 1238, 1284, 1227,
-     1228, 1233, 1230, 1228, 1230, 1234, 1235, 1233, 1231, 1234,
-     1236, 1237, 1243, 1239, 1240, 1236, 1236, 1235, 1241, 1240,
-     1242, 1245, 1246, 1238, 1247, 1242, 1248, 1248, 1250, 1249,
-     1237, 1239, 1243, 1249, 1251, 1245, 1241, 1252, 1253, 1254,
-     1246, 1255, 1247, 1252, 1256, 1257, 1250, 1258,    0, 1259,
-     1253, 1262, 1261, 1251, 1259, 1255, 1260, 1261, 1254, 1256,
-     1257, 1263, 1265, 1260, 1264, 1264, 1258, 1266, 1266, 1262,
+     1213, 1214, 1215, 1217, 1206, 1209, 1219, 1214, 1218, 1218,
+     1221, 1215, 1222, 1223, 1217, 1224, 1225, 1216, 1227, 1223,
+     1228, 1224, 1225, 1229, 1227, 1230, 1219, 1231, 1232, 1234,
+     1221, 1233, 1233, 1235, 1228, 1222, 1236, 1230, 1239, 1237,
+     1228, 1231, 1244, 1229, 1237, 1240, 1232, 1238, 1238, 1234,
+     1240, 1242, 1247, 1248, 1236, 1245, 1249, 1243, 1235, 1246,
+     1244, 1239, 1243, 1243, 1245, 1252, 1247, 1246, 1248, 1258,
+     1242, 1249, 1250, 1251, 1249, 1251, 1254, 1250, 1256, 1252,
+     1250, 1255, 1254, 1259, 1260, 1255, 1257, 1262, 1258, 1256,
+     1261, 1257, 1257, 1263, 1264, 1261, 1266, 1267, 1263, 1268,
 
-     1263, 1268, 1267, 1278, 1269, 1270, 1271, 1265, 1267, 1269,
-     1279, 1270, 1271, 1272, 1272, 1273, 1273, 1275, 1275, 1276,
-     1277, 1278, 1268, 1276, 1279, 1280, 1281, 1282, 1282, 1277,
-     1283, 1285, 1286, 1281, 1287, 1290, 1285, 1288, 1292, 1289,
-     1280, 1293, 1288, 1288, 1289, 1289, 1286, 1291, 1291, 1294,
-     1283, 1295, 1296, 1287, 1297, 1290, 1295, 1292, 1294, 1298,
-     1293, 1299, 1301, 1300, 1302, 1303, 1304, 1299, 1300, 1305,
-     1302, 1296, 1304, 1306, 1297, 1305, 1307, 1298, 1308, 1309,
-     1310, 1311, 1313, 1313, 1303, 1312, 1314, 1315, 1301, 1314,
-     1316, 1316, 1306, 1320, 1310, 1307, 1318, 1308, 1309, 1315,
+     1269, 1269, 1260, 1270, 1271, 1262, 1272, 1270, 1274, 1259,
+     1266, 1275, 1273, 1276, 1264, 1267, 1277, 1268, 1273, 1278,
+     1274, 1279, 1271, 1280, 1282, 1272, 1281, 1276, 1280, 1282,
+     1275, 1277, 1283, 1281, 1278, 1284, 1285, 1285, 1286, 1287,
+     1279, 1288, 1289, 1289, 1284, 1290, 1291, 1294, 1287, 1307,
+     1283, 1290, 1293, 1286, 1292, 1292, 1307, 1295, 1293, 1296,
+     1291, 1288, 1295, 1297, 1304, 1296, 1298, 1298, 1294, 1297,
+     1299, 1299, 1301, 1301, 1302, 1303, 1305, 1306, 1302, 1308,
+     1308, 1309, 1304, 1310, 1303, 1312, 1313, 1316, 1311, 1314,
+     1305, 1310, 1306, 1311, 1314, 1314, 1318, 1315, 1319, 1312,
 
-     1312, 1318, 1311, 1317, 1317, 1319, 1320, 1321, 1322, 1319,
-     1325, 1323, 1327, 1323, 1326, 1328, 1321, 1323, 1329, 1326,
-     1331, 1322, 1330, 1330, 1333, 1331, 1332, 1327, 1325, 1334,
-     1323, 1335, 1332, 1336, 1329, 1328, 1335, 1336, 1338, 1333,
-     1337, 1339, 1334, 1340, 1337, 1341, 1342, 1342, 1344, 1346,
-     1347, 1341, 1348, 1348, 1349, 1347, 1350, 1356, 1338, 1339,
-     1349, 1352, 1352, 1340, 1354, 1357, 1344, 1354, 1355, 1355,
-     1346, 1359, 1360, 1356, 1359, 1361, 1350, 1362, 1362, 1363,
-     1364, 1357, 1366, 1365, 1361, 1367, 1369, 1366, 1368, 1368,
-     1370, 1371, 1360, 1372, 1363, 1369, 1373, 1373, 1374, 1367,
+     1322, 1309, 1315, 1315, 1320, 1313, 1321, 1316, 1317, 1317,
+     1323, 1321, 1325, 1320, 1324, 1318, 1326, 1319, 1325, 1322,
+     1327, 1326, 1328, 1329, 1332, 1330, 1333, 1331, 1328, 1334,
+     1323, 1330, 1324, 1331, 1335, 1336, 1337, 1338, 1339, 1339,
+        0, 1340, 1329, 1332, 1340, 1333, 1327, 1341, 1334, 1336,
+     1342, 1342, 1338, 1335, 1343, 1343, 1344, 1337, 1345, 1341,
+     1346, 1344, 1345, 1347, 1348, 1349, 1353, 1349, 1351, 1352,
+     1354, 1349, 1347, 1346, 1352, 1355, 1358, 1348, 1356, 1356,
+     1357, 1353, 1358, 1359, 1349, 1357, 1351, 1360, 1361, 1364,
+     1354, 1355, 1362, 1361, 1365, 1363, 1362, 1366, 1359, 1363,
 
-     1376, 1364, 1365, 1375, 1377, 1376, 1371, 1379, 1370, 1378,
-     1378, 1379, 1374, 1380, 1381, 1381, 1382, 1383, 1372, 1377,
-     1384, 1375, 1385, 1390, 1384, 1386, 1388, 1388, 1383, 1389,
-     1386, 1391, 1392, 1380, 1393, 1394, 1394, 1390, 1382, 1395,
-     1396, 1385, 1397, 1398, 1395, 1400, 1392, 1389, 1399, 1403,
-     1391, 1391, 1398, 1399, 1401, 1403, 1401, 1404, 1402, 1393,
-     1396, 1405, 1397, 1402, 1407, 1400, 1409, 1405, 1408, 1408,
-     1410, 1413, 1414, 1414, 1412, 1416, 1410, 1404, 1407, 1412,
-     1415, 1415, 1417, 1418, 1419, 1409, 1422, 1419, 1424, 1416,
-     1420, 1420, 1421, 1423, 1424, 1413, 1423, 1425, 1418, 1423,
+     1360, 1367, 1368, 1368, 1370, 1372, 1373, 1367, 1376, 1364,
+     1375, 1373, 1365, 1374, 1374, 1382, 1375, 1366, 1378, 1378,
+     1380, 1383, 1370, 1380, 1381, 1381, 1372, 1385, 1376, 1386,
+     1385, 1382, 1387, 1388, 1388, 1389, 1390, 1383, 1392, 1391,
+     1393, 1387, 1395, 1392, 1394, 1394, 1396, 1397, 1398, 1386,
+     1389, 1395, 1399, 1399, 1393, 1400, 1401, 1390, 1391, 1405,
+     1402, 1403, 1397, 1405, 1396, 1402, 1404, 1404, 1406, 1400,
+     1407, 1407, 1408, 1398, 1401, 1409, 1403, 1410, 1411, 1412,
+     1415, 1410, 1414, 1414, 1412, 1416, 1409, 1417, 1406, 1418,
+     1419, 1420, 1420, 1422, 1408, 1421, 1423, 1411, 1415, 1416,
 
-     1417, 1428, 1425, 1430, 1421, 1426, 1422, 1429, 1426, 1432,
-     1428, 1423, 1429, 1431, 1433, 1432, 1431, 1434, 1434, 1433,
-     1435, 1435, 1437, 1436, 1426, 1438, 1439, 1437, 1430, 1436,
-     1440, 1441, 1442, 1443, 1444, 1442, 1445, 1446, 1438, 1443,
-     1444, 1445, 1447, 1446, 1439, 1448, 1449, 1449, 1450, 1440,
-     1448, 1441, 1451, 1450, 1452, 1453, 1457, 1454, 1455, 1460,
-     1458, 1459, 1461, 1462, 1463, 1447, 1466, 1459, 1457, 1469,
-     1451, 1454, 1455, 1458, 1452, 1453, 1470, 1462, 1467, 1460,
-     1465, 1465, 1461, 1467, 1469, 1463, 1466, 1468, 1468, 1471,
-     1470, 1472, 1473, 1474, 1476, 1475, 1477, 1481,    0, 1479,
+     1421, 1424, 1426, 1418, 1425, 1429, 1417, 1417, 1430, 1425,
+     1424, 1429, 1427, 1422, 1427, 1419, 1423, 1433, 1428, 1431,
+     1434, 1434, 1426, 1428, 1435, 1431, 1436, 1439, 1430, 1438,
+     1442, 1433, 1436, 1444, 1438, 1440, 1440, 1441, 1441, 1443,
+     1446, 1446, 1445, 1435, 1442, 1445, 1447, 1448, 1444, 1450,
+     1449, 1439, 1454, 1449, 1451, 1450, 1449, 1443, 1447, 1451,
+     1452, 1454, 1456, 1452, 1455, 1458,    0, 1448, 1449, 1455,
+     1457, 1458, 1459, 1457, 1460, 1460, 1462, 1459, 1463, 1452,
+     1461, 1461, 1462, 1463, 1464, 1465, 1466, 1456, 1467, 1468,
+     1469, 1473, 1468, 1470, 1477, 1471, 1469, 1464, 1472, 1470,
 
-     1486, 1473, 1475, 1476, 1482, 1485, 1476, 1482, 1474, 1472,
-     1483, 1483, 1477, 1471, 1479, 1484, 1484, 1485, 1486, 1479,
-     1487, 1489, 1481, 1487, 1488, 1488, 1490, 1491, 1492, 1493,
-     1494, 1495, 1491, 1492, 1489, 1496, 1501, 1499, 1497, 1505,
-     1495, 1503, 1498, 1499, 1502, 1490, 1494, 1497, 1493, 1504,
-     1497, 1498, 1500, 1500, 1496, 1505, 1501, 1502, 1506, 1503,
-     1509, 1510, 1512, 1504, 1511, 1511, 1513, 1514, 1515, 1515,
-     1506, 1517, 1514, 1518, 1519, 1513, 1517, 1516, 1512, 1510,
-     1520, 1524, 1521, 1515, 1525, 1509, 1516, 1521, 1521, 1516,
-     1523, 1518, 1526, 1527, 1528, 1519, 1524, 1526, 1520, 1527,
+     1471, 1474, 1476, 1465, 1472, 1466, 1474, 1476, 1467, 1475,
+     1475, 1478, 1477, 1479, 1473, 1480, 1481, 1483, 1482, 1484,
+     1485, 1486, 1485, 1491, 1488, 1489, 1492, 1493, 1490, 1480,
+     1481, 1478, 1482, 1479, 1490, 1483, 1488, 1494, 1489, 1497,
+     1486, 1493, 1500, 1491, 1484, 1498, 1492, 1496, 1496, 1501,
+     1498, 1499, 1499, 1502, 1503, 1504, 1505, 1500, 1494, 1497,
+     1506, 1507, 1508, 1501, 1504, 1510, 1512, 1506, 1514, 1514,
+     1507, 1505, 1503, 1507, 1515, 1515, 1513, 1502, 1508, 1513,
+     1510, 1516, 1517, 1518, 1520, 1510, 1518, 1519, 1519, 1521,
+     1522, 1512, 1524, 1516, 1523, 1522, 1525, 1520, 1526, 1523,
 
-     1529, 1529, 1530, 1532, 1523, 1531, 1525, 1533, 1530, 1532,
-     1531, 1535, 1528, 1533, 1536, 1537, 1538, 1539, 1540, 1542,
-     1539, 1537, 1544, 1545, 1540, 1546, 1539, 1542, 1536, 1538,
-     1547, 1535, 1548, 1546, 1549, 1550, 1551, 1552, 1552, 1547,
-     1553, 1544, 1545, 1555, 1557, 1548, 1553, 1549, 1554, 1550,
-     1551, 1556, 1556, 1558, 1554, 1559, 1555, 1560, 1562, 1552,
-     1561, 1563, 1567, 1564, 1557, 1568, 1561, 1566, 1566, 1568,
-     1560, 1558, 1573, 1569, 1559, 1575, 1572, 1563, 1569, 1570,
-     1562, 1564, 1567, 1571, 1570, 1572, 1576, 1576, 1571, 1577,
-     1575, 1578, 1579, 1580, 1580, 1573, 1581, 1582, 1585, 1586,
+     1517, 1527, 1532, 1530, 1528, 1529, 1533, 1526, 1521, 1530,
+     1534, 1524, 1525, 1528, 1529, 1535, 1528, 1531, 1531, 1533,
+     1527, 1536, 1532, 1537, 1540, 1541, 1542, 1542, 1534, 1535,
+     1543, 1544, 1549, 1545, 1548, 1537, 1547, 1536, 1545, 1548,
+     1544, 1546, 1546, 1541, 1550, 1547, 1543, 1552, 1547, 1540,
+     1549, 1551, 1552, 1552, 1554, 1555, 1546, 1556, 1557, 1559,
+     1558, 1560, 1560, 1557, 1566, 1550, 1558, 1561, 1554, 1551,
+     1555, 1562, 1563, 1561, 1564, 1567, 1562, 1559, 1563, 1556,
+     1564, 1568, 1569, 1570, 1566, 1571, 1570, 1568, 1573, 1567,
+     1575, 1571, 1570, 1576, 1577, 1569, 1573, 1578, 1579,    0,
 
-     1583, 1584, 1588, 1578, 1582, 1589, 1591, 1591, 1577, 1587,
-     1581, 1579, 1583, 1584, 1588, 1587, 1590, 1585, 1592, 1586,
-     1596, 1592, 1590, 1589, 1593, 1593, 1595, 1597, 1599, 1596,
-     1600, 1595, 1600, 1597, 1598, 1598, 1601, 1602, 1603, 1601,
-     1599, 1604, 1606, 1605, 1607, 1610, 1608, 1606, 1609, 1612,
-     1610, 1614, 1618, 1607,    0, 1611, 1614, 1602, 1608, 1604,
-     1603, 1605, 1613, 1609, 1611, 1615, 1617, 1613, 1619, 1612,
-     1616, 1616, 1617, 1618, 1613, 1620, 1621, 1611, 1623, 1622,
-     1615, 1622, 1624, 1624, 1625, 1625, 1627, 1619, 1626, 1626,
-     1630, 1620, 1623, 1631, 1623, 1638, 1621, 1628, 1628, 1629,
+     1580, 1581, 1577, 1582, 1583, 1583, 1578, 1586, 1584, 1575,
+     1585, 1579, 1576, 1580, 1584, 1581, 1585, 1582, 1587, 1587,
+     1586, 1588, 1589, 1590, 1591, 1592, 1583, 1593, 1594, 1595,
+     1598, 1592, 1597, 1597, 1599, 1604, 1603, 1591, 1599, 1606,
+     1589, 1588, 1590, 1600, 1594, 1603, 1601, 1595, 1600, 1593,
+     1598, 1601, 1602, 1608, 1606, 1607, 1607, 1602, 1604, 1609,
+     1610, 1611, 1611, 1612, 1614, 1616, 1613, 1617, 1615, 1618,
+     1619, 1609, 1608, 1613, 1620, 1618, 1614, 1612, 1623, 1610,
+     1615, 1623, 1619, 1621, 1616, 1622, 1622, 1617, 1626, 1621,
+     1624, 1624, 1620, 1626, 1627, 1628, 1629, 1629, 1630, 1633,
 
-     1629, 1632, 1632, 1633, 1634, 1635, 1627, 1633, 1635, 1637,
-     1634, 1630, 1639, 1638, 1631, 1637, 1640, 1641, 1639, 1644,
-     1641, 1642, 1642, 1643, 1643, 1644, 1645, 1646, 1647, 1648,
-     1649, 1651, 1652, 1658, 1655, 1648, 1651, 1651, 1645, 1645,
-     1645, 1640, 1653, 1654, 1653, 1645, 1652, 1646, 1647, 1655,
-     1649, 1656, 1657, 1658, 1654, 1659, 1661, 1656, 1660, 1660,
-     1663, 1657, 1662, 1662, 1664, 1665, 1665, 1666, 1666, 1667,
-     1670, 1670, 1671, 1675, 1672, 1674, 1659, 1677, 1677, 1676,
-     1663, 1678, 1661, 1672, 1674, 1676, 1664, 1681, 1679, 1667,
-     1682, 1680, 1683, 1683, 1675, 1684, 1681, 1671, 1680, 1685,
+     1631, 1628, 1631, 1627, 1632, 1634, 1635, 1632, 1636, 1637,
+     1630, 1638, 1641, 1639, 1637, 1640, 1643, 1641, 1646, 1633,
+     1638, 1649, 1642, 1644, 1635, 1639, 1636, 1634, 1644, 1645,
+     1640, 1642, 1650, 1646, 1645, 1644, 1643, 1647, 1647, 1648,
+     1651, 1652, 1649, 1654, 1642, 1648, 1653, 1658, 1653, 1655,
+     1655, 1650, 1656, 1656, 1657, 1657, 1651, 1654, 1661, 1654,
+     1662, 1652, 1659, 1659, 1660, 1660, 1664, 1658, 1663, 1663,
+     1664, 1665, 1666, 1669, 1668, 1666, 1670, 1665, 1671, 1661,
+     1668, 1662, 1670, 1672, 1673, 1673, 1672, 1674, 1675, 1676,
+     1676, 1669, 1677, 1675, 1678, 1679, 1679, 1681, 1680, 1678,
 
-     1687, 1688, 1678, 1679, 1689, 1687, 1690, 1688, 1691, 1693,
-     1693, 1692, 1696, 1690, 1691, 1685, 1682, 1692, 1694, 1695,
-     1697, 1684, 1698, 1694, 1689, 1700, 1699, 1701, 1695, 1699,
-     1702, 1702, 1696, 1706, 1698, 1703, 1704, 1705, 1709, 1697,
-     1707, 1703, 1704, 1700, 1707, 1710, 1711, 1713, 1706, 1712,
-     1712, 1711, 1716, 1701, 1714, 1717, 1718, 1705, 1709, 1717,
-     1707, 1719, 1718, 1720, 1720, 1722, 1713, 1710, 1721, 1714,
-     1719, 1716, 1721, 1723, 1723, 1724, 1722, 1725, 1726, 1727,
-     1728, 1722, 1729, 1730, 1727, 1732, 1731, 1733, 1733, 1730,
-     1732, 1725, 1734, 1734, 1735, 1737, 1724, 1726, 1735, 1738,
+     1682, 1683, 1684, 1671, 1680, 1685,    0, 1674, 1684, 1681,
+     1681, 1681, 1687, 1677, 1688, 1690, 1681, 1687, 1687, 1691,
+     1682, 1683, 1689, 1692, 1689, 1685, 1690, 1693, 1688, 1692,
+     1694, 1695, 1696, 1696, 1691, 1697, 1693, 1698, 1698, 1699,
+     1700, 1701, 1701, 1702, 1702, 1703, 1706, 1706, 1707, 1708,
+     1694, 1710, 1695, 1711, 1713, 1713, 1714, 1712, 1708, 1699,
+     1710, 1697, 1700, 1712, 1715, 1703, 1718, 1717, 1716, 1719,
+     1719, 1720, 1721, 1707, 1711, 1716, 1717, 1714, 1723, 1715,
+     1724, 1725, 1726, 1723, 1727, 1728, 1724, 1731, 1721, 1726,
+     1727, 1728, 1718, 1729, 1729, 1730, 1731, 1720, 1732, 1734,
 
-     1728, 1731, 1729, 1739, 1737, 1740, 1740, 1742, 1742, 1746,
-     1738, 1743, 1744, 1745, 1748, 1738, 1743, 1743, 1744, 1745,
-     1747, 1749, 1751, 1739, 1752, 1747, 1748, 1749, 1752, 1753,
-     1754, 1755, 1756, 1757, 1751, 1746, 1758, 1755, 1760, 1757,
-     1761, 1753, 1762, 1764, 1765, 1765, 1764, 1762, 1758, 1768,
-     1760, 1766, 1766,    0, 1756, 1754, 1767, 1767, 1769, 1761,
-     1770, 1773, 1771, 1775, 1769, 1772, 1770, 1771, 1775, 1768,
-     1773, 1772, 1777, 1778, 1781, 1777, 1779, 1779, 1782, 1783,
-     1784, 1784, 1785, 1786, 1783, 1778, 1781, 1787, 1786, 1789,
-     1782, 1785, 1787, 1788, 1788, 1790, 1791, 1792, 1793, 1796,
+     1730, 1725, 1733, 1735, 1736, 1737, 1735, 1738, 1738, 1739,
+     1740, 1734, 1741, 1742, 1745, 1739, 1740, 1749, 1732, 1743,
+     1746, 1733, 1736, 1743, 1747, 1748, 1748, 1752, 1742, 1747,
+     1750, 1737, 1741, 1753, 1745, 1754, 1749, 1753, 1755, 1743,
+     1758, 1754, 1746, 1756, 1756, 1750, 1752, 1755, 1757, 1759,
+     1759, 1758, 1757, 1760, 1761, 1763, 1758, 1762, 1764, 1765,
+     1763, 1766, 1767, 1773, 1768, 1769, 1769, 1766, 1761, 1768,
+     1770, 1770, 1773, 1775, 1760, 1774, 1762, 1767, 1764, 1765,
+     1771, 1776, 1776, 1782, 1771, 1790, 1774, 1778, 1778, 1779,
+     1780, 1774, 1781, 1775, 1779, 1779, 1780, 1783, 1781, 1784,
 
-     1794, 1795, 1793, 1797, 1790, 1794, 1798, 1795, 1799, 1789,
-     1802, 1803, 1797, 1807, 1791, 1806, 1792, 1796, 1801, 1801,
-     1803,    0, 1799, 1805, 1798, 1804, 1804, 1806, 1802, 1809,
-     1801, 1808, 1805, 1815, 1807, 1816, 1808, 1812, 1812, 1818,
-     1814, 1819, 1809, 1814, 1820, 1821, 1822, 1822, 1828, 1815,
-     1820, 1816, 1824, 1824, 1818, 1819, 1823, 1825, 1823, 1827,
-     1829, 1829, 1821, 1830, 1831, 1825, 1827, 1832, 1828, 1833,
-     1834, 1835, 1830, 1836, 1837, 1839, 1842, 1840, 1843, 1832,
-     1837, 1833, 1834, 1841, 1841, 1831, 1845, 1844, 1836, 1840,
-     1844, 1845, 1846, 1837, 1842, 1839, 1848, 1835, 1843, 1850,
+     1785, 1787, 1783, 1788, 1789, 1792, 1785, 1788, 1791, 1782,
+     1790, 1784, 1793, 1787, 1791, 1797, 1789, 1794, 1793, 1796,
+     1798, 1800, 1801, 1801, 1800, 1798, 1804, 1792,    0, 1794,
+     1809, 1796, 1802, 1802, 1797, 1803, 1803, 1805, 1806, 1809,
+     1807, 1808, 1814, 1805, 1806, 1807, 1804, 1808, 1811, 1813,
+     1815, 1815, 1813, 1811, 1814, 1817, 1818, 1819, 1820, 1820,
+     1821, 1822, 1819, 1824, 1824, 1823, 1822, 1817, 1818, 1821,
+     1823, 1825, 1826, 1829, 1827, 1828, 1831, 1829, 1830, 1832,
+     1833, 1826, 1831, 1830, 1834, 1835, 1837, 1837, 1838, 1833,
+     1843, 1825, 1827,    0, 1828, 1839, 1841, 1832, 1837, 1835,
 
-     1849, 1848, 1849, 1851, 1852, 1854, 1856, 1857, 1851, 1858,
-     1860, 1852, 1846, 1859, 1854, 1859, 1857, 1850, 1862, 1863,
-     1862, 1858, 1864, 1864, 1856, 1865, 1866, 1868, 1867, 1860,
-     1867, 1866, 1868, 1863, 1869, 1870, 1871, 1872, 1875, 1869,
-     1873, 1874, 1877, 1872, 1878, 1873, 1875, 1879, 1879, 1880,
-     1880, 1865, 1881, 1870, 1874, 1882, 1871, 1883, 1878, 1884,
-     1885, 1877, 1885, 1883, 1884, 1886, 1887, 1881, 1888, 1888,
-     1890, 1890, 1889, 1894, 1887, 1882, 1891, 1891, 1892, 1898,
-     1893, 1896, 1887, 1886, 1889, 1893, 1897, 1892, 1897, 1899,
-     1896, 1894, 1900, 1896, 1899, 1899, 1901, 1903, 1904, 1905,
+     1840, 1840, 1834, 1842, 1839, 1841, 1838, 1844, 1845, 1848,
+     1848, 1843, 1844, 1850, 1851, 1842, 1850, 1852, 1855, 1854,
+     1856, 1845, 1857, 1858, 1858, 1859, 1856, 1859, 1860, 1860,
+     1851, 1869, 1855, 1852, 1854, 1861, 1863, 1863, 1866, 1857,
+     1864, 1864, 1867, 1861, 1866, 1868, 1870, 1870, 1867, 1871,
+     1872, 1869, 1868, 1873, 1874, 1875, 1876, 1877, 1871, 1880,
+     1883, 1881, 1878, 1882, 1882, 1873, 1874, 1875, 1878, 1884,
+     1886, 1872, 1877, 1881, 1885, 1886, 1887, 1885, 1883, 1880,
+     1889, 1878, 1876, 1891, 1890, 1889, 1890, 1892, 1893, 1884,
+     1895, 1897, 1892, 1898, 1899, 1893, 1887, 1901, 1900, 1895,
 
-     1898, 1900, 1907, 1904, 1905, 1908, 1911, 1909, 1901, 1903,
-     1910, 1910, 1912, 1913, 1914, 1907, 1909, 1915, 1919, 1917,
-     1931, 1918, 1920, 1928, 1911, 1908, 1922, 1920, 1914, 1913,
-     1912, 1917, 1915, 1918, 1921, 1922, 1925, 1927, 1919, 1921,
-     1930, 1929, 1925, 1927, 1932, 1931, 1928, 1933, 1933, 1936,
-     1934, 1935, 1935, 1932, 1939, 1925, 1929, 1937, 1930, 1934,
-     1938, 1937,    0, 1945, 1940, 1938, 1941, 1939, 1936, 1940,
-     1940, 1942, 1941, 1943, 1944, 1950, 1943, 1942, 1948, 1948,
-     1949, 1949, 1944, 1945, 1950, 1951, 1951, 1952, 1952, 1953,
-     1954, 1955, 1962, 1956, 1963, 1949, 1962, 1955, 1956, 1957,
+     1900, 1891, 1898, 1903, 1904, 1903, 1899, 1905, 1905, 1897,
+     1906, 1908, 1907, 1908, 1909, 1910, 1901, 1907, 1904, 1909,
+     1910, 1911, 1912, 1913, 1915, 1914, 1916, 1918, 1922, 1913,
+     1914, 1919, 1920, 1920, 1916, 1923, 1906, 1915, 1924, 1911,
+     1921, 1921, 1912, 1922, 1924, 1919, 1918, 1925, 1926, 1927,
+     1926, 1930, 1925, 1928, 1935, 1923, 1929, 1929, 1931, 1931,
+     1939, 1928, 1933, 1930, 1932, 1932, 1937, 1927, 1934, 1928,
+     1941, 1933, 1935, 1934, 1938, 1937, 1938, 1940, 1937, 1941,
+     1942, 1939, 1940, 1940, 1944, 1945, 1946, 1948, 1949, 1950,
+     1945, 1946, 1942, 1951, 1951, 1952, 1944, 1953, 1950, 1956,
 
-     1957, 1953, 1958, 1958, 1959, 1960, 1949, 1966, 1954, 1959,
-     1967, 1960, 1964, 1968, 1963, 1967, 1964, 1970, 1969, 1971,
-     1973, 1974, 1970, 1972, 1975, 1977, 1974, 1976, 1976, 1977,
-     1978, 1980, 1966, 1969, 1982, 1981, 1968, 1971, 1979, 1972,
-     1973, 1984, 1985, 1979, 1983, 1978, 1975, 1981, 1988, 1983,
-     1986, 1986, 1989, 1982, 1984, 1990, 1988, 1980, 1991, 1992,
-     1985, 1993, 1998, 1994, 1995, 1996, 1999, 1999, 2002, 2000,
-     2007, 1989, 2000, 2038, 1990, 2001, 1995, 1998, 2003, 2038,
-     1993, 1991, 2002, 1992, 1994, 2007, 1996, 2008, 2001, 2004,
-     2004, 2003, 2005, 2005, 2006, 2006, 2009, 2009, 2010, 2012,
+     1948, 1954, 1955, 1960, 1961, 1962, 1958, 1959, 1949, 1961,
+     1962, 1963, 1969, 1952, 1956, 1953, 1955, 1954, 1958, 1959,
+     1963, 1966, 1968, 1960, 1970, 1971, 1972, 1966, 1968, 1973,
+     1974, 1974, 1975, 1976, 1976, 1969, 1977, 1980, 1973, 1970,
+     1966, 1975, 1978, 1971, 1979, 1986, 1978, 1981, 1982, 1979,
+     1980, 1972, 1981, 1981, 1982, 1977, 1983, 1984, 1985, 1995,
+     1984, 1991, 1983, 1989, 1989, 1986, 1985, 1990, 1990, 1994,
+     1991, 1992, 1992, 1993, 1993, 1997, 2007, 1995, 1996, 2003,
+     1997, 1994, 1990, 2003, 1996, 1998, 1998, 1999, 1999, 2000,
+     2001, 2004, 2008, 1990, 2000, 2005, 2001, 2008, 2009, 2005,
 
-     2008, 2011, 2011, 2014, 2012, 2015, 2016, 2010, 2014, 2017,
-     2010, 2018, 2018, 2019, 2019, 2020, 2021, 2021, 2022, 2023,
-     2023, 2017, 2024, 2025, 2028, 2015, 2016, 2030, 2025, 2026,
-     2026, 2027, 2027, 2029, 2020, 2031, 2022, 2024, 2028, 2033,
-     2035, 2030, 2029, 2037, 2033, 2034, 2034, 2036, 2036, 2039,
-     2040, 2040, 2039, 2042, 2031, 2041, 2041, 2044, 2043, 2035,
-     2047, 2037, 2045, 2045, 2048, 2050, 2040, 2049, 2058, 2050,
-     2051, 2051, 2042, 2043, 2052, 2054, 2044, 2055, 2053, 2059,
-     2047, 2060, 2049, 2053, 2057, 2057, 2059, 2048, 2058, 2061,
-     2054, 2062, 2055, 2052, 2063, 2060, 2064, 2064, 2066, 2065,
+     2010, 2007, 2011, 2013, 2012, 2014, 2016, 2011, 2015, 2017,
+     2017, 2004, 2018, 2015, 2019, 2010, 2018, 2021, 2020, 2013,
+     2022, 2009, 2012, 2020, 2025, 2014, 2023, 2030, 2016, 2019,
+     2024, 2026, 2022, 2027, 2027, 2024, 2029, 2025, 2031, 2032,
+     2033, 2034, 2035, 2021, 2029, 2023, 2030, 2036, 2037, 2026,
+     2039, 2095, 2042, 2041, 2043, 2095, 2043, 2031, 2042, 2036,
+     2034, 2046, 2032, 2035, 2033, 2039, 2041, 2044, 2044, 2037,
+     2045, 2047, 2052, 2045, 2046, 2048, 2049, 2049, 2050, 2050,
+     2051, 2051, 2053, 2054, 2054, 2047, 2060, 2052, 2048, 2055,
+     2056, 2056, 2057, 2061, 2059, 2053, 2062, 2057, 2055, 2059,
 
-     2066, 2067, 2069, 2072, 2067, 2070, 2071, 2061, 2065, 2062,
-     2070, 2071, 2073, 2074, 2069, 2076, 2080, 2075, 2078, 2067,
-     2063, 2067, 2075, 2078, 2079, 2073, 2081, 2082, 2072, 2079,
-     2083, 2080, 2081, 2084, 2074, 2085, 2083, 2086, 2084, 2087,
-     2085, 2076, 2088, 2093, 2089, 2088, 2090, 2091, 2082, 2092,
-     2098,    0, 2087, 2089, 2094, 2090, 2091, 2093, 2092, 2095,
-     2094, 2106, 2086, 2096, 2100, 2095, 2102, 2096, 2101, 2101,
-     2098, 2104, 2102, 2100, 2103, 2103, 2107, 2106, 2108, 2108,
-     2109, 2110, 2112, 2103, 2113, 2115, 2114, 2119, 2121, 2121,
-     2110, 2104, 2107, 2104, 2112, 2109, 2117, 2115, 2118, 2117,
+     2065, 2055, 2063, 2063, 2064, 2064, 2060, 2067, 2062, 2066,
+     2066, 2068, 2068, 2061, 2069, 2070, 2071, 2071, 2073, 2065,
+     2070, 2072, 2072, 2075, 2074, 2067, 2076, 2079, 2079, 2069,
+     2078, 2080, 2073, 2074, 2082, 2078, 2083, 2075, 2081, 2081,
+     2084, 2087, 2083, 2084, 2088, 2076, 2085, 2085, 2086, 2086,
+     2080, 2089, 2082, 2090, 2090, 2092, 2093, 2094, 2097, 2088,
+     2087, 2098, 2085, 2096, 2096, 2099, 2098, 2100, 2102, 2102,
+     2089, 2103, 2094, 2105, 2104, 2092, 2106, 2097, 2107, 2093,
+     2099, 2104, 2100, 2108, 2109, 2109, 2110, 2105, 2111, 2114,
+     2111, 2103, 2118, 2115, 2106, 2110, 2107, 2112, 2115, 2116,
 
-     2113, 2114, 2120, 2118, 2122, 2122, 2126, 2119, 2124, 2124,
-     2125, 2126, 2127, 2125, 2120, 2128, 2129, 2129, 2127, 2130,
-     2132, 2128, 2131, 2131, 2133, 2134, 2135, 2135, 2136, 2137,
-     2138, 2145, 2132, 2130, 2136, 2138, 2140,    0, 2133, 2141,
-     2140, 2144, 2141, 2137, 2134, 2142, 2142, 2143, 2148, 2146,
-     2144, 2145, 2143, 2146, 2147, 2147, 2151, 2150, 2152, 2153,
-     2154, 2148, 2150, 2155, 2154, 2156, 2157, 2159, 2158, 2164,
-     2156, 2161, 2157, 2153, 2158, 2162, 2151, 2164, 2152, 2165,
-     2162, 2165, 2163, 2155, 2168, 2159, 2171, 2161, 2163, 2169,
-     2169, 2170, 2172, 2172, 2170, 2174, 2175, 2176, 2168, 2174,
+     2112, 2114, 2117, 2119, 2116, 2118, 2120, 2121, 2123, 2108,
+     2125, 2120, 2126, 2123, 2124, 2112, 2127, 2112, 2126, 2124,
+     2128, 2131, 2132, 2129, 2119, 2125, 2128, 2117, 2129, 2130,
+     2138, 2134, 2135, 2121, 2130, 2132, 2133, 2127, 2136, 2133,
+     2134, 2135, 2137, 2139, 2138, 2143, 2131, 2136, 2140, 2139,
+     2145, 2137, 2141, 2149, 2140, 2147, 2141, 2146, 2146, 2145,
+     2151, 2147, 2148, 2148, 2152, 2143, 2153, 2153, 2154, 2155,
+     2157, 2148, 2158, 2149, 2159, 2149, 2151, 2164, 2155, 2160,
+     2152, 2162, 2157, 2154, 2162, 2163, 2165,    0, 2158, 2159,
+     2163, 2160, 2166, 2166, 2167, 2167, 2175, 2164, 2165, 2169,
 
-     2177, 2177, 2175, 2183, 2178, 2181, 2181, 2186, 2185, 2176,
-     2189, 2190, 2171, 2178, 2191, 2189, 2193, 2193, 2197, 2191,
-     2192, 2183, 2185, 2186, 2197, 2192, 2195, 2195, 2198, 2198,
-     2199, 2200, 2203, 2201, 2207, 2204, 2208, 2190, 2201, 2205,
-     2205, 2209, 2208, 2207, 2214, 2210, 2199, 2204, 2212, 2212,
-     2215, 2203, 2213, 2200, 2220, 2213, 2217, 2217, 2221, 2209,
-     2210, 2218, 2218, 2214, 2219, 2222, 2224, 2221, 2215, 2219,
-     2222, 2223, 2220, 2223, 2225, 2226, 2227, 2228, 2229,    0,
-     2224, 2227, 2235, 2229, 2230, 2230, 2234, 2226, 2225, 2231,
-     2231, 2232, 2232, 2233, 2233, 2239, 2236, 2228, 2234, 2240,
+     2169, 2170, 2171, 2172, 2170, 2173, 2177, 2171, 2178, 2172,
+     2175, 2173, 2174, 2174, 2176, 2176, 2179, 2181, 2177, 2180,
+     2180, 2183, 2178, 2181, 2182, 2185, 2183, 2186, 2188, 2185,
+     2186, 2187, 2187, 2188, 2189, 2179, 2190, 2191, 2182, 2192,
+     2192, 2191, 2193, 2189, 2195, 2196, 2197, 2198, 2199, 2195,
+     2200, 2202, 2199, 2201, 2203, 2193, 2190, 2202, 2201, 2204,
+     2203, 2198, 2205, 2206, 2207, 2196, 2197, 2209, 2206, 2210,
+     2200, 2212, 2211, 2213, 2210, 2213, 2216, 2204, 2211, 2212,
+     2219, 2205, 2238, 2209, 2224, 2207, 2217, 2217, 2218, 2223,
+     2216, 2218, 2220, 2220, 2222, 2223, 2224, 2231, 2222, 2225,
 
-     2235, 2236, 2237, 2237, 2238, 2238, 2241, 2239, 2242, 2243,
-     2243, 2240, 2244, 2245, 2245, 2246, 2246, 2247, 2248, 2251,
-     2249, 2250, 2253, 2254, 2242, 2257, 2241, 2249, 2247, 2252,
-     2248, 2244, 2256, 2250, 2252, 2255, 2255, 2258, 2260, 2251,
-     2259, 2256, 2253, 2254, 2261, 2262, 2262, 2263, 2264, 2265,
-     2267, 2257, 2268, 2259, 2269, 2272, 2263, 2258, 2261, 2271,
-     2272,    0, 2260, 2264, 2265, 2273, 2270, 2281, 2267, 2270,
-     2273, 2274, 2274, 2271, 2268, 2275, 2275, 2269, 2276, 2276,
-     2278, 2278, 2280, 2280, 2282, 2281, 2283, 2285, 2286, 2287,
-     2288, 2289, 2290, 2292, 2291, 2282, 2291, 2293, 2294, 2298,
+     2225, 2226, 2229, 2229, 2233, 2234, 2219, 2237, 2238, 2239,
+     2226, 2240, 2237, 2247, 2239, 2231, 2240, 2248, 2233, 2241,
+     2241, 2234, 2243, 2243, 2245, 2246, 2246, 2249, 2251, 2247,
+     2245, 2252, 2249, 2253, 2253, 2255, 2256, 2257, 2258, 2248,
+     2260, 2260, 2256, 2252, 2255, 2261, 2262, 2251, 2261, 2263,
+     2265, 2265, 2268, 2258, 2267, 2257, 2266, 2266, 2270, 2267,
+     2269, 2272, 2271, 2270, 2271, 2262, 2273, 2263, 2275, 2269,
+     2268, 2274, 2276, 2275, 2277, 2272, 2278, 2278, 2282, 2277,
+     2273, 2279, 2279, 2274, 2280, 2280, 2281, 2281, 2283, 2284,
+     2282, 2287, 2276, 2288, 2284, 2285, 2285, 2286, 2286, 2289,
 
-     2289, 2295, 2295, 2297, 2297, 2283, 2286, 2285, 2299, 2304,
-     2288, 2287, 2290, 2292, 2302, 2293, 2294, 2299, 2300, 2300,
-     2305, 2298, 2306, 2302, 2303, 2303, 2307, 2304, 2308, 2306,
-     2309, 2310, 2311, 2312, 2312, 2313, 2313, 2314, 2305, 2315,
-     2316, 2307, 2317, 2314, 2318, 2319, 2308, 2310, 2309, 2318,
-     2320, 2311, 2322, 2321, 2322, 2316, 2327, 2315, 2321, 2323,
-     2323, 2317, 2324, 2329, 2324, 2319, 2325, 2325, 2330, 2331,
-     2320, 2332, 2329, 2333, 2334, 2327, 2335, 2338, 2333, 2339,
-     2342, 2331, 2339, 2340, 2340, 2341, 2344, 2330, 2343, 2343,
-     2344, 2332, 2346, 2349, 2334, 2335, 2351, 2338, 2342, 2347,
+     2290, 2291, 2291, 2287, 2292, 2288, 2283, 2293, 2293, 2294,
+     2294, 2295, 2296, 2297, 2298, 2299, 2290, 2301, 2302, 2289,
+     2297, 2305, 2295, 2292, 2296, 2300, 2298, 2303, 2303, 2306,
+     2300, 2304, 2307, 2308, 2309, 2299, 2312, 2301, 2302, 2313,
+     2304, 2310, 2310, 2311, 2315, 2307, 2316, 2305, 2309, 2306,
+     2317, 2312, 2311, 2318, 2313, 2319, 2318, 2308, 2320, 2321,
+     2322, 2322, 2315, 2320, 2321, 2323, 2323, 2329, 2316, 2319,
+     2324, 2324, 2330, 2317, 2326, 2326, 2328, 2328, 2331, 2333,
+     2334, 2335, 2336, 2330, 2337, 2329, 2338, 2339, 2340, 2339,
+     2346, 2341, 2342, 2337, 2343, 2343, 2347, 2331, 2334, 2333,
 
-     2341, 2348, 2348, 2347, 2352, 2353, 2349, 2346, 2354, 2354,
-     2356, 2351, 2357, 2358, 2359, 2359, 2360, 2358, 2361, 2361,
-     2363, 2357, 2356, 2362, 2352, 2353, 2364, 2365, 2362, 2363,
-     2366, 2366, 2371, 2371, 2372, 2360, 2373, 2373, 2374, 2365,
-     2375, 2376, 2364, 2377, 2378, 2378, 2379, 2381, 2381, 2384,
-     2376, 2374, 2377, 2375, 2384, 2385, 2372, 2386, 2387, 2388,
-     2385, 2379, 2389, 2387, 2390, 2393, 2391, 2388, 2396, 2399,
-     2394, 2386, 2395, 2390, 2391, 2394, 2399, 2395, 2397, 2397,
-     2393, 2389, 2400, 2396, 2398, 2398, 2401, 2400, 2402, 2403,
-     2406, 2404, 2405, 2405, 2407, 2403, 2404, 2408, 2408, 2407,
+     2345, 2345, 2336, 2335, 2352, 2347, 2338, 2350, 2340, 2341,
+     2342, 2353, 2346, 2348, 2348, 2355, 2350, 2351, 2351, 2354,
+     2356, 2357, 2352, 2359, 2358, 2362, 2354, 2360, 2360, 2353,
+     2355, 2361, 2361, 2364, 2364, 2363, 2366, 2367, 2356, 2357,
+     2358, 2363, 2359, 2362, 2365, 2368, 2369, 2370, 2371,    0,
+     2365, 2369, 2367, 2372, 2366, 2373, 2378, 2373, 2372, 2374,
+     2374, 2375, 2380, 2375, 2368, 2376, 2376, 2370, 2371, 2381,
+     2382, 2380, 2383, 2384, 2385, 2378, 2386, 2389, 2384,    0,
+     2390, 2392, 2382, 2390, 2391, 2391, 2393, 2395, 2381, 2394,
+     2394, 2395, 2383, 2397, 2385, 2386, 2392, 2389, 2398, 2399,
 
-     2409, 2409, 2412,    0, 2401, 2406, 2402, 2413, 2413, 2414,
-     2424, 2415, 2414, 2416, 2417, 2412, 2415, 2415, 2416, 2417,
-     2418, 2419, 2420, 2421, 2422, 2419, 2418, 2420, 2423, 2425,
-     2428, 2424, 2421, 2427, 2426, 2425, 2423, 2433, 2427, 2422,
-     2426, 2430, 2428, 2435, 2431, 2436, 2430, 2431, 2435, 2433,
-     2436, 2437, 2438, 2439, 2440, 2441, 2441, 2442, 2445, 2446,
-     2451, 2447, 2439, 2440, 2449, 2438, 2442, 2448, 2448, 2437,
-     2452, 2452, 2450, 2453, 2455, 2451, 2457, 2445, 2458, 2446,
-     2447, 2450, 2458, 2449, 2459, 2459, 2460, 2461, 2462, 2455,
-        0, 2463, 2453, 2461, 2462, 2465, 2457, 2463, 2464, 2464,
+     2399, 2400, 2398, 2402, 2393, 2403, 2404, 2407, 2397, 2405,
+     2405, 2408, 2409, 2411, 2400, 2415, 2409, 2416, 2402, 2407,
+     2408, 2410, 2410, 2412, 2412, 2403, 2404, 2414, 2413, 2416,
+     2423, 2415, 2411, 2413, 2417, 2417, 2414, 2422, 2422, 2424,
+     2424, 2425, 2426, 2430, 2427, 2429, 2429, 2428, 2432, 2432,
+     2440, 2437, 2423, 2427, 2425, 2426, 2428, 2435, 2430, 2436,
+     2439, 2438, 2435, 2441, 2436, 2437, 2438, 2442, 2439, 2440,
+     2444, 2445, 2441, 2446, 2447, 2442, 2445, 2450, 2446, 2448,
+     2448, 2449, 2449, 2451, 2450, 2444, 2452, 2453, 2451, 2447,
+     2454, 2457, 2455, 2456, 2456, 2458, 2454, 2455, 2459, 2459,
 
-     2466, 2468, 2469, 2465, 2471, 2466, 2472, 2473, 2471, 2476,
-     2468, 2460, 2475, 2475, 2486, 2469, 2477, 2477, 2478, 2478,
-     2472, 2481, 2473, 2480, 2480, 2481, 2482, 2476, 2484, 2484,
-     2487, 2482, 2488, 2489, 2486, 2487, 2491, 2499, 2489, 2489,
-     2492, 2492, 2494, 2494, 2488, 2495, 2495, 2496, 2497, 2501,
-     2496, 2502, 2502, 2503, 2503, 2499, 2491, 2504, 2504, 2505,
-     2507, 2497, 2506, 2506, 2508, 2509, 2510, 2511, 2511, 2501,
-     2516, 2512, 2510, 2507, 2505, 2512, 2517, 2518, 2515, 2509,
-     2519, 2520, 2508, 2515, 2515, 2521, 2519, 2520, 2522, 2523,
-     2523, 2531, 2522, 2516, 2526, 2528, 2517, 2518, 2529, 2526,
+     2458, 2460, 2460, 2463, 2452, 2453, 2457, 2464, 2464, 2465,
+     2467, 2473, 2465, 2466, 2469, 2467, 2463, 2468, 2466, 2466,
+     2469, 2470, 2468, 2471, 2472, 2470, 2473, 2474, 2471, 2475,
+     2476, 2477, 2479, 2472, 2478, 2474, 2476, 2477, 2481, 2478,
+     2484, 2486, 2482, 2481, 2479, 2482, 2486, 2488, 2487, 2489,
+     2475, 2490, 2484, 2487, 2491, 2492, 2492, 2493, 2496, 2499,
+     2490, 2497, 2489, 2491, 2496, 2488, 2493, 2497, 2500, 2505,
+     2501, 2502, 2502, 2503, 2504, 2506, 2506, 2507, 2499, 2509,
+     2511, 2512, 2514, 2504, 2505, 2512, 2513, 2513, 2500, 2501,
+     2519, 2515, 2503, 2516, 2509, 2517, 2507, 2515, 2519, 2516,
 
-     2533, 2529, 2532, 2528, 2534, 2532, 2535, 2536, 2537, 2534,
-     2521, 2538, 2538, 2542, 2539, 2541, 2531, 2533, 2533, 2545,
-     2540, 2551, 2537, 2540, 2535, 2543, 2554, 2536, 2539, 2541,
-     2544, 2540, 2542, 2543,    0, 2544, 2544, 2551, 2545, 2546,
-     2546, 2547, 2547, 2548, 2548, 2549, 2549, 2550, 2550, 2552,
-     2553, 2555, 2554, 2556, 2552, 2557, 2559, 2559, 2560, 2561,
-     2555, 2560, 2563, 2563, 2564, 2565, 2565, 2566, 2568, 2568,
-     2553, 2564, 2566, 2556, 2569, 2557, 2570, 2561, 2571, 2573,
-     2574, 2574, 2575, 2569, 2576, 2570, 2575, 2571, 2577, 2578,
-     2580, 2579, 2581, 2576, 2578, 2578, 2581, 2573, 2589, 2580,
+     2511, 2517, 2518, 2518, 2520, 2522, 2523, 2514, 2525, 2520,
+     2526, 2527, 2525, 2530, 2522, 2529, 2529, 2531, 2531, 2523,
+     2532, 2532, 2534, 2534, 2526, 2535, 2527, 2536, 2540, 2535,
+     2541, 2530, 2536, 2538, 2538, 2541, 2543, 2542, 2545, 2546,
+     2546, 2543, 2543, 2548, 2548, 2549, 2549, 2550, 2540, 2542,
+     2550, 2551, 2553, 2555, 2556, 2556, 2557, 2557, 2545, 2558,
+     2558, 2559, 2560, 2560, 2551, 2561, 2562, 2563, 2564, 2570,
+     2553, 2565, 2565, 2555, 2564, 2566, 2559, 2569, 2561, 2566,
+     2571, 2563, 2569, 2569, 2562, 2572, 2575, 2573, 2574, 2577,
+     2577, 2576, 2570, 2573, 2574, 2576, 2580, 2585, 2582, 2583,
 
-     2585, 2586, 2586, 2577, 2579, 2585, 2588, 2588, 2590, 2591,
-     2593, 2594, 2589, 2597, 2599, 2598, 2600, 2602, 2604, 2593,
-     2606, 2607, 2600, 2594, 2598, 2606, 2607, 2591, 2609, 2602,
-     2608, 2608, 2618, 2590, 2599, 2611, 2619, 2609, 2597, 2604,
-     2611, 2612, 2612, 2614, 2614, 2612, 2615, 2615, 2616, 2616,
-     2617, 2620, 2618, 2623, 2622, 2619, 2620, 2624, 2623, 2617,
-     2622, 2626, 2624, 2625, 2625, 2627, 2628, 2629, 2630, 2631,
-     2635, 2628, 2632, 2632, 2630, 2635, 2634, 2636, 2638, 2626,
-     2634, 2639, 2636, 2637, 2637, 2629, 2627, 2640, 2642, 2642,
-     2644, 2645, 2647, 2648, 2631, 2646, 2639, 2638, 2649, 2646,
+     2571, 2580, 2583, 2587, 2586, 2572, 2582, 2586, 2588, 2589,
+     2590, 2575, 2591, 2588, 2592, 2592, 2596, 2593, 2595, 2606,
+     2587, 2587, 2585, 2599, 2606, 2594, 2591, 2589, 2594, 2597,
+     2590, 2593, 2595, 2598, 2607, 2596, 2594, 2597, 2598, 2598,
+     2600, 2600, 2599, 2601, 2601, 2602, 2602, 2603, 2603, 2604,
+     2604, 2605, 2608, 2609, 2607, 2610, 2611, 2612, 2617, 2613,
+     2610, 2615, 2615, 2616, 2620, 2611, 2616, 2605, 2619, 2619,
+     2622, 2620, 2609, 2621, 2621, 2622, 2617, 2612, 2608, 2613,
+     2624, 2624, 2625, 2626, 2627, 2629, 2630, 2630, 2632, 2633,
+     2631, 2625, 2626, 2627, 2631, 2634, 2635, 2632, 2636, 2646,
 
-     2650, 2647, 2652, 2644, 2645, 2651, 2654, 2640, 2650, 2648,
-     2651, 2653, 2653, 2656, 2656, 2657, 2657, 2649, 2659, 2661,
-     2661, 2663, 2664, 2669, 2665, 2654, 2666, 2670, 2652, 2668,
-     2668, 2666, 2671, 2673, 2673, 2674, 2675, 2663, 2664, 2659,
-     2665, 2676, 2676, 2669, 2679, 2682, 2680, 2691, 2681, 2674,
-     2670, 2671, 2680, 2681, 2685, 2675, 2683, 2683, 2684, 2684,
-     2686, 2686, 2687, 2688, 2679, 2689, 2691, 2682, 2693, 2690,
-     2692,    0, 2688, 2687, 2685, 2690, 2694, 2694, 2695, 2700,
-     2686, 2695, 2692, 2696, 2696, 2689, 2701, 2702, 2693, 2703,
-     2703, 2700, 2704, 2702, 2705, 2704, 2706, 2708, 2709, 2710,
+     2634, 2634, 2637, 2629, 2633, 2641, 2637, 2636, 2645, 2635,
+     2641, 2642, 2642, 2644, 2644, 2647, 2649, 2650, 2653, 2654,
+     2655, 2656, 2645, 2658, 2646, 2649, 2660, 2656, 2654, 2650,
+     2682, 2662, 2663, 2647,    0, 2658, 2662, 2663, 2664, 2664,
+     2655, 2665, 2674, 2653, 2667, 2670, 2670, 2660, 2682, 2667,
+     2665, 2668, 2668, 2671, 2671, 2668, 2672, 2672, 2673, 2675,
+     2676, 2679, 2674, 2678, 2683, 2676, 2679, 2673, 2680, 2678,
+     2681, 2681, 2684, 2680, 2685, 2686, 2687, 2684, 2675, 2688,
+     2688, 2686, 2690, 2691, 2692, 2683, 2690, 2694, 2691, 2692,
+     2693, 2693, 2685, 2695, 2696, 2698, 2698, 2700, 2701, 2702,
 
-     2705, 2711, 2708, 2709, 2712, 2715, 2701, 2711, 2713, 2713,
-     2716, 2717, 2718, 2720, 2706, 2719, 2719, 2715, 2710, 2726,
-     2721, 2712, 2712, 2723, 2723, 2718, 2724, 2724, 2716, 2721,
-     2725, 2736, 2720, 2726, 2727, 2725, 2717, 2728, 2728, 2727,
-     2729, 2729, 2730, 2730, 2731, 2733, 2733, 2738, 2739, 2731,
-     2736, 2740, 2741, 2741, 2743, 2743, 2745, 2744, 2746, 2747,
-     2747, 2748, 2748, 2751, 2794, 2752, 2750, 2746, 2794, 2738,
-     2739, 2744, 2750, 2740, 2753, 2760, 2745, 2756, 2756, 2753,
-     2758, 2758, 2759, 2751, 2752, 2761, 2762, 2759, 2763, 2760,
-     2765, 2761, 2764, 2764, 2767, 2765, 2763, 2768, 2762, 2769,
+     2703, 2687, 2704, 2702, 2705, 2706, 2694, 2707, 2695, 2703,
+     2700, 2701, 2707, 2706, 2696, 2708, 2709, 2710, 2704, 2711,
+     2711, 2712, 2721, 2705, 2708, 2714, 2714, 2715, 2715, 2717,
+     2719, 2719, 2722, 2723, 2709, 2727, 2724, 2728, 2721, 2729,
+     2712, 2724, 2732, 2710, 2726, 2726, 2731, 2731, 2722, 2723,
+     2717, 2733, 2734, 2734, 2737, 2727, 2732, 2738, 2729, 2739,
+     2728, 2740, 2743, 2738, 2739, 2741, 2741, 2742, 2742, 2745,
+     2733, 2744, 2744, 2747, 2737, 2746, 2749, 2750, 2751, 2748,
+     2745, 2759, 2743, 2740, 2746, 2748, 2752, 2752, 2854, 2750,
+     2758, 2744, 2854, 2747, 2753, 2749, 2764, 2753, 2751, 2754,
 
-     2770, 2771, 2773, 2774, 2769, 2775, 2776, 2771, 2778, 2777,
-     2773, 2779, 2770, 2780, 2767, 2781, 2783, 2768, 2784, 2788,
-     2781, 2783, 2774, 2861, 2778, 2775, 2776, 2777, 2779, 2779,
-     2785, 2789, 2786,    0, 2780, 2861, 2785, 2786, 2784, 2788,
-     2792, 2792, 2793, 2793, 2789, 2798, 2798, 2800, 2800, 2801,
-     2801, 2804, 2801, 2802, 2802, 2804, 2802, 2803, 2803, 2807,
-     2803, 2806, 2806, 2811, 2808, 2812, 2813, 2814, 2814, 2817,
-     2819, 2813, 2818, 2820, 2819, 2821,    0, 2807, 2808, 2818,
-     2823, 2828, 2820, 2811, 2824, 2812, 2825, 2825, 2826, 2826,
-     2821, 2827, 2827, 2824, 2817, 2829, 2828, 2830, 2823, 2831,
+     2754, 2759, 2758, 2760, 2761, 2761, 2763, 2762, 2766, 2760,
+     2762, 2767, 2763, 2766, 2764, 2768, 2767, 2769, 2770, 2771,
+     2771, 2773, 2774, 2769, 2775, 2776, 2777, 2777, 2778,    0,
+     2779, 2781, 2781, 2773, 2768, 2770, 2770, 2784, 2776, 2779,
+     2774, 2782, 2782, 2783, 2789, 2785, 2798, 2778, 2783, 2775,
+     2785, 2784, 2786, 2786, 2787, 2787, 2788, 2788, 2790, 2796,
+     2791, 2793, 2793, 2799, 2790, 2791, 2800, 2804, 2798, 2805,
+     2789, 2801, 2801, 2803, 2803, 2806, 2807, 2807, 2796, 2808,
+     2808, 2804, 2811,    0, 2806, 2799, 2810, 2812, 2800, 2805,
+     2813, 2820, 2810, 2816, 2816, 2813, 2818, 2818, 2819, 2822,
 
-     2829, 2832, 2833, 2834, 2831, 2831, 2830, 2832, 2835, 2830,
-     2836, 2837, 2838, 2839, 2839, 2836, 2837, 2840, 2834, 2841,
-     2842, 2842, 2868, 2840, 2910, 2841,    0, 2833, 2910, 2835,
-     2844, 2838, 2843, 2843, 2868, 2844, 2847, 2847, 2850, 2850,
-     2851, 2851, 2852, 2852, 2853, 2853, 2854, 2854, 2855, 2855,
-     2856, 2856, 2858, 2859, 2859, 2860, 2862, 2866, 2864, 2865,
-     2865, 2858, 2867, 2870, 2860, 2869, 2869, 2871, 2871, 2874,
-     2875, 2876, 2866, 2875, 2878, 2867, 2862, 2864, 2870, 2877,
-     2877, 2880, 2881, 2884, 2880, 2882, 2883, 2874, 2881, 2885,
-     2886, 2883, 2878, 2892, 2888, 2889, 2903, 2876, 2901, 2882,
+     2823, 2821, 2811, 2819, 2827, 2820, 2812, 2821, 2823, 2824,
+     2824, 2822, 2825, 2828, 2829, 2830, 2831, 2825, 2833, 2829,
+     2834, 2835, 2831, 2836, 2827,    0, 2833, 2830, 2837, 2838,
+     2839, 2840, 2841, 2828, 2844, 2843, 2845, 2841, 2848, 2834,
+     2843, 2835, 2845, 2836, 2846, 2838, 2837, 2839, 2839, 2846,
+     2849, 2859, 2840, 3034, 2844, 2852, 2852, 2858, 2848, 2853,
+     2853, 3034, 2858, 2849, 2860, 2860, 2862, 2862, 2863, 2863,
+     2859, 2863, 2864, 2864, 2866, 2864, 2865, 2865, 2866, 2865,
+     2868, 2868, 2869, 2870, 2873, 2874, 2875, 2876, 2876, 2879,
+     2881, 2875, 2880, 2882, 2881, 2883, 2890, 2870, 2885, 2880,
 
-     2888, 2901, 2884, 2908, 2889, 2912, 2886, 2885, 2892, 2903,
-     2904, 2904, 2905, 2905, 2906, 2906, 2909, 2911, 2914, 2912,
-     2915, 2917, 2916, 2917, 2918, 2909, 2908, 2916, 2919, 2919,
-     2920, 2915, 2921, 2923, 2922, 2924, 2926, 2911, 2925, 2918,
-     2928, 2914, 2927, 2920, 2929, 2926, 2935,    0, 2934, 2923,
-     2930, 2921, 2922, 2925, 2927, 2930, 2936, 2936, 2937, 2942,
-     2924, 2928, 2934, 2943, 2929, 2947, 2935, 2937, 2938, 2938,
-     2939, 2939, 2940, 2940, 2941, 2941, 2944, 2945, 2942, 2944,
-     2946, 2948, 2945, 2943, 2950, 2946, 2949, 2951, 2952, 2953,
-     2947, 2955, 2949, 2952, 2954, 2954, 2948, 2956, 2950, 2951,
+     2869,    0, 2882, 2886, 2873, 2874, 2887, 2887, 2888, 2888,
+     2883, 2890, 2886, 2892, 2879, 2891, 2885, 2889, 2889, 2895,
+     2891, 2893, 2892, 2894, 2896, 2892, 2893, 2893, 2897, 2894,
+     2898, 2899, 2900, 2901, 2901, 2898, 2899, 2902,    0, 2896,
+     2903, 2904, 2904, 2902, 2895, 2906, 2903, 2905, 2905, 2897,
+     2906, 2900, 2909, 2909, 2910, 2910, 2911, 2914, 2914, 2915,
+     2915, 2916, 2916, 2917, 2917, 2911, 2918, 2918, 2919, 2919,
+     2920, 2920, 2922, 2923, 2923, 2924, 2925, 2926, 2930, 2928,
+     2932, 2922, 2929, 2929, 2924, 2934, 2931, 2938, 2925, 2933,
+     2933, 2940, 2932, 2930, 2935, 2935, 2942, 2926, 2928, 2931,
 
-     2957, 2957, 2959, 2961, 2964, 2964, 2955, 2965, 2965, 2953,
-     2966, 2967, 2970, 2968, 2969, 2971, 2956, 2959, 2966, 2968,
-     2969, 2961, 2972, 2977, 2973, 2978, 2970, 2983, 2971, 2973,
-     2967, 2974, 2974, 2975, 2975, 2980, 2981, 2984, 2985, 2986,
-     2981, 2972, 2984, 2987, 2977, 2978, 2988, 2983, 2989, 2980,
-     2990, 2994, 2986, 2989, 2995, 2990, 2987, 2985, 2991, 2991,
-     2996, 2997, 2997, 2998, 2999, 2988, 3000, 3000, 2998, 3001,
-     2999, 2994, 2995, 3002, 3001, 3003, 3004, 3005, 3002, 2996,
-     3003, 3007, 3007, 3005, 3008, 3009, 3009, 3011, 3012, 3008,
-     3013, 3011, 3014, 3015, 3016, 3004, 3017, 3013, 3020, 3020,
+     2934, 2939, 2941, 2941, 2939, 2938, 2944, 2945, 2946, 2944,
+     2947, 2948, 2950, 2945, 2942, 2947, 2949, 2940, 2952, 2959,
+     2953, 2956, 2946, 2967, 2952, 2969, 2967, 2974, 2950, 2953,
+     2948, 2970, 2970, 2976, 2949, 2975, 2956, 2976, 2969, 2971,
+     2971, 2972, 2972, 2977, 2975, 2959, 2978, 2980, 2981, 2982,
+     2974, 2983, 2984, 2983, 2982, 2985, 2985, 2987, 2986, 2981,
+     2978, 2988, 2989, 2977, 2990, 2991, 2992, 2984, 2995, 2993,
+     2980, 2986, 2994, 2995, 2996, 2992, 2987, 2997, 2989, 2988,
+     2991, 2993, 2997, 3001, 3002, 3003, 3003, 3004, 3009, 2990,
+     3005, 3005, 3010, 2994, 2996, 3014, 3004, 3001, 3006, 3006,
 
-     3016, 3018, 3022, 3022, 3023, 3024, 3025, 3012, 3026, 3027,
-     3024, 3014, 3015, 3023, 3018, 3017, 3023, 3028, 3028, 3029,
-     3030, 3032, 3027, 3034, 3029, 3025, 3039, 3026, 3033, 3033,
-     3035, 3035, 3037, 3030, 3036, 3036, 3038, 3037, 3040, 3040,
-     3046, 3041, 3034, 3038, 3048, 3039, 3041, 3032, 3042, 3044,
-     3042, 3043, 3043, 3045, 3050, 3050, 3044, 3047, 3051, 3046,
-     3045, 3053, 3047, 3048, 3054, 3055, 3053, 3056, 3060, 3054,
-     3057, 3057, 3059, 3059, 3061, 3062, 3062, 3051, 3063, 3063,
-        0, 3064, 3066, 3066, 3055, 3068, 3056, 3060, 3064, 3067,
-     3067, 3070, 3068, 3061, 3073, 3074, 3070, 3075,    0, 3073,
+     3007, 3007, 3008, 3008, 3002, 3011, 3012, 3009, 3011, 3013,
+     3015, 3012, 3010, 3016, 3013, 3017, 3018, 3019, 3020, 3016,
+     3014, 3023, 3019, 3021, 3021, 3015, 3022, 3022, 3018, 3017,
+     3024, 3025, 3025, 3027, 3029, 3035, 3023, 3036, 3020, 3032,
+     3032, 3033, 3033, 3036, 3037, 3038, 3040, 3039, 3027, 3024,
+     3037, 3041, 3029, 3046, 3035, 3047, 3041, 3042, 3042, 3038,
+     3039, 3043, 3043, 3049, 3050, 3040, 3052, 3053, 3050, 3054,
+     3055, 3056, 3053, 3057, 3046, 3047, 3058, 3049, 3060, 3060,
+     3059, 3058, 3063, 3055, 3056, 3059, 3052, 3064, 3054, 3065,
+     3066, 3066, 3057, 3067, 3068, 3069, 3069, 3073, 3067, 3070,
 
-     3076, 3076, 3077, 3077,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0, 3074,    0, 3075, 3081, 3081, 3081,
-     3081, 3081, 3081, 3081, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3083, 3083, 3083, 3083, 3083, 3083, 3083, 3084, 3084,
-     3084, 3084, 3084, 3084, 3084, 3085, 3085, 3085, 3085, 3085,
-     3085, 3085, 3087, 3087,    0, 3087, 3087, 3087, 3087, 3088,
-     3088,    0,    0,    0, 3088, 3088, 3089, 3089,    0,    0,
-     3089,    0, 3089, 3090,    0,    0,    0,    0,    0, 3090,
-     3091, 3091,    0,    0,    0, 3091, 3091, 3092,    0,    0,
-        0,    0,    0, 3092, 3093, 3093,    0, 3093, 3093, 3093,
+     3068, 3071, 3063, 3074, 3070, 3064, 3071, 3072, 3065, 3074,
+     3076, 3076, 3072, 3077, 3078, 3078, 3073, 3080, 3077, 3081,
+     3082, 3080, 3083, 3084, 3085, 3086, 3087, 3082, 3089, 3089,
+     3085, 3091, 3091, 3094, 3092, 3093, 3095, 3096, 3081, 3087,
+     3093, 3083, 3084, 3092, 3086, 3099, 3092, 3097, 3097, 3098,
+     3096, 3101, 3094, 3103, 3098, 3095, 3102, 3102, 3099, 3104,
+     3104, 3105, 3105, 3106, 3107, 3108, 3109, 3109, 3106, 3110,
+     3115, 3107, 3103, 3111, 3110, 3111, 3113, 3101, 3112, 3112,
+     3114, 3116, 3117, 3113, 3108, 3120, 3116, 3114, 3122, 3115,
+     3119, 3119, 3123, 3122, 3124, 3125, 3129, 3123, 3126, 3126,
 
-     3093, 3094, 3094,    0, 3094, 3094, 3094, 3094, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080,
-     3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080, 3080
+     3130, 3117, 3128, 3128, 3120, 3131, 3131, 3132, 3132, 3133,
+     3135, 3135, 3143, 3124, 3125, 3129, 3133, 3136, 3136, 3130,
+     3137, 3139, 3144, 3142, 3145, 3145, 3139, 3137, 3142, 3146,
+     3146, 3143,    0,    0,    0,    0,    0,    0,    0,    0,
+        0, 3144, 3150, 3150, 3150, 3150, 3150, 3150, 3150, 3151,
+     3151, 3151, 3151, 3151, 3151, 3151, 3152, 3152, 3152, 3152,
+     3152, 3152, 3152, 3153, 3153, 3153, 3153, 3153, 3153, 3153,
+     3154, 3154, 3154, 3154, 3154, 3154, 3154, 3156, 3156,    0,
+     3156, 3156, 3156, 3156, 3157, 3157,    0,    0,    0, 3157,
+     3157, 3158, 3158,    0,    0, 3158,    0, 3158, 3159,    0,
+
+        0,    0,    0,    0, 3159, 3160, 3160,    0,    0,    0,
+     3160, 3160, 3161,    0,    0,    0,    0,    0, 3161, 3162,
+     3162,    0, 3162, 3162, 3162, 3162, 3163, 3163,    0, 3163,
+     3163, 3163, 3163, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3149
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2969,7 +3019,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 2971 "<stdout>"
+#line 3021 "<stdout>"
 #define YY_NO_INPUT 1
 #line 184 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -2978,9 +3028,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 2980 "<stdout>"
+#line 3030 "<stdout>"
 
-#line 2982 "<stdout>"
+#line 3032 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3202,7 +3252,7 @@ YY_DECL
 	{
 #line 204 "./util/configlexer.lex"
 
-#line 3204 "<stdout>"
+#line 3254 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3235,13 +3285,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3081 )
+				if ( yy_current_state >= 3150 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 6009 );
+		while ( yy_base[yy_current_state] != 6134 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3486,1294 +3536,1319 @@ YY_RULE_SETUP
 case 44:
 YY_RULE_SETUP
 #line 251 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HTTPS_PORT) }
+{ YDVAR(1, VAR_TLS_USE_SNI) }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 252 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TLS_USE_SNI) }
+{ YDVAR(1, VAR_HTTPS_PORT) }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 253 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSTEMD) }
+{ YDVAR(1, VAR_HTTP_ENDPOINT) }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 254 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_DAEMONIZE) }
+{ YDVAR(1, VAR_HTTP_MAX_STREAMS) }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 255 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE) }
+{ YDVAR(1, VAR_HTTP_QUERY_BUFFER_SIZE) }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 256 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE) }
+{ YDVAR(1, VAR_HTTP_RESPONSE_BUFFER_SIZE) }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 257 "./util/configlexer.lex"
-{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
+{ YDVAR(1, VAR_HTTP_NODELAY) }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 258 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
+{ YDVAR(1, VAR_USE_SYSTEMD) }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 259 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_RCVBUF) }
+{ YDVAR(1, VAR_DO_DAEMONIZE) }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 260 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_SNDBUF) }
+{ YDVAR(1, VAR_INTERFACE) }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 261 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_REUSEPORT) }
+{ YDVAR(1, VAR_INTERFACE) }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 262 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_TRANSPARENT) }
+{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 263 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_FREEBIND) }
+{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 264 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_DSCP) }
+{ YDVAR(1, VAR_SO_RCVBUF) }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 265 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CHROOT) }
+{ YDVAR(1, VAR_SO_SNDBUF) }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 266 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USERNAME) }
+{ YDVAR(1, VAR_SO_REUSEPORT) }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 267 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DIRECTORY) }
+{ YDVAR(1, VAR_IP_TRANSPARENT) }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 268 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOGFILE) }
+{ YDVAR(1, VAR_IP_FREEBIND) }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 269 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PIDFILE) }
+{ YDVAR(1, VAR_IP_DSCP) }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 270 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_HINTS) }
+{ YDVAR(1, VAR_CHROOT) }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 271 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STREAM_WAIT_SIZE) }
+{ YDVAR(1, VAR_USERNAME) }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 272 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
+{ YDVAR(1, VAR_DIRECTORY) }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 273 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
+{ YDVAR(1, VAR_LOGFILE) }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 274 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
+{ YDVAR(1, VAR_PIDFILE) }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 275 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
+{ YDVAR(1, VAR_ROOT_HINTS) }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 276 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
+{ YDVAR(1, VAR_STREAM_WAIT_SIZE) }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 277 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
+{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 278 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MAX_TTL) }
+{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 279 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) }
+{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 280 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MIN_TTL) }
+{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 281 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_HOST_TTL) }
+{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 282 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_LAME_TTL) }
+{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 283 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
+{ YDVAR(1, VAR_CACHE_MAX_TTL) }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 284 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
+{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 285 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
+{ YDVAR(1, VAR_CACHE_MIN_TTL) }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 286 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
+{ YDVAR(1, VAR_INFRA_HOST_TTL) }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 287 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
+{ YDVAR(1, VAR_INFRA_LAME_TTL) }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 288 "./util/configlexer.lex"
-{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
+{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 289 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DELAY_CLOSE) }
+{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 290 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
+{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 291 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
+{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 292 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
+{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 293 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_GLUE) }
+{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 294 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
+{ YDVAR(1, VAR_DELAY_CLOSE) }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 295 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
+{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 296 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
+{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 297 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
+{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 298 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
+{ YDVAR(1, VAR_HARDEN_GLUE) }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 299 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CAPS_WHITELIST) }
+{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 300 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
+{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 301 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
+{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 302 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
+{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 303 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH_KEY) }
+{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 304 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH) }
+{ YDVAR(1, VAR_CAPS_WHITELIST) }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 305 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DENY_ANY) }
+{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 306 "./util/configlexer.lex"
-{ YDVAR(0, VAR_STUB_ZONE) }
+{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 307 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NAME) }
+{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 308 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_ADDR) }
+{ YDVAR(1, VAR_PREFETCH_KEY) }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 309 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_HOST) }
+{ YDVAR(1, VAR_PREFETCH) }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 310 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_PRIME) }
+{ YDVAR(1, VAR_DENY_ANY) }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 311 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_FIRST) }
+{ YDVAR(0, VAR_STUB_ZONE) }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 312 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_NO_CACHE) }
+{ YDVAR(1, VAR_NAME) }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 313 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_ADDR) }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 314 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_HOST) }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 315 "./util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_PRIME) }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 316 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(1, VAR_STUB_FIRST) }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 317 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_STUB_NO_CACHE) }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 318 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_FIRST) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 319 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 320 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 321 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 322 "./util/configlexer.lex"
-{ YDVAR(0, VAR_AUTH_ZONE) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(0, VAR_RPZ) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TAGS) }
+{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 326 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 327 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 328 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG_NAME) }
+{ YDVAR(0, VAR_RPZ) }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 329 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEFILE) }
+{ YDVAR(1, VAR_TAGS) }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MASTER) }
+{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_URL) }
+{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ALLOW_NOTIFY) }
+{ YDVAR(1, VAR_RPZ_LOG) }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 333 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+{ YDVAR(1, VAR_RPZ_LOG_NAME) }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 334 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_UPSTREAM) }
+{ YDVAR(1, VAR_ZONEFILE) }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FALLBACK_ENABLED) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 336 "./util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(1, VAR_URL) }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 337 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(1, VAR_ALLOW_NOTIFY) }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 338 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 340 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_FALLBACK_ENABLED) }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(0, VAR_VIEW) }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 344 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 346 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_IDENTITY) }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_VERSION) }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_MODULE_CONF) }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
+{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 382 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 383 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 384 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 385 "./util/configlexer.lex"
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+#line 386 "./util/configlexer.lex"
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 388 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+#line 387 "./util/configlexer.lex"
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 389 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+#line 388 "./util/configlexer.lex"
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+#line 389 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 397 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 398 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 399 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 422 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 423 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 424 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 425 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 426 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 427 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 428 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 429 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 430 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 438 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
 #line 439 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
 #line 440 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 441 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
-#line 443 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+#line 442 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_IP) }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
-#line 445 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 443 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_TLS) }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
-#line 446 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+#line 444 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
-#line 447 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+#line 445 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
-#line 448 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+#line 446 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
-#line 449 "./util/configlexer.lex"
+#line 448 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
-#line 451 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+#line 450 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
-#line 453 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+#line 451 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
-#line 455 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+#line 452 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
-#line 457 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+#line 453 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
-#line 459 "./util/configlexer.lex"
+#line 454 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
-#line 461 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 456 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
-#line 462 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+#line 458 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
-#line 463 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+#line 460 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
-#line 464 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+#line 462 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
-#line 465 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+#line 464 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
 #line 466 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
 #line 467 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
 #line 468 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
 #line 469 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
 #line 470 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
 #line 471 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
 #line 472 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 257:
 YY_RULE_SETUP
 #line 473 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 258:
 YY_RULE_SETUP
 #line 474 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 475 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
 #line 476 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 261:
 YY_RULE_SETUP
 #line 477 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_LOW_RTT) }
 	YY_BREAK
 case 262:
 YY_RULE_SETUP
 #line 478 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
 #line 479 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
 #line 480 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 481 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 482 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 483 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
 #line 484 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 269:
 YY_RULE_SETUP
 #line 485 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 270:
 YY_RULE_SETUP
 #line 486 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 271:
 YY_RULE_SETUP
 #line 487 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 272:
 YY_RULE_SETUP
-#line 489 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+#line 488 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 273:
 YY_RULE_SETUP
-#line 491 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 489 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
-#line 492 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+#line 490 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
-#line 493 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+#line 491 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
-#line 494 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+#line 492 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
-#line 495 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+#line 494 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 503 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 504 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 505 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 506 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 507 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 290:
 YY_RULE_SETUP
 #line 508 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 291:
 YY_RULE_SETUP
 #line 509 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 292:
 YY_RULE_SETUP
 #line 510 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
 	YY_BREAK
 case 293:
-/* rule 293 can match eol */
 YY_RULE_SETUP
 #line 511 "./util/configlexer.lex"
+{ YDVAR(0, VAR_IPSET) }
+	YY_BREAK
+case 294:
+YY_RULE_SETUP
+#line 512 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
+	YY_BREAK
+case 295:
+YY_RULE_SETUP
+#line 513 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
+	YY_BREAK
+case 296:
+YY_RULE_SETUP
+#line 514 "./util/configlexer.lex"
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+	YY_BREAK
+case 297:
+YY_RULE_SETUP
+#line 515 "./util/configlexer.lex"
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+	YY_BREAK
+case 298:
+/* rule 298 can match eol */
+YY_RULE_SETUP
+#line 516 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 294:
+case 299:
 YY_RULE_SETUP
-#line 514 "./util/configlexer.lex"
+#line 519 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 515 "./util/configlexer.lex"
+#line 520 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 295:
+case 300:
 YY_RULE_SETUP
-#line 520 "./util/configlexer.lex"
+#line 525 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 296:
-/* rule 296 can match eol */
+case 301:
+/* rule 301 can match eol */
 YY_RULE_SETUP
-#line 521 "./util/configlexer.lex"
+#line 526 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 297:
+case 302:
 YY_RULE_SETUP
-#line 523 "./util/configlexer.lex"
+#line 528 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4786,34 +4861,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 298:
+case 303:
 YY_RULE_SETUP
-#line 535 "./util/configlexer.lex"
+#line 540 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 536 "./util/configlexer.lex"
+#line 541 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 299:
+case 304:
 YY_RULE_SETUP
-#line 541 "./util/configlexer.lex"
+#line 546 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 300:
-/* rule 300 can match eol */
+case 305:
+/* rule 305 can match eol */
 YY_RULE_SETUP
-#line 542 "./util/configlexer.lex"
+#line 547 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 301:
+case 306:
 YY_RULE_SETUP
-#line 544 "./util/configlexer.lex"
+#line 549 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4826,38 +4901,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 302:
+case 307:
 YY_RULE_SETUP
-#line 556 "./util/configlexer.lex"
+#line 561 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 558 "./util/configlexer.lex"
+#line 563 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 303:
+case 308:
 YY_RULE_SETUP
-#line 562 "./util/configlexer.lex"
+#line 567 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
-case 304:
-/* rule 304 can match eol */
+case 309:
+/* rule 309 can match eol */
 YY_RULE_SETUP
-#line 563 "./util/configlexer.lex"
+#line 568 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
-case 305:
+case 310:
 YY_RULE_SETUP
-#line 564 "./util/configlexer.lex"
+#line 569 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
 	YY_BREAK
-case 306:
+case 311:
 YY_RULE_SETUP
-#line 565 "./util/configlexer.lex"
+#line 570 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext);
@@ -4865,27 +4940,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 570 "./util/configlexer.lex"
+#line 575 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 307:
+case 312:
 YY_RULE_SETUP
-#line 574 "./util/configlexer.lex"
+#line 579 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 308:
-/* rule 308 can match eol */
+case 313:
+/* rule 313 can match eol */
 YY_RULE_SETUP
-#line 575 "./util/configlexer.lex"
+#line 580 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 309:
+case 314:
 YY_RULE_SETUP
-#line 577 "./util/configlexer.lex"
+#line 582 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -4895,7 +4970,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 583 "./util/configlexer.lex"
+#line 588 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -4907,33 +4982,33 @@ case YY_STATE_EOF(val):
 	}
 }
 	YY_BREAK
-case 310:
+case 315:
 YY_RULE_SETUP
-#line 594 "./util/configlexer.lex"
+#line 599 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 311:
+case 316:
 YY_RULE_SETUP
-#line 598 "./util/configlexer.lex"
+#line 603 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 312:
+case 317:
 YY_RULE_SETUP
-#line 602 "./util/configlexer.lex"
+#line 607 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 313:
+case 318:
 YY_RULE_SETUP
-#line 606 "./util/configlexer.lex"
+#line 611 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 4935 "<stdout>"
+#line 5010 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5228,7 +5303,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3081 )
+			if ( yy_current_state >= 3150 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5256,11 +5331,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3081 )
+		if ( yy_current_state >= 3150 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3080);
+	yy_is_jam = (yy_current_state == 3149);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -5899,6 +5974,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 606 "./util/configlexer.lex"
+#line 611 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index d20c8f5ed..cbe0fd2c1 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -248,8 +248,13 @@ tls-additional-port{COLON}	{ YDVAR(1, VAR_TLS_ADDITIONAL_PORT) }
 tls-session-ticket-keys{COLON}	{ YDVAR(1, VAR_TLS_SESSION_TICKET_KEYS) }
 tls-ciphers{COLON}		{ YDVAR(1, VAR_TLS_CIPHERS) }
 tls-ciphersuites{COLON}		{ YDVAR(1, VAR_TLS_CIPHERSUITES) }
-https-port{COLON}		{ YDVAR(1, VAR_HTTPS_PORT) }
 tls-use-sni{COLON}		{ YDVAR(1, VAR_TLS_USE_SNI) }
+https-port{COLON}		{ YDVAR(1, VAR_HTTPS_PORT) }
+http-endpoint{COLON}		{ YDVAR(1, VAR_HTTP_ENDPOINT) }
+http-max-streams{COLON}		{ YDVAR(1, VAR_HTTP_MAX_STREAMS) }
+http-query-buffer-size{COLON}	{ YDVAR(1, VAR_HTTP_QUERY_BUFFER_SIZE) }
+http-response-buffer-size{COLON} { YDVAR(1, VAR_HTTP_RESPONSE_BUFFER_SIZE) }
+http-nodelay{COLON}		{ YDVAR(1, VAR_HTTP_NODELAY) }
 use-systemd{COLON}		{ YDVAR(1, VAR_USE_SYSTEMD) }
 do-daemonize{COLON}		{ YDVAR(1, VAR_DO_DAEMONIZE) }
 interface{COLON}		{ YDVAR(1, VAR_INTERFACE) }
diff --git a/util/configparser.c b/util/configparser.c
index 0069a96e3..57656864b 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -265,153 +265,158 @@ extern int yydebug;
     VAR_FORWARD_SSL_UPSTREAM = 394,
     VAR_TLS_CERT_BUNDLE = 395,
     VAR_HTTPS_PORT = 396,
-    VAR_STUB_FIRST = 397,
-    VAR_MINIMAL_RESPONSES = 398,
-    VAR_RRSET_ROUNDROBIN = 399,
-    VAR_MAX_UDP_SIZE = 400,
-    VAR_DELAY_CLOSE = 401,
-    VAR_UNBLOCK_LAN_ZONES = 402,
-    VAR_INSECURE_LAN_ZONES = 403,
-    VAR_INFRA_CACHE_MIN_RTT = 404,
-    VAR_DNS64_PREFIX = 405,
-    VAR_DNS64_SYNTHALL = 406,
-    VAR_DNS64_IGNORE_AAAA = 407,
-    VAR_DNSTAP = 408,
-    VAR_DNSTAP_ENABLE = 409,
-    VAR_DNSTAP_SOCKET_PATH = 410,
-    VAR_DNSTAP_IP = 411,
-    VAR_DNSTAP_TLS = 412,
-    VAR_DNSTAP_TLS_SERVER_NAME = 413,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 414,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 415,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 416,
-    VAR_DNSTAP_SEND_IDENTITY = 417,
-    VAR_DNSTAP_SEND_VERSION = 418,
-    VAR_DNSTAP_IDENTITY = 419,
-    VAR_DNSTAP_VERSION = 420,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 421,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 422,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 423,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 424,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 425,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 426,
-    VAR_RESPONSE_IP_TAG = 427,
-    VAR_RESPONSE_IP = 428,
-    VAR_RESPONSE_IP_DATA = 429,
-    VAR_HARDEN_ALGO_DOWNGRADE = 430,
-    VAR_IP_TRANSPARENT = 431,
-    VAR_IP_DSCP = 432,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 433,
-    VAR_IP_RATELIMIT = 434,
-    VAR_IP_RATELIMIT_SLABS = 435,
-    VAR_IP_RATELIMIT_SIZE = 436,
-    VAR_RATELIMIT = 437,
-    VAR_RATELIMIT_SLABS = 438,
-    VAR_RATELIMIT_SIZE = 439,
-    VAR_RATELIMIT_FOR_DOMAIN = 440,
-    VAR_RATELIMIT_BELOW_DOMAIN = 441,
-    VAR_IP_RATELIMIT_FACTOR = 442,
-    VAR_RATELIMIT_FACTOR = 443,
-    VAR_SEND_CLIENT_SUBNET = 444,
-    VAR_CLIENT_SUBNET_ZONE = 445,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 446,
-    VAR_CLIENT_SUBNET_OPCODE = 447,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 448,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 449,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 450,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 451,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 452,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 453,
-    VAR_CAPS_WHITELIST = 454,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 455,
-    VAR_PERMIT_SMALL_HOLDDOWN = 456,
-    VAR_QNAME_MINIMISATION = 457,
-    VAR_QNAME_MINIMISATION_STRICT = 458,
-    VAR_IP_FREEBIND = 459,
-    VAR_DEFINE_TAG = 460,
-    VAR_LOCAL_ZONE_TAG = 461,
-    VAR_ACCESS_CONTROL_TAG = 462,
-    VAR_LOCAL_ZONE_OVERRIDE = 463,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 464,
-    VAR_ACCESS_CONTROL_TAG_DATA = 465,
-    VAR_VIEW = 466,
-    VAR_ACCESS_CONTROL_VIEW = 467,
-    VAR_VIEW_FIRST = 468,
-    VAR_SERVE_EXPIRED = 469,
-    VAR_SERVE_EXPIRED_TTL = 470,
-    VAR_SERVE_EXPIRED_TTL_RESET = 471,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 472,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 473,
-    VAR_FAKE_DSA = 474,
-    VAR_FAKE_SHA1 = 475,
-    VAR_LOG_IDENTITY = 476,
-    VAR_HIDE_TRUSTANCHOR = 477,
-    VAR_TRUST_ANCHOR_SIGNALING = 478,
-    VAR_AGGRESSIVE_NSEC = 479,
-    VAR_USE_SYSTEMD = 480,
-    VAR_SHM_ENABLE = 481,
-    VAR_SHM_KEY = 482,
-    VAR_ROOT_KEY_SENTINEL = 483,
-    VAR_DNSCRYPT = 484,
-    VAR_DNSCRYPT_ENABLE = 485,
-    VAR_DNSCRYPT_PORT = 486,
-    VAR_DNSCRYPT_PROVIDER = 487,
-    VAR_DNSCRYPT_SECRET_KEY = 488,
-    VAR_DNSCRYPT_PROVIDER_CERT = 489,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 490,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 491,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 492,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 493,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 494,
-    VAR_IPSECMOD_ENABLED = 495,
-    VAR_IPSECMOD_HOOK = 496,
-    VAR_IPSECMOD_IGNORE_BOGUS = 497,
-    VAR_IPSECMOD_MAX_TTL = 498,
-    VAR_IPSECMOD_WHITELIST = 499,
-    VAR_IPSECMOD_STRICT = 500,
-    VAR_CACHEDB = 501,
-    VAR_CACHEDB_BACKEND = 502,
-    VAR_CACHEDB_SECRETSEED = 503,
-    VAR_CACHEDB_REDISHOST = 504,
-    VAR_CACHEDB_REDISPORT = 505,
-    VAR_CACHEDB_REDISTIMEOUT = 506,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 507,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 508,
-    VAR_FOR_UPSTREAM = 509,
-    VAR_AUTH_ZONE = 510,
-    VAR_ZONEFILE = 511,
-    VAR_MASTER = 512,
-    VAR_URL = 513,
-    VAR_FOR_DOWNSTREAM = 514,
-    VAR_FALLBACK_ENABLED = 515,
-    VAR_TLS_ADDITIONAL_PORT = 516,
-    VAR_LOW_RTT = 517,
-    VAR_LOW_RTT_PERMIL = 518,
-    VAR_FAST_SERVER_PERMIL = 519,
-    VAR_FAST_SERVER_NUM = 520,
-    VAR_ALLOW_NOTIFY = 521,
-    VAR_TLS_WIN_CERT = 522,
-    VAR_TCP_CONNECTION_LIMIT = 523,
-    VAR_FORWARD_NO_CACHE = 524,
-    VAR_STUB_NO_CACHE = 525,
-    VAR_LOG_SERVFAIL = 526,
-    VAR_DENY_ANY = 527,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 528,
-    VAR_LOG_TAG_QUERYREPLY = 529,
-    VAR_STREAM_WAIT_SIZE = 530,
-    VAR_TLS_CIPHERS = 531,
-    VAR_TLS_CIPHERSUITES = 532,
-    VAR_TLS_USE_SNI = 533,
-    VAR_IPSET = 534,
-    VAR_IPSET_NAME_V4 = 535,
-    VAR_IPSET_NAME_V6 = 536,
-    VAR_TLS_SESSION_TICKET_KEYS = 537,
-    VAR_RPZ = 538,
-    VAR_TAGS = 539,
-    VAR_RPZ_ACTION_OVERRIDE = 540,
-    VAR_RPZ_CNAME_OVERRIDE = 541,
-    VAR_RPZ_LOG = 542,
-    VAR_RPZ_LOG_NAME = 543
+    VAR_HTTP_ENDPOINT = 397,
+    VAR_HTTP_MAX_STREAMS = 398,
+    VAR_HTTP_QUERY_BUFFER_SIZE = 399,
+    VAR_HTTP_RESPONSE_BUFFER_SIZE = 400,
+    VAR_HTTP_NODELAY = 401,
+    VAR_STUB_FIRST = 402,
+    VAR_MINIMAL_RESPONSES = 403,
+    VAR_RRSET_ROUNDROBIN = 404,
+    VAR_MAX_UDP_SIZE = 405,
+    VAR_DELAY_CLOSE = 406,
+    VAR_UNBLOCK_LAN_ZONES = 407,
+    VAR_INSECURE_LAN_ZONES = 408,
+    VAR_INFRA_CACHE_MIN_RTT = 409,
+    VAR_DNS64_PREFIX = 410,
+    VAR_DNS64_SYNTHALL = 411,
+    VAR_DNS64_IGNORE_AAAA = 412,
+    VAR_DNSTAP = 413,
+    VAR_DNSTAP_ENABLE = 414,
+    VAR_DNSTAP_SOCKET_PATH = 415,
+    VAR_DNSTAP_IP = 416,
+    VAR_DNSTAP_TLS = 417,
+    VAR_DNSTAP_TLS_SERVER_NAME = 418,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 419,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 420,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 421,
+    VAR_DNSTAP_SEND_IDENTITY = 422,
+    VAR_DNSTAP_SEND_VERSION = 423,
+    VAR_DNSTAP_IDENTITY = 424,
+    VAR_DNSTAP_VERSION = 425,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 426,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 427,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 428,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 429,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 430,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 431,
+    VAR_RESPONSE_IP_TAG = 432,
+    VAR_RESPONSE_IP = 433,
+    VAR_RESPONSE_IP_DATA = 434,
+    VAR_HARDEN_ALGO_DOWNGRADE = 435,
+    VAR_IP_TRANSPARENT = 436,
+    VAR_IP_DSCP = 437,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 438,
+    VAR_IP_RATELIMIT = 439,
+    VAR_IP_RATELIMIT_SLABS = 440,
+    VAR_IP_RATELIMIT_SIZE = 441,
+    VAR_RATELIMIT = 442,
+    VAR_RATELIMIT_SLABS = 443,
+    VAR_RATELIMIT_SIZE = 444,
+    VAR_RATELIMIT_FOR_DOMAIN = 445,
+    VAR_RATELIMIT_BELOW_DOMAIN = 446,
+    VAR_IP_RATELIMIT_FACTOR = 447,
+    VAR_RATELIMIT_FACTOR = 448,
+    VAR_SEND_CLIENT_SUBNET = 449,
+    VAR_CLIENT_SUBNET_ZONE = 450,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 451,
+    VAR_CLIENT_SUBNET_OPCODE = 452,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 453,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 454,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 455,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 456,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 457,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 458,
+    VAR_CAPS_WHITELIST = 459,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 460,
+    VAR_PERMIT_SMALL_HOLDDOWN = 461,
+    VAR_QNAME_MINIMISATION = 462,
+    VAR_QNAME_MINIMISATION_STRICT = 463,
+    VAR_IP_FREEBIND = 464,
+    VAR_DEFINE_TAG = 465,
+    VAR_LOCAL_ZONE_TAG = 466,
+    VAR_ACCESS_CONTROL_TAG = 467,
+    VAR_LOCAL_ZONE_OVERRIDE = 468,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 469,
+    VAR_ACCESS_CONTROL_TAG_DATA = 470,
+    VAR_VIEW = 471,
+    VAR_ACCESS_CONTROL_VIEW = 472,
+    VAR_VIEW_FIRST = 473,
+    VAR_SERVE_EXPIRED = 474,
+    VAR_SERVE_EXPIRED_TTL = 475,
+    VAR_SERVE_EXPIRED_TTL_RESET = 476,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 477,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 478,
+    VAR_FAKE_DSA = 479,
+    VAR_FAKE_SHA1 = 480,
+    VAR_LOG_IDENTITY = 481,
+    VAR_HIDE_TRUSTANCHOR = 482,
+    VAR_TRUST_ANCHOR_SIGNALING = 483,
+    VAR_AGGRESSIVE_NSEC = 484,
+    VAR_USE_SYSTEMD = 485,
+    VAR_SHM_ENABLE = 486,
+    VAR_SHM_KEY = 487,
+    VAR_ROOT_KEY_SENTINEL = 488,
+    VAR_DNSCRYPT = 489,
+    VAR_DNSCRYPT_ENABLE = 490,
+    VAR_DNSCRYPT_PORT = 491,
+    VAR_DNSCRYPT_PROVIDER = 492,
+    VAR_DNSCRYPT_SECRET_KEY = 493,
+    VAR_DNSCRYPT_PROVIDER_CERT = 494,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 495,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 496,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 497,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 498,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 499,
+    VAR_IPSECMOD_ENABLED = 500,
+    VAR_IPSECMOD_HOOK = 501,
+    VAR_IPSECMOD_IGNORE_BOGUS = 502,
+    VAR_IPSECMOD_MAX_TTL = 503,
+    VAR_IPSECMOD_WHITELIST = 504,
+    VAR_IPSECMOD_STRICT = 505,
+    VAR_CACHEDB = 506,
+    VAR_CACHEDB_BACKEND = 507,
+    VAR_CACHEDB_SECRETSEED = 508,
+    VAR_CACHEDB_REDISHOST = 509,
+    VAR_CACHEDB_REDISPORT = 510,
+    VAR_CACHEDB_REDISTIMEOUT = 511,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 512,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 513,
+    VAR_FOR_UPSTREAM = 514,
+    VAR_AUTH_ZONE = 515,
+    VAR_ZONEFILE = 516,
+    VAR_MASTER = 517,
+    VAR_URL = 518,
+    VAR_FOR_DOWNSTREAM = 519,
+    VAR_FALLBACK_ENABLED = 520,
+    VAR_TLS_ADDITIONAL_PORT = 521,
+    VAR_LOW_RTT = 522,
+    VAR_LOW_RTT_PERMIL = 523,
+    VAR_FAST_SERVER_PERMIL = 524,
+    VAR_FAST_SERVER_NUM = 525,
+    VAR_ALLOW_NOTIFY = 526,
+    VAR_TLS_WIN_CERT = 527,
+    VAR_TCP_CONNECTION_LIMIT = 528,
+    VAR_FORWARD_NO_CACHE = 529,
+    VAR_STUB_NO_CACHE = 530,
+    VAR_LOG_SERVFAIL = 531,
+    VAR_DENY_ANY = 532,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 533,
+    VAR_LOG_TAG_QUERYREPLY = 534,
+    VAR_STREAM_WAIT_SIZE = 535,
+    VAR_TLS_CIPHERS = 536,
+    VAR_TLS_CIPHERSUITES = 537,
+    VAR_TLS_USE_SNI = 538,
+    VAR_IPSET = 539,
+    VAR_IPSET_NAME_V4 = 540,
+    VAR_IPSET_NAME_V6 = 541,
+    VAR_TLS_SESSION_TICKET_KEYS = 542,
+    VAR_RPZ = 543,
+    VAR_TAGS = 544,
+    VAR_RPZ_ACTION_OVERRIDE = 545,
+    VAR_RPZ_CNAME_OVERRIDE = 546,
+    VAR_RPZ_LOG = 547,
+    VAR_RPZ_LOG_NAME = 548
   };
 #endif
 /* Tokens.  */
@@ -554,153 +559,158 @@ extern int yydebug;
 #define VAR_FORWARD_SSL_UPSTREAM 394
 #define VAR_TLS_CERT_BUNDLE 395
 #define VAR_HTTPS_PORT 396
-#define VAR_STUB_FIRST 397
-#define VAR_MINIMAL_RESPONSES 398
-#define VAR_RRSET_ROUNDROBIN 399
-#define VAR_MAX_UDP_SIZE 400
-#define VAR_DELAY_CLOSE 401
-#define VAR_UNBLOCK_LAN_ZONES 402
-#define VAR_INSECURE_LAN_ZONES 403
-#define VAR_INFRA_CACHE_MIN_RTT 404
-#define VAR_DNS64_PREFIX 405
-#define VAR_DNS64_SYNTHALL 406
-#define VAR_DNS64_IGNORE_AAAA 407
-#define VAR_DNSTAP 408
-#define VAR_DNSTAP_ENABLE 409
-#define VAR_DNSTAP_SOCKET_PATH 410
-#define VAR_DNSTAP_IP 411
-#define VAR_DNSTAP_TLS 412
-#define VAR_DNSTAP_TLS_SERVER_NAME 413
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 414
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 415
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 416
-#define VAR_DNSTAP_SEND_IDENTITY 417
-#define VAR_DNSTAP_SEND_VERSION 418
-#define VAR_DNSTAP_IDENTITY 419
-#define VAR_DNSTAP_VERSION 420
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 421
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 422
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 423
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 424
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 425
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 426
-#define VAR_RESPONSE_IP_TAG 427
-#define VAR_RESPONSE_IP 428
-#define VAR_RESPONSE_IP_DATA 429
-#define VAR_HARDEN_ALGO_DOWNGRADE 430
-#define VAR_IP_TRANSPARENT 431
-#define VAR_IP_DSCP 432
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 433
-#define VAR_IP_RATELIMIT 434
-#define VAR_IP_RATELIMIT_SLABS 435
-#define VAR_IP_RATELIMIT_SIZE 436
-#define VAR_RATELIMIT 437
-#define VAR_RATELIMIT_SLABS 438
-#define VAR_RATELIMIT_SIZE 439
-#define VAR_RATELIMIT_FOR_DOMAIN 440
-#define VAR_RATELIMIT_BELOW_DOMAIN 441
-#define VAR_IP_RATELIMIT_FACTOR 442
-#define VAR_RATELIMIT_FACTOR 443
-#define VAR_SEND_CLIENT_SUBNET 444
-#define VAR_CLIENT_SUBNET_ZONE 445
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 446
-#define VAR_CLIENT_SUBNET_OPCODE 447
-#define VAR_MAX_CLIENT_SUBNET_IPV4 448
-#define VAR_MAX_CLIENT_SUBNET_IPV6 449
-#define VAR_MIN_CLIENT_SUBNET_IPV4 450
-#define VAR_MIN_CLIENT_SUBNET_IPV6 451
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 452
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 453
-#define VAR_CAPS_WHITELIST 454
-#define VAR_CACHE_MAX_NEGATIVE_TTL 455
-#define VAR_PERMIT_SMALL_HOLDDOWN 456
-#define VAR_QNAME_MINIMISATION 457
-#define VAR_QNAME_MINIMISATION_STRICT 458
-#define VAR_IP_FREEBIND 459
-#define VAR_DEFINE_TAG 460
-#define VAR_LOCAL_ZONE_TAG 461
-#define VAR_ACCESS_CONTROL_TAG 462
-#define VAR_LOCAL_ZONE_OVERRIDE 463
-#define VAR_ACCESS_CONTROL_TAG_ACTION 464
-#define VAR_ACCESS_CONTROL_TAG_DATA 465
-#define VAR_VIEW 466
-#define VAR_ACCESS_CONTROL_VIEW 467
-#define VAR_VIEW_FIRST 468
-#define VAR_SERVE_EXPIRED 469
-#define VAR_SERVE_EXPIRED_TTL 470
-#define VAR_SERVE_EXPIRED_TTL_RESET 471
-#define VAR_SERVE_EXPIRED_REPLY_TTL 472
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 473
-#define VAR_FAKE_DSA 474
-#define VAR_FAKE_SHA1 475
-#define VAR_LOG_IDENTITY 476
-#define VAR_HIDE_TRUSTANCHOR 477
-#define VAR_TRUST_ANCHOR_SIGNALING 478
-#define VAR_AGGRESSIVE_NSEC 479
-#define VAR_USE_SYSTEMD 480
-#define VAR_SHM_ENABLE 481
-#define VAR_SHM_KEY 482
-#define VAR_ROOT_KEY_SENTINEL 483
-#define VAR_DNSCRYPT 484
-#define VAR_DNSCRYPT_ENABLE 485
-#define VAR_DNSCRYPT_PORT 486
-#define VAR_DNSCRYPT_PROVIDER 487
-#define VAR_DNSCRYPT_SECRET_KEY 488
-#define VAR_DNSCRYPT_PROVIDER_CERT 489
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 490
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 491
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 492
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 493
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 494
-#define VAR_IPSECMOD_ENABLED 495
-#define VAR_IPSECMOD_HOOK 496
-#define VAR_IPSECMOD_IGNORE_BOGUS 497
-#define VAR_IPSECMOD_MAX_TTL 498
-#define VAR_IPSECMOD_WHITELIST 499
-#define VAR_IPSECMOD_STRICT 500
-#define VAR_CACHEDB 501
-#define VAR_CACHEDB_BACKEND 502
-#define VAR_CACHEDB_SECRETSEED 503
-#define VAR_CACHEDB_REDISHOST 504
-#define VAR_CACHEDB_REDISPORT 505
-#define VAR_CACHEDB_REDISTIMEOUT 506
-#define VAR_CACHEDB_REDISEXPIRERECORDS 507
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 508
-#define VAR_FOR_UPSTREAM 509
-#define VAR_AUTH_ZONE 510
-#define VAR_ZONEFILE 511
-#define VAR_MASTER 512
-#define VAR_URL 513
-#define VAR_FOR_DOWNSTREAM 514
-#define VAR_FALLBACK_ENABLED 515
-#define VAR_TLS_ADDITIONAL_PORT 516
-#define VAR_LOW_RTT 517
-#define VAR_LOW_RTT_PERMIL 518
-#define VAR_FAST_SERVER_PERMIL 519
-#define VAR_FAST_SERVER_NUM 520
-#define VAR_ALLOW_NOTIFY 521
-#define VAR_TLS_WIN_CERT 522
-#define VAR_TCP_CONNECTION_LIMIT 523
-#define VAR_FORWARD_NO_CACHE 524
-#define VAR_STUB_NO_CACHE 525
-#define VAR_LOG_SERVFAIL 526
-#define VAR_DENY_ANY 527
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 528
-#define VAR_LOG_TAG_QUERYREPLY 529
-#define VAR_STREAM_WAIT_SIZE 530
-#define VAR_TLS_CIPHERS 531
-#define VAR_TLS_CIPHERSUITES 532
-#define VAR_TLS_USE_SNI 533
-#define VAR_IPSET 534
-#define VAR_IPSET_NAME_V4 535
-#define VAR_IPSET_NAME_V6 536
-#define VAR_TLS_SESSION_TICKET_KEYS 537
-#define VAR_RPZ 538
-#define VAR_TAGS 539
-#define VAR_RPZ_ACTION_OVERRIDE 540
-#define VAR_RPZ_CNAME_OVERRIDE 541
-#define VAR_RPZ_LOG 542
-#define VAR_RPZ_LOG_NAME 543
+#define VAR_HTTP_ENDPOINT 397
+#define VAR_HTTP_MAX_STREAMS 398
+#define VAR_HTTP_QUERY_BUFFER_SIZE 399
+#define VAR_HTTP_RESPONSE_BUFFER_SIZE 400
+#define VAR_HTTP_NODELAY 401
+#define VAR_STUB_FIRST 402
+#define VAR_MINIMAL_RESPONSES 403
+#define VAR_RRSET_ROUNDROBIN 404
+#define VAR_MAX_UDP_SIZE 405
+#define VAR_DELAY_CLOSE 406
+#define VAR_UNBLOCK_LAN_ZONES 407
+#define VAR_INSECURE_LAN_ZONES 408
+#define VAR_INFRA_CACHE_MIN_RTT 409
+#define VAR_DNS64_PREFIX 410
+#define VAR_DNS64_SYNTHALL 411
+#define VAR_DNS64_IGNORE_AAAA 412
+#define VAR_DNSTAP 413
+#define VAR_DNSTAP_ENABLE 414
+#define VAR_DNSTAP_SOCKET_PATH 415
+#define VAR_DNSTAP_IP 416
+#define VAR_DNSTAP_TLS 417
+#define VAR_DNSTAP_TLS_SERVER_NAME 418
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 419
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 420
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 421
+#define VAR_DNSTAP_SEND_IDENTITY 422
+#define VAR_DNSTAP_SEND_VERSION 423
+#define VAR_DNSTAP_IDENTITY 424
+#define VAR_DNSTAP_VERSION 425
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 426
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 427
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 428
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 429
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 430
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 431
+#define VAR_RESPONSE_IP_TAG 432
+#define VAR_RESPONSE_IP 433
+#define VAR_RESPONSE_IP_DATA 434
+#define VAR_HARDEN_ALGO_DOWNGRADE 435
+#define VAR_IP_TRANSPARENT 436
+#define VAR_IP_DSCP 437
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 438
+#define VAR_IP_RATELIMIT 439
+#define VAR_IP_RATELIMIT_SLABS 440
+#define VAR_IP_RATELIMIT_SIZE 441
+#define VAR_RATELIMIT 442
+#define VAR_RATELIMIT_SLABS 443
+#define VAR_RATELIMIT_SIZE 444
+#define VAR_RATELIMIT_FOR_DOMAIN 445
+#define VAR_RATELIMIT_BELOW_DOMAIN 446
+#define VAR_IP_RATELIMIT_FACTOR 447
+#define VAR_RATELIMIT_FACTOR 448
+#define VAR_SEND_CLIENT_SUBNET 449
+#define VAR_CLIENT_SUBNET_ZONE 450
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 451
+#define VAR_CLIENT_SUBNET_OPCODE 452
+#define VAR_MAX_CLIENT_SUBNET_IPV4 453
+#define VAR_MAX_CLIENT_SUBNET_IPV6 454
+#define VAR_MIN_CLIENT_SUBNET_IPV4 455
+#define VAR_MIN_CLIENT_SUBNET_IPV6 456
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 457
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 458
+#define VAR_CAPS_WHITELIST 459
+#define VAR_CACHE_MAX_NEGATIVE_TTL 460
+#define VAR_PERMIT_SMALL_HOLDDOWN 461
+#define VAR_QNAME_MINIMISATION 462
+#define VAR_QNAME_MINIMISATION_STRICT 463
+#define VAR_IP_FREEBIND 464
+#define VAR_DEFINE_TAG 465
+#define VAR_LOCAL_ZONE_TAG 466
+#define VAR_ACCESS_CONTROL_TAG 467
+#define VAR_LOCAL_ZONE_OVERRIDE 468
+#define VAR_ACCESS_CONTROL_TAG_ACTION 469
+#define VAR_ACCESS_CONTROL_TAG_DATA 470
+#define VAR_VIEW 471
+#define VAR_ACCESS_CONTROL_VIEW 472
+#define VAR_VIEW_FIRST 473
+#define VAR_SERVE_EXPIRED 474
+#define VAR_SERVE_EXPIRED_TTL 475
+#define VAR_SERVE_EXPIRED_TTL_RESET 476
+#define VAR_SERVE_EXPIRED_REPLY_TTL 477
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 478
+#define VAR_FAKE_DSA 479
+#define VAR_FAKE_SHA1 480
+#define VAR_LOG_IDENTITY 481
+#define VAR_HIDE_TRUSTANCHOR 482
+#define VAR_TRUST_ANCHOR_SIGNALING 483
+#define VAR_AGGRESSIVE_NSEC 484
+#define VAR_USE_SYSTEMD 485
+#define VAR_SHM_ENABLE 486
+#define VAR_SHM_KEY 487
+#define VAR_ROOT_KEY_SENTINEL 488
+#define VAR_DNSCRYPT 489
+#define VAR_DNSCRYPT_ENABLE 490
+#define VAR_DNSCRYPT_PORT 491
+#define VAR_DNSCRYPT_PROVIDER 492
+#define VAR_DNSCRYPT_SECRET_KEY 493
+#define VAR_DNSCRYPT_PROVIDER_CERT 494
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 495
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 496
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 497
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 498
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 499
+#define VAR_IPSECMOD_ENABLED 500
+#define VAR_IPSECMOD_HOOK 501
+#define VAR_IPSECMOD_IGNORE_BOGUS 502
+#define VAR_IPSECMOD_MAX_TTL 503
+#define VAR_IPSECMOD_WHITELIST 504
+#define VAR_IPSECMOD_STRICT 505
+#define VAR_CACHEDB 506
+#define VAR_CACHEDB_BACKEND 507
+#define VAR_CACHEDB_SECRETSEED 508
+#define VAR_CACHEDB_REDISHOST 509
+#define VAR_CACHEDB_REDISPORT 510
+#define VAR_CACHEDB_REDISTIMEOUT 511
+#define VAR_CACHEDB_REDISEXPIRERECORDS 512
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 513
+#define VAR_FOR_UPSTREAM 514
+#define VAR_AUTH_ZONE 515
+#define VAR_ZONEFILE 516
+#define VAR_MASTER 517
+#define VAR_URL 518
+#define VAR_FOR_DOWNSTREAM 519
+#define VAR_FALLBACK_ENABLED 520
+#define VAR_TLS_ADDITIONAL_PORT 521
+#define VAR_LOW_RTT 522
+#define VAR_LOW_RTT_PERMIL 523
+#define VAR_FAST_SERVER_PERMIL 524
+#define VAR_FAST_SERVER_NUM 525
+#define VAR_ALLOW_NOTIFY 526
+#define VAR_TLS_WIN_CERT 527
+#define VAR_TCP_CONNECTION_LIMIT 528
+#define VAR_FORWARD_NO_CACHE 529
+#define VAR_STUB_NO_CACHE 530
+#define VAR_LOG_SERVFAIL 531
+#define VAR_DENY_ANY 532
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 533
+#define VAR_LOG_TAG_QUERYREPLY 534
+#define VAR_STREAM_WAIT_SIZE 535
+#define VAR_TLS_CIPHERS 536
+#define VAR_TLS_CIPHERSUITES 537
+#define VAR_TLS_USE_SNI 538
+#define VAR_IPSET 539
+#define VAR_IPSET_NAME_V4 540
+#define VAR_IPSET_NAME_V6 541
+#define VAR_TLS_SESSION_TICKET_KEYS 542
+#define VAR_RPZ 543
+#define VAR_TAGS 544
+#define VAR_RPZ_ACTION_OVERRIDE 545
+#define VAR_RPZ_CNAME_OVERRIDE 546
+#define VAR_RPZ_LOG 547
+#define VAR_RPZ_LOG_NAME 548
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -711,7 +721,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 715 "util/configparser.c" /* yacc.c:355  */
+#line 725 "util/configparser.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -728,7 +738,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 732 "util/configparser.c" /* yacc.c:358  */
+#line 742 "util/configparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -970,21 +980,21 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   611
+#define YYLAST   621
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  289
+#define YYNTOKENS  294
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  312
+#define YYNNTS  317
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  602
+#define YYNRULES  612
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  896
+#define YYNSTATES  911
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   543
+#define YYMAXUTOK   548
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1047,74 +1057,75 @@ static const yytype_uint16 yytranslate[] =
      255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288
+     285,   286,   287,   288,   289,   290,   291,   292,   293
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   180,   180,   180,   181,   181,   182,   182,   183,   183,
-     183,   184,   184,   185,   185,   186,   190,   195,   196,   197,
-     197,   197,   198,   198,   199,   199,   199,   200,   200,   201,
-     201,   201,   202,   202,   203,   203,   203,   204,   204,   204,
-     205,   205,   206,   206,   207,   207,   208,   208,   209,   209,
-     210,   210,   211,   211,   212,   212,   213,   213,   213,   214,
-     214,   214,   215,   215,   215,   216,   216,   217,   217,   218,
-     218,   219,   219,   220,   220,   220,   221,   221,   222,   222,
-     223,   223,   223,   224,   224,   225,   225,   226,   226,   227,
-     227,   227,   228,   228,   229,   229,   230,   230,   231,   231,
-     232,   232,   233,   233,   233,   234,   234,   235,   235,   235,
-     236,   236,   236,   237,   237,   237,   238,   238,   238,   238,
-     239,   240,   240,   240,   241,   242,   242,   242,   243,   243,
-     244,   244,   245,   245,   245,   246,   246,   247,   247,   247,
-     248,   249,   249,   250,   250,   251,   252,   252,   253,   253,
-     254,   254,   255,   256,   256,   257,   257,   258,   258,   259,
-     259,   260,   260,   261,   261,   261,   262,   262,   263,   263,
-     264,   264,   265,   265,   266,   266,   267,   267,   268,   268,
-     268,   269,   269,   269,   270,   270,   270,   271,   271,   272,
-     273,   273,   274,   274,   275,   275,   276,   276,   277,   277,
-     277,   278,   278,   278,   279,   279,   279,   280,   280,   281,
-     281,   282,   282,   283,   285,   297,   298,   299,   299,   299,
-     299,   299,   300,   300,   302,   314,   315,   316,   316,   316,
-     316,   317,   317,   319,   333,   334,   335,   335,   335,   335,
-     336,   336,   336,   338,   355,   356,   357,   357,   357,   357,
-     358,   358,   358,   359,   362,   381,   398,   406,   416,   424,
-     441,   442,   443,   443,   443,   443,   443,   444,   444,   444,
-     445,   445,   447,   456,   465,   476,   485,   494,   503,   514,
-     523,   535,   549,   564,   575,   592,   609,   626,   643,   658,
-     673,   686,   701,   710,   719,   728,   737,   746,   755,   764,
-     773,   782,   791,   800,   809,   818,   827,   840,   849,   862,
-     871,   880,   889,   896,   903,   912,   919,   928,   936,   943,
-     950,   958,   965,   974,   983,   992,  1006,  1015,  1024,  1033,
-    1042,  1051,  1060,  1067,  1074,  1100,  1108,  1115,  1122,  1129,
-    1136,  1144,  1152,  1160,  1167,  1178,  1189,  1196,  1205,  1214,
-    1223,  1230,  1237,  1245,  1253,  1263,  1273,  1283,  1297,  1305,
-    1318,  1329,  1337,  1350,  1359,  1368,  1377,  1387,  1397,  1405,
-    1418,  1427,  1435,  1444,  1452,  1465,  1474,  1481,  1491,  1501,
-    1511,  1521,  1531,  1541,  1551,  1561,  1568,  1575,  1582,  1591,
-    1600,  1609,  1618,  1625,  1635,  1655,  1662,  1680,  1693,  1706,
-    1715,  1724,  1733,  1742,  1752,  1762,  1773,  1782,  1791,  1800,
-    1809,  1818,  1827,  1840,  1853,  1862,  1869,  1878,  1887,  1896,
-    1905,  1913,  1926,  1934,  1975,  1982,  1997,  2007,  2017,  2024,
-    2031,  2038,  2047,  2055,  2069,  2090,  2111,  2123,  2135,  2147,
-    2156,  2177,  2187,  2196,  2204,  2212,  2225,  2238,  2253,  2268,
-    2277,  2286,  2292,  2301,  2310,  2320,  2330,  2343,  2356,  2368,
-    2382,  2394,  2408,  2418,  2425,  2432,  2441,  2450,  2460,  2470,
-    2480,  2487,  2494,  2503,  2512,  2522,  2532,  2539,  2546,  2553,
-    2561,  2571,  2581,  2591,  2601,  2640,  2650,  2658,  2666,  2681,
-    2690,  2695,  2696,  2697,  2697,  2697,  2698,  2698,  2698,  2699,
-    2699,  2701,  2711,  2720,  2727,  2734,  2741,  2748,  2755,  2762,
-    2767,  2768,  2769,  2769,  2770,  2770,  2770,  2771,  2772,  2772,
-    2773,  2773,  2774,  2774,  2775,  2776,  2777,  2778,  2779,  2780,
-    2782,  2791,  2798,  2805,  2814,  2821,  2828,  2835,  2842,  2851,
-    2860,  2867,  2874,  2884,  2894,  2904,  2914,  2924,  2934,  2939,
-    2940,  2941,  2943,  2949,  2959,  2966,  2975,  2983,  2988,  2989,
-    2991,  2991,  2991,  2992,  2992,  2993,  2994,  2995,  2996,  2997,
-    2999,  3009,  3018,  3025,  3034,  3041,  3050,  3058,  3071,  3079,
-    3092,  3097,  3098,  3099,  3099,  3100,  3100,  3100,  3101,  3103,
-    3115,  3127,  3139,  3154,  3167,  3180,  3191,  3196,  3197,  3198,
-    3198,  3200,  3215
+       0,   182,   182,   182,   183,   183,   184,   184,   185,   185,
+     185,   186,   186,   187,   187,   188,   192,   197,   198,   199,
+     199,   199,   200,   200,   201,   201,   201,   202,   202,   203,
+     203,   203,   204,   204,   205,   205,   205,   206,   206,   206,
+     207,   207,   208,   208,   209,   209,   210,   210,   211,   211,
+     212,   212,   213,   213,   214,   214,   215,   215,   215,   216,
+     216,   216,   217,   217,   217,   218,   218,   219,   219,   220,
+     220,   221,   221,   222,   222,   222,   223,   223,   224,   224,
+     225,   225,   225,   226,   226,   227,   227,   228,   228,   229,
+     229,   229,   230,   230,   231,   231,   232,   232,   233,   233,
+     234,   234,   235,   235,   235,   236,   236,   237,   237,   237,
+     238,   238,   238,   239,   239,   239,   240,   240,   240,   240,
+     241,   242,   242,   242,   243,   243,   243,   244,   244,   245,
+     246,   246,   246,   247,   247,   248,   248,   249,   249,   249,
+     250,   250,   251,   251,   251,   252,   253,   253,   254,   254,
+     255,   256,   256,   257,   257,   258,   258,   259,   260,   260,
+     261,   261,   262,   262,   263,   263,   264,   264,   265,   265,
+     265,   266,   266,   267,   267,   268,   268,   269,   269,   270,
+     270,   271,   271,   272,   272,   272,   273,   273,   273,   274,
+     274,   274,   275,   275,   276,   277,   277,   278,   278,   279,
+     279,   280,   280,   281,   281,   281,   282,   282,   282,   283,
+     283,   283,   284,   284,   285,   285,   286,   286,   287,   289,
+     301,   302,   303,   303,   303,   303,   303,   304,   304,   306,
+     318,   319,   320,   320,   320,   320,   321,   321,   323,   337,
+     338,   339,   339,   339,   339,   340,   340,   340,   342,   359,
+     360,   361,   361,   361,   361,   362,   362,   362,   363,   366,
+     385,   402,   410,   420,   428,   445,   446,   447,   447,   447,
+     447,   447,   448,   448,   448,   449,   449,   451,   460,   469,
+     480,   489,   498,   507,   518,   527,   539,   553,   568,   579,
+     596,   613,   630,   647,   662,   677,   690,   705,   714,   723,
+     732,   741,   750,   759,   768,   777,   786,   795,   804,   813,
+     822,   831,   844,   853,   866,   875,   884,   893,   900,   907,
+     916,   923,   932,   940,   947,   954,   962,   971,   978,   992,
+    1000,  1008,  1016,  1024,  1033,  1042,  1056,  1065,  1074,  1083,
+    1092,  1101,  1110,  1117,  1124,  1150,  1158,  1165,  1172,  1179,
+    1186,  1194,  1202,  1210,  1217,  1228,  1239,  1246,  1255,  1264,
+    1273,  1280,  1287,  1295,  1303,  1313,  1323,  1333,  1347,  1355,
+    1368,  1379,  1387,  1400,  1409,  1418,  1427,  1437,  1447,  1455,
+    1468,  1477,  1485,  1494,  1502,  1515,  1524,  1531,  1541,  1551,
+    1561,  1571,  1581,  1591,  1601,  1611,  1618,  1625,  1632,  1641,
+    1650,  1659,  1668,  1675,  1685,  1705,  1712,  1730,  1743,  1756,
+    1765,  1774,  1783,  1792,  1802,  1812,  1823,  1832,  1841,  1850,
+    1859,  1868,  1877,  1890,  1903,  1912,  1919,  1928,  1937,  1946,
+    1955,  1963,  1976,  1984,  2025,  2032,  2047,  2057,  2067,  2074,
+    2081,  2088,  2097,  2105,  2119,  2140,  2161,  2173,  2185,  2197,
+    2206,  2227,  2237,  2246,  2254,  2262,  2275,  2288,  2303,  2318,
+    2327,  2336,  2342,  2351,  2360,  2370,  2380,  2393,  2406,  2418,
+    2432,  2444,  2458,  2468,  2475,  2482,  2491,  2500,  2510,  2520,
+    2530,  2537,  2544,  2553,  2562,  2572,  2582,  2589,  2596,  2603,
+    2611,  2621,  2631,  2641,  2651,  2690,  2700,  2708,  2716,  2731,
+    2740,  2745,  2746,  2747,  2747,  2747,  2748,  2748,  2748,  2749,
+    2749,  2751,  2761,  2770,  2777,  2784,  2791,  2798,  2805,  2812,
+    2817,  2818,  2819,  2819,  2820,  2820,  2820,  2821,  2822,  2822,
+    2823,  2823,  2824,  2824,  2825,  2826,  2827,  2828,  2829,  2830,
+    2832,  2841,  2848,  2855,  2864,  2871,  2878,  2885,  2892,  2901,
+    2910,  2917,  2924,  2934,  2944,  2954,  2964,  2974,  2984,  2989,
+    2990,  2991,  2993,  2999,  3009,  3016,  3025,  3033,  3038,  3039,
+    3041,  3041,  3041,  3042,  3042,  3043,  3044,  3045,  3046,  3047,
+    3049,  3059,  3068,  3075,  3084,  3091,  3100,  3108,  3121,  3129,
+    3142,  3147,  3148,  3149,  3149,  3150,  3150,  3150,  3151,  3153,
+    3165,  3177,  3189,  3204,  3217,  3230,  3241,  3246,  3247,  3248,
+    3248,  3250,  3265
 };
 #endif
 
@@ -1168,15 +1179,18 @@ static const char *const yytname[] =
   "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM",
   "VAR_SSL_PORT", "VAR_FORWARD_FIRST", "VAR_STUB_SSL_UPSTREAM",
   "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_HTTPS_PORT",
-  "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN",
-  "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES",
-  "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX",
-  "VAR_DNS64_SYNTHALL", "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP",
-  "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP",
-  "VAR_DNSTAP_TLS", "VAR_DNSTAP_TLS_SERVER_NAME",
-  "VAR_DNSTAP_TLS_CERT_BUNDLE", "VAR_DNSTAP_TLS_CLIENT_KEY_FILE",
-  "VAR_DNSTAP_TLS_CLIENT_CERT_FILE", "VAR_DNSTAP_SEND_IDENTITY",
-  "VAR_DNSTAP_SEND_VERSION", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION",
+  "VAR_HTTP_ENDPOINT", "VAR_HTTP_MAX_STREAMS",
+  "VAR_HTTP_QUERY_BUFFER_SIZE", "VAR_HTTP_RESPONSE_BUFFER_SIZE",
+  "VAR_HTTP_NODELAY", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES",
+  "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE",
+  "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES",
+  "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL",
+  "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE",
+  "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP", "VAR_DNSTAP_TLS",
+  "VAR_DNSTAP_TLS_SERVER_NAME", "VAR_DNSTAP_TLS_CERT_BUNDLE",
+  "VAR_DNSTAP_TLS_CLIENT_KEY_FILE", "VAR_DNSTAP_TLS_CLIENT_CERT_FILE",
+  "VAR_DNSTAP_SEND_IDENTITY", "VAR_DNSTAP_SEND_VERSION",
+  "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION",
   "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES",
   "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES",
   "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES",
@@ -1256,47 +1270,50 @@ static const char *const yytname[] =
   "server_tls_cert_bundle", "server_tls_win_cert",
   "server_tls_additional_port", "server_tls_ciphers",
   "server_tls_ciphersuites", "server_tls_session_ticket_keys",
-  "server_https_port", "server_tls_use_sni", "server_use_systemd",
-  "server_do_daemonize", "server_use_syslog", "server_log_time_ascii",
-  "server_log_queries", "server_log_replies", "server_log_tag_queryreply",
-  "server_log_servfail", "server_log_local_actions", "server_chroot",
-  "server_username", "server_directory", "server_logfile",
-  "server_pidfile", "server_root_hints", "server_dlv_anchor_file",
-  "server_dlv_anchor", "server_auto_trust_anchor_file",
-  "server_trust_anchor_file", "server_trusted_keys_file",
-  "server_trust_anchor", "server_trust_anchor_signaling",
-  "server_root_key_sentinel", "server_domain_insecure",
-  "server_hide_identity", "server_hide_version", "server_hide_trustanchor",
-  "server_identity", "server_version", "server_so_rcvbuf",
-  "server_so_sndbuf", "server_so_reuseport", "server_ip_transparent",
-  "server_ip_freebind", "server_ip_dscp", "server_stream_wait_size",
-  "server_edns_buffer_size", "server_msg_buffer_size",
-  "server_msg_cache_size", "server_msg_cache_slabs",
-  "server_num_queries_per_thread", "server_jostle_timeout",
-  "server_delay_close", "server_unblock_lan_zones",
-  "server_insecure_lan_zones", "server_rrset_cache_size",
-  "server_rrset_cache_slabs", "server_infra_host_ttl",
-  "server_infra_lame_ttl", "server_infra_cache_numhosts",
-  "server_infra_cache_lame_size", "server_infra_cache_slabs",
-  "server_infra_cache_min_rtt", "server_target_fetch_policy",
-  "server_harden_short_bufsize", "server_harden_large_queries",
-  "server_harden_glue", "server_harden_dnssec_stripped",
-  "server_harden_below_nxdomain", "server_harden_referral_path",
-  "server_harden_algo_downgrade", "server_use_caps_for_id",
-  "server_caps_whitelist", "server_private_address",
-  "server_private_domain", "server_prefetch", "server_prefetch_key",
-  "server_deny_any", "server_unwanted_reply_threshold",
-  "server_do_not_query_address", "server_do_not_query_localhost",
-  "server_access_control", "server_module_conf",
-  "server_val_override_date", "server_val_sig_skew_min",
-  "server_val_sig_skew_max", "server_cache_max_ttl",
-  "server_cache_max_negative_ttl", "server_cache_min_ttl",
-  "server_bogus_ttl", "server_val_clean_additional",
-  "server_val_permissive_mode", "server_aggressive_nsec",
-  "server_ignore_cd_flag", "server_serve_expired",
-  "server_serve_expired_ttl", "server_serve_expired_ttl_reset",
-  "server_serve_expired_reply_ttl", "server_serve_expired_client_timeout",
-  "server_fake_dsa", "server_fake_sha1", "server_val_log_level",
+  "server_tls_use_sni", "server_https_port", "server_http_endpoint",
+  "server_http_max_streams", "server_http_query_buffer_size",
+  "server_http_response_buffer_size", "server_http_nodelay",
+  "server_use_systemd", "server_do_daemonize", "server_use_syslog",
+  "server_log_time_ascii", "server_log_queries", "server_log_replies",
+  "server_log_tag_queryreply", "server_log_servfail",
+  "server_log_local_actions", "server_chroot", "server_username",
+  "server_directory", "server_logfile", "server_pidfile",
+  "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor",
+  "server_auto_trust_anchor_file", "server_trust_anchor_file",
+  "server_trusted_keys_file", "server_trust_anchor",
+  "server_trust_anchor_signaling", "server_root_key_sentinel",
+  "server_domain_insecure", "server_hide_identity", "server_hide_version",
+  "server_hide_trustanchor", "server_identity", "server_version",
+  "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport",
+  "server_ip_transparent", "server_ip_freebind", "server_ip_dscp",
+  "server_stream_wait_size", "server_edns_buffer_size",
+  "server_msg_buffer_size", "server_msg_cache_size",
+  "server_msg_cache_slabs", "server_num_queries_per_thread",
+  "server_jostle_timeout", "server_delay_close",
+  "server_unblock_lan_zones", "server_insecure_lan_zones",
+  "server_rrset_cache_size", "server_rrset_cache_slabs",
+  "server_infra_host_ttl", "server_infra_lame_ttl",
+  "server_infra_cache_numhosts", "server_infra_cache_lame_size",
+  "server_infra_cache_slabs", "server_infra_cache_min_rtt",
+  "server_target_fetch_policy", "server_harden_short_bufsize",
+  "server_harden_large_queries", "server_harden_glue",
+  "server_harden_dnssec_stripped", "server_harden_below_nxdomain",
+  "server_harden_referral_path", "server_harden_algo_downgrade",
+  "server_use_caps_for_id", "server_caps_whitelist",
+  "server_private_address", "server_private_domain", "server_prefetch",
+  "server_prefetch_key", "server_deny_any",
+  "server_unwanted_reply_threshold", "server_do_not_query_address",
+  "server_do_not_query_localhost", "server_access_control",
+  "server_module_conf", "server_val_override_date",
+  "server_val_sig_skew_min", "server_val_sig_skew_max",
+  "server_cache_max_ttl", "server_cache_max_negative_ttl",
+  "server_cache_min_ttl", "server_bogus_ttl",
+  "server_val_clean_additional", "server_val_permissive_mode",
+  "server_aggressive_nsec", "server_ignore_cd_flag",
+  "server_serve_expired", "server_serve_expired_ttl",
+  "server_serve_expired_ttl_reset", "server_serve_expired_reply_ttl",
+  "server_serve_expired_client_timeout", "server_fake_dsa",
+  "server_fake_sha1", "server_val_log_level",
   "server_val_nsec3_keysize_iterations", "server_add_holddown",
   "server_del_holddown", "server_keep_missing",
   "server_permit_small_holddown", "server_key_cache_size",
@@ -1390,14 +1407,15 @@ static const yytype_uint16 yytoknum[] =
      505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   537,   538,   539,   540,   541,   542,   543
+     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
+     545,   546,   547,   548
 };
 # endif
 
-#define YYPACT_NINF -274
+#define YYPACT_NINF -279
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-274)))
+  (!!((Yystate) == (-279)))
 
 #define YYTABLE_NINF -1
 
@@ -1408,96 +1426,98 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -274,     0,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,   272,   -42,
-     -38,   -41,    -7,   -43,   -30,  -138,  -103,  -178,  -173,  -273,
+    -279,     0,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,   277,   -42,
+     -38,   -41,    -7,   -43,   -30,  -143,  -103,  -183,  -178,  -278,
        2,     3,    24,    25,    26,    28,    31,    32,    33,    34,
       36,    37,    38,    39,    40,    52,    53,    70,    71,    72,
       73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    87,    88,    92,    93,    94,    95,    96,    97,
+      83,    84,    87,    88,    90,    92,    93,    94,    96,    97,
       98,    99,   100,   102,   103,   104,   105,   106,   107,   108,
      109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   124,   125,   126,   127,   128,   129,   130,
+     119,   120,   121,   122,   123,   124,   125,   126,   129,   130,
      131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   144,   145,   146,   147,   148,   149,   150,   151,
+     141,   142,   143,   144,   145,   146,   147,   149,   150,   151,
      152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
+     162,   163,   164,   165,   166,   168,   169,   170,   171,   172,
      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
      183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,   202,   206,
-     207,   208,   209,   210,   211,   212,   214,   215,   216,   217,
-     220,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     238,   244,   246,   247,   248,   250,   251,   252,   253,   254,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   207,   211,   212,   213,   214,   215,   216,
+     217,   219,   220,   221,   222,   225,   227,   228,   229,   230,
+     231,   232,   233,   234,   235,   243,   249,   251,   252,   253,
      255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   270,   271,   306,   307,   308,   309,
-     313,   314,   315,   357,   358,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,   359,   360,   361,   362,   363,   364,   365,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,   369,   373,   374,   399,
-     400,   401,  -274,  -274,  -274,  -274,  -274,  -274,  -274,   404,
-     415,   416,   417,   418,   419,   420,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,   421,   422,   423,   424,   425,   426,
-     427,   428,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,   429,   430,   431,   432,   433,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,   473,   475,   491,
-     492,   493,   494,   495,   496,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,   497,   498,   499,   500,   501,   508,
-     509,   510,   511,   512,   513,   514,   516,   517,   518,   519,
-     520,   521,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,   522,  -274,  -274,   525,   528,   531,   532,   541,   542,
-     543,   545,   546,   547,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,   548,   549,   550,   551,   552,
-     553,  -274,  -274,  -274,  -274,  -274,  -274,  -274,   554,   555,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,   556,   557,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,   558,   559,   560,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,   561,   562,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,   563,   564,   565,   566,   567,
-     568,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,   569,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,   570,  -274,  -274,   571,   572,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,   573,   574,   575,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   275,
+     276,   311,   312,   313,   314,   318,   319,   320,   362,   363,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,   364,   365,   366,   367,   368,   369,   370,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,   374,   378,   379,   404,
+     405,   406,  -279,  -279,  -279,  -279,  -279,  -279,  -279,   414,
+     425,   426,   427,   428,   429,   430,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,   431,   432,   433,   434,   435,   436,
+     437,   438,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,   439,   440,   441,   442,   443,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,   483,   485,   501,
+     502,   503,   504,   505,   506,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,   507,   508,   509,   510,   511,   518,
+     519,   520,   521,   522,   523,   524,   526,   527,   528,   529,
+     530,   531,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,   532,  -279,  -279,   535,   538,   541,   542,   551,   552,
+     553,   555,   556,   557,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,   558,   559,   560,   561,   562,
+     563,  -279,  -279,  -279,  -279,  -279,  -279,  -279,   564,   565,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,   566,   567,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,   568,   569,   570,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,   571,
+     572,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+     573,   574,   575,   576,   577,   578,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,   579,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,   580,  -279,  -279,
+     581,   582,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+     583,   584,   585,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1505,9 +1525,9 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    16,   214,   224,   490,   548,   509,   233,
-     557,   580,   243,   596,   259,     3,    18,   216,   226,   235,
-     245,   261,   492,   511,   550,   559,   582,   598,     4,     5,
+       2,     0,     1,    16,   219,   229,   500,   558,   519,   238,
+     567,   590,   248,   606,   264,     3,    18,   221,   231,   240,
+     250,   266,   502,   521,   560,   569,   592,   608,     4,     5,
        6,    10,    14,    15,     8,     9,     7,    11,    12,    13,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1528,147 +1548,149 @@ static const yytype_uint16 yydefact[] =
        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,     0,     0,     0,     0,    17,    19,    20,    83,    86,
-      95,   184,   185,    21,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,    34,    74,    22,    87,    88,    45,
-      67,    82,    23,    24,    27,    28,    25,    26,    29,    30,
-      31,    32,    33,   118,   196,   119,   121,   122,   123,   198,
-     203,   199,   210,   211,   212,   124,   213,   180,    84,    73,
-      99,   116,   117,   208,   205,   120,    35,    36,    37,    38,
-      39,    75,    89,    90,   105,    61,    71,    62,   188,   189,
-     100,    55,    56,   187,    57,    58,   109,   113,   128,   137,
-     163,   140,   209,   110,    68,    40,    41,    42,    97,   129,
-     130,   131,    43,    44,    46,    47,    49,    50,    48,   135,
-      51,    52,    53,    59,    78,   114,    92,   136,    85,   159,
-      93,    94,   111,   112,   206,    98,    54,    76,    79,    60,
-      63,   101,   102,    77,   160,   103,    64,    65,    66,   197,
-     115,   173,   174,   175,   176,   177,   178,   186,   104,    72,
-     106,   107,   108,   161,    69,    70,    91,    80,    81,    96,
-     125,   126,   207,   127,   132,   133,   134,   164,   165,   167,
-     169,   170,   168,   171,   181,   138,   139,   143,   144,   141,
-     142,   145,   146,   148,   147,   200,   202,   201,   162,   172,
-     190,   192,   191,   193,   194,   195,   166,   179,   182,   183,
-     204,     0,     0,     0,     0,     0,     0,     0,   215,   217,
-     218,   219,   221,   222,   223,   220,     0,     0,     0,     0,
-       0,     0,   225,   227,   228,   229,   230,   231,   232,     0,
-       0,     0,     0,     0,     0,     0,   234,   236,   237,   240,
-     241,   238,   242,   239,     0,     0,     0,     0,     0,     0,
-       0,     0,   244,   246,   247,   248,   249,   253,   250,   251,
-     252,     0,     0,     0,     0,     0,   264,   268,   269,   270,
-     271,   260,   262,   263,   265,   266,   267,     0,     0,     0,
-       0,     0,     0,     0,     0,   491,   493,   495,   494,   500,
-     496,   497,   498,   499,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   510,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,     0,   549,   551,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   558,   560,   561,   562,   564,   565,
-     563,   566,   567,   568,   569,     0,     0,     0,     0,     0,
-       0,   581,   583,   584,   585,   586,   587,   588,     0,     0,
-     597,   599,   600,   273,   272,   279,   292,   290,   302,   298,
-     299,   303,   300,   301,   304,   305,   306,   307,   308,   332,
-     333,   334,   335,   336,   361,   362,   363,   368,   369,   295,
-     370,   371,   374,   372,   373,   376,   377,   378,   392,   347,
-     348,   350,   351,   379,   395,   341,   343,   396,   402,   403,
-     404,   296,   360,   420,   421,   342,   415,   325,   291,   337,
-     393,   399,   380,     0,     0,   424,   297,   274,   324,   384,
-     275,   293,   294,   338,   339,   422,   382,   386,   387,   276,
-     425,   364,   391,   326,   346,   397,   398,   401,   414,   340,
-     418,   416,   417,   352,   359,   388,   389,   353,   354,   381,
-     406,   327,   328,   331,   309,   311,   312,   313,   314,   315,
-     321,   426,   427,   429,   365,   366,   367,   375,   430,   431,
-     432,     0,     0,     0,   383,   355,   357,   553,   441,   445,
-     443,   442,   446,   444,     0,     0,   449,   450,   280,   281,
-     282,   283,   284,   285,   286,   287,   288,   289,   385,   400,
-     419,   454,   455,   356,   433,     0,     0,     0,     0,     0,
-       0,   407,   408,   409,   410,   411,   412,   413,   554,   349,
-     344,   405,   323,   277,   278,   345,   456,   458,   457,   459,
-     460,   461,   310,   317,   451,   453,   452,   316,     0,   330,
-     390,   428,   329,   358,   318,   319,   322,   320,   462,   463,
-     464,   468,   467,   465,   466,   469,   470,   471,   472,   474,
-     473,   483,     0,   487,   488,     0,     0,   489,   475,   481,
-     476,   477,   478,   480,   482,   479,   254,   255,   256,   257,
-     258,   501,   503,   502,   505,   506,   507,   508,   504,   530,
-     531,   532,   533,   534,   535,   536,   537,   538,   539,   540,
-     541,   542,   543,   544,   545,   546,   547,   552,   570,   571,
-     572,   575,   573,   574,   576,   577,   578,   579,   589,   590,
-     591,   592,   593,   594,   601,   602,   394,   423,   440,   555,
-     556,   447,   448,   434,   435,     0,     0,     0,   439,   595,
-     484,   485,   486,   438,   436,   437
+      17,    19,    20,    83,    86,    95,   189,   190,    21,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,    34,
+      74,    22,    87,    88,    45,    67,    82,    23,    24,    27,
+      28,    25,    26,    29,    30,    31,    32,    33,   118,   201,
+     119,   121,   122,   123,   203,   208,   204,   215,   216,   217,
+     218,   124,   125,   126,   127,   128,   129,   185,    84,    73,
+      99,   116,   117,   213,   210,   120,    35,    36,    37,    38,
+      39,    75,    89,    90,   105,    61,    71,    62,   193,   194,
+     100,    55,    56,   192,    57,    58,   109,   113,   133,   142,
+     168,   145,   214,   110,    68,    40,    41,    42,    97,   134,
+     135,   136,    43,    44,    46,    47,    49,    50,    48,   140,
+      51,    52,    53,    59,    78,   114,    92,   141,    85,   164,
+      93,    94,   111,   112,   211,    98,    54,    76,    79,    60,
+      63,   101,   102,    77,   165,   103,    64,    65,    66,   202,
+     115,   178,   179,   180,   181,   182,   183,   191,   104,    72,
+     106,   107,   108,   166,    69,    70,    91,    80,    81,    96,
+     130,   131,   212,   132,   137,   138,   139,   169,   170,   172,
+     174,   175,   173,   176,   186,   143,   144,   148,   149,   146,
+     147,   150,   151,   153,   152,   205,   207,   206,   167,   177,
+     195,   197,   196,   198,   199,   200,   171,   184,   187,   188,
+     209,     0,     0,     0,     0,     0,     0,     0,   220,   222,
+     223,   224,   226,   227,   228,   225,     0,     0,     0,     0,
+       0,     0,   230,   232,   233,   234,   235,   236,   237,     0,
+       0,     0,     0,     0,     0,     0,   239,   241,   242,   245,
+     246,   243,   247,   244,     0,     0,     0,     0,     0,     0,
+       0,     0,   249,   251,   252,   253,   254,   258,   255,   256,
+     257,     0,     0,     0,     0,     0,   269,   273,   274,   275,
+     276,   265,   267,   268,   270,   271,   272,     0,     0,     0,
+       0,     0,     0,     0,     0,   501,   503,   505,   504,   510,
+     506,   507,   508,   509,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   520,   522,   523,   524,   525,   526,   527,   528,
+     529,   530,   531,   532,   533,   534,   535,   536,   537,   538,
+     539,     0,   559,   561,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   568,   570,   571,   572,   574,   575,
+     573,   576,   577,   578,   579,     0,     0,     0,     0,     0,
+       0,   591,   593,   594,   595,   596,   597,   598,     0,     0,
+     607,   609,   610,   278,   277,   284,   297,   295,   307,   303,
+     304,   308,   305,   306,   309,   310,   311,   312,   313,   342,
+     343,   344,   345,   346,   371,   372,   373,   378,   379,   300,
+     380,   381,   384,   382,   383,   386,   387,   388,   402,   357,
+     358,   360,   361,   389,   405,   351,   353,   406,   412,   413,
+     414,   301,   370,   430,   431,   352,   425,   335,   296,   347,
+     403,   409,   390,     0,     0,   434,   302,   279,   334,   394,
+     280,   298,   299,   348,   349,   432,   392,   396,   397,   281,
+     435,   374,   401,   336,   356,   407,   408,   411,   424,   350,
+     428,   426,   427,   362,   369,   398,   399,   363,   364,   391,
+     416,   337,   338,   341,   314,   316,   317,   318,   319,   320,
+     327,   328,   329,   330,   331,   332,   436,   437,   439,   375,
+     376,   377,   385,   440,   441,   442,     0,     0,     0,   393,
+     365,   367,   563,   451,   455,   453,   452,   456,   454,     0,
+       0,   459,   460,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   395,   410,   429,   464,   465,   366,   443,
+       0,     0,     0,     0,     0,     0,   417,   418,   419,   420,
+     421,   422,   423,   564,   359,   354,   415,   333,   282,   283,
+     355,   466,   468,   467,   469,   470,   471,   315,   322,   461,
+     463,   462,   321,     0,   340,   400,   438,   339,   368,   323,
+     324,   326,   325,   472,   473,   474,   478,   477,   475,   476,
+     479,   480,   481,   482,   484,   483,   493,     0,   497,   498,
+       0,     0,   499,   485,   491,   486,   487,   488,   490,   492,
+     489,   259,   260,   261,   262,   263,   511,   513,   512,   515,
+     516,   517,   518,   514,   540,   541,   542,   543,   544,   545,
+     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
+     556,   557,   562,   580,   581,   582,   585,   583,   584,   586,
+     587,   588,   589,   599,   600,   601,   602,   603,   604,   611,
+     612,   404,   433,   450,   565,   566,   457,   458,   444,   445,
+       0,     0,     0,   449,   605,   494,   495,   496,   448,   446,
+     447
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,   -23,
-     249,   576,   577,   578,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,  -274,
-    -274,  -274
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,   -23,   254,   586,   587,   588,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,  -279,
+    -279,  -279,  -279,  -279,  -279,  -279,  -279
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    15,    16,    28,   235,    17,    29,   438,    18,
-      30,   452,    19,    31,   466,    20,    32,   482,   496,   497,
-     498,   499,   500,    21,    33,   501,   236,   237,   238,   239,
-     240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
-     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,   354,   355,   356,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   439,   440,   441,   442,
-     443,   444,   445,   453,   454,   455,   456,   457,   458,   483,
-     484,   485,   486,   487,   488,   489,   490,   467,   468,   469,
-     470,   471,   472,   473,    22,    34,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,    23,    35,   542,   543,   544,
-     545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
-     555,   556,   557,   558,   559,   560,    24,    36,   562,   563,
-     426,   427,   428,   429,    25,    37,   574,   575,   576,   577,
-     578,   579,   580,   581,   582,   583,   584,    26,    38,   591,
-     592,   593,   594,   595,   596,   597,   430,    27,    39,   600,
-     601,   602
+      -1,     1,    15,    16,    28,   240,    17,    29,   448,    18,
+      30,   462,    19,    31,   476,    20,    32,   492,   506,   507,
+     508,   509,   510,    21,    33,   511,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   449,   450,   451,   452,   453,   454,   455,   463,   464,
+     465,   466,   467,   468,   493,   494,   495,   496,   497,   498,
+     499,   500,   477,   478,   479,   480,   481,   482,   483,    22,
+      34,   525,   526,   527,   528,   529,   530,   531,   532,   533,
+      23,    35,   552,   553,   554,   555,   556,   557,   558,   559,
+     560,   561,   562,   563,   564,   565,   566,   567,   568,   569,
+     570,    24,    36,   572,   573,   436,   437,   438,   439,    25,
+      37,   584,   585,   586,   587,   588,   589,   590,   591,   592,
+     593,   594,    26,    38,   601,   602,   603,   604,   605,   606,
+     607,   440,    27,    39,   610,   611,   612
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1676,128 +1698,130 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   474,   431,   459,   432,   433,   446,   598,   599,   561,
-     502,     3,   603,   604,   447,   448,   524,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   537,
-     538,   539,   540,   541,   605,   606,   607,   474,   608,   460,
-     461,   609,   610,   611,   612,     4,   613,   614,   615,   616,
-     617,     5,   564,   565,   566,   567,   568,   569,   570,   571,
-     572,   573,   618,   619,   462,   434,   507,   508,   509,   510,
-     511,   512,   513,   514,   585,   586,   587,   588,   589,   590,
-     620,   621,   622,   623,   624,   625,   626,   627,   628,   629,
-     630,   631,   632,   633,   634,     6,   435,   635,   636,   449,
-     436,   450,   637,   638,   639,   640,   641,   642,   643,   644,
-     645,     7,   646,   647,   648,   649,   650,   651,   652,   653,
-     654,   655,   656,   657,   658,   659,   660,   661,   662,   663,
-     664,   665,   463,   464,   666,   667,   668,   669,   670,   671,
-     672,   673,   674,   675,   676,   677,   678,   679,   680,   681,
-     682,   683,   684,     8,   685,   686,   687,   688,   689,   690,
-     691,   692,   693,   694,   695,   696,   697,   698,   699,   700,
-     701,   702,   465,   703,   704,   705,   706,   707,   708,   709,
-     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+       2,   484,   441,   469,   442,   443,   456,   608,   609,   571,
+     512,     3,   613,   614,   457,   458,   534,   535,   536,   537,
+     538,   539,   540,   541,   542,   543,   544,   545,   546,   547,
+     548,   549,   550,   551,   615,   616,   617,   484,   618,   470,
+     471,   619,   620,   621,   622,     4,   623,   624,   625,   626,
+     627,     5,   574,   575,   576,   577,   578,   579,   580,   581,
+     582,   583,   628,   629,   472,   444,   517,   518,   519,   520,
+     521,   522,   523,   524,   595,   596,   597,   598,   599,   600,
+     630,   631,   632,   633,   634,   635,   636,   637,   638,   639,
+     640,   641,   642,   643,   644,     6,   445,   645,   646,   459,
+     647,   460,   648,   649,   650,   446,   651,   652,   653,   654,
+     655,     7,   656,   657,   658,   659,   660,   661,   662,   663,
+     664,   665,   666,   667,   668,   669,   670,   671,   672,   673,
+     674,   675,   676,   677,   678,   679,   680,   473,   474,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,     8,   700,
+     701,   702,   703,   704,   705,   706,   707,   708,   709,   710,
+     711,   712,   713,   714,   715,   716,   717,   475,   718,   719,
      720,   721,   722,   723,   724,   725,   726,   727,   728,   729,
      730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
-     740,     9,   741,   476,   477,   478,   742,   743,   744,   745,
-     746,   747,   748,   481,   749,   750,   751,   752,   437,    10,
-     753,   451,   754,   755,   756,   757,   758,   759,   760,   761,
-     762,   491,   492,   493,   494,   495,    11,   475,   763,   476,
-     477,   478,   479,   480,   764,    12,   765,   766,   767,   481,
-     768,   769,   770,   771,   772,   773,   774,   775,   776,   777,
-     778,   779,   780,   781,   782,   783,   784,   785,   786,    13,
-     787,   788,   503,    14,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,   789,   790,   791,   792,
-      72,    73,    74,   793,   794,   795,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   796,   797,   798,
-     799,   800,   801,   802,   803,   804,   116,   117,   118,   805,
-     119,   120,   121,   806,   807,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   808,
-     809,   810,   146,   147,   811,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   812,   813,   814,   815,   816,
-     817,   818,   819,   820,   821,   822,   823,   824,   825,   826,
-     827,   828,   829,   830,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-     194,   195,   196,   831,   197,   832,   198,   199,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
-     212,   833,   834,   835,   836,   837,   838,   839,   840,   841,
-     842,   843,   213,   214,   215,   216,   217,   218,   844,   845,
-     846,   847,   848,   849,   850,   219,   851,   852,   853,   854,
-     855,   856,   857,   220,   221,   858,   222,   223,   859,   224,
-     225,   860,   861,   226,   227,   228,   229,   230,   231,   232,
-     233,   862,   863,   864,   234,   865,   866,   867,   868,   869,
-     870,   871,   872,   873,   874,   875,   876,   877,   878,   879,
-     880,   881,   882,   883,   884,   885,   886,   887,   888,   889,
-     890,   891,   892,   893,   894,   895,     0,     0,     0,     0,
+     740,   741,   742,   743,   744,   745,   746,   747,   748,   749,
+     750,   751,   752,   753,   754,   755,     9,   756,   486,   487,
+     488,   757,   758,   759,   760,   761,   762,   763,   491,   764,
+     765,   766,   767,   447,    10,   768,   461,   769,   770,   771,
+     772,   773,   774,   775,   776,   777,   501,   502,   503,   504,
+     505,    11,   485,   778,   486,   487,   488,   489,   490,   779,
+      12,   780,   781,   782,   491,   783,   784,   785,   786,   787,
+     788,   789,   790,   791,   792,   793,   794,   795,   796,   797,
+     798,   799,   800,   801,    13,   802,   803,   513,    14,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,   804,   805,   806,   807,    72,    73,    74,   808,   809,
+     810,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   811,   812,   813,   814,   815,   816,   817,   818,
+     819,   116,   117,   118,   820,   119,   120,   121,   821,   822,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
+     142,   143,   144,   145,   823,   824,   825,   146,   147,   148,
+     149,   150,   151,   152,   826,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   827,   828,   829,   830,   831,
+     832,   833,   834,   835,   836,   837,   838,   839,   840,   841,
+     842,   843,   844,   845,   163,   164,   165,   166,   167,   168,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
+     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
+     199,   200,   201,   846,   202,   847,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   848,   849,   850,   851,   852,   853,   854,   855,   856,
+     857,   858,   218,   219,   220,   221,   222,   223,   859,   860,
+     861,   862,   863,   864,   865,   224,   866,   867,   868,   869,
+     870,   871,   872,   225,   226,   873,   227,   228,   874,   229,
+     230,   875,   876,   231,   232,   233,   234,   235,   236,   237,
+     238,   877,   878,   879,   239,   880,   881,   882,   883,   884,
+     885,   886,   887,   888,   889,   890,   891,   892,   893,   894,
+     895,   896,   897,   898,   899,   900,   901,   902,   903,   904,
+     905,   906,   907,   908,   909,   910,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   504,
-     505,   506
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   514,
+     515,   516
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    44,    44,    44,    46,    47,    44,   280,   281,   112,
-      33,    11,    10,    10,    52,    53,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,    10,    10,    10,    44,    10,    80,
+       0,    44,    44,    44,    46,    47,    44,   285,   286,   112,
+      33,    11,    10,    10,    52,    53,   159,   160,   161,   162,
+     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
+     173,   174,   175,   176,    10,    10,    10,    44,    10,    80,
       81,    10,    10,    10,    10,    45,    10,    10,    10,    10,
-      10,    51,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,   239,    10,    10,   105,   107,    96,    97,    98,    99,
-     100,   101,   102,   103,   247,   248,   249,   250,   251,   252,
+      10,    51,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,    10,    10,   105,   107,    96,    97,    98,    99,
+     100,   101,   102,   103,   252,   253,   254,   255,   256,   257,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    95,   138,    10,    10,   137,
-     142,   139,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,   139,    10,    10,    10,   147,    10,    10,    10,    10,
       10,   111,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   173,   174,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,   178,   179,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,   153,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,   158,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   213,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,   218,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,   211,    10,   256,   257,   258,    10,    10,    10,    10,
-      10,    10,    10,   266,    10,    10,    10,    10,   270,   229,
-      10,   269,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,   284,   285,   286,   287,   288,   246,   254,    10,   256,
-     257,   258,   259,   260,    10,   255,    10,    10,    10,   266,
+      10,    10,    10,    10,    10,    10,   216,    10,   261,   262,
+     263,    10,    10,    10,    10,    10,    10,    10,   271,    10,
+      10,    10,    10,   275,   234,    10,   274,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,   289,   290,   291,   292,
+     293,   251,   259,    10,   261,   262,   263,   264,   265,    10,
+     260,    10,    10,    10,   271,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   279,
-      10,    10,    33,   283,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    10,    10,    10,    10,
-      48,    49,    50,    10,    10,    10,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,   104,   105,   106,    10,
-     108,   109,   110,    10,    10,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,    10,
-      10,    10,   140,   141,    10,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,   284,    10,    10,    33,   288,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    10,    10,    10,    10,    48,    49,    50,    10,    10,
+      10,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,   104,   105,   106,    10,   108,   109,   110,    10,    10,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,    10,    10,    10,   140,   141,   142,
+     143,   144,   145,   146,    10,   148,   149,   150,   151,   152,
+     153,   154,   155,   156,   157,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,    10,   212,    10,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
-     228,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   240,   241,   242,   243,   244,   245,    10,    10,
-      10,    10,    10,    10,    10,   253,    10,    10,    10,    10,
-      10,    10,    10,   261,   262,    10,   264,   265,    10,   267,
-     268,    10,    10,   271,   272,   273,   274,   275,   276,   277,
-     278,    10,    10,    10,   282,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,   177,   178,   179,   180,   181,   182,
+     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,   211,   212,
+     213,   214,   215,    10,   217,    10,   219,   220,   221,   222,
+     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,   245,   246,   247,   248,   249,   250,    10,    10,
+      10,    10,    10,    10,    10,   258,    10,    10,    10,    10,
+      10,    10,    10,   266,   267,    10,   269,   270,    10,   272,
+     273,    10,    10,   276,   277,   278,   279,   280,   281,   282,
+     283,    10,    10,    10,   287,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    -1,    -1,    -1,    -1,
@@ -1810,10 +1834,10 @@ static const yytype_int16 yycheck[] =
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   290,     0,    11,    45,    51,    95,   111,   153,   211,
-     229,   246,   255,   279,   283,   291,   292,   295,   298,   301,
-     304,   312,   533,   544,   565,   573,   586,   596,   293,   296,
-     299,   302,   305,   313,   534,   545,   566,   574,   587,   597,
+       0,   295,     0,    11,    45,    51,    95,   111,   158,   216,
+     234,   251,   260,   284,   288,   296,   297,   300,   303,   306,
+     309,   317,   543,   554,   575,   583,   596,   606,   298,   301,
+     304,   307,   310,   318,   544,   555,   576,   584,   597,   607,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
@@ -1824,17 +1848,17 @@ static const yytype_uint16 yystos[] =
       89,    90,    91,    92,    93,    94,   104,   105,   106,   108,
      109,   110,   113,   114,   115,   116,   117,   118,   119,   120,
      121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   140,   141,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     131,   132,   133,   134,   135,   136,   140,   141,   142,   143,
+     144,   145,   146,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   177,   178,   179,   180,   181,   182,   183,
      184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
      194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   212,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,   240,   241,   242,   243,   244,   245,   253,
-     261,   262,   264,   265,   267,   268,   271,   272,   273,   274,
-     275,   276,   277,   278,   282,   294,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   217,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   245,   246,
+     247,   248,   249,   250,   258,   266,   267,   269,   270,   272,
+     273,   276,   277,   278,   279,   280,   281,   282,   283,   287,
+     299,   320,   321,   322,   323,   324,   325,   326,   327,   328,
      329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
      339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
@@ -1852,25 +1876,26 @@ static const yytype_uint16 yystos[] =
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
      479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
      489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   569,   570,   571,   572,
-     595,    44,    46,    47,   107,   138,   142,   270,   297,   505,
-     506,   507,   508,   509,   510,   511,    44,    52,    53,   137,
-     139,   269,   300,   512,   513,   514,   515,   516,   517,    44,
-      80,    81,   105,   173,   174,   213,   303,   526,   527,   528,
-     529,   530,   531,   532,    44,   254,   256,   257,   258,   259,
-     260,   266,   306,   518,   519,   520,   521,   522,   523,   524,
-     525,   284,   285,   286,   287,   288,   307,   308,   309,   310,
-     311,   314,   518,   519,   520,   521,   522,    96,    97,    98,
-      99,   100,   101,   102,   103,   535,   536,   537,   538,   539,
-     540,   541,   542,   543,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   546,   547,   548,   549,   550,   551,   552,   553,
-     554,   555,   556,   557,   558,   559,   560,   561,   562,   563,
-     564,   112,   567,   568,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   575,   576,   577,   578,   579,   580,
-     581,   582,   583,   584,   585,   247,   248,   249,   250,   251,
-     252,   588,   589,   590,   591,   592,   593,   594,   280,   281,
-     598,   599,   600,    10,    10,    10,    10,    10,    10,    10,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,   510,   511,   512,   513,   514,   579,   580,   581,   582,
+     605,    44,    46,    47,   107,   138,   147,   275,   302,   515,
+     516,   517,   518,   519,   520,   521,    44,    52,    53,   137,
+     139,   274,   305,   522,   523,   524,   525,   526,   527,    44,
+      80,    81,   105,   178,   179,   218,   308,   536,   537,   538,
+     539,   540,   541,   542,    44,   259,   261,   262,   263,   264,
+     265,   271,   311,   528,   529,   530,   531,   532,   533,   534,
+     535,   289,   290,   291,   292,   293,   312,   313,   314,   315,
+     316,   319,   528,   529,   530,   531,   532,    96,    97,    98,
+      99,   100,   101,   102,   103,   545,   546,   547,   548,   549,
+     550,   551,   552,   553,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   556,   557,   558,   559,   560,   561,   562,   563,
+     564,   565,   566,   567,   568,   569,   570,   571,   572,   573,
+     574,   112,   577,   578,   235,   236,   237,   238,   239,   240,
+     241,   242,   243,   244,   585,   586,   587,   588,   589,   590,
+     591,   592,   593,   594,   595,   252,   253,   254,   255,   256,
+     257,   598,   599,   600,   601,   602,   603,   604,   285,   286,
+     608,   609,   610,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1899,40 +1924,41 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   289,   290,   290,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   292,   293,   293,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   295,   296,   296,   297,   297,   297,
-     297,   297,   297,   297,   298,   299,   299,   300,   300,   300,
-     300,   300,   300,   301,   302,   302,   303,   303,   303,   303,
-     303,   303,   303,   304,   305,   305,   306,   306,   306,   306,
-     306,   306,   306,   306,   307,   308,   309,   310,   311,   312,
-     313,   313,   314,   314,   314,   314,   314,   314,   314,   314,
-     314,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+       0,   294,   295,   295,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   297,   298,   298,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   300,
+     301,   301,   302,   302,   302,   302,   302,   302,   302,   303,
+     304,   304,   305,   305,   305,   305,   305,   305,   306,   307,
+     307,   308,   308,   308,   308,   308,   308,   308,   309,   310,
+     310,   311,   311,   311,   311,   311,   311,   311,   311,   312,
+     313,   314,   315,   316,   317,   318,   318,   319,   319,   319,
+     319,   319,   319,   319,   319,   319,   319,   320,   321,   322,
      323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
      333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
      343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
@@ -1954,18 +1980,19 @@ static const yytype_uint16 yyr1[] =
      503,   504,   505,   506,   507,   508,   509,   510,   511,   512,
      513,   514,   515,   516,   517,   518,   519,   520,   521,   522,
      523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   534,   535,   535,   535,   535,   535,   535,   535,
-     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   545,   546,   546,   546,   546,   546,   546,   546,   546,
-     546,   546,   546,   546,   546,   546,   546,   546,   546,   546,
-     547,   548,   549,   550,   551,   552,   553,   554,   555,   556,
+     533,   534,   535,   536,   537,   538,   539,   540,   541,   542,
+     543,   544,   544,   545,   545,   545,   545,   545,   545,   545,
+     545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
+     555,   555,   556,   556,   556,   556,   556,   556,   556,   556,
+     556,   556,   556,   556,   556,   556,   556,   556,   556,   556,
      557,   558,   559,   560,   561,   562,   563,   564,   565,   566,
-     566,   567,   568,   569,   570,   571,   572,   573,   574,   574,
-     575,   575,   575,   575,   575,   575,   575,   575,   575,   575,
-     576,   577,   578,   579,   580,   581,   582,   583,   584,   585,
-     586,   587,   587,   588,   588,   588,   588,   588,   588,   589,
-     590,   591,   592,   593,   594,   595,   596,   597,   597,   598,
-     598,   599,   600
+     567,   568,   569,   570,   571,   572,   573,   574,   575,   576,
+     576,   577,   578,   579,   580,   581,   582,   583,   584,   584,
+     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
+     586,   587,   588,   589,   590,   591,   592,   593,   594,   595,
+     596,   597,   597,   598,   598,   598,   598,   598,   598,   599,
+     600,   601,   602,   603,   604,   605,   606,   607,   607,   608,
+     608,   609,   610
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1992,13 +2019,14 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        2,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     0,     1,     1,     1,     1,     1,     1,     1,     2,
+       0,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       0,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2708,15 +2736,15 @@ yyreduce:
   switch (yyn)
     {
         case 16:
-#line 191 "./util/configparser.y" /* yacc.c:1646  */
+#line 193 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(server:)\n")); 
 	}
-#line 2716 "util/configparser.c" /* yacc.c:1646  */
+#line 2744 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 214:
-#line 286 "./util/configparser.y" /* yacc.c:1646  */
+  case 219:
+#line 290 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2727,11 +2755,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2731 "util/configparser.c" /* yacc.c:1646  */
+#line 2759 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 224:
-#line 303 "./util/configparser.y" /* yacc.c:1646  */
+  case 229:
+#line 307 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2742,11 +2770,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2746 "util/configparser.c" /* yacc.c:1646  */
+#line 2774 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 233:
-#line 320 "./util/configparser.y" /* yacc.c:1646  */
+  case 238:
+#line 324 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
@@ -2759,11 +2787,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2763 "util/configparser.c" /* yacc.c:1646  */
+#line 2791 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 339 "./util/configparser.y" /* yacc.c:1646  */
+  case 248:
+#line 343 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
@@ -2779,11 +2807,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2783 "util/configparser.c" /* yacc.c:1646  */
+#line 2811 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 363 "./util/configparser.y" /* yacc.c:1646  */
+  case 259:
+#line 367 "./util/configparser.y" /* yacc.c:1646  */
     {
 		uint8_t* bitlist;
 		size_t len = 0;
@@ -2800,11 +2828,11 @@ yyreduce:
 
 		}
 	}
-#line 2804 "util/configparser.c" /* yacc.c:1646  */
+#line 2832 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 382 "./util/configparser.y" /* yacc.c:1646  */
+  case 260:
+#line 386 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
@@ -2819,21 +2847,21 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2823 "util/configparser.c" /* yacc.c:1646  */
+#line 2851 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 399 "./util/configparser.y" /* yacc.c:1646  */
+  case 261:
+#line 403 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2833 "util/configparser.c" /* yacc.c:1646  */
+#line 2861 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 257:
-#line 407 "./util/configparser.y" /* yacc.c:1646  */
+  case 262:
+#line 411 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2841,21 +2869,21 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2845 "util/configparser.c" /* yacc.c:1646  */
+#line 2873 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 258:
-#line 417 "./util/configparser.y" /* yacc.c:1646  */
+  case 263:
+#line 421 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 2855 "util/configparser.c" /* yacc.c:1646  */
+#line 2883 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 259:
-#line 425 "./util/configparser.y" /* yacc.c:1646  */
+  case 264:
+#line 429 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
@@ -2871,11 +2899,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2875 "util/configparser.c" /* yacc.c:1646  */
+#line 2903 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 448 "./util/configparser.y" /* yacc.c:1646  */
+  case 277:
+#line 452 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2883,11 +2911,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2887 "util/configparser.c" /* yacc.c:1646  */
+#line 2915 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 457 "./util/configparser.y" /* yacc.c:1646  */
+  case 278:
+#line 461 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2895,11 +2923,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2899 "util/configparser.c" /* yacc.c:1646  */
+#line 2927 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 466 "./util/configparser.y" /* yacc.c:1646  */
+  case 279:
+#line 470 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2909,11 +2937,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2913 "util/configparser.c" /* yacc.c:1646  */
+#line 2941 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 477 "./util/configparser.y" /* yacc.c:1646  */
+  case 280:
+#line 481 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2921,11 +2949,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2925 "util/configparser.c" /* yacc.c:1646  */
+#line 2953 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 486 "./util/configparser.y" /* yacc.c:1646  */
+  case 281:
+#line 490 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2933,11 +2961,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2937 "util/configparser.c" /* yacc.c:1646  */
+#line 2965 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 495 "./util/configparser.y" /* yacc.c:1646  */
+  case 282:
+#line 499 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2945,11 +2973,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2949 "util/configparser.c" /* yacc.c:1646  */
+#line 2977 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 504 "./util/configparser.y" /* yacc.c:1646  */
+  case 283:
+#line 508 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2959,11 +2987,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2963 "util/configparser.c" /* yacc.c:1646  */
+#line 2991 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 279:
-#line 515 "./util/configparser.y" /* yacc.c:1646  */
+  case 284:
+#line 519 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2971,11 +2999,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2975 "util/configparser.c" /* yacc.c:1646  */
+#line 3003 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 280:
-#line 524 "./util/configparser.y" /* yacc.c:1646  */
+  case 285:
+#line 528 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -2986,11 +3014,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 2990 "util/configparser.c" /* yacc.c:1646  */
+#line 3018 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 281:
-#line 536 "./util/configparser.y" /* yacc.c:1646  */
+  case 286:
+#line 540 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -3002,11 +3030,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3006 "util/configparser.c" /* yacc.c:1646  */
+#line 3034 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 550 "./util/configparser.y" /* yacc.c:1646  */
+  case 287:
+#line 554 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -3020,11 +3048,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3024 "util/configparser.c" /* yacc.c:1646  */
+#line 3052 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 565 "./util/configparser.y" /* yacc.c:1646  */
+  case 288:
+#line 569 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -3034,11 +3062,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3038 "util/configparser.c" /* yacc.c:1646  */
+#line 3066 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 576 "./util/configparser.y" /* yacc.c:1646  */
+  case 289:
+#line 580 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3054,11 +3082,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3058 "util/configparser.c" /* yacc.c:1646  */
+#line 3086 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 593 "./util/configparser.y" /* yacc.c:1646  */
+  case 290:
+#line 597 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3074,11 +3102,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3078 "util/configparser.c" /* yacc.c:1646  */
+#line 3106 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 610 "./util/configparser.y" /* yacc.c:1646  */
+  case 291:
+#line 614 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3094,11 +3122,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3098 "util/configparser.c" /* yacc.c:1646  */
+#line 3126 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 627 "./util/configparser.y" /* yacc.c:1646  */
+  case 292:
+#line 631 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3114,11 +3142,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3118 "util/configparser.c" /* yacc.c:1646  */
+#line 3146 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 644 "./util/configparser.y" /* yacc.c:1646  */
+  case 293:
+#line 648 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3132,11 +3160,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3136 "util/configparser.c" /* yacc.c:1646  */
+#line 3164 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 659 "./util/configparser.y" /* yacc.c:1646  */
+  case 294:
+#line 663 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3150,11 +3178,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3154 "util/configparser.c" /* yacc.c:1646  */
+#line 3182 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 674 "./util/configparser.y" /* yacc.c:1646  */
+  case 295:
+#line 678 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -3166,11 +3194,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3170 "util/configparser.c" /* yacc.c:1646  */
+#line 3198 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 687 "./util/configparser.y" /* yacc.c:1646  */
+  case 296:
+#line 691 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -3184,11 +3212,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3188 "util/configparser.c" /* yacc.c:1646  */
+#line 3216 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 702 "./util/configparser.y" /* yacc.c:1646  */
+  case 297:
+#line 706 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3196,11 +3224,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3200 "util/configparser.c" /* yacc.c:1646  */
+#line 3228 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 711 "./util/configparser.y" /* yacc.c:1646  */
+  case 298:
+#line 715 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
@@ -3208,11 +3236,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3212 "util/configparser.c" /* yacc.c:1646  */
+#line 3240 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 720 "./util/configparser.y" /* yacc.c:1646  */
+  case 299:
+#line 724 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
@@ -3220,11 +3248,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3224 "util/configparser.c" /* yacc.c:1646  */
+#line 3252 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 729 "./util/configparser.y" /* yacc.c:1646  */
+  case 300:
+#line 733 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3232,11 +3260,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3236 "util/configparser.c" /* yacc.c:1646  */
+#line 3264 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 738 "./util/configparser.y" /* yacc.c:1646  */
+  case 301:
+#line 742 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3244,11 +3272,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3248 "util/configparser.c" /* yacc.c:1646  */
+#line 3276 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 747 "./util/configparser.y" /* yacc.c:1646  */
+  case 302:
+#line 751 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3256,11 +3284,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3260 "util/configparser.c" /* yacc.c:1646  */
+#line 3288 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 756 "./util/configparser.y" /* yacc.c:1646  */
+  case 303:
+#line 760 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3268,11 +3296,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3272 "util/configparser.c" /* yacc.c:1646  */
+#line 3300 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 765 "./util/configparser.y" /* yacc.c:1646  */
+  case 304:
+#line 769 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3280,11 +3308,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3284 "util/configparser.c" /* yacc.c:1646  */
+#line 3312 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 774 "./util/configparser.y" /* yacc.c:1646  */
+  case 305:
+#line 778 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3292,11 +3320,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3296 "util/configparser.c" /* yacc.c:1646  */
+#line 3324 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 783 "./util/configparser.y" /* yacc.c:1646  */
+  case 306:
+#line 787 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3304,11 +3332,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3308 "util/configparser.c" /* yacc.c:1646  */
+#line 3336 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 792 "./util/configparser.y" /* yacc.c:1646  */
+  case 307:
+#line 796 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3316,11 +3344,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3320 "util/configparser.c" /* yacc.c:1646  */
+#line 3348 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 801 "./util/configparser.y" /* yacc.c:1646  */
+  case 308:
+#line 805 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3328,11 +3356,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3332 "util/configparser.c" /* yacc.c:1646  */
+#line 3360 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 810 "./util/configparser.y" /* yacc.c:1646  */
+  case 309:
+#line 814 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3340,11 +3368,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3344 "util/configparser.c" /* yacc.c:1646  */
+#line 3372 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 819 "./util/configparser.y" /* yacc.c:1646  */
+  case 310:
+#line 823 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3352,11 +3380,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3356 "util/configparser.c" /* yacc.c:1646  */
+#line 3384 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 828 "./util/configparser.y" /* yacc.c:1646  */
+  case 311:
+#line 832 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3368,11 +3396,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3372 "util/configparser.c" /* yacc.c:1646  */
+#line 3400 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 841 "./util/configparser.y" /* yacc.c:1646  */
+  case 312:
+#line 845 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3380,11 +3408,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3384 "util/configparser.c" /* yacc.c:1646  */
+#line 3412 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 850 "./util/configparser.y" /* yacc.c:1646  */
+  case 313:
+#line 854 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3396,11 +3424,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3400 "util/configparser.c" /* yacc.c:1646  */
+#line 3428 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 863 "./util/configparser.y" /* yacc.c:1646  */
+  case 314:
+#line 867 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3408,11 +3436,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3412 "util/configparser.c" /* yacc.c:1646  */
+#line 3440 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 872 "./util/configparser.y" /* yacc.c:1646  */
+  case 315:
+#line 876 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3420,11 +3448,11 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3424 "util/configparser.c" /* yacc.c:1646  */
+#line 3452 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 881 "./util/configparser.y" /* yacc.c:1646  */
+  case 316:
+#line 885 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3432,31 +3460,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3436 "util/configparser.c" /* yacc.c:1646  */
+#line 3464 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 890 "./util/configparser.y" /* yacc.c:1646  */
+  case 317:
+#line 894 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3446 "util/configparser.c" /* yacc.c:1646  */
+#line 3474 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 897 "./util/configparser.y" /* yacc.c:1646  */
+  case 318:
+#line 901 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3456 "util/configparser.c" /* yacc.c:1646  */
+#line 3484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 904 "./util/configparser.y" /* yacc.c:1646  */
+  case 319:
+#line 908 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3464,21 +3492,21 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3468 "util/configparser.c" /* yacc.c:1646  */
+#line 3496 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 913 "./util/configparser.y" /* yacc.c:1646  */
+  case 320:
+#line 917 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3478 "util/configparser.c" /* yacc.c:1646  */
+#line 3506 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 920 "./util/configparser.y" /* yacc.c:1646  */
+  case 321:
+#line 924 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3486,64 +3514,53 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3490 "util/configparser.c" /* yacc.c:1646  */
+#line 3518 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 929 "./util/configparser.y" /* yacc.c:1646  */
+  case 322:
+#line 933 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3501 "util/configparser.c" /* yacc.c:1646  */
+#line 3529 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 937 "./util/configparser.y" /* yacc.c:1646  */
+  case 323:
+#line 941 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3511 "util/configparser.c" /* yacc.c:1646  */
+#line 3539 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 944 "./util/configparser.y" /* yacc.c:1646  */
+  case 324:
+#line 948 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3521 "util/configparser.c" /* yacc.c:1646  */
+#line 3549 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 951 "./util/configparser.y" /* yacc.c:1646  */
+  case 325:
+#line 955 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3532 "util/configparser.c" /* yacc.c:1646  */
+#line 3560 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 959 "./util/configparser.y" /* yacc.c:1646  */
-    {
-		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("port number expected");
-		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
-	}
-#line 3543 "util/configparser.c" /* yacc.c:1646  */
-    break;
-
-  case 322:
-#line 966 "./util/configparser.y" /* yacc.c:1646  */
+  case 326:
+#line 963 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3551,11 +3568,88 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3555 "util/configparser.c" /* yacc.c:1646  */
+#line 3572 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 975 "./util/configparser.y" /* yacc.c:1646  */
+  case 327:
+#line 972 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
+		if(atoi((yyvsp[0].str)) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
+	}
+#line 3583 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 328:
+#line 979 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str)));
+		free(cfg_parser->cfg->http_endpoint);
+		if((yyvsp[0].str) && (yyvsp[0].str)[0] != '/') {
+			cfg_parser->cfg->http_endpoint = malloc(strlen((yyvsp[0].str))+2);
+			cfg_parser->cfg->http_endpoint[0] = '/';
+			memcpy(cfg_parser->cfg->http_endpoint+1, (yyvsp[0].str),
+				strlen((yyvsp[0].str))+1);
+			free((yyvsp[0].str));
+		} else {
+			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
+		}
+	}
+#line 3601 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 329:
+#line 993 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str)));
+		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
+		free((yyvsp[0].str));
+	}
+#line 3613 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 330:
+#line 1001 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str)));
+		if(!cfg_parse_memsize((yyvsp[0].str),
+			&cfg_parser->cfg->http_query_buffer_size))
+			yyerror("memory size expected");
+		free((yyvsp[0].str));
+	}
+#line 3625 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 331:
+#line 1009 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str)));
+		if(!cfg_parse_memsize((yyvsp[0].str),
+			&cfg_parser->cfg->http_response_buffer_size))
+			yyerror("memory size expected");
+		free((yyvsp[0].str));
+	}
+#line 3637 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 332:
+#line 1017 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str)));
+		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
+		free((yyvsp[0].str));
+	}
+#line 3649 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 333:
+#line 1025 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3563,11 +3657,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3567 "util/configparser.c" /* yacc.c:1646  */
+#line 3661 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 984 "./util/configparser.y" /* yacc.c:1646  */
+  case 334:
+#line 1034 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3575,11 +3669,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3579 "util/configparser.c" /* yacc.c:1646  */
+#line 3673 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 993 "./util/configparser.y" /* yacc.c:1646  */
+  case 335:
+#line 1043 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3592,11 +3686,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3596 "util/configparser.c" /* yacc.c:1646  */
+#line 3690 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 1007 "./util/configparser.y" /* yacc.c:1646  */
+  case 336:
+#line 1057 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3604,11 +3698,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3608 "util/configparser.c" /* yacc.c:1646  */
+#line 3702 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 1016 "./util/configparser.y" /* yacc.c:1646  */
+  case 337:
+#line 1066 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3616,11 +3710,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3620 "util/configparser.c" /* yacc.c:1646  */
+#line 3714 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 1025 "./util/configparser.y" /* yacc.c:1646  */
+  case 338:
+#line 1075 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3628,11 +3722,11 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3632 "util/configparser.c" /* yacc.c:1646  */
+#line 3726 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 1034 "./util/configparser.y" /* yacc.c:1646  */
+  case 339:
+#line 1084 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3640,11 +3734,11 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3644 "util/configparser.c" /* yacc.c:1646  */
+#line 3738 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 1043 "./util/configparser.y" /* yacc.c:1646  */
+  case 340:
+#line 1093 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3652,11 +3746,11 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3656 "util/configparser.c" /* yacc.c:1646  */
+#line 3750 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 1052 "./util/configparser.y" /* yacc.c:1646  */
+  case 341:
+#line 1102 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3664,31 +3758,31 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3668 "util/configparser.c" /* yacc.c:1646  */
+#line 3762 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 1061 "./util/configparser.y" /* yacc.c:1646  */
+  case 342:
+#line 1111 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3678 "util/configparser.c" /* yacc.c:1646  */
+#line 3772 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 1068 "./util/configparser.y" /* yacc.c:1646  */
+  case 343:
+#line 1118 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3688 "util/configparser.c" /* yacc.c:1646  */
+#line 3782 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 1075 "./util/configparser.y" /* yacc.c:1646  */
+  case 344:
+#line 1125 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3713,105 +3807,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3717 "util/configparser.c" /* yacc.c:1646  */
+#line 3811 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 1101 "./util/configparser.y" /* yacc.c:1646  */
+  case 345:
+#line 1151 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3728 "util/configparser.c" /* yacc.c:1646  */
+#line 3822 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 1109 "./util/configparser.y" /* yacc.c:1646  */
+  case 346:
+#line 1159 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3738 "util/configparser.c" /* yacc.c:1646  */
+#line 3832 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 1116 "./util/configparser.y" /* yacc.c:1646  */
+  case 347:
+#line 1166 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3748 "util/configparser.c" /* yacc.c:1646  */
+#line 3842 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 1123 "./util/configparser.y" /* yacc.c:1646  */
+  case 348:
+#line 1173 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dlv_anchor_file);
 		cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
 	}
-#line 3758 "util/configparser.c" /* yacc.c:1646  */
+#line 3852 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 1130 "./util/configparser.y" /* yacc.c:1646  */
+  case 349:
+#line 1180 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3768 "util/configparser.c" /* yacc.c:1646  */
+#line 3862 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 1137 "./util/configparser.y" /* yacc.c:1646  */
+  case 350:
+#line 1187 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3779 "util/configparser.c" /* yacc.c:1646  */
+#line 3873 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 1145 "./util/configparser.y" /* yacc.c:1646  */
+  case 351:
+#line 1195 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3790 "util/configparser.c" /* yacc.c:1646  */
+#line 3884 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 1153 "./util/configparser.y" /* yacc.c:1646  */
+  case 352:
+#line 1203 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3801 "util/configparser.c" /* yacc.c:1646  */
+#line 3895 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 1161 "./util/configparser.y" /* yacc.c:1646  */
+  case 353:
+#line 1211 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3811 "util/configparser.c" /* yacc.c:1646  */
+#line 3905 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 344:
-#line 1168 "./util/configparser.y" /* yacc.c:1646  */
+  case 354:
+#line 1218 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3821,11 +3915,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3825 "util/configparser.c" /* yacc.c:1646  */
+#line 3919 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 1179 "./util/configparser.y" /* yacc.c:1646  */
+  case 355:
+#line 1229 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3835,21 +3929,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3839 "util/configparser.c" /* yacc.c:1646  */
+#line 3933 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 346:
-#line 1190 "./util/configparser.y" /* yacc.c:1646  */
+  case 356:
+#line 1240 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3849 "util/configparser.c" /* yacc.c:1646  */
+#line 3943 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 347:
-#line 1197 "./util/configparser.y" /* yacc.c:1646  */
+  case 357:
+#line 1247 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3857,11 +3951,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3861 "util/configparser.c" /* yacc.c:1646  */
+#line 3955 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 348:
-#line 1206 "./util/configparser.y" /* yacc.c:1646  */
+  case 358:
+#line 1256 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3869,11 +3963,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3873 "util/configparser.c" /* yacc.c:1646  */
+#line 3967 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 1215 "./util/configparser.y" /* yacc.c:1646  */
+  case 359:
+#line 1265 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3881,53 +3975,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3885 "util/configparser.c" /* yacc.c:1646  */
+#line 3979 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 1224 "./util/configparser.y" /* yacc.c:1646  */
+  case 360:
+#line 1274 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 3895 "util/configparser.c" /* yacc.c:1646  */
+#line 3989 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 351:
-#line 1231 "./util/configparser.y" /* yacc.c:1646  */
+  case 361:
+#line 1281 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 3905 "util/configparser.c" /* yacc.c:1646  */
+#line 3999 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 1238 "./util/configparser.y" /* yacc.c:1646  */
+  case 362:
+#line 1288 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3916 "util/configparser.c" /* yacc.c:1646  */
+#line 4010 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 1246 "./util/configparser.y" /* yacc.c:1646  */
+  case 363:
+#line 1296 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3927 "util/configparser.c" /* yacc.c:1646  */
+#line 4021 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 1254 "./util/configparser.y" /* yacc.c:1646  */
+  case 364:
+#line 1304 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3936,11 +4030,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3940 "util/configparser.c" /* yacc.c:1646  */
+#line 4034 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 355:
-#line 1264 "./util/configparser.y" /* yacc.c:1646  */
+  case 365:
+#line 1314 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3949,11 +4043,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3953 "util/configparser.c" /* yacc.c:1646  */
+#line 4047 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 1274 "./util/configparser.y" /* yacc.c:1646  */
+  case 366:
+#line 1324 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3962,11 +4056,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3966 "util/configparser.c" /* yacc.c:1646  */
+#line 4060 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 1284 "./util/configparser.y" /* yacc.c:1646  */
+  case 367:
+#line 1334 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3979,22 +4073,22 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3983 "util/configparser.c" /* yacc.c:1646  */
+#line 4077 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 1298 "./util/configparser.y" /* yacc.c:1646  */
+  case 368:
+#line 1348 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3994 "util/configparser.c" /* yacc.c:1646  */
+#line 4088 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 1306 "./util/configparser.y" /* yacc.c:1646  */
+  case 369:
+#line 1356 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4006,11 +4100,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4010 "util/configparser.c" /* yacc.c:1646  */
+#line 4104 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 1319 "./util/configparser.y" /* yacc.c:1646  */
+  case 370:
+#line 1369 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4020,22 +4114,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4024 "util/configparser.c" /* yacc.c:1646  */
+#line 4118 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 1330 "./util/configparser.y" /* yacc.c:1646  */
+  case 371:
+#line 1380 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4035 "util/configparser.c" /* yacc.c:1646  */
+#line 4129 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 1338 "./util/configparser.y" /* yacc.c:1646  */
+  case 372:
+#line 1388 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4047,11 +4141,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4051 "util/configparser.c" /* yacc.c:1646  */
+#line 4145 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 1351 "./util/configparser.y" /* yacc.c:1646  */
+  case 373:
+#line 1401 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4059,11 +4153,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4063 "util/configparser.c" /* yacc.c:1646  */
+#line 4157 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 1360 "./util/configparser.y" /* yacc.c:1646  */
+  case 374:
+#line 1410 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4071,11 +4165,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4075 "util/configparser.c" /* yacc.c:1646  */
+#line 4169 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 1369 "./util/configparser.y" /* yacc.c:1646  */
+  case 375:
+#line 1419 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4083,11 +4177,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4087 "util/configparser.c" /* yacc.c:1646  */
+#line 4181 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 366:
-#line 1378 "./util/configparser.y" /* yacc.c:1646  */
+  case 376:
+#line 1428 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4096,11 +4190,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4100 "util/configparser.c" /* yacc.c:1646  */
+#line 4194 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 1388 "./util/configparser.y" /* yacc.c:1646  */
+  case 377:
+#line 1438 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4109,22 +4203,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4113 "util/configparser.c" /* yacc.c:1646  */
+#line 4207 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 1398 "./util/configparser.y" /* yacc.c:1646  */
+  case 378:
+#line 1448 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4124 "util/configparser.c" /* yacc.c:1646  */
+#line 4218 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 1406 "./util/configparser.y" /* yacc.c:1646  */
+  case 379:
+#line 1456 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4136,11 +4230,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4140 "util/configparser.c" /* yacc.c:1646  */
+#line 4234 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 370:
-#line 1419 "./util/configparser.y" /* yacc.c:1646  */
+  case 380:
+#line 1469 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4148,22 +4242,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4152 "util/configparser.c" /* yacc.c:1646  */
+#line 4246 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 371:
-#line 1428 "./util/configparser.y" /* yacc.c:1646  */
+  case 381:
+#line 1478 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4163 "util/configparser.c" /* yacc.c:1646  */
+#line 4257 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 1436 "./util/configparser.y" /* yacc.c:1646  */
+  case 382:
+#line 1486 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4171,22 +4265,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4175 "util/configparser.c" /* yacc.c:1646  */
+#line 4269 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 1445 "./util/configparser.y" /* yacc.c:1646  */
+  case 383:
+#line 1495 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4186 "util/configparser.c" /* yacc.c:1646  */
+#line 4280 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 374:
-#line 1453 "./util/configparser.y" /* yacc.c:1646  */
+  case 384:
+#line 1503 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4198,11 +4292,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4202 "util/configparser.c" /* yacc.c:1646  */
+#line 4296 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 1466 "./util/configparser.y" /* yacc.c:1646  */
+  case 385:
+#line 1516 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4210,21 +4304,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4214 "util/configparser.c" /* yacc.c:1646  */
+#line 4308 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 376:
-#line 1475 "./util/configparser.y" /* yacc.c:1646  */
+  case 386:
+#line 1525 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4224 "util/configparser.c" /* yacc.c:1646  */
+#line 4318 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 1482 "./util/configparser.y" /* yacc.c:1646  */
+  case 387:
+#line 1532 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4233,11 +4327,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4237 "util/configparser.c" /* yacc.c:1646  */
+#line 4331 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 1492 "./util/configparser.y" /* yacc.c:1646  */
+  case 388:
+#line 1542 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4246,11 +4340,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4250 "util/configparser.c" /* yacc.c:1646  */
+#line 4344 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 1502 "./util/configparser.y" /* yacc.c:1646  */
+  case 389:
+#line 1552 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4259,11 +4353,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4263 "util/configparser.c" /* yacc.c:1646  */
+#line 4357 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 380:
-#line 1512 "./util/configparser.y" /* yacc.c:1646  */
+  case 390:
+#line 1562 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4272,11 +4366,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4276 "util/configparser.c" /* yacc.c:1646  */
+#line 4370 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 381:
-#line 1522 "./util/configparser.y" /* yacc.c:1646  */
+  case 391:
+#line 1572 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4285,11 +4379,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4289 "util/configparser.c" /* yacc.c:1646  */
+#line 4383 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 382:
-#line 1532 "./util/configparser.y" /* yacc.c:1646  */
+  case 392:
+#line 1582 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4298,11 +4392,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4302 "util/configparser.c" /* yacc.c:1646  */
+#line 4396 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 383:
-#line 1542 "./util/configparser.y" /* yacc.c:1646  */
+  case 393:
+#line 1592 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4311,11 +4405,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4315 "util/configparser.c" /* yacc.c:1646  */
+#line 4409 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 384:
-#line 1552 "./util/configparser.y" /* yacc.c:1646  */
+  case 394:
+#line 1602 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4324,41 +4418,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4328 "util/configparser.c" /* yacc.c:1646  */
+#line 4422 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 385:
-#line 1562 "./util/configparser.y" /* yacc.c:1646  */
+  case 395:
+#line 1612 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4338 "util/configparser.c" /* yacc.c:1646  */
+#line 4432 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 386:
-#line 1569 "./util/configparser.y" /* yacc.c:1646  */
+  case 396:
+#line 1619 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4348 "util/configparser.c" /* yacc.c:1646  */
+#line 4442 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 387:
-#line 1576 "./util/configparser.y" /* yacc.c:1646  */
+  case 397:
+#line 1626 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4358 "util/configparser.c" /* yacc.c:1646  */
+#line 4452 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 388:
-#line 1583 "./util/configparser.y" /* yacc.c:1646  */
+  case 398:
+#line 1633 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4366,11 +4460,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4370 "util/configparser.c" /* yacc.c:1646  */
+#line 4464 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 389:
-#line 1592 "./util/configparser.y" /* yacc.c:1646  */
+  case 399:
+#line 1642 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4378,11 +4472,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4382 "util/configparser.c" /* yacc.c:1646  */
+#line 4476 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 390:
-#line 1601 "./util/configparser.y" /* yacc.c:1646  */
+  case 400:
+#line 1651 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4390,11 +4484,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4394 "util/configparser.c" /* yacc.c:1646  */
+#line 4488 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 391:
-#line 1610 "./util/configparser.y" /* yacc.c:1646  */
+  case 401:
+#line 1660 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4402,21 +4496,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4406 "util/configparser.c" /* yacc.c:1646  */
+#line 4500 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 392:
-#line 1619 "./util/configparser.y" /* yacc.c:1646  */
+  case 402:
+#line 1669 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4416 "util/configparser.c" /* yacc.c:1646  */
+#line 4510 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 1626 "./util/configparser.y" /* yacc.c:1646  */
+  case 403:
+#line 1676 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4425,11 +4519,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4429 "util/configparser.c" /* yacc.c:1646  */
+#line 4523 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 1636 "./util/configparser.y" /* yacc.c:1646  */
+  case 404:
+#line 1686 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -4448,21 +4542,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4452 "util/configparser.c" /* yacc.c:1646  */
+#line 4546 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 1656 "./util/configparser.y" /* yacc.c:1646  */
+  case 405:
+#line 1706 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4462 "util/configparser.c" /* yacc.c:1646  */
+#line 4556 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 1663 "./util/configparser.y" /* yacc.c:1646  */
+  case 406:
+#line 1713 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4479,11 +4573,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4483 "util/configparser.c" /* yacc.c:1646  */
+#line 4577 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 1681 "./util/configparser.y" /* yacc.c:1646  */
+  case 407:
+#line 1731 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4495,11 +4589,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4499 "util/configparser.c" /* yacc.c:1646  */
+#line 4593 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 398:
-#line 1694 "./util/configparser.y" /* yacc.c:1646  */
+  case 408:
+#line 1744 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4511,11 +4605,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4515 "util/configparser.c" /* yacc.c:1646  */
+#line 4609 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 399:
-#line 1707 "./util/configparser.y" /* yacc.c:1646  */
+  case 409:
+#line 1757 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4523,11 +4617,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4527 "util/configparser.c" /* yacc.c:1646  */
+#line 4621 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 400:
-#line 1716 "./util/configparser.y" /* yacc.c:1646  */
+  case 410:
+#line 1766 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4535,11 +4629,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4539 "util/configparser.c" /* yacc.c:1646  */
+#line 4633 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 401:
-#line 1725 "./util/configparser.y" /* yacc.c:1646  */
+  case 411:
+#line 1775 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4547,11 +4641,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4551 "util/configparser.c" /* yacc.c:1646  */
+#line 4645 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 402:
-#line 1734 "./util/configparser.y" /* yacc.c:1646  */
+  case 412:
+#line 1784 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4559,11 +4653,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4563 "util/configparser.c" /* yacc.c:1646  */
+#line 4657 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 403:
-#line 1743 "./util/configparser.y" /* yacc.c:1646  */
+  case 413:
+#line 1793 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4572,11 +4666,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4576 "util/configparser.c" /* yacc.c:1646  */
+#line 4670 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 404:
-#line 1753 "./util/configparser.y" /* yacc.c:1646  */
+  case 414:
+#line 1803 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4585,11 +4679,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4589 "util/configparser.c" /* yacc.c:1646  */
+#line 4683 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 405:
-#line 1763 "./util/configparser.y" /* yacc.c:1646  */
+  case 415:
+#line 1813 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4599,11 +4693,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4603 "util/configparser.c" /* yacc.c:1646  */
+#line 4697 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 406:
-#line 1774 "./util/configparser.y" /* yacc.c:1646  */
+  case 416:
+#line 1824 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4611,11 +4705,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4615 "util/configparser.c" /* yacc.c:1646  */
+#line 4709 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 407:
-#line 1783 "./util/configparser.y" /* yacc.c:1646  */
+  case 417:
+#line 1833 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4623,11 +4717,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4627 "util/configparser.c" /* yacc.c:1646  */
+#line 4721 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 408:
-#line 1792 "./util/configparser.y" /* yacc.c:1646  */
+  case 418:
+#line 1842 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4635,11 +4729,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4639 "util/configparser.c" /* yacc.c:1646  */
+#line 4733 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 409:
-#line 1801 "./util/configparser.y" /* yacc.c:1646  */
+  case 419:
+#line 1851 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4647,11 +4741,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4651 "util/configparser.c" /* yacc.c:1646  */
+#line 4745 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 410:
-#line 1810 "./util/configparser.y" /* yacc.c:1646  */
+  case 420:
+#line 1860 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4659,11 +4753,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4663 "util/configparser.c" /* yacc.c:1646  */
+#line 4757 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 411:
-#line 1819 "./util/configparser.y" /* yacc.c:1646  */
+  case 421:
+#line 1869 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4671,11 +4765,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4675 "util/configparser.c" /* yacc.c:1646  */
+#line 4769 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 412:
-#line 1828 "./util/configparser.y" /* yacc.c:1646  */
+  case 422:
+#line 1878 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4687,11 +4781,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4691 "util/configparser.c" /* yacc.c:1646  */
+#line 4785 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 1841 "./util/configparser.y" /* yacc.c:1646  */
+  case 423:
+#line 1891 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4703,11 +4797,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4707 "util/configparser.c" /* yacc.c:1646  */
+#line 4801 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 414:
-#line 1854 "./util/configparser.y" /* yacc.c:1646  */
+  case 424:
+#line 1904 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4715,21 +4809,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4719 "util/configparser.c" /* yacc.c:1646  */
+#line 4813 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 1863 "./util/configparser.y" /* yacc.c:1646  */
+  case 425:
+#line 1913 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4729 "util/configparser.c" /* yacc.c:1646  */
+#line 4823 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 416:
-#line 1870 "./util/configparser.y" /* yacc.c:1646  */
+  case 426:
+#line 1920 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4737,11 +4831,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4741 "util/configparser.c" /* yacc.c:1646  */
+#line 4835 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 1879 "./util/configparser.y" /* yacc.c:1646  */
+  case 427:
+#line 1929 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4749,11 +4843,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4753 "util/configparser.c" /* yacc.c:1646  */
+#line 4847 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 1888 "./util/configparser.y" /* yacc.c:1646  */
+  case 428:
+#line 1938 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4761,11 +4855,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4765 "util/configparser.c" /* yacc.c:1646  */
+#line 4859 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 1897 "./util/configparser.y" /* yacc.c:1646  */
+  case 429:
+#line 1947 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4774,22 +4868,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4778 "util/configparser.c" /* yacc.c:1646  */
+#line 4872 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 1906 "./util/configparser.y" /* yacc.c:1646  */
+  case 430:
+#line 1956 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4789 "util/configparser.c" /* yacc.c:1646  */
+#line 4883 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 1914 "./util/configparser.y" /* yacc.c:1646  */
+  case 431:
+#line 1964 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4801,22 +4895,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4805 "util/configparser.c" /* yacc.c:1646  */
+#line 4899 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 422:
-#line 1927 "./util/configparser.y" /* yacc.c:1646  */
+  case 432:
+#line 1977 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4816 "util/configparser.c" /* yacc.c:1646  */
+#line 4910 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 423:
-#line 1935 "./util/configparser.y" /* yacc.c:1646  */
+  case 433:
+#line 1985 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4856,21 +4950,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4860 "util/configparser.c" /* yacc.c:1646  */
+#line 4954 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 424:
-#line 1976 "./util/configparser.y" /* yacc.c:1646  */
+  case 434:
+#line 2026 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 4870 "util/configparser.c" /* yacc.c:1646  */
+#line 4964 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 425:
-#line 1983 "./util/configparser.y" /* yacc.c:1646  */
+  case 435:
+#line 2033 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -4884,11 +4978,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4888 "util/configparser.c" /* yacc.c:1646  */
+#line 4982 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 426:
-#line 1998 "./util/configparser.y" /* yacc.c:1646  */
+  case 436:
+#line 2048 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4897,11 +4991,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4901 "util/configparser.c" /* yacc.c:1646  */
+#line 4995 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 427:
-#line 2008 "./util/configparser.y" /* yacc.c:1646  */
+  case 437:
+#line 2058 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4910,41 +5004,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4914 "util/configparser.c" /* yacc.c:1646  */
+#line 5008 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 428:
-#line 2018 "./util/configparser.y" /* yacc.c:1646  */
+  case 438:
+#line 2068 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4924 "util/configparser.c" /* yacc.c:1646  */
+#line 5018 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 2025 "./util/configparser.y" /* yacc.c:1646  */
+  case 439:
+#line 2075 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4934 "util/configparser.c" /* yacc.c:1646  */
+#line 5028 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 2032 "./util/configparser.y" /* yacc.c:1646  */
+  case 440:
+#line 2082 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 4944 "util/configparser.c" /* yacc.c:1646  */
+#line 5038 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 431:
-#line 2039 "./util/configparser.y" /* yacc.c:1646  */
+  case 441:
+#line 2089 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4952,22 +5046,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4956 "util/configparser.c" /* yacc.c:1646  */
+#line 5050 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 2048 "./util/configparser.y" /* yacc.c:1646  */
+  case 442:
+#line 2098 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 4967 "util/configparser.c" /* yacc.c:1646  */
+#line 5061 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 2056 "./util/configparser.y" /* yacc.c:1646  */
+  case 443:
+#line 2106 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -4980,11 +5074,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4984 "util/configparser.c" /* yacc.c:1646  */
+#line 5078 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 2070 "./util/configparser.y" /* yacc.c:1646  */
+  case 444:
+#line 2120 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5004,11 +5098,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5008 "util/configparser.c" /* yacc.c:1646  */
+#line 5102 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 435:
-#line 2091 "./util/configparser.y" /* yacc.c:1646  */
+  case 445:
+#line 2141 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5028,11 +5122,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5032 "util/configparser.c" /* yacc.c:1646  */
+#line 5126 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 436:
-#line 2112 "./util/configparser.y" /* yacc.c:1646  */
+  case 446:
+#line 2162 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -5043,11 +5137,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5047 "util/configparser.c" /* yacc.c:1646  */
+#line 5141 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 437:
-#line 2124 "./util/configparser.y" /* yacc.c:1646  */
+  case 447:
+#line 2174 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -5058,11 +5152,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5062 "util/configparser.c" /* yacc.c:1646  */
+#line 5156 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 438:
-#line 2136 "./util/configparser.y" /* yacc.c:1646  */
+  case 448:
+#line 2186 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -5073,11 +5167,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5077 "util/configparser.c" /* yacc.c:1646  */
+#line 5171 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 439:
-#line 2148 "./util/configparser.y" /* yacc.c:1646  */
+  case 449:
+#line 2198 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -5085,11 +5179,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5089 "util/configparser.c" /* yacc.c:1646  */
+#line 5183 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 440:
-#line 2157 "./util/configparser.y" /* yacc.c:1646  */
+  case 450:
+#line 2207 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5109,11 +5203,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5113 "util/configparser.c" /* yacc.c:1646  */
+#line 5207 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 441:
-#line 2178 "./util/configparser.y" /* yacc.c:1646  */
+  case 451:
+#line 2228 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5121,11 +5215,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5125 "util/configparser.c" /* yacc.c:1646  */
+#line 5219 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 442:
-#line 2188 "./util/configparser.y" /* yacc.c:1646  */
+  case 452:
+#line 2238 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5133,33 +5227,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5137 "util/configparser.c" /* yacc.c:1646  */
+#line 5231 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 443:
-#line 2197 "./util/configparser.y" /* yacc.c:1646  */
+  case 453:
+#line 2247 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5148 "util/configparser.c" /* yacc.c:1646  */
+#line 5242 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 444:
-#line 2205 "./util/configparser.y" /* yacc.c:1646  */
+  case 454:
+#line 2255 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5159 "util/configparser.c" /* yacc.c:1646  */
+#line 5253 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 445:
-#line 2213 "./util/configparser.y" /* yacc.c:1646  */
+  case 455:
+#line 2263 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5171,11 +5265,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5175 "util/configparser.c" /* yacc.c:1646  */
+#line 5269 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 446:
-#line 2226 "./util/configparser.y" /* yacc.c:1646  */
+  case 456:
+#line 2276 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5187,11 +5281,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5191 "util/configparser.c" /* yacc.c:1646  */
+#line 5285 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 447:
-#line 2239 "./util/configparser.y" /* yacc.c:1646  */
+  case 457:
+#line 2289 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5205,11 +5299,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5209 "util/configparser.c" /* yacc.c:1646  */
+#line 5303 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 448:
-#line 2254 "./util/configparser.y" /* yacc.c:1646  */
+  case 458:
+#line 2304 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5223,11 +5317,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5227 "util/configparser.c" /* yacc.c:1646  */
+#line 5321 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 449:
-#line 2269 "./util/configparser.y" /* yacc.c:1646  */
+  case 459:
+#line 2319 "./util/configparser.y" /* yacc.c:1646  */
     { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5235,11 +5329,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5239 "util/configparser.c" /* yacc.c:1646  */
+#line 5333 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 450:
-#line 2278 "./util/configparser.y" /* yacc.c:1646  */
+  case 460:
+#line 2328 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5247,20 +5341,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5251 "util/configparser.c" /* yacc.c:1646  */
+#line 5345 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 451:
-#line 2287 "./util/configparser.y" /* yacc.c:1646  */
+  case 461:
+#line 2337 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5260 "util/configparser.c" /* yacc.c:1646  */
+#line 5354 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 452:
-#line 2293 "./util/configparser.y" /* yacc.c:1646  */
+  case 462:
+#line 2343 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5268,11 +5362,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5272 "util/configparser.c" /* yacc.c:1646  */
+#line 5366 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 453:
-#line 2302 "./util/configparser.y" /* yacc.c:1646  */
+  case 463:
+#line 2352 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5280,11 +5374,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5284 "util/configparser.c" /* yacc.c:1646  */
+#line 5378 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 454:
-#line 2311 "./util/configparser.y" /* yacc.c:1646  */
+  case 464:
+#line 2361 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5293,11 +5387,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5297 "util/configparser.c" /* yacc.c:1646  */
+#line 5391 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 455:
-#line 2321 "./util/configparser.y" /* yacc.c:1646  */
+  case 465:
+#line 2371 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5306,11 +5400,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5310 "util/configparser.c" /* yacc.c:1646  */
+#line 5404 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 456:
-#line 2331 "./util/configparser.y" /* yacc.c:1646  */
+  case 466:
+#line 2381 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5322,11 +5416,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5326 "util/configparser.c" /* yacc.c:1646  */
+#line 5420 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 457:
-#line 2344 "./util/configparser.y" /* yacc.c:1646  */
+  case 467:
+#line 2394 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5338,11 +5432,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5342 "util/configparser.c" /* yacc.c:1646  */
+#line 5436 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 458:
-#line 2357 "./util/configparser.y" /* yacc.c:1646  */
+  case 468:
+#line 2407 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5353,11 +5447,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5357 "util/configparser.c" /* yacc.c:1646  */
+#line 5451 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 459:
-#line 2369 "./util/configparser.y" /* yacc.c:1646  */
+  case 469:
+#line 2419 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5370,11 +5464,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5374 "util/configparser.c" /* yacc.c:1646  */
+#line 5468 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 460:
-#line 2383 "./util/configparser.y" /* yacc.c:1646  */
+  case 470:
+#line 2433 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5385,11 +5479,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5389 "util/configparser.c" /* yacc.c:1646  */
+#line 5483 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 461:
-#line 2395 "./util/configparser.y" /* yacc.c:1646  */
+  case 471:
+#line 2445 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5402,11 +5496,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5406 "util/configparser.c" /* yacc.c:1646  */
+#line 5500 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 462:
-#line 2409 "./util/configparser.y" /* yacc.c:1646  */
+  case 472:
+#line 2459 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5415,31 +5509,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5419 "util/configparser.c" /* yacc.c:1646  */
+#line 5513 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 463:
-#line 2419 "./util/configparser.y" /* yacc.c:1646  */
+  case 473:
+#line 2469 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5429 "util/configparser.c" /* yacc.c:1646  */
+#line 5523 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 464:
-#line 2426 "./util/configparser.y" /* yacc.c:1646  */
+  case 474:
+#line 2476 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5439 "util/configparser.c" /* yacc.c:1646  */
+#line 5533 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 465:
-#line 2433 "./util/configparser.y" /* yacc.c:1646  */
+  case 475:
+#line 2483 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5447,11 +5541,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5451 "util/configparser.c" /* yacc.c:1646  */
+#line 5545 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 466:
-#line 2442 "./util/configparser.y" /* yacc.c:1646  */
+  case 476:
+#line 2492 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5459,11 +5553,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5463 "util/configparser.c" /* yacc.c:1646  */
+#line 5557 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 467:
-#line 2451 "./util/configparser.y" /* yacc.c:1646  */
+  case 477:
+#line 2501 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5472,11 +5566,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5476 "util/configparser.c" /* yacc.c:1646  */
+#line 5570 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 468:
-#line 2461 "./util/configparser.y" /* yacc.c:1646  */
+  case 478:
+#line 2511 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5485,11 +5579,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5489 "util/configparser.c" /* yacc.c:1646  */
+#line 5583 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 469:
-#line 2471 "./util/configparser.y" /* yacc.c:1646  */
+  case 479:
+#line 2521 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5498,31 +5592,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5502 "util/configparser.c" /* yacc.c:1646  */
+#line 5596 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 470:
-#line 2481 "./util/configparser.y" /* yacc.c:1646  */
+  case 480:
+#line 2531 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5512 "util/configparser.c" /* yacc.c:1646  */
+#line 5606 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 471:
-#line 2488 "./util/configparser.y" /* yacc.c:1646  */
+  case 481:
+#line 2538 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5522 "util/configparser.c" /* yacc.c:1646  */
+#line 5616 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 472:
-#line 2495 "./util/configparser.y" /* yacc.c:1646  */
+  case 482:
+#line 2545 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5530,11 +5624,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5534 "util/configparser.c" /* yacc.c:1646  */
+#line 5628 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 473:
-#line 2504 "./util/configparser.y" /* yacc.c:1646  */
+  case 483:
+#line 2554 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5542,11 +5636,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5546 "util/configparser.c" /* yacc.c:1646  */
+#line 5640 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 474:
-#line 2513 "./util/configparser.y" /* yacc.c:1646  */
+  case 484:
+#line 2563 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5555,11 +5649,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5559 "util/configparser.c" /* yacc.c:1646  */
+#line 5653 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 475:
-#line 2523 "./util/configparser.y" /* yacc.c:1646  */
+  case 485:
+#line 2573 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5568,52 +5662,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5572 "util/configparser.c" /* yacc.c:1646  */
+#line 5666 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 476:
-#line 2533 "./util/configparser.y" /* yacc.c:1646  */
+  case 486:
+#line 2583 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5582 "util/configparser.c" /* yacc.c:1646  */
+#line 5676 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 477:
-#line 2540 "./util/configparser.y" /* yacc.c:1646  */
+  case 487:
+#line 2590 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5592 "util/configparser.c" /* yacc.c:1646  */
+#line 5686 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 478:
-#line 2547 "./util/configparser.y" /* yacc.c:1646  */
+  case 488:
+#line 2597 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5602 "util/configparser.c" /* yacc.c:1646  */
+#line 5696 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 479:
-#line 2554 "./util/configparser.y" /* yacc.c:1646  */
+  case 489:
+#line 2604 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5613 "util/configparser.c" /* yacc.c:1646  */
+#line 5707 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 480:
-#line 2562 "./util/configparser.y" /* yacc.c:1646  */
+  case 490:
+#line 2612 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5622,11 +5716,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5626 "util/configparser.c" /* yacc.c:1646  */
+#line 5720 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 481:
-#line 2572 "./util/configparser.y" /* yacc.c:1646  */
+  case 491:
+#line 2622 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5635,11 +5729,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5639 "util/configparser.c" /* yacc.c:1646  */
+#line 5733 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 482:
-#line 2582 "./util/configparser.y" /* yacc.c:1646  */
+  case 492:
+#line 2632 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5648,11 +5742,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5652 "util/configparser.c" /* yacc.c:1646  */
+#line 5746 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 483:
-#line 2592 "./util/configparser.y" /* yacc.c:1646  */
+  case 493:
+#line 2642 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5661,11 +5755,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5665 "util/configparser.c" /* yacc.c:1646  */
+#line 5759 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 484:
-#line 2602 "./util/configparser.y" /* yacc.c:1646  */
+  case 494:
+#line 2652 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5703,11 +5797,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5707 "util/configparser.c" /* yacc.c:1646  */
+#line 5801 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 485:
-#line 2641 "./util/configparser.y" /* yacc.c:1646  */
+  case 495:
+#line 2691 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5716,33 +5810,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5720 "util/configparser.c" /* yacc.c:1646  */
+#line 5814 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 486:
-#line 2651 "./util/configparser.y" /* yacc.c:1646  */
+  case 496:
+#line 2701 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5731 "util/configparser.c" /* yacc.c:1646  */
+#line 5825 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 487:
-#line 2659 "./util/configparser.y" /* yacc.c:1646  */
+  case 497:
+#line 2709 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5742 "util/configparser.c" /* yacc.c:1646  */
+#line 5836 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 488:
-#line 2667 "./util/configparser.y" /* yacc.c:1646  */
+  case 498:
+#line 2717 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5756,11 +5850,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5760 "util/configparser.c" /* yacc.c:1646  */
+#line 5854 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 489:
-#line 2682 "./util/configparser.y" /* yacc.c:1646  */
+  case 499:
+#line 2732 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5768,19 +5862,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5772 "util/configparser.c" /* yacc.c:1646  */
+#line 5866 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 490:
-#line 2691 "./util/configparser.y" /* yacc.c:1646  */
+  case 500:
+#line 2741 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5780 "util/configparser.c" /* yacc.c:1646  */
+#line 5874 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 501:
-#line 2702 "./util/configparser.y" /* yacc.c:1646  */
+  case 511:
+#line 2752 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5789,11 +5883,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5793 "util/configparser.c" /* yacc.c:1646  */
+#line 5887 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 502:
-#line 2712 "./util/configparser.y" /* yacc.c:1646  */
+  case 512:
+#line 2762 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5801,79 +5895,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5805 "util/configparser.c" /* yacc.c:1646  */
+#line 5899 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 503:
-#line 2721 "./util/configparser.y" /* yacc.c:1646  */
+  case 513:
+#line 2771 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5815 "util/configparser.c" /* yacc.c:1646  */
+#line 5909 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 504:
-#line 2728 "./util/configparser.y" /* yacc.c:1646  */
+  case 514:
+#line 2778 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5825 "util/configparser.c" /* yacc.c:1646  */
+#line 5919 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 505:
-#line 2735 "./util/configparser.y" /* yacc.c:1646  */
+  case 515:
+#line 2785 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 5835 "util/configparser.c" /* yacc.c:1646  */
+#line 5929 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 506:
-#line 2742 "./util/configparser.y" /* yacc.c:1646  */
+  case 516:
+#line 2792 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 5845 "util/configparser.c" /* yacc.c:1646  */
+#line 5939 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 507:
-#line 2749 "./util/configparser.y" /* yacc.c:1646  */
+  case 517:
+#line 2799 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 5855 "util/configparser.c" /* yacc.c:1646  */
+#line 5949 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 508:
-#line 2756 "./util/configparser.y" /* yacc.c:1646  */
+  case 518:
+#line 2806 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 5865 "util/configparser.c" /* yacc.c:1646  */
+#line 5959 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 509:
-#line 2763 "./util/configparser.y" /* yacc.c:1646  */
+  case 519:
+#line 2813 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 5873 "util/configparser.c" /* yacc.c:1646  */
+#line 5967 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 530:
-#line 2783 "./util/configparser.y" /* yacc.c:1646  */
+  case 540:
+#line 2833 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5881,31 +5975,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5885 "util/configparser.c" /* yacc.c:1646  */
+#line 5979 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 531:
-#line 2792 "./util/configparser.y" /* yacc.c:1646  */
+  case 541:
+#line 2842 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 5895 "util/configparser.c" /* yacc.c:1646  */
+#line 5989 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 532:
-#line 2799 "./util/configparser.y" /* yacc.c:1646  */
+  case 542:
+#line 2849 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 5905 "util/configparser.c" /* yacc.c:1646  */
+#line 5999 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 533:
-#line 2806 "./util/configparser.y" /* yacc.c:1646  */
+  case 543:
+#line 2856 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5913,51 +6007,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5917 "util/configparser.c" /* yacc.c:1646  */
+#line 6011 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 534:
-#line 2815 "./util/configparser.y" /* yacc.c:1646  */
+  case 544:
+#line 2865 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 5927 "util/configparser.c" /* yacc.c:1646  */
+#line 6021 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 535:
-#line 2822 "./util/configparser.y" /* yacc.c:1646  */
+  case 545:
+#line 2872 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 5937 "util/configparser.c" /* yacc.c:1646  */
+#line 6031 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 536:
-#line 2829 "./util/configparser.y" /* yacc.c:1646  */
+  case 546:
+#line 2879 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 5947 "util/configparser.c" /* yacc.c:1646  */
+#line 6041 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 537:
-#line 2836 "./util/configparser.y" /* yacc.c:1646  */
+  case 547:
+#line 2886 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 5957 "util/configparser.c" /* yacc.c:1646  */
+#line 6051 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 538:
-#line 2843 "./util/configparser.y" /* yacc.c:1646  */
+  case 548:
+#line 2893 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5965,11 +6059,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5969 "util/configparser.c" /* yacc.c:1646  */
+#line 6063 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 539:
-#line 2852 "./util/configparser.y" /* yacc.c:1646  */
+  case 549:
+#line 2902 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5977,31 +6071,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5981 "util/configparser.c" /* yacc.c:1646  */
+#line 6075 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 540:
-#line 2861 "./util/configparser.y" /* yacc.c:1646  */
+  case 550:
+#line 2911 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 5991 "util/configparser.c" /* yacc.c:1646  */
+#line 6085 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 541:
-#line 2868 "./util/configparser.y" /* yacc.c:1646  */
+  case 551:
+#line 2918 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6001 "util/configparser.c" /* yacc.c:1646  */
+#line 6095 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 542:
-#line 2875 "./util/configparser.y" /* yacc.c:1646  */
+  case 552:
+#line 2925 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6010,11 +6104,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6014 "util/configparser.c" /* yacc.c:1646  */
+#line 6108 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 543:
-#line 2885 "./util/configparser.y" /* yacc.c:1646  */
+  case 553:
+#line 2935 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6023,11 +6117,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6027 "util/configparser.c" /* yacc.c:1646  */
+#line 6121 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 544:
-#line 2895 "./util/configparser.y" /* yacc.c:1646  */
+  case 554:
+#line 2945 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6036,11 +6130,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6040 "util/configparser.c" /* yacc.c:1646  */
+#line 6134 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 545:
-#line 2905 "./util/configparser.y" /* yacc.c:1646  */
+  case 555:
+#line 2955 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6049,11 +6143,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6053 "util/configparser.c" /* yacc.c:1646  */
+#line 6147 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 546:
-#line 2915 "./util/configparser.y" /* yacc.c:1646  */
+  case 556:
+#line 2965 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6062,11 +6156,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6066 "util/configparser.c" /* yacc.c:1646  */
+#line 6160 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 547:
-#line 2925 "./util/configparser.y" /* yacc.c:1646  */
+  case 557:
+#line 2975 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6075,29 +6169,29 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6079 "util/configparser.c" /* yacc.c:1646  */
+#line 6173 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 548:
-#line 2935 "./util/configparser.y" /* yacc.c:1646  */
+  case 558:
+#line 2985 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6087 "util/configparser.c" /* yacc.c:1646  */
+#line 6181 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 552:
-#line 2944 "./util/configparser.y" /* yacc.c:1646  */
+  case 562:
+#line 2994 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6097 "util/configparser.c" /* yacc.c:1646  */
+#line 6191 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 553:
-#line 2950 "./util/configparser.y" /* yacc.c:1646  */
+  case 563:
+#line 3000 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6106,21 +6200,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6110 "util/configparser.c" /* yacc.c:1646  */
+#line 6204 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 554:
-#line 2960 "./util/configparser.y" /* yacc.c:1646  */
+  case 564:
+#line 3010 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6120 "util/configparser.c" /* yacc.c:1646  */
+#line 6214 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 555:
-#line 2967 "./util/configparser.y" /* yacc.c:1646  */
+  case 565:
+#line 3017 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6128,30 +6222,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6132 "util/configparser.c" /* yacc.c:1646  */
+#line 6226 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 556:
-#line 2976 "./util/configparser.y" /* yacc.c:1646  */
+  case 566:
+#line 3026 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6143 "util/configparser.c" /* yacc.c:1646  */
+#line 6237 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 557:
-#line 2984 "./util/configparser.y" /* yacc.c:1646  */
+  case 567:
+#line 3034 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6151 "util/configparser.c" /* yacc.c:1646  */
+#line 6245 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 570:
-#line 3000 "./util/configparser.y" /* yacc.c:1646  */
+  case 580:
+#line 3050 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6159,11 +6253,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6163 "util/configparser.c" /* yacc.c:1646  */
+#line 6257 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 571:
-#line 3010 "./util/configparser.y" /* yacc.c:1646  */
+  case 581:
+#line 3060 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6171,21 +6265,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6175 "util/configparser.c" /* yacc.c:1646  */
+#line 6269 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 572:
-#line 3019 "./util/configparser.y" /* yacc.c:1646  */
+  case 582:
+#line 3069 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6185 "util/configparser.c" /* yacc.c:1646  */
+#line 6279 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 573:
-#line 3026 "./util/configparser.y" /* yacc.c:1646  */
+  case 583:
+#line 3076 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6193,21 +6287,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6197 "util/configparser.c" /* yacc.c:1646  */
+#line 6291 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 574:
-#line 3035 "./util/configparser.y" /* yacc.c:1646  */
+  case 584:
+#line 3085 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6207 "util/configparser.c" /* yacc.c:1646  */
+#line 6301 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 575:
-#line 3042 "./util/configparser.y" /* yacc.c:1646  */
+  case 585:
+#line 3092 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6215,22 +6309,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6219 "util/configparser.c" /* yacc.c:1646  */
+#line 6313 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 576:
-#line 3051 "./util/configparser.y" /* yacc.c:1646  */
+  case 586:
+#line 3101 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6230 "util/configparser.c" /* yacc.c:1646  */
+#line 6324 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 577:
-#line 3059 "./util/configparser.y" /* yacc.c:1646  */
+  case 587:
+#line 3109 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6242,22 +6336,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6246 "util/configparser.c" /* yacc.c:1646  */
+#line 6340 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 578:
-#line 3072 "./util/configparser.y" /* yacc.c:1646  */
+  case 588:
+#line 3122 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6257 "util/configparser.c" /* yacc.c:1646  */
+#line 6351 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 579:
-#line 3080 "./util/configparser.y" /* yacc.c:1646  */
+  case 589:
+#line 3130 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6269,19 +6363,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6273 "util/configparser.c" /* yacc.c:1646  */
+#line 6367 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 580:
-#line 3093 "./util/configparser.y" /* yacc.c:1646  */
+  case 590:
+#line 3143 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6281 "util/configparser.c" /* yacc.c:1646  */
+#line 6375 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 589:
-#line 3104 "./util/configparser.y" /* yacc.c:1646  */
+  case 599:
+#line 3154 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6292,11 +6386,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6296 "util/configparser.c" /* yacc.c:1646  */
+#line 6390 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 590:
-#line 3116 "./util/configparser.y" /* yacc.c:1646  */
+  case 600:
+#line 3166 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6307,11 +6401,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6311 "util/configparser.c" /* yacc.c:1646  */
+#line 6405 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 591:
-#line 3128 "./util/configparser.y" /* yacc.c:1646  */
+  case 601:
+#line 3178 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6322,11 +6416,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6326 "util/configparser.c" /* yacc.c:1646  */
+#line 6420 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 592:
-#line 3140 "./util/configparser.y" /* yacc.c:1646  */
+  case 602:
+#line 3190 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6340,11 +6434,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6344 "util/configparser.c" /* yacc.c:1646  */
+#line 6438 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 593:
-#line 3155 "./util/configparser.y" /* yacc.c:1646  */
+  case 603:
+#line 3205 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6356,11 +6450,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6360 "util/configparser.c" /* yacc.c:1646  */
+#line 6454 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 594:
-#line 3168 "./util/configparser.y" /* yacc.c:1646  */
+  case 604:
+#line 3218 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6372,11 +6466,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6376 "util/configparser.c" /* yacc.c:1646  */
+#line 6470 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 595:
-#line 3181 "./util/configparser.y" /* yacc.c:1646  */
+  case 605:
+#line 3231 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6386,19 +6480,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6390 "util/configparser.c" /* yacc.c:1646  */
+#line 6484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 596:
-#line 3192 "./util/configparser.y" /* yacc.c:1646  */
+  case 606:
+#line 3242 "./util/configparser.y" /* yacc.c:1646  */
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6398 "util/configparser.c" /* yacc.c:1646  */
+#line 6492 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 601:
-#line 3201 "./util/configparser.y" /* yacc.c:1646  */
+  case 611:
+#line 3251 "./util/configparser.y" /* yacc.c:1646  */
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6412,11 +6506,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6416 "util/configparser.c" /* yacc.c:1646  */
+#line 6510 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 602:
-#line 3216 "./util/configparser.y" /* yacc.c:1646  */
+  case 612:
+#line 3266 "./util/configparser.y" /* yacc.c:1646  */
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6430,11 +6524,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6434 "util/configparser.c" /* yacc.c:1646  */
+#line 6528 "util/configparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 6438 "util/configparser.c" /* yacc.c:1646  */
+#line 6532 "util/configparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -6662,7 +6756,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3230 "./util/configparser.y" /* yacc.c:1906  */
+#line 3280 "./util/configparser.y" /* yacc.c:1906  */
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 9b2d0f424..cbfd68ca5 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -184,153 +184,158 @@ extern int yydebug;
     VAR_FORWARD_SSL_UPSTREAM = 394,
     VAR_TLS_CERT_BUNDLE = 395,
     VAR_HTTPS_PORT = 396,
-    VAR_STUB_FIRST = 397,
-    VAR_MINIMAL_RESPONSES = 398,
-    VAR_RRSET_ROUNDROBIN = 399,
-    VAR_MAX_UDP_SIZE = 400,
-    VAR_DELAY_CLOSE = 401,
-    VAR_UNBLOCK_LAN_ZONES = 402,
-    VAR_INSECURE_LAN_ZONES = 403,
-    VAR_INFRA_CACHE_MIN_RTT = 404,
-    VAR_DNS64_PREFIX = 405,
-    VAR_DNS64_SYNTHALL = 406,
-    VAR_DNS64_IGNORE_AAAA = 407,
-    VAR_DNSTAP = 408,
-    VAR_DNSTAP_ENABLE = 409,
-    VAR_DNSTAP_SOCKET_PATH = 410,
-    VAR_DNSTAP_IP = 411,
-    VAR_DNSTAP_TLS = 412,
-    VAR_DNSTAP_TLS_SERVER_NAME = 413,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 414,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 415,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 416,
-    VAR_DNSTAP_SEND_IDENTITY = 417,
-    VAR_DNSTAP_SEND_VERSION = 418,
-    VAR_DNSTAP_IDENTITY = 419,
-    VAR_DNSTAP_VERSION = 420,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 421,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 422,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 423,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 424,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 425,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 426,
-    VAR_RESPONSE_IP_TAG = 427,
-    VAR_RESPONSE_IP = 428,
-    VAR_RESPONSE_IP_DATA = 429,
-    VAR_HARDEN_ALGO_DOWNGRADE = 430,
-    VAR_IP_TRANSPARENT = 431,
-    VAR_IP_DSCP = 432,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 433,
-    VAR_IP_RATELIMIT = 434,
-    VAR_IP_RATELIMIT_SLABS = 435,
-    VAR_IP_RATELIMIT_SIZE = 436,
-    VAR_RATELIMIT = 437,
-    VAR_RATELIMIT_SLABS = 438,
-    VAR_RATELIMIT_SIZE = 439,
-    VAR_RATELIMIT_FOR_DOMAIN = 440,
-    VAR_RATELIMIT_BELOW_DOMAIN = 441,
-    VAR_IP_RATELIMIT_FACTOR = 442,
-    VAR_RATELIMIT_FACTOR = 443,
-    VAR_SEND_CLIENT_SUBNET = 444,
-    VAR_CLIENT_SUBNET_ZONE = 445,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 446,
-    VAR_CLIENT_SUBNET_OPCODE = 447,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 448,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 449,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 450,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 451,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 452,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 453,
-    VAR_CAPS_WHITELIST = 454,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 455,
-    VAR_PERMIT_SMALL_HOLDDOWN = 456,
-    VAR_QNAME_MINIMISATION = 457,
-    VAR_QNAME_MINIMISATION_STRICT = 458,
-    VAR_IP_FREEBIND = 459,
-    VAR_DEFINE_TAG = 460,
-    VAR_LOCAL_ZONE_TAG = 461,
-    VAR_ACCESS_CONTROL_TAG = 462,
-    VAR_LOCAL_ZONE_OVERRIDE = 463,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 464,
-    VAR_ACCESS_CONTROL_TAG_DATA = 465,
-    VAR_VIEW = 466,
-    VAR_ACCESS_CONTROL_VIEW = 467,
-    VAR_VIEW_FIRST = 468,
-    VAR_SERVE_EXPIRED = 469,
-    VAR_SERVE_EXPIRED_TTL = 470,
-    VAR_SERVE_EXPIRED_TTL_RESET = 471,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 472,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 473,
-    VAR_FAKE_DSA = 474,
-    VAR_FAKE_SHA1 = 475,
-    VAR_LOG_IDENTITY = 476,
-    VAR_HIDE_TRUSTANCHOR = 477,
-    VAR_TRUST_ANCHOR_SIGNALING = 478,
-    VAR_AGGRESSIVE_NSEC = 479,
-    VAR_USE_SYSTEMD = 480,
-    VAR_SHM_ENABLE = 481,
-    VAR_SHM_KEY = 482,
-    VAR_ROOT_KEY_SENTINEL = 483,
-    VAR_DNSCRYPT = 484,
-    VAR_DNSCRYPT_ENABLE = 485,
-    VAR_DNSCRYPT_PORT = 486,
-    VAR_DNSCRYPT_PROVIDER = 487,
-    VAR_DNSCRYPT_SECRET_KEY = 488,
-    VAR_DNSCRYPT_PROVIDER_CERT = 489,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 490,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 491,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 492,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 493,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 494,
-    VAR_IPSECMOD_ENABLED = 495,
-    VAR_IPSECMOD_HOOK = 496,
-    VAR_IPSECMOD_IGNORE_BOGUS = 497,
-    VAR_IPSECMOD_MAX_TTL = 498,
-    VAR_IPSECMOD_WHITELIST = 499,
-    VAR_IPSECMOD_STRICT = 500,
-    VAR_CACHEDB = 501,
-    VAR_CACHEDB_BACKEND = 502,
-    VAR_CACHEDB_SECRETSEED = 503,
-    VAR_CACHEDB_REDISHOST = 504,
-    VAR_CACHEDB_REDISPORT = 505,
-    VAR_CACHEDB_REDISTIMEOUT = 506,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 507,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 508,
-    VAR_FOR_UPSTREAM = 509,
-    VAR_AUTH_ZONE = 510,
-    VAR_ZONEFILE = 511,
-    VAR_MASTER = 512,
-    VAR_URL = 513,
-    VAR_FOR_DOWNSTREAM = 514,
-    VAR_FALLBACK_ENABLED = 515,
-    VAR_TLS_ADDITIONAL_PORT = 516,
-    VAR_LOW_RTT = 517,
-    VAR_LOW_RTT_PERMIL = 518,
-    VAR_FAST_SERVER_PERMIL = 519,
-    VAR_FAST_SERVER_NUM = 520,
-    VAR_ALLOW_NOTIFY = 521,
-    VAR_TLS_WIN_CERT = 522,
-    VAR_TCP_CONNECTION_LIMIT = 523,
-    VAR_FORWARD_NO_CACHE = 524,
-    VAR_STUB_NO_CACHE = 525,
-    VAR_LOG_SERVFAIL = 526,
-    VAR_DENY_ANY = 527,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 528,
-    VAR_LOG_TAG_QUERYREPLY = 529,
-    VAR_STREAM_WAIT_SIZE = 530,
-    VAR_TLS_CIPHERS = 531,
-    VAR_TLS_CIPHERSUITES = 532,
-    VAR_TLS_USE_SNI = 533,
-    VAR_IPSET = 534,
-    VAR_IPSET_NAME_V4 = 535,
-    VAR_IPSET_NAME_V6 = 536,
-    VAR_TLS_SESSION_TICKET_KEYS = 537,
-    VAR_RPZ = 538,
-    VAR_TAGS = 539,
-    VAR_RPZ_ACTION_OVERRIDE = 540,
-    VAR_RPZ_CNAME_OVERRIDE = 541,
-    VAR_RPZ_LOG = 542,
-    VAR_RPZ_LOG_NAME = 543
+    VAR_HTTP_ENDPOINT = 397,
+    VAR_HTTP_MAX_STREAMS = 398,
+    VAR_HTTP_QUERY_BUFFER_SIZE = 399,
+    VAR_HTTP_RESPONSE_BUFFER_SIZE = 400,
+    VAR_HTTP_NODELAY = 401,
+    VAR_STUB_FIRST = 402,
+    VAR_MINIMAL_RESPONSES = 403,
+    VAR_RRSET_ROUNDROBIN = 404,
+    VAR_MAX_UDP_SIZE = 405,
+    VAR_DELAY_CLOSE = 406,
+    VAR_UNBLOCK_LAN_ZONES = 407,
+    VAR_INSECURE_LAN_ZONES = 408,
+    VAR_INFRA_CACHE_MIN_RTT = 409,
+    VAR_DNS64_PREFIX = 410,
+    VAR_DNS64_SYNTHALL = 411,
+    VAR_DNS64_IGNORE_AAAA = 412,
+    VAR_DNSTAP = 413,
+    VAR_DNSTAP_ENABLE = 414,
+    VAR_DNSTAP_SOCKET_PATH = 415,
+    VAR_DNSTAP_IP = 416,
+    VAR_DNSTAP_TLS = 417,
+    VAR_DNSTAP_TLS_SERVER_NAME = 418,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 419,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 420,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 421,
+    VAR_DNSTAP_SEND_IDENTITY = 422,
+    VAR_DNSTAP_SEND_VERSION = 423,
+    VAR_DNSTAP_IDENTITY = 424,
+    VAR_DNSTAP_VERSION = 425,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 426,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 427,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 428,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 429,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 430,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 431,
+    VAR_RESPONSE_IP_TAG = 432,
+    VAR_RESPONSE_IP = 433,
+    VAR_RESPONSE_IP_DATA = 434,
+    VAR_HARDEN_ALGO_DOWNGRADE = 435,
+    VAR_IP_TRANSPARENT = 436,
+    VAR_IP_DSCP = 437,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 438,
+    VAR_IP_RATELIMIT = 439,
+    VAR_IP_RATELIMIT_SLABS = 440,
+    VAR_IP_RATELIMIT_SIZE = 441,
+    VAR_RATELIMIT = 442,
+    VAR_RATELIMIT_SLABS = 443,
+    VAR_RATELIMIT_SIZE = 444,
+    VAR_RATELIMIT_FOR_DOMAIN = 445,
+    VAR_RATELIMIT_BELOW_DOMAIN = 446,
+    VAR_IP_RATELIMIT_FACTOR = 447,
+    VAR_RATELIMIT_FACTOR = 448,
+    VAR_SEND_CLIENT_SUBNET = 449,
+    VAR_CLIENT_SUBNET_ZONE = 450,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 451,
+    VAR_CLIENT_SUBNET_OPCODE = 452,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 453,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 454,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 455,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 456,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 457,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 458,
+    VAR_CAPS_WHITELIST = 459,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 460,
+    VAR_PERMIT_SMALL_HOLDDOWN = 461,
+    VAR_QNAME_MINIMISATION = 462,
+    VAR_QNAME_MINIMISATION_STRICT = 463,
+    VAR_IP_FREEBIND = 464,
+    VAR_DEFINE_TAG = 465,
+    VAR_LOCAL_ZONE_TAG = 466,
+    VAR_ACCESS_CONTROL_TAG = 467,
+    VAR_LOCAL_ZONE_OVERRIDE = 468,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 469,
+    VAR_ACCESS_CONTROL_TAG_DATA = 470,
+    VAR_VIEW = 471,
+    VAR_ACCESS_CONTROL_VIEW = 472,
+    VAR_VIEW_FIRST = 473,
+    VAR_SERVE_EXPIRED = 474,
+    VAR_SERVE_EXPIRED_TTL = 475,
+    VAR_SERVE_EXPIRED_TTL_RESET = 476,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 477,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 478,
+    VAR_FAKE_DSA = 479,
+    VAR_FAKE_SHA1 = 480,
+    VAR_LOG_IDENTITY = 481,
+    VAR_HIDE_TRUSTANCHOR = 482,
+    VAR_TRUST_ANCHOR_SIGNALING = 483,
+    VAR_AGGRESSIVE_NSEC = 484,
+    VAR_USE_SYSTEMD = 485,
+    VAR_SHM_ENABLE = 486,
+    VAR_SHM_KEY = 487,
+    VAR_ROOT_KEY_SENTINEL = 488,
+    VAR_DNSCRYPT = 489,
+    VAR_DNSCRYPT_ENABLE = 490,
+    VAR_DNSCRYPT_PORT = 491,
+    VAR_DNSCRYPT_PROVIDER = 492,
+    VAR_DNSCRYPT_SECRET_KEY = 493,
+    VAR_DNSCRYPT_PROVIDER_CERT = 494,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 495,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 496,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 497,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 498,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 499,
+    VAR_IPSECMOD_ENABLED = 500,
+    VAR_IPSECMOD_HOOK = 501,
+    VAR_IPSECMOD_IGNORE_BOGUS = 502,
+    VAR_IPSECMOD_MAX_TTL = 503,
+    VAR_IPSECMOD_WHITELIST = 504,
+    VAR_IPSECMOD_STRICT = 505,
+    VAR_CACHEDB = 506,
+    VAR_CACHEDB_BACKEND = 507,
+    VAR_CACHEDB_SECRETSEED = 508,
+    VAR_CACHEDB_REDISHOST = 509,
+    VAR_CACHEDB_REDISPORT = 510,
+    VAR_CACHEDB_REDISTIMEOUT = 511,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 512,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 513,
+    VAR_FOR_UPSTREAM = 514,
+    VAR_AUTH_ZONE = 515,
+    VAR_ZONEFILE = 516,
+    VAR_MASTER = 517,
+    VAR_URL = 518,
+    VAR_FOR_DOWNSTREAM = 519,
+    VAR_FALLBACK_ENABLED = 520,
+    VAR_TLS_ADDITIONAL_PORT = 521,
+    VAR_LOW_RTT = 522,
+    VAR_LOW_RTT_PERMIL = 523,
+    VAR_FAST_SERVER_PERMIL = 524,
+    VAR_FAST_SERVER_NUM = 525,
+    VAR_ALLOW_NOTIFY = 526,
+    VAR_TLS_WIN_CERT = 527,
+    VAR_TCP_CONNECTION_LIMIT = 528,
+    VAR_FORWARD_NO_CACHE = 529,
+    VAR_STUB_NO_CACHE = 530,
+    VAR_LOG_SERVFAIL = 531,
+    VAR_DENY_ANY = 532,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 533,
+    VAR_LOG_TAG_QUERYREPLY = 534,
+    VAR_STREAM_WAIT_SIZE = 535,
+    VAR_TLS_CIPHERS = 536,
+    VAR_TLS_CIPHERSUITES = 537,
+    VAR_TLS_USE_SNI = 538,
+    VAR_IPSET = 539,
+    VAR_IPSET_NAME_V4 = 540,
+    VAR_IPSET_NAME_V6 = 541,
+    VAR_TLS_SESSION_TICKET_KEYS = 542,
+    VAR_RPZ = 543,
+    VAR_TAGS = 544,
+    VAR_RPZ_ACTION_OVERRIDE = 545,
+    VAR_RPZ_CNAME_OVERRIDE = 546,
+    VAR_RPZ_LOG = 547,
+    VAR_RPZ_LOG_NAME = 548
   };
 #endif
 /* Tokens.  */
@@ -473,153 +478,158 @@ extern int yydebug;
 #define VAR_FORWARD_SSL_UPSTREAM 394
 #define VAR_TLS_CERT_BUNDLE 395
 #define VAR_HTTPS_PORT 396
-#define VAR_STUB_FIRST 397
-#define VAR_MINIMAL_RESPONSES 398
-#define VAR_RRSET_ROUNDROBIN 399
-#define VAR_MAX_UDP_SIZE 400
-#define VAR_DELAY_CLOSE 401
-#define VAR_UNBLOCK_LAN_ZONES 402
-#define VAR_INSECURE_LAN_ZONES 403
-#define VAR_INFRA_CACHE_MIN_RTT 404
-#define VAR_DNS64_PREFIX 405
-#define VAR_DNS64_SYNTHALL 406
-#define VAR_DNS64_IGNORE_AAAA 407
-#define VAR_DNSTAP 408
-#define VAR_DNSTAP_ENABLE 409
-#define VAR_DNSTAP_SOCKET_PATH 410
-#define VAR_DNSTAP_IP 411
-#define VAR_DNSTAP_TLS 412
-#define VAR_DNSTAP_TLS_SERVER_NAME 413
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 414
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 415
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 416
-#define VAR_DNSTAP_SEND_IDENTITY 417
-#define VAR_DNSTAP_SEND_VERSION 418
-#define VAR_DNSTAP_IDENTITY 419
-#define VAR_DNSTAP_VERSION 420
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 421
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 422
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 423
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 424
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 425
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 426
-#define VAR_RESPONSE_IP_TAG 427
-#define VAR_RESPONSE_IP 428
-#define VAR_RESPONSE_IP_DATA 429
-#define VAR_HARDEN_ALGO_DOWNGRADE 430
-#define VAR_IP_TRANSPARENT 431
-#define VAR_IP_DSCP 432
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 433
-#define VAR_IP_RATELIMIT 434
-#define VAR_IP_RATELIMIT_SLABS 435
-#define VAR_IP_RATELIMIT_SIZE 436
-#define VAR_RATELIMIT 437
-#define VAR_RATELIMIT_SLABS 438
-#define VAR_RATELIMIT_SIZE 439
-#define VAR_RATELIMIT_FOR_DOMAIN 440
-#define VAR_RATELIMIT_BELOW_DOMAIN 441
-#define VAR_IP_RATELIMIT_FACTOR 442
-#define VAR_RATELIMIT_FACTOR 443
-#define VAR_SEND_CLIENT_SUBNET 444
-#define VAR_CLIENT_SUBNET_ZONE 445
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 446
-#define VAR_CLIENT_SUBNET_OPCODE 447
-#define VAR_MAX_CLIENT_SUBNET_IPV4 448
-#define VAR_MAX_CLIENT_SUBNET_IPV6 449
-#define VAR_MIN_CLIENT_SUBNET_IPV4 450
-#define VAR_MIN_CLIENT_SUBNET_IPV6 451
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 452
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 453
-#define VAR_CAPS_WHITELIST 454
-#define VAR_CACHE_MAX_NEGATIVE_TTL 455
-#define VAR_PERMIT_SMALL_HOLDDOWN 456
-#define VAR_QNAME_MINIMISATION 457
-#define VAR_QNAME_MINIMISATION_STRICT 458
-#define VAR_IP_FREEBIND 459
-#define VAR_DEFINE_TAG 460
-#define VAR_LOCAL_ZONE_TAG 461
-#define VAR_ACCESS_CONTROL_TAG 462
-#define VAR_LOCAL_ZONE_OVERRIDE 463
-#define VAR_ACCESS_CONTROL_TAG_ACTION 464
-#define VAR_ACCESS_CONTROL_TAG_DATA 465
-#define VAR_VIEW 466
-#define VAR_ACCESS_CONTROL_VIEW 467
-#define VAR_VIEW_FIRST 468
-#define VAR_SERVE_EXPIRED 469
-#define VAR_SERVE_EXPIRED_TTL 470
-#define VAR_SERVE_EXPIRED_TTL_RESET 471
-#define VAR_SERVE_EXPIRED_REPLY_TTL 472
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 473
-#define VAR_FAKE_DSA 474
-#define VAR_FAKE_SHA1 475
-#define VAR_LOG_IDENTITY 476
-#define VAR_HIDE_TRUSTANCHOR 477
-#define VAR_TRUST_ANCHOR_SIGNALING 478
-#define VAR_AGGRESSIVE_NSEC 479
-#define VAR_USE_SYSTEMD 480
-#define VAR_SHM_ENABLE 481
-#define VAR_SHM_KEY 482
-#define VAR_ROOT_KEY_SENTINEL 483
-#define VAR_DNSCRYPT 484
-#define VAR_DNSCRYPT_ENABLE 485
-#define VAR_DNSCRYPT_PORT 486
-#define VAR_DNSCRYPT_PROVIDER 487
-#define VAR_DNSCRYPT_SECRET_KEY 488
-#define VAR_DNSCRYPT_PROVIDER_CERT 489
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 490
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 491
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 492
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 493
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 494
-#define VAR_IPSECMOD_ENABLED 495
-#define VAR_IPSECMOD_HOOK 496
-#define VAR_IPSECMOD_IGNORE_BOGUS 497
-#define VAR_IPSECMOD_MAX_TTL 498
-#define VAR_IPSECMOD_WHITELIST 499
-#define VAR_IPSECMOD_STRICT 500
-#define VAR_CACHEDB 501
-#define VAR_CACHEDB_BACKEND 502
-#define VAR_CACHEDB_SECRETSEED 503
-#define VAR_CACHEDB_REDISHOST 504
-#define VAR_CACHEDB_REDISPORT 505
-#define VAR_CACHEDB_REDISTIMEOUT 506
-#define VAR_CACHEDB_REDISEXPIRERECORDS 507
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 508
-#define VAR_FOR_UPSTREAM 509
-#define VAR_AUTH_ZONE 510
-#define VAR_ZONEFILE 511
-#define VAR_MASTER 512
-#define VAR_URL 513
-#define VAR_FOR_DOWNSTREAM 514
-#define VAR_FALLBACK_ENABLED 515
-#define VAR_TLS_ADDITIONAL_PORT 516
-#define VAR_LOW_RTT 517
-#define VAR_LOW_RTT_PERMIL 518
-#define VAR_FAST_SERVER_PERMIL 519
-#define VAR_FAST_SERVER_NUM 520
-#define VAR_ALLOW_NOTIFY 521
-#define VAR_TLS_WIN_CERT 522
-#define VAR_TCP_CONNECTION_LIMIT 523
-#define VAR_FORWARD_NO_CACHE 524
-#define VAR_STUB_NO_CACHE 525
-#define VAR_LOG_SERVFAIL 526
-#define VAR_DENY_ANY 527
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 528
-#define VAR_LOG_TAG_QUERYREPLY 529
-#define VAR_STREAM_WAIT_SIZE 530
-#define VAR_TLS_CIPHERS 531
-#define VAR_TLS_CIPHERSUITES 532
-#define VAR_TLS_USE_SNI 533
-#define VAR_IPSET 534
-#define VAR_IPSET_NAME_V4 535
-#define VAR_IPSET_NAME_V6 536
-#define VAR_TLS_SESSION_TICKET_KEYS 537
-#define VAR_RPZ 538
-#define VAR_TAGS 539
-#define VAR_RPZ_ACTION_OVERRIDE 540
-#define VAR_RPZ_CNAME_OVERRIDE 541
-#define VAR_RPZ_LOG 542
-#define VAR_RPZ_LOG_NAME 543
+#define VAR_HTTP_ENDPOINT 397
+#define VAR_HTTP_MAX_STREAMS 398
+#define VAR_HTTP_QUERY_BUFFER_SIZE 399
+#define VAR_HTTP_RESPONSE_BUFFER_SIZE 400
+#define VAR_HTTP_NODELAY 401
+#define VAR_STUB_FIRST 402
+#define VAR_MINIMAL_RESPONSES 403
+#define VAR_RRSET_ROUNDROBIN 404
+#define VAR_MAX_UDP_SIZE 405
+#define VAR_DELAY_CLOSE 406
+#define VAR_UNBLOCK_LAN_ZONES 407
+#define VAR_INSECURE_LAN_ZONES 408
+#define VAR_INFRA_CACHE_MIN_RTT 409
+#define VAR_DNS64_PREFIX 410
+#define VAR_DNS64_SYNTHALL 411
+#define VAR_DNS64_IGNORE_AAAA 412
+#define VAR_DNSTAP 413
+#define VAR_DNSTAP_ENABLE 414
+#define VAR_DNSTAP_SOCKET_PATH 415
+#define VAR_DNSTAP_IP 416
+#define VAR_DNSTAP_TLS 417
+#define VAR_DNSTAP_TLS_SERVER_NAME 418
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 419
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 420
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 421
+#define VAR_DNSTAP_SEND_IDENTITY 422
+#define VAR_DNSTAP_SEND_VERSION 423
+#define VAR_DNSTAP_IDENTITY 424
+#define VAR_DNSTAP_VERSION 425
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 426
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 427
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 428
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 429
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 430
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 431
+#define VAR_RESPONSE_IP_TAG 432
+#define VAR_RESPONSE_IP 433
+#define VAR_RESPONSE_IP_DATA 434
+#define VAR_HARDEN_ALGO_DOWNGRADE 435
+#define VAR_IP_TRANSPARENT 436
+#define VAR_IP_DSCP 437
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 438
+#define VAR_IP_RATELIMIT 439
+#define VAR_IP_RATELIMIT_SLABS 440
+#define VAR_IP_RATELIMIT_SIZE 441
+#define VAR_RATELIMIT 442
+#define VAR_RATELIMIT_SLABS 443
+#define VAR_RATELIMIT_SIZE 444
+#define VAR_RATELIMIT_FOR_DOMAIN 445
+#define VAR_RATELIMIT_BELOW_DOMAIN 446
+#define VAR_IP_RATELIMIT_FACTOR 447
+#define VAR_RATELIMIT_FACTOR 448
+#define VAR_SEND_CLIENT_SUBNET 449
+#define VAR_CLIENT_SUBNET_ZONE 450
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 451
+#define VAR_CLIENT_SUBNET_OPCODE 452
+#define VAR_MAX_CLIENT_SUBNET_IPV4 453
+#define VAR_MAX_CLIENT_SUBNET_IPV6 454
+#define VAR_MIN_CLIENT_SUBNET_IPV4 455
+#define VAR_MIN_CLIENT_SUBNET_IPV6 456
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 457
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 458
+#define VAR_CAPS_WHITELIST 459
+#define VAR_CACHE_MAX_NEGATIVE_TTL 460
+#define VAR_PERMIT_SMALL_HOLDDOWN 461
+#define VAR_QNAME_MINIMISATION 462
+#define VAR_QNAME_MINIMISATION_STRICT 463
+#define VAR_IP_FREEBIND 464
+#define VAR_DEFINE_TAG 465
+#define VAR_LOCAL_ZONE_TAG 466
+#define VAR_ACCESS_CONTROL_TAG 467
+#define VAR_LOCAL_ZONE_OVERRIDE 468
+#define VAR_ACCESS_CONTROL_TAG_ACTION 469
+#define VAR_ACCESS_CONTROL_TAG_DATA 470
+#define VAR_VIEW 471
+#define VAR_ACCESS_CONTROL_VIEW 472
+#define VAR_VIEW_FIRST 473
+#define VAR_SERVE_EXPIRED 474
+#define VAR_SERVE_EXPIRED_TTL 475
+#define VAR_SERVE_EXPIRED_TTL_RESET 476
+#define VAR_SERVE_EXPIRED_REPLY_TTL 477
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 478
+#define VAR_FAKE_DSA 479
+#define VAR_FAKE_SHA1 480
+#define VAR_LOG_IDENTITY 481
+#define VAR_HIDE_TRUSTANCHOR 482
+#define VAR_TRUST_ANCHOR_SIGNALING 483
+#define VAR_AGGRESSIVE_NSEC 484
+#define VAR_USE_SYSTEMD 485
+#define VAR_SHM_ENABLE 486
+#define VAR_SHM_KEY 487
+#define VAR_ROOT_KEY_SENTINEL 488
+#define VAR_DNSCRYPT 489
+#define VAR_DNSCRYPT_ENABLE 490
+#define VAR_DNSCRYPT_PORT 491
+#define VAR_DNSCRYPT_PROVIDER 492
+#define VAR_DNSCRYPT_SECRET_KEY 493
+#define VAR_DNSCRYPT_PROVIDER_CERT 494
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 495
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 496
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 497
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 498
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 499
+#define VAR_IPSECMOD_ENABLED 500
+#define VAR_IPSECMOD_HOOK 501
+#define VAR_IPSECMOD_IGNORE_BOGUS 502
+#define VAR_IPSECMOD_MAX_TTL 503
+#define VAR_IPSECMOD_WHITELIST 504
+#define VAR_IPSECMOD_STRICT 505
+#define VAR_CACHEDB 506
+#define VAR_CACHEDB_BACKEND 507
+#define VAR_CACHEDB_SECRETSEED 508
+#define VAR_CACHEDB_REDISHOST 509
+#define VAR_CACHEDB_REDISPORT 510
+#define VAR_CACHEDB_REDISTIMEOUT 511
+#define VAR_CACHEDB_REDISEXPIRERECORDS 512
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 513
+#define VAR_FOR_UPSTREAM 514
+#define VAR_AUTH_ZONE 515
+#define VAR_ZONEFILE 516
+#define VAR_MASTER 517
+#define VAR_URL 518
+#define VAR_FOR_DOWNSTREAM 519
+#define VAR_FALLBACK_ENABLED 520
+#define VAR_TLS_ADDITIONAL_PORT 521
+#define VAR_LOW_RTT 522
+#define VAR_LOW_RTT_PERMIL 523
+#define VAR_FAST_SERVER_PERMIL 524
+#define VAR_FAST_SERVER_NUM 525
+#define VAR_ALLOW_NOTIFY 526
+#define VAR_TLS_WIN_CERT 527
+#define VAR_TCP_CONNECTION_LIMIT 528
+#define VAR_FORWARD_NO_CACHE 529
+#define VAR_STUB_NO_CACHE 530
+#define VAR_LOG_SERVFAIL 531
+#define VAR_DENY_ANY 532
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 533
+#define VAR_LOG_TAG_QUERYREPLY 534
+#define VAR_STREAM_WAIT_SIZE 535
+#define VAR_TLS_CIPHERS 536
+#define VAR_TLS_CIPHERSUITES 537
+#define VAR_TLS_USE_SNI 538
+#define VAR_IPSET 539
+#define VAR_IPSET_NAME_V4 540
+#define VAR_IPSET_NAME_V6 541
+#define VAR_TLS_SESSION_TICKET_KEYS 542
+#define VAR_RPZ 543
+#define VAR_TAGS 544
+#define VAR_RPZ_ACTION_OVERRIDE 545
+#define VAR_RPZ_CNAME_OVERRIDE 546
+#define VAR_RPZ_LOG 547
+#define VAR_RPZ_LOG_NAME 548
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -630,7 +640,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 634 "util/configparser.h" /* yacc.c:1909  */
+#line 644 "util/configparser.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 67281d3d3..a00584dcd 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -111,7 +111,9 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM
 %token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST
 %token VAR_STUB_SSL_UPSTREAM VAR_FORWARD_SSL_UPSTREAM VAR_TLS_CERT_BUNDLE
-%token VAR_HTTPS_PORT
+%token VAR_HTTPS_PORT VAR_HTTP_ENDPOINT VAR_HTTP_MAX_STREAMS
+%token VAR_HTTP_QUERY_BUFFER_SIZE VAR_HTTP_RESPONSE_BUFFER_SIZE
+%token VAR_HTTP_NODELAY
 %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN
 %token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE
 %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES
@@ -238,7 +240,9 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_log_queries | server_log_replies | server_tcp_upstream | server_ssl_upstream |
 	server_log_local_actions |
 	server_ssl_service_key | server_ssl_service_pem | server_ssl_port |
-	server_https_port |
+	server_https_port | server_http_endpoint | server_http_max_streams |
+	server_http_query_buffer_size | server_http_response_buffer_size |
+	server_http_nodelay |
 	server_minimal_responses | server_rrset_roundrobin | server_max_udp_size |
 	server_so_reuseport | server_delay_close |
 	server_unblock_lan_zones | server_insecure_lan_zones |
@@ -955,13 +959,6 @@ server_tls_session_ticket_keys: VAR_TLS_SESSION_TICKET_KEYS STRING_ARG
 			yyerror("out of memory");
 	}
 	;
-server_https_port: VAR_HTTPS_PORT STRING_ARG
-	{
-		OUTYY(("P(server_https_port:%s)\n", $2));
-		if(atoi($2) == 0)
-			yyerror("port number expected");
-		else cfg_parser->cfg->https_port = atoi($2);
-	};
 server_tls_use_sni: VAR_TLS_USE_SNI STRING_ARG
 	{
 		OUTYY(("P(server_tls_use_sni:%s)\n", $2));
@@ -971,6 +968,59 @@ server_tls_use_sni: VAR_TLS_USE_SNI STRING_ARG
 		free($2);
 	}
 	;
+server_https_port: VAR_HTTPS_PORT STRING_ARG
+	{
+		OUTYY(("P(server_https_port:%s)\n", $2));
+		if(atoi($2) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->https_port = atoi($2);
+	};
+server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG
+	{
+		OUTYY(("P(server_http_endpoint:%s)\n", $2));
+		free(cfg_parser->cfg->http_endpoint);
+		if($2 && $2[0] != '/') {
+			cfg_parser->cfg->http_endpoint = malloc(strlen($2)+2);
+			cfg_parser->cfg->http_endpoint[0] = '/';
+			memcpy(cfg_parser->cfg->http_endpoint+1, $2,
+				strlen($2)+1);
+			free($2);
+		} else {
+			cfg_parser->cfg->http_endpoint = $2;
+		}
+	};
+server_http_max_streams: VAR_HTTP_MAX_STREAMS STRING_ARG
+	{
+		OUTYY(("P(server_http_max_streams:%s)\n", $2));
+		if(atoi($2) == 0 && strcmp($2, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->http_max_streams = atoi($2);
+		free($2);
+	};
+server_http_query_buffer_size: VAR_HTTP_QUERY_BUFFER_SIZE STRING_ARG
+	{
+		OUTYY(("P(server_http_query_buffer_size:%s)\n", $2));
+		if(!cfg_parse_memsize($2,
+			&cfg_parser->cfg->http_query_buffer_size))
+			yyerror("memory size expected");
+		free($2);
+	};
+server_http_response_buffer_size: VAR_HTTP_RESPONSE_BUFFER_SIZE STRING_ARG
+	{
+		OUTYY(("P(server_http_response_buffer_size:%s)\n", $2));
+		if(!cfg_parse_memsize($2,
+			&cfg_parser->cfg->http_response_buffer_size))
+			yyerror("memory size expected");
+		free($2);
+	};
+server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG
+	{
+		OUTYY(("P(server_http_nodelay:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->http_nodelay = (strcmp($2, "yes")==0);
+		free($2);
+	};
 server_use_systemd: VAR_USE_SYSTEMD STRING_ARG
 	{
 		OUTYY(("P(server_use_systemd:%s)\n", $2));
diff --git a/util/netevent.c b/util/netevent.c
index 5bd74e172..749781934 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -929,7 +929,8 @@ static int http2_submit_settings(struct http2_session* h2_session)
 {
 	int ret;
 	nghttp2_settings_entry settings[1] = {
-		{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
+		{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
+		 h2_session->c->http2_max_streams}};
 
 	ret = nghttp2_submit_settings(h2_session->session, NGHTTP2_FLAG_NONE,
 		settings, 1);
@@ -965,27 +966,27 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
 	 * correct event base for the event structure for libevent */
 	ub_event_free(c_hdl->ev->ev);
 
+	if(c_hdl->type == comm_http) {
 #ifdef HAVE_NGHTTP2
-	if(c_hdl->type == comm_http && c_hdl->h2_session) {
-		if(!http2_session_server_create(c_hdl->h2_session)) {
+		if(!c_hdl->h2_session ||
+			!http2_session_server_create(c_hdl->h2_session)) {
 			log_warn("failed to create nghttp2");
 			return;
 		}
-		if(!http2_submit_settings(c_hdl->h2_session)) {
+		if(!c_hdl->h2_session ||
+			!http2_submit_settings(c_hdl->h2_session)) {
 			log_warn("failed to submit http2 settings");
 			return;
 		}
+#endif
 		c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1,
 			UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT,
 			comm_point_http_handle_callback, c_hdl);
 	} else {
-#endif
 		c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1,
 			UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT,
 			comm_point_tcp_handle_callback, c_hdl);
-#ifdef HAVE_NGHTTP2
 	}
-#endif
 	if(!c_hdl->ev->ev) {
 		log_warn("could not ub_event_new, dropped tcp");
 		return;
@@ -2295,10 +2296,7 @@ void http2_stream_delete(struct http2_session* h2_session,
 		mesh_state_remove_reply(h2_stream->mesh, h2_stream->mesh_state,
 			h2_session->c);
 	}
-	if(h2_stream->qbuffer)
-		sldns_buffer_free(h2_stream->qbuffer);
-	if(h2_stream->rbuffer)
-		sldns_buffer_free(h2_stream->rbuffer);
+	http2_req_stream_clear(h2_stream);
 	free(h2_stream);
 }
 #endif
@@ -3091,6 +3089,7 @@ comm_point_create_tcp_handler(struct comm_base *base,
 static struct comm_point* 
 comm_point_create_http_handler(struct comm_base *base, 
 	struct comm_point* parent, size_t bufsize, int harden_large_queries,
+	uint32_t http_max_streams, char* http_endpoint,
 	comm_point_callback_type* callback, void* callback_arg)
 {
 	struct comm_point* c = (struct comm_point*)calloc(1,
@@ -3147,9 +3146,11 @@ comm_point_create_http_handler(struct comm_base *base,
 	c->cb_arg = callback_arg;
 
 	c->http_min_version = http_version_2;
-	c->http2_max_qbuffer_size = bufsize;
+	c->http2_stream_max_qbuffer_size = bufsize;
 	if(harden_large_queries && bufsize > 512)
-		c->http2_max_qbuffer_size = 512;
+		c->http2_stream_max_qbuffer_size = 512;
+	c->http2_max_streams = http_max_streams;
+	c->http_endpoint = strdup(http_endpoint);
 	c->alpn_h2 = 0;
 #ifdef HAVE_NGHTTP2
 	if(!(c->h2_session = http2_session_create(c))) {
@@ -3195,6 +3196,7 @@ comm_point_create_http_handler(struct comm_base *base,
 struct comm_point* 
 comm_point_create_tcp(struct comm_base *base, int fd, int num,
 	int idle_timeout, int harden_large_queries,
+	uint32_t http_max_streams, char* http_endpoint,
 	struct tcl_list* tcp_conn_limit, size_t bufsize,
 	struct sldns_buffer* spoolbuf, enum listen_type port_type,
 	comm_point_callback_type* callback, void* callback_arg)
@@ -3271,6 +3273,7 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num,
 		} else if(port_type == listen_type_http) {
 			c->tcp_handlers[i] = comm_point_create_http_handler(
 				base, c, bufsize, harden_large_queries,
+				http_max_streams, http_endpoint,
 				callback, callback_arg);
 		}
 		else {
@@ -3592,6 +3595,10 @@ comm_point_delete(struct comm_point* c)
 		SSL_free(c->ssl);
 #endif
 	}
+	if(c->type == comm_http && c->http_endpoint) {
+		free(c->http_endpoint);
+		c->http_endpoint = NULL;
+	}
 	comm_point_close(c);
 	if(c->tcp_handlers) {
 		int i;
diff --git a/util/netevent.h b/util/netevent.h
index 8664a61b6..68f4c1297 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -219,6 +219,8 @@ struct comm_point {
 		http_version_none = 0,
 		http_version_2 = 2
 	} http_min_version;
+	/** http endpoint */
+	char* http_endpoint;
 	/* -------- HTTP/1.1 ------- */
 	/** Currently reading in http headers */
 	int http_in_headers;
@@ -236,10 +238,13 @@ struct comm_point {
 	struct http2_session* h2_session;
 	/** set to 1 if h2 is negatiated using alpn */
 	int alpn_h2;
-	/** maximum allowed query buffer size */
-	size_t http2_max_qbuffer_size;
 	/** stream currently being handled */
 	struct http2_stream* h2_stream;
+	/** maximum allowed query buffer size, per stream */
+	size_t http2_stream_max_qbuffer_size;
+	/** maximum number of HTTP/2 streams per connection. Send in HTTP/2
+	 * SETTINGS frame. */
+	uint32_t http2_max_streams;
 
 	/* -------- dnstap ------- */
 	/** the dnstap environment */
@@ -481,6 +486,8 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base,
  *	many tcp handler commpoints.
  * @param idle_timeout: TCP idle timeout in ms.
  * @param harden_large_queries: whether query size should be limited.
+ * @param http_max_streams: maximum number of HTTP/2 streams per connection.
+ * @param http_endpoint: HTTP endpoint to service queries on
  * @param tcp_conn_limit: TCP connection limit info.
  * @param bufsize: size of buffer to create for handlers.
  * @param spoolbuf: shared spool buffer for tcp_req_info structures.
@@ -496,6 +503,7 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base,
  */
 struct comm_point* comm_point_create_tcp(struct comm_base* base,
 	int fd, int num, int idle_timeout, int harden_large_queries,
+	uint32_t http_max_streams, char* http_endpoint,
 	struct tcl_list* tcp_conn_limit,
 	size_t bufsize, struct sldns_buffer* spoolbuf,
 	enum listen_type port_type,

From 4fc7b434d7a00e2d30fd21597a616e2b44ed46e4 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 13 May 2020 13:05:40 +0200
Subject: [PATCH 005/108] - Document new DoH configuration options.

---
 doc/example.conf.in   | 16 ++++++++++++++++
 doc/unbound.conf.5.in | 33 +++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/doc/example.conf.in b/doc/example.conf.in
index f7c6364a0..a7c261723 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -773,6 +773,22 @@ server:
 	# Also serve tls on these port numbers (eg. 443, ...), by listing
 	# tls-additional-port: portno for each of the port numbers.
 
+	# HTTP endpoint to provide DNS-over-HTTPS service on.
+	# http-endpoint: "/dns-query"
+
+	# HTTP/2 SETTINGS_MAX_CONCURRENT_STREAMS value to use.
+	# http-max-streams: 100
+
+	# Maximum number of bytes used for all HTTP/2 query buffers.
+	# http-query-buffer-size: 4m
+
+	# Maximum number of bytes used for all HTTP/2 response buffers.
+	# http-response-buffer-size: 4m
+
+	# Set TCP_NODELAY socket option on sockets used for DNS-over-HTTPS
+	# service.
+	# http-nodelay: yes
+
 	# DNS64 prefix. Must be specified when DNS64 is use.
 	# Enable dns64 in module-config.  Used to synthesize IPv6 from IPv4.
 	# dns64-prefix: 64:ff9b::0/96
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 7ee52e7f5..55a0dbae9 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -503,10 +503,6 @@ Alternate syntax for \fBtls\-service\-pem\fR.
 The port number on which to provide TCP TLS service, default 853, only
 interfaces configured with that port number as @number get the TLS service.
 .TP
-.B https\-port: \fI<number>
-The port number on which to provide DNS-over-HTTPS service, default 443, only
-interfaces configured with that port number as @number get the HTTPS service.
-.TP
 .B ssl\-port: \fI<number>
 Alternate syntax for \fBtls\-port\fR.
 .TP
@@ -556,6 +552,35 @@ Enable or disable sending the SNI extension on TLS connections.
 Default is yes.
 Changing the value requires a reload.
 .TP
+.B https\-port: \fI<number>
+The port number on which to provide DNS-over-HTTPS service, default 443, only
+interfaces configured with that port number as @number get the HTTPS service.
+.TP
+.B http\-endpoint: \fI<endpoint string>
+The HTTP endpoint to provide DNS-over-HTTPS service on. Default "/dns-query".
+.TP
+.B http\-max\-streams: \fI<number of streams>
+Number used in the SETTINGS_MAX_CONCURRENT_STREAMS parameter in the HTTP/2
+SETTINGS frame for DNS-over-HTTPS connections. Default 100.
+.TP
+.B http\-query\-buffer\-size: \fI<size in bytes>
+Maximum number of bytes used for all HTTP/2 query buffers combined. These
+buffers contain (partial) DNS queries waiting for request stream completion.
+An RST_STREAM frame will be send to streams exceeding this limit. Default is 4
+megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes,
+megabytes or gigabytes (1024*1024 bytes in a megabyte).
+.TP
+.B http\-response\-buffer\-size: \fI<size in bytes>
+Maximum number of bytes used for all HTTP/2 response buffers combined. These
+buffers contain DNS responses waiting to be written back to the clients.
+An RST_STREAM frame will be send to streams exceeding this limit. Default is 4
+megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes,
+megabytes or gigabytes (1024*1024 bytes in a megabyte).
+.TP
+.B http\-nodelay: \fI<yes or no>
+Set TCP_NODELAY socket option on sockets used to provide DNS-over-HTTPS service.
+Ignored if the option is not available. Default is yes.
+.TP
 .B use\-systemd: \fI<yes or no>
 Enable or disable systemd socket activation.
 Default is no.

From 605e6c9bdae999f9b5eacae1315ed14262cae71b Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Fri, 15 May 2020 09:52:15 +0200
Subject: [PATCH 006/108] add dohclient to makefile

---
 Makefile.in | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f2b9ac76d..61d3b2366 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,6 +224,10 @@ STREAMTCP_SRC=testcode/streamtcp.c
 STREAMTCP_OBJ=streamtcp.lo
 STREAMTCP_OBJ_LINK=$(STREAMTCP_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \
 $(SLDNS_OBJ)
+DOHCLIENT_SRC=testcode/dohclient.c
+DOHCLIENT_OBJ=dohclient.lo
+DOHCLIENT_OBJ_LINK=$(DOHCLIENT_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \
+$(SLDNS_OBJ)
 PERF_SRC=testcode/perf.c
 PERF_OBJ=perf.lo
 PERF_OBJ_LINK=$(PERF_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) $(SLDNS_OBJ)
@@ -265,7 +269,8 @@ ALL_SRC=$(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \
 	$(ASYNCLOOK_SRC) $(STREAMTCP_SRC) $(PERF_SRC) $(DELAYER_SRC) \
 	$(CONTROL_SRC) $(UBANCHOR_SRC) $(PETAL_SRC) $(DNSTAP_SOCKET_SRC)\
 	$(PYTHONMOD_SRC) $(PYUNBOUND_SRC) $(WIN_DAEMON_THE_SRC) \
-	$(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC)
+	$(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC) \
+	$(DOHCLIENT_SRC)
 
 ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \
 	$(TESTBOUND_OBJ) $(LOCKVERIFY_OBJ) $(PKTVIEW_OBJ) \
@@ -273,7 +278,8 @@ ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \
 	$(ASYNCLOOK_OBJ) $(STREAMTCP_OBJ) $(PERF_OBJ) $(DELAYER_OBJ) \
 	$(CONTROL_OBJ) $(UBANCHOR_OBJ) $(PETAL_OBJ) $(DNSTAP_SOCKET_OBJ)\
 	$(COMPAT_OBJ) $(PYUNBOUND_OBJ) \
-	$(SVCINST_OBJ) $(SVCUNINST_OBJ) $(ANCHORUPD_OBJ) $(SLDNS_OBJ)
+	$(SVCINST_OBJ) $(SVCUNINST_OBJ) $(ANCHORUPD_OBJ) $(SLDNS_OBJ) \
+	$(DOHCLIENT_OBJ)
 
 COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@
 LINK=$(LIBTOOL) --tag=CC --mode=link $(CC) $(staticexe) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
@@ -310,7 +316,7 @@ rsrc_unbound_checkconf.o:	$(srcdir)/winrc/rsrc_unbound_checkconf.rc config.h
 TEST_BIN=asynclook$(EXEEXT) delayer$(EXEEXT) \
 	lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \
 	petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \
-	unbound-dnstap-socket$(EXEEXT) \
+	unbound-dnstap-socket$(EXEEXT) dohclient$(EXEEXT) \
 	testbound$(EXEEXT) unittest$(EXEEXT)
 tests:	all $(TEST_BIN)
 
@@ -380,6 +386,9 @@ asynclook$(EXEEXT):	$(ASYNCLOOK_OBJ_LINK) libunbound.la
 streamtcp$(EXEEXT):	$(STREAMTCP_OBJ_LINK)
 	$(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS)
 
+dohclient$(EXEEXT):	$(DOHCLIENT_OBJ_LINK)
+	$(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS)
+
 perf$(EXEEXT):	$(PERF_OBJ_LINK)
 	$(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS)
 
@@ -1515,6 +1524,10 @@ parseutil.lo parseutil.o: $(srcdir)/sldns/parseutil.c config.h $(srcdir)/sldns/p
 rrdef.lo rrdef.o: $(srcdir)/sldns/rrdef.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h
 str2wire.lo str2wire.o: $(srcdir)/sldns/str2wire.c config.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h \
  $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h
+dohclient.lo dohclient.o: $(srcdir)/testcode/dohclient.c config.h $(srcdir)/sldns/wire2str.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgencode.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/net_help.h
 ctime_r.lo ctime_r.o: $(srcdir)/compat/ctime_r.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
 fake-rfc2553.lo fake-rfc2553.o: $(srcdir)/compat/fake-rfc2553.c $(srcdir)/compat/fake-rfc2553.h config.h
 gmtime_r.lo gmtime_r.o: $(srcdir)/compat/gmtime_r.c config.h

From 0fbfce4c9916630a0abcbcb87e51a326fd63c2d9 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 14:04:34 +0200
Subject: [PATCH 007/108] - Add DoH tests

---
 services/mesh.c                               |   4 +
 sldns/parseutil.c                             |  49 ++-
 sldns/parseutil.h                             |   2 +
 .../doh_downstream.tdir/doh_downstream.conf   |  27 ++
 .../doh_downstream.tdir/doh_downstream.dsc    |  16 +
 .../doh_downstream.tdir/doh_downstream.post   |  11 +
 .../doh_downstream.tdir/doh_downstream.pre    |  31 ++
 .../doh_downstream.tdir/doh_downstream.test   | 343 ++++++++++++++++++
 .../doh_downstream.tdir/doh_downstream.testns |  74 ++++
 .../doh_downstream.tdir/unbound_server.key    |  15 +
 .../doh_downstream.tdir/unbound_server.pem    |  11 +
 .../doh_downstream_post.conf                  |  27 ++
 .../doh_downstream_post.dsc                   |  16 +
 .../doh_downstream_post.post                  |  11 +
 .../doh_downstream_post.pre                   |  30 ++
 .../doh_downstream_post.test                  | 343 ++++++++++++++++++
 .../doh_downstream_post.testns                |  74 ++++
 .../unbound_server.key                        |  15 +
 .../unbound_server.pem                        |  11 +
 util/netevent.c                               |   6 +-
 20 files changed, 1103 insertions(+), 13 deletions(-)
 create mode 100644 testdata/doh_downstream.tdir/doh_downstream.conf
 create mode 100644 testdata/doh_downstream.tdir/doh_downstream.dsc
 create mode 100644 testdata/doh_downstream.tdir/doh_downstream.post
 create mode 100644 testdata/doh_downstream.tdir/doh_downstream.pre
 create mode 100644 testdata/doh_downstream.tdir/doh_downstream.test
 create mode 100644 testdata/doh_downstream.tdir/doh_downstream.testns
 create mode 100644 testdata/doh_downstream.tdir/unbound_server.key
 create mode 100644 testdata/doh_downstream.tdir/unbound_server.pem
 create mode 100644 testdata/doh_downstream_post.tdir/doh_downstream_post.conf
 create mode 100644 testdata/doh_downstream_post.tdir/doh_downstream_post.dsc
 create mode 100644 testdata/doh_downstream_post.tdir/doh_downstream_post.post
 create mode 100644 testdata/doh_downstream_post.tdir/doh_downstream_post.pre
 create mode 100644 testdata/doh_downstream_post.tdir/doh_downstream_post.test
 create mode 100644 testdata/doh_downstream_post.tdir/doh_downstream_post.testns
 create mode 100644 testdata/doh_downstream_post.tdir/unbound_server.key
 create mode 100644 testdata/doh_downstream_post.tdir/unbound_server.pem

diff --git a/services/mesh.c b/services/mesh.c
index 225449fb9..c2afdbf82 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1212,6 +1212,10 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		rcode = LDNS_RCODE_SERVFAIL;
 	if(r->query_reply.c->alpn_h2) {
 		r->query_reply.c->h2_stream = r->h2_stream;
+		/* Mesh reply won't exist for long anymore. Make it impossible
+		 * for HTTP/2 stream to refer to mesh state, in case
+		 * connection gets cleanup before HTTP/2 stream close. */
+		r->h2_stream->mesh_state = NULL;
 	}
 	/* send the reply */
 	/* We don't reuse the encoded answer if either the previous or current
diff --git a/sldns/parseutil.c b/sldns/parseutil.c
index b51a0709d..dc8354b62 100644
--- a/sldns/parseutil.c
+++ b/sldns/parseutil.c
@@ -619,13 +619,18 @@ size_t sldns_b64_ntop_calculate_size(size_t srcsize)
  *
  * This routine does not insert spaces or linebreaks after 76 characters.
  */
-int sldns_b64_ntop(uint8_t const *src, size_t srclength,
-	char *target, size_t targsize)
+static int sldns_b64_ntop_base(uint8_t const *src, size_t srclength,
+	char *target, size_t targsize, int base64url, int padding)
 {
-	const char* b64 =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	char* b64;
 	const char pad64 = '=';
 	size_t i = 0, o = 0;
+	if(base64url)
+		b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123"
+			"456789-_";
+	else
+		b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123"
+			"456789+/";
 	if(targsize < sldns_b64_ntop_calculate_size(srclength))
 		return -1;
 	/* whole chunks: xxxxxxyy yyyyzzzz zzwwwwww */
@@ -645,18 +650,26 @@ int sldns_b64_ntop(uint8_t const *src, size_t srclength,
 		target[o] = b64[src[i] >> 2];
 		target[o+1] = b64[ ((src[i]&0x03)<<4) | (src[i+1]>>4) ];
 		target[o+2] = b64[ ((src[i+1]&0x0f)<<2) ];
-		target[o+3] = pad64;
-		/* i += 2; */
-		o += 4;
+		if(padding) {
+			target[o+3] = pad64;
+			/* i += 2; */
+			o += 4;
+		} else {
+			o += 3;
+		}
 		break;
 	case 1:
 		/* one at end, converted into A B = = */
 		target[o] = b64[src[i] >> 2];
 		target[o+1] = b64[ ((src[i]&0x03)<<4) ];
-		target[o+2] = pad64;
-		target[o+3] = pad64;
-		/* i += 1; */
-		o += 4;
+		if(padding) {
+			target[o+2] = pad64;
+			target[o+3] = pad64;
+			/* i += 1; */
+			o += 4;
+		} else {
+			o += 2;
+		}
 		break;
 	case 0:
 	default:
@@ -669,6 +682,20 @@ int sldns_b64_ntop(uint8_t const *src, size_t srclength,
 	return (int)o;
 }
 
+int sldns_b64_ntop(uint8_t const *src, size_t srclength, char *target,
+	size_t targsize)
+{
+	return sldns_b64_ntop_base(src, srclength, target, targsize,
+		0 /* no base64url */, 1 /* padding */);
+}
+
+int sldns_b64url_ntop(uint8_t const *src, size_t srclength, char *target,
+	size_t targsize)
+{
+	return sldns_b64_ntop_base(src, srclength, target, targsize,
+		1 /* base64url */, 0 /* no padding */);
+}
+
 size_t sldns_b64_pton_calculate_size(size_t srcsize)
 {
 	return (((((srcsize + 3) / 4) * 3)) + 1);
diff --git a/sldns/parseutil.h b/sldns/parseutil.h
index 852ad3fb5..7eb23317f 100644
--- a/sldns/parseutil.h
+++ b/sldns/parseutil.h
@@ -92,6 +92,8 @@ size_t sldns_b64_ntop_calculate_size(size_t srcsize);
 
 int sldns_b64_ntop(uint8_t const *src, size_t srclength,
 	char *target, size_t targsize);
+int sldns_b64url_ntop(uint8_t const *src, size_t srclength, char *target,
+	size_t targsize);
 
 /**
  * calculates the size needed to store the result of sldns_b64_pton
diff --git a/testdata/doh_downstream.tdir/doh_downstream.conf b/testdata/doh_downstream.tdir/doh_downstream.conf
new file mode 100644
index 000000000..f0857bb58
--- /dev/null
+++ b/testdata/doh_downstream.tdir/doh_downstream.conf
@@ -0,0 +1,27 @@
+server:
+	verbosity: 2
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	https-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	http-query-buffer-size: 1G
+	http-response-buffer-size: 1G
+	http-max-streams: 200
+
+	local-zone: "example.net" static
+	local-data: "www1.example.net. IN A 1.2.3.1"
+	local-data: "www2.example.net. IN A 1.2.3.2"
+	local-data: "www3.example.net. IN A 1.2.3.3"
+	local-zone: "drop.net" deny
+	tcp-upstream: yes
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/doh_downstream.tdir/doh_downstream.dsc b/testdata/doh_downstream.tdir/doh_downstream.dsc
new file mode 100644
index 000000000..66b84284e
--- /dev/null
+++ b/testdata/doh_downstream.tdir/doh_downstream.dsc
@@ -0,0 +1,16 @@
+BaseName: doh_downstream
+Version: 1.0
+Description: Test DNS-over-HTTPS query processing
+CreationDate: Mon Jun 12 12:00:00 CET 2020
+Maintainer:
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: doh_downstream.pre
+Post: doh_downstream.post
+Test: doh_downstream.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/doh_downstream.tdir/doh_downstream.post b/testdata/doh_downstream.tdir/doh_downstream.post
new file mode 100644
index 000000000..432e0eedd
--- /dev/null
+++ b/testdata/doh_downstream.tdir/doh_downstream.post
@@ -0,0 +1,11 @@
+# #-- doh_downstream.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $FWD_PID
+kill_pid $UNBOUND_PID
+cat unbound.log
diff --git a/testdata/doh_downstream.tdir/doh_downstream.pre b/testdata/doh_downstream.tdir/doh_downstream.pre
new file mode 100644
index 000000000..84734d76e
--- /dev/null
+++ b/testdata/doh_downstream.tdir/doh_downstream.pre
@@ -0,0 +1,31 @@
+# #-- doh_downstream.pre--#
+# 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
+get_random_port 2
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+
+# start forwarder
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT doh_downstream.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream.conf > ub.conf
+# start unbound in the background
+PRE="../.."
+$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_ldns_testns_up fwd.log
+wait_unbound_up unbound.log
+
diff --git a/testdata/doh_downstream.tdir/doh_downstream.test b/testdata/doh_downstream.tdir/doh_downstream.test
new file mode 100644
index 000000000..98a54af26
--- /dev/null
+++ b/testdata/doh_downstream.tdir/doh_downstream.test
@@ -0,0 +1,343 @@
+# #-- doh_downstream.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="../.."
+. ../common.sh
+get_make
+(cd $PRE; $MAKE dohclient)
+
+
+# this test query should just work (server is up)
+echo "> query www1.example.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+
+# multiple requests (from localdata)
+echo "> query www1.example.net. www2.example.net. www3.example.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+echo ""
+echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www.example.com" outfile | grep "10.20.30.40"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.com" outfile | grep "10.20.30.42"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+# www.example.com present twice, answered twice.
+echo ""
+echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www.example.com" outfile | grep "10.20.30.40"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+# www3.example.com present twice, answered twice.
+echo ""
+echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.com" outfile | grep "10.20.30.43"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+echo ""
+echo "> query www4.example.com. www3.example.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www4.example.com" outfile | grep "10.20.30.44"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+
+echo ""
+echo "> query a1.example.com. - a90.example.com."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+grep "a.example.com.	IN	A" outfile
+
+echo ""
+echo "> query www5.example.net. www3.example.net. www.drop.net."
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+
+echo "OK"
+exit 0
diff --git a/testdata/doh_downstream.tdir/doh_downstream.testns b/testdata/doh_downstream.tdir/doh_downstream.testns
new file mode 100644
index 000000000..c53941b67
--- /dev/null
+++ b/testdata/doh_downstream.tdir/doh_downstream.testns
@@ -0,0 +1,74 @@
+; nameserver test file
+$ORIGIN example.com.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www2	IN	A
+SECTION ANSWER
+www2	IN	A	10.20.30.42
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www3	IN	A
+SECTION ANSWER
+www3	IN	A	10.20.30.43
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www4	IN	A
+SECTION ANSWER
+www4	IN	A	10.20.30.44
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www5	IN	A
+SECTION ANSWER
+www5	IN	A	10.20.30.45
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www6	IN	A
+SECTION ANSWER
+www6	IN	A	10.20.30.46
+ENTRY_END
+
+; lots of noerror/nodata answers for other queries (a.. queries)
+ENTRY_BEGIN
+MATCH opcode qtype subdomain
+REPLY QR AA NOERROR
+ADJUST copy_id copy_query
+SECTION QUESTION
+a.example.com.	IN	A
+SECTION AUTHORITY
+example.com.	IN SOA ns hostmaster 2019 28800 7200 604800 3600
+ENTRY_END
diff --git a/testdata/doh_downstream.tdir/unbound_server.key b/testdata/doh_downstream.tdir/unbound_server.key
new file mode 100644
index 000000000..4256c421d
--- /dev/null
+++ b/testdata/doh_downstream.tdir/unbound_server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA
+3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s
+RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB
+AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS
+6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds
+sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi
+XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3
+fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL
+CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP
+0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2
+oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l
+In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S
+LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/doh_downstream.tdir/unbound_server.pem b/testdata/doh_downstream.tdir/unbound_server.pem
new file mode 100644
index 000000000..aeda3ff11
--- /dev/null
+++ b/testdata/doh_downstream.tdir/unbound_server.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1
+bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE
+AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS
+y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/
+/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu
+g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ
+9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG
+l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH
+Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg==
+-----END CERTIFICATE-----
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.conf b/testdata/doh_downstream_post.tdir/doh_downstream_post.conf
new file mode 100644
index 000000000..f0857bb58
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.conf
@@ -0,0 +1,27 @@
+server:
+	verbosity: 2
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	https-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	http-query-buffer-size: 1G
+	http-response-buffer-size: 1G
+	http-max-streams: 200
+
+	local-zone: "example.net" static
+	local-data: "www1.example.net. IN A 1.2.3.1"
+	local-data: "www2.example.net. IN A 1.2.3.2"
+	local-data: "www3.example.net. IN A 1.2.3.3"
+	local-zone: "drop.net" deny
+	tcp-upstream: yes
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.dsc b/testdata/doh_downstream_post.tdir/doh_downstream_post.dsc
new file mode 100644
index 000000000..70de7502f
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.dsc
@@ -0,0 +1,16 @@
+BaseName: doh_downstream_post
+Version: 1.0
+Description: Test DNS-over-HTTPS query processing, using POST method
+CreationDate: Mon Jun 12 12:00:00 CET 2020
+Maintainer:
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: doh_downstream_post.pre
+Post: doh_downstream_post.post
+Test: doh_downstream_post.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.post b/testdata/doh_downstream_post.tdir/doh_downstream_post.post
new file mode 100644
index 000000000..f66183b70
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.post
@@ -0,0 +1,11 @@
+# #-- doh_downstream_post.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $FWD_PID
+kill_pid $UNBOUND_PID
+cat unbound.log
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.pre b/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
new file mode 100644
index 000000000..e32f187c5
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
@@ -0,0 +1,30 @@
+# #-- doh_downstream_post.pre--#
+# 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
+get_random_port 2
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+
+# start forwarder
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT doh_downstream_post.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_post.conf > ub.conf
+# start unbound in the background
+PRE="../.."
+$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_ldns_testns_up fwd.log
+wait_unbound_up unbound.log
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.test b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
new file mode 100644
index 000000000..4a49c8b51
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
@@ -0,0 +1,343 @@
+# #-- doh_downstream_post.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="../.."
+. ../common.sh
+get_make
+(cd $PRE; $MAKE dohclient)
+
+
+# this test query should just work (server is up)
+echo "> query www1.example.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+
+# multiple requests (from localdata)
+echo "> query www1.example.net. www2.example.net. www3.example.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+echo ""
+echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www.example.com" outfile | grep "10.20.30.40"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.com" outfile | grep "10.20.30.42"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+# www.example.com present twice, answered twice.
+echo ""
+echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www.example.com" outfile | grep "10.20.30.40"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+# www3.example.com present twice, answered twice.
+echo ""
+echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.com" outfile | grep "10.20.30.43"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+echo ""
+echo "> query www4.example.com. www3.example.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www4.example.com" outfile | grep "10.20.30.44"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+
+echo ""
+echo "> query a1.example.com. - a90.example.com."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+grep "a.example.com.	IN	A" outfile
+
+echo ""
+echo "> query www5.example.net. www3.example.net. www.drop.net."
+$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+
+echo "OK"
+exit 0
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.testns b/testdata/doh_downstream_post.tdir/doh_downstream_post.testns
new file mode 100644
index 000000000..c53941b67
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.testns
@@ -0,0 +1,74 @@
+; nameserver test file
+$ORIGIN example.com.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www2	IN	A
+SECTION ANSWER
+www2	IN	A	10.20.30.42
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www3	IN	A
+SECTION ANSWER
+www3	IN	A	10.20.30.43
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www4	IN	A
+SECTION ANSWER
+www4	IN	A	10.20.30.44
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www5	IN	A
+SECTION ANSWER
+www5	IN	A	10.20.30.45
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www6	IN	A
+SECTION ANSWER
+www6	IN	A	10.20.30.46
+ENTRY_END
+
+; lots of noerror/nodata answers for other queries (a.. queries)
+ENTRY_BEGIN
+MATCH opcode qtype subdomain
+REPLY QR AA NOERROR
+ADJUST copy_id copy_query
+SECTION QUESTION
+a.example.com.	IN	A
+SECTION AUTHORITY
+example.com.	IN SOA ns hostmaster 2019 28800 7200 604800 3600
+ENTRY_END
diff --git a/testdata/doh_downstream_post.tdir/unbound_server.key b/testdata/doh_downstream_post.tdir/unbound_server.key
new file mode 100644
index 000000000..4256c421d
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/unbound_server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA
+3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s
+RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB
+AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS
+6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds
+sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi
+XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3
+fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL
+CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP
+0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2
+oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l
+In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S
+LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/doh_downstream_post.tdir/unbound_server.pem b/testdata/doh_downstream_post.tdir/unbound_server.pem
new file mode 100644
index 000000000..aeda3ff11
--- /dev/null
+++ b/testdata/doh_downstream_post.tdir/unbound_server.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1
+bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE
+AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS
+y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/
+/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu
+g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ
+9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG
+l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH
+Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg==
+-----END CERTIFICATE-----
diff --git a/util/netevent.c b/util/netevent.c
index 749781934..49ad08a4d 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2289,12 +2289,13 @@ struct http2_stream* http2_stream_create(int32_t stream_id)
 }
 
 /** Delete http2 stream. After session delete or stream close callback */
-void http2_stream_delete(struct http2_session* h2_session,
+static void http2_stream_delete(struct http2_session* h2_session,
 	struct http2_stream* h2_stream)
 {
 	if(h2_stream->mesh_state) {
 		mesh_state_remove_reply(h2_stream->mesh, h2_stream->mesh_state,
 			h2_session->c);
+		h2_stream->mesh_state = NULL;
 	}
 	http2_req_stream_clear(h2_stream);
 	free(h2_stream);
@@ -2426,7 +2427,8 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c)
 	/* reading until recv cb returns NGHTTP2_ERR_WOULDBLOCK */
 	ret = nghttp2_session_recv(c->h2_session->session);
 	if(ret) {
-		if(ret != NGHTTP2_ERR_EOF) {
+		if(ret != NGHTTP2_ERR_EOF &&
+			ret != NGHTTP2_ERR_CALLBACK_FAILURE) {
 			verbose(VERB_QUERY, "http2: session_recv failed, "
 				"error: %s", nghttp2_strerror(ret));
 		}

From 2e66809c6587ff806e7b2af29cdc2078868b20b7 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 14:59:56 +0200
Subject: [PATCH 008/108] - Add dohclient, for use in tests

---
 testcode/dohclient.c | 577 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 577 insertions(+)
 create mode 100644 testcode/dohclient.c

diff --git a/testcode/dohclient.c b/testcode/dohclient.c
new file mode 100644
index 000000000..10f365898
--- /dev/null
+++ b/testcode/dohclient.c
@@ -0,0 +1,577 @@
+/*
+ * testcode/dohclient.c - debug program. Perform multiple DNS queries using DoH.
+ *
+ * Copyright (c) 2020, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** 
+ * \file
+ *
+ * Simple DNS-over-HTTPS client. For testing and debugging purposes.
+ * No authentication of TLS cert.
+ */
+
+#include "config.h"
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+#include "sldns/wire2str.h"
+#include "sldns/sbuffer.h"
+#include "sldns/str2wire.h"
+#include "sldns/parseutil.h"
+#include "util/data/msgencode.h"
+#include "util/data/msgreply.h"
+#include "util/data/msgparse.h"
+#include "util/net_help.h"
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#ifdef HAVE_NGHTTP2
+#include <nghttp2/nghttp2.h>
+
+struct http2_session {
+	nghttp2_session* session;
+	SSL* ssl;
+	int fd;
+	int query_count;
+	/* Use POST :method if 1 */
+	int post;
+	int block_select;
+	const char* authority;
+	const char* endpoint;
+	const char* content_type;
+};
+
+struct http2_stream {
+	int32_t stream_id;
+	int res_status;
+	struct sldns_buffer* buf;
+	char* path;
+};
+
+static void usage(char* argv[])
+{
+	printf("usage: %s [options] name type class ...\n", argv[0]);
+	printf("	sends the name-type-class queries over "
+			"DNS-over-HTTPS.\n");
+	printf("-s server	IP address to send the queries to, "
+			"default: 127.0.0.1\n");
+	printf("-p		Port to connect to, default: %d\n",
+		UNBOUND_DNS_OVER_HTTPS_PORT);
+	printf("-P		Use POST method instead of default GET\n");
+	printf("-e		HTTP endpoint, default: /dns-query\n");
+	printf("-c		Content-type in request, default: "
+		"application/dns-message\n");
+	printf("-h 		This help text\n");
+	exit(1);
+}
+
+/** open TCP socket to svr */
+static int
+open_svr(const char* svr, int port)
+{
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+	int fd = -1;
+	int r;
+	if(!ipstrtoaddr(svr, port, &addr, &addrlen)) {
+		printf("fatal: bad server specs '%s'\n", svr);
+		exit(1);
+	}
+
+	fd = socket(addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET,
+		SOCK_STREAM, 0);
+	if(fd == -1) {
+		perror("socket() error");
+		exit(1);
+	}
+	r = connect(fd, (struct sockaddr*)&addr, addrlen);
+	if(r < 0 && r != EINPROGRESS) {
+		perror("connect() error");
+		exit(1);
+	}
+	return fd;
+}
+
+static ssize_t http2_submit_request_read_cb(
+	nghttp2_session* ATTR_UNUSED(session),
+	int32_t ATTR_UNUSED(stream_id), uint8_t* buf, size_t length,
+	uint32_t* data_flags, nghttp2_data_source* source,
+	void* ATTR_UNUSED(cb_arg))
+{
+	if(length > sldns_buffer_remaining(source->ptr))
+		length = sldns_buffer_remaining(source->ptr);
+
+	memcpy(buf, sldns_buffer_current(source->ptr), length);
+	sldns_buffer_skip(source->ptr, length);
+
+	if(sldns_buffer_remaining(source->ptr) == 0) {
+		*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+	}
+
+	return length;
+}
+
+static void
+submit_query(struct http2_session* h2_session, struct sldns_buffer* buf)
+{
+	int32_t stream_id;
+	struct http2_stream* h2_stream;
+	nghttp2_nv headers[5];
+	char* qb64;
+	size_t qb64_size;
+	size_t qb64_expected_size;
+	size_t i;
+	nghttp2_data_provider data_prd;
+
+	h2_stream = calloc(1,  sizeof(*h2_stream));
+	if(!h2_stream)
+		fatal_exit("could not malloc http2 stream");
+	h2_stream->buf = buf;
+
+	if(h2_session->post) {
+		data_prd.source.ptr = buf;
+		data_prd.read_callback = http2_submit_request_read_cb;
+		h2_stream->path = (char*)h2_session->endpoint;
+	} else {
+		qb64_expected_size = sldns_b64_ntop_calculate_size(
+				sldns_buffer_remaining(buf));
+		qb64 = malloc(qb64_expected_size);
+		if(!qb64) fatal_exit("out of memory");
+		qb64_size = sldns_b64url_ntop(sldns_buffer_begin(buf),
+			sldns_buffer_remaining(buf), qb64, qb64_expected_size);
+		h2_stream->path = malloc(strlen(
+			h2_session->endpoint)+strlen("?dns=")+qb64_size+1);
+		if(!h2_stream->path) fatal_exit("out of memory");
+		sprintf(h2_stream->path, "%s?dns=%s", h2_session->endpoint,
+			qb64);
+		free(qb64);
+	}
+
+	headers[0].name = (uint8_t*)":method";
+	if(h2_session->post)
+		headers[0].value = (uint8_t*)"POST";
+	else
+		headers[0].value = (uint8_t*)"GET";
+	headers[1].name = (uint8_t*)":path";
+	headers[1].value = (uint8_t*)h2_stream->path;
+	headers[2].name = (uint8_t*)":scheme";
+	headers[2].value = (uint8_t*)"https";
+	headers[3].name = (uint8_t*)":authority";
+	headers[3].value = (uint8_t*)h2_session->authority;
+	headers[4].name = (uint8_t*)"content-type";
+	headers[4].value = (uint8_t*)h2_session->content_type;
+
+	printf("Request headers\n");
+	for(i=0; i<sizeof(headers)/sizeof(headers[0]); i++) {
+		headers[i].namelen = strlen((char*)headers[i].name);
+		headers[i].valuelen = strlen((char*)headers[i].value);
+		headers[i].flags = NGHTTP2_NV_FLAG_NONE;
+		printf("%s: %s\n", headers[i].name, headers[i].value);
+	}
+
+	stream_id = nghttp2_submit_request(h2_session->session, NULL, headers,
+		sizeof(headers)/sizeof(headers[0]),
+		(h2_session->post) ? &data_prd : NULL, h2_stream);
+	if(stream_id < 0) {
+		printf("Failed to submit nghttp2 request");
+		exit(1);
+	}
+	h2_session->query_count++;
+	h2_stream->stream_id = stream_id;
+}
+
+static sldns_buffer*
+make_query(char* qname, char* qtype, char* qclass)
+{
+	struct query_info qinfo;
+	struct edns_data edns;
+	sldns_buffer* buf = sldns_buffer_new(65553);
+	if(!buf) fatal_exit("out of memory");
+	qinfo.qname = sldns_str2wire_dname(qname, &qinfo.qname_len);
+	if(!qinfo.qname) {
+		printf("cannot parse query name: '%s'\n", qname);
+		exit(1);
+	}
+
+	qinfo.qtype = sldns_get_rr_type_by_name(qtype);
+	qinfo.qclass = sldns_get_rr_class_by_name(qclass);
+	qinfo.local_alias = NULL;
+
+	qinfo_query_encode(buf, &qinfo); /* flips buffer */
+	sldns_buffer_write_u16_at(buf, 0, 0x0000);
+	sldns_buffer_write_u16_at(buf, 2, BIT_RD);
+	memset(&edns, 0, sizeof(edns));
+	edns.edns_present = 1;
+	edns.bits = EDNS_DO;
+	edns.udp_size = 4096;
+	if(sldns_buffer_capacity(buf) >=
+		sldns_buffer_limit(buf)+calc_edns_field_size(&edns))
+		attach_edns_record(buf, &edns);
+	return buf;
+}
+
+static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session),
+	uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	int r;
+	struct timeval tv, *waittv;
+	fd_set rfd;
+	ERR_clear_error();
+
+	memset(&tv, 0, sizeof(tv));
+
+	if(h2_session->block_select && h2_session->query_count <= 0) {
+		return NGHTTP2_ERR_WOULDBLOCK;
+	}
+	if(h2_session->block_select)
+		waittv = NULL;
+	else
+		waittv = &tv;
+	memset(&rfd, 0, sizeof(rfd));
+	FD_ZERO(&rfd);
+	FD_SET(h2_session->fd, &rfd);
+	r = select(h2_session->fd+1, &rfd, NULL, NULL, waittv);
+	if(r <= 0) {
+		return NGHTTP2_ERR_WOULDBLOCK;
+	}
+
+	r = SSL_read(h2_session->ssl, buf, len);
+	if(r <= 0) {
+		int want = SSL_get_error(h2_session->ssl, r);
+		if(want == SSL_ERROR_ZERO_RETURN) {
+			return NGHTTP2_ERR_EOF;
+		}
+		log_crypto_err("could not SSL_read");
+		return NGHTTP2_ERR_EOF;
+	}
+	return r;
+}
+
+static ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session),
+	const uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+
+	int r;
+	ERR_clear_error();
+	r = SSL_write(h2_session->ssl, buf, len);
+	if(r <= 0) {
+		int want = SSL_get_error(h2_session->ssl, r);
+		if(want == SSL_ERROR_ZERO_RETURN) {
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		}
+		log_crypto_err("could not SSL_write");
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+	return r;
+}
+
+static int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session),
+	int32_t ATTR_UNUSED(stream_id),
+	nghttp2_error_code ATTR_UNUSED(error_code), void *cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	struct http2_stream* h2_stream;
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		h2_session->session, stream_id))) {
+		return 0;
+	}
+	h2_session->query_count--;
+	sldns_buffer_free(h2_stream->buf);
+	if(!h2_session->post)
+		free(h2_stream->path);
+	free(h2_stream);
+	h2_stream = NULL;
+	return 0;
+}
+
+static int http2_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
+	uint8_t ATTR_UNUSED(flags), int32_t stream_id, const uint8_t* data,
+	size_t len, void* cb_arg)
+{
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	struct http2_stream* h2_stream;
+
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		h2_session->session, stream_id))) {
+		return 0;
+	}
+
+	sldns_buffer_write(h2_stream->buf, data, len);
+
+	return 0;
+}
+
+static int http2_frame_recv_cb(nghttp2_session *session,
+	const nghttp2_frame *frame, void* ATTR_UNUSED(cb_arg))
+{
+	struct http2_stream* h2_stream;
+
+	if(!(h2_stream = nghttp2_session_get_stream_user_data(
+		session, frame->hd.stream_id)))
+		return 0;
+	if(frame->hd.type == NGHTTP2_HEADERS &&
+		frame->headers.cat == NGHTTP2_HCAT_RESPONSE) {
+		sldns_buffer_clear(h2_stream->buf);
+	}
+	if(((frame->hd.type != NGHTTP2_DATA &&
+		frame->hd.type != NGHTTP2_HEADERS) ||
+		frame->hd.flags & NGHTTP2_FLAG_END_STREAM) &&
+			h2_stream->res_status == 200) {
+			char* pktstr;
+			sldns_buffer_flip(h2_stream->buf);
+			pktstr = sldns_wire2str_pkt(
+				sldns_buffer_begin(h2_stream->buf),
+				sldns_buffer_limit(h2_stream->buf));
+			printf("%s\n", pktstr);
+			free(pktstr);
+			return 0;
+	}
+	return 0;
+}
+static int http2_header_cb(nghttp2_session* ATTR_UNUSED(session),
+	const nghttp2_frame* frame, const uint8_t* name, size_t namelen,
+	const uint8_t* value, size_t ATTR_UNUSED(valuelen),
+	uint8_t ATTR_UNUSED(flags), void* cb_arg)
+{
+	struct http2_stream* h2_stream;
+	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	printf("%s %s\n", name, value);
+	if(namelen == 7 && memcmp(":status", name, namelen) == 0) {
+		if(!(h2_stream = nghttp2_session_get_stream_user_data(
+			h2_session->session, frame->hd.stream_id))) {
+			return 0;
+		}
+		h2_stream->res_status = atoi((char*)value);
+	}
+	return 0;
+}
+
+static struct http2_session*
+http2_session_create()
+{
+	struct http2_session* h2_session = calloc(1,
+		sizeof(struct http2_session));
+	nghttp2_session_callbacks* callbacks;
+	if(!h2_session)
+		fatal_exit("out of memory");
+
+	if(nghttp2_session_callbacks_new(&callbacks) == NGHTTP2_ERR_NOMEM) {
+		log_err("failed to initialize nghttp2 callback");
+		return NULL;
+	}
+	nghttp2_session_callbacks_set_recv_callback(callbacks, http2_recv_cb);
+	nghttp2_session_callbacks_set_send_callback(callbacks, http2_send_cb);
+	nghttp2_session_callbacks_set_on_stream_close_callback(callbacks,
+		http2_stream_close_cb);
+	nghttp2_session_callbacks_set_on_data_chunk_recv_callback(callbacks,
+		http2_data_chunk_recv_cb);
+	nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+		http2_frame_recv_cb);
+	nghttp2_session_callbacks_set_on_header_callback(callbacks,
+		http2_header_cb);
+	nghttp2_session_client_new(&h2_session->session, callbacks, h2_session);
+	return h2_session;
+}
+
+static void
+http2_session_delete(struct http2_session* h2_session)
+{
+	nghttp2_session_del(h2_session->session);
+	free(h2_session);
+}
+
+static void
+http2_submit_setting(struct http2_session* h2_session)
+{
+	int ret;
+	nghttp2_settings_entry settings[1] = {
+		{NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
+		 100}};
+
+	ret = nghttp2_submit_settings(h2_session->session, NGHTTP2_FLAG_NONE,
+		settings, 1);
+	if(ret) {
+		printf("http2: submit_settings failed, "
+			"error: %s\n", nghttp2_strerror(ret));
+		exit(1);
+	}
+}
+
+static void
+http2_write(struct http2_session* h2_session)
+{
+	if(nghttp2_session_want_write(h2_session->session)) {
+		if(nghttp2_session_send(h2_session->session)) {
+			printf("nghttp2 session send failed\n");
+			exit(1);
+		}
+	}
+}
+
+static void
+http2_read(struct http2_session* h2_session)
+{
+	if(nghttp2_session_want_read(h2_session->session)) {
+		if(nghttp2_session_recv(h2_session->session)) {
+			printf("nghttp2 session mem_recv failed\n");
+			exit(1);
+		}
+	}
+}
+
+static void
+run(struct http2_session* h2_session, int port, int count, char** q)
+{
+	int i;
+	SSL_CTX* ctx = NULL;
+	SSL* ssl = NULL;
+	int fd;
+	struct sldns_buffer* buf = NULL;
+
+	fd = open_svr(h2_session->authority, port);
+	h2_session->fd = fd;
+
+	ctx = connect_sslctx_create(NULL, NULL, NULL, 0);
+	if(!ctx) fatal_exit("cannot create ssl ctx");
+	SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3);
+	ssl = outgoing_ssl_fd(ctx, fd);
+	if(!ssl) {
+		printf("cannot create ssl\n");
+		exit(1);
+	}
+	h2_session->ssl = ssl;
+	while(1) {
+		int r;
+		ERR_clear_error();
+		if( (r=SSL_do_handshake(ssl)) == 1)
+			break;
+		r = SSL_get_error(ssl, r);
+		if(r != SSL_ERROR_WANT_READ &&
+			r != SSL_ERROR_WANT_WRITE) {
+			log_crypto_err("could not ssl_handshake");
+			exit(1);
+		}
+	}
+
+	http2_submit_setting(h2_session);
+	http2_write(h2_session);
+	http2_read(h2_session); /* Read setting from remote peer */
+
+	h2_session->block_select = 1;
+
+	/* hande query */
+	for(i=0; i<count; i+=3) {
+		buf = make_query(q[i], q[i+1], q[i+2]);
+		submit_query(h2_session, buf);
+	}
+	http2_write(h2_session);
+	while(h2_session->query_count) {
+		http2_read(h2_session);
+		http2_write(h2_session);
+	}
+
+	/* shutdown */
+	http2_session_delete(h2_session);
+	SSL_shutdown(ssl);
+	SSL_free(ssl);
+	SSL_CTX_free(ctx);
+	close(fd);
+}
+
+/** getopt global, in case header files fail to declare it. */
+extern int optind;
+/** getopt global, in case header files fail to declare it. */
+extern char* optarg;
+int main(int argc, char** argv)
+{
+	int c;
+	int port = UNBOUND_DNS_OVER_HTTPS_PORT;
+	struct http2_session* h2_session = http2_session_create();
+	if(!h2_session) fatal_exit("out of memory");
+
+	if(argc == 1) {
+		usage(argv);
+	}
+	
+	h2_session->authority = "127.0.0.1";
+	h2_session->post = 0;
+	h2_session->endpoint = "/dns-query";
+	h2_session->content_type = "application/dns-message";
+
+	while((c=getopt(argc, argv, "c:e:hs:p:P")) != -1) {
+		switch(c) {
+			case 'c':
+				h2_session->content_type = optarg;
+				break;
+			case 'e':
+				h2_session->endpoint = optarg;
+				break;
+			case 'p':
+				if(atoi(optarg)==0 && strcmp(optarg,"0")!=0) {
+					printf("error parsing port, "
+					    "number expected: %s\n", optarg);
+					return 1;
+				}
+				port = atoi(optarg);
+				break;
+			case 'P':
+				h2_session->post = 1;
+				break;
+			case 's':
+				h2_session->authority = optarg;
+				break;
+			case 'h':
+			case '?':
+			default:
+				usage(argv);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if(argc%3!=0) {
+		printf("Invalid input. Specify qname, qtype, and qclass.\n");
+		return 1;
+	}
+
+
+	run(h2_session, port, argc, argv);
+
+	return 0;
+}
+#else
+int main(int ATTR_UNUSED(argc), char** ATTR_UNUSED(argv))
+{
+	printf("Compiled without nghttp2, cannot run test.\n");
+}
+#endif /*  HAVE_NGHTTP2 */

From 941559c2b7409b3e01bf89c73cf0c8fcfb3fb50b Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 15:09:05 +0200
Subject: [PATCH 009/108] dohclient memory leak fix

---
 testcode/dohclient.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testcode/dohclient.c b/testcode/dohclient.c
index 10f365898..060d71ee4 100644
--- a/testcode/dohclient.c
+++ b/testcode/dohclient.c
@@ -227,6 +227,7 @@ make_query(char* qname, char* qtype, char* qclass)
 	qinfo.local_alias = NULL;
 
 	qinfo_query_encode(buf, &qinfo); /* flips buffer */
+	free(qinfo.qname);
 	sldns_buffer_write_u16_at(buf, 0, 0x0000);
 	sldns_buffer_write_u16_at(buf, 2, BIT_RD);
 	memset(&edns, 0, sizeof(edns));
@@ -401,6 +402,7 @@ http2_session_create()
 	nghttp2_session_callbacks_set_on_header_callback(callbacks,
 		http2_header_cb);
 	nghttp2_session_client_new(&h2_session->session, callbacks, h2_session);
+	nghttp2_session_callbacks_del(callbacks);
 	return h2_session;
 }
 

From d9cdb924ad132190353e3373ed01f592afec5d5d Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 15:34:50 +0200
Subject: [PATCH 010/108] Add DoH endpoint configuration test

---
 .../doh_downstream_endpoint.conf              | 17 +++++
 .../doh_downstream_endpoint.dsc               | 16 +++++
 .../doh_downstream_endpoint.post              | 10 +++
 .../doh_downstream_endpoint.pre               | 22 +++++++
 .../doh_downstream_endpoint.test              | 62 +++++++++++++++++++
 .../unbound_server.key                        | 15 +++++
 .../unbound_server.pem                        | 11 ++++
 7 files changed, 153 insertions(+)
 create mode 100644 testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.conf
 create mode 100644 testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.dsc
 create mode 100644 testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
 create mode 100644 testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
 create mode 100644 testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
 create mode 100644 testdata/doh_downstream_endpoint.tdir/unbound_server.key
 create mode 100644 testdata/doh_downstream_endpoint.tdir/unbound_server.pem

diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.conf b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.conf
new file mode 100644
index 000000000..3ec5ed4a1
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.conf
@@ -0,0 +1,17 @@
+server:
+	verbosity: 2
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	https-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	http-endpoint: "/abc"
+
+	local-zone: "example.net" static
+	local-data: "www.example.net. IN A 1.2.3.1"
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.dsc b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.dsc
new file mode 100644
index 000000000..ef36a1968
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.dsc
@@ -0,0 +1,16 @@
+BaseName: doh_downstream
+Version: 1.0
+Description: Test DNS-over-HTTPS query processing, endpoint setting
+CreationDate: Mon Jun 12 12:00:00 CET 2020
+Maintainer:
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: doh_downstream_endpoint.pre
+Post: doh_downstream_endpoint.post
+Test: doh_downstream_endpoint.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
new file mode 100644
index 000000000..ffad089e4
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
@@ -0,0 +1,10 @@
+# #-- doh_downstream.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $UNBOUND_PID
+cat unbound.log
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
new file mode 100644
index 000000000..4f10a9a18
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
@@ -0,0 +1,22 @@
+# #-- doh_downstream.pre--#
+# 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
+get_random_port 1
+UNBOUND_PORT=$RND_PORT
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_endpoint.conf > ub.conf
+# start unbound in the background
+PRE="../.."
+$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_unbound_up unbound.log
+
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
new file mode 100644
index 000000000..6ae176dd9
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
@@ -0,0 +1,62 @@
+# #-- doh_downstream.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="../.."
+. ../common.sh
+get_make
+(cd $PRE; $MAKE dohclient)
+
+
+echo "> query www.example.net. endpoint /dns-query"
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www.example.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "status 404" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+
+echo "> query www.example.net. endpoint /dns-query"
+$PRE/dohclient -e /abc -s 127.0.0.1 -p $UNBOUND_PORT www.example.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep ":status 200" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+exit 0
diff --git a/testdata/doh_downstream_endpoint.tdir/unbound_server.key b/testdata/doh_downstream_endpoint.tdir/unbound_server.key
new file mode 100644
index 000000000..4256c421d
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/unbound_server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA
+3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s
+RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB
+AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS
+6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds
+sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi
+XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3
+fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL
+CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP
+0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2
+oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l
+In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S
+LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/doh_downstream_endpoint.tdir/unbound_server.pem b/testdata/doh_downstream_endpoint.tdir/unbound_server.pem
new file mode 100644
index 000000000..aeda3ff11
--- /dev/null
+++ b/testdata/doh_downstream_endpoint.tdir/unbound_server.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1
+bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE
+AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS
+y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/
+/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu
+g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ
+9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG
+l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH
+Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg==
+-----END CERTIFICATE-----

From 70b270925df89f4382c379ba099a149ed7415007 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 16:31:51 +0200
Subject: [PATCH 011/108] - Add http-response-buffer-size test

---
 .../doh_downstream_buffer_size.conf           | 17 +++++++++
 .../doh_downstream_buffer_size.dsc            | 16 ++++++++
 .../doh_downstream_buffer_size.post           | 10 +++++
 .../doh_downstream_buffer_size.pre            | 22 +++++++++++
 .../doh_downstream_buffer_size.test           | 38 +++++++++++++++++++
 .../unbound_server.key                        | 15 ++++++++
 .../unbound_server.pem                        | 11 ++++++
 .../doh_downstream_endpoint.test              |  4 --
 8 files changed, 129 insertions(+), 4 deletions(-)
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.conf
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.dsc
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/unbound_server.key
 create mode 100644 testdata/doh_downstream_buffer_size.tdir/unbound_server.pem

diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.conf b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.conf
new file mode 100644
index 000000000..30d8e2a4f
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.conf
@@ -0,0 +1,17 @@
+server:
+	verbosity: 2
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	https-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	http-response-buffer-size: 500
+
+	local-zone: "example.net" redirect
+	local-data: "example.net. IN A 1.2.3.1"
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.dsc b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.dsc
new file mode 100644
index 000000000..c271fcdc1
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.dsc
@@ -0,0 +1,16 @@
+BaseName: doh_downstream_buffer_size
+Version: 1.0
+Description: Test DNS-over-HTTPS http-response-buffer-size
+CreationDate: Mon Jun 12 12:00:00 CET 2020
+Maintainer:
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: doh_downstream_buffer_size.pre
+Post: doh_downstream_buffer_size.post
+Test: doh_downstream_buffer_size.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
new file mode 100644
index 000000000..ffad089e4
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
@@ -0,0 +1,10 @@
+# #-- doh_downstream.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $UNBOUND_PID
+cat unbound.log
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
new file mode 100644
index 000000000..19795398c
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
@@ -0,0 +1,22 @@
+# #-- doh_downstream.pre--#
+# 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
+get_random_port 1
+UNBOUND_PORT=$RND_PORT
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_buffer_size.conf > ub.conf
+# start unbound in the background
+PRE="../.."
+$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_unbound_up unbound.log
+
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
new file mode 100644
index 000000000..bbeb9eb2b
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
@@ -0,0 +1,38 @@
+# #-- doh_downstream.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="../.."
+. ../common.sh
+get_make
+(cd $PRE; $MAKE dohclient)
+
+
+echo "> query www.example.net. endpoint /dns-query"
+$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT 1.example.net. A IN 2.example.net. A IN 3.example.net. A IN 4.example.net. A IN 5.example.net. A IN 6.example.net. A IN 7.example.net. A IN 8.example.net. A IN 9.example.net. A IN 10.example.net. A IN  >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+num=$(grep "ANSWER SEC" outfile | wc -l)
+# 58 byte answers, 500 byte max response buffer -> 8 answers
+if [ $num -eq 8 ]; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+
+exit 0
diff --git a/testdata/doh_downstream_buffer_size.tdir/unbound_server.key b/testdata/doh_downstream_buffer_size.tdir/unbound_server.key
new file mode 100644
index 000000000..4256c421d
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/unbound_server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA
+3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s
+RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB
+AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS
+6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds
+sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi
+XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3
+fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL
+CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP
+0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2
+oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l
+In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S
+LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/doh_downstream_buffer_size.tdir/unbound_server.pem b/testdata/doh_downstream_buffer_size.tdir/unbound_server.pem
new file mode 100644
index 000000000..aeda3ff11
--- /dev/null
+++ b/testdata/doh_downstream_buffer_size.tdir/unbound_server.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1
+bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE
+AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS
+y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/
+/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu
+g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ
+9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG
+l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH
+Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg==
+-----END CERTIFICATE-----
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
index 6ae176dd9..0e25a47f6 100644
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
@@ -17,7 +17,6 @@ if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
-	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
 	exit 1
@@ -28,7 +27,6 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
-	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
 	exit 1
@@ -42,7 +40,6 @@ if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
-	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
 	exit 1
@@ -53,7 +50,6 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
-	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
 	exit 1

From 16029281a87bc6f79c8133a2eeecb18743bfdf91 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 23 Jul 2020 17:17:44 +0200
Subject: [PATCH 012/108] Start of EDNS client tags implementation.

---
 daemon/daemon.c            | 15 +++++++++++
 services/outside_network.c | 12 +++++++++
 sldns/rrdef.h              |  3 ++-
 util/edns.c                | 38 ++++++++++++++++++++++++++
 util/edns.h                | 55 ++++++++++++++++++++++++++++++++++++++
 util/module.h              |  1 +
 6 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 5d4279259..34f7bfda1 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -77,6 +77,7 @@
 #include "util/storage/lookup3.h"
 #include "util/storage/slabhash.h"
 #include "util/tcp_conn_limit.h"
+#include "util/edns.h"
 #include "services/listen_dnsport.h"
 #include "services/cache/rrset.h"
 #include "services/cache/infra.h"
@@ -290,6 +291,15 @@ daemon_init(void)
 		free(daemon);
 		return NULL;
 	}
+	if(!(daemon->env->edns_tags = edns_tags_create())) {
+		auth_zones_delete(daemon->env->auth_zones);
+		acl_list_delete(daemon->acl);
+		tcl_list_delete(daemon->tcl);
+		edns_known_options_delete(daemon->env);
+		free(daemon->env);
+		free(daemon);
+		return NULL;
+	}
 	return daemon;	
 }
 
@@ -619,6 +629,10 @@ daemon_fork(struct daemon* daemon)
 		&daemon->use_rpz))
 		fatal_exit("auth_zones could not be setup");
 
+	/* Set-up EDNS tags */
+	if(!edns_tags_apply_cfg(daemon->env->edns_tags, daemon->cfg))
+		fatal_exit("Could not set up EDNS tags");
+
 	/* setup modules */
 	daemon_setup_modules(daemon);
 
@@ -750,6 +764,7 @@ daemon_delete(struct daemon* daemon)
 		rrset_cache_delete(daemon->env->rrset_cache);
 		infra_delete(daemon->env->infra_cache);
 		edns_known_options_delete(daemon->env);
+		edns_tags_delete(daemon->env->edns_tags);
 		auth_zones_delete(daemon->env->auth_zones);
 	}
 	ub_randfree(daemon->rand);
diff --git a/services/outside_network.c b/services/outside_network.c
index 44e01d745..b7ac5ef60 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -58,6 +58,7 @@
 #include "util/net_help.h"
 #include "util/random.h"
 #include "util/fptr_wlist.h"
+#include "util/edns.h"
 #include "sldns/sbuffer.h"
 #include "dnstap/dnstap.h"
 #ifdef HAVE_OPENSSL_SSL_H
@@ -2111,9 +2112,20 @@ outnet_serviced_query(struct outside_network* outnet,
 {
 	struct serviced_query* sq;
 	struct service_callback* cb;
+	struct edns_tag_addr* client_tag_addr;
+
 	if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen, zone, zonelen,
 		qstate, qstate->region))
 			return NULL;
+
+	if((client_tag_addr = edns_tag_addr_lookup(env->edns_tags->client_tags,
+		addr, addrlen))) {
+		uint16_t client_tag = htons(client_tag_addr->tag_data);
+		edns_opt_list_append(&qstate->edns_opts_back_out,
+			LDNS_EDNS_CLIENT_TAG, 2,
+			(uint8_t*)&client_tag, qstate->region);
+	}
+
 	serviced_gen_query(buff, qinfo->qname, qinfo->qname_len, qinfo->qtype,
 		qinfo->qclass, flags);
 	sq = lookup_serviced(outnet, buff, dnssec, addr, addrlen,
diff --git a/sldns/rrdef.h b/sldns/rrdef.h
index 4e7fef574..e084f354a 100644
--- a/sldns/rrdef.h
+++ b/sldns/rrdef.h
@@ -426,7 +426,8 @@ enum sldns_enum_edns_option
 	LDNS_EDNS_N3U = 7, /* RFC6975 */
 	LDNS_EDNS_CLIENT_SUBNET = 8, /* RFC7871 */
 	LDNS_EDNS_KEEPALIVE = 11, /* draft-ietf-dnsop-edns-tcp-keepalive*/
-	LDNS_EDNS_PADDING = 12 /* RFC7830 */
+	LDNS_EDNS_PADDING = 12, /* RFC7830 */
+	LDNS_EDNS_CLIENT_TAG = 16 /* draft-bellis-dnsop-edns-tags-01 */
 };
 typedef enum sldns_enum_edns_option sldns_edns_option;
 
diff --git a/util/edns.c b/util/edns.c
index d19952df0..0ab00cf7c 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -47,6 +47,44 @@
 #include "util/data/msgparse.h"
 #include "util/data/msgreply.h"
 
+struct edns_tags* edns_tags_create(void)
+{
+	struct edns_tags* edns_tags = calloc(1, sizeof(struct edns_tags));
+	if(!edns_tags)
+		return NULL;
+	if(!(edns_tags->region = regional_create())) {
+		edns_tags_delete(edns_tags);
+		return NULL;
+	}
+	return edns_tags;
+}
+
+void edns_tags_delete(struct edns_tags* edns_tags)
+{
+	if(!edns_tags)
+		return;
+	regional_destroy(edns_tags->region);
+	free(edns_tags);
+}
+
+int edns_tags_apply_cfg(struct edns_tags* edns_tags,
+	struct config_file* config)
+{
+	regional_free_all(edns_tags->region);
+	addr_tree_init(&edns_tags->client_tags);
+
+	/* TODO walk over config, create and insert node. */
+
+	return 1;
+}
+
+struct edns_tag_addr*
+edns_tag_addr_lookup(rbtree_type tree, struct sockaddr_storage* addr,
+	socklen_t addrlen)
+{
+	return (struct edns_tag_addr*)addr_tree_lookup(&tree, addr, addrlen);
+}
+
 static int edns_keepalive(struct edns_data* edns_out, struct edns_data* edns_in,
 		struct comm_point* c, struct regional* region)
 {
diff --git a/util/edns.h b/util/edns.h
index a4ee7def6..310ba1cd2 100644
--- a/util/edns.h
+++ b/util/edns.h
@@ -42,11 +42,66 @@
 #ifndef UTIL_EDNS_H
 #define UTIL_EDNS_H
 
+#include "util/storage/dnstree.h"
+
 struct edns_data;
 struct config_file;
 struct comm_point;
 struct regional;
 
+/**
+ * Structure containing all EDNS tags.
+ */
+struct edns_tags {
+	/** Tree of EDNS client tags to use in upstream queries, per address
+	 * prefix. Contains nodes of type edns_tag_addr. */
+	rbtree_type client_tags;
+	/** region to allocate tree nodes in */
+	struct regional* region;
+};
+
+/**
+ * EDNS tag. Node of rbtree, containing tag and prefix.
+ */
+struct edns_tag_addr {
+	/** node in address tree, used for tree lookups. Need to be the first
+	 * member of this struct. */
+	struct addr_tree_node node;
+	/** tag data, in host byte ordering */
+	uint16_t tag_data;
+};
+
+/**
+ * Create structure to hold EDNS tags
+ * @return: newly created edns_tags, NULL on alloc failure.
+ */
+struct edns_tags* edns_tags_create(void);
+
+/** Delete ENDS tags structure
+ * @param edns_tags: struct to delete
+ */
+void edns_tags_delete(struct edns_tags* edns_tags);
+
+/**
+ * Add configured EDNS tags
+ * @param edns_tags: edns tags to apply config to
+ * @param config: struct containing EDNS tags configuration
+ * @return 0 on error
+ */
+int edns_tags_apply_cfg(struct edns_tags* edns_tags,
+	struct config_file* config);
+
+/**
+ * Find tag for address.
+ * @param tree: tree containing EDNS tags per address prefix.
+ * @param addr: address to use for tree lookup
+ * @param addrlen: length of address
+ * @return: matching tree node, NULL otherwise
+ */
+struct edns_tag_addr*
+edns_tag_addr_lookup(rbtree_type tree, struct sockaddr_storage* addr,
+	socklen_t addrlen);
+
 /**
  * Apply common EDNS options.
  *
diff --git a/util/module.h b/util/module.h
index fa89c647e..1d696ed0a 100644
--- a/util/module.h
+++ b/util/module.h
@@ -520,6 +520,7 @@ struct module_env {
 	struct edns_known_option* edns_known_options;
 	/* Number of known edns options */
 	size_t edns_known_options_num;
+	struct edns_tags* edns_tags;
 
 	/* Make every mesh state unique, do not aggregate mesh states. */
 	int unique_mesh;

From 64806a0d146aeef89aac2d8670bb0b796820c22d Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Fri, 24 Jul 2020 14:52:04 +0200
Subject: [PATCH 013/108] Add edns-client-tag configuration option

---
 doc/unbound.conf.5.in |    6 +
 util/config_file.c    |    3 +
 util/config_file.h    |    3 +
 util/configlexer.c    | 4128 +++++++++++++++++++++--------------------
 util/configlexer.lex  |    1 +
 util/configparser.c   | 2075 +++++++++++----------
 util/configparser.h   |   10 +-
 util/configparser.y   |   19 +-
 util/edns.c           |    1 +
 9 files changed, 3156 insertions(+), 3090 deletions(-)

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index cd43f04ea..2b2f909da 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1516,6 +1516,12 @@ servers set. The default for fast\-server\-permil is 0.
 Set the number of servers that should be used for fast server selection. Only
 use the fastest specified number of servers with the fast\-server\-permil
 option, that turns this on or off. The default is to use the fastest 3 servers.
+.TP 5
+.B edns\-client\-tag: \fI<IP netblock> <tag data>
+Include an edns-client-tag option in queries with destination address matching
+the configured IP netblock. This configuration option can be used multiple
+times. The most specific match will be used. The tag data is configured in
+decimal format, from 0 to 65535.
 .SS "Remote Control Options"
 In the
 .B remote\-control:
diff --git a/util/config_file.c b/util/config_file.c
index 0e9ee471b..0ab8614a3 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -315,6 +315,7 @@ config_create(void)
 	cfg->qname_minimisation_strict = 0;
 	cfg->shm_enable = 0;
 	cfg->shm_key = 11777;
+	cfg->edns_client_tags = NULL;
 	cfg->dnscrypt = 0;
 	cfg->dnscrypt_port = 0;
 	cfg->dnscrypt_provider = NULL;
@@ -1130,6 +1131,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_LS3(opt, "access-control-tag-action", acl_tag_actions)
 	else O_LS3(opt, "access-control-tag-data", acl_tag_datas)
 	else O_LS2(opt, "access-control-view", acl_view)
+	else O_LS2(opt, "edns_client_tags", edns_client_tags)
 #ifdef USE_IPSECMOD
 	else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled)
 	else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus)
@@ -1499,6 +1501,7 @@ config_delete(struct config_file* cfg)
 	config_deldblstrlist(cfg->ratelimit_below_domain);
 	config_delstrlist(cfg->python_script);
 	config_delstrlist(cfg->dynlib_file);
+	config_deldblstrlist(cfg->edns_client_tags);
 #ifdef USE_IPSECMOD
 	free(cfg->ipsecmod_hook);
 	config_delstrlist(cfg->ipsecmod_whitelist);
diff --git a/util/config_file.h b/util/config_file.h
index 66e5025d0..e61257a39 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -553,6 +553,9 @@ struct config_file {
 	/** SHM data - key for the shm */
 	int shm_key;
 
+	/** list of EDNS client tag entries, linked list */
+	struct config_str2list* edns_client_tags;
+
 	/** DNSCrypt */
 	/** true to enable dnscrypt */
 	int dnscrypt;
diff --git a/util/configlexer.c b/util/configlexer.c
index cd505dfda..46022f656 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1,7 +1,7 @@
 #include "config.h"
 #include "util/configyyrename.h"
 
-#line 2 "<stdout>"
+#line 3 "<stdout>"
 
 #define  YY_INT_ALIGNED short int
 
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 323
-#define YY_END_OF_BUFFER 324
+#define YY_NUM_RULES 324
+#define YY_END_OF_BUFFER 325
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,353 +363,354 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3137] =
+static const flex_int16_t yy_accept[3148] =
     {   0,
-        1,    1,  297,  297,  301,  301,  305,  305,  309,  309,
-        1,    1,  313,  313,  317,  317,  324,  321,    1,  295,
-      295,  322,    2,  322,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  297,  298,  298,  299,
-      322,  301,  302,  302,  303,  322,  308,  305,  306,  306,
-      307,  322,  309,  310,  310,  311,  322,  320,  296,    2,
-      300,  322,  320,  316,  313,  314,  314,  315,  322,  317,
-      318,  318,  319,  322,  321,    0,    1,    2,    2,    2,
-        2,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+        1,    1,  298,  298,  302,  302,  306,  306,  310,  310,
+        1,    1,  314,  314,  318,  318,  325,  322,    1,  296,
+      296,  323,    2,  323,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  298,  299,  299,  300,
+      323,  302,  303,  303,  304,  323,  309,  306,  307,  307,
+      308,  323,  310,  311,  311,  312,  323,  321,  297,    2,
+      301,  323,  321,  317,  314,  315,  315,  316,  323,  318,
+      319,  319,  320,  323,  322,    0,    1,    2,    2,    2,
+        2,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  297,    0,  301,    0,
-      308,    0,  305,  309,    0,  320,    0,    2,    2,  320,
-      316,    0,  313,  317,    0,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  298,    0,  302,    0,
+      309,    0,  306,  310,    0,  321,    0,    2,    2,  321,
+      317,    0,  314,  318,    0,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  320,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  321,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  115,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  123,
-      321,  321,  321,  321,  321,  321,  321,  320,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  115,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  123,
+      322,  322,  322,  322,  322,  322,  322,  321,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,   99,  321,  321,  321,  321,  321,
-      321,    8,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      116,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,   99,  322,  322,  322,  322,  322,
+      322,    8,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      116,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      128,  321,  320,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  290,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      128,  322,  321,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  290,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  320,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,   57,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  321,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,   57,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      227,  321,   14,   15,  321,   19,   18,  321,  321,  211,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  122,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  209,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  227,  322,   14,   15,  322,   19,   18,  322,  322,
+      211,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  122,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  209,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,    3,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  320,  321,  321,
-      321,  321,  321,  321,  321,  284,  321,  321,  283,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,    3,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  321,
+      322,  322,  322,  322,  322,  322,  322,  284,  322,  322,
+      283,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  304,  321,  321,
-      321,  321,  321,  321,  321,   56,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,   60,  321,  258,  321,  321,  321,  321,  321,
-      321,  321,  321,  291,  292,  321,  321,  321,  321,  321,
-       61,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  119,  321,  321,
-      321,  321,  321,  321,  321,  321,  198,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      305,  322,  322,  322,  322,  322,  322,  322,   56,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,   60,  322,  258,  322,  322,
+      322,  322,  322,  322,  322,  322,  291,  292,  322,  322,
+      322,  322,  322,   61,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      119,  322,  322,  322,  322,  322,  322,  322,  322,  198,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,   21,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  147,  321,  321,  320,
-      304,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,   97,  321,  321,  321,  321,  321,  321,  321,  266,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  170,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+       21,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  147,
+      322,  322,  321,  305,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,   97,  322,  322,  322,  322,  322,
+      322,  322,  266,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      170,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  146,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,   96,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,   32,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,   33,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  146,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,   96,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,   32,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,   58,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  121,  320,  321,  321,  321,  321,
-      321,  114,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,   59,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  231,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  171,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,   33,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,   58,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  121,  321,
+      322,  322,  322,  322,  322,  114,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+       59,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  231,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  171,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,   47,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  249,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,   51,  321,   52,  321,  321,  321,  321,  321,  100,
-      321,  101,  321,  321,  321,  321,   98,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,   47,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  249,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,   51,  322,   52,  322,
+      322,  322,  322,  322,  100,  322,  101,  322,  322,  322,
+      322,   98,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,    7,  321,  320,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  220,  321,  321,  321,  321,
-      149,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  232,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,   48,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+        7,  322,  321,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      220,  322,  322,  322,  322,  149,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  232,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  190,
-      321,  189,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,   16,   17,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,   62,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  197,  321,  321,  321,  321,
-      321,  321,  103,  321,  102,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  181,  321,  321,  321,
+      322,   48,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  190,  322,  189,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,   16,   17,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,   62,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  197,  322,  322,  322,  322,  322,  322,  103,  322,
+      102,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  129,  320,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,   81,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  210,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-       85,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,   55,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  181,  322,  322,  322,  322,  322,  322,  322,
+      322,  129,  321,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,   81,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  210,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,   85,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,   55,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  184,  185,  321,  321,  321,  260,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,    6,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  264,  321,  321,  321,  321,  321,  321,
-      285,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,   42,  321,  321,  321,  321,   44,  321,  321,  321,
-      321,  321,  321,  321,  321,   45,  321,  321,  321,  321,
-      321,  321,  321,  320,  321,  177,  321,  321,  321,  124,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      184,  185,  322,  322,  322,  260,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,    6,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      264,  322,  322,  322,  322,  322,  322,  285,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,   42,  322,
+      322,  322,  322,   44,  322,  322,  322,  322,  322,  322,
+      322,  322,   45,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      202,  321,  178,  321,  321,  321,  217,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,   46,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  126,  108,  321,
-      109,  321,  321,  321,  107,  321,  321,  321,  321,  321,
-      321,  321,  321,  144,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  248,  321,  321,  321,
-      321,  321,  321,  321,  321,  179,  321,  321,  321,  321,
-      321,  182,  321,  188,  321,  321,  321,  321,  321,  216,
+      321,  322,  177,  322,  322,  322,  124,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  202,  322,  178,
+      322,  322,  322,  217,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,   46,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  126,  108,  322,  109,  322,
+      322,  322,  107,  322,  322,  322,  322,  322,  322,  322,
+      322,  144,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  248,  322,  322,  322,  322,  322,
+      322,  322,  322,  179,  322,  322,  322,  322,  322,  182,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,   95,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  120,  321,  321,  321,  321,  321,  321,
-       53,  321,  321,  321,   26,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,   20,  321,  321,  321,  321,  321,
-      321,   27,   36,  321,  154,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  320,  321,
-      321,  321,  321,  321,  321,   70,   72,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  188,  322,  322,  322,  322,  322,  216,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,   95,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  120,  322,  322,  322,  322,  322,  322,   53,  322,
+      322,  322,   26,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,   20,  322,  322,  322,  322,  322,  322,   27,
+       36,  322,  154,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  321,  322,  322,  322,
+      322,  322,  322,   70,   72,  322,  322,  322,  322,  322,
 
-      268,  321,  321,  321,  321,  228,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  110,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  143,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  279,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  148,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  208,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  288,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  268,  322,
+      322,  322,  322,  228,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  110,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  143,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  279,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  148,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  208,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  165,
-      321,  321,  321,  321,  321,  321,  321,  321,  104,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  160,  321,
-      172,  321,  321,  321,  321,  320,  321,  132,  321,  321,
-      321,  321,  321,   91,  321,  321,  321,  321,  200,  321,
-      321,  321,  321,  321,  321,  218,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  240,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  125,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  288,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  165,  322,
+      322,  322,  322,  322,  322,  322,  322,  104,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  160,  322,  172,
+      322,  322,  322,  322,  321,  322,  132,  322,  322,  322,
+      322,  322,   91,  322,  322,  322,  322,  200,  322,  322,
+      322,  322,  322,  322,  218,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  240,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  164,  321,  321,  321,  321,  321,  321,
-       73,   74,  321,  321,  321,  321,  321,   54,  321,  321,
-      321,  321,  321,   80,  173,  321,  191,  321,  221,  321,
-      321,  183,  261,  321,  321,  321,  321,  321,   66,  321,
-      175,  321,  321,  321,  321,  321,    9,  321,  321,  321,
-       94,  321,  321,  321,  321,  253,  321,  321,  321,  321,
-      199,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  125,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  164,  322,  322,  322,  322,  322,  322,
+       73,   74,  322,  322,  322,  322,  322,   54,  322,  322,
+      322,  322,  322,   80,  173,  322,  191,  322,  221,  322,
+      322,  183,  261,  322,  322,  322,  322,  322,   66,  322,
+      175,  322,  322,  322,  322,  322,    9,  322,  322,  322,
+       94,  322,  322,  322,  322,  253,  322,  322,  322,  322,
+      199,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  320,  321,  321,  321,
-      321,  163,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  150,  321,  267,  321,  321,  321,  321,  321,
-      239,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  212,  321,  321,  321,  321,  259,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  282,  321,  174,  321,  321,  321,  321,
-      321,  321,  321,   65,   67,  321,  321,  321,  321,  321,
-      321,  321,   93,  321,  321,  321,  321,  251,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  321,  322,  322,  322,
+      322,  163,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  150,  322,  267,  322,  322,  322,  322,  322,
+      239,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  212,  322,  295,  322,  322,  322,  259,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  282,  322,  174,  322,  322,  322,
+      322,  322,  322,  322,   65,   67,  322,  322,  322,  322,
 
-      321,  321,  263,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  204,   34,   28,   30,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,   35,  321,   29,
-       31,  321,  321,  321,  321,  321,  321,  321,  321,   90,
-      321,  321,  321,  321,  321,  321,  320,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  206,  203,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,   64,  321,
-      321,  127,  321,  111,  321,  321,  321,  321,  321,  321,
-      321,  321,  145,  312,   13,  321,  321,  321,  321,  321,
+      322,  322,  322,   93,  322,  322,  322,  322,  251,  322,
+      322,  322,  322,  263,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  204,   34,   28,   30,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,   35,  322,
+       29,   31,  322,  322,  322,  322,  322,  322,  322,  322,
+       90,  322,  322,  322,  322,  322,  322,  321,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  206,
+      203,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,   64,
+      322,  322,  127,  322,  111,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  277,  321,  280,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,   12,  321,  321,
-       22,  321,  321,  321,  257,  321,  321,  321,  321,  265,
-      321,  321,  321,   68,  321,  214,  321,  321,  321,  321,
-      205,  321,  321,   63,  321,  321,  321,  321,   23,  321,
-       43,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  159,  158,  312,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  207,  201,  321,  219,  321,
-      321,  269,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  145,  313,   13,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  277,  322,  280,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,   12,  322,
+      322,   22,  322,  322,  322,  257,  322,  322,  322,  322,
+      265,  322,  322,  322,   68,  322,  214,  322,  322,  322,
+      322,  205,  322,  322,   63,  322,  322,  322,  322,   23,
+      322,   43,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  159,  158,  313,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  207,  201,  322,  219,
+      322,  322,  269,  322,  322,  322,  322,  322,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-       75,  321,  321,  321,  252,  321,  321,  321,  321,  187,
-      321,  321,  321,  321,  213,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  286,  287,  156,  321,  321,   69,
-      321,  321,  321,  321,  166,  321,  321,  105,  106,  321,
-      321,  321,  321,  151,  321,  153,  321,  192,  321,  321,
-      321,  321,  157,  321,  321,  222,  321,  321,  321,  321,
-      321,  321,  321,  134,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  230,  321,  321,  321,
-      321,  321,  321,  321,   24,  321,  262,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,   75,  322,  322,  322,  252,  322,  322,  322,  322,
+      187,  322,  322,  322,  322,  213,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  286,  287,  156,  322,  322,
+       69,  322,  322,  322,  322,  166,  322,  322,  105,  106,
+      322,  322,  322,  322,  151,  322,  153,  322,  192,  322,
+      322,  322,  322,  157,  322,  322,  222,  322,  322,  322,
+      322,  322,  322,  322,  134,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  230,  322,  322,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  193,  321,
-      321,  250,  321,  281,  321,  186,  321,  321,  321,  321,
-       49,  321,  321,  321,  321,    4,  321,  321,  321,  321,
-      118,  133,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      225,   37,   38,  321,  321,  321,  321,  321,  321,  321,
-      270,  321,  321,  321,  321,  321,  321,  321,  238,  321,
-      321,  321,  321,  321,  321,  321,  196,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,   78,  321,   50,  256,
-      321,  226,  321,  321,  321,  321,   11,  321,  321,  321,
+      322,  322,  322,  322,  322,   24,  322,  262,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  193,
+      322,  322,  250,  322,  281,  322,  186,  322,  322,  322,
+      322,   49,  322,  322,  322,  322,    4,  322,  322,  322,
+      322,  118,  133,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  225,   37,   38,  322,  322,  322,  322,  322,  322,
+      322,  270,  322,  322,  322,  322,  322,  322,  322,  238,
+      322,  322,  322,  322,  322,  322,  322,  196,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,   78,  322,   50,
 
-      321,  321,  321,  117,  321,  321,  321,  321,  194,   82,
-      321,   40,  321,  321,  321,  321,  321,  321,  321,  321,
-      162,  321,  321,  321,  321,  321,  136,  321,  321,  321,
-      321,  229,  321,  321,  321,  321,  321,  237,  321,  321,
-      321,  321,  130,  321,  321,  112,  113,  321,  321,  321,
-       84,   88,   83,  321,   76,  321,  321,  321,  321,  321,
-       10,  321,  321,  321,  254,  289,  321,  321,  321,  321,
-      294,   39,  321,  321,  321,  321,  321,  161,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      256,  322,  226,  322,  322,  322,  322,   11,  322,  322,
+      322,  322,  322,  322,  117,  322,  322,  322,  322,  194,
+       82,  322,   40,  322,  322,  322,  322,  322,  322,  322,
+      322,  162,  322,  322,  322,  322,  322,  136,  322,  322,
+      322,  322,  229,  322,  322,  322,  322,  322,  237,  322,
+      322,  322,  322,  130,  322,  322,  112,  113,  322,  322,
+      322,   84,   88,   83,  322,   76,  322,  322,  322,  322,
+      322,   10,  322,  322,  322,  254,  289,  322,  322,  322,
+      322,  294,   39,  322,  322,  322,  322,  322,  161,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
 
-       89,   87,  321,   77,  278,  321,  321,  321,  321,  321,
-      321,  321,  180,  321,  321,  321,  321,  321,  195,  321,
-      321,  321,  321,  321,  321,  321,  321,  152,   71,  321,
-      321,  321,  321,  321,  271,  321,  321,  321,  321,  321,
-      321,  321,  234,  321,  321,  233,  131,  321,   86,  137,
-      138,  141,  142,  139,  140,   79,  321,  255,  321,  321,
-      321,  321,  155,  321,  321,  321,  321,  321,  224,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  168,  167,   41,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,   89,   87,  322,   77,  278,  322,  322,  322,  322,
+      322,  322,  322,  180,  322,  322,  322,  322,  322,  195,
+      322,  322,  322,  322,  322,  322,  322,  322,  152,   71,
+      322,  322,  322,  322,  322,  271,  322,  322,  322,  322,
+      322,  322,  322,  234,  322,  322,  233,  131,  322,   86,
+      137,  138,  141,  142,  139,  140,   79,  322,  255,  322,
+      322,  322,  322,  155,  322,  322,  322,  322,  322,  224,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  168,  167,   41,
 
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  321,  321,   92,  321,  223,  321,  247,  275,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,    5,  321,  321,  215,  321,  321,  276,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  235,   25,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
-      321,  236,  321,  321,  321,  135,  321,  321,  321,  321,
-      321,  321,  321,  321,  169,  321,  176,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  272,  321,  321,  321,
-      321,  321,  321,  321,  321,  321,  321,  321,  321,  321,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,   92,  322,  223,  322,  247,  275,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,    5,  322,  322,  215,  322,  322,  276,  322,
+      322,  322,  322,  322,  322,  322,  322,  322,  235,   25,
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  236,  322,  322,  322,  135,  322,  322,  322,
+      322,  322,  322,  322,  322,  169,  322,  176,  322,  322,
+      322,  322,  322,  322,  322,  322,  322,  272,  322,  322,
 
-      321,  321,  321,  321,  293,  321,  321,  243,  321,  321,
-      321,  321,  321,  273,  321,  321,  321,  321,  321,  321,
-      274,  321,  321,  321,  241,  321,  244,  245,  321,  321,
-      321,  321,  321,  242,  246,    0
+      322,  322,  322,  322,  322,  322,  322,  322,  322,  322,
+      322,  322,  322,  322,  322,  293,  322,  322,  243,  322,
+      322,  322,  322,  322,  273,  322,  322,  322,  322,  322,
+      322,  274,  322,  322,  322,  241,  322,  244,  245,  322,
+      322,  322,  322,  322,  242,  246,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -752,17 +753,17 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3155] =
+static const flex_int16_t yy_base[3166] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 4335, 3834,   81, 6133,
-     6133, 6133,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 3174, 3068,   81, 6159,
+     6159, 6159,  129,   52,  130,   63,  131,  152,   70,  140,
       144,  156,   57,   88,   76,  173,  175,   95,  184,  135,
-      185,  205,  147,  204,  178,  123, 3717, 6133, 6133, 6133,
-      107, 3426, 6133, 6133, 6133,  178, 3362, 3153, 6133, 6133,
-     6133,  224, 2654, 6133, 6133, 6133,  204, 2276, 6133,  238,
-     6133,  242,  197, 2238, 1962, 6133, 6133, 6133,  246, 1833,
-     6133, 6133, 6133,  216, 1673,  252,  166,    0,  256,    0,
+      185,  205,  147,  204,  178,  123, 2844, 6159, 6159, 6159,
+      107, 2406, 6159, 6159, 6159,  178, 2248, 2125, 6159, 6159,
+     6159,  224, 2071, 6159, 6159, 6159,  204, 2005, 6159,  238,
+     6159,  242,  197, 1902, 1688, 6159, 6159, 6159,  246, 1637,
+     6159, 6159, 6159,  216, 1370,  252,  166,    0,  256,    0,
         0,  216,  248,  162,  241,  250,  254,  258,   92,  259,
 
       262,  263,  260,  264,  265,  272,  267,  273,  271,  282,
@@ -770,7 +771,7 @@ static const flex_int16_t yy_base[3155] =
       311,  300,  316,  191,  321,  315,  323,  304,  325,  327,
       326,  337,  329,  338,  340,  348,  341,  345,  347,  350,
       357,  227,  351,  354,  358,  362,  369,  359,  373,  379,
-      374,  377,  383,  385,  387,  384, 1618,  403, 1352,  406,
+      374,  377,  383,  385,  387,  384, 1072,  403,  947,  406,
       814,  416,  740,  688,  410,  600,  420,  424,    0,  416,
       501,  430,  464,  442,  435,  422,  434,  429,  430,  431,
       433,  397,  432,  435,  436,  437,  440,  454,  438,  453,
@@ -791,670 +792,672 @@ static const flex_int16_t yy_base[3155] =
       719,  717,  725,  713,  718,  733,  723,  737,  726,  745,
       743,  730,  758,  744,  747,  749,  759,  748,  750,  756,
       769,  761,  779,  766,  773,  781,  784,  792,  789,  795,
-      785,  797,  787,  798,  801,  803,  810,  808, 6133,  805,
+      785,  797,  787,  798,  801,  803,  810,  808, 6159,  805,
       807,  819,  822,  823,  826,  816,  832,  806,  836,  839,
-      841,  838,  846,  868,  824,  842,  845,  847,  850, 6133,
+      841,  838,  846,  868,  824,  842,  845,  847,  850, 6159,
       854,  852,  892,  861,  856,  878,  874,  858,  881,  870,
       888,  882,  896,  883,  893,  898,  916,  899,  903,  905,
       902,  914,  915,  924,  926,  921,  928,  929,  937,  932,
 
       933,  934,  938,  942,  944,  945,  950,  946,  951,  952,
-      954,  965,  955,  963,  959,  967,  968,  970,  972,  983,
-      976,  977,  993,  984,  989,  994,  996,  997,  991, 1000,
-     1003, 1007, 1004, 1008, 1012, 1020, 1015, 1010, 1017, 1018,
-     1022, 1028, 1024, 1026, 1030, 1031, 1032, 1040, 1033, 1041,
-     1034, 1047, 1049,  752, 6133, 1051, 1053, 1054, 1055, 1056,
-     1057, 6133, 1059, 1058, 1061, 1066, 1063, 1071, 1080, 1067,
-     1082, 1070, 1083, 1084, 1092, 1087, 1088, 1095, 1094, 1096,
-      947, 1098, 1100, 1105, 1102, 1106, 1109, 1103, 1114, 1128,
-     6133, 1112, 1115, 1116, 1118, 1123, 1131, 1140, 1126, 1133,
+      955,  965,  958,  963,  967,  968,  970,  972,  973,  975,
+      985,  979,  993,  969,  991,  995,  998, 1000,  976, 1002,
+     1004, 1007, 1008, 1009, 1010, 1018, 1015, 1014, 1016, 1020,
+     1021, 1023, 1027, 1028, 1031, 1030, 1033, 1034, 1035, 1040,
+     1045, 1043, 1051,  752, 6159, 1053, 1044, 1055, 1057, 1056,
+     1046, 6159, 1059, 1060, 1061, 1068, 1069, 1073, 1081, 1070,
+     1074, 1087, 1083, 1088, 1095, 1071, 1093, 1098, 1094, 1099,
+     1100, 1102, 1101, 1106, 1109, 1107, 1110, 1113, 1114, 1133,
+     6159, 1115, 1121, 1125, 1118, 1128, 1138, 1145, 1131, 1143,
 
-     1143, 1146, 1156, 1151, 1121, 1152, 1153, 1157, 1160, 1163,
-     1165, 1166, 1168, 1169, 1170, 1171, 1172, 1174, 1179, 1184,
-     6133, 1177, 1187, 1195, 1196, 1182, 1198, 1199, 1200, 1201,
-     1202, 1203, 1205, 1204, 1210, 1220, 1211, 1224, 1221, 1222,
-     1226, 1227, 1229, 1228, 1230, 1232, 1244, 1237, 1236, 1252,
-     1247, 1254, 1256, 1263, 1265, 1245, 1258, 1262, 1260, 1268,
-     1269, 1270, 1271, 1273, 1274, 1283, 1280, 1281, 1282, 1285,
-     1295, 1286, 1288, 1298, 1290, 1296, 1293, 1300, 1304, 1307,
-     1303, 1313, 6133, 1320, 1315, 1318, 1319, 1322, 1326, 1325,
-     1331, 1332, 1333, 1335, 1334, 1336, 1338, 1342, 1341, 1343,
+     1151, 1155, 1163, 1140, 1117, 1158, 1160, 1161, 1165, 1171,
+     1169, 1166, 1173, 1174, 1175, 1177, 1176, 1179, 1186, 1183,
+     6159, 1187, 1191, 1200, 1192, 1199, 1202, 1203, 1205, 1206,
+     1207, 1209, 1208, 1215, 1213, 1225, 1216, 1232, 1218, 1231,
+     1227, 1229, 1233, 1236, 1237, 1235, 1248, 1245, 1250, 1255,
+     1263, 1260, 1262, 1270, 1272, 1252, 1265, 1240, 1269, 1267,
+     1268, 1275, 1279, 1280, 1281, 1283, 1288, 1285, 1290, 1291,
+     1292, 1299, 1297, 1295, 1298, 1304, 1313, 1305, 1311, 1315,
+     1316, 1317, 1318, 6159, 1325, 1326, 1329, 1324, 1334, 1337,
+     1336, 1330, 1338, 1342, 1294, 1343, 1344, 1352, 1345, 1347,
 
-     1344, 1346, 1355, 1357, 1361, 1368, 1367, 1369, 1354, 1362,
-     1377, 1373, 1381, 1379, 1380, 1389, 1384, 1386, 1387, 1396,
-     1391, 1393, 1395, 1394, 1403, 1398, 1408, 1415, 1401, 1412,
-     1422, 1418, 1420, 1423, 1424, 1427, 1428, 1430, 1431, 1432,
-     1433, 1440, 1435, 1438, 1437, 1441, 1436, 1442, 1450, 1444,
-     1463, 1455, 1458, 1460, 1464, 1467, 1466, 1465, 1468, 1472,
-     1473, 1475, 1474, 1476, 1478, 1485,  875, 1487, 1489, 1493,
-     1495, 1497, 1496, 1500, 1499, 1502, 1508, 1498, 1511, 1512,
-     1515, 1517, 1519, 1520, 1524, 1528, 1522, 1530, 1523, 1533,
-     1534, 1541, 1542, 1545, 1537, 6133, 1535, 1556, 1548, 1549,
+     1353, 1358, 1359, 1361, 1357, 1362, 1375, 1374, 1376, 1360,
+     1368, 1385, 1383, 1386, 1384, 1389, 1396, 1391, 1392, 1393,
+     1403, 1399, 1400, 1401, 1402, 1407, 1410, 1411, 1421, 1416,
+     1419, 1426, 1430, 1423, 1432, 1427, 1433, 1436, 1437, 1438,
+     1439, 1440, 1447, 1445, 1442, 1444, 1450, 1443, 1452, 1457,
+     1453, 1470, 1462, 1463, 1466, 1467, 1473, 1472, 1478, 1474,
+     1479, 1480, 1482, 1481, 1483, 1489, 1488,  875, 1491, 1496,
+     1500, 1502, 1504, 1503, 1506, 1508, 1509, 1513, 1512, 1519,
+     1520, 1522, 1523, 1525, 1528, 1524, 1531, 1534, 1538, 1539,
+     1541, 1540, 1543, 1544, 1550, 1551, 6159, 1546, 1558, 1556,
 
-     1552, 1557, 1558, 1565, 1561, 1560, 1562, 1563, 1566, 1589,
-     6133, 1570, 6133, 6133, 1573, 6133, 6133, 1572, 1571, 6133,
-     1578, 1579, 1583, 1574, 1592, 1596, 1597, 1599, 1600, 1610,
-     1621, 1612, 1603, 1614, 1602, 1616, 1635, 1630, 1605, 1626,
-     1642, 1631, 1644, 1645, 1649, 1651, 1646, 1638, 1652, 1654,
-     1659, 1655, 1660, 1662, 1665, 1666, 1664, 1668, 1669, 1676,
-     1681, 1672, 1689, 6133, 1685, 1693, 1698, 1694, 1701, 1697,
-     1696, 1703, 1705, 1707, 1708, 1709, 1710, 1712, 1713, 1718,
-     1675, 1714, 1726, 1721, 6133, 1724, 1725, 1723, 1730, 1728,
-     1736, 1738, 1731, 1729, 1741, 1742, 1752, 1748, 1744, 1753,
+     1559, 1557, 1562, 1564, 1572, 1567, 1570, 1568, 1571, 1573,
+     1597, 6159, 1574, 6159, 6159, 1578, 6159, 6159, 1579, 1584,
+     6159, 1585, 1583, 1594, 1600, 1580, 1607, 1119, 1603, 1598,
+     1605, 1620, 1626, 1613, 1601, 1611, 1615, 1631, 1642, 1632,
+     1623, 1635, 1646, 1643, 1649, 1651, 1654, 1655, 1658, 1659,
+     1660, 1661, 1663, 1665, 1666, 1662, 1669, 1671, 1668, 1675,
+     1674, 1685, 1684, 1691, 1694, 6159, 1692, 1701, 1704, 1700,
+     1708, 1703, 1707, 1709, 1711, 1715, 1712, 1716, 1718, 1719,
+     1680, 1722, 1724, 1727, 1731, 1728, 6159, 1729, 1730, 1732,
+     1736, 1737, 1740, 1744, 1745, 1742, 1748, 1750, 1761, 1751,
 
-     1756, 1757, 1758, 6133, 1760, 1764, 1766, 1768, 1767, 1770,
-     1771, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1789, 1784,
-     1786, 1792, 1794, 1801, 1802, 1804, 1806, 1803, 1810, 1812,
-     1813, 1814, 1815, 1817, 1818, 1826, 1828, 1825, 1830, 1827,
-     1835, 1846, 1841, 1831, 1842, 1843, 1844, 1851, 1855, 1853,
-     1857, 1858, 1866, 1859, 1864, 1867, 1868, 1878, 1861, 1870,
-     1880, 1869, 1882, 1883, 1884, 6133, 1886, 1887, 6133, 1889,
-     1890, 1912, 1892, 1894, 1899, 1896, 1897, 1900, 1905, 1913,
-     1919, 1916, 1932, 1925, 1929, 1935, 1937, 1940, 1906, 1936,
-     1942, 1938, 1944, 1948, 1947, 1960, 1967, 1908, 1968, 1970,
+     1753, 1754, 1762, 1758, 1766, 6159, 1770, 1765, 1774, 1775,
+     1776, 1778, 1779, 1781, 1784, 1783, 1785, 1786, 1787, 1788,
+     1800, 1793, 1789, 1791, 1806, 1809, 1811, 1812, 1814, 1796,
+     1818, 1819, 1821, 1822, 1823, 1824, 1826, 1834, 1836, 1833,
+     1837, 1832, 1841, 1844, 1849, 1840, 1848, 1850, 1851, 1856,
+     1864, 1862, 1861, 1854, 1869, 1866, 1871, 1873, 1875, 1882,
+     1874, 1883, 1877, 1884, 1885, 1888, 1890, 6159, 1892, 1894,
+     6159, 1895, 1896, 1918, 1897, 1899, 1904, 1901, 1907, 1910,
+     1911, 1922, 1920, 1924, 1941, 1928, 1930, 1942, 1933, 1945,
+     1931, 1947, 1949, 1951, 1953, 1955, 1956, 1954, 1971, 1974,
 
-     1949, 1946, 1962, 1981, 1966, 1969, 1972, 1973, 1975, 1979,
-     1983, 1988, 1977, 1990, 1993, 1994, 1997, 6133, 2005, 2003,
-     2004, 2008, 2016, 2013, 2011, 6133, 2015, 2019, 2020, 2031,
-     2026, 2014, 2022, 2012, 2029, 2034, 2037, 2038, 2039, 2040,
-     2041, 2050, 6133, 2045, 6133, 2042, 2051, 2053, 2052, 2055,
-     2059, 2057, 2060, 6133, 6133, 2063, 2067, 2069, 2081, 2064,
-     6133, 2078, 2085, 2082, 2087, 2088, 2080, 2089, 2091, 2093,
-     2092, 2101, 2096, 2103, 2098, 2099, 2108, 6133, 2111, 2110,
-     2112, 2115, 2118, 2119, 2121, 2123, 6133, 2127, 2125, 2130,
-     2138, 2129, 2137, 2139, 2140, 2144, 2142, 2147, 2148, 2149,
+     1913, 1966, 1975, 1957, 1970, 1973, 1992, 1976, 1977, 1980,
+     1978, 1983, 1981, 1987, 1985, 1996, 1997, 2002, 2003, 2004,
+     6159, 2014, 2010, 2009, 2017, 2025, 2021, 2020, 6159, 2022,
+     2023, 2027, 2035, 2033, 2034, 2036, 2037, 2038, 2040, 2044,
+     2045, 2046, 2058, 2048, 2067, 6159, 2047, 6159, 2059, 2049,
+     2051, 2062, 2050, 2066, 2072, 2074, 6159, 6159, 2075, 2078,
+     2082, 2090, 2085, 6159, 2086, 2094, 2091, 2096, 2089, 2097,
+     2100, 2101, 2105, 2106, 2110, 2107, 2114, 2109, 2115, 2111,
+     6159, 2123, 2112, 2129, 2130, 2122, 2131, 2132, 2128, 6159,
+     2139, 2141, 2142, 2149, 2147, 2144, 2150, 2151, 2155, 2152,
 
-     2150, 2159, 2161, 2151, 2162, 2164, 2171, 6133, 2154, 2158,
-     2176, 2174, 2181, 2173, 2175, 2177, 2183, 2185, 2186, 2187,
-     2190, 2191, 2192, 2199, 2200, 2197, 2196, 2205, 2206, 2207,
-     2210, 2213, 2214, 2215, 2216, 2217, 6133, 2218, 2220, 2223,
-      391, 2226, 2229, 2227, 2228, 2236, 2231, 2234, 2247, 2252,
-     2248, 2249, 2250, 2256, 2257, 2258, 2259, 2260, 2261, 2262,
-     2264, 6133, 2266, 2267, 2269, 2273, 2272, 2275, 2280, 6133,
-     2282, 2289, 2292, 2301, 2284, 2293, 2302, 2298, 2303, 2304,
-     2306, 2308, 2310, 2309, 2312, 2315, 6133, 2319, 2320, 2324,
-     2316, 2326, 2328, 2330, 2333, 2335, 2337, 2340, 2338, 2342,
+     2158, 2159, 2160, 2161, 2171, 2172, 2162, 2164, 2173, 2181,
+     6159, 2176, 2180, 2188, 2184, 2186, 2183, 2187, 2190, 2191,
+     2195, 2199, 2193, 2197, 2201, 2203, 2211, 2212, 2209, 2214,
+     2217, 2207, 2218, 2221, 2227, 2220, 2225, 2228, 2229, 6159,
+     2230, 2236, 2231,  391, 2239, 2237, 2243, 2240, 2241, 2257,
+     2242, 2264, 2265, 2261, 2244, 2263, 2260, 2267, 2270, 2269,
+     2271, 2272, 2273, 2276, 6159, 2278, 2280, 2282, 2283, 2285,
+     2286, 2296, 6159, 2289, 2302, 2287, 2305, 2307, 2297, 2313,
+     2299, 2308, 2319, 2317, 2320, 2309, 2324, 2323, 2325, 2327,
+     6159, 2331, 2333, 2335, 2332, 2342, 2341, 2334, 2344, 2348,
 
-     2343, 2341, 2344, 2345, 2351, 2346, 2347, 2354, 2359, 6133,
-     2364, 2362, 2366, 2370, 2369, 2371, 2372, 2387, 2373, 2379,
-     2375, 2382, 2394, 2385, 2391, 2396, 2404, 2401, 2409, 2414,
-     2410, 2411, 2419, 2412, 2421, 2423, 2424, 2425, 2427, 2429,
-     2430, 2431, 2432, 2440, 2447, 2437, 2448, 2446, 2438, 2456,
-     2457, 6133, 2459, 2458, 2451, 2461, 2477, 2465, 2467, 2475,
-     2472, 2478, 2479, 2481, 2482, 2490, 2491, 2485, 2483, 2494,
-     2488, 2495, 2501, 2503, 2505, 2507, 2508, 2512, 2395, 6133,
-     2513, 2509, 2515, 2517, 2521, 2518, 2525, 2529, 2522, 2531,
-     2532, 2536, 2537, 2539, 2540, 2541, 2545, 2547, 2533, 6133,
+     2349, 2350, 2351, 2353, 2355, 2354, 2356, 2357, 2358, 2361,
+     2365, 2369, 2370, 6159, 2378, 2371, 2374, 2382, 2380, 2387,
+     2381, 2397, 2383, 2384, 2394, 2403, 2408, 2399, 2401, 2411,
+     2414, 2418, 2419, 2426, 2424, 2425, 2432, 2422, 2434, 2436,
+     2437, 2438, 2440, 2442, 2445, 2395, 2446, 2453, 2454, 2455,
+     2459, 2452, 2473, 2478, 2458, 6159, 2467, 2465, 2477, 2479,
+     2487, 2482, 2483, 2484, 2485, 2492, 2490, 2493, 2494, 2502,
+     2497, 2503, 2500, 2510, 2504, 2507, 2506, 2513, 2517, 2520,
+     2521, 2526, 2527, 6159, 2528, 2530, 2523, 2532, 2534, 2537,
+     2540, 2543, 2545, 2546, 2547, 2549, 2551, 2552, 2553, 2554,
 
-     2555, 2544, 2543, 2550, 2556, 2562, 2563, 2566, 2572, 2569,
-     2565, 2575, 2577, 2567, 6133, 2582, 2585, 2586, 2593, 2588,
-     2589, 2590, 2595, 2578, 6133, 2592, 2596, 2599, 2606, 2609,
-     2604, 6133, 2611, 2612, 2613, 2602, 2615, 2617, 2618, 2620,
-     2621, 2623, 2625, 2628, 2624, 2631, 6133, 2634, 2643, 2638,
-     2639, 2644, 2645, 2649, 2650, 2655, 2657, 2667, 2658, 6133,
-     2676, 2671, 2651, 2679, 2661, 2674, 2677, 2681, 2682, 2683,
-     2684, 2685, 6133, 2688, 2690, 2691, 2692, 2694, 2696, 2697,
-     2710, 2699, 2703, 2706, 2712, 2713, 2707, 2718, 2717, 2725,
-     2715, 2729, 2731, 2719, 2735, 2721, 2736, 2739, 2746, 2748,
+     2556, 2558, 2561, 6159, 2563, 2562, 2564, 2570, 2575, 2574,
+     2576, 2578, 2585, 2587, 2572, 2588, 2444, 2589, 6159, 2597,
+     2599, 2595, 2604, 2596, 2601, 2603, 2607, 2608, 6159, 2609,
+     2610, 2611, 2618, 2619, 2615, 6159, 2622, 2617, 2623, 2626,
+     2625, 2627, 2632, 2629, 2635, 2636, 2641, 2648, 2640, 2650,
+     6159, 2642, 2657, 2644, 2658, 2664, 2652, 2653, 2659, 2665,
+     2669, 2679, 2671, 6159, 2682, 2680, 2675, 2689, 2687, 2690,
+     2691, 2692, 2693, 2694, 2695, 2696, 2699, 6159, 2700, 2702,
+     2703, 2704, 2707, 2708, 2710, 2723, 2713, 2718, 2722, 2724,
+     2727, 2728, 2730, 2731, 2740, 2732, 2734, 2748, 2741, 2746,
 
-     2749, 2751, 6133, 2754, 2743, 2755, 2745, 2756, 2758, 2759,
-     2760, 2762, 2767, 2769, 2765, 2768, 2777, 2784, 2772, 2780,
-     2785, 2786, 2788, 2789, 2790, 2791, 2795, 2799, 2796, 2798,
-     2806, 2802, 2808, 2816, 2803, 2807, 2812, 2815, 2818, 2817,
-     2820, 2827, 2830, 2825, 2840, 2842, 2843, 2819, 2836, 2844,
-     2845, 2850, 6133, 2829, 2846, 2855, 2854, 2857, 2860, 2861,
-     2868, 2863, 2864, 2867, 2871, 2876, 2865, 2879, 2881, 2888,
-     2884, 6133, 2886, 6133, 2887, 2889, 2890, 2898, 2893, 6133,
-     2896, 6133, 2899, 2906, 2900, 2903, 6133, 2907, 2909, 2911,
-     2914, 2912, 2917, 2918, 2921, 2922, 2923, 2925, 2928, 2930,
+     2744, 2733, 2753, 2757, 2761, 2762, 2764, 6159, 2767, 2768,
+     2769, 2759, 2770, 2771, 2773, 2774, 2776, 2779, 2783, 2781,
+     2782, 2791, 2798, 2789, 2793, 2799, 2800, 2802, 2803, 2804,
+     2805, 2806, 2813, 2810, 2812, 2820, 2816, 2821, 2828, 2817,
+     2826, 2829, 2830, 2832, 2831, 2839, 2833, 2837, 2841, 2843,
+     2851, 2855, 2857, 2856, 2858, 2859, 2862, 6159, 2847, 2866,
+     2863, 2870, 2873, 2875, 2877, 2885, 2876, 2880, 2883, 2892,
+     2894, 2884, 2887, 2886, 2901, 2900, 6159, 2897, 6159, 2902,
+     2903, 2909, 2913, 2911, 6159, 2917, 6159, 2918, 2920, 2912,
+     2914, 6159, 2922, 2924, 2926, 2932, 2927, 2929, 2934, 2936,
 
-     2931, 2932, 2935, 2939, 2942, 2940, 2944, 2948, 2941, 2950,
-     2953, 2954, 2958, 2959, 2963, 6133, 2967, 2960, 2964, 2969,
-     2970, 2971, 2972, 2973, 2979, 2980, 2981, 2977, 2987, 2988,
-     2991, 2994, 3002, 2995, 3004, 6133, 3003, 3006, 3007, 3010,
-     6133, 3009, 3011, 3012, 3018, 3020, 3021, 3022, 3024, 3028,
-     3023, 3030, 3025, 3040, 3038, 3031, 3044, 6133, 3048, 3049,
-     3050, 3052, 3060, 3062, 3061, 3064, 3067, 3076, 3069, 3071,
-     3033, 3053, 3073, 3077, 3085, 3087, 3078, 3088, 3086, 3089,
-     3091, 3092, 3095, 3096, 3098, 3100, 3101, 3099, 3105, 3106,
-     3108, 3103, 3104, 3107, 3110, 6133, 3126, 3112, 3122, 3128,
+     2937, 2938, 2940, 2943, 2945, 2946, 2947, 2952, 2954, 2957,
+     2955, 2959, 2963, 2956, 2964, 2968, 2969, 2973, 2974, 2978,
+     6159, 2982, 2975, 2979, 2984, 2985, 2986, 2987, 2988, 2994,
+     2995, 2996, 2992, 3002, 3003, 3006, 3009, 3017, 3010, 3019,
+     6159, 3018, 3021, 3022, 3025, 6159, 3024, 3026, 3027, 3033,
+     3035, 3036, 3037, 3039, 3043, 3038, 3045, 3040, 3055, 3053,
+     3046, 3059, 6159, 3063, 3064, 3065, 3067, 3075, 3077, 3082,
+     3079, 3080, 3085, 3089, 3087, 3088, 3048, 3091, 3093, 3094,
+     3102, 3104, 3095, 3105, 3103, 3106, 3108, 3109, 3112, 3115,
+     3116, 3117, 3118, 3121, 3122, 3124, 3125, 3120, 3123, 3127,
 
-     3120, 3130, 3133, 3134, 3136, 3138, 3139, 3142, 3140, 6133,
-     3143, 6133, 3137, 3147, 3149, 3160, 3155, 3161, 3165, 3170,
-     3164, 3166, 3171, 3173, 3172, 3174, 3175, 3180, 3183, 3187,
-     3188, 3194, 3181, 3189, 3186, 3197, 3198, 3200, 6133, 6133,
-     3203, 3205, 3206, 3208, 3209, 3210, 3216, 3213, 3221, 3219,
-     3220, 3227, 3235, 6133, 3230, 3232, 3233, 3238, 3242, 3239,
-     3249, 3246, 3251, 3258, 3253, 6133, 3250, 3254, 3266, 3261,
-     3262, 3269, 6133, 3264, 6133, 3267, 3273, 3275, 3276, 3277,
-     3278, 3279, 3280, 3282, 3295, 3302, 3284, 3288, 3298, 3299,
-     3300, 3301, 3310, 3305, 3306, 3307, 6133, 3309, 3311, 3312,
+     3128, 6159, 3139, 3142, 3145, 3146, 3129, 3151, 3148, 3152,
+     3154, 3153, 3157, 3166, 3155, 6159, 3159, 6159, 3156, 3158,
+     3177, 3183, 3173, 3169, 3186, 3191, 3167, 3184, 3188, 3192,
+     3194, 3195, 3196, 3198, 3200, 3199, 3207, 3215, 3202, 3206,
+     3210, 3204, 3216, 3221, 6159, 6159, 3220, 3223, 3224, 3226,
+     3227, 3229, 3237, 3231, 3230, 3239, 3244, 3246, 3254, 6159,
+     3247, 3251, 3249, 3250, 3262, 3258, 3260, 3269, 3267, 3274,
+     3273, 6159, 3270, 3275, 3283, 3278, 3284, 3286, 6159, 3288,
+     6159, 3281, 3282, 3294, 3295, 3285, 3292, 3297, 3299, 3307,
+     3309, 3314, 3310, 3316, 3312, 3317, 3318, 3320, 3325, 3321,
 
-     3315, 3321, 3323, 3324, 3313, 6133, 3329, 3330, 3335, 3332,
-     3337, 3338, 3340, 3342, 3343, 3346, 3347, 3344, 3348, 3360,
-     3352, 3353, 3355, 3366, 3367, 3373, 6133, 3369, 3375, 3382,
-     3378, 3379, 3381, 3385, 3380, 3386, 3387, 3389, 3390, 3392,
-     3393, 3394, 3396, 3398, 3401, 3399, 3404, 3412, 3413, 3415,
-     3424, 3420, 6133, 3421, 3422, 3425, 3427, 3430, 3431, 3434,
-     3436, 3437, 3443, 3447, 3439, 3449, 3451, 3452, 3459, 3455,
-     6133, 3467, 3454, 3468, 3463, 3466, 3465, 3473, 3471, 3481,
-     3477, 3478, 3479, 3486, 3482, 6133, 3493, 3483, 3501, 3484,
-     3485, 3510, 3505, 3506, 3494, 3508, 3509, 3511, 3513, 3516,
+     3322, 3324, 6159, 3327, 3329, 3330, 3331, 3339, 3340, 3341,
+     3346, 6159, 3347, 3348, 3352, 3353, 3354, 3355, 3357, 3361,
+     3358, 3364, 3367, 3362, 3360, 3377, 3370, 3368, 3378, 3388,
+     3389, 3391, 6159, 3393, 3385, 3401, 3397, 3399, 3400, 3403,
+     3404, 3383, 3407, 3408, 3409, 3410, 3412, 3416, 3417, 3413,
+     3420, 3419, 3422, 3430, 3423, 3437, 3446, 3431, 6159, 3441,
+     3433, 3443, 3444, 3445, 3449, 3450, 3455, 3457, 3448, 3462,
+     3466, 3458, 3469, 3471, 3472, 3480, 3475, 6159, 3483, 3473,
+     3487, 3482, 3485, 3493, 3494, 3484, 3502, 3486, 3497, 3501,
+     3509, 3504, 6159, 3512, 3508, 3513, 3514, 3516, 3526, 3510,
 
-     3517, 3520, 3521, 6133, 6133, 3523, 3524, 3525, 6133, 3527,
-     3529, 3537, 3540, 3530, 3528, 3545, 3544, 3532, 3546, 3542,
-     3548, 6133, 3554, 3561, 3556, 3560, 3563, 3571, 3570, 3572,
-     3566, 3562, 3573, 3574, 3578, 3579, 3580, 3583, 3591, 3593,
-     3588, 3589, 3590, 6133, 3595, 3596, 3598, 3600, 3601, 3602,
-     6133, 3605, 3607, 3613, 3612, 3623, 3625, 3616, 3631, 3614,
-     3626, 3609, 3633, 3634, 3636, 3643, 3642, 3639, 3646, 3647,
-     3649, 6133, 3641, 3651, 3652, 3659, 6133, 3661, 3669, 3670,
-     3671, 3655, 3673, 3674, 3682, 6133, 3675, 3679, 3677, 3666,
-     3690, 3680, 3694, 3692, 3693, 6133, 3695, 3685, 3696, 6133,
+     3518, 3523, 3528, 3529, 3532, 3530, 3534, 3535, 3540, 3537,
+     6159, 6159, 3542, 3543, 3545, 6159, 3549, 3546, 3553, 3552,
+     3548, 3559, 3563, 3562, 3560, 3564, 3561, 3566, 6159, 3572,
+     3579, 3575, 3576, 3584, 3591, 3581, 3588, 3589, 3590, 3592,
+     3594, 3596, 3597, 3600, 3601, 3609, 3613, 3604, 3605, 3608,
+     6159, 3614, 3616, 3617, 3619, 3621, 3627, 6159, 3625, 3629,
+     3630, 3623, 3646, 3631, 3637, 3650, 3639, 3641, 3643, 3647,
+     3651, 3654, 3663, 3658, 3656, 3665, 3666, 3668, 6159, 3669,
+     3659, 3676, 3680, 6159, 3682, 3689, 3690, 3691, 3677, 3687,
+     3686, 3699, 6159, 3694, 3697, 3695, 3700, 3708, 3704, 3711,
 
-     3700, 3698, 3709, 3711, 3706, 3718, 3713, 3715, 3716, 3714,
-     6133, 3724, 6133, 3725, 3721, 3730, 6133, 3727, 3732, 3735,
-     3737, 3734, 3741, 3742, 3745, 3750, 3738, 3751, 3752, 3753,
-     3755, 3756, 3763, 3762, 3764, 3765, 3754, 6133, 3766, 3769,
-     3775, 3776, 3779, 3774, 3771, 3785, 3781, 6133, 6133, 3796,
-     6133, 3797, 3782, 3789, 6133, 3791, 3793, 3808, 3799, 3803,
-     3809, 3813, 3810, 6133, 3814, 3801, 3815, 3819, 3817, 3822,
-     3824, 3825, 3827, 3828, 3829, 3832, 6133, 3830, 3833, 3841,
-     3831, 3842, 3852, 3848, 3846, 6133, 3856, 3857, 3847, 3858,
-     3860, 6133, 3864, 6133, 3868, 3869, 3870, 3872, 3871, 6133,
+     3709, 3710, 6159, 3712, 3713, 3715, 6159, 3716, 3717, 3728,
+     3730, 3721, 3737, 3733, 3735, 3736, 3734, 6159, 3744, 6159,
+     3745, 3738, 3746, 6159, 3751, 3752, 3753, 3755, 3756, 3757,
+     3761, 3767, 3760, 3768, 3769, 3771, 3772, 3773, 3774, 3781,
+     3776, 3783, 3780, 3782, 6159, 3785, 3784, 3790, 3800, 3803,
+     3805, 3795, 3787, 3806, 3809, 6159, 6159, 3813, 6159, 3815,
+     3810, 3816, 6159, 3819, 3817, 3827, 3820, 3823, 3828, 3836,
+     3825, 6159, 3838, 3829, 3839, 3840, 3843, 3842, 3844, 3846,
+     3848, 3847, 3849, 3855, 6159, 3850, 3853, 3867, 3854, 3857,
+     3868, 3875, 3862, 6159, 3876, 3883, 3869, 3879, 3886, 6159,
 
-     3875, 3879, 3881, 3876, 3883, 3885, 3884, 3891, 3892, 3894,
-     3901, 3898, 3899, 3897, 6133, 3900, 3904, 3907, 3908, 3911,
-     3913, 3921, 3917, 3923, 3916, 3920, 3930, 3927, 3931, 3937,
-     3935, 3940, 3924, 6133, 3941, 3946, 3943, 3955, 3947, 3951,
-     6133, 3957, 3960, 3961, 6133, 3958, 3952, 3959, 3974, 3962,
-     3967, 3970, 3975, 3976, 6133, 3978, 3981, 3977, 3979, 3982,
-     3983, 6133, 6133, 3988, 6133, 3995, 3996, 3998, 3999, 4000,
-     4002, 4004, 4005, 4009, 4010, 4012, 4015, 4018, 4006, 4027,
-     4030, 4038, 4033, 4034, 4023, 6133, 6133, 4040, 4044, 4037,
-     4048, 4049, 4041, 4051, 4058, 4055, 4056, 4062, 4063, 4071,
+     3888, 6159, 3878, 3889, 3890, 3892, 3891, 6159, 3899, 3895,
+     3904, 3900, 3906, 3905, 3908, 3912, 3914, 3915, 3922, 3918,
+     3920, 3919, 6159, 3921, 3924, 3929, 3930, 3934, 3925, 3942,
+     3939, 3941, 3937, 3946, 3948, 3951, 3952, 3956, 3950, 3960,
+     3958, 6159, 3961, 3964, 3967, 3975, 3968, 3971, 6159, 3972,
+     3980, 3981, 6159, 3978, 3979, 3987, 3990, 3982, 3992, 3993,
+     3994, 3997, 6159, 3995, 4001, 3998, 4006, 4014, 4015, 6159,
+     6159, 4016, 6159, 4017, 4002, 4005, 4003, 4004, 4027, 4031,
+     4028, 4033, 4026, 4034, 4039, 4040, 4041, 4048, 4049, 4052,
+     4051, 4050, 4055, 6159, 6159, 4057, 4059, 4061, 4065, 4066,
 
-     6133, 4072, 4054, 4073, 4064, 6133, 4066, 4075, 4067, 4078,
-     4081, 4079, 4082, 4083, 4087, 4085, 4089, 4095, 4094, 4096,
-     4100, 4102, 4104, 4105, 4022, 4106, 4112, 6133, 4108, 4113,
-     4115, 4117, 4118, 4119, 4120, 4121, 4122, 6133, 4129, 4128,
-     4125, 4136, 4135, 4131, 4137, 4146, 4152, 4154, 4149, 4155,
-     4156, 4158, 4160, 4161, 6133, 4169, 4162, 4163, 4165, 4172,
-     4176, 4173, 4179, 4180, 4185, 4181, 4186, 4188, 4190, 4193,
-     4194, 4195, 4197, 6133, 4199, 4201, 4202, 4206, 4208, 4211,
-     4210, 4214, 4219, 4212, 4220, 4222, 4224, 6133, 4225, 4227,
-     4228, 4229, 4237, 4232, 4234, 4238, 4240, 6133, 4247, 4242,
+     4068, 4069, 4077, 4073, 4081, 4084, 4086, 4094, 6159, 4072,
+     4079, 4089, 4090, 6159, 4092, 4095, 4096, 4097, 4098, 4102,
+     4105, 4104, 4101, 4107, 4109, 4111, 4113, 4118, 4114, 4125,
+     4122, 4116, 4126, 4130, 4127, 4137, 6159, 4133, 4138, 4139,
+     4142, 4144, 4147, 4146, 4148, 4149, 6159, 4154, 4151, 4156,
+     4152, 4159, 4162, 4164, 4173, 4179, 4181, 4171, 4175, 4182,
+     4184, 4190, 4187, 6159, 4194, 4185, 4191, 4195, 4198, 4201,
+     4202, 4204, 4206, 4209, 4210, 4212, 4214, 4216, 4218, 4219,
+     4220, 4222, 6159, 4226, 4230, 4223, 4236, 4227, 4233, 4237,
+     4243, 4247, 4238, 4248, 4249, 4251, 6159, 4252, 4253, 4254,
 
-     4249, 4244, 4248, 4252, 4254, 4259, 4263, 4265, 4261, 6133,
-     4257, 4268, 4271, 4274, 4275, 4277, 4278, 4282, 6133, 4284,
-     4285, 4286, 4293, 4291, 4300, 4292, 4302, 4295, 4296, 4303,
-     4304, 4305, 4310, 4315, 4311, 4322, 4323, 4326, 6133, 4318,
-     6133, 4327, 4328, 4337, 4332, 4334, 4335, 6133, 4340, 4342,
-     4344, 4345, 4350, 6133, 4349, 4346, 4348, 4352, 6133, 4351,
-     4365, 4347, 4366, 4369, 4371, 6133, 4374, 4376, 4375, 4383,
-     4387, 4382, 4385, 4386, 4388, 4390, 4392, 4393, 4394, 4403,
-     4396, 4399, 6133, 4401, 4408, 4414, 4415, 4398, 4409, 4417,
-     4419, 4422, 6133, 4423, 4416, 4424, 4425, 4426, 4427, 4432,
+     4256, 4262, 4255, 4265, 4258, 4264, 6159, 4267, 4271, 4275,
+     4278, 4277, 4280, 4281, 4283, 4285, 4286, 4290, 6159, 4287,
+     4296, 4297, 4289, 4300, 4303, 4304, 4305, 6159, 4306, 4312,
+     4315, 4322, 4318, 4325, 4321, 4323, 4320, 4327, 4329, 4333,
+     4334, 4335, 4337, 4336, 4347, 4354, 4349, 6159, 4338, 6159,
+     4351, 4355, 4363, 4361, 4359, 4352, 6159, 4365, 4366, 4368,
+     4369, 4371, 6159, 4373, 4375, 4377, 4376, 6159, 4383, 4389,
+     4378, 4387, 4396, 4400, 6159, 4403, 4390, 4404, 4411, 4412,
+     4407, 4414, 4408, 4417, 4415, 4410, 4419, 4420, 4429, 4425,
+     4426, 6159, 4428, 4430, 4435, 4436, 4443, 4437, 4440, 4444,
 
-     4440, 4442, 4431, 6133, 4433, 4438, 4441, 4456, 4443, 4453,
-     6133, 6133, 4452, 4457, 4459, 4460, 4463, 6133, 4461, 4473,
-     4468, 4470, 4472, 6133, 6133, 4475, 6133, 4471, 6133, 4476,
-     4477, 6133, 6133, 4478, 4479, 4482, 4491, 4485, 6133, 4495,
-     6133, 4498, 4499, 4488, 4497, 4501, 6133, 4502, 4503, 4508,
-     6133, 4509, 4516, 4511, 4512, 6133, 4514, 4517, 4522, 4524,
-     6133, 4525, 4531, 4523, 4532, 4534, 4533, 4535, 4539, 4540,
-     4536, 4544, 4545, 4546, 4556, 4558, 4560, 4562, 4552, 4563,
-     4566, 4567, 4569, 4572, 4573, 4574, 4575, 4577, 4578, 4580,
-     4583, 4587, 4588, 4586, 4589, 4590, 4599, 4592, 4595, 4603,
+     4450, 4445, 6159, 4447, 4451, 4453, 4454, 4455, 4456, 4457,
+     4467, 4463, 4379, 6159, 4465, 4464, 4470, 4472, 4474, 4479,
+     6159, 6159, 4478, 4483, 4485, 4486, 4489, 6159, 4487, 4499,
+     4494, 4496, 4498, 6159, 6159, 4501, 6159, 4497, 6159, 4502,
+     4503, 6159, 6159, 4504, 4505, 4508, 4517, 4511, 6159, 4521,
+     6159, 4524, 4525, 4514, 4523, 4527, 6159, 4528, 4529, 4534,
+     6159, 4535, 4542, 4537, 4538, 6159, 4540, 4543, 4548, 4550,
+     6159, 4551, 4557, 4549, 4558, 4560, 4559, 4561, 4565, 4566,
+     4562, 4570, 4571, 4572, 4582, 4584, 4586, 4588, 4578, 4589,
+     4592, 4593, 4595, 4598, 4599, 4600, 4601, 4603, 4604, 4606,
 
-     4596, 4606, 4607, 4608, 4609, 4611, 4614, 4616, 4613, 4619,
-     4620, 6133, 4618, 4623, 4624, 4628, 4629, 4637, 4639, 4641,
-     4649, 4650, 6133, 4652, 6133, 4654, 4638, 4646, 4658, 4659,
-     6133, 4660, 4661, 4662, 4663, 4664, 4665, 4666, 4667, 4670,
-     4671, 4675, 6133, 4682, 4669, 4686, 4693, 6133, 4690, 4697,
-     4694, 4698, 4700, 4702, 4701, 4703, 4704, 4705, 4709, 4711,
-     4714, 4678, 4715, 4722, 4706, 4718, 4726, 4727, 4729, 4728,
-     4732, 4736, 4740, 6133, 4735, 6133, 4741, 4742, 4743, 4744,
-     4748, 4745, 4749, 6133, 6133, 4751, 4756, 4758, 4752, 4760,
-     4763, 4766, 6133, 4769, 4772, 4774, 4775, 6133, 4777, 4779,
+     4609, 4613, 4614, 4612, 4615, 4616, 4625, 4618, 4621, 4629,
+     4622, 4632, 4633, 4634, 4635, 4637, 4640, 4642, 4639, 4645,
+     4646, 6159, 4644, 4649, 4650, 4654, 4655, 4663, 4665, 4667,
+     4675, 4676, 6159, 4678, 6159, 4680, 4664, 4672, 4684, 4685,
+     6159, 4686, 4687, 4688, 4689, 4690, 4691, 4692, 4693, 4696,
+     4697, 4701, 6159, 4708, 6159, 4695, 4712, 4719, 6159, 4716,
+     4723, 4720, 4724, 4726, 4728, 4727, 4729, 4730, 4731, 4735,
+     4737, 4740, 4704, 4741, 4748, 4732, 4744, 4752, 4753, 4755,
+     4754, 4758, 4762, 4766, 6159, 4761, 6159, 4767, 4768, 4769,
+     4770, 4774, 4771, 4775, 6159, 6159, 4777, 4782, 4784, 4778,
 
-     4780, 4782, 6133, 4783, 4785, 4786, 4797, 4787, 4802, 4793,
-     4803, 4789, 4804, 4808, 6133, 6133, 6133, 6133, 4809, 4791,
-     4815, 4811, 4817, 4818, 4819, 4821, 4822, 6133, 4826, 6133,
-     6133, 4829, 4831, 4832, 4833, 4835, 4823, 4839, 4841, 6133,
-     4840, 4845, 4847, 4844, 4854, 4857, 4861, 4851, 4862, 4863,
-     4864, 4871, 4868, 4869, 4872, 4874, 4876, 4878, 6133, 6133,
-     4880, 4884, 4885, 4892, 4889, 4890, 4896, 4903, 4898, 4899,
-     4900, 4901, 4905, 4906, 4914, 4917, 4907, 4918, 6133, 4915,
-     4919, 6133, 4921, 6133, 4923, 4924, 4925, 4926, 4931, 4932,
-     4934, 4936, 6133, 6133, 6133, 4937, 4938, 4942, 4947, 4944,
+     4786, 4789, 4792, 6159, 4795, 4798, 4800, 4801, 6159, 4803,
+     4805, 4806, 4808, 6159, 4809, 4811, 4812, 4823, 4813, 4828,
+     4819, 4829, 4815, 4830, 4834, 6159, 6159, 6159, 6159, 4835,
+     4817, 4841, 4837, 4843, 4844, 4845, 4847, 4848, 6159, 4852,
+     6159, 6159, 4855, 4857, 4858, 4859, 4861, 4849, 4865, 4867,
+     6159, 4866, 4871, 4873, 4870, 4880, 4883, 4887, 4877, 4888,
+     4889, 4890, 4897, 4894, 4895, 4898, 4900, 4902, 4904, 6159,
+     6159, 4906, 4910, 4911, 4918, 4915, 4916, 4922, 4929, 4924,
+     4925, 4926, 4927, 4931, 4932, 4940, 4943, 4933, 4944, 6159,
+     4941, 4945, 6159, 4947, 6159, 4949, 4950, 4951, 4952, 4957,
 
-     4948, 4949, 4951, 4952, 6133, 4953, 6133, 4954, 4955, 4966,
-     4960, 4973, 4975, 4976, 4978, 4972, 4979, 6133, 4981, 4982,
-     6133, 4983, 4986, 4988, 6133, 4991, 4989, 4994, 4997, 6133,
-     4999, 5001, 5004, 6133, 5011, 6133, 5002, 5008, 5006, 5020,
-     6133, 5012, 5015, 6133, 5024, 5026, 5027, 5021, 6133, 5017,
-     6133, 5028, 5037, 5038, 5041, 5029, 5043, 5033, 5031, 5045,
-     5053, 5051, 5052, 6133, 6133,  181, 5061, 5054, 5058, 5062,
-     5057, 5070, 5065, 5067, 5069, 6133, 6133, 5074, 6133, 5072,
-     5073, 6133, 5066, 5081, 5085, 5075, 5083, 5087, 5089, 5094,
-     5096, 5097, 5099, 5098, 5100, 5106, 5121, 5103, 5117, 5123,
+     4958, 4960, 4962, 6159, 6159, 6159, 4963, 4964, 4968, 4973,
+     4970, 4974, 4975, 4977, 4978, 6159, 4979, 6159, 4980, 4981,
+     4992, 4986, 4999, 5001, 5002, 5004, 4998, 5005, 6159, 5007,
+     5008, 6159, 5009, 5012, 5014, 6159, 5017, 5015, 5020, 5023,
+     6159, 5025, 5027, 5030, 6159, 5037, 6159, 5028, 5034, 5032,
+     5046, 6159, 5038, 5041, 6159, 5050, 5052, 5053, 5047, 6159,
+     5043, 6159, 5054, 5063, 5064, 5067, 5055, 5069, 5059, 5057,
+     5071, 5079, 5077, 5078, 6159, 6159,  181, 5087, 5080, 5084,
+     5088, 5083, 5096, 5091, 5093, 5095, 6159, 6159, 5100, 6159,
+     5098, 5099, 6159, 5092, 5107, 5111, 5101, 5109, 5113, 5115,
 
-     5125, 5127, 5129, 5118, 5131, 5113, 5132, 5135, 5137, 5139,
-     6133, 5141, 5101, 5138, 6133, 5143, 5145, 5147, 5148, 6133,
-     5150, 5151, 5154, 5155, 6133, 5161, 5166, 5167, 5168, 5169,
-     5176, 5172, 5173, 5174, 6133, 6133, 6133, 5181, 5188, 6133,
-     5190, 5180, 5183, 5191, 6133, 5192, 5193, 6133, 6133, 5195,
-     5197, 5196, 5204, 6133, 5199, 6133, 5200, 6133, 5202, 5210,
-     5212, 5214, 6133, 5217, 5224, 6133, 5219, 5227, 5230, 5231,
-     5232, 5234, 5233, 6133, 5241, 5237, 5239, 5246, 5236, 5243,
-     5247, 5251, 5248, 5263, 5249, 5259, 6133, 5260, 5262, 5265,
-     5271, 5250, 5261, 5273, 6133, 5278, 6133, 5275, 5279, 5280,
+     5120, 5122, 5123, 5125, 5124, 5126, 5132, 5147, 5129, 5143,
+     5149, 5151, 5153, 5155, 5144, 5157, 5139, 5158, 5161, 5163,
+     5165, 6159, 5167, 5127, 5164, 6159, 5169, 5171, 5173, 5174,
+     6159, 5176, 5177, 5180, 5181, 6159, 5187, 5192, 5193, 5194,
+     5195, 5202, 5198, 5199, 5200, 6159, 6159, 6159, 5207, 5214,
+     6159, 5216, 5206, 5209, 5217, 6159, 5218, 5219, 6159, 6159,
+     5221, 5223, 5222, 5230, 6159, 5225, 6159, 5226, 6159, 5228,
+     5236, 5238, 5240, 6159, 5243, 5250, 6159, 5245, 5253, 5256,
+     5257, 5258, 5260, 5259, 6159, 5267, 5263, 5265, 5272, 5262,
+     5269, 5273, 5277, 5274, 5289, 5275, 5285, 6159, 5286, 5288,
 
-     5281, 5282, 5283, 5286, 5291, 5285, 5300, 5287, 6133, 5304,
-     5308, 6133, 5289, 6133, 5313, 6133, 5301, 5305, 5309, 5314,
-     6133, 5316, 5318, 5297, 5322, 6133, 5323, 5326, 5327, 5329,
-     6133, 6133, 5330, 5337, 5334, 5332, 5336, 5343, 5333, 5345,
-     5347, 5348, 5349, 5361, 5351, 5356, 5352, 5360, 5362, 5366,
-     6133, 6133, 6133, 5363, 5371, 5379, 5377, 5378, 5380, 5382,
-     6133, 5383, 5385, 5387, 5386, 5395, 5390, 5394, 6133, 5397,
-     5396, 5398, 5399, 5402, 5403, 5404, 6133, 5411, 5416, 5419,
-     5406, 5421, 5418, 5428, 5430, 5431, 6133, 5433, 6133, 6133,
-     5425, 6133, 5434, 5435, 5437, 5438, 6133, 5441, 5446, 5442,
+     5291, 5297, 5276, 5287, 5299, 6159, 5304, 6159, 5301, 5305,
+     5306, 5307, 5308, 5309, 5312, 5317, 5311, 5326, 5313, 6159,
+     5330, 5334, 6159, 5315, 6159, 5339, 6159, 5327, 5331, 5335,
+     5340, 6159, 5342, 5344, 5323, 5348, 6159, 5349, 5352, 5353,
+     5355, 6159, 6159, 5356, 5363, 5360, 5358, 5362, 5369, 5359,
+     5371, 5373, 5374, 5375, 5387, 5377, 5382, 5378, 5386, 5388,
+     5392, 6159, 6159, 6159, 5389, 5397, 5405, 5403, 5404, 5406,
+     5408, 6159, 5409, 5411, 5413, 5412, 5421, 5416, 5420, 6159,
+     5423, 5422, 5424, 5425, 5428, 5429, 5430, 6159, 5437, 5442,
+     5445, 5432, 5447, 5444, 5454, 5456, 5457, 6159, 5459, 6159,
 
-     5443, 5448, 5450, 6133, 5451, 5453, 5455, 5458, 6133, 6133,
-     5465, 6133, 5467, 5470, 5454, 5477, 5469, 5472, 5479, 5482,
-     6133, 5476, 5483, 5484, 5485, 5486, 6133, 5490, 5488, 5491,
-     5493, 6133, 5494, 5499, 5500, 5495, 5501, 6133, 5504, 5502,
-     5514, 5505, 6133, 5519, 5520, 6133, 6133, 5524, 5526, 5527,
-     6133, 6133, 6133, 5529, 6133, 5535, 5540, 5544, 5548, 5532,
-     6133, 5550, 5543, 5551, 6133, 6133, 5547, 5552, 5553, 5555,
-     6133, 6133, 5556, 5557, 5559, 5521, 5560, 6133, 5562, 5568,
-     5569, 5574, 5579, 5571, 5582, 5576, 5590, 5597, 5583, 5592,
-     5593, 5594, 5595, 5596, 5602, 5604, 5603, 5606, 5611, 5612,
+     6159, 5451, 6159, 5460, 5461, 5463, 5464, 6159, 5467, 5472,
+     5468, 5469, 5474, 5476, 6159, 5477, 5479, 5481, 5484, 6159,
+     6159, 5491, 6159, 5493, 5496, 5480, 5503, 5495, 5498, 5505,
+     5508, 6159, 5502, 5509, 5510, 5511, 5512, 6159, 5516, 5514,
+     5517, 5519, 6159, 5520, 5525, 5526, 5521, 5527, 6159, 5530,
+     5528, 5540, 5531, 6159, 5545, 5546, 6159, 6159, 5550, 5552,
+     5553, 6159, 6159, 6159, 5555, 6159, 5561, 5566, 5570, 5574,
+     5558, 6159, 5576, 5569, 5577, 6159, 6159, 5573, 5578, 5579,
+     5581, 6159, 6159, 5582, 5583, 5585, 5547, 5586, 6159, 5588,
+     5594, 5595, 5600, 5605, 5597, 5608, 5602, 5616, 5623, 5609,
 
-     6133, 6133, 5619, 6133, 6133, 5621, 5623, 5625, 5627, 5629,
-     5631, 5633, 6133, 5634, 5636, 5637, 5638, 5639, 6133, 5641,
-     5645, 5640, 5648, 5642, 5651, 5647, 5657, 6133, 6133, 5649,
-     5613, 5653, 5663, 5658, 6133, 5665, 5672, 5669, 5670, 5671,
-     5673, 5677, 6133, 5674, 5678, 6133, 6133, 5681, 6133, 6133,
-     6133, 6133, 6133, 6133, 6133, 6133, 5682, 6133, 5684, 5689,
-     5695, 5699, 6133, 5686, 5692, 5700, 5702, 5703, 6133, 5705,
-     5707, 5706, 5708, 5712, 5713, 5716, 5715, 5719, 5720, 5721,
-     5723, 5724, 5730, 5726, 5725, 5735, 6133, 6133, 6133, 5739,
-     5731, 5744, 5732, 5749, 5754, 5757, 5759, 5750, 5752, 5760,
+     5618, 5619, 5620, 5621, 5622, 5628, 5630, 5629, 5632, 5637,
+     5638, 6159, 6159, 5645, 6159, 6159, 5647, 5649, 5651, 5653,
+     5655, 5657, 5659, 6159, 5660, 5662, 5663, 5664, 5665, 6159,
+     5667, 5671, 5666, 5674, 5668, 5677, 5673, 5683, 6159, 6159,
+     5675, 5639, 5679, 5689, 5684, 6159, 5691, 5698, 5695, 5696,
+     5697, 5699, 5703, 6159, 5700, 5704, 6159, 6159, 5707, 6159,
+     6159, 6159, 6159, 6159, 6159, 6159, 6159, 5708, 6159, 5710,
+     5715, 5721, 5725, 6159, 5712, 5718, 5726, 5728, 5729, 6159,
+     5731, 5733, 5732, 5734, 5738, 5739, 5742, 5741, 5745, 5746,
+     5747, 5749, 5750, 5756, 5752, 5751, 5761, 6159, 6159, 6159,
 
-     5761, 5762, 5764, 5765, 5774, 5770, 5771, 5773, 5775, 5777,
-     5779, 5781, 5786, 6133, 5782, 6133, 5787, 6133, 6133, 5791,
-     5792, 5788, 5798, 5807, 5808, 5799, 5803, 5804, 5806, 5810,
-     5815, 6133, 5812, 5818, 6133, 5820, 5821, 6133, 5819, 5822,
-     5824, 5828, 5829, 5826, 5830, 5831, 5847, 6133, 6133, 5832,
-     5837, 5840, 5849, 5851, 5850, 5853, 5857, 5858, 5860, 5861,
-     5870, 6133, 5867, 5868, 5872, 6133, 5874, 5869, 5875, 5876,
-     5877, 5885, 5881, 5884, 6133, 5886, 6133, 5890, 5892, 5893,
-     5883, 5891, 5894, 5905, 5903, 5899, 6133, 5909, 5913, 5911,
-     5915, 5917, 5919, 5920, 5921, 5923, 5926, 5932, 5929, 5936,
+     5765, 5757, 5770, 5758, 5775, 5780, 5783, 5785, 5776, 5778,
+     5786, 5787, 5788, 5790, 5791, 5800, 5796, 5797, 5799, 5801,
+     5803, 5805, 5807, 5812, 6159, 5808, 6159, 5813, 6159, 6159,
+     5817, 5818, 5814, 5824, 5833, 5834, 5825, 5829, 5830, 5832,
+     5836, 5841, 6159, 5838, 5844, 6159, 5846, 5847, 6159, 5845,
+     5848, 5850, 5854, 5855, 5852, 5856, 5857, 5873, 6159, 6159,
+     5858, 5863, 5866, 5875, 5877, 5876, 5879, 5883, 5884, 5886,
+     5887, 5896, 6159, 5893, 5894, 5898, 6159, 5900, 5895, 5901,
+     5902, 5903, 5911, 5907, 5910, 6159, 5912, 6159, 5916, 5918,
+     5919, 5909, 5917, 5920, 5931, 5929, 5925, 6159, 5935, 5939,
 
-     5937, 5933, 5941, 5938, 6133, 5948, 5939, 6133, 5945, 5949,
-     5942, 5951, 5955, 6133, 5960, 5953, 5962, 5963, 5966, 5967,
-     6133, 5969, 5976, 5971, 6133, 5977, 6133, 6133, 5979, 5973,
-     5980, 5986, 5988, 6133, 6133, 6133, 6013, 6020, 6027, 6034,
-     6041, 6048, 6055,   88, 6062, 6069, 6076, 6083, 6090, 6097,
-     6104, 6111, 6118, 6125
+     5937, 5941, 5943, 5945, 5946, 5947, 5949, 5952, 5958, 5955,
+     5962, 5963, 5959, 5967, 5964, 6159, 5974, 5965, 6159, 5971,
+     5975, 5968, 5977, 5981, 6159, 5986, 5979, 5988, 5989, 5992,
+     5993, 6159, 5995, 6002, 5997, 6159, 6003, 6159, 6159, 6005,
+     5999, 6006, 6012, 6014, 6159, 6159, 6159, 6039, 6046, 6053,
+     6060, 6067, 6074, 6081,   88, 6088, 6095, 6102, 6109, 6116,
+     6123, 6130, 6137, 6144, 6151
     } ;
 
-static const flex_int16_t yy_def[3155] =
+static const flex_int16_t yy_def[3166] =
     {   0,
-     3136,    1, 3137, 3137, 3138, 3138, 3139, 3139, 3140, 3140,
-     3141, 3141, 3142, 3142, 3143, 3143, 3136, 3144, 3136, 3136,
-     3136, 3136, 3145, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3146, 3136, 3136, 3136,
-     3146, 3147, 3136, 3136, 3136, 3147, 3148, 3136, 3136, 3136,
-     3136, 3148, 3149, 3136, 3136, 3136, 3149, 3150, 3136, 3151,
-     3136, 3150, 3150, 3152, 3136, 3136, 3136, 3136, 3152, 3153,
-     3136, 3136, 3136, 3153, 3144, 3144, 3136, 3154, 3145, 3154,
-     3145, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3147,    1, 3148, 3148, 3149, 3149, 3150, 3150, 3151, 3151,
+     3152, 3152, 3153, 3153, 3154, 3154, 3147, 3155, 3147, 3147,
+     3147, 3147, 3156, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3157, 3147, 3147, 3147,
+     3157, 3158, 3147, 3147, 3147, 3158, 3159, 3147, 3147, 3147,
+     3147, 3159, 3160, 3147, 3147, 3147, 3160, 3161, 3147, 3162,
+     3147, 3161, 3161, 3163, 3147, 3147, 3147, 3147, 3163, 3164,
+     3147, 3147, 3147, 3164, 3155, 3155, 3147, 3165, 3156, 3165,
+     3156, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3146, 3146, 3147, 3147,
-     3148, 3148, 3136, 3149, 3149, 3150, 3150, 3151, 3151, 3150,
-     3152, 3152, 3136, 3153, 3153, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3157, 3157, 3158, 3158,
+     3159, 3159, 3147, 3160, 3160, 3161, 3161, 3162, 3162, 3161,
+     3163, 3163, 3147, 3164, 3164, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3150, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3150, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3150, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3161, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3150, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3161, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3136, 3136, 3144, 3136, 3136, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3147, 3147, 3155, 3147, 3147, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3150, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3161,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3136, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3147, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3150,
-     3150, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3161, 3161, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3150, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3161,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3150, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3161, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3136, 3150, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3161, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3136, 3136, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3150, 3144, 3136, 3144, 3144, 3144, 3136,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3147, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3136, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3136, 3144,
-     3136, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3136,
+     3161, 3155, 3147, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3147, 3155, 3147, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3147,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3150, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3147, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3147, 3155, 3155, 3155, 3155, 3155,
 
-     3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3136, 3144, 3144, 3144, 3144, 3150, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147,
+     3155, 3155, 3155, 3155, 3161, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3136, 3136, 3144, 3136, 3144, 3136, 3144,
-     3144, 3136, 3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3147, 3147, 3155, 3147, 3155, 3147, 3155,
+     3155, 3147, 3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3150, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3147, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3147, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3136, 3136, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3136,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3150, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3136,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3136, 3136, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3147, 3147, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3147, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3161, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3147, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3136, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3136, 3150, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3136, 3136, 3144, 3136, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3147, 3147, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3147, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3147,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3147, 3161, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3147, 3147, 3155, 3147,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3136, 3136, 3144, 3144, 3136,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3136, 3136, 3144,
-     3144, 3144, 3144, 3136, 3144, 3136, 3144, 3136, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3147, 3147, 3155, 3155,
+     3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3147, 3147,
+     3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3147, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3136, 3144, 3136, 3144, 3136, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3136, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3136, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3136, 3136,
-     3144, 3136, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3147, 3155, 3147, 3155, 3147, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3147, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3147, 3147, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147,
 
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3136, 3136,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3136, 3136, 3144, 3144, 3144,
-     3136, 3136, 3136, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3136, 3136, 3144, 3144, 3144, 3144,
-     3136, 3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3147, 3155, 3147, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3147,
+     3147, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3147, 3147, 3155, 3155,
+     3155, 3147, 3147, 3147, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3147, 3147, 3155, 3155, 3155,
+     3155, 3147, 3147, 3155, 3155, 3155, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
 
-     3136, 3136, 3144, 3136, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3136, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3136, 3136, 3144, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3144, 3136, 3144, 3144,
-     3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3136, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3147, 3155, 3147, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3147,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3147, 3147, 3155, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3155, 3147, 3155,
+     3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3147, 3147,
 
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3136, 3144, 3136, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3136, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3136, 3136, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
-     3144, 3136, 3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3136, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3136, 3144, 3144, 3144,
-     3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144, 3144,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3147, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3147, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3147,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3147, 3155, 3155, 3155, 3147, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3147, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155,
 
-     3144, 3144, 3144, 3144, 3136, 3144, 3144, 3136, 3144, 3144,
-     3144, 3144, 3144, 3136, 3144, 3144, 3144, 3144, 3144, 3144,
-     3136, 3144, 3144, 3144, 3136, 3144, 3136, 3136, 3144, 3144,
-     3144, 3144, 3144, 3136, 3136,    0, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136
+     3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155, 3155,
+     3155, 3155, 3155, 3155, 3155, 3147, 3155, 3155, 3147, 3155,
+     3155, 3155, 3155, 3155, 3147, 3155, 3155, 3155, 3155, 3155,
+     3155, 3147, 3155, 3155, 3155, 3147, 3155, 3147, 3147, 3155,
+     3155, 3155, 3155, 3155, 3147, 3147,    0, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147
     } ;
 
-static const flex_int16_t yy_nxt[6174] =
+static const flex_int16_t yy_nxt[6200] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1541,7 +1544,7 @@ static const flex_int16_t yy_nxt[6174] =
        86,  433,  434,  431,  430,  436,   86,   86,   86,  435,
        86,   86,   86,   86,  449,   86,  443,  445,  454,   86,
       432,   86,   86,  455,   86,  446,  450,  447,  444,   86,
-      437,  451,   86,  438,  452,  453,   86,  606,  439,  440,
+      437,  451,   86,  438,  452,  453,   86,  607,  439,  440,
       441,  442,   86,  448,   86,  456,  457,   86,   86,  458,
 
        86,  459,   86,  460,  462,   86,  461,  463,   86,  464,
@@ -1553,7 +1556,7 @@ static const flex_int16_t yy_nxt[6174] =
        86,  485,  493,   86,  486,   86,  487,   86,  494,   86,
       508,  167,  495,  505,   86,  506,  504,  507,  519,  510,
       496,   86,  497,   86,  498,  520,  509,   86,   86,  518,
-      521,   86,  523,  522,   86,   86,   86,  499,  525,  841,
+      521,   86,  523,  522,   86,   86,   86,  499,  525,  843,
 
       500,   86,  501,  528,  502,   86,   86,  511,  512,   86,
       526,   86,   86,  524,  527,   86,   86,  513,   86,  514,
@@ -1561,583 +1564,586 @@ static const flex_int16_t yy_nxt[6174] =
       537,  540,  538,  533,   86,  534,  535,   86,  536,   86,
       541,   86,   86,  539,  545,   86,   86,   86,  549,  550,
        86,   86,  548,  543,  542,   86,  544,   86,   86,   86,
-       86,  555,  547,   86,   86,   86,  556,   86,   86,  558,
-      546,  559,   86,  552,  553,  551,   86,  554,   86,  561,
-       86,   86,  634,   86,  557,   86,  560,  562,  564,   86,
-       86,  563,  567,  572,  570,  566,   86,   86,  565,  573,
+      160,  555,  547,   86,   86,   86,  556,  557,   86,  559,
+      546,   86,  560,  552,  553,  551,   86,  554,   86,  562,
+       86,   86,   86,   86,  558,   86,   86,  561,   86,   86,
+      563,  564,   86,  572,  568,  571,  565,  567,   86,  566,
 
-      574,  571,   86,  568,   86,  569,   86,   86,  576,   86,
-       86,  577,  578,   86,  581,  579,   86,   86,  575,  583,
-       86,   86,  584,   86,  580,   86,  586,  587,   86,  582,
-       86,   86,  588,   86,  585,   86,  591,   86,  589,   86,
-      592,   86,  593,   86,   86,   86,   86,   86,  599,  595,
-      594,  590,  603,   86,   86,  602,  598,  600,  601,  596,
-       86,  597,   86,  605,   86,  607,   86,   86,   86,   86,
-       86,   86,   86,  617,   86,  609,   86,  610,  619,   86,
-       86,  604,  612,   86,   86,  618,  624,  608,  616,  611,
-      613,  615,  614,   86,  621,   86,   86,   86,  620,  627,
+      575,  574,  573,  576,   86,  569,   86,  570,   86,  581,
+      577,   86,  578,   86,  579,   86,  582,   86,  580,  584,
+       86,   86,   86,   86,  587,  588,  585,   86,   86,   86,
+      583,   86,  589,   86,   86,  586,   86,  594,  592,  593,
+       86,   86,  590,   86,   86,  595,   86,   86,   86,  600,
+      591,  601,  596,   86,  603,  599,   86,   86,   86,   86,
+      602,  597,  598,  604,   86,  606,   86,  608,   86,   86,
+       86,  613,   86,   86,   86,  618,  610,  605,  609,  611,
+      620,   86,   86,   86,   86,  158,   86,   86,  617,  612,
+      614,  619,  615,  616,   86,  623,   86,  622,  624,  621,
 
-       86,   86,  630,  622,  629,   86,  623,   86,   86,   86,
-      625,   86,  626,   86,  633,   86,   86,  636,   86,   86,
-      628,  632,   86,  637,  639,   86,  631,   86,   86,   86,
-      638,   86,  635,  653,   86,  641,   86,  667,  640,   86,
-      642,   86,  643,  652,   86,  651,   86,  644,  656,  645,
-      654,  660,  655,   86,  659,  646,   86,  647,  657,   86,
-      648,  649,  658,  664,   86,   86,   86,  650,  663,   86,
-       86,  670,  661,   86,  665,  662,   86,  672,   86,   86,
-      666,   86,   86,   86,   86,   86,  669,   86,  668,  678,
-       86,  674,   86,  673,  679,   86,  675,   86,  671,  683,
+       86,   86,  628,  625,  629,  631,   86,   86,   86,  630,
+      626,   86,   86,   86,   86,   86,  627,  634,  637,   86,
+       86,  633,   86,   86,  638,  640,   86,   86,   86,  632,
+       86,   86,   86,  668,   86,  635,  636,  639,   86,  641,
+      643,   86,  654,  903,   86,  642,   86,  644,  652,  653,
+      655,   86,  645,   86,  646,  657,   86,  656,   86,  660,
+      647,  661,  648,  658,   86,  649,  650,  659,   86,  667,
+      665,   86,  651,   86,   86,  671,   86,  664,   86,   86,
+      662,  666,   86,  663,   86,  673,   86,   86,   86,   86,
+       86,  675,   86,  670,  669,  679,   86,  674,  680,   86,
 
-      167,  676,  685,  682,  684,  677,  680,  681,   86,   86,
-      687,   86,   86,   86,   86,   86,   86,   86,   86,  692,
-      694,  686,  696,   86,   86,  695,  689,  697,  690,  693,
-      688,  699,  691,   86,   86,   86,  698,   86,  701,   86,
-       86,   86,   86,   86,  705,   86,  700,  704,  713,   86,
-       86,  710,  706,  702,  715,  703,  711,   86,   86,  707,
-       86,  709,  708,  712,  714,   86,  716,   86,  717,   86,
-      718,   86,  719,   86,  722,   86,   86,  720,   86,  721,
-      723,   86,   86,   86,   86,  726,   86,   86,  727,  725,
-      731,  730,  724,   86,   86,   86,   86,  732,   86,   86,
+       86,  676,  683,  672,  167,   86,  677,  686,  685,  684,
+      678,  681,   86,   86,  682,   86,   86,  687,   86,   86,
+       86,   86,   86,  695,  693,  697,   86,  688,   86,   86,
+      690,   86,  698,  691,  689,  694,  696,  692,   86,  700,
+       86,  699,   86,  701,   86,   86,   86,  702,   86,   86,
+       86,  705,  706,   86,  703,  711,  724,  704,   86,  707,
+      712,   86,  714,   86,  710,   86,  708,  715,   86,  709,
+      716,  713,  717,   86,  718,   86,   86,  719,   86,  720,
+       86,   86,   86,   86,  721,   86,  722,  725,   86,  727,
+      723,  728,   86,   86,   86,  733,   86,  729,   86,  726,
 
-      734,   86,  736,   86,  737,  729,   86,  728,   86,   86,
-      743,   86,  733,   86,  739,  738,   86,   86,  735,  740,
-       86,  742,  746,  741,  744,  747,   86,  750,   86,  745,
-      748,   86,   86,   86,  752,   86,  753,  751,   86,   86,
-      755,  749,  756,  757,   86,   86,   86,   86,   86,   86,
-      764,   86,  762,  760,   86,   86,   86,   86,  754,   86,
-      758,  761,  770,  759,  765,  160,  768,   86,   86,  763,
-       86,  769,  767,  766,   86,   86,  771,  772,  773,  774,
-       86,   86,   86,  775,  779,  777,   86,  776,  781,  778,
-       86,  780,   86,   86,   86,  782,  784,   86,  783,   86,
+      732,   86,  734,   86,   86,   86,  738,   86,   86,  736,
+       86,   86,   86,  731,  741,  739,  730,   86,   86,  742,
+      763,  735,  740,  743,   86,  737,   86,  745,   86,   86,
+       86,   86,  752,  748,  749,  744,  746,   86,   86,   86,
+      747,  755,   86,   86,  750,  754,  751,   86,  753,   86,
+       86,   86,  757,  758,  759,   86,   86,   86,   86,  760,
+       86,  764,  762,  756,  766,   86,   86,  767,  772,  761,
+       86,   86,   86,   86,   86,   86,  773,  765,  774,  768,
+      770,   86,  769,   86,  771,  775,  776,   86,   86,   86,
+      777,  779,  781,  783,  778,  780,   86,   86,   86,   86,
 
-       86,  785,   86,  791,   86,  788,   86,   86,   86,   86,
-      786,   86,  787,  794,   86,  793,   86,  796,  797,  789,
-      790,   86,  800,  792,  798,   86,  801,  795,   86,  803,
-      802,   86,  805,   86,  804,   86,   86,   86,  807,  799,
-       86,   86,  809,   86,   86,   86,   86,  815,   86,   86,
-       86,   86,  816,   86,   86,   86,  808,   86,  806,  810,
-      817,  811,  812,   86,  813,  818,  814,  820,   86,  819,
-      824,   86,  823,   86,  821,  822,   86,   86,   86,   86,
-       86,   86,  825,  826,  829,   86,   86,   86,   86,   86,
-      838,   86,  827,  836,  831,  839,  828,  830,   86,  832,
+      784,  782,   86,  786,   86,   86,   86,  785,  787,   86,
+      793,  790,   86,   86,   86,   86,   86,  788,  789,  796,
+       86,  798,  795,   86,   86,  791,  792,  800,  802,   86,
+      799,  794,   86,  805,   86,  797,   86,  804,  806,   86,
+       86,  803,  801,   86,  807,   86,   86,  809,  811,   86,
+       86,   86,   86,   86,  817,   86,   86,   86,   86,  810,
+       86,  808,  818,   86,  819,   86,   86,  812,  813,  814,
+       86,  815,  820,  816,  822,   86,   86,  826,  821,   86,
+       86,  825,  824,   86,  823,   86,   86,   86,  828,  827,
+      831,   86,   86,   86,   86,   86,   86,  840,  829,  830,
 
-       86,  837,   86,  833,  834,  835,   86,  843,   86,   86,
-       86,   86,   86,   86,  842,   86,  847,  840,  848,  849,
-      850,   86,  844,  846,   86,   86,  851,  845,   86,  852,
-       86,  853,   86,  167,  854,   86,   86,   86,  858,  856,
-      859,   86,  855,   86,  857,  860,   86,   86,   86,  861,
-       86,  863,  862,  866,   86,   86,  867,  869,   86,  870,
-      864,   86,   86,  872,  868,   86,  874,  871,  865,   86,
-       86,   86,  878,   86,   86,   86,   86,  875,   86,   86,
-      880,  873,  879,   86,   86,   86,   86,   86,  898,  877,
-      894,   86,   86,  881,  893,  876,   86,  895,  891,  883,
+      838,   86,   86,  832,   86,  834,  841,  833,  839,   86,
+      835,  836,  837,   86,  845,   86,   86,   86,  844,   86,
+      842,   86,   86,  849,  850,   86,   86,  852,  851,  846,
+      848,  853,   86,   86,  847,   86,   86,   86,   86,  855,
+      861,  167,  856,  854,   86,  858,  860,   86,  862,  857,
+      859,   86,   86,   86,   86,  868,   86,   86,  869,   86,
+      864,  863,  871,   86,   86,  874,  870,  865,  866,   86,
+       86,   86,   86,  872,  867,   86,  876,   86,  873,  880,
+       86,   86,  877,   86,   86,   86,   86,   86,  881,  875,
+      882,   86,   86,   86,  901,  879,   86,   86,   86,  883,
 
-      897,  882,   86,  892,  884,   86,  899,  885,  896,   86,
-       86,  886,   86,   86,  887,   86,   86,  904,   86,  920,
-      900,  888,  889,   86,  890,   86,  902,   86,  901,   86,
-      912,  158,  916,  903,   86,  905,  906,  913,  907,   86,
-      915,  908,  917,   86,   86,  914,  909,  918,   86,  923,
-      919,   86,  910,  911,  921,   86,  922,   86,   86,   86,
-      924,  926,   86,  925,   86,   86,  927,   86,   86,  930,
-      929,  928,   86,   86,  934,   86,  933,   86,   86,   86,
-      937,   86,   86,  941,  943,   86,   86,  931,   86,   86,
-      935,  932,  936,  939,   86,  938,  944,  962,   86,  942,
+      878,  895,  893,  896,  897,  898,  885,   86,  894,  884,
+       86,   86,  886,   86,   86,  887,   86,  900,   86,  888,
+       86,  902,  889,  899,   86,  905,   86,  907,   86,  890,
+      891,  915,  892,   86,  904,  916,   86,  923,  906,   86,
+      908,  909,  917,  910,   86,   86,  911,  919,   86,  920,
+      175,  912,  922,  918,  921,   86,   86,  913,  914,   86,
+      925,  926,   86,  924,   86,  927,  929,   86,   86,  928,
+      930,   86,   86,   86,   86,   86,   86,  933,   86,   86,
+      937,   86,   86,  931,   86,  940,  936,   86,   86,  173,
+      938,  932,  944,   86,  934,  935,  939,   86,   86,  941,
 
-      947,  945,   86,  946,  940,  948,   86,   86,  950,   86,
-       86,   86,  949,  951,   86,  952,   86,  954,   86,  955,
-       86,   86,   86,   86,  953,   86,   86,   86,  958,  956,
-      961,   86,  959,  964,   86,  963,   86,   86,   86,   86,
-      957,   86,   86,   86,   86,  960,  966,  967,  969,   86,
-      970,   86,  971,  965,   86,   86,  972,   86,  973,  977,
-      968,   86,  979,  975,  978,   86,   86,  974,  976,   86,
-       86,   86,  980,   86,  984,  986,  987,   86,  982,   86,
-       86,   86,  985,   86,   86,  981,  989,   86,   86,   86,
-       86,   86,   86,   86,  983,  997, 1000,   86,  995,   86,
+      942,  947,  945,  946,   86,   86,  948,   86,  950,  943,
+      949,  951,  963,   86,   86,  953,   86,   86,  952,  954,
+       86,   86,   86,  957,   86,   86,  955,  958,   86,   86,
+      956,   86,   86,  959,  964,   86,  961,   86,  967,  962,
+       86,   86,   86,   86,   86,   86,  965,  960,  966,   86,
+       86,  969,  970,   86,  972,   86,  974,   86,   86,  973,
+      968,   86,  975,   86,   86,  982,   86,   86,  980,  971,
+      978,   86,  976,  981,   86,   86,  979,  990,   86,   86,
+      977,  983,  987,   86,  985,  989,  984,   86,   86,   86,
+      988,   86,   86,  992,   86,  986,   86,   86,   86,   86,
 
-      988,  990,   86,  991,  992,   86, 1001,   86,  994,  993,
-      998, 1002,  999,  996,   86,   86,   86,   86, 1008,   86,
-     1005, 1004, 1007,   86, 1003,   86,   86,   86,   86, 1006,
-       86,   86, 1010, 1017, 1012, 1018, 1009, 1020,   86,   86,
-       86,   86, 1022,   86,   86, 1011,  175, 1013,   86, 1015,
-     1014, 1016, 1019, 1023,   86,   86,   86,   86, 1024,   86,
-     1021, 1028, 1031, 1025,   86, 1030,   86, 1026,   86, 1032,
-       86,   86,   86, 1035,   86, 1027, 1037,   86, 1029,   86,
-       86,   86,   86,   86, 1034, 1040, 1039, 1043, 1033, 1042,
-     1041,  167, 1036,   86, 1044,   86,   86,   86, 1038,   86,
+       86,   86,   86, 1000,   86,  998,   86, 1003,  991,   86,
+      993,  994,  995,   86, 1005, 1004,  996,  997, 1001,   86,
+     1002,  999,   86, 1006,   86,   86, 1011,   86, 1008, 1012,
+     1010,   86,   86, 1007,   86,   86,   86,   86, 1009,   86,
+     1013, 1020, 1015, 1021, 1023,   86,   86,   86, 1025,   86,
+       86, 1026, 1014,   86,   86, 1016, 1018,   86, 1017, 1019,
+     1022,   86,   86,   86,   86, 1024, 1027,   86, 1031,   86,
+     1033, 1034, 1028, 1029,   86,   86, 1038,   86, 1035,   86,
+     1037, 1030,   86, 1040,   86, 1032,   86,   86,   86, 1043,
+       86, 1047, 1036, 1042, 1044,  167,   86,   86,   86, 1039,
 
-       86, 1047,   86,   86, 1045,   86, 1059,   86, 1062,   86,
-       86, 1060,   86,   86, 1050, 1046, 1048, 1064,   86,   86,
-     1087,   86, 1051, 1049, 1052,   86,   86, 1061, 1053,   86,
-     1054, 1078,   86, 1065, 1055, 1063, 1056, 1067,   86, 1069,
-     1066, 1057,   86, 1068, 1070,   86, 1058, 1071,   86,   86,
-       86,   86, 1073,   86, 1079,   86, 1072,   86, 1076,   86,
-       86,   86,   86,  173, 1074, 1075, 1084, 1085, 1077, 1080,
-     1083, 1082, 1081,   86, 1086,   86, 1088, 1089, 1091,   86,
-       86,   86,   86,   86, 1090,   86,   86, 1101,   86, 1104,
-       86, 1100,   86, 1092,   86, 1093,   86, 1105, 1103, 1102,
+     1046,   86, 1045,   86, 1041,   86, 1050,   86,   86,   86,
+       86, 1062,   86, 1065,   86,  172, 1063,   86, 1049, 1048,
+       86, 1053, 1051,   86,   86, 1091,   86, 1067, 1054, 1052,
+     1055,   86, 1064,   86, 1056,   86, 1057,   86, 1070, 1068,
+     1058,   86, 1059,   86,   86, 1066,   86, 1060, 1072, 1069,
+     1074, 1071, 1061, 1073,   86,   86, 1081, 1075,   86, 1076,
+       86, 1078,   86, 1079,   86, 1082,   86,   86,   86,   86,
+       86, 1077, 1088, 1080, 1092, 1087, 1083, 1086, 1089,   86,
+     1085, 1090, 1093,   86,   86, 1084,   86,   86,   86,   86,
+       86,   86, 1094,   86,   86, 1105,   86, 1108,   86, 1109,
 
-     1094,   86, 1095,   86, 1106, 1110,   86,   86, 1096, 1108,
-       86, 1111, 1113, 1097, 1098, 1107,   86,   86,   86, 1114,
-     1099,   86, 1109, 1117,   86,   86,   86,   86,   86,   86,
-     1112, 1118,   86,   86, 1116,   86, 1115, 1120, 1123,   86,
-     1126, 1121,   86, 1119,   86, 1127, 1125,   86, 1124, 1122,
-       86,   86,   86,   86,   86,   86, 1128, 1135,   86, 1133,
-     1131, 1132, 1130,   86,   86,   86,   86, 1129,   86, 1137,
-       86, 1134,   86,   86, 1136, 1143,   86,   86, 1144, 1140,
-       86, 1145,   86, 1147, 1138, 1139, 1141, 1142, 1148, 1146,
-     1149,   86, 1151,   86,   86,   86, 1153, 1152,   86, 1154,
+       86, 1104, 1095, 1107, 1096,   86, 1097, 1106, 1110,   86,
+       86, 1098, 1111, 1099, 1114,   86,   86,   86,  167, 1100,
+     1115, 1117,   86,   86, 1101, 1102, 1118,   86, 1112, 1113,
+       86, 1103, 1121,   86,   86,   86,   86, 1116,   86, 1122,
+       86, 1119, 1127, 1120, 1124, 1125,   86,   86,   86,   86,
+       86,   86, 1123,   86, 1130, 1128, 1126,   86,   86,   86,
+       86,   86,   86,   86,   86, 1132, 1129, 1135, 1136, 1134,
+     1131,   86,   86, 1133, 1139,   86, 1140, 1137, 1138,   86,
+       86, 1145, 1142, 1143,  165,   86, 1141,   86,   86, 1144,
+     1147,   86, 1148, 1149, 1146,   86, 1151, 1152,   86,   86,
 
-       86,   86,   86, 1155,   86,   86,   86, 1150, 1162,   86,
-     1164,   86,   86, 1157,   86, 1156,   86, 1166, 1158, 1160,
-     1161,   86, 1159,   86,   86,   86, 1165, 1168,   86, 1163,
-     1170,   86,   86, 1171,   86, 1167,   86, 1173,   86, 1174,
-       86, 1180,   86,   86, 1169, 1179, 1176, 1172, 1175, 1178,
-       86,   86,   86,   86, 1177,   86, 1183,   86, 1184, 1181,
-       86,   86,   86,   86,   86, 1188, 1190,   86, 1191, 1192,
-     1182,   86,   86, 1185,   86,   86, 1189,   86, 1195, 1186,
-     1193, 1187, 1194, 1198,   86, 1196,   86,   86,   86,   86,
-       86, 1197, 1199, 1200,   86, 1201,   86, 1202,   86,   86,
+     1150, 1155,   86,   86,   86, 1157, 1156,   86, 1158,   86,
+       86, 1153, 1159,   86,   86, 1154, 1160, 1166,   86,   86,
+       86, 1168,   86,   86,   86,   86,  163,   86,   86, 1162,
+     1161, 1164, 1163, 1170, 1165,   86,   86, 1169, 1171, 1172,
+     1167,   86,   86,   86,   86,   86, 1173, 1174, 1175, 1177,
+     1178, 1176,   86, 1179,   86,   86, 1183,   86, 1180, 1184,
+       86, 1182,   86,   86,   86,   86, 1185, 1187,   86, 1188,
+     1181,   86,   86,   86,   86,   86, 1192,   86, 1194, 1195,
+     1196, 1186, 1197, 1189,   86,   86,   86, 1193, 1199,   86,
+     1190, 1198, 1191,   86,   86, 1202,   86,   86, 1204,   86,
 
-       86, 1205, 1206,   86,   86,   86, 1211, 1212, 1203,   86,
-       86, 1207,   86,   86, 1214, 1204, 1209, 1215,   86,   86,
-       86, 1208, 1219,   86, 1210, 1213,   86,   86,   86,   86,
-       86,   86, 1225,   86, 1217, 1218,  167, 1221, 1216,   86,
-       86,   86,   86, 1232,   86, 1220, 1230,   86, 1222,   86,
-     1224,  172, 1229, 1227, 1234, 1223, 1226, 1228, 1231, 1235,
-       86,   86,   86,   86, 1237,   86, 1236, 1233, 1238,   86,
-       86,   86,   86,   86,   86,   86, 1241,   86, 1247,   86,
-       86, 1244,   86, 1239, 1240,   86,   86, 1242,   86,  167,
-     1245, 1251, 1243,   86, 1248,   86, 1246,   86, 1253, 1257,
+       86,   86, 1203,   86,   86, 1205,   86, 1200,   86, 1206,
+       86, 1209,   86, 1201,   86, 1210,   86, 1211, 1215, 1216,
+       86, 1207,   86, 1208,   86,   86, 1213,   86, 1212, 1219,
+       86,   86, 1218,   86,   86, 1214, 1223, 1217,   86, 1220,
+       86,   86,   86,   86,  167, 1221, 1222, 1225, 1229,   86,
+       86, 1224,   86,   86,   86,   86,   86,   86, 1234, 1241,
+     1226,  162, 1228, 1235, 1230, 1232, 1231, 1227, 1233, 1236,
+       86, 1238, 1239,   86,   86, 1237,   86,   86,   86, 1240,
+       86, 1242,   86,   86,   86,   86,   86, 1243, 1245,   86,
+     1251,   86, 1248,   86, 1244,   86,   86, 1246,   86,   86,
 
-     1249, 1250,   86, 1258, 1261,   86,   86, 1254, 1252, 1255,
-     1259,   86, 1256, 1260,   86,   86,   86,   86, 1263,   86,
-     1262,   86,   86,   86, 1267,   86, 1266, 1270,   86,   86,
-     1264, 1273,   86,   86, 1265, 1269, 1271,   86, 1274,   86,
-     1268,   86, 1275,   86, 1277, 1278,   86, 1272,   86, 1276,
-       86,   86, 1279,   86,   86,   86,   86,   86,   86,   86,
-       86, 1280, 1285, 1281,   86, 1283, 1284,   86, 1286, 1282,
-     1290, 1295,   86, 1287, 1291,   86, 1289,   86, 1288,   86,
-     1292, 1294,   86,   86,   86,   86,   86, 1293,   86, 1300,
-     1296, 1298,   86, 1297, 1302,   86, 1307, 1301,   86, 1303,
+       86, 1249,   86, 1247, 1255, 1263, 1261, 1252, 1250,   86,
+       86, 1254,   86, 1253, 1257,   86, 1262, 1264,   86, 1256,
+       86,   86,   86, 1258, 1266, 1259,   86, 1265, 1260, 1267,
+       86, 1268,   86,   86, 1273, 1271,   86,   86,   86, 1269,
+       86, 1270, 1274, 1278,   86,   86,   86,   86,   86, 1276,
+     1275, 1279, 1272, 1280,   86,   86, 1284,   86, 1283, 1277,
+     1282,   86,   86,   86,   86, 1281,   86,   86,   86,   86,
+       86,   86, 1285, 1290,   86, 1288, 1286, 1295,   86, 1289,
+     1291, 1287,   86,   86,   86, 1300, 1292,   86, 1294, 1296,
+     1293,   86, 1299,   86,   86,   86,   86,   86, 1297, 1301,
 
-       86, 1306, 1299, 1316,   86, 1304, 1305,   86,   86,   86,
-     1375, 1314, 1308, 1315,   86, 1309, 1310,   86, 1317, 1318,
-     1311, 1320,   86,   86,   86,   86, 1312,   86, 1321, 1322,
-     1313, 1319,   86, 1323,   86, 1325,   86,   86,   86, 1326,
-       86, 1327,   86,   86,   86,   86, 1324, 1335, 1332, 1330,
-       86,   86, 1344,   86, 1336, 1337, 1329, 1328, 1333,   86,
-       86,   86, 1331, 1334,   86, 1338, 1345, 1346, 1339,   86,
-       86,   86,   86, 1340,   86, 1341, 1348, 1342,   86, 1343,
-       86, 1347, 1350, 1351, 1352,   86, 1349, 1354,   86, 1353,
-       86,   86,   86, 1356,   86,   86,   86, 1362,   86, 1357,
+       86, 1302, 1298, 1303, 1307, 1305, 1306,   86,   86, 1308,
+       86, 1310,   86, 1304,   86, 1309,   86, 1312, 1321,  160,
+     1311,   86, 1338, 1320,   86, 1319, 1313,   86, 1322, 1314,
+     1315,   86,   86, 1325, 1316,   86, 1323,   86,   86,   86,
+     1317, 1324, 1326, 1327, 1318,   86, 1328,   86, 1330,   86,
+       86,   86, 1331,   86, 1332,   86, 1329,   86,   86,   86,
+     1340, 1341, 1335, 1337, 1412,   86,   86,   86,   86, 1334,
+     1333,   86,   86, 1342, 1344, 1336, 1343, 1339,   86, 1345,
+       86, 1346, 1352, 1347, 1353, 1348,   86, 1349, 1350, 1351,
+       86,   86,   86, 1354, 1357,   86,   86,   86,   86, 1358,
 
-     1358,   86, 1355,   86,   86, 1363, 1364,   86,   86, 1361,
-     1365, 1359, 1366, 1360,   86, 1367,   86, 1368,   86, 1372,
-       86,   86,   86, 1371, 1374,   86,   86, 1377,   86, 1376,
-       86,   86, 1369, 1380,   86,   86, 1373, 1382,   86, 1379,
-     1384, 1370,   86, 1383,   86,   86,   86, 1378, 1387,   86,
-       86, 1381,   86,   86,   86, 1389,   86,   86,   86, 1391,
-       86, 1397, 1393,   86, 1394, 1385, 1386, 1392,   86,   86,
-     1388, 1395, 1396, 1390, 1399,   86,   86, 1398,   86,   86,
-       86, 1401,   86, 1400, 1402,   86, 1403, 1404,   86, 1409,
-       86,   86, 1410, 1408, 1406,   86, 1405, 1407,   86,   86,
+       86, 1356, 1361,   86, 1359,   86,   86,   86, 1355, 1367,
+       86, 1368, 1362,   86, 1363,   86,   86,   86, 1360,   86,
+       86, 1366, 1364,   86, 1369, 1365,   86, 1370, 1371, 1373,
+       86, 1372, 1377,   86,   86, 1376,   86, 1374, 1379,   86,
+       86,   86, 1380,   86, 1381,   86, 1385,   86, 1382, 1378,
+       86, 1375, 1387,   86, 1384, 1383,   86, 1388,   86,   86,
+       86, 1392,   86, 1389,   86,   86,   86,   86, 1394,   86,
+     1386,   86, 1396, 1398,   86,   86,   86,   86, 1397, 1400,
+     1390, 1391, 1402,   86, 1393,   86, 1395,   86,   86,   86,
+     1401,   86, 1399, 1404, 1406, 1405, 1407, 1403,   86, 1408,
 
-     1412,   86,   86,   86, 1411,  167,   86, 1416,   86,   86,
-     1413, 1417,   86, 1421, 1415,   86, 1422,   86, 1424,   86,
-     1418, 1414,   86, 1423,   86,   86,   86, 1428,   86, 1419,
-       86,   86, 1431,   86,   86, 1420,   86,   86,   86, 1425,
-     1436,   86, 1429, 1435,   86, 1426, 1427,   86, 1430, 1438,
-     1440,   86,   86, 1432, 1434, 1441,   86,   86,   86, 1433,
-     1437, 1443,   86,   86,   86, 1444, 1439,  165,   86, 1442,
-       86,   86, 1445, 1449,   86, 1456, 1450, 1446, 1447, 1451,
-       86, 1448, 1452, 1454,   86, 1453, 1457,   86, 1455,   86,
-       86, 1458,   86, 1459,   86,   86,   86,   86,   86, 1462,
+       86,   86,   86, 1410, 1414, 1409, 1415, 1411,   86,   86,
+       86, 1417,   86, 1416,   86, 1413,   86,   86, 1418, 1421,
+       86,   86,  167,   86,   86, 1426, 1427, 1420,   86, 1429,
+       86,   86,   86, 1419, 1428,   86,   86, 1423,   86,   86,
+       86, 1422,   86, 1424, 1430,   86, 1436, 1425,   86,   86,
+     1431, 1433, 1434,   86,   86,   86, 1432,   86, 1435, 1440,
+     1441,   86, 1437,   86, 1445,   86,   86, 1439, 1443, 1446,
+       86,   86,   86, 1438, 1444, 1447, 1442,   86,   86, 1450,
+     1448, 1451,   86, 1454,   86, 1449, 1455, 1452,   86, 1459,
+     1453, 1456,   86,   86, 1457,   86, 1462, 1460, 1458, 1461,
 
-     1463,   86, 1465,   86,   86,   86, 1470,   86, 1461,   86,
-       86, 1471,   86, 1460, 1464, 1467,   86, 1474, 1466,   86,
-       86, 1468, 1469,   86, 1475,   86,   86, 1472,   86, 1473,
-       86,   86,   86, 1477,   86, 1476, 1481, 1482,   86, 1480,
-     1478, 1479,   86, 1483,   86, 1486, 1484, 1487,   86,   86,
-     1489, 1485,   86, 1492, 1488, 1493,   86, 1491,   86,   86,
-     1497,   86,   86, 1494,   86, 1495, 1496,   86,   86,   86,
-     1490,   86,   86,   86, 1503,   86, 1499, 1498,   86, 1502,
-       86,   86,   86, 1500, 1509,   86, 1501, 1506, 1505, 1510,
-       86, 1511, 1507,   86, 1514, 1504, 1512,   86,   86,   86,
+       86, 1463,   86,   86,   86,   86,   86,   86,   86,   86,
+     1467, 1468,   86,   86, 1471,   86,   86,   86, 1476, 1464,
+       86,   86, 1466,   86, 1477, 1469,   86, 1473, 1470, 1465,
+     1480,   86, 1472, 1474, 1475,   86,   86,   86, 1481, 1478,
+       86,   86, 1479,   86,   86,   86,   86,   86, 1487, 1483,
+     1482, 1488, 1484,   86,   86, 1485, 1491,   86, 1489,   86,
+     1486,   86, 1492, 1490, 1498, 1494,   86, 1496, 1499, 1493,
+       86, 1497,   86, 1495,   86,   86, 1500,   86, 1501, 1502,
+       86,   86,   86,   86,   86, 1503,   86,   86, 1509,   86,
+     1505, 1504,   86, 1508,   86,   86,   86, 1506, 1515, 1507,
 
-     1508,   86,   86,   86,   86, 1513, 1522, 1518,   86,   86,
-     1517,   86,   86, 1525, 1523,   86,   86, 1515, 1516,   86,
-       86,   86, 1519, 1528, 1520,   86, 1521, 1527,   86,   86,
-       86,   86,   86,   86, 1526, 1529, 1542, 1524,   86, 1530,
-       86, 1536,   86,   86, 1531, 1533, 1537, 1532, 1535,   86,
-     1538, 1534, 1539,   86, 1540,   86,   86,   86,   86,   86,
-     1549, 1541, 1543,   86, 1550, 1546, 1544,   86,   86, 1547,
-       86, 1545, 1554,   86,   86, 1556,   86,   86,   86, 1555,
-       86,   86, 1548, 1551,   86, 1559, 1553, 1552, 1560,   86,
-     1558, 1557,   86, 1561,   86, 1565, 1566,   86, 1562,   86,
+     1511, 1512,   86, 1516,   86, 1517,   86, 1520, 1513, 1510,
+     1518,   86,   86,   86, 1514,   86,   86,   86,   86,   86,
+     1528, 1524, 1519,   86, 1523,   86,   86, 1531, 1529,   86,
+       86, 1521, 1522,   86,   86, 1534, 1525, 1527, 1526,   86,
+     1533,   86,   86,   86,   86,   86,   86, 1542, 1532, 1535,
+       86, 1530,   86, 1543,   86, 1545,   86,  158, 1536, 1539,
+       86, 1537, 1538, 1546,   86, 1540, 1544, 1541,   86,   86,
+       86,   86,   86, 1547, 1548,   86,   86, 1552, 1555,   86,
+     1550, 1553, 1549,   86, 1556, 1551,   86, 1560,   86,   86,
+       86, 1557, 1562,   86, 1554, 1561,   86,   86,   86,   86,
 
-       86,   86,   86,   86, 1570, 1571,   86, 1569, 1573,   86,
-     1563,   86,   86,   86, 1564, 1574,   86, 1567, 1575,   86,
-       86, 1568,   86, 1578,   86,   86, 1572,   86, 1581, 1576,
-       86,   86, 1577, 1580,   86,   86,   86, 1587,   86, 1585,
-     1582,   86, 1579,   86,   86,   86, 1592, 1588,   86, 1586,
-     1584, 1583,   86,   86,   86,   86, 1597,   86, 1590, 1589,
-     1595,   86, 1593,   86, 1600, 1598,   86,   86, 1596, 1591,
-     1594,   86,   86,  167, 1599, 1603,   86,   86, 1602, 1606,
-       86, 1605,   86,   86,   86,   86,   86, 1614, 1601, 1607,
-       86, 1604,   86,   86,   86, 1608, 1609, 1615, 1612, 1618,
+       86, 1565, 1559, 1558, 1563,   86, 1564,   86, 1571, 1566,
+       86, 1567, 1572,   86,   86,   86,   86, 1568, 1569, 1570,
+     1577, 1575,   86, 1576,   86,   86,   86,   86, 1573, 1579,
+       86,   86, 1581,   86, 1580,   86, 1574,   86, 1584,   86,
+       86, 1582,   86, 1583, 1578,   86, 1587,   86, 1586,   86,
+       86,   86, 1593,   86, 1591, 1588,   86, 1585,   86,   86,
+       86, 1598, 1594, 1589, 1592,   86, 1590,   86,   86,   86,
+       86, 1603,   86, 1596, 1595, 1601,   86,   86, 1606, 1599,
+     1604,   86,   86, 1602, 1597, 1600,   86,   86,  167, 1605,
+     1609,   86,   86, 1608, 1612,   86, 1611,   86,   86,   86,
 
-       86,   86, 1610, 1611,   86, 1619, 1621,   86,   86, 1623,
-     1613, 1625, 1622, 1616, 1617,   86,   86,   86, 1627,   86,
-       86, 1620,   86,   86,   86,   86, 1632, 1630, 1624, 1629,
-     1626,   86, 1633,   86,   86,   86,   86,   86,   86, 1628,
-     1637,   86, 1638,   86,   86, 1645,   86, 1634, 1631, 1646,
-     1636,   86, 1635,   86, 1639, 1640, 1642,   86, 1641, 1643,
-     1647,   86,   86,   86, 1661,   86,   86, 1650, 1652, 1654,
-     1649, 1644, 1653,   86,   86,   86, 1648,   86, 1656, 1655,
-       86, 1657,   86, 1658,   86, 1662,   86, 1659, 1651,   86,
-       86,   86, 1665, 1664, 1666, 1668, 1667, 1660,   86,   86,
+       86,   86, 1620, 1607, 1613,   86, 1610,   86,   86,   86,
+     1614, 1615, 1621, 1618, 1624,   86,   86, 1616, 1617,   86,
+     1625, 1627,   86,   86, 1629, 1619, 1631, 1628, 1622, 1623,
+       86,   86,   86, 1633,   86,   86, 1626,   86,   86,   86,
+       86, 1638, 1636, 1630, 1635, 1632,   86, 1639,   86,   86,
+       86,   86,   86,   86, 1634, 1643,   86, 1644,   86,   86,
+     1651,   86, 1640, 1637, 1652, 1642,   86, 1641,   86, 1645,
+     1646, 1648,   86, 1647, 1649, 1653,   86,   86,   86, 1668,
+       86,   86, 1656, 1658, 1660, 1655, 1650, 1659,   86, 1661,
+       86, 1654,   86,   86, 1663,   86, 1665, 1662,   86, 1664,
 
-       86,   86,   86, 1671,   86,   86, 1663, 1670,   86,   86,
-     1672,   86,   86,   86,   86, 1681,   86,   86,   86,   86,
-       86,   86, 1669,   86, 1678,   86, 1673, 1676, 1677, 1674,
-     1679, 1675, 1680,   86, 1684,   86, 1682, 1683, 1686,   86,
-     1688,   86, 1689,   86, 1685, 1687,   86,   86, 1690,   86,
-       86,   86,   86,   86,  163,   86,   86, 1691, 1694, 1696,
-       86, 1704,   86, 1703, 1697, 1693, 1695, 1698,   86, 1699,
-     1692, 1700, 1705,   86,   86, 1702, 1701,   86,   86,   86,
-     1706, 1708, 1709,   86,   86,   86,   86,   86,   86, 1712,
-     1710, 1713, 1707,   86,   86, 1721,   86, 1716, 1711,   86,
+       86,   86,   86, 1657,   86, 1666,   86,   86,   86, 1672,
+     1671, 1673, 1675, 1674, 1667,   86,   86,   86,   86,   86,
+     1678,   86,   86, 1669, 1677,   86, 1670, 1679,   86,   86,
+       86,   86, 1688,   86,   86,   86,   86,   86,   86, 1676,
+       86,   86,   86, 1680, 1683, 1684, 1685, 1686, 1681, 1682,
+     1687, 1693,   86, 1689, 1691,   86, 1690, 1697,   86,   86,
+     1696,   86, 1692, 1695,   86,   86,   86,   86,   86,   86,
+       86,   86,   86, 3147, 1710, 1694, 1701, 1703, 1698,   86,
+       86, 1702,   86, 1700, 1706, 1699,   86, 1707, 1704, 1711,
+       86, 1705, 1708, 1717, 1709, 1712,   86,   86, 1713,   86,
 
-       86,   86,   86, 1715, 1714, 1718, 1722,   86, 1719, 1720,
-       86,   86, 1717,   86, 1723, 1724,   86, 1725,   86,   86,
-     1731,   86,   86,   86, 1726, 1728,   86, 1727, 1734,   86,
-     1735, 1733,   86,   86,   86, 1737, 1730, 1732, 1738, 1739,
-       86, 1729, 1743,   86, 1736,   86,   86, 1744,   86, 1749,
-     1740,   86,   86, 1752, 1741,   86, 1748, 1745, 1742,   86,
-     1746, 1751,   86,   86,   86, 1754,   86,   86, 1747, 1753,
-     1750,   86, 1755, 1758,   86,   86, 1762,   86, 1760,   86,
-       86, 1757,   86, 1756, 1761, 1763,   86, 1759,   86,   86,
-       86,   86,   86,   86, 1772,   86, 1766,   86, 1767, 1764,
+     1714,   86, 1715, 1716,   86,   86, 1719,   86,   86,   86,
+     1720,   86,   86,   86, 1728,   86, 1718,   86, 1723,   86,
+       86, 1727, 1725,   86, 1722, 1726, 1721, 1729,   86,   86,
+     1724, 1733, 1731,   86,   86, 1730,   86,   86, 1738,   86,
+       86, 1732,   86,   86,   86, 1734, 1735, 1741, 1746, 1740,
+       86, 1742,   86, 1744, 1737, 1739, 1745,   86, 1736,   86,
+       86, 1750,   86,   86,   86, 1743, 1751,   86, 1755, 1756,
+     1747,   86, 1758,   86, 1752,   86, 1759, 1749, 1748, 1753,
+       86, 1761,   86,   86, 1754, 1760,   86,   86,   86, 1757,
+     1765,   86, 1762, 1769,   86,   86,   86,   86,   86,   86,
 
-     1777,   86, 1774, 1768, 1769, 1765, 1770, 1771,   86, 1775,
-     1776,   86,   86,   86,   86,   86, 1773, 1782,   86,   86,
-       86, 1786,   86,   86,   86,   86,   86, 1781,   86, 1788,
-     1779, 1778, 1780, 1789,   86, 1784,   86,   86, 1785, 1790,
-     1783, 1791,  167,   86, 1787,   86, 1792, 1796,   86, 1793,
-       86,   86, 1800,   86, 1794,   86,   86,   86, 1795,   86,
-       86,   86, 1798, 1802, 1797,   86,   86, 1807,   86, 1801,
-     1799, 1803, 1804,   86, 1810,  162, 1805, 1808, 1811,   86,
-       86, 1806,   86, 1812, 1809, 1813,   86, 1814,   86, 1816,
-     1817,   86,   86,   86,   86,   86, 1819, 1815,   86,   86,
+     1767,   86, 1764, 1763, 1766,   86, 1768,   86,   86, 1770,
+       86, 1775,   86, 1771, 1772, 1773, 1781, 1774, 1776, 1779,
+       86, 1782,   86,   86, 1777,   86, 1778,   86, 1784,   86,
+       86,   86, 1789,   86,   86,   86, 1783,   86,   86, 1793,
+       86, 1780,   86,   86,   86, 1785, 1788, 1795, 1786, 1796,
+     1787, 1791,   86,   86,   86, 1792, 1790, 1797, 1798,   86,
+      167,   86, 1794, 1799, 1803,   86,   86,   86,   86, 1807,
+       86,   86, 1801,   86,   86,   86, 1802,   86, 1809, 1805,
+       86,   86, 1800,   86, 1814, 1804, 3147, 1806, 1808, 1810,
+       86,   86, 1811, 1813, 1812, 1815,   86, 1817,   86, 1816,
 
-       86, 1820,   86,   86, 1818,   86,   86,   86, 1825,   86,
-     1826,   86,   86, 1821,   86, 1827, 1830,   86, 1823, 1828,
-     1824, 1822, 1834, 1831, 1829,   86,   86, 1838,   86, 1835,
-     1836, 1839, 1833,   86,   86,   86, 1832,   86,   86,  160,
-       86, 1837, 1844,   86,   86, 1847, 1848,   86, 1849,   86,
-       86, 1842,   86, 1841, 1840, 1851,   86, 1845, 1843, 1846,
-       86, 1852,   86, 1855,   86,   86, 1857,   86,   86, 1856,
-     1850, 1858,   86, 1853, 1859, 1861,   86, 1864,   86,   86,
-       86,   86, 1863, 1854,   86, 1860,   86, 1865, 1867, 1866,
-       86,   86,   86, 1874,   86,   86,   86,   86,   86,   86,
+     1818,   86,   86, 1820,   86, 1819,   86, 1822, 1823, 1824,
+       86, 1821,   86,   86,   86, 1826,   86,   86, 1829, 1827,
+       86,   86,   86,   86, 1825,   86,   86, 1832, 1833,   86,
+       86, 1837,   86,   86, 1834,   86,   86, 1828, 1830, 1831,
+     1841, 1835, 1838,   86,   86, 1836,   86, 1842, 1843, 1845,
+       86, 1844, 1840, 1846,   86, 1839,   86,   86,   86,   86,
+     1852,   86,   86,   86, 1855, 1847, 1849, 1856,   86, 1857,
+       86,   86, 1850, 1848, 1859,   86, 1853, 1851, 1854,   86,
+     1860, 1858,   86, 1863,   86,   86,   86, 1865,   86, 1864,
+     1867, 1866, 1861,   86, 1869,   86,   86,   86,   86,   86,
 
-     1876, 1862, 1868, 1869, 1870, 1877,   86,   86, 1880, 1871,
-     1878, 1872, 1873, 1881,   86, 1875, 1879, 1882,   86,   86,
-     1886,   86,   86,   86,   86, 1888,   86, 1883, 1885,   86,
-       86, 1891, 1892,   86,   86, 1894,   86,   86,   86, 1884,
-       86,   86,   86,   86, 1899,   86, 1889, 1896, 1887, 1897,
-       86, 1890, 1900,   86, 1893,   86, 1902,   86,   86,   86,
-     1906,   86, 1895, 1898, 1901, 1903, 1904,   86, 1910,   86,
-     1913, 1905, 1909,   86,   86,   86,   86, 1908, 1914,   86,
-     1912, 1907, 1915,   86,   86,   86,   86,   86, 1917, 1911,
-     1916,   86,   86,   86, 1921, 1918,   86, 1924, 1925, 1920,
+       86, 1871, 1874, 1862, 1868, 1872,   86,   86, 1873, 1875,
+       86, 1876, 1877, 1878,   86,   86, 1882,   86, 1879, 1884,
+     1870,   86,   86,   86, 1885,   86,   86,   86, 1887,   86,
+     1880,   86, 1891, 1890, 1881, 1886,   86, 1883, 1888,   86,
+     1894,   86,   86,   86, 1889,   86, 1896,   86,   86, 1899,
+       86, 1892, 1900,   86, 1902,   86,   86, 1893,   86,   86,
+     1907,   86,   86, 1897, 1908,   86,   86, 1904, 1895, 1898,
+     1901, 1905,   86,   86,   86,   86,   86,   86, 1914,   86,
+     1906, 1903, 1909, 1911, 1912,   86, 1918, 1910,   86,   86,
+     1917, 1921,   86, 1923,   86, 1916, 1920,   86, 1922, 1913,
 
-     1926,   86,   86,   86,   86, 1919,   86, 1929,   86,   86,
-     1922,   86, 1934,   86,   86,   86, 1933, 1928,   86, 1923,
-       86, 1927,   86, 1930, 1938,   86,   86,   86, 1931,   86,
-     1936, 1932, 1939, 1935, 1940, 1941,   86, 1937,   86,   86,
-     1943, 1948, 1942, 1945,   86, 1944,   86,   86, 1946,   86,
-     1952, 1949,   86, 1947,   86,   86,   86, 1954, 1955,   86,
-       86, 1956,   86, 1958,   86,   86, 1957, 1950,   86, 1951,
-     1953, 1962,   86, 1963,   86, 1959, 1964, 1966, 1967,   86,
-     1960, 1965,   86,   86,   86, 1961,   86,   86,   86, 1971,
-       86, 1969,   86,   86, 1968,   86, 1973, 1976,   86, 1970,
+     1915,   86,   86,   86,   86,   86, 1924,   86, 1919,   86,
+       86, 1925, 1929,   86,   86, 1932, 1933,   86,   86, 1928,
+     1934,   86,   86, 1926, 1927, 1937,   86,   86, 1930,   86,
+       86, 1942,   86, 1936,   86, 1941,   86, 1935,   86, 1931,
+       86, 1938,   86,   86,   86, 1948, 1946, 1939, 1950, 1947,
+       86, 1940,   86, 1943,   86, 1944,   86, 1945, 1949,   86,
+       86, 1951, 1953,   86,   86, 1957, 1952,   86, 1955,   86,
+     1960,   86,   86, 1954, 1962, 1956,   86, 1963,   86,   86,
+     1964,   86,   86, 1967, 1958, 1965, 1961, 1959, 1968,   86,
+       86, 1966, 1970,   86, 1971,   86, 1972, 1974, 1975,   86,
 
-     1972, 1978, 1974,   86, 1975,  167,   86,   86,   86,   86,
-     1979,   86, 1985,   86, 1983, 1977, 1984, 1982, 1980,   86,
-     1981, 1986,   86, 1987,   86, 1989,   86,   86,   86,   86,
-      158,   86, 1990, 1991,   86, 1992, 1993,   86,   86, 1988,
-       86, 1995, 1994,   86, 1997,   86, 1996,   86,   86, 2001,
-       86,   86, 1998, 2000,   86,   86, 2002, 1999,   86, 2003,
-     2004, 2005, 2006,   86,   86,   86,   86,   86,   86,   86,
-     2013, 2007, 2011, 2008, 2012,   86,   86,   86,   86,   86,
-     2018, 2017,   86, 2009,   86, 2010, 2015,   86,   86,   86,
-     2022, 2019,   86, 2014,   86,   86, 2016, 2021,   86, 2024,
+       86, 1973,   86,   86,   86, 1977, 1979,   86,   86, 1969,
+       86, 1978,   86,   86, 1981, 1984, 1976,   86, 1986, 1980,
+     1982,   86,  167,   86,   86,   86,   86, 1987,   86,   86,
+       86, 1993, 1992, 1991,   86, 1988, 3147, 1989, 1983, 1985,
+     1994,   86, 1995,   86, 1997, 1990,   86,   86,   86,   86,
+       86,   86, 1998, 1999, 1996, 2000, 2001,   86,   86,   86,
+     2005, 2003, 2002, 2004,   86,   86,   86, 2009,   86,   86,
+       86, 2008, 2014,   86,   86, 2011, 2006, 2007, 2010, 2012,
+       86,   86,   86, 2013,   86,   86,   86,   86, 2021,   86,
+     2019, 2016, 2020,   86,   86,   86,   86,   86,   86, 2026,
 
-     2020, 2023,   86, 2026,   86, 2025,   86, 2027, 2028,   86,
-       86, 2030,   86, 2029,   86, 2034,   86, 2036, 2031, 2032,
-     2033,   86,   86,   86, 2037, 2038,   86,   86,   86, 2035,
-       86, 2039,   86, 2043, 2040,   86, 2041,   86,   86, 2044,
-       86,   86,   86,   86,   86,   86,   86,   86, 2042, 2046,
-     2047, 2051, 2048, 2055,   86,   86, 2045, 2050, 2054,   86,
-       86,   86, 2056, 2053, 2052,   86, 2059, 2049, 2058,   86,
-       86,   86, 2062,   86, 2061, 2057, 2064,   86, 2063, 2060,
-     2065,   86,   86,   86,   86,   86, 2066, 2070,   86,   86,
-     2072, 2068,   86, 2074,   86, 2069,   86,   86,   86, 2067,
+       86, 2015, 2017,   86, 2018, 2023, 3147, 2022,   86, 2025,
+     2027, 2024, 2029,   86, 2030, 2028,   86, 2031,   86,   86,
+     2033, 2034,   86,   86, 2035, 2037,   86, 2032,   86,   86,
+       86, 2038,   86,   86, 2043, 2036,   86, 2045,   86, 2039,
+       86,   86,   86, 2046, 2042, 2040, 2048, 2041, 2047,   86,
+     2044,   86,   86,   86, 2052,   86,   86,   86, 2049,   86,
+       86,   86,   86,   86, 2050, 2053,   86,   86,   86, 2055,
+       86, 2056, 2051, 2057, 2060,   86, 2054, 2059, 2063, 2064,
+       86,   86,   86, 2062, 2067, 2065, 2058, 2061,   86,   86,
+     2066,   86,   86, 2068, 2070, 2069,   86, 2073, 2071,   86,
 
-     2077, 2076, 2078, 2071,   86,   86, 2073,   86, 2082, 2079,
-       86,   86,   86,   86,   86, 2075, 2083,   86, 2085, 2088,
-       86,   86, 2089, 2080,   86, 2084,   86, 2081, 2092,   86,
-       86, 2087, 2086,   86,   86, 2093,   86,   86, 2094, 2090,
-       86, 2096, 2098,   86,   86, 2100, 2091, 2095,   86, 2097,
-       86, 2101, 2099,   86,   86, 2104,   86, 2102, 2103,   86,
-       86, 2107, 2109, 2105,   86,   86, 2106, 2110,   86, 2111,
-       86,   86,   86,   86,   86,   86, 2112, 2108, 2114, 2115,
-       86, 2118, 2113,   86, 2116, 2117, 2119,   86,   86,   86,
-       86,   86,   86, 2120,   86,   86,   86, 2128, 2121, 2122,
+     2072,   86,   86,   86,   86,   86, 2074, 2079,   86, 2076,
+     2075, 2077,   86,   86, 2081, 2078, 2083,   86,   86,   86,
+     2086,   86, 2082, 2080, 2085,   86, 2087,   86,   86, 2091,
+     2088,   86,   86,   86,   86,   86, 2092,   86,   86, 2084,
+     2094, 2097,   86,   86, 2098, 2089, 2093,   86, 2090, 2101,
+       86, 2096,   86, 2095,   86,   86, 2103, 2102, 2100,   86,
+     2107,   86, 2099,   86,   86,   86, 2109, 2105, 2104,   86,
+     2110,   86, 2111,   86,   86, 2106, 2108,   86, 2112, 2116,
+       86,   86, 2118, 2114,   86,   86, 2115, 2119,   86, 2113,
+     2120,   86,   86,   86,   86,   86, 2121, 2122, 2123, 2124,
 
-     2129,   86, 2123, 2125, 2124, 2130, 2126, 2131,   86,   86,
-     2127,   86,   86,   86, 2133,   86, 2139,   86,   86,  167,
-     2132, 2141,   86,   86, 2138,   86, 2135, 2140,   86, 2143,
-     2136,   86, 2134, 2144, 2147,   86,   86, 2149, 2137, 2148,
-       86, 2146, 2142,   86, 2145, 2150,   86,   86, 2191, 2151,
-       86,   86, 2154,   86,   86, 2152, 2153,   86, 2155, 2158,
-     2159,   86,   86, 2160,   86, 2163, 2161,   86,   86,   86,
-     2165,   86, 2156, 2164, 2166,   86,   86,   86, 2168,   86,
-       86, 2167, 2162, 2157,   86,   86,   86, 2170,   86, 2169,
-     2171,   86,   86, 2174,   86,   86,   86, 2172,   86, 2177,
+       86, 2117, 2128,   86, 2125,   86,   86,   86,   86, 2127,
+       86,   86, 2126, 2129,   86,   86,   86,   86,   86,   86,
+     2134, 2132, 2131, 2130, 2137, 2133, 2135,   86,   86,   86,
+       86, 2136, 2138, 2144, 2145, 2140, 2142, 2139, 2143,   86,
+       86,   86, 2146, 2148,   86, 2150,   86,   86, 2141, 2147,
+     2149, 2152,   86,   86,  167, 2156, 2158, 2153, 2151, 2159,
+     2157,   86,   86,   86,   86,   86, 2154, 2160,   86, 2163,
+       86, 2161,   86, 2164,   86, 3147, 2155, 2168,   86,   86,
+     2169,   86,   86, 2167, 2172,   86,   86, 2165, 2162, 2178,
+       86, 2173,   86, 2170,   86, 2174, 2175,   86, 2166,   86,
 
-       86, 2183,   86, 2175, 2173, 2181, 2176,   86,   86,   86,
-     2178, 2179, 2184,   86, 2186,   86, 2180,   86,   86,   86,
-     2182,   86, 2185, 2190, 2193,   86,   86, 2188,   86, 2194,
-       86,   86,   86,   86,   86,   86, 2189, 2192,   86, 2187,
-     2204,   86,   86, 2205,   86, 2195, 2201, 2196,   86,   86,
-       86, 2199, 2206, 2197, 2200, 2198, 2202, 2203, 2208,   86,
-     2210, 2207,   86, 2209, 2211,   86, 2212,   86,   86,   86,
-     2215,   86, 2218,   86,   86,   86,   86, 2213,   86, 2219,
-     2216, 2214,   86, 2217, 2224,   86,   86, 2220, 2225,   86,
-     2223, 2227,   86,   86,   86, 2221, 2222, 2229,   86,   86,
+     2171, 2177,   86,   86, 2176,   86, 2180,   86,   86,   86,
+       86,   86, 2179, 2183,   86,   86, 2186,   86,   86, 2190,
+       86, 2192,   86, 2181,   86, 2185,   86,   86, 2193,   86,
+     2182,   86, 2184, 2187, 2188,   86, 2195, 2189,   86,   86,
+       86, 2194, 2191,   86, 2200, 2197,   86, 2198, 2199, 2203,
+       86,   86,   86, 2196, 2204,   86, 2201,   86, 2202,   86,
+       86,   86,   86, 2214,   86,   86, 3147,   86, 2216,   86,
+     2205, 2206,   86, 2211, 2215,   86, 3147,   86, 2207, 2209,
+     2210, 2208, 2213, 2212,   86, 2217,   86, 2220,   86, 2218,
+     2219, 2221,   86, 2222,   86,   86, 2225,   86,   86, 2223,
 
-     2232,   86, 2233,   86, 2231, 2226,   86,   86,   86, 2230,
-       86, 2228,   86, 2239,   86,   86, 2235, 2238, 2241,   86,
-     2234,   86, 2236,   86,   86,   86, 2244,   86, 2245, 2237,
-     2243, 2247,   86,   86, 2240,   86, 2251,   86,   86, 2242,
-       86,   86,   86, 2246, 2248,   86, 2255,   86, 2249, 2256,
-       86,   86, 2258,   86, 2250,   86, 2254,   86, 2252, 2261,
-       86,   86,   86, 2253, 2257,   86, 2259,   86, 2260, 2263,
-       86, 2264,   86, 2268,   86, 2262,   86, 2271,   86, 2265,
-     2270,   86, 2274, 2266,   86, 2269, 2275,   86,   86, 2276,
-       86,   86, 2272, 2267, 2273,   86, 2280,   86,   86,   86,
+       86, 2224, 2228,   86,   86, 2229, 2226,   86,   86, 2227,
+     2234,   86, 2230, 2235,   86,   86, 2237,   86, 2231,   86,
+     2233, 2239,   86,   86, 2232,   86, 2242,   86, 2243,   86,
+     2241,   86,   86,   86, 2236,   86,   86, 2238, 2240,   86,
+       86, 2245, 2249,   86, 2248, 2244,   86, 2246, 2251,   86,
+       86,   86, 2253, 2254, 2247, 2250,   86, 2255, 2252, 2257,
+       86,   86,   86, 2261,   86,   86,   86,   86,   86,   86,
+     2258,   86, 2256, 2265, 2266,   86, 2259,   86,   86, 2271,
+       86, 2260, 2264, 2268,   86, 2262, 2269, 2267,   86, 2263,
+       86,   86, 2270,   86,   86, 2273,   86, 2278,   86,   86,
 
-     2285, 2278, 2282, 2283,   86,   86,   86, 2287,   86,   86,
-     2288, 2279, 2277,   86, 2284,   86,   86,   86,   86, 2292,
-     2289, 2281, 2291,   86,   86, 2286, 2293, 2294,   86, 2298,
-     2299,   86, 2295, 2290, 3136,   86,   86, 2296, 2297,   86,
-       86,   86, 2303, 2300, 2304,   86, 2305,  167,   86, 2302,
-       86, 2301, 2307,   86, 2306,   86, 2312,   86,   86,   86,
-       86,   86,   86,   86,   86,   86, 3136, 2319, 2308, 2310,
-     2309, 2311, 2314, 2313, 2315, 2316, 2317, 2318,   86,   86,
-     2321, 2323,   86, 2320,   86, 2324, 2325,   86,   86,   86,
-     2328, 2322, 2326, 2327, 2329,   86,   86, 2331,   86,   86,
+       86, 2280,   86,   86, 2272, 2274, 2281, 2279, 2275,   86,
+       86, 2276, 2284,   86, 2285, 2286,   86,   86,   86,   86,
+     2277, 2282, 2290, 2283, 2292,   86, 2288, 2287,   86, 2295,
+     2293,   86, 2297,   86,   86,   86,   86, 2289,   86, 2298,
+       86, 2299,   86, 2294, 2291, 2302,   86,   86,   86,   86,
+       86,   86, 2296, 2301, 2308, 2303, 2304, 2305, 2300, 2306,
+       86, 2309,   86, 2307,   86,   86, 2310,   86,   86, 2313,
+     2314, 2311,  167, 2312,   86, 2315,   86, 2317,   86,   86,
+     2322,   86,   86, 2316,   86, 2318,   86, 2319,   86,   86,
+       86,   86,   86, 2324, 2320, 2321,   86, 2323, 2325, 2329,
 
-       86,   86, 2333,   86, 2330,   86,   86,   86, 2337,   86,
-     2338,   86,   86, 2332,   86, 2334,   86, 2340, 2341, 2335,
-     2345,   86,   86, 2339, 2342, 2336, 2343,   86,   86,   86,
-       86, 2348,   86, 2344, 2347,   86,   86,   86,   86,   86,
-       86, 2350, 2346, 2354,   86,   86,   86, 2357, 2349, 2351,
-     2356,   86, 2353,   86,   86,   86,   86, 2352, 2360, 2362,
-     2355, 2358, 2359, 2363, 2364,   86,   86, 2361, 2365,   86,
-       86, 2367,   86,   86,   86, 2368,   86, 2370, 2371, 2366,
-     2372,   86, 2374,   86,   86,   86,   86, 2376,   86,   86,
-       86,   86,   86, 2373, 2375,   86, 2380, 2384,   86, 2369,
+       86, 2328,   86,   86, 2326, 2327, 2336, 2330, 2333,   86,
+     2370, 2331, 2332,   86, 2334, 2335,   86,   86, 2338, 2339,
+       86,   86, 2337,   86,   86,   86, 2341,   86,   86, 2340,
+       86, 2343,   86,   86, 2347, 2342, 2348, 2345,   86,   86,
+     2344,   86,   86,   86, 2350, 2351, 2352, 2353,   86,   86,
+       86, 2346, 2349,   86, 2354, 2355,   86,   86,   86, 2356,
+       86, 2358, 2359,   86,   86, 2361,   86,   86,   86,   86,
+       86, 2360, 2365, 2357, 2368, 2367,   86,   86,   86, 2374,
+       86, 2364, 2369,   86, 2362,   86, 2363,   86, 2373, 2366,
+     2371,   86,   86, 2372, 2376, 2375,   86, 2378,   86,   86,
 
-     2382,   86, 2377, 2378,   86, 2386, 2379, 2385,   86, 2383,
-       86,   86,   86, 2387,   86,   86,   86, 2388, 2381, 2390,
-     2393,   86,   86, 2395,   86,   86, 2398,   86, 2392,   86,
-       86, 2394, 2389, 2399, 2391,   86,   86,   86,   86, 2402,
-     2397, 2404, 2396, 2403,   86,   86,   86,   86,   86,   86,
-     2408, 2407,   86,   86, 2400, 2401, 2406,   86,   86,   86,
-     3136, 2411, 2412, 2405, 2414,   86, 2409, 2410, 2415,   86,
-     2416,   86, 2417,   86, 2418,   86,   86, 2419, 2413,   86,
-       86, 2422,   86, 2423, 2421,   86,   86,   86,   86, 2428,
-       86,   86, 2430,   86, 2420, 2431,   86, 2424, 2425,   86,
+       86, 2379,   86, 2381, 2382, 2377, 2383,   86, 2385,   86,
+       86,   86,   86, 2387,   86,   86,   86,   86,   86, 2384,
+     2386,   86, 2391, 2395,   86, 2380, 2393,   86, 2388, 2389,
+       86, 2397, 2390, 2396,   86, 2394,   86,   86,   86, 2398,
+       86,   86,   86, 2399, 2392, 2401, 2404,   86,   86, 2406,
+       86,   86, 2409,   86, 2403,   86,   86, 2405, 2400, 2410,
+     2402,   86,   86,   86,   86, 2413, 2408, 2415, 2407, 2414,
+       86,   86,   86,   86,   86,   86, 2419, 2418,   86,   86,
+     2411, 2412, 2417,   86,   86,   86, 3147, 2422, 2423, 2416,
+     2425,   86, 2420, 2421, 2426,   86, 2427,   86, 2428,   86,
 
-       86,   86,   86,   86, 2427,   86, 2434, 2426,   86,   86,
-     2429, 2432,   86, 2433, 2435, 2440,   86, 2437, 2441,   86,
-       86,   86,   86, 2436,   86, 2438,   86,  167, 2439,   86,
-     2448,   86,   86,   86, 2444, 2449,   86,   86, 2446, 2447,
-     2443,   86,   86, 3136, 2455, 2442, 2445, 2450, 2451, 2452,
-       86,   86,   86, 2459,   86, 2457, 2456, 2458, 2453,   86,
-     2454, 2460,   86,   86, 2461,   86, 2462,   86, 2463, 2464,
-     2465,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86, 2474,   86,   86,   86, 2496, 2472, 2467,   86, 2478,
-     2466,   86, 2469, 2468, 2479,   86, 2471, 2470, 2473,   86,
+     2429,   86,   86, 2430, 2424,   86,   86, 2433,   86, 2434,
+     2432,   86,   86,   86,   86, 2439,   86,   86, 2441,   86,
+     2431, 2442,   86, 2435, 2436,   86,   86,   86,   86,   86,
+     2438,   86, 2445, 2437,   86,   86, 2440, 2443,   86, 2444,
+     2446, 2451,   86, 2448, 2452,   86,   86,   86,   86, 2447,
+       86, 2449,   86,  167, 2450,   86, 2459,   86,   86,   86,
+     2455, 2460,   86,   86, 2457, 2458, 2454,   86,   86, 3147,
+     2466, 2453, 2456, 2461, 2462, 2463,   86,   86,   86, 2470,
+       86, 2468, 2467, 2469, 2464,   86, 2465, 2471,   86,   86,
+     2472,   86, 2473,   86, 2474, 2475, 2476,   86,   86,   86,
 
-     2475, 2476, 2477,   86, 2480, 2482,   86,   86, 2481, 2484,
-       86,   86, 2483,   86,   86,   86,   86,   86,   86,   86,
-     2487, 2493,   86, 2494,   86, 2485, 2495,   86,   86, 2486,
-     2488,   86, 2489, 2491, 2490,   86, 2500, 2492, 2499,   86,
-       86,   86,   86, 2504, 2505,   86, 2497, 2503,   86,   86,
-     2498, 2506, 2507,   86,   86,   86,   86,   86,   86, 2501,
-     2502,   86,   86, 2509,   86,   86, 2513, 2508, 2511,   86,
-     2518,   86, 2517,   86, 2510, 2521,   86, 2512, 2514,   86,
-     2519, 2515,   86, 2522, 2516,   86, 2525,   86,   86, 2524,
-       86, 2520,   86,   86, 2530,   86,   86, 2523,   86,   86,
+       86,   86,   86,   86,   86,   86,   86, 2485,   86,   86,
+       86, 2507, 2483, 2478,   86, 2489, 2477,   86, 2480, 2479,
+     2490,   86, 2482, 2481, 2484,   86, 2486, 2487, 2488,   86,
+     2491, 2493,   86,   86, 2492, 2495,   86,   86, 2494,   86,
+       86,   86,   86,   86,   86,   86, 2498, 2504,   86, 2505,
+       86, 2496, 2506,   86,   86, 2497, 2499,   86, 2500, 2502,
+     2501,   86, 2511, 2503, 2510,   86,   86,   86,   86, 2515,
+     2516,   86, 2508, 2514,   86,   86, 2509, 2517, 2518,   86,
+       86,   86,   86,   86,   86, 2512, 2513,   86,   86, 2520,
+       86,   86, 2524, 2519, 2522,   86, 2529,   86, 2528,   86,
 
-       86, 2526,   86, 2533,   86, 2527,   86, 2532, 2531, 2534,
-       86, 2537, 2528, 2529, 2536,   86,   86,   86, 2539, 2535,
-     2541,   86,   86, 2542,   86, 2538, 2543, 2544,   86, 2540,
-       86,   86,   86, 2549,   86,   86,   86, 2545, 2551,   86,
-     2547, 2548,   86, 2546,   86,   86,   86, 2552,   86, 2553,
-     2550, 2555,   86,   86,   86, 2557, 2556,   86,   86, 2554,
-       86, 2558, 2559, 2561,   86, 2562, 2564,   86, 2560, 2565,
-       86, 2567, 2563, 2566,  167,   86,   86,   86, 2571, 3136,
-     2568,   86,   86, 2573,   86,   86, 2572,   86, 2576,   86,
-     2577,   86, 2575,   86, 2569, 2570, 2579,   86,   86, 2581,
+     2521, 2532,   86, 2523, 2525,   86, 2530, 2526,   86, 2533,
+     2527,   86, 2536,   86,   86, 2535,   86, 2531,   86,   86,
+     2541,   86,   86, 2534,   86,   86,   86, 2537,   86, 2544,
+       86, 2538,   86, 2543, 2542, 2545,   86, 2548, 2539, 2540,
+     2547,   86,   86,   86, 2550, 2546, 2552,   86,   86, 2553,
+       86, 2549, 2554, 2555,   86, 2551,   86,   86,   86, 2560,
+       86,   86,   86, 2556, 2562,   86, 2558, 2559,   86, 2557,
+       86,   86,   86, 2563,   86, 2564, 2561, 2566,   86,   86,
+       86, 2568, 2567,   86,   86, 2565,   86, 2569, 2570, 2572,
+       86, 2573, 2575,   86, 2571, 2576,   86, 2578, 2574, 2577,
 
-     2574, 2580,   86,   86, 2582,   86, 2578, 2583, 2584,   86,
-     2586,   86,   86,   86,   86, 2587,   86, 2588,   86,   86,
-       86, 2593, 2589, 2585, 2594, 2595, 2591,   86,   86, 2590,
-       86,   86,   86, 2597,   86, 2598,   86,   86,   86,   86,
-     2592, 2600, 2601, 2596,   86,   86, 2599,   86, 2606,   86,
-       86,   86, 2603, 2604, 2605,   86, 2602,   86, 2607, 2611,
-       86,   86,   86, 2615,   86,   86,   86,   86,   86, 2608,
-     2613, 2609, 2619,   86, 2610, 3136, 2612, 2614, 2620,   86,
-     2622, 2617, 2623, 2624, 2616,   86,   86, 2618,   86,   86,
-     2625,   86,   86, 2626,   86,   86,   86, 2627, 2621,   86,
+      167,   86,   86,   86, 2582, 3147, 2579,   86,   86, 2584,
+       86,   86, 2583,   86, 2587,   86, 2588,   86, 2586,   86,
+     2580, 2581, 2590,   86,   86, 2592, 2585, 2591,   86,   86,
+     2593,   86, 2589, 2594, 2595,   86, 2597,   86,   86,   86,
+       86, 2598,   86, 2599,   86,   86,   86, 2604, 2600, 2596,
+     2605, 2606, 2602,   86,   86, 2601,   86,   86,   86, 2608,
+       86, 2609,   86,   86,   86,   86, 2603, 2611, 2612, 2607,
+       86,   86, 2610,   86, 2617,   86,   86,   86, 2614, 2615,
+     2616,   86, 2613,   86, 2618, 2622,   86,   86,   86, 2626,
+       86,   86,   86,   86,   86, 2619, 2624, 2620, 2630,   86,
 
-     2630,   86,   86, 2628,   86, 2633, 2635,   86, 2629, 2636,
-       86, 2637,   86, 2631,   86,   86, 2632,   86, 2638,   86,
-     2634,   86, 2639, 2640,   86,   86, 2642, 2644,   86, 2647,
-       86, 2643, 2645,   86,   86, 2641, 2648,   86, 2649,   86,
-       86,   86,   86, 2650,   86, 2646,   86, 2651, 2652, 2654,
-       86,   86, 2655, 2656,   86, 2658,   86, 2657,   86, 2659,
-     2662, 2653, 2660, 2663,   86,   86,   86,   86, 2665, 2664,
-       86,   86, 2661, 2666,   86,   86, 2670, 2671,   86,   86,
-       86, 2674,   86,   86, 2673,   86,   86,   86,   86, 2677,
-     2667, 2668, 2675, 2676,   86, 2669,   86, 2679,   86, 2680,
+     2621, 3147, 2623, 2625, 2631,   86, 2633, 2628, 2634, 2635,
+     2627,   86,   86, 2629,   86,   86, 2636,   86,   86, 2637,
+       86,   86,   86, 2638, 2632,   86, 2641,   86,   86, 2639,
+       86, 2644, 2646,   86, 2640, 2647,   86, 2648,   86, 2642,
+       86,   86, 2643,   86, 2649,   86, 2645,   86, 2650, 2651,
+       86,   86, 2653, 2655,   86, 2658,   86, 2654, 2656,   86,
+       86, 2652, 2659,   86, 2660,   86,   86,   86,   86, 2661,
+       86, 2657,   86, 2662, 2663, 2665,   86,   86, 2666, 2667,
+       86, 2669,   86, 2668,   86, 2670, 2673, 2664, 2671, 2674,
+       86,   86,   86,   86, 2676, 2675,   86,   86, 2672, 2677,
 
-       86, 2683,   86, 2672, 2678, 2681, 2682,   86, 2687,   86,
-       86,   86,   86,   86,   86, 2689,   86, 2710, 2684,   86,
-     3136, 2686, 2685, 2690, 2688, 2691,   86, 2693, 2694, 2697,
-       86,   86, 2692, 2695,   86, 2696,   86, 2698,   86, 2699,
-       86, 2700,   86, 2701,   86,   86, 2704, 2702,   86, 2703,
-       86,   86,   86, 2709,   86, 2712,   86, 2706,   86, 2714,
-       86,   86, 2716,   86,   86, 2713, 2715,   86,   86, 2711,
-     2707, 2705, 2708, 2717,   86, 3136, 2718, 2719, 2721,   86,
-       86,   86,   86, 2725, 2722,   86,   86,   86, 2726,   86,
-     2723, 2729, 2720,   86,   86, 2728,   86, 2724, 2727, 2730,
+       86,   86, 2681, 2682,   86,   86,   86, 2685,   86,   86,
+     2684,   86,   86,   86,   86, 2688, 2678, 2679, 2686, 2687,
+       86, 2680,   86, 2690,   86, 2691,   86, 2694,   86, 2683,
+     2689, 2692, 2693,   86, 2698,   86,   86,   86,   86,   86,
+       86, 2700,   86, 2721, 2695,   86, 3147, 2697, 2696, 2701,
+     2699, 2702,   86, 2704, 2705, 2708,   86,   86, 2703, 2706,
+       86, 2707,   86, 2709,   86, 2710,   86, 2711,   86, 2712,
+       86,   86, 2715, 2713,   86, 2714,   86,   86,   86, 2720,
+       86, 2723,   86, 2717,   86, 2725,   86,   86, 2727,   86,
+       86, 2724, 2726,   86,   86, 2722, 2718, 2716, 2719, 2728,
 
-     2731,   86, 2732,   86,   86,   86,   86, 2733,   86,   86,
-       86, 2741,   86,   86, 2736,   86, 3136,   86, 2737, 2739,
-     2744, 2734, 2735,   86, 2742,   86, 2746,   86, 2745, 2740,
-       86, 2751,   86, 2738, 2743, 2748, 2747,   86, 2749, 2752,
-       86, 2750, 2753,   86,   86,   86,   86,   86, 2758,   86,
-       86, 2757,   86, 2754,   86, 2759,   86, 2760, 2761,   86,
-       86,   86,   86,   86,   86, 2755, 2756, 2762, 2763, 2765,
-     2767, 2769,   86,   86,   86,   86,   86, 2770,   86, 2766,
-     2771, 2764, 2774, 2772,   86, 2773,   86, 2768,   86, 2775,
-     2777,   86,   86,   86,   86,   86,   86, 2780,   86,   86,
+       86, 3147, 2729, 2730, 2732,   86,   86,   86,   86, 2736,
+     2733,   86,   86,   86, 2737,   86, 2734, 2740, 2731,   86,
+       86, 2739,   86, 2735, 2738, 2741, 2742,   86, 2743,   86,
+       86,   86,   86, 2744,   86,   86,   86, 2752,   86,   86,
+     2747,   86, 3147,   86, 2748, 2750, 2755, 2745, 2746,   86,
+     2753,   86, 2757,   86, 2756, 2751,   86, 2762,   86, 2749,
+     2754, 2759, 2758,   86, 2760, 2763,   86, 2761, 2764,   86,
+       86,   86,   86,   86, 2769,   86,   86, 2768,   86, 2765,
+       86, 2770,   86, 2771, 2772,   86,   86,   86,   86,   86,
+       86, 2766, 2767, 2773, 2774, 2776, 2778, 2780,   86,   86,
 
-       86, 2778,   86, 2781,   86, 2779, 2776, 2784, 3136, 2785,
-       86, 2782, 2787,   86,   86, 2783, 2789,   86,   86, 2788,
-     2790,   86,   86, 2791, 2786, 2792,   86,   86, 2797,   86,
-     2793,   86, 2796, 2799, 2794,   86,   86, 2801, 2795,   86,
-       86, 2804,   86,   86, 2806,   86,   86,   86, 2809,   86,
-       86, 2798, 2807, 2802, 2800, 2810,   86, 2812,   86, 2803,
-       86,   86,   86, 2805,   86,   86, 2811, 2808, 2817,   86,
-     2815, 2814, 2821,   86,   86,   86,   86, 2813, 2822,   86,
-     2823, 2819, 2816, 2818,   86, 2820, 2826, 2829, 2824, 2827,
-       86,   86,   86,   86, 2828,   86,   86, 2832,   86,   86,
+       86,   86,   86, 2781,   86, 2777, 2782, 2775, 2785, 2783,
+       86, 2784,   86, 2779,   86, 2786, 2788,   86,   86,   86,
+       86,   86,   86, 2791,   86,   86,   86, 2789,   86, 2792,
+       86, 2790, 2787, 2795, 3147, 2796,   86, 2793, 2798,   86,
+       86, 2794, 2800,   86,   86, 2799, 2801,   86,   86, 2802,
+     2797, 2803,   86,   86, 2808,   86, 2804,   86, 2807, 2810,
+     2805,   86,   86, 2812, 2806,   86,   86, 2815,   86,   86,
+     2817,   86,   86,   86, 2820,   86,   86, 2809, 2818, 2813,
+     2811, 2821,   86, 2823,   86, 2814,   86,   86,   86, 2816,
+       86,   86, 2822, 2819, 2828,   86, 2826, 2825, 2832,   86,
 
-       86, 2831, 2835,   86, 2825, 2833, 2838,   86,   86,   86,
-       86,   86,   86, 2830, 2843,   86,   86,   86, 2834,   86,
-     2836, 2837, 2839, 2846,   86, 2842, 2845, 2840, 2847,   86,
-     2851,   86,   86, 2849,   86, 2844, 2841, 2848,   86, 2850,
-     2852,   86, 2853,   86,   86, 2855,   86,   86,   86, 2854,
-       86,   86, 2860, 2861,   86,   86,   86, 2856, 2867,   86,
-     2865,   86, 2866,   86,   86, 2864,   86,   86,   86, 2857,
-     2858,   86, 2859, 2862, 3136, 2863, 2870, 2871,   86, 2872,
-       86, 2874,   86,   86, 2875,   86, 2868, 2869, 2873,   86,
-       86, 2878,   86, 2877, 2876,   86,   86,   86,   86,   86,
+       86,   86,   86, 2824, 2833,   86, 2834, 2830, 2827, 2829,
+       86, 2831, 2837, 2840, 2835, 2838,   86,   86,   86,   86,
+     2839,   86,   86, 2843,   86,   86,   86, 2842, 2846,   86,
+     2836, 2844, 2849,   86,   86,   86,   86,   86,   86, 2841,
+     2854,   86,   86,   86, 2845,   86, 2847, 2848, 2850, 2857,
+       86, 2853, 2856, 2851, 2858,   86, 2862,   86,   86, 2860,
+       86, 2855, 2852, 2859,   86, 2861, 2863,   86, 2864,   86,
+       86, 2866,   86,   86,   86, 2865,   86,   86, 2871, 2872,
+       86,   86,   86, 2867, 2878,   86, 2876,   86, 2877,   86,
+       86, 2875,   86,   86,   86, 2868, 2869,   86, 2870, 2873,
 
-     2879,   86, 2882,   86,   86, 2884,   86,   86,   86, 2880,
-     2883, 2885,   86,   86,   86,   86, 2881,   86,   86, 2894,
-     2886, 2897, 2895, 2898, 2887, 2889, 2888,   86, 2890, 2893,
-     2891, 2892,   86,   86,   86, 2896, 2901,   86, 2902,   86,
-       86, 2904,   86, 2923, 2903,   86, 2900, 2905,   86, 2912,
-     2906, 2907, 2899,   86, 2908, 2909,   86,   86, 2910, 2911,
-       86,   86, 2913,   86,   86,   86,   86, 2919,   86,   86,
-       86, 2918,   86,   86, 2914,   86, 2922, 2921, 2915, 3136,
-     2916,   86,   86, 2927,   86, 2917, 2928,   86, 2924,   86,
-     2926, 2929,   86, 2925, 2920,   86,   86, 2934, 2932, 2930,
+     3147, 2874, 2881, 2882,   86, 2883,   86, 2885,   86,   86,
+     2886,   86, 2879, 2880, 2884,   86,   86, 2889,   86, 2888,
+     2887,   86,   86,   86,   86,   86, 2890,   86, 2893,   86,
+       86, 2895,   86,   86,   86, 2891, 2894, 2896,   86,   86,
+       86,   86, 2892,   86,   86, 2905, 2897, 2908, 2906, 2909,
+     2898, 2900, 2899,   86, 2901, 2904, 2902, 2903,   86,   86,
+       86, 2907, 2912,   86, 2913,   86,   86, 2915,   86, 2934,
+     2914,   86, 2911, 2916,   86, 2923, 2917, 2918, 2910,   86,
+     2919, 2920,   86,   86, 2921, 2922,   86,   86, 2924,   86,
+       86,   86,   86, 2930,   86,   86,   86, 2929,   86,   86,
 
-     2931, 2933, 2935,   86, 2936,   86,   86,   86,   86,   86,
-       86, 2944, 2940, 2941, 2943,   86,   86,   86, 2946,   86,
-     2938, 2937, 2945, 2947,   86,   86,   86, 2939, 2942, 2971,
-     2948, 2949,   86, 2950,   86, 2951,   86, 2952,   86, 2953,
-       86, 2954,   86, 2955,   86, 2956,   86,   86, 2958,   86,
-       86,   86,   86,   86,   86,   86, 2957, 2963,   86, 2959,
-       86,   86,   86, 2960,   86, 2967,   86, 2966, 2964, 2969,
-       86,   86, 2961, 2962, 2965, 2968,   86, 2973,   86, 2976,
-     2970, 2975,   86,   86,   86,   86,   86,   86, 2978, 2974,
-       86,   86, 2972, 2982,   86,   86, 2977,   86, 2985,   86,
+     2925,   86, 2933, 2932, 2926, 3147, 2927,   86,   86, 2938,
+       86, 2928, 2939,   86, 2935,   86, 2937, 2940,   86, 2936,
+     2931,   86,   86, 2945, 2943, 2941, 2942, 2944, 2946,   86,
+     2947,   86,   86,   86,   86,   86,   86, 2955, 2951, 2952,
+     2954,   86,   86,   86, 2957,   86, 2949, 2948, 2956, 2958,
+       86,   86,   86, 2950, 2953, 2982, 2959, 2960,   86, 2961,
+       86, 2962,   86, 2963,   86, 2964,   86, 2965,   86, 2966,
+       86, 2967,   86,   86, 2969,   86,   86,   86,   86,   86,
+       86,   86, 2968, 2974,   86, 2970,   86,   86,   86, 2971,
+       86, 2978,   86, 2977, 2975, 2980,   86,   86, 2972, 2973,
 
-     2983, 2987,   86, 2979, 2980,   86, 2981, 2988,   86, 2984,
-     2986, 2989,   86,   86, 2991,   86,   86, 2992,   86,   86,
-       86,   86, 2990, 2998, 2997,   86,   86, 3000,   86,   86,
-     2994, 2996,   86,   86,   86, 2993,   86,   86,   86,   86,
-     2999, 2995, 3001,   86,   86,   86, 3007, 3002,   86, 3004,
-     3003, 3006,   86, 3011, 3015, 3008, 3014,   86, 3010, 3005,
-     3009, 3016,   86,   86, 3013,   86, 3012,   86, 3017, 3018,
-       86, 3019,   86,   86,   86,   86, 3022,   86,   86, 3023,
-     3024, 3027, 3020,   86,   86, 3021,   86,   86,   86, 3032,
-       86, 3030,   86, 3026,   86,   86, 3029, 3028, 3035,   86,
+     2976, 2979,   86, 2984,   86, 2987, 2981, 2986,   86,   86,
+       86,   86,   86,   86, 2989, 2985,   86,   86, 2983, 2993,
+       86,   86, 2988,   86, 2996,   86, 2994, 2998,   86, 2990,
+     2991,   86, 2992, 2999,   86, 2995, 2997, 3000,   86,   86,
+     3002,   86,   86, 3003,   86,   86,   86,   86, 3001, 3009,
+     3008,   86,   86, 3011,   86,   86, 3005, 3007,   86,   86,
+       86, 3004,   86,   86,   86,   86, 3010, 3006, 3012,   86,
+       86,   86, 3018, 3013,   86, 3015, 3014, 3017,   86, 3022,
+     3026, 3019, 3025,   86, 3021, 3016, 3020, 3027,   86,   86,
+     3024,   86, 3023,   86, 3028, 3029,   86, 3030,   86,   86,
 
-       86,   86, 3025, 3038,   86,   86, 3039, 3033, 3031, 3040,
-     3036,   86,   86, 3034, 3042, 3043,   86,   86, 3037,   86,
-       86,   86, 3048,   86, 3047,   86, 3044, 3049,   86, 3045,
-     3041,   86,   86,   86,   86,   86, 3046,   86, 3053,   86,
-     3055,   86,   86,   86,   86,   86, 3050, 3052, 3060, 3061,
-       86, 3051, 3054,   86, 3057, 3058, 3056, 3068, 3059, 3062,
-       86, 3066,   86,   86,   86, 3063,   86, 3069, 3064, 3067,
-       86,   86, 3065,   86,   86, 3070, 3071, 3074, 3072, 3075,
-       86,   86,   86,   86, 3077,   86, 3076,   86,   86,   86,
-       86, 3078, 3083, 3073,   86, 3080,   86,   86,   86,   86,
+       86,   86, 3033,   86,   86, 3034, 3035, 3038, 3031,   86,
+       86, 3032,   86,   86,   86, 3043,   86, 3041,   86, 3037,
+       86,   86, 3040, 3039, 3046,   86,   86,   86, 3036, 3049,
+       86,   86, 3050, 3044, 3042, 3051, 3047,   86,   86, 3045,
+     3053, 3054,   86,   86, 3048,   86,   86,   86, 3059,   86,
+     3058,   86, 3055, 3060,   86, 3056, 3052,   86,   86,   86,
+       86,   86, 3057,   86, 3064,   86, 3066,   86,   86,   86,
+       86,   86, 3061, 3063, 3071, 3072,   86, 3062, 3065,   86,
+     3068, 3069, 3067, 3079, 3070, 3073,   86, 3077,   86,   86,
+       86, 3074,   86, 3080, 3075, 3078,   86,   86, 3076,   86,
 
-     3086, 3079, 3087,   86,   86,   86,   86,   86, 3081, 3082,
-     3085, 3090,   86, 3084, 3088, 3091,   86, 3089,   86, 3094,
-     3093, 3095,   86, 3092,   86, 3096,   86, 3098,   86, 3100,
-       86, 3101,   86,   86,   86, 3105,   86, 3102, 3136,   86,
-     3103, 3108,   86, 3099, 3106,   86,   86, 3107, 3097,   86,
-       86,   86,   86, 3104,   86,   86, 3109, 3110,   86, 3112,
-     3114,   86,   86, 3116,   86, 3111,   86, 3117,   86, 3120,
-     3113, 3115, 3121,   86, 3118,   86,   86, 3124, 3125,   86,
-       86, 3127,   86, 3119,   86, 3122,   86, 3126, 3128,   86,
-       86, 3129,   86,   86, 3123, 3130, 3136, 3131, 3134,   86,
+       86, 3081, 3082, 3085, 3083, 3086,   86,   86,   86,   86,
+     3088,   86, 3087,   86,   86,   86,   86, 3089, 3094, 3084,
+       86, 3091,   86,   86,   86,   86, 3097, 3090, 3098,   86,
+       86,   86,   86,   86, 3092, 3093, 3096, 3101,   86, 3095,
+     3099, 3102,   86, 3100,   86, 3105, 3104, 3106,   86, 3103,
+       86, 3107,   86, 3109,   86, 3111,   86, 3112,   86,   86,
+       86, 3116,   86, 3113, 3147,   86, 3114, 3119,   86, 3110,
+     3117,   86,   86, 3118, 3108,   86,   86,   86,   86, 3115,
+       86,   86, 3120, 3121,   86, 3123, 3125,   86,   86, 3127,
+       86, 3122,   86, 3128,   86, 3131, 3124, 3126, 3132,   86,
 
-     3135,   86, 3136, 3136, 3136, 3132, 3136, 3136, 3136, 3136,
-     3136, 3136, 3133,   47,   47,   47,   47,   47,   47,   47,
-       52,   52,   52,   52,   52,   52,   52,   57,   57,   57,
-       57,   57,   57,   57,   63,   63,   63,   63,   63,   63,
-       63,   68,   68,   68,   68,   68,   68,   68,   74,   74,
-       74,   74,   74,   74,   74,   80,   80,   80,   80,   80,
-       80,   80,   89,   89, 3136,   89,   89,   89,   89,  157,
-      157, 3136, 3136, 3136,  157,  157,  159,  159, 3136, 3136,
-      159, 3136,  159,  161, 3136, 3136, 3136, 3136, 3136,  161,
-      164,  164, 3136, 3136, 3136,  164,  164,  166, 3136, 3136,
+     3129,   86,   86, 3135, 3136,   86,   86, 3138,   86, 3130,
+       86, 3133,   86, 3137, 3139,   86,   86, 3140,   86,   86,
+     3134, 3141, 3147, 3142, 3145,   86, 3146,   86, 3147, 3147,
+     3147, 3143, 3147, 3147, 3147, 3147, 3147, 3147, 3144,   47,
+       47,   47,   47,   47,   47,   47,   52,   52,   52,   52,
+       52,   52,   52,   57,   57,   57,   57,   57,   57,   57,
+       63,   63,   63,   63,   63,   63,   63,   68,   68,   68,
+       68,   68,   68,   68,   74,   74,   74,   74,   74,   74,
+       74,   80,   80,   80,   80,   80,   80,   80,   89,   89,
+     3147,   89,   89,   89,   89,  157,  157, 3147, 3147, 3147,
+
+      157,  157,  159,  159, 3147, 3147,  159, 3147,  159,  161,
+     3147, 3147, 3147, 3147, 3147,  161,  164,  164, 3147, 3147,
+     3147,  164,  164,  166, 3147, 3147, 3147, 3147, 3147,  166,
+      168,  168, 3147,  168,  168,  168,  168,  171, 3147, 3147,
+     3147, 3147, 3147,  171,  174,  174, 3147, 3147, 3147,  174,
+      174,   90,   90, 3147,   90,   90,   90,   90,   17, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147
 
-     3136, 3136, 3136,  166,  168,  168, 3136,  168,  168,  168,
-      168,  171, 3136, 3136, 3136, 3136, 3136,  171,  174,  174,
-     3136, 3136, 3136,  174,  174,   90,   90, 3136,   90,   90,
-       90,   90,   17, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136
     } ;
 
-static const flex_int16_t yy_chk[6174] =
+static const flex_int16_t yy_chk[6200] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2147,7 +2153,7 @@ static const flex_int16_t yy_chk[6174] =
         5,    3,    6,   24,    4,   24,   24,    5,   24,    6,
         7,    7,    7,    7,   24,    7,    8,    8,    8,    8,
        33,    8,    7,    9,    9,    9,   26,   26,    8,   10,
-       10,   10,   19,   29,    9,   33,   19,   29, 3144,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3155,   35,
        10,   11,   11,   11,   11,   11,   11,   13,   13,   13,
 
        13,   34,   13,   11,   35,   99,   34,   29,   38,   13,
@@ -2159,7 +2165,7 @@ static const flex_int16_t yy_chk[6174] =
        43,   43,   40,   43,   25,   28,   31,   87,   30,   32,
        28,   87,   43,   32,   28,   94,   32,   28,   43,   28,
        28,   56,   94,   32,   56,   32,   36,   36,   37,   37,
-       28,   45,   45,   37, 2566,   36,   45,   39,   41,   41,
+       28,   45,   45,   37, 2577,   36,   45,   39,   41,   41,
 
        45,   36,   39,   41,  124,   36,   39,   67,   67,   37,
        73,  124,   39,   41,   41,   39,   41,   44,   42,   84,
@@ -2183,7 +2189,7 @@ static const flex_int16_t yy_chk[6174] =
       136,  140,  147,  141,  138,  144,  149,  151,  144,  145,
       152,  146,  150,  148,  150,  152,  153,  156,  154,  151,
 
-      155,  147,  149,  150, 1041,  155,  158,  158,  153,  160,
+      155,  147,  149,  150, 1044,  155,  158,  158,  153,  160,
       182,  156,  160,  165,  165,  150,  154,  162,  182,  162,
       162,  167,  162,  167,  167,  168,  167,  168,  168,  170,
       168,  172,  170,  172,  172,  176,  172,  168,  175,  175,
@@ -2235,8 +2241,8 @@ static const flex_int16_t yy_chk[6174] =
       359,  362,  360,  361,  361,  366,  362,  365,  367,  363,
       368,  357,  363,  369,  357,  372,  357,  371,  363,  375,
       371,  378,  363,  367,  374,  368,  366,  369,  375,  372,
-      363,  364,  364,  380,  364,  376,  371,  377,  667,  374,
-      376,  376,  378,  377,  379,  382,  384,  364,  380,  667,
+      363,  364,  364,  380,  364,  376,  371,  377,  668,  374,
+      376,  376,  378,  377,  379,  382,  384,  364,  380,  668,
 
       364,  381,  364,  383,  364,  373,  385,  373,  373,  383,
       381,  386,  388,  379,  382,  391,  389,  373,  390,  373,
@@ -2244,580 +2250,583 @@ static const flex_int16_t yy_chk[6174] =
       391,  394,  392,  387,  396,  388,  389,  394,  390,  395,
       395,  397,  398,  393,  399,  400,  401,  402,  403,  403,
       399,  403,  402,  397,  396,  404,  398,  405,  406,  408,
-      481,  408,  401,  407,  409,  410,  409,  411,  413,  410,
-      400,  411,  415,  405,  406,  404,  414,  407,  412,  412,
-      416,  417,  481,  418,  409,  419,  411,  413,  415,  421,
-      422,  414,  418,  421,  419,  417,  420,  424,  416,  422,
+      159,  408,  401,  407,  409,  410,  409,  409,  411,  410,
+      400,  413,  411,  405,  406,  404,  414,  407,  412,  412,
+      415,  416,  424,  417,  409,  418,  419,  411,  420,  429,
+      413,  414,  422,  420,  418,  419,  415,  417,  421,  416,
 
-      423,  420,  425,  418,  429,  418,  423,  426,  425,  427,
-      428,  426,  427,  430,  430,  428,  431,  433,  424,  432,
-      432,  434,  433,  438,  429,  435,  435,  436,  437,  431,
-      439,  440,  437,  436,  434,  441,  440,  443,  438,  444,
-      441,  442,  442,  445,  446,  447,  449,  451,  447,  443,
-      442,  439,  451,  448,  450,  450,  446,  448,  449,  444,
-      452,  445,  453,  453,  456,  456,  457,  458,  459,  460,
-      461,  464,  463,  466,  465,  458,  467,  459,  468,  466,
-      470,  452,  461,  472,  468,  467,  472,  457,  465,  460,
-      463,  464,  463,  469,  470,  471,  473,  474,  469,  475,
+      423,  422,  421,  424,  425,  418,  423,  418,  426,  429,
+      425,  427,  426,  428,  427,  430,  430,  431,  428,  432,
+      432,  433,  434,  435,  435,  436,  433,  438,  437,  439,
+      431,  436,  437,  440,  441,  434,  442,  442,  440,  441,
+      443,  444,  438,  446,  445,  442,  447,  448,  449,  447,
+      439,  448,  443,  450,  450,  446,  452,  457,  451,  461,
+      449,  444,  445,  451,  453,  453,  456,  456,  458,  460,
+      459,  461,  463,  464,  465,  466,  458,  452,  457,  459,
+      468,  466,  467,  470,  476,  157,  468,  471,  465,  460,
+      463,  467,  463,  464,  469,  471,  473,  470,  471,  469,
 
-      476,  477,  478,  471,  477,  475,  471,  479,  478,  480,
-      473,  482,  474,  483,  480,  485,  488,  483,  484,  486,
-      476,  479,  487,  484,  486,  492,  478,  489,  493,  494,
-      485,  495,  482,  494,  505,  488,  496,  505,  487,  499,
-      489,  490,  490,  493,  497,  492,  500,  490,  497,  490,
-      495,  500,  496,  498,  499,  490,  501,  490,  498,  502,
-      490,  490,  498,  503,  504,  506,  507,  490,  502,  503,
-      508,  508,  501,  509,  503,  501,  510,  510,  511,  512,
-      504,  513,  514,  515,  516,  517,  507,  518,  506,  516,
-      522,  512,  519,  511,  517,  526,  513,  520,  509,  522,
+      472,  474,  475,  472,  476,  478,  477,  479,  475,  477,
+      473,  478,  480,  481,  483,  482,  474,  480,  483,  484,
+      486,  479,  485,  487,  484,  486,  488,  489,  492,  478,
+      505,  495,  728,  505,  493,  481,  482,  485,  494,  487,
+      489,  496,  494,  728,  499,  488,  490,  490,  492,  493,
+      495,  497,  490,  504,  490,  497,  500,  496,  498,  499,
+      490,  500,  490,  498,  501,  490,  490,  498,  502,  504,
+      503,  506,  490,  507,  508,  508,  503,  502,  509,  512,
+      501,  503,  511,  501,  510,  510,  513,  514,  515,  517,
+      516,  512,  518,  507,  506,  516,  520,  511,  517,  519,
 
-      523,  514,  524,  520,  523,  515,  518,  519,  524,  525,
-      526,  527,  528,  529,  530,  531,  532,  534,  533,  531,
-      533,  525,  535,  535,  537,  534,  528,  536,  529,  532,
-      527,  538,  530,  536,  539,  540,  537,  538,  540,  541,
-      542,  544,  543,  545,  544,  546,  539,  543,  549,  549,
-      548,  547,  545,  541,  551,  542,  547,  547,  556,  545,
-      551,  546,  545,  548,  550,  550,  552,  552,  553,  553,
-      554,  557,  555,  559,  557,  558,  554,  555,  555,  556,
-      558,  560,  561,  562,  563,  561,  564,  565,  562,  560,
-      566,  565,  559,  567,  568,  569,  566,  567,  570,  572,
+      522,  513,  520,  509,  523,  525,  514,  524,  523,  522,
+      515,  518,  526,  524,  519,  527,  528,  525,  529,  530,
+      531,  533,  532,  533,  531,  535,  535,  526,  534,  537,
+      528,  539,  536,  529,  527,  532,  534,  530,  536,  538,
+      541,  537,  542,  539,  540,  538,  543,  540,  546,  544,
+      545,  543,  544,  558,  541,  547,  558,  542,  548,  545,
+      547,  547,  549,  549,  546,  556,  545,  550,  550,  545,
+      551,  548,  552,  552,  553,  553,  551,  554,  557,  555,
+      560,  561,  559,  554,  555,  555,  556,  559,  562,  561,
+      557,  562,  563,  564,  565,  567,  566,  563,  568,  560,
 
-      569,  573,  571,  575,  572,  564,  577,  563,  571,  576,
-      576,  574,  568,  578,  574,  573,  581,  579,  570,  574,
-      580,  575,  579,  574,  577,  580,  582,  584,  585,  578,
-      581,  586,  587,  584,  586,  588,  587,  585,  590,  589,
-      588,  582,  589,  590,  591,  592,  593,  595,  594,  596,
-      597,  597,  595,  593,  599,  598,  600,  601,  587,  602,
-      591,  594,  603,  592,  598,  159,  601,  609,  603,  596,
-      604,  602,  600,  599,  605,  610,  604,  605,  606,  606,
-      607,  606,  608,  607,  611,  609,  612,  608,  613,  610,
-      611,  612,  614,  615,  613,  614,  616,  617,  615,  618,
+      566,  567,  568,  569,  570,  571,  572,  595,  574,  570,
+      573,  575,  572,  565,  575,  573,  564,  576,  578,  575,
+      595,  569,  574,  575,  579,  571,  577,  577,  580,  581,
+      582,  583,  585,  580,  581,  576,  578,  588,  585,  586,
+      579,  588,  587,  592,  582,  587,  583,  589,  586,  591,
+      590,  593,  589,  590,  591,  594,  596,  597,  599,  592,
+      600,  596,  594,  588,  598,  598,  601,  599,  604,  593,
+      605,  602,  603,  610,  604,  606,  605,  597,  606,  600,
+      602,  611,  601,   85,  603,  607,  607,  608,  607,  609,
+      608,  610,  612,  614,  609,  611,  613,  615,  612,  614,
 
-      619,  616,  616,  620,  621,  619,  622,  624,  623,  620,
-      617,  626,  618,  623,  629,  622,  625,  625,  626,  619,
-      619,  627,  628,  621,  627,  630,  629,  624,  628,  631,
-      630,  632,  632,  633,  631,  631,  634,  635,  634,  627,
-      636,  637,  636,  638,  639,  640,  641,  642,  643,  647,
-      645,  644,  643,  642,  646,  648,  635,  650,  633,  637,
-      644,  638,  639,  649,  640,  645,  641,  647,  652,  646,
-      651,  653,  650,  654,  648,  649,  651,  655,  658,  657,
-      656,  659,  652,  653,  656,  660,  661,  663,  662,  664,
-      664,  665,  654,  662,  658,  665,  655,  657,  666,  659,
+      615,  613,  616,  617,  618,  619,  620,  616,  617,  617,
+      621,  620,  622,  623,  624,  625,  621,  618,  619,  624,
+      626,  626,  623,  627,  628,  620,  620,  628,  629,  630,
+      627,  622,  631,  632,  629,  625,  634,  631,  632,  632,
+      636,  630,  628,  633,  633,  635,  637,  635,  637,  638,
+      639,  640,  641,  642,  643,  645,  648,  646,  644,  636,
+      643,  634,  644,  647,  645,  649,  651,  638,  639,  640,
+      650,  641,  646,  642,  648,  653,  654,  652,  647,  655,
+      656,  651,  650,  652,  649,  658,  657,  660,  654,  653,
+      657,  659,  661,  662,  664,  663,  665,  665,  655,  656,
 
-      668,  663,  669,  660,  660,  661,  670,  669,  671,  673,
-      672,  678,  675,  674,  668,  676,  673,  666,  674,  675,
-      676,  677,  670,  672,  679,  680,  677,  671,  681,  678,
-      682,  679,  683,  684,  680,  687,  689,  685,  684,  682,
-      685,  686,  681,  688,  683,  686,  690,  691,  697,  687,
-      695,  689,  688,  692,  692,  693,  693,  694,  694,  695,
-      690,  699,  700,  698,  693,  701,  700,  697,  691,  698,
-      702,  703,  704,  706,  705,  707,  708,  701,  704,  709,
-      706,  699,  705,  712,  719,  718,  715,  724,  724,  703,
-      719,  721,  722,  707,  718,  702,  723,  721,  712,  709,
+      663,  667,  666,  658,  669,  660,  666,  659,  664,  670,
+      661,  661,  662,  671,  670,  672,  674,  673,  669,  675,
+      667,  676,  677,  674,  675,  679,  678,  677,  676,  671,
+      673,  678,  680,  681,  672,  682,  683,  686,  684,  680,
+      686,  685,  681,  679,  687,  683,  685,  688,  687,  682,
+      684,  689,  690,  692,  691,  693,  693,  694,  694,  698,
+      689,  688,  695,  695,  696,  699,  694,  690,  691,  700,
+      702,  699,  701,  696,  692,  703,  701,  704,  698,  705,
+      706,  708,  702,  707,  709,  705,  710,  713,  706,  700,
+      707,  716,  719,  726,  726,  704,  723,  720,  722,  708,
 
-      723,  708,  710,  715,  710,  725,  725,  710,  722,  726,
-      727,  710,  728,  729,  710,  735,  733,  730,  739,  739,
-      726,  710,  710,  730,  710,  732,  728,  734,  727,  736,
-      732,  157,  736,  729,  731,  731,  731,  733,  731,  740,
-      735,  731,  737,  738,  742,  734,  731,  737,  737,  742,
-      738,  748,  731,  731,  740,  741,  741,  743,  744,  747,
-      743,  745,  745,  744,  746,  749,  746,  750,  752,  749,
-      748,  747,  751,  753,  753,  754,  752,  757,  755,  756,
-      756,  758,  759,  760,  762,  762,   85,  750,  781,  760,
-      754,  751,  755,  758,  761,  757,  763,  781,  765,  761,
+      703,  719,  713,  720,  722,  723,  710,  724,  716,  709,
+      711,  730,  711,  725,  735,  711,  729,  725,  731,  711,
+      727,  727,  711,  724,  736,  730,  734,  732,  737,  711,
+      711,  734,  711,  732,  729,  735,  741,  741,  731,  733,
+      733,  733,  736,  733,  738,  740,  733,  738,  742,  739,
+       80,  733,  740,  737,  739,  739,  744,  733,  733,  743,
+      743,  744,  745,  742,  746,  745,  747,  747,  748,  746,
+      748,  749,  750,  751,  752,  756,  753,  751,  754,  755,
+      755,  759,  757,  749,  758,  758,  754,  761,  760,   75,
+      756,  750,  762,  781,  752,  753,  757,  763,  762,  759,
 
-      766,  763,  763,  765,  759,  767,  766,  768,  769,  771,
-      770,  767,  768,  770,  769,  771,  772,  773,  773,  774,
-      774,  775,  776,  777,  772,  778,  779,  782,  777,  775,
-      780,  780,  778,  783,  784,  782,  788,  786,  787,  783,
-      776,  790,  794,  789,  793,  779,  786,  787,  789,  791,
-      790,  792,  791,  784,  795,  796,  792,  799,  793,  797,
-      788,  798,  798,  795,  797,  797,  800,  794,  796,  801,
-      802,  803,  799,  805,  803,  805,  806,  806,  801,  807,
-      809,  808,  803,  810,  811,  800,  808,  812,  813,  814,
-      815,  816,  817,  818,  802,  816,  819,  820,  814,  821,
+      760,  765,  763,  764,  764,  767,  765,  765,  768,  761,
+      767,  769,  781,  770,  768,  771,  772,  769,  770,  772,
+      773,  771,  774,  775,  775,  777,  773,  776,  776,  778,
+      774,  779,  780,  777,  782,  782,  779,  783,  785,  780,
+      784,  786,  788,  789,  785,  790,  783,  778,  784,  791,
+      792,  788,  789,  793,  791,  796,  793,  794,  795,  792,
+      786,  797,  794,  798,  800,  800,  801,  802,  799,  790,
+      797,  804,  795,  799,  799,  803,  798,  808,  808,  805,
+      796,  801,  805,  807,  803,  807,  802,  809,  810,  811,
+      805,  812,  813,  810,  814,  804,  816,  815,  817,  818,
 
-      807,  809,  819,  810,  811,  822,  820,  823,  813,  812,
-      817,  821,  818,  815,  824,  825,  828,  826,  827,  827,
-      824,  823,  826,  829,  822,  830,  831,  832,  833,  825,
-      834,  835,  829,  836,  831,  837,  828,  839,  838,  836,
-      840,  837,  841,  839,  844,  830,   80,  832,  841,  834,
-      833,  835,  838,  842,  843,  845,  846,  847,  843,  842,
-      840,  846,  849,  844,  848,  848,  850,  845,  849,  850,
-      851,  852,  854,  853,  859,  845,  855,  855,  847,  853,
-      856,  857,  862,  860,  852,  858,  857,  860,  851,  859,
-      858,  858,  854,  861,  861,  863,  864,  865,  856,  867,
+      819,  820,  823,  818,  824,  816,  822,  821,  809,  830,
+      811,  812,  813,  821,  823,  822,  814,  815,  819,  825,
+      820,  817,  826,  824,  827,  828,  829,  829,  826,  830,
+      828,  831,  832,  825,  833,  834,  835,  836,  827,  837,
+      831,  838,  833,  839,  841,  842,  840,  838,  843,  839,
+      841,  844,  832,  846,  843,  834,  836,  844,  835,  837,
+      840,  847,  845,  848,  849,  842,  845,  854,  848,  850,
+      850,  851,  846,  847,  853,  852,  855,  851,  852,  856,
+      854,  847,  855,  857,  857,  849,  858,  861,  859,  860,
+      863,  863,  853,  859,  860,  860,  862,  864,  865,  856,
 
-      868,  864,  870,  871,  862,  873,  873,  874,  876,  876,
-      877,  874,  875,  878,  868,  863,  865,  878,  879,  889,
-      898,  898,  870,  867,  871,  872,  880,  875,  872,  882,
-      872,  889,  881,  879,  872,  877,  872,  881,  884,  883,
-      880,  872,  885,  882,  883,  883,  872,  884,  886,  890,
-      887,  892,  886,  888,  890,  891,  885,  893,  888,  902,
-      895,  894,  901,   75,  886,  887,  895,  896,  888,  891,
-      894,  893,  892,  896,  897,  903,  899,  900,  902,  905,
-      897,  899,  906,  900,  901,  907,  908,  906,  909,  909,
-      913,  905,  910,  903,  904,  904,  911,  910,  908,  907,
+      862,  866,  861,  867,  858,  869,  866,  870,  872,  873,
+      875,  875,  876,  878,  878,   74,  876,  877,  865,  864,
+      879,  870,  867,  880,  881,  901,  901,  880,  872,  869,
+      873,  874,  877,  883,  874,  882,  874,  884,  883,  881,
+      874,  886,  874,  887,  891,  879,  889,  874,  885,  882,
+      886,  884,  874,  885,  885,  888,  891,  887,  890,  888,
+      892,  889,  893,  890,  894,  892,  895,  898,  896,  897,
+      904,  888,  898,  890,  902,  897,  893,  896,  899,  902,
+      895,  900,  903,  905,  899,  894,  906,  900,  903,  908,
+      909,  911,  904,  910,  913,  909,  912,  912,  915,  913,
 
-      904,  912,  904,  914,  911,  915,  915,  916,  904,  913,
-      917,  916,  919,  904,  904,  912,  920,  921,  919,  920,
-      904,  922,  914,  923,  925,  934,  924,  932,  927,  923,
-      917,  924,  928,  929,  922,  933,  921,  927,  930,  931,
-      933,  928,  935,  925,  930,  934,  932,  936,  931,  929,
-      937,  938,  939,  940,  941,  946,  935,  942,  944,  940,
-      938,  939,  937,  942,  947,  949,  948,  936,  950,  946,
-      952,  941,  951,  953,  944,  952,  956,  960,  953,  949,
-      957,  956,  958,  958,  947,  948,  950,  951,  959,  957,
-      960,  962,  963,  967,  959,  964,  964,  963,  963,  964,
+      914,  908,  905,  911,  906,  907,  907,  910,  914,  916,
+      917,  907,  915,  907,  918,  918,  919,  920,   68,  907,
+      919,  922,  924,  923,  907,  907,  923,  922,  916,  917,
+      925,  907,  926,  928,  927,  930,  931,  920,  926,  927,
+      932,  924,  933,  925,  930,  931,  934,  935,  933,  936,
+      937,  938,  928,  939,  936,  934,  932,  940,  941,  942,
+      947,  944,  950,  953,  951,  938,  935,  941,  942,  940,
+      937,  943,  949,  939,  945,  952,  947,  943,  944,  954,
+      945,  953,  950,  951,   63,  955,  949,  956,  959,  952,
+      955,  960,  956,  959,  954,  961,  961,  962,  963,  965,
 
-      965,  966,  968,  965,  969,  971,  970,  962,  972,  973,
-      974,  975,  976,  967,  972,  966,  974,  976,  968,  970,
-      971,  977,  969,  980,  979,  981,  975,  979,  982,  973,
-      981,  983,  984,  982,  985,  977,  986,  984,  989,  985,
-      988,  992,  992,  990,  980,  991,  988,  983,  986,  990,
-      993,  991,  994,  995,  989,  997,  995,  996,  996,  993,
-      998,  999, 1000, 1001, 1004, 1000, 1002, 1009, 1003, 1004,
-      994, 1010, 1002,  997, 1003, 1005, 1001, 1006, 1007,  998,
-     1005,  999, 1006, 1011, 1007, 1009, 1014, 1012, 1015, 1011,
-     1016, 1010, 1012, 1013, 1013, 1014, 1017, 1015, 1018, 1019,
+      960,  966,  969,  962,  967,  967,  966,  966,  967,  968,
+      970,  963,  968,  971,  972,  965,  969,  975,  973,  974,
+      976,  977,  978,  975,  980,  983,   58,  977,  979,  971,
+      970,  973,  972,  979,  974,  986,  982,  978,  980,  982,
+      976,  989,  984,  985,  987,  988,  983,  984,  985,  987,
+      988,  986,  991,  989,  992,  993,  994,  996,  991,  995,
+      995,  993,  994,  997,  998, 1000,  996,  998,  999,  999,
+      992, 1001, 1002, 1003, 1004, 1007, 1003, 1008, 1005, 1006,
+     1007,  997, 1008, 1000, 1005, 1006, 1009, 1004, 1010, 1012,
+     1001, 1009, 1002, 1013, 1010, 1014, 1017, 1015, 1016, 1016,
 
-     1020, 1018, 1019, 1021, 1022, 1023, 1024, 1025, 1016, 1027,
-     1026, 1020, 1024, 1025, 1027, 1017, 1022, 1028, 1028, 1029,
-     1030, 1021, 1032, 1031, 1023, 1026, 1032, 1033, 1034, 1035,
-     1036, 1038, 1039, 1039, 1030, 1031, 1040, 1034, 1029, 1042,
-     1044, 1045, 1043, 1047, 1047, 1033, 1045, 1048, 1035, 1046,
-     1038,   74, 1044, 1042, 1049, 1036, 1040, 1043, 1046, 1050,
-     1049, 1051, 1052, 1053, 1052, 1050, 1051, 1048, 1053, 1054,
-     1055, 1056, 1057, 1058, 1059, 1060, 1056, 1061, 1063, 1063,
-     1064, 1059, 1065, 1054, 1055, 1067, 1066, 1057, 1068,   68,
-     1060, 1067, 1058, 1069, 1064, 1071, 1061, 1075, 1069, 1071,
+     1018, 1014, 1015, 1019, 1020, 1017, 1023, 1012, 1021, 1018,
+     1024, 1021, 1022, 1013, 1025, 1022, 1026, 1023, 1027, 1028,
+     1032, 1019, 1029, 1020, 1027, 1028, 1025, 1030, 1024, 1031,
+     1031, 1033, 1030, 1036, 1034, 1026, 1035, 1029, 1037, 1032,
+     1035, 1038, 1039, 1041, 1043, 1033, 1034, 1037, 1042, 1042,
+     1046, 1036, 1045, 1048, 1049, 1051, 1047, 1055, 1048, 1055,
+     1038,   57, 1041, 1049, 1043, 1046, 1045, 1039, 1047, 1050,
+     1050, 1052, 1053, 1057, 1054, 1051, 1056, 1052, 1053, 1054,
+     1058, 1056, 1060, 1059, 1061, 1062, 1063, 1057, 1059, 1064,
+     1066, 1066, 1062, 1067, 1058, 1068, 1069, 1060, 1070, 1071,
 
-     1065, 1066, 1072, 1072, 1075, 1073, 1076, 1069, 1068, 1069,
-     1073, 1078, 1069, 1074, 1074, 1077, 1079, 1080, 1077, 1081,
-     1076, 1082, 1084, 1083, 1081, 1085, 1080, 1084, 1086, 1091,
-     1078, 1088, 1088, 1089, 1079, 1083, 1085, 1090, 1089, 1092,
-     1082, 1093, 1090, 1094, 1092, 1093, 1095, 1086, 1096, 1091,
-     1097, 1099, 1094, 1098, 1102, 1100, 1101, 1103, 1104, 1106,
-     1107, 1095, 1100, 1096, 1105, 1098, 1099, 1108, 1101, 1097,
-     1105, 1111, 1109, 1102, 1106, 1112, 1104, 1111, 1103, 1113,
-     1107, 1109, 1115, 1114, 1116, 1117, 1119, 1108, 1121, 1116,
-     1112, 1114, 1120, 1113, 1118, 1122, 1122, 1117, 1124, 1118,
+     1076, 1063, 1074, 1061, 1070, 1076, 1074, 1067, 1064, 1072,
+     1079, 1069, 1081, 1068, 1072, 1075, 1075, 1077, 1077, 1071,
+     1078, 1082, 1086, 1072, 1079, 1072, 1080, 1078, 1072, 1080,
+     1084, 1081, 1083, 1085, 1086, 1084, 1088, 1087, 1089, 1082,
+     1090, 1083, 1087, 1092, 1092, 1095, 1093, 1098, 1094, 1089,
+     1088, 1093, 1085, 1094, 1097, 1096, 1098, 1099, 1097, 1090,
+     1096, 1100, 1101, 1102, 1103, 1095, 1104, 1106, 1105, 1107,
+     1108, 1109, 1099, 1104, 1110, 1102, 1100, 1109, 1111, 1103,
+     1105, 1101, 1112, 1113, 1116, 1115, 1106, 1117, 1108, 1110,
+     1107, 1115, 1113, 1119, 1121, 1118, 1123, 1124, 1111, 1116,
 
-     1118, 1121, 1115, 1126, 1125, 1119, 1120, 1123, 1179, 1126,
-     1179, 1124, 1123, 1125, 1128, 1123, 1123, 1127, 1127, 1128,
-     1123, 1130, 1129, 1131, 1132, 1134, 1123, 1130, 1131, 1132,
-     1123, 1129, 1133, 1133, 1135, 1135, 1136, 1137, 1138, 1136,
-     1139, 1136, 1140, 1141, 1142, 1143, 1134, 1144, 1141, 1139,
-     1146, 1149, 1149, 1144, 1145, 1146, 1138, 1137, 1142, 1148,
-     1145, 1147, 1140, 1143, 1155, 1147, 1150, 1150, 1148, 1150,
-     1151, 1154, 1153, 1148, 1156, 1148, 1153, 1148, 1158, 1148,
-     1159, 1151, 1155, 1156, 1157, 1161, 1154, 1158, 1160, 1157,
-     1157, 1162, 1163, 1160, 1164, 1165, 1169, 1166, 1168, 1161,
+     1120, 1117, 1112, 1118, 1122, 1120, 1121, 1125, 1146, 1122,
+     1122, 1124, 1128, 1119, 1129, 1123, 1126, 1126, 1130,   52,
+     1125, 1127, 1146, 1129, 1130, 1128, 1127, 1131, 1131, 1127,
+     1127, 1132, 1133, 1134, 1127, 1138, 1132, 1135, 1136, 1134,
+     1127, 1133, 1135, 1136, 1127, 1137, 1137, 1139, 1139, 1140,
+     1141, 1142, 1140, 1143, 1140, 1144, 1138, 1217, 1145, 1147,
+     1148, 1149, 1143, 1145, 1217, 1152, 1148, 1149, 1150, 1142,
+     1141, 1155, 1151, 1150, 1152, 1144, 1151, 1147, 1158, 1152,
+     1157, 1152, 1155, 1152, 1157, 1152, 1153, 1153, 1154, 1154,
+     1159, 1154, 1160, 1158, 1161, 1162, 1163, 1164, 1165, 1161,
 
-     1162, 1171, 1159, 1166, 1167, 1167, 1168, 1170, 1172, 1165,
-     1169, 1163, 1170, 1164, 1173, 1171, 1174, 1172, 1175, 1176,
-     1176, 1177, 1182, 1175, 1178, 1178, 1181, 1182, 1183, 1181,
-     1184, 1186, 1173, 1185, 1185, 1189, 1177, 1187, 1187, 1184,
-     1189, 1174, 1188, 1188, 1190, 1191, 1199, 1183, 1192, 1192,
-     1193, 1186, 1194, 1195, 1196, 1194, 1203, 1202, 1197, 1196,
-     1198, 1203, 1198, 1204, 1199, 1190, 1191, 1197, 1201, 1205,
-     1193, 1201, 1202, 1195, 1205, 1206, 1207, 1204, 1211, 1208,
-     1214, 1207, 1210, 1206, 1208, 1209, 1209, 1210, 1212, 1216,
-     1213, 1224, 1217, 1214, 1212, 1216, 1211, 1213, 1217, 1218,
+     1161, 1160, 1164, 1167, 1162, 1166, 1168, 1169, 1159, 1170,
+     1171, 1171, 1165, 1173, 1166, 1170, 1172, 1175, 1163, 1177,
+     1176, 1169, 1167, 1174, 1172, 1168, 1178, 1173, 1174, 1176,
+     1179, 1175, 1180, 1180, 1181, 1179, 1187, 1177, 1182, 1182,
+     1183, 1185, 1183, 1186, 1185, 1188, 1189, 1189, 1186, 1181,
+     1190, 1178, 1191, 1191, 1188, 1187, 1192, 1192, 1193, 1194,
+     1195, 1196, 1196, 1193, 1197, 1198, 1199, 1200, 1198, 1201,
+     1190, 1202, 1200, 1202, 1203, 1206, 1205, 1207, 1201, 1205,
+     1194, 1195, 1207, 1208, 1197, 1215, 1199, 1210, 1209, 1211,
+     1206, 1212, 1203, 1209, 1211, 1210, 1212, 1208, 1213, 1213,
 
-     1219, 1220, 1221, 1222, 1218, 1226, 1219, 1223, 1223, 1227,
-     1220, 1224, 1228, 1229, 1222, 1236, 1230, 1231, 1233, 1229,
-     1226, 1221, 1230, 1231, 1233, 1234, 1235, 1236, 1237, 1227,
-     1238, 1239, 1239, 1240, 1241, 1228, 1242, 1245, 1243, 1234,
-     1244, 1244, 1237, 1243, 1246, 1234, 1235, 1248, 1238, 1246,
-     1249, 1250, 1251, 1240, 1242, 1249, 1249, 1252, 1253, 1241,
-     1245, 1251, 1254, 1255, 1263, 1252, 1248,   63, 1256, 1250,
-     1257, 1259, 1253, 1256, 1265, 1263, 1256, 1254, 1255, 1257,
-     1258, 1255, 1258, 1261, 1262, 1259, 1264, 1266, 1262, 1261,
-     1267, 1264, 1264, 1265, 1268, 1269, 1270, 1271, 1272, 1268,
+     1214, 1216, 1218, 1215, 1220, 1214, 1221, 1216, 1222, 1224,
+     1220, 1223, 1221, 1222, 1225, 1218, 1226, 1223, 1224, 1227,
+     1227, 1228, 1230, 1231, 1232, 1233, 1234, 1226, 1235, 1237,
+     1238, 1233, 1234, 1225, 1235, 1237, 1239, 1230, 1241, 1240,
+     1242, 1228, 1244, 1231, 1238, 1243, 1243, 1232, 1245, 1246,
+     1238, 1240, 1241, 1249, 1247, 1252, 1239, 1254, 1242, 1247,
+     1248, 1248, 1244, 1250, 1253, 1257, 1258, 1246, 1250, 1253,
+     1253, 1255, 1259, 1245, 1252, 1254, 1249, 1256, 1260, 1257,
+     1255, 1258, 1261, 1260, 1263, 1256, 1260, 1259, 1267, 1265,
+     1259, 1261, 1262, 1266, 1262, 1265, 1268, 1266, 1263, 1267,
 
-     1269, 1274, 1271, 1275, 1276, 1277, 1277, 1278, 1267, 1279,
-     1280, 1278, 1282, 1266, 1270, 1274, 1283, 1281, 1272, 1284,
-     1287, 1275, 1276, 1281, 1282, 1285, 1286, 1279, 1291, 1280,
-     1289, 1288, 1294, 1284, 1296, 1283, 1288, 1289, 1290, 1287,
-     1285, 1286, 1292, 1290, 1293, 1293, 1291, 1294, 1295, 1297,
-     1296, 1292, 1298, 1299, 1295, 1300, 1305, 1298, 1307, 1299,
-     1305, 1300, 1301, 1301, 1302, 1302, 1304, 1304, 1306, 1308,
-     1297, 1309, 1310, 1311, 1311, 1312, 1307, 1306, 1315, 1310,
-     1313, 1316, 1314, 1308, 1317, 1319, 1309, 1314, 1313, 1317,
-     1317, 1318, 1315, 1320, 1320, 1312, 1318, 1318, 1321, 1322,
+     1269, 1268, 1268, 1270, 1271, 1272, 1273, 1274, 1275, 1276,
+     1272, 1273, 1277, 1279, 1276, 1280, 1281, 1282, 1282, 1269,
+     1283, 1284, 1271, 1285, 1283, 1274, 1287, 1279, 1275, 1270,
+     1286, 1288, 1277, 1280, 1281, 1289, 1286, 1290, 1287, 1284,
+     1291, 1292, 1285, 1293, 1294, 1296, 1302, 1297, 1293, 1289,
+     1288, 1294, 1290, 1295, 1299, 1291, 1297, 1301, 1295, 1300,
+     1292, 1298, 1298, 1296, 1304, 1300, 1303, 1302, 1305, 1299,
+     1304, 1303, 1312, 1301, 1305, 1306, 1306, 1307, 1307, 1309,
+     1309, 1310, 1311, 1313, 1314, 1310, 1315, 1316, 1316, 1317,
+     1312, 1311, 1318, 1315, 1320, 1321, 1319, 1313, 1322, 1314,
 
-     1316, 1323, 1324, 1325, 1326, 1319, 1328, 1324, 1327, 1329,
-     1323, 1330, 1328, 1331, 1329, 1332, 1335, 1321, 1322, 1331,
-     1336, 1333, 1325, 1334, 1326, 1337, 1327, 1333, 1338, 1334,
-     1340, 1339, 1348, 1341, 1332, 1335, 1348, 1330, 1344, 1336,
-     1342, 1342, 1354, 1343, 1337, 1339, 1343, 1338, 1341, 1349,
-     1344, 1340, 1345, 1345, 1346, 1346, 1347, 1350, 1351, 1355,
-     1354, 1347, 1349, 1352, 1355, 1352, 1350, 1357, 1356, 1352,
-     1358, 1351, 1359, 1359, 1360, 1361, 1362, 1363, 1367, 1360,
-     1364, 1361, 1352, 1356, 1365, 1364, 1358, 1357, 1365, 1366,
-     1363, 1362, 1368, 1366, 1369, 1370, 1371, 1371, 1367, 1373,
+     1318, 1319, 1324, 1322, 1322, 1323, 1325, 1325, 1320, 1317,
+     1323, 1323, 1326, 1327, 1321, 1328, 1329, 1330, 1331, 1332,
+     1333, 1329, 1324, 1334, 1328, 1335, 1333, 1336, 1334, 1337,
+     1340, 1326, 1327, 1336, 1338, 1339, 1330, 1332, 1331, 1341,
+     1338, 1339, 1342, 1343, 1345, 1344, 1347, 1347, 1337, 1340,
+     1348, 1335, 1346, 1348, 1349, 1350, 1350,   47, 1341, 1344,
+     1359, 1342, 1343, 1351, 1351, 1345, 1349, 1346, 1352, 1354,
+     1353, 1355, 1356, 1352, 1353, 1357, 1361, 1357, 1359, 1360,
+     1355, 1357, 1354, 1362, 1360, 1356, 1363, 1364, 1364, 1367,
+     1365, 1361, 1366, 1368, 1357, 1365, 1369, 1372, 1366, 1374,
 
-     1375, 1370, 1376, 1377, 1377, 1378, 1379, 1376, 1381, 1381,
-     1368, 1378, 1383, 1385, 1369, 1383, 1386, 1373, 1384, 1384,
-     1388, 1375, 1389, 1388, 1390, 1392, 1379, 1391, 1391, 1385,
-     1393, 1394, 1386, 1390, 1395, 1396, 1397, 1397, 1398, 1395,
-     1392, 1399, 1389, 1400, 1401, 1402, 1402, 1398, 1403, 1396,
-     1394, 1393, 1404, 1406, 1409, 1405, 1407, 1407, 1400, 1399,
-     1405, 1408, 1403, 1410, 1410, 1408, 1411, 1412, 1406, 1401,
-     1404, 1413, 1414, 1418, 1409, 1413, 1415, 1419, 1412, 1417,
-     1417, 1415, 1420, 1421, 1422, 1423, 1424, 1424, 1411, 1418,
-     1428, 1414, 1425, 1426, 1427, 1419, 1420, 1425, 1422, 1428,
+     1373, 1369, 1363, 1362, 1367, 1370, 1368, 1371, 1375, 1370,
+     1378, 1371, 1376, 1376, 1375, 1380, 1381, 1372, 1373, 1374,
+     1383, 1381, 1382, 1382, 1384, 1390, 1383, 1391, 1378, 1386,
+     1386, 1388, 1389, 1389, 1388, 1393, 1380, 1394, 1393, 1395,
+     1397, 1390, 1398, 1391, 1384, 1396, 1396, 1399, 1395, 1400,
+     1401, 1402, 1402, 1403, 1400, 1397, 1404, 1394, 1405, 1406,
+     1407, 1407, 1403, 1398, 1401, 1408, 1399, 1409, 1411, 1414,
+     1410, 1412, 1412, 1405, 1404, 1410, 1413, 1415, 1415, 1408,
+     1413, 1416, 1417, 1411, 1406, 1409, 1418, 1419, 1423, 1414,
+     1418, 1420, 1424, 1417, 1422, 1422, 1420, 1425, 1426, 1427,
 
-     1429, 1430, 1421, 1421, 1431, 1429, 1431, 1432, 1434, 1433,
-     1423, 1435, 1432, 1426, 1427, 1433, 1437, 1435, 1438, 1438,
-     1439, 1430, 1442, 1440, 1443, 1444, 1444, 1442, 1434, 1440,
-     1437, 1445, 1445, 1446, 1447, 1448, 1451, 1449, 1453, 1439,
-     1449, 1450, 1450, 1452, 1456, 1455, 1471, 1446, 1443, 1456,
-     1448, 1455, 1447, 1454, 1451, 1452, 1454, 1457, 1453, 1454,
-     1457, 1459, 1460, 1461, 1471, 1462, 1472, 1460, 1462, 1464,
-     1459, 1454, 1463, 1463, 1465, 1464, 1457, 1466, 1466, 1465,
-     1467, 1467, 1469, 1468, 1470, 1472, 1473, 1469, 1461, 1468,
-     1474, 1477, 1475, 1474, 1476, 1478, 1477, 1470, 1475, 1479,
+     1428, 1429, 1429, 1416, 1423, 1433, 1419, 1430, 1431, 1432,
+     1424, 1425, 1430, 1427, 1433, 1434, 1435, 1426, 1426, 1436,
+     1434, 1436, 1437, 1439, 1438, 1428, 1440, 1437, 1431, 1432,
+     1438, 1442, 1440, 1443, 1443, 1444, 1435, 1447, 1445, 1448,
+     1449, 1449, 1447, 1439, 1445, 1442, 1450, 1450, 1451, 1452,
+     1453, 1456, 1454, 1458, 1444, 1454, 1455, 1455, 1457, 1461,
+     1460, 1477, 1451, 1448, 1461, 1453, 1460, 1452, 1459, 1456,
+     1457, 1459, 1462, 1458, 1459, 1462, 1464, 1465, 1466, 1477,
+     1467,   18, 1465, 1467, 1469, 1464, 1459, 1468, 1468, 1470,
+     1469, 1462, 1471, 1472, 1472, 1470, 1474, 1471, 1473, 1473,
 
-     1476, 1478, 1480, 1481, 1481, 1482, 1473, 1480, 1483, 1484,
-     1482, 1485, 1488, 1486, 1487, 1491, 1492, 1493, 1489, 1490,
-     1494, 1491, 1479, 1495, 1488, 1498, 1483, 1486, 1487, 1484,
-     1489, 1485, 1490, 1501, 1494, 1499, 1492, 1493, 1497, 1497,
-     1499, 1500, 1500, 1502, 1495, 1498, 1503, 1504, 1501, 1505,
-     1513, 1506, 1507, 1509,   58, 1508, 1511, 1502, 1505, 1507,
-     1514, 1515, 1515, 1514, 1508, 1504, 1506, 1508, 1517, 1509,
-     1503, 1511, 1516, 1516, 1518, 1513, 1511, 1521, 1519, 1522,
-     1517, 1519, 1520, 1520, 1523, 1525, 1524, 1526, 1527, 1523,
-     1521, 1524, 1518, 1528, 1533, 1531, 1529, 1527, 1522, 1535,
+     1475, 1476, 1474, 1466, 1478, 1475, 1479, 1480, 1483, 1481,
+     1480, 1482, 1484, 1483, 1476, 1481, 1485, 1482, 1484, 1486,
+     1487, 1487, 1488, 1478, 1486, 1489, 1479, 1488, 1490, 1491,
+     1492, 1493, 1497, 1498, 1494, 1495, 1499, 1496, 1497, 1485,
+     1500, 1501, 1507, 1489, 1492, 1493, 1494, 1495, 1490, 1491,
+     1496, 1503, 1503, 1498, 1500, 1504, 1499, 1507, 1505, 1506,
+     1506, 1509, 1501, 1505, 1508, 1510, 1512, 1511, 1515, 1519,
+     1513, 1520, 1517,   17, 1520, 1504, 1511, 1513, 1508, 1514,
+     1527, 1512, 1524, 1510, 1515, 1509, 1523, 1517, 1514, 1521,
+     1521, 1514, 1517, 1527, 1519, 1522, 1522, 1528, 1523, 1525,
 
-     1530, 1531, 1534, 1526, 1525, 1529, 1532, 1532, 1529, 1530,
-     1536, 1537, 1528, 1538, 1533, 1534, 1541, 1535, 1542, 1543,
-     1543, 1544, 1545, 1546, 1536, 1538, 1548, 1537, 1546, 1547,
-     1547, 1545, 1550, 1551, 1549, 1548, 1542, 1544, 1548, 1549,
-     1552, 1541, 1553, 1555, 1547, 1556, 1557, 1553, 1553, 1559,
-     1550, 1558, 1560, 1562, 1551, 1559, 1558, 1555, 1552, 1562,
-     1556, 1561, 1561, 1567, 1563, 1564, 1565, 1568, 1557, 1563,
-     1560, 1564, 1565, 1569, 1570, 1571, 1572, 1574, 1571, 1569,
-     1576, 1568, 1572, 1567, 1571, 1574, 1577, 1570, 1578, 1579,
-     1580, 1581, 1582, 1583, 1584, 1584, 1578, 1587, 1579, 1576,
+     1524, 1529, 1525, 1526, 1526, 1530, 1529, 1531, 1532, 1533,
+     1530, 1534, 1536, 1535, 1537, 1539, 1528, 1542, 1533, 1540,
+     1537, 1536, 1535, 1541, 1532, 1535, 1531, 1538, 1538, 1543,
+     1534, 1542, 1540, 1547, 1544, 1539, 1548, 1549, 1549, 1550,
+     1551, 1541, 1552, 1555, 1554, 1543, 1544, 1552, 1555, 1551,
+     1553, 1553, 1556, 1554, 1548, 1550, 1554, 1557, 1547, 1558,
+     1561, 1559, 1563, 1564, 1562, 1553, 1559, 1559, 1564, 1565,
+     1556, 1566, 1567, 1567, 1561, 1565, 1568, 1558, 1557, 1562,
+     1569, 1570, 1568, 1573, 1563, 1569, 1571, 1570, 1574, 1566,
+     1575, 1576, 1571, 1578, 1582, 1583, 1575, 1577, 1586, 1578,
 
-     1588, 1588, 1585, 1580, 1581, 1577, 1582, 1583, 1585, 1586,
-     1587, 1589, 1590, 1591, 1592, 1586, 1584, 1593, 1594, 1595,
-     1596, 1598, 1598, 1593, 1599, 1600, 1605, 1592, 1601, 1600,
-     1590, 1589, 1591, 1601, 1602, 1595, 1603, 1604, 1596, 1602,
-     1594, 1603, 1607, 1608, 1599, 1610, 1604, 1609, 1609, 1605,
-     1611, 1612, 1613, 1613, 1607, 1614, 1615, 1618, 1608, 1616,
-     1617, 1619, 1611, 1615, 1610, 1621, 1622, 1620, 1623, 1614,
-     1612, 1616, 1617, 1620, 1623,   57, 1618, 1621, 1624, 1624,
-     1625, 1619, 1628, 1625, 1622, 1626, 1626, 1628, 1629, 1630,
-     1631, 1631, 1632, 1635, 1633, 1630, 1633, 1629, 1634, 1636,
+     1577, 1580, 1574, 1573, 1576, 1587, 1577, 1584, 1585, 1580,
+     1588, 1586, 1589, 1582, 1583, 1584, 1591, 1585, 1587, 1590,
+     1590, 1592, 1591, 1593, 1588, 1595, 1589, 1592, 1594, 1594,
+     1596, 1597, 1599, 1598, 1600, 1601, 1593, 1602, 1599, 1604,
+     1604, 1590, 1605, 1606, 1607, 1595, 1598, 1606, 1596, 1607,
+     1597, 1601, 1608, 1609, 1610, 1602, 1600, 1608, 1609, 1611,
+     1613, 1614, 1605, 1610, 1615, 1615, 1616, 1617, 1618, 1619,
+     1619, 1621, 1613, 1625, 1620, 1624, 1614, 1622, 1621, 1617,
+     1623, 1628, 1611, 1627, 1626, 1616,    0, 1618, 1620, 1622,
+     1626, 1629, 1623, 1625, 1624, 1627, 1642, 1629, 1635, 1628,
 
-     1637, 1634, 1638, 1639, 1632, 1640, 1641, 1642, 1639, 1643,
-     1640, 1644, 1646, 1635, 1645, 1641, 1644, 1647, 1637, 1642,
-     1638, 1636, 1647, 1645, 1643, 1648, 1649, 1650, 1650, 1647,
-     1648, 1651, 1646, 1652, 1654, 1655, 1645, 1651, 1656,   52,
-     1657, 1649, 1657, 1658, 1659, 1659, 1660, 1660, 1661, 1661,
-     1662, 1655, 1665, 1654, 1652, 1663, 1663, 1658, 1656, 1658,
-     1664, 1664, 1666, 1667, 1667, 1668, 1669, 1673, 1670, 1668,
-     1662, 1670, 1669, 1665, 1672, 1674, 1675, 1677, 1677, 1676,
-     1672, 1674, 1676, 1666, 1679, 1673, 1678, 1678, 1680, 1679,
-     1681, 1682, 1683, 1684, 1680, 1685, 1688, 1690, 1691, 1684,
+     1630, 1630, 1631, 1632, 1632, 1631, 1634, 1635, 1636, 1637,
+     1637, 1634, 1638, 1639, 1636, 1639, 1640, 1641, 1642, 1640,
+     1643, 1644, 1645, 1646, 1638, 1647, 1650, 1645, 1646, 1648,
+     1649, 1650, 1652, 1651, 1647, 1653, 1655, 1641, 1643, 1644,
+     1653, 1648, 1651, 1654, 1658, 1649, 1661, 1653, 1654, 1656,
+     1656, 1655, 1652, 1657, 1660, 1651, 1662, 1663, 1664, 1657,
+     1664, 1669, 1665, 1666, 1666, 1658, 1661, 1667, 1667, 1668,
+     1668, 1672, 1662, 1660, 1670, 1670, 1665, 1663, 1665, 1671,
+     1671, 1669, 1673, 1674, 1674, 1675, 1680, 1676, 1677, 1675,
+     1679, 1677, 1672, 1676, 1681, 1682, 1679, 1686, 1683, 1688,
 
-     1687, 1675, 1681, 1681, 1681, 1687, 1687, 1695, 1690, 1681,
-     1688, 1682, 1683, 1691, 1689, 1685, 1689, 1692, 1693, 1694,
-     1696, 1696, 1697, 1692, 1698, 1698, 1699, 1693, 1695, 1700,
-     1701, 1701, 1702, 1702, 1703, 1706, 1706, 1707, 1708, 1694,
-     1710, 1715, 1711, 1714, 1712, 1718, 1699, 1708, 1697, 1710,
-     1712, 1700, 1713, 1713, 1703, 1720, 1715, 1717, 1716, 1719,
-     1719, 1721, 1707, 1711, 1714, 1716, 1717, 1723, 1724, 1725,
-     1727, 1718, 1723, 1726, 1724, 1732, 1727, 1721, 1728, 1731,
-     1726, 1720, 1729, 1729, 1728, 1730, 1733, 1734, 1731, 1725,
-     1730, 1735, 1736, 1737, 1735, 1732, 1738, 1738, 1739, 1734,
+     1681, 1683, 1686, 1673, 1680, 1684, 1684, 1685, 1685, 1687,
+     1689, 1688, 1688, 1688, 1690, 1687, 1691, 1692, 1688, 1694,
+     1682, 1695, 1691, 1700, 1694, 1694, 1696, 1697, 1696, 1698,
+     1689, 1701, 1700, 1699, 1690, 1695, 1702, 1692, 1697, 1699,
+     1703, 1703, 1704, 1706, 1698, 1705, 1705, 1707, 1708, 1708,
+     1710, 1701, 1709, 1709, 1713, 1713, 1714, 1702, 1715, 1718,
+     1719, 1721, 1717, 1706, 1720, 1720, 1719, 1715, 1704, 1707,
+     1710, 1717, 1722, 1725, 1727, 1724, 1723, 1726, 1726, 1728,
+     1718, 1714, 1721, 1723, 1724, 1730, 1731, 1722, 1732, 1733,
+     1730, 1734, 1731, 1736, 1736, 1728, 1733, 1734, 1735, 1725,
 
-     1740, 1741, 1742, 1743, 1739, 1733, 1740, 1743, 1745, 1746,
-     1736, 1747, 1748, 1748, 1749, 1750, 1747, 1742, 1752, 1737,
-     1753, 1741, 1762, 1743, 1753, 1755, 1754, 1760, 1745, 1758,
-     1750, 1746, 1754, 1749, 1755, 1756, 1756, 1752, 1757, 1761,
-     1758, 1762, 1757, 1759, 1759, 1758, 1763, 1764, 1760, 1765,
-     1766, 1763, 1768, 1761, 1773, 1767, 1766, 1768, 1769, 1769,
-     1770, 1770, 1771, 1773, 1774, 1775, 1771, 1764, 1782, 1765,
-     1767, 1776, 1776, 1778, 1778, 1774, 1779, 1780, 1781, 1790,
-     1774, 1779, 1779, 1780, 1781, 1775, 1783, 1784, 1787, 1785,
-     1789, 1783, 1788, 1792, 1782, 1785, 1788, 1791, 1798, 1784,
+     1727, 1737, 1738, 1739, 1735, 1740, 1737, 1741, 1732, 1742,
+     1743, 1738, 1742, 1744, 1745, 1745, 1746, 1748, 1749, 1741,
+     1747, 1750, 1746, 1739, 1740, 1750, 1747, 1752, 1743, 1753,
+     1754, 1755, 1755, 1749, 1756, 1754, 1762, 1748, 1759, 1744,
+     1757, 1750, 1760, 1761, 1764, 1762, 1760, 1752, 1764, 1761,
+     1765, 1753, 1767, 1756, 1768, 1757, 1769, 1759, 1763, 1763,
+     1770, 1765, 1766, 1766, 1771, 1770, 1765, 1772, 1768, 1775,
+     1773, 1774, 1781, 1767, 1775, 1769, 1773, 1776, 1776, 1777,
+     1777, 1778, 1780, 1781, 1771, 1778, 1774, 1772, 1781, 1782,
+     1789, 1780, 1783, 1783, 1785, 1785, 1786, 1787, 1788, 1791,
 
-     1787, 1793, 1789, 1791, 1790, 1794, 1795, 1793, 1797, 1799,
-     1794, 1802, 1802, 1801, 1799, 1792, 1801, 1798, 1795, 1805,
-     1797, 1803, 1803, 1804, 1804, 1806, 1807, 1810, 1808, 1809,
-       47, 1806, 1807, 1808, 1815, 1809, 1810, 1812, 1814, 1805,
-     1818, 1814, 1812, 1816, 1816, 1819, 1815, 1822, 1820, 1821,
-     1821, 1827, 1818, 1820, 1823, 1824, 1822, 1819, 1825, 1823,
-     1824, 1825, 1826, 1826, 1828, 1829, 1830, 1837, 1831, 1832,
-     1833, 1827, 1831, 1828, 1832, 1834, 1833, 1835, 1836, 1839,
-     1839, 1837, 1840, 1829, 1845, 1830, 1835, 1844, 1841, 1842,
-     1842, 1839, 1843, 1834, 1847, 1853, 1836, 1841, 1846, 1844,
+     1790, 1786, 1786, 1787, 1788, 1790, 1792, 1794, 1796, 1782,
+     1795, 1791, 1792, 1797, 1795, 1798, 1789, 1799, 1800, 1794,
+     1796, 1798, 1801, 1802, 1800, 1804, 1805, 1801, 1806, 1808,
+     1809, 1809, 1808, 1806, 1812, 1802,    0, 1804, 1797, 1799,
+     1810, 1810, 1811, 1811, 1813, 1805, 1814, 1817, 1815, 1816,
+     1813, 1822, 1814, 1815, 1812, 1816, 1817, 1819, 1821, 1823,
+     1823, 1821, 1819, 1822, 1825, 1826, 1827, 1828, 1828, 1829,
+     1830, 1827, 1833, 1833, 1831, 1830, 1825, 1826, 1829, 1831,
+     1832, 1834, 1835, 1832, 1836, 1837, 1838, 1839, 1840, 1841,
+     1838, 1835, 1839, 1843, 1840, 1844, 1842, 1847, 1846, 1846,
 
-     1840, 1843, 1854, 1846, 1856, 1845, 1857, 1847, 1850, 1850,
-     1852, 1853, 1859, 1852, 1866, 1858, 1860, 1860, 1854, 1856,
-     1857, 1858, 1861, 1863, 1861, 1862, 1862, 1865, 1867, 1859,
-     1869, 1863, 1868, 1868, 1865, 1870, 1866, 1871, 1872, 1869,
-     1873, 1874, 1875, 1878, 1881, 1876, 1879,   18, 1867, 1871,
-     1872, 1876, 1873, 1880, 1880, 1882, 1870, 1875, 1879, 1885,
-     1889, 1884, 1881, 1878, 1876, 1883, 1884, 1874, 1883, 1887,
-     1888, 1890, 1888, 1891, 1887, 1882, 1890, 1893, 1889, 1885,
-     1891, 1895, 1896, 1897, 1899, 1898, 1893, 1898, 1901, 1904,
-     1901, 1896, 1902, 1903, 1903, 1897, 1905, 1907, 1906, 1895,
+     1853, 1834, 1836, 1848, 1837, 1842,    0, 1841, 1852, 1844,
+     1846, 1843, 1848, 1849, 1849, 1847, 1850, 1850, 1851, 1854,
+     1852, 1853, 1855, 1861, 1854, 1858, 1858, 1851, 1860, 1862,
+     1865, 1860, 1864, 1867, 1866, 1855, 1868, 1868, 1871, 1861,
+     1866, 1869, 1874, 1869, 1865, 1862, 1871, 1864, 1870, 1870,
+     1867, 1873, 1875, 1876, 1876, 1878, 1877, 1879, 1873, 1880,
+     1882, 1881, 1883, 1886, 1874, 1877, 1887, 1889, 1884, 1879,
+     1890, 1880, 1875, 1881, 1884, 1893, 1878, 1883, 1887, 1888,
+     1888, 1891, 1897, 1886, 1891, 1889, 1882, 1884, 1892, 1895,
+     1890, 1903, 1898, 1892, 1895, 1893, 1896, 1898, 1896, 1899,
 
-     1906, 1905, 1907, 1899, 1908, 1909, 1902, 1910, 1911, 1908,
-     1914, 1912, 1913, 1916, 1911, 1904, 1912, 1917, 1914, 1918,
-     1918, 1919, 1919, 1909, 1920, 1913, 1921, 1910, 1922, 1925,
-     1923, 1917, 1916, 1926, 1922, 1923, 1924, 1933, 1924, 1920,
-     1928, 1926, 1927, 1927, 1929, 1929, 1921, 1925, 1931, 1926,
-     1930, 1930, 1928, 1932, 1935, 1933, 1937, 1931, 1932, 1936,
-     1939, 1936, 1938, 1935, 1940, 1947, 1935, 1938, 1938, 1939,
-     1942, 1946, 1948, 1943, 1944, 1950, 1940, 1937, 1943, 1944,
-     1951, 1948, 1942, 1952, 1946, 1947, 1949, 1949, 1953, 1954,
-     1958, 1956, 1959, 1950, 1957, 1960, 1961, 1959, 1951, 1952,
+     1897, 1901, 1904, 1905, 1907, 1906, 1899, 1906, 1910, 1903,
+     1901, 1904, 1909, 1912, 1909, 1905, 1911, 1911, 1914, 1913,
+     1914, 1915, 1910, 1907, 1913, 1916, 1915, 1917, 1918, 1919,
+     1916, 1920, 1922, 1921, 1924, 1919, 1920, 1925, 1929, 1912,
+     1922, 1926, 1926, 1927, 1927, 1917, 1921, 1928, 1918, 1930,
+     1933, 1925, 1931, 1924, 1932, 1930, 1932, 1931, 1929, 1934,
+     1935, 1935, 1928, 1939, 1936, 1937, 1937, 1934, 1933, 1938,
+     1938, 1941, 1939, 1940, 1943, 1934, 1936, 1944, 1940, 1944,
+     1945, 1947, 1946, 1943, 1948, 1950, 1943, 1946, 1946, 1941,
+     1947, 1954, 1955, 1951, 1952, 1958, 1948, 1950, 1951, 1952,
 
-     1960, 1964, 1953, 1956, 1954, 1961, 1957, 1964, 1966, 1967,
-     1958, 1968, 1969, 1970, 1966, 1971, 1972, 1972, 1973, 1979,
-     1964, 1974, 1974, 1975, 1971, 1976, 1968, 1973, 1977, 1976,
-     1969, 1978, 1967, 1977, 1980, 2025, 1985, 1981, 1970, 1980,
-     1980, 1979, 1975, 1981, 1978, 1982, 1983, 1984, 2025, 1983,
-     1990, 1982, 1988, 1988, 1993, 1984, 1985, 1989, 1989, 1990,
-     1991, 1991, 1992, 1992, 1994, 1995, 1993, 2003, 1996, 1997,
-     1997, 1995, 1989, 1996, 1998, 1998, 1999, 2005, 2000, 2007,
-     2009, 1999, 1994, 1989, 2000, 2002, 2004, 2003, 2008, 2002,
-     2004, 2010, 2012, 2008, 2011, 2013, 2014, 2005, 2016, 2011,
+     1956, 1945, 1957, 1957, 1954, 1959, 1960, 1961, 1964, 1956,
+     1962, 1966, 1955, 1958, 1965, 1975, 1977, 1978, 1976, 1967,
+     1964, 1961, 1960, 1959, 1967, 1962, 1965, 1968, 1969, 1972,
+     1974, 1966, 1968, 1976, 1977, 1972, 1974, 1969, 1975, 1983,
+     1979, 1981, 1978, 1980, 1980, 1982, 1982, 1984, 1972, 1979,
+     1981, 1984, 1985, 1986, 1987, 1988, 1989, 1985, 1983, 1990,
+     1988, 1988, 1989, 1992, 1991, 1990, 1986, 1991, 1993, 1996,
+     1996, 1992, 1997, 1997, 1998,    0, 1987, 1999, 1999, 2000,
+     2000, 2001, 2002, 1998, 2003, 2010, 2004, 1997, 1993, 2010,
+     2003, 2004, 2011, 2001, 2005, 2005, 2006, 2006, 1997, 2007,
 
-     2015, 2017, 2017, 2009, 2007, 2015, 2010, 2019, 2018, 2020,
-     2012, 2013, 2018, 2021, 2020, 2022, 2014, 2023, 2024, 2026,
-     2016, 2029, 2019, 2024, 2027, 2027, 2030, 2022, 2031, 2029,
-     2032, 2033, 2034, 2035, 2036, 2037, 2023, 2026, 2041, 2021,
-     2040, 2040, 2039, 2041, 2044, 2030, 2036, 2031, 2043, 2042,
-     2045, 2034, 2042, 2032, 2035, 2033, 2037, 2039, 2044, 2046,
-     2046, 2043, 2049, 2045, 2047, 2047, 2048, 2048, 2050, 2051,
-     2051, 2052, 2053, 2053, 2054, 2057, 2058, 2049, 2059, 2054,
-     2052, 2050, 2056, 2052, 2060, 2060, 2062, 2056, 2061, 2061,
-     2059, 2063, 2063, 2064, 2066, 2057, 2058, 2065, 2065, 2067,
+     2002, 2008, 2012, 2013, 2007, 2015, 2012, 2008, 2016, 2017,
+     2018, 2019, 2011, 2016, 2023, 2020, 2019, 2022, 2021, 2023,
+     2024, 2025, 2025, 2013, 2026, 2018, 2027, 2029, 2026, 2032,
+     2015, 2028, 2017, 2020, 2021, 2031, 2028, 2022, 2030, 2033,
+     2035, 2027, 2024, 2034, 2033, 2030, 2038, 2031, 2032, 2036,
+     2036, 2039, 2040, 2029, 2038, 2041, 2034, 2042, 2035, 2044,
+     2043, 2045, 2046, 2049, 2049, 2051,    0, 2048, 2051, 2050,
+     2039, 2040, 2052, 2045, 2050, 2053,    0, 2054, 2041, 2043,
+     2044, 2042, 2048, 2046, 2058, 2052, 2055, 2055, 2059, 2053,
+     2054, 2056, 2056, 2057, 2057, 2060, 2060, 2061, 2066, 2058,
 
-     2068, 2068, 2069, 2069, 2067, 2062, 2070, 2071, 2072, 2066,
-     2073, 2064, 2075, 2076, 2076, 2077, 2071, 2075, 2078, 2078,
-     2070, 2079, 2072, 2081, 2080, 2084, 2081, 2082, 2082, 2073,
-     2080, 2083, 2083, 2085, 2077, 2086, 2087, 2087, 2089, 2079,
-     2090, 2091, 2092, 2082, 2084, 2094, 2092, 2095, 2085, 2093,
-     2093, 2096, 2095, 2097, 2086, 2100, 2091, 2102, 2089, 2099,
-     2099, 2103, 2101, 2090, 2094, 2104, 2096, 2105, 2097, 2101,
-     2111, 2102, 2106, 2106, 2109, 2100, 2107, 2109, 2108, 2103,
-     2108, 2112, 2111, 2104, 2113, 2107, 2112, 2114, 2115, 2113,
-     2116, 2117, 2109, 2105, 2109, 2118, 2117, 2120, 2121, 2122,
+     2063, 2059, 2062, 2062, 2067, 2063, 2061, 2065, 2068, 2061,
+     2069, 2069, 2065, 2070, 2070, 2071, 2072, 2072, 2066, 2073,
+     2068, 2074, 2074, 2075, 2067, 2076, 2077, 2077, 2078, 2078,
+     2076, 2079, 2080, 2081, 2071, 2082, 2086, 2073, 2075, 2084,
+     2088, 2080, 2085, 2085, 2084, 2079, 2089, 2081, 2087, 2087,
+     2090, 2093, 2089, 2090, 2082, 2086, 2091, 2091, 2088, 2092,
+     2092, 2094, 2095, 2096, 2096, 2098, 2099, 2100, 2103, 2101,
+     2093, 2105, 2091, 2101, 2102, 2102, 2094, 2106, 2104, 2108,
+     2108, 2095, 2100, 2104, 2109, 2098, 2105, 2103, 2110, 2099,
+     2112, 2111, 2106, 2113, 2114, 2110, 2115, 2115, 2116, 2117,
 
-     2123, 2115, 2120, 2121, 2124, 2126, 2123, 2125, 2128, 2129,
-     2126, 2116, 2114, 2125, 2122, 2127, 2130, 2131, 2132, 2130,
-     2127, 2118, 2129, 2133, 2135, 2124, 2131, 2132, 2134, 2136,
-     2137, 2140, 2133, 2128,   17, 2136, 2137, 2134, 2135, 2138,
-     2142, 2143, 2143, 2138, 2144, 2145, 2145, 2146, 2147, 2142,
-     2144, 2140, 2146, 2149, 2145, 2150, 2151, 2151, 2152, 2156,
-     2162, 2157, 2155, 2153, 2160, 2158,    0, 2160, 2147, 2149,
-     2147, 2150, 2153, 2152, 2155, 2156, 2157, 2158, 2161, 2163,
-     2162, 2164, 2164, 2161, 2165, 2165, 2167, 2167, 2169, 2168,
-     2170, 2163, 2168, 2169, 2171, 2172, 2170, 2173, 2173, 2174,
+     2120, 2117, 2123, 2118, 2109, 2111, 2118, 2116, 2112, 2121,
+     2122, 2113, 2120, 2124, 2121, 2122, 2125, 2126, 2127, 2129,
+     2114, 2118, 2126, 2118, 2129, 2130, 2124, 2123, 2131, 2132,
+     2130, 2133, 2134, 2137, 2135, 2132, 2136, 2125, 2134, 2135,
+     2138, 2136, 2139, 2131, 2127, 2139, 2140, 2141, 2142, 2144,
+     2143, 2149, 2133, 2138, 2145, 2140, 2141, 2142, 2137, 2143,
+     2145, 2146, 2147, 2144, 2151, 2156, 2147, 2146, 2152, 2152,
+     2153, 2149, 2155, 2151, 2154, 2154, 2153, 2155, 2158, 2159,
+     2160, 2160, 2161, 2154, 2162, 2156, 2164, 2156, 2165, 2167,
+     2166, 2171, 2213, 2162, 2158, 2159, 2169, 2161, 2164, 2169,
 
-     2171, 2175, 2175, 2176, 2172, 2177, 2178, 2179, 2179, 2181,
-     2180, 2188, 2182, 2174, 2184, 2176, 2180, 2182, 2184, 2177,
-     2188, 2185, 2189, 2181, 2185, 2178, 2186, 2186, 2187, 2195,
-     2190, 2191, 2191, 2187, 2190, 2192, 2194, 2196, 2197, 2198,
-     2199, 2194, 2189, 2198, 2203, 2200, 2205, 2201, 2192, 2195,
-     2200, 2206, 2197, 2201, 2207, 2202, 2209, 2196, 2205, 2207,
-     2199, 2202, 2203, 2208, 2209, 2213, 2210, 2206, 2210, 2208,
-     2214, 2214, 2215, 2216, 2219, 2215, 2217, 2217, 2219, 2213,
-     2220, 2221, 2222, 2222, 2228, 2223, 2220, 2226, 2226, 2230,
-     2231, 2234, 2235, 2221, 2223, 2236, 2234, 2238, 2238, 2216,
+     2172, 2167, 2170, 2177, 2165, 2166, 2177, 2170, 2173, 2173,
+     2213, 2171, 2172, 2174, 2174, 2176, 2176, 2178, 2179, 2180,
+     2181, 2183, 2178, 2186, 2179, 2180, 2182, 2182, 2185, 2181,
+     2184, 2184, 2187, 2188, 2188, 2183, 2189, 2186, 2190, 2191,
+     2185, 2193, 2189, 2194, 2191, 2193, 2194, 2195, 2195, 2196,
+     2198, 2187, 2190, 2199, 2196, 2197, 2197, 2200, 2202, 2198,
+     2204, 2200, 2201, 2201, 2205, 2204, 2206, 2207, 2208, 2209,
+     2210, 2202, 2208, 2199, 2211, 2210, 2212, 2216, 2215, 2218,
+     2211, 2207, 2212, 2217, 2205, 2218, 2206, 2219, 2217, 2209,
+     2215, 2223, 2220, 2216, 2220, 2219, 2224, 2224, 2225, 2226,
 
-     2236, 2244, 2228, 2230, 2237, 2242, 2231, 2240, 2240, 2237,
-     2245, 2242, 2243, 2243, 2246, 2248, 2249, 2244, 2235, 2246,
-     2250, 2250, 2252, 2253, 2254, 2255, 2257, 2257, 2249, 2253,
-     2258, 2252, 2245, 2258, 2248, 2259, 2264, 2260, 2262, 2262,
-     2255, 2264, 2254, 2263, 2263, 2265, 2267, 2266, 2268, 2271,
-     2268, 2267, 2269, 2270, 2259, 2260, 2266, 2272, 2273, 2274,
-        0, 2271, 2272, 2265, 2274, 2279, 2269, 2270, 2275, 2275,
-     2276, 2276, 2277, 2277, 2278, 2278, 2280, 2279, 2273, 2281,
-     2282, 2282, 2283, 2283, 2281, 2284, 2285, 2286, 2287, 2288,
-     2288, 2289, 2290, 2290, 2280, 2291, 2291, 2284, 2285, 2294,
+     2229, 2225, 2227, 2227, 2229, 2223, 2230, 2231, 2232, 2232,
+     2238, 2233, 2230, 2236, 2236, 2240, 2241, 2244, 2245, 2231,
+     2233, 2246, 2244, 2248, 2248, 2226, 2246, 2254, 2238, 2240,
+     2247, 2252, 2241, 2250, 2250, 2247, 2255, 2252, 2253, 2253,
+     2256, 2258, 2259, 2254, 2245, 2256, 2260, 2260, 2262, 2263,
+     2264, 2265, 2267, 2267, 2259, 2263, 2268, 2262, 2255, 2268,
+     2258, 2269, 2274, 2270, 2272, 2272, 2265, 2274, 2264, 2273,
+     2273, 2275, 2277, 2276, 2278, 2281, 2278, 2277, 2279, 2280,
+     2269, 2270, 2276, 2282, 2283, 2284,    0, 2281, 2282, 2275,
+     2284, 2289, 2279, 2280, 2285, 2285, 2286, 2286, 2287, 2287,
 
-     2292, 2293, 2295, 2296, 2287, 2298, 2294, 2286, 2299, 2301,
-     2289, 2292, 2297, 2293, 2295, 2300, 2300, 2297, 2301, 2302,
-     2303, 2304, 2305, 2296, 2306, 2298, 2309, 2307, 2299, 2308,
-     2308, 2313, 2310, 2311, 2304, 2309, 2314, 2315, 2306, 2307,
-     2303, 2316, 2317,    0, 2316, 2302, 2305, 2310, 2311, 2313,
-     2318, 2327, 2319, 2320, 2320, 2318, 2317, 2319, 2314, 2328,
-     2315, 2321, 2321, 2322, 2322, 2324, 2324, 2326, 2326, 2327,
-     2328, 2329, 2330, 2332, 2333, 2334, 2335, 2336, 2337, 2338,
-     2339, 2338, 2345, 2340, 2341, 2362, 2336, 2330, 2342, 2342,
-     2329, 2362, 2333, 2332, 2344, 2344, 2335, 2334, 2337, 2346,
+     2288, 2288, 2290, 2289, 2283, 2291, 2292, 2292, 2293, 2293,
+     2291, 2294, 2295, 2296, 2297, 2298, 2298, 2299, 2300, 2300,
+     2290, 2301, 2301, 2294, 2295, 2304, 2302, 2303, 2305, 2306,
+     2297, 2308, 2304, 2296, 2309, 2311, 2299, 2302, 2307, 2303,
+     2305, 2310, 2310, 2307, 2311, 2312, 2313, 2314, 2315, 2306,
+     2316, 2308, 2319, 2317, 2309, 2318, 2318, 2323, 2320, 2321,
+     2314, 2319, 2324, 2325, 2316, 2317, 2313, 2326, 2327,    0,
+     2326, 2312, 2315, 2320, 2321, 2323, 2328, 2337, 2329, 2330,
+     2330, 2328, 2327, 2329, 2324, 2338, 2325, 2331, 2331, 2332,
+     2332, 2334, 2334, 2336, 2336, 2337, 2338, 2339, 2340, 2342,
 
-     2339, 2340, 2341, 2349, 2345, 2347, 2347, 2351, 2346, 2350,
-     2350, 2352, 2349, 2353, 2355, 2354, 2356, 2357, 2358, 2365,
-     2353, 2359, 2359, 2360, 2360, 2351, 2361, 2361, 2363, 2352,
-     2354, 2366, 2355, 2357, 2356, 2364, 2366, 2358, 2365, 2367,
-     2368, 2370, 2369, 2370, 2371, 2371, 2363, 2369, 2375, 2372,
-     2364, 2372, 2373, 2373, 2377, 2378, 2379, 2380, 2382, 2367,
-     2368, 2381, 2383, 2377, 2386, 2389, 2381, 2375, 2379, 2387,
-     2388, 2388, 2387, 2390, 2378, 2391, 2391, 2380, 2382, 2392,
-     2389, 2383, 2394, 2392, 2386, 2395, 2396, 2396, 2397, 2395,
-     2399, 2390, 2400, 2401, 2402, 2402, 2404, 2394, 2405, 2406,
+     2343, 2344, 2345, 2346, 2347, 2348, 2349, 2348, 2356, 2350,
+     2351, 2373, 2346, 2340, 2352, 2352, 2339, 2373, 2343, 2342,
+     2354, 2354, 2345, 2344, 2347, 2357, 2349, 2350, 2351, 2360,
+     2356, 2358, 2358, 2362, 2357, 2361, 2361, 2363, 2360, 2364,
+     2366, 2365, 2367, 2368, 2369, 2376, 2364, 2370, 2370, 2371,
+     2371, 2362, 2372, 2372, 2374, 2363, 2365, 2377, 2366, 2368,
+     2367, 2375, 2377, 2369, 2376, 2378, 2379, 2381, 2380, 2381,
+     2382, 2382, 2374, 2380, 2386, 2383, 2375, 2383, 2384, 2384,
+     2388, 2389, 2390, 2391, 2393, 2378, 2379, 2392, 2394, 2388,
+     2397, 2400, 2392, 2386, 2390, 2398, 2399, 2399, 2398, 2401,
 
-     2408, 2397, 2412, 2406, 2420, 2399, 2410, 2405, 2404, 2407,
-     2407, 2410, 2400, 2401, 2409, 2409, 2411, 2413, 2412, 2408,
-     2414, 2414, 2419, 2419, 2422, 2411, 2420, 2421, 2421, 2413,
-     2423, 2424, 2425, 2426, 2426, 2427, 2437, 2422, 2429, 2429,
-     2424, 2425, 2432, 2423, 2433, 2434, 2435, 2432, 2436, 2433,
-     2427, 2435, 2438, 2441, 2439, 2437, 2436, 2444, 2442, 2434,
-     2443, 2438, 2439, 2442, 2448, 2443, 2445, 2445, 2441, 2446,
-     2446, 2448, 2444, 2447, 2447, 2449, 2450, 2451, 2452,    0,
-     2449, 2453, 2454, 2454, 2452, 2455, 2453, 2456, 2457, 2457,
-     2458, 2458, 2456, 2461, 2450, 2451, 2462, 2462, 2463, 2464,
+     2389, 2402, 2402, 2391, 2393, 2403, 2400, 2394, 2405, 2403,
+     2397, 2406, 2407, 2407, 2408, 2406, 2410, 2401, 2411, 2412,
+     2413, 2413, 2415, 2405, 2416, 2417, 2419, 2408, 2423, 2417,
+     2431, 2410, 2421, 2416, 2415, 2418, 2418, 2421, 2411, 2412,
+     2420, 2420, 2422, 2424, 2423, 2419, 2425, 2425, 2430, 2430,
+     2433, 2422, 2431, 2432, 2432, 2424, 2434, 2435, 2436, 2437,
+     2437, 2438, 2448, 2433, 2440, 2440, 2435, 2436, 2443, 2434,
+     2444, 2445, 2446, 2443, 2447, 2444, 2438, 2446, 2449, 2452,
+     2450, 2448, 2447, 2455, 2453, 2445, 2454, 2449, 2450, 2453,
+     2459, 2454, 2456, 2456, 2452, 2457, 2457, 2459, 2455, 2458,
 
-     2455, 2463, 2465, 2466, 2464, 2464, 2461, 2465, 2466, 2467,
-     2468, 2469, 2470, 2471, 2472, 2469, 2468, 2470, 2473, 2474,
-     2477, 2475, 2471, 2467, 2476, 2477, 2473, 2475, 2480, 2472,
-     2476, 2478, 2481, 2480, 2483, 2481, 2485, 2486, 2487, 2488,
-     2474, 2485, 2486, 2478, 2489, 2490, 2483, 2491, 2491, 2492,
-     2496, 2497, 2488, 2489, 2490, 2498, 2487, 2500, 2492, 2499,
-     2499, 2501, 2502, 2503, 2503, 2504, 2506, 2508, 2509, 2496,
-     2501, 2497, 2509, 2511, 2498,    0, 2500, 2502, 2510, 2510,
-     2512, 2506, 2513, 2514, 2504, 2516, 2512, 2508, 2513, 2514,
-     2515, 2515, 2517, 2516, 2519, 2520, 2522, 2517, 2511, 2523,
+     2458, 2460, 2461, 2462, 2463,    0, 2460, 2464, 2465, 2465,
+     2463, 2466, 2464, 2467, 2468, 2468, 2469, 2469, 2467, 2472,
+     2461, 2462, 2473, 2473, 2474, 2475, 2466, 2474, 2476, 2477,
+     2475, 2475, 2472, 2476, 2477, 2478, 2479, 2480, 2481, 2482,
+     2483, 2480, 2479, 2481, 2484, 2485, 2488, 2486, 2482, 2478,
+     2487, 2488, 2484, 2486, 2491, 2483, 2487, 2489, 2492, 2491,
+     2494, 2492, 2496, 2497, 2498, 2499, 2485, 2496, 2497, 2489,
+     2500, 2501, 2494, 2502, 2502, 2503, 2507, 2508, 2499, 2500,
+     2501, 2509, 2498, 2511, 2503, 2510, 2510, 2512, 2513, 2514,
+     2514, 2515, 2517, 2519, 2520, 2507, 2512, 2508, 2520, 2522,
 
-     2522, 2524, 2527, 2519, 2526, 2526, 2528, 2528, 2520, 2529,
-     2529, 2531, 2531, 2523, 2532, 2537, 2524, 2533, 2532, 2539,
-     2527, 2538, 2533, 2535, 2535, 2542, 2538, 2540, 2543, 2543,
-     2550, 2539, 2540, 2540, 2548, 2537, 2545, 2545, 2546, 2546,
-     2547, 2552, 2556, 2547, 2559, 2542, 2558, 2548, 2550, 2553,
-     2553, 2554, 2554, 2555, 2555, 2557, 2557, 2556, 2560, 2558,
-     2561, 2552, 2559, 2562, 2562, 2563, 2561, 2568, 2567, 2563,
-     2571, 2569, 2560, 2567, 2567, 2570, 2571, 2572, 2573, 2583,
-     2574, 2575, 2575, 2572, 2574, 2580, 2581, 2578, 2586, 2581,
-     2568, 2569, 2578, 2580, 2584, 2570, 2587, 2584, 2585, 2585,
+     2509,    0, 2511, 2513, 2521, 2521, 2523, 2517, 2524, 2525,
+     2515, 2527, 2523, 2519, 2524, 2525, 2526, 2526, 2528, 2527,
+     2530, 2531, 2533, 2528, 2522, 2534, 2533, 2535, 2538, 2530,
+     2537, 2537, 2539, 2539, 2531, 2540, 2540, 2542, 2542, 2534,
+     2543, 2548, 2535, 2544, 2543, 2550, 2538, 2549, 2544, 2546,
+     2546, 2553, 2549, 2551, 2554, 2554, 2561, 2550, 2551, 2551,
+     2559, 2548, 2556, 2556, 2557, 2557, 2558, 2563, 2567, 2558,
+     2570, 2553, 2569, 2559, 2561, 2564, 2564, 2565, 2565, 2566,
+     2566, 2568, 2568, 2567, 2571, 2569, 2572, 2563, 2570, 2573,
+     2573, 2574, 2572, 2579, 2578, 2574, 2582, 2580, 2571, 2578,
 
-     2588, 2587, 2589, 2573, 2583, 2586, 2586, 2590, 2591, 2591,
-     2592, 2594, 2593, 2595, 2613, 2593, 2598, 2613, 2588, 2596,
-        0, 2590, 2589, 2593, 2592, 2594, 2606, 2596, 2597, 2599,
-     2599, 2604, 2595, 2597, 2597, 2598, 2600, 2600, 2601, 2601,
-     2602, 2602, 2603, 2603, 2605, 2607, 2606, 2604, 2608, 2605,
-     2609, 2614, 2610, 2612, 2612, 2616, 2616, 2608, 2617, 2618,
-     2618, 2619, 2621, 2621, 2622, 2617, 2619, 2623, 2624, 2614,
-     2609, 2607, 2610, 2622, 2626,    0, 2623, 2624, 2627, 2627,
-     2628, 2629, 2630, 2631, 2628, 2632, 2633, 2634, 2631, 2631,
-     2629, 2634, 2626, 2642, 2638, 2633, 2643, 2630, 2632, 2638,
+     2578, 2581, 2582, 2583, 2584, 2594, 2585, 2586, 2586, 2583,
+     2585, 2591, 2592, 2589, 2597, 2592, 2579, 2580, 2589, 2591,
+     2595, 2581, 2598, 2595, 2596, 2596, 2599, 2598, 2600, 2584,
+     2594, 2597, 2597, 2601, 2602, 2602, 2603, 2605, 2604, 2606,
+     2624, 2604, 2609, 2624, 2599, 2607,    0, 2601, 2600, 2604,
+     2603, 2605, 2617, 2607, 2608, 2610, 2610, 2615, 2606, 2608,
+     2608, 2609, 2611, 2611, 2612, 2612, 2613, 2613, 2614, 2614,
+     2616, 2618, 2617, 2615, 2619, 2616, 2620, 2625, 2621, 2623,
+     2623, 2627, 2627, 2619, 2628, 2629, 2629, 2630, 2632, 2632,
+     2633, 2628, 2630, 2634, 2635, 2625, 2620, 2618, 2621, 2633,
 
-     2639, 2639, 2641, 2641, 2644, 2646, 2647, 2642, 2650, 2652,
-     2651, 2653, 2655, 2657, 2646, 2659,    0, 2653, 2647, 2651,
-     2659, 2643, 2644, 2660, 2655, 2661, 2661, 2662, 2660, 2652,
-     2664, 2667, 2667, 2650, 2657, 2664, 2662, 2665, 2665, 2668,
-     2668, 2665, 2669, 2669, 2670, 2671, 2673, 2672, 2675, 2679,
-     2676, 2673, 2677, 2670, 2675, 2676, 2680, 2677, 2678, 2678,
-     2681, 2683, 2685, 2692, 2682, 2671, 2672, 2679, 2680, 2682,
-     2684, 2686, 2686, 2688, 2693, 2689, 2684, 2688, 2690, 2683,
-     2689, 2681, 2692, 2690, 2691, 2691, 2694, 2685, 2698, 2693,
-     2696, 2696, 2699, 2700, 2701, 2702, 2703, 2700, 2706, 2704,
+     2637,    0, 2634, 2635, 2638, 2638, 2639, 2640, 2641, 2642,
+     2639, 2643, 2644, 2645, 2642, 2642, 2640, 2645, 2637, 2653,
+     2649, 2644, 2654, 2641, 2643, 2649, 2650, 2650, 2652, 2652,
+     2655, 2657, 2658, 2653, 2661, 2663, 2662, 2664, 2666, 2668,
+     2657, 2670,    0, 2664, 2658, 2662, 2670, 2654, 2655, 2671,
+     2666, 2672, 2672, 2673, 2671, 2663, 2675, 2678, 2678, 2661,
+     2668, 2675, 2673, 2676, 2676, 2679, 2679, 2676, 2680, 2680,
+     2681, 2682, 2684, 2683, 2686, 2690, 2687, 2684, 2688, 2681,
+     2686, 2687, 2691, 2688, 2689, 2689, 2692, 2694, 2696, 2703,
+     2693, 2682, 2683, 2690, 2691, 2693, 2695, 2697, 2697, 2699,
 
-     2708, 2698, 2713, 2701, 2705, 2699, 2694, 2704,    0, 2705,
-     2724, 2702, 2707, 2707, 2717, 2703, 2710, 2710, 2718, 2708,
-     2711, 2711, 2719, 2713, 2706, 2715, 2715, 2720, 2722, 2722,
-     2717, 2723, 2720, 2724, 2718, 2725, 2727, 2727, 2719, 2728,
-     2729, 2730, 2730, 2733, 2734, 2736, 2739, 2735, 2737, 2737,
-     2734, 2723, 2735, 2728, 2725, 2738, 2738, 2740, 2740, 2729,
-     2741, 2742, 2743, 2733, 2745, 2747, 2739, 2736, 2744, 2746,
-     2742, 2741, 2748, 2748, 2744, 2749, 2754, 2740, 2749, 2750,
-     2750, 2746, 2743, 2745, 2755, 2747, 2756, 2759, 2754, 2757,
-     2757, 2758, 2756, 2759, 2758, 2760, 2762, 2763, 2763, 2765,
+     2704, 2700, 2695, 2699, 2701, 2694, 2700, 2692, 2703, 2701,
+     2702, 2702, 2705, 2696, 2709, 2704, 2707, 2707, 2710, 2711,
+     2712, 2713, 2714, 2711, 2717, 2715, 2719, 2709, 2724, 2712,
+     2716, 2710, 2705, 2715,    0, 2716, 2735, 2713, 2718, 2718,
+     2728, 2714, 2721, 2721, 2729, 2719, 2722, 2722, 2730, 2724,
+     2717, 2726, 2726, 2731, 2733, 2733, 2728, 2734, 2731, 2735,
+     2729, 2736, 2738, 2738, 2730, 2739, 2740, 2741, 2741, 2744,
+     2745, 2747, 2750, 2746, 2748, 2748, 2745, 2734, 2746, 2739,
+     2736, 2749, 2749, 2751, 2751, 2740, 2752, 2753, 2754, 2744,
+     2756, 2758, 2750, 2747, 2755, 2757, 2753, 2752, 2759, 2759,
 
-     2764, 2762, 2766, 2767, 2755, 2764, 2768, 2768, 2766, 2771,
-     2770, 2772, 2773, 2760, 2774, 2774, 2775, 2776, 2765, 2781,
-     2767, 2767, 2770, 2778, 2778, 2773, 2776, 2771, 2779, 2779,
-     2783, 2783, 2780, 2781, 2782, 2775, 2772, 2780, 2791, 2782,
-     2784, 2784, 2785, 2785, 2786, 2788, 2788, 2793, 2794, 2786,
-     2795, 2796, 2796, 2798, 2798, 2800, 2801, 2791, 2805, 2799,
-     2802, 2802, 2803, 2803, 2805, 2801, 2806, 2815, 2807, 2793,
-     2794, 2808, 2795, 2799,    0, 2800, 2808, 2811, 2811, 2813,
-     2813, 2815, 2817, 2814, 2816, 2818, 2806, 2807, 2814, 2822,
-     2816, 2819, 2819, 2818, 2817, 2820, 2823, 2824, 2825, 2826,
+     2755, 2760, 2765, 2751, 2760, 2761, 2761, 2757, 2754, 2756,
+     2766, 2758, 2767, 2770, 2765, 2768, 2768, 2769, 2767, 2770,
+     2769, 2771, 2773, 2774, 2774, 2776, 2775, 2773, 2777, 2778,
+     2766, 2775, 2779, 2779, 2777, 2782, 2781, 2783, 2784, 2771,
+     2785, 2785, 2786, 2787, 2776, 2792, 2778, 2778, 2781, 2789,
+     2789, 2784, 2787, 2782, 2790, 2790, 2794, 2794, 2791, 2792,
+     2793, 2786, 2783, 2791, 2802, 2793, 2795, 2795, 2796, 2796,
+     2797, 2799, 2799, 2804, 2805, 2797, 2806, 2807, 2807, 2809,
+     2809, 2811, 2812, 2802, 2816, 2810, 2813, 2813, 2814, 2814,
+     2816, 2812, 2817, 2826, 2818, 2804, 2805, 2819, 2806, 2810,
 
-     2820, 2829, 2824, 2828, 2830, 2826, 2831, 2833, 2836, 2822,
-     2825, 2828, 2834, 2835, 2837, 2840, 2823, 2839, 2842, 2837,
-     2829, 2841, 2839, 2842, 2830, 2833, 2831, 2841, 2834, 2836,
-     2835, 2835, 2844, 2845, 2876, 2840, 2848, 2848, 2849, 2849,
-     2850, 2854, 2854, 2876, 2850, 2860, 2845, 2856, 2856, 2860,
-     2857, 2857, 2844, 2857, 2858, 2858, 2863, 2858, 2859, 2859,
-     2867, 2859, 2862, 2862, 2864, 2868, 2869, 2870, 2870, 2873,
-     2874, 2869, 2875, 2877, 2863, 2879, 2875, 2874, 2864,    0,
-     2867, 2880, 2881, 2881, 2884, 2868, 2882, 2882, 2877, 2886,
-     2880, 2883, 2883, 2879, 2873, 2885, 2889, 2887, 2886, 2884,
+        0, 2811, 2819, 2822, 2822, 2824, 2824, 2826, 2828, 2825,
+     2827, 2829, 2817, 2818, 2825, 2833, 2827, 2830, 2830, 2829,
+     2828, 2831, 2834, 2835, 2836, 2837, 2831, 2840, 2835, 2839,
+     2841, 2837, 2842, 2844, 2847, 2833, 2836, 2839, 2845, 2846,
+     2848, 2851, 2834, 2850, 2853, 2848, 2840, 2852, 2850, 2853,
+     2841, 2844, 2842, 2852, 2845, 2847, 2846, 2846, 2855, 2856,
+     2887, 2851, 2859, 2859, 2860, 2860, 2861, 2865, 2865, 2887,
+     2861, 2871, 2856, 2867, 2867, 2871, 2868, 2868, 2855, 2868,
+     2869, 2869, 2874, 2869, 2870, 2870, 2878, 2870, 2873, 2873,
+     2875, 2879, 2880, 2881, 2881, 2884, 2885, 2880, 2886, 2888,
 
-     2885, 2886, 2887, 2887, 2888, 2890, 2891, 2892, 2893, 2894,
-     2888, 2896, 2892, 2893, 2895, 2895, 2897, 2896, 2898, 2898,
-     2890, 2889, 2897, 2899, 2899, 2900, 2931, 2891, 2894, 2931,
-     2900, 2903, 2903, 2906, 2906, 2907, 2907, 2908, 2908, 2909,
-     2909, 2910, 2910, 2911, 2911, 2912, 2912, 2914, 2915, 2915,
-     2916, 2917, 2918, 2922, 2920, 2924, 2914, 2921, 2921, 2916,
-     2926, 2923, 2930, 2917, 2925, 2925, 2932, 2924, 2922, 2927,
-     2927, 2934, 2918, 2920, 2923, 2926, 2933, 2933, 2936, 2937,
-     2930, 2936, 2938, 2939, 2940, 2937, 2941, 2944, 2939, 2934,
-     2942, 2945, 2932, 2944, 2948, 2957, 2938, 2959, 2957, 2964,
+     2874, 2890, 2886, 2885, 2875,    0, 2878, 2891, 2892, 2892,
+     2895, 2879, 2893, 2893, 2888, 2897, 2891, 2894, 2894, 2890,
+     2884, 2896, 2900, 2898, 2897, 2895, 2896, 2897, 2898, 2898,
+     2899, 2901, 2902, 2903, 2904, 2905, 2899, 2907, 2903, 2904,
+     2906, 2906, 2908, 2907, 2909, 2909, 2901, 2900, 2908, 2910,
+     2910, 2911, 2942, 2902, 2905, 2942, 2911, 2914, 2914, 2917,
+     2917, 2918, 2918, 2919, 2919, 2920, 2920, 2921, 2921, 2922,
+     2922, 2923, 2923, 2925, 2926, 2926, 2927, 2928, 2929, 2933,
+     2931, 2935, 2925, 2932, 2932, 2927, 2937, 2934, 2941, 2928,
+     2936, 2936, 2943, 2935, 2933, 2938, 2938, 2945, 2929, 2931,
 
-     2945, 2960, 2960, 2940, 2941, 2965, 2942, 2961, 2961, 2948,
-     2959, 2962, 2962, 2966, 2965, 2967, 2968, 2966, 2970, 2972,
-     2971, 2973, 2964, 2973, 2972, 2974, 2975, 2975, 2977, 2976,
-     2968, 2971, 2978, 2979, 2980, 2967, 2981, 2982, 2985, 2984,
-     2974, 2970, 2976, 2983, 2991, 2993, 2982, 2977, 2986, 2979,
-     2978, 2981, 2990, 2986, 2993, 2983, 2992, 2992, 2985, 2980,
-     2984, 2994, 2994, 2998, 2991, 2999, 2990, 2995, 2995, 2996,
-     2996, 2997, 2997, 3000, 3001, 3002, 3000, 3003, 3004, 3001,
-     3002, 3005, 2998, 3006, 3007, 2999, 3008, 3005, 3009, 3010,
-     3010, 3008, 3011, 3004, 3012, 3015, 3007, 3006, 3013, 3013,
+     2934, 2937, 2944, 2944, 2947, 2948, 2941, 2947, 2949, 2950,
+     2951, 2948, 2952, 2955, 2950, 2945, 2953, 2956, 2943, 2955,
+     2959, 2968, 2949, 2970, 2968, 2975, 2956, 2971, 2971, 2951,
+     2952, 2976, 2953, 2972, 2972, 2959, 2970, 2973, 2973, 2977,
+     2976, 2978, 2979, 2977, 2981, 2983, 2982, 2984, 2975, 2984,
+     2983, 2985, 2986, 2986, 2988, 2987, 2979, 2982, 2989, 2990,
+     2991, 2978, 2992, 2993, 2996, 2995, 2985, 2981, 2987, 2994,
+     3002, 3004, 2993, 2988, 2997, 2990, 2989, 2992, 3001, 2997,
+     3004, 2994, 3003, 3003, 2996, 2991, 2995, 3005, 3005, 3009,
+     3002, 3010, 3001, 3006, 3006, 3007, 3007, 3008, 3008, 3011,
 
-     3017, 3022, 3003, 3020, 3020, 3021, 3021, 3011, 3009, 3022,
-     3015, 3023, 3026, 3012, 3024, 3025, 3027, 3028, 3017, 3029,
-     3024, 3025, 3030, 3030, 3029, 3033, 3026, 3031, 3031, 3027,
-     3023, 3034, 3039, 3036, 3037, 3040, 3028, 3041, 3037, 3044,
-     3040, 3042, 3043, 3045, 3046, 3050, 3033, 3036, 3045, 3046,
-     3051, 3034, 3039, 3052, 3042, 3043, 3041, 3055, 3044, 3047,
-     3047, 3053, 3053, 3055, 3054, 3050, 3056, 3056, 3051, 3054,
-     3057, 3058, 3052, 3059, 3060, 3057, 3058, 3061, 3059, 3063,
-     3063, 3064, 3068, 3061, 3065, 3065, 3064, 3067, 3069, 3070,
-     3071, 3067, 3072, 3060, 3073, 3069, 3081, 3074, 3072, 3076,
+     3012, 3013, 3011, 3014, 3015, 3012, 3013, 3016, 3009, 3017,
+     3018, 3010, 3019, 3016, 3020, 3021, 3021, 3019, 3022, 3015,
+     3023, 3026, 3018, 3017, 3024, 3024, 3028, 3033, 3014, 3031,
+     3031, 3032, 3032, 3022, 3020, 3033, 3026, 3034, 3037, 3023,
+     3035, 3036, 3038, 3039, 3028, 3040, 3035, 3036, 3041, 3041,
+     3040, 3044, 3037, 3042, 3042, 3038, 3034, 3045, 3050, 3047,
+     3048, 3051, 3039, 3052, 3048, 3055, 3051, 3053, 3054, 3056,
+     3057, 3061, 3044, 3047, 3056, 3057, 3062, 3045, 3050, 3063,
+     3053, 3054, 3052, 3066, 3055, 3058, 3058, 3064, 3064, 3066,
+     3065, 3061, 3067, 3067, 3062, 3065, 3068, 3069, 3063, 3070,
 
-     3076, 3068, 3078, 3078, 3082, 3079, 3080, 3083, 3070, 3071,
-     3074, 3080, 3086, 3073, 3079, 3081, 3085, 3079, 3084, 3084,
-     3083, 3085, 3088, 3082, 3090, 3086, 3089, 3089, 3091, 3091,
-     3092, 3092, 3093, 3094, 3095, 3096, 3096, 3093,    0, 3097,
-     3094, 3099, 3099, 3090, 3097, 3098, 3102, 3098, 3088, 3100,
-     3101, 3104, 3107, 3095, 3103, 3111, 3100, 3101, 3109, 3103,
-     3106, 3106, 3110, 3109, 3112, 3102, 3116, 3110, 3113, 3113,
-     3104, 3107, 3115, 3115, 3111, 3117, 3118, 3118, 3119, 3119,
-     3120, 3122, 3122, 3112, 3124, 3116, 3130, 3120, 3123, 3123,
-     3126, 3124, 3129, 3131, 3117, 3126,    0, 3129, 3132, 3132,
+     3071, 3068, 3069, 3072, 3070, 3074, 3074, 3075, 3079, 3072,
+     3076, 3076, 3075, 3078, 3080, 3081, 3082, 3078, 3083, 3071,
+     3084, 3080, 3092, 3085, 3083, 3087, 3087, 3079, 3089, 3089,
+     3093, 3090, 3091, 3094, 3081, 3082, 3085, 3091, 3097, 3084,
+     3090, 3092, 3096, 3090, 3095, 3095, 3094, 3096, 3099, 3093,
+     3101, 3097, 3100, 3100, 3102, 3102, 3103, 3103, 3104, 3105,
+     3106, 3107, 3107, 3104,    0, 3108, 3105, 3110, 3110, 3101,
+     3108, 3109, 3113, 3109, 3099, 3111, 3112, 3115, 3118, 3106,
+     3114, 3122, 3111, 3112, 3120, 3114, 3117, 3117, 3121, 3120,
+     3123, 3113, 3127, 3121, 3124, 3124, 3115, 3118, 3126, 3126,
 
-     3133, 3133,    0,    0,    0, 3130,    0,    0,    0,    0,
-        0,    0, 3131, 3137, 3137, 3137, 3137, 3137, 3137, 3137,
-     3138, 3138, 3138, 3138, 3138, 3138, 3138, 3139, 3139, 3139,
-     3139, 3139, 3139, 3139, 3140, 3140, 3140, 3140, 3140, 3140,
-     3140, 3141, 3141, 3141, 3141, 3141, 3141, 3141, 3142, 3142,
-     3142, 3142, 3142, 3142, 3142, 3143, 3143, 3143, 3143, 3143,
-     3143, 3143, 3145, 3145,    0, 3145, 3145, 3145, 3145, 3146,
-     3146,    0,    0,    0, 3146, 3146, 3147, 3147,    0,    0,
-     3147,    0, 3147, 3148,    0,    0,    0,    0,    0, 3148,
-     3149, 3149,    0,    0,    0, 3149, 3149, 3150,    0,    0,
+     3122, 3128, 3129, 3129, 3130, 3130, 3131, 3133, 3133, 3123,
+     3135, 3127, 3141, 3131, 3134, 3134, 3137, 3135, 3140, 3142,
+     3128, 3137,    0, 3140, 3143, 3143, 3144, 3144,    0,    0,
+        0, 3141,    0,    0,    0,    0,    0,    0, 3142, 3148,
+     3148, 3148, 3148, 3148, 3148, 3148, 3149, 3149, 3149, 3149,
+     3149, 3149, 3149, 3150, 3150, 3150, 3150, 3150, 3150, 3150,
+     3151, 3151, 3151, 3151, 3151, 3151, 3151, 3152, 3152, 3152,
+     3152, 3152, 3152, 3152, 3153, 3153, 3153, 3153, 3153, 3153,
+     3153, 3154, 3154, 3154, 3154, 3154, 3154, 3154, 3156, 3156,
+        0, 3156, 3156, 3156, 3156, 3157, 3157,    0,    0,    0,
+
+     3157, 3157, 3158, 3158,    0,    0, 3158,    0, 3158, 3159,
+        0,    0,    0,    0,    0, 3159, 3160, 3160,    0,    0,
+        0, 3160, 3160, 3161,    0,    0,    0,    0,    0, 3161,
+     3162, 3162,    0, 3162, 3162, 3162, 3162, 3163,    0,    0,
+        0,    0,    0, 3163, 3164, 3164,    0,    0,    0, 3164,
+     3164, 3165, 3165,    0, 3165, 3165, 3165, 3165, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147,
+     3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147, 3147
 
-        0,    0,    0, 3150, 3151, 3151,    0, 3151, 3151, 3151,
-     3151, 3152,    0,    0,    0,    0,    0, 3152, 3153, 3153,
-        0,    0,    0, 3153, 3153, 3154, 3154,    0, 3154, 3154,
-     3154, 3154, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136, 3136,
-     3136, 3136, 3136
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3023,7 +3032,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3024 "<stdout>"
+#line 3034 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3032,9 +3041,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3033 "<stdout>"
+#line 3043 "<stdout>"
 
-#line 3035 "<stdout>"
+#line 3045 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3258,7 +3267,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3259 "<stdout>"
+#line 3269 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3291,13 +3300,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3137 )
+				if ( yy_current_state >= 3148 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 6133 );
+		while ( yy_base[yy_current_state] != 6159 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -4806,40 +4815,45 @@ YY_RULE_SETUP
 { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
 	YY_BREAK
 case 295:
-/* rule 295 can match eol */
 YY_RULE_SETUP
 #line 520 "./util/configlexer.lex"
+{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+	YY_BREAK
+case 296:
+/* rule 296 can match eol */
+YY_RULE_SETUP
+#line 521 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 296:
+case 297:
 YY_RULE_SETUP
-#line 523 "./util/configlexer.lex"
+#line 524 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 524 "./util/configlexer.lex"
+#line 525 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 297:
-YY_RULE_SETUP
-#line 529 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 298:
-/* rule 298 can match eol */
 YY_RULE_SETUP
 #line 530 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 299:
+/* rule 299 can match eol */
+YY_RULE_SETUP
+#line 531 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 299:
+case 300:
 YY_RULE_SETUP
-#line 532 "./util/configlexer.lex"
+#line 533 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4852,34 +4866,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 300:
+case 301:
 YY_RULE_SETUP
-#line 544 "./util/configlexer.lex"
+#line 545 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 545 "./util/configlexer.lex"
+#line 546 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 301:
-YY_RULE_SETUP
-#line 550 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 302:
-/* rule 302 can match eol */
 YY_RULE_SETUP
 #line 551 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 303:
+/* rule 303 can match eol */
+YY_RULE_SETUP
+#line 552 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 303:
+case 304:
 YY_RULE_SETUP
-#line 553 "./util/configlexer.lex"
+#line 554 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4892,38 +4906,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 304:
+case 305:
 YY_RULE_SETUP
-#line 565 "./util/configlexer.lex"
+#line 566 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 567 "./util/configlexer.lex"
+#line 568 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 305:
-YY_RULE_SETUP
-#line 571 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 306:
-/* rule 306 can match eol */
 YY_RULE_SETUP
 #line 572 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 307:
+/* rule 307 can match eol */
 YY_RULE_SETUP
 #line 573 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 308:
 YY_RULE_SETUP
 #line 574 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 309:
+YY_RULE_SETUP
+#line 575 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -4931,27 +4945,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 579 "./util/configlexer.lex"
+#line 580 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 309:
-YY_RULE_SETUP
-#line 583 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 310:
-/* rule 310 can match eol */
 YY_RULE_SETUP
 #line 584 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 311:
+/* rule 311 can match eol */
+YY_RULE_SETUP
+#line 585 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 311:
+case 312:
 YY_RULE_SETUP
-#line 586 "./util/configlexer.lex"
+#line 587 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -4961,7 +4975,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 592 "./util/configlexer.lex"
+#line 593 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -4976,39 +4990,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 312:
+case 313:
 YY_RULE_SETUP
-#line 606 "./util/configlexer.lex"
+#line 607 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 609 "./util/configlexer.lex"
+#line 610 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 313:
-YY_RULE_SETUP
-#line 613 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
 case 314:
-/* rule 314 can match eol */
 YY_RULE_SETUP
 #line 614 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
 	YY_BREAK
 case 315:
+/* rule 315 can match eol */
 YY_RULE_SETUP
 #line 615 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 case 316:
 YY_RULE_SETUP
 #line 616 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 317:
+YY_RULE_SETUP
+#line 617 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5017,29 +5031,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 622 "./util/configlexer.lex"
+#line 623 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 317:
-YY_RULE_SETUP
-#line 626 "./util/configlexer.lex"
-{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 318:
-/* rule 318 can match eol */
 YY_RULE_SETUP
 #line 627 "./util/configlexer.lex"
+{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 319:
+/* rule 319 can match eol */
+YY_RULE_SETUP
+#line 628 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 319:
+case 320:
 YY_RULE_SETUP
-#line 631 "./util/configlexer.lex"
+#line 632 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5048,33 +5062,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 320:
+case 321:
 YY_RULE_SETUP
-#line 639 "./util/configlexer.lex"
+#line 640 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 321:
+case 322:
 YY_RULE_SETUP
-#line 643 "./util/configlexer.lex"
+#line 644 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 322:
+case 323:
 YY_RULE_SETUP
-#line 647 "./util/configlexer.lex"
+#line 648 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 323:
+case 324:
 YY_RULE_SETUP
-#line 651 "./util/configlexer.lex"
+#line 652 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5075 "<stdout>"
+#line 5090 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5369,7 +5383,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3137 )
+			if ( yy_current_state >= 3148 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5397,11 +5411,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3137 )
+		if ( yy_current_state >= 3148 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3136);
+	yy_is_jam = (yy_current_state == 3147);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6040,6 +6054,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 651 "./util/configlexer.lex"
+#line 652 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 83cea4b99..79a0edcad 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -517,6 +517,7 @@ name-v4{COLON}			{ YDVAR(1, VAR_IPSET_NAME_V4) }
 name-v6{COLON}			{ YDVAR(1, VAR_IPSET_NAME_V6) }
 udp-upstream-without-downstream{COLON} { YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 tcp-connection-limit{COLON}	{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+edns-client-tag{COLON}		{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
 <INITIAL,val>{NEWLINE}		{ LEXOUT(("NL\n")); cfg_parser->line++; }
 
 	/* Quoted strings. Strip leading and ending quotes */
diff --git a/util/configparser.c b/util/configparser.c
index 2c9af619a..1d5be9fa0 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.  */
+/* A Bison parser, made by GNU Bison 3.5.1.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.5"
+#define YYBISON_VERSION "3.5.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -431,7 +431,8 @@ extern int yydebug;
     VAR_RPZ_LOG = 543,
     VAR_RPZ_LOG_NAME = 544,
     VAR_DYNLIB = 545,
-    VAR_DYNLIB_FILE = 546
+    VAR_DYNLIB_FILE = 546,
+    VAR_EDNS_CLIENT_TAG = 547
   };
 #endif
 /* Tokens.  */
@@ -724,6 +725,7 @@ extern int yydebug;
 #define VAR_RPZ_LOG_NAME 544
 #define VAR_DYNLIB 545
 #define VAR_DYNLIB_FILE 546
+#define VAR_EDNS_CLIENT_TAG 547
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -733,7 +735,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 737 "util/configparser.c"
+#line 739 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -1052,19 +1054,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   620
+#define YYLAST   622
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  292
+#define YYNTOKENS  293
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  317
+#define YYNNTS  318
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  610
+#define YYNRULES  612
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  905
+#define YYNSTATES  909
 
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   546
+#define YYMAXUTOK   547
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1130,7 +1132,7 @@ static const yytype_int16 yytranslate[] =
      255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291
+     285,   286,   287,   288,   289,   290,   291,   292
 };
 
 #if YYDEBUG
@@ -1158,47 +1160,47 @@ static const yytype_int16 yyrline[] =
      273,   273,   273,   274,   274,   274,   275,   275,   275,   276,
      276,   277,   278,   278,   279,   279,   280,   280,   281,   281,
      282,   282,   282,   283,   283,   283,   284,   284,   284,   285,
-     285,   286,   286,   287,   287,   288,   290,   302,   303,   304,
-     304,   304,   304,   304,   305,   305,   307,   319,   320,   321,
-     321,   321,   321,   322,   322,   324,   338,   339,   340,   340,
-     340,   340,   341,   341,   341,   343,   360,   361,   362,   362,
-     362,   362,   363,   363,   363,   364,   367,   386,   403,   411,
-     421,   429,   446,   447,   448,   448,   448,   448,   448,   449,
-     449,   449,   450,   450,   452,   461,   470,   481,   490,   499,
-     508,   519,   528,   540,   554,   569,   580,   597,   614,   631,
-     648,   663,   678,   691,   706,   715,   724,   733,   742,   751,
-     760,   769,   778,   787,   796,   805,   814,   823,   832,   845,
-     854,   867,   876,   885,   894,   901,   908,   917,   924,   933,
-     941,   948,   955,   963,   972,   981,   990,  1004,  1013,  1022,
-    1031,  1040,  1049,  1058,  1065,  1072,  1098,  1106,  1113,  1120,
-    1127,  1134,  1142,  1150,  1158,  1165,  1176,  1187,  1194,  1203,
-    1212,  1221,  1228,  1235,  1243,  1251,  1261,  1271,  1281,  1295,
-    1303,  1316,  1327,  1335,  1348,  1357,  1366,  1375,  1385,  1395,
-    1403,  1416,  1425,  1433,  1442,  1450,  1463,  1472,  1479,  1489,
-    1499,  1509,  1519,  1529,  1539,  1549,  1559,  1566,  1573,  1580,
-    1589,  1598,  1607,  1616,  1623,  1633,  1653,  1660,  1678,  1691,
-    1704,  1713,  1722,  1731,  1740,  1750,  1760,  1771,  1780,  1789,
-    1798,  1807,  1816,  1825,  1838,  1851,  1860,  1867,  1876,  1885,
-    1894,  1903,  1911,  1924,  1932,  1973,  1980,  1995,  2005,  2015,
-    2022,  2029,  2036,  2045,  2053,  2067,  2088,  2109,  2121,  2133,
-    2145,  2154,  2175,  2185,  2194,  2202,  2210,  2223,  2236,  2251,
-    2266,  2275,  2284,  2290,  2299,  2308,  2318,  2328,  2341,  2354,
-    2366,  2380,  2392,  2406,  2416,  2423,  2430,  2439,  2448,  2458,
-    2468,  2478,  2485,  2492,  2501,  2510,  2520,  2530,  2537,  2544,
-    2551,  2559,  2569,  2579,  2589,  2599,  2638,  2648,  2656,  2664,
-    2679,  2688,  2693,  2694,  2695,  2695,  2695,  2696,  2696,  2696,
-    2697,  2697,  2699,  2709,  2718,  2725,  2732,  2739,  2746,  2753,
-    2760,  2765,  2766,  2767,  2767,  2767,  2768,  2768,  2768,  2769,
-    2770,  2770,  2771,  2771,  2772,  2772,  2773,  2774,  2775,  2776,
-    2777,  2778,  2780,  2789,  2799,  2806,  2813,  2822,  2829,  2836,
-    2843,  2850,  2859,  2868,  2875,  2882,  2892,  2902,  2912,  2922,
-    2932,  2942,  2947,  2948,  2949,  2951,  2957,  2962,  2963,  2964,
-    2966,  2972,  2982,  2989,  2998,  3006,  3011,  3012,  3014,  3014,
-    3014,  3015,  3015,  3016,  3017,  3018,  3019,  3020,  3022,  3032,
-    3041,  3048,  3057,  3064,  3073,  3081,  3094,  3102,  3115,  3120,
-    3121,  3122,  3122,  3123,  3123,  3123,  3124,  3126,  3138,  3150,
-    3162,  3177,  3190,  3203,  3214,  3219,  3220,  3221,  3221,  3223,
-    3238
+     285,   286,   286,   287,   287,   288,   288,   290,   302,   303,
+     304,   304,   304,   304,   304,   305,   305,   307,   319,   320,
+     321,   321,   321,   321,   322,   322,   324,   338,   339,   340,
+     340,   340,   340,   341,   341,   341,   343,   360,   361,   362,
+     362,   362,   362,   363,   363,   363,   364,   367,   386,   403,
+     411,   421,   429,   446,   447,   448,   448,   448,   448,   448,
+     449,   449,   449,   450,   450,   452,   461,   470,   481,   490,
+     499,   508,   519,   528,   540,   554,   569,   580,   597,   614,
+     631,   648,   663,   678,   691,   706,   715,   724,   733,   742,
+     751,   760,   769,   778,   787,   796,   805,   814,   823,   832,
+     845,   854,   867,   876,   885,   894,   901,   908,   917,   924,
+     933,   941,   948,   955,   963,   972,   981,   990,  1004,  1013,
+    1022,  1031,  1040,  1049,  1058,  1065,  1072,  1098,  1106,  1113,
+    1120,  1127,  1134,  1142,  1150,  1158,  1165,  1176,  1187,  1194,
+    1203,  1212,  1221,  1228,  1235,  1243,  1251,  1261,  1271,  1281,
+    1295,  1303,  1316,  1327,  1335,  1348,  1357,  1366,  1375,  1385,
+    1395,  1403,  1416,  1425,  1433,  1442,  1450,  1463,  1472,  1479,
+    1489,  1499,  1509,  1519,  1529,  1539,  1549,  1559,  1566,  1573,
+    1580,  1589,  1598,  1607,  1616,  1623,  1633,  1653,  1660,  1678,
+    1691,  1704,  1713,  1722,  1731,  1740,  1750,  1760,  1771,  1780,
+    1789,  1798,  1807,  1816,  1825,  1838,  1851,  1860,  1867,  1876,
+    1885,  1894,  1903,  1911,  1924,  1932,  1973,  1980,  1995,  2005,
+    2015,  2022,  2029,  2036,  2045,  2053,  2067,  2088,  2109,  2121,
+    2133,  2145,  2154,  2175,  2185,  2194,  2202,  2210,  2223,  2236,
+    2251,  2266,  2275,  2284,  2290,  2299,  2308,  2318,  2328,  2341,
+    2354,  2366,  2380,  2392,  2406,  2421,  2431,  2438,  2445,  2454,
+    2463,  2473,  2483,  2493,  2500,  2507,  2516,  2525,  2535,  2545,
+    2552,  2559,  2566,  2574,  2584,  2594,  2604,  2614,  2653,  2663,
+    2671,  2679,  2694,  2703,  2708,  2709,  2710,  2710,  2710,  2711,
+    2711,  2711,  2712,  2712,  2714,  2724,  2733,  2740,  2747,  2754,
+    2761,  2768,  2775,  2780,  2781,  2782,  2782,  2782,  2783,  2783,
+    2783,  2784,  2785,  2785,  2786,  2786,  2787,  2787,  2788,  2789,
+    2790,  2791,  2792,  2793,  2795,  2804,  2814,  2821,  2828,  2837,
+    2844,  2851,  2858,  2865,  2874,  2883,  2890,  2897,  2907,  2917,
+    2927,  2937,  2947,  2957,  2962,  2963,  2964,  2966,  2972,  2977,
+    2978,  2979,  2981,  2987,  2997,  3004,  3013,  3021,  3026,  3027,
+    3029,  3029,  3029,  3030,  3030,  3031,  3032,  3033,  3034,  3035,
+    3037,  3047,  3056,  3063,  3072,  3079,  3088,  3096,  3109,  3117,
+    3130,  3135,  3136,  3137,  3137,  3138,  3138,  3138,  3139,  3141,
+    3153,  3165,  3177,  3192,  3205,  3218,  3229,  3234,  3235,  3236,
+    3236,  3238,  3253
 };
 #endif
 
@@ -1314,17 +1316,17 @@ static const char *const yytname[] =
   "VAR_IPSET_NAME_V4", "VAR_IPSET_NAME_V6", "VAR_TLS_SESSION_TICKET_KEYS",
   "VAR_RPZ", "VAR_TAGS", "VAR_RPZ_ACTION_OVERRIDE",
   "VAR_RPZ_CNAME_OVERRIDE", "VAR_RPZ_LOG", "VAR_RPZ_LOG_NAME",
-  "VAR_DYNLIB", "VAR_DYNLIB_FILE", "$accept", "toplevelvars",
-  "toplevelvar", "force_toplevel", "serverstart", "contents_server",
-  "content_server", "stubstart", "contents_stub", "content_stub",
-  "forwardstart", "contents_forward", "content_forward", "viewstart",
-  "contents_view", "content_view", "authstart", "contents_auth",
-  "content_auth", "rpz_tag", "rpz_action_override", "rpz_cname_override",
-  "rpz_log", "rpz_log_name", "rpzstart", "contents_rpz", "content_rpz",
-  "server_num_threads", "server_verbosity", "server_statistics_interval",
-  "server_statistics_cumulative", "server_extended_statistics",
-  "server_shm_enable", "server_shm_key", "server_port",
-  "server_send_client_subnet", "server_client_subnet_zone",
+  "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_TAG", "$accept",
+  "toplevelvars", "toplevelvar", "force_toplevel", "serverstart",
+  "contents_server", "content_server", "stubstart", "contents_stub",
+  "content_stub", "forwardstart", "contents_forward", "content_forward",
+  "viewstart", "contents_view", "content_view", "authstart",
+  "contents_auth", "content_auth", "rpz_tag", "rpz_action_override",
+  "rpz_cname_override", "rpz_log", "rpz_log_name", "rpzstart",
+  "contents_rpz", "content_rpz", "server_num_threads", "server_verbosity",
+  "server_statistics_interval", "server_statistics_cumulative",
+  "server_extended_statistics", "server_shm_enable", "server_shm_key",
+  "server_port", "server_send_client_subnet", "server_client_subnet_zone",
   "server_client_subnet_always_forward", "server_client_subnet_opcode",
   "server_max_client_subnet_ipv4", "server_max_client_subnet_ipv6",
   "server_min_client_subnet_ipv4", "server_min_client_subnet_ipv6",
@@ -1403,11 +1405,12 @@ static const char *const yytname[] =
   "server_qname_minimisation_strict", "server_ipsecmod_enabled",
   "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook",
   "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist",
-  "server_ipsecmod_strict", "stub_name", "stub_host", "stub_addr",
-  "stub_first", "stub_no_cache", "stub_ssl_upstream", "stub_prime",
-  "forward_name", "forward_host", "forward_addr", "forward_first",
-  "forward_no_cache", "forward_ssl_upstream", "auth_name", "auth_zonefile",
-  "auth_master", "auth_url", "auth_allow_notify", "auth_for_downstream",
+  "server_ipsecmod_strict", "server_edns_client_tag", "stub_name",
+  "stub_host", "stub_addr", "stub_first", "stub_no_cache",
+  "stub_ssl_upstream", "stub_prime", "forward_name", "forward_host",
+  "forward_addr", "forward_first", "forward_no_cache",
+  "forward_ssl_upstream", "auth_name", "auth_zonefile", "auth_master",
+  "auth_url", "auth_allow_notify", "auth_for_downstream",
   "auth_for_upstream", "auth_fallback_enabled", "view_name",
   "view_local_zone", "view_response_ip", "view_response_ip_data",
   "view_local_data", "view_local_data_ptr", "view_first", "rcstart",
@@ -1477,7 +1480,7 @@ static const yytype_int16 yytoknum[] =
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546
+     545,   546,   547
 };
 # endif
 
@@ -1518,7 +1521,7 @@ static const yytype_int16 yypact[] =
      241,   242,   243,   244,   245,   247,   248,   249,   250,   251,
      252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
      262,   263,   264,   265,   266,   267,   268,   269,   271,   272,
-     273,   275,   276,   277,   279,   313,   314,   315,   316,  -285,
+     273,   275,   276,   277,   279,   313,   314,   315,   316,   320,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
@@ -1538,54 +1541,54 @@ static const yytype_int16 yypact[] =
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,   320,   321,   322,   364,   365,   366,
-     367,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   368,
-     369,   370,   371,   372,   376,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,   380,   381,   406,   407,   408,   410,   421,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285,   422,   423,   424,
-     425,   426,   427,   428,   429,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,   430,   431,   432,   433,   434,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,   321,   322,   364,   365,
+     366,   367,   368,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,   369,   370,   371,   372,   376,   380,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,   381,   406,   407,   408,   410,   421,
+     422,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   423,
+     424,   425,   426,   427,   428,   429,   430,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,   431,   432,   433,   434,
+     435,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,   436,   437,   438,   439,   440,   480,   482,   498,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   515,
+     516,   517,   518,   519,   520,   521,   523,   524,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-     435,   436,   437,   438,   439,   440,   480,   482,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285,   498,   499,   500,
-     501,   502,   503,   504,   505,   506,   507,   508,   515,   516,
-     517,   518,   519,   520,   521,   523,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,   524,  -285,  -285,   525,
-    -285,  -285,   526,   527,   528,   529,   532,   535,   538,   539,
-     548,   549,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,   550,   552,   553,   554,   555,   556,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,   557,   558,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   525,  -285,
+    -285,   526,  -285,  -285,   527,   528,   529,   532,   535,   538,
+     539,   548,   549,   550,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,   552,   553,   554,   555,   556,
+     557,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   558,   559,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,   559,   560,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,   561,   562,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   561,   562,
-     563,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,   564,   565,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,   566,   567,   568,   569,   570,   571,  -285,  -285,
+     563,   564,   565,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,   566,   567,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,   568,   569,   570,   571,   572,   573,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,   572,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,   574,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,   575,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   573,
-    -285,  -285,   574,   575,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,   576,  -285,  -285,   577,   578,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,   576,   577,   578,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,   579,   580,   581,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1593,10 +1596,10 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_int16 yydefact[] =
 {
-       2,     0,     1,    18,    19,   216,   226,   491,   551,   510,
-     235,   565,   588,   245,   604,   261,   556,     3,    17,    21,
-     218,   228,   237,   247,   263,   493,   512,   553,   558,   567,
-     590,   606,     4,     5,     6,    10,    14,    15,     8,     9,
+       2,     0,     1,    18,    19,   217,   227,   493,   553,   512,
+     236,   567,   590,   246,   606,   262,   558,     3,    17,    21,
+     219,   229,   238,   248,   264,   495,   514,   555,   560,   569,
+     592,   608,     4,     5,     6,    10,    14,    15,     8,     9,
        7,    16,    11,    12,    13,     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,
@@ -1616,74 +1619,74 @@ static const yytype_int16 yydefact[] =
        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,     0,     0,     0,     0,     0,     0,     0,     0,    20,
-      22,    23,    86,    89,    98,   186,   187,    24,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,    37,    77,
-      25,    90,    91,    48,    70,    85,    26,    27,    30,    31,
-      28,    29,    32,    33,    34,    35,    36,   121,   198,   122,
-     124,   125,   126,   200,   205,   201,   212,   213,   214,   215,
-     182,    87,    76,   102,   119,   120,   210,   207,   123,    38,
-      39,    40,    41,    42,    78,    92,    93,   108,    64,    74,
-      65,   190,   191,   103,    58,    59,   189,    60,    61,   112,
-     116,   130,   139,   165,   142,   211,   113,    71,    43,    44,
-      45,   100,   131,   132,   133,    46,    47,    49,    50,    52,
-      53,    51,   137,    54,    55,    56,    62,    81,   117,    95,
-     138,    88,   161,    96,    97,   114,   115,   208,   101,    57,
-      79,    82,    63,    66,   104,   105,    80,   162,   106,    67,
-      68,    69,   199,   118,   175,   176,   177,   178,   179,   180,
-     188,   107,    75,   109,   110,   111,   163,    72,    73,    94,
-      83,    84,    99,   127,   128,   209,   129,   134,   135,   136,
-     166,   167,   169,   171,   172,   170,   173,   183,   140,   141,
-     145,   146,   143,   144,   147,   148,   150,   149,   202,   204,
-     203,   164,   174,   192,   194,   193,   195,   196,   197,   168,
-     181,   184,   185,   206,     0,     0,     0,     0,     0,     0,
-       0,   217,   219,   220,   221,   223,   224,   225,   222,     0,
-       0,     0,     0,     0,     0,   227,   229,   230,   231,   232,
-     233,   234,     0,     0,     0,     0,     0,     0,     0,   236,
-     238,   239,   242,   243,   240,   244,   241,     0,     0,     0,
-       0,     0,     0,     0,     0,   246,   248,   249,   250,   251,
-     255,   252,   253,   254,     0,     0,     0,     0,     0,   266,
-     270,   271,   272,   273,   262,   264,   265,   267,   268,   269,
-       0,     0,     0,     0,     0,     0,     0,     0,   492,   494,
-     496,   495,   501,   497,   498,   499,   500,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   511,   513,   515,   514,
-     516,   517,   518,   519,   520,   521,   522,   523,   524,   525,
-     526,   527,   528,   529,   530,   531,     0,   552,   554,     0,
-     557,   559,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   566,   568,   569,   570,   572,   573,   571,   574,
-     575,   576,   577,     0,     0,     0,     0,     0,     0,   589,
-     591,   592,   593,   594,   595,   596,     0,     0,   605,   607,
-     608,   275,   274,   281,   294,   292,   304,   300,   301,   305,
-     302,   303,   306,   307,   308,   309,   310,   333,   334,   335,
-     336,   337,   362,   363,   364,   369,   370,   297,   371,   372,
-     375,   373,   374,   377,   378,   379,   393,   348,   349,   351,
-     352,   380,   396,   342,   344,   397,   403,   404,   405,   298,
-     361,   421,   422,   343,   416,   326,   293,   338,   394,   400,
-     381,     0,     0,   425,   299,   276,   325,   385,   277,   295,
-     296,   339,   340,   423,   383,   387,   388,   278,   426,   365,
-     392,   327,   347,   398,   399,   402,   415,   341,   419,   417,
-     418,   353,   360,   389,   390,   354,   355,   382,   407,   328,
-     329,   332,   311,   313,   314,   315,   316,   317,   427,   428,
-     430,   366,   367,   368,   376,   431,   432,   433,     0,     0,
-       0,   384,   356,   358,   561,   442,   446,   444,   443,   447,
-     445,     0,     0,   450,   451,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   386,   401,   420,   455,   456,
-     357,   434,     0,     0,     0,     0,     0,     0,   408,   409,
-     410,   411,   412,   413,   414,   562,   350,   345,   406,   324,
-     279,   280,   346,   457,   459,   458,   460,   461,   462,   312,
-     319,   452,   454,   453,   318,     0,   331,   391,   429,   330,
-     359,   320,   321,   323,   322,   463,   464,   465,   469,   468,
-     466,   467,   470,   471,   472,   473,   475,   474,   484,     0,
-     488,   489,     0,     0,   490,   476,   482,   477,   478,   479,
-     481,   483,   480,   256,   257,   258,   259,   260,   502,   504,
-     503,   506,   507,   508,   509,   505,   532,   534,   535,   536,
-     537,   538,   539,   540,   541,   542,   533,   543,   544,   545,
-     546,   547,   548,   549,   550,   555,   560,   578,   579,   580,
-     583,   581,   582,   584,   585,   586,   587,   597,   598,   599,
-     600,   601,   602,   609,   610,   395,   424,   441,   563,   564,
-     448,   449,   435,   436,     0,     0,     0,   440,   603,   485,
-     486,   487,   439,   437,   438
+      20,    22,    23,    86,    89,    98,   186,   187,    24,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,    37,
+      77,    25,    90,    91,    48,    70,    85,    26,    27,    30,
+      31,    28,    29,    32,    33,    34,    35,    36,   121,   198,
+     122,   124,   125,   126,   200,   205,   201,   212,   213,   214,
+     215,   182,    87,    76,   102,   119,   120,   210,   207,   123,
+      38,    39,    40,    41,    42,    78,    92,    93,   108,    64,
+      74,    65,   190,   191,   103,    58,    59,   189,    60,    61,
+     112,   116,   130,   139,   165,   142,   211,   113,    71,    43,
+      44,    45,   100,   131,   132,   133,    46,    47,    49,    50,
+      52,    53,    51,   137,    54,    55,    56,    62,    81,   117,
+      95,   138,    88,   161,    96,    97,   114,   115,   208,   101,
+      57,    79,    82,    63,    66,   104,   105,    80,   162,   106,
+      67,    68,    69,   199,   118,   175,   176,   177,   178,   179,
+     180,   188,   107,    75,   109,   110,   111,   163,    72,    73,
+      94,    83,    84,    99,   127,   128,   209,   129,   134,   135,
+     136,   166,   167,   169,   171,   172,   170,   173,   183,   140,
+     141,   145,   146,   143,   144,   147,   148,   150,   149,   202,
+     204,   203,   164,   174,   192,   194,   193,   195,   196,   197,
+     216,   168,   181,   184,   185,   206,     0,     0,     0,     0,
+       0,     0,     0,   218,   220,   221,   222,   224,   225,   226,
+     223,     0,     0,     0,     0,     0,     0,   228,   230,   231,
+     232,   233,   234,   235,     0,     0,     0,     0,     0,     0,
+       0,   237,   239,   240,   243,   244,   241,   245,   242,     0,
+       0,     0,     0,     0,     0,     0,     0,   247,   249,   250,
+     251,   252,   256,   253,   254,   255,     0,     0,     0,     0,
+       0,   267,   271,   272,   273,   274,   263,   265,   266,   268,
+     269,   270,     0,     0,     0,     0,     0,     0,     0,     0,
+     494,   496,   498,   497,   503,   499,   500,   501,   502,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   513,   515,
+     517,   516,   518,   519,   520,   521,   522,   523,   524,   525,
+     526,   527,   528,   529,   530,   531,   532,   533,     0,   554,
+     556,     0,   559,   561,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   568,   570,   571,   572,   574,   575,
+     573,   576,   577,   578,   579,     0,     0,     0,     0,     0,
+       0,   591,   593,   594,   595,   596,   597,   598,     0,     0,
+     607,   609,   610,   276,   275,   282,   295,   293,   305,   301,
+     302,   306,   303,   304,   307,   308,   309,   310,   311,   334,
+     335,   336,   337,   338,   363,   364,   365,   370,   371,   298,
+     372,   373,   376,   374,   375,   378,   379,   380,   394,   349,
+     350,   352,   353,   381,   397,   343,   345,   398,   404,   405,
+     406,   299,   362,   422,   423,   344,   417,   327,   294,   339,
+     395,   401,   382,     0,     0,   426,   300,   277,   326,   386,
+     278,   296,   297,   340,   341,   424,   384,   388,   389,   279,
+     427,   366,   393,   328,   348,   399,   400,   403,   416,   342,
+     420,   418,   419,   354,   361,   390,   391,   355,   356,   383,
+     408,   329,   330,   333,   312,   314,   315,   316,   317,   318,
+     428,   429,   431,   367,   368,   369,   377,   432,   433,   434,
+       0,     0,     0,   385,   357,   359,   563,   443,   447,   445,
+     444,   448,   446,     0,     0,   451,   452,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   387,   402,   421,
+     456,   457,   358,   435,     0,     0,     0,     0,     0,     0,
+     409,   410,   411,   412,   413,   414,   415,   564,   351,   346,
+     407,   325,   280,   281,   347,   458,   460,   459,   461,   462,
+     463,   313,   320,   453,   455,   454,   319,     0,   332,   392,
+     430,   331,   360,   321,   322,   324,   323,     0,   465,   466,
+     467,   471,   470,   468,   469,   472,   473,   474,   475,   477,
+     476,   486,     0,   490,   491,     0,     0,   492,   478,   484,
+     479,   480,   481,   483,   485,   482,   257,   258,   259,   260,
+     261,   504,   506,   505,   508,   509,   510,   511,   507,   534,
+     536,   537,   538,   539,   540,   541,   542,   543,   544,   535,
+     545,   546,   547,   548,   549,   550,   551,   552,   557,   562,
+     580,   581,   582,   585,   583,   584,   586,   587,   588,   589,
+     599,   600,   601,   602,   603,   604,   611,   612,   396,   425,
+     442,   565,   566,   449,   450,   436,   437,     0,     0,     0,
+     441,   605,   464,   487,   488,   489,   440,   438,   439
 };
 
   /* YYPGOTO[NTERM-NUM].  */
@@ -1711,8 +1714,8 @@ static const yytype_int16 yypgoto[] =
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,   579,
-     580,   581,   582,   583,  -285,  -285,  -285,  -285,  -285,  -285,
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
+     560,   582,   583,   584,   585,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
@@ -1720,44 +1723,44 @@ static const yytype_int16 yypgoto[] =
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
     -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285,
-    -285,  -285,  -285,  -285,  -285,  -285,  -285
+    -285,  -285,  -285,  -285,  -285,  -285,  -285,  -285
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    17,    18,    19,    32,   239,    20,    33,   441,
-      21,    34,   455,    22,    35,   469,    23,    36,   485,   499,
-     500,   501,   502,   503,    24,    37,   504,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
-     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
-     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
-     383,   384,   385,   386,   387,   388,   389,   390,   391,   392,
-     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
-     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   442,   443,   444,   445,
-     446,   447,   448,   456,   457,   458,   459,   460,   461,   486,
-     487,   488,   489,   490,   491,   492,   493,   470,   471,   472,
-     473,   474,   475,   476,    25,    38,   518,   519,   520,   521,
-     522,   523,   524,   525,   526,    26,    39,   546,   547,   548,
-     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
-     559,   560,   561,   562,   563,   564,   565,    27,    40,   567,
-     568,    28,    41,   570,   571,   429,   430,   431,   432,    29,
-      42,   582,   583,   584,   585,   586,   587,   588,   589,   590,
-     591,   592,    30,    43,   599,   600,   601,   602,   603,   604,
-     605,   433,    31,    44,   608,   609,   610
+      -1,     1,    17,    18,    19,    32,   240,    20,    33,   443,
+      21,    34,   457,    22,    35,   471,    23,    36,   487,   501,
+     502,   503,   504,   505,    24,    37,   506,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
+     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
+     294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
+     374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
+     384,   385,   386,   387,   388,   389,   390,   391,   392,   393,
+     394,   395,   396,   397,   398,   399,   400,   401,   402,   403,
+     404,   405,   406,   407,   408,   409,   410,   411,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   444,   445,   446,
+     447,   448,   449,   450,   458,   459,   460,   461,   462,   463,
+     488,   489,   490,   491,   492,   493,   494,   495,   472,   473,
+     474,   475,   476,   477,   478,    25,    38,   520,   521,   522,
+     523,   524,   525,   526,   527,   528,    26,    39,   548,   549,
+     550,   551,   552,   553,   554,   555,   556,   557,   558,   559,
+     560,   561,   562,   563,   564,   565,   566,   567,    27,    40,
+     569,   570,    28,    41,   572,   573,   431,   432,   433,   434,
+      29,    42,   584,   585,   586,   587,   588,   589,   590,   591,
+     592,   593,   594,    30,    43,   601,   602,   603,   604,   605,
+     606,   607,   435,    31,    44,   610,   611,   612
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1765,69 +1768,69 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-       2,   477,   462,   434,   566,   435,   436,   569,   449,   606,
-     607,     3,     4,   611,   612,   613,   450,   451,   593,   594,
-     595,   596,   597,   598,   477,   572,   573,   574,   575,   576,
-     577,   578,   579,   580,   581,   614,   615,   616,   463,   464,
-     617,   618,   619,   620,   621,   622,     5,   623,   624,   625,
-     626,   627,     6,   628,   629,   630,   631,   632,   633,   634,
-     635,   636,   637,   465,   638,   639,   437,   527,   528,   529,
-     530,   531,   532,   533,   534,   535,   536,   537,   538,   539,
-     540,   541,   542,   543,   544,   545,   510,   511,   512,   513,
-     514,   515,   516,   517,   640,   641,     7,   438,   642,   643,
-     439,   452,   644,   453,   645,   646,   647,   648,   649,   650,
-     651,   652,     8,   653,   654,   655,   656,   657,   658,   659,
-     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
-     670,   466,   467,   671,   672,   673,   674,   675,   676,   677,
-     678,   679,   680,   681,   682,   683,   684,   685,   686,   687,
-     688,   689,   690,     9,   691,   692,   693,   694,   695,   696,
-     697,   698,   699,   700,   701,   702,   703,   704,   705,   706,
-     707,   468,   708,   709,   710,   711,   712,   713,   714,   715,
-     716,   717,   718,   719,   720,   721,   722,   723,   724,   725,
-     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
-     736,   737,   738,   739,   740,   741,   742,   743,   744,   745,
-     746,   747,    10,   479,   480,   481,   748,   749,   750,   751,
-     752,   753,   754,   484,   755,   756,   757,   758,   759,   440,
-      11,   760,   761,   454,   478,   762,   479,   480,   481,   482,
-     483,   494,   495,   496,   497,   498,   484,    12,   763,   764,
-     765,   766,   767,   768,   769,   770,    13,   771,   772,   773,
-     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
-     784,   785,   786,   787,   788,   789,   790,   791,   792,   793,
-      14,   794,   795,   796,    15,   797,   798,   799,     0,   800,
+       2,   479,   464,   436,   568,   437,   438,   571,   451,   608,
+     609,     3,     4,   613,   614,   615,   452,   453,   595,   596,
+     597,   598,   599,   600,   479,   574,   575,   576,   577,   578,
+     579,   580,   581,   582,   583,   616,   617,   618,   465,   466,
+     619,   620,   621,   622,   623,   624,     5,   625,   626,   627,
+     628,   629,     6,   630,   631,   632,   633,   634,   635,   636,
+     637,   638,   639,   467,   640,   641,   439,   529,   530,   531,
+     532,   533,   534,   535,   536,   537,   538,   539,   540,   541,
+     542,   543,   544,   545,   546,   547,   512,   513,   514,   515,
+     516,   517,   518,   519,   642,   643,     7,   440,   644,   645,
+     441,   454,   646,   455,   647,   648,   649,   650,   651,   652,
+     653,   654,     8,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,   468,   469,   673,   674,   675,   676,   677,   678,   679,
+     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
+     690,   691,   692,     9,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
+     709,   470,   710,   711,   712,   713,   714,   715,   716,   717,
+     718,   719,   720,   721,   722,   723,   724,   725,   726,   727,
+     728,   729,   730,   731,   732,   733,   734,   735,   736,   737,
+     738,   739,   740,   741,   742,   743,   744,   745,   746,   747,
+     748,   749,    10,   481,   482,   483,   750,   751,   752,   753,
+     754,   755,   756,   486,   757,   758,   759,   760,   761,   442,
+      11,   762,   763,   456,   480,   764,   481,   482,   483,   484,
+     485,   496,   497,   498,   499,   500,   486,    12,   765,   766,
+     767,   768,   769,   770,   771,   772,    13,   773,   774,   775,
+     776,   777,   778,   779,   780,   781,   782,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   793,   794,   795,
+      14,   796,   797,   798,    15,   799,   800,   801,     0,   802,
       16,    45,    46,    47,    48,    49,    50,    51,    52,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
       64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,   801,   802,   803,   804,    77,    78,    79,
-     805,   806,   807,    80,    81,    82,    83,    84,    85,    86,
+      74,    75,    76,   803,   804,   805,   806,    77,    78,    79,
+     807,   808,   809,    80,    81,    82,    83,    84,    85,    86,
       87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
       97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   808,   809,   810,   811,   812,   813,
-     814,   815,   816,   121,   122,   123,   817,   124,   125,   126,
-     818,   819,   127,   128,   129,   130,   131,   132,   133,   134,
+     117,   118,   119,   120,   810,   811,   812,   813,   814,   815,
+     816,   817,   818,   121,   122,   123,   819,   124,   125,   126,
+     820,   821,   127,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   820,   821,   822,   151,
-     823,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   824,   825,   826,   827,   828,   829,   830,   831,   832,
-     833,   834,   835,   836,   837,   838,   839,   840,   841,   842,
-     843,   162,   163,   164,   165,   166,   167,   168,   169,   170,
+     145,   146,   147,   148,   149,   150,   822,   823,   824,   151,
+     825,   152,   153,   154,   155,   156,   157,   158,   159,   160,
+     161,   826,   827,   828,   829,   830,   831,   832,   833,   834,
+     835,   836,   837,   838,   839,   840,   841,   842,   843,   844,
+     845,   162,   163,   164,   165,   166,   167,   168,   169,   170,
      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
      181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
      191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     844,   201,   845,   202,   203,   204,   205,   206,   207,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   846,   847,
-     848,   849,   850,   851,   852,   853,   854,   855,   856,   217,
-     218,   219,   220,   221,   222,   857,   858,   859,   860,   861,
-     862,   863,   223,   864,   865,   866,   867,   868,   869,   870,
-     224,   225,   871,   226,   227,   872,   228,   229,   873,   874,
-     230,   231,   232,   233,   234,   235,   236,   237,   875,   876,
-     877,   238,   878,   879,   880,   881,   882,   883,   884,   885,
-     886,   887,   888,   889,   890,   891,   892,   893,   894,   895,
-     896,   897,   898,   899,   900,   901,   902,   903,   904,     0,
+     846,   201,   847,   202,   203,   204,   205,   206,   207,   208,
+     209,   210,   211,   212,   213,   214,   215,   216,   848,   849,
+     850,   851,   852,   853,   854,   855,   856,   857,   858,   217,
+     218,   219,   220,   221,   222,   859,   860,   861,   862,   863,
+     864,   865,   223,   866,   867,   868,   869,   870,   871,   872,
+     224,   225,   873,   226,   227,   874,   228,   229,   875,   876,
+     230,   231,   232,   233,   234,   235,   236,   237,   877,   878,
+     879,   238,   880,   881,   882,   883,   884,   885,   886,   887,
+     239,   888,   889,   890,   891,   892,   893,   894,   895,   896,
+     897,   898,   899,   900,   901,   902,   903,   904,   905,   906,
+     907,   908,     0,     0,     0,     0,     0,   507,     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,   505,   506,   507,   508,
-     509
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   508,
+     509,   510,   511
 };
 
 static const yytype_int16 yycheck[] =
@@ -1889,23 +1892,23 @@ static const yytype_int16 yycheck[] =
      262,   263,    10,   265,   266,    10,   268,   269,    10,    10,
      272,   273,   274,   275,   276,   277,   278,   279,    10,    10,
       10,   283,    10,    10,    10,    10,    10,    10,    10,    10,
+     292,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    -1,
+      10,    10,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    37,    37,    37,
-      37
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      37,    37,    37
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_int16 yystos[] =
 {
-       0,   293,     0,    11,    12,    46,    52,    96,   112,   153,
-     212,   230,   247,   256,   280,   284,   290,   294,   295,   296,
-     299,   302,   305,   308,   316,   536,   547,   569,   573,   581,
-     594,   604,   297,   300,   303,   306,   309,   317,   537,   548,
-     570,   574,   582,   595,   605,    13,    14,    15,    16,    17,
+       0,   294,     0,    11,    12,    46,    52,    96,   112,   153,
+     212,   230,   247,   256,   280,   284,   290,   295,   296,   297,
+     300,   303,   306,   309,   317,   538,   549,   571,   575,   583,
+     596,   606,   298,   301,   304,   307,   310,   318,   539,   550,
+     572,   576,   584,   597,   607,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    49,    50,    51,
@@ -1924,8 +1927,8 @@ static const yytype_int16 yystos[] =
      211,   213,   215,   216,   217,   218,   219,   220,   221,   222,
      223,   224,   225,   226,   227,   228,   229,   241,   242,   243,
      244,   245,   246,   254,   262,   263,   265,   266,   268,   269,
-     272,   273,   274,   275,   276,   277,   278,   279,   283,   298,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     272,   273,   274,   275,   276,   277,   278,   279,   283,   292,
+     299,   320,   321,   322,   323,   324,   325,   326,   327,   328,
      329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
      339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
@@ -1943,26 +1946,26 @@ static const yytype_int16 yystos[] =
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
      479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
      489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   577,
-     578,   579,   580,   603,    45,    47,    48,   108,   139,   142,
-     271,   301,   508,   509,   510,   511,   512,   513,   514,    45,
-      53,    54,   138,   140,   270,   304,   515,   516,   517,   518,
-     519,   520,    45,    81,    82,   106,   174,   175,   214,   307,
-     529,   530,   531,   532,   533,   534,   535,    45,   255,   257,
-     258,   259,   260,   261,   267,   310,   521,   522,   523,   524,
-     525,   526,   527,   528,   285,   286,   287,   288,   289,   311,
-     312,   313,   314,   315,   318,   521,   522,   523,   524,   525,
-      97,    98,    99,   100,   101,   102,   103,   104,   538,   539,
-     540,   541,   542,   543,   544,   545,   546,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   549,   550,   551,   552,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,   579,   580,   581,   582,   605,    45,    47,    48,   108,
+     139,   142,   271,   302,   510,   511,   512,   513,   514,   515,
+     516,    45,    53,    54,   138,   140,   270,   305,   517,   518,
+     519,   520,   521,   522,    45,    81,    82,   106,   174,   175,
+     214,   308,   531,   532,   533,   534,   535,   536,   537,    45,
+     255,   257,   258,   259,   260,   261,   267,   311,   523,   524,
+     525,   526,   527,   528,   529,   530,   285,   286,   287,   288,
+     289,   312,   313,   314,   315,   316,   319,   523,   524,   525,
+     526,   527,    97,    98,    99,   100,   101,   102,   103,   104,
+     540,   541,   542,   543,   544,   545,   546,   547,   548,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   551,   552,
      553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
-     563,   564,   565,   566,   567,   568,   113,   571,   572,   291,
-     575,   576,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   583,   584,   585,   586,   587,   588,   589,   590,
-     591,   592,   593,   248,   249,   250,   251,   252,   253,   596,
-     597,   598,   599,   600,   601,   602,   281,   282,   606,   607,
-     608,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+     563,   564,   565,   566,   567,   568,   569,   570,   113,   573,
+     574,   291,   577,   578,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   585,   586,   587,   588,   589,   590,
+     591,   592,   593,   594,   595,   248,   249,   250,   251,   252,
+     253,   598,   599,   600,   601,   602,   603,   604,   281,   282,
+     608,   609,   610,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1991,40 +1994,40 @@ static const yytype_int16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int16 yyr1[] =
 {
-       0,   292,   293,   293,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   295,   296,
-     297,   297,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
-     298,   298,   298,   298,   298,   298,   299,   300,   300,   301,
-     301,   301,   301,   301,   301,   301,   302,   303,   303,   304,
-     304,   304,   304,   304,   304,   305,   306,   306,   307,   307,
-     307,   307,   307,   307,   307,   308,   309,   309,   310,   310,
-     310,   310,   310,   310,   310,   310,   311,   312,   313,   314,
-     315,   316,   317,   317,   318,   318,   318,   318,   318,   318,
-     318,   318,   318,   318,   319,   320,   321,   322,   323,   324,
+       0,   293,   294,   294,   295,   295,   295,   295,   295,   295,
+     295,   295,   295,   295,   295,   295,   295,   295,   296,   297,
+     298,   298,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   299,   299,   299,
+     299,   299,   299,   299,   299,   299,   299,   300,   301,   301,
+     302,   302,   302,   302,   302,   302,   302,   303,   304,   304,
+     305,   305,   305,   305,   305,   305,   306,   307,   307,   308,
+     308,   308,   308,   308,   308,   308,   309,   310,   310,   311,
+     311,   311,   311,   311,   311,   311,   311,   312,   313,   314,
+     315,   316,   317,   318,   318,   319,   319,   319,   319,   319,
+     319,   319,   319,   319,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
@@ -2046,19 +2049,19 @@ static const yytype_int16 yyr1[] =
      505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   537,   537,   538,   538,   538,   538,   538,   538,
-     538,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-     547,   548,   548,   549,   549,   549,   549,   549,   549,   549,
-     549,   549,   549,   549,   549,   549,   549,   549,   549,   549,
-     549,   549,   550,   551,   552,   553,   554,   555,   556,   557,
+     535,   536,   537,   538,   539,   539,   540,   540,   540,   540,
+     540,   540,   540,   540,   541,   542,   543,   544,   545,   546,
+     547,   548,   549,   550,   550,   551,   551,   551,   551,   551,
+     551,   551,   551,   551,   551,   551,   551,   551,   551,   551,
+     551,   551,   551,   551,   552,   553,   554,   555,   556,   557,
      558,   559,   560,   561,   562,   563,   564,   565,   566,   567,
-     568,   569,   570,   570,   571,   572,   573,   574,   574,   575,
-     576,   577,   578,   579,   580,   581,   582,   582,   583,   583,
-     583,   583,   583,   583,   583,   583,   583,   583,   584,   585,
+     568,   569,   570,   571,   572,   572,   573,   574,   575,   576,
+     576,   577,   578,   579,   580,   581,   582,   583,   584,   584,
+     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
      586,   587,   588,   589,   590,   591,   592,   593,   594,   595,
-     595,   596,   596,   596,   596,   596,   596,   597,   598,   599,
-     600,   601,   602,   603,   604,   605,   605,   606,   606,   607,
-     608
+     596,   597,   597,   598,   598,   598,   598,   598,   598,   599,
+     600,   601,   602,   603,   604,   605,   606,   607,   607,   608,
+     608,   609,   610
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -2085,13 +2088,13 @@ static const yytype_int8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     0,
        1,     1,     1,     1,     1,     1,     1,     2,     0,     1,
        1,     1,     1,     1,     1,     1,     1,     2,     0,     1,
-       1,     1,     1,     1,     1,     1,     2,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
-       2,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2103,29 +2106,29 @@ static const yytype_int8 yyr2[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     3,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     3,     4,     4,
+       4,     3,     3,     2,     2,     2,     2,     2,     2,     3,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     3,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     3,     4,     4,     4,
-       3,     3,     2,     2,     2,     2,     2,     2,     3,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     3,     3,     2,     2,
-       2,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
-       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       2,     2,     2,     2,     2,     2,     2,     3,     3,     3,
+       2,     2,     2,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     1,     2,     0,     1,     2,     1,     2,     0,     1,
-       2,     2,     2,     3,     3,     1,     2,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
-       0,     1,     1,     1,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     3,     1,     2,     0,     1,     1,     2,
-       2
+       2,     2,     2,     1,     2,     0,     1,     2,     1,     2,
+       0,     1,     2,     2,     2,     3,     3,     1,     2,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       1,     2,     0,     1,     1,     1,     1,     1,     1,     2,
+       2,     2,     2,     2,     2,     3,     1,     2,     0,     1,
+       1,     2,     2
 };
 
 
@@ -2272,7 +2275,7 @@ yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       yystos[+yyssp[yyi + 1 - yynrhs]],
                        &yyvsp[(yyi + 1) - (yynrhs)]
                                               );
       YYFPRINTF (stderr, "\n");
@@ -2450,7 +2453,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
   */
   if (yytoken != YYEMPTY)
     {
-      int yyn = yypact[*yyssp];
+      int yyn = yypact[+*yyssp];
       YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
       yysize = yysize0;
       yyarg[yycount++] = yytname[yytoken];
@@ -2825,7 +2828,7 @@ yyreduce:
         {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2829 "util/configparser.c"
+#line 2832 "util/configparser.c"
     break;
 
   case 19:
@@ -2833,10 +2836,10 @@ yyreduce:
         { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2837 "util/configparser.c"
+#line 2840 "util/configparser.c"
     break;
 
-  case 216:
+  case 217:
 #line 291 "./util/configparser.y"
         {
 		struct config_stub* s;
@@ -2848,10 +2851,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2852 "util/configparser.c"
+#line 2855 "util/configparser.c"
     break;
 
-  case 226:
+  case 227:
 #line 308 "./util/configparser.y"
         {
 		struct config_stub* s;
@@ -2863,10 +2866,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2867 "util/configparser.c"
+#line 2870 "util/configparser.c"
     break;
 
-  case 235:
+  case 236:
 #line 325 "./util/configparser.y"
         {
 		struct config_view* s;
@@ -2880,10 +2883,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2884 "util/configparser.c"
+#line 2887 "util/configparser.c"
     break;
 
-  case 245:
+  case 246:
 #line 344 "./util/configparser.y"
         {
 		struct config_auth* s;
@@ -2900,10 +2903,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2904 "util/configparser.c"
+#line 2907 "util/configparser.c"
     break;
 
-  case 256:
+  case 257:
 #line 368 "./util/configparser.y"
         {
 		uint8_t* bitlist;
@@ -2921,10 +2924,10 @@ yyreduce:
 
 		}
 	}
-#line 2925 "util/configparser.c"
+#line 2928 "util/configparser.c"
     break;
 
-  case 257:
+  case 258:
 #line 387 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
@@ -2940,20 +2943,20 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2944 "util/configparser.c"
+#line 2947 "util/configparser.c"
     break;
 
-  case 258:
+  case 259:
 #line 404 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2954 "util/configparser.c"
+#line 2957 "util/configparser.c"
     break;
 
-  case 259:
+  case 260:
 #line 412 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
@@ -2962,20 +2965,20 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2966 "util/configparser.c"
+#line 2969 "util/configparser.c"
     break;
 
-  case 260:
+  case 261:
 #line 422 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 2976 "util/configparser.c"
+#line 2979 "util/configparser.c"
     break;
 
-  case 261:
+  case 262:
 #line 430 "./util/configparser.y"
         {
 		struct config_auth* s;
@@ -2992,10 +2995,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2996 "util/configparser.c"
+#line 2999 "util/configparser.c"
     break;
 
-  case 274:
+  case 275:
 #line 453 "./util/configparser.y"
         { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
@@ -3004,10 +3007,10 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3008 "util/configparser.c"
+#line 3011 "util/configparser.c"
     break;
 
-  case 275:
+  case 276:
 #line 462 "./util/configparser.y"
         { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
@@ -3016,10 +3019,10 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3020 "util/configparser.c"
+#line 3023 "util/configparser.c"
     break;
 
-  case 276:
+  case 277:
 #line 471 "./util/configparser.y"
         { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
@@ -3030,10 +3033,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3034 "util/configparser.c"
+#line 3037 "util/configparser.c"
     break;
 
-  case 277:
+  case 278:
 #line 482 "./util/configparser.y"
         {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
@@ -3042,10 +3045,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3046 "util/configparser.c"
+#line 3049 "util/configparser.c"
     break;
 
-  case 278:
+  case 279:
 #line 491 "./util/configparser.y"
         {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
@@ -3054,10 +3057,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3058 "util/configparser.c"
+#line 3061 "util/configparser.c"
     break;
 
-  case 279:
+  case 280:
 #line 500 "./util/configparser.y"
         {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
@@ -3066,10 +3069,10 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3070 "util/configparser.c"
+#line 3073 "util/configparser.c"
     break;
 
-  case 280:
+  case 281:
 #line 509 "./util/configparser.y"
         { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
@@ -3080,10 +3083,10 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3084 "util/configparser.c"
+#line 3087 "util/configparser.c"
     break;
 
-  case 281:
+  case 282:
 #line 520 "./util/configparser.y"
         {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
@@ -3092,10 +3095,10 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3096 "util/configparser.c"
+#line 3099 "util/configparser.c"
     break;
 
-  case 282:
+  case 283:
 #line 529 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3107,10 +3110,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3111 "util/configparser.c"
+#line 3114 "util/configparser.c"
     break;
 
-  case 283:
+  case 284:
 #line 541 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3123,10 +3126,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3127 "util/configparser.c"
+#line 3130 "util/configparser.c"
     break;
 
-  case 284:
+  case 285:
 #line 555 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3141,10 +3144,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3145 "util/configparser.c"
+#line 3148 "util/configparser.c"
     break;
 
-  case 285:
+  case 286:
 #line 570 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3155,10 +3158,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3159 "util/configparser.c"
+#line 3162 "util/configparser.c"
     break;
 
-  case 286:
+  case 287:
 #line 581 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3175,10 +3178,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3179 "util/configparser.c"
+#line 3182 "util/configparser.c"
     break;
 
-  case 287:
+  case 288:
 #line 598 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3195,10 +3198,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3199 "util/configparser.c"
+#line 3202 "util/configparser.c"
     break;
 
-  case 288:
+  case 289:
 #line 615 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3215,10 +3218,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3219 "util/configparser.c"
+#line 3222 "util/configparser.c"
     break;
 
-  case 289:
+  case 290:
 #line 632 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3235,10 +3238,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3239 "util/configparser.c"
+#line 3242 "util/configparser.c"
     break;
 
-  case 290:
+  case 291:
 #line 649 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3253,10 +3256,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3257 "util/configparser.c"
+#line 3260 "util/configparser.c"
     break;
 
-  case 291:
+  case 292:
 #line 664 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
@@ -3271,10 +3274,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3275 "util/configparser.c"
+#line 3278 "util/configparser.c"
     break;
 
-  case 292:
+  case 293:
 #line 679 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
@@ -3287,10 +3290,10 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3291 "util/configparser.c"
+#line 3294 "util/configparser.c"
     break;
 
-  case 293:
+  case 294:
 #line 692 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
@@ -3305,10 +3308,10 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3309 "util/configparser.c"
+#line 3312 "util/configparser.c"
     break;
 
-  case 294:
+  case 295:
 #line 707 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
@@ -3317,10 +3320,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3321 "util/configparser.c"
+#line 3324 "util/configparser.c"
     break;
 
-  case 295:
+  case 296:
 #line 716 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
@@ -3329,10 +3332,10 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3333 "util/configparser.c"
+#line 3336 "util/configparser.c"
     break;
 
-  case 296:
+  case 297:
 #line 725 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
@@ -3341,10 +3344,10 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3345 "util/configparser.c"
+#line 3348 "util/configparser.c"
     break;
 
-  case 297:
+  case 298:
 #line 734 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -3353,10 +3356,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3357 "util/configparser.c"
+#line 3360 "util/configparser.c"
     break;
 
-  case 298:
+  case 299:
 #line 743 "./util/configparser.y"
         {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -3365,10 +3368,10 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3369 "util/configparser.c"
+#line 3372 "util/configparser.c"
     break;
 
-  case 299:
+  case 300:
 #line 752 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
@@ -3377,10 +3380,10 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3381 "util/configparser.c"
+#line 3384 "util/configparser.c"
     break;
 
-  case 300:
+  case 301:
 #line 761 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
@@ -3389,10 +3392,10 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3393 "util/configparser.c"
+#line 3396 "util/configparser.c"
     break;
 
-  case 301:
+  case 302:
 #line 770 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
@@ -3401,10 +3404,10 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3405 "util/configparser.c"
+#line 3408 "util/configparser.c"
     break;
 
-  case 302:
+  case 303:
 #line 779 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
@@ -3413,10 +3416,10 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3417 "util/configparser.c"
+#line 3420 "util/configparser.c"
     break;
 
-  case 303:
+  case 304:
 #line 788 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
@@ -3425,10 +3428,10 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3429 "util/configparser.c"
+#line 3432 "util/configparser.c"
     break;
 
-  case 304:
+  case 305:
 #line 797 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
@@ -3437,10 +3440,10 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3441 "util/configparser.c"
+#line 3444 "util/configparser.c"
     break;
 
-  case 305:
+  case 306:
 #line 806 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
@@ -3449,10 +3452,10 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3453 "util/configparser.c"
+#line 3456 "util/configparser.c"
     break;
 
-  case 306:
+  case 307:
 #line 815 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -3461,10 +3464,10 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3465 "util/configparser.c"
+#line 3468 "util/configparser.c"
     break;
 
-  case 307:
+  case 308:
 #line 824 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -3473,10 +3476,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3477 "util/configparser.c"
+#line 3480 "util/configparser.c"
     break;
 
-  case 308:
+  case 309:
 #line 833 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
@@ -3489,10 +3492,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3493 "util/configparser.c"
+#line 3496 "util/configparser.c"
     break;
 
-  case 309:
+  case 310:
 #line 846 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
@@ -3501,10 +3504,10 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3505 "util/configparser.c"
+#line 3508 "util/configparser.c"
     break;
 
-  case 310:
+  case 311:
 #line 855 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
@@ -3517,10 +3520,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3521 "util/configparser.c"
+#line 3524 "util/configparser.c"
     break;
 
-  case 311:
+  case 312:
 #line 868 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
@@ -3529,10 +3532,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3533 "util/configparser.c"
+#line 3536 "util/configparser.c"
     break;
 
-  case 312:
+  case 313:
 #line 877 "./util/configparser.y"
         {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
@@ -3541,10 +3544,10 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3545 "util/configparser.c"
+#line 3548 "util/configparser.c"
     break;
 
-  case 313:
+  case 314:
 #line 886 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
@@ -3553,30 +3556,30 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3557 "util/configparser.c"
+#line 3560 "util/configparser.c"
     break;
 
-  case 314:
+  case 315:
 #line 895 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3567 "util/configparser.c"
+#line 3570 "util/configparser.c"
     break;
 
-  case 315:
+  case 316:
 #line 902 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3577 "util/configparser.c"
+#line 3580 "util/configparser.c"
     break;
 
-  case 316:
+  case 317:
 #line 909 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
@@ -3585,20 +3588,20 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3589 "util/configparser.c"
+#line 3592 "util/configparser.c"
     break;
 
-  case 317:
+  case 318:
 #line 918 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3599 "util/configparser.c"
+#line 3602 "util/configparser.c"
     break;
 
-  case 318:
+  case 319:
 #line 925 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
@@ -3607,10 +3610,10 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3611 "util/configparser.c"
+#line 3614 "util/configparser.c"
     break;
 
-  case 319:
+  case 320:
 #line 934 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
@@ -3618,30 +3621,30 @@ yyreduce:
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3622 "util/configparser.c"
+#line 3625 "util/configparser.c"
     break;
 
-  case 320:
+  case 321:
 #line 942 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3632 "util/configparser.c"
+#line 3635 "util/configparser.c"
     break;
 
-  case 321:
+  case 322:
 #line 949 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3642 "util/configparser.c"
+#line 3645 "util/configparser.c"
     break;
 
-  case 322:
+  case 323:
 #line 956 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
@@ -3649,10 +3652,10 @@ yyreduce:
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3653 "util/configparser.c"
+#line 3656 "util/configparser.c"
     break;
 
-  case 323:
+  case 324:
 #line 964 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
@@ -3661,10 +3664,10 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3665 "util/configparser.c"
+#line 3668 "util/configparser.c"
     break;
 
-  case 324:
+  case 325:
 #line 973 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
@@ -3673,10 +3676,10 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3677 "util/configparser.c"
+#line 3680 "util/configparser.c"
     break;
 
-  case 325:
+  case 326:
 #line 982 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
@@ -3685,10 +3688,10 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3689 "util/configparser.c"
+#line 3692 "util/configparser.c"
     break;
 
-  case 326:
+  case 327:
 #line 991 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
@@ -3702,10 +3705,10 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3706 "util/configparser.c"
+#line 3709 "util/configparser.c"
     break;
 
-  case 327:
+  case 328:
 #line 1005 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
@@ -3714,10 +3717,10 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3718 "util/configparser.c"
+#line 3721 "util/configparser.c"
     break;
 
-  case 328:
+  case 329:
 #line 1014 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
@@ -3726,10 +3729,10 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3730 "util/configparser.c"
+#line 3733 "util/configparser.c"
     break;
 
-  case 329:
+  case 330:
 #line 1023 "./util/configparser.y"
   {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
@@ -3738,10 +3741,10 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3742 "util/configparser.c"
+#line 3745 "util/configparser.c"
     break;
 
-  case 330:
+  case 331:
 #line 1032 "./util/configparser.y"
   {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
@@ -3750,10 +3753,10 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3754 "util/configparser.c"
+#line 3757 "util/configparser.c"
     break;
 
-  case 331:
+  case 332:
 #line 1041 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
@@ -3762,10 +3765,10 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3766 "util/configparser.c"
+#line 3769 "util/configparser.c"
     break;
 
-  case 332:
+  case 333:
 #line 1050 "./util/configparser.y"
   {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
@@ -3774,30 +3777,30 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3778 "util/configparser.c"
+#line 3781 "util/configparser.c"
     break;
 
-  case 333:
+  case 334:
 #line 1059 "./util/configparser.y"
         {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3788 "util/configparser.c"
+#line 3791 "util/configparser.c"
     break;
 
-  case 334:
+  case 335:
 #line 1066 "./util/configparser.y"
         {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3798 "util/configparser.c"
+#line 3801 "util/configparser.c"
     break;
 
-  case 335:
+  case 336:
 #line 1073 "./util/configparser.y"
         {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
@@ -3823,10 +3826,10 @@ yyreduce:
 			}
 		}
 	}
-#line 3827 "util/configparser.c"
+#line 3830 "util/configparser.c"
     break;
 
-  case 336:
+  case 337:
 #line 1099 "./util/configparser.y"
         {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
@@ -3834,50 +3837,50 @@ yyreduce:
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3838 "util/configparser.c"
+#line 3841 "util/configparser.c"
     break;
 
-  case 337:
+  case 338:
 #line 1107 "./util/configparser.y"
         {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3848 "util/configparser.c"
+#line 3851 "util/configparser.c"
     break;
 
-  case 338:
+  case 339:
 #line 1114 "./util/configparser.y"
         {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3858 "util/configparser.c"
+#line 3861 "util/configparser.c"
     break;
 
-  case 339:
+  case 340:
 #line 1121 "./util/configparser.y"
         {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dlv_anchor_file);
 		cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
 	}
-#line 3868 "util/configparser.c"
+#line 3871 "util/configparser.c"
     break;
 
-  case 340:
+  case 341:
 #line 1128 "./util/configparser.y"
         {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3878 "util/configparser.c"
+#line 3881 "util/configparser.c"
     break;
 
-  case 341:
+  case 342:
 #line 1135 "./util/configparser.y"
         {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
@@ -3885,10 +3888,10 @@ yyreduce:
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3889 "util/configparser.c"
+#line 3892 "util/configparser.c"
     break;
 
-  case 342:
+  case 343:
 #line 1143 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
@@ -3896,10 +3899,10 @@ yyreduce:
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3900 "util/configparser.c"
+#line 3903 "util/configparser.c"
     break;
 
-  case 343:
+  case 344:
 #line 1151 "./util/configparser.y"
         {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
@@ -3907,20 +3910,20 @@ yyreduce:
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3911 "util/configparser.c"
+#line 3914 "util/configparser.c"
     break;
 
-  case 344:
+  case 345:
 #line 1159 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3921 "util/configparser.c"
+#line 3924 "util/configparser.c"
     break;
 
-  case 345:
+  case 346:
 #line 1166 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
@@ -3931,10 +3934,10 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3935 "util/configparser.c"
+#line 3938 "util/configparser.c"
     break;
 
-  case 346:
+  case 347:
 #line 1177 "./util/configparser.y"
         {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
@@ -3945,20 +3948,20 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3949 "util/configparser.c"
+#line 3952 "util/configparser.c"
     break;
 
-  case 347:
+  case 348:
 #line 1188 "./util/configparser.y"
         {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3959 "util/configparser.c"
+#line 3962 "util/configparser.c"
     break;
 
-  case 348:
+  case 349:
 #line 1195 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
@@ -3967,10 +3970,10 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3971 "util/configparser.c"
+#line 3974 "util/configparser.c"
     break;
 
-  case 349:
+  case 350:
 #line 1204 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
@@ -3979,10 +3982,10 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3983 "util/configparser.c"
+#line 3986 "util/configparser.c"
     break;
 
-  case 350:
+  case 351:
 #line 1213 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
@@ -3991,30 +3994,30 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3995 "util/configparser.c"
+#line 3998 "util/configparser.c"
     break;
 
-  case 351:
+  case 352:
 #line 1222 "./util/configparser.y"
         {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 4005 "util/configparser.c"
+#line 4008 "util/configparser.c"
     break;
 
-  case 352:
+  case 353:
 #line 1229 "./util/configparser.y"
         {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 4015 "util/configparser.c"
+#line 4018 "util/configparser.c"
     break;
 
-  case 353:
+  case 354:
 #line 1236 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
@@ -4022,10 +4025,10 @@ yyreduce:
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4026 "util/configparser.c"
+#line 4029 "util/configparser.c"
     break;
 
-  case 354:
+  case 355:
 #line 1244 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
@@ -4033,10 +4036,10 @@ yyreduce:
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4037 "util/configparser.c"
+#line 4040 "util/configparser.c"
     break;
 
-  case 355:
+  case 356:
 #line 1252 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
@@ -4046,10 +4049,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4050 "util/configparser.c"
+#line 4053 "util/configparser.c"
     break;
 
-  case 356:
+  case 357:
 #line 1262 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
@@ -4059,10 +4062,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4063 "util/configparser.c"
+#line 4066 "util/configparser.c"
     break;
 
-  case 357:
+  case 358:
 #line 1272 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
@@ -4072,10 +4075,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4076 "util/configparser.c"
+#line 4079 "util/configparser.c"
     break;
 
-  case 358:
+  case 359:
 #line 1282 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
@@ -4089,10 +4092,10 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4093 "util/configparser.c"
+#line 4096 "util/configparser.c"
     break;
 
-  case 359:
+  case 360:
 #line 1296 "./util/configparser.y"
         {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
@@ -4100,10 +4103,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4104 "util/configparser.c"
+#line 4107 "util/configparser.c"
     break;
 
-  case 360:
+  case 361:
 #line 1304 "./util/configparser.y"
         {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -4116,10 +4119,10 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4120 "util/configparser.c"
+#line 4123 "util/configparser.c"
     break;
 
-  case 361:
+  case 362:
 #line 1317 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -4130,10 +4133,10 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4134 "util/configparser.c"
+#line 4137 "util/configparser.c"
     break;
 
-  case 362:
+  case 363:
 #line 1328 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
@@ -4141,10 +4144,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4145 "util/configparser.c"
+#line 4148 "util/configparser.c"
     break;
 
-  case 363:
+  case 364:
 #line 1336 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -4157,10 +4160,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4161 "util/configparser.c"
+#line 4164 "util/configparser.c"
     break;
 
-  case 364:
+  case 365:
 #line 1349 "./util/configparser.y"
         {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
@@ -4169,10 +4172,10 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4173 "util/configparser.c"
+#line 4176 "util/configparser.c"
     break;
 
-  case 365:
+  case 366:
 #line 1358 "./util/configparser.y"
         {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
@@ -4181,10 +4184,10 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4185 "util/configparser.c"
+#line 4188 "util/configparser.c"
     break;
 
-  case 366:
+  case 367:
 #line 1367 "./util/configparser.y"
         {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
@@ -4193,10 +4196,10 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4197 "util/configparser.c"
+#line 4200 "util/configparser.c"
     break;
 
-  case 367:
+  case 368:
 #line 1376 "./util/configparser.y"
         {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
@@ -4206,10 +4209,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4210 "util/configparser.c"
+#line 4213 "util/configparser.c"
     break;
 
-  case 368:
+  case 369:
 #line 1386 "./util/configparser.y"
         {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
@@ -4219,10 +4222,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4223 "util/configparser.c"
+#line 4226 "util/configparser.c"
     break;
 
-  case 369:
+  case 370:
 #line 1396 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
@@ -4230,10 +4233,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4234 "util/configparser.c"
+#line 4237 "util/configparser.c"
     break;
 
-  case 370:
+  case 371:
 #line 1404 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -4246,10 +4249,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4250 "util/configparser.c"
+#line 4253 "util/configparser.c"
     break;
 
-  case 371:
+  case 372:
 #line 1417 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
@@ -4258,10 +4261,10 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4262 "util/configparser.c"
+#line 4265 "util/configparser.c"
     break;
 
-  case 372:
+  case 373:
 #line 1426 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
@@ -4269,10 +4272,10 @@ yyreduce:
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4273 "util/configparser.c"
+#line 4276 "util/configparser.c"
     break;
 
-  case 373:
+  case 374:
 #line 1434 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
@@ -4281,10 +4284,10 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4285 "util/configparser.c"
+#line 4288 "util/configparser.c"
     break;
 
-  case 374:
+  case 375:
 #line 1443 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
@@ -4292,10 +4295,10 @@ yyreduce:
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4296 "util/configparser.c"
+#line 4299 "util/configparser.c"
     break;
 
-  case 375:
+  case 376:
 #line 1451 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -4308,10 +4311,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4312 "util/configparser.c"
+#line 4315 "util/configparser.c"
     break;
 
-  case 376:
+  case 377:
 #line 1464 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
@@ -4320,20 +4323,20 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4324 "util/configparser.c"
+#line 4327 "util/configparser.c"
     break;
 
-  case 377:
+  case 378:
 #line 1473 "./util/configparser.y"
         {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4334 "util/configparser.c"
+#line 4337 "util/configparser.c"
     break;
 
-  case 378:
+  case 379:
 #line 1480 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
@@ -4343,10 +4346,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4347 "util/configparser.c"
+#line 4350 "util/configparser.c"
     break;
 
-  case 379:
+  case 380:
 #line 1490 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
@@ -4356,10 +4359,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4360 "util/configparser.c"
+#line 4363 "util/configparser.c"
     break;
 
-  case 380:
+  case 381:
 #line 1500 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
@@ -4369,10 +4372,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4373 "util/configparser.c"
+#line 4376 "util/configparser.c"
     break;
 
-  case 381:
+  case 382:
 #line 1510 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
@@ -4382,10 +4385,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4386 "util/configparser.c"
+#line 4389 "util/configparser.c"
     break;
 
-  case 382:
+  case 383:
 #line 1520 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
@@ -4395,10 +4398,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4399 "util/configparser.c"
+#line 4402 "util/configparser.c"
     break;
 
-  case 383:
+  case 384:
 #line 1530 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
@@ -4408,10 +4411,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4412 "util/configparser.c"
+#line 4415 "util/configparser.c"
     break;
 
-  case 384:
+  case 385:
 #line 1540 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
@@ -4421,10 +4424,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4425 "util/configparser.c"
+#line 4428 "util/configparser.c"
     break;
 
-  case 385:
+  case 386:
 #line 1550 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
@@ -4434,40 +4437,40 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4438 "util/configparser.c"
+#line 4441 "util/configparser.c"
     break;
 
-  case 386:
+  case 387:
 #line 1560 "./util/configparser.y"
         {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4448 "util/configparser.c"
+#line 4451 "util/configparser.c"
     break;
 
-  case 387:
+  case 388:
 #line 1567 "./util/configparser.y"
         {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4458 "util/configparser.c"
+#line 4461 "util/configparser.c"
     break;
 
-  case 388:
+  case 389:
 #line 1574 "./util/configparser.y"
         {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4468 "util/configparser.c"
+#line 4471 "util/configparser.c"
     break;
 
-  case 389:
+  case 390:
 #line 1581 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
@@ -4476,10 +4479,10 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4480 "util/configparser.c"
+#line 4483 "util/configparser.c"
     break;
 
-  case 390:
+  case 391:
 #line 1590 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
@@ -4488,10 +4491,10 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4492 "util/configparser.c"
+#line 4495 "util/configparser.c"
     break;
 
-  case 391:
+  case 392:
 #line 1599 "./util/configparser.y"
         {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
@@ -4500,10 +4503,10 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4504 "util/configparser.c"
+#line 4507 "util/configparser.c"
     break;
 
-  case 392:
+  case 393:
 #line 1608 "./util/configparser.y"
         {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
@@ -4512,20 +4515,20 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4516 "util/configparser.c"
+#line 4519 "util/configparser.c"
     break;
 
-  case 393:
+  case 394:
 #line 1617 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4526 "util/configparser.c"
+#line 4529 "util/configparser.c"
     break;
 
-  case 394:
+  case 395:
 #line 1624 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
@@ -4535,10 +4538,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4539 "util/configparser.c"
+#line 4542 "util/configparser.c"
     break;
 
-  case 395:
+  case 396:
 #line 1634 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -4558,20 +4561,20 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4562 "util/configparser.c"
+#line 4565 "util/configparser.c"
     break;
 
-  case 396:
+  case 397:
 #line 1654 "./util/configparser.y"
         {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4572 "util/configparser.c"
+#line 4575 "util/configparser.c"
     break;
 
-  case 397:
+  case 398:
 #line 1661 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
@@ -4589,10 +4592,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4593 "util/configparser.c"
+#line 4596 "util/configparser.c"
     break;
 
-  case 398:
+  case 399:
 #line 1679 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
@@ -4605,10 +4608,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4609 "util/configparser.c"
+#line 4612 "util/configparser.c"
     break;
 
-  case 399:
+  case 400:
 #line 1692 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
@@ -4621,10 +4624,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4625 "util/configparser.c"
+#line 4628 "util/configparser.c"
     break;
 
-  case 400:
+  case 401:
 #line 1705 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -4633,10 +4636,10 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4637 "util/configparser.c"
+#line 4640 "util/configparser.c"
     break;
 
-  case 401:
+  case 402:
 #line 1714 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
@@ -4645,10 +4648,10 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4649 "util/configparser.c"
+#line 4652 "util/configparser.c"
     break;
 
-  case 402:
+  case 403:
 #line 1723 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
@@ -4657,10 +4660,10 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4661 "util/configparser.c"
+#line 4664 "util/configparser.c"
     break;
 
-  case 403:
+  case 404:
 #line 1732 "./util/configparser.y"
         {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
@@ -4669,10 +4672,10 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4673 "util/configparser.c"
+#line 4676 "util/configparser.c"
     break;
 
-  case 404:
+  case 405:
 #line 1741 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
@@ -4682,10 +4685,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4686 "util/configparser.c"
+#line 4689 "util/configparser.c"
     break;
 
-  case 405:
+  case 406:
 #line 1751 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
@@ -4695,10 +4698,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4699 "util/configparser.c"
+#line 4702 "util/configparser.c"
     break;
 
-  case 406:
+  case 407:
 #line 1761 "./util/configparser.y"
         {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
@@ -4709,10 +4712,10 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4713 "util/configparser.c"
+#line 4716 "util/configparser.c"
     break;
 
-  case 407:
+  case 408:
 #line 1772 "./util/configparser.y"
         {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
@@ -4721,10 +4724,10 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4725 "util/configparser.c"
+#line 4728 "util/configparser.c"
     break;
 
-  case 408:
+  case 409:
 #line 1781 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
@@ -4733,10 +4736,10 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4737 "util/configparser.c"
+#line 4740 "util/configparser.c"
     break;
 
-  case 409:
+  case 410:
 #line 1790 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
@@ -4745,10 +4748,10 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4749 "util/configparser.c"
+#line 4752 "util/configparser.c"
     break;
 
-  case 410:
+  case 411:
 #line 1799 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
@@ -4757,10 +4760,10 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4761 "util/configparser.c"
+#line 4764 "util/configparser.c"
     break;
 
-  case 411:
+  case 412:
 #line 1808 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
@@ -4769,10 +4772,10 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4773 "util/configparser.c"
+#line 4776 "util/configparser.c"
     break;
 
-  case 412:
+  case 413:
 #line 1817 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
@@ -4781,10 +4784,10 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4785 "util/configparser.c"
+#line 4788 "util/configparser.c"
     break;
 
-  case 413:
+  case 414:
 #line 1826 "./util/configparser.y"
         {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
@@ -4797,10 +4800,10 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4801 "util/configparser.c"
+#line 4804 "util/configparser.c"
     break;
 
-  case 414:
+  case 415:
 #line 1839 "./util/configparser.y"
         {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
@@ -4813,10 +4816,10 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4817 "util/configparser.c"
+#line 4820 "util/configparser.c"
     break;
 
-  case 415:
+  case 416:
 #line 1852 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
@@ -4825,20 +4828,20 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4829 "util/configparser.c"
+#line 4832 "util/configparser.c"
     break;
 
-  case 416:
+  case 417:
 #line 1861 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4839 "util/configparser.c"
+#line 4842 "util/configparser.c"
     break;
 
-  case 417:
+  case 418:
 #line 1868 "./util/configparser.y"
         {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
@@ -4847,10 +4850,10 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4851 "util/configparser.c"
+#line 4854 "util/configparser.c"
     break;
 
-  case 418:
+  case 419:
 #line 1877 "./util/configparser.y"
         {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
@@ -4859,10 +4862,10 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4863 "util/configparser.c"
+#line 4866 "util/configparser.c"
     break;
 
-  case 419:
+  case 420:
 #line 1886 "./util/configparser.y"
         {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
@@ -4871,10 +4874,10 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4875 "util/configparser.c"
+#line 4878 "util/configparser.c"
     break;
 
-  case 420:
+  case 421:
 #line 1895 "./util/configparser.y"
         {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
@@ -4884,10 +4887,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4888 "util/configparser.c"
+#line 4891 "util/configparser.c"
     break;
 
-  case 421:
+  case 422:
 #line 1904 "./util/configparser.y"
         {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
@@ -4895,10 +4898,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4899 "util/configparser.c"
+#line 4902 "util/configparser.c"
     break;
 
-  case 422:
+  case 423:
 #line 1912 "./util/configparser.y"
         {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -4911,10 +4914,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4915 "util/configparser.c"
+#line 4918 "util/configparser.c"
     break;
 
-  case 423:
+  case 424:
 #line 1925 "./util/configparser.y"
         {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
@@ -4922,10 +4925,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4926 "util/configparser.c"
+#line 4929 "util/configparser.c"
     break;
 
-  case 424:
+  case 425:
 #line 1933 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -4966,20 +4969,20 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4970 "util/configparser.c"
+#line 4973 "util/configparser.c"
     break;
 
-  case 425:
+  case 426:
 #line 1974 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 4980 "util/configparser.c"
+#line 4983 "util/configparser.c"
     break;
 
-  case 426:
+  case 427:
 #line 1981 "./util/configparser.y"
         {
 		char* ptr;
@@ -4994,10 +4997,10 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4998 "util/configparser.c"
+#line 5001 "util/configparser.c"
     break;
 
-  case 427:
+  case 428:
 #line 1996 "./util/configparser.y"
         {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
@@ -5007,10 +5010,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5011 "util/configparser.c"
+#line 5014 "util/configparser.c"
     break;
 
-  case 428:
+  case 429:
 #line 2006 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
@@ -5020,40 +5023,40 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5024 "util/configparser.c"
+#line 5027 "util/configparser.c"
     break;
 
-  case 429:
+  case 430:
 #line 2016 "./util/configparser.y"
         {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5034 "util/configparser.c"
+#line 5037 "util/configparser.c"
     break;
 
-  case 430:
+  case 431:
 #line 2023 "./util/configparser.y"
         {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5044 "util/configparser.c"
+#line 5047 "util/configparser.c"
     break;
 
-  case 431:
+  case 432:
 #line 2030 "./util/configparser.y"
         {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 5054 "util/configparser.c"
+#line 5057 "util/configparser.c"
     break;
 
-  case 432:
+  case 433:
 #line 2037 "./util/configparser.y"
         {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
@@ -5062,10 +5065,10 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5066 "util/configparser.c"
+#line 5069 "util/configparser.c"
     break;
 
-  case 433:
+  case 434:
 #line 2046 "./util/configparser.y"
         {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
@@ -5073,10 +5076,10 @@ yyreduce:
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 5077 "util/configparser.c"
+#line 5080 "util/configparser.c"
     break;
 
-  case 434:
+  case 435:
 #line 2054 "./util/configparser.y"
         {
 		char* p, *s = (yyvsp[0].str);
@@ -5090,10 +5093,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5094 "util/configparser.c"
+#line 5097 "util/configparser.c"
     break;
 
-  case 435:
+  case 436:
 #line 2068 "./util/configparser.y"
         {
 		size_t len = 0;
@@ -5114,10 +5117,10 @@ yyreduce:
 			}
 		}
 	}
-#line 5118 "util/configparser.c"
+#line 5121 "util/configparser.c"
     break;
 
-  case 436:
+  case 437:
 #line 2089 "./util/configparser.y"
         {
 		size_t len = 0;
@@ -5138,10 +5141,10 @@ yyreduce:
 			}
 		}
 	}
-#line 5142 "util/configparser.c"
+#line 5145 "util/configparser.c"
     break;
 
-  case 437:
+  case 438:
 #line 2110 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5153,10 +5156,10 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5157 "util/configparser.c"
+#line 5160 "util/configparser.c"
     break;
 
-  case 438:
+  case 439:
 #line 2122 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5168,10 +5171,10 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5172 "util/configparser.c"
+#line 5175 "util/configparser.c"
     break;
 
-  case 439:
+  case 440:
 #line 2134 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5183,10 +5186,10 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5187 "util/configparser.c"
+#line 5190 "util/configparser.c"
     break;
 
-  case 440:
+  case 441:
 #line 2146 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5195,10 +5198,10 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5199 "util/configparser.c"
+#line 5202 "util/configparser.c"
     break;
 
-  case 441:
+  case 442:
 #line 2155 "./util/configparser.y"
         {
 		size_t len = 0;
@@ -5219,10 +5222,10 @@ yyreduce:
 			}
 		}
 	}
-#line 5223 "util/configparser.c"
+#line 5226 "util/configparser.c"
     break;
 
-  case 442:
+  case 443:
 #line 2176 "./util/configparser.y"
         { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
@@ -5231,10 +5234,10 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5235 "util/configparser.c"
+#line 5238 "util/configparser.c"
     break;
 
-  case 443:
+  case 444:
 #line 2186 "./util/configparser.y"
         { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
@@ -5243,10 +5246,10 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5247 "util/configparser.c"
+#line 5250 "util/configparser.c"
     break;
 
-  case 444:
+  case 445:
 #line 2195 "./util/configparser.y"
   {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
@@ -5254,10 +5257,10 @@ yyreduce:
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5258 "util/configparser.c"
+#line 5261 "util/configparser.c"
     break;
 
-  case 445:
+  case 446:
 #line 2203 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
@@ -5265,10 +5268,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5269 "util/configparser.c"
+#line 5272 "util/configparser.c"
     break;
 
-  case 446:
+  case 447:
 #line 2211 "./util/configparser.y"
   {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
@@ -5281,10 +5284,10 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5285 "util/configparser.c"
+#line 5288 "util/configparser.c"
     break;
 
-  case 447:
+  case 448:
 #line 2224 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
@@ -5297,10 +5300,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5301 "util/configparser.c"
+#line 5304 "util/configparser.c"
     break;
 
-  case 448:
+  case 449:
 #line 2237 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5315,10 +5318,10 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5319 "util/configparser.c"
+#line 5322 "util/configparser.c"
     break;
 
-  case 449:
+  case 450:
 #line 2252 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5333,10 +5336,10 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5337 "util/configparser.c"
+#line 5340 "util/configparser.c"
     break;
 
-  case 450:
+  case 451:
 #line 2267 "./util/configparser.y"
   { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
@@ -5345,10 +5348,10 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5349 "util/configparser.c"
+#line 5352 "util/configparser.c"
     break;
 
-  case 451:
+  case 452:
 #line 2276 "./util/configparser.y"
         { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
@@ -5357,19 +5360,19 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5361 "util/configparser.c"
+#line 5364 "util/configparser.c"
     break;
 
-  case 452:
+  case 453:
 #line 2285 "./util/configparser.y"
         { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5370 "util/configparser.c"
+#line 5373 "util/configparser.c"
     break;
 
-  case 453:
+  case 454:
 #line 2291 "./util/configparser.y"
         { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
@@ -5378,10 +5381,10 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5382 "util/configparser.c"
+#line 5385 "util/configparser.c"
     break;
 
-  case 454:
+  case 455:
 #line 2300 "./util/configparser.y"
         { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
@@ -5390,10 +5393,10 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5394 "util/configparser.c"
+#line 5397 "util/configparser.c"
     break;
 
-  case 455:
+  case 456:
 #line 2309 "./util/configparser.y"
         {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
@@ -5403,10 +5406,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5407 "util/configparser.c"
+#line 5410 "util/configparser.c"
     break;
 
-  case 456:
+  case 457:
 #line 2319 "./util/configparser.y"
         {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
@@ -5416,10 +5419,10 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5420 "util/configparser.c"
+#line 5423 "util/configparser.c"
     break;
 
-  case 457:
+  case 458:
 #line 2329 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
@@ -5432,10 +5435,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5436 "util/configparser.c"
+#line 5439 "util/configparser.c"
     break;
 
-  case 458:
+  case 459:
 #line 2342 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
@@ -5448,10 +5451,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5452 "util/configparser.c"
+#line 5455 "util/configparser.c"
     break;
 
-  case 459:
+  case 460:
 #line 2355 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
@@ -5463,10 +5466,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5467 "util/configparser.c"
+#line 5470 "util/configparser.c"
     break;
 
-  case 460:
+  case 461:
 #line 2367 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
@@ -5480,10 +5483,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5484 "util/configparser.c"
+#line 5487 "util/configparser.c"
     break;
 
-  case 461:
+  case 462:
 #line 2381 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
@@ -5495,10 +5498,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5499 "util/configparser.c"
+#line 5502 "util/configparser.c"
     break;
 
-  case 462:
+  case 463:
 #line 2393 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
@@ -5512,11 +5515,29 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5516 "util/configparser.c"
+#line 5519 "util/configparser.c"
     break;
 
-  case 463:
+  case 464:
 #line 2407 "./util/configparser.y"
+        {
+		int tag_data;
+		OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+		tag_data = atoi((yyvsp[0].str));
+		if(tag_data > 65535 || tag_data < 0 ||
+			(tag_data == 0 && (strlen((yyvsp[0].str)) != 1 || (yyvsp[0].str)[0] != '0')))
+			yyerror("edns-client-tag data invalid, needs to be a "
+				"number from 0 to 65535");
+		if(!cfg_str2list_insert(
+			&cfg_parser->cfg->edns_client_tags, (yyvsp[-1].str), (yyvsp[0].str)))
+			fatal_exit("out of memory adding "
+				"edns-client-tag");
+	}
+#line 5537 "util/configparser.c"
+    break;
+
+  case 465:
+#line 2422 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5525,31 +5546,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5529 "util/configparser.c"
+#line 5550 "util/configparser.c"
     break;
 
-  case 464:
-#line 2417 "./util/configparser.y"
+  case 466:
+#line 2432 "./util/configparser.y"
         {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5539 "util/configparser.c"
+#line 5560 "util/configparser.c"
     break;
 
-  case 465:
-#line 2424 "./util/configparser.y"
+  case 467:
+#line 2439 "./util/configparser.y"
         {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5549 "util/configparser.c"
+#line 5570 "util/configparser.c"
     break;
 
-  case 466:
-#line 2431 "./util/configparser.y"
+  case 468:
+#line 2446 "./util/configparser.y"
         {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5557,11 +5578,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5561 "util/configparser.c"
+#line 5582 "util/configparser.c"
     break;
 
-  case 467:
-#line 2440 "./util/configparser.y"
+  case 469:
+#line 2455 "./util/configparser.y"
         {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5569,11 +5590,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5573 "util/configparser.c"
+#line 5594 "util/configparser.c"
     break;
 
-  case 468:
-#line 2449 "./util/configparser.y"
+  case 470:
+#line 2464 "./util/configparser.y"
         {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5582,11 +5603,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5586 "util/configparser.c"
+#line 5607 "util/configparser.c"
     break;
 
-  case 469:
-#line 2459 "./util/configparser.y"
+  case 471:
+#line 2474 "./util/configparser.y"
         {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5595,11 +5616,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5599 "util/configparser.c"
+#line 5620 "util/configparser.c"
     break;
 
-  case 470:
-#line 2469 "./util/configparser.y"
+  case 472:
+#line 2484 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5608,31 +5629,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5612 "util/configparser.c"
+#line 5633 "util/configparser.c"
     break;
 
-  case 471:
-#line 2479 "./util/configparser.y"
+  case 473:
+#line 2494 "./util/configparser.y"
         {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5622 "util/configparser.c"
+#line 5643 "util/configparser.c"
     break;
 
-  case 472:
-#line 2486 "./util/configparser.y"
+  case 474:
+#line 2501 "./util/configparser.y"
         {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5632 "util/configparser.c"
+#line 5653 "util/configparser.c"
     break;
 
-  case 473:
-#line 2493 "./util/configparser.y"
+  case 475:
+#line 2508 "./util/configparser.y"
         {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5640,11 +5661,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5644 "util/configparser.c"
+#line 5665 "util/configparser.c"
     break;
 
-  case 474:
-#line 2502 "./util/configparser.y"
+  case 476:
+#line 2517 "./util/configparser.y"
         {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5652,11 +5673,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5656 "util/configparser.c"
+#line 5677 "util/configparser.c"
     break;
 
-  case 475:
-#line 2511 "./util/configparser.y"
+  case 477:
+#line 2526 "./util/configparser.y"
         {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5665,11 +5686,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5669 "util/configparser.c"
+#line 5690 "util/configparser.c"
     break;
 
-  case 476:
-#line 2521 "./util/configparser.y"
+  case 478:
+#line 2536 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5678,45 +5699,24 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5682 "util/configparser.c"
+#line 5703 "util/configparser.c"
     break;
 
-  case 477:
-#line 2531 "./util/configparser.y"
+  case 479:
+#line 2546 "./util/configparser.y"
         {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5692 "util/configparser.c"
-    break;
-
-  case 478:
-#line 2538 "./util/configparser.y"
-        {
-		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
-			yyerror("out of memory");
-	}
-#line 5702 "util/configparser.c"
-    break;
-
-  case 479:
-#line 2545 "./util/configparser.y"
-        {
-		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
-			yyerror("out of memory");
-	}
-#line 5712 "util/configparser.c"
+#line 5713 "util/configparser.c"
     break;
 
   case 480:
-#line 2552 "./util/configparser.y"
+#line 2553 "./util/configparser.y"
         {
-		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
-			(yyvsp[0].str)))
+		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
 #line 5723 "util/configparser.c"
@@ -5724,6 +5724,27 @@ yyreduce:
 
   case 481:
 #line 2560 "./util/configparser.y"
+        {
+		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
+			yyerror("out of memory");
+	}
+#line 5733 "util/configparser.c"
+    break;
+
+  case 482:
+#line 2567 "./util/configparser.y"
+        {
+		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
+			(yyvsp[0].str)))
+			yyerror("out of memory");
+	}
+#line 5744 "util/configparser.c"
+    break;
+
+  case 483:
+#line 2575 "./util/configparser.y"
         {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5732,11 +5753,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5736 "util/configparser.c"
+#line 5757 "util/configparser.c"
     break;
 
-  case 482:
-#line 2570 "./util/configparser.y"
+  case 484:
+#line 2585 "./util/configparser.y"
         {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5745,11 +5766,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5749 "util/configparser.c"
+#line 5770 "util/configparser.c"
     break;
 
-  case 483:
-#line 2580 "./util/configparser.y"
+  case 485:
+#line 2595 "./util/configparser.y"
         {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5758,11 +5779,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5762 "util/configparser.c"
+#line 5783 "util/configparser.c"
     break;
 
-  case 484:
-#line 2590 "./util/configparser.y"
+  case 486:
+#line 2605 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5771,11 +5792,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5775 "util/configparser.c"
+#line 5796 "util/configparser.c"
     break;
 
-  case 485:
-#line 2600 "./util/configparser.y"
+  case 487:
+#line 2615 "./util/configparser.y"
         {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5813,11 +5834,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5817 "util/configparser.c"
+#line 5838 "util/configparser.c"
     break;
 
-  case 486:
-#line 2639 "./util/configparser.y"
+  case 488:
+#line 2654 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5826,33 +5847,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5830 "util/configparser.c"
+#line 5851 "util/configparser.c"
     break;
 
-  case 487:
-#line 2649 "./util/configparser.y"
+  case 489:
+#line 2664 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5841 "util/configparser.c"
+#line 5862 "util/configparser.c"
     break;
 
-  case 488:
-#line 2657 "./util/configparser.y"
+  case 490:
+#line 2672 "./util/configparser.y"
         {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5852 "util/configparser.c"
+#line 5873 "util/configparser.c"
     break;
 
-  case 489:
-#line 2665 "./util/configparser.y"
+  case 491:
+#line 2680 "./util/configparser.y"
         {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5866,11 +5887,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5870 "util/configparser.c"
+#line 5891 "util/configparser.c"
     break;
 
-  case 490:
-#line 2680 "./util/configparser.y"
+  case 492:
+#line 2695 "./util/configparser.y"
         {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5878,19 +5899,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5882 "util/configparser.c"
+#line 5903 "util/configparser.c"
     break;
 
-  case 491:
-#line 2689 "./util/configparser.y"
+  case 493:
+#line 2704 "./util/configparser.y"
         { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5890 "util/configparser.c"
+#line 5911 "util/configparser.c"
     break;
 
-  case 502:
-#line 2700 "./util/configparser.y"
+  case 504:
+#line 2715 "./util/configparser.y"
         {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5899,11 +5920,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5903 "util/configparser.c"
+#line 5924 "util/configparser.c"
     break;
 
-  case 503:
-#line 2710 "./util/configparser.y"
+  case 505:
+#line 2725 "./util/configparser.y"
         {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5911,79 +5932,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5915 "util/configparser.c"
+#line 5936 "util/configparser.c"
     break;
 
-  case 504:
-#line 2719 "./util/configparser.y"
+  case 506:
+#line 2734 "./util/configparser.y"
         {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5925 "util/configparser.c"
+#line 5946 "util/configparser.c"
     break;
 
-  case 505:
-#line 2726 "./util/configparser.y"
+  case 507:
+#line 2741 "./util/configparser.y"
         {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5935 "util/configparser.c"
+#line 5956 "util/configparser.c"
     break;
 
-  case 506:
-#line 2733 "./util/configparser.y"
+  case 508:
+#line 2748 "./util/configparser.y"
         {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 5945 "util/configparser.c"
+#line 5966 "util/configparser.c"
     break;
 
-  case 507:
-#line 2740 "./util/configparser.y"
+  case 509:
+#line 2755 "./util/configparser.y"
         {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 5955 "util/configparser.c"
+#line 5976 "util/configparser.c"
     break;
 
-  case 508:
-#line 2747 "./util/configparser.y"
+  case 510:
+#line 2762 "./util/configparser.y"
         {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 5965 "util/configparser.c"
+#line 5986 "util/configparser.c"
     break;
 
-  case 509:
-#line 2754 "./util/configparser.y"
+  case 511:
+#line 2769 "./util/configparser.y"
         {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 5975 "util/configparser.c"
+#line 5996 "util/configparser.c"
     break;
 
-  case 510:
-#line 2761 "./util/configparser.y"
+  case 512:
+#line 2776 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 5983 "util/configparser.c"
+#line 6004 "util/configparser.c"
     break;
 
-  case 532:
-#line 2781 "./util/configparser.y"
+  case 534:
+#line 2796 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5991,11 +6012,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5995 "util/configparser.c"
+#line 6016 "util/configparser.c"
     break;
 
-  case 533:
-#line 2790 "./util/configparser.y"
+  case 535:
+#line 2805 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6004,31 +6025,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6008 "util/configparser.c"
+#line 6029 "util/configparser.c"
     break;
 
-  case 534:
-#line 2800 "./util/configparser.y"
+  case 536:
+#line 2815 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 6018 "util/configparser.c"
+#line 6039 "util/configparser.c"
     break;
 
-  case 535:
-#line 2807 "./util/configparser.y"
+  case 537:
+#line 2822 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 6028 "util/configparser.c"
+#line 6049 "util/configparser.c"
     break;
 
-  case 536:
-#line 2814 "./util/configparser.y"
+  case 538:
+#line 2829 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6036,51 +6057,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6040 "util/configparser.c"
+#line 6061 "util/configparser.c"
     break;
 
-  case 537:
-#line 2823 "./util/configparser.y"
+  case 539:
+#line 2838 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 6050 "util/configparser.c"
+#line 6071 "util/configparser.c"
     break;
 
-  case 538:
-#line 2830 "./util/configparser.y"
+  case 540:
+#line 2845 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 6060 "util/configparser.c"
+#line 6081 "util/configparser.c"
     break;
 
-  case 539:
-#line 2837 "./util/configparser.y"
+  case 541:
+#line 2852 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 6070 "util/configparser.c"
+#line 6091 "util/configparser.c"
     break;
 
-  case 540:
-#line 2844 "./util/configparser.y"
+  case 542:
+#line 2859 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 6080 "util/configparser.c"
+#line 6101 "util/configparser.c"
     break;
 
-  case 541:
-#line 2851 "./util/configparser.y"
+  case 543:
+#line 2866 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6088,11 +6109,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6092 "util/configparser.c"
+#line 6113 "util/configparser.c"
     break;
 
-  case 542:
-#line 2860 "./util/configparser.y"
+  case 544:
+#line 2875 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6100,31 +6121,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6104 "util/configparser.c"
+#line 6125 "util/configparser.c"
     break;
 
-  case 543:
-#line 2869 "./util/configparser.y"
+  case 545:
+#line 2884 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6114 "util/configparser.c"
+#line 6135 "util/configparser.c"
     break;
 
-  case 544:
-#line 2876 "./util/configparser.y"
+  case 546:
+#line 2891 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6124 "util/configparser.c"
+#line 6145 "util/configparser.c"
     break;
 
-  case 545:
-#line 2883 "./util/configparser.y"
+  case 547:
+#line 2898 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6133,11 +6154,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6137 "util/configparser.c"
+#line 6158 "util/configparser.c"
     break;
 
-  case 546:
-#line 2893 "./util/configparser.y"
+  case 548:
+#line 2908 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6146,11 +6167,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6150 "util/configparser.c"
+#line 6171 "util/configparser.c"
     break;
 
-  case 547:
-#line 2903 "./util/configparser.y"
+  case 549:
+#line 2918 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6159,11 +6180,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6163 "util/configparser.c"
+#line 6184 "util/configparser.c"
     break;
 
-  case 548:
-#line 2913 "./util/configparser.y"
+  case 550:
+#line 2928 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6172,11 +6193,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6176 "util/configparser.c"
+#line 6197 "util/configparser.c"
     break;
 
-  case 549:
-#line 2923 "./util/configparser.y"
+  case 551:
+#line 2938 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6185,11 +6206,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6189 "util/configparser.c"
+#line 6210 "util/configparser.c"
     break;
 
-  case 550:
-#line 2933 "./util/configparser.y"
+  case 552:
+#line 2948 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6198,47 +6219,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6202 "util/configparser.c"
+#line 6223 "util/configparser.c"
     break;
 
-  case 551:
-#line 2943 "./util/configparser.y"
+  case 553:
+#line 2958 "./util/configparser.y"
         { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6210 "util/configparser.c"
+#line 6231 "util/configparser.c"
     break;
 
-  case 555:
-#line 2952 "./util/configparser.y"
+  case 557:
+#line 2967 "./util/configparser.y"
         {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6220 "util/configparser.c"
+#line 6241 "util/configparser.c"
     break;
 
-  case 556:
-#line 2958 "./util/configparser.y"
+  case 558:
+#line 2973 "./util/configparser.y"
         { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6228 "util/configparser.c"
+#line 6249 "util/configparser.c"
     break;
 
-  case 560:
-#line 2967 "./util/configparser.y"
+  case 562:
+#line 2982 "./util/configparser.y"
         {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6238 "util/configparser.c"
+#line 6259 "util/configparser.c"
     break;
 
-  case 561:
-#line 2973 "./util/configparser.y"
+  case 563:
+#line 2988 "./util/configparser.y"
         {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6247,21 +6268,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6251 "util/configparser.c"
+#line 6272 "util/configparser.c"
     break;
 
-  case 562:
-#line 2983 "./util/configparser.y"
+  case 564:
+#line 2998 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6261 "util/configparser.c"
+#line 6282 "util/configparser.c"
     break;
 
-  case 563:
-#line 2990 "./util/configparser.y"
+  case 565:
+#line 3005 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6269,30 +6290,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6273 "util/configparser.c"
+#line 6294 "util/configparser.c"
     break;
 
-  case 564:
-#line 2999 "./util/configparser.y"
+  case 566:
+#line 3014 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6284 "util/configparser.c"
+#line 6305 "util/configparser.c"
     break;
 
-  case 565:
-#line 3007 "./util/configparser.y"
+  case 567:
+#line 3022 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6292 "util/configparser.c"
+#line 6313 "util/configparser.c"
     break;
 
-  case 578:
-#line 3023 "./util/configparser.y"
+  case 580:
+#line 3038 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6300,11 +6321,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6304 "util/configparser.c"
+#line 6325 "util/configparser.c"
     break;
 
-  case 579:
-#line 3033 "./util/configparser.y"
+  case 581:
+#line 3048 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6312,21 +6333,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6316 "util/configparser.c"
+#line 6337 "util/configparser.c"
     break;
 
-  case 580:
-#line 3042 "./util/configparser.y"
+  case 582:
+#line 3057 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6326 "util/configparser.c"
+#line 6347 "util/configparser.c"
     break;
 
-  case 581:
-#line 3049 "./util/configparser.y"
+  case 583:
+#line 3064 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6334,21 +6355,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6338 "util/configparser.c"
+#line 6359 "util/configparser.c"
     break;
 
-  case 582:
-#line 3058 "./util/configparser.y"
+  case 584:
+#line 3073 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6348 "util/configparser.c"
+#line 6369 "util/configparser.c"
     break;
 
-  case 583:
-#line 3065 "./util/configparser.y"
+  case 585:
+#line 3080 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6356,22 +6377,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6360 "util/configparser.c"
+#line 6381 "util/configparser.c"
     break;
 
-  case 584:
-#line 3074 "./util/configparser.y"
+  case 586:
+#line 3089 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6371 "util/configparser.c"
+#line 6392 "util/configparser.c"
     break;
 
-  case 585:
-#line 3082 "./util/configparser.y"
+  case 587:
+#line 3097 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6383,22 +6404,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6387 "util/configparser.c"
+#line 6408 "util/configparser.c"
     break;
 
-  case 586:
-#line 3095 "./util/configparser.y"
+  case 588:
+#line 3110 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6398 "util/configparser.c"
+#line 6419 "util/configparser.c"
     break;
 
-  case 587:
-#line 3103 "./util/configparser.y"
+  case 589:
+#line 3118 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6410,19 +6431,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6414 "util/configparser.c"
+#line 6435 "util/configparser.c"
     break;
 
-  case 588:
-#line 3116 "./util/configparser.y"
+  case 590:
+#line 3131 "./util/configparser.y"
         {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6422 "util/configparser.c"
+#line 6443 "util/configparser.c"
     break;
 
-  case 597:
-#line 3127 "./util/configparser.y"
+  case 599:
+#line 3142 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6433,11 +6454,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6437 "util/configparser.c"
+#line 6458 "util/configparser.c"
     break;
 
-  case 598:
-#line 3139 "./util/configparser.y"
+  case 600:
+#line 3154 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6448,11 +6469,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6452 "util/configparser.c"
+#line 6473 "util/configparser.c"
     break;
 
-  case 599:
-#line 3151 "./util/configparser.y"
+  case 601:
+#line 3166 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6463,11 +6484,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6467 "util/configparser.c"
+#line 6488 "util/configparser.c"
     break;
 
-  case 600:
-#line 3163 "./util/configparser.y"
+  case 602:
+#line 3178 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6481,11 +6502,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6485 "util/configparser.c"
+#line 6506 "util/configparser.c"
     break;
 
-  case 601:
-#line 3178 "./util/configparser.y"
+  case 603:
+#line 3193 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6497,11 +6518,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6501 "util/configparser.c"
+#line 6522 "util/configparser.c"
     break;
 
-  case 602:
-#line 3191 "./util/configparser.y"
+  case 604:
+#line 3206 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6513,11 +6534,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6517 "util/configparser.c"
+#line 6538 "util/configparser.c"
     break;
 
-  case 603:
-#line 3204 "./util/configparser.y"
+  case 605:
+#line 3219 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6527,19 +6548,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6531 "util/configparser.c"
+#line 6552 "util/configparser.c"
     break;
 
-  case 604:
-#line 3215 "./util/configparser.y"
+  case 606:
+#line 3230 "./util/configparser.y"
                 {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6539 "util/configparser.c"
+#line 6560 "util/configparser.c"
     break;
 
-  case 609:
-#line 3224 "./util/configparser.y"
+  case 611:
+#line 3239 "./util/configparser.y"
                 {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6553,11 +6574,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6557 "util/configparser.c"
+#line 6578 "util/configparser.c"
     break;
 
-  case 610:
-#line 3239 "./util/configparser.y"
+  case 612:
+#line 3254 "./util/configparser.y"
         {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6571,11 +6592,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6575 "util/configparser.c"
+#line 6596 "util/configparser.c"
     break;
 
 
-#line 6579 "util/configparser.c"
+#line 6600 "util/configparser.c"
 
       default: break;
     }
@@ -6794,7 +6815,7 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
+                  yystos[+*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -6807,7 +6828,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3253 "./util/configparser.y"
+#line 3268 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 2a86ce512..2083891f9 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.  */
+/* A Bison parser, made by GNU Bison 3.5.1.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -337,7 +337,8 @@ extern int yydebug;
     VAR_RPZ_LOG = 543,
     VAR_RPZ_LOG_NAME = 544,
     VAR_DYNLIB = 545,
-    VAR_DYNLIB_FILE = 546
+    VAR_DYNLIB_FILE = 546,
+    VAR_EDNS_CLIENT_TAG = 547
   };
 #endif
 /* Tokens.  */
@@ -630,6 +631,7 @@ extern int yydebug;
 #define VAR_RPZ_LOG_NAME 544
 #define VAR_DYNLIB 545
 #define VAR_DYNLIB_FILE 546
+#define VAR_EDNS_CLIENT_TAG 547
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -639,7 +641,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 643 "util/configparser.h"
+#line 645 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index fe600a999..1d0e86580 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -175,7 +175,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_IPSET VAR_IPSET_NAME_V4 VAR_IPSET_NAME_V6
 %token VAR_TLS_SESSION_TICKET_KEYS VAR_RPZ VAR_TAGS VAR_RPZ_ACTION_OVERRIDE
 %token VAR_RPZ_CNAME_OVERRIDE VAR_RPZ_LOG VAR_RPZ_LOG_NAME
-%token VAR_DYNLIB VAR_DYNLIB_FILE
+%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_TAG
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -285,7 +285,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_unknown_server_time_limit | server_log_tag_queryreply |
 	server_stream_wait_size | server_tls_ciphers |
 	server_tls_ciphersuites | server_tls_session_ticket_keys |
-	server_tls_use_sni
+	server_tls_use_sni | server_edns_client_tag
 	;
 stubstart: VAR_STUB_ZONE
 	{
@@ -2403,6 +2403,21 @@ server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG
 	#endif
 	}
 	;
+server_edns_client_tag: VAR_EDNS_CLIENT_TAG STRING_ARG STRING_ARG
+	{
+		int tag_data;
+		OUTYY(("P(server_edns_client_tag:%s %s)\n", $2, $3));
+		tag_data = atoi($3);
+		if(tag_data > 65535 || tag_data < 0 ||
+			(tag_data == 0 && (strlen($3) != 1 || $3[0] != '0')))
+			yyerror("edns-client-tag data invalid, needs to be a "
+				"number from 0 to 65535");
+		if(!cfg_str2list_insert(
+			&cfg_parser->cfg->edns_client_tags, $2, $3))
+			fatal_exit("out of memory adding "
+				"edns-client-tag");
+	}
+	;
 stub_name: VAR_NAME STRING_ARG
 	{
 		OUTYY(("P(name:%s)\n", $2));
diff --git a/util/edns.c b/util/edns.c
index 0ab00cf7c..341b7f90a 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -75,6 +75,7 @@ int edns_tags_apply_cfg(struct edns_tags* edns_tags,
 
 	/* TODO walk over config, create and insert node. */
 
+	addr_tree_init_parents(&edns_tags->client_tags);
 	return 1;
 }
 

From 2fe398f4bf04dbb66b4224c72e61d916a3948990 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Fri, 24 Jul 2020 16:00:13 +0200
Subject: [PATCH 014/108] EDNS client tags - insert configured tags into tree

---
 services/outside_network.c |  2 +-
 util/edns.c                | 44 +++++++++++++++++++++++++++++++++++---
 util/edns.h                |  2 +-
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index b7ac5ef60..67eca05ed 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -2118,7 +2118,7 @@ outnet_serviced_query(struct outside_network* outnet,
 		qstate, qstate->region))
 			return NULL;
 
-	if((client_tag_addr = edns_tag_addr_lookup(env->edns_tags->client_tags,
+	if((client_tag_addr = edns_tag_addr_lookup(&env->edns_tags->client_tags,
 		addr, addrlen))) {
 		uint16_t client_tag = htons(client_tag_addr->tag_data);
 		edns_opt_list_append(&qstate->edns_opts_back_out,
diff --git a/util/edns.c b/util/edns.c
index 341b7f90a..db33212c0 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -43,6 +43,7 @@
 #include "util/edns.h"
 #include "util/config_file.h"
 #include "util/netevent.h"
+#include "util/net_help.h"
 #include "util/regional.h"
 #include "util/data/msgparse.h"
 #include "util/data/msgreply.h"
@@ -67,23 +68,60 @@ void edns_tags_delete(struct edns_tags* edns_tags)
 	free(edns_tags);
 }
 
+static int
+edns_tags_client_insert(struct edns_tags* edns_tags,
+	struct sockaddr_storage* addr, socklen_t addrlen, int net,
+	uint16_t tag_data)
+{
+	struct edns_tag_addr* eta = regional_alloc_zero(edns_tags->region,
+		sizeof(struct edns_tag_addr));
+	if(!eta)
+		return 0;
+	eta->tag_data = tag_data;
+	if(!addr_tree_insert(&edns_tags->client_tags, &eta->node, addr, addrlen,
+		net)) {
+		verbose(VERB_QUERY, "duplicate EDNS client tag ignored.");
+	}
+	return 1;
+}
+
 int edns_tags_apply_cfg(struct edns_tags* edns_tags,
 	struct config_file* config)
 {
+	struct config_str2list* c;
 	regional_free_all(edns_tags->region);
 	addr_tree_init(&edns_tags->client_tags);
 
-	/* TODO walk over config, create and insert node. */
+	for(c=config->edns_client_tags; c; c=c->next) {
+		struct sockaddr_storage addr;
+		socklen_t addrlen;
+		int net;
+		uint16_t tag_data;
+		log_assert(c->str && c->str2);
+
+		if(!netblockstrtoaddr(c->str, UNBOUND_DNS_PORT, &addr, &addrlen,
+			&net)) {
+			log_err("cannot parse EDNS client tag IP netblock: %s",
+				c->str);
+			return 0;
+		}
+		tag_data = atoi(c->str2); /* validated in config parser */
+		if(!edns_tags_client_insert(edns_tags, &addr, addrlen, net,
+			tag_data)) {
+			log_err("out of memory while adding EDNS tags");
+			return 0;
+		}
+	}
 
 	addr_tree_init_parents(&edns_tags->client_tags);
 	return 1;
 }
 
 struct edns_tag_addr*
-edns_tag_addr_lookup(rbtree_type tree, struct sockaddr_storage* addr,
+edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr,
 	socklen_t addrlen)
 {
-	return (struct edns_tag_addr*)addr_tree_lookup(&tree, addr, addrlen);
+	return (struct edns_tag_addr*)addr_tree_lookup(tree, addr, addrlen);
 }
 
 static int edns_keepalive(struct edns_data* edns_out, struct edns_data* edns_in,
diff --git a/util/edns.h b/util/edns.h
index 310ba1cd2..ee0e3de54 100644
--- a/util/edns.h
+++ b/util/edns.h
@@ -99,7 +99,7 @@ int edns_tags_apply_cfg(struct edns_tags* edns_tags,
  * @return: matching tree node, NULL otherwise
  */
 struct edns_tag_addr*
-edns_tag_addr_lookup(rbtree_type tree, struct sockaddr_storage* addr,
+edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr,
 	socklen_t addrlen);
 
 /**

From fa892b2456020b41a7e077cdd4ea5b3e8f2d201d Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 27 Jul 2020 15:54:43 +0200
Subject: [PATCH 015/108] - Add EDNS client tag test

---
 testcode/fake_event.c        |  14 +++-
 testdata/edns_client_tag.rpl | 151 +++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 2 deletions(-)
 create mode 100644 testdata/edns_client_tag.rpl

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index d89eedce8..59df27f57 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -52,6 +52,7 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgencode.h"
 #include "util/data/dname.h"
+#include "util/edns.h"
 #include "util/config_file.h"
 #include "services/listen_dnsport.h"
 #include "services/outside_network.h"
@@ -1180,7 +1181,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 	socklen_t addrlen, uint8_t* zone, size_t zonelen,
 	struct module_qstate* qstate, comm_point_callback_type* callback,
 	void* callback_arg, sldns_buffer* ATTR_UNUSED(buff),
-	struct module_env* ATTR_UNUSED(env))
+	struct module_env* env)
 {
 	struct replay_runtime* runtime = (struct replay_runtime*)outnet->base;
 	struct fake_pending* pend = (struct fake_pending*)calloc(1,
@@ -1209,6 +1210,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 	sldns_buffer_flip(pend->buffer);
 	if(1) {
 		struct edns_data edns;
+		struct edns_tag_addr* client_tag_addr;
 		if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen,
 			zone, zonelen, qstate, qstate->region)) {
 			free(pend);
@@ -1220,9 +1222,17 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 		edns.edns_version = EDNS_ADVERTISED_VERSION;
 		edns.udp_size = EDNS_ADVERTISED_SIZE;
 		edns.bits = 0;
-		edns.opt_list = qstate->edns_opts_back_out;
 		if(dnssec)
 			edns.bits = EDNS_DO;
+		if((client_tag_addr = edns_tag_addr_lookup(
+			&env->edns_tags->client_tags,
+			addr, addrlen))) {
+			uint16_t client_tag = htons(client_tag_addr->tag_data);
+			edns_opt_list_append(&qstate->edns_opts_back_out,
+				LDNS_EDNS_CLIENT_TAG, 2,
+				(uint8_t*)&client_tag, qstate->region);
+		}
+		edns.opt_list = qstate->edns_opts_back_out;
 		attach_edns_record(pend->buffer, &edns);
 	}
 	memcpy(&pend->addr, addr, addrlen);
diff --git a/testdata/edns_client_tag.rpl b/testdata/edns_client_tag.rpl
new file mode 100644
index 000000000..767652c26
--- /dev/null
+++ b/testdata/edns_client_tag.rpl
@@ -0,0 +1,151 @@
+; config options
+server:
+	edns-client-tag: 10.0.0.0/24 1234
+	edns-client-tag: 10.0.0.10/32 5678
+
+stub-zone:
+	name: "tag1234."
+	stub-addr: 10.0.0.1
+
+stub-zone:
+	name: "tag5678."
+	stub-addr: 10.0.0.10
+
+stub-zone:
+	name: "notag."
+	stub-addr: 10.10.0.1
+
+CONFIG_END
+
+SCENARIO_BEGIN Test EDNS client tag option
+
+RANGE_BEGIN 0 1000
+	ADDRESS 10.0.0.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+tag1234. IN A
+SECTION ANSWER
+tag1234. IN A 10.20.30.40
+SECTION ADDITIONAL
+ENTRY_END
+RANGE_END
+
+RANGE_BEGIN 0 1000
+	ADDRESS 10.0.0.10
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+tag5678. IN A
+SECTION ANSWER
+tag5678. IN A 10.20.30.40
+SECTION ADDITIONAL
+ENTRY_END
+RANGE_END
+
+RANGE_BEGIN 0 1000
+	ADDRESS 10.10.0.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+notag. IN A
+SECTION ANSWER
+notag. IN A 10.20.30.40
+SECTION ADDITIONAL
+ENTRY_END
+RANGE_END
+
+STEP 10 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+tag1234. IN A
+ENTRY_END
+
+STEP 20 CHECK_OUT_QUERY
+ENTRY_BEGIN
+MATCH qname qtype opcode ednsdata
+SECTION QUESTION
+tag1234. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 10           ; Opcode 16
+		00 02           ; Length 2
+		04 d2           ; 1234
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 30 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+tag1234. IN A
+SECTION ANSWER
+tag1234. IN A 10.20.30.40
+ENTRY_END
+
+STEP 110 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+tag5678. IN A
+ENTRY_END
+
+STEP 120 CHECK_OUT_QUERY
+ENTRY_BEGIN
+MATCH qname qtype opcode ednsdata
+SECTION QUESTION
+tag5678. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 10           ; Opcode 16
+		00 02           ; Length 2
+		16 2e           ; 5678
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 130 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+tag5678. IN A
+SECTION ANSWER
+tag5678. IN A 10.20.30.40
+ENTRY_END
+
+STEP 210 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+notag. IN A
+ENTRY_END
+
+STEP 220 CHECK_OUT_QUERY
+ENTRY_BEGIN
+MATCH qname qtype opcode ednsdata
+SECTION QUESTION
+notag. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 230 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+notag. IN A
+SECTION ANSWER
+notag. IN A 10.20.30.40
+ENTRY_END
+
+SCENARIO_END

From 61100b646305a5a87ea83311f786ad444bec0e9e Mon Sep 17 00:00:00 2001
From: Vitezslav Cizek <vcizek@suse.com>
Date: Fri, 31 Jul 2020 14:44:05 +0200
Subject: [PATCH 016/108] net_help: Rename EVP_MAC_set_ctx_params to
 EVP_MAC_CTX_set_params

This fixes build with OpenSSL 3.0.0 Alpha 5.
EVP_MAC_set_ctx_params got renamed back to EVP_MAC_CTX_set_params
in https://github.com/openssl/openssl/pull/12186
---
 util/net_help.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/net_help.c b/util/net_help.c
index 7d81d47be..ce1bc0c15 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -1478,7 +1478,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
 		params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
 			"sha256", 0);
 		params[2] = OSSL_PARAM_construct_end();
-		EVP_MAC_set_ctx_params(hmac_ctx, params);
+		EVP_MAC_CTX_set_params(hmac_ctx, params);
 #elif !defined(HMAC_INIT_EX_RETURNS_VOID)
 		if (HMAC_Init_ex(hmac_ctx, ticket_keys->hmac_key, 32, digest, NULL) != 1) {
 			verbose(VERB_CLIENT, "HMAC_Init_ex failed");
@@ -1509,7 +1509,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
 		params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
 			"sha256", 0);
 		params[2] = OSSL_PARAM_construct_end();
-		EVP_MAC_set_ctx_params(hmac_ctx, params);
+		EVP_MAC_CTX_set_params(hmac_ctx, params);
 #elif !defined(HMAC_INIT_EX_RETURNS_VOID)
 		if (HMAC_Init_ex(hmac_ctx, key->hmac_key, 32, digest, NULL) != 1) {
 			verbose(VERB_CLIENT, "HMAC_Init_ex failed");

From 9bc30967d29dd13441eca2a003048ee7975181f7 Mon Sep 17 00:00:00 2001
From: Felipe Gasper <felipe@felipegasper.com>
Date: Mon, 3 Aug 2020 14:37:00 -0400
Subject: [PATCH 017/108] Make tvOS & watchOS checks verify truthiness as well
 as definedness.

---
 daemon/unbound.c           | 2 +-
 libunbound/libworker.c     | 2 +-
 smallapp/unbound-control.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 3f96603c4..cd0fd69f2 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -92,7 +92,7 @@
 #include <TargetConditionals.h>
 #endif
 
-#if defined(TARGET_OS_TV) || defined(TARGET_OS_WATCH)
+#if (defined(TARGET_OS_TV) && TARGET_OS_TV) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
 #undef HAVE_FORK
 #endif
 
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 44b8d7905..bd42462e1 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -78,7 +78,7 @@
 #include <TargetConditionals.h>
 #endif
 
-#if defined(TARGET_OS_TV) || defined(TARGET_OS_WATCH)
+#if (defined(TARGET_OS_TV) && TARGET_OS_TV) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
 #undef HAVE_FORK
 #endif
 
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index c2b42e951..4662c7cb6 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -886,7 +886,7 @@ int main(int argc, char* argv[])
 	if(argc == 0)
 		usage();
 	if(argc >= 1 && strcmp(argv[0], "start")==0) {
-#if defined(TARGET_OS_TV) || defined(TARGET_OS_WATCH)
+#if (defined(TARGET_OS_TV) && TARGET_OS_TV) || (defined(TARGET_OS_WATCH) && TARGET_OS_WATCH)
 		fatal_exit("could not exec unbound: %s",
 			strerror(ENOSYS));
 #else

From c0c722cd9755541dd087dfef133a9b7c35281f71 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 4 Aug 2020 09:05:09 +0200
Subject: [PATCH 018/108] DLV removal

---
 doc/example.conf.in              |    5 -
 doc/unbound.conf.5.in            |   15 -
 pythonmod/doc/modules/config.rst |    8 -
 services/cache/dns.c             |    5 +-
 smallapp/unbound-checkconf.c     |    2 -
 util/config_file.c               |    8 -
 util/config_file.h               |    4 -
 util/configparser.c              | 1922 ++++++++++++++----------------
 util/configparser.h              |    2 +-
 util/configparser.y              |    6 +-
 validator/val_anchor.c           |   33 -
 validator/val_anchor.h           |    2 -
 validator/val_neg.c              |  102 --
 validator/val_neg.h              |   20 -
 validator/val_nsec.c             |   83 --
 validator/val_nsec.h             |   13 -
 validator/validator.h            |   23 -
 17 files changed, 920 insertions(+), 1333 deletions(-)

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 3af4420c6..03d22d381 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -509,11 +509,6 @@ server:
 	# Root key trust anchor sentinel (draft-ietf-dnsop-kskroll-sentinel)
 	# root-key-sentinel: yes
 
-	# File with DLV trusted keys. Same format as trust-anchor-file.
-	# There can be only one DLV configured, it is trusted from root down.
-	# DLV is going to be decommissioned.  Please do not use it any more.
-	# dlv-anchor-file: "dlv.isc.org.key"
-
 	# File with trusted keys for validation. Specify more than one file
 	# with several entries, one file per entry.
 	# Zone file format, with DS and DNSKEY entries.
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 4920a0b2d..23895d808 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1010,21 +1010,6 @@ Send RFC8145 key tag query after trust anchor priming. Default is yes.
 .B root\-key\-sentinel: \fI<yes or no>
 Root key trust anchor sentinel. Default is yes.
 .TP
-.B dlv\-anchor\-file: \fI<filename>
-This option was used during early days DNSSEC deployment when no parent-side
-DS record registrations were easily available.  Nowadays, it is best to have
-DS records registered with the parent zone (many top level zones are signed).
-File with trusted keys for DLV (DNSSEC Lookaside Validation). Both DS and
-DNSKEY entries can be used in the file, in the same format as for
-\fItrust\-anchor\-file:\fR statements. Only one DLV can be configured, more
-would be slow. The DLV configured is used as a root trusted DLV, this
-means that it is a lookaside for the root. Default is "", or no dlv anchor
-file. DLV is going to be decommissioned.  Please do not use it any more.
-.TP
-.B dlv\-anchor: \fI<"Resource Record">
-Much like trust\-anchor, this is a DLV anchor with the DS or DNSKEY inline.
-DLV is going to be decommissioned.  Please do not use it any more.
-.TP
 .B domain\-insecure: \fI<domain name>
 Sets domain name to be insecure, DNSSEC chain of trust is ignored towards
 the domain name.  So a trust anchor above the domain name can not make the
diff --git a/pythonmod/doc/modules/config.rst b/pythonmod/doc/modules/config.rst
index 43333bdae..89afbef8a 100644
--- a/pythonmod/doc/modules/config.rst
+++ b/pythonmod/doc/modules/config.rst
@@ -256,14 +256,6 @@ config_file
    
       Files with trusted DNSKEYs in named.conf format, list.
    
-   .. attribute:: dlv_anchor_file
-   
-      DLV anchor file.
-   
-   .. attribute:: dlv_anchor_list
-   
-      DLV anchor inline.
-
    .. attribute:: max_ttl
    
       The number of seconds maximal TTL used for RRsets and messages.
diff --git a/services/cache/dns.c b/services/cache/dns.c
index 7b6e142c9..f3149b614 100644
--- a/services/cache/dns.c
+++ b/services/cache/dns.c
@@ -890,9 +890,8 @@ dns_cache_lookup(struct module_env* env,
 		lock_rw_unlock(&rrset->entry.lock);
 	}
 
-	/* construct DS, DNSKEY, DLV messages from rrset cache. */
-	if((qtype == LDNS_RR_TYPE_DS || qtype == LDNS_RR_TYPE_DNSKEY ||
-		qtype == LDNS_RR_TYPE_DLV) &&
+	/* construct DS, DNSKEY messages from rrset cache. */
+	if((qtype == LDNS_RR_TYPE_DS || qtype == LDNS_RR_TYPE_DNSKEY) &&
 		(rrset=rrset_cache_lookup(env->rrset_cache, qname, qnamelen, 
 		qtype, qclass, 0, now, 0))) {
 		/* if the rrset is from the additional section, and the
diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 0cf348add..b1b7ae7ef 100644
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -624,8 +624,6 @@ morechecks(struct config_file* cfg)
 		cfg->auto_trust_anchor_file_list, cfg->chrootdir, cfg);
 	check_chroot_filelist_wild("trusted-keys-file",
 		cfg->trusted_keys_file_list, cfg->chrootdir, cfg);
-	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 */
diff --git a/util/config_file.c b/util/config_file.c
index 0e9ee471b..0460c28b0 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -233,8 +233,6 @@ config_create(void)
 	cfg->trusted_keys_file_list = NULL;
 	cfg->trust_anchor_signaling = 1;
 	cfg->root_key_sentinel = 1;
-	cfg->dlv_anchor_file = NULL;
-	cfg->dlv_anchor_list = NULL;
 	cfg->domain_insecure = NULL;
 	cfg->val_date_override = 0;
 	cfg->val_sig_skew_min = 3600; /* at least daylight savings trouble */
@@ -581,8 +579,6 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_STRLIST("trusted-keys-file:", trusted_keys_file_list)
 	else S_YNO("trust-anchor-signaling:", trust_anchor_signaling)
 	else S_YNO("root-key-sentinel:", root_key_sentinel)
-	else S_STR("dlv-anchor-file:", dlv_anchor_file)
-	else S_STRLIST("dlv-anchor:", dlv_anchor_list)
 	else S_STRLIST("domain-insecure:", domain_insecure)
 	else S_NUMBER_OR_ZERO("val-bogus-ttl:", bogus_ttl)
 	else S_YNO("val-clean-additional:", val_clean_additional)
@@ -998,7 +994,6 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_DEC(opt, "unwanted-reply-threshold", unwanted_threshold)
 	else O_YNO(opt, "do-not-query-localhost", donotquery_localhost)
 	else O_STR(opt, "module-config", module_conf)
-	else O_STR(opt, "dlv-anchor-file", dlv_anchor_file)
 	else O_DEC(opt, "val-bogus-ttl", bogus_ttl)
 	else O_YNO(opt, "val-clean-additional", val_clean_additional)
 	else O_DEC(opt, "val-log-level", val_log_level)
@@ -1036,7 +1031,6 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_LST(opt, "trusted-keys-file", trusted_keys_file_list)
 	else O_YNO(opt, "trust-anchor-signaling", trust_anchor_signaling)
 	else O_YNO(opt, "root-key-sentinel", root_key_sentinel)
-	else O_LST(opt, "dlv-anchor", dlv_anchor_list)
 	else O_LST(opt, "control-interface", control_ifs.first)
 	else O_LST(opt, "domain-insecure", domain_insecure)
 	else O_UNS(opt, "val-override-date", val_date_override)
@@ -1462,8 +1456,6 @@ config_delete(struct config_file* cfg)
 	config_delstrlist(cfg->trusted_keys_file_list);
 	config_delstrlist(cfg->trust_anchor_list);
 	config_delstrlist(cfg->domain_insecure);
-	free(cfg->dlv_anchor_file);
-	config_delstrlist(cfg->dlv_anchor_list);
 	config_deldblstrlist(cfg->acls);
 	config_deldblstrlist(cfg->tcp_connection_limits);
 	free(cfg->val_nsec3_key_iterations);
diff --git a/util/config_file.h b/util/config_file.h
index 66e5025d0..db80abc7e 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -331,10 +331,6 @@ struct config_file {
 	struct config_strlist* auto_trust_anchor_file_list;
 	/** files with trusted DNSKEYs in named.conf format, list */
 	struct config_strlist* trusted_keys_file_list;
-	/** DLV anchor file */
-	char* dlv_anchor_file;
-	/** DLV anchor inline */
-	struct config_strlist* dlv_anchor_list;
 	/** insecure domain list */
 	struct config_strlist* domain_insecure;
 	/** send key tag query */
diff --git a/util/configparser.c b/util/configparser.c
index 2c9af619a..5f8c70bd0 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.5.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -48,7 +48,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.5"
+#define YYBISON_VERSION "3.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -97,15 +97,6 @@ extern struct config_parser_state* cfg_parser;
 
 #line 99 "util/configparser.c"
 
-# ifndef YY_CAST
-#  ifdef __cplusplus
-#   define YY_CAST(Type, Val) static_cast<Type> (Val)
-#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
-#  else
-#   define YY_CAST(Type, Val) ((Type) (Val))
-#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
-#  endif
-# endif
 # ifndef YY_NULLPTR
 #  if defined __cplusplus
 #   if 201103L <= __cplusplus
@@ -733,7 +724,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 737 "util/configparser.c"
+#line 728 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -754,83 +745,36 @@ int yyparse (void);
 # undef short
 #endif
 
-/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
-   <limits.h> and (if available) <stdint.h> are included
-   so that the code can choose integer types of a good width.  */
-
-#ifndef __PTRDIFF_MAX__
-# include <limits.h> /* INFRINGES ON USER NAME SPACE */
-# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
-#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
-#  define YY_STDINT_H
-# endif
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
 
-/* Narrow types that promote to a signed type and that can represent a
-   signed or unsigned integer of at least N bits.  In tables they can
-   save space and decrease cache pressure.  Promoting to a signed type
-   helps avoid bugs in integer arithmetic.  */
-
-#ifdef __INT_LEAST8_MAX__
-typedef __INT_LEAST8_TYPE__ yytype_int8;
-#elif defined YY_STDINT_H
-typedef int_least8_t yytype_int8;
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
 #else
 typedef signed char yytype_int8;
 #endif
 
-#ifdef __INT_LEAST16_MAX__
-typedef __INT_LEAST16_TYPE__ yytype_int16;
-#elif defined YY_STDINT_H
-typedef int_least16_t yytype_int16;
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
 #else
 typedef short yytype_int16;
 #endif
 
-#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
-typedef __UINT_LEAST8_TYPE__ yytype_uint8;
-#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
-       && UINT_LEAST8_MAX <= INT_MAX)
-typedef uint_least8_t yytype_uint8;
-#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
-typedef unsigned char yytype_uint8;
-#else
-typedef short yytype_uint8;
-#endif
-
-#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
-typedef __UINT_LEAST16_TYPE__ yytype_uint16;
-#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
-       && UINT_LEAST16_MAX <= INT_MAX)
-typedef uint_least16_t yytype_uint16;
-#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
-typedef unsigned short yytype_uint16;
-#else
-typedef int yytype_uint16;
-#endif
-
-#ifndef YYPTRDIFF_T
-# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
-#  define YYPTRDIFF_T __PTRDIFF_TYPE__
-#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
-# elif defined PTRDIFF_MAX
-#  ifndef ptrdiff_t
-#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  endif
-#  define YYPTRDIFF_T ptrdiff_t
-#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
-# else
-#  define YYPTRDIFF_T long
-#  define YYPTRDIFF_MAXIMUM LONG_MAX
-# endif
-#endif
-
 #ifndef YYSIZE_T
 # ifdef __SIZE_TYPE__
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -838,19 +782,7 @@ typedef int yytype_uint16;
 # endif
 #endif
 
-#define YYSIZE_MAXIMUM                                  \
-  YY_CAST (YYPTRDIFF_T,                                 \
-           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
-            ? YYPTRDIFF_MAXIMUM                         \
-            : YY_CAST (YYSIZE_T, -1)))
-
-#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
-
-/* Stored state numbers (used for stacks). */
-typedef yytype_int16 yy_state_t;
-
-/* State numbers in computations.  */
-typedef int yy_state_fast_t;
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -864,20 +796,22 @@ typedef int yy_state_fast_t;
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE_PURE
-# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
-#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
 # else
-#  define YY_ATTRIBUTE_PURE
+#  define YY_ATTRIBUTE(Spec) /* empty */
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
 #ifndef YY_ATTRIBUTE_UNUSED
-# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
-#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-# else
-#  define YY_ATTRIBUTE_UNUSED
-# endif
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
@@ -889,11 +823,11 @@ typedef int yy_state_fast_t;
 
 #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
     _Pragma ("GCC diagnostic pop")
 #else
 # define YY_INITIAL_VALUE(Value) Value
@@ -906,18 +840,6 @@ typedef int yy_state_fast_t;
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
-# define YY_IGNORE_USELESS_CAST_BEGIN                          \
-    _Pragma ("GCC diagnostic push")                            \
-    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
-# define YY_IGNORE_USELESS_CAST_END            \
-    _Pragma ("GCC diagnostic pop")
-#endif
-#ifndef YY_IGNORE_USELESS_CAST_BEGIN
-# define YY_IGNORE_USELESS_CAST_BEGIN
-# define YY_IGNORE_USELESS_CAST_END
-#endif
-
 
 #define YY_ASSERT(E) ((void) (0 && (E)))
 
@@ -996,17 +918,17 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yy_state_t yyss_alloc;
+  yytype_int16 yyss_alloc;
   YYSTYPE yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 # define YYCOPY_NEEDED 1
@@ -1019,11 +941,11 @@ union yyalloc
 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     do                                                                  \
       {                                                                 \
-        YYPTRDIFF_T yynewbytes;                                         \
+        YYSIZE_T yynewbytes;                                            \
         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
         Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                 \
     while (0)
 
@@ -1035,12 +957,12 @@ union yyalloc
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
 #  else
 #   define YYCOPY(Dst, Src, Count)              \
       do                                        \
         {                                       \
-          YYPTRDIFF_T yyi;                      \
+          YYSIZE_T yyi;                         \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
@@ -1066,15 +988,14 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   546
 
-
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
-  (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
-static const yytype_int16 yytranslate[] =
+static const yytype_uint16 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1135,7 +1056,7 @@ static const yytype_int16 yytranslate[] =
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_int16 yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
        0,   181,   181,   181,   182,   182,   183,   183,   184,   184,
      184,   185,   185,   186,   186,   187,   187,   188,   190,   196,
@@ -1171,34 +1092,34 @@ static const yytype_int16 yyrline[] =
      854,   867,   876,   885,   894,   901,   908,   917,   924,   933,
      941,   948,   955,   963,   972,   981,   990,  1004,  1013,  1022,
     1031,  1040,  1049,  1058,  1065,  1072,  1098,  1106,  1113,  1120,
-    1127,  1134,  1142,  1150,  1158,  1165,  1176,  1187,  1194,  1203,
-    1212,  1221,  1228,  1235,  1243,  1251,  1261,  1271,  1281,  1295,
-    1303,  1316,  1327,  1335,  1348,  1357,  1366,  1375,  1385,  1395,
-    1403,  1416,  1425,  1433,  1442,  1450,  1463,  1472,  1479,  1489,
-    1499,  1509,  1519,  1529,  1539,  1549,  1559,  1566,  1573,  1580,
-    1589,  1598,  1607,  1616,  1623,  1633,  1653,  1660,  1678,  1691,
-    1704,  1713,  1722,  1731,  1740,  1750,  1760,  1771,  1780,  1789,
-    1798,  1807,  1816,  1825,  1838,  1851,  1860,  1867,  1876,  1885,
-    1894,  1903,  1911,  1924,  1932,  1973,  1980,  1995,  2005,  2015,
-    2022,  2029,  2036,  2045,  2053,  2067,  2088,  2109,  2121,  2133,
-    2145,  2154,  2175,  2185,  2194,  2202,  2210,  2223,  2236,  2251,
-    2266,  2275,  2284,  2290,  2299,  2308,  2318,  2328,  2341,  2354,
-    2366,  2380,  2392,  2406,  2416,  2423,  2430,  2439,  2448,  2458,
-    2468,  2478,  2485,  2492,  2501,  2510,  2520,  2530,  2537,  2544,
-    2551,  2559,  2569,  2579,  2589,  2599,  2638,  2648,  2656,  2664,
-    2679,  2688,  2693,  2694,  2695,  2695,  2695,  2696,  2696,  2696,
-    2697,  2697,  2699,  2709,  2718,  2725,  2732,  2739,  2746,  2753,
-    2760,  2765,  2766,  2767,  2767,  2767,  2768,  2768,  2768,  2769,
-    2770,  2770,  2771,  2771,  2772,  2772,  2773,  2774,  2775,  2776,
-    2777,  2778,  2780,  2789,  2799,  2806,  2813,  2822,  2829,  2836,
-    2843,  2850,  2859,  2868,  2875,  2882,  2892,  2902,  2912,  2922,
-    2932,  2942,  2947,  2948,  2949,  2951,  2957,  2962,  2963,  2964,
-    2966,  2972,  2982,  2989,  2998,  3006,  3011,  3012,  3014,  3014,
-    3014,  3015,  3015,  3016,  3017,  3018,  3019,  3020,  3022,  3032,
-    3041,  3048,  3057,  3064,  3073,  3081,  3094,  3102,  3115,  3120,
-    3121,  3122,  3122,  3123,  3123,  3123,  3124,  3126,  3138,  3150,
-    3162,  3177,  3190,  3203,  3214,  3219,  3220,  3221,  3221,  3223,
-    3238
+    1126,  1132,  1140,  1148,  1156,  1163,  1174,  1185,  1192,  1201,
+    1210,  1219,  1226,  1233,  1241,  1249,  1259,  1269,  1279,  1293,
+    1301,  1314,  1325,  1333,  1346,  1355,  1364,  1373,  1383,  1393,
+    1401,  1414,  1423,  1431,  1440,  1448,  1461,  1470,  1477,  1487,
+    1497,  1507,  1517,  1527,  1537,  1547,  1557,  1564,  1571,  1578,
+    1587,  1596,  1605,  1614,  1621,  1631,  1651,  1658,  1676,  1689,
+    1702,  1711,  1720,  1729,  1738,  1748,  1758,  1769,  1778,  1787,
+    1796,  1805,  1814,  1823,  1836,  1849,  1858,  1865,  1874,  1883,
+    1892,  1901,  1909,  1922,  1930,  1971,  1978,  1993,  2003,  2013,
+    2020,  2027,  2034,  2043,  2051,  2065,  2086,  2107,  2119,  2131,
+    2143,  2152,  2173,  2183,  2192,  2200,  2208,  2221,  2234,  2249,
+    2264,  2273,  2282,  2288,  2297,  2306,  2316,  2326,  2339,  2352,
+    2364,  2378,  2390,  2404,  2414,  2421,  2428,  2437,  2446,  2456,
+    2466,  2476,  2483,  2490,  2499,  2508,  2518,  2528,  2535,  2542,
+    2549,  2557,  2567,  2577,  2587,  2597,  2636,  2646,  2654,  2662,
+    2677,  2686,  2691,  2692,  2693,  2693,  2693,  2694,  2694,  2694,
+    2695,  2695,  2697,  2707,  2716,  2723,  2730,  2737,  2744,  2751,
+    2758,  2763,  2764,  2765,  2765,  2765,  2766,  2766,  2766,  2767,
+    2768,  2768,  2769,  2769,  2770,  2770,  2771,  2772,  2773,  2774,
+    2775,  2776,  2778,  2787,  2797,  2804,  2811,  2820,  2827,  2834,
+    2841,  2848,  2857,  2866,  2873,  2880,  2890,  2900,  2910,  2920,
+    2930,  2940,  2945,  2946,  2947,  2949,  2955,  2960,  2961,  2962,
+    2964,  2970,  2980,  2987,  2996,  3004,  3009,  3010,  3012,  3012,
+    3012,  3013,  3013,  3014,  3015,  3016,  3017,  3018,  3020,  3030,
+    3039,  3046,  3055,  3062,  3071,  3079,  3092,  3100,  3113,  3118,
+    3119,  3120,  3120,  3121,  3121,  3121,  3122,  3124,  3136,  3148,
+    3160,  3175,  3188,  3201,  3212,  3217,  3218,  3219,  3219,  3221,
+    3236
 };
 #endif
 
@@ -1446,7 +1367,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_int16 yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -1481,14 +1402,14 @@ static const yytype_int16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF (-285)
+#define YYPACT_NINF -285
 
-#define yypact_value_is_default(Yyn) \
-  ((Yyn) == YYPACT_NINF)
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-285)))
 
-#define YYTABLE_NINF (-1)
+#define YYTABLE_NINF -1
 
-#define yytable_value_is_error(Yyn) \
+#define yytable_value_is_error(Yytable_value) \
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1591,7 +1512,7 @@ static const yytype_int16 yypact[] =
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
      Performed when YYTABLE does not specify something else to do.  Zero
      means the default is an error.  */
-static const yytype_int16 yydefact[] =
+static const yytype_uint16 yydefact[] =
 {
        2,     0,     1,    18,    19,   216,   226,   491,   551,   510,
      235,   565,   588,   245,   604,   261,   556,     3,    17,    21,
@@ -1763,7 +1684,7 @@ static const yytype_int16 yydefgoto[] =
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
      positive, shift that token.  If negative, reduce the rule whose
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_int16 yytable[] =
+static const yytype_uint16 yytable[] =
 {
        2,   477,   462,   434,   566,   435,   436,   569,   449,   606,
      607,     3,     4,   611,   612,   613,   450,   451,   593,   594,
@@ -1899,7 +1820,7 @@ static const yytype_int16 yycheck[] =
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
-static const yytype_int16 yystos[] =
+static const yytype_uint16 yystos[] =
 {
        0,   293,     0,    11,    12,    46,    52,    96,   112,   153,
      212,   230,   247,   256,   280,   284,   290,   294,   295,   296,
@@ -1995,7 +1916,7 @@ static const yytype_int16 yystos[] =
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_int16 yyr1[] =
+static const yytype_uint16 yyr1[] =
 {
        0,   292,   293,   293,   294,   294,   294,   294,   294,   294,
      294,   294,   294,   294,   294,   294,   294,   294,   295,   296,
@@ -2062,7 +1983,7 @@ static const yytype_int16 yyr1[] =
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_int8 yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     0,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     1,     1,     1,
@@ -2211,9 +2132,7 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
   if (yytype < YYNTOKENS)
     YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
@@ -2237,7 +2156,7 @@ yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 `------------------------------------------------------------------*/
 
 static void
-yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -2260,12 +2179,12 @@ do {                                                            \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
-  int yylno = yyrline[yyrule];
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
              yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
@@ -2317,13 +2236,13 @@ int yydebug;
 
 # ifndef yystrlen
 #  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
+#   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-static YYPTRDIFF_T
+static YYSIZE_T
 yystrlen (const char *yystr)
 {
-  YYPTRDIFF_T yylen;
+  YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
     continue;
   return yylen;
@@ -2359,12 +2278,12 @@ yystpcpy (char *yydest, const char *yysrc)
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-static YYPTRDIFF_T
+static YYSIZE_T
 yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
-      YYPTRDIFF_T yyn = 0;
+      YYSIZE_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -2395,10 +2314,10 @@ yytnamerr (char *yyres, const char *yystr)
     do_not_strip_quotes: ;
     }
 
-  if (yyres)
-    return yystpcpy (yyres, yystr) - yyres;
-  else
+  if (! yyres)
     return yystrlen (yystr);
+
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -2411,19 +2330,19 @@ yytnamerr (char *yyres, const char *yystr)
    *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
    required number of bytes is too large to store.  */
 static int
-yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
-                yy_state_t *yyssp, int yytoken)
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat: reported tokens (one for the "unexpected",
-     one per "expected"). */
+  /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Actual size of YYARG. */
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
   int yycount = 0;
-  /* Cumulated lengths of YYARG.  */
-  YYPTRDIFF_T yysize = 0;
 
   /* There are many possibilities here to consider:
      - If this state is a consistent state with a default action, then
@@ -2451,8 +2370,6 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
   if (yytoken != YYEMPTY)
     {
       int yyn = yypact[*yyssp];
-      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-      yysize = yysize0;
       yyarg[yycount++] = yytname[yytoken];
       if (!yypact_value_is_default (yyn))
         {
@@ -2477,8 +2394,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYPTRDIFF_T yysize1
-                    = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
                   if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
                     yysize = yysize1;
                   else
@@ -2505,9 +2421,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
     }
 
   {
-    /* Don't count the "%s"s in the final size, but reserve room for
-       the terminator.  */
-    YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
     if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
       yysize = yysize1;
     else
@@ -2537,8 +2451,8 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
         }
       else
         {
-          ++yyp;
-          ++yyformat;
+          yyp++;
+          yyformat++;
         }
   }
   return 0;
@@ -2581,7 +2495,7 @@ int yynerrs;
 int
 yyparse (void)
 {
-    yy_state_fast_t yystate;
+    int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
@@ -2593,16 +2507,16 @@ yyparse (void)
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
-    yy_state_t yyssa[YYINITDEPTH];
-    yy_state_t *yyss;
-    yy_state_t *yyssp;
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
     /* The semantic value stack.  */
     YYSTYPE yyvsa[YYINITDEPTH];
     YYSTYPE *yyvs;
     YYSTYPE *yyvsp;
 
-    YYPTRDIFF_T yystacksize;
+    YYSIZE_T yystacksize;
 
   int yyn;
   int yyresult;
@@ -2616,7 +2530,7 @@ yyparse (void)
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
   char *yymsg = yymsgbuf;
-  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
@@ -2648,14 +2562,12 @@ yynewstate:
 
 
 /*--------------------------------------------------------------------.
-| yysetstate -- set current state (the top of the stack) to yystate.  |
+| yynewstate -- set current state (the top of the stack) to yystate.  |
 `--------------------------------------------------------------------*/
 yysetstate:
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
   YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
-  YY_IGNORE_USELESS_CAST_BEGIN
-  *yyssp = YY_CAST (yy_state_t, yystate);
-  YY_IGNORE_USELESS_CAST_END
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -2663,23 +2575,23 @@ yysetstate:
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYPTRDIFF_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
 # if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
-        yy_state_t *yyss1 = yyss;
         YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
 
         /* Each stack pointer address is followed by the size of the
            data in use in that stack, in bytes.  This used to be a
            conditional around just the two extra args, but that might
            be undefined if yyoverflow is a macro.  */
         yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * YYSIZEOF (*yyssp),
-                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
                     &yystacksize);
         yyss = yyss1;
         yyvs = yyvs1;
@@ -2693,10 +2605,9 @@ yysetstate:
         yystacksize = YYMAXDEPTH;
 
       {
-        yy_state_t *yyss1 = yyss;
+        yytype_int16 *yyss1 = yyss;
         union yyalloc *yyptr =
-          YY_CAST (union yyalloc *,
-                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
         if (! yyptr)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
@@ -2710,10 +2621,8 @@ yysetstate:
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-      YY_IGNORE_USELESS_CAST_BEGIN
-      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
-                  YY_CAST (long, yystacksize)));
-      YY_IGNORE_USELESS_CAST_END
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
@@ -2779,13 +2688,14 @@ yybackup:
 
   /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
   yystate = yyn;
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
   goto yynewstate;
 
 
@@ -2822,23 +2732,23 @@ yyreduce:
     {
   case 18:
 #line 191 "./util/configparser.y"
-        {
+    {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2829 "util/configparser.c"
+#line 2739 "util/configparser.c"
     break;
 
   case 19:
 #line 197 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2837 "util/configparser.c"
+#line 2747 "util/configparser.c"
     break;
 
   case 216:
 #line 291 "./util/configparser.y"
-        {
+    {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -2848,12 +2758,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2852 "util/configparser.c"
+#line 2762 "util/configparser.c"
     break;
 
   case 226:
 #line 308 "./util/configparser.y"
-        {
+    {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -2863,12 +2773,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2867 "util/configparser.c"
+#line 2777 "util/configparser.c"
     break;
 
   case 235:
 #line 325 "./util/configparser.y"
-        {
+    {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
 		s = (struct config_view*)calloc(1, sizeof(struct config_view));
@@ -2880,12 +2790,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2884 "util/configparser.c"
+#line 2794 "util/configparser.c"
     break;
 
   case 245:
 #line 344 "./util/configparser.y"
-        {
+    {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -2900,12 +2810,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2904 "util/configparser.c"
+#line 2814 "util/configparser.c"
     break;
 
   case 256:
 #line 368 "./util/configparser.y"
-        {
+    {
 		uint8_t* bitlist;
 		size_t len = 0;
 		OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str)));
@@ -2921,12 +2831,12 @@ yyreduce:
 
 		}
 	}
-#line 2925 "util/configparser.c"
+#line 2835 "util/configparser.c"
     break;
 
   case 257:
 #line 387 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
 		   strcmp((yyvsp[0].str), "passthru")!=0 && strcmp((yyvsp[0].str), "drop")!=0 &&
@@ -2940,44 +2850,44 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2944 "util/configparser.c"
+#line 2854 "util/configparser.c"
     break;
 
   case 258:
 #line 404 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2954 "util/configparser.c"
+#line 2864 "util/configparser.c"
     break;
 
   case 259:
 #line 412 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2966 "util/configparser.c"
+#line 2876 "util/configparser.c"
     break;
 
   case 260:
 #line 422 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 2976 "util/configparser.c"
+#line 2886 "util/configparser.c"
     break;
 
   case 261:
 #line 430 "./util/configparser.y"
-        {
+    {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -2992,36 +2902,36 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2996 "util/configparser.c"
+#line 2906 "util/configparser.c"
     break;
 
   case 274:
 #line 453 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3008 "util/configparser.c"
+#line 2918 "util/configparser.c"
     break;
 
   case 275:
 #line 462 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3020 "util/configparser.c"
+#line 2930 "util/configparser.c"
     break;
 
   case 276:
 #line 471 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
 			cfg_parser->cfg->stat_interval = 0;
@@ -3030,48 +2940,48 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3034 "util/configparser.c"
+#line 2944 "util/configparser.c"
     break;
 
   case 277:
 #line 482 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3046 "util/configparser.c"
+#line 2956 "util/configparser.c"
     break;
 
   case 278:
 #line 491 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3058 "util/configparser.c"
+#line 2968 "util/configparser.c"
     break;
 
   case 279:
 #line 500 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3070 "util/configparser.c"
+#line 2980 "util/configparser.c"
     break;
 
   case 280:
 #line 509 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
 			cfg_parser->cfg->shm_key = 0;
@@ -3080,24 +2990,24 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3084 "util/configparser.c"
+#line 2994 "util/configparser.c"
     break;
 
   case 281:
 #line 520 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3096 "util/configparser.c"
+#line 3006 "util/configparser.c"
     break;
 
   case 282:
 #line 529 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet, (yyvsp[0].str)))
@@ -3107,12 +3017,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3111 "util/configparser.c"
+#line 3021 "util/configparser.c"
     break;
 
   case 283:
 #line 541 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet_zone,
@@ -3123,12 +3033,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3127 "util/configparser.c"
+#line 3037 "util/configparser.c"
     break;
 
   case 284:
 #line 555 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3141,12 +3051,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3145 "util/configparser.c"
+#line 3055 "util/configparser.c"
     break;
 
   case 285:
 #line 570 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
 		OUTYY(("P(Deprecated option, ignoring)\n"));
@@ -3155,12 +3065,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3159 "util/configparser.c"
+#line 3069 "util/configparser.c"
     break;
 
   case 286:
 #line 581 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3175,12 +3085,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3179 "util/configparser.c"
+#line 3089 "util/configparser.c"
     break;
 
   case 287:
 #line 598 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3195,12 +3105,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3199 "util/configparser.c"
+#line 3109 "util/configparser.c"
     break;
 
   case 288:
 #line 615 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3215,12 +3125,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3219 "util/configparser.c"
+#line 3129 "util/configparser.c"
     break;
 
   case 289:
 #line 632 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3235,12 +3145,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3239 "util/configparser.c"
+#line 3149 "util/configparser.c"
     break;
 
   case 290:
 #line 649 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3253,12 +3163,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3257 "util/configparser.c"
+#line 3167 "util/configparser.c"
     break;
 
   case 291:
 #line 664 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3271,12 +3181,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3275 "util/configparser.c"
+#line 3185 "util/configparser.c"
     break;
 
   case 292:
 #line 679 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
 			cfg_parser->cfg->ifs = calloc(1, sizeof(char*));
@@ -3287,12 +3197,12 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3291 "util/configparser.c"
+#line 3201 "util/configparser.c"
     break;
 
   case 293:
 #line 692 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
 			cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*));
@@ -3305,180 +3215,180 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3309 "util/configparser.c"
+#line 3219 "util/configparser.c"
     break;
 
   case 294:
 #line 707 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3321 "util/configparser.c"
+#line 3231 "util/configparser.c"
     break;
 
   case 295:
 #line 716 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
 			cfg_parser->cfg->outgoing_avail_ports, 65536))
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3333 "util/configparser.c"
+#line 3243 "util/configparser.c"
     break;
 
   case 296:
 #line 725 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
 			cfg_parser->cfg->outgoing_avail_ports, 65536))
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3345 "util/configparser.c"
+#line 3255 "util/configparser.c"
     break;
 
   case 297:
 #line 734 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3357 "util/configparser.c"
+#line 3267 "util/configparser.c"
     break;
 
   case 298:
 #line 743 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3369 "util/configparser.c"
+#line 3279 "util/configparser.c"
     break;
 
   case 299:
 #line 752 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3381 "util/configparser.c"
+#line 3291 "util/configparser.c"
     break;
 
   case 300:
 #line 761 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3393 "util/configparser.c"
+#line 3303 "util/configparser.c"
     break;
 
   case 301:
 #line 770 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3405 "util/configparser.c"
+#line 3315 "util/configparser.c"
     break;
 
   case 302:
 #line 779 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3417 "util/configparser.c"
+#line 3327 "util/configparser.c"
     break;
 
   case 303:
 #line 788 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3429 "util/configparser.c"
+#line 3339 "util/configparser.c"
     break;
 
   case 304:
 #line 797 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3441 "util/configparser.c"
+#line 3351 "util/configparser.c"
     break;
 
   case 305:
 #line 806 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3453 "util/configparser.c"
+#line 3363 "util/configparser.c"
     break;
 
   case 306:
 #line 815 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                         yyerror("number expected");
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3465 "util/configparser.c"
+#line 3375 "util/configparser.c"
     break;
 
   case 307:
 #line 824 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3477 "util/configparser.c"
+#line 3387 "util/configparser.c"
     break;
 
   case 308:
 #line 833 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
@@ -3489,24 +3399,24 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3493 "util/configparser.c"
+#line 3403 "util/configparser.c"
     break;
 
   case 309:
 #line 846 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3505 "util/configparser.c"
+#line 3415 "util/configparser.c"
     break;
 
   case 310:
 #line 855 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
@@ -3517,180 +3427,180 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3521 "util/configparser.c"
+#line 3431 "util/configparser.c"
     break;
 
   case 311:
 #line 868 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3533 "util/configparser.c"
+#line 3443 "util/configparser.c"
     break;
 
   case 312:
 #line 877 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3545 "util/configparser.c"
+#line 3455 "util/configparser.c"
     break;
 
   case 313:
 #line 886 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3557 "util/configparser.c"
+#line 3467 "util/configparser.c"
     break;
 
   case 314:
 #line 895 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3567 "util/configparser.c"
+#line 3477 "util/configparser.c"
     break;
 
   case 315:
 #line 902 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3577 "util/configparser.c"
+#line 3487 "util/configparser.c"
     break;
 
   case 316:
 #line 909 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3589 "util/configparser.c"
+#line 3499 "util/configparser.c"
     break;
 
   case 317:
 #line 918 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3599 "util/configparser.c"
+#line 3509 "util/configparser.c"
     break;
 
   case 318:
 #line 925 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3611 "util/configparser.c"
+#line 3521 "util/configparser.c"
     break;
 
   case 319:
 #line 934 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3622 "util/configparser.c"
+#line 3532 "util/configparser.c"
     break;
 
   case 320:
 #line 942 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3632 "util/configparser.c"
+#line 3542 "util/configparser.c"
     break;
 
   case 321:
 #line 949 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3642 "util/configparser.c"
+#line 3552 "util/configparser.c"
     break;
 
   case 322:
 #line 956 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3653 "util/configparser.c"
+#line 3563 "util/configparser.c"
     break;
 
   case 323:
 #line 964 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3665 "util/configparser.c"
+#line 3575 "util/configparser.c"
     break;
 
   case 324:
 #line 973 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3677 "util/configparser.c"
+#line 3587 "util/configparser.c"
     break;
 
   case 325:
 #line 982 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3689 "util/configparser.c"
+#line 3599 "util/configparser.c"
     break;
 
   case 326:
 #line 991 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -3702,104 +3612,104 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3706 "util/configparser.c"
+#line 3616 "util/configparser.c"
     break;
 
   case 327:
 #line 1005 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3718 "util/configparser.c"
+#line 3628 "util/configparser.c"
     break;
 
   case 328:
 #line 1014 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3730 "util/configparser.c"
+#line 3640 "util/configparser.c"
     break;
 
   case 329:
 #line 1023 "./util/configparser.y"
-  {
+    {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
   		yyerror("expected yes or no.");
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3742 "util/configparser.c"
+#line 3652 "util/configparser.c"
     break;
 
   case 330:
 #line 1032 "./util/configparser.y"
-  {
+    {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
   		yyerror("expected yes or no.");
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3754 "util/configparser.c"
+#line 3664 "util/configparser.c"
     break;
 
   case 331:
 #line 1041 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3766 "util/configparser.c"
+#line 3676 "util/configparser.c"
     break;
 
   case 332:
 #line 1050 "./util/configparser.y"
-  {
+    {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
   		yyerror("expected yes or no.");
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3778 "util/configparser.c"
+#line 3688 "util/configparser.c"
     break;
 
   case 333:
 #line 1059 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3788 "util/configparser.c"
+#line 3698 "util/configparser.c"
     break;
 
   case 334:
 #line 1066 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3798 "util/configparser.c"
+#line 3708 "util/configparser.c"
     break;
 
   case 335:
 #line 1073 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
 		cfg_parser->cfg->directory = (yyvsp[0].str);
@@ -3823,106 +3733,104 @@ yyreduce:
 			}
 		}
 	}
-#line 3827 "util/configparser.c"
+#line 3737 "util/configparser.c"
     break;
 
   case 336:
 #line 1099 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3838 "util/configparser.c"
+#line 3748 "util/configparser.c"
     break;
 
   case 337:
 #line 1107 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3848 "util/configparser.c"
+#line 3758 "util/configparser.c"
     break;
 
   case 338:
 #line 1114 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3858 "util/configparser.c"
+#line 3768 "util/configparser.c"
     break;
 
   case 339:
 #line 1121 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
-		free(cfg_parser->cfg->dlv_anchor_file);
-		cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
+		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
 	}
-#line 3868 "util/configparser.c"
+#line 3777 "util/configparser.c"
     break;
 
   case 340:
-#line 1128 "./util/configparser.y"
-        {
+#line 1127 "./util/configparser.y"
+    {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
-			yyerror("out of memory");
+		log_warn("option dlv-anchor ignored: DLV is decommissioned");
 	}
-#line 3878 "util/configparser.c"
+#line 3786 "util/configparser.c"
     break;
 
   case 341:
-#line 1135 "./util/configparser.y"
-        {
+#line 1133 "./util/configparser.y"
+    {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3889 "util/configparser.c"
+#line 3797 "util/configparser.c"
     break;
 
   case 342:
-#line 1143 "./util/configparser.y"
-        {
+#line 1141 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3900 "util/configparser.c"
+#line 3808 "util/configparser.c"
     break;
 
   case 343:
-#line 1151 "./util/configparser.y"
-        {
+#line 1149 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3911 "util/configparser.c"
+#line 3819 "util/configparser.c"
     break;
 
   case 344:
-#line 1159 "./util/configparser.y"
-        {
+#line 1157 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3921 "util/configparser.c"
+#line 3829 "util/configparser.c"
     break;
 
   case 345:
-#line 1166 "./util/configparser.y"
-        {
+#line 1164 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -3931,12 +3839,12 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3935 "util/configparser.c"
+#line 3843 "util/configparser.c"
     break;
 
   case 346:
-#line 1177 "./util/configparser.y"
-        {
+#line 1175 "./util/configparser.y"
+    {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -3945,99 +3853,99 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3949 "util/configparser.c"
+#line 3857 "util/configparser.c"
     break;
 
   case 347:
-#line 1188 "./util/configparser.y"
-        {
+#line 1186 "./util/configparser.y"
+    {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3959 "util/configparser.c"
+#line 3867 "util/configparser.c"
     break;
 
   case 348:
-#line 1195 "./util/configparser.y"
-        {
+#line 1193 "./util/configparser.y"
+    {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3971 "util/configparser.c"
+#line 3879 "util/configparser.c"
     break;
 
   case 349:
-#line 1204 "./util/configparser.y"
-        {
+#line 1202 "./util/configparser.y"
+    {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3983 "util/configparser.c"
+#line 3891 "util/configparser.c"
     break;
 
   case 350:
-#line 1213 "./util/configparser.y"
-        {
+#line 1211 "./util/configparser.y"
+    {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3995 "util/configparser.c"
+#line 3903 "util/configparser.c"
     break;
 
   case 351:
-#line 1222 "./util/configparser.y"
-        {
+#line 1220 "./util/configparser.y"
+    {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 4005 "util/configparser.c"
+#line 3913 "util/configparser.c"
     break;
 
   case 352:
-#line 1229 "./util/configparser.y"
-        {
+#line 1227 "./util/configparser.y"
+    {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 4015 "util/configparser.c"
+#line 3923 "util/configparser.c"
     break;
 
   case 353:
-#line 1236 "./util/configparser.y"
-        {
+#line 1234 "./util/configparser.y"
+    {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4026 "util/configparser.c"
+#line 3934 "util/configparser.c"
     break;
 
   case 354:
-#line 1244 "./util/configparser.y"
-        {
+#line 1242 "./util/configparser.y"
+    {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4037 "util/configparser.c"
+#line 3945 "util/configparser.c"
     break;
 
   case 355:
-#line 1252 "./util/configparser.y"
+#line 1250 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4046,11 +3954,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4050 "util/configparser.c"
+#line 3958 "util/configparser.c"
     break;
 
   case 356:
-#line 1262 "./util/configparser.y"
+#line 1260 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4059,11 +3967,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4063 "util/configparser.c"
+#line 3971 "util/configparser.c"
     break;
 
   case 357:
-#line 1272 "./util/configparser.y"
+#line 1270 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4072,12 +3980,12 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4076 "util/configparser.c"
+#line 3984 "util/configparser.c"
     break;
 
   case 358:
-#line 1282 "./util/configparser.y"
-        {
+#line 1280 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
@@ -4089,23 +3997,23 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4093 "util/configparser.c"
+#line 4001 "util/configparser.c"
     break;
 
   case 359:
-#line 1296 "./util/configparser.y"
-        {
+#line 1294 "./util/configparser.y"
+    {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4104 "util/configparser.c"
+#line 4012 "util/configparser.c"
     break;
 
   case 360:
-#line 1304 "./util/configparser.y"
-        {
+#line 1302 "./util/configparser.y"
+    {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4116,12 +4024,12 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4120 "util/configparser.c"
+#line 4028 "util/configparser.c"
     break;
 
   case 361:
-#line 1317 "./util/configparser.y"
-        {
+#line 1315 "./util/configparser.y"
+    {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4130,23 +4038,23 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4134 "util/configparser.c"
+#line 4042 "util/configparser.c"
     break;
 
   case 362:
-#line 1328 "./util/configparser.y"
-        {
+#line 1326 "./util/configparser.y"
+    {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4145 "util/configparser.c"
+#line 4053 "util/configparser.c"
     break;
 
   case 363:
-#line 1336 "./util/configparser.y"
-        {
+#line 1334 "./util/configparser.y"
+    {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4157,48 +4065,48 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4161 "util/configparser.c"
+#line 4069 "util/configparser.c"
     break;
 
   case 364:
-#line 1349 "./util/configparser.y"
-        {
+#line 1347 "./util/configparser.y"
+    {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4173 "util/configparser.c"
+#line 4081 "util/configparser.c"
     break;
 
   case 365:
-#line 1358 "./util/configparser.y"
-        {
+#line 1356 "./util/configparser.y"
+    {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4185 "util/configparser.c"
+#line 4093 "util/configparser.c"
     break;
 
   case 366:
-#line 1367 "./util/configparser.y"
-        {
+#line 1365 "./util/configparser.y"
+    {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4197 "util/configparser.c"
+#line 4105 "util/configparser.c"
     break;
 
   case 367:
-#line 1376 "./util/configparser.y"
-        {
+#line 1374 "./util/configparser.y"
+    {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4206,12 +4114,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4210 "util/configparser.c"
+#line 4118 "util/configparser.c"
     break;
 
   case 368:
-#line 1386 "./util/configparser.y"
-        {
+#line 1384 "./util/configparser.y"
+    {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4219,23 +4127,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4223 "util/configparser.c"
+#line 4131 "util/configparser.c"
     break;
 
   case 369:
-#line 1396 "./util/configparser.y"
-        {
+#line 1394 "./util/configparser.y"
+    {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4234 "util/configparser.c"
+#line 4142 "util/configparser.c"
     break;
 
   case 370:
-#line 1404 "./util/configparser.y"
-        {
+#line 1402 "./util/configparser.y"
+    {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4246,58 +4154,58 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4250 "util/configparser.c"
+#line 4158 "util/configparser.c"
     break;
 
   case 371:
-#line 1417 "./util/configparser.y"
-        {
+#line 1415 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4262 "util/configparser.c"
+#line 4170 "util/configparser.c"
     break;
 
   case 372:
-#line 1426 "./util/configparser.y"
-        {
+#line 1424 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4273 "util/configparser.c"
+#line 4181 "util/configparser.c"
     break;
 
   case 373:
-#line 1434 "./util/configparser.y"
-        {
+#line 1432 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4285 "util/configparser.c"
+#line 4193 "util/configparser.c"
     break;
 
   case 374:
-#line 1443 "./util/configparser.y"
-        {
+#line 1441 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4296 "util/configparser.c"
+#line 4204 "util/configparser.c"
     break;
 
   case 375:
-#line 1451 "./util/configparser.y"
-        {
+#line 1449 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4308,34 +4216,34 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4312 "util/configparser.c"
+#line 4220 "util/configparser.c"
     break;
 
   case 376:
-#line 1464 "./util/configparser.y"
-        {
+#line 1462 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4324 "util/configparser.c"
+#line 4232 "util/configparser.c"
     break;
 
   case 377:
-#line 1473 "./util/configparser.y"
-        {
+#line 1471 "./util/configparser.y"
+    {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4334 "util/configparser.c"
+#line 4242 "util/configparser.c"
     break;
 
   case 378:
-#line 1480 "./util/configparser.y"
-        {
+#line 1478 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4343,12 +4251,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4347 "util/configparser.c"
+#line 4255 "util/configparser.c"
     break;
 
   case 379:
-#line 1490 "./util/configparser.y"
-        {
+#line 1488 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4356,12 +4264,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4360 "util/configparser.c"
+#line 4268 "util/configparser.c"
     break;
 
   case 380:
-#line 1500 "./util/configparser.y"
-        {
+#line 1498 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4369,12 +4277,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4373 "util/configparser.c"
+#line 4281 "util/configparser.c"
     break;
 
   case 381:
-#line 1510 "./util/configparser.y"
-        {
+#line 1508 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4382,12 +4290,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4386 "util/configparser.c"
+#line 4294 "util/configparser.c"
     break;
 
   case 382:
-#line 1520 "./util/configparser.y"
-        {
+#line 1518 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4395,12 +4303,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4399 "util/configparser.c"
+#line 4307 "util/configparser.c"
     break;
 
   case 383:
-#line 1530 "./util/configparser.y"
-        {
+#line 1528 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4408,12 +4316,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4412 "util/configparser.c"
+#line 4320 "util/configparser.c"
     break;
 
   case 384:
-#line 1540 "./util/configparser.y"
-        {
+#line 1538 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4421,12 +4329,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4425 "util/configparser.c"
+#line 4333 "util/configparser.c"
     break;
 
   case 385:
-#line 1550 "./util/configparser.y"
-        {
+#line 1548 "./util/configparser.y"
+    {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4434,100 +4342,100 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4438 "util/configparser.c"
+#line 4346 "util/configparser.c"
     break;
 
   case 386:
-#line 1560 "./util/configparser.y"
-        {
+#line 1558 "./util/configparser.y"
+    {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4448 "util/configparser.c"
+#line 4356 "util/configparser.c"
     break;
 
   case 387:
-#line 1567 "./util/configparser.y"
-        {
+#line 1565 "./util/configparser.y"
+    {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4458 "util/configparser.c"
+#line 4366 "util/configparser.c"
     break;
 
   case 388:
-#line 1574 "./util/configparser.y"
-        {
+#line 1572 "./util/configparser.y"
+    {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4468 "util/configparser.c"
+#line 4376 "util/configparser.c"
     break;
 
   case 389:
-#line 1581 "./util/configparser.y"
-        {
+#line 1579 "./util/configparser.y"
+    {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4480 "util/configparser.c"
+#line 4388 "util/configparser.c"
     break;
 
   case 390:
-#line 1590 "./util/configparser.y"
-        {
+#line 1588 "./util/configparser.y"
+    {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4492 "util/configparser.c"
+#line 4400 "util/configparser.c"
     break;
 
   case 391:
-#line 1599 "./util/configparser.y"
-        {
+#line 1597 "./util/configparser.y"
+    {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4504 "util/configparser.c"
+#line 4412 "util/configparser.c"
     break;
 
   case 392:
-#line 1608 "./util/configparser.y"
-        {
+#line 1606 "./util/configparser.y"
+    {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4516 "util/configparser.c"
+#line 4424 "util/configparser.c"
     break;
 
   case 393:
-#line 1617 "./util/configparser.y"
-        {
+#line 1615 "./util/configparser.y"
+    {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4526 "util/configparser.c"
+#line 4434 "util/configparser.c"
     break;
 
   case 394:
-#line 1624 "./util/configparser.y"
-        {
+#line 1622 "./util/configparser.y"
+    {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4535,12 +4443,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4539 "util/configparser.c"
+#line 4447 "util/configparser.c"
     break;
 
   case 395:
-#line 1634 "./util/configparser.y"
-        {
+#line 1632 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
 			strcmp((yyvsp[0].str), "deny_non_local")!=0 &&
@@ -4558,22 +4466,22 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4562 "util/configparser.c"
+#line 4470 "util/configparser.c"
     break;
 
   case 396:
-#line 1654 "./util/configparser.y"
-        {
+#line 1652 "./util/configparser.y"
+    {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4572 "util/configparser.c"
+#line 4480 "util/configparser.c"
     break;
 
   case 397:
-#line 1661 "./util/configparser.y"
-        {
+#line 1659 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
 			cfg_parser->cfg->val_date_override = 0;
@@ -4589,12 +4497,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4593 "util/configparser.c"
+#line 4501 "util/configparser.c"
     break;
 
   case 398:
-#line 1679 "./util/configparser.y"
-        {
+#line 1677 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
 			cfg_parser->cfg->val_sig_skew_min = 0;
@@ -4605,12 +4513,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4609 "util/configparser.c"
+#line 4517 "util/configparser.c"
     break;
 
   case 399:
-#line 1692 "./util/configparser.y"
-        {
+#line 1690 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
 			cfg_parser->cfg->val_sig_skew_max = 0;
@@ -4621,60 +4529,60 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4625 "util/configparser.c"
+#line 4533 "util/configparser.c"
     break;
 
   case 400:
-#line 1705 "./util/configparser.y"
-        {
+#line 1703 "./util/configparser.y"
+    {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4637 "util/configparser.c"
+#line 4545 "util/configparser.c"
     break;
 
   case 401:
-#line 1714 "./util/configparser.y"
-        {
+#line 1712 "./util/configparser.y"
+    {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4649 "util/configparser.c"
+#line 4557 "util/configparser.c"
     break;
 
   case 402:
-#line 1723 "./util/configparser.y"
-        {
+#line 1721 "./util/configparser.y"
+    {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4661 "util/configparser.c"
+#line 4569 "util/configparser.c"
     break;
 
   case 403:
-#line 1732 "./util/configparser.y"
-        {
+#line 1730 "./util/configparser.y"
+    {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4673 "util/configparser.c"
+#line 4581 "util/configparser.c"
     break;
 
   case 404:
-#line 1741 "./util/configparser.y"
-        {
+#line 1739 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4682,12 +4590,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4686 "util/configparser.c"
+#line 4594 "util/configparser.c"
     break;
 
   case 405:
-#line 1751 "./util/configparser.y"
-        {
+#line 1749 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4695,12 +4603,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4699 "util/configparser.c"
+#line 4607 "util/configparser.c"
     break;
 
   case 406:
-#line 1761 "./util/configparser.y"
-        {
+#line 1759 "./util/configparser.y"
+    {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4709,84 +4617,84 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4713 "util/configparser.c"
+#line 4621 "util/configparser.c"
     break;
 
   case 407:
-#line 1772 "./util/configparser.y"
-        {
+#line 1770 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4725 "util/configparser.c"
+#line 4633 "util/configparser.c"
     break;
 
   case 408:
-#line 1781 "./util/configparser.y"
-        {
+#line 1779 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4737 "util/configparser.c"
+#line 4645 "util/configparser.c"
     break;
 
   case 409:
-#line 1790 "./util/configparser.y"
-        {
+#line 1788 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4749 "util/configparser.c"
+#line 4657 "util/configparser.c"
     break;
 
   case 410:
-#line 1799 "./util/configparser.y"
-        {
+#line 1797 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4761 "util/configparser.c"
+#line 4669 "util/configparser.c"
     break;
 
   case 411:
-#line 1808 "./util/configparser.y"
-        {
+#line 1806 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4773 "util/configparser.c"
+#line 4681 "util/configparser.c"
     break;
 
   case 412:
-#line 1817 "./util/configparser.y"
-        {
+#line 1815 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4785 "util/configparser.c"
+#line 4693 "util/configparser.c"
     break;
 
   case 413:
-#line 1826 "./util/configparser.y"
-        {
+#line 1824 "./util/configparser.y"
+    {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4797,12 +4705,12 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4801 "util/configparser.c"
+#line 4709 "util/configparser.c"
     break;
 
   case 414:
-#line 1839 "./util/configparser.y"
-        {
+#line 1837 "./util/configparser.y"
+    {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4813,70 +4721,70 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4817 "util/configparser.c"
+#line 4725 "util/configparser.c"
     break;
 
   case 415:
-#line 1852 "./util/configparser.y"
-        {
+#line 1850 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4829 "util/configparser.c"
+#line 4737 "util/configparser.c"
     break;
 
   case 416:
-#line 1861 "./util/configparser.y"
-        {
+#line 1859 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4839 "util/configparser.c"
+#line 4747 "util/configparser.c"
     break;
 
   case 417:
-#line 1868 "./util/configparser.y"
-        {
+#line 1866 "./util/configparser.y"
+    {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4851 "util/configparser.c"
+#line 4759 "util/configparser.c"
     break;
 
   case 418:
-#line 1877 "./util/configparser.y"
-        {
+#line 1875 "./util/configparser.y"
+    {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4863 "util/configparser.c"
+#line 4771 "util/configparser.c"
     break;
 
   case 419:
-#line 1886 "./util/configparser.y"
-        {
+#line 1884 "./util/configparser.y"
+    {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4875 "util/configparser.c"
+#line 4783 "util/configparser.c"
     break;
 
   case 420:
-#line 1895 "./util/configparser.y"
-        {
+#line 1893 "./util/configparser.y"
+    {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4884,23 +4792,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4888 "util/configparser.c"
+#line 4796 "util/configparser.c"
     break;
 
   case 421:
-#line 1904 "./util/configparser.y"
-        {
+#line 1902 "./util/configparser.y"
+    {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4899 "util/configparser.c"
+#line 4807 "util/configparser.c"
     break;
 
   case 422:
-#line 1912 "./util/configparser.y"
-        {
+#line 1910 "./util/configparser.y"
+    {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4911,23 +4819,23 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4915 "util/configparser.c"
+#line 4823 "util/configparser.c"
     break;
 
   case 423:
-#line 1925 "./util/configparser.y"
-        {
+#line 1923 "./util/configparser.y"
+    {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4926 "util/configparser.c"
+#line 4834 "util/configparser.c"
     break;
 
   case 424:
-#line 1933 "./util/configparser.y"
-        {
+#line 1931 "./util/configparser.y"
+    {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
 		   strcmp((yyvsp[0].str), "refuse")!=0 && strcmp((yyvsp[0].str), "redirect")!=0 &&
@@ -4966,22 +4874,22 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4970 "util/configparser.c"
+#line 4878 "util/configparser.c"
     break;
 
   case 425:
-#line 1974 "./util/configparser.y"
-        {
+#line 1972 "./util/configparser.y"
+    {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 4980 "util/configparser.c"
+#line 4888 "util/configparser.c"
     break;
 
   case 426:
-#line 1981 "./util/configparser.y"
-        {
+#line 1979 "./util/configparser.y"
+    {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -4994,12 +4902,12 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4998 "util/configparser.c"
+#line 4906 "util/configparser.c"
     break;
 
   case 427:
-#line 1996 "./util/configparser.y"
-        {
+#line 1994 "./util/configparser.y"
+    {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5007,12 +4915,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5011 "util/configparser.c"
+#line 4919 "util/configparser.c"
     break;
 
   case 428:
-#line 2006 "./util/configparser.y"
-        {
+#line 2004 "./util/configparser.y"
+    {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5020,65 +4928,65 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5024 "util/configparser.c"
+#line 4932 "util/configparser.c"
     break;
 
   case 429:
-#line 2016 "./util/configparser.y"
-        {
+#line 2014 "./util/configparser.y"
+    {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5034 "util/configparser.c"
+#line 4942 "util/configparser.c"
     break;
 
   case 430:
-#line 2023 "./util/configparser.y"
-        {
+#line 2021 "./util/configparser.y"
+    {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5044 "util/configparser.c"
+#line 4952 "util/configparser.c"
     break;
 
   case 431:
-#line 2030 "./util/configparser.y"
-        {
+#line 2028 "./util/configparser.y"
+    {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 5054 "util/configparser.c"
+#line 4962 "util/configparser.c"
     break;
 
   case 432:
-#line 2037 "./util/configparser.y"
-        {
+#line 2035 "./util/configparser.y"
+    {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5066 "util/configparser.c"
+#line 4974 "util/configparser.c"
     break;
 
   case 433:
-#line 2046 "./util/configparser.y"
-        {
+#line 2044 "./util/configparser.y"
+    {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 5077 "util/configparser.c"
+#line 4985 "util/configparser.c"
     break;
 
   case 434:
-#line 2054 "./util/configparser.y"
-        {
+#line 2052 "./util/configparser.y"
+    {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
 		while((p=strsep(&s, " \t\n")) != NULL) {
@@ -5090,12 +4998,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5094 "util/configparser.c"
+#line 5002 "util/configparser.c"
     break;
 
   case 435:
-#line 2068 "./util/configparser.y"
-        {
+#line 2066 "./util/configparser.y"
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5114,12 +5022,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5118 "util/configparser.c"
+#line 5026 "util/configparser.c"
     break;
 
   case 436:
-#line 2089 "./util/configparser.y"
-        {
+#line 2087 "./util/configparser.y"
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5138,12 +5046,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5142 "util/configparser.c"
+#line 5050 "util/configparser.c"
     break;
 
   case 437:
-#line 2110 "./util/configparser.y"
-        {
+#line 2108 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
 			(yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
@@ -5153,12 +5061,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5157 "util/configparser.c"
+#line 5065 "util/configparser.c"
     break;
 
   case 438:
-#line 2122 "./util/configparser.y"
-        {
+#line 2120 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
 			(yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
@@ -5168,12 +5076,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5172 "util/configparser.c"
+#line 5080 "util/configparser.c"
     break;
 
   case 439:
-#line 2134 "./util/configparser.y"
-        {
+#line 2132 "./util/configparser.y"
+    {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
 			(yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
@@ -5183,24 +5091,24 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5187 "util/configparser.c"
+#line 5095 "util/configparser.c"
     break;
 
   case 440:
-#line 2146 "./util/configparser.y"
-        {
+#line 2144 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
 			(yyvsp[-1].str), (yyvsp[0].str))) {
 			yyerror("out of memory");
 		}
 	}
-#line 5199 "util/configparser.c"
+#line 5107 "util/configparser.c"
     break;
 
   case 441:
-#line 2155 "./util/configparser.y"
-        {
+#line 2153 "./util/configparser.y"
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5219,58 +5127,58 @@ yyreduce:
 			}
 		}
 	}
-#line 5223 "util/configparser.c"
+#line 5131 "util/configparser.c"
     break;
 
   case 442:
-#line 2176 "./util/configparser.y"
-        { 
+#line 2174 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5235 "util/configparser.c"
+#line 5143 "util/configparser.c"
     break;
 
   case 443:
-#line 2186 "./util/configparser.y"
-        { 
+#line 2184 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5247 "util/configparser.c"
+#line 5155 "util/configparser.c"
     break;
 
   case 444:
-#line 2195 "./util/configparser.y"
-  {
+#line 2193 "./util/configparser.y"
+    {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5258 "util/configparser.c"
+#line 5166 "util/configparser.c"
     break;
 
   case 445:
-#line 2203 "./util/configparser.y"
-        {
+#line 2201 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5269 "util/configparser.c"
+#line 5177 "util/configparser.c"
     break;
 
   case 446:
-#line 2211 "./util/configparser.y"
-  {
+#line 2209 "./util/configparser.y"
+    {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -5281,12 +5189,12 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5285 "util/configparser.c"
+#line 5193 "util/configparser.c"
     break;
 
   case 447:
-#line 2224 "./util/configparser.y"
-        {
+#line 2222 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -5297,12 +5205,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5301 "util/configparser.c"
+#line 5209 "util/configparser.c"
     break;
 
   case 448:
-#line 2237 "./util/configparser.y"
-        {
+#line 2235 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
 			yyerror("number expected");
@@ -5315,12 +5223,12 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5319 "util/configparser.c"
+#line 5227 "util/configparser.c"
     break;
 
   case 449:
-#line 2252 "./util/configparser.y"
-        {
+#line 2250 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
 			yyerror("number expected");
@@ -5333,69 +5241,69 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5337 "util/configparser.c"
+#line 5245 "util/configparser.c"
     break;
 
   case 450:
-#line 2267 "./util/configparser.y"
-  { 
+#line 2265 "./util/configparser.y"
+    { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
   		yyerror("number expected");
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5349 "util/configparser.c"
+#line 5257 "util/configparser.c"
     break;
 
   case 451:
-#line 2276 "./util/configparser.y"
-        { 
+#line 2274 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5361 "util/configparser.c"
+#line 5269 "util/configparser.c"
     break;
 
   case 452:
-#line 2285 "./util/configparser.y"
-        { 
+#line 2283 "./util/configparser.y"
+    { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5370 "util/configparser.c"
+#line 5278 "util/configparser.c"
     break;
 
   case 453:
-#line 2291 "./util/configparser.y"
-        { 
+#line 2289 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5382 "util/configparser.c"
+#line 5290 "util/configparser.c"
     break;
 
   case 454:
-#line 2300 "./util/configparser.y"
-        { 
+#line 2298 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5394 "util/configparser.c"
+#line 5302 "util/configparser.c"
     break;
 
   case 455:
-#line 2309 "./util/configparser.y"
-        {
+#line 2307 "./util/configparser.y"
+    {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5403,12 +5311,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5407 "util/configparser.c"
+#line 5315 "util/configparser.c"
     break;
 
   case 456:
-#line 2319 "./util/configparser.y"
-        {
+#line 2317 "./util/configparser.y"
+    {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5416,12 +5324,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5420 "util/configparser.c"
+#line 5328 "util/configparser.c"
     break;
 
   case 457:
-#line 2329 "./util/configparser.y"
-        {
+#line 2327 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5432,12 +5340,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5436 "util/configparser.c"
+#line 5344 "util/configparser.c"
     break;
 
   case 458:
-#line 2342 "./util/configparser.y"
-        {
+#line 2340 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5448,12 +5356,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5452 "util/configparser.c"
+#line 5360 "util/configparser.c"
     break;
 
   case 459:
-#line 2355 "./util/configparser.y"
-        {
+#line 2353 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ipsecmod_hook);
@@ -5463,12 +5371,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5467 "util/configparser.c"
+#line 5375 "util/configparser.c"
     break;
 
   case 460:
-#line 2367 "./util/configparser.y"
-        {
+#line 2365 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5480,12 +5388,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5484 "util/configparser.c"
+#line 5392 "util/configparser.c"
     break;
 
   case 461:
-#line 2381 "./util/configparser.y"
-        {
+#line 2379 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->ipsecmod_whitelist, (yyvsp[0].str)))
@@ -5495,12 +5403,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5499 "util/configparser.c"
+#line 5407 "util/configparser.c"
     break;
 
   case 462:
-#line 2393 "./util/configparser.y"
-        {
+#line 2391 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5512,12 +5420,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5516 "util/configparser.c"
+#line 5424 "util/configparser.c"
     break;
 
   case 463:
-#line 2407 "./util/configparser.y"
-        {
+#line 2405 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
 			yyerror("stub name override, there must be one name "
@@ -5525,56 +5433,56 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5529 "util/configparser.c"
+#line 5437 "util/configparser.c"
     break;
 
   case 464:
-#line 2417 "./util/configparser.y"
-        {
+#line 2415 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5539 "util/configparser.c"
+#line 5447 "util/configparser.c"
     break;
 
   case 465:
-#line 2424 "./util/configparser.y"
-        {
+#line 2422 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5549 "util/configparser.c"
+#line 5457 "util/configparser.c"
     break;
 
   case 466:
-#line 2431 "./util/configparser.y"
-        {
+#line 2429 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5561 "util/configparser.c"
+#line 5469 "util/configparser.c"
     break;
 
   case 467:
-#line 2440 "./util/configparser.y"
-        {
+#line 2438 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5573 "util/configparser.c"
+#line 5481 "util/configparser.c"
     break;
 
   case 468:
-#line 2449 "./util/configparser.y"
-        {
+#line 2447 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5582,12 +5490,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5586 "util/configparser.c"
+#line 5494 "util/configparser.c"
     break;
 
   case 469:
-#line 2459 "./util/configparser.y"
-        {
+#line 2457 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5595,12 +5503,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5599 "util/configparser.c"
+#line 5507 "util/configparser.c"
     break;
 
   case 470:
-#line 2469 "./util/configparser.y"
-        {
+#line 2467 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
 			yyerror("forward name override, there must be one "
@@ -5608,56 +5516,56 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5612 "util/configparser.c"
+#line 5520 "util/configparser.c"
     break;
 
   case 471:
-#line 2479 "./util/configparser.y"
-        {
+#line 2477 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5622 "util/configparser.c"
+#line 5530 "util/configparser.c"
     break;
 
   case 472:
-#line 2486 "./util/configparser.y"
-        {
+#line 2484 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5632 "util/configparser.c"
+#line 5540 "util/configparser.c"
     break;
 
   case 473:
-#line 2493 "./util/configparser.y"
-        {
+#line 2491 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5644 "util/configparser.c"
+#line 5552 "util/configparser.c"
     break;
 
   case 474:
-#line 2502 "./util/configparser.y"
-        {
+#line 2500 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5656 "util/configparser.c"
+#line 5564 "util/configparser.c"
     break;
 
   case 475:
-#line 2511 "./util/configparser.y"
-        {
+#line 2509 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5665,12 +5573,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5669 "util/configparser.c"
+#line 5577 "util/configparser.c"
     break;
 
   case 476:
-#line 2521 "./util/configparser.y"
-        {
+#line 2519 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
 			yyerror("auth name override, there must be one name "
@@ -5678,53 +5586,53 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5682 "util/configparser.c"
+#line 5590 "util/configparser.c"
     break;
 
   case 477:
-#line 2531 "./util/configparser.y"
-        {
+#line 2529 "./util/configparser.y"
+    {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5692 "util/configparser.c"
+#line 5600 "util/configparser.c"
     break;
 
   case 478:
-#line 2538 "./util/configparser.y"
-        {
+#line 2536 "./util/configparser.y"
+    {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5702 "util/configparser.c"
+#line 5610 "util/configparser.c"
     break;
 
   case 479:
-#line 2545 "./util/configparser.y"
-        {
+#line 2543 "./util/configparser.y"
+    {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5712 "util/configparser.c"
+#line 5620 "util/configparser.c"
     break;
 
   case 480:
-#line 2552 "./util/configparser.y"
-        {
+#line 2550 "./util/configparser.y"
+    {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5723 "util/configparser.c"
+#line 5631 "util/configparser.c"
     break;
 
   case 481:
-#line 2560 "./util/configparser.y"
-        {
+#line 2558 "./util/configparser.y"
+    {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5732,12 +5640,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5736 "util/configparser.c"
+#line 5644 "util/configparser.c"
     break;
 
   case 482:
-#line 2570 "./util/configparser.y"
-        {
+#line 2568 "./util/configparser.y"
+    {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5745,12 +5653,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5749 "util/configparser.c"
+#line 5657 "util/configparser.c"
     break;
 
   case 483:
-#line 2580 "./util/configparser.y"
-        {
+#line 2578 "./util/configparser.y"
+    {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5758,12 +5666,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5762 "util/configparser.c"
+#line 5670 "util/configparser.c"
     break;
 
   case 484:
-#line 2590 "./util/configparser.y"
-        {
+#line 2588 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
 			yyerror("view name override, there must be one "
@@ -5771,12 +5679,12 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5775 "util/configparser.c"
+#line 5683 "util/configparser.c"
     break;
 
   case 485:
-#line 2600 "./util/configparser.y"
-        {
+#line 2598 "./util/configparser.y"
+    {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
 		   strcmp((yyvsp[0].str), "refuse")!=0 && strcmp((yyvsp[0].str), "redirect")!=0 &&
@@ -5813,12 +5721,12 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5817 "util/configparser.c"
+#line 5725 "util/configparser.c"
     break;
 
   case 486:
-#line 2639 "./util/configparser.y"
-        {
+#line 2637 "./util/configparser.y"
+    {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
 		if(!cfg_str2list_insert(
@@ -5826,34 +5734,34 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5830 "util/configparser.c"
+#line 5738 "util/configparser.c"
     break;
 
   case 487:
-#line 2649 "./util/configparser.y"
-        {
+#line 2647 "./util/configparser.y"
+    {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5841 "util/configparser.c"
+#line 5749 "util/configparser.c"
     break;
 
   case 488:
-#line 2657 "./util/configparser.y"
-        {
+#line 2655 "./util/configparser.y"
+    {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5852 "util/configparser.c"
+#line 5760 "util/configparser.c"
     break;
 
   case 489:
-#line 2665 "./util/configparser.y"
-        {
+#line 2663 "./util/configparser.y"
+    {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -5866,32 +5774,32 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5870 "util/configparser.c"
+#line 5778 "util/configparser.c"
     break;
 
   case 490:
-#line 2680 "./util/configparser.y"
-        {
+#line 2678 "./util/configparser.y"
+    {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5882 "util/configparser.c"
+#line 5790 "util/configparser.c"
     break;
 
   case 491:
-#line 2689 "./util/configparser.y"
-        { 
+#line 2687 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5890 "util/configparser.c"
+#line 5798 "util/configparser.c"
     break;
 
   case 502:
-#line 2700 "./util/configparser.y"
-        {
+#line 2698 "./util/configparser.y"
+    {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5899,104 +5807,104 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5903 "util/configparser.c"
+#line 5811 "util/configparser.c"
     break;
 
   case 503:
-#line 2710 "./util/configparser.y"
-        {
+#line 2708 "./util/configparser.y"
+    {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("control port number expected");
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5915 "util/configparser.c"
+#line 5823 "util/configparser.c"
     break;
 
   case 504:
-#line 2719 "./util/configparser.y"
-        {
+#line 2717 "./util/configparser.y"
+    {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5925 "util/configparser.c"
+#line 5833 "util/configparser.c"
     break;
 
   case 505:
-#line 2726 "./util/configparser.y"
-        {
+#line 2724 "./util/configparser.y"
+    {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5935 "util/configparser.c"
+#line 5843 "util/configparser.c"
     break;
 
   case 506:
-#line 2733 "./util/configparser.y"
-        {
+#line 2731 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 5945 "util/configparser.c"
+#line 5853 "util/configparser.c"
     break;
 
   case 507:
-#line 2740 "./util/configparser.y"
-        {
+#line 2738 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 5955 "util/configparser.c"
+#line 5863 "util/configparser.c"
     break;
 
   case 508:
-#line 2747 "./util/configparser.y"
-        {
+#line 2745 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 5965 "util/configparser.c"
+#line 5873 "util/configparser.c"
     break;
 
   case 509:
-#line 2754 "./util/configparser.y"
-        {
+#line 2752 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 5975 "util/configparser.c"
+#line 5883 "util/configparser.c"
     break;
 
   case 510:
-#line 2761 "./util/configparser.y"
-        {
+#line 2759 "./util/configparser.y"
+    {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 5983 "util/configparser.c"
+#line 5891 "util/configparser.c"
     break;
 
   case 532:
-#line 2781 "./util/configparser.y"
-        {
+#line 2779 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5995 "util/configparser.c"
+#line 5903 "util/configparser.c"
     break;
 
   case 533:
-#line 2790 "./util/configparser.y"
-        {
+#line 2788 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6004,128 +5912,128 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6008 "util/configparser.c"
+#line 5916 "util/configparser.c"
     break;
 
   case 534:
-#line 2800 "./util/configparser.y"
-        {
+#line 2798 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 6018 "util/configparser.c"
+#line 5926 "util/configparser.c"
     break;
 
   case 535:
-#line 2807 "./util/configparser.y"
-        {
+#line 2805 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 6028 "util/configparser.c"
+#line 5936 "util/configparser.c"
     break;
 
   case 536:
-#line 2814 "./util/configparser.y"
-        {
+#line 2812 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6040 "util/configparser.c"
+#line 5948 "util/configparser.c"
     break;
 
   case 537:
-#line 2823 "./util/configparser.y"
-        {
+#line 2821 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 6050 "util/configparser.c"
+#line 5958 "util/configparser.c"
     break;
 
   case 538:
-#line 2830 "./util/configparser.y"
-        {
+#line 2828 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 6060 "util/configparser.c"
+#line 5968 "util/configparser.c"
     break;
 
   case 539:
-#line 2837 "./util/configparser.y"
-        {
+#line 2835 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 6070 "util/configparser.c"
+#line 5978 "util/configparser.c"
     break;
 
   case 540:
-#line 2844 "./util/configparser.y"
-        {
+#line 2842 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 6080 "util/configparser.c"
+#line 5988 "util/configparser.c"
     break;
 
   case 541:
-#line 2851 "./util/configparser.y"
-        {
+#line 2849 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6092 "util/configparser.c"
+#line 6000 "util/configparser.c"
     break;
 
   case 542:
-#line 2860 "./util/configparser.y"
-        {
+#line 2858 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6104 "util/configparser.c"
+#line 6012 "util/configparser.c"
     break;
 
   case 543:
-#line 2869 "./util/configparser.y"
-        {
+#line 2867 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6114 "util/configparser.c"
+#line 6022 "util/configparser.c"
     break;
 
   case 544:
-#line 2876 "./util/configparser.y"
-        {
+#line 2874 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6124 "util/configparser.c"
+#line 6032 "util/configparser.c"
     break;
 
   case 545:
-#line 2883 "./util/configparser.y"
-        {
+#line 2881 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6133,12 +6041,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6137 "util/configparser.c"
+#line 6045 "util/configparser.c"
     break;
 
   case 546:
-#line 2893 "./util/configparser.y"
-        {
+#line 2891 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6146,12 +6054,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6150 "util/configparser.c"
+#line 6058 "util/configparser.c"
     break;
 
   case 547:
-#line 2903 "./util/configparser.y"
-        {
+#line 2901 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6159,12 +6067,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6163 "util/configparser.c"
+#line 6071 "util/configparser.c"
     break;
 
   case 548:
-#line 2913 "./util/configparser.y"
-        {
+#line 2911 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6172,12 +6080,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6176 "util/configparser.c"
+#line 6084 "util/configparser.c"
     break;
 
   case 549:
-#line 2923 "./util/configparser.y"
-        {
+#line 2921 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6185,12 +6093,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6189 "util/configparser.c"
+#line 6097 "util/configparser.c"
     break;
 
   case 550:
-#line 2933 "./util/configparser.y"
-        {
+#line 2931 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6198,48 +6106,48 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6202 "util/configparser.c"
+#line 6110 "util/configparser.c"
     break;
 
   case 551:
-#line 2943 "./util/configparser.y"
-        { 
+#line 2941 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6210 "util/configparser.c"
+#line 6118 "util/configparser.c"
     break;
 
   case 555:
-#line 2952 "./util/configparser.y"
-        {
+#line 2950 "./util/configparser.y"
+    {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6220 "util/configparser.c"
+#line 6128 "util/configparser.c"
     break;
 
   case 556:
-#line 2958 "./util/configparser.y"
-        { 
+#line 2956 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6228 "util/configparser.c"
+#line 6136 "util/configparser.c"
     break;
 
   case 560:
-#line 2967 "./util/configparser.y"
-        {
+#line 2965 "./util/configparser.y"
+    {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6238 "util/configparser.c"
+#line 6146 "util/configparser.c"
     break;
 
   case 561:
-#line 2973 "./util/configparser.y"
-        {
+#line 2971 "./util/configparser.y"
+    {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6247,132 +6155,132 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6251 "util/configparser.c"
+#line 6159 "util/configparser.c"
     break;
 
   case 562:
-#line 2983 "./util/configparser.y"
-        {
+#line 2981 "./util/configparser.y"
+    {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6261 "util/configparser.c"
+#line 6169 "util/configparser.c"
     break;
 
   case 563:
-#line 2990 "./util/configparser.y"
-        {
+#line 2988 "./util/configparser.y"
+    {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_actions,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6273 "util/configparser.c"
+#line 6181 "util/configparser.c"
     break;
 
   case 564:
-#line 2999 "./util/configparser.y"
-        {
+#line 2997 "./util/configparser.y"
+    {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6284 "util/configparser.c"
+#line 6192 "util/configparser.c"
     break;
 
   case 565:
-#line 3007 "./util/configparser.y"
-        {
+#line 3005 "./util/configparser.y"
+    {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6292 "util/configparser.c"
+#line 6200 "util/configparser.c"
     break;
 
   case 578:
-#line 3023 "./util/configparser.y"
-        {
+#line 3021 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6304 "util/configparser.c"
+#line 6212 "util/configparser.c"
     break;
 
   case 579:
-#line 3033 "./util/configparser.y"
-        {
+#line 3031 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6316 "util/configparser.c"
+#line 6224 "util/configparser.c"
     break;
 
   case 580:
-#line 3042 "./util/configparser.y"
-        {
+#line 3040 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6326 "util/configparser.c"
+#line 6234 "util/configparser.c"
     break;
 
   case 581:
-#line 3049 "./util/configparser.y"
-        {
+#line 3047 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			log_warn("dnscrypt-provider-cert %s is a duplicate", (yyvsp[0].str));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6338 "util/configparser.c"
+#line 6246 "util/configparser.c"
     break;
 
   case 582:
-#line 3058 "./util/configparser.y"
-        {
+#line 3056 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6348 "util/configparser.c"
+#line 6256 "util/configparser.c"
     break;
 
   case 583:
-#line 3065 "./util/configparser.y"
-        {
+#line 3063 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			log_warn("dnscrypt-secret-key: %s is a duplicate", (yyvsp[0].str));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6360 "util/configparser.c"
+#line 6268 "util/configparser.c"
     break;
 
   case 584:
-#line 3074 "./util/configparser.y"
-  {
+#line 3072 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6371 "util/configparser.c"
+#line 6279 "util/configparser.c"
     break;
 
   case 585:
-#line 3082 "./util/configparser.y"
-  {
+#line 3080 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -6383,23 +6291,23 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6387 "util/configparser.c"
+#line 6295 "util/configparser.c"
     break;
 
   case 586:
-#line 3095 "./util/configparser.y"
-  {
+#line 3093 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6398 "util/configparser.c"
+#line 6306 "util/configparser.c"
     break;
 
   case 587:
-#line 3103 "./util/configparser.y"
-  {
+#line 3101 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -6410,20 +6318,20 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6414 "util/configparser.c"
+#line 6322 "util/configparser.c"
     break;
 
   case 588:
-#line 3116 "./util/configparser.y"
-        {
+#line 3114 "./util/configparser.y"
+    {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6422 "util/configparser.c"
+#line 6330 "util/configparser.c"
     break;
 
   case 597:
-#line 3127 "./util/configparser.y"
-        {
+#line 3125 "./util/configparser.y"
+    {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_backend);
@@ -6433,12 +6341,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6437 "util/configparser.c"
+#line 6345 "util/configparser.c"
     break;
 
   case 598:
-#line 3139 "./util/configparser.y"
-        {
+#line 3137 "./util/configparser.y"
+    {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_secret);
@@ -6448,12 +6356,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6452 "util/configparser.c"
+#line 6360 "util/configparser.c"
     break;
 
   case 599:
-#line 3151 "./util/configparser.y"
-        {
+#line 3149 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->redis_server_host);
@@ -6463,12 +6371,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6467 "util/configparser.c"
+#line 6375 "util/configparser.c"
     break;
 
   case 600:
-#line 3163 "./util/configparser.y"
-        {
+#line 3161 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
 		OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str)));
@@ -6481,12 +6389,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6485 "util/configparser.c"
+#line 6393 "util/configparser.c"
     break;
 
   case 601:
-#line 3178 "./util/configparser.y"
-        {
+#line 3176 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6497,12 +6405,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6501 "util/configparser.c"
+#line 6409 "util/configparser.c"
     break;
 
   case 602:
-#line 3191 "./util/configparser.y"
-        {
+#line 3189 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6513,12 +6421,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6517 "util/configparser.c"
+#line 6425 "util/configparser.c"
     break;
 
   case 603:
-#line 3204 "./util/configparser.y"
-        {
+#line 3202 "./util/configparser.y"
+    {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
 			yyerror("positive number expected");
@@ -6527,20 +6435,20 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6531 "util/configparser.c"
+#line 6439 "util/configparser.c"
     break;
 
   case 604:
-#line 3215 "./util/configparser.y"
-                {
+#line 3213 "./util/configparser.y"
+    {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6539 "util/configparser.c"
+#line 6447 "util/configparser.c"
     break;
 
   case 609:
-#line 3224 "./util/configparser.y"
-                {
+#line 3222 "./util/configparser.y"
+    {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v4)
@@ -6553,12 +6461,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6557 "util/configparser.c"
+#line 6465 "util/configparser.c"
     break;
 
   case 610:
-#line 3239 "./util/configparser.y"
-        {
+#line 3237 "./util/configparser.y"
+    {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v6)
@@ -6571,11 +6479,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6575 "util/configparser.c"
+#line 6483 "util/configparser.c"
     break;
 
 
-#line 6579 "util/configparser.c"
+#line 6487 "util/configparser.c"
 
       default: break;
     }
@@ -6639,7 +6547,7 @@ yyerrlab:
           {
             if (yymsg != yymsgbuf)
               YYSTACK_FREE (yymsg);
-            yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
             if (!yymsg)
               {
                 yymsg = yymsgbuf;
@@ -6807,7 +6715,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3253 "./util/configparser.y"
+#line 3251 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 2a86ce512..4d3381fa3 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.5.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
 /* Bison interface for Yacc-like parsers in C
 
diff --git a/util/configparser.y b/util/configparser.y
index fe600a999..52ec8251c 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -1120,15 +1120,13 @@ server_root_hints: VAR_ROOT_HINTS STRING_ARG
 server_dlv_anchor_file: VAR_DLV_ANCHOR_FILE STRING_ARG
 	{
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", $2));
-		free(cfg_parser->cfg->dlv_anchor_file);
-		cfg_parser->cfg->dlv_anchor_file = $2;
+		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
 	}
 	;
 server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG
 	{
 		OUTYY(("P(server_dlv_anchor:%s)\n", $2));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, $2))
-			yyerror("out of memory");
+		log_warn("option dlv-anchor ignored: DLV is decommissioned");
 	}
 	;
 server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG
diff --git a/validator/val_anchor.c b/validator/val_anchor.c
index 7224f00a2..9b6574c5d 100644
--- a/validator/val_anchor.c
+++ b/validator/val_anchor.c
@@ -1030,8 +1030,6 @@ anchors_assemble_rrsets(struct val_anchors* anchors)
 				")", b);
 			(void)rbtree_delete(anchors->tree, &ta->node);
 			lock_basic_unlock(&ta->lock);
-			if(anchors->dlv_anchor == ta)
-				anchors->dlv_anchor = NULL;
 			anchors_delfunc(&ta->node, NULL);
 			ta = next;
 			continue;
@@ -1103,37 +1101,6 @@ anchors_apply_cfg(struct val_anchors* anchors, struct config_file* cfg)
 			return 0;
 		}
 	}
-	if(cfg->dlv_anchor_file && cfg->dlv_anchor_file[0] != 0) {
-		struct trust_anchor* dlva;
-		nm = cfg->dlv_anchor_file;
-		if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm,
-			cfg->chrootdir, strlen(cfg->chrootdir)) == 0)
-			nm += strlen(cfg->chrootdir);
-		if(!(dlva = anchor_read_file(anchors, parsebuf,
-			nm, 1))) {
-			log_err("error reading dlv-anchor-file: %s", 
-				cfg->dlv_anchor_file);
-			sldns_buffer_free(parsebuf);
-			return 0;
-		}
-		lock_basic_lock(&anchors->lock);
-		anchors->dlv_anchor = dlva;
-		lock_basic_unlock(&anchors->lock);
-	}
-	for(f = cfg->dlv_anchor_list; f; f = f->next) {
-		struct trust_anchor* dlva;
-		if(!f->str || f->str[0] == 0) /* empty "" */
-			continue;
-		if(!(dlva = anchor_store_str(
-			anchors, parsebuf, f->str))) {
-			log_err("error in dlv-anchor: \"%s\"", f->str);
-			sldns_buffer_free(parsebuf);
-			return 0;
-		}
-		lock_basic_lock(&anchors->lock);
-		anchors->dlv_anchor = dlva;
-		lock_basic_unlock(&anchors->lock);
-	}
 	/* do autr last, so that it sees what anchors are filled by other
 	 * means can can print errors about double config for the name */
 	for(f = cfg->auto_trust_anchor_file_list; f; f = f->next) {
diff --git a/validator/val_anchor.h b/validator/val_anchor.h
index a2a795d09..1597a7d62 100644
--- a/validator/val_anchor.h
+++ b/validator/val_anchor.h
@@ -67,8 +67,6 @@ struct val_anchors {
 	 * contents of type trust_anchor.
 	 */
 	rbtree_type* tree;
-	/** The DLV trust anchor (if one is configured, else NULL) */
-	struct trust_anchor* dlv_anchor;
 	/** Autotrust global data, anchors sorted by next probe time */
 	struct autr_global_data* autr;
 };
diff --git a/validator/val_neg.c b/validator/val_neg.c
index 4c08e6bbc..67699b1f7 100644
--- a/validator/val_neg.c
+++ b/validator/val_neg.c
@@ -965,108 +965,6 @@ static int neg_closest_data(struct val_neg_zone* zone,
 	}
 }
 
-int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len,
-        uint16_t qclass, struct rrset_cache* rrset_cache, time_t now)
-{
-	/* lookup closest zone */
-	struct val_neg_zone* zone;
-	struct val_neg_data* data;
-	int labs;
-	struct ub_packed_rrset_key* nsec;
-	struct packed_rrset_data* d;
-	uint32_t flags;
-	uint8_t* wc;
-	struct query_info qinfo;
-	if(!neg) return 0;
-
-	log_nametypeclass(VERB_ALGO, "negcache dlvlookup", qname, 
-		LDNS_RR_TYPE_DLV, qclass);
-	
-	labs = dname_count_labels(qname);
-	lock_basic_lock(&neg->lock);
-	zone = neg_closest_zone_parent(neg, qname, len, labs, qclass);
-	while(zone && !zone->in_use)
-		zone = zone->parent;
-	if(!zone) {
-		lock_basic_unlock(&neg->lock);
-		return 0;
-	}
-	log_nametypeclass(VERB_ALGO, "negcache zone", zone->name, 0, 
-		zone->dclass);
-
-	/* DLV is defined to use NSEC only */
-	if(zone->nsec3_hash) {
-		lock_basic_unlock(&neg->lock);
-		return 0;
-	}
-
-	/* lookup closest data record */
-	(void)neg_closest_data(zone, qname, len, labs, &data);
-	while(data && !data->in_use)
-		data = data->parent;
-	if(!data) {
-		lock_basic_unlock(&neg->lock);
-		return 0;
-	}
-	log_nametypeclass(VERB_ALGO, "negcache rr", data->name, 
-		LDNS_RR_TYPE_NSEC, zone->dclass);
-
-	/* lookup rrset in rrset cache */
-	flags = 0;
-	if(query_dname_compare(data->name, zone->name) == 0)
-		flags = PACKED_RRSET_NSEC_AT_APEX;
-	nsec = rrset_cache_lookup(rrset_cache, data->name, data->len,
-		LDNS_RR_TYPE_NSEC, zone->dclass, flags, now, 0);
-
-	/* check if secure and TTL ok */
-	if(!nsec) {
-		lock_basic_unlock(&neg->lock);
-		return 0;
-	}
-	d = (struct packed_rrset_data*)nsec->entry.data;
-	if(!d || now > d->ttl) {
-		lock_rw_unlock(&nsec->entry.lock);
-		/* delete data record if expired */
-		neg_delete_data(neg, data);
-		lock_basic_unlock(&neg->lock);
-		return 0;
-	}
-	if(d->security != sec_status_secure) {
-		lock_rw_unlock(&nsec->entry.lock);
-		neg_delete_data(neg, data);
-		lock_basic_unlock(&neg->lock);
-		return 0;
-	}
-	verbose(VERB_ALGO, "negcache got secure rrset");
-
-	/* check NSEC security */
-	/* check if NSEC proves no DLV type exists */
-	/* check if NSEC proves NXDOMAIN for qname */
-	qinfo.qname = qname;
-	qinfo.qtype = LDNS_RR_TYPE_DLV;
-	qinfo.qclass = qclass;
-	qinfo.local_alias = NULL;
-	if(!nsec_proves_nodata(nsec, &qinfo, &wc) &&
-		!val_nsec_proves_name_error(nsec, qname)) {
-		/* the NSEC is not a denial for the DLV */
-		lock_rw_unlock(&nsec->entry.lock);
-		lock_basic_unlock(&neg->lock);
-		verbose(VERB_ALGO, "negcache not proven");
-		return 0;
-	}
-	/* so the NSEC was a NODATA proof, or NXDOMAIN proof. */
-
-	/* no need to check for wildcard NSEC; no wildcards in DLV repos */
-	/* no need to lookup SOA record for client; no response message */
-
-	lock_rw_unlock(&nsec->entry.lock);
-	/* if OK touch the LRU for neg_data element */
-	neg_lru_touch(neg, data);
-	lock_basic_unlock(&neg->lock);
-	verbose(VERB_ALGO, "negcache DLV denial proven");
-	return 1;
-}
-
 void val_neg_addreferral(struct val_neg_cache* neg, struct reply_info* rep,
 	uint8_t* zone_name)
 {
diff --git a/validator/val_neg.h b/validator/val_neg.h
index 877f5c944..5643ca331 100644
--- a/validator/val_neg.h
+++ b/validator/val_neg.h
@@ -218,26 +218,6 @@ void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep);
 void val_neg_addreferral(struct val_neg_cache* neg, struct reply_info* rep,
 	uint8_t* zone);
 
-/**
- * Perform a DLV style lookup
- * During the lookup, we could find out that data has expired. In that
- * case the neg_cache entries are removed, and lookup fails.
- *
- * @param neg: negative cache.
- * @param qname: name to look for
- * @param len: length of qname.
- * @param qclass: class to look in.
- * @param rrset_cache: the rrset cache, for NSEC lookups.
- * @param now: current time for ttl checks.
- * @return 
- *	0 on error
- *	0 if no proof of negative
- *	1 if indeed negative was proven
- *	  thus, qname DLV qclass does not exist.
- */
-int val_neg_dlvlookup(struct val_neg_cache* neg, uint8_t* qname, size_t len,
-	uint16_t qclass, struct rrset_cache* rrset_cache, time_t now);
-
 /**
  * For the given query, try to get a reply out of the negative cache.
  * The reply still needs to be validated.
diff --git a/validator/val_nsec.c b/validator/val_nsec.c
index a795e7733..032d2ae03 100644
--- a/validator/val_nsec.c
+++ b/validator/val_nsec.c
@@ -541,86 +541,3 @@ val_nsec_proves_no_wc(struct ub_packed_rrset_key* nsec, uint8_t* qname,
 	}
 	return 0;
 }
-
-/**
- * Find shared topdomain that exists
- */
-static void
-dlv_topdomain(struct ub_packed_rrset_key* nsec, uint8_t* qname,
-	uint8_t** nm, size_t* nm_len)
-{
-	/* make sure reply is part of nm */
-	/* take shared topdomain with left of NSEC. */
-
-	/* because, if empty nonterminal, then right is subdomain of qname.
-	 * and any shared topdomain would be empty nonterminals.
-	 * 
-	 * If nxdomain, then the right is bigger, and could have an 
-	 * interesting shared topdomain, but if it does have one, it is
-	 * an empty nonterminal. An empty nonterminal shared with the left
-	 * one. */
-	int n;
-	uint8_t* common = dname_get_shared_topdomain(qname, nsec->rk.dname);
-	n = dname_count_labels(*nm) - dname_count_labels(common);
-	dname_remove_labels(nm, nm_len, n);
-}
-
-int val_nsec_check_dlv(struct query_info* qinfo,
-        struct reply_info* rep, uint8_t** nm, size_t* nm_len)
-{
-	uint8_t* next;
-	size_t i, nlen;
-	int c;
-	/* we should now have a NOERROR/NODATA or NXDOMAIN message */
-	if(rep->an_numrrsets != 0) {
-		return 0;
-	}
-	/* is this NOERROR ? */
-	if(FLAGS_GET_RCODE(rep->flags) == LDNS_RCODE_NOERROR) {
-		/* it can be a plain NSEC match - go up one more level. */
-		/* or its an empty nonterminal - go up to nonempty level */
-		for(i=0; i<rep->ns_numrrsets; i++) {
-			if(htons(rep->rrsets[i]->rk.type)!=LDNS_RR_TYPE_NSEC ||
-				!nsec_get_next(rep->rrsets[i], &next, &nlen))
-				continue;
-			c = dname_canonical_compare(
-				rep->rrsets[i]->rk.dname, qinfo->qname);
-			if(c == 0) {
-				/* plain match */
-				if(nsec_has_type(rep->rrsets[i],
-					LDNS_RR_TYPE_DLV))
-					return 0;
-				dname_remove_label(nm, nm_len);
-				return 1;
-			} else if(c < 0 && 
-				dname_strict_subdomain_c(next, qinfo->qname)) {
-				/* ENT */
-				dlv_topdomain(rep->rrsets[i], qinfo->qname,
-					nm, nm_len);
-				return 1;
-			}
-		}
-		return 0;
-	}
-
-	/* is this NXDOMAIN ? */
-	if(FLAGS_GET_RCODE(rep->flags) == LDNS_RCODE_NXDOMAIN) {
-		/* find the qname denial NSEC record. It can tell us
-		 * a closest encloser name; or that we not need bother */
-		for(i=0; i<rep->ns_numrrsets; i++) {
-			if(htons(rep->rrsets[i]->rk.type) != LDNS_RR_TYPE_NSEC)
-				continue;
-			if(val_nsec_proves_name_error(rep->rrsets[i], 
-				qinfo->qname)) {
-				log_nametypeclass(VERB_ALGO, "topdomain on",
-					rep->rrsets[i]->rk.dname, 
-					ntohs(rep->rrsets[i]->rk.type), 0);
-				dlv_topdomain(rep->rrsets[i], qinfo->qname,
-					nm, nm_len);
-				return 1;
-			}
-		}
-		return 0;
-	}
-	return 0;
-}
diff --git a/validator/val_nsec.h b/validator/val_nsec.h
index 4e71257bc..7117809d6 100644
--- a/validator/val_nsec.h
+++ b/validator/val_nsec.h
@@ -158,19 +158,6 @@ uint8_t* nsec_closest_encloser(uint8_t* qname,
 int val_nsec_proves_no_wc(struct ub_packed_rrset_key* nsec, uint8_t* qname, 
 	size_t qnamelen);
 
-/**
- * Determine the DLV result, what to do with NSEC DLV reply.
- * @param qinfo: what was queried for.
- * @param rep: the nonpositive reply.
- * @param nm: dlv lookup name, to adjust for new lookup name (if needed).
- * @param nm_len: length of lookup name.
- * @return 0 on error, 1 if a higher point is found.
- * 	If the higher point is above the dlv repo anchor, the qname does 
- * 	not exist.
- */
-int val_nsec_check_dlv(struct query_info* qinfo,
-	struct reply_info* rep, uint8_t** nm, size_t* nm_len);
-
 /**
  * Determine if an nsec proves an insecure delegation towards the qname.
  * @param nsec: nsec rrset.
diff --git a/validator/validator.h b/validator/validator.h
index 9e4c8a941..35da1920a 100644
--- a/validator/validator.h
+++ b/validator/validator.h
@@ -137,8 +137,6 @@ enum val_state {
 	VAL_VALIDATE_STATE,
 	/** finish up */
 	VAL_FINISHED_STATE,
-	/** DLV lookup state, processing DLV queries */
-	VAL_DLVLOOKUP_STATE
 };
 
 /**
@@ -217,27 +215,6 @@ struct val_qstate {
 
 	/** true if this state is waiting to prime a trust anchor */
 	int wait_prime_ta;
-
-	/** have we already checked the DLV? */
-	int dlv_checked;
-	/** The name for which the DLV is looked up. For the current message
-	 * or for the current RRset (for CNAME, REFERRAL types).
-	 * If there is signer name, that may be it, else a domain name */
-	uint8_t* dlv_lookup_name;
-	/** length of dlv lookup name */
-	size_t dlv_lookup_name_len;
-	/** Name at which chain of trust stopped with insecure, starting DLV
-	 * DLV must result in chain going further down */
-	uint8_t* dlv_insecure_at;
-	/** length of dlv insecure point name */
-	size_t dlv_insecure_at_len;
-	/** status of DLV lookup. Indication to VAL_DLV_STATE what to do */
-	enum dlv_status {
-		dlv_error, /* server failure */
-		dlv_success, /* got a DLV */
-		dlv_ask_higher, /* ask again */
-		dlv_there_is_no_dlv /* got no DLV, sure of it */
-	} dlv_status;
 };
 
 /**

From f78f6a3b2909e1368946bc93db328b95cb86e163 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 4 Aug 2020 09:15:45 +0200
Subject: [PATCH 019/108] dlv removal, remove from tests and validator state
 machine

---
 testdata/dlv_anchor.rpl            | 279 ------------------
 testdata/dlv_ask_higher.rpl        | 354 -----------------------
 testdata/dlv_below_ta.rpl          | 355 -----------------------
 testdata/dlv_delegation.rpl        | 335 ----------------------
 testdata/dlv_ds_lookup.rpl         | 281 ------------------
 testdata/dlv_insecure.rpl          | 254 -----------------
 testdata/dlv_insecure_negcache.rpl | 311 --------------------
 testdata/dlv_keyretry.rpl          | 287 -------------------
 testdata/dlv_negnx.rpl             | 405 --------------------------
 testdata/dlv_optout.rpl            | 440 -----------------------------
 testdata/dlv_remove.rpl            | 198 -------------
 testdata/dlv_remove_empty.rpl      | 272 ------------------
 testdata/dlv_remove_nodel.rpl      | 276 ------------------
 testdata/dlv_remove_pos.rpl        | 167 -----------
 testdata/dlv_unused.rpl            | 277 ------------------
 testdata/domain_insec_dlv.rpl      | 277 ------------------
 testdata/fwddlv_parse.rpl          | 134 ---------
 testdata/val_unalgo_dlv.rpl        | 284 -------------------
 validator/validator.c              | 369 ------------------------
 19 files changed, 5555 deletions(-)
 delete mode 100644 testdata/dlv_anchor.rpl
 delete mode 100644 testdata/dlv_ask_higher.rpl
 delete mode 100644 testdata/dlv_below_ta.rpl
 delete mode 100644 testdata/dlv_delegation.rpl
 delete mode 100644 testdata/dlv_ds_lookup.rpl
 delete mode 100644 testdata/dlv_insecure.rpl
 delete mode 100644 testdata/dlv_insecure_negcache.rpl
 delete mode 100644 testdata/dlv_keyretry.rpl
 delete mode 100644 testdata/dlv_negnx.rpl
 delete mode 100644 testdata/dlv_optout.rpl
 delete mode 100644 testdata/dlv_remove.rpl
 delete mode 100644 testdata/dlv_remove_empty.rpl
 delete mode 100644 testdata/dlv_remove_nodel.rpl
 delete mode 100644 testdata/dlv_remove_pos.rpl
 delete mode 100644 testdata/dlv_unused.rpl
 delete mode 100644 testdata/domain_insec_dlv.rpl
 delete mode 100644 testdata/fwddlv_parse.rpl
 delete mode 100644 testdata/val_unalgo_dlv.rpl

diff --git a/testdata/dlv_anchor.rpl b/testdata/dlv_anchor.rpl
deleted file mode 100644
index 81547454e..000000000
--- a/testdata/dlv_anchor.rpl
+++ /dev/null
@@ -1,279 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV anchor
-; positive response for DLV.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_ask_higher.rpl b/testdata/dlv_ask_higher.rpl
deleted file mode 100644
index fad8355c8..000000000
--- a/testdata/dlv_ask_higher.rpl
+++ /dev/null
@@ -1,354 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV where it needs to ask higher up in dlv.
-; at first negative DLV response, it needs to ask higher.
-; the SOA record in that negative response has a big span (if interpreted as NSEC)
-; then a positive response for DLV.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; failed DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NXDOMAIN
-SECTION QUESTION
-sub.example.net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.net.example.com IN NSEC not.example.com. RRSIG NSEC DLV
-example.net.example.com.	3600	IN	RRSIG	NSEC 3 4 3600 20070926134150 20070829134150 2854 example.com. AKz/e6KOw8gCx6wnpIatBwKb0WOPBTWmNNMg91XR/wlJQ9Z2+qICPmA= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-SECTION ADDITIONAL
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.sub.example.net query
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN A
-SECTION ANSWER
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	DS	30899 5 1 36b39460f94a807cbbbf3b31cc9db955081b2b36 ; xetir-fahok-bovug-pebyl-sovur-zyvaf-cufan-tivih-hadec-rypof-kixox
-sub.example.net.	3600	IN	RRSIG	DS 5 3 3600 20070926134150 20070829134150 30899 example.net. nM5HAlRsrLurc5mUNKwCye5X6LSH53pLgSeyni4wb6Jd2J48ZRWwrVvy7IpyvI75+Wlu3aGOjv/kEyVaizChRQ== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ENTRY_END
-
-RANGE_END
-
-; ns.sub.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.6
-; DS
-; sub.example.net.	3600	IN	DS	30899 5 1 36b39460f94a807cbbbf3b31cc9db955081b2b36 ; xetir-fahok-bovug-pebyl-sovur-zyvaf-cufan-tivih-hadec-rypof-kixox
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN DNSKEY
-SECTION ANSWER
-sub.example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-sub.example.net.	3600	IN	RRSIG	DNSKEY 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. PATh0K1jz9QeN02C79noX9gwK+Nr5VznWPQwygm/pYDsOb0z3EsaiOrzyoreegDKgoNn3kN0CywS+usCWM6hrw== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN NS
-SECTION ANSWER
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; www.sub.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.sub.example.net. IN A
-SECTION ANSWER
-www.sub.example.net.	3600	IN	A	10.20.30.40
-www.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. Q+88AIM3K8q6S0bHeFVT742EepZFxOxgtaL1V68DEkP4NePKzL4zttWQD3uI/5ALw/fIrC7G43Eo+epWn2ZGCA== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.sub.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.sub.example.net. IN A
-SECTION ANSWER
-www.sub.example.net.	3600	IN	A	10.20.30.40
-www.sub.example.net.    3600    IN      RRSIG   A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. Q+88AIM3K8q6S0bHeFVT742EepZFxOxgtaL1V68DEkP4NePKzL4zttWQD3uI/5ALw/fIrC7G43Eo+epWn2ZGCA== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.        3600    IN      RRSIG   NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.     3600    IN      RRSIG   A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_below_ta.rpl b/testdata/dlv_below_ta.rpl
deleted file mode 100644
index f5d630dfb..000000000
--- a/testdata/dlv_below_ta.rpl
+++ /dev/null
@@ -1,355 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	trust-anchor: "example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator, use DLV for nonDSed zone below trustanchor.
-; DLV example.com.
-; trust anchor at example.net but no secure delegation to
-; sub.example.net  signed with DLV but not by parent.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net.example.com. IN DLV
-SECTION ANSWER
-sub.example.net.example.com.	3600	IN	DLV	30899 5 1 36b39460f94a807cbbbf3b31cc9db955081b2b36 ; xetir-fahok-bovug-pebyl-sovur-zyvaf-cufan-tivih-hadec-rypof-kixox
-sub.example.net.example.com.	3600	IN	RRSIG	DLV 3 5 3600 20070926135752 20070829135752 2854 example.com. AAdhy87nuDEaxmc+k9pJHYnhKiEYL++OLPxzOdwEQOtsHi7jeD3lRDU= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC sub.example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. ALITtZY03PDWnuAeEL/5VwMIXY3iC2y7Qkeq5DgAHmPbNyWiOmJNEKg= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC sub.example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. ALITtZY03PDWnuAeEL/5VwMIXY3iC2y7Qkeq5DgAHmPbNyWiOmJNEKg= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; no DS to sub.example.net, securely insecure.
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id 
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN DS
-SECTION ANSWER
-SECTION AUTHORITY
-example.net. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.net.	3600	IN	RRSIG	SOA 5 2 3600 20070926134150 20070829134150 30899 example.net. ELVULZHTRc0Qk06rSBRnB/T6sm1+AbAtdEJHN6PCsz2Z3s3E5A8NH7Krz0VzRaYIEUStnbAtuE3oP8XHWHBnyQ== ;{id = 30899}
-sub.example.net.	IN NSEC tut.example.net. NS NSEC
-sub.example.net.	3600	IN	RRSIG	NSEC 5 3 3600 20070926134150 20070829134150 30899 example.net. eNJ2OPjMhGKvg70aYT9l9Uo1lJsqmDqVRMlHibv6t+CNjljytI9Vwbao17oV0cjIksmESAewReb73x9fmVIgEQ== ;{id = 30899}
-SECTION ADDITIONAL
-ENTRY_END
-
-; delegation to sub.example.net, securely insecure.
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN NS
-SECTION ANSWER
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	IN NSEC tut.example.net. NS NSEC
-sub.example.net.	3600	IN	RRSIG	NSEC 5 3 3600 20070926134150 20070829134150 30899 example.net. eNJ2OPjMhGKvg70aYT9l9Uo1lJsqmDqVRMlHibv6t+CNjljytI9Vwbao17oV0cjIksmESAewReb73x9fmVIgEQ== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ENTRY_END
-
-
-RANGE_END
-
-; ns.sub.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.6
-; DS is
-; sub.example.net.	3600	IN	DS	30899 5 1 36b39460f94a807cbbbf3b31cc9db955081b2b36 ; xetir-fahok-bovug-pebyl-sovur-zyvaf-cufan-tivih-hadec-rypof-kixox
-; DNSKEY query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-sub.example.net. IN DNSKEY
-SECTION ANSWER
-sub.example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-sub.example.net.	3600	IN	RRSIG	DNSKEY 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. PATh0K1jz9QeN02C79noX9gwK+Nr5VznWPQwygm/pYDsOb0z3EsaiOrzyoreegDKgoNn3kN0CywS+usCWM6hrw== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-sub.example.net. IN NS
-SECTION ANSWER
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; www.sub.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-www.sub.example.net. IN A
-SECTION ANSWER
-www.sub.example.net. IN A 10.20.30.40
-www.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. Q+88AIM3K8q6S0bHeFVT742EepZFxOxgtaL1V68DEkP4NePKzL4zttWQD3uI/5ALw/fIrC7G43Eo+epWn2ZGCA== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.sub.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.sub.example.net. IN A
-SECTION ANSWER
-www.sub.example.net. IN A 10.20.30.40
-www.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. Q+88AIM3K8q6S0bHeFVT742EepZFxOxgtaL1V68DEkP4NePKzL4zttWQD3uI/5ALw/fIrC7G43Eo+epWn2ZGCA== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_delegation.rpl b/testdata/dlv_delegation.rpl
deleted file mode 100644
index 53074c8e2..000000000
--- a/testdata/dlv_delegation.rpl
+++ /dev/null
@@ -1,335 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with delegation in DLV repository
-; positive response for DLV.
-; but the DLV repository has a (secure) delegation inside it.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; referral to the net.example.com DLV server
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-net.example.com. NS ns.net.example.com.
-net.example.com.	3600	IN	DS	2854 3 1 24d80cd822bc4083cf491b7f055890345a77dd9b ; xenat-myfat-memir-sabym-fefig-nakol-zucyh-megef-gakel-lolyn-ruxox
-net.example.com.	3600	IN	RRSIG	DS 3 3 3600 20070926134150 20070829134150 2854 example.com. AA0APyTN12wzj1XmDEZe+wrPE1hkLAINKT8cT9zGup7zX3O8R4Ki2N8= ;{id = 2854}
-SECTION ADDITIONAL
-ns.net.example.com. A 1.2.3.6
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AJEvfI+tX6Y1OF0h1CNHERJjXaaTsmLWTMLgXk4UYJl8JjAikCpsf9Q= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.net.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.6
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN NS
-SECTION ANSWER
-net.example.com. NS ns.net.example.com.
-net.example.com.	3600	IN	RRSIG	NS 3 3 3600 20070926134150 20070829134150 2854 net.example.com. AHjTvB20SzZVV9P3LXJ6lVzFWCoDk7T71VHllOwmom3a/EutlUpsgNM= ;{id = 2854}
-SECTION ADDITIONAL
-ns.net.example.com. A 1.2.3.6
-ns.net.example.com.	3600	IN	RRSIG	A 3 4 3600 20070926134150 20070829134150 2854 net.example.com. AE2wjNCJayCBi6e8QAGwgujdMC2LbVWQVbQCuQx+grjoQJXQxxpFB5I= ;{id = 2854}
-ENTRY_END
-
-; DNSKEY query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DNSKEY
-SECTION ANSWER
-net.example.com.        3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJIIs70j+sDS/UT2QRp61SE7S3EEXopNXoFE73JLRmvpi/UrOO/Vz4Se6wXv/CYCKjGw06U4WRgRYXcpEhJROyNapmdIKSxhOzfLVE1gqA0PweZR8dtY3aNQSRn3sPpwJr6Mi/PqQKAMMrZ9ckJpf1+bQMOOvxgzz2U1GS18b3yZKcgTMEaJzd/GZYzi/BN2DzQ0MsrSwYXfsNLFOBbs8PJMW4LYIxeeOe6rUgkWOF7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-net.example.com.	3600	IN	RRSIG	DNSKEY 3 3 3600 20070926134150 20070829134150 2854 net.example.com. ADgKDV1Yi2iFOXFUN1XkvBU7KW/rdtGcOEdc9VMIxfIKDo5h24E5fqs= ;{id = 2854}
-SECTION AUTHORITY
-net.example.com. NS ns.net.example.com.
-net.example.com.	3600	IN	RRSIG	NS 3 3 3600 20070926134150 20070829134150 2854 net.example.com. AHjTvB20SzZVV9P3LXJ6lVzFWCoDk7T71VHllOwmom3a/EutlUpsgNM= ;{id = 2854}
-SECTION ADDITIONAL
-ns.net.example.com. A 1.2.3.6
-ns.net.example.com.	3600	IN	RRSIG	A 3 4 3600 20070926134150 20070829134150 2854 net.example.com. AE2wjNCJayCBi6e8QAGwgujdMC2LbVWQVbQCuQx+grjoQJXQxxpFB5I= ;{id = 2854}
-ENTRY_END
-
-; DLV apex
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-net.example.com. SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-net.example.com.	3600	IN	RRSIG	SOA 3 3 3600 20070926134150 20070829134150 2854 net.example.com. AKAjedAeGWRHaqhDhNhbTvVUQMgCspiD4GNC7dMVbEZSd87AFcqwg1Y= ;{id = 2854}
-net.example.com. NSEC example.net.example.com. SOA NS DNSKEY RRSIG NSEC
-net.example.com.	3600	IN	RRSIG	NSEC 3 3 3600 20070926134150 20070829134150 2854 net.example.com. AAHqj3xDqng7ZuNFn89sTjTo2qfuXTv0yR6v8mZ1+L5mCsOwjpGXrJw= ;{id = 2854}
-SECTION ADDITIONAL
-ENTRY_END
-
-; DLV of interest
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.        3600    IN      DLV     30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 net.example.com. AIZmoTbAlXYwLknm84i7sbglbHr1Iq7t0yyTENO/MsPj7K/mvEQAI/g= ;{id = 2854}
-SECTION AUTHORITY
-net.example.com. NS ns.net.example.com.
-net.example.com.	3600	IN	RRSIG	NS 3 3 3600 20070926134150 20070829134150 2854 net.example.com. AHjTvB20SzZVV9P3LXJ6lVzFWCoDk7T71VHllOwmom3a/EutlUpsgNM= ;{id = 2854}
-SECTION ADDITIONAL
-ns.net.example.com. A 1.2.3.6
-ns.net.example.com.	3600	IN	RRSIG	A 3 4 3600 20070926134150 20070829134150 2854 net.example.com. AE2wjNCJayCBi6e8QAGwgujdMC2LbVWQVbQCuQx+grjoQJXQxxpFB5I= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_ds_lookup.rpl b/testdata/dlv_ds_lookup.rpl
deleted file mode 100644
index 663cd9c36..000000000
--- a/testdata/dlv_ds_lookup.rpl
+++ /dev/null
@@ -1,281 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV anchor for a DS lookup.
-; positive response for DLV.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DS
-SECTION AUTHORITY
-net.			900	IN	SOA	a.gtld-servers.net. nstld.verisign-grs.com. 1251367385 1800 900 604800 86400
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-example.net. IN DS
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-example.net. IN DS
-SECTION AUTHORITY
-net.			900	IN	SOA	a.gtld-servers.net. nstld.verisign-grs.com. 1251367385 1800 900 604800 86400
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_insecure.rpl b/testdata/dlv_insecure.rpl
deleted file mode 100644
index e6515a9fb..000000000
--- a/testdata/dlv_insecure.rpl
+++ /dev/null
@@ -1,254 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	harden-referral-path: no
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with insecure zone with no DLV 
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-; could be picked out of the negative cache due to NS queries in between.
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-www.example.net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_insecure_negcache.rpl b/testdata/dlv_insecure_negcache.rpl
deleted file mode 100644
index 8408870b9..000000000
--- a/testdata/dlv_insecure_negcache.rpl
+++ /dev/null
@@ -1,311 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	harden-referral-path: no
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with insecure zone, no DLV from negative cache
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 300
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-; could be picked out of the negative cache due to NS queries in between.
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-www.example.net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-zoink.name.example.com IN NSEC zazz.net.example.com. RRSIG NSEC DLV
-zoink.name.example.com. 3600    IN      RRSIG   NSEC 3 4 3600 20070926134150 20070829134150 2854 example.com. AHipxvshRHglCEN4nZCT4m/4RIj8TrCOE2AsqEoH9e+6OYSo+yuNzzo= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-zoink.name.example.com IN NSEC zazz.net.example.com. RRSIG NSEC DLV
-zoink.name.example.com. 3600    IN      RRSIG   NSEC 3 4 3600 20070926134150 20070829134150 2854 example.com. AHipxvshRHglCEN4nZCT4m/4RIj8TrCOE2AsqEoH9e+6OYSo+yuNzzo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC frump.aqua.example.com. SOA NS RRSIG NSEC DNSKEY
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AAscY9DfNm3Uy8f8Q4WX6AzR0flHYNSr3fKfgQ0Xc20fzj1lGP9ebfk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 300
-	ADDRESS 1.2.3.5
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	10	IN	A	10.20.30.40
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	10	IN	A	10.20.30.40
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-STEP 150 TIME_PASSES ELAPSE 30
-
-; no more DLV authority reachable
-STEP 200 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-STEP 210 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	10	IN	A	10.20.30.40
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ENTRY_END
-
-STEP 220 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-net. IN NS
-ENTRY_END
-
-STEP 230 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_keyretry.rpl b/testdata/dlv_keyretry.rpl
deleted file mode 100644
index 8d477b5a5..000000000
--- a/testdata/dlv_keyretry.rpl
+++ /dev/null
@@ -1,287 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV anchor and subsequently key retries
-; positive response for DLV.  But the DNSKEY for the target fails validation.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-; expired signature
-example.net.	3600	IN	RRSIG	DNSKEY 5 2 3600 20050926134150 20050829134150 30899 example.net. ydM0/eWMqFn4RxMTbscdSLU7bJNoPuzjCa0eI7HSV/r/54slSGvkl0fmwqrROl1tpc0YMV6kAzgB1T5lJbvdsA== ;{id = 30899}
-; good signature:
-;example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; AAAA for nameserver (for dnssec retry) query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-ns.example.net. IN AAAA
-SECTION AUTHORITY
-example.net. IN SOA . . 2007091300 28800 7200 604800 3600
-example.net.	3600	IN	RRSIG	SOA 5 2 3600 20070926134150 20070829134150 30899 example.net. MrpP4svNpbN/YKhuYRlNbvNg0yVxn4ywW1tyEFA9v6F7BR6k1pP8iPfN5XV+XWPAmbss9h3fwKq8zNs4F/SPkg== ;{id = 30899}
-ns.example.net. IN NSEC ppp.example.net. A RRSIG NSEC
-ns.example.net.	3600	IN	RRSIG	NSEC 5 3 3600 20070926134150 20070829134150 30899 example.net. freWP6rXWsU5iyRE2gIM9rICuBxCYlQSW01GkLPez5czqtEL0hHN8vtjTlfoNxjJjiZj3vAavZDIQGgOOOMIsA== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO SERVFAIL
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_negnx.rpl b/testdata/dlv_negnx.rpl
deleted file mode 100644
index 03edf1a47..000000000
--- a/testdata/dlv_negnx.rpl
+++ /dev/null
@@ -1,405 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV anchor for negcache nxdomain proof
-; put a DLV in the negcache.
-; then test ask-higher with that in the cache.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; under example.net in DLV
-ENTRY_BEGIN
-MATCH opcode qtype subdomain
-ADJUST copy_id copy_query
-REPLY QR NXDOMAIN
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.net.example.com.	3600	IN 	NSEC fru.net.example.com. RRSIG NSEC DLV
-example.net.example.com.	3600	IN	RRSIG	NSEC 3 4 3600 20070926134150 20070829134150 2854 example.com. AI6NNKt4dGcAdCrW73GYwyoqelsdj1dd8mBNPpHRQIL0yp7yYFZ7kXU= ;{id = 2854}
-example.com. IN SOA . . 1 2 3 4 5
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AIkRPbv+kZaiG61pH/wQy8fX2UqQS5YRwHaxe4yjEUXk59fgO71Db3s= ;{id = 2854}
-SECTION ADDITIONAL
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-; have it flushed out of the cache quickly.
-example.net.    0    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    0    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; subzone
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-sub1.example.net. IN A
-SECTION ANSWER
-SECTION AUTHORITY
-sub1.example.net.	3600	IN	DS	30899 5 1 8916603e54c6f7edcfd885602e3b7b8dc475ba5c ; xodec-komif-vehis-kotav-tefot-mecyk-biryf-rivym-ticol-huvyh-saxox
-sub1.example.net.	3600	IN	RRSIG	DS 5 3 3600 20070926134150 20070829134150 30899 example.net. A3vVrEY3+oIUqdbAa3tkKaU3o47eBD01hVXfAEAue1M+Uci2PA5YyiulLzStyiP75XUXkvubLQ2+ltKMTtfdag== ;{id = 30899}
-sub1.example.net. IN NS ns.sub1.example.net.
-SECTION ADDITIONAL
-ns.sub1.example.net. IN A 1.2.3.10
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-sub2.example.net. IN A
-SECTION ANSWER
-SECTION AUTHORITY
-sub2.example.net.	3600	IN	DS	30899 5 1 627f7a51f1545133fec3ecbd19b85b92b15679c9 ; ximil-zovah-casuh-gygef-fyzas-farir-tikir-mukon-disih-kavus-nyxex
-sub2.example.net.	3600	IN	RRSIG	DS 5 3 3600 20070926134150 20070829134150 30899 example.net. azMXKt4VPHj2hk5MDU6h8E/HOtNnHnIVS6Le3BV43wtJcHG5wlCxOksOZBOpXMkpbWLvbCJOOMPOnh31nlbjgg== ;{id = 30899}
-sub2.example.net. IN NS ns.sub2.example.net.
-SECTION ADDITIONAL
-ns.sub2.example.net. IN A 1.2.3.12
-ENTRY_END
-RANGE_END
-
-; sub1.example.net.
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.10
-; DNSKEY query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-sub1.example.net. IN DNSKEY
-SECTION ANSWER
-sub1.example.net.       3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-sub1.example.net.	3600	IN	RRSIG	DNSKEY 5 3 3600 20070926134150 20070829134150 30899 sub1.example.net. E200eTdRnkL7/fk54i1nXEE9a/rC2GxZfVkWMU044tpwV6d4XRxVhlFBzY4FytbRFFBUDhz7L3B0qC6BXJM8rg== ;{id = 30899}
-ENTRY_END
-
-; www query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.sub1.example.net. IN A
-SECTION ANSWER
-www.sub1.example.net. IN A 192.168.1.1
-www.sub1.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub1.example.net. JKxcjPjc/TsQmUmCYHLQa3cBk1c+SbDPtVml69nDWC167NNWG8OLjLrLtUBVCfbTzCmqOWXq2qhrGPxjO65GCQ== ;{id = 30899}
-ENTRY_END
-
-RANGE_END
-
-; sub2.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.12
-; DNSKEY query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-sub2.example.net. IN DNSKEY
-SECTION ANSWER
-sub2.example.net.       3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-sub2.example.net.	3600	IN	RRSIG	DNSKEY 5 3 3600 20070926134150 20070829134150 30899 sub2.example.net. VcNaPuz9Mmjj5ofZqOa4FsixBomFJTjd/9wxhZOVdxf1LsNR5L++8k09gQvnjtCvqSPfNer/uv0xl+9sRr8Wmw== ;{id = 30899}
-ENTRY_END
-
-; www query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.sub2.example.net. IN A
-SECTION ANSWER
-www.sub2.example.net. IN A 192.168.1.12
-www.sub2.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub2.example.net. PsWY6+5/0+hsTOhNak/jdSeG44hvHgX5az1Q5XY/YkIchsflH9rmvP1EruFhflNhRR+22M7POiljYOoD5ylQXQ== ;{id = 30899}
-ENTRY_END
-
-RANGE_END
-
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.sub1.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.sub1.example.net. IN A
-SECTION ANSWER
-www.sub1.example.net. IN A 192.168.1.1
-www.sub1.example.net.   3600    IN      RRSIG   A 5 4 3600 20070926134150 20070829134150 30899 sub1.example.net. JKxcjPjc/TsQmUmCYHLQa3cBk1c+SbDPtVml69nDWC167NNWG8OLjLrLtUBVCfbTzCmqOWXq2qhrGPxjO65GCQ== ;{id = 30899}
-SECTION AUTHORITY
-SECTION ADDITIONAL
-ENTRY_END
-
-; have example.net DNSKEY time out
-STEP 14 TIME_PASSES ELAPSE 1.0
-
-STEP 20 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.sub2.example.net. IN A
-ENTRY_END
-
-STEP 30 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.sub2.example.net. IN A
-SECTION ANSWER
-www.sub2.example.net. IN A 192.168.1.12
-www.sub2.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub2.example.net. PsWY6+5/0+hsTOhNak/jdSeG44hvHgX5az1Q5XY/YkIchsflH9rmvP1EruFhflNhRR+22M7POiljYOoD5ylQXQ== ;{id = 30899}
-SECTION AUTHORITY
-SECTION ADDITIONAL
-ENTRY_END
-
-
-SCENARIO_END
diff --git a/testdata/dlv_optout.rpl b/testdata/dlv_optout.rpl
deleted file mode 100644
index e5a8fdd62..000000000
--- a/testdata/dlv_optout.rpl
+++ /dev/null
@@ -1,440 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	trust-anchor: "example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator, DLV to zone below optout, check negative cache.
-; DLV example.com.
-; trust anchor at example.net but no secure delegation to
-; sub.example.net  signed with DLV but not by parent.
-; parent uses optout NSEC3.
-; then a signed delegation to down.sub.example.net.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net.example.com. IN DLV
-SECTION ANSWER
-sub.example.net.example.com.	3600	IN	DLV	30899 5 1 36b39460f94a807cbbbf3b31cc9db955081b2b36 ; xetir-fahok-bovug-pebyl-sovur-zyvaf-cufan-tivih-hadec-rypof-kixox
-sub.example.net.example.com.	3600	IN	RRSIG	DLV 3 5 3600 20070926135752 20070829135752 2854 example.com. AAdhy87nuDEaxmc+k9pJHYnhKiEYL++OLPxzOdwEQOtsHi7jeD3lRDU= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-down.sub.example.net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-sub.example.net.example.com. IN NSEC zzz.example.net.example.com. RRSIG NSEC DLV
-sub.example.net.example.com.	3600	IN	RRSIG	NSEC 3 5 3600 20070926134150 20070829134150 2854 example.com. AG/M+H/lex1CMTIuO+JpdmTjCzt7XBsLtRLPDfYTykhxnnECzZwkMnQ= ;{id = 2854}
-SECTION ADDITIONAL
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC sub.example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. ALITtZY03PDWnuAeEL/5VwMIXY3iC2y7Qkeq5DgAHmPbNyWiOmJNEKg= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC sub.example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. ALITtZY03PDWnuAeEL/5VwMIXY3iC2y7Qkeq5DgAHmPbNyWiOmJNEKg= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; no DS to sub.example.net, optout NSEC3.
-; NSEC3PARAM 1 1 31 DE15C001
-; example.net. 		-> hk4jq0lg6q3bt992urc88dqten1k2be8.
-; sub.example.net. 	-> ecs17hqd0kf7dk9g1cjvevj25pginrf2.
-; *.example.net. 	-> 1tgbedpeeuubbsejh2dqvso62f8n4dk1.
-; down.sub.example.net. -> 9j1r8re9b1238vd907tilclgat1i0fre.
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id 
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN DS
-SECTION ANSWER
-SECTION AUTHORITY
-example.net. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.net.	3600	IN	RRSIG	SOA 5 2 3600 20070926134150 20070829134150 30899 example.net. ELVULZHTRc0Qk06rSBRnB/T6sm1+AbAtdEJHN6PCsz2Z3s3E5A8NH7Krz0VzRaYIEUStnbAtuE3oP8XHWHBnyQ== ;{id = 30899}
-; CE is example.net
-hk4jq0lg6q3bt992urc88dqten1k2be8.example.net. IN NSEC3 1 1 31 DE15C001 hl4jq0lg6q3bt992urc88dqten1k2be8 NS SOA NAPTR RRSIG DNSKEY NSEC3PARAM
-hk4jq0lg6q3bt992urc88dqten1k2be8.example.net.	3600	IN	RRSIG	NSEC3 5 3 3600 20070926134150 20070829134150 30899 example.net. n1dQKbRoB+X4K003RAhdUp6ZUP5dCiwQi+apGfLII8wmCUmw/cKiz7/Ijhs/+88hZwq/7yhlZM0D/yqAUKUiAA== ;{id = 30899}
-; NC covers sub.example.net
-ebs17hqd0kf7dk9g1cjvevj25pginrf2.example.net. IN NSEC3 1 1 31 de15c001 efs17hqd0kf7dk9g1cjvevj25pginrf2 A RRSIG
-ebs17hqd0kf7dk9g1cjvevj25pginrf2.example.net.	3600	IN	RRSIG	NSEC3 5 3 3600 20070926134150 20070829134150 30899 example.net. oSVB7Dyp7/yaOlT8AFwBJZdqwRRSQ8XFzCpu1AP51JPIuhCg5byepdvY6UC3xXc7YVO6h74tpxFCGqLpRXwDoQ== ;{id = 30899}
-SECTION ADDITIONAL
-ENTRY_END
-
-; delegation to sub.example.net, optout NSEC3.
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-sub.example.net. IN NS
-SECTION ANSWER
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-hk4jq0lg6q3bt992urc88dqten1k2be8.example.net. IN NSEC3 1 1 31 DE15C001 hl4jq0lg6q3bt992urc88dqten1k2be8 NS SOA NAPTR RRSIG DNSKEY NSEC3PARAM
-hk4jq0lg6q3bt992urc88dqten1k2be8.example.net.	3600	IN	RRSIG	NSEC3 5 3 3600 20070926134150 20070829134150 30899 example.net. n1dQKbRoB+X4K003RAhdUp6ZUP5dCiwQi+apGfLII8wmCUmw/cKiz7/Ijhs/+88hZwq/7yhlZM0D/yqAUKUiAA== ;{id = 30899}
-ebs17hqd0kf7dk9g1cjvevj25pginrf2.example.net. IN NSEC3 1 1 31 de15c001 efs17hqd0kf7dk9g1cjvevj25pginrf2 A RRSIG
-ebs17hqd0kf7dk9g1cjvevj25pginrf2.example.net.	3600	IN	RRSIG	NSEC3 5 3 3600 20070926134150 20070829134150 30899 example.net. oSVB7Dyp7/yaOlT8AFwBJZdqwRRSQ8XFzCpu1AP51JPIuhCg5byepdvY6UC3xXc7YVO6h74tpxFCGqLpRXwDoQ== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ENTRY_END
-
-
-RANGE_END
-
-; ns.sub.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.6
-; DS is
-; sub.example.net.	3600	IN	DS	30899 5 1 36b39460f94a807cbbbf3b31cc9db955081b2b36 ; xetir-fahok-bovug-pebyl-sovur-zyvaf-cufan-tivih-hadec-rypof-kixox
-; DNSKEY query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-sub.example.net. IN DNSKEY
-SECTION ANSWER
-sub.example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-sub.example.net.	3600	IN	RRSIG	DNSKEY 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. PATh0K1jz9QeN02C79noX9gwK+Nr5VznWPQwygm/pYDsOb0z3EsaiOrzyoreegDKgoNn3kN0CywS+usCWM6hrw== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-sub.example.net. IN NS
-SECTION ANSWER
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; www.sub.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-www.sub.example.net. IN A
-SECTION ANSWER
-www.sub.example.net. IN A 10.20.30.40
-www.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. Q+88AIM3K8q6S0bHeFVT742EepZFxOxgtaL1V68DEkP4NePKzL4zttWQD3uI/5ALw/fIrC7G43Eo+epWn2ZGCA== ;{id = 30899}
-SECTION AUTHORITY
-sub.example.net.    IN NS   ns.sub.example.net.
-sub.example.net.	3600	IN	RRSIG	NS 5 3 3600 20070926134150 20070829134150 30899 sub.example.net. JZUK303aE7R428S5XXLaowpM79YSc2g7wy2rDOH+6Ts2UefZInv6X5cjJU4+qBrS8i9XhdllqG7SEnPKZ0GtAw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.sub.example.net.         IN      A       1.2.3.6
-ns.sub.example.net.	3600	IN	RRSIG	A 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AluXPa4XdlCysQMVrt0YairoOug4GMvy8rNUeKLCfQ5xVqRMqkTisbzJXBQPgYEVA0DJR74eEpgLrcz5ztb1aA== ;{id = 30899}
-ENTRY_END
-
-; DS for down.sub.example.net
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-down.sub.example.net. IN DS
-SECTION ANSWER
-down.sub.example.net.   3600    IN      DS      60946 5 1 c636304ab7cdb6272215aceac95a8d312ac7a4f6 
-down.sub.example.net.	3600	IN	RRSIG	DS 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AMc8J534UF2+0PtPSNBw6RzN4Q5gXfnBXiUfpuT/MR1YtOE/5AP/0dTgvqvKRiFZx3NjOPeZmRnaabxkw0Qzrw== ;{id = 30899}
-SECTION AUTHORITY
-SECTION ADDITIONAL
-ENTRY_END
-
-; delegation to down.sub.example.net
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-down.sub.example.net. IN NS
-SECTION ANSWER
-SECTION AUTHORITY
-down.sub.example.net. IN NS ns.down.sub.example.net.
-; the DS record is not given (like it was parent and child hosted on the same
-; server)
-;down.sub.example.net.   3600    IN      DS      60946 5 1 c636304ab7cdb6272215aceac95a8d312ac7a4f6 
-;down.sub.example.net.	3600	IN	RRSIG	DS 5 4 3600 20070926134150 20070829134150 30899 sub.example.net. AMc8J534UF2+0PtPSNBw6RzN4Q5gXfnBXiUfpuT/MR1YtOE/5AP/0dTgvqvKRiFZx3NjOPeZmRnaabxkw0Qzrw== ;{id = 30899}
-SECTION ADDITIONAL
-ns.down.sub.example.net. IN A 1.2.3.7
-ENTRY_END
-
-RANGE_END
-
-; ns.down.sub.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.7
-; DNSKEY query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-down.sub.example.net. IN DNSKEY
-SECTION ANSWER
-down.sub.example.net.	3600	IN	DNSKEY	257 3 5 AwEAAeiaUiUIpWMfYz5L0sfJTZWnuN9IyBX4em9VjsoqQTsOD1HDQpNb4buvJo7pN2aBCxNS7e0OL8e2mVB6CLZ+8ek= ;{id = 60946 (ksk), size = 512b}
-down.sub.example.net.	3600	IN	RRSIG	DNSKEY 5 4 3600 20070926134150 20070829134150 60946 down.sub.example.net. lK5HNva/IPw0CS9BfBd16fqm5y9bgCSwGsBLBAA1d5SCcKep6AVrv6NFuXl12d1G3MdQ4ruHi6eDDO5dhtkfrw== ;{id = 60946}
-SECTION AUTHORITY
-SECTION ADDITIONAL
-ENTRY_END
-
-; www.down.sub.example.net.
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR AA NOERROR
-SECTION QUESTION
-www.down.sub.example.net. IN A
-SECTION ANSWER
-www.down.sub.example.net. IN A 10.20.30.44
-www.down.sub.example.net.	3600	IN	RRSIG	A 5 5 3600 20070926134150 20070829134150 60946 down.sub.example.net. Hg5WF/xW8PRth2rl1mZcYK8/pgGpM73e/fD+mH/XElEKgL9zq0ou8psA0I6OvMLGBN6RQeknQHRAy3D2/5k/Wg== ;{id = 60946}
-SECTION AUTHORITY
-SECTION ADDITIONAL
-ENTRY_END
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.down.sub.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.down.sub.example.net. IN A
-SECTION ANSWER
-www.down.sub.example.net. IN A 10.20.30.44
-www.down.sub.example.net.	3600	IN	RRSIG	A 5 5 3600 20070926134150 20070829134150 60946 down.sub.example.net. Hg5WF/xW8PRth2rl1mZcYK8/pgGpM73e/fD+mH/XElEKgL9zq0ou8psA0I6OvMLGBN6RQeknQHRAy3D2/5k/Wg== ;{id = 60946}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_remove.rpl b/testdata/dlv_remove.rpl
deleted file mode 100644
index d503148c7..000000000
--- a/testdata/dlv_remove.rpl
+++ /dev/null
@@ -1,198 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	fake-sha1: yes
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV anchor but DLV domain is down
-; so DLV has been decommissioned.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-
-ENTRY_BEGIN
-MATCH opcode
-ADJUST copy_id copy_query
-REPLY QR SERVFAIL
-SECTION QUESTION
-example.com. IN NS
-ENTRY_END
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO SERVFAIL
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_remove_empty.rpl b/testdata/dlv_remove_empty.rpl
deleted file mode 100644
index 11b825bc2..000000000
--- a/testdata/dlv_remove_empty.rpl
+++ /dev/null
@@ -1,272 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	fake-sha1: yes
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV and DLV repository is empty.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query, everything is NXDOMAIN
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR AA NXDOMAIN
-SECTION QUESTION
-example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com.	3600	IN	NSEC	example.com. NS SOA RRSIG NSEC DNSKEY 
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AH++lP1qhsBw6zO1g3JVPZeQIpDhL9xT8V9xdgjXvCjIGQ1BUUlfQkA=
-SECTION ADDITIONAL
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_remove_nodel.rpl b/testdata/dlv_remove_nodel.rpl
deleted file mode 100644
index 1abe5a32f..000000000
--- a/testdata/dlv_remove_nodel.rpl
+++ /dev/null
@@ -1,276 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "dlv.example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	fake-sha1: yes
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV and DLV is removed and not delegated
-; so the response is that the dlv domain itself does not exist, but it's
-; parent domain does exist (securely).
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query, everything is NXDOMAIN
-; thus, no delegation to the dlv repository in dlv.example.com
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR AA NXDOMAIN
-SECTION QUESTION
-example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com.	3600	IN	NSEC	example.com. NS SOA RRSIG NSEC DNSKEY 
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AH++lP1qhsBw6zO1g3JVPZeQIpDhL9xT8V9xdgjXvCjIGQ1BUUlfQkA=
-SECTION ADDITIONAL
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_remove_pos.rpl b/testdata/dlv_remove_pos.rpl
deleted file mode 100644
index 892ffa3c0..000000000
--- a/testdata/dlv_remove_pos.rpl
+++ /dev/null
@@ -1,167 +0,0 @@
-; config options
-; The island of trust is at example.com
-server:
-	dlv-anchor: "dlv.example.net.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with DLV removed for positive anchored response
-; So the destination has a valid DNSSEC chain of trust to the root,
-; but the configured dlv anchor fails.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-; this covers dlv.example.net and thus makes it servfail (unusable).
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR SERVFAIL
-SECTION QUESTION
-net. IN NS
-ENTRY_END
-
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to query of interest
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.com. IN A
-SECTION ANSWER
-www.example.com. IN A	10.20.30.40
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-www.example.com.        3600    IN      RRSIG   A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854}
-ENTRY_END
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.com. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.example.com. IN A
-SECTION ANSWER
-www.example.com. IN A	10.20.30.40
-www.example.com.        3600    IN      RRSIG   A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/dlv_unused.rpl b/testdata/dlv_unused.rpl
deleted file mode 100644
index aa7d04c1e..000000000
--- a/testdata/dlv_unused.rpl
+++ /dev/null
@@ -1,277 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	trust-anchor: "example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator, DLV anchor unused because trustanchor works.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC zazz.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926135752 20070829135752 2854 example.com. AAi21jQpno6gXnrPrtK0NvNgX9B8E9U5RvTd47QiCWLF7KdtKxB7Xz0= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/domain_insec_dlv.rpl b/testdata/domain_insec_dlv.rpl
deleted file mode 100644
index c8bd98344..000000000
--- a/testdata/domain_insec_dlv.rpl
+++ /dev/null
@@ -1,277 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	domain-insecure: "example.net"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with domain-insecure below a DLV
-; positive response for DLV.
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/fwddlv_parse.rpl b/testdata/fwddlv_parse.rpl
deleted file mode 100644
index 8b8a9613f..000000000
--- a/testdata/fwddlv_parse.rpl
+++ /dev/null
@@ -1,134 +0,0 @@
-; config options
-; The island of trust is at example.com
-server:
-	trust-anchor: "dlv.isc.org. 5072    IN      DNSKEY  256 3 5 BEAAAAOlYGw53D+f01yCL5JsP0SB6EjYrnd0JYRBooAaGPT+Q0kpiN+7GviFh+nIazoB8e2Yv7mupgqkmIjObdcbGstYpUltdECdNpNmBvASKB9SBdtGeRvXXpORi3Qyxb9kHGG7SpzyYbc+KDVKnzYHB94pvqu3ZZpPFPBFtCibp/mkhw=="
-	val-override-date: "20090617133009"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test parse of packet when forwarding and dlv are in use
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-org. IN NS
-SECTION AUTHORITY
-org.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net. (for ORG)
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-org. IN NS
-SECTION ANSWER
-org.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-dlv.isc.org. IN NS
-SECTION AUTHORITY
-dlv.isc.org. IN NS ns.org.
-SECTION ADDITIONAL
-ns.org.	IN A 1.2.3.4
-ENTRY_END
-RANGE_END
-
-; ns.org for dlv.isc.org
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-dlv.isc.org.	IN	DNSKEY
-SECTION ANSWER
-dlv.isc.org.	5072	IN	DNSKEY	256 3 5 BEAAAAOlYGw53D+f01yCL5JsP0SB6EjYrnd0JYRBooAaGPT+Q0kpiN+7GviFh+nIazoB8e2Yv7mupgqkmIjObdcbGstYpUltdECdNpNmBvASKB9SBdtGeRvXXpORi3Qyxb9kHGG7SpzyYbc+KDVKnzYHB94pvqu3ZZpPFPBFtCibp/mkhw== ;{id = 64263 (zsk), size = 1024b}
-dlv.isc.org.	5072	IN	DNSKEY	257 3 5 BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URkY62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboMQKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VStTDN0YUuWrBNh ;{id = 19297 (ksk), size = 2048b}
-dlv.isc.org.	5072	IN	RRSIG	DNSKEY 5 3 7200 20090717133009 20090617133009 19297 dlv.isc.org. iqGOzsIQKFHcPLbJHLb/kNzcm7TlHiyT4kzTknCjKsC7DCB86YCOhnZZjvZQyA+D0N0KDgNWY8v5czbyX57qR6qORciT2zmPSTGj7CIOe4zrq60n8HzsChKgvk+RSYQrzf6vRfnZhce6Y1waXQd4wh1buPAUw/l46Ovt74ALXzcWSgfMNyx6PBz7rbusuePKeSv0GZL9+M2qhXKe9LJmnzD9uCwnbV/Y5yu+xLfxLdm9q4IKp6Rn50CeHYKf3tO2jI9dkWqFR94XHSTNGfhC02i5UsfP1HRPnk49bX7OMstuuCq9zMX+qTt602MVFYdTSHTy/5+Yw5DvOA9JgOqO4w== ;{id = 19297}
-dlv.isc.org.	5072	IN	RRSIG	DNSKEY 5 3 7200 20090717133009 20090617133009 64263 dlv.isc.org. W1KX1PagXsaWWmxkaOfnLetnw1hhSw7ym91S4rSu14QfFbYi5iN9ZkSuKa21M7Do52S9om/2hDllMF7EFfnv9l4e4/rMOc59vKGVojpHOvZyRVhIiMyh1H9NfLTYUovORRvKO0Cnp65gBXspVf1WhzoY3pC1NZ+5pscPWLeD1rw= ;{id = 64263}
-ENTRY_END
-
-; response to query of interest
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-www.example.com.dlv.isc.org.	IN	DLV
-SECTION ANSWER
-SECTION AUTHORITY
-dlv.isc.org.	2776	IN	SOA	ns-int.isc.org. hostmaster.isc.org. 2009061702 7200 3600 2419200 3600
-dlv.isc.org.	2776	IN	RRSIG	SOA 5 3 3600 20090717133009 20090617133009 64263 dlv.isc.org. S5iTFqF8k9XWoGq4Wajo1GQF6Oc1e5lI1kGFWyaKf3oM2asbzCbVk2aZLtyDCGjYA4euZWXD0q2vol7/1cPB5Ds4SteCuo5Jkpa/mw7mPAcbNu8mYexq1RaodVCbWrW8KSxEyVd8X5mZx2OBaSyK8zns/W5I3ZPNNLf4Kz6Zpo0= ;{id = 64263}
-seatex.com.cn.dlv.isc.org.	2776	IN	RRSIG	NSEC 5 6 3600 20090717133009 20090617133009 64263 dlv.isc.org. Rxv7gVdu8rpWbJ3fJm7cY66IKV+C94I4/HYiDQke1m2P7hXo5bpDBBShKpIvME34ANN8Lb0cZQK9XT7NYpWjE5rjW7CaMiVjiR6U1LyDGQyK4X3wdkbv3aJcHLSg7sWsxyZXj5iVUxkU5JO3JBjo412oKQ3bh+RGi1BxTIIq09g= ;{id = 64263}
-seatex.com.cn.dlv.isc.org.	2776	IN	NSEC	absolight.com.dlv.isc.org. RRSIG NSEC DLV 
-ericgermann.com.dlv.isc.org.	2776	IN	RRSIG	NSEC 5 5 3600 20090717133009 20090617133009 64263 dlv.isc.org. OEUizWAXsWFBzt4rN5+AUTaND8phZc4ezux06LA/Ua5N/B/LQQ1cb42eEqCQHwnGK8BsRhbsRiVywPNgnnPlL1Gy8n25gi+0qWOpA27fOwZJbO3n944gKvPDWZoDeCbdJr6AQG5Z9/Ka0ERRtHC6uI2Xn6KCQPjgTEihqhoayYg= ;{id = 64263}
-ericgermann.com.dlv.isc.org.	2776	IN	NSEC	fayengineering.com.dlv.isc.org. RRSIG NSEC DLV 
-SECTION ADDITIONAL
-ENTRY_END
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.com.dlv.isc.org. IN DLV
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA AD DO NXDOMAIN
-SECTION QUESTION
-www.example.com.dlv.isc.org. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-dlv.isc.org.    2776    IN      SOA     ns-int.isc.org. hostmaster.isc.org. 2009061702 7200 3600 2419200 3600
-dlv.isc.org.    2776    IN      RRSIG   SOA 5 3 3600 20090717133009 20090617133009 64263 dlv.isc.org. S5iTFqF8k9XWoGq4Wajo1GQF6Oc1e5lI1kGFWyaKf3oM2asbzCbVk2aZLtyDCGjYA4euZWXD0q2vol7/1cPB5Ds4SteCuo5Jkpa/mw7mPAcbNu8mYexq1RaodVCbWrW8KSxEyVd8X5mZx2OBaSyK8zns/W5I3ZPNNLf4Kz6Zpo0= ;{id = 64263}
-seatex.com.cn.dlv.isc.org.      2776    IN      NSEC    absolight.com.dlv.isc.org. RRSIG NSEC DLV
-seatex.com.cn.dlv.isc.org.      2776    IN      RRSIG   NSEC 5 6 3600 20090717133009 20090617133009 64263 dlv.isc.org. Rxv7gVdu8rpWbJ3fJm7cY66IKV+C94I4/HYiDQke1m2P7hXo5bpDBBShKpIvME34ANN8Lb0cZQK9XT7NYpWjE5rjW7CaMiVjiR6U1LyDGQyK4X3wdkbv3aJcHLSg7sWsxyZXj5iVUxkU5JO3JBjo412oKQ3bh+RGi1BxTIIq09g= ;{id = 64263}
-ericgermann.com.dlv.isc.org.    2776    IN      NSEC    fayengineering.com.dlv.isc.org. RRSIG NSEC DLV
-ericgermann.com.dlv.isc.org.    2776    IN      RRSIG   NSEC 5 5 3600 20090717133009 20090617133009 64263 dlv.isc.org. OEUizWAXsWFBzt4rN5+AUTaND8phZc4ezux06LA/Ua5N/B/LQQ1cb42eEqCQHwnGK8BsRhbsRiVywPNgnnPlL1Gy8n25gi+0qWOpA27fOwZJbO3n944gKvPDWZoDeCbdJr6AQG5Z9/Ka0ERRtHC6uI2Xn6KCQPjgTEihqhoayYg= ;{id = 64263}
-ENTRY_END
-
-SCENARIO_END
diff --git a/testdata/val_unalgo_dlv.rpl b/testdata/val_unalgo_dlv.rpl
deleted file mode 100644
index 142beae8d..000000000
--- a/testdata/val_unalgo_dlv.rpl
+++ /dev/null
@@ -1,284 +0,0 @@
-; config options
-; The island of trust is at example.com (the DLV repository)
-server:
-	dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
-	val-override-date: "20070916134226"
-	target-fetch-policy: "0 0 0 0 0"
-	qname-minimisation: "no"
-	fake-sha1: yes
-	trust-anchor-signaling: no
-	minimal-responses: no
-
-stub-zone:
-	name: "."
-	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
-CONFIG_END
-
-SCENARIO_BEGIN Test validator with unknown algorithm DLV anchor
-; positive response for DLV.
-; but only has unknown algos
-; have to treat zone as insecure
-
-; K.ROOT-SERVERS.NET.
-RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN A
-SECTION AUTHORITY
-com.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN A
-SECTION AUTHORITY
-net.	IN NS	a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.	IN 	A	192.5.6.30
-ENTRY_END
-RANGE_END
-
-; a.gtld-servers.net.
-RANGE_BEGIN 0 100
-	ADDRESS 192.5.6.30
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-com. IN NS
-SECTION ANSWER
-com.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net. IN NS
-SECTION ANSWER
-net.    IN NS   a.gtld-servers.net.
-SECTION ADDITIONAL
-a.gtld-servers.net.     IN      A       192.5.6.30
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN A
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode subdomain
-ADJUST copy_id copy_query
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN A
-SECTION AUTHORITY
-example.net.	IN NS	ns.example.net.
-SECTION ADDITIONAL
-ns.example.net.		IN 	A	1.2.3.5
-ENTRY_END
-RANGE_END
-
-; ns.example.com.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.4
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN NS
-SECTION ANSWER
-example.com.    IN NS   ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.         IN      A       1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; response to DNSKEY priming query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.com. IN DNSKEY
-SECTION ANSWER
-example.com.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}
-example.com.    3600    IN      RRSIG   DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-; DLV query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net.example.com. IN DLV
-SECTION ANSWER
-; algo 208 is unknown
-example.net.example.com.	3600	IN	DLV	30899 208 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. AFBU1dN/KstcLfQQzy7ZKvPq+2hQg7D6QynqgwI3f8envPQGj782/NA= ;{id = 2854}
-;example.net.example.com.	3600	IN	DLV	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-;example.net.example.com.	3600	IN	RRSIG	DLV 3 4 3600 20070926134150 20070829134150 2854 example.com. ACK48Q/oKwh/SM9yRiKjZYuc+AtEZ2yCPNJ15kKCN8nsVcv7xigmNTY= ;{id = 2854}
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
-ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-net.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NXDOMAIN
-SECTION QUESTION
-com.example.com. IN DLV
-SECTION ANSWER
-SECTION AUTHORITY
-example.com. IN SOA open.nlnetlabs.nl. hostmaster.nlnetlabs.nl. 2008081300 28800 7200 604800 3600
-example.com.	3600	IN	RRSIG	SOA 3 2 3600 20070926134150 20070829134150 2854 example.com. AKPJnPBqfJKxE4P2iVYkSRJno9HmiXJZtjdqE8oBeq9Lk9FytcMdcig= ;{id = 2854}
-example.com IN NSEC example.net.example.com. SOA NS RRSIG NSEC
-example.com.	3600	IN	RRSIG	NSEC 3 2 3600 20070926134150 20070829134150 2854 example.com. AIoUkJ04/7/kJFDLocoqksqt9UL2RHHwlRfXAMxGdBHcNO+GSpG47Uk= ;{id = 2854}
-ENTRY_END
-
-RANGE_END
-
-; ns.example.net.
-RANGE_BEGIN 0 100
-	ADDRESS 1.2.3.5
-; DS RR is
-; example.net.	3600	IN	DS	30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix
-; DNSKEY prime query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN DNSKEY
-SECTION ANSWER
-example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
-example.net.    3600    IN      RRSIG   DNSKEY RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. hiFzlQ8VoYgCuvIsfVuxC3mfJDqsTh0yc6abs5xMx5uEcIjb0dndFQx7INOM+imlzveEN73Hqp4OLFpFhsWLlw== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; NS query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-example.net. IN NS
-SECTION ANSWER
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-; www.example.net query
-ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
-REPLY QR NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-
-RANGE_END
-
-STEP 1 QUERY
-ENTRY_BEGIN
-REPLY RD DO
-SECTION QUESTION
-www.example.net. IN A
-ENTRY_END
-
-; recursion happens here.
-STEP 10 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA DO NOERROR
-SECTION QUESTION
-www.example.net. IN A
-SECTION ANSWER
-www.example.net.	3600	IN	A	10.20.30.40
-www.example.net.	3600	IN	RRSIG	A 5 3 3600 20070926135752 20070829135752 30899 example.net. ACvv4RQVC7TbI57ewqFImRaVoymktJ5Cxn/FaCodIENt82LVM92nivbP2WtwWCsQHWp7FkrMxTlQTJwyAeXFyg== ;{id = 30899}
-SECTION AUTHORITY
-example.net.    IN NS   ns.example.net.
-example.net.    3600    IN      RRSIG   NS RSASHA1 2 3600 20070926134150 20070829134150 30899 example.net. E8JX0l4B+cSR5bkHQwOJy1pBmlLMTYCJ8EwfNMU/eCv0YhKwo26rHhn52FGisgv+Nwp7/NbhHqQ+kJgoZC94XA== ;{id = 30899}
-SECTION ADDITIONAL
-ns.example.net.         IN      A       1.2.3.5
-ns.example.net. 3600    IN      RRSIG   A RSASHA1 3 3600 20070926134150 20070829134150 30899 example.net. x+tQMC9FhzT7Fcy1pM5NrOC7E8nLd7THPI3C6ie4EwL8PrxllqlR3q/DKB0d/m0qCOPcgN6HFOYURV1s4uAcsw== ;{id = 30899}
-ENTRY_END
-
-SCENARIO_END
diff --git a/validator/validator.c b/validator/validator.c
index c3ca0a27d..ab0698012 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1603,7 +1603,6 @@ processInit(struct module_qstate* qstate, struct val_qstate* vq,
 			val_mark_insecure(vq->chase_reply, anchor->name, 
 				qstate->env->rrset_cache, qstate->env);
 			lock_basic_unlock(&anchor->lock);
-			vq->dlv_checked=1; /* skip DLV check */
 			/* go to finished state to cache this result */
 			vq->state = VAL_FINISHED_STATE;
 			return 1;
@@ -1985,148 +1984,6 @@ processValidate(struct module_qstate* qstate, struct val_qstate* vq,
 	return 1;
 }
 
-/**
- * Init DLV check.
- * DLV is going to be decommissioned, but the code is still here for some time.
- *
- * Called when a query is determined by other trust anchors to be insecure
- * (or indeterminate).  Then we look if there is a key in the DLV.
- * Performs aggressive negative cache check to see if there is no key.
- * Otherwise, spawns a DLV query, and changes to the DLV wait state.
- *
- * @param qstate: query state.
- * @param vq: validator query state.
- * @param ve: validator shared global environment.
- * @param id: module id.
- * @return  true if there is no DLV.
- * 	false: processing is finished for the validator operate().
- * 	This function may exit in three ways:
- *         o	no DLV (aggressive cache), so insecure. (true)
- *         o	error - stop processing (false)
- *         o	DLV lookup was started, stop processing (false)
- */
-static int
-val_dlv_init(struct module_qstate* qstate, struct val_qstate* vq, 
-	struct val_env* ve, int id)
-{
-	uint8_t* nm;
-	size_t nm_len;
-	struct module_qstate* newq = NULL;
-	/* there must be a DLV configured */
-	log_assert(qstate->env->anchors->dlv_anchor);
-	/* this bool is true to avoid looping in the DLV checks */
-	log_assert(vq->dlv_checked);
-
-	/* init the DLV lookup variables */
-	vq->dlv_lookup_name = NULL;
-	vq->dlv_lookup_name_len = 0;
-	vq->dlv_insecure_at = NULL;
-	vq->dlv_insecure_at_len = 0;
-
-	/* Determine the name for which we want to lookup DLV.
-	 * This name is for the current message, or 
-	 * for the current RRset for CNAME, referral subtypes.
-	 * If there is a signer, use that, otherwise the domain name */
-	if(vq->signer_name) {
-		nm = vq->signer_name;
-		nm_len = vq->signer_len;
-	} else {
-		/* use qchase */
-		nm = vq->qchase.qname;
-		nm_len = vq->qchase.qname_len;
-		if(vq->qchase.qtype == LDNS_RR_TYPE_DS)
-			dname_remove_label(&nm, &nm_len);
-	}
-	log_nametypeclass(VERB_ALGO, "DLV init look", nm, LDNS_RR_TYPE_DS,
-		vq->qchase.qclass);
-	log_assert(nm && nm_len);
-	/* sanity check: no DLV lookups below the DLV anchor itself.
-	 * Like, an securely insecure delegation there makes no sense. */
-	if(dname_subdomain_c(nm, qstate->env->anchors->dlv_anchor->name)) {
-		verbose(VERB_ALGO, "DLV lookup within DLV repository denied");
-		return 1;
-	}
-	/* concat name (minus root label) + dlv name */
-	vq->dlv_lookup_name_len = nm_len - 1 + 
-		qstate->env->anchors->dlv_anchor->namelen;
-	vq->dlv_lookup_name = regional_alloc(qstate->region, 
-		vq->dlv_lookup_name_len);
-	if(!vq->dlv_lookup_name) {
-		log_err("Out of memory preparing DLV lookup");
-		return val_error(qstate, id);
-	}
-	memmove(vq->dlv_lookup_name, nm, nm_len-1);
-	memmove(vq->dlv_lookup_name+nm_len-1, 
-		qstate->env->anchors->dlv_anchor->name, 
-		qstate->env->anchors->dlv_anchor->namelen);
-	log_nametypeclass(VERB_ALGO, "DLV name", vq->dlv_lookup_name, 
-		LDNS_RR_TYPE_DLV, vq->qchase.qclass);
-
-	/* determine where the insecure point was determined, the DLV must 
-	 * be equal or below that to continue building the trust chain 
-	 * down. May be NULL if no trust chain was built yet */
-	nm = NULL;
-	if(vq->key_entry && key_entry_isnull(vq->key_entry)) {
-		nm = vq->key_entry->name;
-		nm_len = vq->key_entry->namelen;
-	}
-	if(nm) {
-		vq->dlv_insecure_at_len = nm_len - 1 +
-			qstate->env->anchors->dlv_anchor->namelen;
-		vq->dlv_insecure_at = regional_alloc(qstate->region,
-			vq->dlv_insecure_at_len);
-		if(!vq->dlv_insecure_at) {
-			log_err("Out of memory preparing DLV lookup");
-			return val_error(qstate, id);
-		}
-		memmove(vq->dlv_insecure_at, nm, nm_len-1);
-		memmove(vq->dlv_insecure_at+nm_len-1, 
-			qstate->env->anchors->dlv_anchor->name, 
-			qstate->env->anchors->dlv_anchor->namelen);
-		log_nametypeclass(VERB_ALGO, "insecure_at", 
-			vq->dlv_insecure_at, 0, vq->qchase.qclass);
-	}
-
-	/* If we can find the name in the aggressive negative cache,
-	 * give up; insecure is the answer */
-	while(val_neg_dlvlookup(ve->neg_cache, vq->dlv_lookup_name,
-		vq->dlv_lookup_name_len, vq->qchase.qclass,
-		qstate->env->rrset_cache, *qstate->env->now)) {
-		/* go up */
-		dname_remove_label(&vq->dlv_lookup_name, 
-			&vq->dlv_lookup_name_len);
-		/* too high? */
-		if(!dname_subdomain_c(vq->dlv_lookup_name,
-			qstate->env->anchors->dlv_anchor->name)) {
-			verbose(VERB_ALGO, "ask above dlv repo");
-			return 1; /* Above the repo is insecure */
-		}
-		/* above chain of trust? */
-		if(vq->dlv_insecure_at && !dname_subdomain_c(
-			vq->dlv_lookup_name, vq->dlv_insecure_at)) {
-			verbose(VERB_ALGO, "ask above insecure endpoint");
-			return 1;
-		}
-	}
-
-	/* perform a lookup for the DLV; with validation */
-	vq->state = VAL_DLVLOOKUP_STATE;
-	if(!generate_request(qstate, id, vq->dlv_lookup_name, 
-		vq->dlv_lookup_name_len, LDNS_RR_TYPE_DLV,
-		vq->qchase.qclass, 0, &newq, 0)) {
-		return val_error(qstate, id);
-	}
-
-	/* Find the closest encloser DLV from the repository.
-	 * then that is used to build another chain of trust 
-	 * This may first require a query 'too low' that has NSECs in
-	 * the answer, from which we determine the closest encloser DLV. 
-	 * When determine the closest encloser, skip empty nonterminals,
-	 * since we want a nonempty node in the DLV repository. */
-
-	return 0;
-}
-
 /**
  * The Finished state. The validation status (good or bad) has been determined.
  *
@@ -2145,16 +2002,6 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
 		qstate->query_flags, &qstate->qinfo, &vq->qchase, 
 		vq->orig_msg->rep, vq->rrset_skip);
 
-	/* if the result is insecure or indeterminate and we have not 
-	 * checked the DLV yet, check the DLV */
-	if((vq->chase_reply->security == sec_status_insecure ||
-		vq->chase_reply->security == sec_status_indeterminate) &&
-		qstate->env->anchors->dlv_anchor && !vq->dlv_checked) {
-		vq->dlv_checked = 1;
-		if(!val_dlv_init(qstate, vq, ve, id))
-			return 0;
-	}
-
 	/* store overall validation result in orig_msg */
 	if(vq->rrset_skip == 0)
 		vq->orig_msg->rep->security = vq->chase_reply->security;
@@ -2177,7 +2024,6 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
 			/* and restart for this rrset */
 			verbose(VERB_ALGO, "validator: go to next rrset");
 			vq->chase_reply->security = sec_status_unchecked;
-			vq->dlv_checked = 0; /* can do DLV for this RR */
 			vq->state = VAL_INIT_STATE;
 			return 1;
 		}
@@ -2195,7 +2041,6 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
 			log_query_info(VERB_ALGO, "validator: chased to",
 				&vq->qchase);
 			vq->chase_reply->security = sec_status_unchecked;
-			vq->dlv_checked = 0; /* can do DLV for this RR */
 			vq->state = VAL_INIT_STATE;
 			return 1;
 		}
@@ -2321,119 +2166,6 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
 	return 0;
 }
 
-/**
- * The DLVLookup state. Process DLV lookups.
- *
- * @param qstate: query state.
- * @param vq: validator query state.
- * @param ve: validator shared global environment.
- * @param id: module id.
- * @return true if the event should be processed further on return, false if
- *         not.
- */
-static int
-processDLVLookup(struct module_qstate* qstate, struct val_qstate* vq, 
-	struct val_env* ve, int id)
-{
-	struct module_qstate* newq = NULL;
-	/* see if this we are ready to continue normal resolution */
-	/* we may need more DLV lookups */
-	if(vq->dlv_status==dlv_error)
-		verbose(VERB_ALGO, "DLV woke up with status dlv_error");
-	else if(vq->dlv_status==dlv_success)
-		verbose(VERB_ALGO, "DLV woke up with status dlv_success");
-	else if(vq->dlv_status==dlv_ask_higher)
-		verbose(VERB_ALGO, "DLV woke up with status dlv_ask_higher");
-	else if(vq->dlv_status==dlv_there_is_no_dlv)
-		verbose(VERB_ALGO, "DLV woke up with status dlv_there_is_no_dlv");
-	else 	verbose(VERB_ALGO, "DLV woke up with status unknown");
-
-	if(vq->dlv_status == dlv_error) {
-		verbose(VERB_QUERY, "failed DLV lookup");
-		errinf(qstate, "failed DLV lookup");
-		return val_error(qstate, id);
-	} else if(vq->dlv_status == dlv_success) {
-		uint8_t* nm;
-		size_t nmlen;
-		/* chain continues with DNSKEY, continue in FINDKEY */
-		vq->state = VAL_FINDKEY_STATE;
-
-		/* strip off the DLV suffix from the name; could result in . */
-		log_assert(dname_subdomain_c(vq->ds_rrset->rk.dname,
-			qstate->env->anchors->dlv_anchor->name));
-		nmlen = vq->ds_rrset->rk.dname_len -
-			qstate->env->anchors->dlv_anchor->namelen + 1;
-		nm = regional_alloc_init(qstate->region, 
-			vq->ds_rrset->rk.dname, nmlen);
-		if(!nm) {
-			log_err("Out of memory in DLVLook");
-			return val_error(qstate, id);
-		}
-		nm[nmlen-1] = 0;
-
-		vq->ds_rrset->rk.dname = nm;
-		vq->ds_rrset->rk.dname_len = nmlen;
-
-		/* create a nullentry for the key so the dnskey lookup
-		 * can be retried after a validation failure for it */
-		vq->key_entry = key_entry_create_null(qstate->region,
-			nm, nmlen, vq->qchase.qclass, 0, 0);
-		if(!vq->key_entry) {
-			log_err("Out of memory in DLVLook");
-			return val_error(qstate, id);
-		}
-
-		if(!generate_request(qstate, id, vq->ds_rrset->rk.dname, 
-			vq->ds_rrset->rk.dname_len, LDNS_RR_TYPE_DNSKEY, 
-			vq->qchase.qclass, BIT_CD, &newq, 0)) {
-			verbose(VERB_ALGO, "error generating DNSKEY request");
-			return val_error(qstate, id);
-		}
-		return 0;
-	} else if(vq->dlv_status == dlv_there_is_no_dlv) {
-		/* continue with the insecure result we got */
-		vq->state = VAL_FINISHED_STATE;
-		return 1;
-	} 
-	log_assert(vq->dlv_status == dlv_ask_higher);
-
-	/* ask higher, make sure we stay in DLV repo, below dlv_at */
-	if(!dname_subdomain_c(vq->dlv_lookup_name,
-		qstate->env->anchors->dlv_anchor->name)) {
-		/* just like, there is no DLV */
-		verbose(VERB_ALGO, "ask above dlv repo");
-		vq->state = VAL_FINISHED_STATE;
-		return 1;
-	}
-	if(vq->dlv_insecure_at && !dname_subdomain_c(vq->dlv_lookup_name,
-		vq->dlv_insecure_at)) {
-		/* already checked a chain lower than dlv_lookup_name */
-		verbose(VERB_ALGO, "ask above insecure endpoint");
-		log_nametypeclass(VERB_ALGO, "enpt", vq->dlv_insecure_at, 0, 0);
-		vq->state = VAL_FINISHED_STATE;
-		return 1;
-	}
-
-	/* check negative cache before making new request */
-	if(val_neg_dlvlookup(ve->neg_cache, vq->dlv_lookup_name,
-		vq->dlv_lookup_name_len, vq->qchase.qclass,
-		qstate->env->rrset_cache, *qstate->env->now)) {
-		/* does not exist, go up one (go higher). */
-		dname_remove_label(&vq->dlv_lookup_name, 
-			&vq->dlv_lookup_name_len);
-		/* limit number of labels, limited number of recursion */
-		return processDLVLookup(qstate, vq, ve, id);
-	}
-
-	if(!generate_request(qstate, id, vq->dlv_lookup_name,
-		vq->dlv_lookup_name_len, LDNS_RR_TYPE_DLV, 
-		vq->qchase.qclass, 0, &newq, 0)) {
-		return val_error(qstate, id);
-	}
-
-	return 0;
-}
-
 /** 
  * Handle validator state.
  * If a method returns true, the next state is started. If false, then
@@ -2464,9 +2196,6 @@ val_handle(struct module_qstate* qstate, struct val_qstate* vq,
 			case VAL_FINISHED_STATE: 
 				cont = processFinished(qstate, vq, ve, id);
 				break;
-			case VAL_DLVLOOKUP_STATE: 
-				cont = processDLVLookup(qstate, vq, ve, id);
-				break;
 			default:
 				log_warn("validator: invalid state %d",
 					vq->state);
@@ -3105,99 +2834,6 @@ process_prime_response(struct module_qstate* qstate, struct val_qstate* vq,
 	/* the qstate will be reactivated after inform_super is done */
 }
 
-/**
- * Process DLV response. Called from inform_supers.
- * Because it is in inform_supers, the mesh itself is busy doing callbacks
- * for a state that is to be deleted soon; don't touch the mesh; instead
- * set a state in the super, as the super will be reactivated soon.
- * Perform processing to determine what state to set in the super.
- *
- * @param qstate: query state that is validating and asked for a DLV.
- * @param vq: validator query state
- * @param id: module id.
- * @param rcode: rcode result value.
- * @param msg: result message (if rcode is OK).
- * @param qinfo: from the sub query state, query info.
- */
-static void
-process_dlv_response(struct module_qstate* qstate, struct val_qstate* vq,
-	int id, int rcode, struct dns_msg* msg, struct query_info* qinfo)
-{
-	struct val_env* ve = (struct val_env*)qstate->env->modinfo[id];
-
-	verbose(VERB_ALGO, "process dlv response to super");
-	if(rcode != LDNS_RCODE_NOERROR) {
-		/* lookup failed, set in vq to give up */
-		vq->dlv_status = dlv_error;
-		verbose(VERB_ALGO, "response is error");
-		return;
-	}
-	if(msg->rep->security != sec_status_secure) {
-		vq->dlv_status = dlv_error;
-		verbose(VERB_ALGO, "response is not secure, %s",
-			sec_status_to_string(msg->rep->security));
-		return;
-	}
-	/* was the lookup a success? validated DLV? */
-	if(FLAGS_GET_RCODE(msg->rep->flags) == LDNS_RCODE_NOERROR &&
-		msg->rep->an_numrrsets == 1 &&
-		msg->rep->security == sec_status_secure &&
-		ntohs(msg->rep->rrsets[0]->rk.type) == LDNS_RR_TYPE_DLV &&
-		ntohs(msg->rep->rrsets[0]->rk.rrset_class) == qinfo->qclass &&
-		query_dname_compare(msg->rep->rrsets[0]->rk.dname, 
-			vq->dlv_lookup_name) == 0) {
-		/* yay! it is just like a DS */
-		vq->ds_rrset = (struct ub_packed_rrset_key*)
-			regional_alloc_init(qstate->region,
-			msg->rep->rrsets[0], sizeof(*vq->ds_rrset));
-		if(!vq->ds_rrset) {
-			log_err("out of memory in process_dlv");
-			return;
-		}
-		vq->ds_rrset->entry.key = vq->ds_rrset;
-		vq->ds_rrset->rk.dname = (uint8_t*)regional_alloc_init(
-			qstate->region, vq->ds_rrset->rk.dname, 
-			vq->ds_rrset->rk.dname_len);
-		if(!vq->ds_rrset->rk.dname) {
-			log_err("out of memory in process_dlv");
-			vq->dlv_status = dlv_error;
-			return;
-		}
-		vq->ds_rrset->entry.data = regional_alloc_init(qstate->region,
-			vq->ds_rrset->entry.data, 
-			packed_rrset_sizeof(vq->ds_rrset->entry.data));
-		if(!vq->ds_rrset->entry.data) {
-			log_err("out of memory in process_dlv");
-			vq->dlv_status = dlv_error;
-			return;
-		}
-		packed_rrset_ptr_fixup(vq->ds_rrset->entry.data);
-		/* make vq do a DNSKEY query next up */
-		vq->dlv_status = dlv_success;
-		return;
-	}
-	/* store NSECs into negative cache */
-	val_neg_addreply(ve->neg_cache, msg->rep);
-
-	/* was the lookup a failure? 
-	 *   if we have to go up into the DLV for a higher DLV anchor
-	 *   then set this in the vq, so it can make queries when activated.
-	 * See if the NSECs indicate that we should look for higher DLV
-	 * or, that there is no DLV securely */
-	if(!val_nsec_check_dlv(qinfo, msg->rep, &vq->dlv_lookup_name, 
-		&vq->dlv_lookup_name_len)) {
-		vq->dlv_status = dlv_error;
-		verbose(VERB_ALGO, "nsec error");
-		return;
-	}
-	if(!dname_subdomain_c(vq->dlv_lookup_name, 
-		qstate->env->anchors->dlv_anchor->name)) {
-		vq->dlv_status = dlv_there_is_no_dlv;
-		return;
-	}
-	vq->dlv_status = dlv_ask_higher;
-}
-
 /* 
  * inform validator super.
  * 
@@ -3233,10 +2869,6 @@ val_inform_super(struct module_qstate* qstate, int id,
 			qstate->return_msg, &qstate->qinfo,
 			qstate->reply_origin);
 		return;
-	} else if(qstate->qinfo.qtype == LDNS_RR_TYPE_DLV) {
-		process_dlv_response(super, vq, id, qstate->return_rcode,
-			qstate->return_msg, &qstate->qinfo);
-		return;
 	}
 	log_err("internal error in validator: no inform_supers possible");
 }
@@ -3284,7 +2916,6 @@ val_state_to_string(enum val_state state)
 		case VAL_FINDKEY_STATE: return "VAL_FINDKEY_STATE";
 		case VAL_VALIDATE_STATE: return "VAL_VALIDATE_STATE";
 		case VAL_FINISHED_STATE: return "VAL_FINISHED_STATE";
-		case VAL_DLVLOOKUP_STATE: return "VAL_DLVLOOKUP_STATE";
 	}
 	return "UNKNOWN VALIDATOR STATE";
 }

From 764a0dc765c96310c611bde80c14893b0814163d Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 4 Aug 2020 12:49:43 +0200
Subject: [PATCH 020/108] - Improve error log message when inserting rpz RR.

---
 doc/Changelog  |  3 +++
 services/rpz.c | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 9638d242f..f673908c3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+4 August 2020: George
+	- Improve error log message when inserting rpz RR.
+
 4 August 2020: Wouter
 	- Fix mini_event.h on OpenBSD cannot find fd_set.
 
diff --git a/services/rpz.c b/services/rpz.c
index 105f238d0..ba5dd186d 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -597,8 +597,18 @@ rpz_insert_rr(struct rpz* r, uint8_t* azname, size_t aznamelen, uint8_t* dname,
 	uint8_t* policydname;
 
 	if(!dname_subdomain_c(dname, azname)) {
-		log_err("RPZ: name of record to insert into RPZ is not a "
-			"subdomain of the configured name of the RPZ zone");
+		char* dname_str = sldns_wire2str_dname(dname, dnamelen);
+		char* azname_str = sldns_wire2str_dname(azname, aznamelen);
+		if(dname_str && azname_str) {
+			log_err("RPZ: name of record (%s) to insert into RPZ is not a "
+				"subdomain of the configured name of the RPZ zone (%s)",
+				dname_str, azname_str);
+		} else {
+			log_err("RPZ: name of record to insert into RPZ is not a "
+				"subdomain of the configured name of the RPZ zone");
+		}
+		free(dname_str);
+		free(azname_str);
 		return 0;
 	}
 

From dd59521e520cf82a15c3496f607009a20540c793 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 4 Aug 2020 17:17:48 +0200
Subject: [PATCH 021/108] dlv removal, remove from comments and unused code in
 iterator and validator

---
 iterator/iterator.c   |  2 +-
 validator/validator.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 23b07ea90..99d020117 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -3191,7 +3191,7 @@ processPrimeResponse(struct module_qstate* qstate, int id)
 	/* validate the root or stub after priming (if enabled).
 	 * This is the same query as the prime query, but with validation.
 	 * Now that we are primed, the additional queries that validation
-	 * may need can be resolved, such as DLV. */
+	 * may need can be resolved. */
 	if(qstate->env->cfg->harden_referral_path) {
 		struct module_qstate* subq = NULL;
 		log_nametypeclass(VERB_ALGO, "schedule prime validation", 
diff --git a/validator/validator.c b/validator/validator.c
index ab0698012..e12180b4b 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -390,10 +390,8 @@ generate_request(struct module_qstate* qstate, int id, uint8_t* name,
 	ask.local_alias = NULL;
 	log_query_info(VERB_ALGO, "generate request", &ask);
 	/* enable valrec flag to avoid recursion to the same validation
-	 * routine, this lookup is simply a lookup. DLVs need validation */
-	if(qtype == LDNS_RR_TYPE_DLV)
-		valrec = 0;
-	else valrec = 1;
+	 * routine, this lookup is simply a lookup. */
+	valrec = 1;
 
 	fptr_ok(fptr_whitelist_modenv_detect_cycle(qstate->env->detect_cycle));
 	if((*qstate->env->detect_cycle)(qstate, &ask,
@@ -1585,7 +1583,7 @@ processInit(struct module_qstate* qstate, struct val_qstate* vq,
 	vq->key_entry = key_cache_obtain(ve->kcache, lookup_name, lookup_len,
 		vq->qchase.qclass, qstate->region, *qstate->env->now);
 
-	/* there is no key(from DLV) and no trust anchor */
+	/* there is no key and no trust anchor */
 	if(vq->key_entry == NULL && anchor == NULL) {
 		/*response isn't under a trust anchor, so we cannot validate.*/
 		vq->chase_reply->security = sec_status_indeterminate;
@@ -1678,9 +1676,8 @@ processFindKey(struct module_qstate* qstate, struct val_qstate* vq, int id)
 	/* We know that state.key_entry is not 0 or bad key -- if it were,
 	 * then previous processing should have directed this event to 
 	 * a different state. 
-	 * It could be an isnull key, which signals that a DLV was just
-	 * done and the DNSKEY after the DLV failed with dnssec-retry state
-	 * and the DNSKEY has to be performed again. */
+	 * It could be an isnull key, which signals the DNSKEY failed
+	 * with retry and has to be looked up again. */
 	log_assert(vq->key_entry && !key_entry_isbad(vq->key_entry));
 	if(key_entry_isnull(vq->key_entry)) {
 		if(!generate_request(qstate, id, vq->ds_rrset->rk.dname, 

From 8f2b9b461b53e191e625fac7497f236b59e8068a Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 5 Aug 2020 10:25:56 +0200
Subject: [PATCH 022/108] dlv removal, remove DLV references from man page and
 pythonmod interface.

---
 doc/example.conf.in   | 2 +-
 doc/unbound.conf.5.in | 2 +-
 pythonmod/interface.i | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 03d22d381..5ed15397e 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -622,7 +622,7 @@ server:
 	# more slabs reduce lock contention, but fragment memory usage.
 	# key-cache-slabs: 4
 
-	# the amount of memory to use for the negative cache (used for DLV).
+	# the amount of memory to use for the negative cache.
 	# plain value in bytes or you can append k, m or G. default is "1Mb".
 	# neg-cache-size: 1m
 
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 23895d808..7acb54b06 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1014,7 +1014,7 @@ Root key trust anchor sentinel. Default is yes.
 Sets domain name to be insecure, DNSSEC chain of trust is ignored towards
 the domain name.  So a trust anchor above the domain name can not make the
 domain secure with a DS record, such a DS record is then ignored.
-Also keys from DLV are ignored for the domain.  Can be given multiple times
+Can be given multiple times
 to specify multiple domains that are treated as if unsigned.  If you set
 trust anchors for the domain they override this setting (and the domain
 is secured).
diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index f08b575d7..71f2bf774 100644
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -992,8 +992,6 @@ struct config_file {
    struct config_strlist* trust_anchor_file_list;
    struct config_strlist* trust_anchor_list;
    struct config_strlist* trusted_keys_file_list;
-   char* dlv_anchor_file;
-   struct config_strlist* dlv_anchor_list;
    int max_ttl;
    int32_t val_date_override;
    int bogus_ttl;

From 70c8d09edd5f7009988160defe901158eb1cb463 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 5 Aug 2020 15:56:45 +0200
Subject: [PATCH 023/108] - Process EDNS client tag review feedback

---
 util/edns.h   | 2 +-
 util/module.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/edns.h b/util/edns.h
index ee0e3de54..c92b1ba5e 100644
--- a/util/edns.h
+++ b/util/edns.h
@@ -77,7 +77,7 @@ struct edns_tag_addr {
  */
 struct edns_tags* edns_tags_create(void);
 
-/** Delete ENDS tags structure
+/** Delete EDNS tags structure
  * @param edns_tags: struct to delete
  */
 void edns_tags_delete(struct edns_tags* edns_tags);
diff --git a/util/module.h b/util/module.h
index 1d696ed0a..1eed21300 100644
--- a/util/module.h
+++ b/util/module.h
@@ -520,6 +520,7 @@ struct module_env {
 	struct edns_known_option* edns_known_options;
 	/* Number of known edns options */
 	size_t edns_known_options_num;
+	/** EDNS client tag information */
 	struct edns_tags* edns_tags;
 
 	/* Make every mesh state unique, do not aggregate mesh states. */

From ce0b39007de4c4cf8203b7bfcc9b48541bb22d26 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 5 Aug 2020 16:10:10 +0200
Subject: [PATCH 024/108] - Changelog entry for EDNS client tag functionality

---
 doc/Changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 4dd1f15e6..9cd6df49f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 August 2020: Ralph
+	- Merge PR #272: Add EDNS client tag functionality.
+
 4 August 2020: George
 	- Improve error log message when inserting rpz RR.
 	- Merge PR #280, Make tvOS & watchOS checks verify truthiness as well as

From 50091d49eae537f6fd328e852bc5818193633164 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 5 Aug 2020 16:33:48 +0200
Subject: [PATCH 025/108] - contrib/aaaa-filter-iterator.patch file renewed
 diff content to   apply cleanly to the current coderepo for the current code
 version.

---
 contrib/aaaa-filter-iterator.patch | 164 ++++++++++++++---------------
 doc/Changelog                      |   4 +
 2 files changed, 86 insertions(+), 82 deletions(-)

diff --git a/contrib/aaaa-filter-iterator.patch b/contrib/aaaa-filter-iterator.patch
index 9881bde89..f51de2a40 100644
--- a/contrib/aaaa-filter-iterator.patch
+++ b/contrib/aaaa-filter-iterator.patch
@@ -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	(working copy)
-@@ -701,6 +701,13 @@
+diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
+index f426ac5f..147fbfa9 100644
+--- a/doc/unbound.conf.5.in
++++ b/doc/unbound.conf.5.in
+@@ -872,6 +872,13 @@ potentially broken nameservers. A lot of domains will not be resolvable when
  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.
+ This option only has effect when qname-minimisation is enabled. Default is no.
  .TP
 +.B aaaa\-filter: \fI<yes or no>
 +Activate behavior similar to BIND's AAAA-filter.
@@ -16,14 +16,15 @@ Index: trunk/doc/unbound.conf.5.in
  .B aggressive\-nsec: \fI<yes or no>
  Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN
  and other denials, using information from previous NXDOMAINs answers.
-Index: trunk/iterator/iter_scrub.c
-===================================================================
---- trunk/iterator/iter_scrub.c	(revision 4357)
-+++ trunk/iterator/iter_scrub.c	(working copy)
-@@ -617,6 +617,32 @@
+diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
+index aae934dd..55c55de0 100644
+--- a/iterator/iter_scrub.c
++++ b/iterator/iter_scrub.c
+@@ -667,6 +667,32 @@ static int sanitize_nsec_is_overreach(struct rrset_parse* rrset,
+ 	return 0;
  }
  
- /**
++/**
 + * ASN: Lookup A records from rrset cache.
 + * @param qinfo: the question originally asked.
 + * @param env: module environment with config and cache.
@@ -49,11 +50,10 @@ Index: trunk/iterator/iter_scrub.c
 +	return 0;
 +}
 +
-+/**
+ /**
   * Given a response event, remove suspect RRsets from the response.
   * "Suspect" rrsets are potentially poison. Note that this routine expects
-  * the response to be in a "normalized" state -- that is, all "irrelevant"
-@@ -635,6 +661,7 @@
+@@ -686,6 +712,7 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg,
  	struct query_info* qinfo, uint8_t* zonename, struct module_env* env,
  	struct iter_env* ie)
  {
@@ -61,7 +61,7 @@ Index: trunk/iterator/iter_scrub.c
  	int del_addi = 0; /* if additional-holding rrsets are deleted, we
  		do not trust the normalized additional-A-AAAA any more */
  	struct rrset_parse* rrset, *prev;
-@@ -670,6 +697,13 @@
+@@ -721,6 +748,13 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg,
  		rrset = rrset->rrset_all_next;
  	}
  
@@ -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;
+@@ -732,6 +766,24 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg,
  	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,14 +96,15 @@ 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 || 
-Index: trunk/iterator/iter_utils.c
-===================================================================
---- trunk/iterator/iter_utils.c	(revision 4357)
-+++ trunk/iterator/iter_utils.c	(working copy)
-@@ -175,6 +175,7 @@
+ 			rrset->type == LDNS_RR_TYPE_AAAA)) {
+diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c
+index 7bc67da6..e10f547a 100644
+--- a/iterator/iter_utils.c
++++ b/iterator/iter_utils.c
+@@ -175,6 +175,7 @@ iter_apply_cfg(struct iter_env* iter_env, struct config_file* cfg)
  	}
  	iter_env->supports_ipv6 = cfg->do_ip6;
  	iter_env->supports_ipv4 = cfg->do_ip4;
@@ -112,11 +112,11 @@ Index: trunk/iterator/iter_utils.c
  	return 1;
  }
  
-Index: trunk/iterator/iterator.c
-===================================================================
---- trunk/iterator/iterator.c	(revision 4357)
-+++ trunk/iterator/iterator.c	(working copy)
-@@ -1847,6 +1847,53 @@
+diff --git a/iterator/iterator.c b/iterator/iterator.c
+index 23b07ea9..ca29b48c 100644
+--- a/iterator/iterator.c
++++ b/iterator/iterator.c
+@@ -2127,6 +2127,53 @@ processDSNSFind(struct module_qstate* qstate, struct iter_qstate* iq, int id)
  
  	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 @@
+@@ -2186,6 +2233,13 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
  		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 @@
+@@ -3574,6 +3628,61 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq,
  	return 0;
  }
  
@@ -246,7 +246,7 @@ Index: trunk/iterator/iterator.c
  /*
   * Return priming query results to interested super querystates.
   * 
-@@ -3114,6 +3223,9 @@
+@@ -3593,6 +3702,9 @@ iter_inform_super(struct module_qstate* qstate, int id,
  	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 @@
+@@ -3630,6 +3742,9 @@ iter_handle(struct module_qstate* qstate, struct iter_qstate* iq,
  			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 @@
+@@ -3961,6 +4076,8 @@ iter_state_to_string(enum iter_state state)
  		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 @@
+@@ -3985,6 +4102,7 @@ iter_state_is_responsestate(enum iter_state s)
  		case INIT_REQUEST_STATE :
  		case INIT_REQUEST_2_STATE :
  		case INIT_REQUEST_3_STATE :
@@ -283,11 +283,11 @@ Index: trunk/iterator/iterator.c
  		case QUERYTARGETS_STATE :
  		case COLLECT_CLASS_STATE :
  			return 0;
-Index: trunk/iterator/iterator.h
-===================================================================
---- trunk/iterator/iterator.h	(revision 4357)
-+++ trunk/iterator/iterator.h	(working copy)
-@@ -130,6 +130,9 @@
+diff --git a/iterator/iterator.h b/iterator/iterator.h
+index 342ac207..731948d1 100644
+--- a/iterator/iterator.h
++++ b/iterator/iterator.h
+@@ -135,6 +135,9 @@ struct iter_env {
  	 */
  	int* target_fetch_policy;
  
@@ -297,10 +297,11 @@ Index: trunk/iterator/iterator.h
  	/** lock on ratelimit counter */
  	lock_basic_type queries_ratelimit_lock;
  	/** number of queries that have been ratelimited */
-@@ -182,6 +185,14 @@
+@@ -186,6 +189,14 @@ enum iter_state {
+ 	 */
  	INIT_REQUEST_3_STATE,
  
- 	/**
++	/**
 +	 * This state is responsible for intercepting AAAA queries,
 +	 * and launch a A subquery on the same target, to populate the
 +	 * cache with A records, so the AAAA filter scrubbing logic can
@@ -308,29 +309,28 @@ Index: trunk/iterator/iterator.h
 +	 */
 +	ASN_FETCH_A_FOR_AAAA_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 
-@@ -364,6 +375,13 @@
- 	 * be used when creating the state. A higher one will be attempted.
+@@ -375,6 +386,13 @@ struct iter_qstate {
  	 */
  	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	(working copy)
-@@ -851,6 +851,7 @@
+ 
+diff --git a/pythonmod/interface.i b/pythonmod/interface.i
+index f08b575d..47f1bb2e 100644
+--- a/pythonmod/interface.i
++++ b/pythonmod/interface.i
+@@ -975,6 +975,7 @@ struct config_file {
     int harden_dnssec_stripped;
     int harden_referral_path;
     int use_caps_bits_for_id;
@@ -338,11 +338,11 @@ Index: trunk/pythonmod/interface.i
     struct config_strlist* private_address;
     struct config_strlist* private_domain;
     size_t unwanted_threshold;
-Index: trunk/util/config_file.c
-===================================================================
---- trunk/util/config_file.c	(revision 4357)
-+++ trunk/util/config_file.c	(working copy)
-@@ -195,6 +195,7 @@
+diff --git a/util/config_file.c b/util/config_file.c
+index 0ab8614a..729fb147 100644
+--- a/util/config_file.c
++++ b/util/config_file.c
+@@ -218,6 +218,7 @@ config_create(void)
  	cfg->harden_referral_path = 0;
  	cfg->harden_algo_downgrade = 0;
  	cfg->use_caps_bits_for_id = 0;
@@ -350,11 +350,11 @@ Index: trunk/util/config_file.c
  	cfg->caps_whitelist = NULL;
  	cfg->private_address = NULL;
  	cfg->private_domain = NULL;
-Index: trunk/util/config_file.h
-===================================================================
---- trunk/util/config_file.h	(revision 4357)
-+++ trunk/util/config_file.h	(working copy)
-@@ -209,6 +209,8 @@
+diff --git a/util/config_file.h b/util/config_file.h
+index e61257a3..dabaa7bb 100644
+--- a/util/config_file.h
++++ b/util/config_file.h
+@@ -260,6 +260,8 @@ struct config_file {
  	int harden_algo_downgrade;
  	/** use 0x20 bits in query as random ID bits */
  	int use_caps_bits_for_id;
@@ -363,11 +363,11 @@ Index: trunk/util/config_file.h
  	/** 0x20 whitelist, domains that do not use capsforid */
  	struct config_strlist* caps_whitelist;
  	/** 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	(working copy)
-@@ -279,6 +279,7 @@
+diff --git a/util/configlexer.lex b/util/configlexer.lex
+index 79a0edca..4eaec678 100644
+--- a/util/configlexer.lex
++++ b/util/configlexer.lex
+@@ -304,6 +304,7 @@ harden-algo-downgrade{COLON}	{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
  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) }
@@ -375,11 +375,11 @@ Index: trunk/util/configlexer.lex
  private-address{COLON}		{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
  private-domain{COLON}		{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
  prefetch-key{COLON}		{ YDVAR(1, VAR_PREFETCH_KEY) }
-Index: trunk/util/configparser.y
-===================================================================
---- trunk/util/configparser.y	(revision 4357)
-+++ trunk/util/configparser.y	(working copy)
-@@ -95,6 +95,7 @@
+diff --git a/util/configparser.y b/util/configparser.y
+index 1d0e8658..f284dd43 100644
+--- a/util/configparser.y
++++ b/util/configparser.y
+@@ -97,6 +97,7 @@ extern struct config_parser_state* cfg_parser;
  %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 @@
+@@ -233,6 +234,7 @@ content_server: server_num_threads | server_verbosity | server_port |
  	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))
+@@ -1563,6 +1565,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG
  			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));
diff --git a/doc/Changelog b/doc/Changelog
index 9cd6df49f..763bf51a6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+5 August 2020: Wouter
+	- contrib/aaaa-filter-iterator.patch file renewed diff content to
+	  apply cleanly to the current coderepo for the current code version.
+
 5 August 2020: Ralph
 	- Merge PR #272: Add EDNS client tag functionality.
 

From 4ec55910c4ba9b40c95b80c83da8dab33cff3ecf Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 6 Aug 2020 08:14:14 +0200
Subject: [PATCH 026/108] dlv removal, free unused variable.

---
 util/configparser.c | 904 ++++++++++++++++++++++----------------------
 util/configparser.y |   2 +
 2 files changed, 455 insertions(+), 451 deletions(-)

diff --git a/util/configparser.c b/util/configparser.c
index 5f8c70bd0..63badad61 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1092,34 +1092,34 @@ static const yytype_uint16 yyrline[] =
      854,   867,   876,   885,   894,   901,   908,   917,   924,   933,
      941,   948,   955,   963,   972,   981,   990,  1004,  1013,  1022,
     1031,  1040,  1049,  1058,  1065,  1072,  1098,  1106,  1113,  1120,
-    1126,  1132,  1140,  1148,  1156,  1163,  1174,  1185,  1192,  1201,
-    1210,  1219,  1226,  1233,  1241,  1249,  1259,  1269,  1279,  1293,
-    1301,  1314,  1325,  1333,  1346,  1355,  1364,  1373,  1383,  1393,
-    1401,  1414,  1423,  1431,  1440,  1448,  1461,  1470,  1477,  1487,
-    1497,  1507,  1517,  1527,  1537,  1547,  1557,  1564,  1571,  1578,
-    1587,  1596,  1605,  1614,  1621,  1631,  1651,  1658,  1676,  1689,
-    1702,  1711,  1720,  1729,  1738,  1748,  1758,  1769,  1778,  1787,
-    1796,  1805,  1814,  1823,  1836,  1849,  1858,  1865,  1874,  1883,
-    1892,  1901,  1909,  1922,  1930,  1971,  1978,  1993,  2003,  2013,
-    2020,  2027,  2034,  2043,  2051,  2065,  2086,  2107,  2119,  2131,
-    2143,  2152,  2173,  2183,  2192,  2200,  2208,  2221,  2234,  2249,
-    2264,  2273,  2282,  2288,  2297,  2306,  2316,  2326,  2339,  2352,
-    2364,  2378,  2390,  2404,  2414,  2421,  2428,  2437,  2446,  2456,
-    2466,  2476,  2483,  2490,  2499,  2508,  2518,  2528,  2535,  2542,
-    2549,  2557,  2567,  2577,  2587,  2597,  2636,  2646,  2654,  2662,
-    2677,  2686,  2691,  2692,  2693,  2693,  2693,  2694,  2694,  2694,
-    2695,  2695,  2697,  2707,  2716,  2723,  2730,  2737,  2744,  2751,
-    2758,  2763,  2764,  2765,  2765,  2765,  2766,  2766,  2766,  2767,
-    2768,  2768,  2769,  2769,  2770,  2770,  2771,  2772,  2773,  2774,
-    2775,  2776,  2778,  2787,  2797,  2804,  2811,  2820,  2827,  2834,
-    2841,  2848,  2857,  2866,  2873,  2880,  2890,  2900,  2910,  2920,
-    2930,  2940,  2945,  2946,  2947,  2949,  2955,  2960,  2961,  2962,
-    2964,  2970,  2980,  2987,  2996,  3004,  3009,  3010,  3012,  3012,
-    3012,  3013,  3013,  3014,  3015,  3016,  3017,  3018,  3020,  3030,
-    3039,  3046,  3055,  3062,  3071,  3079,  3092,  3100,  3113,  3118,
-    3119,  3120,  3120,  3121,  3121,  3121,  3122,  3124,  3136,  3148,
-    3160,  3175,  3188,  3201,  3212,  3217,  3218,  3219,  3219,  3221,
-    3236
+    1127,  1134,  1142,  1150,  1158,  1165,  1176,  1187,  1194,  1203,
+    1212,  1221,  1228,  1235,  1243,  1251,  1261,  1271,  1281,  1295,
+    1303,  1316,  1327,  1335,  1348,  1357,  1366,  1375,  1385,  1395,
+    1403,  1416,  1425,  1433,  1442,  1450,  1463,  1472,  1479,  1489,
+    1499,  1509,  1519,  1529,  1539,  1549,  1559,  1566,  1573,  1580,
+    1589,  1598,  1607,  1616,  1623,  1633,  1653,  1660,  1678,  1691,
+    1704,  1713,  1722,  1731,  1740,  1750,  1760,  1771,  1780,  1789,
+    1798,  1807,  1816,  1825,  1838,  1851,  1860,  1867,  1876,  1885,
+    1894,  1903,  1911,  1924,  1932,  1973,  1980,  1995,  2005,  2015,
+    2022,  2029,  2036,  2045,  2053,  2067,  2088,  2109,  2121,  2133,
+    2145,  2154,  2175,  2185,  2194,  2202,  2210,  2223,  2236,  2251,
+    2266,  2275,  2284,  2290,  2299,  2308,  2318,  2328,  2341,  2354,
+    2366,  2380,  2392,  2406,  2416,  2423,  2430,  2439,  2448,  2458,
+    2468,  2478,  2485,  2492,  2501,  2510,  2520,  2530,  2537,  2544,
+    2551,  2559,  2569,  2579,  2589,  2599,  2638,  2648,  2656,  2664,
+    2679,  2688,  2693,  2694,  2695,  2695,  2695,  2696,  2696,  2696,
+    2697,  2697,  2699,  2709,  2718,  2725,  2732,  2739,  2746,  2753,
+    2760,  2765,  2766,  2767,  2767,  2767,  2768,  2768,  2768,  2769,
+    2770,  2770,  2771,  2771,  2772,  2772,  2773,  2774,  2775,  2776,
+    2777,  2778,  2780,  2789,  2799,  2806,  2813,  2822,  2829,  2836,
+    2843,  2850,  2859,  2868,  2875,  2882,  2892,  2902,  2912,  2922,
+    2932,  2942,  2947,  2948,  2949,  2951,  2957,  2962,  2963,  2964,
+    2966,  2972,  2982,  2989,  2998,  3006,  3011,  3012,  3014,  3014,
+    3014,  3015,  3015,  3016,  3017,  3018,  3019,  3020,  3022,  3032,
+    3041,  3048,  3057,  3064,  3073,  3081,  3094,  3102,  3115,  3120,
+    3121,  3122,  3122,  3123,  3123,  3123,  3124,  3126,  3138,  3150,
+    3162,  3177,  3190,  3203,  3214,  3219,  3220,  3221,  3221,  3223,
+    3238
 };
 #endif
 
@@ -3772,64 +3772,66 @@ yyreduce:
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
+		free((yyvsp[0].str));
 	}
-#line 3777 "util/configparser.c"
+#line 3778 "util/configparser.c"
     break;
 
   case 340:
-#line 1127 "./util/configparser.y"
+#line 1128 "./util/configparser.y"
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor ignored: DLV is decommissioned");
+		free((yyvsp[0].str));
 	}
-#line 3786 "util/configparser.c"
+#line 3788 "util/configparser.c"
     break;
 
   case 341:
-#line 1133 "./util/configparser.y"
+#line 1135 "./util/configparser.y"
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3797 "util/configparser.c"
+#line 3799 "util/configparser.c"
     break;
 
   case 342:
-#line 1141 "./util/configparser.y"
+#line 1143 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3808 "util/configparser.c"
+#line 3810 "util/configparser.c"
     break;
 
   case 343:
-#line 1149 "./util/configparser.y"
+#line 1151 "./util/configparser.y"
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3819 "util/configparser.c"
+#line 3821 "util/configparser.c"
     break;
 
   case 344:
-#line 1157 "./util/configparser.y"
+#line 1159 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3829 "util/configparser.c"
+#line 3831 "util/configparser.c"
     break;
 
   case 345:
-#line 1164 "./util/configparser.y"
+#line 1166 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3839,11 +3841,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3843 "util/configparser.c"
+#line 3845 "util/configparser.c"
     break;
 
   case 346:
-#line 1175 "./util/configparser.y"
+#line 1177 "./util/configparser.y"
     {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3853,21 +3855,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3857 "util/configparser.c"
+#line 3859 "util/configparser.c"
     break;
 
   case 347:
-#line 1186 "./util/configparser.y"
+#line 1188 "./util/configparser.y"
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3867 "util/configparser.c"
+#line 3869 "util/configparser.c"
     break;
 
   case 348:
-#line 1193 "./util/configparser.y"
+#line 1195 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3875,11 +3877,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3879 "util/configparser.c"
+#line 3881 "util/configparser.c"
     break;
 
   case 349:
-#line 1202 "./util/configparser.y"
+#line 1204 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3887,11 +3889,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3891 "util/configparser.c"
+#line 3893 "util/configparser.c"
     break;
 
   case 350:
-#line 1211 "./util/configparser.y"
+#line 1213 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3899,53 +3901,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3903 "util/configparser.c"
+#line 3905 "util/configparser.c"
     break;
 
   case 351:
-#line 1220 "./util/configparser.y"
+#line 1222 "./util/configparser.y"
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 3913 "util/configparser.c"
+#line 3915 "util/configparser.c"
     break;
 
   case 352:
-#line 1227 "./util/configparser.y"
+#line 1229 "./util/configparser.y"
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 3923 "util/configparser.c"
+#line 3925 "util/configparser.c"
     break;
 
   case 353:
-#line 1234 "./util/configparser.y"
+#line 1236 "./util/configparser.y"
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3934 "util/configparser.c"
+#line 3936 "util/configparser.c"
     break;
 
   case 354:
-#line 1242 "./util/configparser.y"
+#line 1244 "./util/configparser.y"
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3945 "util/configparser.c"
+#line 3947 "util/configparser.c"
     break;
 
   case 355:
-#line 1250 "./util/configparser.y"
+#line 1252 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3954,11 +3956,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3958 "util/configparser.c"
+#line 3960 "util/configparser.c"
     break;
 
   case 356:
-#line 1260 "./util/configparser.y"
+#line 1262 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3967,11 +3969,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3971 "util/configparser.c"
+#line 3973 "util/configparser.c"
     break;
 
   case 357:
-#line 1270 "./util/configparser.y"
+#line 1272 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3980,11 +3982,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3984 "util/configparser.c"
+#line 3986 "util/configparser.c"
     break;
 
   case 358:
-#line 1280 "./util/configparser.y"
+#line 1282 "./util/configparser.y"
     {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3997,22 +3999,22 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4001 "util/configparser.c"
+#line 4003 "util/configparser.c"
     break;
 
   case 359:
-#line 1294 "./util/configparser.y"
+#line 1296 "./util/configparser.y"
     {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4012 "util/configparser.c"
+#line 4014 "util/configparser.c"
     break;
 
   case 360:
-#line 1302 "./util/configparser.y"
+#line 1304 "./util/configparser.y"
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4024,11 +4026,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4028 "util/configparser.c"
+#line 4030 "util/configparser.c"
     break;
 
   case 361:
-#line 1315 "./util/configparser.y"
+#line 1317 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4038,22 +4040,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4042 "util/configparser.c"
+#line 4044 "util/configparser.c"
     break;
 
   case 362:
-#line 1326 "./util/configparser.y"
+#line 1328 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4053 "util/configparser.c"
+#line 4055 "util/configparser.c"
     break;
 
   case 363:
-#line 1334 "./util/configparser.y"
+#line 1336 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4065,11 +4067,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4069 "util/configparser.c"
+#line 4071 "util/configparser.c"
     break;
 
   case 364:
-#line 1347 "./util/configparser.y"
+#line 1349 "./util/configparser.y"
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4077,11 +4079,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4081 "util/configparser.c"
+#line 4083 "util/configparser.c"
     break;
 
   case 365:
-#line 1356 "./util/configparser.y"
+#line 1358 "./util/configparser.y"
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4089,11 +4091,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4093 "util/configparser.c"
+#line 4095 "util/configparser.c"
     break;
 
   case 366:
-#line 1365 "./util/configparser.y"
+#line 1367 "./util/configparser.y"
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4101,11 +4103,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4105 "util/configparser.c"
+#line 4107 "util/configparser.c"
     break;
 
   case 367:
-#line 1374 "./util/configparser.y"
+#line 1376 "./util/configparser.y"
     {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4114,11 +4116,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4118 "util/configparser.c"
+#line 4120 "util/configparser.c"
     break;
 
   case 368:
-#line 1384 "./util/configparser.y"
+#line 1386 "./util/configparser.y"
     {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4127,22 +4129,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4131 "util/configparser.c"
+#line 4133 "util/configparser.c"
     break;
 
   case 369:
-#line 1394 "./util/configparser.y"
+#line 1396 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4142 "util/configparser.c"
+#line 4144 "util/configparser.c"
     break;
 
   case 370:
-#line 1402 "./util/configparser.y"
+#line 1404 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4154,11 +4156,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4158 "util/configparser.c"
+#line 4160 "util/configparser.c"
     break;
 
   case 371:
-#line 1415 "./util/configparser.y"
+#line 1417 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4166,22 +4168,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4170 "util/configparser.c"
+#line 4172 "util/configparser.c"
     break;
 
   case 372:
-#line 1424 "./util/configparser.y"
+#line 1426 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4181 "util/configparser.c"
+#line 4183 "util/configparser.c"
     break;
 
   case 373:
-#line 1432 "./util/configparser.y"
+#line 1434 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4189,22 +4191,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4193 "util/configparser.c"
+#line 4195 "util/configparser.c"
     break;
 
   case 374:
-#line 1441 "./util/configparser.y"
+#line 1443 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4204 "util/configparser.c"
+#line 4206 "util/configparser.c"
     break;
 
   case 375:
-#line 1449 "./util/configparser.y"
+#line 1451 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4216,11 +4218,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4220 "util/configparser.c"
+#line 4222 "util/configparser.c"
     break;
 
   case 376:
-#line 1462 "./util/configparser.y"
+#line 1464 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4228,21 +4230,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4232 "util/configparser.c"
+#line 4234 "util/configparser.c"
     break;
 
   case 377:
-#line 1471 "./util/configparser.y"
+#line 1473 "./util/configparser.y"
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4242 "util/configparser.c"
+#line 4244 "util/configparser.c"
     break;
 
   case 378:
-#line 1478 "./util/configparser.y"
+#line 1480 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4251,11 +4253,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4255 "util/configparser.c"
+#line 4257 "util/configparser.c"
     break;
 
   case 379:
-#line 1488 "./util/configparser.y"
+#line 1490 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4264,11 +4266,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4268 "util/configparser.c"
+#line 4270 "util/configparser.c"
     break;
 
   case 380:
-#line 1498 "./util/configparser.y"
+#line 1500 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4277,11 +4279,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4281 "util/configparser.c"
+#line 4283 "util/configparser.c"
     break;
 
   case 381:
-#line 1508 "./util/configparser.y"
+#line 1510 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4290,11 +4292,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4294 "util/configparser.c"
+#line 4296 "util/configparser.c"
     break;
 
   case 382:
-#line 1518 "./util/configparser.y"
+#line 1520 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4303,11 +4305,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4307 "util/configparser.c"
+#line 4309 "util/configparser.c"
     break;
 
   case 383:
-#line 1528 "./util/configparser.y"
+#line 1530 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4316,11 +4318,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4320 "util/configparser.c"
+#line 4322 "util/configparser.c"
     break;
 
   case 384:
-#line 1538 "./util/configparser.y"
+#line 1540 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4329,11 +4331,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4333 "util/configparser.c"
+#line 4335 "util/configparser.c"
     break;
 
   case 385:
-#line 1548 "./util/configparser.y"
+#line 1550 "./util/configparser.y"
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4342,41 +4344,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4346 "util/configparser.c"
+#line 4348 "util/configparser.c"
     break;
 
   case 386:
-#line 1558 "./util/configparser.y"
+#line 1560 "./util/configparser.y"
     {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4356 "util/configparser.c"
+#line 4358 "util/configparser.c"
     break;
 
   case 387:
-#line 1565 "./util/configparser.y"
+#line 1567 "./util/configparser.y"
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4366 "util/configparser.c"
+#line 4368 "util/configparser.c"
     break;
 
   case 388:
-#line 1572 "./util/configparser.y"
+#line 1574 "./util/configparser.y"
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4376 "util/configparser.c"
+#line 4378 "util/configparser.c"
     break;
 
   case 389:
-#line 1579 "./util/configparser.y"
+#line 1581 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4384,11 +4386,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4388 "util/configparser.c"
+#line 4390 "util/configparser.c"
     break;
 
   case 390:
-#line 1588 "./util/configparser.y"
+#line 1590 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4396,11 +4398,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4400 "util/configparser.c"
+#line 4402 "util/configparser.c"
     break;
 
   case 391:
-#line 1597 "./util/configparser.y"
+#line 1599 "./util/configparser.y"
     {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4408,11 +4410,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4412 "util/configparser.c"
+#line 4414 "util/configparser.c"
     break;
 
   case 392:
-#line 1606 "./util/configparser.y"
+#line 1608 "./util/configparser.y"
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4420,21 +4422,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4424 "util/configparser.c"
+#line 4426 "util/configparser.c"
     break;
 
   case 393:
-#line 1615 "./util/configparser.y"
+#line 1617 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4434 "util/configparser.c"
+#line 4436 "util/configparser.c"
     break;
 
   case 394:
-#line 1622 "./util/configparser.y"
+#line 1624 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4443,11 +4445,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4447 "util/configparser.c"
+#line 4449 "util/configparser.c"
     break;
 
   case 395:
-#line 1632 "./util/configparser.y"
+#line 1634 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -4466,21 +4468,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4470 "util/configparser.c"
+#line 4472 "util/configparser.c"
     break;
 
   case 396:
-#line 1652 "./util/configparser.y"
+#line 1654 "./util/configparser.y"
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4480 "util/configparser.c"
+#line 4482 "util/configparser.c"
     break;
 
   case 397:
-#line 1659 "./util/configparser.y"
+#line 1661 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4497,11 +4499,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4501 "util/configparser.c"
+#line 4503 "util/configparser.c"
     break;
 
   case 398:
-#line 1677 "./util/configparser.y"
+#line 1679 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4513,11 +4515,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4517 "util/configparser.c"
+#line 4519 "util/configparser.c"
     break;
 
   case 399:
-#line 1690 "./util/configparser.y"
+#line 1692 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4529,11 +4531,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4533 "util/configparser.c"
+#line 4535 "util/configparser.c"
     break;
 
   case 400:
-#line 1703 "./util/configparser.y"
+#line 1705 "./util/configparser.y"
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4541,11 +4543,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4545 "util/configparser.c"
+#line 4547 "util/configparser.c"
     break;
 
   case 401:
-#line 1712 "./util/configparser.y"
+#line 1714 "./util/configparser.y"
     {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4553,11 +4555,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4557 "util/configparser.c"
+#line 4559 "util/configparser.c"
     break;
 
   case 402:
-#line 1721 "./util/configparser.y"
+#line 1723 "./util/configparser.y"
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4565,11 +4567,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4569 "util/configparser.c"
+#line 4571 "util/configparser.c"
     break;
 
   case 403:
-#line 1730 "./util/configparser.y"
+#line 1732 "./util/configparser.y"
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4577,11 +4579,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4581 "util/configparser.c"
+#line 4583 "util/configparser.c"
     break;
 
   case 404:
-#line 1739 "./util/configparser.y"
+#line 1741 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4590,11 +4592,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4594 "util/configparser.c"
+#line 4596 "util/configparser.c"
     break;
 
   case 405:
-#line 1749 "./util/configparser.y"
+#line 1751 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4603,11 +4605,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4607 "util/configparser.c"
+#line 4609 "util/configparser.c"
     break;
 
   case 406:
-#line 1759 "./util/configparser.y"
+#line 1761 "./util/configparser.y"
     {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4617,11 +4619,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4621 "util/configparser.c"
+#line 4623 "util/configparser.c"
     break;
 
   case 407:
-#line 1770 "./util/configparser.y"
+#line 1772 "./util/configparser.y"
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4629,11 +4631,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4633 "util/configparser.c"
+#line 4635 "util/configparser.c"
     break;
 
   case 408:
-#line 1779 "./util/configparser.y"
+#line 1781 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4641,11 +4643,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4645 "util/configparser.c"
+#line 4647 "util/configparser.c"
     break;
 
   case 409:
-#line 1788 "./util/configparser.y"
+#line 1790 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4653,11 +4655,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4657 "util/configparser.c"
+#line 4659 "util/configparser.c"
     break;
 
   case 410:
-#line 1797 "./util/configparser.y"
+#line 1799 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4665,11 +4667,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4669 "util/configparser.c"
+#line 4671 "util/configparser.c"
     break;
 
   case 411:
-#line 1806 "./util/configparser.y"
+#line 1808 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4677,11 +4679,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4681 "util/configparser.c"
+#line 4683 "util/configparser.c"
     break;
 
   case 412:
-#line 1815 "./util/configparser.y"
+#line 1817 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4689,11 +4691,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4693 "util/configparser.c"
+#line 4695 "util/configparser.c"
     break;
 
   case 413:
-#line 1824 "./util/configparser.y"
+#line 1826 "./util/configparser.y"
     {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4705,11 +4707,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4709 "util/configparser.c"
+#line 4711 "util/configparser.c"
     break;
 
   case 414:
-#line 1837 "./util/configparser.y"
+#line 1839 "./util/configparser.y"
     {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4721,11 +4723,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4725 "util/configparser.c"
+#line 4727 "util/configparser.c"
     break;
 
   case 415:
-#line 1850 "./util/configparser.y"
+#line 1852 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4733,21 +4735,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4737 "util/configparser.c"
+#line 4739 "util/configparser.c"
     break;
 
   case 416:
-#line 1859 "./util/configparser.y"
+#line 1861 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4747 "util/configparser.c"
+#line 4749 "util/configparser.c"
     break;
 
   case 417:
-#line 1866 "./util/configparser.y"
+#line 1868 "./util/configparser.y"
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4755,11 +4757,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4759 "util/configparser.c"
+#line 4761 "util/configparser.c"
     break;
 
   case 418:
-#line 1875 "./util/configparser.y"
+#line 1877 "./util/configparser.y"
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4767,11 +4769,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4771 "util/configparser.c"
+#line 4773 "util/configparser.c"
     break;
 
   case 419:
-#line 1884 "./util/configparser.y"
+#line 1886 "./util/configparser.y"
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4779,11 +4781,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4783 "util/configparser.c"
+#line 4785 "util/configparser.c"
     break;
 
   case 420:
-#line 1893 "./util/configparser.y"
+#line 1895 "./util/configparser.y"
     {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4792,22 +4794,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4796 "util/configparser.c"
+#line 4798 "util/configparser.c"
     break;
 
   case 421:
-#line 1902 "./util/configparser.y"
+#line 1904 "./util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4807 "util/configparser.c"
+#line 4809 "util/configparser.c"
     break;
 
   case 422:
-#line 1910 "./util/configparser.y"
+#line 1912 "./util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4819,22 +4821,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4823 "util/configparser.c"
+#line 4825 "util/configparser.c"
     break;
 
   case 423:
-#line 1923 "./util/configparser.y"
+#line 1925 "./util/configparser.y"
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4834 "util/configparser.c"
+#line 4836 "util/configparser.c"
     break;
 
   case 424:
-#line 1931 "./util/configparser.y"
+#line 1933 "./util/configparser.y"
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4874,21 +4876,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4878 "util/configparser.c"
+#line 4880 "util/configparser.c"
     break;
 
   case 425:
-#line 1972 "./util/configparser.y"
+#line 1974 "./util/configparser.y"
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 4888 "util/configparser.c"
+#line 4890 "util/configparser.c"
     break;
 
   case 426:
-#line 1979 "./util/configparser.y"
+#line 1981 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -4902,11 +4904,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4906 "util/configparser.c"
+#line 4908 "util/configparser.c"
     break;
 
   case 427:
-#line 1994 "./util/configparser.y"
+#line 1996 "./util/configparser.y"
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4915,11 +4917,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4919 "util/configparser.c"
+#line 4921 "util/configparser.c"
     break;
 
   case 428:
-#line 2004 "./util/configparser.y"
+#line 2006 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4928,41 +4930,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4932 "util/configparser.c"
+#line 4934 "util/configparser.c"
     break;
 
   case 429:
-#line 2014 "./util/configparser.y"
+#line 2016 "./util/configparser.y"
     {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4942 "util/configparser.c"
+#line 4944 "util/configparser.c"
     break;
 
   case 430:
-#line 2021 "./util/configparser.y"
+#line 2023 "./util/configparser.y"
     {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4952 "util/configparser.c"
+#line 4954 "util/configparser.c"
     break;
 
   case 431:
-#line 2028 "./util/configparser.y"
+#line 2030 "./util/configparser.y"
     {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 4962 "util/configparser.c"
+#line 4964 "util/configparser.c"
     break;
 
   case 432:
-#line 2035 "./util/configparser.y"
+#line 2037 "./util/configparser.y"
     {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4970,22 +4972,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4974 "util/configparser.c"
+#line 4976 "util/configparser.c"
     break;
 
   case 433:
-#line 2044 "./util/configparser.y"
+#line 2046 "./util/configparser.y"
     {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 4985 "util/configparser.c"
+#line 4987 "util/configparser.c"
     break;
 
   case 434:
-#line 2052 "./util/configparser.y"
+#line 2054 "./util/configparser.y"
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -4998,11 +5000,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5002 "util/configparser.c"
+#line 5004 "util/configparser.c"
     break;
 
   case 435:
-#line 2066 "./util/configparser.y"
+#line 2068 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5022,11 +5024,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5026 "util/configparser.c"
+#line 5028 "util/configparser.c"
     break;
 
   case 436:
-#line 2087 "./util/configparser.y"
+#line 2089 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5046,11 +5048,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5050 "util/configparser.c"
+#line 5052 "util/configparser.c"
     break;
 
   case 437:
-#line 2108 "./util/configparser.y"
+#line 2110 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -5061,11 +5063,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5065 "util/configparser.c"
+#line 5067 "util/configparser.c"
     break;
 
   case 438:
-#line 2120 "./util/configparser.y"
+#line 2122 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -5076,11 +5078,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5080 "util/configparser.c"
+#line 5082 "util/configparser.c"
     break;
 
   case 439:
-#line 2132 "./util/configparser.y"
+#line 2134 "./util/configparser.y"
     {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -5091,11 +5093,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5095 "util/configparser.c"
+#line 5097 "util/configparser.c"
     break;
 
   case 440:
-#line 2144 "./util/configparser.y"
+#line 2146 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -5103,11 +5105,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5107 "util/configparser.c"
+#line 5109 "util/configparser.c"
     break;
 
   case 441:
-#line 2153 "./util/configparser.y"
+#line 2155 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5127,11 +5129,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5131 "util/configparser.c"
+#line 5133 "util/configparser.c"
     break;
 
   case 442:
-#line 2174 "./util/configparser.y"
+#line 2176 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5139,11 +5141,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5143 "util/configparser.c"
+#line 5145 "util/configparser.c"
     break;
 
   case 443:
-#line 2184 "./util/configparser.y"
+#line 2186 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5151,33 +5153,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5155 "util/configparser.c"
+#line 5157 "util/configparser.c"
     break;
 
   case 444:
-#line 2193 "./util/configparser.y"
+#line 2195 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5166 "util/configparser.c"
+#line 5168 "util/configparser.c"
     break;
 
   case 445:
-#line 2201 "./util/configparser.y"
+#line 2203 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5177 "util/configparser.c"
+#line 5179 "util/configparser.c"
     break;
 
   case 446:
-#line 2209 "./util/configparser.y"
+#line 2211 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5189,11 +5191,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5193 "util/configparser.c"
+#line 5195 "util/configparser.c"
     break;
 
   case 447:
-#line 2222 "./util/configparser.y"
+#line 2224 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5205,11 +5207,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5209 "util/configparser.c"
+#line 5211 "util/configparser.c"
     break;
 
   case 448:
-#line 2235 "./util/configparser.y"
+#line 2237 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5223,11 +5225,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5227 "util/configparser.c"
+#line 5229 "util/configparser.c"
     break;
 
   case 449:
-#line 2250 "./util/configparser.y"
+#line 2252 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5241,11 +5243,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5245 "util/configparser.c"
+#line 5247 "util/configparser.c"
     break;
 
   case 450:
-#line 2265 "./util/configparser.y"
+#line 2267 "./util/configparser.y"
     { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5253,11 +5255,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5257 "util/configparser.c"
+#line 5259 "util/configparser.c"
     break;
 
   case 451:
-#line 2274 "./util/configparser.y"
+#line 2276 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5265,20 +5267,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5269 "util/configparser.c"
+#line 5271 "util/configparser.c"
     break;
 
   case 452:
-#line 2283 "./util/configparser.y"
+#line 2285 "./util/configparser.y"
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5278 "util/configparser.c"
+#line 5280 "util/configparser.c"
     break;
 
   case 453:
-#line 2289 "./util/configparser.y"
+#line 2291 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5286,11 +5288,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5290 "util/configparser.c"
+#line 5292 "util/configparser.c"
     break;
 
   case 454:
-#line 2298 "./util/configparser.y"
+#line 2300 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5298,11 +5300,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5302 "util/configparser.c"
+#line 5304 "util/configparser.c"
     break;
 
   case 455:
-#line 2307 "./util/configparser.y"
+#line 2309 "./util/configparser.y"
     {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5311,11 +5313,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5315 "util/configparser.c"
+#line 5317 "util/configparser.c"
     break;
 
   case 456:
-#line 2317 "./util/configparser.y"
+#line 2319 "./util/configparser.y"
     {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5324,11 +5326,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5328 "util/configparser.c"
+#line 5330 "util/configparser.c"
     break;
 
   case 457:
-#line 2327 "./util/configparser.y"
+#line 2329 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5340,11 +5342,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5344 "util/configparser.c"
+#line 5346 "util/configparser.c"
     break;
 
   case 458:
-#line 2340 "./util/configparser.y"
+#line 2342 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5356,11 +5358,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5360 "util/configparser.c"
+#line 5362 "util/configparser.c"
     break;
 
   case 459:
-#line 2353 "./util/configparser.y"
+#line 2355 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5371,11 +5373,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5375 "util/configparser.c"
+#line 5377 "util/configparser.c"
     break;
 
   case 460:
-#line 2365 "./util/configparser.y"
+#line 2367 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5388,11 +5390,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5392 "util/configparser.c"
+#line 5394 "util/configparser.c"
     break;
 
   case 461:
-#line 2379 "./util/configparser.y"
+#line 2381 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5403,11 +5405,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5407 "util/configparser.c"
+#line 5409 "util/configparser.c"
     break;
 
   case 462:
-#line 2391 "./util/configparser.y"
+#line 2393 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5420,11 +5422,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5424 "util/configparser.c"
+#line 5426 "util/configparser.c"
     break;
 
   case 463:
-#line 2405 "./util/configparser.y"
+#line 2407 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5433,31 +5435,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5437 "util/configparser.c"
+#line 5439 "util/configparser.c"
     break;
 
   case 464:
-#line 2415 "./util/configparser.y"
+#line 2417 "./util/configparser.y"
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5447 "util/configparser.c"
+#line 5449 "util/configparser.c"
     break;
 
   case 465:
-#line 2422 "./util/configparser.y"
+#line 2424 "./util/configparser.y"
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5457 "util/configparser.c"
+#line 5459 "util/configparser.c"
     break;
 
   case 466:
-#line 2429 "./util/configparser.y"
+#line 2431 "./util/configparser.y"
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5465,11 +5467,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5469 "util/configparser.c"
+#line 5471 "util/configparser.c"
     break;
 
   case 467:
-#line 2438 "./util/configparser.y"
+#line 2440 "./util/configparser.y"
     {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5477,11 +5479,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5481 "util/configparser.c"
+#line 5483 "util/configparser.c"
     break;
 
   case 468:
-#line 2447 "./util/configparser.y"
+#line 2449 "./util/configparser.y"
     {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5490,11 +5492,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5494 "util/configparser.c"
+#line 5496 "util/configparser.c"
     break;
 
   case 469:
-#line 2457 "./util/configparser.y"
+#line 2459 "./util/configparser.y"
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5503,11 +5505,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5507 "util/configparser.c"
+#line 5509 "util/configparser.c"
     break;
 
   case 470:
-#line 2467 "./util/configparser.y"
+#line 2469 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5516,31 +5518,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5520 "util/configparser.c"
+#line 5522 "util/configparser.c"
     break;
 
   case 471:
-#line 2477 "./util/configparser.y"
+#line 2479 "./util/configparser.y"
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5530 "util/configparser.c"
+#line 5532 "util/configparser.c"
     break;
 
   case 472:
-#line 2484 "./util/configparser.y"
+#line 2486 "./util/configparser.y"
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5540 "util/configparser.c"
+#line 5542 "util/configparser.c"
     break;
 
   case 473:
-#line 2491 "./util/configparser.y"
+#line 2493 "./util/configparser.y"
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5548,11 +5550,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5552 "util/configparser.c"
+#line 5554 "util/configparser.c"
     break;
 
   case 474:
-#line 2500 "./util/configparser.y"
+#line 2502 "./util/configparser.y"
     {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5560,11 +5562,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5564 "util/configparser.c"
+#line 5566 "util/configparser.c"
     break;
 
   case 475:
-#line 2509 "./util/configparser.y"
+#line 2511 "./util/configparser.y"
     {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5573,11 +5575,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5577 "util/configparser.c"
+#line 5579 "util/configparser.c"
     break;
 
   case 476:
-#line 2519 "./util/configparser.y"
+#line 2521 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5586,52 +5588,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5590 "util/configparser.c"
+#line 5592 "util/configparser.c"
     break;
 
   case 477:
-#line 2529 "./util/configparser.y"
+#line 2531 "./util/configparser.y"
     {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5600 "util/configparser.c"
+#line 5602 "util/configparser.c"
     break;
 
   case 478:
-#line 2536 "./util/configparser.y"
+#line 2538 "./util/configparser.y"
     {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5610 "util/configparser.c"
+#line 5612 "util/configparser.c"
     break;
 
   case 479:
-#line 2543 "./util/configparser.y"
+#line 2545 "./util/configparser.y"
     {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5620 "util/configparser.c"
+#line 5622 "util/configparser.c"
     break;
 
   case 480:
-#line 2550 "./util/configparser.y"
+#line 2552 "./util/configparser.y"
     {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5631 "util/configparser.c"
+#line 5633 "util/configparser.c"
     break;
 
   case 481:
-#line 2558 "./util/configparser.y"
+#line 2560 "./util/configparser.y"
     {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5640,11 +5642,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5644 "util/configparser.c"
+#line 5646 "util/configparser.c"
     break;
 
   case 482:
-#line 2568 "./util/configparser.y"
+#line 2570 "./util/configparser.y"
     {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5653,11 +5655,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5657 "util/configparser.c"
+#line 5659 "util/configparser.c"
     break;
 
   case 483:
-#line 2578 "./util/configparser.y"
+#line 2580 "./util/configparser.y"
     {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5666,11 +5668,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5670 "util/configparser.c"
+#line 5672 "util/configparser.c"
     break;
 
   case 484:
-#line 2588 "./util/configparser.y"
+#line 2590 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5679,11 +5681,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5683 "util/configparser.c"
+#line 5685 "util/configparser.c"
     break;
 
   case 485:
-#line 2598 "./util/configparser.y"
+#line 2600 "./util/configparser.y"
     {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5721,11 +5723,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5725 "util/configparser.c"
+#line 5727 "util/configparser.c"
     break;
 
   case 486:
-#line 2637 "./util/configparser.y"
+#line 2639 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5734,33 +5736,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5738 "util/configparser.c"
+#line 5740 "util/configparser.c"
     break;
 
   case 487:
-#line 2647 "./util/configparser.y"
+#line 2649 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5749 "util/configparser.c"
+#line 5751 "util/configparser.c"
     break;
 
   case 488:
-#line 2655 "./util/configparser.y"
+#line 2657 "./util/configparser.y"
     {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5760 "util/configparser.c"
+#line 5762 "util/configparser.c"
     break;
 
   case 489:
-#line 2663 "./util/configparser.y"
+#line 2665 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5774,11 +5776,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5778 "util/configparser.c"
+#line 5780 "util/configparser.c"
     break;
 
   case 490:
-#line 2678 "./util/configparser.y"
+#line 2680 "./util/configparser.y"
     {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5786,19 +5788,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5790 "util/configparser.c"
+#line 5792 "util/configparser.c"
     break;
 
   case 491:
-#line 2687 "./util/configparser.y"
+#line 2689 "./util/configparser.y"
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5798 "util/configparser.c"
+#line 5800 "util/configparser.c"
     break;
 
   case 502:
-#line 2698 "./util/configparser.y"
+#line 2700 "./util/configparser.y"
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5807,11 +5809,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5811 "util/configparser.c"
+#line 5813 "util/configparser.c"
     break;
 
   case 503:
-#line 2708 "./util/configparser.y"
+#line 2710 "./util/configparser.y"
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5819,79 +5821,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5823 "util/configparser.c"
+#line 5825 "util/configparser.c"
     break;
 
   case 504:
-#line 2717 "./util/configparser.y"
+#line 2719 "./util/configparser.y"
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5833 "util/configparser.c"
+#line 5835 "util/configparser.c"
     break;
 
   case 505:
-#line 2724 "./util/configparser.y"
+#line 2726 "./util/configparser.y"
     {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5843 "util/configparser.c"
+#line 5845 "util/configparser.c"
     break;
 
   case 506:
-#line 2731 "./util/configparser.y"
+#line 2733 "./util/configparser.y"
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 5853 "util/configparser.c"
+#line 5855 "util/configparser.c"
     break;
 
   case 507:
-#line 2738 "./util/configparser.y"
+#line 2740 "./util/configparser.y"
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 5863 "util/configparser.c"
+#line 5865 "util/configparser.c"
     break;
 
   case 508:
-#line 2745 "./util/configparser.y"
+#line 2747 "./util/configparser.y"
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 5873 "util/configparser.c"
+#line 5875 "util/configparser.c"
     break;
 
   case 509:
-#line 2752 "./util/configparser.y"
+#line 2754 "./util/configparser.y"
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 5883 "util/configparser.c"
+#line 5885 "util/configparser.c"
     break;
 
   case 510:
-#line 2759 "./util/configparser.y"
+#line 2761 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 5891 "util/configparser.c"
+#line 5893 "util/configparser.c"
     break;
 
   case 532:
-#line 2779 "./util/configparser.y"
+#line 2781 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5899,11 +5901,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5903 "util/configparser.c"
+#line 5905 "util/configparser.c"
     break;
 
   case 533:
-#line 2788 "./util/configparser.y"
+#line 2790 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5912,31 +5914,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5916 "util/configparser.c"
+#line 5918 "util/configparser.c"
     break;
 
   case 534:
-#line 2798 "./util/configparser.y"
+#line 2800 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 5926 "util/configparser.c"
+#line 5928 "util/configparser.c"
     break;
 
   case 535:
-#line 2805 "./util/configparser.y"
+#line 2807 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 5936 "util/configparser.c"
+#line 5938 "util/configparser.c"
     break;
 
   case 536:
-#line 2812 "./util/configparser.y"
+#line 2814 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5944,51 +5946,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5948 "util/configparser.c"
+#line 5950 "util/configparser.c"
     break;
 
   case 537:
-#line 2821 "./util/configparser.y"
+#line 2823 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 5958 "util/configparser.c"
+#line 5960 "util/configparser.c"
     break;
 
   case 538:
-#line 2828 "./util/configparser.y"
+#line 2830 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 5968 "util/configparser.c"
+#line 5970 "util/configparser.c"
     break;
 
   case 539:
-#line 2835 "./util/configparser.y"
+#line 2837 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 5978 "util/configparser.c"
+#line 5980 "util/configparser.c"
     break;
 
   case 540:
-#line 2842 "./util/configparser.y"
+#line 2844 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 5988 "util/configparser.c"
+#line 5990 "util/configparser.c"
     break;
 
   case 541:
-#line 2849 "./util/configparser.y"
+#line 2851 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5996,11 +5998,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6000 "util/configparser.c"
+#line 6002 "util/configparser.c"
     break;
 
   case 542:
-#line 2858 "./util/configparser.y"
+#line 2860 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6008,31 +6010,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6012 "util/configparser.c"
+#line 6014 "util/configparser.c"
     break;
 
   case 543:
-#line 2867 "./util/configparser.y"
+#line 2869 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6022 "util/configparser.c"
+#line 6024 "util/configparser.c"
     break;
 
   case 544:
-#line 2874 "./util/configparser.y"
+#line 2876 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6032 "util/configparser.c"
+#line 6034 "util/configparser.c"
     break;
 
   case 545:
-#line 2881 "./util/configparser.y"
+#line 2883 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6041,11 +6043,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6045 "util/configparser.c"
+#line 6047 "util/configparser.c"
     break;
 
   case 546:
-#line 2891 "./util/configparser.y"
+#line 2893 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6054,11 +6056,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6058 "util/configparser.c"
+#line 6060 "util/configparser.c"
     break;
 
   case 547:
-#line 2901 "./util/configparser.y"
+#line 2903 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6067,11 +6069,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6071 "util/configparser.c"
+#line 6073 "util/configparser.c"
     break;
 
   case 548:
-#line 2911 "./util/configparser.y"
+#line 2913 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6080,11 +6082,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6084 "util/configparser.c"
+#line 6086 "util/configparser.c"
     break;
 
   case 549:
-#line 2921 "./util/configparser.y"
+#line 2923 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6093,11 +6095,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6097 "util/configparser.c"
+#line 6099 "util/configparser.c"
     break;
 
   case 550:
-#line 2931 "./util/configparser.y"
+#line 2933 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6106,47 +6108,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6110 "util/configparser.c"
+#line 6112 "util/configparser.c"
     break;
 
   case 551:
-#line 2941 "./util/configparser.y"
+#line 2943 "./util/configparser.y"
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6118 "util/configparser.c"
+#line 6120 "util/configparser.c"
     break;
 
   case 555:
-#line 2950 "./util/configparser.y"
+#line 2952 "./util/configparser.y"
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6128 "util/configparser.c"
+#line 6130 "util/configparser.c"
     break;
 
   case 556:
-#line 2956 "./util/configparser.y"
+#line 2958 "./util/configparser.y"
     { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6136 "util/configparser.c"
+#line 6138 "util/configparser.c"
     break;
 
   case 560:
-#line 2965 "./util/configparser.y"
+#line 2967 "./util/configparser.y"
     {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6146 "util/configparser.c"
+#line 6148 "util/configparser.c"
     break;
 
   case 561:
-#line 2971 "./util/configparser.y"
+#line 2973 "./util/configparser.y"
     {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6155,21 +6157,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6159 "util/configparser.c"
+#line 6161 "util/configparser.c"
     break;
 
   case 562:
-#line 2981 "./util/configparser.y"
+#line 2983 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6169 "util/configparser.c"
+#line 6171 "util/configparser.c"
     break;
 
   case 563:
-#line 2988 "./util/configparser.y"
+#line 2990 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6177,30 +6179,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6181 "util/configparser.c"
+#line 6183 "util/configparser.c"
     break;
 
   case 564:
-#line 2997 "./util/configparser.y"
+#line 2999 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6192 "util/configparser.c"
+#line 6194 "util/configparser.c"
     break;
 
   case 565:
-#line 3005 "./util/configparser.y"
+#line 3007 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6200 "util/configparser.c"
+#line 6202 "util/configparser.c"
     break;
 
   case 578:
-#line 3021 "./util/configparser.y"
+#line 3023 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6208,11 +6210,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6212 "util/configparser.c"
+#line 6214 "util/configparser.c"
     break;
 
   case 579:
-#line 3031 "./util/configparser.y"
+#line 3033 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6220,21 +6222,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6224 "util/configparser.c"
+#line 6226 "util/configparser.c"
     break;
 
   case 580:
-#line 3040 "./util/configparser.y"
+#line 3042 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6234 "util/configparser.c"
+#line 6236 "util/configparser.c"
     break;
 
   case 581:
-#line 3047 "./util/configparser.y"
+#line 3049 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6242,21 +6244,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6246 "util/configparser.c"
+#line 6248 "util/configparser.c"
     break;
 
   case 582:
-#line 3056 "./util/configparser.y"
+#line 3058 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6256 "util/configparser.c"
+#line 6258 "util/configparser.c"
     break;
 
   case 583:
-#line 3063 "./util/configparser.y"
+#line 3065 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6264,22 +6266,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6268 "util/configparser.c"
+#line 6270 "util/configparser.c"
     break;
 
   case 584:
-#line 3072 "./util/configparser.y"
+#line 3074 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6279 "util/configparser.c"
+#line 6281 "util/configparser.c"
     break;
 
   case 585:
-#line 3080 "./util/configparser.y"
+#line 3082 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6291,22 +6293,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6295 "util/configparser.c"
+#line 6297 "util/configparser.c"
     break;
 
   case 586:
-#line 3093 "./util/configparser.y"
+#line 3095 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6306 "util/configparser.c"
+#line 6308 "util/configparser.c"
     break;
 
   case 587:
-#line 3101 "./util/configparser.y"
+#line 3103 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6318,19 +6320,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6322 "util/configparser.c"
+#line 6324 "util/configparser.c"
     break;
 
   case 588:
-#line 3114 "./util/configparser.y"
+#line 3116 "./util/configparser.y"
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6330 "util/configparser.c"
+#line 6332 "util/configparser.c"
     break;
 
   case 597:
-#line 3125 "./util/configparser.y"
+#line 3127 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6341,11 +6343,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6345 "util/configparser.c"
+#line 6347 "util/configparser.c"
     break;
 
   case 598:
-#line 3137 "./util/configparser.y"
+#line 3139 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6356,11 +6358,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6360 "util/configparser.c"
+#line 6362 "util/configparser.c"
     break;
 
   case 599:
-#line 3149 "./util/configparser.y"
+#line 3151 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6371,11 +6373,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6375 "util/configparser.c"
+#line 6377 "util/configparser.c"
     break;
 
   case 600:
-#line 3161 "./util/configparser.y"
+#line 3163 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6389,11 +6391,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6393 "util/configparser.c"
+#line 6395 "util/configparser.c"
     break;
 
   case 601:
-#line 3176 "./util/configparser.y"
+#line 3178 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6405,11 +6407,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6409 "util/configparser.c"
+#line 6411 "util/configparser.c"
     break;
 
   case 602:
-#line 3189 "./util/configparser.y"
+#line 3191 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6421,11 +6423,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6425 "util/configparser.c"
+#line 6427 "util/configparser.c"
     break;
 
   case 603:
-#line 3202 "./util/configparser.y"
+#line 3204 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6435,19 +6437,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6439 "util/configparser.c"
+#line 6441 "util/configparser.c"
     break;
 
   case 604:
-#line 3213 "./util/configparser.y"
+#line 3215 "./util/configparser.y"
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6447 "util/configparser.c"
+#line 6449 "util/configparser.c"
     break;
 
   case 609:
-#line 3222 "./util/configparser.y"
+#line 3224 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6461,11 +6463,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6465 "util/configparser.c"
+#line 6467 "util/configparser.c"
     break;
 
   case 610:
-#line 3237 "./util/configparser.y"
+#line 3239 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6479,11 +6481,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6483 "util/configparser.c"
+#line 6485 "util/configparser.c"
     break;
 
 
-#line 6487 "util/configparser.c"
+#line 6489 "util/configparser.c"
 
       default: break;
     }
@@ -6715,7 +6717,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3251 "./util/configparser.y"
+#line 3253 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.y b/util/configparser.y
index 52ec8251c..e6e26a537 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -1121,12 +1121,14 @@ server_dlv_anchor_file: VAR_DLV_ANCHOR_FILE STRING_ARG
 	{
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", $2));
 		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
+		free($2);
 	}
 	;
 server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG
 	{
 		OUTYY(("P(server_dlv_anchor:%s)\n", $2));
 		log_warn("option dlv-anchor ignored: DLV is decommissioned");
+		free($2);
 	}
 	;
 server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG

From 022a716e5b5edc852e2aafcbb36fbcb5a8cac9de Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 6 Aug 2020 14:18:16 +0200
Subject: [PATCH 027/108] dlv removal, remove DLV reference from unused use in
 test case.

---
 testdata/val_stub_noroot.rpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testdata/val_stub_noroot.rpl b/testdata/val_stub_noroot.rpl
index 4235bcc52..07113bef7 100644
--- a/testdata/val_stub_noroot.rpl
+++ b/testdata/val_stub_noroot.rpl
@@ -3,8 +3,6 @@ server:
 	target-fetch-policy: "0 0 0 0 0"
 	trust-anchor: "lp0.eu. IN DNSKEY 257 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3"
 	val-override-date: "20100913111500"
-	; the dlv anchor is completely ignored, but here to test that.
-	dlv-anchor: "dlv.isc.org. IN DNSKEY 257 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3"
 	fake-sha1: yes
 	trust-anchor-signaling: no
 	minimal-responses: no

From f35293cabaa76b3bd980434028893078acede9fd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 6 Aug 2020 14:23:33 +0200
Subject: [PATCH 028/108] Changelog note for #246 and #284 - Merge PR #284 and
 Fix #246: Remove DLV entirely from Unbound.   The DLV has been decommisioned
 and in unbound 1.5.4, in 2015, there   was advise to stop using it.  The
 current code base does not contain   DLV code any more.  The use of dlv
 options displays a warning.

---
 doc/Changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 763bf51a6..bcc48de6e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+6 August 2020: Wouter
+	- Merge PR #284 and Fix #246: Remove DLV entirely from Unbound.
+	  The DLV has been decommisioned and in unbound 1.5.4, in 2015, there
+	  was advise to stop using it.  The current code base does not contain
+	  DLV code any more.  The use of dlv options displays a warning.
+
 5 August 2020: Wouter
 	- contrib/aaaa-filter-iterator.patch file renewed diff content to
 	  apply cleanly to the current coderepo for the current code version.

From a3f95d3358c75ec521bb11e73354d637b08bd0c2 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 10 Aug 2020 08:15:06 +0200
Subject: [PATCH 029/108] - Fix #287: doc typo: "Additionaly".

---
 doc/Changelog         | 3 +++
 doc/unbound.conf.5.in | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index bcc48de6e..4dd98012a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+10 August 2020: Wouter
+	- Fix #287: doc typo: "Additionaly".
+
 6 August 2020: Wouter
 	- Merge PR #284 and Fix #246: Remove DLV entirely from Unbound.
 	  The DLV has been decommisioned and in unbound 1.5.4, in 2015, there
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 8eae10a62..951094ed1 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -2101,7 +2101,7 @@ even if some data have expired in terms of DNS TTL or the Redis server has
 cached too much data;
 if necessary the Redis server must be configured to limit the cache size,
 preferably with some kind of least-recently-used eviction policy.
-Additionaly, the \fBredis\-expire\-records\fR option can be used in order to
+Additionally, the \fBredis\-expire\-records\fR option can be used in order to
 set the relative DNS TTL of the message as timeout to the Redis records; keep
 in mind that some additional memory is used per key and that the expire
 information is stored as absolute Unix timestamps in Redis (computer time must

From 31f81adadbc7992ff98f41b556e58835432bfbc1 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 10 Aug 2020 17:29:06 +0200
Subject: [PATCH 030/108]  - Check for existence 'EVP_MAC_CTX_set_params'
 function (openssl >=    3.0.0-alpha5)

---
 config.h.in     |    3 +
 configure       | 8690 +----------------------------------------------
 configure.ac    |    2 +-
 util/net_help.c |    8 +
 4 files changed, 100 insertions(+), 8603 deletions(-)

diff --git a/config.h.in b/config.h.in
index 6b106d8de..d0cb339ad 100644
--- a/config.h.in
+++ b/config.h.in
@@ -507,6 +507,9 @@
    function. */
 #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
 
+/* Define to 1 if you have the `EVP_MAC_CTX_set_params` function. */
+#undef HAVE_EVP_MAC_CTX_SET_PARAMS
+
 /* Define to 1 if you have the `SSL_get0_peername' function. */
 #undef HAVE_SSL_GET0_PEERNAME
 
diff --git a/configure b/configure
index 2510b2bfc..223ed24db 100755
--- a/configure
+++ b/configure
@@ -198,15 +198,7 @@ test -x / || exit 1"
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -565,8 +557,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-SHELL=${CONFIG_SHELL-/bin/sh}
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -722,26 +712,6 @@ LIBOBJS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-LT_SYS_LIBRARY_PATH
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-AWK
-RANLIB
-ac_ct_AR
-DLLTOOL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-SED
-LIBTOOL
 AR
 host_os
 host_vendor
@@ -808,6 +778,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -843,14 +814,6 @@ enable_debug
 enable_flto
 enable_pie
 enable_relro_now
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_aix_soname
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
 enable_rpath
 enable_largefile
 enable_systemd
@@ -909,7 +872,6 @@ CPPFLAGS
 CPP
 YACC
 YFLAGS
-LT_SYS_LIBRARY_PATH
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -956,6 +918,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1208,6 +1171,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1345,7 +1317,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1498,6 +1470,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1538,11 +1511,6 @@ Optional Features:
                           benefit from ASLR, small performance penalty)
   --enable-relro-now      Enable full relocation binding at load-time (RELRO
                           NOW, to protect GOT and .dtor areas)
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-rpath         disable hardcoded rpath (default=enabled)
   --disable-largefile     omit support for large files
   --enable-systemd        compile with systemd support
@@ -1610,14 +1578,6 @@ Optional Packages:
                           not exist if you are content with the builtin.
   --with-username=user    set default user that unbound changes to (default
                           user is unbound)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-aix-soname=aix|svr4|both
-                          shared library versioning (aka "SONAME") variant to
-                          provide on AIX, [default=aix].
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
   --with-pthreads         use pthreads library, or --without-pthreads to
                           disable threading support.
   --with-solaris-threads  use solaris native thread library.
@@ -1664,8 +1624,6 @@ Some influential environment variables:
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
-  LT_SYS_LIBRARY_PATH
-              User-defined run-time library search path.
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -2049,73 +2007,6 @@ fi
 
 } # ac_fn_c_try_link
 
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2353,6 +2244,73 @@ rm -f conftest.val
 
 } # ac_fn_c_compute_int
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
 # ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
@@ -6959,7649 +6917,9 @@ if test $AR = false; then
 	as_fn_error $? "Cannot find 'ar', please extend PATH to include it" "$LINENO" 5
 fi
 
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.6'
-macro_revision='2.4.6'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case $ECHO in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-$as_echo_n "checking for a working dd... " >&6; }
-if ${ac_cv_path_lt_DD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-if test -z "$lt_DD"; then
-  ac_path_lt_DD_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in dd; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_lt_DD" || continue
-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi
-      $ac_path_lt_DD_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_lt_DD"; then
-    :
-  fi
-else
-  ac_cv_path_lt_DD=$lt_DD
-fi
-
-rm -f conftest.i conftest2.i conftest.out
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-$as_echo "$ac_cv_path_lt_DD" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-$as_echo_n "checking how to truncate binary pipes... " >&6; }
-if ${lt_cv_truncate_bin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-$as_echo "$lt_cv_truncate_bin" >&6; }
-
-
-
-
-
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[012][,.]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-  shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[5-9]*,yes)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
-
-# Check whether --with-aix-soname was given.
-if test "${with_aix_soname+set}" = set; then :
-  withval=$with_aix_soname; case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname
-else
-  if ${lt_cv_with_aix_soname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_with_aix_soname=aix
-fi
-
-    with_aix_soname=$lt_cv_with_aix_soname
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-$as_echo "$with_aix_soname" >&6; }
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/${ac_tool_prefix}file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC=$CC
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test yes = "$GCC"; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        lt_prog_compiler_wl='-Wl,-Wl,,'
-        lt_prog_compiler_pic='-PIC'
-        lt_prog_compiler_static='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works"; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works"; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-    export_dynamic_flag_spec='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='$wl--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-      export_dynamic_flag_spec='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  export_dynamic_flag_spec='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test no = "$ld_shlibs"; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	hardcode_direct=no
-	hardcode_direct_absolute=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      export_dynamic_flag_spec='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' $wl-bernotok'
-	  allow_undefined_flag=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test yes = "$lt_cv_prog_compiler__b"; then
-    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS=$save_LDFLAGS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	ld_shlibs=yes
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	  export_dynamic_flag_spec='$wl-E'
-	else
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='$wl-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='$wl-z,text'
-      allow_undefined_flag='$wl-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test no = "$ld_shlibs" && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test yes = "$hardcode_automatic"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
-     test no != "$hardcode_minus_L"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test relink = "$hardcode_action" ||
-   test yes = "$inherit_rpath"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP"; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report what library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
 
 
+AC_PROG_LIBTOOL
 
 
 
@@ -15675,7 +7993,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15721,7 +8039,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15745,7 +8063,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15790,7 +8108,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15814,7 +8132,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -18341,7 +10659,7 @@ fi
 
 done
 
-for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback
+for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback EVP_MAC_CTX_set_params
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -22215,7 +14533,6 @@ gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
-AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 
@@ -22319,293 +14636,6 @@ _ASBOX
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_import \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-lt_cv_nm_interface \
-nm_file_list_spec \
-lt_cv_truncate_bin \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-configure_time_dlsearch_path \
-configure_time_lt_sys_library_path; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -22614,7 +14644,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "disable-rpath") CONFIG_COMMANDS="$CONFIG_COMMANDS disable-rpath" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/example.conf") CONFIG_FILES="$CONFIG_FILES doc/example.conf" ;;
@@ -23183,549 +15212,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-# Copyright (C) 2014 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.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=''
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shared archive member basename,for filename based shared library versioning on AIX.
-shared_archive_member_spec=$shared_archive_member_spec
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm into a list of symbols to manually relocate.
-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name lister interface.
-nm_interface=$lt_lt_cv_nm_interface
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and where our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# Command to truncate a binary pipe.
-lt_truncate_bin=$lt_lt_cv_truncate_bin
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
-
-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
     "disable-rpath":C)
 	sed < libtool > libtool-2 \
 	's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_RPATH_SED__ "/'
diff --git a/configure.ac b/configure.ac
index 59a075086..e488ae488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -852,7 +852,7 @@ else
 	AC_MSG_RESULT([no])
 fi
 AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h openssl/core_names.h],,, [AC_INCLUDES_DEFAULT])
-AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback])
+AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback EVP_MAC_CTX_set_params])
 
 # these check_funcs need -lssl
 BAKLIBS="$LIBS"
diff --git a/util/net_help.c b/util/net_help.c
index ce1bc0c15..4d985b66d 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -1478,7 +1478,11 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
 		params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
 			"sha256", 0);
 		params[2] = OSSL_PARAM_construct_end();
+#ifdef HAVE_EVP_MAC_CTX_SET_PARAMS
 		EVP_MAC_CTX_set_params(hmac_ctx, params);
+#else
+		EVP_MAC_set_ctx_params(hmac_ctx, params);
+#endif
 #elif !defined(HMAC_INIT_EX_RETURNS_VOID)
 		if (HMAC_Init_ex(hmac_ctx, ticket_keys->hmac_key, 32, digest, NULL) != 1) {
 			verbose(VERB_CLIENT, "HMAC_Init_ex failed");
@@ -1509,7 +1513,11 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
 		params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
 			"sha256", 0);
 		params[2] = OSSL_PARAM_construct_end();
+#ifdef HAVE_EVP_MAC_CTX_SET_PARAMS
 		EVP_MAC_CTX_set_params(hmac_ctx, params);
+#else
+		EVP_MAC_set_ctx_params(hmac_ctx, params);
+#endif
 #elif !defined(HMAC_INIT_EX_RETURNS_VOID)
 		if (HMAC_Init_ex(hmac_ctx, key->hmac_key, 32, digest, NULL) != 1) {
 			verbose(VERB_CLIENT, "HMAC_Init_ex failed");

From 59a66601f0aa7915ceaab4fd36b92a6ea943980c Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 10 Aug 2020 17:35:18 +0200
Subject: [PATCH 031/108] Add changlog entry for PR #277.

---
 doc/Changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 4dd98012a..346555b00 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+10 August 2020: Ralph
+	- Merge (modified) PR #277, use EVP_MAC_CTX_set_params if available,
+	  by Vítězslav Čížek.
+
 10 August 2020: Wouter
 	- Fix #287: doc typo: "Additionaly".
 

From 3e86d30a508be7d368d20f790621255eedc94ad6 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 10 Aug 2020 17:42:41 +0200
Subject: [PATCH 032/108] Rerun autoconf and autoheader on configure.ac, with
 libtool

---
 config.h.in |    6 +-
 configure   | 8688 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 8604 insertions(+), 90 deletions(-)

diff --git a/config.h.in b/config.h.in
index d0cb339ad..2ed8a461c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -221,6 +221,9 @@
 /* Define to 1 if you have the `EVP_EncryptInit_ex' function. */
 #undef HAVE_EVP_ENCRYPTINIT_EX
 
+/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */
+#undef HAVE_EVP_MAC_CTX_SET_PARAMS
+
 /* Define to 1 if you have the `EVP_MD_CTX_new' function. */
 #undef HAVE_EVP_MD_CTX_NEW
 
@@ -507,9 +510,6 @@
    function. */
 #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
 
-/* Define to 1 if you have the `EVP_MAC_CTX_set_params` function. */
-#undef HAVE_EVP_MAC_CTX_SET_PARAMS
-
 /* Define to 1 if you have the `SSL_get0_peername' function. */
 #undef HAVE_SSL_GET0_PEERNAME
 
diff --git a/configure b/configure
index 223ed24db..245b44380 100755
--- a/configure
+++ b/configure
@@ -198,7 +198,15 @@ test -x / || exit 1"
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -557,6 +565,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+SHELL=${CONFIG_SHELL-/bin/sh}
+
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -712,6 +722,26 @@ LIBOBJS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+AWK
+RANLIB
+ac_ct_AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+LIBTOOL
 AR
 host_os
 host_vendor
@@ -778,7 +808,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -814,6 +843,14 @@ enable_debug
 enable_flto
 enable_pie
 enable_relro_now
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
 enable_rpath
 enable_largefile
 enable_systemd
@@ -872,6 +909,7 @@ CPPFLAGS
 CPP
 YACC
 YFLAGS
+LT_SYS_LIBRARY_PATH
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -918,7 +956,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1171,15 +1208,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1317,7 +1345,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1470,7 +1498,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1511,6 +1538,11 @@ Optional Features:
                           benefit from ASLR, small performance penalty)
   --enable-relro-now      Enable full relocation binding at load-time (RELRO
                           NOW, to protect GOT and .dtor areas)
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-rpath         disable hardcoded rpath (default=enabled)
   --disable-largefile     omit support for large files
   --enable-systemd        compile with systemd support
@@ -1578,6 +1610,14 @@ Optional Packages:
                           not exist if you are content with the builtin.
   --with-username=user    set default user that unbound changes to (default
                           user is unbound)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
   --with-pthreads         use pthreads library, or --without-pthreads to
                           disable threading support.
   --with-solaris-threads  use solaris native thread library.
@@ -1624,6 +1664,8 @@ Some influential environment variables:
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -2007,6 +2049,73 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2244,73 +2353,6 @@ rm -f conftest.val
 
 } # ac_fn_c_compute_int
 
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
 # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
 # ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
@@ -6917,9 +6959,7649 @@ if test $AR = false; then
 	as_fn_error $? "Cannot find 'ar', please extend PATH to include it" "$LINENO" 5
 fi
 
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[012][,.]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
+	else
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
 
 
-AC_PROG_LIBTOOL
 
 
 
@@ -7993,7 +15675,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -8039,7 +15721,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -8063,7 +15745,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -8108,7 +15790,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -8132,7 +15814,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -14533,6 +22215,7 @@ gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 
@@ -14636,6 +22319,293 @@ _ASBOX
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14644,6 +22614,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "disable-rpath") CONFIG_COMMANDS="$CONFIG_COMMANDS disable-rpath" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/example.conf") CONFIG_FILES="$CONFIG_FILES doc/example.conf" ;;
@@ -15212,6 +23183,549 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 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.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
     "disable-rpath":C)
 	sed < libtool > libtool-2 \
 	's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_RPATH_SED__ "/'

From b75ff25cfdfde8be471768029f38cfa818436eb6 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 10 Aug 2020 17:43:19 +0200
Subject: [PATCH 033/108] Changelog note. 	- Rerun autoconf

---
 doc/Changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/Changelog b/doc/Changelog
index 346555b00..01f2ee3c2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 
 10 August 2020: Wouter
 	- Fix #287: doc typo: "Additionaly".
+	- Rerun autoconf
 
 6 August 2020: Wouter
 	- Merge PR #284 and Fix #246: Remove DLV entirely from Unbound.

From 8b05dcdf8c3fd4624e1847028fd03bf041b44508 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 13 Aug 2020 14:57:21 +0200
Subject: [PATCH 034/108] - Create and init edns tags data for libunbound.

---
 doc/Changelog           |  3 +++
 libunbound/context.c    |  3 +++
 libunbound/libunbound.c | 13 +++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 01f2ee3c2..8bc333e0d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+13 August 2020: Ralph
+	- Create and init edns tags data for libunbound.
+
 10 August 2020: Ralph
 	- Merge (modified) PR #277, use EVP_MAC_CTX_set_params if available,
 	  by Vítězslav Čížek.
diff --git a/libunbound/context.c b/libunbound/context.c
index 6d62e32b5..713259c71 100644
--- a/libunbound/context.c
+++ b/libunbound/context.c
@@ -50,6 +50,7 @@
 #include "services/authzone.h"
 #include "util/data/msgreply.h"
 #include "util/storage/slabhash.h"
+#include "util/edns.h"
 #include "sldns/sbuffer.h"
 
 int 
@@ -79,6 +80,8 @@ context_finalize(struct ub_ctx* ctx)
 		return UB_INITFAIL;
 	if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1, &is_rpz))
 		return UB_INITFAIL;
+	if(!edns_tags_apply_cfg(ctx->env->edns_tags, cfg))
+		return UB_INITFAIL;
 	if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size,
 		cfg->msg_cache_slabs)) {
 		slabhash_delete(ctx->env->msg_cache);
diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index 3b30419b3..af26e5546 100644
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -58,6 +58,7 @@
 #include "util/net_help.h"
 #include "util/tube.h"
 #include "util/ub_event.h"
+#include "util/edns.h"
 #include "services/modstack.h"
 #include "services/localzone.h"
 #include "services/cache/infra.h"
@@ -153,6 +154,18 @@ static struct ub_ctx* ub_ctx_create_nopipe(void)
 		errno = ENOMEM;
 		return NULL;
 	}
+	ctx->env->edns_tags = edns_tags_create();
+	if(!ctx->env->edns_tags) {
+		auth_zones_delete(ctx->env->auth_zones);
+		edns_known_options_delete(ctx->env);
+		config_delete(ctx->env->cfg);
+		free(ctx->env);
+		ub_randfree(ctx->seed_rnd);
+		free(ctx);
+		errno = ENOMEM;
+		return NULL;
+	}
+
 	ctx->env->alloc = &ctx->superalloc;
 	ctx->env->worker = NULL;
 	ctx->env->need_to_validate = 0;

From e6ebabc0cc492bca4519111b11eb4864e602a5c6 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 20 Aug 2020 17:54:28 +0200
Subject: [PATCH 035/108] - Fix stats double count issue (#289).

---
 daemon/worker.c | 11 +----------
 doc/Changelog   |  3 +++
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 23e3244c5..680241fff 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1219,7 +1219,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
 		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), 
 			LDNS_RCODE_FORMERR);
-		server_stats_insrcode(&worker->stats, c->buffer);
 		goto send_reply;
 	}
 	if(worker->env.cfg->log_queries) {
@@ -1237,7 +1236,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			LDNS_RCODE_REFUSED);
 		if(worker->stats.extended) {
 			worker->stats.qtype[qinfo.qtype]++;
-			server_stats_insrcode(&worker->stats, c->buffer);
 		}
 		goto send_reply;
 	}
@@ -1259,7 +1257,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			LDNS_RCODE_FORMERR);
 		if(worker->stats.extended) {
 			worker->stats.qtype[qinfo.qtype]++;
-			server_stats_insrcode(&worker->stats, c->buffer);
 		}
 		goto send_reply;
 	}
@@ -1275,7 +1272,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			*(uint16_t*)(void *)sldns_buffer_begin(c->buffer),
 			sldns_buffer_read_u16_at(c->buffer, 2), &reply_edns);
 		regional_free_all(worker->scratchpad);
-		server_stats_insrcode(&worker->stats, c->buffer);
 		goto send_reply;
 	}
 	if(edns.edns_present) {
@@ -1354,7 +1350,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		edns.udp_size = 65535; /* max size for TCP replies */
 	if(qinfo.qclass == LDNS_RR_CLASS_CH && answer_chaos(worker, &qinfo,
 		&edns, repinfo, c->buffer)) {
-		server_stats_insrcode(&worker->stats, c->buffer);
 		regional_free_all(worker->scratchpad);
 		goto send_reply;
 	}
@@ -1375,7 +1370,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			comm_point_drop_reply(repinfo);
 			return 0;
 		}
-		server_stats_insrcode(&worker->stats, c->buffer);
 		goto send_reply;
 	}
 	if(worker->env.auth_zones &&
@@ -1387,7 +1381,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			comm_point_drop_reply(repinfo);
 			return 0;
 		}
-		server_stats_insrcode(&worker->stats, c->buffer);
 		goto send_reply;
 	}
 	if(worker->env.auth_zones &&
@@ -1403,7 +1396,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		if(LDNS_RD_WIRE(sldns_buffer_begin(c->buffer)) &&
 		   acl != acl_deny_non_local && acl != acl_refuse_non_local)
 			LDNS_RA_SET(sldns_buffer_begin(c->buffer));
-		server_stats_insrcode(&worker->stats, c->buffer);
 		goto send_reply;
 	}
 
@@ -1432,7 +1424,6 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			*(uint16_t*)(void *)sldns_buffer_begin(c->buffer),
 			sldns_buffer_read_u16_at(c->buffer, 2), NULL);
 		regional_free_all(worker->scratchpad);
-		server_stats_insrcode(&worker->stats, c->buffer);
 		log_addr(VERB_ALGO, "refused nonrec (cache snoop) query from",
 			&repinfo->addr, repinfo->addrlen);
 		goto send_reply;
@@ -1588,9 +1579,9 @@ send_reply_rc:
 	if(is_expired_answer) {
 		worker->stats.ans_expired++;
 	}
+	server_stats_insrcode(&worker->stats, c->buffer);
 	if(worker->stats.extended) {
 		if(is_secure_answer) worker->stats.ans_secure++;
-		server_stats_insrcode(&worker->stats, repinfo->c->buffer);
 	}
 #ifdef USE_DNSTAP
 	if(worker->dtenv.log_client_response_messages)
diff --git a/doc/Changelog b/doc/Changelog
index 8bc333e0d..de643c8b1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+20 August 2020: Ralph
+	- Fix stats double count issue (#289).
+
 13 August 2020: Ralph
 	- Create and init edns tags data for libunbound.
 

From 45712de9a21ef3c704aac889b88ee0867dba5650 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 24 Aug 2020 09:23:36 +0200
Subject: [PATCH 036/108] - Fix that dnstap reconnects do not spam the log with
 the repeated   attempts.  Attempts on the timer are only logged on high
 verbosity,   if they produce a connection failure error.

---
 dnstap/dtstream.c | 10 ++++++++++
 doc/Changelog     |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index dda3ef1ff..7c8a08604 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -1873,6 +1873,11 @@ static int dtio_open_output_local(struct dt_io_thread* dtio)
 	if(connect(dtio->fd, (struct sockaddr*)&s, (socklen_t)sizeof(s))
 		== -1) {
 		char* to = dtio->socket_path;
+		if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN &&
+			verbosity < 4) {
+			dtio_close_fd(dtio);
+			return 0; /* no log retries on low verbosity */
+		}
 #ifndef USE_WINSOCK
 		log_err("dnstap io: failed to connect to \"%s\": %s",
 			to, strerror(errno));
@@ -1916,6 +1921,11 @@ static int dtio_open_output_tcp(struct dt_io_thread* dtio)
 	if(connect(dtio->fd, (struct sockaddr*)&addr, addrlen) == -1) {
 		if(errno == EINPROGRESS)
 			return 1; /* wait until connect done*/
+		if(dtio->reconnect_timeout > DTIO_RECONNECT_TIMEOUT_MIN &&
+			verbosity < 4) {
+			dtio_close_fd(dtio);
+			return 0; /* no log retries on low verbosity */
+		}
 #ifndef USE_WINSOCK
 		if(tcp_connect_errno_needs_log(
 			(struct sockaddr *)&addr, addrlen)) {
diff --git a/doc/Changelog b/doc/Changelog
index de643c8b1..1923c17ad 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+24 August 2020: Wouter
+	- Fix that dnstap reconnects do not spam the log with the repeated
+	  attempts.  Attempts on the timer are only logged on high verbosity,
+	  if they produce a connection failure error.
+
 20 August 2020: Ralph
 	- Fix stats double count issue (#289).
 

From 45d4cbaa420d2e1ce2ea2a21a9ed3d9666655bc6 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 24 Aug 2020 14:55:16 +0200
Subject: [PATCH 037/108] - Fix to apply chroot to dnstap-socket-path, if
 chroot is enabled.

---
 dnstap/dnstap.c   | 10 ++++++++--
 dnstap/dtstream.c |  3 ++-
 doc/Changelog     |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c
index cc5449dff..bda837876 100644
--- a/dnstap/dnstap.c
+++ b/dnstap/dnstap.c
@@ -134,9 +134,15 @@ dt_create(struct config_file* cfg)
 
 	if(cfg->dnstap && cfg->dnstap_socket_path && cfg->dnstap_socket_path[0] &&
 		(cfg->dnstap_ip==NULL || cfg->dnstap_ip[0]==0)) {
+		char* p = fname_after_chroot(cfg->dnstap_socket_path, cfg, 1);
+		if(!p) {
+			log_err("malloc failure");
+			return NULL;
+		}
 		verbose(VERB_OPS, "attempting to connect to dnstap socket %s",
-			cfg->dnstap_socket_path);
-		check_socket_file(cfg->dnstap_socket_path);
+			p);
+		check_socket_file(p);
+		free(p);
 	}
 
 	env = (struct dt_env *) calloc(1, sizeof(struct dt_env));
diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index 7c8a08604..63d517cb8 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -279,7 +279,8 @@ int dt_io_thread_apply_cfg(struct dt_io_thread* dtio, struct config_file *cfg)
 			return 0;
 		}
 		free(dtio->socket_path);
-		dtio->socket_path = strdup(cfg->dnstap_socket_path);
+		dtio->socket_path = fname_after_chroot(cfg->dnstap_socket_path,
+			cfg, 1);
 		if(!dtio->socket_path) {
 			log_err("dnstap setup: malloc failure");
 			return 0;
diff --git a/doc/Changelog b/doc/Changelog
index 1923c17ad..37931d395 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix that dnstap reconnects do not spam the log with the repeated
 	  attempts.  Attempts on the timer are only logged on high verbosity,
 	  if they produce a connection failure error.
+	- Fix to apply chroot to dnstap-socket-path, if chroot is enabled.
 
 20 August 2020: Ralph
 	- Fix stats double count issue (#289).

From aa602fdd0c9447df95cd1f18c27a33ff964d2be1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 24 Aug 2020 16:13:42 +0200
Subject: [PATCH 038/108] - Change configure to use EVP_sha256 instead of
 HMAC_Update for   openssl-3.0.0.

---
 acx_nlnetlabs.m4 | 37 +++++++++++++++++++------------------
 config.h.in      |  3 ---
 configure        | 32 ++++++++++++++++----------------
 configure.ac     |  2 +-
 doc/Changelog    |  2 ++
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 8eccc15b0..31e43d67e 100644
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 34
+# Version 35
+# 2020-08-24 Use EVP_sha256 instead of HMAC_Update (for openssl-3.0.0).
 # 2016-03-21 Check -ldl -pthread for libcrypto for ldns and openssl 1.1.0.
 # 2016-03-21 Use HMAC_Update instead of HMAC_CTX_Init (for openssl-1.1.0).
 # 2016-01-04 -D_DEFAULT_SOURCE defined with -D_BSD_SOURCE for Linux glibc 2.20
@@ -673,16 +674,16 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                 ACX_RUNTIME_PATH_ADD([$ssldir/lib])
             fi
         
-            AC_MSG_CHECKING([for HMAC_Update in -lcrypto])
+            AC_MSG_CHECKING([for EVP_sha256 in -lcrypto])
             LIBS="$LIBS -lcrypto"
             LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
             AC_TRY_LINK(, [
-                int HMAC_Update(void);
-                (void)HMAC_Update();
+                int EVP_sha256(void);
+                (void)EVP_sha256();
               ], [
                 AC_MSG_RESULT(yes)
-                AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
-                          [If you have HMAC_Update])
+                AC_DEFINE([HAVE_EVP_SHA256], 1,
+                          [If you have EVP_sha256])
               ], [
                 AC_MSG_RESULT(no)
                 # check if -lwsock32 or -lgdi32 are needed.	
@@ -692,11 +693,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
 		LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32"
                 AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
                 AC_TRY_LINK([], [
-                    int HMAC_Update(void);
-                    (void)HMAC_Update();
+                    int EVP_sha256(void);
+                    (void)EVP_sha256();
                   ],[
-                    AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
-                        [If you have HMAC_Update])
+                    AC_DEFINE([HAVE_EVP_SHA256], 1,
+                        [If you have EVP_sha256])
                     AC_MSG_RESULT(yes) 
                   ],[
                     AC_MSG_RESULT(no)
@@ -706,11 +707,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                     LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
                     AC_MSG_CHECKING([if -lcrypto needs -ldl])
                     AC_TRY_LINK([], [
-                        int HMAC_Update(void);
-                        (void)HMAC_Update();
+                        int EVP_sha256(void);
+                        (void)EVP_sha256();
                       ],[
-                        AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
-                            [If you have HMAC_Update])
+                        AC_DEFINE([HAVE_EVP_SHA256], 1,
+                            [If you have EVP_sha256])
                         AC_MSG_RESULT(yes) 
                       ],[
                         AC_MSG_RESULT(no)
@@ -720,11 +721,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                         LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread"
                         AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread])
                         AC_TRY_LINK([], [
-                            int HMAC_Update(void);
-                            (void)HMAC_Update();
+                            int EVP_sha256(void);
+                            (void)EVP_sha256();
                           ],[
-                            AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
-                                [If you have HMAC_Update])
+                            AC_DEFINE([HAVE_EVP_SHA256], 1,
+                                [If you have EVP_sha256])
                             AC_MSG_RESULT(yes) 
                           ],[
                             AC_MSG_RESULT(no)
diff --git a/config.h.in b/config.h.in
index 2ed8a461c..65c258517 100644
--- a/config.h.in
+++ b/config.h.in
@@ -299,9 +299,6 @@
 /* Define to 1 if you have the `HMAC_Init_ex' function. */
 #undef HAVE_HMAC_INIT_EX
 
-/* If you have HMAC_Update */
-#undef HAVE_HMAC_UPDATE
-
 /* If we have htobe64 */
 #undef HAVE_HTOBE64
 
diff --git a/configure b/configure
index 245b44380..4df378a8a 100755
--- a/configure
+++ b/configure
@@ -17943,8 +17943,8 @@ $as_echo "found in $ssldir" >&6; }
 
             fi
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Update in -lcrypto" >&5
-$as_echo_n "checking for HMAC_Update in -lcrypto... " >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_sha256 in -lcrypto" >&5
+$as_echo_n "checking for EVP_sha256 in -lcrypto... " >&6; }
             LIBS="$LIBS -lcrypto"
             LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17954,8 +17954,8 @@ int
 main ()
 {
 
-                int HMAC_Update(void);
-                (void)HMAC_Update();
+                int EVP_sha256(void);
+                (void)EVP_sha256();
 
   ;
   return 0;
@@ -17966,7 +17966,7 @@ if ac_fn_c_try_link "$LINENO"; then :
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
+$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h
 
 
 else
@@ -17987,8 +17987,8 @@ int
 main ()
 {
 
-                    int HMAC_Update(void);
-                    (void)HMAC_Update();
+                    int EVP_sha256(void);
+                    (void)EVP_sha256();
 
   ;
   return 0;
@@ -17997,7 +17997,7 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
 
-$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
+$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h
 
                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -18019,8 +18019,8 @@ int
 main ()
 {
 
-                        int HMAC_Update(void);
-                        (void)HMAC_Update();
+                        int EVP_sha256(void);
+                        (void)EVP_sha256();
 
   ;
   return 0;
@@ -18029,7 +18029,7 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
 
-$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
+$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h
 
                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -18051,8 +18051,8 @@ int
 main ()
 {
 
-                            int HMAC_Update(void);
-                            (void)HMAC_Update();
+                            int EVP_sha256(void);
+                            (void)EVP_sha256();
 
   ;
   return 0;
@@ -18061,7 +18061,7 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
 
-$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h
+$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h
 
                             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -18246,11 +18246,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char HMAC_Update ();
+char EVP_sha256 ();
 int
 main ()
 {
-return HMAC_Update ();
+return EVP_sha256 ();
   ;
   return 0;
 }
diff --git a/configure.ac b/configure.ac
index e488ae488..aa38a56d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -832,7 +832,7 @@ AC_SUBST(PC_CRYPTO_DEPENDENCY)
 BAKLIBS="$LIBS"
 LIBS="-lssl $LIBS"
 AC_MSG_CHECKING([if libssl needs -lcrypt32])
-AC_TRY_LINK_FUNC([HMAC_Update], [
+AC_TRY_LINK_FUNC([EVP_sha256], [
 	AC_MSG_RESULT([no])
 	LIBS="$BAKLIBS"
 ], [
diff --git a/doc/Changelog b/doc/Changelog
index 37931d395..946aa67fe 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,8 @@
 	  attempts.  Attempts on the timer are only logged on high verbosity,
 	  if they produce a connection failure error.
 	- Fix to apply chroot to dnstap-socket-path, if chroot is enabled.
+	- Change configure to use EVP_sha256 instead of HMAC_Update for
+	  openssl-3.0.0.
 
 20 August 2020: Ralph
 	- Fix stats double count issue (#289).

From a912786ca9e72dc1ccde98d5af7d23595640043b Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 26 Aug 2020 11:59:09 +0200
Subject: [PATCH 039/108] - Update documentation in python example code.

---
 doc/Changelog                        | 3 +++
 pythonmod/examples/avahi-resolver.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 946aa67fe..0351df5bc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+26 August 2020: George
+	- Update documentation in python example code.
+
 24 August 2020: Wouter
 	- Fix that dnstap reconnects do not spam the log with the repeated
 	  attempts.  Attempts on the timer are only logged on high verbosity,
diff --git a/pythonmod/examples/avahi-resolver.py b/pythonmod/examples/avahi-resolver.py
index b1d4e36fc..497e1e74f 100644
--- a/pythonmod/examples/avahi-resolver.py
+++ b/pythonmod/examples/avahi-resolver.py
@@ -59,6 +59,8 @@
 # |   num-threads: 32
 # |   cache-max-negative-ttl: 60
 # |   cache-max-ttl: 60
+# | python:
+# |   python-script: path/to/this/file
 #
 #
 # The plugin can also be run interactively. Provide the name and

From f5d8861bbfd69fcb96640da7e130ce77bcedd641 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 27 Aug 2020 12:28:17 +0200
Subject: [PATCH 040/108] - process review feedback

---
 services/listen_dnsport.c  | 15 +++++++++------
 smallapp/unbound-control.c |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 870ffac3a..27f92a9dc 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -2157,7 +2157,7 @@ static int http2_submit_rst_stream(struct http2_session* h2_session,
 /**
  * DNS response ready to be submitted to nghttp2, to be prepared for sending
  * out. Response is stored in c->buffer. Copy to rbuffer because the c->buffer
- * might be used before this will bne send out.
+ * might be used before this will be sent out.
  * @param h2_session: http2 session, containing c->buffer which contains answer
  * @return 0 on error, 1 otherwise
  */
@@ -2194,13 +2194,16 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 			"in https-response-buffer-size");
 		return http2_submit_rst_stream(h2_session, h2_stream);
 	}
+	http2_response_buffer_count += rlen;
+	lock_basic_unlock(&http2_response_buffer_count_lock);
+
 	if(!(h2_stream->rbuffer = sldns_buffer_new(rlen))) {
+		lock_basic_lock(&http2_response_buffer_count_lock);
+		http2_response_buffer_count -= rlen;
 		lock_basic_unlock(&http2_response_buffer_count_lock);
 		log_err("http2 submit response error: malloc failure");
 		return 0;
 	}
-	http2_response_buffer_count += rlen;
-	lock_basic_unlock(&http2_response_buffer_count_lock);
 
 	headers[0].name = (uint8_t*)":status";
 	headers[0].namelen = 7;
@@ -2502,7 +2505,7 @@ static int http2_req_begin_headers_cb(nghttp2_session* session,
  * @param h2_stream: http2 stream
  * @param start: start of the base64 string
  * @param length: length of the base64 string
- * @return: 0 on error, 1 otherwise. query will be stored in h2_stram->qbuffer,
+ * @return: 0 on error, 1 otherwise. query will be stored in h2_stream->qbuffer,
  * buffer will be NULL is unparseble.
  */
 static int http2_buffer_uri_query(struct http2_session* h2_session,
@@ -2595,10 +2598,10 @@ static int http2_req_header_cb(nghttp2_session* session,
 	 * content-length value is guaranteed to contain digits
 	 */
 
-	if(!h2_stream->http_method && namelen  == 7 &&
+	if(!h2_stream->http_method && namelen == 7 &&
 		memcmp(":method", name, namelen) == 0) {
 		/* Case insensitive check on :method value to be on the safe
-		 * side. I failed to find text about case sentitivity in specs.
+		 * side. I failed to find text about case sensitivity in specs.
 		 */
 		if(valuelen == 3 && strcasecmp("GET", (const char*)value) == 0)
 			h2_stream->http_method = HTTP_METHOD_GET;
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 6c09f0106..3f3fb4f06 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -343,8 +343,8 @@ static void print_extended(struct ub_stats_info* s)
 	PR_UL("num.query.tcpout", s->svr.qtcp_outgoing);
 	PR_UL("num.query.tls", s->svr.qtls);
 	PR_UL("num.query.tls_resume", s->svr.qtls_resume);
-	PR_UL("num.query.https", s->svr.qhttps);
 	PR_UL("num.query.ipv6", s->svr.qipv6);
+	PR_UL("num.query.https", s->svr.qhttps);
 
 	/* flags */
 	PR_UL("num.query.flags.QR", s->svr.qbit_QR);

From 852a2e11051870f8aa2bd31f1c8ddef68224e8d7 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 27 Aug 2020 12:28:57 +0200
Subject: [PATCH 041/108] - Add 'DYNLIBMOD_EXTRALIBS' to dohclient in makefile

---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index b10bd55e1..d2600e71f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,7 +394,7 @@ streamtcp$(EXEEXT):	$(STREAMTCP_OBJ_LINK)
 	$(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
 
 dohclient$(EXEEXT):	$(DOHCLIENT_OBJ_LINK)
-	$(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS)
+	$(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
 
 perf$(EXEEXT):	$(PERF_OBJ_LINK)
 	$(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)

From f6a527c25ad2e60e2dc129fff3605e6ec48c30f2 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 27 Aug 2020 14:53:33 +0200
Subject: [PATCH 042/108] - Similar to NSD PR#113, implement that interface
 names can be used,   eg. something like interface: eth0 is resolved at server
 start and   uses the IP addresses for that named interface.

---
 config.h.in               |   9 ++
 configure                 |   4 +-
 configure.ac              |   4 +-
 daemon/daemon.c           |  11 ++-
 doc/Changelog             |   5 ++
 doc/unbound.conf.5.in     |   3 +-
 services/listen_dnsport.c | 176 ++++++++++++++++++++++++++++++++++++--
 services/listen_dnsport.h |  15 +++-
 testcode/fake_event.c     |   7 ++
 util/config_file.c        |   4 +-
 util/config_file.h        |   3 +
 11 files changed, 225 insertions(+), 16 deletions(-)

diff --git a/config.h.in b/config.h.in
index 65c258517..1054ba176 100644
--- a/config.h.in
+++ b/config.h.in
@@ -272,6 +272,9 @@
 /* Define to 1 if you have the `getentropy' function. */
 #undef HAVE_GETENTROPY
 
+/* Define to 1 if you have the `getifaddrs' function. */
+#undef HAVE_GETIFADDRS
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
@@ -302,6 +305,9 @@
 /* If we have htobe64 */
 #undef HAVE_HTOBE64
 
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#undef HAVE_IFADDRS_H
+
 /* Define to 1 if you have the `inet_aton' function. */
 #undef HAVE_INET_ATON
 
@@ -371,6 +377,9 @@
 /* Define to 1 if you have the <nettle/eddsa.h> header file. */
 #undef HAVE_NETTLE_EDDSA_H
 
+/* Define to 1 if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
 /* Use libnss for crypto */
 #undef HAVE_NSS
 
diff --git a/configure b/configure
index 4df378a8a..e46d7f59e 100755
--- a/configure
+++ b/configure
@@ -14726,7 +14726,7 @@ $as_echo "no" >&6; }
 fi
 
 # Checks for header files.
-for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h
+for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h net/if.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
@@ -20224,7 +20224,7 @@ if test "$ac_res" != no; then :
 
 fi
 
-for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4
+for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 getifaddrs
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.ac b/configure.ac
index aa38a56d2..4bb4e9463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,7 +399,7 @@ ACX_LIBTOOL_C_ONLY
 PKG_PROG_PKG_CONFIG
 
 # Checks for header files.
-AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h],,, [AC_INCLUDES_DEFAULT])
+AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h net/if.h],,, [AC_INCLUDES_DEFAULT])
 
 # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH
 AC_CHECK_HEADERS([TargetConditionals.h])
@@ -1552,7 +1552,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([
   AC_MSG_RESULT(no))
 
 AC_SEARCH_LIBS([setusercontext], [util])
-AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4])
+AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 getifaddrs])
 AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])])
 AC_CHECK_FUNCS([setresgid],,[AC_CHECK_FUNCS([setregid])])
 
diff --git a/daemon/daemon.c b/daemon/daemon.c
index 34f7bfda1..f480c94e6 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -308,6 +308,8 @@ daemon_open_shared_ports(struct daemon* daemon)
 {
 	log_assert(daemon);
 	if(daemon->cfg->port != daemon->listening_port) {
+		char** resif = NULL;
+		int num_resif = 0;
 		size_t i;
 		struct listen_port* p0;
 		daemon->reuseport = 0;
@@ -318,15 +320,18 @@ daemon_open_shared_ports(struct daemon* daemon)
 			free(daemon->ports);
 			daemon->ports = NULL;
 		}
+		if(!resolve_interface_names(daemon->cfg, &resif, &num_resif))
+			return 0;
 		/* see if we want to reuseport */
 #ifdef SO_REUSEPORT
 		if(daemon->cfg->so_reuseport && daemon->cfg->num_threads > 0)
 			daemon->reuseport = 1;
 #endif
 		/* try to use reuseport */
-		p0 = listening_ports_open(daemon->cfg, &daemon->reuseport);
+		p0 = listening_ports_open(daemon->cfg, resif, num_resif, &daemon->reuseport);
 		if(!p0) {
 			listening_ports_free(p0);
+			config_del_strarray(resif, num_resif);
 			return 0;
 		}
 		if(daemon->reuseport) {
@@ -340,6 +345,7 @@ daemon_open_shared_ports(struct daemon* daemon)
 		if(!(daemon->ports = (struct listen_port**)calloc(
 			daemon->num_ports, sizeof(*daemon->ports)))) {
 			listening_ports_free(p0);
+			config_del_strarray(resif, num_resif);
 			return 0;
 		}
 		daemon->ports[0] = p0;
@@ -348,16 +354,19 @@ daemon_open_shared_ports(struct daemon* daemon)
 			for(i=1; i<daemon->num_ports; i++) {
 				if(!(daemon->ports[i]=
 					listening_ports_open(daemon->cfg,
+						resif, num_resif,
 						&daemon->reuseport))
 					|| !daemon->reuseport ) {
 					for(i=0; i<daemon->num_ports; i++)
 						listening_ports_free(daemon->ports[i]);
 					free(daemon->ports);
 					daemon->ports = NULL;
+					config_del_strarray(resif, num_resif);
 					return 0;
 				}
 			}
 		}
+		config_del_strarray(resif, num_resif);
 		daemon->listening_port = daemon->cfg->port;
 	}
 	if(!daemon->cfg->remote_control_enable && daemon->rc_port) {
diff --git a/doc/Changelog b/doc/Changelog
index 0351df5bc..11e81088f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+27 August 2020: Wouter
+	- Similar to NSD PR#113, implement that interface names can be used,
+	  eg. something like interface: eth0 is resolved at server start and
+	  uses the IP addresses for that named interface.
+
 26 August 2020: George
 	- Update documentation in python example code.
 
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 951094ed1..fa4850aad 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -122,7 +122,8 @@ The port number, default 53, on which the server responds to queries.
 Interface to use to connect to the network. This interface is listened to
 for queries from clients, and answers to clients are given from it.
 Can be given multiple times to work on several interfaces. If none are
-given the default is to listen to localhost.
+given the default is to listen to localhost.  If an interface name is used
+instead of an ip address, the list of ip addresses on that interface are used.
 The interfaces are not changed on a reload (kill \-HUP) but only on restart.
 A port number can be specified with @port (without spaces between
 interface and port number), if not specified the default port (from
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index cc56d3fd3..63d9f0398 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -70,6 +70,13 @@
 #include <systemd/sd-daemon.h>
 #endif
 
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
 /** number of queued TCP connections for listen() */
 #define TCP_BACKLOG 256 
 
@@ -1439,8 +1446,163 @@ listen_delete(struct listen_dnsport* front)
 	}
 }
 
+#ifdef HAVE_GETIFADDRS
+static int
+resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addresses, int *ip_addresses_size)
+{
+	struct ifaddrs *ifa;
+	int last_ip_addresses_size = *ip_addresses_size;
+
+	for(ifa = ifas; ifa != NULL; ifa = ifa->ifa_next) {
+		sa_family_t family;
+		const char* atsign;
+#ifdef INET6      /* |   address ip    | % |  ifa name  | @ |  port  | nul */
+		char addr_buf[INET6_ADDRSTRLEN + 1 + IF_NAMESIZE + 1 + 16 + 1];
+#else
+		char addr_buf[INET_ADDRSTRLEN + 1 + 16 + 1];
+#endif
+
+		if((atsign=strrchr(search_ifa, '@')) != NULL) {
+			if(strlen(ifa->ifa_name) != (size_t)(atsign-search_ifa)
+			   || strncmp(ifa->ifa_name, search_ifa,
+			   atsign-search_ifa) != 0)
+				continue;
+		} else {
+			if(strcmp(ifa->ifa_name, search_ifa) != 0)
+				continue;
+			atsign = "";
+		}
+
+		if(ifa->ifa_addr == NULL)
+			continue;
+
+		family = ifa->ifa_addr->sa_family;
+		if(family == AF_INET) {
+			char a4[INET_ADDRSTRLEN + 1];
+			struct sockaddr_in *in4 = (struct sockaddr_in *)
+				ifa->ifa_addr;
+			if(!inet_ntop(family, &in4->sin_addr, a4, sizeof(a4))) {
+				log_err("inet_ntop failed");
+				return 0;
+			}
+			snprintf(addr_buf, sizeof(addr_buf), "%s%s",
+				a4, atsign);
+		}
+#ifdef INET6
+		else if(family == AF_INET6) {
+			struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)
+				ifa->ifa_addr;
+			char a6[INET6_ADDRSTRLEN + 1];
+			char if_index_name[IF_NAMESIZE + 1];
+			if_index_name[0] = 0;
+			if(!inet_ntop(family, &in6->sin6_addr, a6, sizeof(a6))) {
+				log_err("inet_ntop failed");
+				return 0;
+			}
+			if_indextoname(in6->sin6_scope_id,
+				(char *)if_index_name);
+			if (strlen(if_index_name) != 0) {
+				snprintf(addr_buf, sizeof(addr_buf),
+					"%s%%%s%s", a6, if_index_name, atsign);
+			} else {
+				snprintf(addr_buf, sizeof(addr_buf), "%s%s",
+					a6, atsign);
+			}
+		}
+#endif
+		else {
+			continue;
+		}
+		verbose(4, "interface %s has address %s", search_ifa, addr_buf);
+
+		*ip_addresses = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1));
+		if(!*ip_addresses) {
+			log_err("realloc failed: out of memory");
+			return 0;
+		}
+		(*ip_addresses)[*ip_addresses_size] = strdup(addr_buf);
+		if(!(*ip_addresses)[*ip_addresses_size]) {
+			log_err("strdup failed: out of memory");
+			return 0;
+		}
+		(*ip_addresses_size)++;
+	}
+
+	if (*ip_addresses_size == last_ip_addresses_size) {
+		*ip_addresses = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1));
+		if(!*ip_addresses) {
+			log_err("realloc failed: out of memory");
+			return 0;
+		}
+		(*ip_addresses)[*ip_addresses_size] = strdup(search_ifa);
+		if(!(*ip_addresses)[*ip_addresses_size]) {
+			log_err("strdup failed: out of memory");
+			return 0;
+		}
+		(*ip_addresses_size)++;
+	}
+	return 1;
+}
+#endif /* HAVE_GETIFADDRS */
+
+int resolve_interface_names(struct config_file* cfg, char*** resif,
+	int* num_resif)
+{
+#ifdef HAVE_GETIFADDRS
+	int i;
+	struct ifaddrs *addrs;
+	if(cfg->num_ifs == 0) {
+		*resif = NULL;
+		*num_resif = 0;
+		return 1;
+	}
+	if(getifaddrs(&addrs) == -1) {
+		log_err("failed to list interfaces: getifaddrs: %s",
+			strerror(errno));
+		freeifaddrs(addrs);
+		return 0;
+	}
+	for(i=0; i<cfg->num_ifs; i++) {
+		if(!resolve_ifa_name(addrs, cfg->ifs[i], resif, num_resif)) {
+			freeifaddrs(addrs);
+			config_del_strarray(*resif, *num_resif);
+			*resif = NULL;
+			*num_resif = 0;
+			return 0;
+		}
+	}
+	freeifaddrs(addrs);
+	return 1;
+#else
+	int i;
+	if(cfg->num_ifs == 0) {
+		*resif = NULL;
+		*num_resif = 0;
+		return 1;
+	}
+	*num_resif = cfg->num_ifs;
+	*resif = calloc(*num_resif, sizeof(**resif));
+	if(!*resif) {
+		log_err("out of memory");
+		return 0;
+	}
+	for(i=0; i<*num_resif; i++) {
+		(*resif)[i] = strdup(cfg->ifs[i]);
+		if(!((*resif)[i])) {
+			log_err("out of memory");
+			config_del_strarray(*resif, *num_resif);
+			*resif = NULL;
+			*num_resif = 0;
+			return 0;
+		}
+	}
+	return 1;
+#endif /* HAVE_GETIFADDRS */
+}
+
 struct listen_port* 
-listening_ports_open(struct config_file* cfg, int* reuseport)
+listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
+	int* reuseport)
 {
 	struct listen_port* list = NULL;
 	struct addrinfo hints;
@@ -1459,7 +1621,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_PASSIVE;
 	/* no name lookups on our listening ports */
-	if(cfg->num_ifs > 0)
+	if(num_ifs > 0)
 		hints.ai_flags |= AI_NUMERICHOST;
 	hints.ai_family = AF_UNSPEC;
 #ifndef INET6
@@ -1469,7 +1631,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 		return NULL;
 	}
 	/* create ip4 and ip6 ports so that return addresses are nice. */
-	if(do_auto || cfg->num_ifs == 0) {
+	if(do_auto || num_ifs == 0) {
 		if(do_ip6) {
 			hints.ai_family = AF_INET6;
 			if(!ports_create_if(do_auto?"::0":"::1", 
@@ -1498,12 +1660,12 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 				return NULL;
 			}
 		}
-	} else for(i = 0; i<cfg->num_ifs; i++) {
-		if(str_is_ip6(cfg->ifs[i])) {
+	} else for(i = 0; i<num_ifs; i++) {
+		if(str_is_ip6(ifs[i])) {
 			if(!do_ip6)
 				continue;
 			hints.ai_family = AF_INET6;
-			if(!ports_create_if(cfg->ifs[i], 0, cfg->do_udp, 
+			if(!ports_create_if(ifs[i], 0, cfg->do_udp,
 				do_tcp, &hints, portbuf, &list, 
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
@@ -1517,7 +1679,7 @@ listening_ports_open(struct config_file* cfg, int* reuseport)
 			if(!do_ip4)
 				continue;
 			hints.ai_family = AF_INET;
-			if(!ports_create_if(cfg->ifs[i], 0, cfg->do_udp, 
+			if(!ports_create_if(ifs[i], 0, cfg->do_udp,
 				do_tcp, &hints, portbuf, &list, 
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index ddd1b63a4..680ec84bb 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -117,19 +117,32 @@ struct listen_port {
  * interfaces for IP4 and/or IP6, for UDP and/or TCP.
  * On the given port number. It creates the sockets.
  * @param cfg: settings on what ports to open.
+ * @param ifs: interfaces to open, array of IP addresses, ip[@port].
+ * @param num_ifs: length of ifs.
  * @param reuseport: set to true if you want reuseport, or NULL to not have it,
  *   set to false on exit if reuseport failed to apply (because of no
  *   kernel support).
  * @return: linked list of ports or NULL on error.
  */
 struct listen_port* listening_ports_open(struct config_file* cfg,
-	int* reuseport);
+	char** ifs, int num_ifs, int* reuseport);
 
 /**
  * Close and delete the (list of) listening ports.
  */
 void listening_ports_free(struct listen_port* list);
 
+/**
+ * Resolve interface names in config and store result IP addresses
+ * @param cfg: config
+ * @param resif: string array (malloced array of malloced strings) with
+ * 	result.  NULL if cfg has none.
+ * @param num_resif: length of resif.  Zero if cfg has zero num_ifs.
+ * @return 0 on failure.
+ */
+int resolve_interface_names(struct config_file* cfg, char*** resif,
+	int* num_resif);
+
 /**
  * Create commpoints with for this thread for the shared ports.
  * @param base: the comm_base that provides event functionality.
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 59df27f57..2ffb46c3a 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1300,7 +1300,14 @@ void outnet_serviced_query_stop(struct serviced_query* sq, void* cb_arg)
 	log_info("double delete of pending serviced query");
 }
 
+int resolve_interface_names(struct config_file* ATTR_UNUSED(cfg),
+	char*** ATTR_UNUSED(resif), int* ATTR_UNUSED(num_resif))
+{
+	return 1;
+}
+
 struct listen_port* listening_ports_open(struct config_file* ATTR_UNUSED(cfg),
+	char** ATTR_UNUSED(ifs), int ATTR_UNUSED(num_ifs),
 	int* ATTR_UNUSED(reuseport))
 {
 	return calloc(1, 1);
diff --git a/util/config_file.c b/util/config_file.c
index e1c372b0e..5f79baa7e 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -1387,8 +1387,8 @@ config_delviews(struct config_view* p)
 		p = np;
 	}
 }
-/** delete string array */
-static void
+
+void
 config_del_strarray(char** array, int num)
 {
 	int i;
diff --git a/util/config_file.h b/util/config_file.h
index cdae04c23..948bd1d0d 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -969,6 +969,9 @@ void config_deldblstrlist(struct config_str2list* list);
  */
 void config_deltrplstrlist(struct config_str3list* list);
 
+/** delete string array */
+void config_del_strarray(char** array, int num);
+
 /** delete stringbytelist */
 void config_del_strbytelist(struct config_strbytelist* list);
 

From b5a237424b8d4f510672f1b5010dc7391fdd86ee Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 27 Aug 2020 15:12:46 +0200
Subject: [PATCH 043/108] Please doxygen, quote the characters to stop it from
 parsing a doxygen command.

---
 services/listen_dnsport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index 680ec84bb..83bdf48e8 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -117,7 +117,7 @@ struct listen_port {
  * interfaces for IP4 and/or IP6, for UDP and/or TCP.
  * On the given port number. It creates the sockets.
  * @param cfg: settings on what ports to open.
- * @param ifs: interfaces to open, array of IP addresses, ip[@port].
+ * @param ifs: interfaces to open, array of IP addresses, "ip[@port]".
  * @param num_ifs: length of ifs.
  * @param reuseport: set to true if you want reuseport, or NULL to not have it,
  *   set to false on exit if reuseport failed to apply (because of no

From 12c0cf7cee6a5d57cd768dd1f8e8e041ada286fe Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 27 Aug 2020 15:27:05 +0200
Subject: [PATCH 044/108] - Review fix, doxygen and assign null in case of
 error free.

---
 doc/Changelog             | 1 +
 services/listen_dnsport.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 11e81088f..10ab6efae 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Similar to NSD PR#113, implement that interface names can be used,
 	  eg. something like interface: eth0 is resolved at server start and
 	  uses the IP addresses for that named interface.
+	- Review fix, doxygen and assign null in case of error free.
 
 26 August 2020: George
 	- Update documentation in python example code.
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 63d9f0398..51fe39e0f 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1550,7 +1550,7 @@ int resolve_interface_names(struct config_file* cfg, char*** resif,
 {
 #ifdef HAVE_GETIFADDRS
 	int i;
-	struct ifaddrs *addrs;
+	struct ifaddrs *addrs = NULL;
 	if(cfg->num_ifs == 0) {
 		*resif = NULL;
 		*num_resif = 0;

From 2460737490941695cc824436824c12aa47edf14c Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@narrans.de>
Date: Fri, 28 Aug 2020 17:31:14 +0200
Subject: [PATCH 045/108] Add missing prototype.

---
 services/listen_dnsport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index 83bdf48e8..d33a5395f 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -384,5 +384,6 @@ size_t tcp_req_info_get_stream_buffer_size(void);
 
 char* set_ip_dscp(int socket, int addrfamily, int ds);
 char* sock_strerror(int errn);
+void sock_close(int socket);
 
 #endif /* LISTEN_DNSPORT_H */

From f22ac44f898b3fc2510368e92bc7093a5fe41565 Mon Sep 17 00:00:00 2001
From: niftylettuce <niftylettuce@gmail.com>
Date: Sat, 29 Aug 2020 20:56:19 -0500
Subject: [PATCH 046/108] docs: fixed typo lean > learn

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7120d486f..3e11ce58c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ fast and lean and incorporates modern features based on open standards. If you
 have any feedback, we would love to hear from you. Don’t hesitate to
 [create an issue on Github](https://github.com/NLnetLabs/unbound/issues/new)
 or post a message on the [Unbound mailing list](https://lists.nlnetlabs.nl/mailman/listinfo/unbound-users).
-You can lean more about Unbound by reading our
+You can learn more about Unbound by reading our
 [documentation](https://nlnetlabs.nl/documentation/unbound/).
 
 ## Compiling

From a6dc0743b47b909f75c7e434a6b44e6872e6c3b6 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 31 Aug 2020 08:41:34 +0200
Subject: [PATCH 047/108] - Merge PR #293: Add missing prototype.  Also
 refactor to use the new   shorthand function to clean up the code.

---
 daemon/remote.c                |  12 +--
 dnstap/dtstream.c              |   6 +-
 dnstap/unbound-dnstap-socket.c |  15 +---
 doc/Changelog                  |   4 +
 services/listen_dnsport.c      | 131 ++++++---------------------------
 services/listen_dnsport.h      |   2 -
 services/outside_network.c     |   9 +--
 smallapp/unbound-control.c     |   6 +-
 testcode/delayer.c             |  37 ++--------
 testcode/perf.c                |   6 +-
 testcode/streamtcp.c           |   6 +-
 util/net_help.c                |  28 +++++++
 util/net_help.h                |   6 ++
 util/netevent.c                |  12 +--
 14 files changed, 83 insertions(+), 197 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index aa263d074..94bc2c57e 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -348,11 +348,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err,
 	/* alloc */
 	n = (struct listen_port*)calloc(1, sizeof(*n));
 	if(!n) {
-#ifndef USE_WINSOCK
-		close(fd);
-#else
-		closesocket(fd);
-#endif
+		sock_close(fd);
 		log_err("out of memory");
 		return 0;
 	}
@@ -461,11 +457,7 @@ int remote_accept_callback(struct comm_point* c, void* arg, int err,
 	if(rc->active >= rc->max_active) {
 		log_warn("drop incoming remote control: too many connections");
 	close_exit:
-#ifndef USE_WINSOCK
-		close(newfd);
-#else
-		closesocket(newfd);
-#endif
+		sock_close(newfd);
 		return 0;
 	}
 
diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index 63d517cb8..26eac063a 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -588,11 +588,7 @@ static void dtio_del_output_event(struct dt_io_thread* dtio)
 /** close dtio socket and set it to -1 */
 static void dtio_close_fd(struct dt_io_thread* dtio)
 {
-#ifndef USE_WINSOCK
-	close(dtio->fd);
-#else
-	closesocket(dtio->fd);
-#endif
+	sock_close(dtio->fd);
 	dtio->fd = -1;
 }
 
diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 44a0eda95..80a117617 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -292,12 +292,11 @@ static int make_tcp_accept(char* ip)
 #ifndef USE_WINSOCK
 		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
 			strerror(errno));
-		close(s);
 #else
 		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
 			wsa_strerror(WSAGetLastError()));
-		closesocket(s);
 #endif
+		sock_close(s);
 		return -1;
 	}
 #endif /* SO_REUSEADDR */
@@ -305,30 +304,24 @@ static int make_tcp_accept(char* ip)
 #ifndef USE_WINSOCK
 		log_err_addr("can't bind socket", strerror(errno),
 			&addr, len);
-		close(s);
 #else
 		log_err_addr("can't bind socket",
 			wsa_strerror(WSAGetLastError()), &addr, len);
-		closesocket(s);
 #endif
+		sock_close(s);
 		return -1;
 	}
 	if(!fd_set_nonblock(s)) {
-#ifndef USE_WINSOCK
-		close(s);
-#else
-		closesocket(s);
-#endif
+		sock_close(s);
 		return -1;
 	}
 	if(listen(s, LISTEN_BACKLOG) == -1) {
 #ifndef USE_WINSOCK
 		log_err("can't listen: %s", strerror(errno));
-		close(s);
 #else
 		log_err("can't listen: %s", wsa_strerror(WSAGetLastError()));
-		closesocket(s);
 #endif
+		sock_close(s);
 		return -1;
 	}
 	return s;
diff --git a/doc/Changelog b/doc/Changelog
index 10ab6efae..a7a95464a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+31 August 2020: Wouter
+	- Merge PR #293: Add missing prototype.  Also refactor to use the new
+	  shorthand function to clean up the code.
+
 27 August 2020: Wouter
 	- Similar to NSD PR#113, implement that interface names can be used,
 	  eg. something like interface: eth0 is resolved at server start and
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 51fe39e0f..e749147e5 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -356,13 +356,12 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #    ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_RCVBUFFORCE, "
 					"...) failed: %s", strerror(errno));
-				close(s);
 #    else
 				log_err("setsockopt(..., SO_RCVBUFFORCE, "
 					"...) failed: %s", 
 					wsa_strerror(WSAGetLastError()));
-				closesocket(s);
 #    endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -373,13 +372,12 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_RCVBUF, "
 					"...) failed: %s", strerror(errno));
-				close(s);
 #  else
 				log_err("setsockopt(..., SO_RCVBUF, "
 					"...) failed: %s", 
 					wsa_strerror(WSAGetLastError()));
-				closesocket(s);
 #  endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -415,13 +413,12 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #    ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_SNDBUFFORCE, "
 					"...) failed: %s", strerror(errno));
-				close(s);
 #    else
 				log_err("setsockopt(..., SO_SNDBUFFORCE, "
 					"...) failed: %s", 
 					wsa_strerror(WSAGetLastError()));
-				closesocket(s);
 #    endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -432,13 +429,12 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_SNDBUF, "
 					"...) failed: %s", strerror(errno));
-				close(s);
 #  else
 				log_err("setsockopt(..., SO_SNDBUF, "
 					"...) failed: %s", 
 					wsa_strerror(WSAGetLastError()));
-				closesocket(s);
 #  endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -471,13 +467,12 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #ifndef USE_WINSOCK
 				log_err("setsockopt(..., IPV6_V6ONLY"
 					", ...) failed: %s", strerror(errno));
-				close(s);
 #else
 				log_err("setsockopt(..., IPV6_V6ONLY"
 					", ...) failed: %s", 
 					wsa_strerror(WSAGetLastError()));
-				closesocket(s);
 #endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -498,13 +493,12 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  ifndef USE_WINSOCK
 			log_err("setsockopt(..., IPV6_USE_MIN_MTU, "
 				"...) failed: %s", strerror(errno));
-			close(s);
 #  else
 			log_err("setsockopt(..., IPV6_USE_MIN_MTU, "
 				"...) failed: %s", 
 				wsa_strerror(WSAGetLastError()));
-			closesocket(s);
 #  endif
+			sock_close(s);
 			*noproto = 0;
 			*inuse = 0;
 			return -1;
@@ -520,12 +514,11 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  ifndef USE_WINSOCK
 			log_err("setsockopt(..., IPV6_MTU, ...) failed: %s", 
 				strerror(errno));
-			close(s);
 #  else
 			log_err("setsockopt(..., IPV6_MTU, ...) failed: %s", 
 				wsa_strerror(WSAGetLastError()));
-			closesocket(s);
 #  endif
+			sock_close(s);
 			*noproto = 0;
 			*inuse = 0;
 			return -1;
@@ -549,12 +542,7 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 			if (errno != EINVAL) {
 				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s",
 					strerror(errno));
-
-#    ifndef USE_WINSOCK
-				close(s);
-#    else
-				closesocket(s);
-#    endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -571,11 +559,7 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 				&action, (socklen_t)sizeof(action)) < 0) {
 				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s",
 					strerror(errno));
-#    ifndef USE_WINSOCK
-				close(s);
-#    else
-				closesocket(s);
-#    endif
+				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
 				return -1;
@@ -587,11 +571,7 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 			&off, (socklen_t)sizeof(off)) < 0) {
 			log_err("setsockopt(..., IP_DONTFRAG, ...) failed: %s",
 				strerror(errno));
-#    ifndef USE_WINSOCK
-			close(s);
-#    else
-			closesocket(s);
-#    endif
+			sock_close(s);
 			*noproto = 0;
 			*inuse = 0;
 			return -1;
@@ -621,7 +601,6 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 				(struct sockaddr_storage*)addr, addrlen);
 		}
 #endif /* EADDRINUSE */
-		close(s);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() != WSAEADDRINUSE &&
 			WSAGetLastError() != WSAEADDRNOTAVAIL &&
@@ -630,18 +609,14 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 				wsa_strerror(WSAGetLastError()),
 				(struct sockaddr_storage*)addr, addrlen);
 		}
-		closesocket(s);
 #endif /* USE_WINSOCK */
+		sock_close(s);
 		return -1;
 	}
 	if(!fd_set_nonblock(s)) {
 		*noproto = 0;
 		*inuse = 0;
-#ifndef USE_WINSOCK
-		close(s);
-#else
-		closesocket(s);
-#endif
+		sock_close(s);
 		return -1;
 	}
 	return s;
@@ -727,12 +702,11 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 #ifndef USE_WINSOCK
 		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
 			strerror(errno));
-		close(s);
 #else
 		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
 			wsa_strerror(WSAGetLastError()));
-		closesocket(s);
 #endif
+		sock_close(s);
 		return -1;
 	}
 #endif /* SO_REUSEADDR */
@@ -770,12 +744,11 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 #ifndef USE_WINSOCK
 			log_err("setsockopt(..., IPV6_V6ONLY, ...) failed: %s",
 				strerror(errno));
-			close(s);
 #else
 			log_err("setsockopt(..., IPV6_V6ONLY, ...) failed: %s",
 				wsa_strerror(WSAGetLastError()));
-			closesocket(s);
 #endif
+			sock_close(s);
 			return -1;
 		}
 	}
@@ -822,32 +795,26 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 				(struct sockaddr_storage*)addr->ai_addr,
 				addr->ai_addrlen);
 		}
-		close(s);
 #else
 		log_err_addr("can't bind socket", 
 			wsa_strerror(WSAGetLastError()),
 			(struct sockaddr_storage*)addr->ai_addr,
 			addr->ai_addrlen);
-		closesocket(s);
 #endif
+		sock_close(s);
 		return -1;
 	}
 	if(!fd_set_nonblock(s)) {
-#ifndef USE_WINSOCK
-		close(s);
-#else
-		closesocket(s);
-#endif
+		sock_close(s);
 		return -1;
 	}
 	if(listen(s, TCP_BACKLOG) == -1) {
 #ifndef USE_WINSOCK
 		log_err("can't listen: %s", strerror(errno));
-		close(s);
 #else
 		log_err("can't listen: %s", wsa_strerror(WSAGetLastError()));
-		closesocket(s);
 #endif
+		sock_close(s);
 		return -1;
 	}
 #ifdef USE_TCP_FASTOPEN
@@ -902,34 +869,6 @@ set_ip_dscp(int socket, int addrfamily, int dscp)
 	return NULL;
 }
 
-#  ifndef USE_WINSOCK
-char*
-sock_strerror(int errn)
-{
-	return strerror(errn);
-}
-
-void
-sock_close(int socket)
-{
-	close(socket);
-}
-
-#  else
-char*
-sock_strerror(int ATTR_UNUSED(errn))
-{
-	return wsa_strerror(WSAGetLastError());
-}
-
-void
-sock_close(int socket)
-{
-	closesocket(socket);
-}
-
-#  endif /* USE_WINSOCK */
-
 int
 create_local_accept_sock(const char *path, int* noproto, int use_systemd)
 {
@@ -990,11 +929,7 @@ create_local_accept_sock(const char *path, int* noproto, int use_systemd)
 	return s;
 
 err:
-#ifndef USE_WINSOCK
-	close(s);
-#else
-	closesocket(s);
-#endif
+	sock_close(s);
 	return -1;
 
 #ifdef HAVE_SYSTEMD
@@ -1245,20 +1180,12 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		}
 		/* getting source addr packet info is highly non-portable */
 		if(!set_recvpktinfo(s, hints->ai_family)) {
-#ifndef USE_WINSOCK
-			close(s);
-#else
-			closesocket(s);
-#endif
+			sock_close(s);
 			return 0;
 		}
 		if(!port_insert(list, s,
 		   is_dnscrypt?listen_type_udpancil_dnscrypt:listen_type_udpancil)) {
-#ifndef USE_WINSOCK
-			close(s);
-#else
-			closesocket(s);
-#endif
+			sock_close(s);
 			return 0;
 		}
 	} else if(do_udp) {
@@ -1274,11 +1201,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		}
 		if(!port_insert(list, s,
 		   is_dnscrypt?listen_type_udp_dnscrypt:listen_type_udp)) {
-#ifndef USE_WINSOCK
-			close(s);
-#else
-			closesocket(s);
-#endif
+			sock_close(s);
 			return 0;
 		}
 	}
@@ -1298,11 +1221,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 			verbose(VERB_ALGO, "setup TCP for SSL service");
 		if(!port_insert(list, s, is_ssl?listen_type_ssl:
 			(is_dnscrypt?listen_type_tcp_dnscrypt:listen_type_tcp))) {
-#ifndef USE_WINSOCK
-			close(s);
-#else
-			closesocket(s);
-#endif
+			sock_close(s);
 			return 0;
 		}
 	}
@@ -1700,11 +1619,7 @@ void listening_ports_free(struct listen_port* list)
 	while(list) {
 		nx = list->next;
 		if(list->fd != -1) {
-#ifndef USE_WINSOCK
-			close(list->fd);
-#else
-			closesocket(list->fd);
-#endif
+			sock_close(list->fd);
 		}
 		free(list);
 		list = nx;
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index d33a5395f..c7daa9e75 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -383,7 +383,5 @@ int tcp_req_info_handle_read_close(struct tcp_req_info* req);
 size_t tcp_req_info_get_stream_buffer_size(void);
 
 char* set_ip_dscp(int socket, int addrfamily, int ds);
-char* sock_strerror(int errn);
-void sock_close(int socket);
 
 #endif /* LISTEN_DNSPORT_H */
diff --git a/services/outside_network.c b/services/outside_network.c
index 67eca05ed..ba07444df 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -166,11 +166,7 @@ pick_outgoing_tcp(struct waiting_tcp* w, int s)
 	if(num == 0) {
 		log_err("no TCP outgoing interfaces of family");
 		log_addr(VERB_OPS, "for addr", &w->addr, w->addrlen);
-#ifndef USE_WINSOCK
-		close(s);
-#else
-		closesocket(s);
-#endif
+		sock_close(s);
 		return 0;
 	}
 #ifdef INET6
@@ -191,12 +187,11 @@ pick_outgoing_tcp(struct waiting_tcp* w, int s)
 	if(bind(s, (struct sockaddr*)&pi->addr, pi->addrlen) != 0) {
 #ifndef USE_WINSOCK
 		log_err("outgoing tcp: bind: %s", strerror(errno));
-		close(s);
 #else
 		log_err("outgoing tcp: bind: %s", 
 			wsa_strerror(WSAGetLastError()));
-		closesocket(s);
 #endif
+		sock_close(s);
 		return 0;
 	}
 	log_addr(VERB_ALGO, "tcp bound to src", &pi->addr, pi->addrlen);
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 4662c7cb6..5936679e6 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -824,11 +824,7 @@ go(const char* cfgfile, char* svr, int quiet, int argc, char* argv[])
 	ret = go_cmd(ssl, fd, quiet, argc, argv);
 
 	if(ssl) SSL_free(ssl);
-#ifndef USE_WINSOCK
-	close(fd);
-#else
-	closesocket(fd);
-#endif
+	sock_close(fd);
 	if(ctx) SSL_CTX_free(ctx);
 	config_delete(cfg);
 	return ret;
diff --git a/testcode/delayer.c b/testcode/delayer.c
index ebf883926..6562f80e6 100644
--- a/testcode/delayer.c
+++ b/testcode/delayer.c
@@ -550,15 +550,9 @@ tcp_proxy_delete(struct tcp_proxy* p)
 		free(s);
 		s = sn;
 	}
-#ifndef USE_WINSOCK
-	close(p->client_s);
+	sock_close(p->client_s);
 	if(p->server_s != -1)
-		close(p->server_s);
-#else
-	closesocket(p->client_s);
-	if(p->server_s != -1)
-		closesocket(p->server_s);
-#endif
+		sock_close(p->server_s);
 	free(p);
 }
 
@@ -607,16 +601,14 @@ service_tcp_listen(int s, fd_set* rorig, int* max, struct tcp_proxy** proxies,
 #ifndef USE_WINSOCK
 		if(errno != EINPROGRESS) {
 			log_err("tcp connect: %s", strerror(errno));
-			close(p->server_s);
-			close(p->client_s);
 #else
 		if(WSAGetLastError() != WSAEWOULDBLOCK &&
 			WSAGetLastError() != WSAEINPROGRESS) {
 			log_err("tcp connect: %s", 
 				wsa_strerror(WSAGetLastError()));
-			closesocket(p->server_s);
-			closesocket(p->client_s);
 #endif
+			sock_close(p->server_s);
+			sock_close(p->client_s);
 			free(p);
 			return;
 		}
@@ -769,11 +761,7 @@ service_tcp_relay(struct tcp_proxy** tcp_proxies, struct timeval* now,
 			log_addr(1, "read tcp answer", &p->addr, p->addr_len);
 			if(!tcp_relay_read(p->server_s, &p->answerlist, 
 				&p->answerlast, now, delay, pkt)) {
-#ifndef USE_WINSOCK
-				close(p->server_s);
-#else
-				closesocket(p->server_s);
-#endif
+				sock_close(p->server_s);
 				FD_CLR(FD_SET_T p->server_s, worig);
 				FD_CLR(FD_SET_T p->server_s, rorig);
 				p->server_s = -1;
@@ -901,11 +889,7 @@ proxy_list_clear(struct proxy* p)
 			"%u returned\n", i++, from, port, (int)p->numreuse+1,
 			(unsigned)p->numwait, (unsigned)p->numsent, 
 			(unsigned)p->numreturn);
-#ifndef USE_WINSOCK
-		close(p->s);
-#else
-		closesocket(p->s);
-#endif
+		sock_close(p->s);
 		free(p);
 		p = np;
 	}
@@ -1109,13 +1093,8 @@ service(const char* bind_str, int bindport, const char* serv_str,
 
 	/* cleanup */
 	verbose(1, "cleanup");
-#ifndef USE_WINSOCK
-	close(s);
-	close(listen_s);
-#else
-	closesocket(s);
-	closesocket(listen_s);
-#endif
+	sock_close(s);
+	sock_close(listen_s);
 	sldns_buffer_free(pkt);
 	ring_delete(ring);
 }
diff --git a/testcode/perf.c b/testcode/perf.c
index 5b170ca57..aef69045f 100644
--- a/testcode/perf.c
+++ b/testcode/perf.c
@@ -260,11 +260,7 @@ perffree(struct perfinfo* info)
 	if(!info) return;
 	if(info->io) {
 		for(i=0; i<info->io_num; i++) {
-#ifndef USE_WINSOCK
-			close(info->io[i].fd);
-#else
-			closesocket(info->io[i].fd);
-#endif
+			sock_close(info->io[i].fd);
 		}
 		free(info->io);
 	}
diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index c49159d33..ffdddbe9d 100644
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -388,11 +388,7 @@ send_em(const char* svr, int udp, int usessl, int noanswer, int onarrival,
 		SSL_free(ssl);
 		SSL_CTX_free(ctx);
 	}
-#ifndef USE_WINSOCK
-	close(fd);
-#else
-	closesocket(fd);
-#endif
+	sock_close(fd);
 	sldns_buffer_free(buf);
 	printf("orderly exit\n");
 }
diff --git a/util/net_help.c b/util/net_help.c
index 4d985b66d..b51e0372e 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -1562,3 +1562,31 @@ listen_sslctx_delete_ticket_keys(void)
 	free(ticket_keys);
 	ticket_keys = NULL;
 }
+
+#  ifndef USE_WINSOCK
+char*
+sock_strerror(int errn)
+{
+	return strerror(errn);
+}
+
+void
+sock_close(int socket)
+{
+	close(socket);
+}
+
+#  else
+char*
+sock_strerror(int ATTR_UNUSED(errn))
+{
+	return wsa_strerror(WSAGetLastError());
+}
+
+void
+sock_close(int socket)
+{
+	closesocket(socket);
+}
+
+#  endif /* USE_WINSOCK */
diff --git a/util/net_help.h b/util/net_help.h
index 29943ada0..45b607a43 100644
--- a/util/net_help.h
+++ b/util/net_help.h
@@ -496,4 +496,10 @@ void listen_sslctx_delete_ticket_keys(void);
  */
 int netblockdnametoaddr(uint8_t* dname, size_t dnamelen,
 	struct sockaddr_storage* addr, socklen_t* addrlen, int* net, int* af);
+
+/** Return strerror or wsastrerror for socket error printout */
+char* sock_strerror(int errn);
+/** close the socket with close, or wsa closesocket */
+void sock_close(int socket);
+
 #endif /* NET_HELP_H */
diff --git a/util/netevent.c b/util/netevent.c
index 3e7a433e5..6172adb1f 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3087,11 +3087,7 @@ comm_point_close(struct comm_point* c)
 			ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_WRITE);
 		}
 		verbose(VERB_ALGO, "close fd %d", c->fd);
-#ifndef USE_WINSOCK
-		close(c->fd);
-#else
-		closesocket(c->fd);
-#endif
+		sock_close(c->fd);
 	}
 	c->fd = -1;
 }
@@ -3232,11 +3228,7 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 	}
 	if(newfd != -1) {
 		if(c->fd != -1) {
-#ifndef USE_WINSOCK
-			close(c->fd);
-#else
-			closesocket(c->fd);
-#endif
+			sock_close(c->fd);
 		}
 		c->fd = newfd;
 		ub_event_set_fd(c->ev->ev, c->fd);

From 47a5dc8cae9733e636da09ee84b9f108f20328c0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 31 Aug 2020 09:12:01 +0200
Subject: [PATCH 048/108] - Refactor to use sock_strerr shorthand function.

---
 daemon/remote.c                | 20 ++-----
 dnstap/dtstream.c              | 50 ++++--------------
 dnstap/unbound-dnstap-socket.c | 49 ++++-------------
 doc/Changelog                  |  1 +
 services/listen_dnsport.c      | 96 ++++++----------------------------
 services/outside_network.c     | 14 +----
 smallapp/unbound-control.c     | 18 ++-----
 testcode/delayer.c             | 78 ++++++---------------------
 testcode/perf.c                | 19 ++-----
 util/netevent.c                | 45 +++++-----------
 10 files changed, 77 insertions(+), 313 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index 94bc2c57e..bd1039d06 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -566,11 +566,8 @@ ssl_print_text(RES* res, const char* text)
 			if(r == -1) {
 				if(errno == EAGAIN || errno == EINTR)
 					continue;
-#ifndef USE_WINSOCK
-				log_err("could not send: %s", strerror(errno));
-#else
-				log_err("could not send: %s", wsa_strerror(WSAGetLastError()));
-#endif
+				log_err("could not send: %s",
+					sock_strerror(errno));
 				return 0;
 			}
 			at += r;
@@ -627,11 +624,8 @@ ssl_read_line(RES* res, char* buf, size_t max)
 					}
 					if(errno == EINTR || errno == EAGAIN)
 						continue;
-#ifndef USE_WINSOCK
-					log_err("could not recv: %s", strerror(errno));
-#else
-					log_err("could not recv: %s", wsa_strerror(WSAGetLastError()));
-#endif
+					log_err("could not recv: %s",
+						sock_strerror(errno));
 					return 0;
 				}
 				break;
@@ -3108,11 +3102,7 @@ handle_req(struct daemon_remote* rc, struct rc_state* s, RES* res)
 				if(rr == 0) return;
 				if(errno == EINTR || errno == EAGAIN)
 					continue;
-#ifndef USE_WINSOCK
-				log_err("could not recv: %s", strerror(errno));
-#else
-				log_err("could not recv: %s", wsa_strerror(WSAGetLastError()));
-#endif
+				log_err("could not recv: %s", sock_strerror(errno));
 				return;
 			}
 			r = (int)rr;
diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index 26eac063a..a778bb64b 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -149,15 +149,14 @@ static void dtio_wakeup(struct dt_io_thread* dtio)
 #ifndef USE_WINSOCK
 			if(errno == EINTR || errno == EAGAIN)
 				continue;
-			log_err("dnstap io wakeup: write: %s", strerror(errno));
 #else
 			if(WSAGetLastError() == WSAEINPROGRESS)
 				continue;
 			if(WSAGetLastError() == WSAEWOULDBLOCK)
 				continue;
-			log_err("dnstap io stop: write: %s",
-				wsa_strerror(WSAGetLastError()));
 #endif
+			log_err("dnstap io wakeup: write: %s",
+				sock_strerror(errno));
 			break;
 		}
 		break;
@@ -656,13 +655,8 @@ static int dtio_check_nb_connect(struct dt_io_thread* dtio)
 		char* to = dtio->socket_path;
 		if(!to) to = dtio->ip_str;
 		if(!to) to = "";
-#ifndef USE_WINSOCK
 		log_err("dnstap io: failed to connect to \"%s\": %s",
-			to, strerror(error));
-#else
-		log_err("dnstap io: failed to connect to \"%s\": %s",
-			to, wsa_strerror(error));
-#endif
+			to, sock_strerror(error));
 		return -1; /* error, close it */
 	}
 
@@ -739,7 +733,6 @@ static int dtio_write_buf(struct dt_io_thread* dtio, uint8_t* buf,
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return 0;
-		log_err("dnstap io: failed send: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEINPROGRESS)
 			return 0;
@@ -749,9 +742,8 @@ static int dtio_write_buf(struct dt_io_thread* dtio, uint8_t* buf,
 				UB_EV_WRITE);
 			return 0;
 		}
-		log_err("dnstap io: failed send: %s",
-			wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("dnstap io: failed send: %s", sock_strerror(errno));
 		return -1;
 	}
 	return ret;
@@ -775,7 +767,6 @@ static int dtio_write_with_writev(struct dt_io_thread* dtio)
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return 0;
-		log_err("dnstap io: failed writev: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEINPROGRESS)
 			return 0;
@@ -785,9 +776,8 @@ static int dtio_write_with_writev(struct dt_io_thread* dtio)
 				UB_EV_WRITE);
 			return 0;
 		}
-		log_err("dnstap io: failed writev: %s",
-			wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("dnstap io: failed writev: %s", sock_strerror(errno));
 		/* close the channel */
 		dtio_del_output_event(dtio);
 		dtio_close_output(dtio);
@@ -1479,15 +1469,13 @@ void dtio_cmd_cb(int fd, short ATTR_UNUSED(bits), void* arg)
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return; /* ignore this */
-		log_err("dnstap io: failed to read: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEINPROGRESS)
 			return;
 		if(WSAGetLastError() == WSAEWOULDBLOCK)
 			return;
-		log_err("dnstap io: failed to read: %s",
-			wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("dnstap io: failed to read: %s", sock_strerror(errno));
 		/* and then fall through to quit the thread */
 	} else if(r == 0) {
 		verbose(VERB_ALGO, "dnstap io: cmd channel closed");
@@ -1849,13 +1837,8 @@ static int dtio_open_output_local(struct dt_io_thread* dtio)
 	struct sockaddr_un s;
 	dtio->fd = socket(AF_LOCAL, SOCK_STREAM, 0);
 	if(dtio->fd == -1) {
-#ifndef USE_WINSOCK
 		log_err("dnstap io: failed to create socket: %s",
-			strerror(errno));
-#else
-		log_err("dnstap io: failed to create socket: %s",
-			wsa_strerror(WSAGetLastError()));
-#endif
+			sock_strerror(errno));
 		return 0;
 	}
 	memset(&s, 0, sizeof(s));
@@ -1875,13 +1858,8 @@ static int dtio_open_output_local(struct dt_io_thread* dtio)
 			dtio_close_fd(dtio);
 			return 0; /* no log retries on low verbosity */
 		}
-#ifndef USE_WINSOCK
 		log_err("dnstap io: failed to connect to \"%s\": %s",
-			to, strerror(errno));
-#else
-		log_err("dnstap io: failed to connect to \"%s\": %s",
-			to, wsa_strerror(WSAGetLastError()));
-#endif
+			to, sock_strerror(errno));
 		dtio_close_fd(dtio);
 		return 0;
 	}
@@ -1906,12 +1884,7 @@ static int dtio_open_output_tcp(struct dt_io_thread* dtio)
 	}
 	dtio->fd = socket(addr.ss_family, SOCK_STREAM, 0);
 	if(dtio->fd == -1) {
-#ifndef USE_WINSOCK
-		log_err("can't create socket: %s", strerror(errno));
-#else
-		log_err("can't create socket: %s",
-			wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("can't create socket: %s", sock_strerror(errno));
 		return 0;
 	}
 	fd_set_nonblock(dtio->fd);
@@ -2104,15 +2077,14 @@ void dt_io_thread_stop(struct dt_io_thread* dtio)
 #ifndef USE_WINSOCK
 			if(errno == EINTR || errno == EAGAIN)
 				continue;
-			log_err("dnstap io stop: write: %s", strerror(errno));
 #else
 			if(WSAGetLastError() == WSAEINPROGRESS)
 				continue;
 			if(WSAGetLastError() == WSAEWOULDBLOCK)
 				continue;
-			log_err("dnstap io stop: write: %s",
-				wsa_strerror(WSAGetLastError()));
 #endif
+			log_err("dnstap io stop: write: %s",
+				sock_strerror(errno));
 			break;
 		}
 		break;
diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 80a117617..ca950c8bf 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -278,36 +278,21 @@ static int make_tcp_accept(char* ip)
 	}
 
 	if((s = socket(addr.ss_family, SOCK_STREAM, 0)) == -1) {
-#ifndef USE_WINSOCK
-		log_err("can't create socket: %s", strerror(errno));
-#else
-		log_err("can't create socket: %s",
-			wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("can't create socket: %s", sock_strerror(errno));
 		return -1;
 	}
 #ifdef SO_REUSEADDR
 	if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&on,
 		(socklen_t)sizeof(on)) < 0) {
-#ifndef USE_WINSOCK
 		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-			strerror(errno));
-#else
-		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-			wsa_strerror(WSAGetLastError()));
-#endif
+			sock_strerror(errno));
 		sock_close(s);
 		return -1;
 	}
 #endif /* SO_REUSEADDR */
 	if(bind(s, (struct sockaddr*)&addr, len) != 0) {
-#ifndef USE_WINSOCK
-		log_err_addr("can't bind socket", strerror(errno),
+		log_err_addr("can't bind socket", sock_strerror(errno),
 			&addr, len);
-#else
-		log_err_addr("can't bind socket",
-			wsa_strerror(WSAGetLastError()), &addr, len);
-#endif
 		sock_close(s);
 		return -1;
 	}
@@ -316,11 +301,7 @@ static int make_tcp_accept(char* ip)
 		return -1;
 	}
 	if(listen(s, LISTEN_BACKLOG) == -1) {
-#ifndef USE_WINSOCK
-		log_err("can't listen: %s", strerror(errno));
-#else
-		log_err("can't listen: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("can't listen: %s", sock_strerror(errno));
 		sock_close(s);
 		return -1;
 	}
@@ -647,7 +628,6 @@ static ssize_t receive_bytes(struct tap_data* data, int fd, void* buf,
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return -1;
-		log_err("could not recv: %s", strerror(errno));
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAEINPROGRESS)
 			return -1;
@@ -655,9 +635,8 @@ static ssize_t receive_bytes(struct tap_data* data, int fd, void* buf,
 			ub_winsock_tcp_wouldblock(data->ev, UB_EV_READ);
 			return -1;
 		}
-		log_err("could not recv: %s",
-			wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("could not recv: %s", sock_strerror(errno));
 		if(verbosity) log_info("dnstap client stream closed from %s",
 			(data->id?data->id:""));
 		return 0;
@@ -789,12 +768,7 @@ static int reply_with_accept(struct tap_data* data)
 		}
 	} else {
 		if(send(data->fd, acceptframe, len, 0) == -1) {
-#ifndef USE_WINSOCK
-			log_err("send failed: %s", strerror(errno));
-#else
-			log_err("send failed: %s",
-				wsa_strerror(WSAGetLastError()));
-#endif
+			log_err("send failed: %s", sock_strerror(errno));
 			fd_set_nonblock(data->fd);
 			free(acceptframe);
 			return 0;
@@ -827,11 +801,7 @@ static int reply_with_finish(int fd)
 
 	fd_set_block(fd);
 	if(send(fd, finishframe, len, 0) == -1) {
-#ifndef USE_WINSOCK
-		log_err("send failed: %s", strerror(errno));
-#else
-		log_err("send failed: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("send failed: %s", sock_strerror(errno));
 		fd_set_nonblock(fd);
 		free(finishframe);
 		return 0;
@@ -1087,7 +1057,6 @@ void dtio_mainfdcallback(int fd, short ATTR_UNUSED(bits), void* arg)
 #endif /* EPROTO */
 			)
 			return;
-		log_err_addr("accept failed", strerror(errno), &addr, addrlen);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAEINPROGRESS ||
 			WSAGetLastError() == WSAECONNRESET)
@@ -1096,9 +1065,9 @@ void dtio_mainfdcallback(int fd, short ATTR_UNUSED(bits), void* arg)
 			ub_winsock_tcp_wouldblock(maindata->ev, UB_EV_READ);
 			return;
 		}
-		log_err_addr("accept failed", wsa_strerror(WSAGetLastError()),
-			&addr, addrlen);
 #endif
+		log_err_addr("accept failed", sock_strerror(errno), &addr,
+			addrlen);
 		return;
 	}
 	fd_set_nonblock(s);
diff --git a/doc/Changelog b/doc/Changelog
index a7a95464a..5a327a23f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 31 August 2020: Wouter
 	- Merge PR #293: Add missing prototype.  Also refactor to use the new
 	  shorthand function to clean up the code.
+	- Refactor to use sock_strerr shorthand function.
 
 27 August 2020: Wouter
 	- Similar to NSD PR#113, implement that interface names can be used,
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index e749147e5..5a7370bf6 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -228,16 +228,14 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 			*noproto = 1;
 			return -1;
 		}
-		log_err("can't create socket: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEAFNOSUPPORT || 
 			WSAGetLastError() == WSAEPROTONOSUPPORT) {
 			*noproto = 1;
 			return -1;
 		}
-		log_err("can't create socket: %s", 
-			wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("can't create socket: %s", sock_strerror(errno));
 		*noproto = 0;
 		return -1;
 	}
@@ -250,9 +248,9 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #ifdef SO_REUSEADDR
 		if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&on, 
 			(socklen_t)sizeof(on)) < 0) {
-#ifndef USE_WINSOCK
 			log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-				strerror(errno));
+				sock_strerror(errno));
+#ifndef USE_WINSOCK
 			if(errno != ENOSYS) {
 				close(s);
 				*noproto = 0;
@@ -260,8 +258,6 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 				return -1;
 			}
 #else
-			log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-				wsa_strerror(WSAGetLastError()));
 			closesocket(s);
 			*noproto = 0;
 			*inuse = 0;
@@ -353,14 +349,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 		if(setsockopt(s, SOL_SOCKET, SO_RCVBUFFORCE, (void*)&rcv, 
 			(socklen_t)sizeof(rcv)) < 0) {
 			if(errno != EPERM) {
-#    ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_RCVBUFFORCE, "
-					"...) failed: %s", strerror(errno));
-#    else
-				log_err("setsockopt(..., SO_RCVBUFFORCE, "
-					"...) failed: %s", 
-					wsa_strerror(WSAGetLastError()));
-#    endif
+					"...) failed: %s", sock_strerror(errno));
 				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
@@ -369,14 +359,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  endif /* SO_RCVBUFFORCE */
 			if(setsockopt(s, SOL_SOCKET, SO_RCVBUF, (void*)&rcv, 
 				(socklen_t)sizeof(rcv)) < 0) {
-#  ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_RCVBUF, "
-					"...) failed: %s", strerror(errno));
-#  else
-				log_err("setsockopt(..., SO_RCVBUF, "
-					"...) failed: %s", 
-					wsa_strerror(WSAGetLastError()));
-#  endif
+					"...) failed: %s", sock_strerror(errno));
 				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
@@ -410,14 +394,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 		if(setsockopt(s, SOL_SOCKET, SO_SNDBUFFORCE, (void*)&snd, 
 			(socklen_t)sizeof(snd)) < 0) {
 			if(errno != EPERM) {
-#    ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_SNDBUFFORCE, "
-					"...) failed: %s", strerror(errno));
-#    else
-				log_err("setsockopt(..., SO_SNDBUFFORCE, "
-					"...) failed: %s", 
-					wsa_strerror(WSAGetLastError()));
-#    endif
+					"...) failed: %s", sock_strerror(errno));
 				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
@@ -426,14 +404,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 #  endif /* SO_SNDBUFFORCE */
 			if(setsockopt(s, SOL_SOCKET, SO_SNDBUF, (void*)&snd, 
 				(socklen_t)sizeof(snd)) < 0) {
-#  ifndef USE_WINSOCK
 				log_err("setsockopt(..., SO_SNDBUF, "
-					"...) failed: %s", strerror(errno));
-#  else
-				log_err("setsockopt(..., SO_SNDBUF, "
-					"...) failed: %s", 
-					wsa_strerror(WSAGetLastError()));
-#  endif
+					"...) failed: %s", sock_strerror(errno));
 				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
@@ -464,14 +436,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 			int val=(v6only==2)?0:1;
 			if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, 
 				(void*)&val, (socklen_t)sizeof(val)) < 0) {
-#ifndef USE_WINSOCK
 				log_err("setsockopt(..., IPV6_V6ONLY"
-					", ...) failed: %s", strerror(errno));
-#else
-				log_err("setsockopt(..., IPV6_V6ONLY"
-					", ...) failed: %s", 
-					wsa_strerror(WSAGetLastError()));
-#endif
+					", ...) failed: %s", sock_strerror(errno));
 				sock_close(s);
 				*noproto = 0;
 				*inuse = 0;
@@ -490,14 +456,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 		 */
 		if (setsockopt(s, IPPROTO_IPV6, IPV6_USE_MIN_MTU,
 			(void*)&on, (socklen_t)sizeof(on)) < 0) {
-#  ifndef USE_WINSOCK
 			log_err("setsockopt(..., IPV6_USE_MIN_MTU, "
-				"...) failed: %s", strerror(errno));
-#  else
-			log_err("setsockopt(..., IPV6_USE_MIN_MTU, "
-				"...) failed: %s", 
-				wsa_strerror(WSAGetLastError()));
-#  endif
+				"...) failed: %s", sock_strerror(errno));
 			sock_close(s);
 			*noproto = 0;
 			*inuse = 0;
@@ -511,13 +471,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 		 */
 		if (setsockopt(s, IPPROTO_IPV6, IPV6_MTU,
 			(void*)&mtu, (socklen_t)sizeof(mtu)) < 0) {
-#  ifndef USE_WINSOCK
 			log_err("setsockopt(..., IPV6_MTU, ...) failed: %s", 
-				strerror(errno));
-#  else
-			log_err("setsockopt(..., IPV6_MTU, ...) failed: %s", 
-				wsa_strerror(WSAGetLastError()));
-#  endif
+				sock_strerror(errno));
 			sock_close(s);
 			*noproto = 0;
 			*inuse = 0;
@@ -660,29 +615,22 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 			*noproto = 1;
 			return -1;
 		}
-		log_err("can't create socket: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEAFNOSUPPORT ||
 			WSAGetLastError() == WSAEPROTONOSUPPORT) {
 			*noproto = 1;
 			return -1;
 		}
-		log_err("can't create socket: %s", 
-			wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("can't create socket: %s", sock_strerror(errno));
 		return -1;
 	}
 	if (mss > 0) {
 #if defined(IPPROTO_TCP) && defined(TCP_MAXSEG)
 		if(setsockopt(s, IPPROTO_TCP, TCP_MAXSEG, (void*)&mss,
 			(socklen_t)sizeof(mss)) < 0) {
-			#ifndef USE_WINSOCK
 			log_err(" setsockopt(.. TCP_MAXSEG ..) failed: %s",
-				strerror(errno));
-			#else
-			log_err(" setsockopt(.. TCP_MAXSEG ..) failed: %s",
-				wsa_strerror(WSAGetLastError()));
-			#endif
+				sock_strerror(errno));
 		} else {
 			verbose(VERB_ALGO,
 				" tcp socket mss set to %d", mss);
@@ -699,13 +647,8 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 #ifdef SO_REUSEADDR
 	if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*)&on, 
 		(socklen_t)sizeof(on)) < 0) {
-#ifndef USE_WINSOCK
 		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-			strerror(errno));
-#else
-		log_err("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-			wsa_strerror(WSAGetLastError()));
-#endif
+			sock_strerror(errno));
 		sock_close(s);
 		return -1;
 	}
@@ -741,13 +684,8 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 	if(addr->ai_family == AF_INET6 && v6only) {
 		if(setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, 
 			(void*)&on, (socklen_t)sizeof(on)) < 0) {
-#ifndef USE_WINSOCK
 			log_err("setsockopt(..., IPV6_V6ONLY, ...) failed: %s",
-				strerror(errno));
-#else
-			log_err("setsockopt(..., IPV6_V6ONLY, ...) failed: %s",
-				wsa_strerror(WSAGetLastError()));
-#endif
+				sock_strerror(errno));
 			sock_close(s);
 			return -1;
 		}
@@ -809,11 +747,7 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
 		return -1;
 	}
 	if(listen(s, TCP_BACKLOG) == -1) {
-#ifndef USE_WINSOCK
-		log_err("can't listen: %s", strerror(errno));
-#else
-		log_err("can't listen: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("can't listen: %s", sock_strerror(errno));
 		sock_close(s);
 		return -1;
 	}
diff --git a/services/outside_network.c b/services/outside_network.c
index ba07444df..085d0e6ae 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -185,12 +185,7 @@ pick_outgoing_tcp(struct waiting_tcp* w, int s)
 		((struct sockaddr_in6*)&pi->addr)->sin6_port = 0;
 	else	((struct sockaddr_in*)&pi->addr)->sin_port = 0;
 	if(bind(s, (struct sockaddr*)&pi->addr, pi->addrlen) != 0) {
-#ifndef USE_WINSOCK
-		log_err("outgoing tcp: bind: %s", strerror(errno));
-#else
-		log_err("outgoing tcp: bind: %s", 
-			wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("outgoing tcp: bind: %s", sock_strerror(errno));
 		sock_close(s);
 		return 0;
 	}
@@ -221,13 +216,8 @@ outnet_get_tcp_fd(struct sockaddr_storage* addr, socklen_t addrlen, int tcp_mss,
 		s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	}
 	if(s == -1) {
-#ifndef USE_WINSOCK
-		log_err_addr("outgoing tcp: socket", strerror(errno),
+		log_err_addr("outgoing tcp: socket", sock_strerror(errno),
 			addr, addrlen);
-#else
-		log_err_addr("outgoing tcp: socket", 
-			wsa_strerror(WSAGetLastError()), addr, addrlen);
-#endif
 		return -1;
 	}
 
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 5936679e6..9ec137635 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -593,11 +593,7 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
 		addrfamily = addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET;
 	fd = socket(addrfamily, SOCK_STREAM, proto);
 	if(fd == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("socket: %s", strerror(errno));
-#else
-		fatal_exit("socket: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("socket: %s", sock_strerror(errno));
 	}
 	if(connect(fd, (struct sockaddr*)&addr, addrlen) < 0) {
 #ifndef USE_WINSOCK
@@ -681,11 +677,7 @@ remote_read(SSL* ssl, int fd, char* buf, size_t len)
 				/* EOF */
 				return 0;
 			}
-#ifndef USE_WINSOCK
-			fatal_exit("could not recv: %s", strerror(errno));
-#else
-			fatal_exit("could not recv: %s", wsa_strerror(WSAGetLastError()));
-#endif
+			fatal_exit("could not recv: %s", sock_strerror(errno));
 		}
 		buf[rr] = 0;
 	}
@@ -701,11 +693,7 @@ remote_write(SSL* ssl, int fd, const char* buf, size_t len)
 			ssl_err("could not SSL_write");
 	} else {
 		if(send(fd, buf, len, 0) < (ssize_t)len) {
-#ifndef USE_WINSOCK
-			fatal_exit("could not send: %s", strerror(errno));
-#else
-			fatal_exit("could not send: %s", wsa_strerror(WSAGetLastError()));
-#endif
+			fatal_exit("could not send: %s", sock_strerror(errno));
 		}
 	}
 }
diff --git a/testcode/delayer.c b/testcode/delayer.c
index 6562f80e6..54175dbe3 100644
--- a/testcode/delayer.c
+++ b/testcode/delayer.c
@@ -372,11 +372,7 @@ service_send(struct ringbuf* ring, struct timeval* now, sldns_buffer* pkt,
 			sldns_buffer_limit(pkt), 0, 
 			(struct sockaddr*)srv_addr, srv_len);
 		if(sent == -1) {
-#ifndef USE_WINSOCK
-			log_err("sendto: %s", strerror(errno));
-#else
-			log_err("sendto: %s", wsa_strerror(WSAGetLastError()));
-#endif
+			log_err("sendto: %s", sock_strerror(errno));
 		} else if(sent != (ssize_t)sldns_buffer_limit(pkt)) {
 			log_err("sendto: partial send");
 		}
@@ -398,13 +394,12 @@ do_proxy(struct proxy* p, int retsock, sldns_buffer* pkt)
 #ifndef USE_WINSOCK
 			if(errno == EAGAIN || errno == EINTR)
 				return;
-			log_err("recv: %s", strerror(errno));
 #else
 			if(WSAGetLastError() == WSAEINPROGRESS ||
 				WSAGetLastError() == WSAEWOULDBLOCK)
 				return;
-			log_err("recv: %s", wsa_strerror(WSAGetLastError()));
 #endif
+			log_err("recv: %s", sock_strerror(errno));
 			return;
 		}
 		sldns_buffer_set_limit(pkt, (size_t)r);
@@ -414,11 +409,7 @@ do_proxy(struct proxy* p, int retsock, sldns_buffer* pkt)
 		r = sendto(retsock, (void*)sldns_buffer_begin(pkt), (size_t)r, 
 			0, (struct sockaddr*)&p->addr, p->addr_len);
 		if(r == -1) {
-#ifndef USE_WINSOCK
-			log_err("sendto: %s", strerror(errno));
-#else
-			log_err("sendto: %s", wsa_strerror(WSAGetLastError()));
-#endif
+			log_err("sendto: %s", sock_strerror(errno));
 		}
 	}
 }
@@ -469,11 +460,7 @@ find_create_proxy(struct sockaddr_storage* from, socklen_t from_len,
 	if(!p) fatal_exit("out of memory");
 	p->s = socket(serv_ip6?AF_INET6:AF_INET, SOCK_DGRAM, 0);
 	if(p->s == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("socket: %s", strerror(errno));
-#else
-		fatal_exit("socket: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("socket: %s", sock_strerror(errno));
 	}
 	fd_set_nonblock(p->s);
 	memmove(&p->addr, from, from_len);
@@ -507,14 +494,12 @@ service_recv(int s, struct ringbuf* ring, sldns_buffer* pkt,
 #ifndef USE_WINSOCK
 			if(errno == EAGAIN || errno == EINTR)
 				return;
-			fatal_exit("recvfrom: %s", strerror(errno));
 #else
 			if(WSAGetLastError() == WSAEWOULDBLOCK || 
 				WSAGetLastError() == WSAEINPROGRESS)
 				return;
-			fatal_exit("recvfrom: %s", 
-				wsa_strerror(WSAGetLastError()));
 #endif
+			fatal_exit("recvfrom: %s", sock_strerror(errno));
 		}
 		sldns_buffer_set_limit(pkt, (size_t)len);
 		/* find its proxy element */
@@ -571,14 +556,13 @@ service_tcp_listen(int s, fd_set* rorig, int* max, struct tcp_proxy** proxies,
 #ifndef USE_WINSOCK
 		if(errno == EAGAIN || errno == EINTR)
 			return;
-		fatal_exit("accept: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEWOULDBLOCK || 
 			WSAGetLastError() == WSAEINPROGRESS ||
 			WSAGetLastError() == WSAECONNRESET)
 			return;
-		fatal_exit("accept: %s", wsa_strerror(WSAGetLastError()));
 #endif
+		fatal_exit("accept: %s", sock_strerror(errno));
 	}
 	p = (struct tcp_proxy*)calloc(1, sizeof(*p));
 	if(!p) fatal_exit("out of memory");
@@ -589,11 +573,7 @@ service_tcp_listen(int s, fd_set* rorig, int* max, struct tcp_proxy** proxies,
 	p->server_s = socket(addr_is_ip6(srv_addr, srv_len)?AF_INET6:AF_INET,
 		SOCK_STREAM, 0);
 	if(p->server_s == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("tcp socket: %s", strerror(errno));
-#else
-		fatal_exit("tcp socket: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("tcp socket: %s", sock_strerror(errno));
 	}
 	fd_set_nonblock(p->client_s);
 	fd_set_nonblock(p->server_s);
@@ -642,13 +622,12 @@ tcp_relay_read(int s, struct tcp_send_list** first,
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return 1;
-		log_err("tcp read: %s", strerror(errno));
 #else
 		if(WSAGetLastError() == WSAEINPROGRESS || 
 			WSAGetLastError() == WSAEWOULDBLOCK)
 			return 1;
-		log_err("tcp read: %s", wsa_strerror(WSAGetLastError()));
 #endif
+		log_err("tcp read: %s", sock_strerror(errno));
 		return 0;
 	} else if(r == 0) {
 		/* connection closed */
@@ -700,14 +679,12 @@ tcp_relay_write(int s, struct tcp_send_list** first,
 #ifndef USE_WINSOCK
 			if(errno == EAGAIN || errno == EINTR)
 				return 1;
-			log_err("tcp write: %s", strerror(errno));
 #else
 			if(WSAGetLastError() == WSAEWOULDBLOCK || 
 				WSAGetLastError() == WSAEINPROGRESS)
 				return 1;
-			log_err("tcp write: %s", 
-				wsa_strerror(WSAGetLastError()));
 #endif
+			log_err("tcp write: %s", sock_strerror(errno));
 			return 0;
 		} else if(r == 0) {
 			/* closed */
@@ -1018,11 +995,7 @@ service(const char* bind_str, int bindport, const char* serv_str,
 	/* bind UDP port */
 	if((s = socket(str_is_ip6(bind_str)?AF_INET6:AF_INET,
 		SOCK_DGRAM, 0)) == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("socket: %s", strerror(errno));
-#else
-		fatal_exit("socket: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("socket: %s", sock_strerror(errno));
 	}
 	i=0;
 	if(bindport == 0) {
@@ -1035,11 +1008,7 @@ service(const char* bind_str, int bindport, const char* serv_str,
 			exit(1);
 		}
 		if(bind(s, (struct sockaddr*)&bind_addr, bind_len) == -1) {
-#ifndef USE_WINSOCK
-			log_err("bind: %s", strerror(errno));
-#else
-			log_err("bind: %s", wsa_strerror(WSAGetLastError()));
-#endif
+			log_err("bind: %s", sock_strerror(errno));
 			if(i--==0)
 				fatal_exit("cannot bind any port");
 			bindport = 1024 + ((int)arc4random())%64000;
@@ -1049,39 +1018,22 @@ service(const char* bind_str, int bindport, const char* serv_str,
 	/* and TCP port */
 	if((listen_s = socket(str_is_ip6(bind_str)?AF_INET6:AF_INET,
 		SOCK_STREAM, 0)) == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("tcp socket: %s", strerror(errno));
-#else
-		fatal_exit("tcp socket: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("tcp socket: %s", sock_strerror(errno));
 	}
 #ifdef SO_REUSEADDR
 	if(1) {
 		int on = 1;
 		if(setsockopt(listen_s, SOL_SOCKET, SO_REUSEADDR, (void*)&on,
 			(socklen_t)sizeof(on)) < 0)
-#ifndef USE_WINSOCK
 			fatal_exit("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-				strerror(errno));
-#else
-			fatal_exit("setsockopt(.. SO_REUSEADDR ..) failed: %s",
-				wsa_strerror(WSAGetLastError()));
-#endif
+				sock_strerror(errno));
 	}
 #endif
 	if(bind(listen_s, (struct sockaddr*)&bind_addr, bind_len) == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("tcp bind: %s", strerror(errno));
-#else
-		fatal_exit("tcp bind: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("tcp bind: %s", sock_strerror(errno));
 	}
 	if(listen(listen_s, 5) == -1) {
-#ifndef USE_WINSOCK
-		fatal_exit("tcp listen: %s", strerror(errno));
-#else
-		fatal_exit("tcp listen: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		fatal_exit("tcp listen: %s", sock_strerror(errno));
 	}
 	fd_set_nonblock(listen_s);
 	printf("listening on port: %d\n", bindport);
diff --git a/testcode/perf.c b/testcode/perf.c
index aef69045f..b13eca6d3 100644
--- a/testcode/perf.c
+++ b/testcode/perf.c
@@ -233,12 +233,7 @@ perfsetup(struct perfinfo* info)
 			addr_is_ip6(&info->dest, info->destlen)?
 			AF_INET6:AF_INET, SOCK_DGRAM, 0);
 		if(info->io[i].fd == -1) {
-#ifndef USE_WINSOCK
-			fatal_exit("socket: %s", strerror(errno));
-#else
-			fatal_exit("socket: %s", 
-				wsa_strerror(WSAGetLastError()));
-#endif
+			fatal_exit("socket: %s", sock_strerror(errno));
 		}
 		if(info->io[i].fd > info->maxfd)
 			info->maxfd = info->io[i].fd;
@@ -281,11 +276,7 @@ perfsend(struct perfinfo* info, size_t n, struct timeval* now)
 	/*log_hex("send", info->qlist_data[info->qlist_idx],
 		info->qlist_len[info->qlist_idx]);*/
 	if(r == -1) {
-#ifndef USE_WINSOCK
-		log_err("sendto: %s", strerror(errno));
-#else
-		log_err("sendto: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("sendto: %s", sock_strerror(errno));
 	} else if(r != (ssize_t)info->qlist_len[info->qlist_idx]) {
 		log_err("partial sendto");
 	}
@@ -305,11 +296,7 @@ perfreply(struct perfinfo* info, size_t n, struct timeval* now)
 	r = recv(info->io[n].fd, (void*)sldns_buffer_begin(info->buf),
 		sldns_buffer_capacity(info->buf), 0);
 	if(r == -1) {
-#ifndef USE_WINSOCK
-		log_err("recv: %s", strerror(errno));
-#else
-		log_err("recv: %s", wsa_strerror(WSAGetLastError()));
-#endif
+		log_err("recv: %s", sock_strerror(errno));
 	} else {
 		info->by_rcode[LDNS_RCODE_WIRE(sldns_buffer_begin(
 			info->buf))]++;
diff --git a/util/netevent.c b/util/netevent.c
index 6172adb1f..d6b9d87a2 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -373,12 +373,7 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 	if(sent == -1) {
 		if(!udp_send_errno_needs_log(addr, addrlen))
 			return 0;
-#ifndef USE_WINSOCK
-		verbose(VERB_OPS, "sendto failed: %s", strerror(errno));
-#else
-		verbose(VERB_OPS, "sendto failed: %s", 
-			wsa_strerror(WSAGetLastError()));
-#endif
+		verbose(VERB_OPS, "sendto failed: %s", sock_strerror(errno));
 		log_addr(VERB_OPS, "remote address is", 
 			(struct sockaddr_storage*)addr, addrlen);
 		return 0;
@@ -845,7 +840,6 @@ int comm_point_perform_accept(struct comm_point* c,
 			return -1;
 		}
 #endif
-		log_err_addr("accept failed", strerror(errno), addr, *addrlen);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAEINPROGRESS ||
 			WSAGetLastError() == WSAECONNRESET)
@@ -854,9 +848,9 @@ int comm_point_perform_accept(struct comm_point* c,
 			ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ);
 			return -1;
 		}
-		log_err_addr("accept failed", wsa_strerror(WSAGetLastError()),
-			addr, *addrlen);
 #endif
+		log_err_addr("accept failed", sock_strerror(errno), addr,
+			*addrlen);
 		return -1;
 	}
 	if(c->tcp_conn_limit && c->type == comm_tcp_accept) {
@@ -1435,8 +1429,6 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 			if(errno == ECONNRESET && verbosity < 2)
 				return 0; /* silence reset by peer */
 #endif
-			log_err_addr("read (in tcp s)", strerror(errno),
-				&c->repinfo.addr, c->repinfo.addrlen);
 #else /* USE_WINSOCK */
 			if(WSAGetLastError() == WSAECONNRESET)
 				return 0;
@@ -1447,10 +1439,9 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 					UB_EV_READ);
 				return 1;
 			}
-			log_err_addr("read (in tcp s)", 
-				wsa_strerror(WSAGetLastError()),
-				&c->repinfo.addr, c->repinfo.addrlen);
 #endif
+			log_err_addr("read (in tcp s)", sock_strerror(errno),
+				&c->repinfo.addr, c->repinfo.addrlen);
 			return 0;
 		} 
 		c->tcp_byte_count += r;
@@ -1483,8 +1474,6 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return 1;
-		log_err_addr("read (in tcp r)", strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAECONNRESET)
 			return 0;
@@ -1494,10 +1483,9 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 			ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ);
 			return 1;
 		}
-		log_err_addr("read (in tcp r)",
-			wsa_strerror(WSAGetLastError()),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #endif
+		log_err_addr("read (in tcp r)", sock_strerror(errno),
+			&c->repinfo.addr, c->repinfo.addrlen);
 		return 0;
 	}
 	sldns_buffer_skip(c->buffer, r);
@@ -1716,8 +1704,6 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 		if(errno == ECONNRESET && verbosity < 2)
 			return 0; /* silence reset by peer */
 #endif
-		log_err_addr("tcp send r", strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #else
 		if(WSAGetLastError() == WSAEINPROGRESS)
 			return 1;
@@ -1727,9 +1713,9 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 		}
 		if(WSAGetLastError() == WSAECONNRESET && verbosity < 2)
 			return 0; /* silence reset by peer */
-		log_err_addr("tcp send r", wsa_strerror(WSAGetLastError()),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #endif
+		log_err_addr("tcp send r", sock_strerror(errno),
+			&c->repinfo.addr, c->repinfo.addrlen);
 		return 0;
 	}
 	sldns_buffer_skip(buffer, r);
@@ -1914,8 +1900,6 @@ http_read_more(int fd, struct comm_point* c)
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return 1;
-		log_err_addr("read (in http r)", strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAECONNRESET)
 			return 0;
@@ -1925,10 +1909,9 @@ http_read_more(int fd, struct comm_point* c)
 			ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ);
 			return 1;
 		}
-		log_err_addr("read (in http r)",
-			wsa_strerror(WSAGetLastError()),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #endif
+		log_err_addr("read (in http r)", sock_strerror(errno),
+			&c->repinfo.addr, c->repinfo.addrlen);
 		return 0;
 	}
 	sldns_buffer_skip(c->buffer, r);
@@ -2364,8 +2347,6 @@ http_write_more(int fd, struct comm_point* c)
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
 			return 1;
-		log_err_addr("http send r", strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #else
 		if(WSAGetLastError() == WSAEINPROGRESS)
 			return 1;
@@ -2373,9 +2354,9 @@ http_write_more(int fd, struct comm_point* c)
 			ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_WRITE);
 			return 1; 
 		}
-		log_err_addr("http send r", wsa_strerror(WSAGetLastError()),
-			&c->repinfo.addr, c->repinfo.addrlen);
 #endif
+		log_err_addr("http send r", sock_strerror(errno),
+			&c->repinfo.addr, c->repinfo.addrlen);
 		return 0;
 	}
 	sldns_buffer_skip(c->buffer, r);

From afbc7bb4fec5026f6a1a1487e643b94b2ba1d694 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 31 Aug 2020 11:50:11 +0200
Subject: [PATCH 049/108] - Fix #296: systemd nss-lookup.target is reached
 before unbound can   successfully answer queries. Changed
 contrib/unbound.service.in.

---
 contrib/unbound.service.in | 6 +++---
 doc/Changelog              | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in
index 8ebe529c9..c95ab94b3 100644
--- a/contrib/unbound.service.in
+++ b/contrib/unbound.service.in
@@ -42,9 +42,9 @@
 [Unit]
 Description=Validating, recursive, and caching DNS resolver
 Documentation=man:unbound(8)
-After=network.target
-Before=network-online.target nss-lookup.target
-Wants=nss-lookup.target
+After=network-online.target
+Before=nss-lookup.target
+Wants=network-online.target nss-lookup.target
 
 [Install]
 WantedBy=multi-user.target
diff --git a/doc/Changelog b/doc/Changelog
index 5a327a23f..110da7f2b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
 	- Merge PR #293: Add missing prototype.  Also refactor to use the new
 	  shorthand function to clean up the code.
 	- Refactor to use sock_strerr shorthand function.
+	- Fix #296: systemd nss-lookup.target is reached before unbound can
+	  successfully answer queries. Changed contrib/unbound.service.in.
 
 27 August 2020: Wouter
 	- Similar to NSD PR#113, implement that interface names can be used,

From 82f2ee63c562bb8e0c64392ac22de79f5dd1d172 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 9 Sep 2020 11:44:44 +0200
Subject: [PATCH 050/108] - Fix num.expired statistics output.

---
 daemon/stats.c | 1 +
 doc/Changelog  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/daemon/stats.c b/daemon/stats.c
index a568ba070..cb956ddd5 100644
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -271,6 +271,7 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 	s->svr.ans_secure += (long long)worker->env.mesh->ans_secure;
 	s->svr.ans_bogus += (long long)worker->env.mesh->ans_bogus;
 	s->svr.ans_rcode_nodata += (long long)worker->env.mesh->ans_nodata;
+	s->svr.ans_expired += (long long)worker->env.mesh->ans_expired;
 	for(i=0; i<UB_STATS_RCODE_NUM; i++)
 		s->svr.ans_rcode[i] += (long long)worker->env.mesh->ans_rcode[i];
 	for(i=0; i<UB_STATS_RPZ_ACTION_NUM; i++)
diff --git a/doc/Changelog b/doc/Changelog
index 110da7f2b..9fb230cf8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+9 September 2020: Wouter
+	- Fix num.expired statistics output.
+
 31 August 2020: Wouter
 	- Merge PR #293: Add missing prototype.  Also refactor to use the new
 	  shorthand function to clean up the code.

From 39f60718542bd86a7ec3f8fa48ecd62dbc251865 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 10 Sep 2020 12:27:37 +0200
Subject: [PATCH 051/108] Ignore base64 padding for strings that are supposed
 to be unpadded.

---
 sldns/parseutil.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sldns/parseutil.c b/sldns/parseutil.c
index f5d45823f..9f289d359 100644
--- a/sldns/parseutil.c
+++ b/sldns/parseutil.c
@@ -735,9 +735,12 @@ static int sldns_b64_pton_base(char const *src, size_t srcsize, uint8_t *target,
 			d = 63;
 		else if(base64url && d == '_')
 			d = 63;
-		else if(!base64url && d == '=')
+		else if(d == '=') {
+			if(!check_padding)
+				continue;
 			d = 64;
-		else	continue;
+		} else	continue;
+
 		in[incount++] = (uint8_t)d;
 		/* work on block of 4, unless padding is not used and there are
 		 * less than 4 chars left */

From a3be2b73b64c2d6cce131ba7dd70b2647cd7a5f7 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 10 Sep 2020 13:05:55 +0200
Subject: [PATCH 052/108] Properly handle http_endpoint malloc failure.

---
 util/netevent.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/util/netevent.c b/util/netevent.c
index 49ad08a4d..be3b740b5 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3152,11 +3152,19 @@ comm_point_create_http_handler(struct comm_base *base,
 	if(harden_large_queries && bufsize > 512)
 		c->http2_stream_max_qbuffer_size = 512;
 	c->http2_max_streams = http_max_streams;
-	c->http_endpoint = strdup(http_endpoint);
+	if(!(c->http_endpoint = strdup(http_endpoint))) {
+		log_err("could not strdup http_endpoint");
+		sldns_buffer_free(c->buffer);
+		free(c->timeout);
+		free(c->ev);
+		free(c);
+		return NULL;
+	}
 	c->alpn_h2 = 0;
 #ifdef HAVE_NGHTTP2
 	if(!(c->h2_session = http2_session_create(c))) {
 		log_err("could not create http2 session");
+		free(c->http_endpoint);
 		sldns_buffer_free(c->buffer);
 		free(c->timeout);
 		free(c->ev);
@@ -3166,6 +3174,7 @@ comm_point_create_http_handler(struct comm_base *base,
 	if(!(c->h2_session->callbacks = http2_req_callbacks_create())) {
 		log_err("could not create http2 callbacks");
 		http2_session_delete(c->h2_session);
+		free(c->http_endpoint);
 		sldns_buffer_free(c->buffer);
 		free(c->timeout);
 		free(c->ev);

From 291ac5988812736bc70498d608f2b445fe64435c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 11 Sep 2020 14:08:10 +0200
Subject: [PATCH 053/108] - Remove x file mode on ipset/ipset.c and h files.

---
 doc/Changelog | 3 +++
 ipset/ipset.c | 0
 ipset/ipset.h | 0
 3 files changed, 3 insertions(+)
 mode change 100755 => 100644 ipset/ipset.c
 mode change 100755 => 100644 ipset/ipset.h

diff --git a/doc/Changelog b/doc/Changelog
index 9fb230cf8..e2ea4c7d8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+11 September 2020: Wouter
+	- Remove x file mode on ipset/ipset.c and h files.
+
 9 September 2020: Wouter
 	- Fix num.expired statistics output.
 
diff --git a/ipset/ipset.c b/ipset/ipset.c
old mode 100755
new mode 100644
diff --git a/ipset/ipset.h b/ipset/ipset.h
old mode 100755
new mode 100644

From 0ce77697194f280e699fc64fd1d27ff02b8b4294 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 15 Sep 2020 12:45:22 +0200
Subject: [PATCH 054/108] - Introduce test for statistics.

---
 doc/Changelog                                 |   3 +
 testdata/stat_values.tdir/stat_values.conf    |  31 ++
 testdata/stat_values.tdir/stat_values.dsc     |  16 +
 testdata/stat_values.tdir/stat_values.post    |  14 +
 testdata/stat_values.tdir/stat_values.pre     |  41 ++
 testdata/stat_values.tdir/stat_values.test    | 411 ++++++++++++++++++
 .../stat_values.testexpiredns                 |  13 +
 testdata/stat_values.tdir/stat_values.testns  |  23 +
 testdata/stat_values.tdir/unbound_control.key |  39 ++
 testdata/stat_values.tdir/unbound_control.pem |  22 +
 testdata/stat_values.tdir/unbound_server.key  |  39 ++
 testdata/stat_values.tdir/unbound_server.pem  |  22 +
 12 files changed, 674 insertions(+)
 create mode 100644 testdata/stat_values.tdir/stat_values.conf
 create mode 100644 testdata/stat_values.tdir/stat_values.dsc
 create mode 100644 testdata/stat_values.tdir/stat_values.post
 create mode 100644 testdata/stat_values.tdir/stat_values.pre
 create mode 100644 testdata/stat_values.tdir/stat_values.test
 create mode 100644 testdata/stat_values.tdir/stat_values.testexpiredns
 create mode 100644 testdata/stat_values.tdir/stat_values.testns
 create mode 100644 testdata/stat_values.tdir/unbound_control.key
 create mode 100644 testdata/stat_values.tdir/unbound_control.pem
 create mode 100644 testdata/stat_values.tdir/unbound_server.key
 create mode 100644 testdata/stat_values.tdir/unbound_server.pem

diff --git a/doc/Changelog b/doc/Changelog
index e2ea4c7d8..593b57971 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+15 September 2020: George
+	- Introduce test for statistics.
+
 11 September 2020: Wouter
 	- Remove x file mode on ipset/ipset.c and h files.
 
diff --git a/testdata/stat_values.tdir/stat_values.conf b/testdata/stat_values.tdir/stat_values.conf
new file mode 100644
index 000000000..aaef81d4f
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.conf
@@ -0,0 +1,31 @@
+server:
+	verbosity: 5
+	num-threads: 1
+	interface: 127.0.0.1
+	port: @PORT@
+	use-syslog: no
+	directory: ""
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	extended-statistics: yes
+	identity: "stat_values"
+
+	local-zone: local.zone static
+	local-data: "www.local.zone A 192.0.2.1"
+remote-control:
+	control-enable: yes
+	control-interface: 127.0.0.1
+	# control-interface: ::1
+	control-port: @CONTROL_PORT@
+	server-key-file: "unbound_server.key"
+	server-cert-file: "unbound_server.pem"
+	control-key-file: "unbound_control.key"
+	control-cert-file: "unbound_control.pem"
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
+forward-zone:
+	name: "expired."
+	forward-addr: "127.0.0.1@@EXPIREDPORT@"
diff --git a/testdata/stat_values.tdir/stat_values.dsc b/testdata/stat_values.tdir/stat_values.dsc
new file mode 100644
index 000000000..5112dbcf9
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.dsc
@@ -0,0 +1,16 @@
+BaseName: stat_values
+Version: 1.0
+Description: Test unbound statistics
+CreationDate: Mon Sep 09 14:48:03 CEST 2020
+Maintainer:
+Category:
+Component:
+CmdDepends:
+Depends:
+Help:
+Pre: stat_values.pre
+Post: stat_values.post
+Test: stat_values.test
+AuxFiles:
+Passed:
+Failure:
diff --git a/testdata/stat_values.tdir/stat_values.post b/testdata/stat_values.tdir/stat_values.post
new file mode 100644
index 000000000..8656b599f
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.post
@@ -0,0 +1,14 @@
+# #-- stat_values.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $FWD_PID
+kill $FWD_EXPIRED_PID >/dev/null 2>&1  # This is killed during testing.
+# it was stopped with unbound-control (if the test succeeded)
+kill $UNBOUND_PID >/dev/null 2>&1
+kill $UNBOUND_PID >/dev/null 2>&1
+exit 0
diff --git a/testdata/stat_values.tdir/stat_values.pre b/testdata/stat_values.tdir/stat_values.pre
new file mode 100644
index 000000000..2db4a17e0
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.pre
@@ -0,0 +1,41 @@
+# #-- stat_values.pre--#
+# 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
+get_random_port 4
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+FWD_EXPIRED_PORT=$(($RND_PORT + 2))
+CONTROL_PORT=$(($RND_PORT + 3))
+FWD_EXPIRED_PORT=$(($RND_PORT + 4))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+echo "FWD_EXPIRED_PORT=$FWD_EXPIRED_PORT" >> .tpkg.var.test
+echo "CONTROL_PORT=$CONTROL_PORT" >> .tpkg.var.test
+
+# start forwarder
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT stat_values.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# start expired forwarder
+$LDNS_TESTNS -p $FWD_EXPIRED_PORT stat_values.testexpiredns >fwd_expired.log 2>&1 &
+FWD_EXPIRED_PID=$!
+echo "FWD_EXPIRED_PID=$FWD_EXPIRED_PID" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@EXPIREDPORT\@/'$FWD_EXPIRED_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < stat_values.conf > ub.conf
+# start unbound in the background
+PRE="../.."
+$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_ldns_testns_up fwd.log
+wait_ldns_testns_up fwd_expired.log
+wait_unbound_up unbound.log
diff --git a/testdata/stat_values.tdir/stat_values.test b/testdata/stat_values.tdir/stat_values.test
new file mode 100644
index 000000000..5c72708a6
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.test
@@ -0,0 +1,411 @@
+# #-- stat_values.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
+# We need kill_pid for the serve-expired-client-timeour test
+. ../common.sh
+
+PRE="../.."
+
+# Individual thread stats.
+STATS_IGNORE_THREAD="\
+^thread"
+
+# Histogram stats.
+STATS_IGNORE_HISTOGRAM="\
+^histogram"
+
+# Time dependent stats.
+STATS_IGNORE_TIME_SPECIFIC="\
+^total.recursion.time.avg=
+^total.recursion.time.median=
+^time.now=
+^time.up=
+^time.elapsed="
+
+# Usage dependent stats.
+STATS_IGNORE_USAGE_SPECIFIC="\
+^total.requestlist.avg=
+^total.requestlist.max=
+^total.requestlist.overwritten=
+^total.requestlist.exceeded=
+^total.requestlist.current.all=
+^total.requestlist.current.user=
+^total.tcpusage=
+^mem\."
+
+# Stats to ignore by default.
+STATS_IGNORE_DEFAULT="\
+$STATS_IGNORE_THREAD
+$STATS_IGNORE_HISTOGRAM
+$STATS_IGNORE_TIME_SPECIFIC
+$STATS_IGNORE_USAGE_SPECIFIC"
+
+# Various files to be used while testing.
+STATS_FILE=stats.$$
+EXPECTED_STATS_FILE=expected_stats.$$
+IGNORE_REGEX_FILE=ignore_regex.$$
+FILTERED_STATS_FILE=filtered_stats.$$
+FOUND_STATS_FILE=found_stats.$$
+REST_STATS_FILE=rest_stats.$$
+
+DEBUG=0
+
+# Write stats to $STATS_FILE.
+# Call this when you want to get stats from unbound.
+get_stats () {
+	echo "> Getting stats"
+	echo "$PRE/unbound-control -c ub.conf stats"
+	$PRE/unbound-control -c ub.conf stats > $STATS_FILE
+	if test $? -ne 0; then
+		echo "wrong exit value after success"
+		exit 1
+	fi
+}
+
+# Set the expected stat values by writing to $EXPECTED_STATS_FILE.
+# sort is used for proper diff later.
+set_expected_stats () {
+	echo "$1" | sort > $EXPECTED_STATS_FILE
+}
+
+# Set the regex to ignore stats by writing to $IGNORE_REGEX_FILE.
+set_ignore_regex_stats () {
+	echo "$1" > $IGNORE_REGEX_FILE
+}
+
+# Filter the stats by removing any matched regex from $IGNORE_REGEX_FILE,
+# sorts and writes the left over stats to $FILTERED_STATS_FILE.
+filter_stats () {
+	grep -v -f $IGNORE_REGEX_FILE $STATS_FILE | sort > $FILTERED_STATS_FILE
+}
+
+# Check that the stats in $FILTERED_STATS_FILE include the expected stats in
+# $EXPECTED_STATS_FILE.
+check_expected_stats () {
+	echo "> Checking expected stats"
+	grep -F -x -f $EXPECTED_STATS_FILE $FILTERED_STATS_FILE > $FOUND_STATS_FILE
+	if test $DEBUG -ne 0; then
+		echo "Found:"
+		cat $FOUND_STATS_FILE
+	fi
+	if diff $EXPECTED_STATS_FILE $FOUND_STATS_FILE; then
+		echo "OK"
+	else
+		echo "! bad expected stats:"
+        cat $FILTERED_STATS_FILE
+		exit 1
+	fi
+}
+
+# Check that the rest (unspecified) stats are all 0 (no surprises).
+check_rest_stats () {
+	echo "> Checking rest stats"
+	grep -F -x -v -f $EXPECTED_STATS_FILE $FILTERED_STATS_FILE > $REST_STATS_FILE
+	if test $DEBUG -ne 0; then
+		echo "Rest:"
+		cat $REST_STATS_FILE
+	fi
+	if grep -v "=0$" $REST_STATS_FILE; then
+		echo "! bad rest stats"
+		exit 1
+	else
+		echo "OK"
+	fi
+}
+
+# Main function to check stats by:
+# - Getting stats from unbound
+# - Filtering out the stats we are not interested in
+# - Checking that the expected stats are part of the filtered stats
+# - The rest of the stats have 0 values.
+check_stats () {
+	set_expected_stats "$1"
+	if test $DEBUG -ne 0; then
+		echo "Expected:"
+		cat $EXPECTED_STATS_FILE
+	fi
+	get_stats
+	filter_stats
+	if test $DEBUG -ne 0; then
+		echo "Filtered:"
+		cat $FILTERED_STATS_FILE
+	fi
+	check_expected_stats
+	check_rest_stats
+}
+
+# Convenient function to set an option through unbound-control.
+set_ub_option () {
+	name=$1
+	value=$2
+	echo "$PRE/unbound-control -c ub.conf set_option $name: $value"
+	$PRE/unbound-control -c ub.conf set_option $name: $value
+	if test $? -ne 0; then
+		echo "wrong exit value after success"
+		exit 1
+	fi
+}
+
+# Convenient function to exit the test.
+end () {
+	echo "> cat logfiles"
+	cat fwd.log
+	cat unbound.log
+	if test $1 -eq 1; then
+		echo "Not OK"
+	else
+		echo "> OK"
+	fi
+	exit $1
+}
+
+# Ignore all run specific stats.
+set_ignore_regex_stats "$STATS_IGNORE_DEFAULT"
+
+# Check if the server is up.
+echo "> dig 1ttl.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT 1ttl.example.com. | tee outfile
+echo "> check answer"
+if grep "1.1.1.1" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+
+echo
+echo "[ Check initial stats based on first query. ]"
+check_stats "\
+total.num.queries=1
+total.num.cachemiss=1
+total.num.recursivereplies=1
+num.query.type.A=1
+num.query.class.IN=1
+num.query.opcode.QUERY=1
+num.query.flags.RD=1
+num.query.flags.AD=1
+num.query.edns.present=1
+msg.cache.count=1
+rrset.cache.count=1
+infra.cache.count=1
+num.answer.rcode.NOERROR=1"
+
+echo
+echo "[ Check stat reset. ]"
+check_stats "\
+msg.cache.count=1
+rrset.cache.count=1
+infra.cache.count=1"
+
+
+echo
+echo "[ Enable serve-expired and check. ]"
+set_ub_option serve-expired yes
+sleep 2  # make sure the TTL has expired.
+echo "> dig 1ttl.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT 1ttl.example.com. | tee outfile
+echo "> check answer"
+if grep "1.1.1.1" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+total.num.queries=1
+total.num.expired=1
+total.num.cachehits=1
+total.num.prefetch=1
+num.answer.rcode.NOERROR=1
+num.query.class.IN=1
+num.query.edns.present=1
+num.query.flags.AD=1
+num.query.flags.RD=1
+num.query.opcode.QUERY=1
+num.query.type.A=1
+msg.cache.count=1
+rrset.cache.count=1
+infra.cache.count=1"
+
+
+echo
+echo "[ Enable serve-expired-client-timeout and check. ]"
+set_ub_option serve-expired-client-timeout 1
+echo "> dig servfail.expired."
+dig @127.0.0.1 -p $UNBOUND_PORT servfail.expired. | tee outfile
+echo "> check answer"
+if grep "192.0.2.1" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+total.num.queries=1
+total.num.cachemiss=1
+total.num.recursivereplies=1
+num.query.type.A=1
+num.query.class.IN=1
+num.query.opcode.QUERY=1
+num.query.flags.RD=1
+num.query.flags.AD=1
+num.query.edns.present=1
+msg.cache.count=2
+rrset.cache.count=2
+infra.cache.count=2
+num.answer.rcode.NOERROR=1"
+kill_pid $FWD_EXPIRED_PID  # kill the expired forwarder to force a servfail from upstream.
+sleep 2  # make sure the TTL has expired.
+echo "> dig servfail.expired."
+dig @127.0.0.1 -p $UNBOUND_PORT servfail.expired. | tee outfile
+echo "> check answer"
+if grep "192.0.2.1" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+total.num.queries=1
+total.num.expired=1
+total.num.recursivereplies=1
+num.answer.rcode.NOERROR=1
+num.query.class.IN=1
+num.query.edns.present=1
+num.query.flags.AD=1
+num.query.flags.RD=1
+num.query.opcode.QUERY=1
+num.query.type.A=1
+total.num.cachemiss=1
+msg.cache.count=2
+rrset.cache.count=2
+infra.cache.count=2"
+
+
+# Disable serve-expired
+set_ub_option serve-expired no
+
+
+echo
+echo "[ Check REFUSED; try without RD flag. ]"
+echo "> dig somethingelse.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT +nordflag somethingelse.example.com. | tee outfile
+echo "> check answer"
+if grep "REFUSED" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+num.answer.rcode.REFUSED=1
+total.num.cachehits=1
+num.query.class.IN=1
+num.query.edns.present=1
+num.query.flags.AD=1
+num.query.opcode.QUERY=1
+num.query.type.A=1
+total.num.queries=1
+msg.cache.count=2
+rrset.cache.count=2
+infra.cache.count=2"
+
+
+echo
+echo "[ Check the AD flag. ]"
+echo "> dig www.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT +noadflag www.example.com. | tee outfile
+echo "> check answer"
+if grep "10.20.30.40" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+num.query.flags.AD=0
+total.num.cachemiss=1
+num.answer.rcode.NOERROR=1
+num.query.class.IN=1
+num.query.edns.present=1
+num.query.flags.RD=1
+num.query.opcode.QUERY=1
+num.query.type.A=1
+total.num.queries=1
+total.num.recursivereplies=1
+msg.cache.count=3
+rrset.cache.count=3
+infra.cache.count=2"
+
+echo
+echo "[ Check local zone. ]"
+echo "> dig www.local.zone."
+dig @127.0.0.1 -p $UNBOUND_PORT www.local.zone. | tee outfile
+echo "> check answer"
+if grep "192.0.2.1" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+num.answer.rcode.NOERROR=1
+total.num.cachehits=1
+num.query.class.IN=1
+num.query.edns.present=1
+num.query.flags.AD=1
+num.query.flags.RD=1
+num.query.opcode.QUERY=1
+num.query.type.A=1
+total.num.queries=1
+msg.cache.count=3
+rrset.cache.count=3
+infra.cache.count=2"
+
+
+echo
+echo "[ Check NXDOMAIN (with local data). ]"
+echo "> dig mail.local.zone."
+dig @127.0.0.1 -p $UNBOUND_PORT mail.local.zone. | tee outfile
+echo "> check answer"
+if grep "NXDOMAIN" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+num.answer.rcode.NXDOMAIN=1
+total.num.cachehits=1
+num.query.class.IN=1
+num.query.edns.present=1
+num.query.flags.AD=1
+num.query.flags.RD=1
+num.query.opcode.QUERY=1
+num.query.type.A=1
+total.num.queries=1
+msg.cache.count=3
+rrset.cache.count=3
+infra.cache.count=2"
+
+
+echo
+echo "[ Check CHAOS. ]"
+echo "> dig id.server. ch txt"
+dig @127.0.0.1 -p $UNBOUND_PORT id.server. ch txt | tee outfile
+echo "> check answer"
+if grep "stat_values" outfile; then
+	echo "OK"
+else
+	end 1
+fi
+check_stats "\
+num.query.class.CH=1
+total.num.cachehits=1
+num.answer.rcode.NOERROR=1
+num.query.edns.present=1
+num.query.flags.AD=1
+num.query.flags.RD=1
+num.query.opcode.QUERY=1
+num.query.type.TXT=1
+total.num.queries=1
+msg.cache.count=3
+rrset.cache.count=3
+infra.cache.count=2"
+
+
+end 0
diff --git a/testdata/stat_values.tdir/stat_values.testexpiredns b/testdata/stat_values.tdir/stat_values.testexpiredns
new file mode 100644
index 000000000..a737a4a79
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.testexpiredns
@@ -0,0 +1,13 @@
+; nameserver test file
+$ORIGIN expired.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+servfail	IN	A
+SECTION ANSWER
+servfail    1 IN A 192.0.2.1
+ENTRY_END
diff --git a/testdata/stat_values.tdir/stat_values.testns b/testdata/stat_values.tdir/stat_values.testns
new file mode 100644
index 000000000..6691b0199
--- /dev/null
+++ b/testdata/stat_values.tdir/stat_values.testns
@@ -0,0 +1,23 @@
+; nameserver test file
+$ORIGIN example.com.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+1ttl	IN	A
+SECTION ANSWER
+1ttl	1 IN	A 1.1.1.1
+ENTRY_END
diff --git a/testdata/stat_values.tdir/unbound_control.key b/testdata/stat_values.tdir/unbound_control.key
new file mode 100644
index 000000000..753a4ef61
--- /dev/null
+++ b/testdata/stat_values.tdir/unbound_control.key
@@ -0,0 +1,39 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIG4gIBAAKCAYEAstEp+Pyh8XGrtZ77A4FhYjvbeB3dMa7Q2rGWxobzlA9przhA
+1aChAvUtCOAuM+rB6NTNB8YWfZJbQHawyMNpmC77cg6vXLYCGUQHZyAqidN049RJ
+F5T7j4N8Vniv17LiRdr0S6swy4PRvEnIPPV43EQHZqC5jVvHsKkhIfmBF/Dj5TXR
+ypeawWV/m5jeU6/4HRYMfytBZdO1mPXuWLh0lgbQ4SCbgrOUVD3rniMk1yZIbQOm
+vlDHYqekjDb/vOW2KxUQLG04aZMJ1mWfdbwG0CKQkSjISEDZ1l76vhM6mTM0fwXb
+IvyFZ9yPPCle1mF5aSlxS2cmGuGVSRQaw8XF9fe3a9ACJJTr33HdSpyaZkKRAUzL
+cKqLCl323daKv3NwwAT03Tj4iQM416ASMoiyfFa/2GWTKQVjddu8Crar7tGaf5xr
+lig4DBmrBvdYA3njy72/RD71hLwmlRoCGU7dRuDr9O6KASUm1Ri91ONZ/qdjMvov
+15l2vj4GV+KXR00dAgMBAAECggGAHepIL1N0dEQkCdpy+/8lH54L9WhpnOo2HqAf
+LU9eaKK7d4jdr9+TkD8cLaPzltPrZNxVALvu/0sA4SP6J1wpyj/x6P7z73qzly5+
+Xo5PD4fEwmi9YaiW/UduAblnEZrnp/AddptJKoL/D5T4XtpiQddPtael4zQ7kB57
+YIexRSQTvEDovA/o3/nvA0TrzOxfgd4ycQP3iOWGN/TMzyLsvjydrUwbOB567iz9
+whL3Etdgvnwh5Sz2blbFfH+nAR8ctvFFz+osPvuIVR21VMEI6wm7kTpSNnQ6sh/c
+lrLb/bTADn4g7z/LpIZJ+MrLvyEcoqValrLYeFBhM9CV8woPxvkO2P3pU47HVGax
+tC7GV6a/kt5RoKFd/TNdiA3OC7NGZtaeXv9VkPf4fVwBtSO9d5ZZXTGEynDD/rUQ
+U4KFJe6OD23APjse08HiiKqTPhsOneOONU67iqoaTdIkT2R4EdlkVEDpXVtWb+G9
+Q+IqYzVljlzuyHrhWXLJw/FMa2aBAoHBAOnZbi4gGpH+P6886WDWVgIlTccuXoyc
+Mg9QQYk9UDeXxL0AizR5bZy49Sduegz9vkHpAiZARQsUnizHjZ8YlRcrmn4t6tx3
+ahTIKAjdprnxJfYINM580j8CGbXvX5LhIlm3O267D0Op+co3+7Ujy+cjsIuFQrP+
+1MqMgXSeBjzC1APivmps7HeFE+4w0k2PfN5wSMDNCzLo99PZuUG5XZ93OVOS5dpN
+b+WskdcD8NOoJy/X/5A08veEI/jYO/DyqQKBwQDDwUQCOWf41ecvJLtBHKmEnHDz
+ftzHino9DRKG8a9XaN4rmetnoWEaM2vHGX3pf3mwH+dAe8vJdAQueDhBKYeEpm6C
+TYNOpou1+Zs5s99BilCTNYo8fkMOAyqwRwmz9zgHS6QxXuPwsghKefLJGt6o6RFF
+tfWVTfLlYJ+I3GQe3ySsk3wjVz4oUTKiyiq5+KzD+HhEkS7u+RQ7Z0ZI2xd2cF8Y
+aN2hjKDpcOiFf3CDoqka5D1qMNLgIHO52AHww1UCgcA1h7o7AMpURRka6hyaODY0
+A4oMYEbwdQjYjIyT998W+rzkbu1us6UtzQEBZ760npkgyU/epbOoV63lnkCC/MOU
+LD0PST+L/CHiY/cWIHb79YG1EifUZKpUFg0Aoq0EGFkepF0MefGCkbRGYA5UZr9U
+R80wAu9D+L+JJiS0J0BSRF74DL196zUuHt5zFeXuLzxsRtPAnq9DliS08BACRYZy
+7H3I7cWD9Vn5/0jbKWHFcaaWwyETR6uekTcSzZzbCRECgcBeoE3/xUA9SSk34Mmj
+7/cB4522Ft0imA3+9RK/qJTZ7Bd5fC4PKjOGNtUiqW/0L2rjeIiQ40bfWvWqgPKw
+jSK1PL6uvkl6+4cNsFsYyZpiVDoe7wKju2UuoNlB3RUTqa2r2STFuNj2wRjA57I1
+BIgdnox65jqQsd14g/yaa+75/WP9CE45xzKEyrtvdcqxm0Pod3OrsYK+gikFjiar
+kT0GQ8u0QPzh2tjt/2ZnIfOBrl+QYERP0MofDZDjhUdq2wECgcB0Lu841+yP5cdR
+qbJhXO4zJNh7oWNcJlOuQp3ZMNFrA1oHpe9pmLukiROOy01k9WxIMQDzU5GSqRv3
+VLkYOIcbhJ3kClKAcM3j95SkKbU2H5/RENb3Ck52xtl4pNU1x/3PnVFZfDVuuHO9
+MZ9YBcIeK98MyP2jr5JtFKnOyPE7xKq0IHIhXadpbc2wjje5FtZ1cUtMyEECCXNa
+C1TpXebHGyXGpY9WdWXhjdE/1jPvfS+uO5WyuDpYPr339gsdq1g=
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/stat_values.tdir/unbound_control.pem b/testdata/stat_values.tdir/unbound_control.pem
new file mode 100644
index 000000000..a1edf7017
--- /dev/null
+++ b/testdata/stat_values.tdir/unbound_control.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDszCCAhsCFGD5193whHQ2bVdzbaQfdf1gc4SkMA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjMwWhcNNDAwMzI1MTMzMjMw
+WjAaMRgwFgYDVQQDDA91bmJvdW5kLWNvbnRyb2wwggGiMA0GCSqGSIb3DQEBAQUA
+A4IBjwAwggGKAoIBgQCy0Sn4/KHxcau1nvsDgWFiO9t4Hd0xrtDasZbGhvOUD2mv
+OEDVoKEC9S0I4C4z6sHo1M0HxhZ9kltAdrDIw2mYLvtyDq9ctgIZRAdnICqJ03Tj
+1EkXlPuPg3xWeK/XsuJF2vRLqzDLg9G8Scg89XjcRAdmoLmNW8ewqSEh+YEX8OPl
+NdHKl5rBZX+bmN5Tr/gdFgx/K0Fl07WY9e5YuHSWBtDhIJuCs5RUPeueIyTXJkht
+A6a+UMdip6SMNv+85bYrFRAsbThpkwnWZZ91vAbQIpCRKMhIQNnWXvq+EzqZMzR/
+Bdsi/IVn3I88KV7WYXlpKXFLZyYa4ZVJFBrDxcX197dr0AIklOvfcd1KnJpmQpEB
+TMtwqosKXfbd1oq/c3DABPTdOPiJAzjXoBIyiLJ8Vr/YZZMpBWN127wKtqvu0Zp/
+nGuWKDgMGasG91gDeePLvb9EPvWEvCaVGgIZTt1G4Ov07ooBJSbVGL3U41n+p2My
++i/XmXa+PgZX4pdHTR0CAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAd++Wen6l8Ifj
+4h3p/y16PhSsWJWuJ4wdNYy3/GM84S26wGjzlEEwiW76HpH6VJzPOiBAeWnFKE83
+hFyetEIxgJeIPbcs9ZP/Uoh8GZH9tRISBSN9Hgk2Slr9llo4t1H0g/XTgA5HqMQU
+9YydlBh43G7Vw3FVwh09OM6poNOGQKNc/tq2/QdKeUMtyBbLWpRmjH5XcCT35fbn
+ZiVOUldqSHD4kKrFO4nJYXZyipRbcXybsLiX9GP0GLemc3IgIvOXyJ2RPp06o/SJ
+pzlMlkcAfLJaSuEW57xRakhuNK7m051TKKzJzIEX+NFYOVdafFHS8VwGrYsdrFvD
+72tMfu+Fu55y3awdWWGc6YlaGogZiuMnJkvQphwgn+5qE/7CGEckoKEsH601rqIZ
+muaIc85+nEcHJeijd/ZlBN9zeltjFoMuqTUENgmv8+tUAdVm/UMY9Vjme6b43ydP
+uv6DS02+k9z8toxXworLiPr94BGaiGV1NxgwZKLZigYJt/Fi2Qte
+-----END CERTIFICATE-----
diff --git a/testdata/stat_values.tdir/unbound_server.key b/testdata/stat_values.tdir/unbound_server.key
new file mode 100644
index 000000000..370a7bbb2
--- /dev/null
+++ b/testdata/stat_values.tdir/unbound_server.key
@@ -0,0 +1,39 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIG5AIBAAKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI
+0x41iG32a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+Nqq
+GRS7XVQ24vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Z
+uh9MDgotaBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8K
+WaBe1ca4TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5
+FzUReSXZuTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xP
+q6O9UPj4+nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XL
+A5UoZgRzXgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP
+7kFZSngxdy1+A/bNAgMBAAECggGBALpTOIqQwVg4CFBylL/a8K1IWJTI/I65sklf
+XxYL7G7SB2HlEJ//z+E+F0+S4Vlao1vyLQ5QkgE82pAUB8FoMWvY1qF0Y8A5wtm6
+iZSGk4OLK488ZbT8Ii9i+AGKgPe2XbVxsJwj8N4k7Zooqec9hz73Up8ATEWJkRz7
+2u7oMGG4z91E0PULA64dOi3l/vOQe5w/Aa+CwVbAWtI05o7kMvQEBMDJn6C7CByo
+MB5op9wueJMnz7PM7hns+U7Dy6oE4ljuolJUy51bDzFWwoM54cRoQqLFNHd8JVQj
+WxldCkbfF43iyprlsEcUrTyUjtdA+ZeiG39vg/mtdmgNpGmdupHJZQvSuG8IcVlz
+O+eMSeQS1QXPD6Ik8UK4SU0h+zOl8xIWtRrsxQuh4fnTN40udm/YUWl/6gOebsBI
+IrVLlKGqJSfB3tMjpCRqdTzJ0dA9keVpkqm2ugZkxEf1+/efq/rFIQ2pUBLCqNTN
+qpNqruK8y8FphP30I2uI4Ej2UIB8AQKBwQDd2Yptj2FyDyaXCycsyde0wYkNyzGU
+dRnzdibfHnMZwjgTjwAwgIUBVIS8H0/z7ZJQKN7osJfddMrtjJtYYUk9g/dCpHXs
+bNh2QSoWah3FdzNGuWd0iRf9+LFxhjAAMo/FS8zFJAJKrFsBdCGTfFUMdsLC0bjr
+YjiWBuvV72uKf8XIZX5KIZruKdWBBcWukcb21R1UDyFYyXRBsly5XHaIYKZql3km
+7pV7MKWO0IYgHbHIqGUqPQlzZ/lkunS1jKECgcEA23wHffD6Ou9/x3okPx2AWpTr
+gh8rgqbyo6hQkBW5Y90Wz824cqaYebZDaBR/xlVx/YwjKkohv8Bde2lpH/ZxRZ1Z
+5Sk2s6GJ/vU0L9RsJZgCgj4L6Coal1NMxuZtCXAlnOpiCdxSZgfqbshbTVz30KsG
+ZJG361Cua1ScdAHxlZBxT52/1Sm0zRC2hnxL7h4qo7Idmtzs40LAJvYOKekR0pPN
+oWeJfra7vgx/jVNvMFWoOoSLpidVO4g+ot4ery6tAoHAdW3rCic1C2zdnmH28Iw+
+s50l8Lk3mz+I5wgJd1zkzCO0DxZIoWPGA3g7cmCYr6N3KRsZMs4W9NAXgjpFGDkW
+zYsG3K21BdpvkdjYcFjnPVjlOXB2RIc0vehf9Jl02wXoeCSxVUDEPcaRvWk9RJYx
+ZpGOchUU7vNkxHURbIJ4yCzuAi9G8/Jp0dsu+kaV5tufF5SjG5WOrzKjaQsCbdN1
+oqaWMCHRrTvov/Z2C+xwsptFOdN5CSyZzg6hQiI4GMlBAoHAXyb6KINcOEi0YMp3
+BFXJ23tMTnEs78tozcKeipigcsbaqORK3omS+NEnj+uzKUzJyl4CsMbKstK2tFYS
+mSTCHqgE3PBtIpsZtEqhgUraR8IK9GPpzZDTTl9ynZgwFTNlWw3RyuyVXF56J+T8
+kCGJ3hEHCHqT/ZRQyX85BKIDFhA0z4tYKxWVqIFiYBNq56R0X9tMMmMs36mEnF93
+7Ht6mowxTZQRa7nU0qOgeKh/P7ki4Zus3y+WJ+T9IqahLtlRAoHBAIhqMrcxSAB8
+RpB9jukJlAnidw2jCMPgrFE8tP0khhVvGrXMldxAUsMKntDIo8dGCnG1KTcWDI0O
+jepvSPHSsxVLFugL79h0eVIS5z4huW48i9xgU8VlHdgAcgEPIAOFcOw2BCu/s0Vp
+O+MM/EyUOdo3NsibB3qc/GJI6iNBYS7AljYEVo6rXo5V/MZvZUF4vClen6Obzsre
+MTTb+4sJjfqleWuvr1XNMeu2mBfXBQkWGZP1byBK0MvD/aQ2PWq92A==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/stat_values.tdir/unbound_server.pem b/testdata/stat_values.tdir/unbound_server.pem
new file mode 100644
index 000000000..986807310
--- /dev/null
+++ b/testdata/stat_values.tdir/unbound_server.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCAhMCFBHWXeQ6ZIa9QcQbXLFfC6tj+KA+MA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjI5WhcNNDAwMzI1MTMzMjI5
+WjASMRAwDgYDVQQDDAd1bmJvdW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+igKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI0x41iG32
+a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+NqqGRS7XVQ2
+4vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Zuh9MDgot
+aBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8KWaBe1ca4
+TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5FzUReSXZ
+uTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xPq6O9UPj4
++nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XLA5UoZgRz
+XgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP7kFZSngx
+dy1+A/bNAgMBAAEwDQYJKoZIhvcNAQELBQADggGBABunf93MKaCUHiZgnoOTinsW
+84/EgInrgtKzAyH+BhnKkJOhhR0kkIAx5d9BpDlaSiRTACFon9moWCgDIIsK/Ar7
+JE0Kln9cV//wiiNoFU0O4mnzyGUIMvlaEX6QHMJJQYvL05+w/3AAcf5XmMJtR5ca
+fJ8FqvGC34b2WxX9lTQoyT52sRt+1KnQikiMEnEyAdKktMG+MwKsFDdOwDXyZhZg
+XZhRrfX3/NVJolqB6EahjWIGXDeKuSSKZVtCyib6LskyeMzN5lcRfvubKDdlqFVF
+qlD7rHBsKhQUWK/IO64mGf7y/de+CgHtED5vDvr/p2uj/9sABATfbrOQR3W/Of25
+sLBj4OEfrJ7lX8hQgFaxkMI3x6VFT3W8dTCp7xnQgb6bgROWB5fNEZ9jk/gjSRmD
+yIU+r0UbKe5kBk/CmZVFXL2TyJ92V5NYEQh8V4DGy19qZ6u/XKYyNJL4ocs35GGe
+CA8SBuyrmdhx38h1RHErR2Skzadi1S7MwGf1y431fQ==
+-----END CERTIFICATE-----

From 1a568a1b8c2b49c257ae3b20afd6b520b9b683de Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 15 Sep 2020 12:48:01 +0200
Subject: [PATCH 055/108] - Reduce unbound verbosity on test; higher during
 development.

---
 testdata/stat_values.tdir/stat_values.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testdata/stat_values.tdir/stat_values.conf b/testdata/stat_values.tdir/stat_values.conf
index aaef81d4f..5cec691f5 100644
--- a/testdata/stat_values.tdir/stat_values.conf
+++ b/testdata/stat_values.tdir/stat_values.conf
@@ -1,5 +1,5 @@
 server:
-	verbosity: 5
+	verbosity: 2
 	num-threads: 1
 	interface: 127.0.0.1
 	port: @PORT@

From 4cc559d7eb29438b193355f7d2661cd9ca70a9f6 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 15 Sep 2020 13:32:30 +0200
Subject: [PATCH 056/108] - Spelling fix.

---
 doc/Changelog                              | 3 +++
 testdata/stat_values.tdir/stat_values.test | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 593b57971..db4b27a2c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,9 @@
 15 September 2020: George
 	- Introduce test for statistics.
 
+15 September 2020: Wouter
+	- Spelling fix.
+
 11 September 2020: Wouter
 	- Remove x file mode on ipset/ipset.c and h files.
 
diff --git a/testdata/stat_values.tdir/stat_values.test b/testdata/stat_values.tdir/stat_values.test
index 5c72708a6..1cd19fa2b 100644
--- a/testdata/stat_values.tdir/stat_values.test
+++ b/testdata/stat_values.tdir/stat_values.test
@@ -3,7 +3,7 @@
 [ -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
-# We need kill_pid for the serve-expired-client-timeour test
+# We need kill_pid for the serve-expired-client-timeout test
 . ../common.sh
 
 PRE="../.."

From 42a35ac26ec902af99ed7df19656f5b4cbe594b0 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 16 Sep 2020 18:25:02 +0200
Subject: [PATCH 057/108] - Final round of DoH review feedback processing.

---
 services/listen_dnsport.c                      | 18 ++++++++++++------
 services/mesh.c                                |  6 +++---
 testcode/dohclient.c                           | 11 +++++++++--
 .../doh_downstream.tdir/doh_downstream.test    | 13 ++++---------
 .../doh_downstream_endpoint.test               |  2 +-
 .../doh_downstream_post.test                   | 12 ++++--------
 util/configparser.y                            |  4 +++-
 util/netevent.c                                | 10 +++++-----
 util/netevent.h                                |  4 ++--
 9 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 27f92a9dc..7833497b1 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -2227,7 +2227,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 
 	sldns_buffer_write(h2_stream->rbuffer,
 		sldns_buffer_current(h2_session->c->buffer),
-		sldns_buffer_remaining(h2_stream->rbuffer));
+		sldns_buffer_remaining(h2_session->c->buffer));
 	sldns_buffer_flip(h2_stream->rbuffer);
 
 	data_prd.source.ptr = h2_session;
@@ -2540,14 +2540,16 @@ static int http2_buffer_uri_query(struct http2_session* h2_session,
 			"in http2-query-buffer-size");
 		return http2_submit_rst_stream(h2_session, h2_stream);
 	}
+	http2_query_buffer_count += expectb64len;
+	lock_basic_unlock(&http2_query_buffer_count_lock);
 	if(!(h2_stream->qbuffer = sldns_buffer_new(expectb64len))) {
+		lock_basic_lock(&http2_query_buffer_count_lock);
+		http2_query_buffer_count -= expectb64len;
 		lock_basic_unlock(&http2_query_buffer_count_lock);
 		log_err("http2_req_header fail, qbuffer "
 			"malloc failure");
 		return 0;
 	}
-	http2_query_buffer_count += expectb64len;
-	lock_basic_unlock(&http2_query_buffer_count_lock);
 
 	if(!(b64len = sldns_b64url_pton(
 		(char const *)start, length,
@@ -2627,7 +2629,7 @@ static int http2_req_header_cb(nghttp2_session* session,
 		 * stream. */
 #define	HTTP_QUERY_PARAM "?dns="
 		size_t el = strlen(h2_session->c->http_endpoint);
-		size_t qpl = sizeof(HTTP_QUERY_PARAM) - 1;
+		size_t qpl = strlen(HTTP_QUERY_PARAM);
 
 		if(valuelen < el || memcmp(h2_session->c->http_endpoint,
 			value, el) != 0) {
@@ -2727,9 +2729,13 @@ static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 				"in http2-query-buffer-size");
 			return http2_submit_rst_stream(h2_session, h2_stream);
 		}
-		if((h2_stream->qbuffer = sldns_buffer_new(qlen)))
-			http2_query_buffer_count += qlen;
+		http2_query_buffer_count += qlen;
 		lock_basic_unlock(&http2_query_buffer_count_lock);
+		if(!(h2_stream->qbuffer = sldns_buffer_new(qlen))) {
+			lock_basic_lock(&http2_query_buffer_count_lock);
+			http2_query_buffer_count -= qlen;
+			lock_basic_unlock(&http2_query_buffer_count_lock);
+		}
 	}
 
 	if(!h2_stream->qbuffer ||
diff --git a/services/mesh.c b/services/mesh.c
index c2afdbf82..ffb6d092a 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -551,7 +551,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			goto servfail_mem;
 		}
 	}
-	if(rep->c->alpn_h2) {
+	if(rep->c->use_h2) {
 		http2_stream_add_meshstate(rep->c->h2_stream, mesh, s);
 	}
 	/* add serve expired timer if required and not already there */
@@ -1210,7 +1210,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 	else	secure = 0;
 	if(!rep && rcode == LDNS_RCODE_NOERROR)
 		rcode = LDNS_RCODE_SERVFAIL;
-	if(r->query_reply.c->alpn_h2) {
+	if(r->query_reply.c->use_h2) {
 		r->query_reply.c->h2_stream = r->h2_stream;
 		/* Mesh reply won't exist for long anymore. Make it impossible
 		 * for HTTP/2 stream to refer to mesh state, in case
@@ -1498,7 +1498,7 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns,
 		s->s.qinfo.qname_len);
 	if(!r->qname)
 		return 0;
-	if(rep->c->alpn_h2)
+	if(rep->c->use_h2)
 		r->h2_stream = rep->c->h2_stream;
 
 	/* Data related to local alias stored in 'qinfo' (if any) is ephemeral
diff --git a/testcode/dohclient.c b/testcode/dohclient.c
index 060d71ee4..adcc7d831 100644
--- a/testcode/dohclient.c
+++ b/testcode/dohclient.c
@@ -171,8 +171,9 @@ submit_query(struct http2_session* h2_session, struct sldns_buffer* buf)
 		h2_stream->path = malloc(strlen(
 			h2_session->endpoint)+strlen("?dns=")+qb64_size+1);
 		if(!h2_stream->path) fatal_exit("out of memory");
-		sprintf(h2_stream->path, "%s?dns=%s", h2_session->endpoint,
-			qb64);
+		snprintf(h2_stream->path, strlen(h2_session->endpoint)+
+			strlen("?dns=")+qb64_size+1, "%s?dns=%s",
+			h2_session->endpoint, qb64);
 		free(qb64);
 	}
 
@@ -328,6 +329,11 @@ static int http2_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 		return 0;
 	}
 
+	if(sldns_buffer_remaining(h2_stream->buf) < len) {
+		log_err("received data chunck does not fit into buffer");
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	}
+
 	sldns_buffer_write(h2_stream->buf, data, len);
 
 	return 0;
@@ -575,5 +581,6 @@ int main(int argc, char** argv)
 int main(int ATTR_UNUSED(argc), char** ATTR_UNUSED(argv))
 {
 	printf("Compiled without nghttp2, cannot run test.\n");
+	return 1;
 }
 #endif /*  HAVE_NGHTTP2 */
diff --git a/testdata/doh_downstream.tdir/doh_downstream.test b/testdata/doh_downstream.tdir/doh_downstream.test
index 98a54af26..78e2e84eb 100644
--- a/testdata/doh_downstream.tdir/doh_downstream.test
+++ b/testdata/doh_downstream.tdir/doh_downstream.test
@@ -323,17 +323,12 @@ if test "$?" -ne 0; then
 	echo "Not OK"
 	exit 1
 fi
-grep "a.example.com.	IN	A" outfile
-
-echo ""
-echo "> query www5.example.net. www3.example.net. www.drop.net."
-$PRE/dohclient -s 127.0.0.1 -p $UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>&1
-cat outfile
-if test "$?" -ne 0; then
-	echo "exit status not OK"
+num_ans=$(grep -B 3 "a.example.com.	IN	A" outfile | grep "rcode: NOERROR" | wc -l )
+if test "$num_ans" -ne 90; then
+	echo "number of answers not OK"
 	echo "> cat logfiles"
 	cat outfile
-	cat fwd.log 
+	cat fwd.log
 	cat unbound.log
 	echo "Not OK"
 	exit 1
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
index 0e25a47f6..d788e3667 100644
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
@@ -33,7 +33,7 @@ else
 fi
 echo "OK"
 
-echo "> query www.example.net. endpoint /dns-query"
+echo "> query www.example.net. endpoint /abc"
 $PRE/dohclient -e /abc -s 127.0.0.1 -p $UNBOUND_PORT www.example.net. A IN >outfile 2>&1
 cat outfile
 if test "$?" -ne 0; then
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.test b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
index 4a49c8b51..d6a512ae3 100644
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.test
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
@@ -323,17 +323,13 @@ if test "$?" -ne 0; then
 	echo "Not OK"
 	exit 1
 fi
-grep "a.example.com.	IN	A" outfile
 
-echo ""
-echo "> query www5.example.net. www3.example.net. www.drop.net."
-$PRE/dohclient -P -s 127.0.0.1 -p $UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>&1
-cat outfile
-if test "$?" -ne 0; then
-	echo "exit status not OK"
+num_ans=$(grep -B 3 "a.example.com.	IN	A" outfile | grep "rcode: NOERROR" | wc -l )
+if test "$num_ans" -ne 90; then
+	echo "number of answers not OK"
 	echo "> cat logfiles"
 	cat outfile
-	cat fwd.log 
+	cat fwd.log
 	cat unbound.log
 	echo "Not OK"
 	exit 1
diff --git a/util/configparser.y b/util/configparser.y
index 6ef42628c..ffc8813ff 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -982,8 +982,10 @@ server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG
 		free(cfg_parser->cfg->http_endpoint);
 		if($2 && $2[0] != '/') {
 			cfg_parser->cfg->http_endpoint = malloc(strlen($2)+2);
+			if(!cfg_parser->cfg->http_endpoint)
+				yyerror("out of memory");
 			cfg_parser->cfg->http_endpoint[0] = '/';
-			memcpy(cfg_parser->cfg->http_endpoint+1, $2,
+			memmove(cfg_parser->cfg->http_endpoint+1, $2,
 				strlen($2)+1);
 			free($2);
 		} else {
diff --git a/util/netevent.c b/util/netevent.c
index be3b740b5..2171e3e6d 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1228,7 +1228,7 @@ ssl_handshake(struct comm_point* c)
 		if(alpnlen == 2 && memcmp("h2", alpn, 2) == 0) {
 			/* connection upgraded to HTTP2 */
 			c->tcp_do_toggle_rw = 0;
-			c->alpn_h2 = 1;
+			c->use_h2 = 1;
 		}
 	}
 
@@ -2472,7 +2472,7 @@ comm_point_http_handle_read(int fd, struct comm_point* c)
 	if(!c->tcp_is_reading)
 		return 1;
 
-	if(c->alpn_h2) {
+	if(c->use_h2) {
 		return comm_point_http2_handle_read(fd, c);
 	}
 
@@ -2766,7 +2766,7 @@ comm_point_http_handle_write(int fd, struct comm_point* c)
 	if(c->tcp_is_reading)
 		return 1;
 
-	if(c->alpn_h2) {
+	if(c->use_h2) {
 		return comm_point_http2_handle_write(fd, c);
 	}
 
@@ -3160,7 +3160,7 @@ comm_point_create_http_handler(struct comm_base *base,
 		free(c);
 		return NULL;
 	}
-	c->alpn_h2 = 0;
+	c->use_h2 = 0;
 #ifdef HAVE_NGHTTP2
 	if(!(c->h2_session = http2_session_create(c))) {
 		log_err("could not create http2 session");
@@ -3676,7 +3676,7 @@ comm_point_send_reply(struct comm_reply *repinfo)
 #endif
 		if(repinfo->c->tcp_req_info) {
 			tcp_req_info_send_reply(repinfo->c->tcp_req_info);
-		} else if(repinfo->c->alpn_h2) {
+		} else if(repinfo->c->use_h2) {
 			if(!http2_submit_dns_response(repinfo->c->h2_session)) {
 				comm_point_drop_reply(repinfo);
 				return;
diff --git a/util/netevent.h b/util/netevent.h
index 68f4c1297..6986f881b 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -236,8 +236,8 @@ struct comm_point {
 	/* -------- HTTP/2 ------- */
 	/** http2 session */
 	struct http2_session* h2_session;
-	/** set to 1 if h2 is negatiated using alpn */
-	int alpn_h2;
+	/** set to 1 if h2 is negotiated to be used (using alpn) */
+	int use_h2;
 	/** stream currently being handled */
 	struct http2_stream* h2_stream;
 	/** maximum allowed query buffer size, per stream */

From 2541ccbb1bc5d675aafce7f876db90ae8aa422b2 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 18 Sep 2020 09:56:38 +0200
Subject: [PATCH 058/108] - Fix that prefer-ip4 and prefer-ip6 can be get and
 set with   unbound-control, with libunbound and the unbound-checkconf option 
  output function.

---
 doc/Changelog      | 5 +++++
 util/config_file.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index db4b27a2c..d9aeec1c8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+18 September 2020: Wouter
+	- Fix that prefer-ip4 and prefer-ip6 can be get and set with
+	  unbound-control, with libunbound and the unbound-checkconf option
+	  output function.
+
 15 September 2020: George
 	- Introduce test for statistics.
 
diff --git a/util/config_file.c b/util/config_file.c
index 5f79baa7e..a2fb4c429 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -489,6 +489,8 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_YNO("do-ip6:", do_ip6)
 	else S_YNO("do-udp:", do_udp)
 	else S_YNO("do-tcp:", do_tcp)
+	else S_YNO("prefer-ip4:", prefer_ip4)
+	else S_YNO("prefer-ip6:", prefer_ip6)
 	else S_YNO("tcp-upstream:", tcp_upstream)
 	else S_YNO("udp-upstream-without-downstream:",
 		udp_upstream_without_downstream)
@@ -947,6 +949,8 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_YNO(opt, "do-ip6", do_ip6)
 	else O_YNO(opt, "do-udp", do_udp)
 	else O_YNO(opt, "do-tcp", do_tcp)
+	else O_YNO(opt, "prefer-ip4", prefer_ip4)
+	else O_YNO(opt, "prefer-ip6", prefer_ip6)
 	else O_YNO(opt, "tcp-upstream", tcp_upstream)
 	else O_YNO(opt, "udp-upstream-without-downstream", udp_upstream_without_downstream)
 	else O_DEC(opt, "tcp-mss", tcp_mss)

From 6ea24c5c86c5409fd49da719eb8d653598b2df9d Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 18 Sep 2020 13:43:16 +0200
Subject: [PATCH 059/108] - iana portlist updated.

---
 doc/Changelog       | 1 +
 util/iana_ports.inc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index d9aeec1c8..31edfa144 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix that prefer-ip4 and prefer-ip6 can be get and set with
 	  unbound-control, with libunbound and the unbound-checkconf option
 	  output function.
+	- iana portlist updated.
 
 15 September 2020: George
 	- Introduce test for statistics.
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index 79488f49a..70a95ee12 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4516,6 +4516,7 @@
 6679,
 6689,
 6696,
+6699,
 6701,
 6702,
 6703,

From 56e0e5b9afb9749e8c2a24d51add097f9d814a58 Mon Sep 17 00:00:00 2001
From: "L. Merino" <luismiguelmerino@gmail.com>
Date: Sat, 19 Sep 2020 09:48:09 +0200
Subject: [PATCH 060/108] fix: return error when malloc fails in
 inplace_cb_register_wrapped()

---
 dynlibmod/dynlibmod.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index f9751d8c6..2bd4a28c1 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -242,6 +242,8 @@ int
 inplace_cb_register_wrapped(void* cb, enum inplace_cb_list_type type, void* cbarg,
     struct module_env* env, int id) {
     struct cb_pair* cb_pair = malloc(sizeof(struct cb_pair));
+    if(cb_pair == NULL)
+        return 0;
     cb_pair->cb = cb;
     cb_pair->cb_arg = cbarg;
     if(type >= inplace_cb_reply && type <= inplace_cb_reply_servfail) {

From 41ab788cab98255c681c5e33ba0a67dc6815ec7a Mon Sep 17 00:00:00 2001
From: "L. Merino" <luismiguelmerino@gmail.com>
Date: Sat, 19 Sep 2020 09:48:42 +0200
Subject: [PATCH 061/108] fix: avoid leaking cb_pair in
 inplace_cb_register_wrapped()

---
 dynlibmod/dynlibmod.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index 2bd4a28c1..10ae143a4 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -255,6 +255,7 @@ inplace_cb_register_wrapped(void* cb, enum inplace_cb_list_type type, void* cbar
     } else if(type == inplace_cb_edns_back_parsed) {
         return inplace_cb_register(&dynlib_inplace_cb_edns_back_parsed, type, (void*) cb_pair, env, id);
     } else {
+        free(cb_pair);
         return 0;
     }
 }

From 9d78ad6898b9c580093c3898a16c78094e47859e Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 21 Sep 2020 10:13:19 +0200
Subject: [PATCH 062/108] - Merge PR #311 by luismerino: Dynlibmod leak.

---
 doc/Changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 31edfa144..fe5b8da16 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 September 2020: Wouter
+	- Merge PR #311 by luismerino: Dynlibmod leak.
+
 18 September 2020: Wouter
 	- Fix that prefer-ip4 and prefer-ip6 can be get and set with
 	  unbound-control, with libunbound and the unbound-checkconf option

From 1175269bbdc7df20e6f80740688f29357a592ff3 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 21 Sep 2020 10:20:10 +0200
Subject: [PATCH 063/108] - Error message is logged for dynlibmod malloc
 failures.

---
 doc/Changelog         | 1 +
 dynlibmod/dynlibmod.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index fe5b8da16..45baef30f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 21 September 2020: Wouter
 	- Merge PR #311 by luismerino: Dynlibmod leak.
+	- Error message is logged for dynlibmod malloc failures.
 
 18 September 2020: Wouter
 	- Fix that prefer-ip4 and prefer-ip6 can be get and set with
diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index 10ae143a4..3bf9d1acb 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -242,8 +242,10 @@ int
 inplace_cb_register_wrapped(void* cb, enum inplace_cb_list_type type, void* cbarg,
     struct module_env* env, int id) {
     struct cb_pair* cb_pair = malloc(sizeof(struct cb_pair));
-    if(cb_pair == NULL)
+    if(cb_pair == NULL) {
+	log_err("dynlibmod[%d]: malloc failure", id);
         return 0;
+    }
     cb_pair->cb = cb;
     cb_pair->cb_arg = cbarg;
     if(type >= inplace_cb_reply && type <= inplace_cb_reply_servfail) {

From c5f0ec36bb94f458f34c1bb02079d9dee7fd89cc Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 21 Sep 2020 11:38:20 +0200
Subject: [PATCH 064/108] - iana portlist updated.

---
 doc/Changelog       | 1 +
 util/iana_ports.inc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 45baef30f..8a368f6cc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 21 September 2020: Wouter
 	- Merge PR #311 by luismerino: Dynlibmod leak.
 	- Error message is logged for dynlibmod malloc failures.
+	- iana portlist updated.
 
 18 September 2020: Wouter
 	- Fix that prefer-ip4 and prefer-ip6 can be get and set with
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index 70a95ee12..fa25869d3 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4745,6 +4745,7 @@
 8023,
 8025,
 8026,
+8027,
 8032,
 8033,
 8034,

From 00fe4b03062c2e9adacb95ade9418b759c1238ca Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 21 Sep 2020 17:17:30 +0200
Subject: [PATCH 065/108] - Fix #304: dnstap logging not recovering after
 dnstap process restarts

---
 dnstap/dtstream.c | 2 ++
 doc/Changelog     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index a778bb64b..6a9e9b890 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -1102,6 +1102,8 @@ static int dtio_read_accept_frame(struct dt_io_thread* dtio)
 					goto close_connection;
 				}
 				dtio->accept_frame_received = 1;
+				if(!dtio_add_output_event_write(dtio))
+					goto close_connection;
 				return 1;
 			} else {
 				/* unknow content type */
diff --git a/doc/Changelog b/doc/Changelog
index 8a368f6cc..7e6455da8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 September 2020: Ralph
+	- Fix #304: dnstap logging not recovering after dnstap process restarts
+
 21 September 2020: Wouter
 	- Merge PR #311 by luismerino: Dynlibmod leak.
 	- Error message is logged for dynlibmod malloc failures.

From 9e9810ab8bec0756a89d956d63d9c897adf74439 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 23 Sep 2020 10:05:39 +0200
Subject: [PATCH 066/108] - Fix edns-client-tags get_option typo

---
 doc/Changelog      | 3 +++
 util/config_file.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 7e6455da8..cd61733be 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+23 September 2020: Ralph
+	- Fix edns-client-tags get_option typo
+
 21 September 2020: Ralph
 	- Fix #304: dnstap logging not recovering after dnstap process restarts
 
diff --git a/util/config_file.c b/util/config_file.c
index a20b1f9c9..8fd3bcffe 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -1149,7 +1149,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_LS3(opt, "access-control-tag-action", acl_tag_actions)
 	else O_LS3(opt, "access-control-tag-data", acl_tag_datas)
 	else O_LS2(opt, "access-control-view", acl_view)
-	else O_LS2(opt, "edns_client_tags", edns_client_tags)
+	else O_LS2(opt, "edns-client-tags", edns_client_tags)
 #ifdef USE_IPSECMOD
 	else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled)
 	else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus)

From 48a56751e97655843572244fb6bb6ced3dcfe071 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 23 Sep 2020 11:13:52 +0200
Subject: [PATCH 067/108] - Fix #305: dnstap logging significantly affects
 unbound performance   (regression in 1.11).

---
 daemon/worker.c   | 16 +++++-----
 dnstap/dnstap.c   |  4 +--
 dnstap/dnstap.h   |  3 +-
 dnstap/dtstream.c | 80 ++++++++++++++++++++++++++++++++++++++++++++---
 dnstap/dtstream.h | 15 ++++++++-
 doc/Changelog     |  4 +++
 util/fptr_wlist.c |  1 +
 7 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 695a4cfe5..5ad8ce4e4 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1717,14 +1717,6 @@ worker_create(struct daemon* daemon, int id, int* ports, int n)
 		return NULL;
 	}
 	explicit_bzero(&seed, sizeof(seed));
-#ifdef USE_DNSTAP
-	if(daemon->cfg->dnstap) {
-		log_assert(daemon->dtenv != NULL);
-		memcpy(&worker->dtenv, daemon->dtenv, sizeof(struct dt_env));
-		if(!dt_init(&worker->dtenv))
-			fatal_exit("dt_init failed");
-	}
-#endif
 	return worker;
 }
 
@@ -1783,6 +1775,14 @@ worker_init(struct worker* worker, struct config_file *cfg,
 	} else { /* !do_sigs */
 		worker->comsig = NULL;
 	}
+#ifdef USE_DNSTAP
+	if(cfg->dnstap) {
+		log_assert(worker->daemon->dtenv != NULL);
+		memcpy(&worker->dtenv, worker->daemon->dtenv, sizeof(struct dt_env));
+		if(!dt_init(&worker->dtenv, worker->base))
+			fatal_exit("dt_init failed");
+	}
+#endif
 	worker->front = listen_create(worker->base, ports,
 		cfg->msg_buffer_size, (int)cfg->incoming_num_tcp,
 		cfg->do_tcp_keepalive
diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c
index bda837876..0c8c6c4d4 100644
--- a/dnstap/dnstap.c
+++ b/dnstap/dnstap.c
@@ -246,9 +246,9 @@ dt_apply_cfg(struct dt_env *env, struct config_file *cfg)
 }
 
 int
-dt_init(struct dt_env *env)
+dt_init(struct dt_env *env, struct comm_base* base)
 {
-	env->msgqueue = dt_msg_queue_create();
+	env->msgqueue = dt_msg_queue_create(base);
 	if(!env->msgqueue) {
 		log_err("malloc failure");
 		return 0;
diff --git a/dnstap/dnstap.h b/dnstap/dnstap.h
index cfef6fc42..783b8c514 100644
--- a/dnstap/dnstap.h
+++ b/dnstap/dnstap.h
@@ -101,10 +101,11 @@ dt_apply_cfg(struct dt_env *env, struct config_file *cfg);
 /**
  * Initialize per-worker state in dnstap environment object.
  * @param env: dnstap environment object to initialize, created with dt_create().
+ * @param base: event base for wakeup timer.
  * @return: true on success, false on failure.
  */
 int
-dt_init(struct dt_env *env);
+dt_init(struct dt_env *env, struct comm_base* base);
 
 /**
  * Deletes the per-worker state created by dt_init
diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index 6a9e9b890..b0586d1ba 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -68,6 +68,8 @@
 #define DTIO_RECONNECT_TIMEOUT_MAX 1000
 /** the msec to wait for reconnect slow, to stop busy spinning on reconnect */
 #define DTIO_RECONNECT_TIMEOUT_SLOW 1000
+/** number of messages before wakeup of thread */
+#define DTIO_MSG_FOR_WAKEUP 32
 
 /** maximum length of received frame */
 #define DTIO_RECV_FRAME_MAX_LEN 1000
@@ -99,13 +101,18 @@ static int dtio_enable_brief_write(struct dt_io_thread* dtio);
 #endif
 
 struct dt_msg_queue*
-dt_msg_queue_create(void)
+dt_msg_queue_create(struct comm_base* base)
 {
 	struct dt_msg_queue* mq = calloc(1, sizeof(*mq));
 	if(!mq) return NULL;
 	mq->maxsize = 1*1024*1024; /* set max size of buffer, per worker,
 		about 1 M should contain 64K messages with some overhead,
 		or a whole bunch smaller ones */
+	mq->wakeup_timer = comm_timer_create(base, mq_wakeup_cb, mq);
+	if(!mq->wakeup_timer) {
+		free(mq);
+		return NULL;
+	}
 	lock_basic_init(&mq->lock);
 	lock_protect(&mq->lock, mq, sizeof(*mq));
 	return mq;
@@ -125,6 +132,7 @@ dt_msg_queue_clear(struct dt_msg_queue* mq)
 	mq->first = NULL;
 	mq->last = NULL;
 	mq->cursize = 0;
+	mq->msgcount = 0;
 }
 
 void
@@ -133,6 +141,7 @@ dt_msg_queue_delete(struct dt_msg_queue* mq)
 	if(!mq) return;
 	lock_basic_destroy(&mq->lock);
 	dt_msg_queue_clear(mq);
+	comm_timer_delete(mq->wakeup_timer);
 	free(mq);
 }
 
@@ -163,10 +172,57 @@ static void dtio_wakeup(struct dt_io_thread* dtio)
 	}
 }
 
+void
+mq_wakeup_cb(void* arg)
+{
+	struct dt_msg_queue* mq = (struct dt_msg_queue*)arg;
+	/* even if the dtio is already active, because perhaps much
+	 * traffic suddenly, we leave the timer running to save on
+	 * managing it, the once a second timer is less work then
+	 * starting and stopping the timer frequently */
+	lock_basic_lock(&mq->dtio->wakeup_timer_lock);
+	mq->dtio->wakeup_timer_enabled = 0;
+	lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
+	dtio_wakeup(mq->dtio);
+}
+
+/** start timer to wakeup dtio because there is content in the queue */
+static void
+dt_msg_queue_start_timer(struct dt_msg_queue* mq)
+{
+	struct timeval tv;
+	/* Start a timer to process messages to be logged.
+	 * If we woke up the dtio thread for every message, the wakeup
+	 * messages take up too much processing power.  If the queue
+	 * fills up the wakeup happens immediately.  The timer wakes it up
+	 * if there are infrequent messages to log. */
+
+	/* we cannot start a timer in dtio thread, because it is a different
+	 * thread and its event base is in use by the other thread, it would
+	 * give race conditions if we tried to modify its event base,
+	 * and locks would wait until it woke up, and this is what we do. */
+
+	/* do not start the timer if a timer already exists, perhaps
+	 * in another worker.  So this variable is protected by a lock in
+	 * dtio */
+	lock_basic_lock(&mq->dtio->wakeup_timer_lock);
+	if(mq->dtio->wakeup_timer_enabled) {
+		lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
+		return;
+	}
+	mq->dtio->wakeup_timer_enabled = 1; /* we are going to start one */
+	lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
+
+	/* start the timer, in mq, in the event base of our worker */
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	comm_timer_set(mq->wakeup_timer, &tv);
+}
+
 void
 dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
 {
-	int wakeup = 0;
+	int wakeupnow = 0, wakeupstarttimer = 0;
 	struct dt_msg_entry* entry;
 
 	/* check conditions */
@@ -197,9 +253,14 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
 
 	/* aqcuire lock */
 	lock_basic_lock(&mq->lock);
-	/* list was empty, wakeup dtio */
+	/* if list was empty, start timer for (eventual) wakeup */
 	if(mq->first == NULL)
-		wakeup = 1;
+		wakeupstarttimer = 1;
+	/* if list contains more than wakeupnum elements, wakeup now,
+	 * or if list is (going to be) almost full */
+	if(mq->msgcount+1 > DTIO_MSG_FOR_WAKEUP ||
+		mq->cursize+len >= mq->maxsize * 9 / 10)
+		wakeupnow = 1;
 	/* see if it is going to fit */
 	if(mq->cursize + len > mq->maxsize) {
 		/* buffer full, or congested. */
@@ -210,6 +271,7 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
 		return;
 	}
 	mq->cursize += len;
+	mq->msgcount ++;
 	/* append to list */
 	if(mq->last) {
 		mq->last->next = entry;
@@ -220,13 +282,19 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
 	/* release lock */
 	lock_basic_unlock(&mq->lock);
 
-	if(wakeup)
+	if(wakeupnow) {
 		dtio_wakeup(mq->dtio);
+	} else if(wakeupstarttimer) {
+		dt_msg_queue_start_timer(mq);
+	}
 }
 
 struct dt_io_thread* dt_io_thread_create(void)
 {
 	struct dt_io_thread* dtio = calloc(1, sizeof(*dtio));
+	lock_basic_init(&dtio->wakeup_timer_lock);
+	lock_protect(&dtio->wakeup_timer_lock, &dtio->wakeup_timer_enabled,
+		sizeof(dtio->wakeup_timer_enabled));
 	return dtio;
 }
 
@@ -234,6 +302,7 @@ void dt_io_thread_delete(struct dt_io_thread* dtio)
 {
 	struct dt_io_list_item* item, *nextitem;
 	if(!dtio) return;
+	lock_basic_destroy(&dtio->wakeup_timer_lock);
 	item=dtio->io_list;
 	while(item) {
 		nextitem = item->next;
@@ -416,6 +485,7 @@ static int dt_msg_queue_pop(struct dt_msg_queue* mq, void** buf,
 		mq->first = entry->next;
 		if(!entry->next) mq->last = NULL;
 		mq->cursize -= entry->len;
+		mq->msgcount --;
 		lock_basic_unlock(&mq->lock);
 
 		*buf = entry->buf;
diff --git a/dnstap/dtstream.h b/dnstap/dtstream.h
index ede491f30..f87d6dc8d 100644
--- a/dnstap/dtstream.h
+++ b/dnstap/dtstream.h
@@ -49,6 +49,7 @@ struct dt_msg_entry;
 struct dt_io_list_item;
 struct dt_io_thread;
 struct config_file;
+struct comm_base;
 
 /**
  * A message buffer with dnstap messages queued up.  It is per-worker.
@@ -68,11 +69,15 @@ struct dt_msg_queue {
 	/** current size of the buffer, in bytes.  data bytes of messages.
 	 * If a new message make it more than maxsize, the buffer is full */
 	size_t cursize;
+	/** number of messages in the queue */
+	int msgcount;
 	/** list of messages.  The messages are added to the back and taken
 	 * out from the front. */
 	struct dt_msg_entry* first, *last;
 	/** reference to the io thread to wakeup */
 	struct dt_io_thread* dtio;
+	/** the wakeup timer for dtio, on worker event base */
+	struct comm_timer* wakeup_timer;
 };
 
 /**
@@ -166,6 +171,10 @@ struct dt_io_thread {
 	 * for the current message length that precedes the frame */
 	size_t cur_msg_len_done;
 
+	/** lock on wakeup_timer_enabled */
+	lock_basic_type wakeup_timer_lock;
+	/** if wakeup timer is enabled in some thread */
+	int wakeup_timer_enabled;
 	/** command pipe that stops the pipe if closed.  Used to quit
 	 * the program. [0] is read, [1] is written to. */
 	int commandpipe[2];
@@ -233,9 +242,10 @@ struct dt_io_list_item {
 
 /**
  * Create new (empty) worker message queue. Limit set to default on max.
+ * @param base: event base for wakeup timer.
  * @return NULL on malloc failure or a new queue (not locked).
  */
-struct dt_msg_queue* dt_msg_queue_create(void);
+struct dt_msg_queue* dt_msg_queue_create(struct comm_base* base);
 
 /**
  * Delete a worker message queue.  It has to be unlinked from access,
@@ -258,6 +268,9 @@ void dt_msg_queue_delete(struct dt_msg_queue* mq);
  */
 void dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len);
 
+/** timer callback to wakeup dtio thread to process messages */
+void mq_wakeup_cb(void* arg);
+
 /**
  * Create IO thread.
  * @return new io thread object. not yet started. or NULL malloc failure.
diff --git a/doc/Changelog b/doc/Changelog
index 7e6455da8..9188da015 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+23 September 2020: Wouter
+	- Fix #305: dnstap logging significantly affects unbound performance
+	  (regression in 1.11).
+
 21 September 2020: Ralph
 	- Fix #304: dnstap logging not recovering after dnstap process restarts
 
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index aa275ed53..241d9e540 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -138,6 +138,7 @@ fptr_whitelist_comm_timer(void (*fptr)(void*))
 	else if(fptr == &auth_xfer_probe_timer_callback) return 1;
 	else if(fptr == &auth_xfer_transfer_timer_callback) return 1;
 	else if(fptr == &mesh_serve_expired_callback) return 1;
+	else if(fptr == &mq_wakeup_cb) return 1;
 	return 0;
 }
 

From 7da369e85ae545a9fd1453784d77dd23dd512530 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 23 Sep 2020 12:09:48 +0200
Subject: [PATCH 068/108] - Add edns-client-tag-opcode option

---
 doc/Changelog              |    1 +
 doc/unbound.conf.5.in      |    4 +
 services/outside_network.c |    2 +-
 testcode/fake_event.c      |    2 +-
 util/config_file.c         |    1 +
 util/config_file.h         |    2 +
 util/configlexer.c         | 2614 ++++++++++++++++++------------------
 util/configlexer.lex       |    1 +
 util/configparser.c        | 2499 +++++++++++++++++-----------------
 util/configparser.h        |    6 +-
 util/configparser.y        |   16 +-
 util/edns.c                |    1 +
 util/edns.h                |    2 +
 13 files changed, 2603 insertions(+), 2548 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 06deb58f9..e316ea99f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 
 23 September 2020: Ralph
 	- Fix edns-client-tags get_option typo
+	- Add edns-client-tag-opcode option
 
 21 September 2020: Ralph
 	- Fix #304: dnstap logging not recovering after dnstap process restarts
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index c2b6d6eb7..f4586b1d1 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1538,6 +1538,10 @@ Include an edns-client-tag option in queries with destination address matching
 the configured IP netblock. This configuration option can be used multiple
 times. The most specific match will be used. The tag data is configured in
 decimal format, from 0 to 65535.
+.TP 5
+.B edns\-client\-tag\-opcode: \fI<opcode>
+EDNS0 option code for the edns-client-tag option, from 0 to 65535. Default is
+16, as assigned by IANA.
 .SS "Remote Control Options"
 In the
 .B remote\-control:
diff --git a/services/outside_network.c b/services/outside_network.c
index 085d0e6ae..41a1d83f1 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -2107,7 +2107,7 @@ outnet_serviced_query(struct outside_network* outnet,
 		addr, addrlen))) {
 		uint16_t client_tag = htons(client_tag_addr->tag_data);
 		edns_opt_list_append(&qstate->edns_opts_back_out,
-			LDNS_EDNS_CLIENT_TAG, 2,
+			env->edns_tags->client_tag_opcode, 2,
 			(uint8_t*)&client_tag, qstate->region);
 	}
 
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 674069afc..d8df76492 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1232,7 +1232,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 			addr, addrlen))) {
 			uint16_t client_tag = htons(client_tag_addr->tag_data);
 			edns_opt_list_append(&qstate->edns_opts_back_out,
-				LDNS_EDNS_CLIENT_TAG, 2,
+				env->edns_tags->client_tag_opcode, 2,
 				(uint8_t*)&client_tag, qstate->region);
 		}
 		edns.opt_list = qstate->edns_opts_back_out;
diff --git a/util/config_file.c b/util/config_file.c
index 8fd3bcffe..f590a36cf 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -322,6 +322,7 @@ config_create(void)
 	cfg->shm_enable = 0;
 	cfg->shm_key = 11777;
 	cfg->edns_client_tags = NULL;
+	cfg->edns_client_tag_opcode = LDNS_EDNS_CLIENT_TAG;
 	cfg->dnscrypt = 0;
 	cfg->dnscrypt_port = 0;
 	cfg->dnscrypt_provider = NULL;
diff --git a/util/config_file.h b/util/config_file.h
index 3148dd016..7750eaa0e 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -564,6 +564,8 @@ struct config_file {
 
 	/** list of EDNS client tag entries, linked list */
 	struct config_str2list* edns_client_tags;
+	/** EDNS opcode to use for EDNS client tags */
+	uint16_t edns_client_tag_opcode;
 
 	/** DNSCrypt */
 	/** true to enable dnscrypt */
diff --git a/util/configlexer.c b/util/configlexer.c
index 16158e472..36b4a2eca 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 330
-#define YY_END_OF_BUFFER 331
+#define YY_NUM_RULES 331
+#define YY_END_OF_BUFFER 332
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,363 +363,364 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3227] =
+static const flex_int16_t yy_accept[3235] =
     {   0,
-        1,    1,  304,  304,  308,  308,  312,  312,  316,  316,
-        1,    1,  320,  320,  324,  324,  331,  328,    1,  302,
-      302,  329,    2,  329,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  304,  305,  305,  306,
-      329,  308,  309,  309,  310,  329,  315,  312,  313,  313,
-      314,  329,  316,  317,  317,  318,  329,  327,  303,    2,
-      307,  329,  327,  323,  320,  321,  321,  322,  329,  324,
-      325,  325,  326,  329,  328,    0,    1,    2,    2,    2,
-        2,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+        1,    1,  305,  305,  309,  309,  313,  313,  317,  317,
+        1,    1,  321,  321,  325,  325,  332,  329,    1,  303,
+      303,  330,    2,  330,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  305,  306,  306,  307,
+      330,  309,  310,  310,  311,  330,  316,  313,  314,  314,
+      315,  330,  317,  318,  318,  319,  330,  328,  304,    2,
+      308,  330,  328,  324,  321,  322,  322,  323,  330,  325,
+      326,  326,  327,  330,  329,    0,    1,    2,    2,    2,
+        2,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  304,    0,  308,
-        0,  315,    0,  312,  316,    0,  327,    0,    2,    2,
-      327,  323,    0,  320,  324,    0,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  305,    0,  309,
+        0,  316,    0,  313,  317,    0,  328,    0,    2,    2,
+      328,  324,    0,  321,  325,    0,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  327,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  328,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  121,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  129,  328,  328,  328,  328,  328,  328,  328,
-      327,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  121,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  129,  329,  329,  329,  329,  329,  329,  329,
+      328,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  105,
-      328,  328,  328,  328,  328,  328,    8,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  122,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  105,
+      329,  329,  329,  329,  329,  329,    8,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  122,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  134,  328,  327,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  296,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  134,  329,  328,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  296,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  327,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  328,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,   63,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  233,  328,   14,   15,  328,   19,   18,  328,
-      328,  217,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  128,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,   63,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  233,  329,   14,   15,  329,   19,   18,  329,
+      329,  217,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  128,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  215,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,    3,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  327,  328,  328,  328,
-      328,  328,  328,  328,  290,  328,  328,  289,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  215,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,    3,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  328,  329,  329,  329,
+      329,  329,  329,  329,  290,  329,  329,  289,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  311,  328,  328,  328,  328,  328,  328,
-      328,   62,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,   66,  328,
-      264,  328,  328,  328,  328,  328,  328,  328,  328,  297,
-      298,  328,  328,  328,  328,  328,   67,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  312,  329,  329,  329,  329,  329,  329,
+      329,   62,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,   66,  329,
+      264,  329,  329,  329,  329,  329,  329,  329,  329,  297,
+      298,  329,  329,  329,  329,  329,   67,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  125,  328,  328,  328,  328,  328,  328,
-      328,  328,  204,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,   21,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  153,  328,  328,  327,  311,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  103,  328,  328,
-      328,  328,  328,  328,  328,  272,  328,  328,  328,  328,
+      329,  329,  329,  125,  329,  329,  329,  329,  329,  329,
+      329,  329,  204,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,   21,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  153,  329,  329,  328,  312,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  103,  329,  329,
+      329,  329,  329,  329,  329,  272,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  176,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  152,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  102,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  176,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  152,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  102,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,   32,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,   33,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,   64,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  127,  327,  328,
-      328,  328,  328,  328,  120,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,   65,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  237,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,   32,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,   33,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,   64,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  127,  328,  329,
+      329,  329,  329,  329,  120,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,   65,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  237,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  177,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,   53,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  255,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  177,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,   53,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  255,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,   57,  328,   58,  328,  328,  328,  328,  328,  106,
-      328,  107,  328,  328,  328,  328,  104,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,    7,  328,  327,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  226,  328,  328,  328,  328,
-      155,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  238,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,   57,  329,   58,  329,  329,  329,  329,  329,  106,
+      329,  107,  329,  329,  329,  329,  104,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,    7,  329,  328,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  226,  329,  329,  329,  329,
+      155,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  238,  329,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,   45,  328,  328,  328,  328,  328,  328,
-      328,  328,   54,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  196,  328,  195,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,   16,   17,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,   45,  329,  329,  329,  329,  329,  329,
+      329,  329,   54,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  196,  329,  195,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,   16,   17,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-       68,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  203,  328,  328,  328,  328,  328,  328,  109,
-      328,  108,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  187,  328,  328,  328,  328,  328,  328,
-      328,  328,  135,  327,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,   87,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  216,
+       68,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  203,  329,  329,  329,  329,  329,  329,  109,
+      329,  108,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  187,  329,  329,  329,  329,  329,  329,
+      329,  329,  135,  328,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,   87,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  216,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,   91,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,   61,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  190,  191,  328,  328,
-      328,  266,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,    6,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  270,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,   91,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,   61,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  190,  191,  329,  329,
+      329,  266,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,    6,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  270,  329,  329,  329,
 
-      328,  328,  328,  291,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,   42,  328,  328,  328,  328,   44,
-      328,  328,  328,  328,  328,  328,  328,  328,   51,  328,
-      328,  328,  328,  328,  328,  328,  327,  328,  183,  328,
-      328,  328,  130,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  208,  328,  184,  328,  328,  328,  223,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-       52,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  291,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,   42,  329,  329,  329,  329,   44,
+      329,  329,  329,  329,  329,  329,  329,  329,   51,  329,
+      329,  329,  329,  329,  329,  329,  328,  329,  183,  329,
+      329,  329,  130,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  208,  329,  184,  329,  329,  329,  223,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+       52,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  132,  114,  328,  115,  328,  328,  328,  113,  328,
-      328,  328,  328,  328,  328,  328,  328,  150,  328,  328,
-       50,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  254,  328,  328,  328,  328,
-      328,  328,  328,  328,  185,  328,  328,  328,  328,  328,
-      188,  328,  194,  328,  328,  328,  328,  328,  222,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  101,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  126,  328,  328,  328,  328,  328,  328,   59,
+      329,  132,  114,  329,  115,  329,  329,  329,  113,  329,
+      329,  329,  329,  329,  329,  329,  329,  150,  329,  329,
+       50,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  254,  329,  329,  329,  329,
+      329,  329,  329,  329,  185,  329,  329,  329,  329,  329,
+      188,  329,  194,  329,  329,  329,  329,  329,  222,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  101,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  126,  329,  329,  329,  329,  329,  329,   59,
 
-      328,  328,  328,   26,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,   20,  328,  328,  328,  328,  328,  328,
-       27,   36,  328,  160,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  327,  328,  328,
-      328,  328,  328,  328,   76,   78,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  274,
-      328,  328,  328,  328,  234,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  116,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  149,  328,   46,
+      329,  329,  329,   26,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,   20,  329,  329,  329,  329,  329,  329,
+       27,   36,  329,  160,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  328,  329,  329,
+      329,  329,  329,  329,   76,   78,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  274,
+      329,  329,  329,  329,  234,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  116,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  149,  329,   46,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  285,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  154,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  214,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  294,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  171,  328,  328,  328,  328,  328,  328,
-      328,  328,  110,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  285,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  154,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  214,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  294,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  171,  329,  329,  329,  329,  329,  329,
+      329,  329,  110,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  166,  328,  178,  328,  328,  328,  328,  327,
-      328,  138,  328,  328,  328,  328,  328,   97,  328,  328,
-      328,  328,  206,  328,  328,  328,  328,  328,  328,  224,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  246,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  131,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  170,  328,  328,  328,  328,  328,  328,   79,   80,
-      328,  328,  328,  328,  328,   60,  328,  328,  328,  328,
-      328,   86,  179,  328,  197,  328,  227,  328,  328,  189,
+      329,  329,  166,  329,  178,  329,  329,  329,  329,  328,
+      329,  138,  329,  329,  329,  329,  329,   97,  329,  329,
+      329,  329,  206,  329,  329,  329,  329,  329,  329,  224,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  246,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  131,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  170,  329,  329,  329,  329,  329,  329,   79,   80,
+      329,  329,  329,  329,  329,   60,  329,  329,  329,  329,
+      329,   86,  179,  329,  197,  329,  227,  329,  329,  189,
 
-      267,  328,  328,  328,  328,  328,   72,  328,  181,  328,
-      328,  328,  328,  328,    9,  328,  328,  328,  100,  328,
-      328,  328,  328,  259,  328,  328,  328,  328,  205,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  327,  328,  328,  328,  328,  169,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      156,  328,  273,  328,  328,  328,  328,  328,  245,  328,
+      267,  329,  329,  329,  329,  329,   72,  329,  181,  329,
+      329,  329,  329,  329,    9,  329,  329,  329,  100,  329,
+      329,  329,  329,  259,  329,  329,  329,  329,  205,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  328,  329,  329,  329,  329,  169,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      156,  329,  273,  329,  329,  329,  329,  329,  245,  329,
 
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      218,  328,  301,  328,  328,  328,  265,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  288,  328,  180,  328,  328,
-      328,  328,  328,  328,  328,   71,   73,  328,  328,  328,
-      328,  328,  328,  328,   99,  328,  328,  328,  328,  257,
-      328,  328,  328,  328,  269,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  210,   34,   28,   30,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,   35,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      218,  329,  329,  301,  329,  329,  329,  265,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  288,  329,  180,  329,
+      329,  329,  329,  329,  329,  329,   71,   73,  329,  329,
+      329,  329,  329,  329,  329,   99,  329,  329,  329,  329,
+      257,  329,  329,  329,  329,  269,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  210,   34,   28,
+       30,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,   29,   31,  328,  328,  328,  328,  328,  328,  328,
-      328,   96,  328,  328,  328,  328,  328,  328,  327,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      212,  209,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-       70,  328,  328,  133,  328,  117,  328,  328,  328,  328,
-      328,  328,  328,  328,  151,   47,  328,  328,  319,   13,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  283,
-      328,  286,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,   12,  328,  328,   22,  328,  328,  328,  263,
+       35,  329,   29,   31,  329,  329,  329,  329,  329,  329,
+      329,  329,   96,  329,  329,  329,  329,  329,  329,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  212,  209,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,   70,  329,  329,  329,  133,  329,  117,  329,  329,
+      329,  329,  329,  329,  329,  329,  151,   47,  329,  329,
+      320,   13,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  283,  329,  286,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,   12,  329,  329,   22,  329,  329,
 
-      328,  328,  328,  328,  271,  328,  328,  328,   74,  328,
-      220,  328,  328,  328,  328,  211,  328,  328,   69,  328,
-      328,  328,  328,   23,  328,   43,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  165,  164,
-      319,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      213,  207,  328,  225,  328,  328,  275,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,   81,  328,  328,
-      328,  258,  328,  328,  328,  328,  193,  328,  328,  328,
+      329,  263,  329,  329,  329,  329,  271,  329,  329,  329,
+       74,  329,  220,  329,  329,  329,  329,  211,  329,  329,
+       69,  329,  329,  329,  329,   23,  329,   43,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      165,  164,  320,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  213,  207,  329,  225,  329,  329,  275,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+       81,  329,  329,  329,  258,  329,  329,  329,  329,  193,
 
-      328,  219,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  292,  293,  162,  328,  328,   75,  328,  328,  328,
-      328,  172,  328,  328,  111,  112,  328,  328,  328,  328,
-      157,  328,  159,  328,  198,  328,  328,  328,  328,  163,
-      328,  328,  228,  328,  328,  328,  328,  328,  328,  328,
-      140,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  236,  328,  328,  328,  328,  328,  328,
-      328,   24,  328,  268,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  199,  328,  328,
-      256,  328,  287,  328,  192,  328,  328,  328,  328,   55,
+      329,  329,  329,  329,  219,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  292,  293,  162,  329,  329,   75,
+      329,  329,  329,  329,  172,  329,  329,  111,  112,  329,
+      329,  329,  329,  157,  329,  159,  329,  198,  329,  329,
+      329,  329,  163,  329,  329,  228,  329,  329,  329,  329,
+      329,  329,  329,  140,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  236,  329,  329,  329,
+      329,  329,  329,  329,  329,   24,  329,  268,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  199,  329,  329,  256,  329,  287,  329,  192,  329,
 
-      328,  328,  328,  328,    4,  328,  328,  328,  328,  124,
-      139,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  231,
-       37,   38,  328,  328,  328,  328,  328,  328,  328,  276,
-      328,  328,  328,  328,  328,  328,  328,  244,  328,  328,
-      328,  328,  328,  328,  328,  202,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,   84,  328,   56,
-      262,  328,  232,  328,  328,  328,  328,   11,  328,  328,
-      328,  328,  328,  328,  123,  328,  328,  328,  328,  200,
-       88,  328,   40,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,   55,  329,  329,  329,  329,    4,  329,
+      329,  329,  329,  124,  139,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  231,   37,   38,  329,  329,  329,  329,
+      329,  329,  329,  276,  329,  329,  329,  329,  329,  329,
+      329,  244,  329,  329,  329,  329,  329,  329,  329,  329,
+      202,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,   84,  329,   56,  262,  329,  232,  329,  329,
+      329,  329,   11,  329,  329,  329,  329,  329,  329,  123,
+      329,  329,  329,  329,  200,   88,  329,   40,  329,  329,
 
-      328,  168,  328,  328,  328,  328,  328,  142,  328,  328,
-      328,  328,  235,  328,  328,  328,  328,  328,  243,  328,
-      328,  328,  328,  136,  328,  328,  118,  119,  328,  328,
-      328,   90,   94,   89,  328,  328,  328,   82,  328,  328,
-      328,  328,  328,   10,  328,  328,  328,  260,  295,  328,
-      328,  328,  328,  300,   39,  328,  328,  328,  328,  328,
-      167,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,   95,   93,  328,  328,  328,   83,  284,
-      328,  328,  328,  328,  328,  328,  328,  186,  328,  328,
+      329,  329,  329,  329,  329,  329,  168,  329,  329,  329,
+      329,  329,  142,  329,  329,  329,  329,  235,  329,  329,
+      329,  329,  329,  243,  329,  329,  329,  329,  136,  329,
+      329,  329,  118,  119,  329,  329,  329,   90,   94,   89,
+      329,  329,  329,   82,  329,  329,  329,  329,  329,   10,
+      329,  329,  329,  260,  295,  329,  329,  329,  329,  300,
+       39,  329,  329,  329,  329,  329,  167,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+       95,   93,  329,  329,  329,   83,  284,  329,  329,  329,
 
-      328,  328,  328,  201,  328,  328,  328,  328,  328,  328,
-      328,  328,  158,   77,  328,  328,  328,  328,  328,  277,
-      328,  328,  328,  328,  328,  328,  328,  240,  328,  328,
-      239,  137,  328,   92,   48,  328,  143,  144,  147,  148,
-      145,  146,   85,  328,  261,  328,  328,  328,  328,  161,
-      328,  328,  328,  328,  328,  230,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  174,  173,   41,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
+      329,  329,  329,  329,  186,  329,  329,  329,  329,  329,
+      201,  329,  329,  329,  329,  329,  329,  329,  329,  158,
+       77,  329,  329,  329,  329,  329,  277,  329,  329,  329,
+      329,  329,  329,  329,  240,  329,  329,  239,  137,  302,
+      329,   92,   48,  329,  143,  144,  147,  148,  145,  146,
+       85,  329,  261,  329,  329,  329,  329,  161,  329,  329,
+      329,  329,  329,  230,  329,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      329,  329,  174,  173,   41,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,   98,  328,  229,  328,  253,  281,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-       49,    5,  328,  328,  221,  328,  328,  282,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  241,   25,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  242,  328,  328,  328,  141,  328,  328,  328,  328,
-      328,  328,  328,  328,  175,  328,  182,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  278,  328,  328,  328,
-      328,  328,  328,  328,  328,  328,  328,  328,  328,  328,
-      328,  328,  328,  328,  299,  328,  328,  249,  328,  328,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+       98,  329,  229,  329,  253,  281,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,   49,    5,
+      329,  329,  221,  329,  329,  282,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  241,   25,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  242,
+      329,  329,  329,  141,  329,  329,  329,  329,  329,  329,
+      329,  329,  175,  329,  182,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  278,  329,  329,  329,  329,  329,
+      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
 
-      328,  328,  328,  279,  328,  328,  328,  328,  328,  328,
-      280,  328,  328,  328,  247,  328,  250,  251,  328,  328,
-      328,  328,  328,  248,  252,    0
+      329,  329,  299,  329,  329,  249,  329,  329,  329,  329,
+      329,  279,  329,  329,  329,  329,  329,  329,  280,  329,
+      329,  329,  247,  329,  250,  251,  329,  329,  329,  329,
+      329,  248,  252,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -762,17 +763,17 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3245] =
+static const flex_int16_t yy_base[3253] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 4264, 3883,   81, 6299,
-     6299, 6299,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 4264, 3883,   81, 6320,
+     6320, 6320,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  184,  145,
-      185,  205,  194,  204,  178,  123, 3532, 6299, 6299, 6299,
-      107, 3462, 6299, 6299, 6299,  154, 3335, 2925, 6299, 6299,
-     6299,  226, 2336, 6299, 6299, 6299,  163, 2298, 6299,  238,
-     6299,  242,  148, 1838, 1641, 6299, 6299, 6299,  246, 1331,
-     6299, 6299, 6299,  250, 1145,  254,  219,    0,  258,    0,
+      185,  205,  194,  204,  178,  123, 3532, 6320, 6320, 6320,
+      107, 3462, 6320, 6320, 6320,  154, 3335, 2925, 6320, 6320,
+     6320,  226, 2336, 6320, 6320, 6320,  163, 2298, 6320,  238,
+     6320,  242,  148, 1838, 1641, 6320, 6320, 6320,  246, 1331,
+     6320, 6320, 6320,  250, 1145,  254,  219,    0,  258,    0,
         0,  165,  250,  191,  215,  243,  252,  256,   92,  260,
 
       261,  262,  264,  265,  266,  273,  270,  277,  278,  281,
@@ -802,9 +803,9 @@ static const flex_int16_t yy_base[3245] =
       739,  741,  752,  747,  748,  761,  754,  756,  757,  764,
       755,  771,  765,  786,  793,  772,  782,  768,  791,  794,
       796,  801,  797,  790,  804,  807,  808,  810,  811,  818,
-      813, 6299,  815,  817,  829,  828,  831,  834,  824,  840,
+      813, 6320,  815,  817,  829,  828,  831,  834,  824,  840,
       832,  820,  850,  846,  847,  851,  873,  848,  849,  862,
-      863,  853, 6299,  866,  857,  897,  865,  875,  887,  882,
+      863,  853, 6320,  866,  857,  897,  865,  875,  887,  882,
       858,  883,  890,  895,  891,  907,  893,  898,  903,  920,
       906,  908,  915,  921,  922,  923,  931,  932,  926,  930,
 
@@ -813,22 +814,22 @@ static const flex_int16_t yy_base[3245] =
       975,  986,  983,  985,  988,  978,  996, 1007,  998, 1002,
      1006, 1009, 1011, 1013, 1014, 1017, 1021, 1018, 1022, 1024,
      1032, 1027, 1028, 1029, 1034, 1036, 1037, 1040, 1042, 1045,
-     1044, 1048, 1049, 1047, 1054, 1060, 1057, 1066, 1058, 6299,
-     1068, 1061, 1064, 1070, 1071, 1073, 6299, 1074, 1075, 1076,
+     1044, 1048, 1049, 1047, 1054, 1060, 1057, 1066, 1058, 6320,
+     1068, 1061, 1064, 1070, 1071, 1073, 6320, 1074, 1075, 1076,
      1083, 1084, 1087, 1096, 1086, 1097, 1099, 1089, 1098, 1110,
      1106, 1109, 1117, 1107, 1114, 1115, 1118, 1116, 1122, 1123,
-     1124, 1125, 1128, 1130, 1148, 6299, 1131, 1140, 1132, 1133,
+     1124, 1125, 1128, 1130, 1148, 6320, 1131, 1140, 1132, 1133,
 
      1134, 1142, 1160, 1144, 1153, 1157, 1161, 1172, 1163, 1175,
      1171, 1180, 1181, 1183, 1184, 1186, 1187, 1188, 1190, 1189,
-     1191, 1193, 1195, 1192, 1198, 6299, 1197, 1212, 1219, 1205,
+     1191, 1193, 1195, 1192, 1198, 6320, 1197, 1212, 1219, 1205,
      1210, 1215, 1218, 1220, 1221, 1222, 1223, 1227, 1230, 1241,
      1237, 1233, 1248, 1243, 1244, 1246, 1249, 1251, 1250, 1252,
      1254, 1263, 1259, 1266, 1274, 1275, 1277, 1279, 1286, 1288,
      1281, 1283, 1289, 1285, 1284, 1291, 1293, 1300, 1294, 1297,
      1224, 1304, 1306, 1301, 1307, 1308, 1313, 1309, 1311, 1315,
      1318, 1321, 1329, 1325, 1326, 1335, 1327, 1336, 1328, 1333,
-     1339, 1348, 1342, 1350, 6299, 1357, 1258, 1352, 1354, 1359,
+     1339, 1348, 1342, 1350, 6320, 1357, 1258, 1352, 1354, 1359,
 
      1360, 1361, 1362, 1367, 1368, 1369, 1371, 1370, 1373, 1374,
      1377, 1379, 1384, 1386, 1387, 1388, 1389, 1402, 1401, 1403,
@@ -841,650 +842,652 @@ static const flex_int16_t yy_base[3245] =
      1528, 1527, 1529, 1531, 1534, 1530, 1539, 1540, 1542, 1536,
      1549, 1550, 1551, 1552, 1555, 1553, 1557, 1562, 1563, 1564,
 
-     1568, 1570, 1569, 1572, 1578, 1575, 1576, 6299, 1580, 1588,
+     1568, 1570, 1569, 1572, 1578, 1575, 1576, 6320, 1580, 1588,
      1581, 1589, 1586, 1591, 1592, 1600, 1595, 1597, 1596, 1602,
-     1605, 1628, 6299, 1606, 6299, 6299,  315, 6299, 6299, 1608,
-     1607, 6299, 1609, 1611, 1618, 1619, 1631, 1635, 1638, 1624,
+     1605, 1628, 6320, 1606, 6320, 6320,  315, 6320, 6320, 1608,
+     1607, 6320, 1609, 1611, 1618, 1619, 1631, 1635, 1638, 1624,
      1612, 1639, 1651, 1660, 1641, 1622, 1652, 1653, 1644, 1654,
      1666, 1655, 1665, 1656, 1673, 1683, 1684, 1685, 1675, 1687,
      1689, 1692, 1693, 1697, 1699, 1700, 1702, 1703, 1704, 1706,
      1705, 1708, 1711, 1714, 1715, 1717, 1710, 1718, 1669, 1727,
-     1720, 1737, 6299, 1729, 1739, 1744, 1741, 1748, 1747, 1743,
+     1720, 1737, 6320, 1729, 1739, 1744, 1741, 1748, 1747, 1743,
      1745, 1752, 1755, 1756, 1757, 1758, 1723, 1759, 1761, 1762,
 
-     1765, 1772, 1767, 6299, 1768, 1770, 1769, 1776, 1774, 1782,
+     1765, 1772, 1767, 6320, 1768, 1770, 1769, 1776, 1774, 1782,
      1784, 1780, 1787, 1788, 1790, 1801, 1791, 1796, 1798, 1799,
-     1802, 1804, 6299, 1814, 1806, 1809, 1813, 1810, 1819, 1820,
+     1802, 1804, 6320, 1814, 1806, 1809, 1813, 1810, 1819, 1820,
      1821, 1822, 1823, 1824, 1825, 1827, 1833, 1834, 1835, 1836,
      1837, 1841, 1851, 1846, 1849, 1859, 1850, 1853, 1861, 1863,
      1864, 1865, 1866, 1868, 1873, 1875, 1872, 1880, 1876, 1883,
      1895, 1878, 1879, 1890, 1892, 1891, 1893, 1905, 1900, 1901,
      1904, 1913, 1906, 1909, 1911, 1915, 1922, 1918, 1923, 1924,
-     1914, 1928, 1930, 1931, 6299, 1932, 1937, 6299, 1934, 1938,
+     1914, 1928, 1930, 1931, 6320, 1932, 1937, 6320, 1934, 1938,
      1960, 1939, 1941, 1942, 1944, 1947, 1949, 1946, 1952, 1962,
 
      1964, 1974, 1970, 1975, 1980, 1977, 1982, 1983, 1985, 1986,
      1988, 1991, 1993, 1998, 1994, 2007, 2012, 2011, 2008, 2019,
      2014, 2015, 2017, 2037, 2016, 2018, 2025, 2020, 2021, 2024,
      2033, 2026, 2027, 2030, 2031, 2048, 2050, 2044, 2052, 2053,
-     2059, 2060, 2054, 6299, 2067, 1955, 2065, 2066, 2075, 2072,
-     2070, 6299, 2073, 2076, 2078, 2086, 2081, 2083, 2087, 2088,
-     2091, 2093, 2095, 2097, 2100, 2098, 2099, 2117, 6299, 2096,
-     6299, 2101, 2103, 2110, 2114, 2118, 2119, 2120, 2121, 6299,
-     6299, 2122, 2124, 2130, 2138, 2135, 6299, 2137, 2145, 2142,
+     2059, 2060, 2054, 6320, 2067, 1955, 2065, 2066, 2075, 2072,
+     2070, 6320, 2073, 2076, 2078, 2086, 2081, 2083, 2087, 2088,
+     2091, 2093, 2095, 2097, 2100, 2098, 2099, 2117, 6320, 2096,
+     6320, 2101, 2103, 2110, 2114, 2118, 2119, 2120, 2121, 6320,
+     6320, 2122, 2124, 2130, 2138, 2135, 6320, 2137, 2145, 2142,
      2147, 2140, 2141, 2149, 2151, 2155, 2152, 2162, 2157, 2164,
 
-     2159, 2166, 2170, 6299, 2160, 2172, 2173, 2175, 2176, 2181,
-     2182, 2179, 6299, 2183, 2185, 2188, 2196, 2198, 2195, 2199,
+     2159, 2166, 2170, 6320, 2160, 2172, 2173, 2175, 2176, 2181,
+     2182, 2179, 6320, 2183, 2185, 2188, 2196, 2198, 2195, 2199,
      2200, 2205, 2202, 2207, 2208, 2209, 2210, 2219, 2221, 2211,
-     2222, 2224, 2231, 6299, 2214, 2218, 2236, 2234, 2241, 2233,
+     2222, 2224, 2231, 6320, 2214, 2218, 2236, 2234, 2241, 2233,
      2235, 2237, 2243, 2245, 2246, 2247, 2250, 2251, 2252, 2259,
      2260, 2257, 2256, 2265, 2266, 2267, 2270, 2273, 2274, 2275,
-     2276, 2277, 6299, 2278, 2280, 2283,  171, 2286, 2289, 2287,
+     2276, 2277, 6320, 2278, 2280, 2283,  171, 2286, 2289, 2287,
      2288, 2296, 2291, 2294, 2307, 2312, 2308, 2309, 2310, 2316,
-     2317, 2318, 2319, 2320, 2321, 2322, 2324, 6299, 2326, 2327,
-     2329, 2333, 2332, 2335, 2340, 6299, 2342, 2349, 2352, 2361,
+     2317, 2318, 2319, 2320, 2321, 2322, 2324, 6320, 2326, 2327,
+     2329, 2333, 2332, 2335, 2340, 6320, 2342, 2349, 2352, 2361,
 
      2344, 2353, 2362, 2358, 2363, 2364, 2366, 2368, 2370, 2369,
-     2372, 2378, 2375, 6299, 2380, 2383, 2385, 2376, 2392, 2391,
+     2372, 2378, 2375, 6320, 2380, 2383, 2385, 2376, 2392, 2391,
      2384, 2398, 2399, 2400, 2403, 2401, 2402, 2405, 2404, 2406,
      2407, 2412, 2411, 2408, 2410, 2420, 2421, 2422, 2431, 2424,
-     2432, 2433, 6299, 2440, 2435, 2437, 2438, 2439, 2452, 2442,
+     2432, 2433, 6320, 2440, 2435, 2437, 2438, 2439, 2452, 2442,
      2461, 2444, 2448, 2445, 2464, 2466, 2456, 2467, 2478, 2480,
      2468, 2477, 2488, 2487, 2490, 2483, 2470, 2493, 2496, 2497,
      2498, 2500, 2502, 2503, 2504, 2505, 2512, 2513, 2510, 2520,
-     2519, 2525, 2532, 2527, 6299, 2536, 2531, 2534, 2541, 2548,
+     2519, 2525, 2532, 2527, 6320, 2536, 2531, 2534, 2541, 2548,
      2544, 2521, 2549, 2545, 2551, 2555, 2556, 2557, 2564, 2561,
 
      2565, 2563, 2567, 2566, 2569, 2568, 2570, 2576, 2583, 2579,
-     2585, 2587, 6299, 2511, 2588, 2590, 2591, 2597, 2592, 2599,
+     2585, 2587, 6320, 2511, 2588, 2590, 2591, 2597, 2592, 2599,
      2601, 2603, 2604, 2605, 2607, 2610, 2611, 2613, 2615, 2618,
-     2617, 2616, 6299, 2621, 2622, 2623, 2629, 2631, 2632, 2639,
-     2641, 2647, 2645, 2635, 2649, 2651, 2652, 6299, 2660, 2662,
-     2659, 2663, 2661, 2666, 2667, 2669, 2671, 6299, 2672, 2673,
-     2674, 2681, 2682, 2677, 6299, 2686, 2684, 2679, 2688, 2689,
-     2690, 2694, 2692, 2696, 2701, 2702, 2706, 2709, 2710, 6299,
+     2617, 2616, 6320, 2621, 2622, 2623, 2629, 2631, 2632, 2639,
+     2641, 2647, 2645, 2635, 2649, 2651, 2652, 6320, 2660, 2662,
+     2659, 2663, 2661, 2666, 2667, 2669, 2671, 6320, 2672, 2673,
+     2674, 2681, 2682, 2677, 6320, 2686, 2684, 2679, 2688, 2689,
+     2690, 2694, 2692, 2696, 2701, 2702, 2706, 2709, 2710, 6320,
      2711, 2723, 2713, 2716, 2718, 2714, 2720, 2724, 2729, 2727,
-     2738, 2733, 6299, 2749, 2638, 2741, 2751, 2744, 2746, 2748,
+     2738, 2733, 6320, 2749, 2638, 2741, 2751, 2744, 2746, 2748,
 
-     2753, 2754, 2755, 2756, 2757, 2760, 6299, 2761, 2764, 2765,
+     2753, 2754, 2755, 2756, 2757, 2760, 6320, 2761, 2764, 2765,
      2767, 2770, 2769, 2771, 2784, 2777, 2779, 2781, 2785, 2786,
      2788, 2791, 2792, 2797, 2793, 2794, 2804, 2806, 2808, 2809,
      2812, 2816, 2814, 2819, 2820, 2815, 2822, 2825, 2833, 2838,
-     2823, 2834, 6299, 2837, 2840, 2839, 2841, 2842, 2845, 2846,
+     2823, 2834, 6320, 2837, 2840, 2839, 2841, 2842, 2845, 2846,
      2849, 2847, 2854, 2852, 2851, 2855, 2864, 2872, 2861, 2868,
      2870, 2873, 2875, 2877, 2876, 2878, 2879, 2886, 2883, 2885,
      2893, 2890, 2894, 2902, 2891, 2899, 2901, 2903, 2905, 2904,
      2906, 2907, 2912, 2914, 2917, 2924, 2927, 2929, 2928, 2930,
-     2931, 2934, 6299, 2937, 2938, 2935, 2942, 2945, 2947, 2949,
+     2931, 2934, 6320, 2937, 2938, 2935, 2942, 2945, 2947, 2949,
 
      2957, 2948, 2952, 2959, 2956, 2966, 2958, 2967, 2968, 2975,
-     2972, 6299, 2973, 6299, 2974, 2976, 2979, 2983, 2982, 6299,
-     2987, 6299, 2989, 2994, 2984, 2990, 6299, 2996, 2997, 2998,
+     2972, 6320, 2973, 6320, 2974, 2976, 2979, 2983, 2982, 6320,
+     2987, 6320, 2989, 2994, 2984, 2990, 6320, 2996, 2997, 2998,
      3003, 3001, 3005, 3008, 3009, 3010, 3011, 3013, 3015, 3019,
      3018, 3020, 3023, 3028, 3025, 3029, 3032, 3035, 3036, 3040,
-     3038, 3042, 3045, 3047, 3050, 6299, 3052, 3048, 3054, 3057,
+     3038, 3042, 3045, 3047, 3050, 6320, 3052, 3048, 3054, 3057,
      3058, 3059, 3061, 3062, 3065, 3067, 3068, 3074, 3075, 3069,
-     3079, 3085, 3082, 3084, 3097, 6299, 3092, 3094, 3095, 3096,
-     6299, 3098, 3099, 3100, 3107, 3105, 3109, 3110, 3112, 3116,
-     3111, 3118, 3113, 3128, 3126, 3132, 3121, 6299, 3135, 3136,
+     3079, 3085, 3082, 3084, 3097, 6320, 3092, 3094, 3095, 3096,
+     6320, 3098, 3099, 3100, 3107, 3105, 3109, 3110, 3112, 3116,
+     3111, 3118, 3113, 3128, 3126, 3132, 3121, 6320, 3135, 3136,
 
      3122, 3139, 3149, 3151, 3156, 3138, 3152, 3154, 3163, 3159,
      3158, 3160, 3161, 3162, 3165, 3172, 3173, 3169, 3176, 3175,
      3179, 3186, 3183, 3177, 3181, 3187, 3189, 3190, 3191, 3192,
-     3193, 3194, 3197, 6299, 3199, 3200, 3202, 3214, 3206, 3209,
-     3213, 3217, 6299, 3220, 3221, 3223, 3224, 3222, 3230, 3231,
-     3232, 3233, 3234, 3236, 3239, 3240, 6299, 3245, 6299, 3246,
+     3193, 3194, 3197, 6320, 3199, 3200, 3202, 3214, 3206, 3209,
+     3213, 3217, 6320, 3220, 3221, 3223, 3224, 3222, 3230, 3231,
+     3232, 3233, 3234, 3236, 3239, 3240, 6320, 3245, 6320, 3246,
      3254, 3253, 3259, 3235, 3261, 3263, 3268, 3262, 3264, 3269,
      3272, 3270, 3276, 3273, 3278, 3281, 3285, 3286, 3288, 3284,
-     3295, 3291, 3296, 3298, 3299, 6299, 6299, 3300, 3301, 3302,
+     3295, 3291, 3296, 3298, 3299, 6320, 6320, 3300, 3301, 3302,
      3305, 3306, 3307, 3316, 3318, 3323, 3320, 3313, 3322, 3342,
 
-     6299, 3329, 3324, 3326, 3332, 3350, 3333, 3346, 3353, 3349,
-     3358, 3355, 6299, 3356, 3357, 3365, 3360, 3363, 3368, 6299,
-     3367, 6299, 3364, 3369, 3370, 3377, 3374, 3379, 3380, 3381,
+     6320, 3329, 3324, 3326, 3332, 3350, 3333, 3346, 3353, 3349,
+     3358, 3355, 6320, 3356, 3357, 3365, 3360, 3363, 3368, 6320,
+     3367, 6320, 3364, 3369, 3370, 3377, 3374, 3379, 3380, 3381,
      3385, 3396, 3397, 3389, 3399, 3393, 3382, 3401, 3403, 3410,
-     3405, 3407, 3408, 6299, 3412, 3409, 3414, 3417, 3419, 3425,
-     3428, 3415, 6299, 3421, 3431, 3435, 3432, 3436, 3439, 3441,
+     3405, 3407, 3408, 6320, 3412, 3409, 3414, 3417, 3419, 3425,
+     3428, 3415, 6320, 3421, 3431, 3435, 3432, 3436, 3439, 3441,
      3442, 3443, 3445, 3447, 3444, 3449, 3460, 3452, 3453, 3455,
-     3466, 3467, 3473, 6299, 3474, 3468, 3481, 3483, 3476, 3478,
+     3466, 3467, 3473, 6320, 3474, 3468, 3481, 3483, 3476, 3478,
      3484, 3485, 3486, 3489, 3491, 3490, 3492, 3493, 3494, 3496,
-     3498, 3501, 3499, 3512, 3513, 3500, 3521, 3522, 3504, 6299,
+     3498, 3501, 3499, 3512, 3513, 3500, 3521, 3522, 3504, 6320,
 
      3514, 3526, 3527, 3528, 3529, 3535, 3536, 3539, 3541, 3530,
-     3545, 3552, 3534, 3542, 3557, 3554, 3565, 3561, 6299, 3566,
+     3545, 3552, 3534, 3542, 3557, 3554, 3565, 3561, 6320, 3566,
      3562, 3573, 3547, 3568, 3570, 3574, 3576, 3578, 3575, 3579,
-     3582, 3585, 3592, 3587, 3588, 3589, 3597, 3593, 6299, 3604,
+     3582, 3585, 3592, 3587, 3588, 3589, 3597, 3593, 6320, 3604,
      3602, 3605, 3610, 3611, 3618, 3614, 3595, 3617, 3620, 3622,
-     3624, 3627, 3628, 3629, 3632, 3633, 6299, 6299, 3635, 3636,
-     3637, 6299, 3640, 3639, 3651, 3642, 3643, 3644, 3655, 3654,
-     3652, 3656, 3658, 3665, 6299, 3666, 3673, 3668, 3669, 3680,
+     3624, 3627, 3628, 3629, 3632, 3633, 6320, 6320, 3635, 3636,
+     3637, 6320, 3640, 3639, 3651, 3642, 3643, 3644, 3655, 3654,
+     3652, 3656, 3658, 3665, 6320, 3666, 3673, 3668, 3669, 3680,
      3683, 3686, 3670, 3682, 3672, 3679, 3687, 3690, 3689, 3694,
-     3695, 3703, 3706, 3701, 3702, 3704, 6299, 3705, 3709, 3710,
+     3695, 3703, 3706, 3701, 3702, 3704, 6320, 3705, 3709, 3710,
 
-     3712, 3713, 3714, 6299, 3716, 3718, 3727, 3719, 3737, 3726,
+     3712, 3713, 3714, 6320, 3716, 3718, 3727, 3719, 3737, 3726,
      3723, 3741, 3738, 3742, 3743, 3744, 3745, 3746, 3753, 3748,
-     3750, 3752, 3757, 3760, 6299, 3761, 3767, 3754, 3769, 6299,
-     3772, 3781, 3779, 3782, 3777, 3784, 3785, 3792, 6299, 3787,
-     3790, 3788, 3791, 3801, 3793, 3802, 3804, 3798, 6299, 3805,
-     3806, 3807, 6299, 3808, 3813, 3819, 3821, 3822, 3829, 3824,
-     3826, 3827, 3828, 6299, 3834, 6299, 3832, 3836, 3840, 6299,
+     3750, 3752, 3757, 3760, 6320, 3761, 3767, 3754, 3769, 6320,
+     3772, 3781, 3779, 3782, 3777, 3784, 3785, 3792, 6320, 3787,
+     3790, 3788, 3791, 3801, 3793, 3802, 3804, 3798, 6320, 3805,
+     3806, 3807, 6320, 3808, 3813, 3819, 3821, 3822, 3829, 3824,
+     3826, 3827, 3828, 6320, 3834, 6320, 3832, 3836, 3840, 6320,
      3838, 3843, 3844, 3846, 3847, 3852, 3853, 3851, 3860, 3861,
      3862, 3864, 3865, 3863, 3868, 3872, 3869, 3870, 3874, 3875,
-     6299, 3876, 3878, 3885, 3890, 3897, 3886, 3893, 3880, 3899,
+     6320, 3876, 3878, 3885, 3890, 3897, 3886, 3893, 3880, 3899,
 
-     3900, 6299, 6299, 3903, 6299, 3906, 3907, 3908, 6299, 3910,
-     3912, 3917, 3914, 3915, 3918, 3922, 3919, 6299, 3929, 3932,
-     6299, 3930, 3940, 3935, 3937, 3938, 3943, 3939, 3941, 3945,
-     3949, 3951, 3946, 3950, 3947, 6299, 3954, 3952, 3956, 3960,
-     3967, 3968, 3970, 3969, 6299, 3976, 3977, 3973, 3980, 3983,
-     6299, 3984, 6299, 3982, 3986, 3992, 3994, 3988, 6299, 3997,
+     3900, 6320, 6320, 3903, 6320, 3906, 3907, 3908, 6320, 3910,
+     3912, 3917, 3914, 3915, 3918, 3922, 3919, 6320, 3929, 3932,
+     6320, 3930, 3940, 3935, 3937, 3938, 3943, 3939, 3941, 3945,
+     3949, 3951, 3946, 3950, 3947, 6320, 3954, 3952, 3956, 3960,
+     3967, 3968, 3970, 3969, 6320, 3976, 3977, 3973, 3980, 3983,
+     6320, 3984, 6320, 3982, 3986, 3992, 3994, 3988, 6320, 3997,
      3998, 4002, 4003, 4005, 4006, 4009, 4011, 4013, 4015, 4023,
-     4019, 4020, 4018, 6299, 4021, 4022, 4028, 4037, 4030, 4032,
+     4019, 4020, 4018, 6320, 4021, 4022, 4028, 4037, 4030, 4032,
      4047, 4034, 4042, 4025, 4046, 4049, 4051, 4055, 4057, 4050,
-     4060, 4053, 6299, 4061, 4064, 4067, 4075, 4068, 4072, 6299,
+     4060, 4053, 6320, 4061, 4064, 4067, 4075, 4068, 4072, 6320,
 
-     4078, 4076, 4080, 6299, 4079, 4082, 4086, 4094, 4083, 4087,
-     4091, 4089, 4096, 6299, 4097, 4098, 4099, 4108, 4112, 4106,
-     6299, 6299, 4114, 6299, 4116, 4100, 4121, 4124, 4104, 4118,
+     4078, 4076, 4080, 6320, 4079, 4082, 4086, 4094, 4083, 4087,
+     4091, 4089, 4096, 6320, 4097, 4098, 4099, 4108, 4112, 4106,
+     6320, 6320, 4114, 6320, 4116, 4100, 4121, 4124, 4104, 4118,
      4126, 4128, 4131, 4132, 4134, 4135, 4139, 4141, 4149, 4150,
-     4153, 4154, 4156, 4145, 6299, 6299, 4159, 4160, 4146, 4167,
-     4168, 4162, 4170, 4177, 4173, 4179, 4182, 4184, 4191, 6299,
-     4172, 4183, 4190, 4187, 6299, 4192, 4193, 4195, 4196, 4197,
+     4153, 4154, 4156, 4145, 6320, 6320, 4159, 4160, 4146, 4167,
+     4168, 4162, 4170, 4177, 4173, 4179, 4182, 4184, 4191, 6320,
+     4172, 4183, 4190, 4187, 6320, 4192, 4193, 4195, 4196, 4197,
      4201, 4199, 4200, 4204, 4205, 4213, 4206, 4208, 4216, 4214,
-     4222, 4224, 4225, 4226, 4228, 4230, 4233, 6299, 4234, 4235,
-     4237, 4238, 4239, 4243, 4245, 4246, 4247, 6299, 4249, 6299,
+     4222, 4224, 4225, 4226, 4228, 4230, 4233, 6320, 4234, 4235,
+     4237, 4238, 4239, 4243, 4245, 4246, 4247, 6320, 4249, 6320,
 
      4252, 4251, 4253, 4260, 4267, 4270, 4269, 4271, 4274, 4275,
-     4278, 4280, 4281, 4284, 4288, 4283, 4291, 4293, 6299, 4294,
+     4278, 4280, 4281, 4284, 4288, 4283, 4291, 4293, 6320, 4294,
      4286, 4300, 4301, 4303, 4305, 4307, 4309, 4310, 4312, 4314,
-     4316, 4318, 4323, 4319, 4315, 4325, 4327, 6299, 4330, 4332,
+     4316, 4318, 4323, 4319, 4315, 4325, 4327, 6320, 4330, 4332,
      4334, 4337, 4338, 4341, 4340, 4344, 4349, 4342, 4350, 4351,
-     4355, 6299, 4352, 4357, 4358, 4359, 4367, 4362, 4364, 4368,
-     4371, 6299, 4375, 4376, 4377, 4378, 4379, 4382, 4385, 4387,
-     4389, 4391, 4399, 6299, 4394, 4390, 4403, 4401, 4405, 4404,
-     4407, 4409, 6299, 4410, 4416, 4413, 4420, 4422, 4429, 4427,
+     4355, 6320, 4352, 4357, 4358, 4359, 4367, 4362, 4364, 4368,
+     4371, 6320, 4375, 4376, 4377, 4378, 4379, 4382, 4385, 4387,
+     4389, 4391, 4399, 6320, 4394, 4390, 4403, 4401, 4405, 4404,
+     4407, 4409, 6320, 4410, 4416, 4413, 4420, 4422, 4429, 4427,
      4431, 4424, 4433, 4434, 4430, 4438, 4441, 4442, 4440, 4458,
 
-     4459, 4444, 6299, 4445, 6299, 4455, 4456, 4466, 4461, 4463,
-     4467, 6299, 4469, 4472, 4474, 4471, 4475, 6299, 4478, 4476,
-     4479, 4481, 6299, 4477, 4491, 4482, 4483, 4498, 4499, 6299,
+     4459, 4444, 6320, 4445, 6320, 4455, 4456, 4466, 4461, 4463,
+     4467, 6320, 4469, 4472, 4474, 4471, 4475, 6320, 4478, 4476,
+     4479, 4481, 6320, 4477, 4491, 4482, 4483, 4498, 4499, 6320,
      4504, 4505, 4501, 4513, 4515, 4510, 4512, 4514, 4516, 4518,
-     4520, 4521, 4522, 4531, 4524, 4527, 6299, 4529, 4536, 4542,
-     4543, 4545, 4526, 4537, 4546, 4552, 4547, 6299, 4549, 4553,
-     4555, 4556, 4558, 4559, 4561, 4569, 4565, 4564, 4567, 4572,
-     4568, 6299, 4576, 4574, 4578, 4587, 4584, 4591, 6299, 6299,
-     4580, 4595, 4597, 4585, 4598, 6299, 4601, 4608, 4603, 4607,
-     4604, 6299, 6299, 4610, 6299, 4612, 6299, 4614, 4616, 6299,
+     4520, 4521, 4522, 4531, 4524, 4527, 6320, 4529, 4536, 4542,
+     4543, 4550, 4526, 4537, 4547, 4546, 4552, 6320, 4553, 4554,
+     4555, 4556, 4559, 4560, 4561, 4568, 4567, 4564, 4569, 4571,
+     4572, 6320, 4577, 4578, 4579, 4587, 4583, 4590, 6320, 6320,
+     4585, 4595, 4597, 4586, 4601, 6320, 4603, 4604, 4605, 4609,
+     4606, 6320, 6320, 4611, 6320, 4613, 6320, 4614, 4616, 6320,
 
-     6299, 4617, 4618, 4619, 4620, 4627, 6299, 4634, 6299, 4629,
-     4635, 4621, 4631, 4638, 6299, 4639, 4640, 4642, 6299, 4645,
-     4655, 4646, 4647, 6299, 4651, 4656, 4648, 4657, 6299, 4660,
-     4666, 4663, 4669, 4670, 4671, 4672, 4677, 4678, 4673, 4681,
-     4680, 4683, 4690, 4694, 4696, 4698, 4699, 4684, 4701, 4703,
-     4707, 4705, 4709, 4710, 4712, 4714, 4715, 4719, 4723, 4716,
-     4720, 4724, 4725, 4726, 4733, 4729, 4735, 4740, 4736, 4741,
-     4742, 4743, 4744, 4747, 4748, 4750, 4754, 4757, 4758, 6299,
-     4752, 4753, 4759, 4766, 4764, 4771, 4774, 4781, 4784, 4785,
-     6299, 4787, 6299, 4789, 4777, 4791, 4792, 4793, 6299, 4794,
+     6320, 4618, 4619, 4620, 4621, 4630, 6320, 4634, 6320, 4641,
+     4636, 4622, 4624, 4639, 6320, 4640, 4642, 4648, 6320, 4643,
+     4655, 4650, 4651, 6320, 4657, 4658, 4653, 4660, 6320, 4662,
+     4665, 4669, 4667, 4670, 4671, 4673, 4677, 4680, 4681, 4682,
+     4683, 4684, 4696, 4698, 4700, 4702, 4692, 4688, 4705, 4707,
+     4711, 4709, 4713, 4714, 4715, 4717, 4718, 4720, 4723, 4724,
+     4726, 4729, 4727, 4728, 4740, 4730, 4732, 4742, 4744, 4733,
+     4743, 4747, 4746, 4751, 4749, 4754, 4757, 4756, 4758, 6320,
+     4762, 4764, 4767, 4769, 4768, 4774, 4776, 4778, 4784, 4787,
+     6320, 4791, 6320, 4793, 4785, 4789, 4795, 4796, 6320, 4797,
 
-     4797, 4796, 4799, 4798, 4800, 4801, 4804, 4805, 4809, 4812,
-     6299, 4817, 6299, 4806, 4821, 4826, 6299, 4822, 4833, 4829,
-     4834, 4835, 4836, 4837, 4838, 4841, 4839, 4844, 4846, 4848,
-     4853, 4850, 4861, 4868, 4854, 4863, 4864, 4865, 4867, 4869,
-     4871, 4873, 4880, 4882, 4886, 6299, 4874, 6299, 4881, 4877,
-     4888, 4891, 4892, 4894, 4898, 6299, 6299, 4895, 4899, 4904,
-     4901, 4905, 4907, 4908, 6299, 4909, 4918, 4920, 4913, 6299,
-     4910, 4921, 4927, 4929, 6299, 4930, 4931, 4932, 4934, 4935,
-     4938, 4939, 4943, 4945, 4946, 4949, 6299, 6299, 6299, 6299,
-     4950, 4953, 4956, 4957, 4959, 4960, 4962, 4964, 4965, 6299,
+     4798, 4799, 4802, 4801, 4804, 4805, 4806, 4809, 4812, 4818,
+     6320, 4829, 4808, 6320, 4813, 4825, 4832, 6320, 4833, 4837,
+     4820, 4839, 4840, 4841, 4843, 4844, 4848, 4846, 4850, 4852,
+     4845, 4853, 4855, 4867, 4874, 4858, 4860, 4869, 4872, 4870,
+     4871, 4873, 4879, 4883, 4884, 4893, 6320, 4880, 6320, 4885,
+     4887, 4889, 4895, 4897, 4896, 4898, 6320, 6320, 4900, 4904,
+     4909, 4903, 4905, 4911, 4686, 6320, 4912, 4921, 4914, 4919,
+     6320, 4922, 4924, 4926, 4929, 6320, 4930, 4931, 4934, 4936,
+     4933, 4948, 4945, 4949, 4939, 4941, 4957, 6320, 6320, 6320,
+     6320, 4959, 4943, 4962, 4951, 4954, 4963, 4966, 4969, 4970,
 
-     4967, 6299, 6299, 4968, 4974, 4976, 4977, 4978, 4981, 4983,
-     4985, 6299, 4984, 4989, 4991, 4987, 4998, 5004, 5006, 4988,
-     5007, 5001, 5008, 5015, 5011, 5013, 5010, 5017, 5021, 5024,
-     6299, 6299, 5018, 5028, 5029, 5036, 5033, 5034, 5037, 5046,
-     5041, 5042, 5043, 5044, 5048, 5049, 5060, 5061, 5053, 5050,
-     6299, 5063, 5064, 6299, 5057, 6299, 5066, 5072, 5065, 5073,
-     5075, 5076, 5078, 5080, 6299, 6299, 5087, 5082, 6299, 6299,
-     5074, 5090, 5092, 5095, 5096, 5091, 5097, 5099, 5101, 6299,
-     5102, 6299, 5103, 5104, 5106, 5107, 5119, 5122, 5124, 5126,
-     5121, 5109, 6299, 5127, 5128, 6299, 5130, 5131, 5133, 6299,
+     6320, 4974, 6320, 6320, 4971, 4977, 4978, 4979, 4980, 4981,
+     4986, 4983, 6320, 4987, 4989, 4993, 4990, 4997, 5004, 5007,
+     5001, 5009, 4999, 5010, 5018, 5011, 5019, 5015, 5021, 5023,
+     5025, 6320, 6320, 5027, 5032, 5033, 5035, 5037, 5038, 5039,
+     5047, 5044, 5045, 5046, 5049, 5051, 5052, 5060, 5062, 5058,
+     5057, 6320, 5061, 5065, 5068, 6320, 5066, 6320, 5067, 5074,
+     5075, 5076, 5081, 5082, 5083, 5085, 6320, 6320, 5086, 5092,
+     6320, 6320, 5087, 5088, 5095, 5097, 5099, 5100, 5101, 5103,
+     5104, 6320, 5105, 6320, 5107, 5111, 5113, 5110, 5125, 5128,
+     5130, 5132, 5121, 5133, 6320, 5117, 5134, 6320, 5136, 5137,
 
-     5137, 5135, 5140, 5143, 6299, 5147, 5150, 5144, 6299, 5152,
-     6299, 5155, 5156, 5157, 5164, 6299, 5159, 5165, 6299, 5168,
-     5171, 5173, 5172, 6299, 5160, 6299, 5162, 5181, 5183, 5187,
-     5174, 5191, 5188, 5177, 5192, 5199, 5197, 5194, 6299, 6299,
-      135, 5208, 5200, 5204, 5205, 5203, 5216, 5211, 5213, 5215,
-     6299, 6299, 5221, 6299, 5212, 5219, 6299, 5218, 5227, 5228,
-     5231, 5232, 5233, 5234, 5238, 5240, 5241, 5242, 5244, 5246,
-     5256, 5263, 5247, 5260, 5267, 5269, 5271, 5273, 5261, 5275,
-     5276, 5278, 5279, 5281, 5282, 5283, 5285, 6299, 5288, 5289,
-     5284, 6299, 5294, 5290, 5300, 5301, 6299, 5308, 5309, 5310,
+     5139, 6320, 5141, 5143, 5145, 5149, 6320, 5153, 5146, 5155,
+     6320, 5157, 6320, 5158, 5159, 5162, 5169, 6320, 5165, 5166,
+     6320, 5171, 5173, 5176, 5175, 6320, 5177, 6320, 5180, 5182,
+     5183, 5187, 5189, 5191, 5192, 5193, 5194, 5202, 5198, 5199,
+     6320, 6320,  135, 5207, 5209, 5210, 5213, 5212, 5220, 5215,
+     5217, 5223, 6320, 6320, 5219, 6320, 5226, 5225, 6320, 5216,
+     5235, 5236, 5227, 5242, 5231, 5239, 5229, 5251, 5246, 5252,
+     5248, 5253, 5256, 5254, 5267, 5258, 5269, 5270, 5273, 5275,
+     5278, 5265, 5280, 5282, 5283, 5284, 5286, 5287, 5288, 5290,
+     6320, 5293, 5294, 5289, 6320, 5299, 5304, 5301, 5312, 6320,
 
-     5311, 6299, 5295, 5315, 5312, 5317, 5235, 5328, 5321, 5323,
-     5325, 6299, 6299, 6299, 5330, 5337, 6299, 5339, 5331, 5324,
-     5333, 6299, 5341, 5340, 6299, 6299, 5342, 5344, 5343, 5354,
-     6299, 5346, 6299, 5347, 6299, 5355, 5356, 5364, 5357, 6299,
-     5369, 5371, 6299, 5377, 5379, 5381, 5373, 5370, 5383, 5384,
-     6299, 5391, 5387, 5388, 5395, 5386, 5396, 5397, 5398, 5399,
-     5406, 5401, 5410, 6299, 5407, 5414, 5415, 5412, 5405, 5416,
-     5421, 6299, 5423, 6299, 5425, 5427, 5428, 5430, 5429, 5433,
-     5434, 5443, 5435, 5436, 5437, 5447, 5449, 6299, 5451, 5456,
-     6299, 5453, 6299, 5458, 6299, 5459, 5460, 5461, 5462, 6299,
+     5306, 5313, 5314, 5315, 6320, 5316, 5319, 5321, 5320, 5326,
+     5333, 5330, 5328, 5331, 6320, 6320, 6320, 5339, 5346, 6320,
+     5348, 5336, 5338, 5340, 6320, 5342, 5349, 6320, 6320, 5352,
+     5353, 5354, 5365, 6320, 5355, 6320, 5357, 6320, 5364, 5366,
+     5372, 5370, 6320, 5375, 5381, 6320, 5384, 5387, 5389, 5390,
+     5356, 5391, 5392, 6320, 5400, 5393, 5396, 5403, 5395, 5404,
+     5405, 5406, 5407, 5414, 5409, 5418, 6320, 5415, 5422, 5423,
+     5420, 5412, 5424, 5429, 5430, 6320, 5433, 6320, 5435, 5436,
+     5437, 5438, 5440, 5442, 5360, 5446, 5443, 5445, 5453, 5455,
+     5457, 6320, 5459, 5465, 6320, 5460, 6320, 5467, 6320, 5462,
 
-     5465, 5466, 5469, 5470, 6299, 5471, 5473, 5478, 5480, 6299,
-     6299, 5481, 5488, 5485, 5483, 5494, 5496, 5484, 5499, 5491,
-     5500, 5503, 5512, 5507, 5508, 5510, 5514, 5359, 5515, 6299,
-     6299, 6299, 5517, 5511, 5525, 5522, 5524, 5534, 5532, 6299,
-     5533, 5536, 5537, 5539, 5546, 5543, 5545, 6299, 5541, 5547,
-     5548, 5549, 5552, 5555, 5554, 6299, 5557, 5567, 5559, 5568,
-     5570, 5572, 5577, 5579, 5569, 5586, 5583, 6299, 5585, 6299,
-     6299, 5581, 6299, 5587, 5589, 5590, 5591, 6299, 5594, 5596,
-     5597, 5598, 5602, 5604, 6299, 5605, 5606, 5608, 5613, 6299,
-     6299, 5615, 6299, 5620, 5616, 5622, 5629, 5625, 5624, 5631,
+     5468, 5469, 5470, 6320, 5472, 5473, 5474, 5477, 6320, 5482,
+     5480, 5486, 5488, 6320, 6320, 5489, 5498, 5490, 5491, 5500,
+     5502, 5503, 5507, 5504, 5508, 5510, 5518, 5514, 5516, 5511,
+     5520, 5521, 5534, 6320, 6320, 6320, 5525, 5522, 5538, 5540,
+     5541, 5549, 5527, 6320, 5546, 5548, 5550, 5552, 5559, 5556,
+     5558, 6320, 5554, 5560, 5536, 5562, 5564, 5565, 5568, 5567,
+     6320, 5570, 5580, 5577, 5581, 5583, 5586, 5590, 5592, 5587,
+     5599, 5596, 6320, 5598, 6320, 6320, 5600, 6320, 5594, 5602,
+     5603, 5604, 6320, 5607, 5608, 5609, 5611, 5615, 5618, 6320,
+     5627, 5610, 5612, 5623, 6320, 6320, 5633, 6320, 5635, 5636,
 
-     5628, 6299, 5634, 5635, 5638, 5639, 5640, 6299, 5641, 5642,
-     5644, 5645, 6299, 5648, 5647, 5650, 5652, 5653, 6299, 5657,
-     5656, 5675, 5672, 6299, 5659, 5670, 6299, 6299, 5681, 5685,
-     5674, 6299, 6299, 6299, 5682, 5671, 5689, 6299, 5692, 5696,
-     5700, 5704, 5695, 6299, 5706, 5703, 5708, 6299, 6299, 5707,
-     5709, 5710, 5712, 6299, 6299, 5713, 5716, 5714, 5717, 5719,
-     6299, 5724, 5728, 5730, 5733, 5736, 5725, 5739, 5741, 5749,
-     5751, 5746, 5747, 5752, 5754, 5755, 5756, 5758, 5767, 5763,
-     5765, 5777, 5774, 6299, 6299, 5781, 5783, 5778, 6299, 6299,
-     5785, 5789, 5791, 5793, 5795, 5797, 5799, 6299, 5800, 5802,
+     5626, 5643, 5638, 5639, 5645, 5646, 6320, 5642, 5648, 5649,
+     5652, 5653, 6320, 5655, 5656, 5657, 5658, 6320, 5661, 5660,
+     5665, 5666, 5667, 6320, 5669, 5670, 5686, 5684, 6320, 5671,
+     5688, 5681, 6320, 6320, 5696, 5698, 5699, 6320, 6320, 6320,
+     5700, 5673, 5702, 6320, 5707, 5711, 5715, 5719, 5710, 6320,
+     5721, 5704, 5718, 6320, 6320, 5723, 5724, 5725, 5727, 6320,
+     6320, 5728, 5729, 5731, 5733, 5734, 6320, 5737, 5738, 5739,
+     5746, 5751, 5741, 5752, 5754, 5765, 5767, 5748, 5760, 5758,
+     5769, 5771, 5762, 5778, 5786, 5782, 5784, 5790, 5792, 5793,
+     6320, 6320, 5795, 5797, 5799, 6320, 6320, 5801, 5803, 5805,
 
-     5803, 5804, 5766, 6299, 5805, 5807, 5808, 5813, 5810, 5814,
-     5817, 5819, 6299, 6299, 5811, 5825, 5660, 5820, 5827, 6299,
-     5830, 5837, 5834, 5835, 5836, 5838, 5841, 6299, 5843, 5842,
-     6299, 6299, 5839, 6299, 6299, 5844, 6299, 6299, 6299, 6299,
-     6299, 6299, 6299, 5847, 6299, 5846, 5853, 5861, 5863, 6299,
-     5858, 5864, 5768, 5865, 5866, 6299, 5867, 5868, 5869, 5875,
-     5871, 5882, 5876, 5872, 5878, 5884, 5887, 5888, 5892, 5893,
-     5894, 5897, 5898, 5899, 6299, 6299, 6299, 5895, 5906, 5908,
-     5910, 5914, 5916, 5921, 5923, 5911, 5924, 5925, 5927, 5929,
-     5931, 5933, 5941, 5936, 5937, 5938, 5939, 5946, 5952, 5940,
+     5807, 5810, 5812, 5814, 6320, 5815, 5817, 5818, 5819, 5820,
+     6320, 5768, 5822, 5770, 5823, 5825, 5828, 5826, 5833, 6320,
+     6320, 5830, 5835, 5834, 5842, 5839, 6320, 5844, 5851, 5849,
+     5850, 5846, 5852, 5853, 6320, 5856, 5858, 6320, 6320, 6320,
+     5859, 6320, 6320, 5854, 6320, 6320, 6320, 6320, 6320, 6320,
+     6320, 5861, 6320, 5866, 5872, 5876, 5878, 6320, 5868, 5873,
+     5881, 5883, 5884, 6320, 5886, 5888, 5887, 5893, 5889, 5896,
+     5894, 5900, 5890, 5901, 5902, 5905, 5906, 5910, 5911, 5913,
+     5914, 5916, 6320, 6320, 6320, 5912, 5923, 5925, 5928, 5930,
+     5935, 5939, 5941, 5931, 5933, 5942, 5944, 5946, 5947, 5948,
 
-     5942, 5954, 6299, 5947, 6299, 5957, 6299, 6299, 5964, 5965,
-     5960, 5958, 5973, 5976, 5969, 5971, 5972, 5974, 5981, 5986,
-     6299, 6299, 5978, 5982, 6299, 5987, 5988, 6299, 5989, 5990,
-     5993, 5994, 5997, 5996, 5998, 6000, 6014, 6299, 6299, 6004,
-     6008, 6006, 6017, 6018, 6027, 6019, 6028, 6029, 6030, 6022,
-     6037, 6299, 6039, 6040, 6043, 6299, 6032, 6044, 6046, 6047,
-     6048, 6055, 6050, 6051, 6299, 6056, 6299, 6059, 6061, 6060,
-     6052, 6062, 6072, 6074, 6077, 6076, 6299, 6054, 6078, 6068,
-     6083, 6090, 6088, 6092, 6086, 6095, 6096, 6098, 6103, 6097,
-     6106, 6107, 6109, 6108, 6299, 6111, 6112, 6299, 6115, 6116,
+     5958, 5954, 5955, 5956, 5957, 5960, 5965, 5966, 5969, 5971,
+     6320, 5974, 6320, 5962, 6320, 6320, 5976, 5978, 5982, 5973,
+     5991, 5993, 5983, 5986, 5984, 5995, 6002, 6005, 6320, 6320,
+     5994, 5996, 6320, 5998, 6006, 6320, 6007, 6008, 6009, 6011,
+     6017, 6014, 6018, 6020, 6022, 6320, 6320, 6019, 6026, 6029,
+     6032, 6035, 6042, 6037, 6041, 6045, 6047, 6034, 6049, 6320,
+     6055, 6051, 6058, 6320, 6059, 6060, 6061, 6062, 6064, 6071,
+     6066, 6067, 6320, 6069, 6320, 6073, 6075, 6077, 6074, 6076,
+     6078, 6088, 6092, 6086, 6320, 6090, 6100, 6094, 6102, 6104,
+     6106, 6107, 6096, 6109, 6112, 6118, 6122, 6119, 6123, 6110,
 
-     6117, 6118, 6122, 6299, 6125, 6119, 6128, 6129, 6133, 6134,
-     6299, 6140, 6143, 6144, 6299, 6145, 6299, 6299, 6148, 6135,
-     6146, 6156, 6158, 6299, 6299, 6299, 6179, 6186, 6193, 6200,
-     6207, 6214, 6221,   88, 6228, 6235, 6242, 6249, 6256, 6263,
-     6270, 6277, 6284, 6291
+     6127, 6124, 6320, 6134, 6125, 6320, 6131, 6135, 6128, 6137,
+     6138, 6320, 6142, 6145, 6146, 6148, 6151, 6152, 6320, 6154,
+     6158, 6155, 6320, 6161, 6320, 6320, 6163, 6160, 6167, 6170,
+     6172, 6320, 6320, 6320, 6200, 6207, 6214, 6221, 6228, 6235,
+     6242,   88, 6249, 6256, 6263, 6270, 6277, 6284, 6291, 6298,
+     6305, 6312
     } ;
 
-static const flex_int16_t yy_def[3245] =
+static const flex_int16_t yy_def[3253] =
     {   0,
-     3226,    1, 3227, 3227, 3228, 3228, 3229, 3229, 3230, 3230,
-     3231, 3231, 3232, 3232, 3233, 3233, 3226, 3234, 3226, 3226,
-     3226, 3226, 3235, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3236, 3226, 3226, 3226,
-     3236, 3237, 3226, 3226, 3226, 3237, 3238, 3226, 3226, 3226,
-     3226, 3238, 3239, 3226, 3226, 3226, 3239, 3240, 3226, 3241,
-     3226, 3240, 3240, 3242, 3226, 3226, 3226, 3226, 3242, 3243,
-     3226, 3226, 3226, 3243, 3234, 3234, 3226, 3244, 3235, 3244,
-     3235, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234,    1, 3235, 3235, 3236, 3236, 3237, 3237, 3238, 3238,
+     3239, 3239, 3240, 3240, 3241, 3241, 3234, 3242, 3234, 3234,
+     3234, 3234, 3243, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3244, 3234, 3234, 3234,
+     3244, 3245, 3234, 3234, 3234, 3245, 3246, 3234, 3234, 3234,
+     3234, 3246, 3247, 3234, 3234, 3234, 3247, 3248, 3234, 3249,
+     3234, 3248, 3248, 3250, 3234, 3234, 3234, 3234, 3250, 3251,
+     3234, 3234, 3234, 3251, 3242, 3242, 3234, 3252, 3243, 3252,
+     3243, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3236, 3236, 3237,
-     3237, 3238, 3238, 3226, 3239, 3239, 3240, 3240, 3241, 3241,
-     3240, 3242, 3242, 3226, 3243, 3243, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3244, 3244, 3245,
+     3245, 3246, 3246, 3234, 3247, 3247, 3248, 3248, 3249, 3249,
+     3248, 3250, 3250, 3234, 3251, 3251, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3240, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3240, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3248, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3240, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3248, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3240, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3226, 3226, 3234, 3226, 3226, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3234, 3234, 3242, 3234, 3234, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3240, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3240, 3240, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3248, 3248, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3240, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3248, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3226, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3240, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3248, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3240, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3248, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3226, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3240, 3234, 3226, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3226, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3234, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3226, 3226, 3234, 3226, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
+     3242, 3234, 3234, 3242, 3234, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
 
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3240, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3226,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3240,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3226,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3226, 3226, 3234, 3226, 3234, 3226, 3234, 3234, 3226,
+     3242, 3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3248,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3242, 3234, 3234, 3242, 3234, 3242, 3234, 3242, 3242, 3234,
 
-     3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3240, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
+     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3248, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
 
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3226, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3226, 3226, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3234, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3234,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3226, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3240, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3226, 3234, 3234, 3226, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3226, 3234, 3234, 3234, 3226,
+     3234, 3242, 3234, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3248,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242,
+     3234, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242,
 
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3226, 3234,
-     3226, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3226,
-     3240, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3226, 3234, 3226, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
+     3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3234, 3248, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3234, 3242, 3234, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234,
 
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3226, 3226, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3226, 3226, 3234, 3234, 3234, 3234,
-     3226, 3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3226, 3234, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3234, 3234, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3234, 3242,
+     3242, 3242, 3242, 3234, 3242, 3234, 3242, 3234, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3234, 3242, 3234, 3242, 3234, 3242,
 
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3226, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3226,
-     3226, 3234, 3226, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
-     3226, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3234, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3234, 3234, 3242, 3234, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3242, 3234, 3234, 3242, 3234, 3242, 3242,
 
-     3234, 3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3226, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3226, 3226, 3234, 3234,
-     3234, 3226, 3226, 3226, 3234, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3226, 3226, 3234,
-     3234, 3234, 3234, 3226, 3226, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3226, 3226, 3234, 3234, 3234, 3226, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3234, 3234, 3242, 3242, 3242, 3234, 3234, 3234,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242, 3242, 3234,
+     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3234, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3226, 3226, 3234, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234,
-     3226, 3226, 3234, 3226, 3226, 3234, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3234, 3226, 3234, 3234, 3234, 3234, 3226,
-     3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3226, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3234, 3234,
+     3242, 3234, 3234, 3242, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3234, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3226, 3234, 3226, 3234, 3226, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3226, 3234, 3234, 3226, 3234, 3234, 3226, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3226, 3226, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3226, 3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3226, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3226, 3234, 3234, 3226, 3234, 3234,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3234, 3242, 3234, 3242, 3234, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234,
+     3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
 
-     3234, 3234, 3234, 3226, 3234, 3234, 3234, 3234, 3234, 3234,
-     3226, 3234, 3234, 3234, 3226, 3234, 3226, 3226, 3234, 3234,
-     3234, 3234, 3234, 3226, 3226,    0, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226
+     3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3242, 3242, 3234, 3242, 3234, 3234, 3242, 3242, 3242, 3242,
+     3242, 3234, 3234,    0, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234
     } ;
 
-static const flex_int16_t yy_nxt[6340] =
+static const flex_int16_t yy_nxt[6361] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1954,7 +1957,7 @@ static const flex_int16_t yy_nxt[6340] =
      2237, 2239, 2242, 2244, 2250,   86, 2249,   86,   86,   86,
      2246,   86, 2252,   86, 2255, 2258,   86,   86,   86, 2253,
        86,   86,   86, 2251, 2256, 2259,   86, 2254,   86,   86,
-       86, 2257,   86, 3226,   86,   86,   86, 2260, 2271, 2261,
+       86, 2257,   86, 3234,   86,   86,   86, 2260, 2271, 2261,
      2270, 2266, 2272,   86, 2262, 2264, 2263, 2268, 2269, 2265,
        86, 2267,   86,   86,   86, 2273, 2274,   86,   86, 2278,
      2279,   86, 2280,   86,   86, 2275,   86,   86, 2276,   86,
@@ -1985,207 +1988,209 @@ static const flex_int16_t yy_nxt[6340] =
      2391,   86,   86, 2392,   86, 2389, 2393,   86,   86, 2395,
      2396, 2394, 2397,   86, 2399,   86,   86,   86,   86,   86,
      2401,   86, 2398,   86,   86,   86, 2405,   86, 2406,   86,
-       86, 2400,   86, 2402,   86, 2408, 2409, 2403, 2414,   86,
-       86, 2407, 2410, 2404, 2411,   86,   86, 2413,   86,   86,
-       86, 2412,   86, 2416, 2417,   86,   86, 2419,   86,   86,
-     2415,   86,   86, 2418,   86, 2423, 2426,   86,   86, 2425,
-       86,   86,   86, 2422, 2427,   86, 2420,   86, 2421,   86,
-     2430,   86, 2424,   86, 2435, 2428, 2434,   86,   86, 2429,
+       86, 2400,   86, 2402,   86, 2408, 2409, 2403, 2415,   86,
+       86, 2407, 2410, 2404, 2411,   86,   86, 2413, 2418,   86,
+       86, 2412, 2414,   86, 2417,   86,   86,   86,   86,   86,
+     2416, 2420,   86,   86,   86, 2427, 2424,   86, 2419, 2426,
+       86,   86,   86, 2423,   86,   86, 2428, 2421, 2422, 2431,
+       86,   86,   86, 2425, 2436, 2429,   86, 2435,   86,   86,
 
-       86, 2432, 2431, 2433,   86, 2436, 2437, 2438,   86, 2439,
-       86,   86, 2442, 2440,   86, 2444,   86,   86, 2443, 2446,
-       86,   86, 2448,   86, 2441,   86, 2447,   86, 2445,   86,
-       86,   86,   86,   86,   86, 2452, 2458, 2454, 2455, 2456,
-       86, 2450,   86, 2449,   86, 2451, 2457,   86,   86, 2459,
-     2460,   86,   86,   86, 2465,   86, 2462, 2453,   86,   86,
-       86,   86, 2467, 2470,   86, 2464, 2461, 2466,   86,   86,
-       86, 2463, 2471,   86, 2474, 2469,   86, 2468, 2475,   86,
-     2472, 2476,   86,   86,   86,   86,   86, 2480, 2473, 2479,
-       86,   86, 2478,   86,   86, 3226,   86,   86, 2483, 2484,
+       86, 2430, 2433,   86, 2437, 2438, 2432, 2434,   86, 2440,
+       86, 2445, 2439, 2441,   86, 2443,   86,   86,   86,   86,
+     2444, 2447,   86, 2449,   86, 2442,   86,   86, 2448,   86,
+     2446,   86,   86,   86,   86,   86, 2453,   86, 2455, 2456,
+     3234, 2451, 2457,   86, 2450, 2452, 2458,   86, 2459,   86,
+     2460, 2461,   86,   86,   86,   86,   86, 2463, 2454, 2462,
+     2466,   86, 2468,   86,   86, 2467,   86, 2465,   86, 2471,
+       86,   86, 2464,   86, 2472,   86, 2475, 2476,   86, 2470,
+       86, 2469,   86,   86,   86, 2473,   86, 2477, 2481, 2480,
+       86, 2474, 2479,   86,   86,   86,   86,   86, 2478,   86,
 
-     2477, 2486, 2487,   86, 2481, 2482, 2488,   86, 2489,   86,
-     2490,   86,   86, 2485,   86, 2492,   86, 2494,   86, 2493,
-       86, 2495,   86,   86, 2491,   86, 2500,   86,   86,   86,
-     2496, 2502,   86,   86, 2497, 2503,   86,   86,   86,   86,
-     2504, 2499,   86, 2498, 2506, 2505,   86, 2501,   86,   86,
-     2507, 2509, 2512,   86,   86,   86,   86,   86, 2513, 2508,
-       86,  168, 2510,   86, 2520,   86,   86,   86, 2511, 2516,
-       86,   86,   86, 2519, 2518, 2515, 2521,   86, 3226,   86,
-     2514, 2517, 2527, 2524,   86, 2522, 2523,   86, 2525, 2529,
-       86, 2528, 2530, 2531,   86, 2526, 2532,   86,   86, 2533,
+     2485,   86, 2487, 2599, 2482,   86, 2484, 2483, 2488,   86,
+     2489,   86, 2490,   86, 2491,   86, 2486, 2492,   86, 2493,
+       86, 2495,   86, 2494,   86, 2496,   86,   86,   86, 2501,
+       86,   86, 2503,   86, 2497, 2504,   86,   86, 2498,   86,
+       86,   86,   86,   86, 2500,   86,   86, 2499, 2505, 2507,
+     2502, 2506, 2508,   86, 2513,   86,   86,   86, 2510,   86,
+       86, 2509,  168, 2511,   86, 2512, 2514,   86, 2521,   86,
+       86,   86, 2515, 2517, 2520,   86, 2516,   86, 2519, 2522,
+       86,   86,   86, 2518, 2523, 2528, 2524,   86, 3234,   86,
+     2532,   86, 2530, 2525, 2531, 2529, 2533,   86,   86, 2526,
 
-       86, 2534,   86, 2535,   86,   86,   86,   86, 2536,   86,
-       86,   86,   86,   86,   86, 2537, 2546,   86,   86,   86,
-     2544, 2539,   86, 3226, 2538,   86, 2550, 2540, 2541, 2551,
-       86, 2542, 2543, 2545,   86,   86, 2548, 2547, 2554,   86,
-     2549, 2552,   86, 2553, 2555, 2556,   86,   86,   86,   86,
-       86,   86,   86, 3226,   86, 2559, 2565,   86, 2566,   86,
-     2557,   86, 2569,   86, 2560, 2558,   86,   86, 2561, 2562,
-     2563, 2564, 2568, 2570,   86, 2571,   86,   86,   86, 2567,
-       86,   86,   86, 2575,   86, 2572,   86,   86, 2579, 2578,
-       86, 2573, 2580,   86,   86,   86, 2574, 2581, 2582,   86,
+       86, 2534,   86, 2527,   86, 2535,   86, 2536,   86,   86,
+       86,   86,   86, 2538,   86,   86, 2537,   86,   86,   86,
+     2547,   86,   86, 2545, 2540,   86,   86, 2539, 3234, 2542,
+     2541,   86, 2551,   86, 2543, 2544, 2553, 2546,   86, 2548,
+     2549, 2552,   86, 2550, 2556,   86,   86, 2555, 2554, 2558,
+       86, 2559,   86,   86,   86, 2557,   86,   86,   86,   86,
+     2561,   86, 2567,   86, 2568,   86,   86, 2571,   86, 2562,
+     2560,   86, 2570,   86, 2563, 2564, 2569, 2565, 2566, 2572,
+       86, 2573,   86,   86,   86,   86,   86,   86, 2575, 2574,
+     2577, 2580,   86,   86, 2581, 2582,   86,   86,   86, 2583,
 
-     2576,   86, 2577, 2584,   86,   86, 2583,   86,   86, 2585,
-     2588,   86,   86, 2586,   86, 2592, 2593,   86,   86, 2596,
-       86,   86,   86,   86, 2587, 2597,   86, 2589, 2591, 2594,
-     2590,   86, 2600,   86,   86, 2599, 2595, 2598, 2602, 2601,
-       86, 2605,   86,   86,   86,   86, 2609,   86,   86, 2608,
-     2611,   86,   86, 2607, 2603, 2606,   86, 2612,   86,   86,
-     2604, 2616,   86,   86, 2617, 2613,   86, 2610, 2619,   86,
-       86, 2615,   86,   86, 2614,   86, 2624,   86,   86, 2626,
-       86,   86, 2622, 2620, 2623, 2621, 2627,   86, 2618,   86,
-       86,   86, 2628, 2625,   86, 2630,   86,   86,   86, 2631,
+       86, 2576,   86, 2578, 2579, 2584,   86, 2586,   86,   86,
+       86,   86, 2585,   86, 2588, 2590,   86,   86,   86, 2587,
+     2594, 2595,   86, 2598,   86,   86, 2602,   86, 2589, 2591,
+     2592, 2596,   86, 2593,   86,   86, 2597,   86, 2601,   86,
+     2600, 2607,   86,   86,   86, 2603,   86,   86, 2611,   86,
+     2604, 2610,   86, 2609,   86, 2608,   86, 2605,   86, 2606,
+     2613,   86,   86, 2614,   86, 2612, 2617,   86, 2616, 2618,
+       86, 2615,   86, 2619, 2621,   86,   86, 2622, 2620,   86,
+     2623, 2626,   86,   86,   86, 2624, 2628,   86, 2625, 2629,
+       86,   86,   86,   86,   86, 2630,   86, 2632, 2627,   86,
 
-       86,   86,   86, 2629,   86, 2633, 2634, 2636, 2642, 2637,
-     2639,   86, 2635, 2632,   86, 2638, 2640,   86, 2641,  168,
-       86,   86, 2646,   86,   86, 2643,   86, 2648,   86, 2647,
-       86,   86, 2644, 2651,   86, 2650, 2652,   86, 2649, 2645,
-     2654,   86,   86, 2656, 2653, 2655,   86,   86, 2657,   86,
-       86, 2658, 2659, 2661,   86,   86,   86,   86, 2662,   86,
-     2663,   86,   86,   86, 2660, 2664,   86, 2668, 2669, 2666,
-       86, 2670, 2665,   86,   86, 2671,   86,   86,   86,   86,
-     2673, 2672, 2674, 2667, 2675,   86,   86,   86,   86,   86,
-     2676,   86, 2681,   86, 2683,   86, 2677, 2679, 2680, 2678,
+       86, 2633,   86,   86, 2636, 2631,   86, 2638, 2635, 2641,
+       86, 2639,   86, 2634,   86, 2637, 2642,   86, 2640, 2643,
+      168, 2644,   86,   86,   86, 2648, 3234, 2645,   86, 2649,
+     2646,   86,   86, 2650,   86, 2653,   86, 2654,   86, 2652,
+       86, 2647, 2658, 2651, 2656,   86,   86, 2659,   86, 2657,
+       86,   86,   86, 2655, 2663, 2660, 2661,   86,   86,   86,
+       86, 2664,   86, 2665,   86,   86, 2662, 2670, 2666, 2671,
+       86,   86, 2668,   86,   86,   86, 2672, 2667,   86,   86,
+       86,   86, 2673, 2675, 2676, 2678, 2669,   86,   86,   86,
+     2674, 2677, 2679, 2686,   86,   86,   86, 2684,   86,   86,
 
-       86, 2684, 2682,   86,   86,   86, 2685, 2688,   86,   86,
-       86, 2692,   86, 2690,   86,   86,   86,   86, 2697,   86,
-       86, 2696,   86, 2686, 2687, 2691, 2699, 2704, 2689, 2700,
-     2694, 2701,   86, 2693,   86,   86, 2695,   86, 2702,   86,
-       86,   86, 2703,   86,   86, 2698,   86, 2707,   86, 2705,
-       86, 2710, 2712,   86, 2706, 2713,   86,   86, 2708, 2714,
-       86, 2709, 2716,   86, 2717,   86, 2711, 2715,   86,   86,
-       86, 2721,   86,   86, 2719,   86, 2722,   86,   86, 2724,
-     2725,   86, 2720, 2726,   86,   86,   86,   86, 2718, 2727,
-       86, 2729, 2723, 2731,   86, 2730,   86, 2732, 2728, 2733,
+       86,   86, 2681, 2682, 2683,   86, 2680, 2685,   86, 2691,
+       86, 2687,   86,   86,   86, 2695,   86,   86,   86, 2688,
+       86, 2689, 2693,   86,   86, 2700,   86, 2690, 2699, 2694,
+       86, 2692, 2702, 2697,   86, 2703, 2696, 2704,   86, 2708,
+     2698,   86, 2706,   86, 2705,   86,   86,   86, 2701,   86,
+       86, 2707,   86, 2710,   86, 2713,   86, 2715,   86,   86,
+     2709, 2716,   86, 2718, 2711, 2717,   86, 2712,   86, 2720,
+       86,   86,   86, 2719, 2714,   86, 2724, 2722,   86,   86,
+     2727, 2725,   86, 2728,   86, 2729,   86, 2723,   86,   86,
+       86, 2721, 2730,   86, 2734,   86,   86, 2735, 2726, 2736,
 
-       86,   86, 2734, 2735,   86,   86, 2739,   86, 2737, 2740,
-       86, 2741,   86,   86, 2736, 2742,   86,   86,   86, 2738,
-     2743,   86, 2747, 2748,   86,   86,   86, 2751,   86,   86,
-     2750,   86,   86, 2753,   86, 2754, 2744, 2745, 2746, 2752,
-       86,   86, 2757, 2756,   86,   86,   86,   86,   86, 2749,
-     2760,   86, 2764,   86,   86,   86, 2755,   86, 2766,   86,
-       86, 2758, 2759, 2803, 2761, 2763, 2767, 2762, 2765,   86,
-     2771, 2768, 2774,   86,   86, 2772,   86, 2770, 2769, 2773,
-       86, 2775,   86, 2776,   86, 2777,   86, 2778,   86,   86,
-     2779,   86,   86, 2780,   86,   86,   86,   86,   86, 2784,
+       86, 2731,   86, 2738,   86,   86,   86,   86, 2732, 2742,
+     2743,   86,   86, 2733, 2745,   86, 2744, 2737, 2739, 2746,
+       86, 2741,   86,   86, 2740,   86,   86, 2751,   86,   86,
+       86, 2750,   86,   86, 2753, 2754,   86, 2755,   86,   86,
+       86, 2757,   86, 2748,   86, 2747, 2749, 2756,   86,   86,
+     2760, 2759,   86, 2752, 2758,   86, 2766, 2761, 2762,   86,
+     2763,   86, 2764, 2767,   86,   86,   86,   86, 2769,   86,
+     2774,   86, 2765, 2768, 2775, 2771, 2770, 2773,   86, 2776,
+       86, 2778,   86,   86, 2779, 2772,   86, 2780,   86, 2781,
+     2777,   86, 2782,   86, 2783,   86,   86,   86, 2784,   86,
 
-     2788,   86,   86,   86, 2785, 2789, 2791,   86,   86, 2781,
-     2792, 2783, 2793,   86,   86, 2790, 2786, 2782, 2787, 2794,
-     2795,   86,   86,   86,   86,   86, 2799, 2800,   86, 2801,
-       86, 2796, 2797, 2798,   86, 2804,   86,   86,   86, 2802,
-     2805,   86, 2808,   86,   86, 2807,   86, 2806, 2809, 2810,
-       86, 2811,   86,   86,   86,   86,   86,   86, 2812,   86,
-       86, 2820, 2813, 2815, 2814, 2816, 2818,   86,   86,   86,
-       86, 2821,   86, 2823, 2824, 2903, 2819,   86, 2825, 2826,
-     2817, 2822,   86,   86,   86, 2828,   86, 2827, 2829, 2830,
-       86, 2831,   86, 2832,   86, 2833,   86,   86, 2837,   86,
+       86,   86,   86,   86, 2788, 2792,   86,   86, 3234, 2789,
+     2793, 2795,   86, 2797,   86, 2785, 2787,   86, 2799,   86,
+     2794, 2790, 2786, 2791, 2796,   86,   86,   86,   86,   86,
+     2798, 2804,   86,   86,   86, 2800, 2801, 2802, 2805,   86,
+     2808,   86, 2806,   86,   86, 2809,   86, 2803, 2812,   86,
+     2811,   86,   86,   86, 2807,   86, 2810, 2813, 2814,   86,
+     2815,   86,   86, 2816, 2819,   86,   86,   86,   86,   86,
+       86, 2818, 2824,   86, 2820, 2822, 2817,   86,   86,   86,
+     2825, 2868, 2827,   86, 2828,   86, 2829, 2823,   86, 2838,
+     2821, 2826, 2830, 2831,   86, 2832, 2834,   86, 2833, 2835,
 
-       86,   86, 2836, 2834,   86, 2838, 2839, 2840,   86,   86,
-       86,   86,   86, 2846,   86, 2835, 2844, 2841,   86,   86,
-       86, 2842, 2848,   86, 2849,   86, 2852,   86,   86,   86,
-     2845, 2843, 2850, 2851,   86, 2856,   86, 2853,   86, 2847,
-       86,   86,   86,   86, 2854, 2859,   86,   86,   86,   86,
-       86, 2857, 2860, 2858, 2855, 2863,   86, 2865, 2861, 2868,
-       86, 2864,   86, 2870,   86, 2862,   86, 2866, 2871,   86,
-     2873,   86,   86,   86,   86,   86, 2867, 2878,   86,   86,
-     2877, 2869,   86,   86,   86, 2882,   86, 2872, 2874, 2875,
-     2876,   86, 2885,   86,   86, 2887,   86,   86,   86, 2879,
+       86, 2836,   86,   86,   86,   86,   86, 2841,   86,   86,
+     2840, 2842, 2837,   86, 2843, 2844,   86,   86,   86,   86,
+       86, 2850,   86, 2839, 2848,   86, 2845,   86,   86, 2846,
+     2852,   86, 2853,   86, 2856,   86,   86,   86, 2849, 2847,
+     2854, 2855,   86,   86, 2857, 2861,   86, 2851,   86,   86,
+       86,   86, 2858,   86, 2864,   86,   86, 2859,   86,   86,
+     2865, 2862, 2863, 2860, 2869, 2870,   86, 2873,   86, 2866,
+       86, 2875,   86,   86, 2867,   86, 2871, 2876,   86, 2878,
+       86,   86,   86,   86, 2883,   86,   86,   86, 2882, 2874,
+       86, 2879, 2872,   86, 2877,   86, 2887, 2880, 2881,   86,
 
-     2883,   86, 2881, 2888,   86, 2880, 2890,   86, 2891,   86,
-     2884, 2893,   86,   86, 2886, 2895,   86, 2892, 2889, 2898,
-       86,   86, 2896,   86,   86,   86, 2902,   86,   86, 2904,
-       86, 2894, 2907, 2900, 2908,   86, 2897,   86,   86, 2899,
-     2909, 2910, 2905, 2901, 2906,   86,   86,   86, 2913,   86,
-       86, 2912,   86, 2916,   86, 2914,   86, 2919,   86,   86,
-       86,   86,   86, 2911, 2924,   86, 2920,   86,   86, 2927,
-       86, 2915,   86, 2917, 2918, 2923, 2926, 2929, 2921, 2928,
-       86,   86,   86,   86, 2932,   86, 2922, 2925, 2931, 2933,
-       86, 2934,   86, 2936,   86, 2930,   86, 2938,   86,   86,
+     2890,   86,   86,   86,   86, 2892, 2884, 2888, 2893, 2886,
+     2885,   86, 2895,   86, 2896,   86,   86,   86, 2889, 2898,
+       86,   86, 2891,   86,   86, 2903, 2894,   86, 2900,   86,
+     2901,   86, 2907,   86,   86,   86, 2897, 2908,   86, 2899,
+       86, 2905, 3234, 2902, 2906, 2912, 2904,   86, 2909,   86,
+     2910,   86, 2913,   86,   86, 2911, 2915, 2914, 2916,   86,
+     2918,   86,   86,   86, 2917,   86, 2921,   86, 2919,   86,
+     2924,   86,   86,   86, 2927,   86, 2929,   86,   86, 2925,
+       86,   86, 2933,   86, 2920, 2931, 2922, 2923, 2928, 2932,
+       86, 2926, 2934,   86,   86, 2935,   86, 2930, 2938,   86,
 
-       86, 2937,   86,   86,   86, 2943, 2944,   86, 2935,   86,
-       86,   86, 2950, 2939, 2948,   86, 2949,   86,   86,   86,
-     2947,   86, 2940, 2945, 2941, 2942,   86, 2954,   86,   86,
-     2946, 2953, 2955,   86, 2956,   86, 2958,   86,   86, 2951,
-     2952,   86,   86, 2961,   86, 2960, 2962,   86,   86, 2957,
-     2959,   86,   86,   86,   86,   86, 2965,   86,   86, 2967,
-       86,   86, 2968,   86, 2966,   86,   86, 2963, 2964,   86,
-       86, 2977,   86,   86, 2969, 2978, 2973, 2970, 2971, 2972,
-     2974, 2975, 2980,   86,   86,   86, 2976,   86,   86, 2979,
-     2981, 2986, 2982, 2984,   86,   86, 2983, 2985,   86, 3059,
+       86, 2937, 2939,   86, 2940,   86, 2942,   86, 2936,   86,
+     2944,   86,   86,   86, 2943,   86,   86,   86, 2949, 2950,
+       86,   86,   86,   86,   86,   86, 2941, 2954,   86, 2946,
+     2955,   86, 2945, 2953, 2956, 2951,   86, 2947, 2948,   86,
+       86, 2959, 2952, 2957, 2958, 2960,   86, 2961,   86,   86,
+     2964,   86,   86, 2963, 2962,   86,   86, 2967,   86,   86,
+     2966,   86,   86, 2965, 2968,   86,   86, 2971,   86,   86,
+       86,   86, 2973,   86,   86, 2969, 2974, 2972,   86,   86,
+       86, 2970,   86,   86,   86, 2983,   86, 2984, 2975, 2979,
+     2976, 2977, 2978, 2986,   86, 2980, 2981,   86, 3234,   86,
 
-     2987, 2989,   86, 2988, 2990,   86, 2991, 2992,   86,   86,
-     2993, 2994, 2997,   86, 2995, 2996,   86,   86, 2998,   86,
-       86,   86,   86,   86, 3004,   86,   86,   86, 3003,   86,
-       86, 3007,   86, 3226, 2999, 3000, 3006,   86,   86, 3008,
-     3001,   86, 3002,   86, 3012, 3013,   86, 3009, 3014,   86,
-     3011, 3005,   86, 3015,   86, 3010, 3019, 3016, 3021,   86,
-       86, 3020,   86, 3017,   86,   86, 3018,   86,   86,   86,
-     3028,   86, 3025, 3026, 3029, 3023,   86, 3031,   86,   86,
-       86,   86, 3030, 3226, 3022, 3080, 3024,   86, 3027, 3032,
-       86,   86, 3033, 3034,   86, 3035,   86, 3037,   86, 3048,
+     2982,   86, 2987, 2985, 2988, 2995, 2989, 2990, 2991,   86,
+     2992,   86,   86,   86, 2996,   86, 2993,   86, 2994, 2997,
+       86, 2998, 2999,   86,   86, 3000, 3001, 3004,   86, 3002,
+     3003,   86,   86, 3005,   86, 3006,   86,   86,   86, 3011,
+       86,   86,   86, 3010,   86, 3007,   86,   86, 3014, 3013,
+       86,   86,   86, 3019,   86, 3015, 3008, 3009, 3020,   86,
+     3018,   86, 3016, 3021,   86,   86, 3012,   86, 3017, 3022,
+     3023,   86, 3026,   86, 3028,   86, 3024, 3027,   86, 3025,
+       86,   86,   86,   86,   86, 3234, 3029, 3032, 3030, 3033,
+     3035,   86, 3031, 3036, 3034,   86, 3038,   86, 3059,   86,
 
-     3036, 3038,   86, 3039,   86, 3040,   86, 3041,   86, 3042,
-       86, 3043,   86,   86, 3045,   86,   86,   86,   86, 3050,
-       86,   86, 3044,   86,   86, 3046,   86,   86, 3054, 3047,
-       86, 3056,   86,   86, 3060, 3053, 3051, 3049,   86, 3052,
-       86, 3058, 3057,   86, 3063, 3055, 3062,   86,   86,   86,
-       86,   86,   86, 3065,   86,   86,   86,   86, 3061,   86,
-       86, 3064, 3069, 3073, 3070, 3075,   86, 3071, 3066, 3067,
-     3068,   86, 3074, 3076,   86, 3077,   86,   86,   86,   86,
-       86,   86,   86, 3072,   86,   86, 3079, 3085,   86,   86,
-     3086,   86, 3084, 3082, 3078,   86, 3088,   86, 3081, 3087,
+     3057, 3037, 3039,   86, 3040,   86,   86, 3042,   86, 3043,
+       86, 3041,   86, 3045,   86, 3046,   86, 3047,   86, 3048,
+       86, 3044, 3049,   86, 3050,   86, 3051,   86,   86, 3053,
+       86,   86,   86,   86, 3058,   86,   86, 3052,   86,   86,
+     3054,   86, 3062,   86, 3055, 3064,   86,   86,   86, 3060,
+     3061, 3066,   86, 3056, 3063,   86, 3068,   86, 3071,   86,
+     3070, 3065,   86,   86,   86,   86,   86,   86, 3073,   86,
+     3069,   86,   86, 3067,   86, 3077, 3072, 3081, 3074,   86,
+     3078,   86, 3076, 3075, 3083,   86,   86, 3079, 3084,   86,
+     3085,   86, 3082, 3080,   86, 3087,   86,   86, 3088,   86,
 
-       86,   86, 3089, 3083, 3090,   86,   86,   86,   86, 3091,
-       86,   86,   86, 3092, 3095, 3098, 3094, 3100, 3096,   86,
-     3103,   86, 3101,   86,   86, 3093, 3105,   86, 3097,   86,
-     3106, 3099, 3104, 3107,   86, 3108,   86,   86,   86, 3102,
-       86, 3111,   86, 3109,   86, 3112,   86, 3113, 3116,   86,
-       86,   86,   86,   86,   86,   86, 3119, 3110, 3121,   86,
-       86, 3115, 3118, 3117, 3122,   86, 3125,   86, 3123, 3114,
-       86,   86, 3120,   86, 3124, 3126, 3128,   86,   86, 3129,
-     3132, 3130,   86, 3133,   86,   86,   86,   86, 3127,   86,
-     3131,   86, 3137, 3138,   86,   86, 3134, 3135, 3139,   86,
+       86,   86,   86,   86, 3086, 3093,   86,   86, 3094,   86,
+     3096, 3090, 3092,   86,   86,   86, 3089, 3095,   86,   86,
+     3097, 3099, 3091,   86,   86,   86,   86,   86, 3103,   86,
+     3100, 3106, 3098, 3102, 3108, 3104,   86, 3111,   86, 3109,
+     3101,   86, 3113,   86,   86, 3105,   86, 3107,   86, 3114,
+     3112, 3115,   86, 3116,   86,   86, 3110,   86, 3119,   86,
+       86,   86, 3120, 3117, 3121, 3124, 3118,   86,   86,   86,
+       86,   86, 3129,   86, 3127,   86, 3123, 3130,   86,   86,
+     3126, 3125,   86, 3133,   86, 3122,   86,   86, 3136,   86,
+     3128,   86, 3137, 3135, 3131,   86,   86,   86, 3140,   86,
 
-       86,   86,   86,   86, 3136, 3143,   86,   86, 3145,   86,
-       86,   86, 3140,   86, 3142, 3141, 3150,   86, 3151,   86,
-     3147,   86, 3144, 3148, 3226, 3146, 3152,   86, 3149, 3156,
-       86,   86,   86, 3159, 3158,   86, 3157, 3153, 3155, 3154,
-       86,   86,   86,   86, 3164,   86, 3160, 3161, 3162, 3168,
-       86, 3165,   86,   86, 3163, 3167,   86,   86, 3166,   86,
-       86,   86, 3173,   86,   86,   86, 3170,   86,   86,   86,
-     3176, 3177,   86,   86,   86,   86, 3169, 3175, 3180, 3171,
-     3172,   86, 3174, 3178, 3181,   86, 3179,   86, 3184,   86,
-       86,   86, 3188, 3187, 3182, 3185,   86, 3190, 3183,   86,
+     3141, 3132, 3134, 3138,   86, 3139,   86,   86,   86,   86,
+     3142,   86, 3143, 3145, 3146,   86, 3144, 3147,   86,   86,
+       86,   86,   86, 3151,   86, 3150, 3153,   86, 3148, 3149,
+       86,   86,   86,   86, 3160,   86, 3158, 3155, 3159,   86,
+     3152, 3154,   86, 3156, 3164,   86, 3157,   86,   86, 3166,
+       86, 3167, 3161, 3165,   86,   86, 3172, 3162,   86, 3168,
+       86, 3163,   86, 3169,   86, 3170, 3171, 3173,   86, 3174,
+     3175,   86,   86,   86,   86,   86, 3176,   86, 3181,   86,
+       86, 3178,   86, 3184,   86, 3185,   86,   86,   86,   86,
+       86,   86, 3177, 3183, 3179, 3188, 3180, 3186, 3182,   86,
 
-     3189,   86, 3186,   86, 3191,   86, 3192, 3195,   86,   86,
-       86,   86, 3193, 3197, 3196, 3198,   86, 3199, 3194,   86,
-       86,   86,   86, 3204,   86,   86, 3200, 3202,   86,   86,
-       86,   86,   86, 3206, 3207,   86, 3210, 3211,   86, 3201,
-     3203,   86,   86, 3214, 3205, 3215,   86,   86,   86, 3208,
-     3209, 3212, 3217,   86, 3216, 3218,   86,   86,   86,   86,
-     3213,   86, 3226, 3220, 3219, 3226, 3221, 3222, 3224,   86,
-     3225,   86, 3226, 3226, 3226, 3226, 3226, 3226, 3223,   47,
-       47,   47,   47,   47,   47,   47,   52,   52,   52,   52,
-       52,   52,   52,   57,   57,   57,   57,   57,   57,   57,
+     3187,   86, 3192,   86, 3191,   86, 3189,   86, 3190,   86,
+     3193, 3234, 3194,   86, 3196,   86, 3198,   86, 3199,   86,
+       86, 3203,   86,   86, 3200,   86, 3197, 3201, 3202, 3195,
+     3204,   86,   86, 3205, 3206,   86,   86,   86,   86, 3207,
+       86,   86, 3209, 3208,   86, 3210, 3212,   86,   86, 3214,
+       86,   86, 3218, 3215, 3219,   86, 3211, 3213,   86,   86,
+     3216,   86, 3222, 3223,   86,   86, 3225,   86,   86, 3217,
+     3226,   86, 3224,   86,   86, 3227,   86, 3220, 3221, 3228,
+       86, 3229, 3232,   86, 3233,   86, 3234, 3234, 3234, 3234,
+     3234, 3234, 3230, 3234, 3234, 3234, 3234, 3234, 3234, 3231,
 
-       63,   63,   63,   63,   63,   63,   63,   68,   68,   68,
-       68,   68,   68,   68,   74,   74,   74,   74,   74,   74,
-       74,   80,   80,   80,   80,   80,   80,   80,   89,   89,
-     3226,   89,   89,   89,   89,  158,  158, 3226, 3226, 3226,
-      158,  158,  160,  160, 3226, 3226,  160, 3226,  160,  162,
-     3226, 3226, 3226, 3226, 3226,  162,  165,  165, 3226, 3226,
-     3226,  165,  165,  167, 3226, 3226, 3226, 3226, 3226,  167,
-      169,  169, 3226,  169,  169,  169,  169,  172, 3226, 3226,
-     3226, 3226, 3226,  172,  175,  175, 3226, 3226, 3226,  175,
-      175,   90,   90, 3226,   90,   90,   90,   90,   17, 3226,
+       47,   47,   47,   47,   47,   47,   47,   52,   52,   52,
+       52,   52,   52,   52,   57,   57,   57,   57,   57,   57,
+       57,   63,   63,   63,   63,   63,   63,   63,   68,   68,
+       68,   68,   68,   68,   68,   74,   74,   74,   74,   74,
+       74,   74,   80,   80,   80,   80,   80,   80,   80,   89,
+       89, 3234,   89,   89,   89,   89,  158,  158, 3234, 3234,
+     3234,  158,  158,  160,  160, 3234, 3234,  160, 3234,  160,
+      162, 3234, 3234, 3234, 3234, 3234,  162,  165,  165, 3234,
+     3234, 3234,  165,  165,  167, 3234, 3234, 3234, 3234, 3234,
+      167,  169,  169, 3234,  169,  169,  169,  169,  172, 3234,
 
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226
+     3234, 3234, 3234, 3234,  172,  175,  175, 3234, 3234, 3234,
+      175,  175,   90,   90, 3234,   90,   90,   90,   90,   17,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234
     } ;
 
-static const flex_int16_t yy_chk[6340] =
+static const flex_int16_t yy_chk[6361] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2195,14 +2200,14 @@ static const flex_int16_t yy_chk[6340] =
         5,    3,    6,   24,    4,   24,   24,    5,   24,    6,
         7,    7,    7,    7,   24,    7,    8,    8,    8,    8,
        33,    8,    7,    9,    9,    9,   26,   26,    8,   10,
-       10,   10,   19,   29,    9,   33,   19,   29, 3234,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3242,   35,
        10,   11,   11,   11,   11,   11,   11,   13,   13,   13,
 
        13,   34,   13,   11,   35,   99,   34,   29,   38,   13,
        51,   51,   11,   12,   12,   12,   12,   12,   12,   14,
        14,   14,   14,   99,   14,   12,   15,   15,   15,   38,
        23,   14,   23,   23,   12,   23,   46,   15,   16,   16,
-       16,   23,   23,   25,   27,   27,   25,   25, 2641,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2643,   16,
        25,   46,   27,   30,   30,   25,   27,   56,   40,   27,
        56,   73,   31,   31,   25,   28,   67,   67,   30,   32,
        28,   31,   40,   32,   28,   73,   32,   28,   92,   28,
@@ -2687,203 +2692,205 @@ static const flex_int16_t yy_chk[6340] =
      2234, 2232, 2235, 2236, 2237, 2237, 2234, 2238, 2235, 2239,
      2239, 2240, 2236, 2241, 2242, 2243, 2243, 2245, 2244, 2253,
      2246, 2238, 2248, 2240, 2244, 2246, 2248, 2241, 2253, 2249,
-     2254, 2245, 2249, 2242, 2250, 2250, 2251, 2252, 2252, 2255,
-     2257, 2251, 2259, 2255, 2256, 2256, 2260, 2259, 2261, 2262,
-     2254, 2263, 2264, 2257, 2265, 2263, 2266, 2268, 2267, 2265,
-     2269, 2271, 2266, 2262, 2267, 2270, 2260, 2274, 2261, 2273,
-     2270, 2275, 2264, 2281, 2276, 2268, 2275, 2277, 2284, 2269,
+     2254, 2245, 2249, 2242, 2250, 2250, 2251, 2252, 2256, 2256,
+     2255, 2251, 2252, 2252, 2255, 2257, 2259, 2260, 2261, 2262,
+     2254, 2259, 2263, 2264, 2265, 2266, 2263, 2268, 2257, 2265,
+     2267, 2266, 2269, 2262, 2270, 2271, 2267, 2260, 2261, 2270,
+     2273, 2274, 2275, 2264, 2276, 2268, 2277, 2275, 2281, 2284,
 
-     2276, 2273, 2271, 2274, 2278, 2277, 2278, 2281, 2282, 2282,
-     2283, 2285, 2285, 2283, 2287, 2288, 2289, 2291, 2287, 2290,
-     2290, 2288, 2294, 2294, 2284, 2296, 2291, 2298, 2289, 2299,
-     2302, 2303, 2304, 2305, 2312, 2302, 2310, 2304, 2305, 2306,
-     2306, 2298, 2310, 2296, 2313, 2299, 2308, 2308, 2311, 2311,
-     2312, 2314, 2316, 2317, 2318, 2318, 2314, 2303, 2320, 2322,
-     2323, 2327, 2321, 2325, 2325, 2317, 2313, 2320, 2321, 2326,
-     2328, 2316, 2326, 2330, 2330, 2323, 2332, 2322, 2331, 2331,
-     2327, 2332, 2333, 2334, 2335, 2336, 2339, 2336, 2328, 2335,
-     2337, 2338, 2334, 2341, 2340,    0, 2342, 2348, 2339, 2340,
+     2276, 2269, 2273, 2278, 2277, 2278, 2271, 2274, 2282, 2282,
+     2283, 2288, 2281, 2283, 2285, 2285, 2287, 2288, 2289, 2291,
+     2287, 2290, 2290, 2294, 2294, 2284, 2296, 2298, 2291, 2299,
+     2289, 2302, 2303, 2304, 2305, 2312, 2302, 2313, 2304, 2305,
+        0, 2298, 2306, 2306, 2296, 2299, 2308, 2308, 2310, 2311,
+     2311, 2312, 2314, 2316, 2310, 2317, 2320, 2314, 2303, 2313,
+     2318, 2318, 2321, 2322, 2323, 2320, 2327, 2317, 2321, 2325,
+     2325, 2326, 2316, 2328, 2326, 2330, 2330, 2331, 2331, 2323,
+     2333, 2322, 2332, 2334, 2335, 2327, 2336, 2332, 2336, 2335,
+     2337, 2328, 2334, 2338, 2339, 2340, 2341, 2342, 2333, 2465,
 
-     2333, 2342, 2343, 2343, 2337, 2338, 2344, 2344, 2345, 2345,
-     2346, 2346, 2347, 2341, 2349, 2348, 2350, 2350, 2352, 2349,
-     2351, 2351, 2353, 2354, 2347, 2355, 2356, 2356, 2357, 2360,
-     2352, 2358, 2358, 2361, 2353, 2359, 2359, 2362, 2363, 2364,
-     2360, 2355, 2366, 2354, 2362, 2361, 2365, 2357, 2367, 2369,
-     2363, 2365, 2368, 2368, 2370, 2371, 2372, 2373, 2369, 2364,
-     2374, 2375, 2366, 2376, 2376, 2381, 2382, 2377, 2367, 2372,
-     2378, 2379, 2383, 2375, 2374, 2371, 2377, 2385,    0, 2384,
-     2370, 2373, 2384, 2381, 2386, 2378, 2379, 2387, 2382, 2386,
-     2395, 2385, 2387, 2388, 2388, 2383, 2389, 2389, 2390, 2390,
+     2340, 2348, 2342, 2465, 2337, 2347, 2339, 2338, 2343, 2343,
+     2344, 2344, 2345, 2345, 2346, 2346, 2341, 2347, 2349, 2348,
+     2350, 2350, 2352, 2349, 2351, 2351, 2353, 2354, 2355, 2356,
+     2356, 2357, 2358, 2358, 2352, 2359, 2359, 2360, 2353, 2361,
+     2363, 2364, 2362, 2366, 2355, 2367, 2370, 2354, 2360, 2362,
+     2357, 2361, 2363, 2365, 2368, 2368, 2371, 2369, 2365, 2373,
+     2372, 2364, 2375, 2366, 2374, 2367, 2369, 2376, 2376, 2378,
+     2377, 2379, 2370, 2372, 2375, 2381, 2371, 2382, 2374, 2377,
+     2383, 2385, 2384, 2373, 2378, 2384, 2379, 2386,    0, 2387,
+     2388, 2388, 2386, 2381, 2387, 2385, 2389, 2389, 2395, 2382,
 
-     2392, 2392, 2394, 2394, 2396, 2397, 2398, 2400, 2395, 2402,
-     2401, 2404, 2403, 2405, 2406, 2396, 2406, 2407, 2408, 2414,
-     2404, 2398, 2409,    0, 2397, 2410, 2410, 2400, 2401, 2412,
-     2412, 2402, 2403, 2405, 2415, 2418, 2408, 2407, 2416, 2416,
-     2409, 2414, 2420, 2415, 2418, 2419, 2419, 2421, 2422, 2423,
-     2424, 2425, 2427,    0, 2426, 2422, 2428, 2428, 2429, 2429,
-     2420, 2430, 2432, 2432, 2423, 2421, 2431, 2435, 2424, 2425,
-     2426, 2427, 2431, 2433, 2433, 2434, 2436, 2437, 2438, 2430,
-     2439, 2434, 2440, 2438, 2441, 2435, 2442, 2447, 2442, 2441,
-     2450, 2436, 2443, 2443, 2449, 2444, 2437, 2444, 2445, 2445,
+     2390, 2390, 2396, 2383, 2392, 2392, 2394, 2394, 2397, 2398,
+     2400, 2401, 2402, 2396, 2404, 2403, 2395, 2405, 2406, 2407,
+     2406, 2413, 2408, 2404, 2398, 2409, 2415, 2397,    0, 2401,
+     2400, 2410, 2410, 2421, 2402, 2403, 2413, 2405, 2416, 2407,
+     2408, 2412, 2412, 2409, 2417, 2417, 2419, 2416, 2415, 2420,
+     2420, 2421, 2422, 2423, 2424, 2419, 2425, 2426, 2431, 2428,
+     2423, 2427, 2429, 2429, 2430, 2430, 2432, 2433, 2433, 2424,
+     2422, 2436, 2432, 2437, 2425, 2426, 2431, 2427, 2428, 2434,
+     2434, 2435, 2438, 2440, 2441, 2439, 2442, 2435, 2437, 2436,
+     2439, 2442, 2443, 2448, 2443, 2444, 2444, 2445, 2450, 2445,
 
-     2439, 2451, 2440, 2449, 2452, 2453, 2447, 2454, 2458, 2450,
-     2453, 2455, 2459, 2451, 2461, 2459, 2460, 2460, 2462, 2463,
-     2463, 2464, 2466, 2471, 2452, 2464, 2469, 2454, 2458, 2461,
-     2455, 2467, 2468, 2468, 2472, 2467, 2462, 2466, 2471, 2469,
-     2473, 2474, 2474, 2476, 2477, 2478, 2479, 2479, 2480, 2478,
-     2481, 2481, 2482, 2477, 2472, 2476, 2483, 2482, 2484, 2485,
-     2473, 2486, 2486, 2491, 2491, 2483, 2492, 2480, 2493, 2493,
-     2494, 2485, 2495, 2496, 2484, 2497, 2498, 2498, 2499, 2501,
-     2501, 2504, 2496, 2494, 2497, 2495, 2504, 2505, 2492, 2506,
-     2507, 2508, 2505, 2499, 2509, 2507, 2510, 2513, 2511, 2508,
+     2451, 2438, 2452, 2440, 2441, 2446, 2446, 2450, 2453, 2455,
+     2454, 2456, 2448, 2459, 2452, 2454, 2462, 2460, 2463, 2451,
+     2460, 2461, 2461, 2464, 2464, 2467, 2469, 2469, 2453, 2455,
+     2456, 2462, 2470, 2459, 2468, 2472, 2463, 2473, 2468, 2474,
+     2467, 2475, 2475, 2477, 2478, 2470, 2481, 2479, 2480, 2480,
+     2472, 2479, 2485, 2478, 2486, 2477, 2493, 2473, 2483, 2474,
+     2482, 2482, 2484, 2483, 2495, 2481, 2486, 2496, 2485, 2487,
+     2487, 2484, 2492, 2492, 2494, 2494, 2497, 2495, 2493, 2498,
+     2496, 2499, 2499, 2500, 2505, 2497, 2502, 2502, 2498, 2505,
+     2506, 2507, 2508, 2509, 2510, 2506, 2512, 2508, 2500, 2511,
 
-     2516, 2520, 2514, 2506, 2515, 2510, 2511, 2514, 2520, 2515,
-     2517, 2517, 2513, 2509, 2522, 2516, 2518, 2518, 2519, 2519,
-     2521, 2523, 2524, 2527, 2525, 2521, 2526, 2526, 2524, 2525,
-     2528, 2533, 2522, 2529, 2529, 2528, 2530, 2530, 2527, 2523,
-     2534, 2534, 2535, 2536, 2533, 2535, 2537, 2538, 2536, 2536,
-     2539, 2537, 2538, 2540, 2541, 2542, 2543, 2544, 2541, 2540,
-     2542, 2545, 2546, 2550, 2539, 2543, 2549, 2547, 2548, 2545,
-     2555, 2549, 2544, 2547, 2548, 2550, 2552, 2553, 2559, 2557,
-     2553, 2552, 2555, 2546, 2557, 2558, 2560, 2571, 2561, 2562,
-     2558, 2563, 2563, 2564, 2567, 2568, 2559, 2561, 2562, 2560,
+     2514, 2509, 2515, 2517, 2512, 2507, 2516, 2515, 2511, 2518,
+     2518, 2516, 2523, 2510, 2521, 2514, 2519, 2519, 2517, 2520,
+     2520, 2521, 2522, 2524, 2526, 2525,    0, 2522, 2528, 2526,
+     2523, 2525, 2527, 2527, 2529, 2530, 2530, 2531, 2531, 2529,
+     2534, 2524, 2537, 2528, 2535, 2535, 2536, 2537, 2537, 2536,
+     2538, 2539, 2540, 2534, 2541, 2538, 2539, 2542, 2543, 2544,
+     2541, 2542, 2545, 2543, 2546, 2547, 2540, 2548, 2544, 2549,
+     2551, 2550, 2546, 2548, 2553, 2549, 2550, 2545, 2554, 2557,
+     2559, 2555, 2551, 2554, 2555, 2559, 2547, 2560, 2561, 2562,
+     2553, 2557, 2560, 2569, 2563, 2564, 2565, 2565, 2566, 2569,
 
-     2567, 2568, 2564, 2572, 2576, 2573, 2571, 2574, 2574, 2575,
-     2577, 2578, 2578, 2576, 2579, 2581, 2583, 2584, 2585, 2585,
-     2586, 2584, 2592, 2572, 2573, 2577, 2587, 2592, 2575, 2588,
-     2581, 2589, 2587, 2579, 2591, 2588, 2583, 2589, 2590, 2590,
-     2594, 2595, 2591, 2597, 2598, 2586, 2599, 2597, 2602, 2594,
-     2601, 2601, 2603, 2603, 2595, 2604, 2604, 2608, 2598, 2606,
-     2606, 2599, 2608, 2607, 2610, 2610, 2602, 2607, 2612, 2613,
-     2614, 2615, 2617, 2625, 2613, 2627, 2615, 2615, 2618, 2618,
-     2620, 2620, 2614, 2621, 2621, 2623, 2622, 2631, 2612, 2622,
-     2634, 2625, 2617, 2628, 2628, 2627, 2629, 2629, 2623, 2630,
+     2573, 2574, 2562, 2563, 2564, 2570, 2561, 2566, 2575, 2576,
+     2576, 2570, 2577, 2578, 2579, 2580, 2580, 2581, 2583, 2573,
+     2585, 2574, 2578, 2588, 2586, 2587, 2587, 2575, 2586, 2579,
+     2596, 2577, 2589, 2583, 2593, 2590, 2581, 2591, 2589, 2596,
+     2585, 2590, 2593, 2591, 2592, 2592, 2594, 2597, 2588, 2599,
+     2600, 2594, 2601, 2599, 2603, 2603, 2604, 2605, 2605, 2609,
+     2597, 2606, 2606, 2609, 2600, 2608, 2608, 2601, 2610, 2612,
+     2612, 2614, 2615, 2610, 2604, 2616, 2617, 2615, 2619, 2620,
+     2620, 2617, 2617, 2622, 2622, 2623, 2623, 2616, 2625, 2624,
+     2627, 2614, 2624, 2629, 2630, 2630, 2631, 2631, 2619, 2632,
 
-     2630, 2633, 2631, 2632, 2632, 2635, 2636, 2638, 2634, 2637,
-     2637, 2638, 2636, 2643, 2633, 2642, 2646, 2644, 2645, 2635,
-     2642, 2642, 2646, 2647, 2648, 2655, 2649, 2650, 2650, 2647,
-     2649, 2658, 2656, 2655, 2653, 2656, 2643, 2644, 2645, 2653,
-     2659, 2660, 2660, 2659, 2661, 2662, 2663, 2664, 2707, 2648,
-     2662, 2665, 2666, 2666, 2667, 2668, 2658, 2669, 2668, 2670,
-     2673, 2661, 2661, 2707, 2663, 2665, 2668, 2664, 2667, 2671,
-     2672, 2669, 2674, 2674, 2679, 2672, 2672, 2671, 2670, 2673,
-     2675, 2675, 2676, 2676, 2677, 2677, 2678, 2678, 2680, 2681,
-     2679, 2682, 2683, 2680, 2684, 2685, 2686, 2691, 2687, 2684,
+     2632, 2625, 2633, 2634, 2634, 2635, 2636, 2637, 2627, 2638,
+     2639, 2639, 2640, 2629, 2644, 2638, 2640, 2633, 2635, 2644,
+     2644, 2637, 2645, 2646, 2636, 2648, 2647, 2649, 2650, 2660,
+     2651, 2648, 2655, 2649, 2651, 2652, 2652, 2655, 2658, 2657,
+     2663, 2658, 2667, 2646, 2665, 2645, 2647, 2657, 2661, 2662,
+     2662, 2661, 2666, 2650, 2660, 2664, 2667, 2663, 2663, 2669,
+     2664, 2671, 2665, 2668, 2668, 2670, 2672, 2674, 2670, 2673,
+     2674, 2676, 2666, 2669, 2675, 2671, 2670, 2673, 2682, 2675,
+     2675, 2677, 2677, 2678, 2678, 2672, 2679, 2679, 2680, 2680,
+     2676, 2681, 2681, 2683, 2682, 2684, 2685, 2686, 2683, 2687,
 
-     2689, 2689, 2690, 2694, 2685, 2690, 2693, 2693, 2703, 2681,
-     2694, 2683, 2695, 2695, 2696, 2691, 2686, 2682, 2687, 2696,
-     2698, 2698, 2699, 2700, 2701, 2705, 2703, 2704, 2704, 2705,
-     2706, 2699, 2700, 2701, 2709, 2708, 2710, 2720, 2711, 2706,
-     2708, 2708, 2711, 2715, 2719, 2710, 2721, 2709, 2715, 2716,
-     2716, 2718, 2718, 2724, 2723, 2727, 2729, 2728, 2719, 2732,
-     2734, 2730, 2720, 2723, 2721, 2724, 2728, 2730, 2736, 2737,
-     2739, 2732, 2828, 2736, 2737, 2828, 2729, 2738, 2738, 2739,
-     2727, 2734, 2741, 2748, 2742, 2742, 2747, 2741, 2742, 2744,
-     2744, 2745, 2745, 2746, 2746, 2747, 2749, 2750, 2752, 2756,
+     2688, 2689, 2694, 2690, 2687, 2692, 2692, 2693,    0, 2688,
+     2693, 2696, 2696, 2698, 2698, 2684, 2686, 2697, 2701, 2701,
+     2694, 2689, 2685, 2690, 2697, 2699, 2702, 2703, 2704, 2706,
+     2699, 2707, 2707, 2709, 2708, 2702, 2703, 2704, 2708, 2710,
+     2711, 2713, 2709, 2712, 2714, 2711, 2711, 2706, 2714, 2722,
+     2713, 2723, 2718, 2724, 2710, 2726, 2712, 2718, 2719, 2719,
+     2721, 2721, 2727, 2722, 2726, 2730, 2731, 2732, 2735, 2751,
+     2737, 2724, 2733, 2785, 2727, 2731, 2723, 2739, 2733, 2740,
+     2735, 2785, 2739, 2742, 2740, 2741, 2741, 2732, 2744, 2751,
+     2730, 2737, 2742, 2744, 2745, 2745, 2747, 2747, 2745, 2748,
 
-     2753, 2754, 2750, 2748, 2752, 2753, 2754, 2755, 2755, 2757,
-     2758, 2759, 2760, 2761, 2762, 2749, 2759, 2756, 2769, 2761,
-     2765, 2757, 2763, 2763, 2765, 2768, 2768, 2766, 2767, 2770,
-     2760, 2758, 2766, 2767, 2771, 2773, 2773, 2769, 2775, 2762,
-     2776, 2777, 2779, 2778, 2770, 2777, 2780, 2781, 2783, 2784,
-     2785, 2775, 2778, 2776, 2771, 2781, 2782, 2783, 2779, 2786,
-     2786, 2782, 2787, 2789, 2789, 2780, 2792, 2784, 2790, 2790,
-     2794, 2794, 2796, 2797, 2798, 2799, 2785, 2801, 2801, 2802,
-     2799, 2787, 2803, 2804, 2806, 2806, 2807, 2792, 2796, 2797,
-     2798, 2808, 2809, 2809, 2812, 2813, 2815, 2818, 2814, 2802,
+     2748, 2749, 2749, 2750, 2752, 2753, 2756, 2755, 2759, 2757,
+     2753, 2756, 2750, 2755, 2757, 2758, 2758, 2760, 2761, 2762,
+     2763, 2764, 2765, 2752, 2762, 2772, 2759, 2764, 2768, 2760,
+     2766, 2766, 2768, 2771, 2771, 2769, 2770, 2773, 2763, 2761,
+     2769, 2770, 2774, 2775, 2772, 2777, 2777, 2765, 2779, 2780,
+     2781, 2782, 2773, 2783, 2781, 2784, 2787, 2774, 2788, 2786,
+     2782, 2779, 2780, 2775, 2786, 2787, 2789, 2790, 2790, 2783,
+     2791, 2793, 2793, 2796, 2784, 2800, 2788, 2794, 2794, 2798,
+     2798, 2801, 2802, 2803, 2805, 2805, 2806, 2807, 2803, 2791,
+     2808, 2800, 2789, 2811, 2796, 2810, 2810, 2801, 2802, 2812,
 
-     2807, 2813, 2804, 2814, 2820, 2803, 2816, 2816, 2817, 2817,
-     2808, 2819, 2819, 2821, 2812, 2820, 2822, 2818, 2815, 2823,
-     2824, 2825, 2821, 2826, 2834, 2823, 2827, 2827, 2829, 2829,
-     2833, 2819, 2835, 2825, 2836, 2836, 2822, 2837, 2835, 2824,
-     2837, 2838, 2833, 2826, 2834, 2839, 2841, 2838, 2842, 2842,
-     2843, 2841, 2844, 2845, 2849, 2843, 2846, 2847, 2847, 2845,
-     2850, 2851, 2852, 2839, 2853, 2853, 2849, 2855, 2854, 2857,
-     2857, 2844, 2859, 2846, 2846, 2852, 2855, 2859, 2850, 2858,
-     2858, 2860, 2865, 2861, 2862, 2862, 2851, 2854, 2861, 2863,
-     2863, 2864, 2864, 2866, 2872, 2860, 2867, 2869, 2869, 2866,
+     2813, 2813, 2816, 2818, 2819, 2817, 2806, 2811, 2818, 2808,
+     2807, 2817, 2820, 2820, 2821, 2821, 2822, 2824, 2812, 2823,
+     2823, 2825, 2816, 2826, 2830, 2827, 2819, 2828, 2824, 2829,
+     2825, 2827, 2831, 2831, 2832, 2838, 2822, 2832, 2837, 2823,
+     2843, 2829,    0, 2826, 2830, 2839, 2828, 2833, 2833, 2855,
+     2837, 2839, 2840, 2840, 2841, 2838, 2842, 2841, 2843, 2845,
+     2846, 2846, 2842, 2847, 2845, 2848, 2849, 2853, 2847, 2850,
+     2851, 2851, 2849, 2854, 2855, 2856, 2857, 2857, 2858, 2853,
+     2860, 2859, 2862, 2862, 2848, 2859, 2850, 2850, 2856, 2860,
+     2864, 2854, 2863, 2863, 2865, 2864, 2866, 2858, 2867, 2867,
 
-     2874, 2867, 2875, 2876, 2877, 2877, 2879, 2879, 2865, 2880,
-     2881, 2882, 2886, 2872, 2883, 2883, 2884, 2884, 2886, 2887,
-     2882, 2888, 2874, 2880, 2875, 2876, 2889, 2892, 2892, 2895,
-     2881, 2889, 2894, 2894, 2895, 2896, 2897, 2899, 2898, 2887,
-     2888, 2901, 2897, 2900, 2900, 2899, 2901, 2903, 2904, 2896,
-     2898, 2905, 2906, 2907, 2909, 2910, 2905, 2911, 2912, 2907,
-     2915, 2914, 2909, 2916, 2906, 2917, 2918, 2903, 2904, 2921,
-     2920, 2918, 2925, 3017, 2910, 2920, 2915, 2911, 2912, 2914,
-     2916, 2916, 2922, 2926, 2936, 2923, 2917, 2931, 2922, 2921,
-     2923, 2931, 2925, 2929, 2929, 2935, 2926, 2930, 2930, 3017,
+     2870, 2866, 2868, 2868, 2869, 2869, 2871, 2879, 2865, 2872,
+     2874, 2874, 2871, 2877, 2872, 2880, 2881, 2882, 2882, 2884,
+     2884, 2885, 2886, 2892, 2887, 2893, 2870, 2888, 2888, 2879,
+     2889, 2889, 2877, 2887, 2891, 2885, 2894, 2880, 2881, 2901,
+     2891, 2894, 2886, 2892, 2893, 2897, 2897, 2899, 2899, 2900,
+     2902, 2903, 2904, 2901, 2900, 2908, 2902, 2905, 2905, 2906,
+     2904, 2909, 2910, 2903, 2906, 2911, 2912, 2910, 2914, 2915,
+     2916, 2917, 2912, 2920, 2919, 2908, 2914, 2911, 2921, 2922,
+     2923, 2909, 2925, 2926, 2930, 2923, 2942, 2925, 2915, 2920,
+     2916, 2917, 2919, 2927, 2932, 2921, 2921, 2928,    0, 2927,
 
-     2935, 2937, 2937, 2936, 2939, 2939, 2940, 2940, 2943, 2940,
-     2941, 2941, 2943, 2941, 2942, 2942, 2946, 2942, 2945, 2945,
-     2950, 2947, 2951, 2952, 2953, 2953, 2956, 2958, 2952, 2957,
-     2959, 2958, 2960,    0, 2946, 2947, 2957, 2962, 2967, 2959,
-     2950, 2963, 2951, 2964, 2964, 2965, 2965, 2960, 2966, 2966,
-     2963, 2956, 2968, 2967, 2969, 2962, 2970, 2968, 2971, 2972,
-     2973, 2970, 2970, 2969, 2971, 2974, 2969, 2975, 2976, 2977,
-     2978, 2978, 2975, 2976, 2979, 2973, 2980, 2981, 2981, 3003,
-     2979, 3053, 2980,    0, 2972, 3053, 2974, 2983, 2977, 2982,
-     2982, 2988, 2983, 2986, 2986, 2987, 2987, 2991, 2991, 3003,
+     2922, 2931, 2928, 2926, 2930, 2942, 2931, 2932, 2935, 2935,
+     2936, 2936, 2937, 2941, 2943, 2943, 2937, 2952, 2941, 2945,
+     2945, 2946, 2946, 2949, 2946, 2947, 2947, 2949, 2947, 2948,
+     2948, 2953, 2948, 2951, 2951, 2952, 2956, 2957, 2958, 2959,
+     2959, 2962, 2963, 2958, 2964, 2953, 2965, 2966, 2964, 2963,
+     2968, 2969, 2970, 2970, 2973, 2965, 2956, 2957, 2971, 2971,
+     2969, 2978, 2966, 2972, 2972, 2974, 2962, 2975, 2968, 2973,
+     2974, 2980, 2976, 2979, 2977, 2983, 2975, 2976, 2976, 2975,
+     2977, 3012, 2981, 3014, 2982,    0, 2978, 2981, 2979, 2982,
+     2984, 2984, 2980, 2985, 2983, 2986, 2987, 2987, 3014, 2985,
 
-     2988, 2992, 2992, 2993, 2993, 2994, 2994, 2995, 2995, 2996,
-     2996, 2997, 2997, 2999, 3000, 3000, 3001, 3002, 3005, 3006,
-     3006, 3007, 2999, 3009, 3015, 3001, 3008, 3010, 3010, 3002,
-     3011, 3012, 3012, 3018, 3018, 3009, 3007, 3005, 3016, 3008,
-     3019, 3016, 3015, 3021, 3022, 3011, 3021, 3023, 3024, 3025,
-     3022, 3026, 3033, 3024, 3027, 3030, 3029, 3036, 3019, 3046,
-     3044, 3023, 3029, 3044, 3030, 3047, 3047, 3033, 3025, 3026,
-     3027, 3051, 3046, 3048, 3048, 3049, 3049, 3052, 3054, 3055,
-     3057, 3058, 3059, 3036, 3061, 3064, 3052, 3059, 3060, 3063,
-     3060, 3065, 3058, 3055, 3051, 3062, 3062, 3066, 3054, 3061,
+     3012, 2986, 2988, 2988, 2989, 2989, 2990, 2993, 2993, 2994,
+     2994, 2990, 2995, 2998, 2998, 2999, 2999, 3000, 3000, 3001,
+     3001, 2995, 3002, 3002, 3003, 3003, 3004, 3004, 3006, 3007,
+     3007, 3008, 3009, 3010, 3013, 3013, 3015, 3006, 3016, 3018,
+     3008, 3017, 3017, 3022, 3009, 3019, 3019, 3024, 3023, 3015,
+     3016, 3023, 3026, 3010, 3018, 3025, 3025, 3028, 3029, 3032,
+     3028, 3022, 3030, 3031, 3029, 3033, 3034, 3044, 3031, 3036,
+     3026, 3037, 3041, 3024, 3052, 3036, 3030, 3052, 3032, 3054,
+     3037, 3059, 3034, 3033, 3055, 3055, 3060, 3041, 3056, 3056,
+     3057, 3057, 3054, 3044, 3061, 3060, 3062, 3063, 3061, 3065,
 
-     3067, 3068, 3063, 3057, 3064, 3069, 3070, 3071, 3078, 3065,
-     3072, 3073, 3074, 3066, 3069, 3072, 3068, 3074, 3070, 3079,
-     3080, 3080, 3078, 3081, 3086, 3067, 3082, 3082, 3071, 3083,
-     3083, 3073, 3081, 3084, 3084, 3085, 3085, 3087, 3088, 3079,
-     3089, 3088, 3090, 3086, 3091, 3089, 3092, 3090, 3093, 3094,
-     3095, 3096, 3097, 3100, 3093, 3101, 3096, 3087, 3098, 3098,
-     3104, 3092, 3095, 3094, 3099, 3099, 3102, 3102, 3100, 3091,
-     3106, 3112, 3097, 3111, 3101, 3104, 3109, 3109, 3110, 3110,
-     3113, 3111, 3115, 3114, 3116, 3117, 3113, 3118, 3106, 3114,
-     3112, 3123, 3118, 3119, 3119, 3124, 3115, 3116, 3120, 3120,
+     3067, 3066, 3069, 3073, 3059, 3067, 3068, 3071, 3068, 3070,
+     3070, 3063, 3066, 3072, 3074, 3075, 3062, 3069, 3076, 3077,
+     3071, 3073, 3065, 3078, 3079, 3086, 3080, 3081, 3077, 3082,
+     3074, 3080, 3072, 3076, 3082, 3078, 3087, 3088, 3088, 3086,
+     3075, 3089, 3090, 3090, 3094, 3079, 3095, 3081, 3091, 3091,
+     3089, 3092, 3092, 3093, 3093, 3096, 3087, 3097, 3096, 3098,
+     3099, 3100, 3097, 3094, 3098, 3101, 3095, 3102, 3103, 3104,
+     3105, 3101, 3106, 3106, 3104, 3114, 3100, 3107, 3107, 3108,
+     3103, 3102, 3109, 3110, 3110, 3099, 3120, 3112, 3117, 3117,
+     3105, 3118, 3118, 3114, 3108, 3119, 3123, 3125, 3121, 3124,
 
-     3126, 3127, 3129, 3130, 3117, 3127, 3131, 3132, 3130, 3134,
-     3133, 3135, 3123, 3136, 3126, 3124, 3135, 3140, 3136, 3142,
-     3132, 3141, 3129, 3133,    0, 3131, 3137, 3137, 3134, 3143,
-     3143, 3144, 3146, 3146, 3145, 3150, 3144, 3140, 3142, 3141,
-     3145, 3147, 3148, 3149, 3151, 3157, 3147, 3148, 3149, 3157,
-     3151, 3153, 3153, 3154, 3150, 3155, 3155, 3158, 3154, 3159,
-     3160, 3161, 3162, 3163, 3164, 3171, 3159, 3178, 3162, 3166,
-     3166, 3168, 3168, 3170, 3169, 3172, 3158, 3164, 3170, 3160,
-     3161, 3180, 3163, 3169, 3171, 3173, 3169, 3174, 3174, 3176,
-     3175, 3179, 3179, 3178, 3172, 3175, 3181, 3181, 3173, 3185,
+     3122, 3109, 3112, 3119, 3121, 3120, 3122, 3131, 3126, 3132,
+     3123, 3134, 3124, 3126, 3127, 3127, 3125, 3128, 3128, 3135,
+     3137, 3138, 3139, 3135, 3140, 3134, 3138, 3142, 3131, 3132,
+     3141, 3143, 3148, 3144, 3145, 3145, 3143, 3140, 3144, 3149,
+     3137, 3139, 3150, 3141, 3151, 3151, 3142, 3158, 3152, 3153,
+     3154, 3154, 3148, 3152, 3155, 3153, 3159, 3149, 3156, 3155,
+     3157, 3150, 3159, 3156, 3162, 3157, 3158, 3161, 3161, 3162,
+     3163, 3163, 3165, 3166, 3167, 3168, 3165, 3169, 3170, 3171,
+     3172, 3167, 3174, 3174, 3170, 3176, 3176, 3179, 3177, 3180,
+     3178, 3181, 3166, 3172, 3168, 3178, 3169, 3177, 3171, 3184,
 
-     3180, 3183, 3176, 3182, 3182, 3184, 3183, 3186, 3186, 3187,
-     3190, 3188, 3184, 3188, 3187, 3189, 3189, 3190, 3185, 3191,
-     3192, 3194, 3193, 3196, 3196, 3197, 3191, 3193, 3199, 3200,
-     3201, 3202, 3206, 3199, 3200, 3203, 3203, 3205, 3205, 3192,
-     3194, 3207, 3208, 3208, 3197, 3209, 3209, 3210, 3220, 3201,
-     3202, 3206, 3212, 3212, 3210, 3213, 3213, 3214, 3216, 3221,
-     3207, 3219,    0, 3216, 3214,    0, 3219, 3220, 3222, 3222,
-     3223, 3223,    0,    0,    0,    0,    0,    0, 3221, 3227,
-     3227, 3227, 3227, 3227, 3227, 3227, 3228, 3228, 3228, 3228,
-     3228, 3228, 3228, 3229, 3229, 3229, 3229, 3229, 3229, 3229,
+     3177, 3182, 3182, 3186, 3181, 3183, 3179, 3188, 3180, 3193,
+     3183,    0, 3184, 3187, 3187, 3189, 3189, 3190, 3190, 3191,
+     3192, 3194, 3194, 3200, 3191, 3195, 3188, 3192, 3193, 3186,
+     3195, 3196, 3198, 3196, 3197, 3197, 3199, 3202, 3205, 3198,
+     3201, 3209, 3200, 3199, 3207, 3201, 3204, 3204, 3208, 3207,
+     3210, 3211, 3211, 3208, 3213, 3213, 3202, 3205, 3214, 3215,
+     3209, 3216, 3216, 3217, 3217, 3218, 3220, 3220, 3222, 3210,
+     3221, 3221, 3218, 3228, 3224, 3222, 3227, 3214, 3215, 3224,
+     3229, 3227, 3230, 3230, 3231, 3231,    0,    0,    0,    0,
+        0,    0, 3228,    0,    0,    0,    0,    0,    0, 3229,
 
-     3230, 3230, 3230, 3230, 3230, 3230, 3230, 3231, 3231, 3231,
-     3231, 3231, 3231, 3231, 3232, 3232, 3232, 3232, 3232, 3232,
-     3232, 3233, 3233, 3233, 3233, 3233, 3233, 3233, 3235, 3235,
-        0, 3235, 3235, 3235, 3235, 3236, 3236,    0,    0,    0,
-     3236, 3236, 3237, 3237,    0,    0, 3237,    0, 3237, 3238,
-        0,    0,    0,    0,    0, 3238, 3239, 3239,    0,    0,
-        0, 3239, 3239, 3240,    0,    0,    0,    0,    0, 3240,
-     3241, 3241,    0, 3241, 3241, 3241, 3241, 3242,    0,    0,
-        0,    0,    0, 3242, 3243, 3243,    0,    0,    0, 3243,
-     3243, 3244, 3244,    0, 3244, 3244, 3244, 3244, 3226, 3226,
+     3235, 3235, 3235, 3235, 3235, 3235, 3235, 3236, 3236, 3236,
+     3236, 3236, 3236, 3236, 3237, 3237, 3237, 3237, 3237, 3237,
+     3237, 3238, 3238, 3238, 3238, 3238, 3238, 3238, 3239, 3239,
+     3239, 3239, 3239, 3239, 3239, 3240, 3240, 3240, 3240, 3240,
+     3240, 3240, 3241, 3241, 3241, 3241, 3241, 3241, 3241, 3243,
+     3243,    0, 3243, 3243, 3243, 3243, 3244, 3244,    0,    0,
+        0, 3244, 3244, 3245, 3245,    0,    0, 3245,    0, 3245,
+     3246,    0,    0,    0,    0,    0, 3246, 3247, 3247,    0,
+        0,    0, 3247, 3247, 3248,    0,    0,    0,    0,    0,
+     3248, 3249, 3249,    0, 3249, 3249, 3249, 3249, 3250,    0,
 
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226,
-     3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226, 3226
+        0,    0,    0,    0, 3250, 3251, 3251,    0,    0,    0,
+     3251, 3251, 3252, 3252,    0, 3252, 3252, 3252, 3252, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
+     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3089,7 +3096,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3091 "<stdout>"
+#line 3098 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3098,9 +3105,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3100 "<stdout>"
+#line 3107 "<stdout>"
 
-#line 3102 "<stdout>"
+#line 3109 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3324,7 +3331,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3326 "<stdout>"
+#line 3333 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3357,13 +3364,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3227 )
+				if ( yy_current_state >= 3235 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 6299 );
+		while ( yy_base[yy_current_state] != 6320 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -4907,40 +4914,45 @@ YY_RULE_SETUP
 { YDVAR(2, VAR_EDNS_CLIENT_TAG) }
 	YY_BREAK
 case 302:
-/* rule 302 can match eol */
 YY_RULE_SETUP
 #line 527 "./util/configlexer.lex"
+{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+	YY_BREAK
+case 303:
+/* rule 303 can match eol */
+YY_RULE_SETUP
+#line 528 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 303:
+case 304:
 YY_RULE_SETUP
-#line 530 "./util/configlexer.lex"
+#line 531 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 531 "./util/configlexer.lex"
+#line 532 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 304:
-YY_RULE_SETUP
-#line 536 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 305:
-/* rule 305 can match eol */
 YY_RULE_SETUP
 #line 537 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 306:
+/* rule 306 can match eol */
+YY_RULE_SETUP
+#line 538 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 306:
+case 307:
 YY_RULE_SETUP
-#line 539 "./util/configlexer.lex"
+#line 540 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4953,34 +4965,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 307:
+case 308:
 YY_RULE_SETUP
-#line 551 "./util/configlexer.lex"
+#line 552 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 552 "./util/configlexer.lex"
+#line 553 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 308:
-YY_RULE_SETUP
-#line 557 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 309:
-/* rule 309 can match eol */
 YY_RULE_SETUP
 #line 558 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 310:
+/* rule 310 can match eol */
+YY_RULE_SETUP
+#line 559 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 310:
+case 311:
 YY_RULE_SETUP
-#line 560 "./util/configlexer.lex"
+#line 561 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4993,38 +5005,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 311:
+case 312:
 YY_RULE_SETUP
-#line 572 "./util/configlexer.lex"
+#line 573 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 574 "./util/configlexer.lex"
+#line 575 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 312:
-YY_RULE_SETUP
-#line 578 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 313:
-/* rule 313 can match eol */
 YY_RULE_SETUP
 #line 579 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 314:
+/* rule 314 can match eol */
 YY_RULE_SETUP
 #line 580 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 315:
 YY_RULE_SETUP
 #line 581 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 316:
+YY_RULE_SETUP
+#line 582 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -5032,27 +5044,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 586 "./util/configlexer.lex"
+#line 587 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 316:
-YY_RULE_SETUP
-#line 590 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 317:
-/* rule 317 can match eol */
 YY_RULE_SETUP
 #line 591 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 318:
+/* rule 318 can match eol */
+YY_RULE_SETUP
+#line 592 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 318:
+case 319:
 YY_RULE_SETUP
-#line 593 "./util/configlexer.lex"
+#line 594 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5062,7 +5074,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 599 "./util/configlexer.lex"
+#line 600 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5077,39 +5089,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 319:
+case 320:
 YY_RULE_SETUP
-#line 613 "./util/configlexer.lex"
+#line 614 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 616 "./util/configlexer.lex"
+#line 617 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 320:
-YY_RULE_SETUP
-#line 620 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
 case 321:
-/* rule 321 can match eol */
 YY_RULE_SETUP
 #line 621 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
 	YY_BREAK
 case 322:
+/* rule 322 can match eol */
 YY_RULE_SETUP
 #line 622 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 case 323:
 YY_RULE_SETUP
 #line 623 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 324:
+YY_RULE_SETUP
+#line 624 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5118,29 +5130,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 629 "./util/configlexer.lex"
+#line 630 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 324:
-YY_RULE_SETUP
-#line 633 "./util/configlexer.lex"
-{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 325:
-/* rule 325 can match eol */
 YY_RULE_SETUP
 #line 634 "./util/configlexer.lex"
+{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 326:
+/* rule 326 can match eol */
+YY_RULE_SETUP
+#line 635 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 326:
+case 327:
 YY_RULE_SETUP
-#line 638 "./util/configlexer.lex"
+#line 639 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5149,33 +5161,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 327:
+case 328:
 YY_RULE_SETUP
-#line 646 "./util/configlexer.lex"
+#line 647 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 328:
+case 329:
 YY_RULE_SETUP
-#line 650 "./util/configlexer.lex"
+#line 651 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 329:
+case 330:
 YY_RULE_SETUP
-#line 654 "./util/configlexer.lex"
+#line 655 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 330:
+case 331:
 YY_RULE_SETUP
-#line 658 "./util/configlexer.lex"
+#line 659 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5177 "<stdout>"
+#line 5189 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5470,7 +5482,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3227 )
+			if ( yy_current_state >= 3235 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5498,11 +5510,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3227 )
+		if ( yy_current_state >= 3235 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3226);
+	yy_is_jam = (yy_current_state == 3234);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6141,6 +6153,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 658 "./util/configlexer.lex"
+#line 659 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index a9b73d989..0b997a306 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -524,6 +524,7 @@ name-v6{COLON}			{ YDVAR(1, VAR_IPSET_NAME_V6) }
 udp-upstream-without-downstream{COLON} { YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 tcp-connection-limit{COLON}	{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
 edns-client-tag{COLON}		{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+edns-client-tag-opcode{COLON}	{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
 <INITIAL,val>{NEWLINE}		{ LEXOUT(("NL\n")); cfg_parser->line++; }
 
 	/* Quoted strings. Strip leading and ending quotes */
diff --git a/util/configparser.c b/util/configparser.c
index 7e7c3fc3f..ba5054eb4 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -438,7 +438,8 @@ extern int yydebug;
     VAR_RPZ_LOG_NAME = 550,
     VAR_DYNLIB = 551,
     VAR_DYNLIB_FILE = 552,
-    VAR_EDNS_CLIENT_TAG = 553
+    VAR_EDNS_CLIENT_TAG = 553,
+    VAR_EDNS_CLIENT_TAG_OPCODE = 554
   };
 #endif
 /* Tokens.  */
@@ -738,6 +739,7 @@ extern int yydebug;
 #define VAR_DYNLIB 551
 #define VAR_DYNLIB_FILE 552
 #define VAR_EDNS_CLIENT_TAG 553
+#define VAR_EDNS_CLIENT_TAG_OPCODE 554
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -747,7 +749,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 751 "util/configparser.c"
+#line 753 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -1066,19 +1068,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   634
+#define YYLAST   635
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  299
+#define YYNTOKENS  300
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  324
+#define YYNNTS  325
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  624
+#define YYNRULES  626
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  927
+#define YYNSTATES  930
 
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   553
+#define YYMAXUTOK   554
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1145,7 +1147,7 @@ static const yytype_int16 yytranslate[] =
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298
+     295,   296,   297,   298,   299
 };
 
 #if YYDEBUG
@@ -1174,47 +1176,47 @@ static const yytype_int16 yyrline[] =
      280,   280,   281,   281,   281,   282,   282,   283,   284,   284,
      285,   285,   286,   286,   287,   287,   288,   288,   288,   289,
      289,   289,   290,   290,   290,   291,   291,   292,   292,   293,
-     293,   294,   294,   296,   308,   309,   310,   310,   310,   310,
-     310,   311,   311,   313,   325,   326,   327,   327,   327,   327,
-     328,   328,   330,   344,   345,   346,   346,   346,   346,   347,
-     347,   347,   349,   366,   367,   368,   368,   368,   368,   369,
-     369,   369,   370,   373,   392,   409,   417,   427,   435,   452,
-     453,   454,   454,   454,   454,   454,   455,   455,   455,   456,
-     456,   458,   467,   476,   487,   496,   505,   514,   525,   534,
-     546,   560,   575,   586,   603,   620,   637,   654,   669,   684,
-     697,   712,   721,   730,   739,   748,   757,   766,   775,   784,
-     793,   802,   811,   820,   829,   838,   851,   860,   873,   882,
-     891,   900,   907,   914,   923,   930,   939,   947,   954,   961,
-     969,   978,   985,  1001,  1009,  1017,  1025,  1033,  1042,  1051,
-    1065,  1074,  1083,  1092,  1101,  1110,  1119,  1126,  1133,  1159,
-    1167,  1174,  1181,  1188,  1195,  1203,  1211,  1219,  1226,  1237,
-    1248,  1255,  1264,  1273,  1282,  1289,  1296,  1304,  1312,  1322,
-    1332,  1342,  1356,  1364,  1377,  1388,  1396,  1409,  1418,  1427,
-    1436,  1446,  1456,  1464,  1477,  1486,  1494,  1503,  1511,  1524,
-    1533,  1540,  1550,  1560,  1570,  1580,  1590,  1600,  1610,  1620,
-    1627,  1634,  1641,  1650,  1659,  1668,  1677,  1684,  1694,  1714,
-    1721,  1739,  1752,  1765,  1774,  1783,  1792,  1801,  1811,  1821,
-    1832,  1841,  1850,  1859,  1868,  1877,  1886,  1899,  1912,  1921,
-    1928,  1937,  1946,  1955,  1964,  1972,  1985,  1993,  2034,  2041,
-    2056,  2066,  2076,  2083,  2090,  2097,  2106,  2114,  2128,  2149,
-    2170,  2182,  2194,  2206,  2215,  2236,  2246,  2255,  2263,  2271,
-    2284,  2297,  2312,  2327,  2336,  2345,  2351,  2360,  2369,  2379,
-    2389,  2402,  2415,  2427,  2441,  2453,  2467,  2482,  2492,  2499,
-    2506,  2515,  2524,  2534,  2544,  2554,  2561,  2568,  2577,  2586,
-    2596,  2606,  2613,  2620,  2627,  2635,  2645,  2655,  2665,  2675,
-    2714,  2724,  2732,  2740,  2755,  2764,  2769,  2770,  2771,  2771,
-    2771,  2772,  2772,  2772,  2773,  2773,  2775,  2785,  2794,  2801,
-    2808,  2815,  2822,  2829,  2836,  2841,  2842,  2843,  2843,  2843,
-    2844,  2844,  2844,  2845,  2846,  2846,  2847,  2847,  2848,  2848,
-    2849,  2850,  2851,  2852,  2853,  2854,  2856,  2865,  2875,  2882,
-    2889,  2898,  2905,  2912,  2919,  2926,  2935,  2944,  2951,  2958,
-    2968,  2978,  2988,  2998,  3008,  3018,  3023,  3024,  3025,  3027,
-    3033,  3038,  3039,  3040,  3042,  3048,  3058,  3065,  3074,  3082,
-    3087,  3088,  3090,  3090,  3090,  3091,  3091,  3092,  3093,  3094,
-    3095,  3096,  3098,  3108,  3117,  3124,  3133,  3140,  3149,  3157,
-    3170,  3178,  3191,  3196,  3197,  3198,  3198,  3199,  3199,  3199,
-    3200,  3202,  3214,  3226,  3238,  3253,  3266,  3279,  3290,  3295,
-    3296,  3297,  3297,  3299,  3314
+     293,   294,   294,   295,   297,   309,   310,   311,   311,   311,
+     311,   311,   312,   312,   314,   326,   327,   328,   328,   328,
+     328,   329,   329,   331,   345,   346,   347,   347,   347,   347,
+     348,   348,   348,   350,   367,   368,   369,   369,   369,   369,
+     370,   370,   370,   371,   374,   393,   410,   418,   428,   436,
+     453,   454,   455,   455,   455,   455,   455,   456,   456,   456,
+     457,   457,   459,   468,   477,   488,   497,   506,   515,   526,
+     535,   547,   561,   576,   587,   604,   621,   638,   655,   670,
+     685,   698,   713,   722,   731,   740,   749,   758,   767,   776,
+     785,   794,   803,   812,   821,   830,   839,   852,   861,   874,
+     883,   892,   901,   908,   915,   924,   931,   940,   948,   955,
+     962,   970,   979,   986,  1002,  1010,  1018,  1026,  1034,  1043,
+    1052,  1066,  1075,  1084,  1093,  1102,  1111,  1120,  1127,  1134,
+    1160,  1168,  1175,  1182,  1189,  1196,  1204,  1212,  1220,  1227,
+    1238,  1249,  1256,  1265,  1274,  1283,  1290,  1297,  1305,  1313,
+    1323,  1333,  1343,  1357,  1365,  1378,  1389,  1397,  1410,  1419,
+    1428,  1437,  1447,  1457,  1465,  1478,  1487,  1495,  1504,  1512,
+    1525,  1534,  1541,  1551,  1561,  1571,  1581,  1591,  1601,  1611,
+    1621,  1628,  1635,  1642,  1651,  1660,  1669,  1678,  1685,  1695,
+    1715,  1722,  1740,  1753,  1766,  1775,  1784,  1793,  1802,  1812,
+    1822,  1833,  1842,  1851,  1860,  1869,  1878,  1887,  1900,  1913,
+    1922,  1929,  1938,  1947,  1956,  1965,  1973,  1986,  1994,  2035,
+    2042,  2057,  2067,  2077,  2084,  2091,  2098,  2107,  2115,  2129,
+    2150,  2171,  2183,  2195,  2207,  2216,  2237,  2247,  2256,  2264,
+    2272,  2285,  2298,  2313,  2328,  2337,  2346,  2352,  2361,  2370,
+    2380,  2390,  2403,  2416,  2428,  2442,  2454,  2468,  2483,  2494,
+    2504,  2511,  2518,  2527,  2536,  2546,  2556,  2566,  2573,  2580,
+    2589,  2598,  2608,  2618,  2625,  2632,  2639,  2647,  2657,  2667,
+    2677,  2687,  2726,  2736,  2744,  2752,  2767,  2776,  2781,  2782,
+    2783,  2783,  2783,  2784,  2784,  2784,  2785,  2785,  2787,  2797,
+    2806,  2813,  2820,  2827,  2834,  2841,  2848,  2853,  2854,  2855,
+    2855,  2855,  2856,  2856,  2856,  2857,  2858,  2858,  2859,  2859,
+    2860,  2860,  2861,  2862,  2863,  2864,  2865,  2866,  2868,  2877,
+    2887,  2894,  2901,  2910,  2917,  2924,  2931,  2938,  2947,  2956,
+    2963,  2970,  2980,  2990,  3000,  3010,  3020,  3030,  3035,  3036,
+    3037,  3039,  3045,  3050,  3051,  3052,  3054,  3060,  3070,  3077,
+    3086,  3094,  3099,  3100,  3102,  3102,  3102,  3103,  3103,  3104,
+    3105,  3106,  3107,  3108,  3110,  3120,  3129,  3136,  3145,  3152,
+    3161,  3169,  3182,  3190,  3203,  3208,  3209,  3210,  3210,  3211,
+    3211,  3211,  3212,  3214,  3226,  3238,  3250,  3265,  3278,  3291,
+    3302,  3307,  3308,  3309,  3309,  3311,  3326
 };
 #endif
 
@@ -1333,17 +1335,18 @@ static const char *const yytname[] =
   "VAR_IPSET_NAME_V4", "VAR_IPSET_NAME_V6", "VAR_TLS_SESSION_TICKET_KEYS",
   "VAR_RPZ", "VAR_TAGS", "VAR_RPZ_ACTION_OVERRIDE",
   "VAR_RPZ_CNAME_OVERRIDE", "VAR_RPZ_LOG", "VAR_RPZ_LOG_NAME",
-  "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_TAG", "$accept",
-  "toplevelvars", "toplevelvar", "force_toplevel", "serverstart",
-  "contents_server", "content_server", "stubstart", "contents_stub",
-  "content_stub", "forwardstart", "contents_forward", "content_forward",
-  "viewstart", "contents_view", "content_view", "authstart",
-  "contents_auth", "content_auth", "rpz_tag", "rpz_action_override",
-  "rpz_cname_override", "rpz_log", "rpz_log_name", "rpzstart",
-  "contents_rpz", "content_rpz", "server_num_threads", "server_verbosity",
-  "server_statistics_interval", "server_statistics_cumulative",
-  "server_extended_statistics", "server_shm_enable", "server_shm_key",
-  "server_port", "server_send_client_subnet", "server_client_subnet_zone",
+  "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_TAG",
+  "VAR_EDNS_CLIENT_TAG_OPCODE", "$accept", "toplevelvars", "toplevelvar",
+  "force_toplevel", "serverstart", "contents_server", "content_server",
+  "stubstart", "contents_stub", "content_stub", "forwardstart",
+  "contents_forward", "content_forward", "viewstart", "contents_view",
+  "content_view", "authstart", "contents_auth", "content_auth", "rpz_tag",
+  "rpz_action_override", "rpz_cname_override", "rpz_log", "rpz_log_name",
+  "rpzstart", "contents_rpz", "content_rpz", "server_num_threads",
+  "server_verbosity", "server_statistics_interval",
+  "server_statistics_cumulative", "server_extended_statistics",
+  "server_shm_enable", "server_shm_key", "server_port",
+  "server_send_client_subnet", "server_client_subnet_zone",
   "server_client_subnet_always_forward", "server_client_subnet_opcode",
   "server_max_client_subnet_ipv4", "server_max_client_subnet_ipv6",
   "server_min_client_subnet_ipv4", "server_min_client_subnet_ipv6",
@@ -1425,12 +1428,12 @@ static const char *const yytname[] =
   "server_qname_minimisation_strict", "server_ipsecmod_enabled",
   "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook",
   "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist",
-  "server_ipsecmod_strict", "server_edns_client_tag", "stub_name",
-  "stub_host", "stub_addr", "stub_first", "stub_no_cache",
-  "stub_ssl_upstream", "stub_prime", "forward_name", "forward_host",
-  "forward_addr", "forward_first", "forward_no_cache",
-  "forward_ssl_upstream", "auth_name", "auth_zonefile", "auth_master",
-  "auth_url", "auth_allow_notify", "auth_for_downstream",
+  "server_ipsecmod_strict", "server_edns_client_tag",
+  "server_edns_client_tag_opcode", "stub_name", "stub_host", "stub_addr",
+  "stub_first", "stub_no_cache", "stub_ssl_upstream", "stub_prime",
+  "forward_name", "forward_host", "forward_addr", "forward_first",
+  "forward_no_cache", "forward_ssl_upstream", "auth_name", "auth_zonefile",
+  "auth_master", "auth_url", "auth_allow_notify", "auth_for_downstream",
   "auth_for_upstream", "auth_fallback_enabled", "view_name",
   "view_local_zone", "view_response_ip", "view_response_ip_data",
   "view_local_data", "view_local_data_ptr", "view_first", "rcstart",
@@ -1500,7 +1503,7 @@ static const yytype_int16 yytoknum[] =
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546,   547,   548,   549,   550,   551,   552,   553
+     545,   546,   547,   548,   549,   550,   551,   552,   553,   554
 };
 # endif
 
@@ -1542,7 +1545,7 @@ static const yytype_int16 yypact[] =
      251,   253,   254,   255,   256,   257,   258,   259,   260,   261,
      262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
      272,   273,   274,   275,   277,   278,   279,   281,   282,   283,
-     285,   319,   320,   321,   322,   326,  -288,  -288,  -288,  -288,
+     285,   319,   320,   321,   322,   326,   327,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
@@ -1562,55 +1565,55 @@ static const yytype_int16 yypact[] =
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   327,   328,
-     370,   371,   372,   373,   374,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,   375,   376,   377,   378,   382,   386,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,   387,   412,   413,   414,
-     422,   433,   434,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,   435,   436,   437,   438,   439,   440,   441,   442,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   443,   444,
-     445,   446,   447,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,   448,   449,   450,   451,   452,   492,
-     494,   510,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,   511,   512,   513,   514,   515,   516,   517,   518,   519,
-     520,   527,   528,   529,   530,   531,   532,   533,   535,   536,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+     328,   370,   371,   372,   373,   374,   375,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,   376,   377,   378,   382,   386,
+     387,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   412,   413,
+     414,   422,   433,   434,   435,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,   436,   437,   438,   439,   440,   441,   442,
+     443,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+     444,   445,   446,   447,   448,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,   449,   450,   451,   452,
+     492,   494,   510,   511,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,   512,   513,   514,   515,   516,   517,   518,
+     519,   520,   527,   528,   529,   530,   531,   532,   533,   535,
+     536,   537,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-     537,  -288,  -288,   538,  -288,  -288,   539,   540,   541,   544,
-     547,   550,   551,   560,   561,   562,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,   564,   565,   566,
-     567,   568,   569,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-     570,   571,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,   538,  -288,  -288,   539,  -288,  -288,   540,   541,
+     544,   547,   550,   551,   560,   561,   562,   564,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   565,
+     566,   567,   568,   569,   570,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,   571,   574,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,   573,   574,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   575,   576,
-     577,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,   578,   579,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,   580,   581,   582,   583,   584,   585,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,   586,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,   587,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-     588,  -288,  -288,   589,   590,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,   575,   576,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,   591,   592,   593,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288
+     577,   578,   579,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,   580,   581,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,   582,   583,   584,   585,   586,   587,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,   588,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,   589,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,   590,  -288,  -288,   591,   592,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   593,   594,
+     595,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1618,10 +1621,10 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_int16 yydefact[] =
 {
-       2,     0,     1,    18,    19,   223,   233,   505,   565,   524,
-     242,   579,   602,   252,   618,   268,   570,     3,    17,    21,
-     225,   235,   244,   254,   270,   507,   526,   567,   572,   581,
-     604,   620,     4,     5,     6,    10,    14,    15,     8,     9,
+       2,     0,     1,    18,    19,   224,   234,   507,   567,   526,
+     243,   581,   604,   253,   620,   269,   572,     3,    17,    21,
+     226,   236,   245,   255,   271,   509,   528,   569,   574,   583,
+     606,   622,     4,     5,     6,    10,    14,    15,     8,     9,
        7,    16,    11,    12,    13,     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,
@@ -1642,75 +1645,75 @@ static const yytype_int16 yydefact[] =
        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,     0,     0,     0,     0,     0,    20,    22,    23,    86,
-      89,    98,   192,   193,    24,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,    37,    77,    25,    90,    91,
-      48,    70,    85,    26,    27,    30,    31,    28,    29,    32,
-      33,    34,    35,    36,   121,   204,   122,   124,   125,   126,
-     206,   211,   207,   218,   219,   220,   221,   127,   128,   129,
-     130,   131,   132,   188,    87,    76,   102,   119,   120,   216,
-     213,   123,    38,    39,    40,    41,    42,    78,    92,    93,
-     108,    64,    74,    65,   196,   197,   103,    58,    59,   195,
-      60,    61,   112,   116,   136,   145,   171,   148,   217,   113,
-      71,    43,    44,    45,   100,   137,   138,   139,    46,    47,
-      49,    50,    52,    53,    51,   143,    54,    55,    56,    62,
-      81,   117,    95,   144,    88,   167,    96,    97,   114,   115,
-     214,   101,    57,    79,    82,    63,    66,   104,   105,    80,
-     168,   106,    67,    68,    69,   205,   118,   181,   182,   183,
-     184,   185,   186,   194,   107,    75,   109,   110,   111,   169,
-      72,    73,    94,    83,    84,    99,   133,   134,   215,   135,
-     140,   141,   142,   172,   173,   175,   177,   178,   176,   179,
-     189,   146,   147,   151,   152,   149,   150,   153,   154,   156,
-     155,   208,   210,   209,   170,   180,   198,   200,   199,   201,
-     202,   203,   222,   174,   187,   190,   191,   212,     0,     0,
-       0,     0,     0,     0,     0,   224,   226,   227,   228,   230,
-     231,   232,   229,     0,     0,     0,     0,     0,     0,   234,
-     236,   237,   238,   239,   240,   241,     0,     0,     0,     0,
-       0,     0,     0,   243,   245,   246,   249,   250,   247,   251,
-     248,     0,     0,     0,     0,     0,     0,     0,     0,   253,
-     255,   256,   257,   258,   262,   259,   260,   261,     0,     0,
-       0,     0,     0,   273,   277,   278,   279,   280,   269,   271,
-     272,   274,   275,   276,     0,     0,     0,     0,     0,     0,
-       0,     0,   506,   508,   510,   509,   515,   511,   512,   513,
-     514,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    20,    22,    23,
+      86,    89,    98,   192,   193,    24,   157,   158,   159,   160,
+     161,   162,   163,   164,   165,   166,    37,    77,    25,    90,
+      91,    48,    70,    85,    26,    27,    30,    31,    28,    29,
+      32,    33,    34,    35,    36,   121,   204,   122,   124,   125,
+     126,   206,   211,   207,   218,   219,   220,   221,   127,   128,
+     129,   130,   131,   132,   188,    87,    76,   102,   119,   120,
+     216,   213,   123,    38,    39,    40,    41,    42,    78,    92,
+      93,   108,    64,    74,    65,   196,   197,   103,    58,    59,
+     195,    60,    61,   112,   116,   136,   145,   171,   148,   217,
+     113,    71,    43,    44,    45,   100,   137,   138,   139,    46,
+      47,    49,    50,    52,    53,    51,   143,    54,    55,    56,
+      62,    81,   117,    95,   144,    88,   167,    96,    97,   114,
+     115,   214,   101,    57,    79,    82,    63,    66,   104,   105,
+      80,   168,   106,    67,    68,    69,   205,   118,   181,   182,
+     183,   184,   185,   186,   194,   107,    75,   109,   110,   111,
+     169,    72,    73,    94,    83,    84,    99,   133,   134,   215,
+     135,   140,   141,   142,   172,   173,   175,   177,   178,   176,
+     179,   189,   146,   147,   151,   152,   149,   150,   153,   154,
+     156,   155,   208,   210,   209,   170,   180,   198,   200,   199,
+     201,   202,   203,   222,   223,   174,   187,   190,   191,   212,
+       0,     0,     0,     0,     0,     0,     0,   225,   227,   228,
+     229,   231,   232,   233,   230,     0,     0,     0,     0,     0,
+       0,   235,   237,   238,   239,   240,   241,   242,     0,     0,
+       0,     0,     0,     0,     0,   244,   246,   247,   250,   251,
+     248,   252,   249,     0,     0,     0,     0,     0,     0,     0,
+       0,   254,   256,   257,   258,   259,   263,   260,   261,   262,
+       0,     0,     0,     0,     0,   274,   278,   279,   280,   281,
+     270,   272,   273,   275,   276,   277,     0,     0,     0,     0,
+       0,     0,     0,     0,   508,   510,   512,   511,   517,   513,
+     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     525,   527,   529,   528,   530,   531,   532,   533,   534,   535,
+       0,     0,   527,   529,   531,   530,   532,   533,   534,   535,
      536,   537,   538,   539,   540,   541,   542,   543,   544,   545,
-       0,   566,   568,     0,   571,   573,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   580,   582,   583,   584,
-     586,   587,   585,   588,   589,   590,   591,     0,     0,     0,
-       0,     0,     0,   603,   605,   606,   607,   608,   609,   610,
-       0,     0,   619,   621,   622,   282,   281,   288,   301,   299,
-     311,   307,   308,   312,   309,   310,   313,   314,   315,   316,
-     317,   346,   347,   348,   349,   350,   375,   376,   377,   382,
-     383,   304,   384,   385,   388,   386,   387,   390,   391,   392,
-     406,   361,   362,   364,   365,   393,   409,   355,   357,   410,
-     416,   417,   418,   305,   374,   434,   435,   356,   429,   339,
-     300,   351,   407,   413,   394,     0,     0,   438,   306,   283,
-     338,   398,   284,   302,   303,   352,   353,   436,   396,   400,
-     401,   285,   439,   378,   405,   340,   360,   411,   412,   415,
-     428,   354,   432,   430,   431,   366,   373,   402,   403,   367,
-     368,   395,   420,   341,   342,   345,   318,   320,   321,   322,
-     323,   324,   331,   332,   333,   334,   335,   336,   440,   441,
-     443,   379,   380,   381,   389,   444,   445,   446,     0,     0,
-       0,   397,   369,   371,   575,   455,   459,   457,   456,   460,
-     458,     0,     0,   463,   464,   289,   290,   291,   292,   293,
-     294,   295,   296,   297,   298,   399,   414,   433,   468,   469,
-     370,   447,     0,     0,     0,     0,     0,     0,   421,   422,
-     423,   424,   425,   426,   427,   576,   363,   358,   419,   337,
-     286,   287,   359,   470,   472,   471,   473,   474,   475,   319,
-     326,   465,   467,   466,   325,     0,   344,   404,   442,   343,
-     372,   327,   328,   330,   329,     0,   477,   478,   479,   483,
-     482,   480,   481,   484,   485,   486,   487,   489,   488,   498,
-       0,   502,   503,     0,     0,   504,   490,   496,   491,   492,
-     493,   495,   497,   494,   263,   264,   265,   266,   267,   516,
-     518,   517,   520,   521,   522,   523,   519,   546,   548,   549,
-     550,   551,   552,   553,   554,   555,   556,   547,   557,   558,
-     559,   560,   561,   562,   563,   564,   569,   574,   592,   593,
-     594,   597,   595,   596,   598,   599,   600,   601,   611,   612,
-     613,   614,   615,   616,   623,   624,   408,   437,   454,   577,
-     578,   461,   462,   448,   449,     0,     0,     0,   453,   617,
-     476,   499,   500,   501,   452,   450,   451
+     546,   547,     0,   568,   570,     0,   573,   575,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   582,   584,
+     585,   586,   588,   589,   587,   590,   591,   592,   593,     0,
+       0,     0,     0,     0,     0,   605,   607,   608,   609,   610,
+     611,   612,     0,     0,   621,   623,   624,   283,   282,   289,
+     302,   300,   312,   308,   309,   313,   310,   311,   314,   315,
+     316,   317,   318,   347,   348,   349,   350,   351,   376,   377,
+     378,   383,   384,   305,   385,   386,   389,   387,   388,   391,
+     392,   393,   407,   362,   363,   365,   366,   394,   410,   356,
+     358,   411,   417,   418,   419,   306,   375,   435,   436,   357,
+     430,   340,   301,   352,   408,   414,   395,     0,     0,   439,
+     307,   284,   339,   399,   285,   303,   304,   353,   354,   437,
+     397,   401,   402,   286,   440,   379,   406,   341,   361,   412,
+     413,   416,   429,   355,   433,   431,   432,   367,   374,   403,
+     404,   368,   369,   396,   421,   342,   343,   346,   319,   321,
+     322,   323,   324,   325,   332,   333,   334,   335,   336,   337,
+     441,   442,   444,   380,   381,   382,   390,   445,   446,   447,
+       0,     0,     0,   398,   370,   372,   577,   456,   460,   458,
+     457,   461,   459,     0,     0,   464,   465,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   400,   415,   434,
+     469,   470,   371,   448,     0,     0,     0,     0,     0,     0,
+     422,   423,   424,   425,   426,   427,   428,   578,   364,   359,
+     420,   338,   287,   288,   360,   471,   473,   472,   474,   475,
+     476,   320,   327,   466,   468,   467,   326,     0,   345,   405,
+     443,   344,   373,   328,   329,   331,   330,     0,   478,   479,
+     480,   481,   485,   484,   482,   483,   486,   487,   488,   489,
+     491,   490,   500,     0,   504,   505,     0,     0,   506,   492,
+     498,   493,   494,   495,   497,   499,   496,   264,   265,   266,
+     267,   268,   518,   520,   519,   522,   523,   524,   525,   521,
+     548,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     549,   559,   560,   561,   562,   563,   564,   565,   566,   571,
+     576,   594,   595,   596,   599,   597,   598,   600,   601,   602,
+     603,   613,   614,   615,   616,   617,   618,   625,   626,   409,
+     438,   455,   579,   580,   462,   463,   449,   450,     0,     0,
+       0,   454,   619,   477,   501,   502,   503,   453,   451,   452
 };
 
   /* YYPGOTO[NTERM-NUM].  */
@@ -1739,8 +1742,8 @@ static const yytype_int16 yypgoto[] =
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,   572,   594,   595,   596,
-     597,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
+    -288,  -288,  -288,  -288,  -288,  -288,  -288,   572,   573,   596,
+     597,   598,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
@@ -1748,45 +1751,45 @@ static const yytype_int16 yypgoto[] =
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
     -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288
+    -288,  -288,  -288,  -288,  -288
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    17,    18,    19,    32,   246,    20,    33,   455,
-      21,    34,   469,    22,    35,   483,    23,    36,   499,   513,
-     514,   515,   516,   517,    24,    37,   518,   247,   248,   249,
-     250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
-     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
-     330,   331,   332,   333,   334,   335,   336,   337,   338,   339,
-     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,   354,   355,   356,   357,   358,   359,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   375,   376,   377,   378,   379,
-     380,   381,   382,   383,   384,   385,   386,   387,   388,   389,
-     390,   391,   392,   393,   394,   395,   396,   397,   398,   399,
-     400,   401,   402,   403,   404,   405,   406,   407,   408,   409,
-     410,   411,   412,   413,   414,   415,   416,   417,   418,   419,
-     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   442,   456,   457,   458,   459,   460,   461,   462,
-     470,   471,   472,   473,   474,   475,   500,   501,   502,   503,
-     504,   505,   506,   507,   484,   485,   486,   487,   488,   489,
-     490,    25,    38,   532,   533,   534,   535,   536,   537,   538,
-     539,   540,    26,    39,   560,   561,   562,   563,   564,   565,
-     566,   567,   568,   569,   570,   571,   572,   573,   574,   575,
-     576,   577,   578,   579,    27,    40,   581,   582,    28,    41,
-     584,   585,   443,   444,   445,   446,    29,    42,   596,   597,
-     598,   599,   600,   601,   602,   603,   604,   605,   606,    30,
-      43,   613,   614,   615,   616,   617,   618,   619,   447,    31,
-      44,   622,   623,   624
+      -1,     1,    17,    18,    19,    32,   247,    20,    33,   457,
+      21,    34,   471,    22,    35,   485,    23,    36,   501,   515,
+     516,   517,   518,   519,    24,    37,   520,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
+     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
+     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
+     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
+     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
+     441,   442,   443,   444,   458,   459,   460,   461,   462,   463,
+     464,   472,   473,   474,   475,   476,   477,   502,   503,   504,
+     505,   506,   507,   508,   509,   486,   487,   488,   489,   490,
+     491,   492,    25,    38,   534,   535,   536,   537,   538,   539,
+     540,   541,   542,    26,    39,   562,   563,   564,   565,   566,
+     567,   568,   569,   570,   571,   572,   573,   574,   575,   576,
+     577,   578,   579,   580,   581,    27,    40,   583,   584,    28,
+      41,   586,   587,   445,   446,   447,   448,    29,    42,   598,
+     599,   600,   601,   602,   603,   604,   605,   606,   607,   608,
+      30,    43,   615,   616,   617,   618,   619,   620,   621,   449,
+      31,    44,   624,   625,   626
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1794,70 +1797,70 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-       2,   491,   476,   448,   580,   449,   450,   463,   620,   621,
-     583,     3,     4,   625,   626,   464,   465,   607,   608,   609,
-     610,   611,   612,   627,   491,   586,   587,   588,   589,   590,
-     591,   592,   593,   594,   595,   628,   629,   630,   477,   478,
-     631,   632,   633,   634,   635,   636,     5,   637,   638,   639,
-     640,   641,     6,   642,   643,   644,   645,   646,   647,   648,
-     649,   650,   651,   479,   652,   653,   451,   541,   542,   543,
-     544,   545,   546,   547,   548,   549,   550,   551,   552,   553,
-     554,   555,   556,   557,   558,   559,   524,   525,   526,   527,
-     528,   529,   530,   531,   654,   655,     7,   452,   656,   657,
-     466,   658,   467,   659,   660,   661,   453,   662,   663,   664,
-     665,   666,     8,   667,   668,   669,   670,   671,   672,   673,
-     674,   675,   676,   677,   678,   679,   680,   681,   682,   683,
-     684,   685,   686,   687,   688,   689,   690,   480,   481,   691,
-     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
-     702,   703,   704,   705,   706,   707,   708,   709,   710,     9,
-     711,   712,   713,   714,   715,   716,   717,   718,   719,   720,
-     721,   722,   723,   724,   725,   726,   727,   482,   728,   729,
-     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
-     740,   741,   742,   743,   744,   745,   746,   747,   748,   749,
-     750,   751,   752,   753,   754,   755,   756,   757,   758,   759,
-     760,   761,   762,   763,   764,   765,   766,   767,    10,   493,
-     494,   495,   768,   769,   770,   771,   772,   773,   774,   498,
-     775,   776,   777,   778,   779,   454,    11,   780,   468,   781,
-     492,   782,   493,   494,   495,   496,   497,   508,   509,   510,
-     511,   512,   498,    12,   783,   784,   785,   786,   787,   788,
-     789,   790,    13,   791,   792,   793,   794,   795,   796,   797,
-     798,   799,   800,   801,   802,   803,   804,   805,   806,   807,
-     808,   809,   810,   811,   812,   813,    14,   814,   815,   816,
-      15,   817,   818,   819,     0,   820,    16,    45,    46,    47,
+       2,   493,   478,   450,   582,   451,   452,   465,   622,   623,
+     585,     3,     4,   627,   628,   466,   467,   609,   610,   611,
+     612,   613,   614,   629,   493,   588,   589,   590,   591,   592,
+     593,   594,   595,   596,   597,   630,   631,   632,   479,   480,
+     633,   634,   635,   636,   637,   638,     5,   639,   640,   641,
+     642,   643,     6,   644,   645,   646,   647,   648,   649,   650,
+     651,   652,   653,   481,   654,   655,   453,   543,   544,   545,
+     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
+     556,   557,   558,   559,   560,   561,   526,   527,   528,   529,
+     530,   531,   532,   533,   656,   657,     7,   454,   658,   659,
+     468,   660,   469,   661,   662,   663,   455,   664,   665,   666,
+     667,   668,     8,   669,   670,   671,   672,   673,   674,   675,
+     676,   677,   678,   679,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   691,   692,   482,   483,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     704,   705,   706,   707,   708,   709,   710,   711,   712,     9,
+     713,   714,   715,   716,   717,   718,   719,   720,   721,   722,
+     723,   724,   725,   726,   727,   728,   729,   484,   730,   731,
+     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
+     742,   743,   744,   745,   746,   747,   748,   749,   750,   751,
+     752,   753,   754,   755,   756,   757,   758,   759,   760,   761,
+     762,   763,   764,   765,   766,   767,   768,   769,    10,   495,
+     496,   497,   770,   771,   772,   773,   774,   775,   776,   500,
+     777,   778,   779,   780,   781,   456,    11,   782,   470,   783,
+     494,   784,   495,   496,   497,   498,   499,   510,   511,   512,
+     513,   514,   500,    12,   785,   786,   787,   788,   789,   790,
+     791,   792,    13,   793,   794,   795,   796,   797,   798,   799,
+     800,   801,   802,   803,   804,   805,   806,   807,   808,   809,
+     810,   811,   812,   813,   814,   815,    14,   816,   817,   818,
+      15,   819,   820,   821,     0,   822,    16,    45,    46,    47,
       48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
       58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,   821,
-     822,   823,   824,    77,    78,    79,   825,   826,   827,    80,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,   823,
+     824,   825,   826,    77,    78,    79,   827,   828,   829,    80,
       81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
       91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     828,   829,   830,   831,   832,   833,   834,   835,   836,   121,
-     122,   123,   837,   124,   125,   126,   838,   839,   127,   128,
+     830,   831,   832,   833,   834,   835,   836,   837,   838,   121,
+     122,   123,   839,   124,   125,   126,   840,   841,   127,   128,
      129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
      139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   840,   841,   842,   151,   152,   153,   154,   155,
-     156,   157,   843,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   844,   845,   846,   847,   848,   849,   850,
-     851,   852,   853,   854,   855,   856,   857,   858,   859,   860,
-     861,   862,   863,   168,   169,   170,   171,   172,   173,   174,
+     149,   150,   842,   843,   844,   151,   152,   153,   154,   155,
+     156,   157,   845,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   846,   847,   848,   849,   850,   851,   852,
+     853,   854,   855,   856,   857,   858,   859,   860,   861,   862,
+     863,   864,   865,   168,   169,   170,   171,   172,   173,   174,
      175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
      185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
      195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   864,   207,   865,   208,   209,   210,   211,   212,
+     205,   206,   866,   207,   867,   208,   209,   210,   211,   212,
      213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     866,   867,   868,   869,   870,   871,   872,   873,   874,   875,
-     876,   223,   224,   225,   226,   227,   228,   877,   878,   879,
-     880,   881,   882,   883,   229,   884,   885,   886,   887,   888,
-     889,   890,   230,   231,   891,   232,   233,   892,   234,   235,
-     893,   894,   236,   237,   238,   239,   240,   241,   242,   243,
-     895,   896,   897,   244,   898,   899,   900,   901,   902,   903,
-     904,   905,   245,   906,   907,   908,   909,   910,   911,   912,
-     913,   914,   915,   916,   917,   918,   919,   920,   921,   922,
-     923,   924,   925,   926,     0,     0,     0,     0,     0,   519,
+     868,   869,   870,   871,   872,   873,   874,   875,   876,   877,
+     878,   223,   224,   225,   226,   227,   228,   879,   880,   881,
+     882,   883,   884,   885,   229,   886,   887,   888,   889,   890,
+     891,   892,   230,   231,   893,   232,   233,   894,   234,   235,
+     895,   896,   236,   237,   238,   239,   240,   241,   242,   243,
+     897,   898,   899,   244,   900,   901,   902,   903,   904,   905,
+     906,   907,   245,   246,   908,   909,   910,   911,   912,   913,
+     914,   915,   916,   917,   918,   919,   920,   921,   922,   923,
+     924,   925,   926,   927,   928,   929,     0,     0,     0,   521,
+     522,     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,   520,   521,   522,   523
+       0,     0,     0,   523,   524,   525
 };
 
 static const yytype_int16 yycheck[] =
@@ -1920,23 +1923,23 @@ static const yytype_int16 yycheck[] =
       10,    10,   268,   269,    10,   271,   272,    10,   274,   275,
       10,    10,   278,   279,   280,   281,   282,   283,   284,   285,
       10,    10,    10,   289,    10,    10,    10,    10,    10,    10,
-      10,    10,   298,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,   298,   299,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    -1,    -1,    -1,    -1,    -1,    37,
+      10,    10,    10,    10,    10,    10,    -1,    -1,    -1,    37,
+      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    37,    37,    37,    37
+      -1,    -1,    -1,    37,    37,    37
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_int16 yystos[] =
 {
-       0,   300,     0,    11,    12,    46,    52,    96,   112,   159,
-     218,   236,   253,   262,   286,   290,   296,   301,   302,   303,
-     306,   309,   312,   315,   323,   550,   561,   583,   587,   595,
-     608,   618,   304,   307,   310,   313,   316,   324,   551,   562,
-     584,   588,   596,   609,   619,    13,    14,    15,    16,    17,
+       0,   301,     0,    11,    12,    46,    52,    96,   112,   159,
+     218,   236,   253,   262,   286,   290,   296,   302,   303,   304,
+     307,   310,   313,   316,   324,   552,   563,   585,   589,   597,
+     610,   620,   305,   308,   311,   314,   317,   325,   553,   564,
+     586,   590,   598,   611,   621,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    49,    50,    51,
@@ -1956,7 +1959,7 @@ static const yytype_int16 yystos[] =
      223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
      233,   234,   235,   247,   248,   249,   250,   251,   252,   260,
      268,   269,   271,   272,   274,   275,   278,   279,   280,   281,
-     282,   283,   284,   285,   289,   298,   305,   326,   327,   328,
+     282,   283,   284,   285,   289,   298,   299,   306,   327,   328,
      329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
      339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
@@ -1976,25 +1979,25 @@ static const yytype_int16 yystos[] =
      489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
      499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
      509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   591,   592,   593,   594,   617,    45,    47,
-      48,   108,   139,   148,   277,   308,   522,   523,   524,   525,
-     526,   527,   528,    45,    53,    54,   138,   140,   276,   311,
-     529,   530,   531,   532,   533,   534,    45,    81,    82,   106,
-     180,   181,   220,   314,   543,   544,   545,   546,   547,   548,
-     549,    45,   261,   263,   264,   265,   266,   267,   273,   317,
-     535,   536,   537,   538,   539,   540,   541,   542,   291,   292,
-     293,   294,   295,   318,   319,   320,   321,   322,   325,   535,
-     536,   537,   538,   539,    97,    98,    99,   100,   101,   102,
-     103,   104,   552,   553,   554,   555,   556,   557,   558,   559,
-     560,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     563,   564,   565,   566,   567,   568,   569,   570,   571,   572,
+     519,   520,   521,   522,   523,   593,   594,   595,   596,   619,
+      45,    47,    48,   108,   139,   148,   277,   309,   524,   525,
+     526,   527,   528,   529,   530,    45,    53,    54,   138,   140,
+     276,   312,   531,   532,   533,   534,   535,   536,    45,    81,
+      82,   106,   180,   181,   220,   315,   545,   546,   547,   548,
+     549,   550,   551,    45,   261,   263,   264,   265,   266,   267,
+     273,   318,   537,   538,   539,   540,   541,   542,   543,   544,
+     291,   292,   293,   294,   295,   319,   320,   321,   322,   323,
+     326,   537,   538,   539,   540,   541,    97,    98,    99,   100,
+     101,   102,   103,   104,   554,   555,   556,   557,   558,   559,
+     560,   561,   562,   160,   161,   162,   163,   164,   165,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   565,   566,   567,   568,   569,   570,   571,   572,
      573,   574,   575,   576,   577,   578,   579,   580,   581,   582,
-     113,   585,   586,   297,   589,   590,   237,   238,   239,   240,
-     241,   242,   243,   244,   245,   246,   597,   598,   599,   600,
-     601,   602,   603,   604,   605,   606,   607,   254,   255,   256,
-     257,   258,   259,   610,   611,   612,   613,   614,   615,   616,
-     287,   288,   620,   621,   622,    10,    10,    10,    10,    10,
+     583,   584,   113,   587,   588,   297,   591,   592,   237,   238,
+     239,   240,   241,   242,   243,   244,   245,   246,   599,   600,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   254,
+     255,   256,   257,   258,   259,   612,   613,   614,   615,   616,
+     617,   618,   287,   288,   622,   623,   624,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -2024,41 +2027,41 @@ static const yytype_int16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int16 yyr1[] =
 {
-       0,   299,   300,   300,   301,   301,   301,   301,   301,   301,
-     301,   301,   301,   301,   301,   301,   301,   301,   302,   303,
-     304,   304,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   306,   307,   307,   308,   308,   308,   308,
-     308,   308,   308,   309,   310,   310,   311,   311,   311,   311,
-     311,   311,   312,   313,   313,   314,   314,   314,   314,   314,
-     314,   314,   315,   316,   316,   317,   317,   317,   317,   317,
-     317,   317,   317,   318,   319,   320,   321,   322,   323,   324,
-     324,   325,   325,   325,   325,   325,   325,   325,   325,   325,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+       0,   300,   301,   301,   302,   302,   302,   302,   302,   302,
+     302,   302,   302,   302,   302,   302,   302,   302,   303,   304,
+     305,   305,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   307,   308,   308,   309,   309,   309,
+     309,   309,   309,   309,   310,   311,   311,   312,   312,   312,
+     312,   312,   312,   313,   314,   314,   315,   315,   315,   315,
+     315,   315,   315,   316,   317,   317,   318,   318,   318,   318,
+     318,   318,   318,   318,   319,   320,   321,   322,   323,   324,
+     325,   325,   326,   326,   326,   326,   326,   326,   326,   326,
+     326,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
@@ -2080,19 +2083,19 @@ static const yytype_int16 yyr1[] =
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546,   547,   548,   549,   550,   551,   551,   552,   552,
-     552,   552,   552,   552,   552,   552,   553,   554,   555,   556,
-     557,   558,   559,   560,   561,   562,   562,   563,   563,   563,
-     563,   563,   563,   563,   563,   563,   563,   563,   563,   563,
-     563,   563,   563,   563,   563,   563,   564,   565,   566,   567,
+     545,   546,   547,   548,   549,   550,   551,   552,   553,   553,
+     554,   554,   554,   554,   554,   554,   554,   554,   555,   556,
+     557,   558,   559,   560,   561,   562,   563,   564,   564,   565,
+     565,   565,   565,   565,   565,   565,   565,   565,   565,   565,
+     565,   565,   565,   565,   565,   565,   565,   565,   566,   567,
      568,   569,   570,   571,   572,   573,   574,   575,   576,   577,
-     578,   579,   580,   581,   582,   583,   584,   584,   585,   586,
-     587,   588,   588,   589,   590,   591,   592,   593,   594,   595,
-     596,   596,   597,   597,   597,   597,   597,   597,   597,   597,
-     597,   597,   598,   599,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   609,   610,   610,   610,   610,   610,
-     610,   611,   612,   613,   614,   615,   616,   617,   618,   619,
-     619,   620,   620,   621,   622
+     578,   579,   580,   581,   582,   583,   584,   585,   586,   586,
+     587,   588,   589,   590,   590,   591,   592,   593,   594,   595,
+     596,   597,   598,   598,   599,   599,   599,   599,   599,   599,
+     599,   599,   599,   599,   600,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,   611,   611,   612,   612,   612,
+     612,   612,   612,   613,   614,   615,   616,   617,   618,   619,
+     620,   621,   621,   622,   622,   623,   624
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -2120,13 +2123,13 @@ static const yytype_int8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
        1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
        1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     2,     2,     2,     2,     1,     2,
-       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     1,
+       2,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2138,29 +2141,29 @@ static const yytype_int8 yyr2[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
-       4,     4,     4,     3,     3,     2,     2,     2,     2,     2,
-       2,     3,     3,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     3,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
-       3,     3,     2,     2,     2,     1,     2,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
-       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       3,     4,     4,     4,     3,     3,     2,     2,     2,     2,
+       2,     2,     3,     3,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     1,     2,     0,     1,     2,
-       1,     2,     0,     1,     2,     2,     2,     3,     3,     1,
-       2,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     2,     2,     2,     2,     2,     2,     3,     1,     2,
-       0,     1,     1,     2,     2
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     3,     3,     2,     2,     2,     1,     2,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     1,     2,     0,
+       1,     2,     1,     2,     0,     1,     2,     2,     2,     3,
+       3,     1,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     2,     2,     2,     2,     2,     2,     3,
+       1,     2,     0,     1,     1,     2,     2
 };
 
 
@@ -2860,7 +2863,7 @@ yyreduce:
         {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2864 "util/configparser.c"
+#line 2867 "util/configparser.c"
     break;
 
   case 19:
@@ -2868,11 +2871,11 @@ yyreduce:
         { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2872 "util/configparser.c"
+#line 2875 "util/configparser.c"
     break;
 
-  case 223:
-#line 297 "./util/configparser.y"
+  case 224:
+#line 298 "./util/configparser.y"
         {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2883,11 +2886,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2887 "util/configparser.c"
+#line 2890 "util/configparser.c"
     break;
 
-  case 233:
-#line 314 "./util/configparser.y"
+  case 234:
+#line 315 "./util/configparser.y"
         {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2898,11 +2901,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2902 "util/configparser.c"
+#line 2905 "util/configparser.c"
     break;
 
-  case 242:
-#line 331 "./util/configparser.y"
+  case 243:
+#line 332 "./util/configparser.y"
         {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
@@ -2915,11 +2918,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2919 "util/configparser.c"
+#line 2922 "util/configparser.c"
     break;
 
-  case 252:
-#line 350 "./util/configparser.y"
+  case 253:
+#line 351 "./util/configparser.y"
         {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
@@ -2935,11 +2938,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2939 "util/configparser.c"
+#line 2942 "util/configparser.c"
     break;
 
-  case 263:
-#line 374 "./util/configparser.y"
+  case 264:
+#line 375 "./util/configparser.y"
         {
 		uint8_t* bitlist;
 		size_t len = 0;
@@ -2956,11 +2959,11 @@ yyreduce:
 
 		}
 	}
-#line 2960 "util/configparser.c"
+#line 2963 "util/configparser.c"
     break;
 
-  case 264:
-#line 393 "./util/configparser.y"
+  case 265:
+#line 394 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
@@ -2975,21 +2978,21 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2979 "util/configparser.c"
+#line 2982 "util/configparser.c"
     break;
 
-  case 265:
-#line 410 "./util/configparser.y"
+  case 266:
+#line 411 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2989 "util/configparser.c"
+#line 2992 "util/configparser.c"
     break;
 
-  case 266:
-#line 418 "./util/configparser.y"
+  case 267:
+#line 419 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2997,21 +3000,21 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3001 "util/configparser.c"
+#line 3004 "util/configparser.c"
     break;
 
-  case 267:
-#line 428 "./util/configparser.y"
+  case 268:
+#line 429 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 3011 "util/configparser.c"
+#line 3014 "util/configparser.c"
     break;
 
-  case 268:
-#line 436 "./util/configparser.y"
+  case 269:
+#line 437 "./util/configparser.y"
         {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
@@ -3027,11 +3030,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3031 "util/configparser.c"
+#line 3034 "util/configparser.c"
     break;
 
-  case 281:
-#line 459 "./util/configparser.y"
+  case 282:
+#line 460 "./util/configparser.y"
         { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3039,11 +3042,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3043 "util/configparser.c"
+#line 3046 "util/configparser.c"
     break;
 
-  case 282:
-#line 468 "./util/configparser.y"
+  case 283:
+#line 469 "./util/configparser.y"
         { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3051,11 +3054,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3055 "util/configparser.c"
+#line 3058 "util/configparser.c"
     break;
 
-  case 283:
-#line 477 "./util/configparser.y"
+  case 284:
+#line 478 "./util/configparser.y"
         { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -3065,11 +3068,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3069 "util/configparser.c"
+#line 3072 "util/configparser.c"
     break;
 
-  case 284:
-#line 488 "./util/configparser.y"
+  case 285:
+#line 489 "./util/configparser.y"
         {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3077,11 +3080,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3081 "util/configparser.c"
+#line 3084 "util/configparser.c"
     break;
 
-  case 285:
-#line 497 "./util/configparser.y"
+  case 286:
+#line 498 "./util/configparser.y"
         {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3089,11 +3092,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3093 "util/configparser.c"
+#line 3096 "util/configparser.c"
     break;
 
-  case 286:
-#line 506 "./util/configparser.y"
+  case 287:
+#line 507 "./util/configparser.y"
         {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3101,11 +3104,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3105 "util/configparser.c"
+#line 3108 "util/configparser.c"
     break;
 
-  case 287:
-#line 515 "./util/configparser.y"
+  case 288:
+#line 516 "./util/configparser.y"
         { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -3115,11 +3118,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3119 "util/configparser.c"
+#line 3122 "util/configparser.c"
     break;
 
-  case 288:
-#line 526 "./util/configparser.y"
+  case 289:
+#line 527 "./util/configparser.y"
         {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3127,11 +3130,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3131 "util/configparser.c"
+#line 3134 "util/configparser.c"
     break;
 
-  case 289:
-#line 535 "./util/configparser.y"
+  case 290:
+#line 536 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -3142,11 +3145,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3146 "util/configparser.c"
+#line 3149 "util/configparser.c"
     break;
 
-  case 290:
-#line 547 "./util/configparser.y"
+  case 291:
+#line 548 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -3158,11 +3161,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3162 "util/configparser.c"
+#line 3165 "util/configparser.c"
     break;
 
-  case 291:
-#line 561 "./util/configparser.y"
+  case 292:
+#line 562 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -3176,11 +3179,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3180 "util/configparser.c"
+#line 3183 "util/configparser.c"
     break;
 
-  case 292:
-#line 576 "./util/configparser.y"
+  case 293:
+#line 577 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -3190,11 +3193,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3194 "util/configparser.c"
+#line 3197 "util/configparser.c"
     break;
 
-  case 293:
-#line 587 "./util/configparser.y"
+  case 294:
+#line 588 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3210,11 +3213,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3214 "util/configparser.c"
+#line 3217 "util/configparser.c"
     break;
 
-  case 294:
-#line 604 "./util/configparser.y"
+  case 295:
+#line 605 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3230,11 +3233,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3234 "util/configparser.c"
+#line 3237 "util/configparser.c"
     break;
 
-  case 295:
-#line 621 "./util/configparser.y"
+  case 296:
+#line 622 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3250,11 +3253,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3254 "util/configparser.c"
+#line 3257 "util/configparser.c"
     break;
 
-  case 296:
-#line 638 "./util/configparser.y"
+  case 297:
+#line 639 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3270,11 +3273,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3274 "util/configparser.c"
+#line 3277 "util/configparser.c"
     break;
 
-  case 297:
-#line 655 "./util/configparser.y"
+  case 298:
+#line 656 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3288,11 +3291,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3292 "util/configparser.c"
+#line 3295 "util/configparser.c"
     break;
 
-  case 298:
-#line 670 "./util/configparser.y"
+  case 299:
+#line 671 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3306,11 +3309,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3310 "util/configparser.c"
+#line 3313 "util/configparser.c"
     break;
 
-  case 299:
-#line 685 "./util/configparser.y"
+  case 300:
+#line 686 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -3322,11 +3325,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3326 "util/configparser.c"
+#line 3329 "util/configparser.c"
     break;
 
-  case 300:
-#line 698 "./util/configparser.y"
+  case 301:
+#line 699 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -3340,11 +3343,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3344 "util/configparser.c"
+#line 3347 "util/configparser.c"
     break;
 
-  case 301:
-#line 713 "./util/configparser.y"
+  case 302:
+#line 714 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3352,11 +3355,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3356 "util/configparser.c"
+#line 3359 "util/configparser.c"
     break;
 
-  case 302:
-#line 722 "./util/configparser.y"
+  case 303:
+#line 723 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
@@ -3364,11 +3367,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3368 "util/configparser.c"
+#line 3371 "util/configparser.c"
     break;
 
-  case 303:
-#line 731 "./util/configparser.y"
+  case 304:
+#line 732 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
@@ -3376,11 +3379,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3380 "util/configparser.c"
+#line 3383 "util/configparser.c"
     break;
 
-  case 304:
-#line 740 "./util/configparser.y"
+  case 305:
+#line 741 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3388,11 +3391,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3392 "util/configparser.c"
+#line 3395 "util/configparser.c"
     break;
 
-  case 305:
-#line 749 "./util/configparser.y"
+  case 306:
+#line 750 "./util/configparser.y"
         {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3400,11 +3403,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3404 "util/configparser.c"
+#line 3407 "util/configparser.c"
     break;
 
-  case 306:
-#line 758 "./util/configparser.y"
+  case 307:
+#line 759 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3412,11 +3415,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3416 "util/configparser.c"
+#line 3419 "util/configparser.c"
     break;
 
-  case 307:
-#line 767 "./util/configparser.y"
+  case 308:
+#line 768 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3424,11 +3427,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3428 "util/configparser.c"
+#line 3431 "util/configparser.c"
     break;
 
-  case 308:
-#line 776 "./util/configparser.y"
+  case 309:
+#line 777 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3436,11 +3439,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3440 "util/configparser.c"
+#line 3443 "util/configparser.c"
     break;
 
-  case 309:
-#line 785 "./util/configparser.y"
+  case 310:
+#line 786 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3448,11 +3451,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3452 "util/configparser.c"
+#line 3455 "util/configparser.c"
     break;
 
-  case 310:
-#line 794 "./util/configparser.y"
+  case 311:
+#line 795 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3460,11 +3463,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3464 "util/configparser.c"
+#line 3467 "util/configparser.c"
     break;
 
-  case 311:
-#line 803 "./util/configparser.y"
+  case 312:
+#line 804 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3472,11 +3475,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3476 "util/configparser.c"
+#line 3479 "util/configparser.c"
     break;
 
-  case 312:
-#line 812 "./util/configparser.y"
+  case 313:
+#line 813 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3484,11 +3487,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3488 "util/configparser.c"
+#line 3491 "util/configparser.c"
     break;
 
-  case 313:
-#line 821 "./util/configparser.y"
+  case 314:
+#line 822 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3496,11 +3499,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3500 "util/configparser.c"
+#line 3503 "util/configparser.c"
     break;
 
-  case 314:
-#line 830 "./util/configparser.y"
+  case 315:
+#line 831 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3508,11 +3511,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3512 "util/configparser.c"
+#line 3515 "util/configparser.c"
     break;
 
-  case 315:
-#line 839 "./util/configparser.y"
+  case 316:
+#line 840 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3524,11 +3527,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3528 "util/configparser.c"
+#line 3531 "util/configparser.c"
     break;
 
-  case 316:
-#line 852 "./util/configparser.y"
+  case 317:
+#line 853 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3536,11 +3539,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3540 "util/configparser.c"
+#line 3543 "util/configparser.c"
     break;
 
-  case 317:
-#line 861 "./util/configparser.y"
+  case 318:
+#line 862 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3552,11 +3555,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3556 "util/configparser.c"
+#line 3559 "util/configparser.c"
     break;
 
-  case 318:
-#line 874 "./util/configparser.y"
+  case 319:
+#line 875 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3564,11 +3567,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3568 "util/configparser.c"
+#line 3571 "util/configparser.c"
     break;
 
-  case 319:
-#line 883 "./util/configparser.y"
+  case 320:
+#line 884 "./util/configparser.y"
         {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3576,11 +3579,11 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3580 "util/configparser.c"
+#line 3583 "util/configparser.c"
     break;
 
-  case 320:
-#line 892 "./util/configparser.y"
+  case 321:
+#line 893 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3588,31 +3591,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3592 "util/configparser.c"
+#line 3595 "util/configparser.c"
     break;
 
-  case 321:
-#line 901 "./util/configparser.y"
+  case 322:
+#line 902 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3602 "util/configparser.c"
+#line 3605 "util/configparser.c"
     break;
 
-  case 322:
-#line 908 "./util/configparser.y"
+  case 323:
+#line 909 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3612 "util/configparser.c"
+#line 3615 "util/configparser.c"
     break;
 
-  case 323:
-#line 915 "./util/configparser.y"
+  case 324:
+#line 916 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3620,21 +3623,21 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3624 "util/configparser.c"
+#line 3627 "util/configparser.c"
     break;
 
-  case 324:
-#line 924 "./util/configparser.y"
+  case 325:
+#line 925 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3634 "util/configparser.c"
+#line 3637 "util/configparser.c"
     break;
 
-  case 325:
-#line 931 "./util/configparser.y"
+  case 326:
+#line 932 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3642,53 +3645,53 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3646 "util/configparser.c"
+#line 3649 "util/configparser.c"
     break;
 
-  case 326:
-#line 940 "./util/configparser.y"
+  case 327:
+#line 941 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3657 "util/configparser.c"
+#line 3660 "util/configparser.c"
     break;
 
-  case 327:
-#line 948 "./util/configparser.y"
+  case 328:
+#line 949 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3667 "util/configparser.c"
+#line 3670 "util/configparser.c"
     break;
 
-  case 328:
-#line 955 "./util/configparser.y"
+  case 329:
+#line 956 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3677 "util/configparser.c"
+#line 3680 "util/configparser.c"
     break;
 
-  case 329:
-#line 962 "./util/configparser.y"
+  case 330:
+#line 963 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3688 "util/configparser.c"
+#line 3691 "util/configparser.c"
     break;
 
-  case 330:
-#line 970 "./util/configparser.y"
+  case 331:
+#line 971 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3696,22 +3699,22 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3700 "util/configparser.c"
+#line 3703 "util/configparser.c"
     break;
 
-  case 331:
-#line 979 "./util/configparser.y"
+  case 332:
+#line 980 "./util/configparser.y"
         {
 		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
 	}
-#line 3711 "util/configparser.c"
+#line 3714 "util/configparser.c"
     break;
 
-  case 332:
-#line 986 "./util/configparser.y"
+  case 333:
+#line 987 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->http_endpoint);
@@ -3727,11 +3730,11 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3731 "util/configparser.c"
+#line 3734 "util/configparser.c"
     break;
 
-  case 333:
-#line 1002 "./util/configparser.y"
+  case 334:
+#line 1003 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3739,11 +3742,11 @@ yyreduce:
 		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3743 "util/configparser.c"
+#line 3746 "util/configparser.c"
     break;
 
-  case 334:
-#line 1010 "./util/configparser.y"
+  case 335:
+#line 1011 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str),
@@ -3751,11 +3754,11 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3755 "util/configparser.c"
+#line 3758 "util/configparser.c"
     break;
 
-  case 335:
-#line 1018 "./util/configparser.y"
+  case 336:
+#line 1019 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str),
@@ -3763,11 +3766,11 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3767 "util/configparser.c"
+#line 3770 "util/configparser.c"
     break;
 
-  case 336:
-#line 1026 "./util/configparser.y"
+  case 337:
+#line 1027 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3775,11 +3778,11 @@ yyreduce:
 		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3779 "util/configparser.c"
+#line 3782 "util/configparser.c"
     break;
 
-  case 337:
-#line 1034 "./util/configparser.y"
+  case 338:
+#line 1035 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3787,11 +3790,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3791 "util/configparser.c"
+#line 3794 "util/configparser.c"
     break;
 
-  case 338:
-#line 1043 "./util/configparser.y"
+  case 339:
+#line 1044 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3799,11 +3802,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3803 "util/configparser.c"
+#line 3806 "util/configparser.c"
     break;
 
-  case 339:
-#line 1052 "./util/configparser.y"
+  case 340:
+#line 1053 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3816,11 +3819,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3820 "util/configparser.c"
+#line 3823 "util/configparser.c"
     break;
 
-  case 340:
-#line 1066 "./util/configparser.y"
+  case 341:
+#line 1067 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3828,11 +3831,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3832 "util/configparser.c"
+#line 3835 "util/configparser.c"
     break;
 
-  case 341:
-#line 1075 "./util/configparser.y"
+  case 342:
+#line 1076 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3840,11 +3843,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3844 "util/configparser.c"
+#line 3847 "util/configparser.c"
     break;
 
-  case 342:
-#line 1084 "./util/configparser.y"
+  case 343:
+#line 1085 "./util/configparser.y"
   {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3852,11 +3855,11 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3856 "util/configparser.c"
+#line 3859 "util/configparser.c"
     break;
 
-  case 343:
-#line 1093 "./util/configparser.y"
+  case 344:
+#line 1094 "./util/configparser.y"
   {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3864,11 +3867,11 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3868 "util/configparser.c"
+#line 3871 "util/configparser.c"
     break;
 
-  case 344:
-#line 1102 "./util/configparser.y"
+  case 345:
+#line 1103 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3876,11 +3879,11 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3880 "util/configparser.c"
+#line 3883 "util/configparser.c"
     break;
 
-  case 345:
-#line 1111 "./util/configparser.y"
+  case 346:
+#line 1112 "./util/configparser.y"
   {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3888,31 +3891,31 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3892 "util/configparser.c"
+#line 3895 "util/configparser.c"
     break;
 
-  case 346:
-#line 1120 "./util/configparser.y"
+  case 347:
+#line 1121 "./util/configparser.y"
         {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3902 "util/configparser.c"
+#line 3905 "util/configparser.c"
     break;
 
-  case 347:
-#line 1127 "./util/configparser.y"
+  case 348:
+#line 1128 "./util/configparser.y"
         {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3912 "util/configparser.c"
+#line 3915 "util/configparser.c"
     break;
 
-  case 348:
-#line 1134 "./util/configparser.y"
+  case 349:
+#line 1135 "./util/configparser.y"
         {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3937,105 +3940,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3941 "util/configparser.c"
+#line 3944 "util/configparser.c"
     break;
 
-  case 349:
-#line 1160 "./util/configparser.y"
+  case 350:
+#line 1161 "./util/configparser.y"
         {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3952 "util/configparser.c"
+#line 3955 "util/configparser.c"
     break;
 
-  case 350:
-#line 1168 "./util/configparser.y"
+  case 351:
+#line 1169 "./util/configparser.y"
         {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3962 "util/configparser.c"
+#line 3965 "util/configparser.c"
     break;
 
-  case 351:
-#line 1175 "./util/configparser.y"
+  case 352:
+#line 1176 "./util/configparser.y"
         {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3972 "util/configparser.c"
+#line 3975 "util/configparser.c"
     break;
 
-  case 352:
-#line 1182 "./util/configparser.y"
+  case 353:
+#line 1183 "./util/configparser.y"
         {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 3982 "util/configparser.c"
+#line 3985 "util/configparser.c"
     break;
 
-  case 353:
-#line 1189 "./util/configparser.y"
+  case 354:
+#line 1190 "./util/configparser.y"
         {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 3992 "util/configparser.c"
+#line 3995 "util/configparser.c"
     break;
 
-  case 354:
-#line 1196 "./util/configparser.y"
+  case 355:
+#line 1197 "./util/configparser.y"
         {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4003 "util/configparser.c"
+#line 4006 "util/configparser.c"
     break;
 
-  case 355:
-#line 1204 "./util/configparser.y"
+  case 356:
+#line 1205 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4014 "util/configparser.c"
+#line 4017 "util/configparser.c"
     break;
 
-  case 356:
-#line 1212 "./util/configparser.y"
+  case 357:
+#line 1213 "./util/configparser.y"
         {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4025 "util/configparser.c"
+#line 4028 "util/configparser.c"
     break;
 
-  case 357:
-#line 1220 "./util/configparser.y"
+  case 358:
+#line 1221 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4035 "util/configparser.c"
+#line 4038 "util/configparser.c"
     break;
 
-  case 358:
-#line 1227 "./util/configparser.y"
+  case 359:
+#line 1228 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4045,11 +4048,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4049 "util/configparser.c"
+#line 4052 "util/configparser.c"
     break;
 
-  case 359:
-#line 1238 "./util/configparser.y"
+  case 360:
+#line 1239 "./util/configparser.y"
         {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4059,21 +4062,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4063 "util/configparser.c"
+#line 4066 "util/configparser.c"
     break;
 
-  case 360:
-#line 1249 "./util/configparser.y"
+  case 361:
+#line 1250 "./util/configparser.y"
         {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4073 "util/configparser.c"
+#line 4076 "util/configparser.c"
     break;
 
-  case 361:
-#line 1256 "./util/configparser.y"
+  case 362:
+#line 1257 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4081,11 +4084,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4085 "util/configparser.c"
+#line 4088 "util/configparser.c"
     break;
 
-  case 362:
-#line 1265 "./util/configparser.y"
+  case 363:
+#line 1266 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4093,11 +4096,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4097 "util/configparser.c"
+#line 4100 "util/configparser.c"
     break;
 
-  case 363:
-#line 1274 "./util/configparser.y"
+  case 364:
+#line 1275 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4105,53 +4108,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4109 "util/configparser.c"
+#line 4112 "util/configparser.c"
     break;
 
-  case 364:
-#line 1283 "./util/configparser.y"
+  case 365:
+#line 1284 "./util/configparser.y"
         {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 4119 "util/configparser.c"
+#line 4122 "util/configparser.c"
     break;
 
-  case 365:
-#line 1290 "./util/configparser.y"
+  case 366:
+#line 1291 "./util/configparser.y"
         {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 4129 "util/configparser.c"
+#line 4132 "util/configparser.c"
     break;
 
-  case 366:
-#line 1297 "./util/configparser.y"
+  case 367:
+#line 1298 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4140 "util/configparser.c"
+#line 4143 "util/configparser.c"
     break;
 
-  case 367:
-#line 1305 "./util/configparser.y"
+  case 368:
+#line 1306 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4151 "util/configparser.c"
+#line 4154 "util/configparser.c"
     break;
 
-  case 368:
-#line 1313 "./util/configparser.y"
+  case 369:
+#line 1314 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4160,11 +4163,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4164 "util/configparser.c"
+#line 4167 "util/configparser.c"
     break;
 
-  case 369:
-#line 1323 "./util/configparser.y"
+  case 370:
+#line 1324 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4173,11 +4176,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4177 "util/configparser.c"
+#line 4180 "util/configparser.c"
     break;
 
-  case 370:
-#line 1333 "./util/configparser.y"
+  case 371:
+#line 1334 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4186,11 +4189,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4190 "util/configparser.c"
+#line 4193 "util/configparser.c"
     break;
 
-  case 371:
-#line 1343 "./util/configparser.y"
+  case 372:
+#line 1344 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4203,22 +4206,22 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4207 "util/configparser.c"
+#line 4210 "util/configparser.c"
     break;
 
-  case 372:
-#line 1357 "./util/configparser.y"
+  case 373:
+#line 1358 "./util/configparser.y"
         {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4218 "util/configparser.c"
+#line 4221 "util/configparser.c"
     break;
 
-  case 373:
-#line 1365 "./util/configparser.y"
+  case 374:
+#line 1366 "./util/configparser.y"
         {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4230,11 +4233,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4234 "util/configparser.c"
+#line 4237 "util/configparser.c"
     break;
 
-  case 374:
-#line 1378 "./util/configparser.y"
+  case 375:
+#line 1379 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4244,22 +4247,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4248 "util/configparser.c"
+#line 4251 "util/configparser.c"
     break;
 
-  case 375:
-#line 1389 "./util/configparser.y"
+  case 376:
+#line 1390 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4259 "util/configparser.c"
+#line 4262 "util/configparser.c"
     break;
 
-  case 376:
-#line 1397 "./util/configparser.y"
+  case 377:
+#line 1398 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4271,11 +4274,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4275 "util/configparser.c"
+#line 4278 "util/configparser.c"
     break;
 
-  case 377:
-#line 1410 "./util/configparser.y"
+  case 378:
+#line 1411 "./util/configparser.y"
         {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4283,11 +4286,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4287 "util/configparser.c"
+#line 4290 "util/configparser.c"
     break;
 
-  case 378:
-#line 1419 "./util/configparser.y"
+  case 379:
+#line 1420 "./util/configparser.y"
         {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4295,11 +4298,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4299 "util/configparser.c"
+#line 4302 "util/configparser.c"
     break;
 
-  case 379:
-#line 1428 "./util/configparser.y"
+  case 380:
+#line 1429 "./util/configparser.y"
         {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4307,11 +4310,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4311 "util/configparser.c"
+#line 4314 "util/configparser.c"
     break;
 
-  case 380:
-#line 1437 "./util/configparser.y"
+  case 381:
+#line 1438 "./util/configparser.y"
         {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4320,11 +4323,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4324 "util/configparser.c"
+#line 4327 "util/configparser.c"
     break;
 
-  case 381:
-#line 1447 "./util/configparser.y"
+  case 382:
+#line 1448 "./util/configparser.y"
         {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4333,22 +4336,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4337 "util/configparser.c"
+#line 4340 "util/configparser.c"
     break;
 
-  case 382:
-#line 1457 "./util/configparser.y"
+  case 383:
+#line 1458 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4348 "util/configparser.c"
+#line 4351 "util/configparser.c"
     break;
 
-  case 383:
-#line 1465 "./util/configparser.y"
+  case 384:
+#line 1466 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4360,11 +4363,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4364 "util/configparser.c"
+#line 4367 "util/configparser.c"
     break;
 
-  case 384:
-#line 1478 "./util/configparser.y"
+  case 385:
+#line 1479 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4372,22 +4375,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4376 "util/configparser.c"
+#line 4379 "util/configparser.c"
     break;
 
-  case 385:
-#line 1487 "./util/configparser.y"
+  case 386:
+#line 1488 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4387 "util/configparser.c"
+#line 4390 "util/configparser.c"
     break;
 
-  case 386:
-#line 1495 "./util/configparser.y"
+  case 387:
+#line 1496 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4395,22 +4398,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4399 "util/configparser.c"
+#line 4402 "util/configparser.c"
     break;
 
-  case 387:
-#line 1504 "./util/configparser.y"
+  case 388:
+#line 1505 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4410 "util/configparser.c"
+#line 4413 "util/configparser.c"
     break;
 
-  case 388:
-#line 1512 "./util/configparser.y"
+  case 389:
+#line 1513 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4422,11 +4425,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4426 "util/configparser.c"
+#line 4429 "util/configparser.c"
     break;
 
-  case 389:
-#line 1525 "./util/configparser.y"
+  case 390:
+#line 1526 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4434,21 +4437,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4438 "util/configparser.c"
+#line 4441 "util/configparser.c"
     break;
 
-  case 390:
-#line 1534 "./util/configparser.y"
+  case 391:
+#line 1535 "./util/configparser.y"
         {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4448 "util/configparser.c"
+#line 4451 "util/configparser.c"
     break;
 
-  case 391:
-#line 1541 "./util/configparser.y"
+  case 392:
+#line 1542 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4457,11 +4460,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4461 "util/configparser.c"
+#line 4464 "util/configparser.c"
     break;
 
-  case 392:
-#line 1551 "./util/configparser.y"
+  case 393:
+#line 1552 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4470,11 +4473,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4474 "util/configparser.c"
+#line 4477 "util/configparser.c"
     break;
 
-  case 393:
-#line 1561 "./util/configparser.y"
+  case 394:
+#line 1562 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4483,11 +4486,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4487 "util/configparser.c"
+#line 4490 "util/configparser.c"
     break;
 
-  case 394:
-#line 1571 "./util/configparser.y"
+  case 395:
+#line 1572 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4496,11 +4499,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4500 "util/configparser.c"
+#line 4503 "util/configparser.c"
     break;
 
-  case 395:
-#line 1581 "./util/configparser.y"
+  case 396:
+#line 1582 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4509,11 +4512,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4513 "util/configparser.c"
+#line 4516 "util/configparser.c"
     break;
 
-  case 396:
-#line 1591 "./util/configparser.y"
+  case 397:
+#line 1592 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4522,11 +4525,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4526 "util/configparser.c"
+#line 4529 "util/configparser.c"
     break;
 
-  case 397:
-#line 1601 "./util/configparser.y"
+  case 398:
+#line 1602 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4535,11 +4538,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4539 "util/configparser.c"
+#line 4542 "util/configparser.c"
     break;
 
-  case 398:
-#line 1611 "./util/configparser.y"
+  case 399:
+#line 1612 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4548,41 +4551,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4552 "util/configparser.c"
+#line 4555 "util/configparser.c"
     break;
 
-  case 399:
-#line 1621 "./util/configparser.y"
+  case 400:
+#line 1622 "./util/configparser.y"
         {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4562 "util/configparser.c"
+#line 4565 "util/configparser.c"
     break;
 
-  case 400:
-#line 1628 "./util/configparser.y"
+  case 401:
+#line 1629 "./util/configparser.y"
         {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4572 "util/configparser.c"
+#line 4575 "util/configparser.c"
     break;
 
-  case 401:
-#line 1635 "./util/configparser.y"
+  case 402:
+#line 1636 "./util/configparser.y"
         {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4582 "util/configparser.c"
+#line 4585 "util/configparser.c"
     break;
 
-  case 402:
-#line 1642 "./util/configparser.y"
+  case 403:
+#line 1643 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4590,11 +4593,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4594 "util/configparser.c"
+#line 4597 "util/configparser.c"
     break;
 
-  case 403:
-#line 1651 "./util/configparser.y"
+  case 404:
+#line 1652 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4602,11 +4605,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4606 "util/configparser.c"
+#line 4609 "util/configparser.c"
     break;
 
-  case 404:
-#line 1660 "./util/configparser.y"
+  case 405:
+#line 1661 "./util/configparser.y"
         {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4614,11 +4617,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4618 "util/configparser.c"
+#line 4621 "util/configparser.c"
     break;
 
-  case 405:
-#line 1669 "./util/configparser.y"
+  case 406:
+#line 1670 "./util/configparser.y"
         {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4626,21 +4629,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4630 "util/configparser.c"
+#line 4633 "util/configparser.c"
     break;
 
-  case 406:
-#line 1678 "./util/configparser.y"
+  case 407:
+#line 1679 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4640 "util/configparser.c"
+#line 4643 "util/configparser.c"
     break;
 
-  case 407:
-#line 1685 "./util/configparser.y"
+  case 408:
+#line 1686 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4649,11 +4652,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4653 "util/configparser.c"
+#line 4656 "util/configparser.c"
     break;
 
-  case 408:
-#line 1695 "./util/configparser.y"
+  case 409:
+#line 1696 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -4672,21 +4675,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4676 "util/configparser.c"
+#line 4679 "util/configparser.c"
     break;
 
-  case 409:
-#line 1715 "./util/configparser.y"
+  case 410:
+#line 1716 "./util/configparser.y"
         {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4686 "util/configparser.c"
+#line 4689 "util/configparser.c"
     break;
 
-  case 410:
-#line 1722 "./util/configparser.y"
+  case 411:
+#line 1723 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4703,11 +4706,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4707 "util/configparser.c"
+#line 4710 "util/configparser.c"
     break;
 
-  case 411:
-#line 1740 "./util/configparser.y"
+  case 412:
+#line 1741 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4719,11 +4722,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4723 "util/configparser.c"
+#line 4726 "util/configparser.c"
     break;
 
-  case 412:
-#line 1753 "./util/configparser.y"
+  case 413:
+#line 1754 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4735,11 +4738,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4739 "util/configparser.c"
+#line 4742 "util/configparser.c"
     break;
 
-  case 413:
-#line 1766 "./util/configparser.y"
+  case 414:
+#line 1767 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4747,11 +4750,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4751 "util/configparser.c"
+#line 4754 "util/configparser.c"
     break;
 
-  case 414:
-#line 1775 "./util/configparser.y"
+  case 415:
+#line 1776 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4759,11 +4762,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4763 "util/configparser.c"
+#line 4766 "util/configparser.c"
     break;
 
-  case 415:
-#line 1784 "./util/configparser.y"
+  case 416:
+#line 1785 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4771,11 +4774,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4775 "util/configparser.c"
+#line 4778 "util/configparser.c"
     break;
 
-  case 416:
-#line 1793 "./util/configparser.y"
+  case 417:
+#line 1794 "./util/configparser.y"
         {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4783,11 +4786,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4787 "util/configparser.c"
+#line 4790 "util/configparser.c"
     break;
 
-  case 417:
-#line 1802 "./util/configparser.y"
+  case 418:
+#line 1803 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4796,11 +4799,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4800 "util/configparser.c"
+#line 4803 "util/configparser.c"
     break;
 
-  case 418:
-#line 1812 "./util/configparser.y"
+  case 419:
+#line 1813 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4809,11 +4812,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4813 "util/configparser.c"
+#line 4816 "util/configparser.c"
     break;
 
-  case 419:
-#line 1822 "./util/configparser.y"
+  case 420:
+#line 1823 "./util/configparser.y"
         {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4823,11 +4826,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4827 "util/configparser.c"
+#line 4830 "util/configparser.c"
     break;
 
-  case 420:
-#line 1833 "./util/configparser.y"
+  case 421:
+#line 1834 "./util/configparser.y"
         {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4835,11 +4838,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4839 "util/configparser.c"
+#line 4842 "util/configparser.c"
     break;
 
-  case 421:
-#line 1842 "./util/configparser.y"
+  case 422:
+#line 1843 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4847,11 +4850,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4851 "util/configparser.c"
+#line 4854 "util/configparser.c"
     break;
 
-  case 422:
-#line 1851 "./util/configparser.y"
+  case 423:
+#line 1852 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4859,11 +4862,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4863 "util/configparser.c"
+#line 4866 "util/configparser.c"
     break;
 
-  case 423:
-#line 1860 "./util/configparser.y"
+  case 424:
+#line 1861 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4871,11 +4874,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4875 "util/configparser.c"
+#line 4878 "util/configparser.c"
     break;
 
-  case 424:
-#line 1869 "./util/configparser.y"
+  case 425:
+#line 1870 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4883,11 +4886,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4887 "util/configparser.c"
+#line 4890 "util/configparser.c"
     break;
 
-  case 425:
-#line 1878 "./util/configparser.y"
+  case 426:
+#line 1879 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4895,11 +4898,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4899 "util/configparser.c"
+#line 4902 "util/configparser.c"
     break;
 
-  case 426:
-#line 1887 "./util/configparser.y"
+  case 427:
+#line 1888 "./util/configparser.y"
         {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4911,11 +4914,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4915 "util/configparser.c"
+#line 4918 "util/configparser.c"
     break;
 
-  case 427:
-#line 1900 "./util/configparser.y"
+  case 428:
+#line 1901 "./util/configparser.y"
         {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4927,11 +4930,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4931 "util/configparser.c"
+#line 4934 "util/configparser.c"
     break;
 
-  case 428:
-#line 1913 "./util/configparser.y"
+  case 429:
+#line 1914 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4939,21 +4942,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4943 "util/configparser.c"
+#line 4946 "util/configparser.c"
     break;
 
-  case 429:
-#line 1922 "./util/configparser.y"
+  case 430:
+#line 1923 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4953 "util/configparser.c"
+#line 4956 "util/configparser.c"
     break;
 
-  case 430:
-#line 1929 "./util/configparser.y"
+  case 431:
+#line 1930 "./util/configparser.y"
         {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4961,11 +4964,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4965 "util/configparser.c"
+#line 4968 "util/configparser.c"
     break;
 
-  case 431:
-#line 1938 "./util/configparser.y"
+  case 432:
+#line 1939 "./util/configparser.y"
         {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4973,11 +4976,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4977 "util/configparser.c"
+#line 4980 "util/configparser.c"
     break;
 
-  case 432:
-#line 1947 "./util/configparser.y"
+  case 433:
+#line 1948 "./util/configparser.y"
         {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4985,11 +4988,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4989 "util/configparser.c"
+#line 4992 "util/configparser.c"
     break;
 
-  case 433:
-#line 1956 "./util/configparser.y"
+  case 434:
+#line 1957 "./util/configparser.y"
         {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4998,22 +5001,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5002 "util/configparser.c"
+#line 5005 "util/configparser.c"
     break;
 
-  case 434:
-#line 1965 "./util/configparser.y"
+  case 435:
+#line 1966 "./util/configparser.y"
         {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5013 "util/configparser.c"
+#line 5016 "util/configparser.c"
     break;
 
-  case 435:
-#line 1973 "./util/configparser.y"
+  case 436:
+#line 1974 "./util/configparser.y"
         {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5025,22 +5028,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5029 "util/configparser.c"
+#line 5032 "util/configparser.c"
     break;
 
-  case 436:
-#line 1986 "./util/configparser.y"
+  case 437:
+#line 1987 "./util/configparser.y"
         {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5040 "util/configparser.c"
+#line 5043 "util/configparser.c"
     break;
 
-  case 437:
-#line 1994 "./util/configparser.y"
+  case 438:
+#line 1995 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5080,21 +5083,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5084 "util/configparser.c"
+#line 5087 "util/configparser.c"
     break;
 
-  case 438:
-#line 2035 "./util/configparser.y"
+  case 439:
+#line 2036 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 5094 "util/configparser.c"
+#line 5097 "util/configparser.c"
     break;
 
-  case 439:
-#line 2042 "./util/configparser.y"
+  case 440:
+#line 2043 "./util/configparser.y"
         {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5108,11 +5111,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5112 "util/configparser.c"
+#line 5115 "util/configparser.c"
     break;
 
-  case 440:
-#line 2057 "./util/configparser.y"
+  case 441:
+#line 2058 "./util/configparser.y"
         {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5121,11 +5124,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5125 "util/configparser.c"
+#line 5128 "util/configparser.c"
     break;
 
-  case 441:
-#line 2067 "./util/configparser.y"
+  case 442:
+#line 2068 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5134,41 +5137,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5138 "util/configparser.c"
+#line 5141 "util/configparser.c"
     break;
 
-  case 442:
-#line 2077 "./util/configparser.y"
+  case 443:
+#line 2078 "./util/configparser.y"
         {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5148 "util/configparser.c"
+#line 5151 "util/configparser.c"
     break;
 
-  case 443:
-#line 2084 "./util/configparser.y"
+  case 444:
+#line 2085 "./util/configparser.y"
         {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5158 "util/configparser.c"
+#line 5161 "util/configparser.c"
     break;
 
-  case 444:
-#line 2091 "./util/configparser.y"
+  case 445:
+#line 2092 "./util/configparser.y"
         {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 5168 "util/configparser.c"
+#line 5171 "util/configparser.c"
     break;
 
-  case 445:
-#line 2098 "./util/configparser.y"
+  case 446:
+#line 2099 "./util/configparser.y"
         {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5176,22 +5179,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5180 "util/configparser.c"
+#line 5183 "util/configparser.c"
     break;
 
-  case 446:
-#line 2107 "./util/configparser.y"
+  case 447:
+#line 2108 "./util/configparser.y"
         {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 5191 "util/configparser.c"
+#line 5194 "util/configparser.c"
     break;
 
-  case 447:
-#line 2115 "./util/configparser.y"
+  case 448:
+#line 2116 "./util/configparser.y"
         {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -5204,11 +5207,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5208 "util/configparser.c"
+#line 5211 "util/configparser.c"
     break;
 
-  case 448:
-#line 2129 "./util/configparser.y"
+  case 449:
+#line 2130 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5228,11 +5231,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5232 "util/configparser.c"
+#line 5235 "util/configparser.c"
     break;
 
-  case 449:
-#line 2150 "./util/configparser.y"
+  case 450:
+#line 2151 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5252,11 +5255,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5256 "util/configparser.c"
+#line 5259 "util/configparser.c"
     break;
 
-  case 450:
-#line 2171 "./util/configparser.y"
+  case 451:
+#line 2172 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -5267,11 +5270,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5271 "util/configparser.c"
+#line 5274 "util/configparser.c"
     break;
 
-  case 451:
-#line 2183 "./util/configparser.y"
+  case 452:
+#line 2184 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -5282,11 +5285,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5286 "util/configparser.c"
+#line 5289 "util/configparser.c"
     break;
 
-  case 452:
-#line 2195 "./util/configparser.y"
+  case 453:
+#line 2196 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -5297,11 +5300,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5301 "util/configparser.c"
+#line 5304 "util/configparser.c"
     break;
 
-  case 453:
-#line 2207 "./util/configparser.y"
+  case 454:
+#line 2208 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -5309,11 +5312,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5313 "util/configparser.c"
+#line 5316 "util/configparser.c"
     break;
 
-  case 454:
-#line 2216 "./util/configparser.y"
+  case 455:
+#line 2217 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5333,11 +5336,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5337 "util/configparser.c"
+#line 5340 "util/configparser.c"
     break;
 
-  case 455:
-#line 2237 "./util/configparser.y"
+  case 456:
+#line 2238 "./util/configparser.y"
         { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5345,11 +5348,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5349 "util/configparser.c"
+#line 5352 "util/configparser.c"
     break;
 
-  case 456:
-#line 2247 "./util/configparser.y"
+  case 457:
+#line 2248 "./util/configparser.y"
         { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5357,33 +5360,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5361 "util/configparser.c"
+#line 5364 "util/configparser.c"
     break;
 
-  case 457:
-#line 2256 "./util/configparser.y"
+  case 458:
+#line 2257 "./util/configparser.y"
   {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5372 "util/configparser.c"
+#line 5375 "util/configparser.c"
     break;
 
-  case 458:
-#line 2264 "./util/configparser.y"
+  case 459:
+#line 2265 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5383 "util/configparser.c"
+#line 5386 "util/configparser.c"
     break;
 
-  case 459:
-#line 2272 "./util/configparser.y"
+  case 460:
+#line 2273 "./util/configparser.y"
   {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5395,11 +5398,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5399 "util/configparser.c"
+#line 5402 "util/configparser.c"
     break;
 
-  case 460:
-#line 2285 "./util/configparser.y"
+  case 461:
+#line 2286 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5411,11 +5414,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5415 "util/configparser.c"
+#line 5418 "util/configparser.c"
     break;
 
-  case 461:
-#line 2298 "./util/configparser.y"
+  case 462:
+#line 2299 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5429,11 +5432,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5433 "util/configparser.c"
+#line 5436 "util/configparser.c"
     break;
 
-  case 462:
-#line 2313 "./util/configparser.y"
+  case 463:
+#line 2314 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5447,11 +5450,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5451 "util/configparser.c"
+#line 5454 "util/configparser.c"
     break;
 
-  case 463:
-#line 2328 "./util/configparser.y"
+  case 464:
+#line 2329 "./util/configparser.y"
   { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5459,11 +5462,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5463 "util/configparser.c"
+#line 5466 "util/configparser.c"
     break;
 
-  case 464:
-#line 2337 "./util/configparser.y"
+  case 465:
+#line 2338 "./util/configparser.y"
         { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5471,20 +5474,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5475 "util/configparser.c"
+#line 5478 "util/configparser.c"
     break;
 
-  case 465:
-#line 2346 "./util/configparser.y"
+  case 466:
+#line 2347 "./util/configparser.y"
         { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5484 "util/configparser.c"
+#line 5487 "util/configparser.c"
     break;
 
-  case 466:
-#line 2352 "./util/configparser.y"
+  case 467:
+#line 2353 "./util/configparser.y"
         { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5492,11 +5495,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5496 "util/configparser.c"
+#line 5499 "util/configparser.c"
     break;
 
-  case 467:
-#line 2361 "./util/configparser.y"
+  case 468:
+#line 2362 "./util/configparser.y"
         { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5504,11 +5507,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5508 "util/configparser.c"
+#line 5511 "util/configparser.c"
     break;
 
-  case 468:
-#line 2370 "./util/configparser.y"
+  case 469:
+#line 2371 "./util/configparser.y"
         {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5517,11 +5520,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5521 "util/configparser.c"
+#line 5524 "util/configparser.c"
     break;
 
-  case 469:
-#line 2380 "./util/configparser.y"
+  case 470:
+#line 2381 "./util/configparser.y"
         {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5530,11 +5533,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5534 "util/configparser.c"
+#line 5537 "util/configparser.c"
     break;
 
-  case 470:
-#line 2390 "./util/configparser.y"
+  case 471:
+#line 2391 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5546,11 +5549,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5550 "util/configparser.c"
+#line 5553 "util/configparser.c"
     break;
 
-  case 471:
-#line 2403 "./util/configparser.y"
+  case 472:
+#line 2404 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5562,11 +5565,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5566 "util/configparser.c"
+#line 5569 "util/configparser.c"
     break;
 
-  case 472:
-#line 2416 "./util/configparser.y"
+  case 473:
+#line 2417 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5577,11 +5580,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5581 "util/configparser.c"
+#line 5584 "util/configparser.c"
     break;
 
-  case 473:
-#line 2428 "./util/configparser.y"
+  case 474:
+#line 2429 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5594,11 +5597,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5598 "util/configparser.c"
+#line 5601 "util/configparser.c"
     break;
 
-  case 474:
-#line 2442 "./util/configparser.y"
+  case 475:
+#line 2443 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5609,11 +5612,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5613 "util/configparser.c"
+#line 5616 "util/configparser.c"
     break;
 
-  case 475:
-#line 2454 "./util/configparser.y"
+  case 476:
+#line 2455 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5626,11 +5629,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5630 "util/configparser.c"
+#line 5633 "util/configparser.c"
     break;
 
-  case 476:
-#line 2468 "./util/configparser.y"
+  case 477:
+#line 2469 "./util/configparser.y"
         {
 		int tag_data;
 		OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5644,11 +5647,25 @@ yyreduce:
 			fatal_exit("out of memory adding "
 				"edns-client-tag");
 	}
-#line 5648 "util/configparser.c"
+#line 5651 "util/configparser.c"
     break;
 
-  case 477:
-#line 2483 "./util/configparser.y"
+  case 478:
+#line 2484 "./util/configparser.y"
+        {
+		OUTYY(("P(edns_client_tag_opcode:%s)\n", (yyvsp[0].str)));
+		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
+			yyerror("option code expected");
+		else if(atoi((yyvsp[0].str)) > 65535 || atoi((yyvsp[0].str)) < 0)
+			yyerror("option code must be in interval [0, 65535]");
+		else cfg_parser->cfg->edns_client_tag_opcode = atoi((yyvsp[0].str));
+
+	}
+#line 5665 "util/configparser.c"
+    break;
+
+  case 479:
+#line 2495 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5657,31 +5674,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5661 "util/configparser.c"
+#line 5678 "util/configparser.c"
     break;
 
-  case 478:
-#line 2493 "./util/configparser.y"
+  case 480:
+#line 2505 "./util/configparser.y"
         {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5671 "util/configparser.c"
+#line 5688 "util/configparser.c"
     break;
 
-  case 479:
-#line 2500 "./util/configparser.y"
+  case 481:
+#line 2512 "./util/configparser.y"
         {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5681 "util/configparser.c"
+#line 5698 "util/configparser.c"
     break;
 
-  case 480:
-#line 2507 "./util/configparser.y"
+  case 482:
+#line 2519 "./util/configparser.y"
         {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5689,11 +5706,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5693 "util/configparser.c"
+#line 5710 "util/configparser.c"
     break;
 
-  case 481:
-#line 2516 "./util/configparser.y"
+  case 483:
+#line 2528 "./util/configparser.y"
         {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5701,11 +5718,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5705 "util/configparser.c"
+#line 5722 "util/configparser.c"
     break;
 
-  case 482:
-#line 2525 "./util/configparser.y"
+  case 484:
+#line 2537 "./util/configparser.y"
         {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5714,11 +5731,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5718 "util/configparser.c"
+#line 5735 "util/configparser.c"
     break;
 
-  case 483:
-#line 2535 "./util/configparser.y"
+  case 485:
+#line 2547 "./util/configparser.y"
         {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5727,11 +5744,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5731 "util/configparser.c"
+#line 5748 "util/configparser.c"
     break;
 
-  case 484:
-#line 2545 "./util/configparser.y"
+  case 486:
+#line 2557 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5740,31 +5757,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5744 "util/configparser.c"
+#line 5761 "util/configparser.c"
     break;
 
-  case 485:
-#line 2555 "./util/configparser.y"
+  case 487:
+#line 2567 "./util/configparser.y"
         {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5754 "util/configparser.c"
+#line 5771 "util/configparser.c"
     break;
 
-  case 486:
-#line 2562 "./util/configparser.y"
+  case 488:
+#line 2574 "./util/configparser.y"
         {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5764 "util/configparser.c"
+#line 5781 "util/configparser.c"
     break;
 
-  case 487:
-#line 2569 "./util/configparser.y"
+  case 489:
+#line 2581 "./util/configparser.y"
         {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5772,11 +5789,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5776 "util/configparser.c"
+#line 5793 "util/configparser.c"
     break;
 
-  case 488:
-#line 2578 "./util/configparser.y"
+  case 490:
+#line 2590 "./util/configparser.y"
         {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5784,11 +5801,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5788 "util/configparser.c"
+#line 5805 "util/configparser.c"
     break;
 
-  case 489:
-#line 2587 "./util/configparser.y"
+  case 491:
+#line 2599 "./util/configparser.y"
         {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5797,11 +5814,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5801 "util/configparser.c"
+#line 5818 "util/configparser.c"
     break;
 
-  case 490:
-#line 2597 "./util/configparser.y"
+  case 492:
+#line 2609 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5810,52 +5827,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5814 "util/configparser.c"
+#line 5831 "util/configparser.c"
     break;
 
-  case 491:
-#line 2607 "./util/configparser.y"
+  case 493:
+#line 2619 "./util/configparser.y"
         {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5824 "util/configparser.c"
+#line 5841 "util/configparser.c"
     break;
 
-  case 492:
-#line 2614 "./util/configparser.y"
+  case 494:
+#line 2626 "./util/configparser.y"
         {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5834 "util/configparser.c"
+#line 5851 "util/configparser.c"
     break;
 
-  case 493:
-#line 2621 "./util/configparser.y"
+  case 495:
+#line 2633 "./util/configparser.y"
         {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5844 "util/configparser.c"
+#line 5861 "util/configparser.c"
     break;
 
-  case 494:
-#line 2628 "./util/configparser.y"
+  case 496:
+#line 2640 "./util/configparser.y"
         {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5855 "util/configparser.c"
+#line 5872 "util/configparser.c"
     break;
 
-  case 495:
-#line 2636 "./util/configparser.y"
+  case 497:
+#line 2648 "./util/configparser.y"
         {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5864,11 +5881,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5868 "util/configparser.c"
+#line 5885 "util/configparser.c"
     break;
 
-  case 496:
-#line 2646 "./util/configparser.y"
+  case 498:
+#line 2658 "./util/configparser.y"
         {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5877,11 +5894,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5881 "util/configparser.c"
+#line 5898 "util/configparser.c"
     break;
 
-  case 497:
-#line 2656 "./util/configparser.y"
+  case 499:
+#line 2668 "./util/configparser.y"
         {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5890,11 +5907,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5894 "util/configparser.c"
+#line 5911 "util/configparser.c"
     break;
 
-  case 498:
-#line 2666 "./util/configparser.y"
+  case 500:
+#line 2678 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5903,11 +5920,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5907 "util/configparser.c"
+#line 5924 "util/configparser.c"
     break;
 
-  case 499:
-#line 2676 "./util/configparser.y"
+  case 501:
+#line 2688 "./util/configparser.y"
         {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5945,11 +5962,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5949 "util/configparser.c"
+#line 5966 "util/configparser.c"
     break;
 
-  case 500:
-#line 2715 "./util/configparser.y"
+  case 502:
+#line 2727 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5958,33 +5975,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5962 "util/configparser.c"
+#line 5979 "util/configparser.c"
     break;
 
-  case 501:
-#line 2725 "./util/configparser.y"
+  case 503:
+#line 2737 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5973 "util/configparser.c"
+#line 5990 "util/configparser.c"
     break;
 
-  case 502:
-#line 2733 "./util/configparser.y"
+  case 504:
+#line 2745 "./util/configparser.y"
         {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5984 "util/configparser.c"
+#line 6001 "util/configparser.c"
     break;
 
-  case 503:
-#line 2741 "./util/configparser.y"
+  case 505:
+#line 2753 "./util/configparser.y"
         {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5998,11 +6015,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 6002 "util/configparser.c"
+#line 6019 "util/configparser.c"
     break;
 
-  case 504:
-#line 2756 "./util/configparser.y"
+  case 506:
+#line 2768 "./util/configparser.y"
         {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6010,19 +6027,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6014 "util/configparser.c"
+#line 6031 "util/configparser.c"
     break;
 
-  case 505:
-#line 2765 "./util/configparser.y"
+  case 507:
+#line 2777 "./util/configparser.y"
         { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6022 "util/configparser.c"
+#line 6039 "util/configparser.c"
     break;
 
-  case 516:
-#line 2776 "./util/configparser.y"
+  case 518:
+#line 2788 "./util/configparser.y"
         {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6031,11 +6048,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6035 "util/configparser.c"
+#line 6052 "util/configparser.c"
     break;
 
-  case 517:
-#line 2786 "./util/configparser.y"
+  case 519:
+#line 2798 "./util/configparser.y"
         {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6043,79 +6060,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6047 "util/configparser.c"
+#line 6064 "util/configparser.c"
     break;
 
-  case 518:
-#line 2795 "./util/configparser.y"
+  case 520:
+#line 2807 "./util/configparser.y"
         {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6057 "util/configparser.c"
+#line 6074 "util/configparser.c"
     break;
 
-  case 519:
-#line 2802 "./util/configparser.y"
+  case 521:
+#line 2814 "./util/configparser.y"
         {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6067 "util/configparser.c"
+#line 6084 "util/configparser.c"
     break;
 
-  case 520:
-#line 2809 "./util/configparser.y"
+  case 522:
+#line 2821 "./util/configparser.y"
         {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 6077 "util/configparser.c"
+#line 6094 "util/configparser.c"
     break;
 
-  case 521:
-#line 2816 "./util/configparser.y"
+  case 523:
+#line 2828 "./util/configparser.y"
         {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 6087 "util/configparser.c"
+#line 6104 "util/configparser.c"
     break;
 
-  case 522:
-#line 2823 "./util/configparser.y"
+  case 524:
+#line 2835 "./util/configparser.y"
         {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 6097 "util/configparser.c"
+#line 6114 "util/configparser.c"
     break;
 
-  case 523:
-#line 2830 "./util/configparser.y"
+  case 525:
+#line 2842 "./util/configparser.y"
         {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 6107 "util/configparser.c"
+#line 6124 "util/configparser.c"
     break;
 
-  case 524:
-#line 2837 "./util/configparser.y"
+  case 526:
+#line 2849 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6115 "util/configparser.c"
+#line 6132 "util/configparser.c"
     break;
 
-  case 546:
-#line 2857 "./util/configparser.y"
+  case 548:
+#line 2869 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6123,11 +6140,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6127 "util/configparser.c"
+#line 6144 "util/configparser.c"
     break;
 
-  case 547:
-#line 2866 "./util/configparser.y"
+  case 549:
+#line 2878 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6136,31 +6153,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6140 "util/configparser.c"
+#line 6157 "util/configparser.c"
     break;
 
-  case 548:
-#line 2876 "./util/configparser.y"
+  case 550:
+#line 2888 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 6150 "util/configparser.c"
+#line 6167 "util/configparser.c"
     break;
 
-  case 549:
-#line 2883 "./util/configparser.y"
+  case 551:
+#line 2895 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 6160 "util/configparser.c"
+#line 6177 "util/configparser.c"
     break;
 
-  case 550:
-#line 2890 "./util/configparser.y"
+  case 552:
+#line 2902 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6168,51 +6185,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6172 "util/configparser.c"
+#line 6189 "util/configparser.c"
     break;
 
-  case 551:
-#line 2899 "./util/configparser.y"
+  case 553:
+#line 2911 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 6182 "util/configparser.c"
+#line 6199 "util/configparser.c"
     break;
 
-  case 552:
-#line 2906 "./util/configparser.y"
+  case 554:
+#line 2918 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 6192 "util/configparser.c"
+#line 6209 "util/configparser.c"
     break;
 
-  case 553:
-#line 2913 "./util/configparser.y"
+  case 555:
+#line 2925 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 6202 "util/configparser.c"
+#line 6219 "util/configparser.c"
     break;
 
-  case 554:
-#line 2920 "./util/configparser.y"
+  case 556:
+#line 2932 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 6212 "util/configparser.c"
+#line 6229 "util/configparser.c"
     break;
 
-  case 555:
-#line 2927 "./util/configparser.y"
+  case 557:
+#line 2939 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6220,11 +6237,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6224 "util/configparser.c"
+#line 6241 "util/configparser.c"
     break;
 
-  case 556:
-#line 2936 "./util/configparser.y"
+  case 558:
+#line 2948 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6232,31 +6249,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6236 "util/configparser.c"
+#line 6253 "util/configparser.c"
     break;
 
-  case 557:
-#line 2945 "./util/configparser.y"
+  case 559:
+#line 2957 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6246 "util/configparser.c"
+#line 6263 "util/configparser.c"
     break;
 
-  case 558:
-#line 2952 "./util/configparser.y"
+  case 560:
+#line 2964 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6256 "util/configparser.c"
+#line 6273 "util/configparser.c"
     break;
 
-  case 559:
-#line 2959 "./util/configparser.y"
+  case 561:
+#line 2971 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6265,11 +6282,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6269 "util/configparser.c"
+#line 6286 "util/configparser.c"
     break;
 
-  case 560:
-#line 2969 "./util/configparser.y"
+  case 562:
+#line 2981 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6278,11 +6295,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6282 "util/configparser.c"
+#line 6299 "util/configparser.c"
     break;
 
-  case 561:
-#line 2979 "./util/configparser.y"
+  case 563:
+#line 2991 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6291,11 +6308,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6295 "util/configparser.c"
+#line 6312 "util/configparser.c"
     break;
 
-  case 562:
-#line 2989 "./util/configparser.y"
+  case 564:
+#line 3001 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6304,11 +6321,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6308 "util/configparser.c"
+#line 6325 "util/configparser.c"
     break;
 
-  case 563:
-#line 2999 "./util/configparser.y"
+  case 565:
+#line 3011 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6317,11 +6334,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6321 "util/configparser.c"
+#line 6338 "util/configparser.c"
     break;
 
-  case 564:
-#line 3009 "./util/configparser.y"
+  case 566:
+#line 3021 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6330,47 +6347,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6334 "util/configparser.c"
+#line 6351 "util/configparser.c"
     break;
 
-  case 565:
-#line 3019 "./util/configparser.y"
+  case 567:
+#line 3031 "./util/configparser.y"
         { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6342 "util/configparser.c"
+#line 6359 "util/configparser.c"
     break;
 
-  case 569:
-#line 3028 "./util/configparser.y"
+  case 571:
+#line 3040 "./util/configparser.y"
         {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6352 "util/configparser.c"
+#line 6369 "util/configparser.c"
     break;
 
-  case 570:
-#line 3034 "./util/configparser.y"
+  case 572:
+#line 3046 "./util/configparser.y"
         { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6360 "util/configparser.c"
+#line 6377 "util/configparser.c"
     break;
 
-  case 574:
-#line 3043 "./util/configparser.y"
+  case 576:
+#line 3055 "./util/configparser.y"
         {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6370 "util/configparser.c"
+#line 6387 "util/configparser.c"
     break;
 
-  case 575:
-#line 3049 "./util/configparser.y"
+  case 577:
+#line 3061 "./util/configparser.y"
         {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6379,21 +6396,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6383 "util/configparser.c"
+#line 6400 "util/configparser.c"
     break;
 
-  case 576:
-#line 3059 "./util/configparser.y"
+  case 578:
+#line 3071 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6393 "util/configparser.c"
+#line 6410 "util/configparser.c"
     break;
 
-  case 577:
-#line 3066 "./util/configparser.y"
+  case 579:
+#line 3078 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6401,30 +6418,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6405 "util/configparser.c"
+#line 6422 "util/configparser.c"
     break;
 
-  case 578:
-#line 3075 "./util/configparser.y"
+  case 580:
+#line 3087 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6416 "util/configparser.c"
+#line 6433 "util/configparser.c"
     break;
 
-  case 579:
-#line 3083 "./util/configparser.y"
+  case 581:
+#line 3095 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6424 "util/configparser.c"
+#line 6441 "util/configparser.c"
     break;
 
-  case 592:
-#line 3099 "./util/configparser.y"
+  case 594:
+#line 3111 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6432,11 +6449,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6436 "util/configparser.c"
+#line 6453 "util/configparser.c"
     break;
 
-  case 593:
-#line 3109 "./util/configparser.y"
+  case 595:
+#line 3121 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6444,21 +6461,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6448 "util/configparser.c"
+#line 6465 "util/configparser.c"
     break;
 
-  case 594:
-#line 3118 "./util/configparser.y"
+  case 596:
+#line 3130 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6458 "util/configparser.c"
+#line 6475 "util/configparser.c"
     break;
 
-  case 595:
-#line 3125 "./util/configparser.y"
+  case 597:
+#line 3137 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6466,21 +6483,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6470 "util/configparser.c"
+#line 6487 "util/configparser.c"
     break;
 
-  case 596:
-#line 3134 "./util/configparser.y"
+  case 598:
+#line 3146 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6480 "util/configparser.c"
+#line 6497 "util/configparser.c"
     break;
 
-  case 597:
-#line 3141 "./util/configparser.y"
+  case 599:
+#line 3153 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6488,22 +6505,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6492 "util/configparser.c"
+#line 6509 "util/configparser.c"
     break;
 
-  case 598:
-#line 3150 "./util/configparser.y"
+  case 600:
+#line 3162 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6503 "util/configparser.c"
+#line 6520 "util/configparser.c"
     break;
 
-  case 599:
-#line 3158 "./util/configparser.y"
+  case 601:
+#line 3170 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6515,22 +6532,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6519 "util/configparser.c"
+#line 6536 "util/configparser.c"
     break;
 
-  case 600:
-#line 3171 "./util/configparser.y"
+  case 602:
+#line 3183 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6530 "util/configparser.c"
+#line 6547 "util/configparser.c"
     break;
 
-  case 601:
-#line 3179 "./util/configparser.y"
+  case 603:
+#line 3191 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6542,19 +6559,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6546 "util/configparser.c"
+#line 6563 "util/configparser.c"
     break;
 
-  case 602:
-#line 3192 "./util/configparser.y"
+  case 604:
+#line 3204 "./util/configparser.y"
         {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6554 "util/configparser.c"
+#line 6571 "util/configparser.c"
     break;
 
-  case 611:
-#line 3203 "./util/configparser.y"
+  case 613:
+#line 3215 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6565,11 +6582,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6569 "util/configparser.c"
+#line 6586 "util/configparser.c"
     break;
 
-  case 612:
-#line 3215 "./util/configparser.y"
+  case 614:
+#line 3227 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6580,11 +6597,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6584 "util/configparser.c"
+#line 6601 "util/configparser.c"
     break;
 
-  case 613:
-#line 3227 "./util/configparser.y"
+  case 615:
+#line 3239 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6595,11 +6612,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6599 "util/configparser.c"
+#line 6616 "util/configparser.c"
     break;
 
-  case 614:
-#line 3239 "./util/configparser.y"
+  case 616:
+#line 3251 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6613,11 +6630,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6617 "util/configparser.c"
+#line 6634 "util/configparser.c"
     break;
 
-  case 615:
-#line 3254 "./util/configparser.y"
+  case 617:
+#line 3266 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6629,11 +6646,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6633 "util/configparser.c"
+#line 6650 "util/configparser.c"
     break;
 
-  case 616:
-#line 3267 "./util/configparser.y"
+  case 618:
+#line 3279 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6645,11 +6662,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6649 "util/configparser.c"
+#line 6666 "util/configparser.c"
     break;
 
-  case 617:
-#line 3280 "./util/configparser.y"
+  case 619:
+#line 3292 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6659,19 +6676,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6663 "util/configparser.c"
+#line 6680 "util/configparser.c"
     break;
 
-  case 618:
-#line 3291 "./util/configparser.y"
+  case 620:
+#line 3303 "./util/configparser.y"
                 {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6671 "util/configparser.c"
+#line 6688 "util/configparser.c"
     break;
 
-  case 623:
-#line 3300 "./util/configparser.y"
+  case 625:
+#line 3312 "./util/configparser.y"
                 {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6685,11 +6702,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6689 "util/configparser.c"
+#line 6706 "util/configparser.c"
     break;
 
-  case 624:
-#line 3315 "./util/configparser.y"
+  case 626:
+#line 3327 "./util/configparser.y"
         {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6703,11 +6720,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6707 "util/configparser.c"
+#line 6724 "util/configparser.c"
     break;
 
 
-#line 6711 "util/configparser.c"
+#line 6728 "util/configparser.c"
 
       default: break;
     }
@@ -6939,7 +6956,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3329 "./util/configparser.y"
+#line 3341 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index eb576e91d..3a5ea579d 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -344,7 +344,8 @@ extern int yydebug;
     VAR_RPZ_LOG_NAME = 550,
     VAR_DYNLIB = 551,
     VAR_DYNLIB_FILE = 552,
-    VAR_EDNS_CLIENT_TAG = 553
+    VAR_EDNS_CLIENT_TAG = 553,
+    VAR_EDNS_CLIENT_TAG_OPCODE = 554
   };
 #endif
 /* Tokens.  */
@@ -644,6 +645,7 @@ extern int yydebug;
 #define VAR_DYNLIB 551
 #define VAR_DYNLIB_FILE 552
 #define VAR_EDNS_CLIENT_TAG 553
+#define VAR_EDNS_CLIENT_TAG_OPCODE 554
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -653,7 +655,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 657 "util/configparser.h"
+#line 659 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 4419bbc7b..43a886f24 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -178,7 +178,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_IPSET VAR_IPSET_NAME_V4 VAR_IPSET_NAME_V6
 %token VAR_TLS_SESSION_TICKET_KEYS VAR_RPZ VAR_TAGS VAR_RPZ_ACTION_OVERRIDE
 %token VAR_RPZ_CNAME_OVERRIDE VAR_RPZ_LOG VAR_RPZ_LOG_NAME
-%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_TAG
+%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_TAG VAR_EDNS_CLIENT_TAG_OPCODE
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -291,7 +291,8 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_unknown_server_time_limit | server_log_tag_queryreply |
 	server_stream_wait_size | server_tls_ciphers |
 	server_tls_ciphersuites | server_tls_session_ticket_keys |
-	server_tls_use_sni | server_edns_client_tag
+	server_tls_use_sni | server_edns_client_tag |
+	server_edns_client_tag_opcode
 	;
 stubstart: VAR_STUB_ZONE
 	{
@@ -2479,6 +2480,17 @@ server_edns_client_tag: VAR_EDNS_CLIENT_TAG STRING_ARG STRING_ARG
 				"edns-client-tag");
 	}
 	;
+server_edns_client_tag_opcode: VAR_EDNS_CLIENT_TAG_OPCODE STRING_ARG
+	{
+		OUTYY(("P(edns_client_tag_opcode:%s)\n", $2));
+		if(atoi($2) == 0 && strcmp($2, "0") != 0)
+			yyerror("option code expected");
+		else if(atoi($2) > 65535 || atoi($2) < 0)
+			yyerror("option code must be in interval [0, 65535]");
+		else cfg_parser->cfg->edns_client_tag_opcode = atoi($2);
+
+	}
+	;
 stub_name: VAR_NAME STRING_ARG
 	{
 		OUTYY(("P(name:%s)\n", $2));
diff --git a/util/edns.c b/util/edns.c
index db33212c0..c83a4a545 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -112,6 +112,7 @@ int edns_tags_apply_cfg(struct edns_tags* edns_tags,
 			return 0;
 		}
 	}
+	edns_tags->client_tag_opcode = config->edns_client_tag_opcode;
 
 	addr_tree_init_parents(&edns_tags->client_tags);
 	return 1;
diff --git a/util/edns.h b/util/edns.h
index c92b1ba5e..cf9f8707e 100644
--- a/util/edns.h
+++ b/util/edns.h
@@ -56,6 +56,8 @@ struct edns_tags {
 	/** Tree of EDNS client tags to use in upstream queries, per address
 	 * prefix. Contains nodes of type edns_tag_addr. */
 	rbtree_type client_tags;
+	/** EDNS opcode to use for client tags */
+	uint16_t client_tag_opcode;
 	/** region to allocate tree nodes in */
 	struct regional* region;
 };

From ed6e3c0c663893a86a16631861ded05d8cb7672f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 23 Sep 2020 13:20:25 +0200
Subject: [PATCH 069/108] - Fix #305: only wake up thread when threshold
 reached.

---
 dnstap/dtstream.c | 5 +++--
 doc/Changelog     | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index b0586d1ba..b0918c52c 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -258,8 +258,9 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
 		wakeupstarttimer = 1;
 	/* if list contains more than wakeupnum elements, wakeup now,
 	 * or if list is (going to be) almost full */
-	if(mq->msgcount+1 > DTIO_MSG_FOR_WAKEUP ||
-		mq->cursize+len >= mq->maxsize * 9 / 10)
+	if(mq->msgcount == DTIO_MSG_FOR_WAKEUP ||
+		(mq->cursize < mq->maxsize * 9 / 10 &&
+		mq->cursize+len >= mq->maxsize * 9 / 10))
 		wakeupnow = 1;
 	/* see if it is going to fit */
 	if(mq->cursize + len > mq->maxsize) {
diff --git a/doc/Changelog b/doc/Changelog
index e316ea99f..4cd9a8e78 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 23 September 2020: Wouter
 	- Fix #305: dnstap logging significantly affects unbound performance
 	  (regression in 1.11).
+	- Fix #305: only wake up thread when threshold reached.
 
 23 September 2020: Ralph
 	- Fix edns-client-tags get_option typo

From 3527171397ce1fd619fcce5ca53632fcc6a3aa38 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 23 Sep 2020 14:30:31 +0200
Subject: [PATCH 070/108] - Fix to ifdef fptr wlist item for dnstap.

---
 doc/Changelog     | 1 +
 util/fptr_wlist.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 4cd9a8e78..453607b62 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix #305: dnstap logging significantly affects unbound performance
 	  (regression in 1.11).
 	- Fix #305: only wake up thread when threshold reached.
+	- Fix to ifdef fptr wlist item for dnstap.
 
 23 September 2020: Ralph
 	- Fix edns-client-tags get_option typo
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index 241d9e540..7d15d1075 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -138,7 +138,9 @@ fptr_whitelist_comm_timer(void (*fptr)(void*))
 	else if(fptr == &auth_xfer_probe_timer_callback) return 1;
 	else if(fptr == &auth_xfer_transfer_timer_callback) return 1;
 	else if(fptr == &mesh_serve_expired_callback) return 1;
+#ifdef USE_DNSTAP
 	else if(fptr == &mq_wakeup_cb) return 1;
+#endif
 	return 0;
 }
 

From eb8ec9c18be040ad943b0d5e0bad8dc69c5abc09 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 23 Sep 2020 14:35:51 +0200
Subject: [PATCH 071/108] - Use inclusive language in configuration

---
 doc/Changelog         |    1 +
 doc/example.conf.in   |   48 +-
 doc/unbound.conf.5.in |   77 +-
 util/configlexer.c    | 4935 +++++++++++++++++++++--------------------
 util/configlexer.lex  |    3 +
 5 files changed, 2557 insertions(+), 2507 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 453607b62..c2176f785 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
 23 September 2020: Ralph
 	- Fix edns-client-tags get_option typo
 	- Add edns-client-tag-opcode option
+	- Use inclusive language in configuration
 
 21 September 2020: Ralph
 	- Fix #304: dnstap logging not recovering after dnstap process restarts
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 8af853fb4..3213a8f8c 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -431,8 +431,8 @@ server:
 
 	# Domains (and domains in them) without support for dns-0x20 and
 	# the fallback fails because they keep sending different answers.
-	# caps-whitelist: "licdn.com"
-	# caps-whitelist: "senderbase.org"
+	# caps-exempt: "licdn.com"
+	# caps-exempt: "senderbase.org"
 
 	# Enforce privacy of these addresses. Strips them away from answers.
 	# It may cause DNSSEC validation to additionally mark it as bogus.
@@ -861,9 +861,9 @@ server:
 	# ipsecmod-ignore-bogus: no
 	#
 	# Domains for which ipsecmod will be triggered. If not defined (default)
-	# all domains are treated as being whitelisted.
-	# ipsecmod-whitelist: "example.com"
-	# ipsecmod-whitelist: "nlnetlabs.nl"
+	# all domains are treated as being allowed.
+	# ipsecmod-allow: "example.com"
+	# ipsecmod-allow: "nlnetlabs.nl"
 
 
 # Python config section. To enable:
@@ -961,27 +961,27 @@ remote-control:
 # upstream (which saves a lookup to the upstream).  The first example
 # has a copy of the root for local usage.  The second serves example.org
 # authoritatively.  zonefile: reads from file (and writes to it if you also
-# download it), master: fetches with AXFR and IXFR, or url to zonefile.
-# With allow-notify: you can give additional (apart from masters) sources of
+# download it), primary: fetches with AXFR and IXFR, or url to zonefile.
+# With allow-notify: you can give additional (apart from primaries) sources of
 # notifies.
 # auth-zone:
 #	name: "."
-#	master: 199.9.14.201         # b.root-servers.net
-#	master: 192.33.4.12          # c.root-servers.net
-#	master: 199.7.91.13          # d.root-servers.net
-#	master: 192.5.5.241          # f.root-servers.net
-#	master: 192.112.36.4         # g.root-servers.net
-#	master: 193.0.14.129         # k.root-servers.net
-#	master: 192.0.47.132         # xfr.cjr.dns.icann.org
-#	master: 192.0.32.132         # xfr.lax.dns.icann.org
-#	master: 2001:500:200::b      # b.root-servers.net
-#	master: 2001:500:2::c        # c.root-servers.net
-#	master: 2001:500:2d::d       # d.root-servers.net
-#	master: 2001:500:2f::f       # f.root-servers.net
-#	master: 2001:500:12::d0d     # g.root-servers.net
-#	master: 2001:7fd::1          # k.root-servers.net
-#	master: 2620:0:2830:202::132 # xfr.cjr.dns.icann.org
-#	master: 2620:0:2d0:202::132  # xfr.lax.dns.icann.org
+#	primary: 199.9.14.201         # b.root-servers.net
+#	primary: 192.33.4.12          # c.root-servers.net
+#	primary: 199.7.91.13          # d.root-servers.net
+#	primary: 192.5.5.241          # f.root-servers.net
+#	primary: 192.112.36.4         # g.root-servers.net
+#	primary: 193.0.14.129         # k.root-servers.net
+#	primary: 192.0.47.132         # xfr.cjr.dns.icann.org
+#	primary: 192.0.32.132         # xfr.lax.dns.icann.org
+#	primary: 2001:500:200::b      # b.root-servers.net
+#	primary: 2001:500:2::c        # c.root-servers.net
+#	primary: 2001:500:2d::d       # d.root-servers.net
+#	primary: 2001:500:2f::f       # f.root-servers.net
+#	primary: 2001:500:12::d0d     # g.root-servers.net
+#	primary: 2001:7fd::1          # k.root-servers.net
+#	primary: 2620:0:2830:202::132 # xfr.cjr.dns.icann.org
+#	primary: 2620:0:2d0:202::132  # xfr.lax.dns.icann.org
 #	fallback-enabled: yes
 #	for-downstream: no
 #	for-upstream: yes
@@ -1101,7 +1101,7 @@ remote-control:
 # rpz:
 #     name: "rpz.example.com"
 #     zonefile: "rpz.example.com"
-#     master: 192.0.2.0
+#     primary: 192.0.2.0
 #     allow-notify: 192.0.2.0/32
 #     url: http://www.example.com/rpz.example.org.zone
 #     rpz-action-override: cname
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index f4586b1d1..dfdab90d5 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -884,12 +884,15 @@ authority servers and checks if the reply still has the correct casing.
 Disabled by default.
 This feature is an experimental implementation of draft dns\-0x20.
 .TP
-.B caps\-whitelist: \fI<domain>
-Whitelist the domain so that it does not receive caps\-for\-id perturbed
+.B caps\-exempt: \fI<domain>
+Exempt the domain so that it does not receive caps\-for\-id perturbed
 queries.  For domains that do not support 0x20 and also fail with fallback
 because they keep sending different answers, like some load balancers.
 Can be given multiple times, for different domains.
 .TP
+.B caps\-whitelist: \fI<yes or no>
+Alternate syntax for \fBcaps\-exempt\fR.
+.TP
 .B qname\-minimisation: \fI<yes or no>
 Send minimum amount of information to upstream servers to enhance privacy.
 Only send minimum required labels of the QNAME and set QTYPE to A when
@@ -1744,16 +1747,16 @@ uses the SOA timer values and performs SOA UDP queries to detect zone changes.
 If the update fetch fails, the timers in the SOA record are used to time
 another fetch attempt.  Until the SOA expiry timer is reached.  Then the
 zone is expired.  When a zone is expired, queries are SERVFAIL, and
-any new serial number is accepted from the master (even if older), and if
+any new serial number is accepted from the primary (even if older), and if
 fallback is enabled, the fallback activates to fetch from the upstream instead
 of the SERVFAIL.
 .TP
 .B name: \fI<zone name>
 Name of the authority zone.
 .TP
-.B master: \fI<IP address or host name>
+.B primary: \fI<IP address or host name>
 Where to download a copy of the zone from, with AXFR and IXFR.  Multiple
-masters can be specified.  They are all tried if one fails.
+primaries can be specified.  They are all tried if one fails.
 With the "ip#name" notation a AXFR over TLS can be used.
 If you point it at another Unbound instance, it would not work because
 that does not support AXFR/IXFR for the zone, but if you used \fBurl:\fR to download
@@ -1762,27 +1765,31 @@ If you specify the hostname, you cannot use the domain from the zonefile,
 because it may not have that when retrieving that data, instead use a plain
 IP address to avoid a circular dependency on retrieving that IP address.
 .TP
+.B master: \fI<IP address or host name>
+Alternate syntax for \fBprimary\fR.
+.TP
 .B url: \fI<url to zonefile>
 Where to download a zonefile for the zone.  With http or https.  An example
 for the url is "http://www.example.com/example.org.zone".  Multiple url
 statements can be given, they are tried in turn.  If only urls are given
 the SOA refresh timer is used to wait for making new downloads.  If also
-masters are listed, the masters are first probed with UDP SOA queries to
+primaries are listed, the primaries are first probed with UDP SOA queries to
 see if the SOA serial number has changed, reducing the number of downloads.
-If none of the urls work, the masters are tried with IXFR and AXFR.
+If none of the urls work, the primaries are tried with IXFR and AXFR.
 For https, the \fBtls\-cert\-bundle\fR and the hostname from the url are used
 to authenticate the connection.
 If you specify a hostname in the URL, you cannot use the domain from the
 zonefile, because it may not have that when retrieving that data, instead
 use a plain IP address to avoid a circular dependency on retrieving that IP
-address.  Avoid dependencies on name lookups by using a notation like "http://192.0.2.1/unbound-master/example.com.zone", with an explicit IP address.
+address.  Avoid dependencies on name lookups by using a notation like
+"http://192.0.2.1/unbound-primaries/example.com.zone", with an explicit IP address.
 .TP
 .B allow\-notify: \fI<IP address or host name or netblockIP/prefix>
 With allow\-notify you can specify additional sources of notifies.
 When notified, the server attempts to first probe and then zone transfer.
-If the notify is from a master, it first attempts that master.  Otherwise
-other masters are attempted.  If there are no masters, but only urls, the
-file is downloaded when notified.  The masters from master: statements are
+If the notify is from a primary, it first attempts that primary.  Otherwise
+other primaries are attempted.  If there are no primaries, but only urls, the
+file is downloaded when notified.  The primaries from primary: statements are
 allowed notify by default.
 .TP
 .B fallback\-enabled: \fI<yes or no>
@@ -1810,7 +1817,7 @@ downstream clients, and use the zone data as a local copy to speed up lookups.
 .B zonefile: \fI<filename>
 The filename where the zone is stored.  If not given then no zonefile is used.
 If the file does not exist or is empty, unbound will attempt to fetch zone
-data (eg. from the master servers).
+data (eg. from the primary servers).
 .SS "View Options"
 .LP
 There may be multiple
@@ -1977,14 +1984,16 @@ The ECS module must be configured in the \fBmodule\-config:\fR "subnetcache
 validator iterator" directive and be compiled into the daemon to be
 enabled.  These settings go in the \fBserver:\fR section.
 .LP
-If the destination address is whitelisted with Unbound will add the EDNS0
-option to the query containing the relevant part of the client's address. When
-an answer contains the ECS option the response and the option are placed in a
-specialized cache. If the authority indicated no support, the response is
+If the destination address is allowed in the configuration Unbound will add the
+EDNS0 option to the query containing the relevant part of the client's address.
+When an answer contains the ECS option the response and the option are placed in
+a 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 when sending the query to addresses that are explicitly
+allowed in the configuration using \fBsend\-client\-subnet\fR. The option will
+always be forwarded, regardless the allowed addresses, if
 \fBclient\-subnet\-always\-forward\fR is set to yes. In this case the lookup in
 the regular cache is skipped.
 .LP
@@ -2005,11 +2014,11 @@ given multiple times. Zones not listed will not receive edns-subnet information,
 unless hosted by authority specified in \fBsend\-client\-subnet\fR.
 .TP
 .B client\-subnet\-always\-forward: \fI<yes or no>\fR
-Specify whether the ECS whitelist check (configured using
+Specify whether the ECS address check (configured using
 \fBsend\-client\-subnet\fR) is applied for all queries, even if the triggering
 query contains an ECS record, or only for queries for which the ECS record is
 generated using the querier address (and therefore did not contain ECS data in
-the client query). If enabled, the whitelist check is skipped when the client
+the client query). If enabled, the address check is skipped when the client
 query contains an ECS record. Default is no.
 .TP
 .B max\-client\-subnet\-ipv6: \fI<number>\fR
@@ -2099,10 +2108,13 @@ to yes, the hook will be called and the A/AAAA answer will be returned to the
 client.  If set to no, the hook will not be called and the answer to the
 A/AAAA query will be SERVFAIL.  Mainly used for testing.  Defaults to no.
 .TP
-.B ipsecmod\-whitelist: \fI<domain>\fR
-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).
+.B ipsecmod\-allow: \fI<domain>\fR
+Allow the ipsecmod functionality for 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 allowed (default).
+.TP
+.B ipsecmod\-whitelist: \fI<yes or no>
+Alternate syntax for \fBipsecmod\-allow\fR.
 .SS "Cache DB Module Options"
 .LP
 The Cache DB module must be configured in the \fBmodule\-config:\fR
@@ -2299,33 +2311,36 @@ are applied after
 .B name: \fI<zone name>
 Name of the authority zone.
 .TP
-.B master: \fI<IP address or host name>
+.B primary: \fI<IP address or host name>
 Where to download a copy of the zone from, with AXFR and IXFR.  Multiple
-masters can be specified.  They are all tried if one fails.
+primaries can be specified.  They are all tried if one fails.
+.TP
+.B master: \fI<IP address or host name>
+Alternate syntax for \fBprimary\fR.
 .TP
 .B url: \fI<url to zonefile>
 Where to download a zonefile for the zone.  With http or https.  An example
 for the url is "http://www.example.com/example.org.zone".  Multiple url
 statements can be given, they are tried in turn.  If only urls are given
 the SOA refresh timer is used to wait for making new downloads.  If also
-masters are listed, the masters are first probed with UDP SOA queries to
+primaries are listed, the primaries are first probed with UDP SOA queries to
 see if the SOA serial number has changed, reducing the number of downloads.
-If none of the urls work, the masters are tried with IXFR and AXFR.
+If none of the urls work, the primaries are tried with IXFR and AXFR.
 For https, the \fBtls\-cert\-bundle\fR and the hostname from the url are used
 to authenticate the connection.
 .TP
 .B allow\-notify: \fI<IP address or host name or netblockIP/prefix>
 With allow\-notify you can specify additional sources of notifies.
 When notified, the server attempts to first probe and then zone transfer.
-If the notify is from a master, it first attempts that master.  Otherwise
-other masters are attempted.  If there are no masters, but only urls, the
-file is downloaded when notified.  The masters from master: statements are
+If the notify is from a primary, it first attempts that primary.  Otherwise
+other primaries are attempted.  If there are no primaries, but only urls, the
+file is downloaded when notified.  The primaries from primary: statements are
 allowed notify by default.
 .TP
 .B zonefile: \fI<filename>
 The filename where the zone is stored.  If not given then no zonefile is used.
 If the file does not exist or is empty, unbound will attempt to fetch zone
-data (eg. from the master servers).
+data (eg. from the primary servers).
 .TP
 .B rpz\-action\-override: \fI<action>
 Always use this RPZ action for matching triggers from this zone. Possible action
diff --git a/util/configlexer.c b/util/configlexer.c
index 36b4a2eca..a00f50b74 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 331
-#define YY_END_OF_BUFFER 332
+#define YY_NUM_RULES 334
+#define YY_END_OF_BUFFER 335
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,364 +363,366 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3235] =
+static const flex_int16_t yy_accept[3253] =
     {   0,
-        1,    1,  305,  305,  309,  309,  313,  313,  317,  317,
-        1,    1,  321,  321,  325,  325,  332,  329,    1,  303,
-      303,  330,    2,  330,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  305,  306,  306,  307,
-      330,  309,  310,  310,  311,  330,  316,  313,  314,  314,
-      315,  330,  317,  318,  318,  319,  330,  328,  304,    2,
-      308,  330,  328,  324,  321,  322,  322,  323,  330,  325,
-      326,  326,  327,  330,  329,    0,    1,    2,    2,    2,
-        2,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+        1,    1,  308,  308,  312,  312,  316,  316,  320,  320,
+        1,    1,  324,  324,  328,  328,  335,  332,    1,  306,
+      306,  333,    2,  333,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  308,  309,  309,  310,
+      333,  312,  313,  313,  314,  333,  319,  316,  317,  317,
+      318,  333,  320,  321,  321,  322,  333,  331,  307,    2,
+      311,  333,  331,  327,  324,  325,  325,  326,  333,  328,
+      329,  329,  330,  333,  332,    0,    1,    2,    2,    2,
+        2,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  305,    0,  309,
-        0,  316,    0,  313,  317,    0,  328,    0,    2,    2,
-      328,  324,    0,  321,  325,    0,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  308,    0,  312,
+        0,  319,    0,  316,  320,    0,  331,    0,    2,    2,
+      331,  327,    0,  324,  328,    0,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  328,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  331,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  121,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  129,  329,  329,  329,  329,  329,  329,  329,
-      328,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  122,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  131,  332,  332,  332,  332,  332,  332,
+      332,  331,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  105,
-      329,  329,  329,  329,  329,  329,    8,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  122,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      106,  332,  332,  332,  332,  332,  332,    8,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  123,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  134,  329,  328,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  296,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  136,  332,  331,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  299,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  328,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  331,
 
-      329,  329,  329,  329,  329,  329,  329,   63,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  233,  329,   14,   15,  329,   19,   18,  329,
-      329,  217,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  128,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,   63,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  235,  332,   14,
+       15,  332,   19,   18,  332,  332,  219,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  129,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  215,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,    3,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  328,  329,  329,  329,
-      329,  329,  329,  329,  290,  329,  329,  289,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  217,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,    3,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  331,  332,  332,  332,  332,  332,  332,  332,
+      293,  332,  332,  292,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  312,  329,  329,  329,  329,  329,  329,
-      329,   62,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,   66,  329,
-      264,  329,  329,  329,  329,  329,  329,  329,  329,  297,
-      298,  329,  329,  329,  329,  329,   67,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      315,  332,  332,  332,  332,  332,  332,  332,   62,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,   66,  332,  266,  332,  332,
+      332,  332,  332,  332,  332,  332,  300,  301,  332,  332,
+      332,  332,  332,   67,  332,  332,  130,  332,  332,  332,
 
-      329,  329,  329,  125,  329,  329,  329,  329,  329,  329,
-      329,  329,  204,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,   21,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  153,  329,  329,  328,  312,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  103,  329,  329,
-      329,  329,  329,  329,  329,  272,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  126,  332,  332,  332,  332,  332,  332,  332,  332,
+      206,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,   21,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      155,  332,  332,  331,  315,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  104,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  176,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  152,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  102,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  274,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  178,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  154,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  103,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,   32,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,   33,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,   64,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  127,  328,  329,
-      329,  329,  329,  329,  120,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,   65,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  237,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,   32,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,   33,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,   64,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  128,  331,  332,  332,
+      332,  332,  332,  121,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,   65,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  177,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,   53,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  255,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  239,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  179,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,   53,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,   57,  329,   58,  329,  329,  329,  329,  329,  106,
-      329,  107,  329,  329,  329,  329,  104,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,    7,  329,  328,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  226,  329,  329,  329,  329,
-      155,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  238,  329,  329,
+      332,  332,  332,  257,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,   57,  332,   58,  332,  332,  332,  332,  332,
+      107,  332,  108,  332,  332,  332,  332,  105,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,    7,  332,  331,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  228,  332,  332,
+      332,  332,  157,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,   45,  329,  329,  329,  329,  329,  329,
-      329,  329,   54,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  196,  329,  195,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,   16,   17,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  240,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,   45,  332,  332,  332,  332,
+      332,  332,  332,  332,   54,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  198,
+      332,  197,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,   16,   17,
 
-       68,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  203,  329,  329,  329,  329,  329,  329,  109,
-      329,  108,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  187,  329,  329,  329,  329,  329,  329,
-      329,  329,  135,  328,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,   87,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  216,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,   68,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  205,  332,  332,  332,  332,
+      332,  332,  110,  332,  109,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  189,  332,  332,  332,
+      332,  332,  332,  332,  332,  137,  331,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,   98,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,   87,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,   91,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,   61,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  190,  191,  329,  329,
-      329,  266,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,    6,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  270,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  218,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,   91,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,   61,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  192,  193,  332,  332,  332,  268,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,    6,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  291,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,   42,  329,  329,  329,  329,   44,
-      329,  329,  329,  329,  329,  329,  329,  329,   51,  329,
-      329,  329,  329,  329,  329,  329,  328,  329,  183,  329,
-      329,  329,  130,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  208,  329,  184,  329,  329,  329,  223,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-       52,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  272,  332,  332,  332,  332,  332,  332,  294,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,   42,
+      332,  332,  332,  332,   44,  332,  332,  332,  332,  332,
+      332,  332,  332,   51,  332,  332,  332,  332,  332,  332,
+      332,  331,  332,  185,  332,  332,  332,  132,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  210,  332,
+      186,  332,  332,  332,  225,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  132,  114,  329,  115,  329,  329,  329,  113,  329,
-      329,  329,  329,  329,  329,  329,  329,  150,  329,  329,
-       50,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  254,  329,  329,  329,  329,
-      329,  329,  329,  329,  185,  329,  329,  329,  329,  329,
-      188,  329,  194,  329,  329,  329,  329,  329,  222,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  101,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  126,  329,  329,  329,  329,  329,  329,   59,
+      332,  332,  332,  332,  332,   52,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  134,  115,  332,  116,
+      332,  332,  332,  114,  332,  332,  332,  332,  332,  332,
+      332,  332,  152,  332,  332,   50,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      256,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      187,  332,  332,  332,  332,  332,  190,  332,  196,  332,
+      332,  332,  332,  332,  224,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  102,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,   26,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,   20,  329,  329,  329,  329,  329,  329,
-       27,   36,  329,  160,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  328,  329,  329,
-      329,  329,  329,  329,   76,   78,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  274,
-      329,  329,  329,  329,  234,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  116,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  149,  329,   46,
+      332,  332,  332,  332,  332,  332,  332,  332,  127,  332,
+      332,  332,  332,  332,  332,   59,  332,  332,  332,   26,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,   20,
+      332,  332,  332,  332,  332,  332,   27,   36,  332,  162,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  331,  332,  332,  332,  332,  332,  332,
+       76,   78,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  276,  332,  332,  332,  332,
+      236,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  285,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  154,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  214,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  294,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  171,  329,  329,  329,  329,  329,  329,
-      329,  329,  110,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  117,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  151,  332,   46,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  287,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  156,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  216,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  297,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      173,  332,  332,  332,  332,  332,  332,  332,  332,  111,
 
-      329,  329,  166,  329,  178,  329,  329,  329,  329,  328,
-      329,  138,  329,  329,  329,  329,  329,   97,  329,  329,
-      329,  329,  206,  329,  329,  329,  329,  329,  329,  224,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  246,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  131,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  170,  329,  329,  329,  329,  329,  329,   79,   80,
-      329,  329,  329,  329,  329,   60,  329,  329,  329,  329,
-      329,   86,  179,  329,  197,  329,  227,  329,  329,  189,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  168,
+      332,  180,  332,  332,  332,  332,  331,  332,  140,  332,
+      332,  332,  332,  332,   97,  332,  332,  332,  332,  208,
+      332,  332,  332,  332,  332,  332,  226,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  248,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  133,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  172,  332,
+      332,  332,  332,  332,  332,   79,   80,  332,  332,  332,
 
-      267,  329,  329,  329,  329,  329,   72,  329,  181,  329,
-      329,  329,  329,  329,    9,  329,  329,  329,  100,  329,
-      329,  329,  329,  259,  329,  329,  329,  329,  205,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  328,  329,  329,  329,  329,  169,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      156,  329,  273,  329,  329,  329,  329,  329,  245,  329,
+      332,  332,   60,  290,  332,  332,  332,  332,  332,   86,
+      181,  332,  199,  332,  229,  332,  332,  191,  269,  332,
+      332,  332,  332,  332,   72,  332,  183,  332,  332,  332,
+      332,  332,    9,  332,  332,  332,  101,  332,  332,  332,
+      332,  261,  332,  332,  332,  332,  207,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  331,  332,  332,  332,  332,  171,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      218,  329,  329,  301,  329,  329,  329,  265,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  288,  329,  180,  329,
-      329,  329,  329,  329,  329,  329,   71,   73,  329,  329,
-      329,  329,  329,  329,  329,   99,  329,  329,  329,  329,
-      257,  329,  329,  329,  329,  269,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  210,   34,   28,
-       30,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  158,  332,
+      275,  332,  332,  332,  332,  332,  247,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  220,  332,
+      332,  304,  332,  332,  332,  267,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  291,  332,  182,  332,  332,  332,
+      332,  332,  332,  332,   71,   73,  332,  332,  332,  332,
+      332,  332,  332,  100,  332,  332,  332,  332,  259,  332,
+      332,  332,  332,  271,  332,  332,  332,  332,  332,  332,
 
-       35,  329,   29,   31,  329,  329,  329,  329,  329,  329,
-      329,  329,   96,  329,  329,  329,  329,  329,  329,  328,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  212,  209,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,   70,  329,  329,  329,  133,  329,  117,  329,  329,
-      329,  329,  329,  329,  329,  329,  151,   47,  329,  329,
-      320,   13,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  283,  329,  286,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,   12,  329,  329,   22,  329,  329,
+      332,  332,  332,  332,  332,  212,   34,   28,   30,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,   35,  332,
+       29,   31,  332,  332,  332,  332,  332,  332,  332,  332,
+       96,  332,  332,  332,  332,  332,  332,  331,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  214,
+      211,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,   70,
+      332,  332,  332,  135,  332,  118,  332,  332,  332,  332,
+      332,  332,  332,  332,  153,   47,  332,  332,  323,   13,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  285,
 
-      329,  263,  329,  329,  329,  329,  271,  329,  329,  329,
-       74,  329,  220,  329,  329,  329,  329,  211,  329,  329,
-       69,  329,  329,  329,  329,   23,  329,   43,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      165,  164,  320,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  213,  207,  329,  225,  329,  329,  275,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-       81,  329,  329,  329,  258,  329,  329,  329,  329,  193,
+      332,  288,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,   12,  332,  332,   22,  332,  332,  332,  265,
+      332,  332,  332,  332,  273,  332,  332,  332,   74,  332,
+      222,  332,  332,  332,  332,  213,  332,  332,   69,  332,
+      332,  332,  332,   23,  332,   43,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  167,  166,
+      323,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      215,  209,  332,  227,  332,  332,  277,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  219,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  292,  293,  162,  329,  329,   75,
-      329,  329,  329,  329,  172,  329,  329,  111,  112,  329,
-      329,  329,  329,  157,  329,  159,  329,  198,  329,  329,
-      329,  329,  163,  329,  329,  228,  329,  329,  329,  329,
-      329,  329,  329,  140,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  236,  329,  329,  329,
-      329,  329,  329,  329,  329,   24,  329,  268,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  199,  329,  329,  256,  329,  287,  329,  192,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,   81,  332,
+      332,  332,  260,  332,  332,  332,  332,  195,  332,  332,
+      332,  332,  221,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  295,  296,  164,  332,  332,   75,  332,  332,
+      332,  332,  174,  332,  332,  112,  113,  332,  332,  332,
+      332,  159,  332,  161,  332,  200,  332,  332,  332,  332,
+      165,  332,  332,  230,  332,  332,  332,  332,  332,  332,
+      332,  142,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  238,  332,  332,  332,  332,  332,
+      332,  332,  332,   24,  332,  270,  332,  332,  332,  332,
 
-      329,  329,  329,   55,  329,  329,  329,  329,    4,  329,
-      329,  329,  329,  124,  139,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  231,   37,   38,  329,  329,  329,  329,
-      329,  329,  329,  276,  329,  329,  329,  329,  329,  329,
-      329,  244,  329,  329,  329,  329,  329,  329,  329,  329,
-      202,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,   84,  329,   56,  262,  329,  232,  329,  329,
-      329,  329,   11,  329,  329,  329,  329,  329,  329,  123,
-      329,  329,  329,  329,  200,   88,  329,   40,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  201,
+      332,  332,  258,  332,  289,  332,  194,  332,  332,  332,
+      332,   55,  332,  332,  332,  332,    4,  332,  332,  332,
+      332,  125,  141,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  233,   37,   38,  332,  332,  332,  332,  332,  332,
+      332,  278,  332,  332,  332,  332,  332,  332,  332,  246,
+      332,  332,  332,  332,  332,  332,  332,  332,  204,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+       84,  332,   56,  264,  332,  234,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  168,  329,  329,  329,
-      329,  329,  142,  329,  329,  329,  329,  235,  329,  329,
-      329,  329,  329,  243,  329,  329,  329,  329,  136,  329,
-      329,  329,  118,  119,  329,  329,  329,   90,   94,   89,
-      329,  329,  329,   82,  329,  329,  329,  329,  329,   10,
-      329,  329,  329,  260,  295,  329,  329,  329,  329,  300,
-       39,  329,  329,  329,  329,  329,  167,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-       95,   93,  329,  329,  329,   83,  284,  329,  329,  329,
+       11,  332,  332,  332,  332,  332,  332,  124,  332,  332,
+      332,  332,  202,   88,  332,   40,  332,  332,  332,  332,
+      332,  332,  332,  332,  170,  332,  332,  332,  332,  332,
+      144,  332,  332,  332,  332,  237,  332,  332,  332,  332,
+      332,  245,  332,  332,  332,  332,  138,  332,  332,  332,
+      119,  120,  332,  332,  332,   90,   94,   89,  332,  332,
+      332,   82,  332,  332,  332,  332,  332,   10,  332,  332,
+      332,  262,  298,  332,  332,  332,  332,  303,   39,  332,
+      332,  332,  332,  332,  169,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  186,  329,  329,  329,  329,  329,
-      201,  329,  329,  329,  329,  329,  329,  329,  329,  158,
-       77,  329,  329,  329,  329,  329,  277,  329,  329,  329,
-      329,  329,  329,  329,  240,  329,  329,  239,  137,  302,
-      329,   92,   48,  329,  143,  144,  147,  148,  145,  146,
-       85,  329,  261,  329,  329,  329,  329,  161,  329,  329,
-      329,  329,  329,  230,  329,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-      329,  329,  174,  173,   41,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      332,  332,  332,  332,  332,  332,  332,  332,   95,   93,
+      332,  332,  332,   83,  286,  332,  332,  332,  332,  332,
+      332,  332,  188,  332,  332,  332,  332,  332,  203,  332,
+      332,  332,  332,  332,  332,  332,  332,  160,   77,  332,
+      332,  332,  332,  332,  279,  332,  332,  332,  332,  332,
+      332,  332,  242,  332,  332,  241,  139,  305,  332,   92,
+       48,  332,  145,  146,  149,  150,  147,  148,   85,  332,
+      263,  332,  332,  332,  332,  163,  332,  332,  332,  332,
+      332,  232,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
-       98,  329,  229,  329,  253,  281,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,   49,    5,
-      329,  329,  221,  329,  329,  282,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  241,   25,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  242,
-      329,  329,  329,  141,  329,  329,  329,  329,  329,  329,
-      329,  329,  175,  329,  182,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  278,  329,  329,  329,  329,  329,
-      329,  329,  329,  329,  329,  329,  329,  329,  329,  329,
+      176,  175,   41,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,   99,  332,
+      231,  332,  255,  283,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,   49,    5,  332,  332,
+      223,  332,  332,  284,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  243,   25,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  244,  332,  332,
+      332,  143,  332,  332,  332,  332,  332,  332,  332,  332,
+      177,  332,  184,  332,  332,  332,  332,  332,  332,  332,
 
-      329,  329,  299,  329,  329,  249,  329,  329,  329,  329,
-      329,  279,  329,  329,  329,  329,  329,  329,  280,  329,
-      329,  329,  247,  329,  250,  251,  329,  329,  329,  329,
-      329,  248,  252,    0
+      332,  332,  280,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      302,  332,  332,  251,  332,  332,  332,  332,  332,  281,
+      332,  332,  332,  332,  332,  332,  282,  332,  332,  332,
+      249,  332,  252,  253,  332,  332,  332,  332,  332,  250,
+      254,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -763,17 +765,17 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3253] =
+static const flex_int16_t yy_base[3271] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 4264, 3883,   81, 6320,
-     6320, 6320,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 3165, 3121,   81, 6365,
+     6365, 6365,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  184,  145,
-      185,  205,  194,  204,  178,  123, 3532, 6320, 6320, 6320,
-      107, 3462, 6320, 6320, 6320,  154, 3335, 2925, 6320, 6320,
-     6320,  226, 2336, 6320, 6320, 6320,  163, 2298, 6320,  238,
-     6320,  242,  148, 1838, 1641, 6320, 6320, 6320,  246, 1331,
-     6320, 6320, 6320,  250, 1145,  254,  219,    0,  258,    0,
+      185,  205,  194,  204,  178,  123, 3093, 6365, 6365, 6365,
+      107, 2724, 6365, 6365, 6365,  154, 2535, 2515, 6365, 6365,
+     6365,  226, 2454, 6365, 6365, 6365,  163, 2353, 6365,  238,
+     6365,  242,  148, 2067, 1986, 6365, 6365, 6365,  246, 1743,
+     6365, 6365, 6365,  250, 1651,  254,  219,    0,  258,    0,
         0,  165,  250,  191,  215,  243,  252,  256,   92,  260,
 
       261,  262,  264,  265,  266,  273,  270,  277,  278,  281,
@@ -781,8 +783,8 @@ static const flex_int16_t yy_base[3253] =
       313,  314,  307,  323,  317,  312,  328,  326,  330,  334,
       337,  340,  342,  343,  344,  346,  349,  354,  348,  356,
       364,  357,  361,  359,  372,  376,  365,  360,  377,  380,
-      384,  385,  387,  388,  391,  399,  389, 1088,  411,  855,
-      415,  776,  422,  778,  644,  426,  406,  430,  434,    0,
+      384,  385,  387,  388,  391,  399,  389, 1400,  411, 1203,
+      415, 1088,  422, 1027,  689,  426,  406,  430,  434,    0,
       411,  280,  438,  233,  181,  442,  430,  442,  419,  438,
       439,  441,  440,  443,  444,  445,  446,  449,  463,  455,
       456,  467,  471,  472,  469,  476,  474,  460,  482,  488,
@@ -790,704 +792,706 @@ static const flex_int16_t yy_base[3253] =
       484,  481,  491,  494,  495,  497,  502,  503,  505,  504,
       506,  507,  523,  510,  499,  509,  532,  530,  534,  539,
       535,  542,  544,  537,  551,  547,  554,  556,  557,  508,
-      559,  546,  561,  549,  560,  562,  569,  563,  570,  573,
-      576,  583,  579,  580,  586,  578,  587,  588,  597,  592,
-      594,  593,  601,  602,  610,  611,  603,  614,  613,  615,
-      616,  619,  627,  630,  631,  623,  632,  626,  628,  634,
-      635,  636,  639,  649,  654,  651,  652,  659,  658,  660,
-      661,  663,  664,  640,  675,  667,  666,  680,  685,  671,
-      683,  686,  676,  678,  688,  690,  695,  696,  703,  698,
+      559,  546,  561,  549,  560,  563,  569,  570,  572,  573,
+      575,  583,  580,  578,  584,  581,  592,  590,  597,  593,
+      594,  598,  601,  604,  612,  616,  602,  623,  607,  614,
+      624,  627,  635,  636,  631,  615,  632,  622,  639,  640,
+      641,  642,  643,  651,  652,  644,  654,  662,  655,  657,
+      660,  663,  664,  665,  673,  676,  680,  668,  684,  674,
+      685,  687,  675,  683,  693,  695,  694,  697,  707,  700,
 
-      706,  699,  708,  707,  709,  713,  720,  721,  716,  717,
-      722,  719,  723,  726,  727,  730,  725,  731,  737,  733,
-      739,  741,  752,  747,  748,  761,  754,  756,  757,  764,
-      755,  771,  765,  786,  793,  772,  782,  768,  791,  794,
-      796,  801,  797,  790,  804,  807,  808,  810,  811,  818,
-      813, 6320,  815,  817,  829,  828,  831,  834,  824,  840,
-      832,  820,  850,  846,  847,  851,  873,  848,  849,  862,
-      863,  853, 6320,  866,  857,  897,  865,  875,  887,  882,
-      858,  883,  890,  895,  891,  907,  893,  898,  903,  920,
-      906,  908,  915,  921,  922,  923,  931,  932,  926,  930,
+      708,  709,  710,  712,  717,  715,  719,  727,  705,  722,
+      723,  605,  728,  731,  724,  726,  732,  735,  736,  738,
+      745,  743,  747,  749,  750,  766,  754,  739,  759,  767,
+      758,  760,  768,  774,  793,  779,  781,  789,  790,  791,
+      795,  797,  805,  807,  796,  809,  803,  810,  812,  813,
+      822,  818, 6365,  817,  820,  833,  826,  834,  835,  836,
+      841,  842,  823,  849,  847,  848,  852,  874,  856,  858,
+      854,  863,  866, 6365,  864,  868,  898,  870,  872,  892,
+      888,  884,  887,  889,  899,  896,  909,  902,  907,  911,
+      922,  918,  919,  920,  921,  924,  930,  937,  932,  934,
 
-      934,  943,  939,  940,  944,  953,  941,  947,  952,  945,
-      955,  967,  954,  962,  971,  960,  965,  973,  974,  976,
-      975,  986,  983,  985,  988,  978,  996, 1007,  998, 1002,
-     1006, 1009, 1011, 1013, 1014, 1017, 1021, 1018, 1022, 1024,
-     1032, 1027, 1028, 1029, 1034, 1036, 1037, 1040, 1042, 1045,
-     1044, 1048, 1049, 1047, 1054, 1060, 1057, 1066, 1058, 6320,
-     1068, 1061, 1064, 1070, 1071, 1073, 6320, 1074, 1075, 1076,
-     1083, 1084, 1087, 1096, 1086, 1097, 1099, 1089, 1098, 1110,
-     1106, 1109, 1117, 1107, 1114, 1115, 1118, 1116, 1122, 1123,
-     1124, 1125, 1128, 1130, 1148, 6320, 1131, 1140, 1132, 1133,
+      859,  935,  944,  942,  943,  946,  950,  952,  953,  955,
+      956,  769,  958,  962,  964,  973,  957,  965,  963,  975,
+      977,  981,  982,  992,  985,  984,  998,  988, 1010, 1005,
+     1006, 1007, 1013, 1009, 1008, 1017, 1019, 1021, 1022, 1023,
+     1024, 1035, 1030, 1031, 1033, 1037, 1038, 1039, 1041, 1044,
+     1045, 1047, 1049, 1051, 1050, 1056, 1060, 1058, 1066, 1061,
+     6365, 1068, 1070, 1072, 1073, 1074, 1075, 6365, 1077, 1071,
+     1076, 1078, 1090, 1093, 1104, 1081, 1085, 1100, 1103, 1101,
+     1105, 1113, 1109, 1114, 1116, 1112, 1118, 1119, 1121, 1124,
+     1122, 1125, 1130, 1131, 1132, 1133, 1152, 6365, 1136, 1139,
 
-     1134, 1142, 1160, 1144, 1153, 1157, 1161, 1172, 1163, 1175,
-     1171, 1180, 1181, 1183, 1184, 1186, 1187, 1188, 1190, 1189,
-     1191, 1193, 1195, 1192, 1198, 6320, 1197, 1212, 1219, 1205,
-     1210, 1215, 1218, 1220, 1221, 1222, 1223, 1227, 1230, 1241,
-     1237, 1233, 1248, 1243, 1244, 1246, 1249, 1251, 1250, 1252,
-     1254, 1263, 1259, 1266, 1274, 1275, 1277, 1279, 1286, 1288,
-     1281, 1283, 1289, 1285, 1284, 1291, 1293, 1300, 1294, 1297,
-     1224, 1304, 1306, 1301, 1307, 1308, 1313, 1309, 1311, 1315,
-     1318, 1321, 1329, 1325, 1326, 1335, 1327, 1336, 1328, 1333,
-     1339, 1348, 1342, 1350, 6320, 1357, 1258, 1352, 1354, 1359,
+     1144, 1138, 1143, 1145, 1164, 1150, 1162, 1161, 1170, 1181,
+     1174, 1182, 1176, 1163, 1187, 1184, 1191, 1189, 1193, 1195,
+     1194, 1196, 1197, 1198, 1200, 1201, 1206, 6365, 1208, 1211,
+     1220, 1221, 1222, 1223, 1224, 1225, 1137, 1226, 1228, 1227,
+     1231, 1235, 1245, 1252, 1236, 1253, 1239, 1254, 1249, 1250,
+     1256, 1259, 1258, 1260, 1270, 1266, 1272, 1281, 1284, 1283,
+     1286, 1293, 1295, 1275, 1288, 1298, 1268, 1290, 1291, 1302,
+     1292, 1303, 1304, 1306, 1313, 1308, 1311, 1314, 1316, 1317,
+     1320, 1315, 1322, 1321, 1324, 1331, 1328, 1332, 1339, 1334,
+     1340, 1338, 1343, 1345, 1348, 1349, 1354, 6365, 1361, 1357,
 
-     1360, 1361, 1362, 1367, 1368, 1369, 1371, 1370, 1373, 1374,
-     1377, 1379, 1384, 1386, 1387, 1388, 1389, 1402, 1401, 1403,
-     1391, 1397, 1412, 1405, 1413, 1414, 1415, 1422, 1418, 1419,
-     1423, 1430, 1425, 1426, 1429, 1427, 1436, 1433, 1438, 1445,
-     1446, 1448, 1455, 1450, 1452, 1457, 1460, 1461, 1462, 1464,
-     1465, 1466, 1467, 1474, 1469, 1472, 1471, 1475, 1470, 1476,
-     1484, 1478, 1497, 1489, 1492, 1494, 1498, 1501, 1500, 1499,
-     1502, 1506, 1507, 1509, 1508, 1510, 1512, 1519, 1521, 1523,
-     1528, 1527, 1529, 1531, 1534, 1530, 1539, 1540, 1542, 1536,
-     1549, 1550, 1551, 1552, 1555, 1553, 1557, 1562, 1563, 1564,
+     1362, 1360, 1367, 1368, 1370, 1358, 1373, 1376, 1377, 1379,
+     1378, 1381, 1385, 1382, 1387, 1388, 1392, 1395, 1393, 1402,
+     1409, 1408, 1410, 1396, 1412, 1419, 1416, 1423, 1422, 1418,
+     1424, 1433, 1428, 1431, 1430, 1440, 1420, 1436, 1437, 1438,
+     1446, 1448, 1451, 1459, 1452, 1456, 1463, 1465, 1460, 1232,
+     1467, 1468, 1471, 1472, 1473, 1474, 1475, 1482, 1477, 1478,
+     1479, 1483, 1484, 1480, 1488, 1492, 1503, 1496, 1501, 1504,
+     1505, 1508, 1509, 1506, 1511, 1514, 1515, 1516, 1517, 1518,
+     1526, 1520, 1525, 1528, 1535, 1537, 1538, 1541, 1543, 1544,
+     1545, 1546, 1555, 1547, 1556, 1558, 1548, 1559, 1561, 1564,
 
-     1568, 1570, 1569, 1572, 1578, 1575, 1576, 6320, 1580, 1588,
-     1581, 1589, 1586, 1591, 1592, 1600, 1595, 1597, 1596, 1602,
-     1605, 1628, 6320, 1606, 6320, 6320,  315, 6320, 6320, 1608,
-     1607, 6320, 1609, 1611, 1618, 1619, 1631, 1635, 1638, 1624,
-     1612, 1639, 1651, 1660, 1641, 1622, 1652, 1653, 1644, 1654,
-     1666, 1655, 1665, 1656, 1673, 1683, 1684, 1685, 1675, 1687,
-     1689, 1692, 1693, 1697, 1699, 1700, 1702, 1703, 1704, 1706,
-     1705, 1708, 1711, 1714, 1715, 1717, 1710, 1718, 1669, 1727,
-     1720, 1737, 6320, 1729, 1739, 1744, 1741, 1748, 1747, 1743,
-     1745, 1752, 1755, 1756, 1757, 1758, 1723, 1759, 1761, 1762,
+     1571, 1566, 1572, 1575, 1576, 1578, 1577, 1580, 1581, 1588,
+     1589, 1593, 6365, 1585, 1601, 1583, 1596, 1597, 1599, 1605,
+     1612, 1607, 1610, 1608, 1611, 1613, 1637, 6365, 1614, 6365,
+     6365,  315, 6365, 6365, 1616, 1621, 6365, 1622, 1631, 1618,
+     1641, 1619, 1643, 1647, 1630, 1638, 1635, 1660, 1661, 1664,
+     1632, 1666, 1667, 1650, 1672, 1670, 1677, 1678, 1681, 1682,
+     1689, 1687, 1690, 1686, 1697, 1695, 1699, 1703, 1705, 1707,
+     1710, 1692, 1712, 1713, 1715, 1717, 1718, 1714, 1721, 1723,
+     1720, 1727, 1726, 1736, 1732, 1741, 1750, 6365, 1742, 1751,
+     1752, 1753, 1760, 1728, 1755, 1756, 1763, 1766, 1759, 1757,
 
-     1765, 1772, 1767, 6320, 1768, 1770, 1769, 1776, 1774, 1782,
-     1784, 1780, 1787, 1788, 1790, 1801, 1791, 1796, 1798, 1799,
-     1802, 1804, 6320, 1814, 1806, 1809, 1813, 1810, 1819, 1820,
-     1821, 1822, 1823, 1824, 1825, 1827, 1833, 1834, 1835, 1836,
-     1837, 1841, 1851, 1846, 1849, 1859, 1850, 1853, 1861, 1863,
-     1864, 1865, 1866, 1868, 1873, 1875, 1872, 1880, 1876, 1883,
-     1895, 1878, 1879, 1890, 1892, 1891, 1893, 1905, 1900, 1901,
-     1904, 1913, 1906, 1909, 1911, 1915, 1922, 1918, 1923, 1924,
-     1914, 1928, 1930, 1931, 6320, 1932, 1937, 6320, 1934, 1938,
-     1960, 1939, 1941, 1942, 1944, 1947, 1949, 1946, 1952, 1962,
+     1768, 1769, 1770, 1772, 1774, 1777, 1779, 1786, 1781, 6365,
+     1782, 1784, 1787, 1790, 1788, 1796, 1798, 1792, 1794, 1801,
+     1802, 1813, 1804, 1808, 1809, 1816, 1814, 1818, 6365, 1820,
+     1827, 1824, 1830, 1831, 1817, 1833, 1832, 1836, 1834, 1839,
+     1840, 1841, 1842, 1855, 1848, 1846, 1847, 1850, 1863, 1851,
+     1867, 1871, 1860, 1868, 1873, 1874, 1875, 1876, 1878, 1879,
+     1887, 1889, 1886, 1890, 1885, 1894, 1902, 1903, 1891, 1892,
+     1901, 1908, 1913, 1915, 1916, 1917, 1911, 1926, 1918, 1922,
+     1923, 1925, 1933, 1928, 1936, 1944, 1931, 1934, 1937, 1939,
+     6365, 1946, 1947, 6365, 1949, 1948, 1950, 1972, 1951, 1955,
 
-     1964, 1974, 1970, 1975, 1980, 1977, 1982, 1983, 1985, 1986,
-     1988, 1991, 1993, 1998, 1994, 2007, 2012, 2011, 2008, 2019,
-     2014, 2015, 2017, 2037, 2016, 2018, 2025, 2020, 2021, 2024,
-     2033, 2026, 2027, 2030, 2031, 2048, 2050, 2044, 2052, 2053,
-     2059, 2060, 2054, 6320, 2067, 1955, 2065, 2066, 2075, 2072,
-     2070, 6320, 2073, 2076, 2078, 2086, 2081, 2083, 2087, 2088,
-     2091, 2093, 2095, 2097, 2100, 2098, 2099, 2117, 6320, 2096,
-     6320, 2101, 2103, 2110, 2114, 2118, 2119, 2120, 2121, 6320,
-     6320, 2122, 2124, 2130, 2138, 2135, 6320, 2137, 2145, 2142,
-     2147, 2140, 2141, 2149, 2151, 2155, 2152, 2162, 2157, 2164,
+     1963, 1957, 1960, 1965, 1964, 1966, 1982, 1976, 1992, 1989,
+     1994, 1995, 1997, 2000, 1984, 2001, 2002, 2003, 2004, 2010,
+     1967, 2009, 2013, 2023, 2021, 2027, 2031, 2026, 2028, 2032,
+     2051, 2029, 2030, 2039, 2033, 2036, 2038, 2034, 2040, 2044,
+     2049, 2046, 2061, 2064, 2056, 2060, 2066, 2073, 2075, 2058,
+     6365, 2086, 2082, 2081, 2083, 2093, 2089, 2088, 6365, 2090,
+     2092, 2095, 2097, 2103, 2098, 2104, 2102, 2105, 2106, 2108,
+     2114, 2115, 2110, 2113, 2127, 6365, 2118, 6365, 2125, 2128,
+     2131, 2129, 2133, 2132, 2135, 2136, 6365, 6365, 2137, 2144,
+     2145, 2155, 2152, 6365, 2138, 2162, 6365, 2159, 2164, 2157,
 
-     2159, 2166, 2170, 6320, 2160, 2172, 2173, 2175, 2176, 2181,
-     2182, 2179, 6320, 2183, 2185, 2188, 2196, 2198, 2195, 2199,
-     2200, 2205, 2202, 2207, 2208, 2209, 2210, 2219, 2221, 2211,
-     2222, 2224, 2231, 6320, 2214, 2218, 2236, 2234, 2241, 2233,
-     2235, 2237, 2243, 2245, 2246, 2247, 2250, 2251, 2252, 2259,
-     2260, 2257, 2256, 2265, 2266, 2267, 2270, 2273, 2274, 2275,
-     2276, 2277, 6320, 2278, 2280, 2283,  171, 2286, 2289, 2287,
-     2288, 2296, 2291, 2294, 2307, 2312, 2308, 2309, 2310, 2316,
-     2317, 2318, 2319, 2320, 2321, 2322, 2324, 6320, 2326, 2327,
-     2329, 2333, 2332, 2335, 2340, 6320, 2342, 2349, 2352, 2361,
+     2158, 2166, 2168, 2170, 2169, 2179, 2172, 2180, 2175, 2176,
+     2177, 6365, 2185, 2187, 2189, 2193, 2195, 2196, 2197, 2200,
+     6365, 2199, 2203, 2204, 2213, 2215, 2209, 2206, 2217, 2221,
+     2216, 2223, 2225, 2226, 2227, 2236, 2237, 2228, 2238, 2239,
+     2241, 6365, 2232, 2246, 2253, 2249, 2252, 2248, 2255, 2256,
+     2258, 2259, 2260, 2261, 2265, 2267, 2268, 2275, 2276, 2271,
+     2273, 2281, 2282, 2284, 2285, 2292, 2289, 2290, 2291, 2293,
+     6365, 2294, 2296, 2300,  171, 2302, 2304, 2303, 2306, 2305,
+     2309, 2312, 2323, 2327, 2322, 2324, 2326, 2325, 2331, 2333,
+     2334, 2335, 2336, 2337, 2341, 2340, 6365, 2343, 2346, 2348,
 
-     2344, 2353, 2362, 2358, 2363, 2364, 2366, 2368, 2370, 2369,
-     2372, 2378, 2375, 6320, 2380, 2383, 2385, 2376, 2392, 2391,
-     2384, 2398, 2399, 2400, 2403, 2401, 2402, 2405, 2404, 2406,
-     2407, 2412, 2411, 2408, 2410, 2420, 2421, 2422, 2431, 2424,
-     2432, 2433, 6320, 2440, 2435, 2437, 2438, 2439, 2452, 2442,
-     2461, 2444, 2448, 2445, 2464, 2466, 2456, 2467, 2478, 2480,
-     2468, 2477, 2488, 2487, 2490, 2483, 2470, 2493, 2496, 2497,
-     2498, 2500, 2502, 2503, 2504, 2505, 2512, 2513, 2510, 2520,
-     2519, 2525, 2532, 2527, 6320, 2536, 2531, 2534, 2541, 2548,
-     2544, 2521, 2549, 2545, 2551, 2555, 2556, 2557, 2564, 2561,
+     2349, 2351, 2352, 2362, 6365, 2354, 2368, 2365, 2374, 2375,
+     2363, 2380, 2371, 2361, 2384, 2386, 2385, 2387, 2389, 2388,
+     2392, 2395, 6365, 2397, 2400, 2401, 2398, 2407, 2409, 2408,
+     2410, 2411, 2415, 2416, 2420, 2422, 2419, 2421, 2423, 2424,
+     2427, 2430, 2432, 2436, 2437, 2438, 2439, 2443, 2441, 2447,
+     2448, 6365, 2457, 2449, 2459, 2461, 2450, 2460, 2463, 2477,
+     2467, 2474, 2472, 2478, 2489, 2480, 2482, 2487, 2483, 2495,
+     2492, 2505, 2504, 2506, 2513, 2496, 2515, 2518, 2507, 2510,
+     2520, 2519, 2525, 2522, 2524, 2532, 2537, 2533, 2540, 2534,
+     2545, 2558, 2549, 6365, 2547, 2553, 2541, 2557, 2570, 2562,
 
-     2565, 2563, 2567, 2566, 2569, 2568, 2570, 2576, 2583, 2579,
-     2585, 2587, 6320, 2511, 2588, 2590, 2591, 2597, 2592, 2599,
-     2601, 2603, 2604, 2605, 2607, 2610, 2611, 2613, 2615, 2618,
-     2617, 2616, 6320, 2621, 2622, 2623, 2629, 2631, 2632, 2639,
-     2641, 2647, 2645, 2635, 2649, 2651, 2652, 6320, 2660, 2662,
-     2659, 2663, 2661, 2666, 2667, 2669, 2671, 6320, 2672, 2673,
-     2674, 2681, 2682, 2677, 6320, 2686, 2684, 2679, 2688, 2689,
-     2690, 2694, 2692, 2696, 2701, 2702, 2706, 2709, 2710, 6320,
-     2711, 2723, 2713, 2716, 2718, 2714, 2720, 2724, 2729, 2727,
-     2738, 2733, 6320, 2749, 2638, 2741, 2751, 2744, 2746, 2748,
+     2561, 2567, 2563, 2565, 2573, 2575, 2576, 2584, 2579, 2581,
+     2582, 2586, 2585, 2588, 2587, 2593, 2595, 2602, 2598, 2604,
+     2606, 6365, 2607, 2609, 2611, 2612, 2616, 2617, 2620, 2622,
+     2624, 2625, 2626, 2628, 2631, 2632, 2633, 2634, 2636, 2638,
+     2641, 6365, 2649, 2642, 2643, 2644, 2650, 2654, 2656, 2660,
+     2663, 2666, 2667, 2668, 2669, 2670, 6365, 2678, 2679, 2675,
+     2687, 2677, 2682, 2684, 2689, 2690, 6365, 2691, 2692, 2693,
+     2700, 2702, 2697, 6365, 2704, 2699, 2705, 2707, 2708, 2709,
+     2711, 2714, 2717, 2718, 2721, 2726, 2733, 2722, 2730, 6365,
+     2728, 2742, 2734, 2740, 2738, 2744, 2748, 2750, 2751, 2753,
 
-     2753, 2754, 2755, 2756, 2757, 2760, 6320, 2761, 2764, 2765,
-     2767, 2770, 2769, 2771, 2784, 2777, 2779, 2781, 2785, 2786,
-     2788, 2791, 2792, 2797, 2793, 2794, 2804, 2806, 2808, 2809,
-     2812, 2816, 2814, 2819, 2820, 2815, 2822, 2825, 2833, 2838,
-     2823, 2834, 6320, 2837, 2840, 2839, 2841, 2842, 2845, 2846,
-     2849, 2847, 2854, 2852, 2851, 2855, 2864, 2872, 2861, 2868,
-     2870, 2873, 2875, 2877, 2876, 2878, 2879, 2886, 2883, 2885,
-     2893, 2890, 2894, 2902, 2891, 2899, 2901, 2903, 2905, 2904,
-     2906, 2907, 2912, 2914, 2917, 2924, 2927, 2929, 2928, 2930,
-     2931, 2934, 6320, 2937, 2938, 2935, 2942, 2945, 2947, 2949,
+     2755, 2760, 6365, 2767, 2766, 2764, 2777, 2754, 2769, 2772,
+     2778, 2779, 2780, 2781, 2782, 2785, 6365, 2786, 2788, 2789,
+     2791, 2793, 2794, 2796, 2808, 2799, 2803, 2804, 2809, 2810,
+     2813, 2814, 2816, 2821, 2817, 2820, 2827, 2830, 2831, 2833,
+     2836, 2844, 2834, 2842, 2843, 2839, 2846, 2847, 2856, 2857,
+     2858, 2860, 6365, 2863, 2864, 2865, 2854, 2866, 2869, 2870,
+     2873, 2875, 2871, 2879, 2877, 2881, 2884, 2894, 2898, 2886,
+     2889, 2896, 2899, 2900, 2902, 2901, 2904, 2905, 2914, 2911,
+     2910, 2919, 2912, 2921, 2928, 2925, 2926, 2929, 2930, 2932,
+     2917, 2935, 2933, 2937, 2939, 2942, 2953, 2954, 2943, 2955,
 
-     2957, 2948, 2952, 2959, 2956, 2966, 2958, 2967, 2968, 2975,
-     2972, 6320, 2973, 6320, 2974, 2976, 2979, 2983, 2982, 6320,
-     2987, 6320, 2989, 2994, 2984, 2990, 6320, 2996, 2997, 2998,
-     3003, 3001, 3005, 3008, 3009, 3010, 3011, 3013, 3015, 3019,
-     3018, 3020, 3023, 3028, 3025, 3029, 3032, 3035, 3036, 3040,
-     3038, 3042, 3045, 3047, 3050, 6320, 3052, 3048, 3054, 3057,
-     3058, 3059, 3061, 3062, 3065, 3067, 3068, 3074, 3075, 3069,
-     3079, 3085, 3082, 3084, 3097, 6320, 3092, 3094, 3095, 3096,
-     6320, 3098, 3099, 3100, 3107, 3105, 3109, 3110, 3112, 3116,
-     3111, 3118, 3113, 3128, 3126, 3132, 3121, 6320, 3135, 3136,
+     2956, 2957, 2958, 6365, 2961, 2962, 2963, 2966, 2969, 2972,
+     2975, 2982, 2973, 2974, 2984, 2990, 2991, 2981, 2992, 2983,
+     2999, 2997, 6365, 2998, 6365, 3000, 3002, 3004, 3012, 3008,
+     6365, 3014, 6365, 3015, 3020, 3009, 3011, 6365, 3023, 3017,
+     3022, 3029, 3024, 3032, 3033, 3035, 3034, 3041, 3036, 3038,
+     3043, 3044, 3046, 3049, 3050, 3054, 3051, 3061, 3067, 3055,
+     3064, 3057, 3062, 3070, 3072, 3076, 6365, 3078, 3080, 3082,
+     3083, 3084, 3085, 3086, 3087, 3089, 3090, 3092, 3102, 3098,
+     3108, 3095, 3114, 3117, 3124, 3105, 3126, 6365, 3109, 3128,
+     3119, 3129, 6365, 3131, 3106, 3132, 3139, 3134, 3137, 3141,
 
-     3122, 3139, 3149, 3151, 3156, 3138, 3152, 3154, 3163, 3159,
-     3158, 3160, 3161, 3162, 3165, 3172, 3173, 3169, 3176, 3175,
-     3179, 3186, 3183, 3177, 3181, 3187, 3189, 3190, 3191, 3192,
-     3193, 3194, 3197, 6320, 3199, 3200, 3202, 3214, 3206, 3209,
-     3213, 3217, 6320, 3220, 3221, 3223, 3224, 3222, 3230, 3231,
-     3232, 3233, 3234, 3236, 3239, 3240, 6320, 3245, 6320, 3246,
-     3254, 3253, 3259, 3235, 3261, 3263, 3268, 3262, 3264, 3269,
-     3272, 3270, 3276, 3273, 3278, 3281, 3285, 3286, 3288, 3284,
-     3295, 3291, 3296, 3298, 3299, 6320, 6320, 3300, 3301, 3302,
-     3305, 3306, 3307, 3316, 3318, 3323, 3320, 3313, 3322, 3342,
+     3142, 3143, 3146, 3147, 3149, 3154, 3158, 3161, 3162, 6365,
+     3167, 3163, 3150, 3170, 3178, 3180, 3185, 3182, 3183, 3188,
+     3192, 3190, 3191, 3153, 3193, 3194, 3196, 3203, 3206, 3202,
+     3211, 3198, 3208, 3210, 3215, 3201, 3216, 3217, 3218, 3224,
+     3225, 3222, 3223, 3226, 3227, 6365, 3229, 3230, 3231, 3249,
+     3233, 3234, 3245, 3235, 6365, 3251, 3247, 3252, 3258, 3260,
+     3262, 3255, 3263, 3264, 3265, 3266, 3268, 3271, 3272, 6365,
+     3276, 6365, 3273, 3286, 3279, 3285, 3290, 3292, 3294, 3300,
+     3293, 3295, 3303, 3304, 3301, 3305, 3307, 3311, 3313, 3315,
+     3318, 3327, 3317, 3319, 3323, 3328, 3329, 3331, 6365, 6365,
 
-     6320, 3329, 3324, 3326, 3332, 3350, 3333, 3346, 3353, 3349,
-     3358, 3355, 6320, 3356, 3357, 3365, 3360, 3363, 3368, 6320,
-     3367, 6320, 3364, 3369, 3370, 3377, 3374, 3379, 3380, 3381,
-     3385, 3396, 3397, 3389, 3399, 3393, 3382, 3401, 3403, 3410,
-     3405, 3407, 3408, 6320, 3412, 3409, 3414, 3417, 3419, 3425,
-     3428, 3415, 6320, 3421, 3431, 3435, 3432, 3436, 3439, 3441,
-     3442, 3443, 3445, 3447, 3444, 3449, 3460, 3452, 3453, 3455,
-     3466, 3467, 3473, 6320, 3474, 3468, 3481, 3483, 3476, 3478,
-     3484, 3485, 3486, 3489, 3491, 3490, 3492, 3493, 3494, 3496,
-     3498, 3501, 3499, 3512, 3513, 3500, 3521, 3522, 3504, 6320,
+     3333, 3334, 3335, 3338, 3339, 3344, 3346, 3350, 3351, 3353,
+     3355, 3357, 3366, 6365, 3363, 3364, 3367, 3368, 3378, 3369,
+     3381, 3388, 3385, 3392, 3391, 6365, 3374, 3370, 3399, 3383,
+     3395, 3406, 6365, 3401, 6365, 3402, 3403, 3405, 3407, 3410,
+     3411, 3412, 3414, 3418, 3425, 3433, 3429, 3431, 3415, 3420,
+     3432, 3434, 3443, 3436, 3440, 3441, 6365, 3445, 3446, 3448,
+     3449, 3450, 3457, 3460, 3453, 6365, 3461, 3463, 3465, 3467,
+     3468, 3470, 3472, 3474, 3475, 3479, 3481, 6365, 3477, 3483,
+     3490, 3485, 3487, 3492, 3495, 3499, 3501, 6365, 3504, 3506,
+     3513, 3511, 3508, 3512, 3516, 3517, 3518, 3521, 3523, 3522,
 
-     3514, 3526, 3527, 3528, 3529, 3535, 3536, 3539, 3541, 3530,
-     3545, 3552, 3534, 3542, 3557, 3554, 3565, 3561, 6320, 3566,
-     3562, 3573, 3547, 3568, 3570, 3574, 3576, 3578, 3575, 3579,
-     3582, 3585, 3592, 3587, 3588, 3589, 3597, 3593, 6320, 3604,
-     3602, 3605, 3610, 3611, 3618, 3614, 3595, 3617, 3620, 3622,
-     3624, 3627, 3628, 3629, 3632, 3633, 6320, 6320, 3635, 3636,
-     3637, 6320, 3640, 3639, 3651, 3642, 3643, 3644, 3655, 3654,
-     3652, 3656, 3658, 3665, 6320, 3666, 3673, 3668, 3669, 3680,
-     3683, 3686, 3670, 3682, 3672, 3679, 3687, 3690, 3689, 3694,
-     3695, 3703, 3706, 3701, 3702, 3704, 6320, 3705, 3709, 3710,
+     3524, 3525, 3526, 3528, 3530, 3533, 3531, 3544, 3545, 3532,
+     3553, 3554, 3536, 6365, 3546, 3558, 3559, 3560, 3561, 3567,
+     3568, 3571, 3573, 3562, 3577, 3584, 3566, 3574, 3589, 3586,
+     3597, 3593, 6365, 3598, 3594, 3605, 3579, 3600, 3602, 3606,
+     3608, 3610, 3607, 3611, 3614, 3617, 3624, 3619, 3620, 3621,
+     3629, 3625, 6365, 3636, 3634, 3627, 3637, 3643, 3644, 3652,
+     3647, 3649, 3650, 3658, 3651, 3660, 3653, 3662, 3663, 3666,
+     3655, 6365, 6365, 3668, 3670, 3672, 6365, 3674, 3676, 3685,
+     3687, 3678, 3688, 3682, 3691, 3680, 3692, 3690, 3694, 6365,
+     3696, 3704, 3702, 3705, 3713, 3714, 3718, 3715, 3719, 3709,
 
-     3712, 3713, 3714, 6320, 3716, 3718, 3727, 3719, 3737, 3726,
-     3723, 3741, 3738, 3742, 3743, 3744, 3745, 3746, 3753, 3748,
-     3750, 3752, 3757, 3760, 6320, 3761, 3767, 3754, 3769, 6320,
-     3772, 3781, 3779, 3782, 3777, 3784, 3785, 3792, 6320, 3787,
-     3790, 3788, 3791, 3801, 3793, 3802, 3804, 3798, 6320, 3805,
-     3806, 3807, 6320, 3808, 3813, 3819, 3821, 3822, 3829, 3824,
-     3826, 3827, 3828, 6320, 3834, 6320, 3832, 3836, 3840, 6320,
-     3838, 3843, 3844, 3846, 3847, 3852, 3853, 3851, 3860, 3861,
-     3862, 3864, 3865, 3863, 3868, 3872, 3869, 3870, 3874, 3875,
-     6320, 3876, 3878, 3885, 3890, 3897, 3886, 3893, 3880, 3899,
+     3711, 3721, 3723, 3724, 3725, 3731, 3740, 3741, 3727, 3737,
+     3739, 6365, 3736, 3738, 3744, 3746, 3748, 3750, 6365, 3753,
+     3754, 3755, 3757, 3763, 3764, 3769, 3771, 3773, 3774, 3776,
+     3777, 3778, 3779, 3781, 3786, 3784, 3791, 3792, 3783, 6365,
+     3796, 3797, 3800, 3803, 6365, 3807, 3810, 3817, 3818, 3814,
+     3816, 3815, 3825, 6365, 3822, 3824, 3823, 3826, 3836, 3831,
+     3838, 3837, 3829, 6365, 3833, 3839, 3843, 6365, 3844, 3849,
+     3855, 3857, 3846, 3865, 3861, 3863, 3864, 3860, 6365, 3871,
+     6365, 3872, 3862, 3877, 6365, 3873, 3879, 3881, 3883, 3880,
+     3887, 3888, 3894, 3896, 3884, 3890, 3898, 3900, 3901, 3902,
 
-     3900, 6320, 6320, 3903, 6320, 3906, 3907, 3908, 6320, 3910,
-     3912, 3917, 3914, 3915, 3918, 3922, 3919, 6320, 3929, 3932,
-     6320, 3930, 3940, 3935, 3937, 3938, 3943, 3939, 3941, 3945,
-     3949, 3951, 3946, 3950, 3947, 6320, 3954, 3952, 3956, 3960,
-     3967, 3968, 3970, 3969, 6320, 3976, 3977, 3973, 3980, 3983,
-     6320, 3984, 6320, 3982, 3986, 3992, 3994, 3988, 6320, 3997,
-     3998, 4002, 4003, 4005, 4006, 4009, 4011, 4013, 4015, 4023,
-     4019, 4020, 4018, 6320, 4021, 4022, 4028, 4037, 4030, 4032,
-     4047, 4034, 4042, 4025, 4046, 4049, 4051, 4055, 4057, 4050,
-     4060, 4053, 6320, 4061, 4064, 4067, 4075, 4068, 4072, 6320,
+     3909, 3906, 3908, 3910, 3911, 6365, 3914, 3912, 3913, 3920,
+     3931, 3918, 3923, 3929, 3933, 3934, 6365, 6365, 3937, 6365,
+     3939, 3940, 3941, 6365, 3943, 3945, 3952, 3944, 3948, 3951,
+     3955, 3960, 6365, 3963, 3964, 6365, 3966, 3973, 3969, 3970,
+     3971, 3974, 3977, 3978, 3981, 3982, 3983, 3979, 3985, 3984,
+     6365, 3987, 3988, 3989, 3997, 3980, 4002, 4006, 4008, 4004,
+     6365, 4010, 4012, 4016, 4018, 4019, 6365, 4020, 6365, 4017,
+     4021, 4025, 4031, 4027, 6365, 4036, 4028, 4040, 4032, 4043,
+     4045, 4044, 4050, 4041, 4051, 4060, 4052, 4053, 4056, 6365,
+     4061, 4062, 4068, 4069, 4063, 4065, 4079, 4072, 4081, 4074,
 
-     4078, 4076, 4080, 6320, 4079, 4082, 4086, 4094, 4083, 4087,
-     4091, 4089, 4096, 6320, 4097, 4098, 4099, 4108, 4112, 4106,
-     6320, 6320, 4114, 6320, 4116, 4100, 4121, 4124, 4104, 4118,
-     4126, 4128, 4131, 4132, 4134, 4135, 4139, 4141, 4149, 4150,
-     4153, 4154, 4156, 4145, 6320, 6320, 4159, 4160, 4146, 4167,
-     4168, 4162, 4170, 4177, 4173, 4179, 4182, 4184, 4191, 6320,
-     4172, 4183, 4190, 4187, 6320, 4192, 4193, 4195, 4196, 4197,
-     4201, 4199, 4200, 4204, 4205, 4213, 4206, 4208, 4216, 4214,
-     4222, 4224, 4225, 4226, 4228, 4230, 4233, 6320, 4234, 4235,
-     4237, 4238, 4239, 4243, 4245, 4246, 4247, 6320, 4249, 6320,
+     4082, 4087, 4084, 4088, 4093, 4091, 4097, 4095, 6365, 4099,
+     4101, 4104, 4115, 4107, 4105, 6365, 4106, 4119, 4121, 6365,
+     4110, 4112, 4120, 4128, 4122, 4130, 4131, 4135, 4136, 6365,
+     4133, 4134, 4137, 4138, 4139, 4141, 6365, 6365, 4152, 6365,
+     4153, 4142, 4154, 4155, 4156, 4161, 4163, 4166, 4168, 4160,
+     4172, 4177, 4174, 4164, 4184, 4191, 4194, 4189, 4190, 4180,
+     6365, 6365, 4196, 4201, 4197, 4204, 4207, 4193, 4199, 4215,
+     4213, 4210, 4220, 4221, 4228, 6365, 4225, 4212, 4230, 4223,
+     6365, 4214, 4231, 4224, 4233, 4235, 4237, 4238, 4241, 4244,
+     4242, 4246, 4252, 4250, 4253, 4251, 4259, 4257, 4260, 4262,
 
-     4252, 4251, 4253, 4260, 4267, 4270, 4269, 4271, 4274, 4275,
-     4278, 4280, 4281, 4284, 4288, 4283, 4291, 4293, 6320, 4294,
-     4286, 4300, 4301, 4303, 4305, 4307, 4309, 4310, 4312, 4314,
-     4316, 4318, 4323, 4319, 4315, 4325, 4327, 6320, 4330, 4332,
-     4334, 4337, 4338, 4341, 4340, 4344, 4349, 4342, 4350, 4351,
-     4355, 6320, 4352, 4357, 4358, 4359, 4367, 4362, 4364, 4368,
-     4371, 6320, 4375, 4376, 4377, 4378, 4379, 4382, 4385, 4387,
-     4389, 4391, 4399, 6320, 4394, 4390, 4403, 4401, 4405, 4404,
-     4407, 4409, 6320, 4410, 4416, 4413, 4420, 4422, 4429, 4427,
-     4431, 4424, 4433, 4434, 4430, 4438, 4441, 4442, 4440, 4458,
+     4263, 4268, 4271, 6365, 4272, 4273, 4274, 4275, 4278, 4281,
+     4282, 4283, 4284, 6365, 4289, 6365, 4288, 4285, 4294, 4307,
+     4308, 4287, 4297, 4309, 4299, 4314, 4317, 4319, 4311, 4320,
+     4321, 4325, 4328, 4330, 4331, 6365, 4335, 4324, 4332, 4338,
+     4342, 4346, 4339, 4348, 4343, 4354, 4349, 4351, 4360, 4363,
+     4355, 4357, 4365, 4367, 6365, 4368, 4371, 4372, 4375, 4376,
+     4377, 4378, 4384, 4388, 4380, 4382, 4389, 4393, 6365, 4390,
+     4395, 4396, 4398, 4404, 4401, 4407, 4406, 4409, 6365, 4414,
+     4405, 4415, 4416, 4417, 4419, 4423, 4426, 4429, 4431, 4436,
+     6365, 4428, 4441, 4442, 4432, 4445, 4434, 4443, 4444, 6365,
 
-     4459, 4444, 6320, 4445, 6320, 4455, 4456, 4466, 4461, 4463,
-     4467, 6320, 4469, 4472, 4474, 4471, 4475, 6320, 4478, 4476,
-     4479, 4481, 6320, 4477, 4491, 4482, 4483, 4498, 4499, 6320,
-     4504, 4505, 4501, 4513, 4515, 4510, 4512, 4514, 4516, 4518,
-     4520, 4521, 4522, 4531, 4524, 4527, 6320, 4529, 4536, 4542,
-     4543, 4550, 4526, 4537, 4547, 4546, 4552, 6320, 4553, 4554,
-     4555, 4556, 4559, 4560, 4561, 4568, 4567, 4564, 4569, 4571,
-     4572, 6320, 4577, 4578, 4579, 4587, 4583, 4590, 6320, 6320,
-     4585, 4595, 4597, 4586, 4601, 6320, 4603, 4604, 4605, 4609,
-     4606, 6320, 6320, 4611, 6320, 4613, 6320, 4614, 4616, 6320,
+     4459, 4460, 4451, 4467, 4450, 4468, 4469, 4472, 4453, 4463,
+     4479, 4475, 4480, 4481, 4483, 4473, 4491, 4494, 4493, 6365,
+     4486, 6365, 4495, 4498, 4502, 4500, 4503, 4505, 6365, 4507,
+     4510, 4512, 4513, 4515, 6365, 4517, 4514, 4516, 4520, 6365,
+     4518, 4533, 4519, 4522, 4536, 4540, 6365, 4543, 4544, 4545,
+     4552, 4554, 4549, 4556, 4537, 4559, 4553, 4557, 4561, 4562,
+     4570, 4567, 4568, 6365, 4572, 4566, 4575, 4577, 4584, 4579,
+     4585, 4586, 4592, 4587, 6365, 4589, 4593, 4595, 4596, 4597,
+     4598, 4599, 4608, 4603, 4606, 4607, 4611, 4612, 6365, 4617,
+     4614, 4620, 4627, 4623, 4632, 6365, 6365, 4622, 4637, 4639,
 
-     6320, 4618, 4619, 4620, 4621, 4630, 6320, 4634, 6320, 4641,
-     4636, 4622, 4624, 4639, 6320, 4640, 4642, 4648, 6320, 4643,
-     4655, 4650, 4651, 6320, 4657, 4658, 4653, 4660, 6320, 4662,
-     4665, 4669, 4667, 4670, 4671, 4673, 4677, 4680, 4681, 4682,
-     4683, 4684, 4696, 4698, 4700, 4702, 4692, 4688, 4705, 4707,
-     4711, 4709, 4713, 4714, 4715, 4717, 4718, 4720, 4723, 4724,
-     4726, 4729, 4727, 4728, 4740, 4730, 4732, 4742, 4744, 4733,
-     4743, 4747, 4746, 4751, 4749, 4754, 4757, 4756, 4758, 6320,
-     4762, 4764, 4767, 4769, 4768, 4774, 4776, 4778, 4784, 4787,
-     6320, 4791, 6320, 4793, 4785, 4789, 4795, 4796, 6320, 4797,
+     4619, 4640, 6365, 6365, 4643, 4650, 4646, 4649, 4651, 6365,
+     6365, 4653, 6365, 4654, 6365, 4655, 4657, 6365, 6365, 4656,
+     4659, 4662, 4663, 4665, 6365, 4671, 6365, 4680, 4675, 4666,
+     4677, 4678, 6365, 4679, 4681, 4687, 6365, 4688, 4690, 4689,
+     4691, 6365, 4695, 4700, 4692, 4696, 6365, 4701, 4705, 4708,
+     4709, 4710, 4712, 4716, 4715, 4720, 4721, 4723, 4722, 4725,
+     4732, 4736, 4738, 4740, 4741, 4726, 4743, 4745, 4749, 4747,
+     4751, 4752, 4754, 4756, 4757, 4761, 4765, 4758, 4762, 4628,
+     4766, 4767, 4768, 4771, 4775, 4780, 4777, 4781, 4782, 4783,
+     4784, 4785, 4788, 4789, 4792, 4794, 4797, 6365, 4793, 4798,
 
-     4798, 4799, 4802, 4801, 4804, 4805, 4806, 4809, 4812, 4818,
-     6320, 4829, 4808, 6320, 4813, 4825, 4832, 6320, 4833, 4837,
-     4820, 4839, 4840, 4841, 4843, 4844, 4848, 4846, 4850, 4852,
-     4845, 4853, 4855, 4867, 4874, 4858, 4860, 4869, 4872, 4870,
-     4871, 4873, 4879, 4883, 4884, 4893, 6320, 4880, 6320, 4885,
-     4887, 4889, 4895, 4897, 4896, 4898, 6320, 6320, 4900, 4904,
-     4909, 4903, 4905, 4911, 4686, 6320, 4912, 4921, 4914, 4919,
-     6320, 4922, 4924, 4926, 4929, 6320, 4930, 4931, 4934, 4936,
-     4933, 4948, 4945, 4949, 4939, 4941, 4957, 6320, 6320, 6320,
-     6320, 4959, 4943, 4962, 4951, 4954, 4963, 4966, 4969, 4970,
+     4803, 4810, 4804, 4814, 4816, 4806, 4823, 4824, 6365, 4827,
+     6365, 4829, 4815, 4831, 4817, 4832, 6365, 4834, 4835, 4837,
+     4838, 4839, 4840, 4841, 4844, 4845, 4849, 4850, 6365, 4856,
+     4846, 6365, 4852, 4857, 4869, 6365, 4862, 4873, 4865, 4870,
+     4875, 4876, 4877, 4878, 4881, 4879, 4885, 4887, 4889, 4893,
+     4901, 4903, 4910, 4890, 4894, 4892, 4912, 4905, 4906, 4913,
+     4914, 4920, 4921, 4928, 6365, 4915, 6365, 4922, 4924, 4929,
+     4930, 4932, 4933, 4935, 6365, 6365, 4936, 4939, 4945, 4940,
+     4946, 4948, 4957, 6365, 4951, 4958, 4960, 4952, 6365, 4963,
+     4949, 4967, 4971, 6365, 4968, 4972, 4973, 4975, 4976, 4983,
 
-     6320, 4974, 6320, 6320, 4971, 4977, 4978, 4979, 4980, 4981,
-     4986, 4983, 6320, 4987, 4989, 4993, 4990, 4997, 5004, 5007,
-     5001, 5009, 4999, 5010, 5018, 5011, 5019, 5015, 5021, 5023,
-     5025, 6320, 6320, 5027, 5032, 5033, 5035, 5037, 5038, 5039,
-     5047, 5044, 5045, 5046, 5049, 5051, 5052, 5060, 5062, 5058,
-     5057, 6320, 5061, 5065, 5068, 6320, 5066, 6320, 5067, 5074,
-     5075, 5076, 5081, 5082, 5083, 5085, 6320, 6320, 5086, 5092,
-     6320, 6320, 5087, 5088, 5095, 5097, 5099, 5100, 5101, 5103,
-     5104, 6320, 5105, 6320, 5107, 5111, 5113, 5110, 5125, 5128,
-     5130, 5132, 5121, 5133, 6320, 5117, 5134, 6320, 5136, 5137,
+     4979, 4985, 4986, 4988, 4990, 6365, 6365, 6365, 6365, 4991,
+     4993, 4997, 4998, 4999, 5001, 5004, 5006, 5003, 6365, 5008,
+     6365, 6365, 5009, 5016, 5017, 5019, 5020, 5022, 5023, 5025,
+     6365, 5027, 5029, 5030, 5036, 5038, 5040, 5044, 5045, 5048,
+     5046, 5047, 5055, 5054, 5056, 5058, 5061, 5063, 5068, 6365,
+     6365, 5069, 5071, 5072, 5080, 5076, 5078, 5077, 5090, 5085,
+     5087, 5086, 5088, 5093, 5094, 5102, 5104, 5100, 5097, 6365,
+     5106, 5107, 5108, 6365, 5113, 6365, 5114, 5116, 5099, 5110,
+     5118, 5120, 5130, 5124, 6365, 6365, 5132, 5128, 6365, 6365,
+     5135, 5136, 5138, 5140, 5141, 5137, 5143, 5145, 5142, 6365,
 
-     5139, 6320, 5141, 5143, 5145, 5149, 6320, 5153, 5146, 5155,
-     6320, 5157, 6320, 5158, 5159, 5162, 5169, 6320, 5165, 5166,
-     6320, 5171, 5173, 5176, 5175, 6320, 5177, 6320, 5180, 5182,
-     5183, 5187, 5189, 5191, 5192, 5193, 5194, 5202, 5198, 5199,
-     6320, 6320,  135, 5207, 5209, 5210, 5213, 5212, 5220, 5215,
-     5217, 5223, 6320, 6320, 5219, 6320, 5226, 5225, 6320, 5216,
-     5235, 5236, 5227, 5242, 5231, 5239, 5229, 5251, 5246, 5252,
-     5248, 5253, 5256, 5254, 5267, 5258, 5269, 5270, 5273, 5275,
-     5278, 5265, 5280, 5282, 5283, 5284, 5286, 5287, 5288, 5290,
-     6320, 5293, 5294, 5289, 6320, 5299, 5304, 5301, 5312, 6320,
+     5147, 6365, 5148, 5149, 5151, 5152, 5165, 5169, 5170, 5167,
+     5171, 5173, 6365, 5172, 5174, 6365, 5176, 5175, 5182, 6365,
+     5183, 5185, 5191, 5193, 6365, 5195, 5196, 5199, 6365, 5202,
+     6365, 5186, 5205, 5207, 5214, 6365, 5198, 5211, 6365, 5216,
+     5221, 5222, 5217, 6365, 5209, 6365, 5223, 5229, 5231, 5234,
+     5224, 5236, 5237, 5226, 5238, 5246, 5242, 5245, 6365, 6365,
+      135, 5254, 5247, 5251, 5255, 5256, 5263, 5258, 5260, 5266,
+     6365, 6365, 5267, 6365, 5261, 5273, 6365, 5259, 5274, 5278,
+     5268, 5282, 5280, 5281, 5288, 5290, 5291, 5292, 5293, 5294,
+     5296, 5297, 5312, 5299, 5309, 5314, 5316, 5319, 5321, 5310,
 
-     5306, 5313, 5314, 5315, 6320, 5316, 5319, 5321, 5320, 5326,
-     5333, 5330, 5328, 5331, 6320, 6320, 6320, 5339, 5346, 6320,
-     5348, 5336, 5338, 5340, 6320, 5342, 5349, 6320, 6320, 5352,
-     5353, 5354, 5365, 6320, 5355, 6320, 5357, 6320, 5364, 5366,
-     5372, 5370, 6320, 5375, 5381, 6320, 5384, 5387, 5389, 5390,
-     5356, 5391, 5392, 6320, 5400, 5393, 5396, 5403, 5395, 5404,
-     5405, 5406, 5407, 5414, 5409, 5418, 6320, 5415, 5422, 5423,
-     5420, 5412, 5424, 5429, 5430, 6320, 5433, 6320, 5435, 5436,
-     5437, 5438, 5440, 5442, 5360, 5446, 5443, 5445, 5453, 5455,
-     5457, 6320, 5459, 5465, 6320, 5460, 6320, 5467, 6320, 5462,
+     5323, 5324, 5325, 5327, 5329, 5330, 5332, 5333, 6365, 5336,
+     5337, 5331, 6365, 5342, 5338, 5348, 5350, 6365, 5357, 5354,
+     5358, 5359, 6365, 5343, 5365, 5362, 5360, 5370, 5377, 5373,
+     5372, 5374, 6365, 6365, 6365, 5375, 5383, 6365, 5388, 5379,
+     5384, 5389, 6365, 5390, 5391, 6365, 6365, 5392, 5395, 5394,
+     5402, 6365, 5398, 6365, 5397, 6365, 5400, 5401, 5411, 5413,
+     6365, 5415, 5423, 6365, 5426, 5429, 5431, 5432, 5416, 5419,
+     5434, 6365, 5443, 5435, 5442, 5445, 5433, 5446, 5448, 5449,
+     5450, 5459, 5452, 5456, 6365, 5457, 5460, 5462, 5463, 5466,
+     5471, 5472, 5470, 6365, 5474, 6365, 5408, 5475, 5476, 5482,
 
-     5468, 5469, 5470, 6320, 5472, 5473, 5474, 5477, 6320, 5482,
-     5480, 5486, 5488, 6320, 6320, 5489, 5498, 5490, 5491, 5500,
-     5502, 5503, 5507, 5504, 5508, 5510, 5518, 5514, 5516, 5511,
-     5520, 5521, 5534, 6320, 6320, 6320, 5525, 5522, 5538, 5540,
-     5541, 5549, 5527, 6320, 5546, 5548, 5550, 5552, 5559, 5556,
-     5558, 6320, 5554, 5560, 5536, 5562, 5564, 5565, 5568, 5567,
-     6320, 5570, 5580, 5577, 5581, 5583, 5586, 5590, 5592, 5587,
-     5599, 5596, 6320, 5598, 6320, 6320, 5600, 6320, 5594, 5602,
-     5603, 5604, 6320, 5607, 5608, 5609, 5611, 5615, 5618, 6320,
-     5627, 5610, 5612, 5623, 6320, 6320, 5633, 6320, 5635, 5636,
+     5478, 5479, 5481, 5492, 5484, 5483, 5495, 5500, 5496, 6365,
+     5503, 5505, 6365, 5506, 6365, 5508, 6365, 5509, 5510, 5512,
+     5511, 6365, 5514, 5517, 5518, 5519, 6365, 5522, 5520, 5524,
+     5530, 6365, 6365, 5531, 5539, 5535, 5532, 5545, 5547, 5536,
+     5549, 5542, 5550, 5552, 5561, 5557, 5558, 5560, 5563, 5564,
+     5565, 6365, 6365, 6365, 5569, 5571, 5579, 5575, 5582, 5583,
+     5578, 6365, 5584, 5587, 5588, 5590, 5598, 5594, 5600, 6365,
+     5595, 5597, 5601, 5603, 5605, 5602, 5606, 5608, 6365, 5614,
+     5619, 5620, 5622, 5623, 5630, 5632, 5634, 5624, 5641, 5637,
+     6365, 5639, 6365, 6365, 5627, 6365, 5640, 5643, 5644, 5647,
 
-     5626, 5643, 5638, 5639, 5645, 5646, 6320, 5642, 5648, 5649,
-     5652, 5653, 6320, 5655, 5656, 5657, 5658, 6320, 5661, 5660,
-     5665, 5666, 5667, 6320, 5669, 5670, 5686, 5684, 6320, 5671,
-     5688, 5681, 6320, 6320, 5696, 5698, 5699, 6320, 6320, 6320,
-     5700, 5673, 5702, 6320, 5707, 5711, 5715, 5719, 5710, 6320,
-     5721, 5704, 5718, 6320, 6320, 5723, 5724, 5725, 5727, 6320,
-     6320, 5728, 5729, 5731, 5733, 5734, 6320, 5737, 5738, 5739,
-     5746, 5751, 5741, 5752, 5754, 5765, 5767, 5748, 5760, 5758,
-     5769, 5771, 5762, 5778, 5786, 5782, 5784, 5790, 5792, 5793,
-     6320, 6320, 5795, 5797, 5799, 6320, 6320, 5801, 5803, 5805,
+     6365, 5652, 5645, 5649, 5654, 5656, 5658, 6365, 5667, 5653,
+     5660, 5670, 6365, 6365, 5672, 6365, 5677, 5678, 5668, 5680,
+     5681, 5684, 5686, 5689, 6365, 5687, 5688, 5690, 5691, 5696,
+     6365, 5697, 5698, 5699, 5700, 6365, 5704, 5709, 5706, 5710,
+     5711, 6365, 5713, 5701, 5732, 5728, 6365, 5714, 5730, 5727,
+     6365, 6365, 5737, 5739, 5741, 6365, 6365, 6365, 5742, 5729,
+     5744, 6365, 5750, 5754, 5758, 5762, 5753, 6365, 5764, 5761,
+     5766, 6365, 6365, 5765, 5767, 5768, 5770, 6365, 6365, 5746,
+     5774, 5772, 5775, 5777, 6365, 5778, 5782, 5788, 5794, 5798,
+     5786, 5790, 5799, 5806, 5809, 5802, 5804, 5807, 5810, 5812,
 
-     5807, 5810, 5812, 5814, 6320, 5815, 5817, 5818, 5819, 5820,
-     6320, 5768, 5822, 5770, 5823, 5825, 5828, 5826, 5833, 6320,
-     6320, 5830, 5835, 5834, 5842, 5839, 6320, 5844, 5851, 5849,
-     5850, 5846, 5852, 5853, 6320, 5856, 5858, 6320, 6320, 6320,
-     5859, 6320, 6320, 5854, 6320, 6320, 6320, 6320, 6320, 6320,
-     6320, 5861, 6320, 5866, 5872, 5876, 5878, 6320, 5868, 5873,
-     5881, 5883, 5884, 6320, 5886, 5888, 5887, 5893, 5889, 5896,
-     5894, 5900, 5890, 5901, 5902, 5905, 5906, 5910, 5911, 5913,
-     5914, 5916, 6320, 6320, 6320, 5912, 5923, 5925, 5928, 5930,
-     5935, 5939, 5941, 5931, 5933, 5942, 5944, 5946, 5947, 5948,
+     5813, 5821, 5822, 5818, 5826, 5830, 5834, 5831, 6365, 6365,
+     5838, 5840, 5814, 6365, 6365, 5842, 5844, 5846, 5848, 5850,
+     5852, 5854, 6365, 5855, 5857, 5858, 5859, 5860, 6365, 5862,
+     5866, 5861, 5869, 5863, 5872, 5868, 5878, 6365, 6365, 5870,
+     5712, 5874, 5884, 5879, 6365, 5886, 5893, 5890, 5891, 5892,
+     5894, 5898, 6365, 5895, 5899, 6365, 6365, 6365, 5902, 6365,
+     6365, 5903, 6365, 6365, 6365, 6365, 6365, 6365, 6365, 5906,
+     6365, 5905, 5916, 5920, 5922, 6365, 5907, 5923, 5924, 5913,
+     5925, 6365, 5926, 5927, 5931, 5935, 5940, 5941, 5934, 5943,
+     5945, 5944, 5946, 5950, 5948, 5952, 5951, 5953, 5954, 5956,
 
-     5958, 5954, 5955, 5956, 5957, 5960, 5965, 5966, 5969, 5971,
-     6320, 5974, 6320, 5962, 6320, 6320, 5976, 5978, 5982, 5973,
-     5991, 5993, 5983, 5986, 5984, 5995, 6002, 6005, 6320, 6320,
-     5994, 5996, 6320, 5998, 6006, 6320, 6007, 6008, 6009, 6011,
-     6017, 6014, 6018, 6020, 6022, 6320, 6320, 6019, 6026, 6029,
-     6032, 6035, 6042, 6037, 6041, 6045, 6047, 6034, 6049, 6320,
-     6055, 6051, 6058, 6320, 6059, 6060, 6061, 6062, 6064, 6071,
-     6066, 6067, 6320, 6069, 6320, 6073, 6075, 6077, 6074, 6076,
-     6078, 6088, 6092, 6086, 6320, 6090, 6100, 6094, 6102, 6104,
-     6106, 6107, 6096, 6109, 6112, 6118, 6122, 6119, 6123, 6110,
+     6365, 6365, 6365, 5959, 5966, 5968, 5969, 5976, 5979, 5982,
+     5984, 5970, 5977, 5985, 5987, 5990, 5991, 5993, 6000, 5996,
+     5999, 5998, 6001, 6005, 6007, 6002, 6009, 6013, 6365, 6014,
+     6365, 6015, 6365, 6365, 6019, 6022, 6024, 6020, 6031, 6036,
+     6026, 6034, 6027, 6037, 6044, 6049, 6365, 6365, 6035, 6038,
+     6365, 6041, 6050, 6365, 6045, 6052, 6051, 6053, 6059, 6060,
+     6062, 6063, 6074, 6365, 6365, 6061, 6064, 6069, 6076, 6078,
+     6077, 6084, 6086, 6087, 6089, 6080, 6096, 6365, 6098, 6095,
+     6102, 6365, 6103, 6093, 6104, 6105, 6106, 6114, 6109, 6110,
+     6365, 6115, 6365, 6118, 6120, 6121, 6119, 6122, 6127, 6130,
 
-     6127, 6124, 6320, 6134, 6125, 6320, 6131, 6135, 6128, 6137,
-     6138, 6320, 6142, 6145, 6146, 6148, 6151, 6152, 6320, 6154,
-     6158, 6155, 6320, 6161, 6320, 6320, 6163, 6160, 6167, 6170,
-     6172, 6320, 6320, 6320, 6200, 6207, 6214, 6221, 6228, 6235,
-     6242,   88, 6249, 6256, 6263, 6270, 6277, 6284, 6291, 6298,
-     6305, 6312
+     6134, 6133, 6365, 6135, 6136, 6143, 6144, 6147, 6149, 6150,
+     6151, 6153, 6155, 6156, 6164, 6159, 6165, 6167, 6168, 6169,
+     6365, 6175, 6171, 6365, 6176, 6177, 6178, 6179, 6183, 6365,
+     6192, 6180, 6185, 6193, 6196, 6200, 6365, 6202, 6206, 6203,
+     6365, 6208, 6365, 6365, 6209, 6211, 6212, 6216, 6218, 6365,
+     6365, 6365, 6245, 6252, 6259, 6266, 6273, 6280, 6287,   88,
+     6294, 6301, 6308, 6315, 6322, 6329, 6336, 6343, 6350, 6357
     } ;
 
-static const flex_int16_t yy_def[3253] =
+static const flex_int16_t yy_def[3271] =
     {   0,
-     3234,    1, 3235, 3235, 3236, 3236, 3237, 3237, 3238, 3238,
-     3239, 3239, 3240, 3240, 3241, 3241, 3234, 3242, 3234, 3234,
-     3234, 3234, 3243, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3244, 3234, 3234, 3234,
-     3244, 3245, 3234, 3234, 3234, 3245, 3246, 3234, 3234, 3234,
-     3234, 3246, 3247, 3234, 3234, 3234, 3247, 3248, 3234, 3249,
-     3234, 3248, 3248, 3250, 3234, 3234, 3234, 3234, 3250, 3251,
-     3234, 3234, 3234, 3251, 3242, 3242, 3234, 3252, 3243, 3252,
-     3243, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3252,    1, 3253, 3253, 3254, 3254, 3255, 3255, 3256, 3256,
+     3257, 3257, 3258, 3258, 3259, 3259, 3252, 3260, 3252, 3252,
+     3252, 3252, 3261, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3262, 3252, 3252, 3252,
+     3262, 3263, 3252, 3252, 3252, 3263, 3264, 3252, 3252, 3252,
+     3252, 3264, 3265, 3252, 3252, 3252, 3265, 3266, 3252, 3267,
+     3252, 3266, 3266, 3268, 3252, 3252, 3252, 3252, 3268, 3269,
+     3252, 3252, 3252, 3269, 3260, 3260, 3252, 3270, 3261, 3270,
+     3261, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3244, 3244, 3245,
-     3245, 3246, 3246, 3234, 3247, 3247, 3248, 3248, 3249, 3249,
-     3248, 3250, 3250, 3234, 3251, 3251, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3262, 3262, 3263,
+     3263, 3264, 3264, 3252, 3265, 3265, 3266, 3266, 3267, 3267,
+     3266, 3268, 3268, 3252, 3269, 3269, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3266, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3248, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3248, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3266,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3266,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3234, 3234, 3242, 3234, 3234, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252,
+     3252, 3260, 3252, 3252, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3248, 3248, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3266, 3266, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3248, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3266, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3248, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3266, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252,
 
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3248, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3266, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3234, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3266, 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3234, 3234, 3242, 3234, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3252,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3248, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
 
-     3242, 3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3248,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3242, 3234, 3234, 3242, 3234, 3242, 3234, 3242, 3242, 3234,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3252, 3260, 3260, 3260, 3260, 3266, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260,
 
-     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3248, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
+     3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3252,
+     3252, 3260, 3252, 3260, 3252, 3260, 3260, 3252, 3252, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3266, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3234, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3234,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3234, 3242, 3234, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3248,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242,
-     3234, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3252, 3252, 3252, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3266, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3252, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
 
-     3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3234, 3248, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3234, 3242, 3234, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3252, 3260,
+     3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252,
+     3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3252, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3234, 3234, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3234, 3242,
-     3242, 3242, 3242, 3234, 3242, 3234, 3242, 3234, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3234, 3242, 3234, 3242, 3234, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3252, 3252, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3252, 3252, 3260, 3260, 3260,
+     3260, 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3234, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3234, 3234, 3242, 3234, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3242, 3234, 3234, 3242, 3234, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3252, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3234, 3234, 3242, 3242, 3242, 3234, 3234, 3234,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242, 3242, 3234,
-     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3234, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242,
+     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3260, 3252, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3252, 3252, 3260, 3260, 3260, 3252, 3252, 3252, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3252, 3252, 3260, 3260, 3260, 3260, 3252, 3252, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3234, 3242, 3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3234, 3234, 3234,
-     3242, 3234, 3234, 3242, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3242, 3234, 3242, 3242, 3242, 3242, 3234, 3242, 3242,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3234, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252,
+     3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260,
+     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3252, 3260, 3260, 3252, 3252, 3252, 3260, 3252,
+     3252, 3260, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3260,
+     3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
-     3234, 3242, 3234, 3242, 3234, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3234,
-     3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3234, 3234, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3234,
-     3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3234, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3234, 3242, 3242, 3242, 3242, 3242,
-     3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242, 3242,
+     3252, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
+     3252, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260,
+     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
 
-     3242, 3242, 3234, 3242, 3242, 3234, 3242, 3242, 3242, 3242,
-     3242, 3234, 3242, 3242, 3242, 3242, 3242, 3242, 3234, 3242,
-     3242, 3242, 3234, 3242, 3234, 3234, 3242, 3242, 3242, 3242,
-     3242, 3234, 3234,    0, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234
+     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252,
+     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3252, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3252,
+     3252,    0, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252
     } ;
 
-static const flex_int16_t yy_nxt[6361] =
+static const flex_int16_t yy_nxt[6406] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1526,7 +1530,7 @@ static const flex_int16_t yy_nxt[6361] =
       204,  199,   86,  202,  207,  209,   86,  213,  210,   86,
        86,  206,  208,   86,  216,   86,   86,   86,   86,  218,
        86,  211,  212,  219,  223,  215,   86,  225,  226,   86,
-      224,   86,  214,   86,  217,  911,  221,   86,  227,  220,
+      224,   86,  214,   86,  217,  918,  221,   86,  227,  220,
        86,  222,  228,   86,  231,   86,   86,   86,  236,   86,
       233,   86,   86,  229,  234,  230,  238,   86,  248,   86,
        86,  232,   86,   86,   86,  239,  235,   86,   86,  237,
@@ -1551,646 +1555,652 @@ static const flex_int16_t yy_nxt[6361] =
       317,  326,  318,   86,  325,   86,  328,   86,   86,  330,
        86,  331,   86,  327,  319,   86,  320,   86,  334,   86,
        86,  336,   86,  337,   86,  335,  332,   86,  329,   86,
-       86,  333,   86,   86,   86,   86,   86,  338,  340,  341,
-      342,  344,   86,   86,  343,  347,   86,  346,  345,   86,
-      351,   86,   86,   86,  357,  352,   86,  353,  348,   86,
+       86,  333,   86,   86,   86,  343,   86,  338,  340,  341,
+      342,  345,   86,   86,  344,   86,   86,  347,   86,  346,
+      352,   86,  348,   86,   86,  353,   86,   86,  354,  358,
 
-       86,   86,  349,  355,  360,   86,   86,   86,  363,  350,
-       86,  354,  362,  356,   86,   86,   86,  366,  367,  358,
-      359,  369,  365,   86,   86,  361,   86,   86,   86,   86,
-      372,  373,   86,  364,  374,  368,   86,  376,  370,  168,
-       86,   86,  371,   86,   86,   86,  377,   86,   86,   86,
-      380,  381,   86,   86,  385,  383,  387,  166,  375,  379,
-      382,  388,   86,  378,   86,   86,  391,   86,  384,  389,
-      390,   86,   86,   86,   86,  386,   86,   86,  397,   86,
-       86,  400,  398,  399,   86,  396,  392,  393,   86,   86,
-      395,   86,  394,   86,  401,  402,   86,  404,   86,   86,
+      349,  356,  350,   86,  361,   86,   86,   86,  351,  355,
+       86,   86,  363,  364,   86,   86,  357,   86,   86,  367,
+       86,  359,  360,  368,  366,   86,  362,   86,   86,   86,
+      370,  428,  371,  365,  369,  168,   86,   86,  373,  374,
+       86,  372,  375,  377,   86,   86,  378,  382,   86,   86,
+      381,  380,   86,   86,   86,   86,   86,   86,  388,  389,
+      386,  384,  390,  379,   86,   86,  376,   86,   86,  392,
+       86,  383,  391,   86,  385,   86,   86,   86,   86,  387,
+      399,   86,  402,  393,  394,  397,   86,   86,   86,   86,
+      396,  395,  400,   86,  403,  401,   86,   86,   86,  405,
 
-      405,   86,  403,   86,  408,  406,  407,  409,   86,   86,
-      412,   86,   86,  414,  415,  416,   86,  410,  411,   86,
-       86,   86,   86,  419,  417,  413,   86,  421,  422,   86,
-       86,  420,   86,   86,   86,   86,   86,  428,   86,   86,
-       86,  418,  429,   86,   86,  427,   86,  431,  425,  424,
-       86,  434,   86,  423,   86,  436,  426,  432,  430,  439,
-       86,   86,  433,  440,  435,   86,  438,   86,   86,   86,
-       86,  454,  437,  441,   86,  450,  448,   86,   86,  164,
-      451,   86,  452,  442,   86,   86,  443,  449,  461,  163,
-      456,  444,  445,  446,  447,   86,  464,  455,  453,   86,
+       86,  406,  166,  398,  407,  404,   86,   86,   86,  409,
+       86,  408,  410,   86,  413,  415,  411,  417,   86,  412,
+       86,   86,   86,   86,  416,   86,  422,  414,   86,  418,
+       86,  420,   86,  421,  423,   86,   86,   86,  425,   86,
+       86,   86,  429,  432,   86,   86,  419,  430,   86,   86,
+      435,   86,   86,  426,  440,  431,   86,  427,   86,  424,
+       86,  437,   86,   86,  433,  441,  434,   86,  439,  436,
+      450,   86,   86,   86,  455,  442,  449,  451,  438,   86,
+       86,   86,   86,  452,  563,  453,  456,   86,  443,  458,
+      459,  444,   86,  457,   86,  462,  445,  446,  447,  448,
 
-      459,  457,  458,   86,   86,  460,   86,   86,  467,   86,
-       86,  469,  462,  465,   86,  463,  466,   86,  470,  468,
-       86,   86,  471,   86,   86,  476,   86,  477,   86,  478,
-       86,   86,  472,   86,  494,  481,  482,   86,  479,  475,
-      473,   86,   86,  474,   86,   86,  483,   86,  480,  484,
-      486,  488,  487,   86,  493,  485,  489,  495,  496,   86,
-       86,   86,   86,   86,   86,  497,   86,  498,  161,  490,
-       86,  168,  491,  499,  492,   86,   86,  500,   86,   86,
-      512,  508,  513,  509,  515,  501,   86,  502,   86,  503,
-      510,  511,  528,  523,  525,   86,   86,  524,  514,  526,
+      460,  454,   86,   86,   86,  461,   86,  468,   86,   86,
+       86,  463,  466,  467,  464,  469,   86,  465,   86,  470,
+       86,  471,   86,   86,  472,   86,   86,  473,  474,  478,
+       86,   86,  479,   86,  480,   86,   86,  496,  483,   86,
+      484,  477,  475,  481,  485,  476,   86,   86,   86,   86,
+      482,  488,  486,  489,   86,   86,  497,  491,  487,  498,
+       86,   86,   86,  490,  495,   86,  499,   86,  500,   86,
+      492,   86,   86,  493,  501,  494,   86,   86,  502,   86,
+      515,   86,  512,   86,  551,   86,  503,   86,  504,  510,
+      505,  513,  511,  514,  526,  517,  516,  168,  525,  527,
 
-       86,  527,  504,   86,   86,  505,   86,  506,   86,  507,
-       86,   86,  516,  517,  533,  529,   86,  531,  530,   86,
-       86,   86,  518,  532,  519,  520,  521,  537,   86,  522,
-      536,  535,  534,   86,   86,   86,   86,  538,  545,   86,
-      543,  540,  539,   86,   86,   86,  546,   86,  541,  542,
-      550,  544,   86,   86,   86,  548,   86,   86,   86,  547,
-       86,  549,  553,  554,  555,   86,   86,   86,   86,  552,
-      560,  564,  559,   86,  556,   86,  557,  551,   86,  565,
-       86,  558,  561,  562,   86,  567,   86,   86,   86,   86,
-      581,   86,  568,  569,  566,  584,   86,  573,   86,   86,
+       86,   86,   86,  506,  528,   86,  507,  529,  508,   86,
+      509,   86,   86,  518,  519,   86,  535,  532,  530,  531,
+       86,  533,   86,  520,   86,  521,  522,  523,  534,  539,
+      524,   86,   86,   86,   86,   86,  541,   86,  538,  540,
+      537,  536,  546,   86,  548,   86,  549,   86,   86,  545,
+       86,  553,  543,  544,  542,   86,   86,   86,  547,   86,
+      557,  558,  552,   86,  556,   86,   86,  550,   86,   86,
+       86,   86,  555,  564,  565,   86,   86,   86,   86,  567,
+      554,  568,  560,  562,  561,  559,   86,  570,   86,  571,
+       86,  566,  573,  572,   86,   86,  569,   86,   86,  584,
 
-      563,   86,  570,  572,  576,  571,  583,  582,  574,   86,
-      575,   86,  577,  578,  586,   86,  579,  580,  585,   86,
-       86,  588,   86,  589,   86,  590,   86,   86,  593,  591,
-       86,   86,  587,  595,   86,   86,  596,   86,  598,  599,
-       86,   86,   86,  594,  600,   86,  592,   86,  597,   86,
-       86,  605,  603,   86,  604,   86,  601,   86,   86,  606,
-       86,   86,   86,  602,  611,  607,  612,   86,  614,  610,
-       86,   86,  613,   86,   86,  608,  609,   86,  615,   86,
-      617,   86,  619,   86,   86,  621,   86,   86,   86,   86,
-      629,  616,  622,  618,  631,  620,   86,   86,  624,   86,
+      579,   86,  586,  576,  575,   86,  574,  585,  580,  581,
+      588,   86,  582,  583,  577,  587,  578,  589,   86,   86,
+       86,   86,   86,   86,  592,  591,   86,  594,  164,  593,
+       86,  596,   86,  598,   86,   86,   86,   86,  601,  590,
+      599,  595,  602,   86,   86,  597,   86,  603,   86,  600,
+       86,   86,   86,  608,   86,  606,  607,   86,   86,  604,
+       86,  609,   86,   86,   86,  614,  610,  605,  615,   86,
+      617,   86,  613,   86,   86,  616,  612,  611,  618,   86,
+      620,   86,  622,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,  619,  624,   86,  625,  621,  633,   86,  636,
 
-       86,  159,   86,  628,  623,  625,  630,  626,  627,   86,
-       86,   86,   86,  633,  632,  636,  637,  639,  634,   86,
-       86,  635,   86,   86,  642,  641,  638,   86,   86,   86,
-       86,   86,  645,  648,  644,   86,   86,   86,   86,  640,
-      649,   86,  651,   86,   86,   86,   86,   86,  643,  665,
-      646,  650,  647,   86,  652,   86,  654,   86,   86,  668,
-      653,   86,  655,  667,  663,  666,   86,  656,  664,  657,
-       86,  672,  671,   86,   86,  658,   86,  659,  669,  676,
-      660,  661,  670,  675,   86,   86,  673,  662,   86,  674,
-      677,  679,  678,   86,   86,  682,   86,   86,  684,   86,
+      627,  163,  630,   86,  623,  632,   86,  626,  628,  631,
+      629,  635,  637,   86,   86,  634,   86,   86,   86,  640,
+      643,  638,   86,  646,  639,   86,   86,   86,  641,   86,
+      645,   86,   86,  642,   86,   86,  649,   86,   86,  648,
+      653,  652,  644,   86,   86,   86,   86,  647,  655,   86,
+       86,   86,   86,  654,  650,  651,   86,   86,   86,  658,
+      656,  669,  672,   86,  657,   86,  659,  668,  707,  667,
+      670,  660,  671,  661,   86,   86,   86,   86,  675,  662,
+      676,  663,  673,   86,  664,  665,  674,   86,  680,   86,
+      677,  666,  679,  678,   86,   86,  685,   86,  683,  681,
 
-       86,   86,   86,   86,   86,   86,   86,  680,   86,  690,
-       86,   86,  686,  681,  685,  691,  687,  694,   86,  695,
-      693,  683,  688,   86,  689,  168,  697,  692,   86,  696,
-      698,   86,   86,   86,   86,   86,   86,   86,  699,  704,
-       86,  743,  706,   86,  709,  701,   86,  700,  702,  705,
-       86,  707,  703,  708,   86,  711,   86,   86,  710,   86,
-      713,   86,   86,   86,   86,   86,  717,   86,  712,  716,
-      722,   86,   86,  714,  718,  723,   86,  715,  725,   86,
-      770,  719,  727,  721,  720,  724,  726,   86,   86,  728,
-       86,  729,   86,  730,   86,  731,   86,   86,   86,   86,
+       86,  686,   86,  682,   86,  688,   86,   86,   86,   86,
+       86,   86,  684,   86,   86,  694,  161,  689,  690,   86,
+      695,   86,  687,  691,  168,  698,  692,  701,  700,  697,
+      699,  693,  696,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,  710,  708,   86,   86,  702,  832,   86,   86,
+      703,  705,   86,  706,  709,  704,  712,  713,   86,  714,
+      716,  715,   86,   86,  717,   86,   86,   86,  711,   86,
+      718,   86,   86,   86,  721,  722,  719,  727,  720,   86,
+      723,   86,  728,   86,  730,   86,  741,  724,   86,  726,
+      725,  732,  729,  731,   86,  733,   86,   86,  734,   86,
 
-      732,   86,   86,  736,   86,  735,   86,   86,  734,  739,
-       86,  744,  738,   86,   86,  733,  737,   86,  740,   86,
-       86,   86,   86,  745,   86,  747,   86,  749,   86,  742,
-      741,   86,  746,  752,   86,  748,  755,  750,   86,   86,
-       86,   86,   86,  756,  176,  751,   86,  753,   86,   86,
-      762,  758,   86,  757,  754,   86,  759,  765,  761,  763,
-      760,   86,  764,   86,  769,   86,  766,   86,  771,  767,
-       86,  772,   86,   86,   86,   86,  775,  774,  768,  776,
-       86,   86,   86,   86,   86,  783,   86,   86,  779,  781,
-       86,  777,   86,  773,  789,  780,  784,   86,  778,   86,
+      735,   86,  736,   86,   86,   86,   86,  737,   86,  738,
+      745,   86,  743,  739,  740,   86,   86,   86,  744,   86,
+      749,   86,  742,  748,   86,  750,   86,   86,   86,   86,
+       86,  754,  752,   86,   86,   86,  747,   86,  760,  746,
+      757,   86,  751,  753,   86,   86,  761,   86,  755,  756,
+      758,   86,   86,   86,  767,  763,   86,  759,   86,  762,
+      764,   86,   86,  770,  765,  766,  771,   86,  774,  768,
+       86,   86,  769,   86,   86,   86,  772,  777,  776,  775,
+       86,   86,  773,   86,  780,  779,   86,  782,  781,   86,
+       86,   86,   86,  788,   86,   86,  784,  786,   86,  778,
 
-       86,   86,   86,  782,   86,  791,  787,  790,  786,  785,
-       86,  788,  792,  793,   86,   86,   86,  794,   86,  798,
-      800,  795,  796,  799,  797,   86,   86,   86,   86,  803,
-      801,   86,   86,  802,  804,   86,   86,  810,   86,   86,
-       86,  807,   86,   86,  805,  806,   86,  813,  812,   86,
-      815,   86,  819,  816,  817,  808,  809,  811,   86,   86,
-      814,   86,  822,   86,  824,   86,  821,  823,   86,  818,
-       86,  820,  826,   86,   86,   86,  828,   86,   86,   86,
-       86,  834,   86,   86,   86,   86,  835,   86,   86,   86,
-      825,   86,  827,  829,  836,  830,  831,   86,  832,  837,
+       86,   86,  794,  785,  783,   86,   86,  789,   86,   86,
+      792,  787,  795,  159,  790,   86,  791,  793,  796,  797,
+      798,   86,   86,   86,  799,   86,  803,  801,  800,   86,
+      805,   86,   86,   86,  804,   86,   86,   86,  806,  802,
+      809,   86,  808,   86,   86,  810,   86,  816,  813,   86,
+       86,   86,  817,   86,  811,  819,  807,  812,  818,   86,
+      821,   86,  814,  815,   86,   86,  825,  823,  822,   86,
+      828,  820,   86,   86,  827,  829,   86,  826,   86,  830,
+       86,   86,  824,  834,   86,   86,   86,   86,   86,  840,
+       86,   86,   86,   86,  841,   86,   86,   86,  831,  833,
 
-      833,  839,   86,  838,  843,   86,  842,   86,  840,  841,
-       86,   86,   86,   86,   86,   86,  844,  845,  848,   86,
-       86,   86,   86,   86,  857,   86,  846,  855,  850,  858,
-      847,  849,   86,  851,   86,  856,   86,  852,  853,  854,
-       86,   86,   86,   86,   86,  860,  862,   86,  867,   86,
-      861,  859,   86,   86,  866,   86,  863,  865,  869,  868,
-      870,  864,   86,   86,   86,   86,  168,  871,   86,  872,
-       86,  877,  873,  878,  875,   86,   86,   86,  874,  879,
-      876,   86,   86,   86,  885,   86,  881,  888,   86,   86,
-      880,   86,  886,   86,   86,  891,  882,  883,  889,   86,
+      842,   86,  835,  836,  837,   86,  838,  843,  839,   86,
+      849,  844,  846,  847,   86,  845,   86,   86,   86,   86,
+      848,   86,   86,  850,   86,  854,  851,   86,   86,   86,
+       86,   86,  863,   86,  861,  856,  852,  853,   86,   86,
+      855,   86,  857,  864,  862,  858,  859,  860,   86,  866,
+       86,   86,  865,  868,   86,  867,   86,   86,   86,   86,
+       86,   86,  873,  872,  875,  874,  869,  871,   86,   86,
+      870,   86,   86,  876,   86,  880,  878,  168,  877,   86,
+      879,  881,  883,  885,   86,   86,  882,  884,   86,   86,
+       86,   86,  891,   86,   86,  892,   86,  887,   86,  886,
 
-      887,   86,   86,  884,   86,   86,  893,  897,   86,   86,
-       86,  894,  890,   86,  892,   86,  898,  899,   86,   86,
-       86,   86,   86,  896,   86,   86,  913,  900,  914,  895,
-      912,   86,   86,  915,  910,   86,  917,   86,  902,  922,
-      901,   86,  174,  903,   86,  918,  904,  916,   86,  919,
-      905,   86,   86,  906,   86,  921,  933,   86,  924,  932,
-      907,  908,  920,  909,   86,   86,   86,   86,   86,   86,
-      935,  937,  923,   86,  925,  926,  967,  927,   86,   86,
-      928,  936,   86,  934,  938,  929,   86,  939,   86,  942,
-      943,  930,  931,  940,  941,  944,   86,   86,   86,  946,
+      894,   86,   86,  893,  888,  889,   86,  895,  898,   86,
+       86,  890,   86,  900,   86,  896,  899,  897,   86,  904,
+       86,   86,  901,   86,   86,   86,   86,   86,  905,   86,
+      906,   86,   86,  925,   86,   86,  903,  902,  919,  907,
+      920,  921,  917,   86,   86,   86,  909,  923,   86,  908,
+       86,   86,  910,  922,   86,  911,   86,  926,  924,  912,
+       86,  928,  913,   86,   86,  929,  940,  931,  930,  914,
+      915,  927,  916,   86,   86,  932,  933,   86,  934,   86,
+       86,  935,  939,   86,  942,   86,  936,  943,  945,  944,
+       86,   86,  937,  938,   86,   86,  950,  941,  949,   86,
 
-       86,  948,   86,  947,  945,   86,   86,  949,  950,  952,
-       86,  951,   86,   86,  953,   86,   86,   86,   86,   86,
-      956,   86,  960,   86,   86,  954,  959,   86,   86,  963,
-       86,   86,  969,   86,  955,  965,   86,  957,  958,  961,
-       86,  962,   86,  985,  970,  968,  973,  972,  964,  971,
-       86,  974,   86,  966,   86,  976,   86,   86,   86,  975,
-       86,   86,  978,  977,  980,   86,  979,  981,   86,   86,
-       86,   86,   86,  987,   86,   86,  984,  982,   86,  990,
-       86,   86,   86,   86,  988,   86,  989,   86,  983,   86,
-      992,  986,  993,   86,  995,   86,  996,   86,  997,  991,
+       86,  951,   86,   86,  953,   86,  947,  952,   86,  946,
+       86,  955,   86,  956,  954,  957,   86,  959,   86,  948,
+       86,  958,  960,   86,  962,   86,   86,   86,   86,  963,
+       86,   86,  967,   86,   86,  961,   86,  970,  966,   86,
+       86,   86,  968,  974,  984,   86,  964,  965,  969,   86,
+      975,  971,  972,  976,   86,   86,  176,  977,  980,  981,
+      979,  973,  978,   86,   86,   86,   86,  983,   86,   86,
+       86,  982,   86,   86,  985,  987,   86,  986,  988,   86,
+      989,   86,   86,   86,  994,   86,  991,   86,  990,  992,
+       86,  997,   86,  998,   86,   86,  995,   86,  996,   86,
 
-       86,   86,  998,   86,   86, 1005,  994,  999, 1003,   86,
-     1001,   86,   86, 1004,   86,   86, 1002,   86, 1013,   86,
-     1010, 1008,   86,   86, 1006, 1000,   86,   86, 1011, 1012,
-     1007, 1015,   86,   86,   86,   86,   86,   86,   86, 1009,
-       86, 1026, 1023, 1014, 1016, 1021,   86,   86,   86,   86,
-       86,  173, 1017, 1018,   86, 1020, 1019, 1027, 1024,   86,
-     1022, 1028,   86,   86,   86, 1025,   86, 1033, 1030, 1029,
-     1031, 1034,   86, 1032,   86, 1036,   86,   86,   86,   86,
-     1043,   86, 1044, 1035, 1038,   86,   86, 1046,   86,   86,
-     1048,   86,   86,   86, 1037, 1050,   86, 1039, 1041, 1045,
+       86,   86,  993,   86, 1000,   86, 1001,   86, 1003,   86,
+     1004,   86, 1005,  999,   86,   86, 1006,   86, 1013, 1007,
+     1011,   86,   86, 1009, 1002, 1012,   86,   86, 1010,   86,
+       86,   86, 1008,   86, 1018, 1020, 1014,   86, 1016, 1021,
+       86, 1015, 1019,   86,   86,   86,   86,   86, 1023,   86,
+     1025, 1017,   86,   86,   86,   86, 1029, 1031, 1022,   86,
+       86,   86, 1034,   86,   86, 1024, 1026, 1027,   86, 1028,
+     1035, 1036, 1032,   86, 1033, 1030,   86, 1038, 1040, 1037,
+       86,   86, 1039, 1042,   86, 1041,   86,   86,   86,   86,
+     1044,   86,   86, 1043, 1051, 1046, 1052, 1054,   86,   86,
 
-     1040, 1042, 1049,   86,   86,   86,   86, 1056,   86, 1047,
-     1054, 1051, 1057,   86,   86, 1052, 1058,   86,   86,   86,
-     1061, 1063,   86, 1053,   86, 1055,   86,   86,   86, 1066,
-     1060,   86, 1059, 1065, 1067,  168,   86,   86, 1070, 1062,
-     1069,   86, 1064,   86,   86,   86, 1068,   86, 1073, 1071,
-       86,   86,   86, 1085,   86,   86, 1088,   86, 1086,   86,
-       86, 1072,   86, 1074, 1076,   86, 1090, 1077,   86, 1075,
-     1087, 1147, 1078,   86, 1091,   86, 1079,   86, 1080, 1092,
-     1093, 1095, 1081,   86, 1082, 1089, 1096,   86,   86, 1083,
-       86, 1094, 1097,   86, 1084,   86,   86, 1099,   86,   86,
+       86, 1056,   86,   86,   86,   86, 1045,   86, 1047, 1057,
+     1049, 1048, 1050, 1053,   86,   86,   86, 1060, 1055, 1062,
+     1058,   86, 1065, 1059,   86, 1061,   86, 1064,   86,   86,
+       86,   86, 1066, 1069, 1071,   86,   86, 1068,   86,   86,
+     1074,   86, 1063, 1073,   86, 1075,  168,   86, 1067,   86,
+       86, 1070,   86, 1077, 1072, 1081, 1076,   86, 1078,   86,
+       86,   86,   86,   86,   86, 1094, 1079, 1080,   86, 1097,
+       86, 1082, 1095,   86, 1084, 1085,   86,   86,   86,   86,
+       86, 1086, 1099, 1083, 1087,   86, 1119,  174, 1088,   86,
+     1089, 1096, 1100, 1101, 1090,   86, 1091,   86, 1098, 1104,
 
-     1102,   86, 1098, 1105,   86, 1101,   86,   86, 1104, 1100,
-     1103,   86, 1111, 1106, 1112, 1109, 1115, 1110, 1108, 1113,
-       86,   86, 1107, 1114,   86,   86, 1116,   86,   86,   86,
-       86,   86,   86,   86,   86, 1131, 1128,   86,   86,   86,
-       86, 1127, 1132,   86,   86, 1130,   86, 1118, 1119, 1117,
-       86, 1120, 1129, 1134, 1133, 1138, 1121,   86, 1122, 1135,
-     1137,   86, 1136,   86, 1123,   86,   86,   86, 1139, 1124,
-     1125, 1143,   86,   86, 1146, 1140, 1126, 1144,   86,   86,
-       86, 1141, 1150,   86, 1142,   86,   86, 1145,   86,   86,
-     1151,   86, 1149, 1156,   86, 1153,   86, 1148, 1154,   86,
+     1102, 1092,   86, 1103, 1105,   86, 1093,   86,   86, 1113,
+       86, 1106, 1108,   86,   86,   86,   86,   86, 1111, 1114,
+     1121, 1107,   86,   86, 1109, 1110,   86, 1120, 1112, 1115,
+     1122, 1117, 1118, 1123,   86, 1124,   86, 1116, 1125,   86,
+       86,   86,   86,   86,   86,   86,   86,   86, 1137,   86,
+     1140,   86,   86,   86, 1136, 1142, 1141,   86, 1139,   86,
+     1127, 1126,   86, 1128,   86, 1129, 1138, 1143, 1147,   86,
+     1130,   86, 1131,   86,   86, 1146, 1144,   86, 1132,   86,
+      173, 1145, 1148, 1133, 1134, 1152,   86, 1149,   86, 1150,
+     1135, 1154, 1153, 1155,   86,   86,   86, 1151, 1156,   86,
 
-       86,   86, 1152, 1157,   86, 1159,   86, 1155,   86,   86,
-       86,   86,   86,   86,   86, 1158,   86, 1166, 1161, 1164,
-     1163, 1160, 1165,   86, 1168, 1169, 1162,   86, 1170, 1167,
-       86,   86,   86,   86,   86,   86, 1171,   86, 1176, 1177,
-     1178, 1173, 1172,   86, 1180, 1181, 1179, 1175,   86, 1174,
-       86,   86, 1184,   86,   86,   86, 1186, 1185,   86, 1187,
-       86, 1182,   86, 1188,   86,   86, 1183, 1189,   86, 1195,
-       86, 1197,   86,   86, 1190,   86, 1201,   86, 1191,   86,
-     1194, 1193, 1192,   86, 1199,   86,   86, 1198,   86,   86,
-     1196, 1203,   86, 1204,   86,   86,   86, 1200,   86, 1206,
+     1159,   86,   86,   86, 1165,   86,   86, 1160,   86, 1158,
+       86,   86, 1162, 1157, 1163,   86,   86,   86,   86,   86,
+     1161,   86, 1168,   86, 1164, 1166,   86,   86,   86, 1175,
+     1167,   86, 1170, 1172, 1177, 1169, 1173, 1174,   86, 1171,
+       86,   86,   86, 1176,   86,   86,   86, 1178,   86,   86,
+       86,   86, 1179, 1185, 1186, 1187, 1182,   86,   86, 1189,
+     1184, 1180, 1190, 1181, 1183,   86, 1188, 1192,   86, 1193,
+       86,   86,   86, 1195, 1194,   86, 1196,   86, 1191,   86,
+     1197,   86,   86,   86, 1198,   86, 1204, 1206,   86,   86,
+       86, 1199,   86,   86, 1208, 1200, 1202, 1203,   86, 1201,
 
-     1207,   86, 1209, 1212, 1208, 1205, 1202, 1211,   86,   86,
-     1213,   86,   86,   86, 1210,   86, 1216, 1214,   86, 1217,
-       86,   86,   86,   86,   86, 1221, 1223,   86, 1224, 1225,
-     1215,   86,   86, 1218,   86,   86, 1222,   86, 1228, 1219,
-     1226, 1220, 1227, 1231,   86, 1229,   86,   86,   86,   86,
-       86, 1230, 1232, 1233,   86, 1234,   86, 1235,   86,   86,
-       86, 1238, 1239,   86,   86,   86, 1244, 1245, 1236,   86,
-       86, 1240,   86,   86, 1247, 1237, 1242, 1248,   86,   86,
-       86, 1241, 1252,   86, 1243, 1246,   86,   86,   86,   86,
-       86,   86, 1258,   86, 1250, 1251,  168, 1254, 1249,   86,
+       86, 1210,   86, 1207, 1209, 1205,   86, 1212,   86,   86,
+       86, 1213,   86,   86, 1215, 1216,   86,   86, 1218,   86,
+     1221, 1211,   86, 1220, 1214, 1217,   86, 1222,   86,   86,
+       86, 1223, 1219, 1225,   86, 1226,   86, 1224,   86,   86,
+       86,   86, 1230, 1232, 1233,   86, 1234, 1227, 1237,   86,
+       86,   86,   86, 1231,   86, 1228, 1235, 1236, 1229,   86,
+     1240,   86,   86, 1238, 1242,   86,   86, 1241,   86,   86,
+     1243,   86,   86,   86,   86, 1247, 1248, 1244,   86, 1239,
+       86,   86, 1253, 1254,   86, 1249,   86, 1245,   86,   86,
+     1246, 1256, 1251, 1257,   86,   86, 1250,   86,   86, 1255,
 
-       86,   86,   86, 1265,   86, 1253, 1263,   86, 1255,   86,
-     1257,  168, 1262, 1260, 1267, 1256, 1259, 1261, 1264, 1268,
-       86,   86,   86,   86, 1270,   86, 1269, 1266, 1271,   86,
-       86,   86,   86,   86,   86,   86, 1274,   86, 1280,   86,
-       86, 1277,   86, 1272, 1273,   86,   86, 1275,   86,  166,
-     1278, 1284, 1276,   86, 1281,   86, 1279,   86, 1286, 1290,
-     1282, 1283,   86, 1291, 1294,   86,   86, 1287, 1285, 1288,
-     1292,   86, 1289, 1293,   86,   86,   86,   86, 1296,   86,
-     1295,   86,   86,   86, 1300,   86, 1299, 1303,   86,   86,
-     1297,   86, 1307,   86, 1298, 1302,   86,   86,   86, 1304,
+     1252, 1261,   86,   86,   86,   86,   86,   86, 1267,   86,
+     1260, 1259, 1263,  168, 1258,   86,   86,   86,   86,   86,
+     1262, 1274,   86, 1264, 1272,   86, 1266, 1273, 1271, 1269,
+     1276, 1265, 1270, 1268, 1277,   86,   86,   86,   86,   86,
+       86, 1280, 1279, 1281,   86, 1275,   86,   86,   86,   86,
+       86, 1278, 1284,   86,   86, 1290,   86, 1287, 1282,   86,
+     1283,   86,   86, 1285,   86,   86,  168,   86, 1286, 1288,
+     1294, 1300, 1289, 1291,   86,   86,   86, 1293,   86, 1292,
+     1296,   86, 1301, 1302,   86, 1295, 1303,   86,   86, 1297,
+     1305, 1298, 1308,   86, 1299, 1304, 1306,   86,   86,   86,
 
-     1301, 1308, 1305, 1309,   86,   86, 1313, 1306, 1312, 1310,
-     1311,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86, 1319,   86,   86,   86, 1314, 1315, 1317, 1318,
-     1320, 1324, 1316,   86,   86,   86, 1321,   86, 1323, 1325,
-     1322, 1326, 1328, 1327,   86,   86,   86, 1335,   86, 1329,
-       86,   86,   86,   86, 1330,   86, 1331,   86,   86, 1338,
-     1333,   86, 1332, 1336, 1337,   86, 1334, 1341, 1342,   86,
-     1340, 1346, 1339, 1343,   86, 1345, 1344,   86, 1347,   86,
-       86,   86, 1354,   86, 1348, 1356, 1358, 1349, 1350, 1355,
-       86,   86, 1351,   86, 1357, 1360,   86, 1363, 1352, 1359,
+       86,   86,   86, 1307, 1310,   86, 1309, 1313,   86, 1317,
+       86,   86, 1312,   86,   86, 1314, 1315, 1311, 1318, 1319,
+       86,   86,   86,   86,   86, 1321, 1322, 1316,   86,   86,
+     1323, 1320,   86,   86,   86,   86,   86,   86, 1324, 1325,
+       86, 1327, 1329,   86, 1330,   86, 1334, 1326, 1328,   86,
+       86,   86,   86, 1331,   86, 1333,   86, 1332, 1335, 1338,
+       86,   86,   86,   86, 1345, 1336, 1339,  166, 1341, 1337,
+       86, 1340,   86,   86,   86, 1343,   86, 1346, 1350, 1342,
+       86, 1344, 1348, 1349, 1352,   86, 1347,   86, 1351, 1353,
+       86,   86, 1357,   86, 1367,   86,   86, 1368, 1356, 1354,
 
-       86,   86, 1353,   86, 1364, 1361,   86, 1365, 1362,   86,
-       86,   86, 1366,   86, 1367,   86,   86,   86,   86, 1375,
-     1376, 1372, 1370,   86,   86,   86,   86, 1416, 1377, 1369,
-     1368, 1373,   86,   86,   86, 1371, 1374, 1378,   86, 1384,
-       86, 1379, 1385, 1386,   86,   86, 1380,   86, 1381,   86,
-     1382, 1387, 1383, 1388,   86, 1392, 1395,   86,   86, 1389,
-     1393,   86,   86, 1391,   86, 1390, 1394, 1396,   86,   86,
-       86, 1402, 1397, 1398,   86, 1403,   86,   86,   86,   86,
-       86,   86,   86,   86, 1401, 1406, 1404, 1399, 1400,   86,
-     1405, 1408,   86, 1407, 1411, 1412,   86, 1414,   86, 1409,
+       86, 1355,   86, 1358, 1366,   86, 1365, 1359,   86,   86,
+     1360, 1361, 1371, 1369, 1370, 1362,  164,   86,   86,   86,
+       86, 1363, 1372,   86, 1373, 1364,   86, 1374,   86, 1376,
+     1375,   86,   86,   86, 1377,   86, 1378,   86,   86, 1386,
+     1379, 1380, 1381, 1383, 1387,   86,   86,   86,  163, 1384,
+       86, 1388, 1382,   86,   86, 1385, 1390, 1389,   86, 1395,
+       86, 1391,   86, 1392, 1399, 1393,   86, 1394, 1396, 1397,
+       86,   86, 1401, 1398,   86,   86,   86, 1403,   86, 1402,
+       86, 1400, 1404,   86, 1405, 1407,   86, 1409,   86,   86,
+     1408, 1413,   86, 1414,   86,   86, 1406,   86,   86,   86,
 
-       86,   86, 1415,   86,   86,   86, 1417, 1413, 1410, 1420,
-       86, 1422,   86, 1419,   86, 1423,   86,   86,   86, 1427,
-       86, 1424, 1418,   86,   86, 1421,   86, 1429,   86,   86,
-       86,   86, 1433, 1431,   86,   86,   86, 1435, 1425, 1426,
-     1432, 1437,   86, 1428,   86,   86, 1430, 1434,   86, 1439,
-     1436,   86,   86, 1440,   86, 1495, 1438, 1441,   86, 1442,
-       86, 1443,   86, 1444,   86,   86, 1445, 1449, 1446, 1450,
-     1452, 1447,   86,   86,   86,   86,   86, 1451, 1448,   86,
-       86, 1456,   86, 1453,   86,  168,   86,   86, 1461, 1462,
-       86, 1455,   86, 1464,   86,   86, 1463,   86, 1454,   86,
+       86,   86, 1415, 1412, 1417, 1410,   86, 1411,   86, 1416,
+     1419,   86, 1418, 1422, 1423,   86, 1425,   86, 1420,   86,
+       86, 1426,   86, 1427,   86,   86, 1424, 1428, 1431,   86,
+       86, 1421, 1433,   86, 1430,   86, 1434,   86,   86,   86,
+     1438,   86, 1435, 1429,   86,   86,   86,   86, 1440,   86,
+     1432,   86, 1442, 1444,   86,   86,   86,   86, 1443, 1436,
+     1437, 1448,   86,   86, 1439, 1446, 1441,   86, 1450,   86,
+     1447, 1449, 1445,   86, 1452, 1451,   86, 1454, 1453,   86,
+       86,   86,   86,   86, 1455, 1460, 1461, 1457,   86, 1458,
+       86,   86,   86, 1462, 1463,   86, 1459,   86, 1456, 1464,
 
-     1458,   86,   86,   86, 1457,   86, 1459,   86, 1471,   86,
-     1460, 1465, 1467, 1468,   86,   86, 1469, 1466, 1476,   86,
-     1475, 1470,   86,   86,   86, 1472,   86,   86, 1478,   86,
-     1480,   86, 1474,   86, 1473, 1481,   86,   86, 1483, 1484,
-       86, 1485,   86, 1479, 1482, 1477,   86, 1489, 1486, 1491,
-     1490,   86, 1487, 1492,   86, 1488, 1494,   86, 1497,   86,
-     1493,   86,   86, 1498,   86, 1496,   86,   86,   86,   86,
-       86, 1502, 1503,   86,   86, 1506, 1499,   86,   86, 1501,
-       86, 1511,   86,   86,   86, 1500, 1504, 1512, 1508, 1505,
-       86, 1515,   86, 1507,   86, 1509, 1510,   86,   86,   86,
+       86, 1467,   86,   86,  168,   86,   86, 1472, 1466, 1473,
+       86, 1475,   86,   86, 1465,   86, 1474,   86,   86, 1469,
+       86,   86,   86, 1468,   86, 1470, 1476,   86, 1483, 1471,
+       86,   86, 1477, 1480,   86,   86, 1481,  161, 1478,   86,
+     1479,   86, 1482,   86, 1487, 1488,   86,   86, 1490, 1492,
+     1484,   86, 1486,   86, 1493,   86, 1485,   86, 1489, 1496,
+     1491,   86, 1495,   86,   86, 1494,   86,   86,   86, 1501,
+     1504, 1497, 1502,   86, 1506, 1503, 1498,   86, 1499,   86,
+       86, 1500,   86, 1507, 1509,   86, 1511, 1505, 1508, 1510,
+       86,   86,   86,   86,   86,   86, 1514, 1515,   86,   86,
 
-     1513,   86, 1516, 1514,   86,   86,   86,   86, 1518, 1522,
-       86, 1517, 1523, 1519, 1520, 1524, 1526,   86, 1527,   86,
-     1521,   86,   86, 1532, 1525,   86, 1531,   86,   86,   86,
-     1529, 1534,   86,   86, 1528,   86,   86, 1541,   86, 1535,
-     1539, 1533, 1530, 1538, 1536, 1540,   86,   86, 1542, 1543,
-       86,   86,   86,   86,   86,   86, 1537, 1544,   86,   86,
-       86, 1545,   86, 1550,   86,   86, 1549,   86,   86, 1547,
-     1553, 1556, 1546, 1548,   86, 1552, 1557,   86, 1554, 1558,
-     1551,   86, 1561,   86, 1559,   86,   86, 1555,   86,   86,
-       86,   86,   86, 1569, 1560, 1565,   86, 1564,   86,   86,
+     1518,   86,   86, 1513,   86, 1523,   86,   86, 1512,   86,
+     1524, 1516,   86, 1520, 1517, 1527,   86,   86, 1519, 1521,
+     1522,   86,   86,   86, 1528, 1525,   86,   86, 1526,   86,
+       86, 1530, 1534,   86,   86, 1529, 1535, 1531, 1532, 1536,
+       86, 1539, 1538,   86,   86, 1533,   86,   86, 1537,   86,
+     1543, 1544,   86, 1541, 1546,   86,   86,   86, 1540,   86,
+       86, 1545, 1547, 1551, 1552, 1550, 1542,   86, 1548,   86,
+       86,   86, 1553,   86, 1554, 1555,   86,   86,   86,   86,
+     1549, 1556,   86,   86,   86, 1558,   86, 1557,   86, 1563,
+       86, 1559,   86, 1562,   86, 1566, 1560,   86, 1561,   86,
 
-     1572, 1570, 1562,   86,   86, 1563,   86,   86, 1566, 1575,
-     1568, 1567,   86, 1574,   86,   86,   86,   86,   86,   86,
-       86, 1583, 1573, 1576, 1571,   86,  164,   86, 1584, 1586,
-       86, 1577, 1580, 1578, 1582, 1579, 1587,   86, 1581, 1585,
-       86,   86,   86,   86,   86, 1588, 1589,   86,   86, 1593,
-       86,   86, 1591, 1594, 1590,   86, 1597, 1592,   86, 1601,
-       86,   86,   86, 1598, 1603,   86, 1595, 1602, 1596,   86,
-       86,   86,   86, 1607, 1600, 1599, 1604, 1606, 1605,   86,
-       86,   86, 1612, 1608, 1613,   86,   86,   86,   86,   86,
-     1618, 1609,   86, 1617, 1616,   86,   86,   86, 1610, 1620,
+     1565, 1569,   86, 1574, 1564, 1571, 1570,   86, 1567,   86,
+     1572,   86,   86,   86,   86,   86, 1568,   86,   86, 1573,
+     1578, 1582, 1577,   86,   86,   86, 1585,   86, 1575, 1583,
+       86, 1576,   86, 1579,   86, 1588, 1581, 1580,   86,   86,
+     1587,   86,   86,   86, 1586,   86,   86, 1596,   86, 1584,
+       86, 1594,   86, 1597, 1599,   86,   86, 1589, 1590, 1593,
+     1602, 1591, 1592, 1595, 1598, 1600,   86,   86,   86,   86,
+       86,   86, 1601, 1606,   86,   86,   86, 1607, 1604,   86,
+     1610, 1603,   86, 1605, 1614,   86,   86,   86,   86, 1616,
+     1608, 1611, 1609, 1615,   86,   86,   86,   86, 1613, 1612,
 
-       86, 1611,   86,   86, 1614, 1621, 1622,   86, 1615,   86,
-       86,   86, 1625, 1623,   86, 1619,   86, 1628,   86, 1624,
-     1627,   86,   86,   86,   86, 1634,   86, 1632,   86, 1629,
-     1626,   86,   86,   86, 1639, 1635,   86, 1633,   86, 1630,
-     1631,   86,   86, 1642, 1644,   86, 1636, 1637,   86,   86,
-     1640,   86, 1645,   86, 1647,   86, 1638, 1643,   86, 1641,
-       86,  168, 1650,   86, 1653,   86, 1649,   86, 1652, 1646,
-       86,   86,   86, 1648,   86,   86, 1661, 1654,   86, 1651,
-       86,   86,   86, 1662, 1656, 1655, 1659,   86,   86, 1670,
-     1657, 1658,   86, 1666, 1668,   86, 1665,   86,   86, 1660,
+     1618, 1617, 1619,   86,   86,   86, 1625, 1620, 1621, 1626,
+       86,   86,   86,   86, 1622,   86, 1624,   86, 1630, 1631,
+     1629,   86,   86, 1623,   86,   86, 1633,   86,   86, 1627,
+       86, 1634, 1635,   86, 1628,   86,   86,   86, 1636, 1638,
+     1637, 1632,   86, 1641, 1640,   86,   86,   86,   86,   86,
+     1639,   86, 1642, 1645,   86, 1647,   86,   86, 1648,   86,
+     1652, 1646,   86,   86,   86, 1644, 1643,   86,   86, 1649,
+       86, 1650, 1655, 1657,   86,   86, 1653,   86, 1660, 1656,
+       86, 1654, 1651,   86, 1658,   86, 1662, 1663, 1659,   86,
+     1666,   86, 1661,  168, 1665,   86,   86,   86,   86,   86,
 
-     1663, 1664, 1667, 1669, 1672,   86, 1674,   86,   86,   86,
-       86,   86,   86,   86, 1679, 1676, 1677, 1671,   86, 1673,
-       86, 1680,   86,   86,   86,   86,   86, 1675, 1684,   86,
-     1685,   86, 1681, 1692,   86,   86, 1678, 1694, 1683,   86,
-     1682,   86, 1686, 1687, 1689,   86, 1688, 1690,   86,   86,
-     1693,   86,   86, 1695, 1697, 1699, 1703, 1696, 1701, 1691,
-     1698, 1700,   86, 1702,   86,   86, 1704,   86, 1705,   86,
-     1706,   86,   86,   86,   86,   86,   86, 1707,   86, 1713,
-     1714, 1712,   86, 1716, 1708,   86,   86, 1715,   86,   86,
-       86, 1709,   86, 1710,   86, 1711,   86, 1718, 1719,   86,
+       86, 1674,   86,   86, 1664,   86,  159, 1675,   86, 1667,
+     1669,   86, 1672, 1668, 1678,   86, 1670, 1671,   86,   86,
+     1679,   86,   86, 1676, 1673, 1677, 1680,   86, 1681, 1682,
+       86, 1684,   86, 1686,   86, 1683, 1687,   86, 1685,   86,
+     1688,   86,   86, 1692,   86,   86, 1693,   86, 1690, 1691,
+       86, 1689,   86, 1694,   86,   86,   86, 1699, 1698,   86,
+       86, 1695,   86,   86, 3252, 1706,   86,   86, 1696, 1697,
+     1703,   86, 1701, 1704,   86,   86,   86, 1700, 1708, 1707,
+       86, 1711, 1702,   86, 1723, 1705, 1713, 1715, 1712, 1710,
+     1714,   86, 1716,   86, 1709,   86,   86, 1718,   86, 1720,
 
-       86, 1720,   86,   86,   86,   86,   86,   86, 1721, 1729,
-       86, 1717,   86,   86, 1722,   86, 1724, 1725, 1726,   86,
-     1723, 1734,   86, 1727, 1731, 1732,   86,   86, 1733, 1730,
-       86, 1728, 1739,   86,   86,   86,   86,   86, 1742, 1735,
-     1737, 1741, 1736,   86,   86,   86,   86,   86,   86,   86,
-     1743, 1738,   86,   86, 1740, 1747, 1749, 1744,   86,   86,
-     1759, 1750, 1748, 1746, 1751, 1757,   86,   86, 1745, 1752,
-     1756, 1758,   86, 1753,   86,   86,   86,   86, 1754, 1761,
-     1762,   86,   86,   86, 1755,   86,   86, 1765, 1763,   86,
-     1766,   86, 1760, 1774,   86, 1769, 1764,   86,   86,   86,
+     1717,   86, 1719,   86,   86,   86,   86,   86, 1721,   86,
+     1727,   86, 1726, 1728,   86,   86,   86, 1722, 1730,   86,
+     1729,   86, 1733,   86,   86, 1724, 1732, 1725,   86,   86,
+       86,   86, 1735, 1734, 1731,   86,   86,   86,   86,   86,
+       86, 1743,   86,   86,   86, 1738,   86,   86,   86, 1736,
+     1737, 1739, 1740, 1741, 1745, 1746, 1748, 1747,   86, 1744,
+       86, 1742,   86, 1753,   86,   86, 1749, 1750,   86, 1752,
+     1755,   86, 1751,   86, 1757,   86,   86,   86,   86,   86,
+     1754,   86, 1759, 1756,   86,   86,   86, 1762, 1764,   86,
+     1758, 1772,   86, 1765, 1763, 1761, 1766, 1773,   86,   86,
 
-     1775,   86, 1767, 1771,   86, 1768, 1772, 1773,   86,   86,
-     1770,   86,   86,   86,   86,   86, 1784, 1776,   86,   86,
-       86, 1777, 1778, 1779, 1781, 1787,   86, 1780, 1786,   86,
-     1788,   86, 1783,   86, 1785,   86,   86,   86, 1782,   86,
-     1790, 1792,   86, 1791, 1789,   86,   86, 1794,  163, 1796,
-     1801, 1793, 1799, 1795, 1797,   86, 1798, 1802, 1804,   86,
-     1805, 1800,   86,   86, 1803, 1807,   86, 1806,   86,   86,
-       86,   86, 1811,   86, 1808, 1815,   86,   86,   86, 1813,
-       86,   86,   86,   86, 1810, 1814, 1812,   86, 1816, 1809,
-       86, 1819,   86,   86,   86,   86, 1817, 1825,   86, 1820,
+     1760, 1767, 1771,   86, 1768,   86,   86,   86,   86, 1769,
+     1776, 1770, 1777,   86,   86, 1774,   86,   86,   86, 1778,
+       86, 1780, 1781, 1775,   86, 1789,   86, 1779,   86, 1784,
+       86,   86,   86, 1782, 1783, 1786,   86, 1788, 1787, 1790,
+       86,   86,   86, 1785,   86, 1792,   86,   86,   86, 1799,
+     1791,   86,   86, 3252, 1793, 1794, 1796,   86, 1795,   86,
+     1803, 1801, 1802,   86,   86, 1798,   86, 1800,   86, 1807,
+       86, 1797, 1805, 1811, 1804, 1806,   86,   86, 1812,   86,
+       86,   86,   86,   86, 1808, 1817, 1816,   86, 1810, 1809,
+     1813,   86, 1814, 1819,   86, 1820,   86, 1825,   86, 1822,
 
-     1821, 1818,   86, 1827, 1828, 1822,   86, 1823, 1824,   86,
-       86, 1830,   86, 1832,   86, 1829,   86, 1835,   86, 1826,
-       86,   86,   86,   86, 1839,   86, 1831,   86,   86, 1834,
-       86, 1841,   86, 1833,  168, 1842, 1837, 1843,   86, 1838,
-     1836,   86, 1840, 1844,   86,   86, 1847, 1849,   86,   86,
-     1845, 1846,   86, 1853,   86,   86,   86,   86,   86, 1848,
-       86, 1851,   86, 1855, 1850,   86,   86, 1860,   86, 1854,
-     1856, 1852, 1857,   86, 1863,  161, 1858, 1861, 1864,   86,
-       86,   86, 1859, 1865, 1862, 1866,   86,   86, 1869,   86,
-     1868,   86, 1867, 1872,   86, 1870,   86,   86,   86,   86,
+     1818,   86, 1815, 1821,   86,   86, 1826, 1824,   86, 1827,
+     1823, 1828,   86, 1830,   86,   86,   86, 1829,   86,   86,
+       86, 3252, 1831,   86,   86,   86, 1834,   86,   86, 1835,
+     1840,   86, 1842,   86, 1832, 1833, 1836, 1837,   86, 1838,
+     1843, 1839,   86, 1845,   86,   86,   86,   86, 1846,   86,
+     1850, 1847, 1841,   86,   86, 1844,   86, 1854,   86,   86,
+     1849,   86,   86,   86, 1848, 1856,   86, 1857, 1858, 1852,
+       86, 1851, 1853,   86,  168, 1859,   86, 1864,   86, 1855,
+       86,   86, 1860,   86, 1868,   86, 1862,   86,   86, 1861,
+       86, 1863,   86, 1866,   86, 1870,   86, 1875,   86, 1865,
 
-     1873, 1871,   86,   86,   86,   86,   86,   86, 1878,   86,
-     1879,   86,   86,   86,   86, 1880, 1883,   86, 1874, 1881,
-     1876, 1875, 1877, 1884, 1882,   86,   86,   86, 1890, 1892,
-     1887, 1889, 1886, 1891,   86,   86, 1885, 1888, 1893,   86,
-       86,   86,   86,   86, 1898,  159, 1894,   86,   86,   86,
-     1901, 1902,   86, 1903,   86,   86, 1896, 1905,   86, 1895,
-       86, 1897, 1899, 1904, 1900,   86, 1906,   86, 1907, 1909,
-       86, 1910, 1911, 1913,   86,   86, 1908, 1912,   86,   86,
-     1915,   86, 1918,   86, 1917, 1916,   86,   86,   86,   86,
-     1921,   86,   86, 1914, 1920,   86, 1924, 1923,   86, 1926,
+       86, 1869, 1867,   86, 1871,   86, 1872, 1879,   86, 1873,
+     1876, 1878,   86, 1881,   86, 1880, 1874,   86, 1877,   86,
+     1884,   86, 1882, 1885,   86,   86,   86, 1887, 1883,   86,
+       86,   86, 1888, 1886,   86,   86,   86,   86,   86,   86,
+     1893,   86, 1894,   86,   86,   86,   86, 1895, 1898,   86,
+     1889, 1896, 1891, 1890, 1892, 1899, 1897,   86,   86,   86,
+     1905, 1907, 1902, 1904, 1901, 1906,   86,   86, 1900, 1903,
+     1908,   86,   86,   86,   86,   86, 1913, 3252, 1909,   86,
+       86,   86, 1916, 1917,   86, 1918,   86,   86, 1911, 1920,
+       86, 1910,   86, 1912, 1914, 1919, 1915,   86, 1921,   86,
 
-       86,   86,   86, 1925, 1933,   86,   86, 1919,   86, 1922,
-       86, 1935, 1927, 1928, 1929,   86, 1936,   86,   86, 1930,
-     1938, 1931, 1932,   86,   86, 1941, 1934,   86, 1943, 1937,
-       86,   86, 1945,   86, 1939,   86, 1942,   86, 1947, 1940,
-       86,   86,   86, 1950, 1951,   86,   86, 1953,   86,   86,
-       86, 1944,   86,   86, 1959,   86,   86,   86, 1958, 1955,
-     1948, 1946, 1956, 1949,   86,   86, 1952,   86,   86,   86,
-     1965,   86, 1961, 1957, 1954, 1962, 1963, 1960,   86,   86,
-     1969,   86,   86,   86, 1968,   86,   86, 1972, 1975, 1971,
-     1973, 1964,   86,   86, 1967,   86,   86, 1966, 1974,   86,
+     1922, 1924,   86, 1925, 1926, 1928,   86,   86, 1923, 1927,
+       86,   86, 1930,   86, 1933,   86, 1932, 1931,   86,   86,
+       86,   86, 1936,   86,   86, 1929, 1935,   86, 1939, 1938,
+       86, 1941,   86,   86,   86, 1940, 1948,   86,   86, 1934,
+       86, 1937,   86, 1950, 1942, 1943, 1944,   86, 1951,   86,
+       86, 1945, 1954, 1946, 1947, 1953,   86,   86, 1949, 1957,
+       86, 1952,   86,   86,   86,   86,   86, 1955,   86, 1958,
+     1961,   86, 1956,   86, 1963,   86,   86, 1966, 1967,   86,
+     1969,   86, 1959,   86, 1960,   86, 1964,   86, 1968,   86,
+     1962,   86, 1974,   86, 1971,   86, 1972, 1965,   86, 1975,
 
-       86, 1970,   86,   86, 1976, 1977, 1980,   86,   86, 1983,
-     1984, 1978, 1979, 1985,   86,   86,   86,   86,   86,   86,
-     1981, 1988,   86,   86, 1993,   86,   86,   86, 1992,   86,
-     1987,   86,   86, 1982, 1986, 1997,   86, 1989, 1990,   86,
-       86, 1999, 1995, 2001, 1991, 1994, 1998, 2002, 1996, 2000,
-       86,   86, 2003, 2004,   86,   86,   86,   86,   86,   86,
-     2011,   86, 2008,   86, 2014,   86,   86,   86, 2013, 2006,
-       86, 2015, 2005,   86,   86, 2007, 2012, 2016, 2009, 2010,
-       86, 2021,   86, 2017, 2022,   86, 2025, 2020, 2023, 2026,
-       86, 2018,   86, 2024,   86,   86, 2019,   86,   86, 2030,
+       86,   86, 1978,   86,   86,   86, 1981,   86, 1970,   86,
+     1973, 1985, 1976, 1979, 1984,   86, 1977,   86,   86, 1980,
+     1988, 1989,   86, 1983,   86, 1987,   86,   86,   86, 1982,
+     1990,   86,   86, 1991,   86, 1986,   86,   86,   86, 1996,
+       86, 1992, 1993, 1994,   86, 1999, 1995, 2000, 2001,   86,
+       86,   86,   86,   86,   86, 1997, 2004,   86, 2009,   86,
+     2002,   86, 2008,   86, 1998, 2003,   86,   86,   86, 2006,
+       86, 2013, 2005, 2007, 2014, 2016,   86,   86, 2011, 2015,
+     2010, 2017,   86, 2020,   86, 2012,   86,   86, 2027,   86,
+       86,   86,   86, 2018,   86, 2024,   86,   86, 2019,   86,
 
-       86,   86, 2028,   86,   86,   86,   86, 2032, 2035, 2037,
-     2029,   86, 2031, 2033,   86,   86, 2027,  168,   86,   86,
-       86,   86, 2038, 2039, 2043, 2042,   86, 2044, 2036, 2034,
-     2040, 2045,   86, 2046,   86,   86, 2048,   86, 2041,   86,
-       86,   86,   86, 2049, 2050,   86, 2051,   86, 2054,   86,
-     2052,   86, 2053,   86, 2056, 2047,   86,   86, 2060,   86,
-       86, 2055, 2059, 2057,   86,   86,   86, 2064, 2058, 2061,
-     2062, 2063, 2065,   86,   86,   86,   86,   86,   86, 2072,
-     2070,   86,   86,   86, 2067,   86, 2071,   86,   86,   86,
-     2077,   86, 2074,   86, 2066, 2068,   86, 2069,   86,   86,
+     2032, 2022, 2029, 2030,   86,   86, 2031, 2021, 2023,   86,
+       86, 2025, 2026,   86, 2028, 2037,   86, 2039, 2033, 2038,
+       86, 2034, 2040,   86, 2041, 2042, 2035,   86,   86,   86,
+       86,   86, 2046, 2036, 2044,   86,   86,   86,   86,   86,
+     2045, 2048,   86, 2051,   86, 2053,   86, 2047, 2049,   86,
+      168,   86,   86, 2043, 2055, 2054,   86,   86, 2056,   86,
+     2059, 2058,   86, 2060, 2050, 3252, 2052, 2061,   86, 2062,
+       86, 2057, 2064,   86,   86,   86,   86,   86,   86, 2063,
+     2065, 2066, 2068, 2067,   86,   86,   86, 2071, 2070, 2069,
+       86, 2072,   86,   86,   86, 2076,   86,   86, 2073, 2075,
 
-     2073, 2078, 2076,   86, 2081, 2075,   86, 2080, 2083, 2079,
-       86, 2082,   86,   86, 2085, 2088,   86, 2086, 2084,   86,
-       86,   86, 2089,   86, 2094,   86, 2087,   86,   86, 2096,
-       86,   86,   86, 2097, 2098,   86, 2090, 2091, 2092, 2093,
-     2099, 2100,   86,   86, 2095,   86, 2101, 2103,   86, 2102,
-       86,   86,   86,   86,   86, 2104,   86, 2107,   86,   86,
-       86, 2108,   86,   86,   86,   86, 2115,   86, 2119,   86,
-     2110, 2106, 2105,   86, 2111, 2109, 2112, 2118, 2114, 2116,
-       86,   86,   86,   86, 2122, 2113,   86, 2117, 2123,   86,
-       86, 2120, 2126,   86, 2125,   86,   86,   86, 2128,   86,
+       86,   86, 2077,   86, 2074, 2078, 2079,   86, 2081,   86,
+     2080,   86, 2083,   86,   86,   86, 2088, 2082, 2086,   86,
+     2087,   86,   86,   86,   86,   86,   86,   86, 2093, 2084,
+     2090,   86, 2085,   86, 2097, 2096,   86, 2089, 2092, 2094,
+     2099, 2091,   86, 2095,   86, 2098,   86,   86, 2100, 2104,
+       86, 2102,   86,   86,   86, 2105,   86,   86,   86, 2110,
+     2103,   86, 2112, 2101,   86,   86, 2113, 2114,   86, 2106,
+     2107, 2108, 2109,   86, 2111, 2116,   86,   86, 2117,   86,
+     2119, 2115,   86,   86,   86, 2118,   86,   86, 2123, 2120,
+       86,   86,   86,   86,   86,   86,   86,   86,   86, 2124,
 
-     2121,   86, 2124, 2129, 2127,   86, 2130,   86, 2132, 2134,
-       86,   86, 2136, 2131, 2138,   86,   86, 2133,   86,   86,
-     2135, 2141,   86, 2140,   86, 2137,   86, 2142,   86, 2143,
-     2146,   86,   86,   86,   86,   86,   86, 2147,   86, 2149,
-     2152,   86, 2139,   86, 2144,   86, 2148,   86, 2145, 2151,
-       86, 2153, 2157, 2150, 2156,   86, 2159, 2158, 2154,   86,
-       86, 2162,   86,   86,   86, 2155,   86, 2160,   86, 2164,
-       86, 2165, 2166,   86,   86, 2161, 2163,   86, 2167, 2171,
-       86,   86, 2173, 2169, 2168,   86, 2170, 2174,   86,   86,
-     2175,   86,   86,   86, 2178,   86,   86, 2176, 2179,   86,
+       86,   86,   86, 2131, 2122, 2121, 2126, 2127, 2128, 2136,
+       86, 2137, 2125, 2130, 2135,   86, 2132,   86, 2129,   86,
+     2133,   86, 2139,   86, 2134,   86, 2140, 2143, 2142,   86,
+       86,   86,   86,   86,   86, 2138, 2145, 2141,   86, 2146,
+       86,   86, 2147, 2149,   86,   86, 2151, 2144, 2148,   86,
+     2150, 2153, 2155,   86,   86, 2154,   86,   86,   86, 2152,
+     2158, 2157, 2159,   86,   86,   86,   86, 2163, 2160,   86,
+     2164, 2156, 2161,   86,   86,   86,   86, 2166,   86, 2165,
+     2169,   86,   86, 2170, 2162,   86, 2173,   86, 3252, 2168,
+     2174, 2171,   86, 2167,   86,   86, 2175,   86, 2172, 2179,
 
-       86, 2172,   86, 2177,   86, 2180, 2183,   86, 2182,   86,
-       86,   86,   86,   86, 2184, 2181, 2187,   86, 2185,   86,
-     2186,   86, 2189, 2190, 2188,   86, 2192,   86, 2194,   86,
-     2193,   86, 2191, 2195,   86, 2197, 2198,   86, 2203,   86,
-     2202,   86, 2201, 2205,   86,   86, 2196,   86,   86, 2199,
-     2204, 2207,   86, 2208,  168, 2200, 2211, 2213,   86,   86,
-     2214, 2212,   86,   86, 2206, 2209,   86,   86, 2222,   86,
-     2215, 2218,   86,   86, 2219,   86, 2210, 2216, 2217, 2223,
-       86,   86, 2224,   86, 2227,   86,   86, 2225, 2220, 2233,
-       86, 2228,   86, 2229, 2230,   86,   86,   86, 2232, 2221,
+       86,   86, 2181, 2177,   86, 2176,   86, 2182,   86, 2180,
+       86, 2178,   86, 2183,   86, 2184, 2188,   86,   86,   86,
+       86, 2186, 2190,   86, 2187,   86, 2185, 2191,   86, 2192,
+     2193, 2194,   86,   86,   86,   86, 2197, 2195, 2189, 2196,
+     2200,   86, 2199,   86,   86, 2198,   86,   86,   86,   86,
+       86,   86,   86, 2201,   86,   86, 2209, 2210, 2206, 2207,
+     2203, 2202, 2204, 2211, 2205,   86,   86,   86,   86,   86,
+     2208, 2212, 2214,   86,   86, 2220,   86,  168, 2215,   86,
+     2222,   86, 2216, 2219, 2213,   86, 2217,   86, 2221, 2224,
+       86, 2228, 2223,   86, 2218, 2225, 2229,   86, 2230, 2227,
 
-       86, 2226, 2231,   86,   86,   86,   86, 2235,   86,   86,
-       86, 2238,   86,   86,   86, 2241, 2234,   86,   86,   86,
-     2236,   86, 2245, 2248, 2240, 2247,   86,   86, 2243,   86,
-     2237, 2239, 2242, 2244, 2250,   86, 2249,   86,   86,   86,
-     2246,   86, 2252,   86, 2255, 2258,   86,   86,   86, 2253,
-       86,   86,   86, 2251, 2256, 2259,   86, 2254,   86,   86,
-       86, 2257,   86, 3234,   86,   86,   86, 2260, 2271, 2261,
-     2270, 2266, 2272,   86, 2262, 2264, 2263, 2268, 2269, 2265,
-       86, 2267,   86,   86,   86, 2273, 2274,   86,   86, 2278,
-     2279,   86, 2280,   86,   86, 2275,   86,   86, 2276,   86,
+     2226, 2231,   86,   86,   86, 2232,   86,   86, 2235,   86,
+       86, 2233,   86, 2234,   86, 2236, 2240,   86, 2242, 2239,
+       86, 2241, 2244,   86, 2246,   86,   86,   86,   86, 2237,
+     2243, 2245, 2247,   86,   86, 2249,   86,   86,   86, 2248,
+     2238,   86, 2250,   86,   86, 2251,   86, 2252,   86, 2255,
+       86,   86, 2254, 2258,   86,   86, 2253,   86, 2264,   86,
+     2256, 2257, 2262,   86,   86,   86,   86, 2260, 2259, 2265,
+       86, 2267,   86,   86, 2261,   86,   86, 2263, 2266, 2269,
+     2272,   86, 2270, 2275,   86,   86,   86,   86,   86, 2273,
+     2268,   86, 2271, 2276,   86,   86,   86,   86,   86, 2274,
 
-     2277,   86, 2283, 2286,   86, 2284,   86,   86, 2285, 2281,
-     2282, 2287, 2288,   86,   86, 2292,   86, 2293,   86, 2289,
-       86, 2295,   86,   86, 2297,   86, 2291,   86,   86,   86,
-     2300,   86,   86, 2290, 2299, 2301,   86, 2303,   86, 2294,
-       86, 2296, 2298,   86, 2307,   86, 2302,   86, 2306, 2309,
-       86,   86, 2304,   86,   86,   86, 2312,   86, 2313, 2305,
-     2311, 2315,   86,   86,   86,   86, 2308, 2319,   86, 2310,
-       86,   86,   86, 2314, 2316,   86, 2323,   86, 2317, 2324,
-       86,   86, 2326, 2318,   86, 2320, 2322, 2329,   86,   86,
-       86,   86,   86, 2321, 2325,   86, 2327, 2331,   86, 2328,
+       86,   86,   86, 2291, 2287, 2277, 2278,   86, 2283, 2288,
+       86, 2279,   86, 2281, 2286, 2280, 2282, 2285, 2284, 2289,
+       86,   86,   86, 2292,   86, 2294, 2290,   86, 2295, 2296,
+       86, 2297,   86,   86,   86, 2300, 2293,   86,   86, 2298,
+     2303,   86, 2304,   86,   86,   86, 2299, 2301,   86, 2305,
+     2302,   86,   86, 2306, 2310,   86,   86, 2307, 2311,   86,
+     2313,   86,   86, 2309,   86, 2308, 2315,   86,   86, 2317,
+       86, 2312, 2318,   86, 2314, 2319,   86, 2316,   86, 2321,
+       86,   86, 2320, 2325,   86,   86, 2324, 2327,   86,   86,
+       86,   86, 2322,   86, 2330,   86, 2329,   86, 2331, 2323,
 
-       86, 2336,   86,   86,   86, 2332, 2338,   86, 2343, 2330,
-     2333, 2337,   86, 2334,   86, 2339,   86,   86,   86, 2342,
-       86, 2344,   86,   86, 2335, 2348,   86, 2353, 2350,   86,
-     2340, 2346, 2341,   86, 2351,   86, 2355,   86, 2347, 2345,
-       86, 2352,   86,   86,   86, 2356,   86,   86, 2349, 2357,
-     2360,   86, 2361,   86,   86,   86, 2354,   86,   86, 2359,
-     2362, 2368, 2358, 2363, 2364, 2366, 2367, 2365,   86,   86,
-     2371,   86,   86, 2372,   86, 2373,  168, 2370, 2369,   86,
-       86, 2375,   86, 2374,   86,   86, 2380,   86,   86,   86,
-       86,   86,   86, 2387,   86,   86,   86, 2382, 2378, 2381,
+     2333,   86,   86,   86, 2326, 2337,   86, 2328,   86,   86,
+     2335,   86, 2334, 2332,   86, 2341, 2342,   86,   86,   86,
+       86, 2336,   86, 2338, 2340, 2344, 2347,   86,   86,   86,
+       86, 2339,   86, 2343, 2345, 2349,   86, 2346, 2348,   86,
+     2354,   86,   86, 2350,   86,   86, 2356,   86, 2351,   86,
+     2352, 2355, 2357, 2360,   86,   86,   86,   86,   86, 2361,
+     2362, 2366, 2353,   86,   86, 3252,   86, 2358, 2365, 2359,
+     2363, 2364,   86,   86, 2371, 2373,   86, 2368, 2369, 2370,
+       86,   86,   86, 2367, 2372,   86,   86, 2374,   86, 2377,
+     2375, 2376,   86,   86,   86, 2378,   86, 2379, 2384,   86,
 
-     2376, 2379, 2377, 2383,   86, 2384, 2386, 2385, 2390, 2388,
-     2391,   86,   86, 2392,   86, 2389, 2393,   86,   86, 2395,
-     2396, 2394, 2397,   86, 2399,   86,   86,   86,   86,   86,
-     2401,   86, 2398,   86,   86,   86, 2405,   86, 2406,   86,
-       86, 2400,   86, 2402,   86, 2408, 2409, 2403, 2415,   86,
-       86, 2407, 2410, 2404, 2411,   86,   86, 2413, 2418,   86,
-       86, 2412, 2414,   86, 2417,   86,   86,   86,   86,   86,
-     2416, 2420,   86,   86,   86, 2427, 2424,   86, 2419, 2426,
-       86,   86,   86, 2423,   86,   86, 2428, 2421, 2422, 2431,
-       86,   86,   86, 2425, 2436, 2429,   86, 2435,   86,   86,
+     2383, 2385, 2380, 2381,   86, 2382,   86,   86,   86, 2390,
+     2386,   86, 2389,   86, 2391,   86,  168, 2388,   86, 2387,
+       86, 2393, 2392,   86, 2398,   86,   86,   86,   86,   86,
+       86,   86,   86,   86, 2405,   86, 2396, 2400, 2394, 2397,
+     2395, 2399, 2401, 2402, 2403, 2404,   86, 2408, 2409,   86,
+       86, 2406, 2407,   86, 2410, 2411,   86,   86,   86, 2414,
+     2412, 2415,   86, 2413, 2418,   86,   86,   86, 2417,   86,
+       86, 2416,   86, 2419,   86,   86, 2423, 2424, 2420,   86,
+       86,   86, 2428,   86, 2421,   86, 2426, 2429,   86, 2427,
+       86, 2431,   86, 2422, 2425, 2430, 2432,   86,   86,   86,
 
-       86, 2430, 2433,   86, 2437, 2438, 2432, 2434,   86, 2440,
-       86, 2445, 2439, 2441,   86, 2443,   86,   86,   86,   86,
-     2444, 2447,   86, 2449,   86, 2442,   86,   86, 2448,   86,
-     2446,   86,   86,   86,   86,   86, 2453,   86, 2455, 2456,
-     3234, 2451, 2457,   86, 2450, 2452, 2458,   86, 2459,   86,
-     2460, 2461,   86,   86,   86,   86,   86, 2463, 2454, 2462,
-     2466,   86, 2468,   86,   86, 2467,   86, 2465,   86, 2471,
-       86,   86, 2464,   86, 2472,   86, 2475, 2476,   86, 2470,
-       86, 2469,   86,   86,   86, 2473,   86, 2477, 2481, 2480,
-       86, 2474, 2479,   86,   86,   86,   86,   86, 2478,   86,
+       86, 2433,   86, 2435, 2436,   86,   86, 2438,   86,   86,
+       86,   86,   86, 2437, 2442, 2445,   86, 2444, 2434,   86,
+       86,   86, 2446, 2441,   86,   86, 2439,   86, 2440, 2449,
+       86, 2443,   86,   86, 2454,   86,   86, 2447, 2453, 2448,
+       86,   86, 2451, 2452, 2455,   86, 2450, 2456, 2525, 2457,
+       86, 2458,   86,   86, 2461, 2459,   86, 2463, 2460,   86,
+     2462, 2465,   86,   86,   86, 2467,   86,   86,   86,   86,
+       86, 2464,   86, 2466, 2471,   86,   86, 2475,   86,   86,
+     2473, 2474, 2469, 2476,   86, 2468, 2470, 2477,   86, 2478,
+       86,   86,   86,   86,   86, 2479, 2481, 2486, 2472, 2484,
 
-     2485,   86, 2487, 2599, 2482,   86, 2484, 2483, 2488,   86,
-     2489,   86, 2490,   86, 2491,   86, 2486, 2492,   86, 2493,
-       86, 2495,   86, 2494,   86, 2496,   86,   86,   86, 2501,
-       86,   86, 2503,   86, 2497, 2504,   86,   86, 2498,   86,
-       86,   86,   86,   86, 2500,   86,   86, 2499, 2505, 2507,
-     2502, 2506, 2508,   86, 2513,   86,   86,   86, 2510,   86,
-       86, 2509,  168, 2511,   86, 2512, 2514,   86, 2521,   86,
-       86,   86, 2515, 2517, 2520,   86, 2516,   86, 2519, 2522,
-       86,   86,   86, 2518, 2523, 2528, 2524,   86, 3234,   86,
-     2532,   86, 2530, 2525, 2531, 2529, 2533,   86,   86, 2526,
+       86,   86,   86,   86,   86,   86, 2483, 2489,   86,   86,
+     2485, 2482, 2480,   86,   86, 2493, 2490, 2494,   86, 2488,
+     2487,   86,   86,   86, 2491,   86, 2495, 2492,   86,   86,
+     2498, 2499, 2497,   86,   86,   86,   86, 3252,   86,   86,
+     2496, 2503, 2500, 2505, 2506,   86, 2502, 2501, 2507,   86,
+     2508,   86, 2509,   86,   86, 2504,   86, 2511,   86, 2513,
+       86, 2512,   86, 2514,   86,   86, 2510,   86, 2519,   86,
+       86,   86, 2515, 2521,   86,   86, 2516, 2522,   86,   86,
+       86,   86, 2523, 2518,   86, 2517, 2528, 2524,   86, 2520,
+       86, 2526, 2531,   86,   86,   86,   86,   86,   86, 2532,
 
-       86, 2534,   86, 2527,   86, 2535,   86, 2536,   86,   86,
-       86,   86,   86, 2538,   86,   86, 2537,   86,   86,   86,
-     2547,   86,   86, 2545, 2540,   86,   86, 2539, 3234, 2542,
-     2541,   86, 2551,   86, 2543, 2544, 2553, 2546,   86, 2548,
-     2549, 2552,   86, 2550, 2556,   86,   86, 2555, 2554, 2558,
-       86, 2559,   86,   86,   86, 2557,   86,   86,   86,   86,
-     2561,   86, 2567,   86, 2568,   86,   86, 2571,   86, 2562,
-     2560,   86, 2570,   86, 2563, 2564, 2569, 2565, 2566, 2572,
-       86, 2573,   86,   86,   86,   86,   86,   86, 2575, 2574,
-     2577, 2580,   86,   86, 2581, 2582,   86,   86,   86, 2583,
+     2527,  168,   86, 2539, 2529,   86,   86,   86, 2530, 2535,
+       86,   86, 2537, 2538, 2540, 2534,   86,   86, 2550,   86,
+     2533, 2536, 2541,   86, 2543, 2542, 2546,   86,   86,   86,
+       86, 2547, 2548, 2544, 2549, 2551,   86,   86, 2552, 2545,
+       86, 2553,   86, 2554,   86,   86, 2555,   86,   86, 2557,
+       86,   86,   86,   86,   86, 2556, 2565,   86,   86,   86,
+     2558, 2563,   86,   86, 2569,   86, 2560, 2559, 2570,   86,
+       86, 2562, 2561, 2564, 2571,   86, 2567, 2566,   86, 2573,
+     2568, 2574,   86,   86, 2575, 2576,   86, 2572,   86,   86,
+       86,   86,   86, 3252,   86, 2579, 2577, 2585,   86, 2586,
 
-       86, 2576,   86, 2578, 2579, 2584,   86, 2586,   86,   86,
-       86,   86, 2585,   86, 2588, 2590,   86,   86,   86, 2587,
-     2594, 2595,   86, 2598,   86,   86, 2602,   86, 2589, 2591,
-     2592, 2596,   86, 2593,   86,   86, 2597,   86, 2601,   86,
-     2600, 2607,   86,   86,   86, 2603,   86,   86, 2611,   86,
-     2604, 2610,   86, 2609,   86, 2608,   86, 2605,   86, 2606,
-     2613,   86,   86, 2614,   86, 2612, 2617,   86, 2616, 2618,
-       86, 2615,   86, 2619, 2621,   86,   86, 2622, 2620,   86,
-     2623, 2626,   86,   86,   86, 2624, 2628,   86, 2625, 2629,
-       86,   86,   86,   86,   86, 2630,   86, 2632, 2627,   86,
+       86, 2578,   86,   86, 2580,   86,   86,   86, 2581, 2582,
+     2583, 2584, 2588, 2589,   86, 2590,   86, 2591,   86,   86,
+     2587, 2592, 2593,   86, 2594,   86,   86,   86,   86, 2599,
+     2595, 2598, 2600,   86,   86,   86, 2601,   86, 2596, 2597,
+     2602,   86,   86,   86, 2604,   86,   86, 2603,   86,   86,
+     2608, 3252,   86,   86, 2606, 2612, 2605, 2613,   86,   86,
+     2616,   86,   86, 2607,   86,   86, 2609, 2610, 2614, 2611,
+       86,   86, 2620,   86, 2617, 2619,   86, 2615, 2621, 2618,
+       86,   86, 2623, 2625,   86,   86,   86, 2629,   86,   86,
+     2628, 2622,   86, 2626, 2627, 2631,   86, 2632,   86,   86,
 
-       86, 2633,   86,   86, 2636, 2631,   86, 2638, 2635, 2641,
-       86, 2639,   86, 2634,   86, 2637, 2642,   86, 2640, 2643,
-      168, 2644,   86,   86,   86, 2648, 3234, 2645,   86, 2649,
-     2646,   86,   86, 2650,   86, 2653,   86, 2654,   86, 2652,
-       86, 2647, 2658, 2651, 2656,   86,   86, 2659,   86, 2657,
-       86,   86,   86, 2655, 2663, 2660, 2661,   86,   86,   86,
-       86, 2664,   86, 2665,   86,   86, 2662, 2670, 2666, 2671,
-       86,   86, 2668,   86,   86,   86, 2672, 2667,   86,   86,
-       86,   86, 2673, 2675, 2676, 2678, 2669,   86,   86,   86,
-     2674, 2677, 2679, 2686,   86,   86,   86, 2684,   86,   86,
+     2624,   86, 2636,   86,   86, 2637,   86, 2633, 2630, 2639,
+       86,   86,   86, 2635,   86, 2634,   86,   86, 2644,   86,
+     2646,   86,   86, 2642, 2640, 2641, 2643, 2647, 2638,   86,
+       86, 2645,   86,   86, 2648,   86,   86, 2650,   86, 3252,
+       86, 2651,   86,   86, 2649, 2653, 2654, 2656, 2657,   86,
+     2659,   86, 2660,   86, 2652, 2655, 2661,  168,   86,   86,
+       86,   86, 2666, 3252, 2658, 2662, 2663,   86,   86,   86,
+     2668,   86, 2667, 3252,   86, 2671,   86, 2664, 2665, 2670,
+     2672,   86,   86, 2674,   86,   86, 2669, 2676, 2675,   86,
+       86,   86, 2677,   86, 2678, 2673, 2679, 2681,   86,   86,
 
-       86,   86, 2681, 2682, 2683,   86, 2680, 2685,   86, 2691,
-       86, 2687,   86,   86,   86, 2695,   86,   86,   86, 2688,
-       86, 2689, 2693,   86,   86, 2700,   86, 2690, 2699, 2694,
-       86, 2692, 2702, 2697,   86, 2703, 2696, 2704,   86, 2708,
-     2698,   86, 2706,   86, 2705,   86,   86,   86, 2701,   86,
-       86, 2707,   86, 2710,   86, 2713,   86, 2715,   86,   86,
-     2709, 2716,   86, 2718, 2711, 2717,   86, 2712,   86, 2720,
-       86,   86,   86, 2719, 2714,   86, 2724, 2722,   86,   86,
-     2727, 2725,   86, 2728,   86, 2729,   86, 2723,   86,   86,
-       86, 2721, 2730,   86, 2734,   86,   86, 2735, 2726, 2736,
+       86,   86, 2682,   86, 2680, 2683,   86,   86, 2684, 2688,
+       86, 2689,   86,   86, 2686,   86, 2685,   86, 2690,   86,
+       86,   86, 2691,   86, 2694, 2693,   86,   86, 2687,   86,
+     2698,   86, 2696,   86, 2697, 2692, 2699,   86, 2695, 2704,
+     2700,   86, 2701,   86, 2702,   86, 2703, 2705,   86,   86,
+       86,   86, 2709,   86,   86,   86,   86, 2713,   86, 2711,
+       86,   86,   86, 2718,   86,   86, 2717, 2706, 3252, 2707,
+     2708, 2712, 2720, 2710, 2714, 2715, 2721, 2722,   86, 2723,
+       86, 2716,   86,   86,   86,   86,   86,   86,   86,   86,
+     2719, 2725, 2724, 2728, 2726,   86,   86, 2731,   86,   86,
 
-       86, 2731,   86, 2738,   86,   86,   86,   86, 2732, 2742,
-     2743,   86,   86, 2733, 2745,   86, 2744, 2737, 2739, 2746,
-       86, 2741,   86,   86, 2740,   86,   86, 2751,   86,   86,
-       86, 2750,   86,   86, 2753, 2754,   86, 2755,   86,   86,
-       86, 2757,   86, 2748,   86, 2747, 2749, 2756,   86,   86,
-     2760, 2759,   86, 2752, 2758,   86, 2766, 2761, 2762,   86,
-     2763,   86, 2764, 2767,   86,   86,   86,   86, 2769,   86,
-     2774,   86, 2765, 2768, 2775, 2771, 2770, 2773,   86, 2776,
-       86, 2778,   86,   86, 2779, 2772,   86, 2780,   86, 2781,
-     2777,   86, 2782,   86, 2783,   86,   86,   86, 2784,   86,
+     2727, 3252, 2729, 2733,   86, 2734,   86, 2735,   86,   86,
+     2730,   86,   86, 2736, 2738,   86, 2732, 2737,   86, 2739,
+       86, 2742,   86, 2740,   86, 2745, 2743,   86, 2746,   86,
+       86, 2744, 2741, 2747,   86,   86,   86,   86, 2748,   86,
+     2750, 2752,   86, 2749,   86, 2753, 2754,   86, 2756,   86,
+       86,   86, 2755, 2760, 2761,   86, 2751, 2758,   86,   86,
+       86, 2763, 2762, 2757,   86, 2759, 2764,   86,   86,   86,
+     2769,   86,   86,   86,   86, 2768,   86, 2771, 2772,   86,
+       86,   86, 2774, 2765, 2766, 2773,   86,   86, 2767, 2775,
+     2777,   86, 2778,   86,   86,   86, 2770, 2776, 2779, 2780,
 
-       86,   86,   86,   86, 2788, 2792,   86,   86, 3234, 2789,
-     2793, 2795,   86, 2797,   86, 2785, 2787,   86, 2799,   86,
-     2794, 2790, 2786, 2791, 2796,   86,   86,   86,   86,   86,
-     2798, 2804,   86,   86,   86, 2800, 2801, 2802, 2805,   86,
-     2808,   86, 2806,   86,   86, 2809,   86, 2803, 2812,   86,
-     2811,   86,   86,   86, 2807,   86, 2810, 2813, 2814,   86,
-     2815,   86,   86, 2816, 2819,   86,   86,   86,   86,   86,
-       86, 2818, 2824,   86, 2820, 2822, 2817,   86,   86,   86,
-     2825, 2868, 2827,   86, 2828,   86, 2829, 2823,   86, 2838,
-     2821, 2826, 2830, 2831,   86, 2832, 2834,   86, 2833, 2835,
+     2781,   86, 2785,   86,   86,   86,   86,   86, 2787,   86,
+       86, 2782,   86, 2792, 2783, 2784, 2788, 2791, 2786, 2793,
+     2789, 2796,   86,   86, 2794,   86, 2790,   86, 2797,   86,
+     2798, 2795,   86, 2799,   86, 2800,   86,   86,   86, 2801,
+       86, 2802,   86,   86,   86,   86,   86, 2806, 2810,   86,
+       86,   86, 2807, 2811, 2813,   86,   86, 2803, 2814, 2805,
+     2815,   86, 2812,   86, 2804, 2808, 2809,   86, 2816, 2817,
+       86,   86,   86,   86, 2821,   86, 2818, 2822,   86, 2823,
+     2819, 2820, 2824,   86, 2826,   86,   86,   86,   86, 2827,
+       86, 2830,   86, 2831, 2829, 2832,   86,   86, 2825, 2828,
 
-       86, 2836,   86,   86,   86,   86,   86, 2841,   86,   86,
-     2840, 2842, 2837,   86, 2843, 2844,   86,   86,   86,   86,
-       86, 2850,   86, 2839, 2848,   86, 2845,   86,   86, 2846,
-     2852,   86, 2853,   86, 2856,   86,   86,   86, 2849, 2847,
-     2854, 2855,   86,   86, 2857, 2861,   86, 2851,   86,   86,
-       86,   86, 2858,   86, 2864,   86,   86, 2859,   86,   86,
-     2865, 2862, 2863, 2860, 2869, 2870,   86, 2873,   86, 2866,
-       86, 2875,   86,   86, 2867,   86, 2871, 2876,   86, 2878,
-       86,   86,   86,   86, 2883,   86,   86,   86, 2882, 2874,
-       86, 2879, 2872,   86, 2877,   86, 2887, 2880, 2881,   86,
+     2833,   86,   86,   86,   86,   86, 2834,   86,   86, 2842,
+       86,   86, 2837,   86,   86,   86, 2838, 2840, 2845, 2846,
+     2836,   86, 2835, 2843,   86, 2847,   86, 2841,   86,   86,
+     2839, 2844,   86, 2849, 2880, 2848,   86, 2850, 2852,   86,
+     2851, 2853,   86, 2854,   86,   86,   86,   86,   86, 2856,
+     2859, 2857, 2858, 2860, 2855,   86,   86, 2862,   86,   86,
+     2861,   86,   86,   86, 2863,   86, 2868, 2866, 2870,   86,
+       86, 2864,   86,   86, 2871,   86,   86, 2874, 2872,   86,
+     2873, 2867, 2865,   86,   86,   86, 2879,   86,   86,   86,
+     2869,   86,   86, 2882,   86,   86,   86,   86, 2875, 2876,
 
-     2890,   86,   86,   86,   86, 2892, 2884, 2888, 2893, 2886,
-     2885,   86, 2895,   86, 2896,   86,   86,   86, 2889, 2898,
-       86,   86, 2891,   86,   86, 2903, 2894,   86, 2900,   86,
-     2901,   86, 2907,   86,   86,   86, 2897, 2908,   86, 2899,
-       86, 2905, 3234, 2902, 2906, 2912, 2904,   86, 2909,   86,
-     2910,   86, 2913,   86,   86, 2911, 2915, 2914, 2916,   86,
-     2918,   86,   86,   86, 2917,   86, 2921,   86, 2919,   86,
-     2924,   86,   86,   86, 2927,   86, 2929,   86,   86, 2925,
-       86,   86, 2933,   86, 2920, 2931, 2922, 2923, 2928, 2932,
-       86, 2926, 2934,   86,   86, 2935,   86, 2930, 2938,   86,
+     2877, 2881, 2886, 2878, 2883,   86, 2888, 2884,   86,   86,
+     2887, 2885, 2891,   86, 2889, 2893,   86, 2894,   86,   86,
+     2896,   86,   86,   86,   86,   86, 2901,   86, 2892, 2900,
+       86,   86,   86,   86, 2890,   86, 2905,   86, 2897, 2898,
+     2895, 2899, 2908,   86,   86,   86, 2910, 2906,   86,   86,
+     2902, 2904,   86, 2911, 2903,   86, 2907, 2913,   86, 2914,
+       86, 2916,   86,   86, 2909,   86, 2918, 2912, 2921, 2915,
+       86,   86, 2919,   86,   86, 2925,   86,   86,   86, 2927,
+     2926, 2917,   86, 2923,   86, 2920, 2930, 2931,   86, 2922,
+     2933,   86,   86, 2924, 2928,   86,   86,   86, 2932, 2936,
 
-       86, 2937, 2939,   86, 2940,   86, 2942,   86, 2936,   86,
-     2944,   86,   86,   86, 2943,   86,   86,   86, 2949, 2950,
-       86,   86,   86,   86,   86,   86, 2941, 2954,   86, 2946,
-     2955,   86, 2945, 2953, 2956, 2951,   86, 2947, 2948,   86,
-       86, 2959, 2952, 2957, 2958, 2960,   86, 2961,   86,   86,
-     2964,   86,   86, 2963, 2962,   86,   86, 2967,   86,   86,
-     2966,   86,   86, 2965, 2968,   86,   86, 2971,   86,   86,
-       86,   86, 2973,   86,   86, 2969, 2974, 2972,   86,   86,
-       86, 2970,   86,   86,   86, 2983,   86, 2984, 2975, 2979,
-     2976, 2977, 2978, 2986,   86, 2980, 2981,   86, 3234,   86,
+       86,   86, 2935,   86, 2929, 2939, 2937,   86,   86, 2934,
+       86,   86, 2942,   86,   86,   86,   86, 2947,   86,   86,
+     2943,   86, 2938, 2949, 2940, 2941, 2951,   86, 2944, 2946,
+     2950, 2952,   86,   86, 2948,   86,   86,   86, 2953, 2945,
+       86, 2955, 2956,   86, 2957,   86, 2958,   86, 2960, 2954,
+       86, 2962,   86,   86,   86, 2961,   86,   86,   86, 2963,
+       86, 2967,   86, 2959, 2968,   86,   86,   86, 2972,   86,
+     2973,   86, 2969,   86, 2974, 2964, 2971, 3252, 2965, 2966,
+       86,   86, 2970,   86, 2978,   86, 2975, 2982, 2977, 2979,
+       86,   86, 2976,   86,   86, 2981, 2980,   86, 2985,   86,
 
-     2982,   86, 2987, 2985, 2988, 2995, 2989, 2990, 2991,   86,
-     2992,   86,   86,   86, 2996,   86, 2993,   86, 2994, 2997,
-       86, 2998, 2999,   86,   86, 3000, 3001, 3004,   86, 3002,
-     3003,   86,   86, 3005,   86, 3006,   86,   86,   86, 3011,
-       86,   86,   86, 3010,   86, 3007,   86,   86, 3014, 3013,
-       86,   86,   86, 3019,   86, 3015, 3008, 3009, 3020,   86,
-     3018,   86, 3016, 3021,   86,   86, 3012,   86, 3017, 3022,
-     3023,   86, 3026,   86, 3028,   86, 3024, 3027,   86, 3025,
-       86,   86,   86,   86,   86, 3234, 3029, 3032, 3030, 3033,
-     3035,   86, 3031, 3036, 3034,   86, 3038,   86, 3059,   86,
+       86,   86,   86,   86,   86, 2984, 2983, 2986, 2989,   86,
+       86,   86,   86,   86,   86, 2991, 2990,   86, 2992,   86,
+     2987, 2988,   86,   86,   86,   86,   86,   86, 3084, 3001,
+     2993, 3002, 2994, 2995, 3003, 2996, 2998, 2999, 2997, 3004,
+       86,   86,   86,   86, 3000,   86, 3005, 3006, 3007, 3009,
+       86, 3010,   86, 3008,   86,   86, 3014,   86, 3011,   86,
+     3012, 3013, 3015,   86, 3016, 3017,   86,   86, 3018, 3019,
+     3022,   86, 3020, 3021,   86,   86, 3023,   86,   86,   86,
+       86,   86, 3029,   86, 3030,   86, 3028,   86,   86, 3032,
+       86,   86, 3024, 3025, 3031,   86, 3252, 3033, 3026,   86,
 
-     3057, 3037, 3039,   86, 3040,   86,   86, 3042,   86, 3043,
-       86, 3041,   86, 3045,   86, 3046,   86, 3047,   86, 3048,
-       86, 3044, 3049,   86, 3050,   86, 3051,   86,   86, 3053,
-       86,   86,   86,   86, 3058,   86,   86, 3052,   86,   86,
-     3054,   86, 3062,   86, 3055, 3064,   86,   86,   86, 3060,
-     3061, 3066,   86, 3056, 3063,   86, 3068,   86, 3071,   86,
-     3070, 3065,   86,   86,   86,   86,   86,   86, 3073,   86,
-     3069,   86,   86, 3067,   86, 3077, 3072, 3081, 3074,   86,
-     3078,   86, 3076, 3075, 3083,   86,   86, 3079, 3084,   86,
-     3085,   86, 3082, 3080,   86, 3087,   86,   86, 3088,   86,
+     3027,   86, 3037,   86, 3036, 3034, 3038,   86, 3041, 3035,
+     3039,   86,   86, 3044, 3040,   86, 3046,   86, 3045,   86,
+       86, 3042,   86,   86, 3043,   86,   86,   86, 3050, 3054,
+     3051,   86, 3048, 3053,   86,   86, 3062, 3055, 3056,   86,
+     3047, 3049, 3057,   86,   86, 3052, 3058,   86, 3252, 3059,
+     3060,   86, 3061,   86, 3063,   86, 3064,   86, 3065,   86,
+     3066,   86, 3067,   86, 3068,   86, 3069,   86,   86, 3071,
+       86,   86,   86,   86,   86,   86,   86, 3070, 3076,   86,
+     3072,   86,   86,   86, 3073,   86, 3080,   86, 3079, 3077,
+     3082,   86,   86, 3074, 3075, 3078, 3081,   86, 3086,   86,
 
-       86,   86,   86,   86, 3086, 3093,   86,   86, 3094,   86,
-     3096, 3090, 3092,   86,   86,   86, 3089, 3095,   86,   86,
-     3097, 3099, 3091,   86,   86,   86,   86,   86, 3103,   86,
-     3100, 3106, 3098, 3102, 3108, 3104,   86, 3111,   86, 3109,
-     3101,   86, 3113,   86,   86, 3105,   86, 3107,   86, 3114,
-     3112, 3115,   86, 3116,   86,   86, 3110,   86, 3119,   86,
-       86,   86, 3120, 3117, 3121, 3124, 3118,   86,   86,   86,
-       86,   86, 3129,   86, 3127,   86, 3123, 3130,   86,   86,
-     3126, 3125,   86, 3133,   86, 3122,   86,   86, 3136,   86,
-     3128,   86, 3137, 3135, 3131,   86,   86,   86, 3140,   86,
+     3089, 3083, 3088,   86,   86,   86,   86,   86,   86, 3091,
+     3087,   86,   86, 3085, 3095,   86,   86, 3090,   86,   86,
+       86, 3096, 3099, 3252, 3092, 3093,   86, 3094, 3101,   86,
+     3097, 3100, 3102,   86, 3103,   86,   86,   86,   86,   86,
+       86, 3106, 3098, 3104,   86, 3105, 3107,   86,   86, 3111,
+     3112, 3110, 3108,   86,   86, 3114,   86,   86,   86,   86,
+     3115,   86, 3109,   86,   86,   86,   86,   86, 3113,   86,
+     3121, 3124,   86, 3118, 3126, 3116, 3117, 3122, 3120,   86,
+     3129,   86,   86,   86, 3119, 3123, 3127, 3125, 3131,   86,
+       86, 3130,   86, 3132, 3133,   86, 3134,   86,   86, 3128,
 
-     3141, 3132, 3134, 3138,   86, 3139,   86,   86,   86,   86,
-     3142,   86, 3143, 3145, 3146,   86, 3144, 3147,   86,   86,
-       86,   86,   86, 3151,   86, 3150, 3153,   86, 3148, 3149,
-       86,   86,   86,   86, 3160,   86, 3158, 3155, 3159,   86,
-     3152, 3154,   86, 3156, 3164,   86, 3157,   86,   86, 3166,
-       86, 3167, 3161, 3165,   86,   86, 3172, 3162,   86, 3168,
-       86, 3163,   86, 3169,   86, 3170, 3171, 3173,   86, 3174,
-     3175,   86,   86,   86,   86,   86, 3176,   86, 3181,   86,
-       86, 3178,   86, 3184,   86, 3185,   86,   86,   86,   86,
-       86,   86, 3177, 3183, 3179, 3188, 3180, 3186, 3182,   86,
+       86, 3137, 3135,   86,   86, 3138,   86, 3142, 3139,   86,
+     3136,   86,   86,   86,   86,   86, 3145, 3147,   86, 3148,
+       86, 3141,   86, 3143, 3144, 3151,   86,   86,   86, 3140,
+     3149, 3154,   86,   86, 3146,   86, 3155,   86, 3158,   86,
+       86, 3150, 3152, 3159,   86, 3156, 3153,   86,   86,   86,
+       86,   86, 3157, 3160,   86, 3163, 3164,   86,   86, 3162,
+     3161, 3165,   86,   86,   86,   86,   86, 3169, 3168, 3166,
+     3171, 3167,   86,   86,   86,   86,   86,   86, 3170, 3173,
+     3176, 3177,   86, 3172, 3184, 3174, 3178,   86, 3182,   86,
+       86,   86, 3175,   86, 3179, 3180, 3183,   86, 3185,   86,
 
-     3187,   86, 3192,   86, 3191,   86, 3189,   86, 3190,   86,
-     3193, 3234, 3194,   86, 3196,   86, 3198,   86, 3199,   86,
-       86, 3203,   86,   86, 3200,   86, 3197, 3201, 3202, 3195,
-     3204,   86,   86, 3205, 3206,   86,   86,   86,   86, 3207,
-       86,   86, 3209, 3208,   86, 3210, 3212,   86,   86, 3214,
-       86,   86, 3218, 3215, 3219,   86, 3211, 3213,   86,   86,
-     3216,   86, 3222, 3223,   86,   86, 3225,   86,   86, 3217,
-     3226,   86, 3224,   86,   86, 3227,   86, 3220, 3221, 3228,
-       86, 3229, 3232,   86, 3233,   86, 3234, 3234, 3234, 3234,
-     3234, 3234, 3230, 3234, 3234, 3234, 3234, 3234, 3234, 3231,
+       86, 3181,   86, 3190, 3186, 3187,   86, 3188,   86,   86,
+     3191,   86, 3189, 3192, 3193,   86,   86,   86,   86,   86,
+     3194, 3199,   86,   86, 3196, 3195, 3252,   86,   86, 3202,
+     3203,   86,   86,   86,   86,   86, 3201, 3197, 3198, 3206,
+       86, 3200, 3204,   86, 3210, 3205,   86,   86,   86,   86,
+     3214, 3207, 3211, 3209, 3208, 3252,   86,   86, 3216, 3212,
+       86, 3217,   86,   86,   86, 3221,   86, 3218,   86,   86,
+     3219, 3223,   86, 3222, 3213, 3215, 3224,   86,   86, 3225,
+       86,   86,   86, 3220,   86, 3226, 3228, 3230,   86,   86,
+       86,   86,   86,   86, 3232, 3233,   86, 3236,   86, 3227,
 
-       47,   47,   47,   47,   47,   47,   47,   52,   52,   52,
-       52,   52,   52,   52,   57,   57,   57,   57,   57,   57,
-       57,   63,   63,   63,   63,   63,   63,   63,   68,   68,
-       68,   68,   68,   68,   68,   74,   74,   74,   74,   74,
-       74,   74,   80,   80,   80,   80,   80,   80,   80,   89,
-       89, 3234,   89,   89,   89,   89,  158,  158, 3234, 3234,
-     3234,  158,  158,  160,  160, 3234, 3234,  160, 3234,  160,
-      162, 3234, 3234, 3234, 3234, 3234,  162,  165,  165, 3234,
-     3234, 3234,  165,  165,  167, 3234, 3234, 3234, 3234, 3234,
-      167,  169,  169, 3234,  169,  169,  169,  169,  172, 3234,
+     3252, 3229, 3252, 3231, 3237,   86,   86, 3240, 3241,   86,
+     3234, 3235, 3238,   86, 3243,   86,   86, 3239, 3244,   86,
+     3242,   86,   86, 3245,   86,   86, 3246, 3247, 3250,   86,
+     3251,   86, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3248, 3249,   47,   47,   47,   47,   47,
+       47,   47,   52,   52,   52,   52,   52,   52,   52,   57,
+       57,   57,   57,   57,   57,   57,   63,   63,   63,   63,
+       63,   63,   63,   68,   68,   68,   68,   68,   68,   68,
+       74,   74,   74,   74,   74,   74,   74,   80,   80,   80,
+       80,   80,   80,   80,   89,   89, 3252,   89,   89,   89,
 
-     3234, 3234, 3234, 3234,  172,  175,  175, 3234, 3234, 3234,
-      175,  175,   90,   90, 3234,   90,   90,   90,   90,   17,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234
+       89,  158,  158, 3252, 3252, 3252,  158,  158,  160,  160,
+     3252, 3252,  160, 3252,  160,  162, 3252, 3252, 3252, 3252,
+     3252,  162,  165,  165, 3252, 3252, 3252,  165,  165,  167,
+     3252, 3252, 3252, 3252, 3252,  167,  169,  169, 3252,  169,
+      169,  169,  169,  172, 3252, 3252, 3252, 3252, 3252,  172,
+      175,  175, 3252, 3252, 3252,  175,  175,   90,   90, 3252,
+       90,   90,   90,   90,   17, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+
+     3252, 3252, 3252, 3252, 3252
     } ;
 
-static const flex_int16_t yy_chk[6361] =
+static const flex_int16_t yy_chk[6406] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2200,18 +2210,18 @@ static const flex_int16_t yy_chk[6361] =
         5,    3,    6,   24,    4,   24,   24,    5,   24,    6,
         7,    7,    7,    7,   24,    7,    8,    8,    8,    8,
        33,    8,    7,    9,    9,    9,   26,   26,    8,   10,
-       10,   10,   19,   29,    9,   33,   19,   29, 3242,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3260,   35,
        10,   11,   11,   11,   11,   11,   11,   13,   13,   13,
 
        13,   34,   13,   11,   35,   99,   34,   29,   38,   13,
        51,   51,   11,   12,   12,   12,   12,   12,   12,   14,
        14,   14,   14,   99,   14,   12,   15,   15,   15,   38,
        23,   14,   23,   23,   12,   23,   46,   15,   16,   16,
-       16,   23,   23,   25,   27,   27,   25,   25, 2643,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2661,   16,
        25,   46,   27,   30,   30,   25,   27,   56,   40,   27,
        56,   73,   31,   31,   25,   28,   67,   67,   30,   32,
        28,   31,   40,   32,   28,   73,   32,   28,   92,   28,
-       28,   92,   31,   32, 1067,   32,   36,   36,   37,   37,
+       28,   92,   31,   32, 1075,   32,   36,   36,   37,   37,
        28,   45,   45,   37,  175,   36,   45,   39,   41,   41,
 
        45,   36,   39,   41,   94,   36,   39,   43,   43,   37,
@@ -2227,9 +2237,9 @@ static const flex_int16_t yy_chk[6361] =
 
       104,  114,  111,  113,  108,  110,  110,  113,  116,  115,
       112,  109,  117,  110,  115,  117,  119,  118,  117,  120,
-      123,  114,  116,  118,  120,  126,  121,  122,  727,  121,
+      123,  114,  116,  118,  120,  126,  121,  122,  732,  121,
       125,  117,  117,  121,  123,  119,  124,  125,  126,  128,
-      124,  127,  118,  129,  120,  727,  122,  130,  127,  121,
+      124,  127,  118,  129,  120,  732,  122,  130,  127,  121,
       131,  122,  128,  132,  131,  133,  134,  135,  135,  136,
       133,  139,  137,  129,  133,  130,  137,  138,  143,  140,
       142,  132,  144,  148,  143,  137,  134,  141,  147,  136,
@@ -2254,643 +2264,649 @@ static const flex_int16_t yy_chk[6361] =
       213,  219,  213,  218,  218,  217,  220,  219,  221,  222,
       224,  223,  220,  219,  213,  222,  213,  223,  225,  232,
       226,  227,  234,  228,  225,  226,  223,  227,  221,  228,
-      229,  224,  231,  235,  233,  236,  238,  229,  231,  232,
-      233,  235,  237,  239,  234,  238,  240,  237,  236,  241,
-      242,  246,  243,  244,  247,  242,  242,  243,  239,  245,
+      229,  224,  231,  235,  233,  234,  236,  229,  231,  232,
+      233,  235,  237,  238,  234,  239,  240,  237,  241,  236,
+      242,  244,  238,  243,  246,  242,  242,  245,  243,  247,
 
-      247,  248,  240,  245,  249,  250,  252,  251,  252,  241,
-      249,  244,  251,  246,  253,  254,  257,  255,  256,  248,
-      248,  258,  254,  255,  256,  250,  259,  258,  260,  261,
-      261,  262,  262,  253,  263,  257,  266,  264,  259,  268,
-      263,  269,  260,  264,  265,  267,  265,  270,  271,  272,
-      267,  268,  273,  284,  272,  270,  274,  165,  263,  266,
-      269,  275,  274,  265,  276,  277,  278,  275,  271,  276,
-      277,  279,  278,  280,  281,  273,  282,  283,  284,  287,
-      286,  287,  285,  286,  290,  283,  279,  280,  285,  293,
-      282,  294,  281,  288,  288,  289,  291,  291,  289,  292,
+      239,  245,  240,  248,  249,  247,  250,  251,  241,  244,
+      249,  252,  251,  252,  253,  257,  246,  254,  312,  255,
+      259,  248,  248,  256,  254,  255,  250,  260,  266,  256,
+      258,  312,  259,  253,  257,  268,  258,  261,  261,  262,
+      262,  260,  263,  264,  265,  267,  265,  268,  263,  264,
+      267,  266,  269,  270,  271,  272,  273,  276,  274,  275,
+      272,  270,  276,  265,  274,  275,  263,  277,  279,  278,
+      280,  269,  277,  281,  271,  278,  282,  283,  284,  273,
+      285,  288,  288,  279,  280,  283,  285,  290,  293,  286,
+      282,  281,  286,  287,  289,  287,  294,  289,  291,  291,
 
-      292,  295,  290,  296,  295,  293,  294,  296,  297,  298,
-      299,  300,  302,  301,  302,  303,  299,  297,  298,  301,
-      304,  303,  305,  305,  304,  300,  306,  307,  308,  309,
-      310,  306,  312,  307,  308,  311,  313,  313,  317,  314,
-      315,  304,  314,  316,  318,  312,  320,  316,  310,  309,
-      319,  319,  321,  308,  322,  321,  311,  317,  315,  323,
-      324,  325,  318,  324,  320,  323,  322,  327,  331,  328,
-      329,  331,  321,  325,  326,  329,  327,  330,  333,  164,
-      330,  338,  330,  326,  332,  336,  326,  328,  336,  162,
-      333,  326,  326,  326,  326,  337,  338,  332,  330,  334,
+      292,  292,  165,  284,  293,  290,  295,  297,  296,  295,
+      298,  294,  296,  300,  299,  301,  297,  303,  309,  298,
+      299,  301,  302,  303,  302,  304,  307,  300,  306,  304,
+      305,  305,  307,  306,  308,  310,  311,  315,  309,  316,
+      308,  313,  313,  316,  314,  317,  304,  314,  318,  319,
+      319,  320,  328,  310,  323,  315,  322,  311,  321,  308,
+      323,  321,  324,  325,  317,  324,  318,  327,  322,  320,
+      328,  331,  329,  332,  331,  325,  327,  329,  321,  326,
+      330,  333,  412,  330,  412,  330,  332,  334,  326,  334,
+      334,  326,  336,  333,  337,  336,  326,  326,  326,  326,
 
-      335,  334,  334,  344,  339,  335,  335,  340,  341,  341,
-      343,  343,  337,  339,  342,  337,  340,  345,  344,  342,
-      346,  347,  345,  348,  349,  350,  351,  351,  353,  351,
-      354,  350,  346,  362,  362,  354,  355,  359,  351,  349,
-      347,  356,  355,  348,  357,  361,  356,  358,  353,  357,
-      358,  359,  358,  360,  361,  357,  360,  363,  364,  364,
-      365,  368,  369,  363,  366,  365,  372,  366,  160,  360,
-      375,  381,  360,  366,  360,  370,  371,  366,  377,  374,
-      372,  368,  374,  369,  375,  366,  367,  367,  378,  367,
-      370,  371,  381,  377,  379,  380,  382,  378,  374,  379,
+      335,  330,  338,  339,  340,  335,  335,  341,  341,  345,
+      342,  337,  339,  340,  337,  342,  347,  338,  343,  343,
+      344,  344,  346,  348,  345,  349,  350,  346,  347,  351,
+      354,  352,  352,  355,  352,  351,  363,  363,  355,  357,
+      356,  350,  348,  352,  357,  349,  356,  358,  359,  360,
+      354,  359,  358,  359,  361,  362,  364,  361,  358,  365,
+      365,  366,  364,  360,  362,  367,  366,  371,  367,  369,
+      361,  370,  401,  361,  367,  361,  372,  375,  367,  373,
+      375,  376,  371,  378,  401,  379,  367,  368,  368,  369,
+      368,  372,  370,  373,  379,  376,  375,  382,  378,  380,
 
-      379,  380,  367,  383,  385,  367,  387,  367,  384,  367,
-      376,  388,  376,  376,  386,  382,  389,  384,  383,  391,
-      386,  392,  376,  385,  376,  376,  376,  390,  393,  376,
-      389,  388,  387,  390,  394,  395,  396,  390,  397,  399,
-      395,  392,  391,  400,  397,  398,  398,  401,  393,  394,
-      402,  396,  403,  404,  407,  400,  402,  405,  410,  399,
-      408,  401,  405,  406,  406,  409,  406,  413,  411,  404,
-      411,  413,  410,  416,  407,  414,  408,  403,  417,  414,
-      412,  409,  412,  412,  415,  415,  418,  419,  421,  420,
-      423,  426,  416,  417,  414,  426,  423,  421,  424,  422,
+      383,  381,  384,  368,  380,  380,  368,  381,  368,  386,
+      368,  377,  385,  377,  377,  388,  387,  384,  382,  383,
+      389,  385,  387,  377,  390,  377,  377,  377,  386,  391,
+      377,  392,  393,  394,  395,  391,  392,  396,  390,  391,
+      389,  388,  396,  397,  398,  399,  399,  400,  402,  395,
+      398,  403,  393,  394,  392,  404,  405,  403,  397,  406,
+      407,  407,  402,  407,  406,  408,  409,  400,  410,  411,
+      417,  413,  405,  413,  413,  414,  419,  415,  418,  414,
+      404,  415,  409,  411,  410,  408,  416,  416,  420,  417,
+      421,  413,  419,  418,  422,  423,  415,  426,  425,  424,
 
-      412,  425,  418,  420,  422,  419,  425,  424,  421,  427,
-      421,  429,  422,  422,  428,  430,  422,  422,  427,  431,
-      428,  430,  432,  431,  433,  432,  434,  435,  435,  433,
-      436,  438,  429,  437,  437,  439,  438,  440,  440,  441,
-      442,  443,  444,  436,  442,  441,  434,  445,  439,  446,
-      447,  447,  445,  448,  446,  449,  443,  451,  450,  447,
-      454,  452,  453,  444,  452,  448,  453,  455,  455,  451,
-      457,  459,  454,  456,  462,  449,  450,  463,  456,  458,
-      458,  461,  461,  464,  465,  463,  466,  468,  469,  470,
-      471,  457,  464,  459,  473,  462,  471,  472,  466,  475,
+      423,  428,  426,  422,  421,  424,  420,  425,  423,  423,
+      428,  427,  423,  423,  422,  427,  422,  429,  430,  431,
+      432,  435,  434,  429,  432,  431,  433,  434,  164,  433,
+      436,  436,  437,  438,  438,  439,  440,  441,  441,  430,
+      439,  435,  442,  443,  444,  437,  445,  443,  442,  440,
+      446,  447,  448,  448,  449,  446,  447,  450,  451,  444,
+      452,  448,  453,  455,  454,  453,  449,  445,  454,  456,
+      456,  458,  452,  457,  460,  455,  451,  450,  457,  459,
+      459,  462,  462,  463,  470,  464,  465,  466,  467,  471,
+      469,  472,  458,  464,  476,  465,  460,  473,  477,  476,
 
-      473,  158,  478,  470,  465,  468,  472,  468,  469,  474,
-      476,  479,  477,  475,  474,  477,  478,  480,  476,  481,
-      484,  476,  482,  480,  483,  482,  479,  485,  486,  488,
-      483,  487,  485,  488,  484,  489,  490,  491,  492,  481,
-      489,  493,  491,  494,  497,  499,  500,  501,  483,  499,
-      486,  490,  487,  498,  492,  502,  494,  504,   85,  502,
-      493,  495,  495,  501,  497,  500,  505,  495,  498,  495,
-      506,  505,  504,  503,  507,  495,  509,  495,  503,  508,
-      495,  495,  503,  507,  511,  508,  506,  495,  510,  506,
-      508,  510,  509,  512,  513,  513,  514,  515,  515,  516,
+      467,  162,  470,  473,  463,  472,  474,  466,  469,  471,
+      469,  475,  477,  478,  480,  474,  479,  475,  481,  479,
+      482,  478,  483,  485,  478,  486,  482,  484,  480,  485,
+      484,  487,  488,  481,  489,  491,  487,  490,  492,  486,
+      491,  490,  483,  493,  494,  495,  496,  485,  493,  499,
+      537,  502,  500,  492,  488,  489,  503,  501,  504,  496,
+      494,  501,  504,  506,  495,  497,  497,  500,  537,  499,
+      502,  497,  503,  497,  508,  507,  514,  505,  506,  497,
+      507,  497,  505,  509,  497,  497,  505,  511,  510,  513,
+      508,  497,  509,  508,  510,  512,  514,  516,  512,  510,
 
-      517,  518,  520,  519,  521,  524,  522,  511,  523,  521,
-      527,  525,  517,  512,  516,  522,  518,  525,  530,  527,
-      524,  514,  519,  531,  520,  528,  529,  523,  532,  528,
-      530,  533,  529,  534,  535,  536,  537,  571,  531,  536,
-      538,  571,  538,  539,  541,  533,  542,  532,  534,  537,
-      541,  539,  535,  540,  540,  543,  544,  545,  542,  546,
-      545,  543,  547,  549,  548,  550,  549,  551,  544,  548,
-      552,  597,  553,  546,  550,  552,  552,  547,  554,  554,
-      597,  550,  556,  551,  550,  553,  555,  555,  556,  557,
-      557,  558,  558,  559,  561,  560,  562,  565,  564,  559,
+      515,  515,  518,  511,  517,  517,  519,  521,  520,  522,
+      523,  524,  513,  525,  526,  523,  160,  518,  519,  527,
+      524,  529,  516,  520,  530,  527,  521,  531,  530,  526,
+      529,  522,  525,  531,  532,  533,  534,  535,  536,  538,
+      540,  539,  540,  538,  541,  650,  532,  650,  542,  545,
+      533,  535,  547,  536,  539,  534,  542,  543,  543,  544,
+      546,  545,  549,  550,  547,  544,  546,  548,  541,  551,
+      548,  553,  552,  554,  551,  552,  549,  555,  550,  556,
+      553,  567,  555,  555,  557,  557,  567,  553,  564,  554,
+      553,  559,  556,  558,  558,  560,  560,  559,  561,  561,
 
-      560,  560,  563,  564,  566,  563,  567,  569,  562,  567,
-      570,  572,  566,  568,  574,  561,  565,  572,  568,  573,
-      575,  576,  578,  573,  579,  575,  577,  577,  580,  570,
-      569,  581,  574,  580,  582,  576,  583,  578,  584,  585,
-      587,  589,  583,  584,   80,  579,  590,  581,  586,  588,
-      588,  586,  591,  585,  582,  593,  586,  591,  587,  589,
-      586,  592,  590,  594,  596,  598,  592,  599,  598,  593,
-      596,  599,  600,  601,  602,  603,  601,  600,  594,  602,
-      604,  605,  606,  608,  607,  609,  609,  610,  605,  607,
-      611,  603,  612,  599,  615,  606,  610,  613,  604,  614,
+      562,  565,  563,  568,  569,  571,  562,  563,  563,  564,
+      571,  566,  569,  565,  566,  570,  572,  573,  570,  574,
+      575,  576,  568,  574,  577,  576,  575,  578,  582,  579,
+      580,  580,  578,  581,  584,  583,  573,  585,  586,  572,
+      583,  587,  577,  579,  586,  588,  587,  590,  581,  582,
+      584,  592,  589,  591,  591,  589,  593,  585,  594,  588,
+      589,  595,  596,  594,  589,  590,  595,  597,  599,  592,
+      600,  606,  593,  602,  599,  601,  596,  602,  601,  600,
+      603,  604,  597,  605,  604,  603,  607,  606,  605,  608,
+      609,  611,  610,  612,  612,  614,  608,  610,  613,  602,
 
-      615,  616,  617,  608,  621,  617,  613,  616,  612,  611,
-      622,  614,  618,  618,  619,  618,  620,  619,  624,  623,
-      625,  620,  621,  624,  622,  623,  625,  626,  627,  628,
-      626,  629,  630,  627,  628,  628,  631,  632,  633,  634,
-      636,  631,  635,  632,  629,  630,  638,  635,  634,  637,
-      637,  639,  640,  638,  639,  631,  631,  633,  640,  641,
-      636,  642,  643,  644,  644,  645,  642,  643,  643,  639,
-      646,  641,  646,  647,  648,  649,  648,  650,  651,  652,
-      653,  654,  655,  659,  657,  656,  655,  654,  658,  660,
-      645,  662,  647,  649,  656,  650,  651,  661,  652,  657,
+      615,  616,  618,  609,  607,  617,  619,  613,  618,  624,
+      616,  611,  619,  158,  614,  620,  615,  617,  620,  621,
+      621,  622,  621,  623,  622,  625,  626,  624,  623,  627,
+      628,  630,  626,  637,  627,  629,  628,  631,  629,  625,
+      632,  633,  631,  635,  634,  632,  632,  636,  635,  638,
+      639,  640,  637,  636,  633,  639,  630,  634,  638,  641,
+      641,  642,  635,  635,  643,  645,  644,  643,  642,  646,
+      647,  640,  644,  649,  646,  647,  647,  645,  648,  648,
+      651,  652,  643,  652,  653,  654,  655,  656,  657,  658,
+      659,  660,  661,  664,  659,  658,  662,  663,  649,  651,
 
-      653,  659,  664,  658,  663,  665,  662,  666,  660,  661,
-      663,  667,  670,  669,  668,  671,  664,  665,  668,  672,
-      673,  675,  674,  676,  676,  677,  666,  674,  670,  677,
-      667,  669,  678,  671,  679,  675,  680,  672,  672,  673,
-      682,  681,  683,  686,  684,  679,  681,  685,  686,  690,
-      680,  678,  687,  688,  685,  689,  682,  684,  688,  687,
-      689,  683,  691,  692,  693,  694,  696,  690,  695,  691,
-      697,  696,  692,  697,  694,  698,  699,  700,  693,  698,
-      695,  701,  703,  702,  704,  704,  700,  706,  706,  707,
-      699,  705,  705,  709,  711,  710,  701,  702,  707,  713,
+      660,  665,  653,  654,  655,  666,  656,  661,  657,  668,
+      667,  662,  664,  665,  669,  663,  667,  670,  671,  674,
+      666,  672,  673,  668,  675,  672,  669,  676,  677,  678,
+      679,  680,  680,  682,  678,  674,  670,  671,  683,  681,
+      673,  684,  675,  681,  679,  676,  676,  677,  685,  683,
+      686,  687,  682,  685,  688,  684,  689,  690,  691,  692,
+      694,  697,  690,  689,  692,  691,  686,  688,  693,  695,
+      687,  696,  698,  693,  699,  697,  695,  700,  694,  702,
+      696,  698,  700,  702,  701,  703,  699,  701,  704,  705,
+      707,  706,  708,  708,  709,  709,  716,  704,  714,  703,
 
-      705,  710,  712,  703,  714,  715,  712,  716,  717,  719,
-      718,  713,  709,  716,  711,  720,  717,  718,  721,  724,
-      731,  730,  733,  715,  734,  741,  731,  719,  733,  714,
-      730,  735,  736,  734,  724,  746,  736,  740,  721,  741,
-      720,  722,   75,  722,  737,  737,  722,  735,  738,  738,
-      722,  739,  742,  722,  745,  740,  746,  749,  743,  745,
-      722,  722,  739,  722,  743,  747,  748,  750,  752,  754,
-      748,  750,  742,  744,  744,  744,  779,  744,  753,  751,
-      744,  749,  779,  747,  751,  744,  755,  752,  759,  755,
-      756,  744,  744,  753,  754,  756,  756,  757,  758,  758,
+      710,  710,  711,  709,  705,  706,  712,  711,  715,  717,
+      718,  707,  719,  717,  715,  712,  716,  714,  720,  721,
+      722,  724,  718,  723,  725,  721,  726,  729,  722,  735,
+      723,  740,  742,  742,  736,  738,  720,  719,  735,  724,
+      736,  738,  729,  745,  739,  751,  726,  740,  747,  725,
+      727,  746,  727,  739,  741,  727,  743,  743,  741,  727,
+      744,  745,  727,  754,   85,  746,  751,  748,  747,  727,
+      727,  744,  727,  748,  749,  749,  749,  750,  749,  752,
+      753,  749,  750,  756,  753,  755,  749,  754,  756,  755,
+      757,  758,  749,  749,  759,  760,  761,  752,  760,  764,
 
-      760,  760,  761,  759,  757,  762,  763,  761,  762,  764,
-      764,  763,  765,  766,  765,  767,  768,  769,  771,  770,
-      768,  772,  772,  777,  773,  766,  771,  774,  775,  775,
-      776,  778,  781,  781,  767,  777,  797,  769,  770,  773,
-      780,  774,  784,  797,  782,  780,  785,  784,  776,  782,
-      782,  786,  785,  778,  787,  788,  790,  786,  791,  787,
-      789,  788,  790,  789,  792,  792,  791,  793,  793,  794,
-      795,  796,  798,  799,  799,  800,  796,  794,  801,  802,
-      803,  805,  807,  806,  800,  802,  801,  809,  795,  808,
-      805,  798,  806,  812,  808,  810,  809,  811,  810,  803,
+      762,  761,  761,  763,  763,  772,  758,  762,  766,  757,
+      765,  765,  767,  766,  764,  767,  768,  769,  769,  759,
+      770,  768,  770,  771,  772,  773,  774,  778,  775,  773,
+      776,  777,  777,  781,  779,  771,  780,  780,  776,  783,
+      782,  794,  778,  784,  794,  785,  774,  775,  779,  784,
+      785,  781,  782,  786,  786,  789,   80,  787,  790,  791,
+      789,  783,  787,  787,  790,  791,  792,  793,  795,  796,
+      800,  792,  799,  793,  795,  797,  797,  796,  798,  798,
+      799,  801,  802,  803,  804,  804,  801,  805,  800,  802,
+      806,  807,  807,  808,  809,  811,  805,  812,  806,  808,
 
-      813,  814,  811,  815,  817,  817,  807,  812,  816,  818,
-      814,  819,  820,  816,  816,  821,  815,  822,  825,  825,
-      822,  820,  826,  828,  818,  813,  827,  824,  822,  824,
-      819,  827,  829,  830,  831,  832,  833,  834,  835,  821,
-      836,  838,  835,  826,  828,  833,  837,  838,  839,  840,
-      841,   74,  829,  830,  842,  832,  831,  839,  836,  844,
-      834,  840,  845,  847,  843,  837,  848,  845,  842,  841,
-      843,  846,  846,  844,  849,  848,  850,  851,  852,  853,
-      855,  854,  856,  847,  850,  857,  855,  858,  856,  859,
-      860,  862,  863,  858,  849,  862,  860,  851,  853,  857,
+      813,  815,  803,  814,  811,  818,  812,  819,  814,  816,
+      815,  817,  816,  809,  820,  821,  817,  823,  823,  818,
+      822,  824,  825,  820,  813,  822,  822,  827,  821,  826,
+      835,  828,  819,  830,  828,  830,  824,  832,  826,  831,
+      831,  825,  828,  833,  834,  837,  836,  839,  833,  838,
+      835,  827,  840,  841,  842,  843,  839,  841,  832,  846,
+      847,  845,  844,  848,  850,  834,  836,  837,  844,  838,
+      845,  846,  842,  853,  843,  840,  849,  848,  850,  847,
+      851,  854,  849,  852,  852,  851,  855,  856,  857,  858,
+      854,  859,  860,  853,  861,  856,  862,  864,  865,  863,
 
-      852,  854,  861,  864,  866,  865,  867,  867,  861,  859,
-      865,  863,  868,  869,  870,  864,  869,  871,  868,  873,
-      872,  874,  874,  864,  875,  866,  872,  881,  876,  877,
-      871,  878,  870,  876,  877,  877,  879,  880,  880,  873,
-      879,  882,  875,  883,  884,  886,  878,  889,  883,  881,
-      887,  890,  892,  892,  893,  894,  895,  895,  893,  898,
-      896,  882,  897,  884,  887,  899,  897,  889,  946,  886,
-      894,  946,  890,  891,  898,  900,  891,  901,  891,  899,
-      900,  902,  891,  903,  891,  896,  902,  902,  904,  891,
-      906,  901,  903,  905,  891,  907,  908,  905,  909,  910,
+      861,  866,  862,  864,  869,  870,  855,  866,  857,  867,
+      859,  858,  860,  863,  871,  867,  868,  870,  865,  871,
+      868,  872,  874,  869,  877,  870,  873,  873,  874,  875,
+      876,  879,  875,  878,  880,  880,  881,  877,  882,  878,
+      883,  884,  872,  882,  887,  883,  883,  888,  876,  885,
+      889,  879,  890,  885,  881,  889,  884,  886,  886,  892,
+      893,  896,  895,  897,  899,  899,  887,  888,  900,  902,
+      902,  890,  900,  903,  893,  895,  901,  905,  904,  906,
+      921,  896,  904,  892,  897,  898,  921,   75,  898,  908,
+      898,  901,  905,  906,  898,  907,  898,  915,  903,  909,
 
-      907,  911,  904,  909,  912,  906,  913,  915,  908,  905,
-      907,  914,  915,  910,  916,  913,  919,  914,  912,  917,
-      916,  919,  911,  918,  918,  917,  920,  921,  922,  925,
-      923,  926,  920,  928,  929,  929,  926,  930,  927,  932,
-      933,  925,  930,  934,  935,  928,  931,  922,  923,  921,
-      924,  924,  927,  932,  931,  936,  924,  938,  924,  933,
-      935,  936,  934,  937,  924,  939,  940,  943,  937,  924,
-      924,  941,  941,  942,  945,  938,  924,  942,  947,  948,
-      945,  939,  949,  951,  940,  950,  953,  943,  949,  954,
-      950,  955,  948,  956,  957,  953,  958,  947,  954,  956,
+      907,  898,  910,  908,  909,  909,  898,  911,  912,  915,
+      913,  910,  912,  914,  916,  917,  918,  919,  914,  916,
+      923,  911,  922,  920,  912,  913,  923,  922,  914,  917,
+      924,  919,  920,  925,  925,  926,  924,  918,  927,  928,
+      926,  929,  932,  933,  927,  930,  935,  938,  933,  936,
+      936,  937,  934,  939,  932,  938,  937,  940,  935,  942,
+      929,  928,  941,  930,  931,  931,  934,  939,  943,  945,
+      931,  950,  931,  946,  943,  942,  940,  944,  931,  947,
+       74,  941,  944,  931,  931,  948,  948,  945,  949,  946,
+      931,  950,  949,  952,  954,  953,  955,  947,  953,  952,
 
-      959,  960,  951,  957,  961,  959,  962,  955,  963,  970,
-      964,  966,  967,  965,  972,  958,  973,  966,  961,  964,
-      963,  960,  965,  974,  968,  970,  962,  975,  972,  967,
-      968,  976,  977,  978,  979,  982,  973,  983,  978,  979,
-      982,  975,  974,  984,  984,  985,  983,  977,  986,  976,
-      988,  985,  989,  992,  993,  990,  990,  989,  989,  990,
-      991,  986,  994,  991,  995,  997,  988,  992,  996,  998,
-      999, 1000, 1001, 1005,  993,  998, 1005, 1000,  994, 1002,
-      997,  996,  995, 1003, 1002, 1006, 1007, 1001, 1008, 1009,
-      999, 1007, 1012, 1008, 1010, 1011, 1014, 1003, 1015, 1010,
+      956,  958,  957,  960,  963,  961,  956,  957,  962,  955,
+      963,  965,  960,  954,  961,  967,  964,  966,  968,  969,
+      958,  970,  966,  973,  962,  964,  974,  971,  972,  973,
+      965,  977,  968,  970,  975,  967,  971,  972,  979,  969,
+      975,  980,  982,  974,  981,  984,  983,  977,  985,  986,
+      989,  995,  979,  985,  986,  989,  982,  990,  991,  991,
+      984,  980,  992,  981,  983,  993,  990,  995,  992,  996,
+     1000, 1001,  998,  998,  996,  996,  998,  999,  993, 1002,
+      999, 1003, 1005, 1004, 1000, 1007, 1006, 1008, 1009, 1010,
+     1011, 1001, 1006, 1008, 1010, 1002, 1004, 1005, 1013, 1003,
 
-     1011, 1016, 1014, 1017, 1012, 1009, 1006, 1016, 1019, 1017,
-     1018, 1018, 1020, 1021, 1015, 1023, 1021, 1019, 1022, 1022,
-     1024, 1025, 1026, 1027, 1030, 1026, 1028, 1035, 1029, 1030,
-     1020, 1036, 1028, 1023, 1029, 1031, 1027, 1032, 1033, 1024,
-     1031, 1025, 1032, 1037, 1033, 1035, 1040, 1038, 1041, 1037,
-     1042, 1036, 1038, 1039, 1039, 1040, 1043, 1041, 1044, 1045,
-     1046, 1044, 1045, 1047, 1048, 1049, 1050, 1051, 1042, 1053,
-     1052, 1046, 1050, 1051, 1053, 1043, 1048, 1054, 1054, 1055,
-     1056, 1047, 1058, 1057, 1049, 1052, 1058, 1059, 1060, 1061,
-     1062, 1064, 1065, 1065, 1056, 1057, 1066, 1060, 1055, 1068,
+     1014, 1013, 1015, 1009, 1011, 1007, 1016, 1015, 1017, 1018,
+     1019, 1016, 1022, 1020, 1018, 1019, 1023, 1024, 1022, 1028,
+     1025, 1014, 1027, 1024, 1017, 1020, 1025, 1026, 1026, 1031,
+     1029, 1027, 1023, 1029, 1030, 1030, 1032, 1028, 1033, 1034,
+     1035, 1038, 1034, 1036, 1037, 1043, 1038, 1031, 1041, 1036,
+     1037, 1039, 1040, 1035, 1041, 1032, 1039, 1040, 1033, 1044,
+     1045, 1048, 1046, 1043, 1047, 1047, 1045, 1046, 1049, 1050,
+     1048, 1051, 1052, 1053, 1054, 1052, 1053, 1049, 1055, 1044,
+     1056, 1057, 1058, 1059, 1060, 1054, 1061, 1050, 1058, 1059,
+     1051, 1061, 1056, 1062, 1062, 1063, 1055, 1064, 1065, 1060,
 
-     1070, 1071, 1069, 1073, 1073, 1059, 1071, 1074, 1061, 1072,
-     1064,   68, 1070, 1068, 1075, 1062, 1066, 1069, 1072, 1076,
-     1075, 1077, 1078, 1079, 1078, 1076, 1077, 1074, 1079, 1080,
-     1081, 1082, 1083, 1084, 1085, 1086, 1082, 1087, 1089, 1089,
-     1090, 1085, 1091, 1080, 1081, 1093, 1092, 1083, 1094,   63,
-     1086, 1093, 1084, 1095, 1090, 1097, 1087, 1101, 1095, 1097,
-     1091, 1092, 1098, 1098, 1101, 1099, 1102, 1095, 1094, 1095,
-     1099, 1104, 1095, 1100, 1100, 1103, 1105, 1106, 1103, 1107,
-     1102, 1108, 1110, 1109, 1107, 1111, 1106, 1110, 1113, 1118,
-     1104, 1112, 1115, 1115, 1105, 1109, 1116, 1121, 1117, 1111,
+     1057, 1066, 1067, 1068, 1069, 1066, 1070, 1072, 1073, 1073,
+     1065, 1064, 1068, 1074, 1063, 1076, 1078, 1077, 1080, 1079,
+     1067, 1081, 1081, 1069, 1079, 1082, 1072, 1080, 1078, 1076,
+     1083, 1070, 1077, 1074, 1084, 1085, 1083, 1086, 1088, 1087,
+     1084, 1087, 1086, 1088, 1089, 1082, 1090, 1091, 1092, 1093,
+     1094, 1085, 1091, 1096, 1095, 1098, 1098, 1094, 1089, 1099,
+     1090, 1100, 1101, 1092, 1102, 1103,   68, 1106, 1093, 1095,
+     1102, 1106, 1096, 1099, 1114, 1104, 1111, 1101, 1108, 1100,
+     1104, 1107, 1107, 1108, 1113, 1103, 1109, 1109, 1110, 1104,
+     1111, 1104, 1114, 1112, 1104, 1110, 1112, 1115, 1117, 1116,
 
-     1108, 1116, 1112, 1117, 1120, 1119, 1121, 1113, 1120, 1118,
-     1119, 1122, 1123, 1124, 1126, 1127, 1125, 1129, 1128, 1130,
-     1131, 1134, 1127, 1135, 1133, 1132, 1122, 1123, 1125, 1126,
-     1128, 1132, 1124, 1136, 1137, 1138, 1129, 1140, 1131, 1133,
-     1130, 1134, 1136, 1135, 1139, 1141, 1142, 1144, 1145, 1137,
-     1146, 1147, 1148, 1144, 1138, 1150, 1139, 1152, 1154, 1147,
-     1141, 1153, 1140, 1145, 1146, 1149, 1142, 1150, 1151, 1157,
-     1149, 1154, 1148, 1151, 1151, 1153, 1152, 1155, 1155, 1156,
-     1158, 1161, 1157, 1167, 1156, 1159, 1161, 1156, 1156, 1158,
-     1162, 1159, 1156, 1160, 1160, 1163, 1166, 1166, 1156, 1162,
+     1118, 1120, 1119, 1113, 1116, 1121, 1115, 1119, 1122, 1124,
+     1124, 1127, 1118, 1125, 1126, 1120, 1121, 1117, 1125, 1126,
+     1128, 1130, 1129, 1131, 1132, 1128, 1129, 1122, 1133, 1134,
+     1130, 1127, 1137, 1135, 1138, 1136, 1139, 1140, 1131, 1132,
+     1141, 1134, 1136, 1142, 1137, 1143, 1141, 1133, 1135, 1144,
+     1145, 1146, 1147, 1138, 1149, 1140, 1148, 1139, 1142, 1145,
+     1150, 1151, 1154, 1157, 1153, 1143, 1146,   63, 1148, 1144,
+     1153, 1147, 1155, 1158, 1156, 1150, 1159, 1154, 1158, 1149,
+     1161, 1151, 1156, 1157, 1160, 1163, 1155, 1162, 1159, 1160,
+     1160, 1164, 1164, 1166, 1168, 1167, 1169, 1169, 1163, 1161,
 
-     1164, 1163, 1156, 1165, 1167, 1164, 1168, 1168, 1165, 1169,
-     1170, 1171, 1169, 1172, 1169, 1173, 1174, 1175, 1176, 1177,
-     1178, 1174, 1172, 1179, 1214, 1177, 1178, 1214, 1179, 1171,
-     1170, 1175, 1181, 1180, 1192, 1173, 1176, 1180, 1182, 1182,
-     1184, 1181, 1183, 1183, 1187, 1183, 1181, 1188, 1181, 1186,
-     1181, 1184, 1181, 1186, 1189, 1190, 1192, 1191, 1194, 1187,
-     1190, 1190, 1193, 1189, 1195, 1188, 1191, 1193, 1196, 1197,
-     1198, 1199, 1194, 1195, 1200, 1200, 1202, 1199, 1201, 1204,
-     1203, 1206, 1205, 1207, 1198, 1203, 1201, 1196, 1197, 1208,
-     1202, 1205, 1210, 1204, 1208, 1209, 1209, 1211, 1211, 1206,
+     1168, 1162, 1165, 1165, 1167, 1171, 1166, 1165, 1170, 1176,
+     1165, 1165, 1172, 1170, 1171, 1165,   58, 1173, 1172, 1174,
+     1179, 1165, 1173, 1180, 1174, 1165, 1175, 1175, 1177, 1177,
+     1176, 1178, 1182, 1181, 1178, 1184, 1178, 1185, 1183, 1186,
+     1179, 1180, 1181, 1183, 1187, 1186, 1188, 1190,   57, 1184,
+     1187, 1188, 1182, 1189, 1197, 1185, 1190, 1189, 1191, 1191,
+     1195, 1190, 1193, 1190, 1195, 1190, 1196, 1190, 1192, 1192,
+     1198, 1192, 1197, 1193, 1201, 1200, 1203, 1199, 1204, 1198,
+     1202, 1196, 1199, 1199, 1200, 1202, 1205, 1204, 1206, 1207,
+     1203, 1208, 1209, 1209, 1210, 1211, 1201, 1208, 1213, 1212,
 
-     1212, 1215, 1212, 1216, 1217, 1219, 1215, 1210, 1207, 1218,
-     1218, 1220, 1220, 1217, 1221, 1221, 1222, 1223, 1224, 1225,
-     1225, 1222, 1216, 1226, 1227, 1219, 1228, 1227, 1229, 1232,
-     1231, 1230, 1231, 1229, 1234, 1235, 1236, 1234, 1223, 1224,
-     1230, 1236, 1237, 1226, 1238, 1239, 1228, 1232, 1244, 1238,
-     1235, 1295, 1240, 1239, 1241, 1295, 1237, 1240, 1243, 1241,
-     1242, 1242, 1245, 1243, 1246, 1247, 1244, 1249, 1245, 1250,
-     1252, 1246, 1251, 1249, 1253, 1250, 1252, 1251, 1247, 1254,
-     1255, 1256, 1256, 1253, 1257, 1259, 1260, 1261, 1262, 1263,
-     1264, 1255, 1268, 1266, 1262, 1263, 1264, 1267, 1254, 1266,
+     1215, 1214, 1210, 1207, 1212, 1205, 1216, 1206, 1217, 1211,
+     1214, 1219, 1213, 1217, 1218, 1218, 1220, 1220, 1215, 1221,
+     1223, 1221, 1224, 1223, 1225, 1226, 1219, 1224, 1227, 1227,
+     1228, 1216, 1229, 1229, 1226, 1230, 1230, 1231, 1232, 1233,
+     1234, 1234, 1231, 1225, 1235, 1236, 1237, 1238, 1236, 1239,
+     1228, 1240, 1238, 1240, 1241, 1244, 1245, 1246, 1239, 1232,
+     1233, 1245, 1243, 1247, 1235, 1243, 1237, 1248, 1247, 1249,
+     1244, 1246, 1241, 1250, 1249, 1248, 1251, 1251, 1250, 1252,
+     1253, 1254, 1255, 1256, 1252, 1258, 1259, 1254, 1260, 1255,
+     1262, 1258, 1259, 1260, 1261, 1263, 1256, 1264, 1253, 1262,
 
-     1259, 1269, 1270, 1271, 1257, 1273, 1260, 1272, 1272, 1274,
-     1261, 1267, 1268, 1269, 1275, 1276, 1270, 1267, 1277, 1277,
-     1276, 1271, 1278, 1279, 1281, 1273, 1283, 1286, 1279, 1284,
-     1282, 1285, 1275, 1287, 1274, 1282, 1282, 1288, 1284, 1285,
-     1290, 1286, 1289, 1281, 1283, 1278, 1292, 1289, 1287, 1290,
-     1289, 1291, 1288, 1291, 1296, 1288, 1294, 1298, 1297, 1299,
-     1292, 1300, 1294, 1297, 1297, 1296, 1301, 1302, 1303, 1304,
-     1305, 1301, 1302, 1306, 1308, 1305, 1298, 1309, 1310, 1300,
-     1311, 1311, 1313, 1312, 1314, 1299, 1303, 1312, 1308, 1304,
-     1316, 1315, 1317, 1306, 1318, 1309, 1310, 1315, 1319, 1320,
+     1261, 1265, 1265, 1266, 1268, 1269, 1270, 1271, 1264, 1272,
+     1273, 1275, 1276, 1271, 1263, 1272, 1273, 1275, 1277, 1268,
+     1278, 1279, 1280, 1266, 1281, 1269, 1276, 1282, 1282, 1270,
+     1283, 1284, 1276, 1279, 1285, 1288, 1280,   52, 1277, 1286,
+     1278, 1291, 1281, 1289, 1286, 1287, 1287, 1293, 1289, 1292,
+     1283, 1295, 1285, 1294, 1292, 1292, 1284, 1296, 1288, 1295,
+     1291, 1297, 1294, 1298, 1299, 1293, 1300, 1308, 1301, 1299,
+     1301, 1296, 1299, 1302, 1304, 1300, 1297, 1306, 1298, 1305,
+     1304, 1298, 1309, 1305, 1307, 1310, 1308, 1302, 1306, 1307,
+     1307, 1311, 1312, 1313, 1314, 1315, 1311, 1312, 1316, 1318,
 
-     1313, 1321, 1316, 1314, 1322, 1323, 1325, 1326, 1318, 1322,
-     1324, 1317, 1323, 1319, 1320, 1324, 1326, 1327, 1327, 1328,
-     1321, 1329, 1330, 1332, 1325, 1331, 1331, 1333, 1336, 1332,
-     1329, 1334, 1334, 1335, 1328, 1337, 1341, 1341, 1338, 1335,
-     1339, 1333, 1330, 1338, 1336, 1340, 1339, 1342, 1342, 1344,
-     1344, 1340, 1346, 1345, 1347, 1348, 1337, 1345, 1349, 1350,
-     1352, 1346, 1351, 1351, 1355, 1354, 1350, 1353, 1356, 1348,
-     1354, 1357, 1347, 1349, 1359, 1353, 1357, 1357, 1355, 1358,
-     1352, 1360, 1360, 1361, 1358, 1358, 1362, 1356, 1363, 1365,
-     1364, 1366, 1367, 1368, 1359, 1364, 1369, 1363, 1370, 1368,
+     1315, 1319, 1320, 1310, 1321, 1321, 1322, 1323, 1309, 1324,
+     1322, 1313, 1326, 1318, 1314, 1325, 1327, 1328, 1316, 1319,
+     1320, 1325, 1329, 1330, 1326, 1323, 1331, 1332, 1324, 1333,
+     1335, 1328, 1332, 1336, 1334, 1327, 1333, 1329, 1330, 1334,
+     1337, 1337, 1336, 1338, 1339, 1331, 1340, 1343, 1335, 1341,
+     1341, 1342, 1346, 1339, 1344, 1344, 1345, 1342, 1338, 1347,
+     1348, 1343, 1345, 1349, 1350, 1348, 1340, 1357, 1346, 1349,
+     1350, 1351, 1351, 1352, 1352, 1354, 1354, 1355, 1356, 1358,
+     1347, 1355, 1359, 1360, 1363, 1357, 1361, 1356, 1362, 1362,
+     1365, 1358, 1364, 1361, 1366, 1365, 1359, 1367, 1360, 1370,
 
-     1371, 1369, 1361, 1372, 1375, 1362, 1371, 1373, 1365, 1374,
-     1367, 1366, 1376, 1373, 1377, 1374, 1378, 1380, 1379, 1381,
-     1382, 1382, 1372, 1375, 1370, 1383,   58, 1384, 1383, 1385,
-     1385, 1376, 1379, 1377, 1381, 1378, 1386, 1386, 1380, 1384,
-     1387, 1389, 1388, 1390, 1391, 1387, 1388, 1392, 1396, 1392,
-     1394, 1395, 1390, 1392, 1389, 1397, 1395, 1391, 1398, 1399,
-     1399, 1402, 1400, 1396, 1401, 1403, 1392, 1400, 1394, 1405,
-     1401, 1407, 1404, 1405, 1398, 1397, 1402, 1404, 1403, 1406,
-     1408, 1409, 1410, 1406, 1411, 1411, 1413, 1415, 1410, 1416,
-     1418, 1407, 1417, 1417, 1416, 1419, 1418, 1425, 1408, 1421,
+     1364, 1368, 1371, 1371, 1363, 1369, 1368, 1368, 1366, 1372,
+     1369, 1369, 1373, 1374, 1376, 1375, 1367, 1377, 1378, 1370,
+     1375, 1379, 1374, 1381, 1380, 1383, 1382, 1379, 1372, 1380,
+     1391, 1373, 1382, 1376, 1384, 1385, 1378, 1377, 1386, 1387,
+     1384, 1385, 1388, 1389, 1383, 1390, 1393, 1393, 1392, 1381,
+     1394, 1391, 1395, 1394, 1396, 1396, 1399, 1386, 1387, 1390,
+     1399, 1388, 1389, 1392, 1395, 1397, 1397, 1398, 1400, 1401,
+     1402, 1403, 1398, 1403, 1405, 1406, 1407, 1403, 1401, 1408,
+     1406, 1400, 1409, 1402, 1410, 1410, 1413, 1414, 1411, 1412,
+     1403, 1407, 1405, 1411, 1418, 1412, 1420, 1415, 1409, 1408,
 
-     1421, 1409, 1423, 1426, 1413, 1423, 1424, 1424, 1415, 1428,
-     1429, 1430, 1428, 1425, 1432, 1419, 1431, 1431, 1433, 1426,
-     1430, 1434, 1435, 1436, 1437, 1437, 1438, 1435, 1439, 1432,
-     1429, 1441, 1440, 1442, 1442, 1438, 1443, 1436, 1445, 1433,
-     1434, 1444, 1446, 1445, 1447, 1447, 1439, 1440, 1448, 1449,
-     1443, 1451, 1448, 1450, 1450, 1452, 1441, 1446, 1453, 1444,
-     1454, 1458, 1453, 1455, 1457, 1457, 1452, 1459, 1455, 1449,
-     1460, 1461, 1462, 1451, 1463, 1464, 1464, 1458, 1465, 1454,
-     1466, 1467, 1470, 1465, 1460, 1459, 1462, 1468, 1469, 1473,
-     1461, 1461, 1471, 1469, 1471, 1473, 1468, 1474, 1472, 1463,
+     1414, 1413, 1415, 1416, 1417, 1419, 1421, 1416, 1417, 1422,
+     1422, 1424, 1421, 1426, 1418, 1427, 1420, 1428, 1428, 1429,
+     1427, 1430, 1436, 1419, 1437, 1429, 1432, 1432, 1434, 1424,
+     1440, 1434, 1435, 1435, 1426, 1441, 1439, 1443, 1436, 1439,
+     1437, 1430, 1442, 1442, 1441, 1444, 1445, 1447, 1446, 1449,
+     1440, 1450, 1443, 1446, 1448, 1448, 1451, 1452, 1449, 1453,
+     1453, 1447, 1454, 1455, 1457, 1445, 1444, 1456, 1460, 1450,
+     1462, 1451, 1456, 1458, 1458, 1463, 1454, 1461, 1461, 1457,
+     1459, 1455, 1452, 1464, 1459, 1465, 1463, 1464, 1460, 1466,
+     1468, 1468, 1462, 1469, 1466, 1470, 1471, 1472, 1473, 1474,
 
-     1466, 1467, 1470, 1472, 1475, 1477, 1478, 1478, 1479, 1480,
-     1475, 1482, 1483, 1484, 1484, 1480, 1482, 1474, 1486, 1477,
-     1485, 1485, 1487, 1488, 1491, 1489, 1493, 1479, 1489, 1490,
-     1490, 1492, 1486, 1495, 1497, 1501, 1483, 1497, 1488, 1495,
-     1487, 1494, 1491, 1492, 1494, 1496, 1493, 1494, 1499, 1500,
-     1496, 1506, 1502, 1497, 1500, 1502, 1506, 1499, 1504, 1494,
-     1501, 1503, 1503, 1505, 1504, 1507, 1507, 1508, 1508, 1505,
-     1509, 1511, 1510, 1512, 1513, 1514, 1509, 1510, 1515, 1516,
-     1517, 1515, 1518, 1519, 1511, 1516, 1517, 1518, 1520, 1519,
-     1524, 1512, 1521, 1513, 1525, 1514, 1523, 1521, 1522, 1522,
+     1475, 1475, 1476, 1477, 1465, 1478,   47, 1476, 1482, 1469,
+     1471, 1480, 1473, 1470, 1479, 1479, 1472, 1472, 1486, 1495,
+     1480, 1481, 1489, 1477, 1474, 1478, 1481, 1483, 1482, 1483,
+     1484, 1485, 1491, 1487,   18, 1484, 1489, 1485, 1486, 1487,
+     1490, 1490, 1492, 1495, 1494, 1496, 1496, 1498, 1492, 1494,
+     1499, 1491, 1497, 1497, 1500, 1501, 1502, 1502, 1501, 1503,
+     1504, 1498, 1505, 1513,   17, 1507, 1524, 1506, 1499, 1500,
+     1506, 1507, 1504, 1506, 1508, 1509, 1512, 1503, 1509, 1508,
+     1511, 1512, 1505, 1514, 1524, 1506, 1514, 1516, 1513, 1511,
+     1515, 1515, 1517, 1516, 1509, 1518, 1519, 1519, 1517, 1521,
 
-     1526, 1523, 1527, 1528, 1529, 1530, 1531, 1532, 1524, 1532,
-     1533, 1520, 1535, 1536, 1525, 1537, 1527, 1528, 1529, 1539,
-     1526, 1538, 1540, 1530, 1535, 1536, 1541, 1538, 1537, 1533,
-     1542, 1531, 1544, 1544, 1545, 1548, 1546, 1547, 1547, 1539,
-     1541, 1546, 1540, 1549, 1550, 1551, 1552, 1553, 1564, 1554,
-     1548, 1542, 1555, 1556, 1545, 1552, 1554, 1549, 1558, 1560,
-     1564, 1555, 1553, 1551, 1555, 1562, 1562, 1561, 1550, 1556,
-     1561, 1563, 1563, 1558, 1565, 1568, 1566, 1569, 1558, 1566,
-     1567, 1567, 1570, 1572, 1560, 1571, 1574, 1570, 1568, 1573,
-     1571, 1575, 1565, 1578, 1576, 1574, 1569, 1580, 1577, 1578,
+     1518, 1520, 1520, 1522, 1523, 1521, 1525, 1526, 1522, 1527,
+     1528, 1532, 1527, 1529, 1536, 1530, 1528, 1523, 1531, 1529,
+     1530, 1533, 1534, 1534, 1531, 1525, 1533, 1526, 1535, 1537,
+     1538, 1539, 1536, 1535, 1532, 1542, 1543, 1540, 1541, 1544,
+     1545, 1544, 1547, 1548, 1549, 1539, 1551, 1552, 1554, 1537,
+     1538, 1540, 1541, 1542, 1547, 1548, 1550, 1549, 1553, 1545,
+     1557, 1543, 1550, 1556, 1556, 1558, 1551, 1552, 1562, 1554,
+     1558, 1559, 1553, 1560, 1560, 1561, 1563, 1564, 1565, 1566,
+     1557, 1567, 1562, 1559, 1568, 1569, 1573, 1565, 1567, 1571,
+     1561, 1575, 1575, 1568, 1566, 1564, 1568, 1576, 1576, 1574,
 
-     1579, 1579, 1572, 1576, 1582, 1573, 1576, 1577, 1581, 1583,
-     1575, 1584, 1585, 1588, 1589, 1590, 1590, 1580, 1591, 1592,
-     1593, 1581, 1582, 1583, 1585, 1593, 1598, 1584, 1592, 1594,
-     1594, 1595, 1589, 1597, 1591, 1599, 1596, 1603, 1588, 1604,
-     1595, 1596, 1602, 1595, 1594, 1605, 1607, 1598,   57, 1600,
-     1605, 1597, 1603, 1599, 1600, 1600, 1602, 1606, 1608, 1608,
-     1609, 1604, 1610, 1606, 1607, 1611, 1609, 1610, 1612, 1614,
-     1615, 1611, 1616, 1617, 1612, 1619, 1618, 1623, 1616, 1618,
-     1621, 1619, 1624, 1625, 1615, 1618, 1617, 1627, 1621, 1614,
-     1626, 1625, 1628, 1629, 1630, 1637, 1623, 1631, 1631, 1626,
+     1563, 1569, 1574, 1577, 1571, 1578, 1581, 1579, 1582, 1571,
+     1579, 1573, 1580, 1580, 1585, 1577, 1583, 1584, 1586, 1581,
+     1587, 1583, 1584, 1578, 1588, 1591, 1589, 1582, 1590, 1587,
+     1593, 1591, 1594, 1585, 1586, 1589, 1595, 1590, 1589, 1592,
+     1592, 1596, 1597, 1588, 1598, 1594, 1601, 1602, 1603, 1603,
+     1593, 1604, 1605,    0, 1595, 1596, 1598, 1606, 1597, 1607,
+     1607, 1605, 1606, 1608, 1609, 1602, 1610, 1604, 1611, 1609,
+     1612, 1601, 1608, 1613, 1607, 1608, 1615, 1616, 1613, 1613,
+     1617, 1618, 1620, 1628, 1610, 1619, 1618, 1627, 1612, 1611,
+     1615, 1619, 1616, 1621, 1621, 1622, 1630, 1628, 1623, 1624,
 
-     1627, 1624, 1634, 1632, 1633, 1628, 1636, 1629, 1630, 1632,
-     1633, 1635, 1635, 1637, 1638, 1634, 1639, 1640, 1641, 1631,
-     1642, 1643, 1646, 1640, 1645, 1645, 1636, 1647, 1652, 1639,
-     1648, 1647, 1649, 1638, 1654, 1648, 1642, 1649, 1650, 1643,
-     1641, 1651, 1646, 1650, 1655, 1657, 1654, 1656, 1656, 1658,
-     1651, 1652, 1659, 1660, 1660, 1661, 1662, 1665, 1663, 1655,
-     1664, 1658, 1666, 1662, 1657, 1668, 1669, 1667, 1670, 1661,
-     1663, 1659, 1664, 1667, 1670,   52, 1665, 1668, 1671, 1671,
-     1672, 1676, 1666, 1672, 1669, 1673, 1673, 1675, 1677, 1679,
-     1676, 1680, 1675, 1680, 1677, 1678, 1678, 1681, 1682, 1683,
+     1620, 1622, 1617, 1623, 1625, 1624, 1629, 1627, 1631, 1630,
+     1625, 1631, 1629, 1632, 1634, 1636, 1637, 1631, 1638, 1632,
+     1639,    0, 1634, 1640, 1641, 1642, 1638, 1643, 1649, 1639,
+     1644, 1644, 1645, 1650, 1636, 1637, 1640, 1641, 1645, 1642,
+     1646, 1643, 1647, 1648, 1648, 1651, 1646, 1652, 1649, 1654,
+     1653, 1650, 1644, 1655, 1656, 1647, 1653, 1658, 1658, 1659,
+     1652, 1660, 1661, 1662, 1651, 1660, 1665, 1661, 1662, 1655,
+     1663, 1654, 1656, 1664, 1667, 1663, 1668, 1669, 1669, 1659,
+     1670, 1671, 1664, 1672, 1673, 1673, 1667, 1674, 1675, 1665,
+     1679, 1668, 1676, 1671, 1677, 1675, 1680, 1681, 1682, 1670,
 
-     1681, 1679, 1684, 1686, 1685, 1687, 1688, 1689, 1686, 1690,
-     1687, 1691, 1693, 1696, 1692, 1688, 1691, 1699, 1682, 1689,
-     1684, 1683, 1685, 1692, 1690, 1694, 1695, 1701, 1696, 1698,
-     1694, 1695, 1693, 1697, 1697, 1698, 1692, 1694, 1699, 1702,
-     1703, 1704, 1705, 1710, 1705,   47, 1701, 1713, 1706, 1707,
-     1707, 1708, 1708, 1709, 1709, 1714, 1703, 1711, 1711, 1702,
-     1723, 1704, 1706, 1710, 1706, 1712, 1712, 1716, 1713, 1715,
-     1715, 1716, 1717, 1720, 1718, 1721, 1714, 1718, 1717, 1720,
-     1722, 1724, 1725, 1725, 1724, 1723, 1722, 1726, 1729, 1727,
-     1728, 1728, 1730, 1721, 1727, 1731, 1731, 1730, 1732, 1733,
+     1683, 1674, 1672, 1681, 1676, 1684, 1677, 1685, 1685, 1679,
+     1682, 1684, 1686, 1687, 1687, 1686, 1680, 1689, 1683, 1690,
+     1691, 1693, 1689, 1692, 1692, 1694, 1691, 1694, 1690, 1695,
+     1696, 1697, 1695, 1693, 1698, 1700, 1699, 1701, 1702, 1703,
+     1700, 1704, 1701, 1705, 1707, 1710, 1706, 1702, 1705, 1713,
+     1696, 1703, 1698, 1697, 1699, 1706, 1704, 1708, 1709, 1715,
+     1710, 1712, 1708, 1709, 1707, 1711, 1711, 1712, 1706, 1708,
+     1713, 1716, 1717, 1718, 1719, 1724, 1719,    0, 1715, 1727,
+     1720, 1721, 1721, 1722, 1722, 1723, 1723, 1728, 1717, 1725,
+     1725, 1716, 1737, 1718, 1720, 1724, 1720, 1726, 1726, 1730,
 
-     1734, 1735, 1736, 1732, 1737, 1733, 1738, 1726, 1747, 1729,
-     1737, 1740, 1734, 1734, 1734, 1741, 1740, 1740, 1742, 1734,
-     1742, 1735, 1736, 1743, 1744, 1745, 1738, 1746, 1747, 1741,
-     1748, 1745, 1749, 1749, 1743, 1750, 1746, 1751, 1751, 1744,
-     1752, 1753, 1754, 1754, 1755, 1755, 1756, 1759, 1759, 1760,
-     1761, 1748, 1764, 1763, 1766, 1766, 1767, 1768, 1765, 1761,
-     1752, 1750, 1763, 1753, 1765, 1771, 1756, 1770, 1769, 1772,
-     1772, 1773, 1768, 1764, 1760, 1769, 1770, 1767, 1774, 1776,
-     1777, 1778, 1779, 1783, 1776, 1785, 1777, 1780, 1783, 1779,
-     1781, 1771, 1786, 1780, 1774, 1784, 1781, 1773, 1782, 1782,
+     1727, 1729, 1729, 1730, 1731, 1734, 1732, 1735, 1728, 1732,
+     1731, 1734, 1736, 1738, 1739, 1739, 1738, 1737, 1736, 1740,
+     1743, 1741, 1742, 1742, 1744, 1735, 1741, 1745, 1745, 1744,
+     1746, 1747, 1748, 1749, 1750, 1746, 1751, 1747, 1752, 1740,
+     1756, 1743, 1751, 1754, 1748, 1748, 1748, 1755, 1754, 1754,
+     1757, 1748, 1757, 1749, 1750, 1756, 1758, 1759, 1752, 1760,
+     1761, 1755, 1762, 1763, 1765, 1760, 1767, 1758, 1771, 1761,
+     1764, 1764, 1759, 1766, 1766, 1768, 1769, 1769, 1770, 1770,
+     1774, 1774, 1762, 1775, 1763, 1776, 1767, 1778, 1771, 1779,
+     1765, 1782, 1780, 1786, 1776, 1784, 1778, 1768, 1780, 1781,
 
-     1787, 1778, 1789, 1788, 1784, 1785, 1788, 1790, 1791, 1791,
-     1792, 1786, 1787, 1793, 1794, 1795, 1792, 1796, 1798, 1793,
-     1789, 1796, 1799, 1800, 1801, 1801, 1802, 1803, 1800, 1805,
-     1795, 1806, 1808, 1790, 1794, 1806, 1811, 1796, 1798, 1810,
-     1807, 1808, 1803, 1810, 1799, 1802, 1807, 1811, 1805, 1809,
-     1809, 1813, 1811, 1812, 1812, 1814, 1815, 1816, 1817, 1818,
-     1819, 1820, 1816, 1821, 1822, 1822, 1819, 1828, 1821, 1814,
-     1823, 1823, 1813, 1824, 1826, 1815, 1820, 1824, 1817, 1818,
-     1827, 1829, 1829, 1826, 1831, 1831, 1833, 1828, 1832, 1834,
-     1835, 1827, 1833, 1832, 1832, 1834, 1827, 1836, 1837, 1838,
+     1781, 1783, 1784, 1788, 1785, 1787, 1787, 1789, 1775, 1791,
+     1779, 1792, 1782, 1785, 1791, 1793, 1783, 1792, 1794, 1786,
+     1795, 1796, 1800, 1789, 1801, 1794, 1795, 1796, 1798, 1788,
+     1797, 1797, 1799, 1798, 1802, 1793, 1803, 1804, 1805, 1803,
+     1809, 1799, 1800, 1801, 1806, 1806, 1802, 1807, 1808, 1813,
+     1810, 1814, 1811, 1807, 1808, 1804, 1811, 1815, 1816, 1816,
+     1809, 1817, 1815, 1818, 1805, 1810, 1820, 1821, 1822, 1813,
+     1823, 1821, 1811, 1814, 1822, 1824, 1824, 1825, 1818, 1823,
+     1817, 1825, 1826, 1827, 1827, 1820, 1828, 1829, 1834, 1830,
+     1831, 1832, 1833, 1826, 1834, 1831, 1839, 1836, 1826, 1835,
 
-     1840, 1842, 1836, 1841, 1843, 1838, 1845, 1841, 1844, 1846,
-     1837, 1848, 1840, 1842, 1844, 1846, 1835, 1847, 1850, 1851,
-     1852, 1854, 1847, 1848, 1854, 1852, 1855, 1855, 1845, 1843,
-     1850, 1856, 1856, 1857, 1857, 1858, 1859, 1860, 1851, 1861,
-     1862, 1863, 1859, 1860, 1861, 1867, 1862, 1865, 1867, 1868,
-     1863, 1871, 1865, 1869, 1869, 1858, 1872, 1873, 1874, 1874,
-     1875, 1868, 1873, 1871, 1878, 1876, 1877, 1878, 1872, 1875,
-     1876, 1877, 1879, 1879, 1880, 1881, 1884, 1882, 1883, 1886,
-     1884, 1885, 1887, 1888, 1881, 1886, 1885, 1889, 1890, 1892,
-     1892, 1893, 1888, 1899, 1880, 1882,   18, 1883, 1894, 1897,
+     1839, 1829, 1836, 1837, 1837, 1838, 1838, 1828, 1830, 1841,
+     1842, 1832, 1833, 1843, 1835, 1844, 1844, 1847, 1841, 1846,
+     1846, 1842, 1847, 1847, 1848, 1849, 1842, 1850, 1852, 1851,
+     1848, 1849, 1853, 1843, 1851, 1855, 1857, 1856, 1853, 1858,
+     1852, 1856, 1863, 1859, 1860, 1861, 1865, 1855, 1857, 1859,
+     1862, 1861, 1866, 1850, 1863, 1862, 1867, 1869, 1865, 1873,
+     1869, 1867, 1870, 1870, 1858,    0, 1860, 1871, 1871, 1872,
+     1872, 1866, 1874, 1878, 1875, 1883, 1876, 1877, 1874, 1873,
+     1875, 1876, 1878, 1877, 1880, 1882, 1886, 1883, 1882, 1880,
+     1884, 1884, 1887, 1890, 1888, 1889, 1889, 1895, 1886, 1888,
 
-     1887, 1892, 1890, 1895, 1895, 1889, 1898, 1894, 1897, 1893,
-     1896, 1896, 1900, 1901, 1899, 1904, 1904, 1900, 1898, 1906,
-     1907, 1908, 1906, 1910, 1912, 1911, 1901, 1913, 1914, 1914,
-     1912, 1915, 1917, 1915, 1916, 1916, 1907, 1908, 1910, 1911,
-     1917, 1919, 1919, 1922, 1913, 1920, 1920, 1923, 1924, 1922,
-     1925, 1926, 1928, 1923, 1929, 1924, 1927, 1927, 1930, 1933,
-     1935, 1928, 1931, 1934, 1932, 1938, 1935, 1937, 1939, 1939,
-     1930, 1926, 1925, 1940, 1931, 1929, 1932, 1938, 1934, 1935,
-     1941, 1942, 1944, 1943, 1942, 1933, 1948, 1937, 1943, 1946,
-     1947, 1940, 1947, 1949, 1946, 1954, 1950, 1952, 1949, 1955,
+     1891, 1892, 1890, 1896, 1887, 1891, 1892, 1893, 1894, 1894,
+     1893, 1897, 1896, 1898, 1899, 1900, 1901, 1895, 1899, 1902,
+     1900, 1903, 1901, 1904, 1905, 1908, 1909, 1907, 1907, 1897,
+     1903, 1912, 1898, 1910, 1910, 1909, 1913, 1902, 1905, 1907,
+     1912, 1904, 1914, 1908, 1911, 1911, 1915, 1916, 1913, 1919,
+     1919, 1915, 1921, 1922, 1923, 1921, 1925, 1928, 1926, 1927,
+     1916, 1929, 1929, 1914, 1930, 1927, 1930, 1931, 1931, 1922,
+     1923, 1925, 1926, 1932, 1928, 1934, 1934, 1935, 1935, 1937,
+     1938, 1932, 1939, 1940, 1941, 1937, 1938, 1942, 1942, 1939,
+     1943, 1944, 1948, 1956, 1945, 1946, 1947, 1950, 1949, 1943,
 
-     1941, 1958, 1944, 1950, 1948, 1956, 1952, 1957, 1955, 1957,
-     1960, 1961, 1960, 1954, 1962, 1962, 1963, 1956, 1964, 1965,
-     1958, 1965, 1966, 1964, 1967, 1961, 1968, 1966, 1969, 1967,
-     1970, 1973, 1971, 1972, 1975, 1976, 1970, 1971, 1984, 1973,
-     1977, 1977, 1963, 1979, 1968, 1980, 1972, 1982, 1969, 1976,
-     1978, 1978, 1982, 1975, 1981, 1983, 1984, 1983, 1979, 1985,
-     1981, 1986, 1986, 1990, 1987, 1980, 1992, 1985, 1988, 1988,
-     1989, 1989, 1990, 1991, 1994, 1985, 1987, 1995, 1991, 1995,
-     1996, 1998, 1997, 1994, 1992, 1999, 1994, 1997, 1997, 2002,
-     1998, 2001, 2005, 2003, 2002, 2006, 2009, 1999, 2003, 2007,
+     1952, 1953, 1954, 1950, 1941, 1940, 1945, 1946, 1947, 1955,
+     1955, 1956, 1944, 1949, 1954, 1957, 1950, 1960, 1948, 1958,
+     1952, 1959, 1958, 1962, 1953, 1963, 1959, 1963, 1962, 1964,
+     1970, 1965, 1966, 1968, 1971, 1957, 1965, 1960, 1972, 1966,
+     1974, 1977, 1968, 1971, 1973, 1979, 1973, 1964, 1970, 1976,
+     1972, 1976, 1978, 1978, 1984, 1977, 1980, 1982, 1981, 1974,
+     1981, 1980, 1982, 1983, 1985, 1987, 1988, 1986, 1983, 1989,
+     1987, 1979, 1984, 1986, 1991, 1992, 1995, 1989, 1996, 1988,
+     1993, 1993, 1994, 1994, 1985, 1998, 1997, 2000,    0, 1992,
+     1998, 1995, 1997, 1991, 1999, 2001, 1999, 2003, 1996, 2002,
 
-     2010, 1996, 2012, 2001, 2011, 2005, 2008, 2008, 2007, 2013,
-     2015, 2016, 2017, 2026, 2009, 2006, 2012, 2029, 2010, 2020,
-     2011, 2018, 2015, 2016, 2013, 2019, 2018, 2023, 2020, 2025,
-     2019, 2030, 2017, 2023, 2027, 2025, 2026, 2028, 2031, 2031,
-     2030, 2032, 2029, 2033, 2033, 2034, 2023, 2035, 2036, 2027,
-     2032, 2035, 2037, 2036, 2038, 2028, 2039, 2040, 2044, 2049,
-     2041, 2039, 2039, 2040, 2034, 2037, 2041, 2042, 2049, 2043,
-     2042, 2047, 2047, 2048, 2048, 2052, 2038, 2043, 2044, 2050,
-     2050, 2051, 2051, 2053, 2054, 2061, 2055, 2052, 2048, 2061,
-     2054, 2055, 2056, 2056, 2057, 2057, 2062, 2058, 2059, 2048,
+     2002, 2004, 2004, 2001, 2006, 2000, 2005, 2005, 2008, 2003,
+     2007, 2001, 2010, 2006, 2011, 2007, 2011, 2012, 2015, 2017,
+     2014, 2010, 2013, 2021, 2010, 2022, 2008, 2013, 2013, 2014,
+     2015, 2017, 2018, 2023, 2019, 2025, 2021, 2018, 2012, 2019,
+     2024, 2024, 2023, 2026, 2027, 2022, 2031, 2032, 2028, 2029,
+     2033, 2034, 2035, 2025, 2036, 2042, 2034, 2035, 2031, 2032,
+     2027, 2026, 2028, 2036, 2029, 2039, 2041, 2043, 2044, 2045,
+     2033, 2039, 2041, 2050, 2046, 2047, 2047, 2054, 2042, 2048,
+     2049, 2049, 2043, 2046, 2039, 2051, 2044, 2053, 2048, 2051,
+     2052, 2055, 2050, 2060, 2045, 2052, 2055, 2055, 2056, 2054,
 
-     2064, 2053, 2058, 2063, 2059, 2066, 2067, 2063, 2068, 2069,
-     2070, 2067, 2072, 2073, 2071, 2070, 2062, 2074, 2075, 2077,
-     2064, 2078, 2074, 2077, 2069, 2076, 2076, 2080, 2072, 2079,
-     2066, 2068, 2071, 2073, 2079, 2081, 2078, 2082, 2083, 2084,
-     2075, 2085, 2081, 2086, 2084, 2087, 2087, 2089, 2090, 2082,
-     2091, 2092, 2093, 2080, 2085, 2089, 2094, 2083, 2095, 2096,
-     2097, 2086, 2099,   17, 2102, 2101, 2103, 2090, 2103, 2091,
-     2102, 2096, 2104, 2104, 2092, 2094, 2093, 2099, 2101, 2095,
-     2105, 2097, 2107, 2106, 2108, 2105, 2106, 2109, 2110, 2110,
-     2111, 2111, 2112, 2112, 2113, 2107, 2116, 2114, 2108, 2121,
+     2053, 2057, 2058, 2059, 2056, 2058, 2068, 2057, 2063, 2063,
+     2065, 2059, 2069, 2060, 2064, 2064, 2066, 2066, 2068, 2065,
+     2067, 2067, 2070, 2072, 2072, 2078, 2071, 2082, 2070, 2064,
+     2069, 2071, 2073, 2073, 2074, 2075, 2080, 2084, 2077, 2074,
+     2064, 2075, 2077, 2079, 2083, 2078, 2085, 2079, 2086, 2083,
+     2087, 2088, 2082, 2086, 2089, 2091, 2080, 2090, 2092, 2092,
+     2084, 2085, 2090, 2094, 2096, 2093, 2095, 2088, 2087, 2093,
+     2098, 2095, 2097, 2099, 2089, 2100, 2101, 2091, 2094, 2097,
+     2100, 2102, 2098, 2103, 2103, 2105, 2106, 2107, 2108, 2101,
+     2096, 2109, 2099, 2105, 2110, 2111, 2112, 2113, 2118, 2102,
 
-     2109, 2115, 2115, 2117, 2117, 2116, 2118, 2120, 2116, 2113,
-     2114, 2118, 2120, 2122, 2123, 2124, 2124, 2125, 2125, 2121,
-     2126, 2127, 2127, 2128, 2129, 2129, 2123, 2130, 2135, 2131,
-     2132, 2132, 2134, 2122, 2131, 2133, 2133, 2135, 2136, 2126,
-     2137, 2128, 2130, 2139, 2140, 2140, 2134, 2141, 2139, 2142,
-     2142, 2143, 2136, 2145, 2144, 2148, 2145, 2146, 2146, 2137,
-     2144, 2147, 2147, 2149, 2150, 2153, 2141, 2151, 2151, 2143,
-     2154, 2155, 2156, 2146, 2148, 2158, 2156, 2159, 2149, 2157,
-     2157, 2160, 2159, 2150, 2161, 2153, 2155, 2163, 2163, 2164,
-     2165, 2166, 2167, 2154, 2158, 2168, 2160, 2165, 2169, 2161,
+     2122, 2117, 2115, 2122, 2118, 2106, 2107, 2119, 2112, 2119,
+     2123, 2108, 2125, 2110, 2117, 2109, 2111, 2115, 2113, 2120,
+     2120, 2121, 2124, 2123, 2129, 2125, 2121, 2126, 2126, 2127,
+     2127, 2128, 2128, 2130, 2131, 2131, 2124, 2138, 2132, 2129,
+     2133, 2133, 2134, 2134, 2135, 2139, 2130, 2132, 2137, 2135,
+     2132, 2140, 2143, 2137, 2141, 2141, 2145, 2138, 2142, 2142,
+     2144, 2144, 2147, 2140, 2148, 2139, 2146, 2146, 2151, 2148,
+     2152, 2143, 2149, 2149, 2145, 2150, 2150, 2147, 2153, 2152,
+     2154, 2156, 2151, 2157, 2157, 2158, 2156, 2159, 2159, 2160,
+     2161, 2162, 2153, 2165, 2162, 2166, 2161, 2163, 2163, 2154,
 
-     2170, 2170, 2171, 2176, 2172, 2166, 2172, 2175, 2176, 2164,
-     2167, 2171, 2173, 2168, 2178, 2173, 2177, 2180, 2179, 2175,
-     2181, 2177, 2182, 2184, 2169, 2181, 2186, 2187, 2184, 2185,
-     2173, 2179, 2173, 2187, 2185, 2188, 2189, 2192, 2180, 2178,
-     2190, 2186, 2189, 2195, 2191, 2190, 2193, 2194, 2182, 2191,
-     2194, 2196, 2195, 2199, 2197, 2198, 2188, 2202, 2204, 2193,
-     2196, 2202, 2192, 2197, 2198, 2200, 2201, 2199, 2206, 2207,
-     2207, 2200, 2201, 2208, 2209, 2209, 2210, 2206, 2204, 2208,
-     2211, 2210, 2213, 2209, 2216, 2214, 2215, 2215, 2217, 2220,
-     2224, 2219, 2221, 2224, 2222, 2226, 2227, 2217, 2213, 2216,
+     2164, 2164, 2167, 2170, 2158, 2168, 2168, 2160, 2171, 2172,
+     2166, 2173, 2165, 2163, 2175, 2173, 2174, 2174, 2181, 2177,
+     2176, 2167, 2178, 2170, 2172, 2176, 2180, 2180, 2182, 2183,
+     2184, 2171, 2185, 2175, 2177, 2182, 2186, 2178, 2181, 2187,
+     2187, 2192, 2188, 2183, 2189, 2195, 2189, 2197, 2184, 2190,
+     2185, 2188, 2190, 2192, 2193, 2194, 2198, 2199, 2196, 2193,
+     2194, 2198, 2186, 2205, 2203,    0, 2209, 2190, 2197, 2190,
+     2195, 2196, 2201, 2202, 2204, 2206, 2210, 2201, 2202, 2203,
+     2204, 2206, 2207, 2199, 2205, 2208, 2216, 2207, 2212, 2210,
+     2208, 2209, 2211, 2213, 2214, 2211, 2215, 2212, 2217, 2221,
 
-     2211, 2214, 2211, 2219, 2225, 2220, 2222, 2221, 2227, 2225,
-     2228, 2228, 2229, 2229, 2233, 2226, 2231, 2231, 2232, 2233,
-     2234, 2232, 2235, 2236, 2237, 2237, 2234, 2238, 2235, 2239,
-     2239, 2240, 2236, 2241, 2242, 2243, 2243, 2245, 2244, 2253,
-     2246, 2238, 2248, 2240, 2244, 2246, 2248, 2241, 2253, 2249,
-     2254, 2245, 2249, 2242, 2250, 2250, 2251, 2252, 2256, 2256,
-     2255, 2251, 2252, 2252, 2255, 2257, 2259, 2260, 2261, 2262,
-     2254, 2259, 2263, 2264, 2265, 2266, 2263, 2268, 2257, 2265,
-     2267, 2266, 2269, 2262, 2270, 2271, 2267, 2260, 2261, 2270,
-     2273, 2274, 2275, 2264, 2276, 2268, 2277, 2275, 2281, 2284,
+     2216, 2218, 2213, 2214, 2217, 2215, 2219, 2218, 2223, 2225,
+     2219, 2224, 2224, 2226, 2226, 2225, 2227, 2223, 2228, 2221,
+     2230, 2227, 2226, 2231, 2232, 2232, 2233, 2237, 2234, 2238,
+     2236, 2241, 2243, 2239, 2241, 2244, 2230, 2234, 2228, 2231,
+     2228, 2233, 2236, 2237, 2238, 2239, 2242, 2244, 2245, 2245,
+     2255, 2242, 2243, 2246, 2246, 2248, 2248, 2249, 2250, 2251,
+     2249, 2252, 2253, 2250, 2255, 2251, 2257, 2252, 2254, 2254,
+     2258, 2253, 2256, 2256, 2259, 2260, 2260, 2261, 2257, 2266,
+     2262, 2263, 2266, 2261, 2258, 2265, 2263, 2267, 2267, 2265,
+     2268, 2269, 2270, 2259, 2262, 2268, 2269, 2269, 2271, 2272,
 
-     2276, 2269, 2273, 2278, 2277, 2278, 2271, 2274, 2282, 2282,
-     2283, 2288, 2281, 2283, 2285, 2285, 2287, 2288, 2289, 2291,
-     2287, 2290, 2290, 2294, 2294, 2284, 2296, 2298, 2291, 2299,
-     2289, 2302, 2303, 2304, 2305, 2312, 2302, 2313, 2304, 2305,
-        0, 2298, 2306, 2306, 2296, 2299, 2308, 2308, 2310, 2311,
-     2311, 2312, 2314, 2316, 2310, 2317, 2320, 2314, 2303, 2313,
-     2318, 2318, 2321, 2322, 2323, 2320, 2327, 2317, 2321, 2325,
-     2325, 2326, 2316, 2328, 2326, 2330, 2330, 2331, 2331, 2323,
-     2333, 2322, 2332, 2334, 2335, 2327, 2336, 2332, 2336, 2335,
-     2337, 2328, 2334, 2338, 2339, 2340, 2341, 2342, 2333, 2465,
+     2274, 2270, 2276, 2272, 2273, 2273, 2277, 2276, 2278, 2279,
+     2280, 2281, 2282, 2274, 2280, 2283, 2284, 2282, 2271, 2285,
+     2286, 2283, 2284, 2279, 2287, 2288, 2277, 2291, 2278, 2287,
+     2290, 2281, 2301, 2292, 2293, 2298, 2294, 2285, 2292, 2286,
+     2293, 2380, 2290, 2291, 2294, 2295, 2288, 2295, 2380, 2298,
+     2299, 2299, 2300, 2302, 2302, 2300, 2305, 2306, 2301, 2307,
+     2305, 2308, 2308, 2306, 2309, 2312, 2312, 2314, 2316, 2320,
+     2317, 2307, 2321, 2309, 2320, 2322, 2323, 2324, 2324, 2330,
+     2322, 2323, 2316, 2326, 2326, 2314, 2317, 2328, 2329, 2329,
+     2331, 2332, 2334, 2328, 2335, 2330, 2332, 2339, 2321, 2336,
 
-     2340, 2348, 2342, 2465, 2337, 2347, 2339, 2338, 2343, 2343,
-     2344, 2344, 2345, 2345, 2346, 2346, 2341, 2347, 2349, 2348,
-     2350, 2350, 2352, 2349, 2351, 2351, 2353, 2354, 2355, 2356,
-     2356, 2357, 2358, 2358, 2352, 2359, 2359, 2360, 2353, 2361,
-     2363, 2364, 2362, 2366, 2355, 2367, 2370, 2354, 2360, 2362,
-     2357, 2361, 2363, 2365, 2368, 2368, 2371, 2369, 2365, 2373,
-     2372, 2364, 2375, 2366, 2374, 2367, 2369, 2376, 2376, 2378,
-     2377, 2379, 2370, 2372, 2375, 2381, 2371, 2382, 2374, 2377,
-     2383, 2385, 2384, 2373, 2378, 2384, 2379, 2386,    0, 2387,
-     2388, 2388, 2386, 2381, 2387, 2385, 2389, 2389, 2395, 2382,
+     2336, 2338, 2340, 2339, 2341, 2345, 2335, 2343, 2343, 2346,
+     2338, 2334, 2331, 2344, 2348, 2348, 2344, 2349, 2349, 2341,
+     2340, 2350, 2351, 2352, 2345, 2353, 2350, 2346, 2355, 2354,
+     2353, 2354, 2352, 2356, 2357, 2359, 2358,    0, 2360, 2366,
+     2351, 2358, 2355, 2360, 2361, 2361, 2357, 2356, 2362, 2362,
+     2363, 2363, 2364, 2364, 2365, 2359, 2367, 2366, 2368, 2368,
+     2370, 2367, 2369, 2369, 2371, 2372, 2365, 2373, 2374, 2374,
+     2375, 2378, 2370, 2376, 2376, 2379, 2371, 2377, 2377, 2381,
+     2382, 2383, 2378, 2373, 2384, 2372, 2383, 2379, 2385, 2375,
+     2387, 2381, 2386, 2386, 2388, 2389, 2390, 2391, 2392, 2387,
 
-     2390, 2390, 2396, 2383, 2392, 2392, 2394, 2394, 2397, 2398,
-     2400, 2401, 2402, 2396, 2404, 2403, 2395, 2405, 2406, 2407,
-     2406, 2413, 2408, 2404, 2398, 2409, 2415, 2397,    0, 2401,
-     2400, 2410, 2410, 2421, 2402, 2403, 2413, 2405, 2416, 2407,
-     2408, 2412, 2412, 2409, 2417, 2417, 2419, 2416, 2415, 2420,
-     2420, 2421, 2422, 2423, 2424, 2419, 2425, 2426, 2431, 2428,
-     2423, 2427, 2429, 2429, 2430, 2430, 2432, 2433, 2433, 2424,
-     2422, 2436, 2432, 2437, 2425, 2426, 2431, 2427, 2428, 2434,
-     2434, 2435, 2438, 2440, 2441, 2439, 2442, 2435, 2437, 2436,
-     2439, 2442, 2443, 2448, 2443, 2444, 2444, 2445, 2450, 2445,
+     2382, 2393, 2394, 2394, 2384, 2395, 2399, 2396, 2385, 2390,
+     2397, 2400, 2392, 2393, 2395, 2389, 2401, 2403, 2406, 2406,
+     2388, 2391, 2396, 2402, 2399, 2397, 2402, 2404, 2413, 2405,
+     2415, 2403, 2404, 2400, 2405, 2407, 2407, 2408, 2408, 2401,
+     2410, 2410, 2412, 2412, 2414, 2416, 2413, 2418, 2419, 2415,
+     2420, 2421, 2422, 2423, 2424, 2414, 2424, 2425, 2426, 2431,
+     2416, 2422, 2427, 2428, 2428, 2433, 2419, 2418, 2430, 2430,
+     2434, 2421, 2420, 2423, 2431, 2437, 2426, 2425, 2439, 2434,
+     2427, 2435, 2435, 2440, 2437, 2438, 2438, 2433, 2441, 2442,
+     2443, 2444, 2446,    0, 2445, 2441, 2439, 2447, 2447, 2448,
 
-     2451, 2438, 2452, 2440, 2441, 2446, 2446, 2450, 2453, 2455,
-     2454, 2456, 2448, 2459, 2452, 2454, 2462, 2460, 2463, 2451,
-     2460, 2461, 2461, 2464, 2464, 2467, 2469, 2469, 2453, 2455,
-     2456, 2462, 2470, 2459, 2468, 2472, 2463, 2473, 2468, 2474,
-     2467, 2475, 2475, 2477, 2478, 2470, 2481, 2479, 2480, 2480,
-     2472, 2479, 2485, 2478, 2486, 2477, 2493, 2473, 2483, 2474,
-     2482, 2482, 2484, 2483, 2495, 2481, 2486, 2496, 2485, 2487,
-     2487, 2484, 2492, 2492, 2494, 2494, 2497, 2495, 2493, 2498,
-     2496, 2499, 2499, 2500, 2505, 2497, 2502, 2502, 2498, 2505,
-     2506, 2507, 2508, 2509, 2510, 2506, 2512, 2508, 2500, 2511,
+     2448, 2440, 2449, 2454, 2442, 2456, 2450, 2455, 2443, 2444,
+     2445, 2446, 2450, 2451, 2451, 2452, 2452, 2453, 2458, 2459,
+     2449, 2454, 2455, 2453, 2456, 2457, 2460, 2461, 2466, 2461,
+     2457, 2460, 2462, 2462, 2463, 2468, 2463, 2469, 2458, 2459,
+     2464, 2464, 2470, 2471, 2468, 2472, 2473, 2466, 2474, 2477,
+     2472,    0, 2478, 2480, 2470, 2478, 2469, 2479, 2479, 2481,
+     2482, 2482, 2491, 2471, 2485, 2488, 2473, 2474, 2480, 2477,
+     2483, 2486, 2487, 2487, 2483, 2486, 2490, 2481, 2488, 2485,
+     2492, 2495, 2491, 2493, 2493, 2496, 2497, 2498, 2498, 2499,
+     2497, 2490, 2501, 2495, 2496, 2500, 2500, 2501, 2502, 2503,
 
-     2514, 2509, 2515, 2517, 2512, 2507, 2516, 2515, 2511, 2518,
-     2518, 2516, 2523, 2510, 2521, 2514, 2519, 2519, 2517, 2520,
-     2520, 2521, 2522, 2524, 2526, 2525,    0, 2522, 2528, 2526,
-     2523, 2525, 2527, 2527, 2529, 2530, 2530, 2531, 2531, 2529,
-     2534, 2524, 2537, 2528, 2535, 2535, 2536, 2537, 2537, 2536,
-     2538, 2539, 2540, 2534, 2541, 2538, 2539, 2542, 2543, 2544,
-     2541, 2542, 2545, 2543, 2546, 2547, 2540, 2548, 2544, 2549,
-     2551, 2550, 2546, 2548, 2553, 2549, 2550, 2545, 2554, 2557,
-     2559, 2555, 2551, 2554, 2555, 2559, 2547, 2560, 2561, 2562,
-     2553, 2557, 2560, 2569, 2563, 2564, 2565, 2565, 2566, 2569,
+     2492, 2504, 2505, 2505, 2510, 2510, 2511, 2502, 2499, 2512,
+     2512, 2513, 2514, 2504, 2515, 2503, 2518, 2516, 2517, 2517,
+     2520, 2520, 2523, 2515, 2513, 2514, 2516, 2523, 2511, 2524,
+     2525, 2518, 2526, 2527, 2524, 2528, 2529, 2526, 2530,    0,
+     2532, 2527, 2533, 2534, 2525, 2529, 2530, 2533, 2534, 2535,
+     2536, 2536, 2537, 2537, 2528, 2532, 2538, 2538, 2539, 2541,
+     2542, 2540, 2543,    0, 2535, 2539, 2540, 2544, 2543, 2545,
+     2545, 2546, 2544,    0, 2547, 2548, 2548, 2541, 2542, 2547,
+     2549, 2549, 2552, 2553, 2553, 2554, 2546, 2555, 2554, 2556,
+     2558, 2557, 2555, 2555, 2556, 2552, 2557, 2559, 2560, 2562,
 
-     2573, 2574, 2562, 2563, 2564, 2570, 2561, 2566, 2575, 2576,
-     2576, 2570, 2577, 2578, 2579, 2580, 2580, 2581, 2583, 2573,
-     2585, 2574, 2578, 2588, 2586, 2587, 2587, 2575, 2586, 2579,
-     2596, 2577, 2589, 2583, 2593, 2590, 2581, 2591, 2589, 2596,
-     2585, 2590, 2593, 2591, 2592, 2592, 2594, 2597, 2588, 2599,
-     2600, 2594, 2601, 2599, 2603, 2603, 2604, 2605, 2605, 2609,
-     2597, 2606, 2606, 2609, 2600, 2608, 2608, 2601, 2610, 2612,
-     2612, 2614, 2615, 2610, 2604, 2616, 2617, 2615, 2619, 2620,
-     2620, 2617, 2617, 2622, 2622, 2623, 2623, 2616, 2625, 2624,
-     2627, 2614, 2624, 2629, 2630, 2630, 2631, 2631, 2619, 2632,
+     2561, 2563, 2560, 2559, 2558, 2561, 2564, 2565, 2562, 2566,
+     2569, 2567, 2579, 2568, 2564, 2566, 2563, 2567, 2568, 2571,
+     2572, 2573, 2569, 2580, 2573, 2572, 2575, 2577, 2565, 2578,
+     2579, 2581, 2577, 2582, 2578, 2571, 2580, 2584, 2575, 2587,
+     2581, 2588, 2582, 2583, 2583, 2587, 2584, 2588, 2591, 2592,
+     2596, 2593, 2594, 2594, 2595, 2599, 2597, 2598, 2598, 2596,
+     2601, 2603, 2604, 2605, 2605, 2606, 2604, 2591,    0, 2592,
+     2593, 2597, 2607, 2595, 2599, 2601, 2608, 2609, 2607, 2610,
+     2610, 2603, 2608, 2609, 2611, 2614, 2612, 2615, 2618, 2617,
+     2606, 2612, 2611, 2617, 2614, 2619, 2621, 2621, 2622, 2632,
 
-     2632, 2625, 2633, 2634, 2634, 2635, 2636, 2637, 2627, 2638,
-     2639, 2639, 2640, 2629, 2644, 2638, 2640, 2633, 2635, 2644,
-     2644, 2637, 2645, 2646, 2636, 2648, 2647, 2649, 2650, 2660,
-     2651, 2648, 2655, 2649, 2651, 2652, 2652, 2655, 2658, 2657,
-     2663, 2658, 2667, 2646, 2665, 2645, 2647, 2657, 2661, 2662,
-     2662, 2661, 2666, 2650, 2660, 2664, 2667, 2663, 2663, 2669,
-     2664, 2671, 2665, 2668, 2668, 2670, 2672, 2674, 2670, 2673,
-     2674, 2676, 2666, 2669, 2675, 2671, 2670, 2673, 2682, 2675,
-     2675, 2677, 2677, 2678, 2678, 2672, 2679, 2679, 2680, 2680,
-     2676, 2681, 2681, 2683, 2682, 2684, 2685, 2686, 2683, 2687,
+     2615,    0, 2618, 2623, 2623, 2624, 2624, 2626, 2626, 2627,
+     2619, 2637, 2628, 2627, 2630, 2630, 2622, 2628, 2633, 2632,
+     2634, 2635, 2645, 2633, 2638, 2638, 2635, 2635, 2640, 2640,
+     2643, 2637, 2634, 2641, 2641, 2642, 2647, 2651, 2642, 2654,
+     2645, 2648, 2648, 2643, 2649, 2649, 2650, 2650, 2652, 2652,
+     2653, 2655, 2651, 2656, 2657, 2657, 2647, 2654, 2658, 2656,
+     2663, 2662, 2658, 2653, 2664, 2655, 2662, 2662, 2665, 2666,
+     2667, 2668, 2678, 2669, 2675, 2666, 2667, 2669, 2670, 2670,
+     2673, 2681, 2675, 2663, 2664, 2673, 2676, 2679, 2665, 2676,
+     2679, 2680, 2680, 2683, 2684, 2682, 2668, 2678, 2681, 2681,
 
-     2688, 2689, 2694, 2690, 2687, 2692, 2692, 2693,    0, 2688,
-     2693, 2696, 2696, 2698, 2698, 2684, 2686, 2697, 2701, 2701,
-     2694, 2689, 2685, 2690, 2697, 2699, 2702, 2703, 2704, 2706,
-     2699, 2707, 2707, 2709, 2708, 2702, 2703, 2704, 2708, 2710,
-     2711, 2713, 2709, 2712, 2714, 2711, 2711, 2706, 2714, 2722,
-     2713, 2723, 2718, 2724, 2710, 2726, 2712, 2718, 2719, 2719,
-     2721, 2721, 2727, 2722, 2726, 2730, 2731, 2732, 2735, 2751,
-     2737, 2724, 2733, 2785, 2727, 2731, 2723, 2739, 2733, 2740,
-     2735, 2785, 2739, 2742, 2740, 2741, 2741, 2732, 2744, 2751,
-     2730, 2737, 2742, 2744, 2745, 2745, 2747, 2747, 2745, 2748,
+     2682, 2685, 2686, 2686, 2687, 2688, 2689, 2690, 2688, 2691,
+     2692, 2683, 2694, 2692, 2684, 2685, 2688, 2691, 2687, 2693,
+     2689, 2695, 2695, 2700, 2693, 2693, 2690, 2696, 2696, 2697,
+     2697, 2694, 2698, 2698, 2699, 2699, 2701, 2702, 2703, 2700,
+     2704, 2701, 2705, 2706, 2712, 2707, 2708, 2705, 2710, 2710,
+     2711, 2715, 2706, 2711, 2714, 2714, 2724, 2702, 2715, 2704,
+     2716, 2716, 2712, 2717, 2703, 2707, 2708, 2720, 2717, 2719,
+     2719, 2721, 2722, 2727, 2724, 2726, 2720, 2725, 2725, 2726,
+     2721, 2722, 2727, 2728, 2729, 2731, 2730, 2732, 2736, 2729,
+     2729, 2732, 2740, 2736, 2731, 2737, 2737, 2741, 2728, 2730,
 
-     2748, 2749, 2749, 2750, 2752, 2753, 2756, 2755, 2759, 2757,
-     2753, 2756, 2750, 2755, 2757, 2758, 2758, 2760, 2761, 2762,
-     2763, 2764, 2765, 2752, 2762, 2772, 2759, 2764, 2768, 2760,
-     2766, 2766, 2768, 2771, 2771, 2769, 2770, 2773, 2763, 2761,
-     2769, 2770, 2774, 2775, 2772, 2777, 2777, 2765, 2779, 2780,
-     2781, 2782, 2773, 2783, 2781, 2784, 2787, 2774, 2788, 2786,
-     2782, 2779, 2780, 2775, 2786, 2787, 2789, 2790, 2790, 2783,
-     2791, 2793, 2793, 2796, 2784, 2800, 2788, 2794, 2794, 2798,
-     2798, 2801, 2802, 2803, 2805, 2805, 2806, 2807, 2803, 2791,
-     2808, 2800, 2789, 2811, 2796, 2810, 2810, 2801, 2802, 2812,
+     2739, 2739, 2742, 2744, 2745, 2748, 2740, 2750, 2749, 2751,
+     2755, 2753, 2744, 2757, 2758, 2751, 2745, 2749, 2757, 2758,
+     2742, 2797, 2741, 2753, 2759, 2759, 2760, 2750, 2762, 2769,
+     2748, 2755, 2770, 2762, 2797, 2760, 2763, 2763, 2765, 2765,
+     2763, 2766, 2766, 2767, 2767, 2768, 2777, 2771, 2774, 2769,
+     2773, 2770, 2771, 2774, 2768, 2775, 2773, 2776, 2776, 2778,
+     2775, 2779, 2780, 2781, 2777, 2783, 2782, 2780, 2784, 2784,
+     2786, 2778, 2782, 2787, 2786, 2788, 2789, 2789, 2787, 2790,
+     2788, 2781, 2779, 2793, 2791, 2792, 2795, 2795, 2798, 2799,
+     2783, 2801, 2802, 2799, 2803, 2800, 2806, 2805, 2790, 2791,
 
-     2813, 2813, 2816, 2818, 2819, 2817, 2806, 2811, 2818, 2808,
-     2807, 2817, 2820, 2820, 2821, 2821, 2822, 2824, 2812, 2823,
-     2823, 2825, 2816, 2826, 2830, 2827, 2819, 2828, 2824, 2829,
-     2825, 2827, 2831, 2831, 2832, 2838, 2822, 2832, 2837, 2823,
-     2843, 2829,    0, 2826, 2830, 2839, 2828, 2833, 2833, 2855,
-     2837, 2839, 2840, 2840, 2841, 2838, 2842, 2841, 2843, 2845,
-     2846, 2846, 2842, 2847, 2845, 2848, 2849, 2853, 2847, 2850,
-     2851, 2851, 2849, 2854, 2855, 2856, 2857, 2857, 2858, 2853,
-     2860, 2859, 2862, 2862, 2848, 2859, 2850, 2850, 2856, 2860,
-     2864, 2854, 2863, 2863, 2865, 2864, 2866, 2858, 2867, 2867,
+     2792, 2798, 2803, 2793, 2800, 2804, 2805, 2801, 2807, 2809,
+     2804, 2802, 2808, 2808, 2806, 2811, 2811, 2812, 2812, 2814,
+     2816, 2816, 2818, 2819, 2821, 2820, 2823, 2823, 2809, 2821,
+     2824, 2825, 2826, 2829, 2807, 2828, 2828, 2830, 2818, 2819,
+     2814, 2820, 2831, 2831, 2834, 2837, 2835, 2829, 2836, 2840,
+     2824, 2826, 2835, 2836, 2825, 2842, 2830, 2838, 2838, 2839,
+     2839, 2841, 2841, 2843, 2834, 2844, 2842, 2837, 2845, 2840,
+     2846, 2847, 2843, 2848, 2845, 2849, 2849, 2850, 2851, 2851,
+     2850, 2841, 2855, 2847, 2856, 2844, 2857, 2858, 2858, 2846,
+     2860, 2861, 2857, 2848, 2855, 2859, 2860, 2863, 2859, 2864,
 
-     2870, 2866, 2868, 2868, 2869, 2869, 2871, 2879, 2865, 2872,
-     2874, 2874, 2871, 2877, 2872, 2880, 2881, 2882, 2882, 2884,
-     2884, 2885, 2886, 2892, 2887, 2893, 2870, 2888, 2888, 2879,
-     2889, 2889, 2877, 2887, 2891, 2885, 2894, 2880, 2881, 2901,
-     2891, 2894, 2886, 2892, 2893, 2897, 2897, 2899, 2899, 2900,
-     2902, 2903, 2904, 2901, 2900, 2908, 2902, 2905, 2905, 2906,
-     2904, 2909, 2910, 2903, 2906, 2911, 2912, 2910, 2914, 2915,
-     2916, 2917, 2912, 2920, 2919, 2908, 2914, 2911, 2921, 2922,
-     2923, 2909, 2925, 2926, 2930, 2923, 2942, 2925, 2915, 2920,
-     2916, 2917, 2919, 2927, 2932, 2921, 2921, 2928,    0, 2927,
+     2864, 2865, 2863, 2866, 2856, 2867, 2865, 2868, 2871, 2861,
+     2872, 2867, 2869, 2869, 2873, 2876, 2874, 2875, 2875, 2877,
+     2871, 2878, 2866, 2877, 2868, 2868, 2880, 2880, 2872, 2874,
+     2878, 2881, 2881, 2882, 2876, 2883, 2884, 2888, 2882, 2873,
+     2895, 2884, 2885, 2885, 2886, 2886, 2887, 2887, 2889, 2883,
+     2890, 2892, 2892, 2897, 2889, 2890, 2898, 2899, 2903, 2895,
+     2900, 2900, 2904, 2888, 2902, 2902, 2910, 2905, 2906, 2906,
+     2907, 2907, 2903, 2911, 2909, 2897, 2905,    0, 2898, 2899,
+     2909, 2919, 2904, 2912, 2915, 2915, 2910, 2920, 2912, 2917,
+     2917, 2918, 2911, 2920, 2921, 2919, 2918, 2922, 2923, 2923,
 
-     2922, 2931, 2928, 2926, 2930, 2942, 2931, 2932, 2935, 2935,
-     2936, 2936, 2937, 2941, 2943, 2943, 2937, 2952, 2941, 2945,
-     2945, 2946, 2946, 2949, 2946, 2947, 2947, 2949, 2947, 2948,
-     2948, 2953, 2948, 2951, 2951, 2952, 2956, 2957, 2958, 2959,
-     2959, 2962, 2963, 2958, 2964, 2953, 2965, 2966, 2964, 2963,
-     2968, 2969, 2970, 2970, 2973, 2965, 2956, 2957, 2971, 2971,
-     2969, 2978, 2966, 2972, 2972, 2974, 2962, 2975, 2968, 2973,
-     2974, 2980, 2976, 2979, 2977, 2983, 2975, 2976, 2976, 2975,
-     2977, 3012, 2981, 3014, 2982,    0, 2978, 2981, 2979, 2982,
-     2984, 2984, 2980, 2985, 2983, 2986, 2987, 2987, 3014, 2985,
+     2926, 2927, 2924, 2928, 2929, 2922, 2921, 2924, 2928, 2930,
+     2932, 2933, 2934, 2935, 2944, 2930, 2929, 2937, 2932, 2939,
+     2926, 2927, 2938, 2940, 2941, 3041, 2943, 2948, 3041, 2941,
+     2933, 2943, 2934, 2935, 2944, 2937, 2939, 2939, 2938, 2945,
+     2950, 2946, 2960, 2949, 2940, 2945, 2946, 2948, 2949, 2953,
+     2953, 2954, 2954, 2950, 2955, 2959, 2961, 2961, 2955, 2980,
+     2959, 2960, 2963, 2963, 2964, 2964, 2967, 2964, 2965, 2965,
+     2967, 2965, 2966, 2966, 2970, 2966, 2969, 2969, 2974, 2971,
+     2975, 2976, 2977, 2977, 2980, 2982, 2976, 2981, 2983, 2982,
+     2984, 2986, 2970, 2971, 2981, 2987,    0, 2983, 2974, 2991,
 
-     3012, 2986, 2988, 2988, 2989, 2989, 2990, 2993, 2993, 2994,
-     2994, 2990, 2995, 2998, 2998, 2999, 2999, 3000, 3000, 3001,
-     3001, 2995, 3002, 3002, 3003, 3003, 3004, 3004, 3006, 3007,
-     3007, 3008, 3009, 3010, 3013, 3013, 3015, 3006, 3016, 3018,
-     3008, 3017, 3017, 3022, 3009, 3019, 3019, 3024, 3023, 3015,
-     3016, 3023, 3026, 3010, 3018, 3025, 3025, 3028, 3029, 3032,
-     3028, 3022, 3030, 3031, 3029, 3033, 3034, 3044, 3031, 3036,
-     3026, 3037, 3041, 3024, 3052, 3036, 3030, 3052, 3032, 3054,
-     3037, 3059, 3034, 3033, 3055, 3055, 3060, 3041, 3056, 3056,
-     3057, 3057, 3054, 3044, 3061, 3060, 3062, 3063, 3061, 3065,
+     2975, 2988, 2988, 2992, 2987, 2984, 2989, 2989, 2992, 2986,
+     2990, 2990, 2993, 2994, 2991, 2996, 2995, 2997, 2994, 2994,
+     2998, 2993, 2995, 2999, 2993, 3000, 3001, 3013, 2999, 3003,
+     3000, 3004, 2997, 3002, 3002, 3003, 3013, 3004, 3005, 3005,
+     2996, 2998, 3006, 3006, 3008, 3001, 3007, 3007,    0, 3008,
+     3011, 3011, 3012, 3012, 3016, 3016, 3017, 3017, 3018, 3018,
+     3019, 3019, 3020, 3020, 3021, 3021, 3022, 3022, 3024, 3025,
+     3025, 3026, 3027, 3028, 3032, 3030, 3034, 3024, 3031, 3031,
+     3026, 3036, 3033, 3040, 3027, 3035, 3035, 3042, 3034, 3032,
+     3037, 3037, 3044, 3028, 3030, 3033, 3036, 3043, 3043, 3046,
 
-     3067, 3066, 3069, 3073, 3059, 3067, 3068, 3071, 3068, 3070,
-     3070, 3063, 3066, 3072, 3074, 3075, 3062, 3069, 3076, 3077,
-     3071, 3073, 3065, 3078, 3079, 3086, 3080, 3081, 3077, 3082,
-     3074, 3080, 3072, 3076, 3082, 3078, 3087, 3088, 3088, 3086,
-     3075, 3089, 3090, 3090, 3094, 3079, 3095, 3081, 3091, 3091,
-     3089, 3092, 3092, 3093, 3093, 3096, 3087, 3097, 3096, 3098,
-     3099, 3100, 3097, 3094, 3098, 3101, 3095, 3102, 3103, 3104,
-     3105, 3101, 3106, 3106, 3104, 3114, 3100, 3107, 3107, 3108,
-     3103, 3102, 3109, 3110, 3110, 3099, 3120, 3112, 3117, 3117,
-     3105, 3118, 3118, 3114, 3108, 3119, 3123, 3125, 3121, 3124,
+     3047, 3040, 3046, 3048, 3049, 3050, 3047, 3051, 3054, 3049,
+     3044, 3052, 3055, 3042, 3054, 3059, 3062, 3048, 3072, 3070,
+     3077, 3055, 3070,    0, 3050, 3051, 3080, 3052, 3073, 3073,
+     3059, 3072, 3074, 3074, 3075, 3075, 3078, 3079, 3081, 3083,
+     3084, 3079, 3062, 3077, 3085, 3078, 3080, 3089, 3086, 3085,
+     3086, 3084, 3081, 3087, 3088, 3088, 3090, 3092, 3091, 3093,
+     3089, 3095, 3083, 3094, 3097, 3096, 3098, 3099, 3087, 3100,
+     3095, 3098, 3104, 3092, 3100, 3090, 3091, 3096, 3094, 3105,
+     3106, 3106, 3107, 3112, 3093, 3097, 3104, 3099, 3108, 3108,
+     3113, 3107, 3109, 3109, 3110, 3110, 3111, 3111, 3114, 3105,
 
-     3122, 3109, 3112, 3119, 3121, 3120, 3122, 3131, 3126, 3132,
-     3123, 3134, 3124, 3126, 3127, 3127, 3125, 3128, 3128, 3135,
-     3137, 3138, 3139, 3135, 3140, 3134, 3138, 3142, 3131, 3132,
-     3141, 3143, 3148, 3144, 3145, 3145, 3143, 3140, 3144, 3149,
-     3137, 3139, 3150, 3141, 3151, 3151, 3142, 3158, 3152, 3153,
-     3154, 3154, 3148, 3152, 3155, 3153, 3159, 3149, 3156, 3155,
-     3157, 3150, 3159, 3156, 3162, 3157, 3158, 3161, 3161, 3162,
-     3163, 3163, 3165, 3166, 3167, 3168, 3165, 3169, 3170, 3171,
-     3172, 3167, 3174, 3174, 3170, 3176, 3176, 3179, 3177, 3180,
-     3178, 3181, 3166, 3172, 3168, 3178, 3169, 3177, 3171, 3184,
+     3115, 3114, 3112, 3116, 3117, 3115, 3118, 3119, 3116, 3120,
+     3113, 3122, 3121, 3119, 3123, 3126, 3122, 3124, 3124, 3125,
+     3125, 3118, 3127, 3120, 3121, 3128, 3128, 3130, 3132, 3117,
+     3126, 3135, 3135, 3138, 3123, 3136, 3136, 3137, 3139, 3141,
+     3143, 3127, 3130, 3140, 3139, 3137, 3132, 3142, 3149, 3140,
+     3144, 3150, 3138, 3141, 3152, 3144, 3145, 3145, 3155, 3143,
+     3142, 3146, 3146, 3153, 3157, 3156, 3158, 3153, 3152, 3149,
+     3156, 3150, 3159, 3160, 3166, 3161, 3162, 3167, 3155, 3158,
+     3161, 3162, 3168, 3157, 3171, 3159, 3163, 3163, 3169, 3169,
+     3171, 3170, 3160, 3176, 3166, 3167, 3170, 3172, 3172, 3173,
 
-     3177, 3182, 3182, 3186, 3181, 3183, 3179, 3188, 3180, 3193,
-     3183,    0, 3184, 3187, 3187, 3189, 3189, 3190, 3190, 3191,
-     3192, 3194, 3194, 3200, 3191, 3195, 3188, 3192, 3193, 3186,
-     3195, 3196, 3198, 3196, 3197, 3197, 3199, 3202, 3205, 3198,
-     3201, 3209, 3200, 3199, 3207, 3201, 3204, 3204, 3208, 3207,
-     3210, 3211, 3211, 3208, 3213, 3213, 3202, 3205, 3214, 3215,
-     3209, 3216, 3216, 3217, 3217, 3218, 3220, 3220, 3222, 3210,
-     3221, 3221, 3218, 3228, 3224, 3222, 3227, 3214, 3215, 3224,
-     3229, 3227, 3230, 3230, 3231, 3231,    0,    0,    0,    0,
-        0,    0, 3228,    0,    0,    0,    0,    0,    0, 3229,
+     3174, 3168, 3175, 3177, 3173, 3174, 3184, 3175, 3180, 3177,
+     3179, 3179, 3176, 3180, 3181, 3181, 3183, 3185, 3186, 3187,
+     3183, 3188, 3189, 3190, 3185, 3184,    0, 3188, 3192, 3192,
+     3194, 3194, 3197, 3195, 3196, 3198, 3190, 3186, 3187, 3196,
+     3199, 3189, 3195, 3200, 3200, 3195, 3202, 3201, 3204, 3205,
+     3205, 3197, 3201, 3199, 3198,    0, 3206, 3207, 3207, 3202,
+     3208, 3208, 3209, 3210, 3211, 3212, 3212, 3209, 3213, 3214,
+     3210, 3214, 3216, 3213, 3204, 3206, 3215, 3215, 3217, 3216,
+     3218, 3219, 3220, 3211, 3223, 3217, 3219, 3222, 3222, 3225,
+     3226, 3227, 3228, 3232, 3225, 3226, 3229, 3229, 3233, 3218,
 
-     3235, 3235, 3235, 3235, 3235, 3235, 3235, 3236, 3236, 3236,
-     3236, 3236, 3236, 3236, 3237, 3237, 3237, 3237, 3237, 3237,
-     3237, 3238, 3238, 3238, 3238, 3238, 3238, 3238, 3239, 3239,
-     3239, 3239, 3239, 3239, 3239, 3240, 3240, 3240, 3240, 3240,
-     3240, 3240, 3241, 3241, 3241, 3241, 3241, 3241, 3241, 3243,
-     3243,    0, 3243, 3243, 3243, 3243, 3244, 3244,    0,    0,
-        0, 3244, 3244, 3245, 3245,    0,    0, 3245,    0, 3245,
-     3246,    0,    0,    0,    0,    0, 3246, 3247, 3247,    0,
-        0,    0, 3247, 3247, 3248,    0,    0,    0,    0,    0,
-     3248, 3249, 3249,    0, 3249, 3249, 3249, 3249, 3250,    0,
+        0, 3220,    0, 3223, 3231, 3231, 3234, 3234, 3235, 3235,
+     3227, 3228, 3232, 3236, 3238, 3238, 3240, 3233, 3239, 3239,
+     3236, 3242, 3245, 3240, 3246, 3247, 3242, 3245, 3248, 3248,
+     3249, 3249,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0, 3246, 3247, 3253, 3253, 3253, 3253, 3253,
+     3253, 3253, 3254, 3254, 3254, 3254, 3254, 3254, 3254, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3256, 3256, 3256, 3256,
+     3256, 3256, 3256, 3257, 3257, 3257, 3257, 3257, 3257, 3257,
+     3258, 3258, 3258, 3258, 3258, 3258, 3258, 3259, 3259, 3259,
+     3259, 3259, 3259, 3259, 3261, 3261,    0, 3261, 3261, 3261,
 
-        0,    0,    0,    0, 3250, 3251, 3251,    0,    0,    0,
-     3251, 3251, 3252, 3252,    0, 3252, 3252, 3252, 3252, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234,
-     3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234, 3234
+     3261, 3262, 3262,    0,    0,    0, 3262, 3262, 3263, 3263,
+        0,    0, 3263,    0, 3263, 3264,    0,    0,    0,    0,
+        0, 3264, 3265, 3265,    0,    0,    0, 3265, 3265, 3266,
+        0,    0,    0,    0,    0, 3266, 3267, 3267,    0, 3267,
+     3267, 3267, 3267, 3268,    0,    0,    0,    0,    0, 3268,
+     3269, 3269,    0,    0,    0, 3269, 3269, 3270, 3270,    0,
+     3270, 3270, 3270, 3270, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+
+     3252, 3252, 3252, 3252, 3252
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3096,7 +3112,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3098 "<stdout>"
+#line 3114 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3105,9 +3121,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3107 "<stdout>"
+#line 3123 "<stdout>"
 
-#line 3109 "<stdout>"
+#line 3125 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3331,7 +3347,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3333 "<stdout>"
+#line 3349 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3364,13 +3380,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3235 )
+				if ( yy_current_state >= 3253 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 6320 );
+		while ( yy_base[yy_current_state] != 6365 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3885,72 +3901,72 @@ YY_RULE_SETUP
 case 98:
 YY_RULE_SETUP
 #line 312 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
+{ YDVAR(1, VAR_CAPS_WHITELIST) }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 313 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
+{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 314 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
+{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 315 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH_KEY) }
+{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 316 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH) }
+{ YDVAR(1, VAR_PREFETCH_KEY) }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 317 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DENY_ANY) }
+{ YDVAR(1, VAR_PREFETCH) }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 318 "./util/configlexer.lex"
-{ YDVAR(0, VAR_STUB_ZONE) }
+{ YDVAR(1, VAR_DENY_ANY) }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 319 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NAME) }
+{ YDVAR(0, VAR_STUB_ZONE) }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 320 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_ADDR) }
+{ YDVAR(1, VAR_NAME) }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 321 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_HOST) }
+{ YDVAR(1, VAR_STUB_ADDR) }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 322 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_PRIME) }
+{ YDVAR(1, VAR_STUB_HOST) }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_FIRST) }
+{ YDVAR(1, VAR_STUB_PRIME) }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_NO_CACHE) }
+{ YDVAR(1, VAR_STUB_FIRST) }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_NO_CACHE) }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
@@ -3960,32 +3976,32 @@ YY_RULE_SETUP
 case 113:
 YY_RULE_SETUP
 #line 327 "./util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 328 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 329 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_FIRST) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
@@ -3995,751 +4011,751 @@ YY_RULE_SETUP
 case 120:
 YY_RULE_SETUP
 #line 334 "./util/configlexer.lex"
-{ YDVAR(0, VAR_AUTH_ZONE) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(0, VAR_RPZ) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 336 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TAGS) }
+{ YDVAR(0, VAR_RPZ) }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 337 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
+{ YDVAR(1, VAR_TAGS) }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 338 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
+{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG) }
+{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 340 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG_NAME) }
+{ YDVAR(1, VAR_RPZ_LOG) }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEFILE) }
+{ YDVAR(1, VAR_RPZ_LOG_NAME) }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MASTER) }
+{ YDVAR(1, VAR_ZONEFILE) }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_URL) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 344 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ALLOW_NOTIFY) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+{ YDVAR(1, VAR_URL) }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 346 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_UPSTREAM) }
+{ YDVAR(1, VAR_ALLOW_NOTIFY) }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FALLBACK_ENABLED) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(1, VAR_FALLBACK_ENABLED) }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(0, VAR_VIEW) }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_IDENTITY) }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_VERSION) }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_MODULE_CONF) }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 382 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 383 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 384 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 385 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 388 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 389 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 398 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 397 "./util/configlexer.lex"
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 399 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+#line 398 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 422 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 423 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 424 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 425 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 426 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 427 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 428 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 429 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 430 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DYNLIB_FILE) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DYNLIB) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(1, VAR_DYNLIB_FILE) }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(0, VAR_DYNLIB) }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 438 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 439 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 440 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 441 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 442 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 443 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 444 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 445 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
 #line 446 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
 #line 447 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 448 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
 #line 449 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
 #line 450 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
 #line 451 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
 #line 452 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
 #line 453 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
 #line 454 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(1, VAR_DNSTAP_IP) }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
 #line 455 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_TLS) }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
 #line 456 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
-#line 458 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+#line 457 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
-#line 460 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 458 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
-#line 461 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+#line 460 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
 #line 462 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
 #line 463 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
 #line 464 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
-#line 466 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+#line 465 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
-#line 468 "./util/configlexer.lex"
+#line 466 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
-#line 470 "./util/configlexer.lex"
+#line 468 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
-#line 472 "./util/configlexer.lex"
+#line 470 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
-#line 474 "./util/configlexer.lex"
+#line 472 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
-#line 476 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 474 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
-#line 477 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+#line 476 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
 #line 478 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
 #line 479 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 257:
 YY_RULE_SETUP
 #line 480 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 258:
 YY_RULE_SETUP
 #line 481 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 482 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
 #line 483 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 261:
 YY_RULE_SETUP
 #line 484 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 262:
 YY_RULE_SETUP
 #line 485 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
 #line 486 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
 #line 487 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 488 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 489 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_LOW_RTT) }
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 490 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
@@ -4749,210 +4765,225 @@ YY_RULE_SETUP
 case 269:
 YY_RULE_SETUP
 #line 492 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 270:
 YY_RULE_SETUP
 #line 493 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 271:
 YY_RULE_SETUP
 #line 494 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 272:
 YY_RULE_SETUP
 #line 495 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 273:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
-#line 504 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+#line 503 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
-#line 506 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 504 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
-#line 507 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+#line 506 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 508 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 509 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 510 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 511 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 512 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 513 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 514 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 290:
 YY_RULE_SETUP
 #line 515 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 291:
 YY_RULE_SETUP
 #line 516 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 292:
 YY_RULE_SETUP
 #line 517 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 293:
 YY_RULE_SETUP
 #line 518 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 294:
 YY_RULE_SETUP
 #line 519 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 295:
 YY_RULE_SETUP
 #line 520 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 296:
 YY_RULE_SETUP
 #line 521 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 297:
 YY_RULE_SETUP
 #line 522 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 298:
 YY_RULE_SETUP
 #line 523 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
 	YY_BREAK
 case 299:
 YY_RULE_SETUP
 #line 524 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(0, VAR_IPSET) }
 	YY_BREAK
 case 300:
 YY_RULE_SETUP
 #line 525 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
 	YY_BREAK
 case 301:
 YY_RULE_SETUP
 #line 526 "./util/configlexer.lex"
-{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
 	YY_BREAK
 case 302:
 YY_RULE_SETUP
 #line 527 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 	YY_BREAK
 case 303:
-/* rule 303 can match eol */
 YY_RULE_SETUP
 #line 528 "./util/configlexer.lex"
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+	YY_BREAK
+case 304:
+YY_RULE_SETUP
+#line 529 "./util/configlexer.lex"
+{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+	YY_BREAK
+case 305:
+YY_RULE_SETUP
+#line 530 "./util/configlexer.lex"
+{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+	YY_BREAK
+case 306:
+/* rule 306 can match eol */
+YY_RULE_SETUP
+#line 531 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 304:
+case 307:
 YY_RULE_SETUP
-#line 531 "./util/configlexer.lex"
+#line 534 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 532 "./util/configlexer.lex"
+#line 535 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 305:
+case 308:
 YY_RULE_SETUP
-#line 537 "./util/configlexer.lex"
+#line 540 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 306:
-/* rule 306 can match eol */
+case 309:
+/* rule 309 can match eol */
 YY_RULE_SETUP
-#line 538 "./util/configlexer.lex"
+#line 541 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 307:
+case 310:
 YY_RULE_SETUP
-#line 540 "./util/configlexer.lex"
+#line 543 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4965,34 +4996,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 308:
+case 311:
 YY_RULE_SETUP
-#line 552 "./util/configlexer.lex"
+#line 555 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 553 "./util/configlexer.lex"
+#line 556 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 309:
+case 312:
 YY_RULE_SETUP
-#line 558 "./util/configlexer.lex"
+#line 561 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 310:
-/* rule 310 can match eol */
+case 313:
+/* rule 313 can match eol */
 YY_RULE_SETUP
-#line 559 "./util/configlexer.lex"
+#line 562 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 311:
+case 314:
 YY_RULE_SETUP
-#line 561 "./util/configlexer.lex"
+#line 564 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5005,38 +5036,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 312:
+case 315:
 YY_RULE_SETUP
-#line 573 "./util/configlexer.lex"
+#line 576 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 575 "./util/configlexer.lex"
+#line 578 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 313:
-YY_RULE_SETUP
-#line 579 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
-case 314:
-/* rule 314 can match eol */
-YY_RULE_SETUP
-#line 580 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
-	YY_BREAK
-case 315:
-YY_RULE_SETUP
-#line 581 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
-	YY_BREAK
 case 316:
 YY_RULE_SETUP
 #line 582 "./util/configlexer.lex"
+{ LEXOUT(("ISP ")); /* ignore */ }
+	YY_BREAK
+case 317:
+/* rule 317 can match eol */
+YY_RULE_SETUP
+#line 583 "./util/configlexer.lex"
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
+	YY_BREAK
+case 318:
+YY_RULE_SETUP
+#line 584 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 319:
+YY_RULE_SETUP
+#line 585 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -5044,27 +5075,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 587 "./util/configlexer.lex"
+#line 590 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 317:
+case 320:
 YY_RULE_SETUP
-#line 591 "./util/configlexer.lex"
+#line 594 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 318:
-/* rule 318 can match eol */
+case 321:
+/* rule 321 can match eol */
 YY_RULE_SETUP
-#line 592 "./util/configlexer.lex"
+#line 595 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 319:
+case 322:
 YY_RULE_SETUP
-#line 594 "./util/configlexer.lex"
+#line 597 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5074,7 +5105,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 600 "./util/configlexer.lex"
+#line 603 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5089,39 +5120,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 320:
+case 323:
 YY_RULE_SETUP
-#line 614 "./util/configlexer.lex"
+#line 617 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 617 "./util/configlexer.lex"
+#line 620 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 321:
-YY_RULE_SETUP
-#line 621 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
-case 322:
-/* rule 322 can match eol */
-YY_RULE_SETUP
-#line 622 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
-	YY_BREAK
-case 323:
-YY_RULE_SETUP
-#line 623 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
-	YY_BREAK
 case 324:
 YY_RULE_SETUP
 #line 624 "./util/configlexer.lex"
+{ LEXOUT(("ITSP ")); /* ignore */ }
+	YY_BREAK
+case 325:
+/* rule 325 can match eol */
+YY_RULE_SETUP
+#line 625 "./util/configlexer.lex"
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
+	YY_BREAK
+case 326:
+YY_RULE_SETUP
+#line 626 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 327:
+YY_RULE_SETUP
+#line 627 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5130,29 +5161,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 630 "./util/configlexer.lex"
+#line 633 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 325:
+case 328:
 YY_RULE_SETUP
-#line 634 "./util/configlexer.lex"
+#line 637 "./util/configlexer.lex"
 { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 326:
-/* rule 326 can match eol */
+case 329:
+/* rule 329 can match eol */
 YY_RULE_SETUP
-#line 635 "./util/configlexer.lex"
+#line 638 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 327:
+case 330:
 YY_RULE_SETUP
-#line 639 "./util/configlexer.lex"
+#line 642 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5161,33 +5192,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 328:
+case 331:
 YY_RULE_SETUP
-#line 647 "./util/configlexer.lex"
+#line 650 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 329:
+case 332:
 YY_RULE_SETUP
-#line 651 "./util/configlexer.lex"
+#line 654 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 330:
+case 333:
 YY_RULE_SETUP
-#line 655 "./util/configlexer.lex"
+#line 658 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 331:
+case 334:
 YY_RULE_SETUP
-#line 659 "./util/configlexer.lex"
+#line 662 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5189 "<stdout>"
+#line 5220 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5482,7 +5513,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3235 )
+			if ( yy_current_state >= 3253 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5510,11 +5541,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3235 )
+		if ( yy_current_state >= 3253 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3234);
+	yy_is_jam = (yy_current_state == 3252);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6153,6 +6184,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 659 "./util/configlexer.lex"
+#line 662 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 0b997a306..ea7c1cf72 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -309,6 +309,7 @@ harden-referral-path{COLON}	{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
 harden-algo-downgrade{COLON}	{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
 use-caps-for-id{COLON}		{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
 caps-whitelist{COLON}		{ YDVAR(1, VAR_CAPS_WHITELIST) }
+caps-exempt{COLON}		{ YDVAR(1, VAR_CAPS_WHITELIST) }
 unwanted-reply-threshold{COLON}	{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
 private-address{COLON}		{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
 private-domain{COLON}		{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
@@ -340,6 +341,7 @@ rpz-log{COLON}			{ YDVAR(1, VAR_RPZ_LOG) }
 rpz-log-name{COLON}		{ YDVAR(1, VAR_RPZ_LOG_NAME) }
 zonefile{COLON}			{ YDVAR(1, VAR_ZONEFILE) }
 master{COLON}			{ YDVAR(1, VAR_MASTER) }
+primary{COLON}			{ YDVAR(1, VAR_MASTER) }
 url{COLON}			{ YDVAR(1, VAR_URL) }
 allow-notify{COLON}		{ YDVAR(1, VAR_ALLOW_NOTIFY) }
 for-downstream{COLON}		{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
@@ -510,6 +512,7 @@ ipsecmod-ignore-bogus{COLON}	{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 ipsecmod-hook{COLON}		{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 ipsecmod-max-ttl{COLON}		{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 ipsecmod-whitelist{COLON}	{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+ipsecmod-allow{COLON}		{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 ipsecmod-strict{COLON}		{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 cachedb{COLON}			{ YDVAR(0, VAR_CACHEDB) }
 backend{COLON}			{ YDVAR(1, VAR_CACHEDB_BACKEND) }

From 83200a3431b0cc7d431eb6642b045c4561c0cec2 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 29 Sep 2020 13:29:24 +0200
Subject: [PATCH 072/108] - Fix unit test for dnstap changes, so that it waits
 for the timer.

---
 doc/Changelog                    | 3 +++
 testdata/dnstap.tdir/dnstap.test | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index c2176f785..47aa0bb32 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+28 September 2020: Wouter
+	- Fix unit test for dnstap changes, so that it waits for the timer.
+
 23 September 2020: Wouter
 	- Fix #305: dnstap logging significantly affects unbound performance
 	  (regression in 1.11).
diff --git a/testdata/dnstap.tdir/dnstap.test b/testdata/dnstap.tdir/dnstap.test
index 04db17b27..d548e2dad 100644
--- a/testdata/dnstap.tdir/dnstap.test
+++ b/testdata/dnstap.tdir/dnstap.test
@@ -24,6 +24,8 @@ else
 	exit 1
 fi
 
+echo "> wait for log to happen on timer"
+sleep 3
 echo "> check tap.log for dnstap info"
 # see if it logged the information in tap.log
 # wait for a moment for filesystem to catch up.

From b6d04f500bb0f021938d87871f995bc85ca619bf Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Tue, 29 Sep 2020 14:07:38 +0200
Subject: [PATCH 073/108] - DNS Flag Day 2020: change edns-buffer-size default
 to 1232.

---
 doc/Changelog                                |  3 +++
 doc/example.conf.in                          |  4 ++--
 doc/unbound.conf.5.in                        | 11 +++++------
 testcode/testpkts.c                          |  2 +-
 testdata/val_cnametocnamewctoposwc.rpl       |  6 +-----
 testdata/val_nsec3_cnametocnamewctoposwc.rpl |  6 +-----
 util/config_file.c                           |  2 +-
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 47aa0bb32..d257816b1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+29 September 2020: Ralph
+	- DNS Flag Day 2020: change edns-buffer-size default to 1232.
+
 28 September 2020: Wouter
 	- Fix unit test for dnstap changes, so that it waits for the timer.
 
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 3213a8f8c..852cccaed 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -129,8 +129,8 @@ server:
 	# ip-dscp: 0
 
 	# EDNS reassembly buffer to advertise to UDP peers (the actual buffer
-	# is set with msg-buffer-size). 1472 can solve fragmentation (timeouts)
-	# edns-buffer-size: 4096
+	# is set with msg-buffer-size).
+	# edns-buffer-size: 1232
 
 	# Maximum UDP response size (not applied to TCP response).
 	# Suggested values are 512 to 4096. Default is 4096. 65536 disables it.
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index dfdab90d5..95c4aaa99 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -207,12 +207,11 @@ accepted. For larger installations increasing this value is a good idea.
 Number of bytes size to advertise as the EDNS reassembly buffer size.
 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
-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).
+not set higher than that value.  Default is 1232 which is the DNS Flag Day 2020
+recommendation. 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).
 .TP
 .B max\-udp\-size: \fI<number>
 Maximum UDP response size (not applied to TCP response).  65536 disables the
diff --git a/testcode/testpkts.c b/testcode/testpkts.c
index 82c143967..dee451761 100644
--- a/testcode/testpkts.c
+++ b/testcode/testpkts.c
@@ -501,7 +501,7 @@ add_edns(uint8_t* pktbuf, size_t pktsize, int do_flag, uint8_t *ednsdata,
 {
 	uint8_t edns[] = {0x00, /* root label */
 		0x00, LDNS_RR_TYPE_OPT, /* type */
-		0x10, 0x00, /* class is UDPSIZE 4096 */
+		0x04, 0xD0, /* class is UDPSIZE 1232 */
 		0x00, /* TTL[0] is ext rcode */
 		0x00, /* TTL[1] is edns version */
 		(uint8_t)(do_flag?0x80:0x00), 0x00, /* TTL[2-3] is edns flags, DO */
diff --git a/testdata/val_cnametocnamewctoposwc.rpl b/testdata/val_cnametocnamewctoposwc.rpl
index f17f5aafc..c290026ba 100644
--- a/testdata/val_cnametocnamewctoposwc.rpl
+++ b/testdata/val_cnametocnamewctoposwc.rpl
@@ -186,7 +186,7 @@ ENTRY_END
 STEP 10 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA AD DO NOERROR
+REPLY QR TC RD RA AD DO NOERROR
 SECTION QUESTION
 start.example.com. IN A
 SECTION ANSWER
@@ -201,11 +201,7 @@ SECTION AUTHORITY
 *.wc.example.com.	86400	IN	RRSIG	NSEC 8 3 86400 20121126131853 20121029131853 64050 example.com. YrmCLu0uGgD2gcU4p12BGnUGYcrKmfg82MJHSF5OnVmmJxXiSbSBnZPahbJNGA/kPLt+SlDyBTcssZKXWxM6bW7WF57OwffOj7rMyr5vhx7J6OsuWKotPVqnUFDx9j/rOum24yCKqoBWvpW/RYUHLuX1Wm05WMCgNWhuN4wqwiU=
 *.end.example.com.	86400	IN	NSEC	escapedtext.example.com. A RRSIG NSEC 
 *.end.example.com.	86400	IN	RRSIG	NSEC 8 3 86400 20121126131826 20121029131826 64050 example.com. P6uJSImaee+5NHlTP06pMxgO69qxjJc0Uo1+htjVyE8f15MhG8A7NttvzggbtyzmfLMPr7TilM+Mm7hC3pIk/TeBEdH8p+8qypnY0NzPntz5z1+6C6ZTjDXp6NxDwMz7th31r3B3u4xo/K4qMnXmrAFOIE5Lopk0uDGXfjKPCKE=
-example.com.	3600	IN	NS	ns.example.com.
-example.com.	3600	IN	RRSIG	NS 8 2 3600 20121126131826 20121029131826 64050 example.com. NgY7UAdkXprnCi/O6c5XoB82tqLBd1bY9LmDG9wwN0zEUR5aHQcOmX9waHyqXQI86SOFQbGCvO2wDLqdqWniw1IYf4S66Vf9KrpaH2gVbvHKiEpGJPeDYQcD5xkv50Lsp4ktcLyuO/dk8ORCP7E2yC5IQVNeFgUfaqttZcJoxuQ=
 SECTION ADDITIONAL
-ns.example.com.	3600	IN	A	1.2.3.4
-ns.example.com.	3600	IN	RRSIG	A 8 2 3600 20121126123249 20121029123249 64050 example.com. zxGyimwFsd39j8T7jJ+tSAQPwZ7tjk6HHmzosTMCRePM4k4newbLb5HbrpucSiW/plaEZvjRTDTJ6bPkw0msPXjPCI/22Zh236XO5vhGtMOlxDgAEazuhifVF6UsM7GZwONPBCvw705HgWQyCR1YlTK2w9ffH3GopU9f4oP7Pmk=
 ENTRY_END
 
 SCENARIO_END
diff --git a/testdata/val_nsec3_cnametocnamewctoposwc.rpl b/testdata/val_nsec3_cnametocnamewctoposwc.rpl
index 23d2b6a89..0fba0e2e1 100644
--- a/testdata/val_nsec3_cnametocnamewctoposwc.rpl
+++ b/testdata/val_nsec3_cnametocnamewctoposwc.rpl
@@ -184,7 +184,7 @@ ENTRY_END
 STEP 10 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA AD DO NOERROR
+REPLY QR TC RD RA AD DO NOERROR
 SECTION QUESTION
 start.example.com. IN A
 SECTION ANSWER
@@ -199,11 +199,7 @@ isjq5aarcp8p5sukc56g961cccjus5u2.example.com.	86400	IN	NSEC3	1 0 1 abcd  isoaarj
 isjq5aarcp8p5sukc56g961cccjus5u2.example.com.	86400	IN	RRSIG	NSEC3 8 3 86400 20121126123259 20121029123259 64050 example.com. Cxwzq1DUQvhkTVHEJHlb92c511Y+uJy/C0yL9br6W/5lB/usuSiK2DjW58ibPh2kLH1P3SpGqd1Y7LigptdXoPBDFakcNcimPWCN93R3J80+vrHHPkPyIsBaywwYI3SNGgfnHfPF+wmH+tZ1vfEHbigOxqPFK+T0ntKq7dkSndg=
 a61sejfu6am5a36p628t4s089s309o44.example.com.	86400	IN	NSEC3	1 0 1 abcd  a64lt5ij9a1up15h5cdsn1u2071901hu A RRSIG 
 a61sejfu6am5a36p628t4s089s309o44.example.com.	86400	IN	RRSIG	NSEC3 8 3 86400 20121126123315 20121029123315 64050 example.com. gfBu4oqo9cVxJbqrw2Ly7mK638kGPOF8l8eh7ovalniwkU3F+PNYJyfSE9yGX8tMGbXrkEW9mAzAh39igr2+Bbzi9WPTRp4RDVM0qw+eyMmQRPWKt7FeanDtP+OcdVp0Hf2aPzsgmgTdS6s0AboUq1rX53H2M6F8xAiwPrBJXDQ=
-example.com.	3600	IN	NS	ns.example.com.
-example.com.	3600	IN	RRSIG	NS 8 2 3600 20121126123249 20121029123249 64050 example.com. cpLjgKPacNxVIGo59tYMZ98GVYpH28WHRWj3AeIHK0StYFcAlflGLdkae1LEgMwfUmzrayrA5GMe3AH8LyuTgA2Dn1oNFxGfuShQvK2MFQ+LxvQfiuoqlAlL5Aa94IWcSoU/wLrr66I1K8oSB2yK1Tyyv73c2N40D1mBbzIE70U=
 SECTION ADDITIONAL
-ns.example.com.	3600	IN	A	1.2.3.4
-ns.example.com.	3600	IN	RRSIG	A 8 2 3600 20121126123249 20121029123249 64050 example.com. zxGyimwFsd39j8T7jJ+tSAQPwZ7tjk6HHmzosTMCRePM4k4newbLb5HbrpucSiW/plaEZvjRTDTJ6bPkw0msPXjPCI/22Zh236XO5vhGtMOlxDgAEazuhifVF6UsM7GZwONPBCvw705HgWQyCR1YlTK2w9ffH3GopU9f4oP7Pmk=
 ENTRY_END
 
 SCENARIO_END
diff --git a/util/config_file.c b/util/config_file.c
index f590a36cf..b789c3359 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -152,7 +152,7 @@ config_create(void)
 	cfg->incoming_num_tcp = 2; 
 #endif
 	cfg->stream_wait_size = 4 * 1024 * 1024;
-	cfg->edns_buffer_size = 4096; /* 4k from rfc recommendation */
+	cfg->edns_buffer_size = 1232; /* from DNS flagday recommendation */
 	cfg->msg_buffer_size = 65552; /* 64 k + a small margin */
 	cfg->msg_cache_size = 4 * 1024 * 1024;
 	cfg->msg_cache_slabs = 4;

From a7ae0ade66d648ab515cc621360968282b42e7f1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 11:20:33 +0200
Subject: [PATCH 074/108] - Fix doh tests when not compiled in.

---
 doc/Changelog                                                 | 3 +++
 testdata/doh_downstream.tdir/doh_downstream.post              | 2 ++
 testdata/doh_downstream.tdir/doh_downstream.pre               | 4 +++-
 testdata/doh_downstream.tdir/doh_downstream.test              | 1 +
 .../doh_downstream_buffer_size.post                           | 2 ++
 .../doh_downstream_buffer_size.pre                            | 4 +++-
 .../doh_downstream_buffer_size.test                           | 1 +
 .../doh_downstream_endpoint.tdir/doh_downstream_endpoint.post | 2 ++
 .../doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre  | 3 ++-
 .../doh_downstream_endpoint.tdir/doh_downstream_endpoint.test | 1 +
 testdata/doh_downstream_post.tdir/doh_downstream_post.post    | 2 ++
 testdata/doh_downstream_post.tdir/doh_downstream_post.pre     | 3 ++-
 testdata/doh_downstream_post.tdir/doh_downstream_post.test    | 1 +
 13 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index d257816b1..9c84fa588 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 September 2020: Wouter
+	- Fix doh tests when not compiled in.
+
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.
 
diff --git a/testdata/doh_downstream.tdir/doh_downstream.post b/testdata/doh_downstream.tdir/doh_downstream.post
index 432e0eedd..0e3c00b05 100644
--- a/testdata/doh_downstream.tdir/doh_downstream.post
+++ b/testdata/doh_downstream.tdir/doh_downstream.post
@@ -5,6 +5,8 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 . ../common.sh
 kill_pid $FWD_PID
 kill_pid $UNBOUND_PID
diff --git a/testdata/doh_downstream.tdir/doh_downstream.pre b/testdata/doh_downstream.tdir/doh_downstream.pre
index 84734d76e..29bb805a1 100644
--- a/testdata/doh_downstream.tdir/doh_downstream.pre
+++ b/testdata/doh_downstream.tdir/doh_downstream.pre
@@ -4,7 +4,10 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
 get_random_port 2
 UNBOUND_PORT=$RND_PORT
 FWD_PORT=$(($RND_PORT + 1))
@@ -20,7 +23,6 @@ echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
diff --git a/testdata/doh_downstream.tdir/doh_downstream.test b/testdata/doh_downstream.tdir/doh_downstream.test
index 78e2e84eb..d66168fba 100644
--- a/testdata/doh_downstream.tdir/doh_downstream.test
+++ b/testdata/doh_downstream.tdir/doh_downstream.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
index ffad089e4..881970a77 100644
--- a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post
@@ -5,6 +5,8 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 . ../common.sh
 kill_pid $UNBOUND_PID
 cat unbound.log
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
index 19795398c..a58780ab3 100644
--- a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre
@@ -4,7 +4,10 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
 get_random_port 1
 UNBOUND_PORT=$RND_PORT
 echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
@@ -12,7 +15,6 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_buffer_size.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
diff --git a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
index bbeb9eb2b..78c46081d 100644
--- a/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
+++ b/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
index ffad089e4..dcdf8627e 100644
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post
@@ -5,6 +5,8 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 kill_pid $UNBOUND_PID
 cat unbound.log
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
index 4f10a9a18..cd0d11fd4 100644
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre
@@ -4,7 +4,9 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_random_port 1
 UNBOUND_PORT=$RND_PORT
 echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
@@ -12,7 +14,6 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_endpoint.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
diff --git a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
index d788e3667..2a6954cab 100644
--- a/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
+++ b/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.post b/testdata/doh_downstream_post.tdir/doh_downstream_post.post
index f66183b70..98034a32c 100644
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.post
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.post
@@ -5,7 +5,9 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 #
 # do your teardown here
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 kill_pid $FWD_PID
 kill_pid $UNBOUND_PID
 cat unbound.log
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.pre b/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
index e32f187c5..34df83d4b 100644
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.pre
@@ -4,7 +4,9 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_random_port 2
 UNBOUND_PORT=$RND_PORT
 FWD_PORT=$(($RND_PORT + 1))
@@ -20,7 +22,6 @@ echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
 # make config file
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_post.conf > ub.conf
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
diff --git a/testdata/doh_downstream_post.tdir/doh_downstream_post.test b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
index d6a512ae3..6442d1e12 100644
--- a/testdata/doh_downstream_post.tdir/doh_downstream_post.test
+++ b/testdata/doh_downstream_post.tdir/doh_downstream_post.test
@@ -6,6 +6,7 @@
 
 PRE="../.."
 . ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 get_make
 (cd $PRE; $MAKE dohclient)
 

From ddb82af523251d22286a83c89be3e5c51e80fddd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 11:21:24 +0200
Subject: [PATCH 075/108] - Add dohclient test executable to gitignore.

---
 .gitignore    | 1 +
 doc/Changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7688fd758..d0c69f81d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
 /unbound.h
 /asynclook
 /delayer
+/dohclient
 /lock-verify
 /memstats
 /perf
diff --git a/doc/Changelog b/doc/Changelog
index 9c84fa588..fe32245ee 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 30 September 2020: Wouter
 	- Fix doh tests when not compiled in.
+	- Add dohclient test executable to gitignore.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.

From bbba236a3663d603d0774677c712b3d09c3c7e3c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 11:29:57 +0200
Subject: [PATCH 076/108] - Fix stream_ssl, ssl_req_order and ssl_req_timeout
 tests for   alloc check debug output.

---
 doc/Changelog                                 |  2 +
 .../ssl_req_order.tdir/ssl_req_order.test     | 51 ++++++++++++++++---
 .../ssl_req_timeout.tdir/ssl_req_timeout.test | 18 +++++--
 testdata/stream_ssl.tdir/stream_ssl.test      |  4 +-
 4 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index fe32245ee..ff370f0b2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 30 September 2020: Wouter
 	- Fix doh tests when not compiled in.
 	- Add dohclient test executable to gitignore.
+	- Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for
+	  alloc check debug output.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.
diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.test b/testdata/ssl_req_order.tdir/ssl_req_order.test
index 65981d16c..360a09922 100644
--- a/testdata/ssl_req_order.tdir/ssl_req_order.test
+++ b/testdata/ssl_req_order.tdir/ssl_req_order.test
@@ -11,12 +11,14 @@ get_make
 
 # this test query should just work (server is up)
 echo "> query www1.example.net."
-$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -28,6 +30,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -37,12 +40,14 @@ echo "OK"
 
 # multiple requests (from localdata)
 echo "> query www1.example.net. www2.example.net. www3.example.net."
-$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -54,6 +59,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -65,6 +71,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -76,6 +83,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -85,12 +93,14 @@ fi
 # out of order requests, the example.com elements take 2 seconds to wait.
 echo ""
 echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -102,6 +112,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -113,6 +124,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -124,6 +136,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -135,6 +148,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -146,6 +160,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -156,12 +171,14 @@ fi
 # www.example.com present twice, answered twice.
 echo ""
 echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -173,6 +190,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -184,6 +202,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -195,6 +214,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -206,6 +226,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -216,12 +237,14 @@ fi
 # www3.example.com present twice, answered twice.
 echo ""
 echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -233,6 +256,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -244,6 +268,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -255,6 +280,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -266,6 +292,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -274,12 +301,14 @@ fi
 
 echo ""
 echo "> query www4.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -291,6 +320,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -302,6 +332,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -310,12 +341,14 @@ fi
 
 echo ""
 echo "> query a1.example.com. - a100.example.com."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN a91.a.example.com. A IN a92.a.example.com. A IN a93.a.example.com. A IN a94.a.example.com. A IN a95.a.example.com. A IN a96.a.example.com. A IN a97.a.example.com. A IN a98.a.example.com. A IN a99.a.example.com. A IN a100.a.example.com. A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN a91.a.example.com. A IN a92.a.example.com. A IN a93.a.example.com. A IN a94.a.example.com. A IN a95.a.example.com. A IN a96.a.example.com. A IN a97.a.example.com. A IN a98.a.example.com. A IN a99.a.example.com. A IN a100.a.example.com. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -325,12 +358,14 @@ grep "a.example.com.	IN	A" outfile
 
 echo ""
 echo "> query www5.example.net. www3.example.net. www.drop.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
diff --git a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test
index 5223fc985..7f6527e0d 100644
--- a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test
+++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test
@@ -17,12 +17,14 @@ fi
 
 # this test query should just work (server is up)
 echo "> query www1.example.net."
-$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -34,6 +36,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -43,12 +46,14 @@ echo "OK"
 
 # multiple requests that are answered immediately and then the timeout
 echo "> query www1.example.net. www2.example.net. www3.example.net. www.example.com."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN www.example.com. A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN www.example.com. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -60,6 +65,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -71,6 +77,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -82,6 +89,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -93,6 +101,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
@@ -101,12 +110,14 @@ fi
 
 # multiple requests that are waiting for answers and then the timeout
 echo "> query www2.example.com. www2.example.com. www3.example.com."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN www2.example.com A IN www3.example.com A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN www2.example.com A IN www3.example.com A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "Not OK"
@@ -118,6 +129,7 @@ else
 	echo "result contents not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	cat fwd.log 
 	cat unbound.log
 	echo "result contents not OK"
diff --git a/testdata/stream_ssl.tdir/stream_ssl.test b/testdata/stream_ssl.tdir/stream_ssl.test
index 08bbcdee9..b5bc2d911 100644
--- a/testdata/stream_ssl.tdir/stream_ssl.test
+++ b/testdata/stream_ssl.tdir/stream_ssl.test
@@ -11,11 +11,12 @@ get_make
 
 # first test streamtcp against the server unbound.
 echo "> streamtcp -s www.example.com A IN"
-$PRE/streamtcp -s -f 127.0.0.1@$SERV_PORT www.example.com. A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$SERV_PORT www.example.com. A IN >outfile 2>outerr
 if test "$?" -ne 0; then
 	echo "exit status not OK"
 	echo "> cat logfiles"
 	cat outfile
+	cat outerr
 	echo "SSLSERVICE"
 	cat unboundserv.log
 	echo "SSLCLIENT"
@@ -27,6 +28,7 @@ else
 fi
 echo "> cat logfiles"
 cat outfile
+cat outerr
 echo "SSLSERVICE"
 cat unboundserv.log
 echo "SSLCLIENT"

From a453ab629c238edf7626124f3373cb0bf8d4062f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 11:38:11 +0200
Subject: [PATCH 077/108] - Easier kill of unbound-dnstap-socket tool in test.

---
 dnstap/unbound-dnstap-socket.c                       | 2 +-
 doc/Changelog                                        | 1 +
 testdata/dnstap_reconnect.tdir/dnstap_reconnect.post | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index ca950c8bf..5a540f337 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -1209,9 +1209,9 @@ setup_and_run(struct config_strlist_head* local_list,
 	if(verbosity) log_info("start of service");
 
 	ub_event_base_dispatch(base);
+	sig_base = NULL;
 
 	if(verbosity) log_info("end of service");
-	sig_base = NULL;
 	tap_socket_list_delete(maindata->acceptlist);
 	ub_event_base_free(base);
 	free(maindata);
diff --git a/doc/Changelog b/doc/Changelog
index ff370f0b2..3dd45963a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- Add dohclient test executable to gitignore.
 	- Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for
 	  alloc check debug output.
+	- Easier kill of unbound-dnstap-socket tool in test.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.
diff --git a/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post b/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post
index 8474b3a02..0056a20d9 100644
--- a/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post
+++ b/testdata/dnstap_reconnect.tdir/dnstap_reconnect.post
@@ -13,4 +13,6 @@ kill_pid $FWD_PID
 kill $UNBOUND_PID
 kill $UNBOUND_PID >/dev/null 2>&1
 cat unbound.log
+cat tap.log
+cat tap.errlog
 exit 0

From 46b3440aea6c15be935d015648b706084a641fd9 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 11:43:46 +0200
Subject: [PATCH 078/108] - Fix memory leak of edns tags at libunbound context
 delete.

---
 doc/Changelog           | 1 +
 libunbound/libunbound.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 3dd45963a..aba2a9ae2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for
 	  alloc check debug output.
 	- Easier kill of unbound-dnstap-socket tool in test.
+	- Fix memory leak of edns tags at libunbound context delete.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.
diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index af26e5546..3922eb041 100644
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -186,6 +186,7 @@ ub_ctx_create(void)
 		config_delete(ctx->env->cfg);
 		modstack_desetup(&ctx->mods, ctx->env);
 		edns_known_options_delete(ctx->env);
+		edns_tags_delete(ctx->env->edns_tags);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -198,6 +199,7 @@ ub_ctx_create(void)
 		config_delete(ctx->env->cfg);
 		modstack_desetup(&ctx->mods, ctx->env);
 		edns_known_options_delete(ctx->env);
+		edns_tags_delete(ctx->env->edns_tags);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -336,6 +338,7 @@ ub_ctx_delete(struct ub_ctx* ctx)
 		infra_delete(ctx->env->infra_cache);
 		config_delete(ctx->env->cfg);
 		edns_known_options_delete(ctx->env);
+		edns_tags_delete(ctx->env->edns_tags);
 		auth_zones_delete(ctx->env->auth_zones);
 		free(ctx->env);
 	}

From ea7c5ac392968656acc082c60ea3085a4082c328 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 14:55:35 +0200
Subject: [PATCH 079/108] - Fix double loopexit for unbound-dnstap-socket after
 sigterm.

---
 dnstap/unbound-dnstap-socket.c | 4 +++-
 doc/Changelog                  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 5a540f337..3ebe2b4e4 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -1167,8 +1167,10 @@ int sig_quit = 0;
 static RETSIGTYPE main_sigh(int sig)
 {
 	verbose(VERB_ALGO, "exit on signal %d\n", sig);
-	if(sig_base)
+	if(sig_base) {
 		ub_event_base_loopexit(sig_base);
+		sig_base = NULL;
+	}
 	sig_quit = 1;
 }
 
diff --git a/doc/Changelog b/doc/Changelog
index aba2a9ae2..7672435d4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	  alloc check debug output.
 	- Easier kill of unbound-dnstap-socket tool in test.
 	- Fix memory leak of edns tags at libunbound context delete.
+	- Fix double loopexit for unbound-dnstap-socket after sigterm.
 
 29 September 2020: Ralph
 	- DNS Flag Day 2020: change edns-buffer-size default to 1232.

From 52b04806f4236c37acd10179ab465a54adc7e86a Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 1 Oct 2020 09:11:22 +0200
Subject: [PATCH 080/108] - Current repo is version 1.12.0 for release.  Tag
 for 1.12.0rc1.

---
 configure     | 50 +++++++++++++++++++-------------------------------
 configure.ac  |  6 +++---
 doc/Changelog |  3 +++
 3 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/configure b/configure
index 680722769..c819b7bf1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unbound 1.11.1.
+# Generated by GNU Autoconf 2.69 for unbound 1.12.0.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.11.1'
-PACKAGE_STRING='unbound 1.11.1'
+PACKAGE_VERSION='1.12.0'
+PACKAGE_STRING='unbound 1.12.0'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues'
 PACKAGE_URL=''
 
@@ -808,7 +808,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -958,7 +957,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1211,15 +1209,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1357,7 +1346,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1470,7 +1459,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.11.1 to adapt to many kinds of systems.
+\`configure' configures unbound 1.12.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1510,7 +1499,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1536,7 +1524,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.11.1:";;
+     short | recursive ) echo "Configuration of unbound 1.12.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1764,7 +1752,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unbound configure 1.11.1
+unbound configure 1.12.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2473,7 +2461,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.11.1, which was
+It was created by unbound $as_me 1.12.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2823,9 +2811,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 UNBOUND_VERSION_MAJOR=1
 
-UNBOUND_VERSION_MINOR=11
+UNBOUND_VERSION_MINOR=12
 
-UNBOUND_VERSION_MICRO=1
+UNBOUND_VERSION_MICRO=0
 
 
 LIBUNBOUND_CURRENT=9
@@ -2906,7 +2894,7 @@ LIBUNBOUND_AGE=1
 # 1.10.0 had 9:7:1
 # 1.10.1 had 9:8:1
 # 1.11.0 had 9:9:1
-# 1.11.1 had 9:10:1
+# 1.12.0 had 9:10:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -15705,7 +15693,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15751,7 +15739,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15775,7 +15763,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15820,7 +15808,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15844,7 +15832,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -21714,7 +21702,7 @@ _ACEOF
 
 
 
-version=1.11.1
+version=1.12.0
 
 date=`date +'%b %e, %Y'`
 
@@ -22233,7 +22221,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.11.1, which was
+This file was extended by unbound $as_me 1.12.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22299,7 +22287,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.11.1
+unbound config.status 1.12.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 8ccfafe6c..7d9879294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ sinclude(dnscrypt/dnscrypt.m4)
 
 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
-m4_define([VERSION_MINOR],[11])
-m4_define([VERSION_MICRO],[1])
+m4_define([VERSION_MINOR],[12])
+m4_define([VERSION_MICRO],[0])
 AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues, unbound)
 AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
@@ -95,7 +95,7 @@ LIBUNBOUND_AGE=1
 # 1.10.0 had 9:7:1
 # 1.10.1 had 9:8:1
 # 1.11.0 had 9:9:1
-# 1.11.1 had 9:10:1
+# 1.12.0 had 9:10:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
diff --git a/doc/Changelog b/doc/Changelog
index 7672435d4..87f796398 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+1 October 2020: Wouter
+	- Current repo is version 1.12.0 for release.  Tag for 1.12.0rc1.
+
 30 September 2020: Wouter
 	- Fix doh tests when not compiled in.
 	- Add dohclient test executable to gitignore.

From ca497815b82587d5e7db7ddb83e9c30fa68585f8 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 8 Oct 2020 09:09:55 +0200
Subject: [PATCH 081/108] - Tag for 1.12.0 release. - Current repo is version
 1.12.1 in development.

---
 configure     | 25 +++++++++++++------------
 configure.ac  |  5 +++--
 doc/Changelog |  4 ++++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index c819b7bf1..9a96bb232 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unbound 1.12.0.
+# Generated by GNU Autoconf 2.69 for unbound 1.12.1.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.12.0'
-PACKAGE_STRING='unbound 1.12.0'
+PACKAGE_VERSION='1.12.1'
+PACKAGE_STRING='unbound 1.12.1'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues'
 PACKAGE_URL=''
 
@@ -1459,7 +1459,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.12.0 to adapt to many kinds of systems.
+\`configure' configures unbound 1.12.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1524,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.12.0:";;
+     short | recursive ) echo "Configuration of unbound 1.12.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1752,7 +1752,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unbound configure 1.12.0
+unbound configure 1.12.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2461,7 +2461,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.12.0, which was
+It was created by unbound $as_me 1.12.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2813,11 +2813,11 @@ UNBOUND_VERSION_MAJOR=1
 
 UNBOUND_VERSION_MINOR=12
 
-UNBOUND_VERSION_MICRO=0
+UNBOUND_VERSION_MICRO=1
 
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=10
+LIBUNBOUND_REVISION=11
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2895,6 +2895,7 @@ LIBUNBOUND_AGE=1
 # 1.10.1 had 9:8:1
 # 1.11.0 had 9:9:1
 # 1.12.0 had 9:10:1
+# 1.12.1 had 9:11:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -21702,7 +21703,7 @@ _ACEOF
 
 
 
-version=1.12.0
+version=1.12.1
 
 date=`date +'%b %e, %Y'`
 
@@ -22221,7 +22222,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.12.0, which was
+This file was extended by unbound $as_me 1.12.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22287,7 +22288,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.12.0
+unbound config.status 1.12.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 7d9879294..2bd44353d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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],[12])
-m4_define([VERSION_MICRO],[0])
+m4_define([VERSION_MICRO],[1])
 AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues, unbound)
 AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=10
+LIBUNBOUND_REVISION=11
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -96,6 +96,7 @@ LIBUNBOUND_AGE=1
 # 1.10.1 had 9:8:1
 # 1.11.0 had 9:9:1
 # 1.12.0 had 9:10:1
+# 1.12.1 had 9:11:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
diff --git a/doc/Changelog b/doc/Changelog
index 87f796398..96f160f99 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+8 October 2020: Wouter
+	- Tag for 1.12.0 release.
+	- Current repo is version 1.12.1 in development.
+
 1 October 2020: Wouter
 	- Current repo is version 1.12.0 for release.  Tag for 1.12.0rc1.
 

From a87f05be7b36c7c45eca249dfd9d998e31770a34 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 8 Oct 2020 09:11:54 +0200
Subject: [PATCH 082/108] - Fix #319: potential memory leak on config failure,
 in rpz config.

---
 doc/Changelog  | 1 +
 services/rpz.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 96f160f99..c59352cfd 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 8 October 2020: Wouter
 	- Tag for 1.12.0 release.
 	- Current repo is version 1.12.1 in development.
+	- Fix #319: potential memory leak on config failure, in rpz config.
 
 1 October 2020: Wouter
 	- Current repo is version 1.12.0 for release.  Tag for 1.12.0rc1.
diff --git a/services/rpz.c b/services/rpz.c
index ba5dd186d..13304652c 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -440,6 +440,8 @@ err:
 			respip_set_delete(r->respip_set);
 		if(r->taglist)
 			free(r->taglist);
+		if(r->region)
+			regional_destroy(r->region);
 		free(r);
 	}
 	return NULL;

From 795a33c6e54aac7c7c0217da37d20faaf78898ef Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 9 Oct 2020 08:57:23 +0200
Subject: [PATCH 083/108] - Fix dnstap socket and the chroot not applied
 properly to the dnstap   socket path.

---
 dnstap/dnstap.c   | 10 ++++------
 dnstap/dtstream.c |  8 ++++++--
 doc/Changelog     |  4 ++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c
index 0c8c6c4d4..b8a321670 100644
--- a/dnstap/dnstap.c
+++ b/dnstap/dnstap.c
@@ -134,15 +134,13 @@ dt_create(struct config_file* cfg)
 
 	if(cfg->dnstap && cfg->dnstap_socket_path && cfg->dnstap_socket_path[0] &&
 		(cfg->dnstap_ip==NULL || cfg->dnstap_ip[0]==0)) {
-		char* p = fname_after_chroot(cfg->dnstap_socket_path, cfg, 1);
-		if(!p) {
-			log_err("malloc failure");
-			return NULL;
-		}
+		char* p = cfg->dnstap_socket_path;
+		if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(p,
+			cfg->chrootdir, strlen(cfg->chrootdir)) == 0)
+			p += strlen(cfg->chrootdir);
 		verbose(VERB_OPS, "attempting to connect to dnstap socket %s",
 			p);
 		check_socket_file(p);
-		free(p);
 	}
 
 	env = (struct dt_env *) calloc(1, sizeof(struct dt_env));
diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index b0918c52c..f1ace3c34 100644
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -341,15 +341,19 @@ int dt_io_thread_apply_cfg(struct dt_io_thread* dtio, struct config_file *cfg)
 	dtio->is_bidirectional = cfg->dnstap_bidirectional;
 
 	if(dtio->upstream_is_unix) {
+		char* nm;
 		if(!cfg->dnstap_socket_path ||
 			cfg->dnstap_socket_path[0]==0) {
 			log_err("dnstap setup: no dnstap-socket-path for "
 				"socket connect");
 			return 0;
 		}
+		nm = cfg->dnstap_socket_path;
+		if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm,
+			cfg->chrootdir, strlen(cfg->chrootdir)) == 0)
+			nm += strlen(cfg->chrootdir);
 		free(dtio->socket_path);
-		dtio->socket_path = fname_after_chroot(cfg->dnstap_socket_path,
-			cfg, 1);
+		dtio->socket_path = strdup(nm);
 		if(!dtio->socket_path) {
 			log_err("dnstap setup: malloc failure");
 			return 0;
diff --git a/doc/Changelog b/doc/Changelog
index c59352cfd..035d040a9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+9 October 2020: Wouter
+	- Fix dnstap socket and the chroot not applied properly to the dnstap
+	  socket path.
+
 8 October 2020: Wouter
 	- Tag for 1.12.0 release.
 	- Current repo is version 1.12.1 in development.

From fca884a7e639c34b9e29de41aa9fe9d8ba45708d Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 9 Oct 2020 14:31:55 +0200
Subject: [PATCH 084/108] - Fix warning in libnss compile, nss_buf2dsa is not
 used without DSA.

---
 doc/Changelog           | 1 +
 validator/val_secalgo.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 035d040a9..e98876fca 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 9 October 2020: Wouter
 	- Fix dnstap socket and the chroot not applied properly to the dnstap
 	  socket path.
+	- Fix warning in libnss compile, nss_buf2dsa is not used without DSA.
 
 8 October 2020: Wouter
 	- Tag for 1.12.0 release.
diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index 65bca8b69..15cccf017 100644
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -990,6 +990,7 @@ static SECKEYPublicKey* nss_buf2ecdsa(unsigned char* key, size_t len, int algo)
 	return pk;
 }
 
+#if defined(USE_DSA) && defined(USE_SHA1)
 static SECKEYPublicKey* nss_buf2dsa(unsigned char* key, size_t len)
 {
 	SECKEYPublicKey* pk;
@@ -1050,6 +1051,7 @@ static SECKEYPublicKey* nss_buf2dsa(unsigned char* key, size_t len)
 	}
 	return pk;
 }
+#endif /* USE_DSA && USE_SHA1 */
 
 static SECKEYPublicKey* nss_buf2rsa(unsigned char* key, size_t len)
 {

From e6c560e5c9d7c1f332dadf47ddf3861f3289cbc9 Mon Sep 17 00:00:00 2001
From: James Renken <jrenken@letsencrypt.org>
Date: Mon, 12 Oct 2020 22:06:20 -0700
Subject: [PATCH 085/108] Add modern X.509v3 extensions to unbound-control TLS
 certificates

---
 smallapp/unbound-control-setup.sh.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in
index 3e506e84e..6b5e0dbbf 100644
--- a/smallapp/unbound-control-setup.sh.in
+++ b/smallapp/unbound-control-setup.sh.in
@@ -124,8 +124,14 @@ default_bits=$BITS
 default_md=$HASH
 prompt=no
 distinguished_name=req_distinguished_name
+x509_extensions=v3_ca
 [req_distinguished_name]
 commonName=$SERVERNAME
+[v3_ca]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+basicConstraints=critical,CA:TRUE,pathlen:0
+subjectAltName=DNS:$SERVERNAME
 EOF
 
 [ -f server.cnf ] || fatal "cannot create openssl configuration"
@@ -156,8 +162,12 @@ default_bits=$BITS
 default_md=$HASH
 prompt=no
 distinguished_name=req_distinguished_name
+req_extensions=v3_req
 [req_distinguished_name]
 commonName=$CLIENTNAME
+[v3_req]
+basicConstraints=critical,CA:FALSE
+subjectAltName=DNS:$CLIENTNAME
 EOF
 
 [ -f client.cnf ] || fatal "cannot create openssl configuration"

From 79a8db1ee184ca9e6fa1e265c1970f7074c0bea1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 13 Oct 2020 08:28:59 +0200
Subject: [PATCH 086/108] - Fix #323: unbound testsuite fails on mock build in
 systemd-nspawn   if systemd support is build.

---
 doc/Changelog        | 4 ++++
 testcode/do-tests.sh | 3 +++
 testcode/run_vm.sh   | 2 ++
 testcode/testbound.c | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index e98876fca..f8cec1158 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+13 October 2020: Wouter
+	- Fix #323: unbound testsuite fails on mock build in systemd-nspawn
+	  if systemd support is build.
+
 9 October 2020: Wouter
 	- Fix dnstap socket and the chroot not applied properly to the dnstap
 	  socket path.
diff --git a/testcode/do-tests.sh b/testcode/do-tests.sh
index 5439f0f28..effb7c16a 100755
--- a/testcode/do-tests.sh
+++ b/testcode/do-tests.sh
@@ -29,6 +29,9 @@ else
 	HAVE_MINGW=no
 fi
 
+# stop tests from notifying systemd, if that is compiled in.
+export -n NOTIFY_SOCKET
+
 cd testdata;
 sh ../testcode/mini_tdir.sh clean
 rm -f .perfstats.txt
diff --git a/testcode/run_vm.sh b/testcode/run_vm.sh
index 5f599e144..363a32b52 100644
--- a/testcode/run_vm.sh
+++ b/testcode/run_vm.sh
@@ -40,6 +40,8 @@ cleanup() {
 	exit 0
 }
 trap cleanup INT
+# stop tests from notifying systemd, if that is compiled in.
+export -n NOTIFY_SOCKET
 
 for t in $RUNLIST
 do
diff --git a/testcode/testbound.c b/testcode/testbound.c
index 602dffaff..3f3e106b0 100644
--- a/testcode/testbound.c
+++ b/testcode/testbound.c
@@ -362,6 +362,10 @@ main(int argc, char* argv[])
 	/* we do not want the test to depend on the timezone */
 	(void)putenv("TZ=UTC");
 	memset(pass_argv, 0, sizeof(pass_argv));
+#ifdef HAVE_SYSTEMD
+	/* we do not want the test to use systemd daemon startup notification*/
+	(void)unsetenv("NOTIFY_SOCKET");
+#endif /* HAVE_SYSTEMD */
 
 	log_init(NULL, 0, NULL);
 	/* determine commandline options for the daemon */

From 72032a95bb254c6c1b16ddcdf50352152141b524 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 14 Oct 2020 10:06:28 +0200
Subject: [PATCH 087/108] - Fix for python reply callback to see mesh state
 reply_list member,   it only removes it briefly for the commpoint call so
 that it does   not drop it and attempt to modify the reply list during reply.

---
 doc/Changelog   |  5 +++++
 services/mesh.c | 29 +++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index f8cec1158..97959cf26 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+14 October 2020: Wouter
+	- Fix for python reply callback to see mesh state reply_list member,
+	  it only removes it briefly for the commpoint call so that it does
+	  not drop it and attempt to modify the reply list during reply.
+
 13 October 2020: Wouter
 	- Fix #323: unbound testsuite fails on mock build in systemd-nspawn
 	  if systemd support is build.
diff --git a/services/mesh.c b/services/mesh.c
index 52ff97e4a..8f746ea8e 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1196,6 +1196,12 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 	/* Copy the client's EDNS for later restore, to make sure the edns
 	 * compare is with the correct edns options. */
 	struct edns_data edns_bak = r->edns;
+	/* briefly set the replylist to null in case the
+	 * meshsendreply calls tcpreqinfo sendreply that
+	 * comm_point_drops because of size, and then the
+	 * null stops the mesh state remove and thus
+	 * reply_list modification and accounting */
+	struct mesh_reply* rlist = m->reply_list;
 	/* examine security status */
 	if(m->s.env->need_to_validate && (!(r->qflags&BIT_CD) ||
 		m->s.env->cfg->ignore_cd) && rep && 
@@ -1236,7 +1242,9 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		sldns_buffer_write_at(r_buffer, 0, &r->qid, sizeof(uint16_t));
 		sldns_buffer_write_at(r_buffer, 12, r->qname,
 			m->s.qinfo.qname_len);
+		m->reply_list = NULL;
 		comm_point_send_reply(&r->query_reply);
+		m->reply_list = rlist;
 	} else if(rcode) {
 		m->s.qinfo.qname = r->qname;
 		m->s.qinfo.local_alias = r->local_alias;
@@ -1251,7 +1259,9 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		}
 		error_encode(r_buffer, rcode, &m->s.qinfo, r->qid,
 			r->qflags, &r->edns);
+		m->reply_list = NULL;
 		comm_point_send_reply(&r->query_reply);
+		m->reply_list = rlist;
 	} else {
 		size_t udp_size = r->edns.udp_size;
 		r->edns.edns_version = EDNS_ADVERTISED_VERSION;
@@ -1277,7 +1287,9 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 				&m->s.qinfo, r->qid, r->qflags, &r->edns);
 		}
 		r->edns = edns_bak;
+		m->reply_list = NULL;
 		comm_point_send_reply(&r->query_reply);
+		m->reply_list = rlist;
 	}
 	/* account */
 	log_assert(m->s.env->mesh->num_reply_addrs > 0);
@@ -1365,20 +1377,12 @@ void mesh_query_done(struct mesh_state* mstate)
 			mstate->reply_list = reply_list;
 		} else {
 			struct sldns_buffer* r_buffer = r->query_reply.c->buffer;
-			struct mesh_reply* rlist = mstate->reply_list;
 			if(r->query_reply.c->tcp_req_info) {
 				r_buffer = r->query_reply.c->tcp_req_info->spool_buffer;
 				prev_buffer = NULL;
 			}
-			/* briefly set the replylist to null in case the
-			 * meshsendreply calls tcpreqinfo sendreply that
-			 * comm_point_drops because of size, and then the
-			 * null stops the mesh state remove and thus
-			 * reply_list modification and accounting */
-			mstate->reply_list = NULL;
 			mesh_send_reply(mstate, mstate->s.return_rcode, rep,
 				r, r_buffer, prev, prev_buffer);
-			mstate->reply_list = rlist;
 			if(r->query_reply.c->tcp_req_info) {
 				tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate);
 				r_buffer = NULL;
@@ -1894,7 +1898,7 @@ mesh_serve_expired_callback(void* arg)
 {
 	struct mesh_state* mstate = (struct mesh_state*) arg;
 	struct module_qstate* qstate = &mstate->s;
-	struct mesh_reply* r, *rlist;
+	struct mesh_reply* r;
 	struct mesh_area* mesh = qstate->env->mesh;
 	struct dns_msg* msg;
 	struct mesh_cb* c;
@@ -1999,15 +2003,8 @@ mesh_serve_expired_callback(void* arg)
 		r_buffer = r->query_reply.c->buffer;
 		if(r->query_reply.c->tcp_req_info)
 			r_buffer = r->query_reply.c->tcp_req_info->spool_buffer;
-		/* briefly set the replylist to null in case the meshsendreply
-		 * calls tcpreqinfo sendreply that comm_point_drops because
-		 * of size, and then the null stops the mesh state remove and
-		 * thus reply_list modification and accounting */
-		rlist = mstate->reply_list;
-		mstate->reply_list = NULL;
 		mesh_send_reply(mstate, LDNS_RCODE_NOERROR, msg->rep,
 			r, r_buffer, prev, prev_buffer);
-		mstate->reply_list = rlist;
 		if(r->query_reply.c->tcp_req_info)
 			tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate);
 		prev = r;

From a9e13f3590f2e6bdba50eb8a3825d2c8e2362778 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 14 Oct 2020 14:01:47 +0200
Subject: [PATCH 088/108] - Fix that if there are on reply callbacks, those are
 called per   reply and a new message created if that was modified by the
 call.

---
 doc/Changelog   | 2 ++
 services/mesh.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 97959cf26..4d35a747e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
 	- Fix for python reply callback to see mesh state reply_list member,
 	  it only removes it briefly for the commpoint call so that it does
 	  not drop it and attempt to modify the reply list during reply.
+	- Fix that if there are on reply callbacks, those are called per
+	  reply and a new message created if that was modified by the call.
 
 13 October 2020: Wouter
 	- Fix #323: unbound testsuite fails on mock build in systemd-nspawn
diff --git a/services/mesh.c b/services/mesh.c
index 8f746ea8e..c22ef43fa 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1235,7 +1235,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		prev->edns.bits == r->edns.bits && 
 		prev->edns.udp_size == r->edns.udp_size &&
 		edns_opt_list_compare(prev->edns.opt_list, r->edns.opt_list)
-		== 0) {
+		== 0 && !env->inplace_cb_lists[inplace_cb_reply]) {
 		/* if the previous reply is identical to this one, fix ID */
 		if(prev_buffer != r_buffer)
 			sldns_buffer_copy(r_buffer, prev_buffer);

From f0c19be06f7148edaf14f159ea3e671075f45e99 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 14 Oct 2020 14:03:04 +0200
Subject: [PATCH 089/108] - Fix that if there are on reply callbacks, those are
 called per   reply and a new message created if that was modified by the
 call.

---
 services/mesh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/mesh.c b/services/mesh.c
index c22ef43fa..810865933 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1235,7 +1235,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		prev->edns.bits == r->edns.bits && 
 		prev->edns.udp_size == r->edns.udp_size &&
 		edns_opt_list_compare(prev->edns.opt_list, r->edns.opt_list)
-		== 0 && !env->inplace_cb_lists[inplace_cb_reply]) {
+		== 0 && !m->s.env->inplace_cb_lists[inplace_cb_reply]) {
 		/* if the previous reply is identical to this one, fix ID */
 		if(prev_buffer != r_buffer)
 			sldns_buffer_copy(r_buffer, prev_buffer);

From 890c8deb0fdc05cbf03c1c15ffa8698ece07d655 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 14 Oct 2020 14:20:16 +0200
Subject: [PATCH 090/108] - Free up auth zone parse region after use for lookup
 of host

---
 doc/Changelog       | 1 +
 services/authzone.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 4d35a747e..c7076fd62 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	  not drop it and attempt to modify the reply list during reply.
 	- Fix that if there are on reply callbacks, those are called per
 	  reply and a new message created if that was modified by the call.
+	- Free up auth zone parse region after use for lookup of host
 
 13 October 2020: Wouter
 	- Fix #323: unbound testsuite fails on mock build in systemd-nspawn
diff --git a/services/authzone.c b/services/authzone.c
index a26d1003a..15be5d60c 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -5387,6 +5387,7 @@ void auth_xfer_transfer_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
 				verbose(VERB_ALGO, "auth zone %s host %s type %s transfer lookup has no answer", zname, xfr->task_transfer->lookup_target->host, (xfr->task_transfer->lookup_aaaa?"AAAA":"A"));
 			}
 		}
+		regional_free_all(temp);
 	} else {
 		if(verbosity >= VERB_ALGO) {
 			char zname[255+1];
@@ -6444,6 +6445,7 @@ void auth_xfer_probe_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
 				verbose(VERB_ALGO, "auth zone %s host %s type %s probe lookup has no address", zname, xfr->task_probe->lookup_target->host, (xfr->task_probe->lookup_aaaa?"AAAA":"A"));
 			}
 		}
+		regional_free_all(temp);
 	} else {
 		if(verbosity >= VERB_ALGO) {
 			char zname[255+1];

From b1a50720e5675f86e9ffa9042453a5d686366ba0 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Wed, 14 Oct 2020 11:32:14 -0400
Subject: [PATCH 091/108] DoH: implement content-lenght header field

---
 services/listen_dnsport.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 3a98c2642..796d62a37 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -2177,9 +2177,10 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	int ret;
 	nghttp2_data_provider data_prd;
 	char status[4];
-	nghttp2_nv headers[2];
+	nghttp2_nv headers[3];
 	struct http2_stream* h2_stream = h2_session->c->h2_stream;
 	size_t rlen;
+	char rlen_str[6]; // big enough to hold a uint16_t number
 
 	if(h2_stream->rbuffer) {
 		log_err("http2 submit response error: rbuffer already "
@@ -2198,6 +2199,13 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	}
 
 	rlen = sldns_buffer_remaining(h2_session->c->buffer);
+	int rv = snprintf(rlen_str, sizeof(rlen_str), "%u", rlen);
+	if (rv <= 0 || rv >= sizeof(rlen_str)) {
+		verbose(VERB_QUERY, "http2: submit response error: "
+			"data buffer too large");
+		return 0;
+	}
+
 	lock_basic_lock(&http2_response_buffer_count_lock);
 	if(http2_response_buffer_count + rlen > http2_response_buffer_max) {
 		lock_basic_unlock(&http2_response_buffer_count_lock);
@@ -2228,13 +2236,11 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	headers[1].valuelen = 23;
 	headers[1].flags = NGHTTP2_NV_FLAG_NONE;
 
-	/*TODO be nice and add the content-length header
 	headers[2].name = (uint8_t*)"content-length";
 	headers[2].namelen = 14;
-	headers[2].value = 
-	headers[2].valuelen = 
+	headers[2].value = rlen_str;
+	headers[2].valuelen = strlen(rlen_str);
 	headers[2].flags = NGHTTP2_NV_FLAG_NONE;
-	*/
 
 	sldns_buffer_write(h2_stream->rbuffer,
 		sldns_buffer_current(h2_session->c->buffer),
@@ -2244,7 +2250,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	data_prd.source.ptr = h2_session;
 	data_prd.read_callback = http2_submit_response_read_callback;
 	ret = nghttp2_submit_response(h2_session->session, h2_stream->stream_id,
-		headers, 2, &data_prd);
+		headers, 3, &data_prd);
 	if(ret) {
 		verbose(VERB_QUERY, "http2: set_stream_user_data failed, "
 			"error: %s", nghttp2_strerror(ret));

From edc8f363a72951ad86112b07f64ce0a8f0495723 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 15 Oct 2020 08:22:42 +0200
Subject: [PATCH 092/108] Changelog note for #326 and changes: - DoH content
 length, simplify code, remove declaration after   statement and fix cast
 warning.

---
 doc/Changelog             |  6 ++++++
 services/listen_dnsport.c | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index c7076fd62..2d8c69e37 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+15 October 2020: Wouter
+	- Merge PR #326 from netblue30: DoH: implement content-length
+	  header field
+	- DoH content length, simplify code, remove declaration after
+	  statement and fix cast warning.
+
 14 October 2020: Wouter
 	- Fix for python reply callback to see mesh state reply_list member,
 	  it only removes it briefly for the commpoint call so that it does
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 796d62a37..1cdb32a9c 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -2180,7 +2180,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	nghttp2_nv headers[3];
 	struct http2_stream* h2_stream = h2_session->c->h2_stream;
 	size_t rlen;
-	char rlen_str[6]; // big enough to hold a uint16_t number
+	char rlen_str[32];
 
 	if(h2_stream->rbuffer) {
 		log_err("http2 submit response error: rbuffer already "
@@ -2199,12 +2199,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	}
 
 	rlen = sldns_buffer_remaining(h2_session->c->buffer);
-	int rv = snprintf(rlen_str, sizeof(rlen_str), "%u", rlen);
-	if (rv <= 0 || rv >= sizeof(rlen_str)) {
-		verbose(VERB_QUERY, "http2: submit response error: "
-			"data buffer too large");
-		return 0;
-	}
+	snprintf(rlen_str, sizeof(rlen_str), "%u", rlen);
 
 	lock_basic_lock(&http2_response_buffer_count_lock);
 	if(http2_response_buffer_count + rlen > http2_response_buffer_max) {
@@ -2238,7 +2233,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 
 	headers[2].name = (uint8_t*)"content-length";
 	headers[2].namelen = 14;
-	headers[2].value = rlen_str;
+	headers[2].value = (uint8_t*)rlen_str;
 	headers[2].valuelen = strlen(rlen_str);
 	headers[2].flags = NGHTTP2_NV_FLAG_NONE;
 

From d55084ea9e9089174ab9b4bc218f884d2095b50f Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Thu, 15 Oct 2020 15:53:16 +0200
Subject: [PATCH 093/108] - Fix that if there are reply callbacks for the given
 rcode, those   are called per reply and a new message created if that was
 modified   by the call. - Pass the comm_reply information to the
 inplace_cb_reply* functions   during the mesh state and update the
 documentation on that.

---
 doc/Changelog                           |  7 ++++++
 pythonmod/doc/examples/example6.rst     |  7 ------
 pythonmod/doc/modules/functions.rst     |  5 +++-
 pythonmod/examples/inplace_callbacks.py | 30 +++--------------------
 services/mesh.c                         | 32 +++++++++++++++----------
 util/data/msgreply.h                    |  2 +-
 6 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 2d8c69e37..c97b24ec0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,10 @@
+15 October 2020: George
+	- Fix that if there are reply callbacks for the given rcode, those
+	  are called per reply and a new message created if that was modified
+	  by the call.
+	- Pass the comm_reply information to the inplace_cb_reply* functions
+	  during the mesh state and update the documentation on that.
+
 15 October 2020: Wouter
 	- Merge PR #326 from netblue30: DoH: implement content-length
 	  header field
diff --git a/pythonmod/doc/examples/example6.rst b/pythonmod/doc/examples/example6.rst
index d294fb8be..fd6caf74d 100644
--- a/pythonmod/doc/examples/example6.rst
+++ b/pythonmod/doc/examples/example6.rst
@@ -60,7 +60,6 @@ The callback function's prototype is the following:
         :param **kwargs: Dictionary that may contain parameters added in a future
                          release. Current parameters:
             ``repinfo``: Reply information for a communication point (comm_reply).
-                         It is None when the callback happens in the mesh states.
 
         :return: True on success, False on failure.
 
@@ -105,8 +104,6 @@ The callback function's prototype is the following:
         :param **kwargs: Dictionary that may contain parameters added in a future
                          release. Current parameters:
             ``repinfo``: Reply information for a communication point (comm_reply).
-                         It is None when the callback happens in the mesh
-                         states(modules).
 
         :return: True on success, False on failure.
 
@@ -154,8 +151,6 @@ The callback function's prototype is the following:
         :param **kwargs: Dictionary that may contain parameters added in a future
                          release. Current parameters:
             ``repinfo``: Reply information for a communication point (comm_reply).
-                         It is None when the callback happens in the mesh
-                         states(modules).
 
         :return: True on success, False on failure.
 
@@ -201,8 +196,6 @@ The callback function's prototype is the following:
         :param **kwargs: Dictionary that may contain parameters added in a future
                          release. Current parameters:
             ``repinfo``: Reply information for a communication point (comm_reply).
-                         It is None when the callback happens in the mesh
-                         states(modules).
 
         :return: True on success, False on failure.
 
diff --git a/pythonmod/doc/modules/functions.rst b/pythonmod/doc/modules/functions.rst
index 43c66eb38..6ded3bf7a 100644
--- a/pythonmod/doc/modules/functions.rst
+++ b/pythonmod/doc/modules/functions.rst
@@ -89,7 +89,7 @@ EDNS options
 Inplace callbacks
 -----------------
 
-.. function:: inplace_cb_reply(qinfo, qstate, rep, rcode, edns, opt_list_out, region)
+.. function:: inplace_cb_reply(qinfo, qstate, rep, rcode, edns, opt_list_out, region, \*\*kwargs)
 
     Function prototype for callback functions used in
     `register_inplace_cb_reply`_, `register_inplace_cb_reply_cache`_,
@@ -102,6 +102,9 @@ Inplace callbacks
     :param edns: :class:`edns_data`
     :param opt_list_out: :class:`edns_option`. EDNS option list to append options to.
     :param region: :class:`regional`
+    :param \*\*kwargs: Dictionary that may contain parameters added in a future
+                     release. Current parameters:
+        ``repinfo``: :class:`comm_reply`. Reply information for a communication point.
 
 .. function:: inplace_cb_query(qinfo, flags, qstate, addr, zone, region)
 
diff --git a/pythonmod/examples/inplace_callbacks.py b/pythonmod/examples/inplace_callbacks.py
index 768c2d013..de375b4e1 100644
--- a/pythonmod/examples/inplace_callbacks.py
+++ b/pythonmod/examples/inplace_callbacks.py
@@ -43,7 +43,7 @@
 #       This query returns SERVFAIL as the txt record of bogus.nlnetlabs.nl is
 #       intentionally bogus. The reply will contain an empty EDNS option
 #       with option code 65003.
-#       Unbound will also log the source address(es) of the client(s) that made
+#       Unbound will also log the source address of the client that made
 #       the request.
 #       (unbound needs to be validating for this example to work)
 
@@ -91,8 +91,6 @@ def inplace_reply_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
     :param **kwargs: Dictionary that may contain parameters added in a future
                      release. Current parameters:
         ``repinfo``: Reply information for a communication point (comm_reply).
-                     It is None when the callback happens in the mesh
-                     states(modules).
 
     :return: True on success, False on failure.
 
@@ -121,8 +119,6 @@ def inplace_cache_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
     :param **kwargs: Dictionary that may contain parameters added in a future
                      release. Current parameters:
         ``repinfo``: Reply information for a communication point (comm_reply).
-                     It is None when the callback happens in the mesh
-                     states(modules).
 
     :return: True on success, False on failure.
 
@@ -173,8 +169,6 @@ def inplace_local_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
     :param **kwargs: Dictionary that may contain parameters added in a future
                      release. Current parameters:
         ``repinfo``: Reply information for a communication point (comm_reply).
-                     It is None when the callback happens in the mesh
-                     states(modules).
 
     :return: True on success, False on failure.
 
@@ -205,13 +199,11 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
     :param **kwargs: Dictionary that may contain parameters added in a future
                      release. Current parameters:
         ``repinfo``: Reply information for a communication point (comm_reply).
-                     It is None when the callback happens in the mesh
-                     states(modules).
 
     :return: True on success, False on failure.
 
     For demonstration purposes we want to reply with an empty EDNS code '65003'
-    and log the IP address(es) of the client(s).
+    and log the IP address of the client.
 
     """
     log_info("python: called back while servfail.")
@@ -219,30 +211,14 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,
     b = bytearray.fromhex("")
     edns_opt_list_append(opt_list_out, 65003, b, region)
 
-    # Log the client(s) IP address(es)
+    # Log the client's IP address
     comm_reply = kwargs['repinfo']
     if comm_reply:
-        # If it is not None this callback was called before the query reached
-        # the mesh states(modules). There is only one client associated with
-        # this query.
         addr = comm_reply.addr
         port = comm_reply.port
         addr_family = comm_reply.family
         log_info("python: Client IP: {}({}), port: {}"
                  "".format(addr, addr_family, port))
-    else:
-        # If it is not None this callback was called while the query is in the
-        # mesh states(modules). In this case they may be multiple clients
-        # waiting for this query.
-        # The following code is the same as with the resip.py example.
-        rl = qstate.mesh_info.reply_list
-        while (rl):
-            if rl.query_reply:
-                q = rl.query_reply
-                log_info("python: Client IP: {}({}), port: {}"
-                         "".format(q.addr, q.family, q.port))
-            rl = rl.next
-
 
     return True
 
diff --git a/services/mesh.c b/services/mesh.c
index 810865933..cd9050936 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1224,18 +1224,24 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		r->h2_stream->mesh_state = NULL;
 	}
 	/* send the reply */
-	/* We don't reuse the encoded answer if either the previous or current
-	 * response has a local alias.  We could compare the alias records
-	 * and still reuse the previous answer if they are the same, but that
-	 * would be complicated and error prone for the relatively minor case.
-	 * So we err on the side of safety. */
-	if(prev && prev_buffer && prev->qflags == r->qflags && 
+	/* We don't reuse the encoded answer if:
+	 * - either the previous or current response has a local alias.  We could
+	 *   compare the alias records and still reuse the previous answer if they
+	 *   are the same, but that would be complicated and error prone for the
+	 *   relatively minor case. So we err on the side of safety.
+	 * - there are registered callback functions for the given rcode, as these
+	 *   need to be called for each reply. */
+	if(((rcode != LDNS_RCODE_SERVFAIL &&
+			!m->s.env->inplace_cb_lists[inplace_cb_reply]) ||
+		(rcode == LDNS_RCODE_SERVFAIL &&
+			!m->s.env->inplace_cb_lists[inplace_cb_reply_servfail])) &&
+		prev && prev_buffer && prev->qflags == r->qflags &&
 		!prev->local_alias && !r->local_alias &&
-		prev->edns.edns_present == r->edns.edns_present && 
-		prev->edns.bits == r->edns.bits && 
+		prev->edns.edns_present == r->edns.edns_present &&
+		prev->edns.bits == r->edns.bits &&
 		prev->edns.udp_size == r->edns.udp_size &&
 		edns_opt_list_compare(prev->edns.opt_list, r->edns.opt_list)
-		== 0 && !m->s.env->inplace_cb_lists[inplace_cb_reply]) {
+		== 0) {
 		/* if the previous reply is identical to this one, fix ID */
 		if(prev_buffer != r_buffer)
 			sldns_buffer_copy(r_buffer, prev_buffer);
@@ -1250,11 +1256,11 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		m->s.qinfo.local_alias = r->local_alias;
 		if(rcode == LDNS_RCODE_SERVFAIL) {
 			if(!inplace_cb_reply_servfail_call(m->s.env, &m->s.qinfo, &m->s,
-				rep, rcode, &r->edns, NULL, m->s.region))
+				rep, rcode, &r->edns, &r->query_reply, m->s.region))
 					r->edns.opt_list = NULL;
 		} else { 
 			if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, rcode,
-				&r->edns, NULL, m->s.region))
+				&r->edns, &r->query_reply, m->s.region))
 					r->edns.opt_list = NULL;
 		}
 		error_encode(r_buffer, rcode, &m->s.qinfo, r->qid,
@@ -1271,7 +1277,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 		m->s.qinfo.qname = r->qname;
 		m->s.qinfo.local_alias = r->local_alias;
 		if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep,
-			LDNS_RCODE_NOERROR, &r->edns, NULL, m->s.region) ||
+			LDNS_RCODE_NOERROR, &r->edns, &r->query_reply, m->s.region) ||
 			!apply_edns_options(&r->edns, &edns_bak,
 				m->s.env->cfg, r->query_reply.c,
 				m->s.region) ||
@@ -1281,7 +1287,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 			secure)) 
 		{
 			if(!inplace_cb_reply_servfail_call(m->s.env, &m->s.qinfo, &m->s,
-			rep, LDNS_RCODE_SERVFAIL, &r->edns, NULL, m->s.region))
+			rep, LDNS_RCODE_SERVFAIL, &r->edns, &r->query_reply, m->s.region))
 				r->edns.opt_list = NULL;
 			error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 				&m->s.qinfo, r->qid, r->qflags, &r->edns);
diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index 8d75f9b12..385780268 100644
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -552,7 +552,7 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code);
  * @param rep: Reply info. Could be NULL.
  * @param rcode: return code.
  * @param edns: edns data of the reply.
- * @param repinfo: comm_reply. NULL.
+ * @param repinfo: comm_reply. Reply information for a communication point.
  * @param region: region to store data.
  * @return false on failure (a callback function returned an error).
  */

From 1d11f470df7691488ac348b3420f0f891f173674 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Fri, 16 Oct 2020 17:12:08 +0200
Subject: [PATCH 094/108] - local-zone regional allocations outside of chunk to
 prevent large chunk per small local-zone allocations.

---
 services/localzone.c |  2 +-
 util/regional.c      | 28 ++++++++++++++++++++++++----
 util/regional.h      | 10 ++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/services/localzone.c b/services/localzone.c
index 6aaf0c055..cad460663 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -157,7 +157,7 @@ local_zone_create(uint8_t* nm, size_t len, int labs,
 	z->namelen = len;
 	z->namelabs = labs;
 	lock_rw_init(&z->lock);
-	z->region = regional_create_custom(sizeof(struct regional));
+	z->region = regional_create_nochunk(sizeof(struct regional));
 	if(!z->region) {
 		free(z);
 		return NULL;
diff --git a/util/regional.c b/util/regional.c
index ff36d0e21..01a042b61 100644
--- a/util/regional.c
+++ b/util/regional.c
@@ -80,18 +80,38 @@ regional_init(struct regional* r)
 	r->total_large = 0;
 }
 
-struct regional* 
-regional_create_custom(size_t size)
+/**
+ * Create a new region, with custom first block and large-object sizes.
+ * @param size: length of first block.
+ * @param large_object_size: outside of chunk allocation threshold.
+ * @return: newly allocated regional.
+ */
+static struct regional*
+regional_create_custom_large_object(size_t size, size_t large_object_size)
 {
 	struct regional* r = (struct regional*)malloc(size);
 	size = ALIGN_UP(size, ALIGNMENT);
 	log_assert(sizeof(struct regional) <= size);
 	if(!r) return NULL;
 	r->first_size = size;
+	r->large_object_size = large_object_size;
 	regional_init(r);
 	return r;
 }
 
+struct regional*
+regional_create_custom(size_t size)
+{
+	return regional_create_custom_large_object(size,
+		REGIONAL_LARGE_OBJECT_SIZE);
+}
+
+struct regional*
+regional_create_nochunk(size_t size)
+{
+	return regional_create_custom_large_object(size, 0);
+}
+
 void 
 regional_free_all(struct regional *r)
 {
@@ -134,7 +154,7 @@ regional_alloc(struct regional *r, size_t size)
 			malloc and ALIGN_UP */
 	a = ALIGN_UP(size, ALIGNMENT);
 	/* large objects */
-	if(a > REGIONAL_LARGE_OBJECT_SIZE) {
+	if(a > r->large_object_size) {
 		s = malloc(ALIGNMENT + size);
 		if(!s) return NULL;
 		r->total_large += ALIGNMENT+size;
@@ -219,7 +239,7 @@ regional_log_stats(struct regional *r)
 	/* some basic assertions put here (non time critical code) */
 	log_assert(ALIGNMENT >= sizeof(char*));
 	log_assert(REGIONAL_CHUNK_SIZE > ALIGNMENT);
-	log_assert(REGIONAL_CHUNK_SIZE-ALIGNMENT > REGIONAL_LARGE_OBJECT_SIZE);
+	log_assert(REGIONAL_CHUNK_SIZE-ALIGNMENT > r->large_object_size);
 	log_assert(REGIONAL_CHUNK_SIZE >= sizeof(struct regional));
 	/* debug print */
 	log_info("regional %u chunks, %u large",
diff --git a/util/regional.h b/util/regional.h
index e8b2cb8d0..eeb7de7b5 100644
--- a/util/regional.h
+++ b/util/regional.h
@@ -74,6 +74,8 @@ struct regional
 	size_t available;
 	/** current chunk data position. */
 	char* data;
+	/** threshold for outside of chunk allocations */
+	size_t large_object_size;
 };
 
 /**
@@ -88,6 +90,14 @@ struct regional* regional_create(void);
  * @return: newly allocated regional.
  */
 struct regional* regional_create_custom(size_t size);
+
+/**
+ * Create a new region, with custom settings, that will allocate everything
+ * outside the region chunk.
+ * @param size: length of first block.
+ * @return: newly allocated regional.
+ */
+struct regional* regional_create_nochunk(size_t size);
 	
 /**
  * Free all memory associated with regional. Only keeps the first block with

From f81d0ac0474cc8904e1240a512b935c8e466f81b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 16 Oct 2020 17:26:58 +0200
Subject: [PATCH 095/108] - Fix that the out of order TCP processing does not
 limit the   number of outstanding queries over a connection.

---
 doc/Changelog             | 4 ++++
 services/listen_dnsport.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index c97b24ec0..3f291bed6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+16 October 2020: Wouter
+	- Fix that the out of order TCP processing does not limit the
+	  number of outstanding queries over a connection.
+
 15 October 2020: George
 	- Fix that if there are reply callbacks for the given rcode, those
 	  are called per reply and a new message created if that was modified
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 1cdb32a9c..ad73fad01 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -82,7 +82,7 @@
 #define TCP_BACKLOG 256 
 
 /** number of simultaneous requests a client can have */
-#define TCP_MAX_REQ_SIMULTANEOUS 32
+/* #define TCP_MAX_REQ_SIMULTANEOUS 32 */
 
 #ifndef THREADS_DISABLED
 /** lock on the counter of stream buffer memory */
@@ -1804,7 +1804,7 @@ tcp_req_info_setup_listen(struct tcp_req_info* req)
 
 	if(!req->cp->tcp_is_reading)
 		wr = 1;
-	if(req->num_open_req + req->num_done_req < TCP_MAX_REQ_SIMULTANEOUS &&
+	if(/*req->num_open_req + req->num_done_req < TCP_MAX_REQ_SIMULTANEOUS &&*/
 		!req->read_is_closed)
 		rd = 1;
 	

From 46607e7c0c54f58fed15ae8643ecdd1252de9cae Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 09:06:33 +0200
Subject: [PATCH 096/108] - Fix that http settings have colon in set_option,
 for   http-endpoint, http-max-streams, http-query-buffer-size,  
 http-response-buffer-size, and http-nodelay.

---
 doc/Changelog      |  5 +++++
 util/config_file.c | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 3f291bed6..8a8e7ffe1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+19 October 2020: Wouter
+	- Fix that http settings have colon in set_option, for
+	  http-endpoint, http-max-streams, http-query-buffer-size,
+	  http-response-buffer-size, and http-nodelay.
+
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
 	  number of outstanding queries over a connection.
diff --git a/util/config_file.c b/util/config_file.c
index b789c3359..25cba18b7 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -522,11 +522,11 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_STR("tls-ciphersuites:", tls_ciphersuites)
 	else S_YNO("tls-use-sni:", tls_use_sni)
 	else S_NUMBER_NONZERO("https-port:", https_port)
-	else S_STR("http-endpoint", http_endpoint)
-	else S_NUMBER_NONZERO("http-max-streams", http_max_streams)
-	else S_MEMSIZE("http-query-buffer-size", http_query_buffer_size)
-	else S_MEMSIZE("http-response-buffer-size", http_response_buffer_size)
-	else S_YNO("http-nodelay", http_nodelay)
+	else S_STR("http-endpoint:", http_endpoint)
+	else S_NUMBER_NONZERO("http-max-streams:", http_max_streams)
+	else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size)
+	else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size)
+	else S_YNO("http-nodelay:", http_nodelay)
 	else S_YNO("interface-automatic:", if_automatic)
 	else S_YNO("use-systemd:", use_systemd)
 	else S_YNO("do-daemonize:", do_daemonize)

From ba074c8bef105b968164060440c21b8c2c614794 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 10:14:40 +0200
Subject: [PATCH 097/108] - Fix memory leak of https port string when reading
 config.

---
 doc/Changelog       |    1 +
 util/configparser.c | 2007 +++++++++++++++++++++----------------------
 util/configparser.h |    4 +-
 util/configparser.y |    1 +
 4 files changed, 963 insertions(+), 1050 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 8a8e7ffe1..49dab107c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix that http settings have colon in set_option, for
 	  http-endpoint, http-max-streams, http-query-buffer-size,
 	  http-response-buffer-size, and http-nodelay.
+	- Fix memory leak of https port string when reading config.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/util/configparser.c b/util/configparser.c
index ba5054eb4..50788a0c5 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.1.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.5.1"
+#define YYBISON_VERSION "3.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -97,15 +97,6 @@ extern struct config_parser_state* cfg_parser;
 
 #line 99 "util/configparser.c"
 
-# ifndef YY_CAST
-#  ifdef __cplusplus
-#   define YY_CAST(Type, Val) static_cast<Type> (Val)
-#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
-#  else
-#   define YY_CAST(Type, Val) ((Type) (Val))
-#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
-#  endif
-# endif
 # ifndef YY_NULLPTR
 #  if defined __cplusplus
 #   if 201103L <= __cplusplus
@@ -749,7 +740,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 753 "util/configparser.c"
+#line 744 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -770,83 +761,36 @@ int yyparse (void);
 # undef short
 #endif
 
-/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
-   <limits.h> and (if available) <stdint.h> are included
-   so that the code can choose integer types of a good width.  */
-
-#ifndef __PTRDIFF_MAX__
-# include <limits.h> /* INFRINGES ON USER NAME SPACE */
-# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
-#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
-#  define YY_STDINT_H
-# endif
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
 
-/* Narrow types that promote to a signed type and that can represent a
-   signed or unsigned integer of at least N bits.  In tables they can
-   save space and decrease cache pressure.  Promoting to a signed type
-   helps avoid bugs in integer arithmetic.  */
-
-#ifdef __INT_LEAST8_MAX__
-typedef __INT_LEAST8_TYPE__ yytype_int8;
-#elif defined YY_STDINT_H
-typedef int_least8_t yytype_int8;
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
 #else
 typedef signed char yytype_int8;
 #endif
 
-#ifdef __INT_LEAST16_MAX__
-typedef __INT_LEAST16_TYPE__ yytype_int16;
-#elif defined YY_STDINT_H
-typedef int_least16_t yytype_int16;
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
 #else
 typedef short yytype_int16;
 #endif
 
-#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
-typedef __UINT_LEAST8_TYPE__ yytype_uint8;
-#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
-       && UINT_LEAST8_MAX <= INT_MAX)
-typedef uint_least8_t yytype_uint8;
-#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
-typedef unsigned char yytype_uint8;
-#else
-typedef short yytype_uint8;
-#endif
-
-#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
-typedef __UINT_LEAST16_TYPE__ yytype_uint16;
-#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
-       && UINT_LEAST16_MAX <= INT_MAX)
-typedef uint_least16_t yytype_uint16;
-#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
-typedef unsigned short yytype_uint16;
-#else
-typedef int yytype_uint16;
-#endif
-
-#ifndef YYPTRDIFF_T
-# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
-#  define YYPTRDIFF_T __PTRDIFF_TYPE__
-#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
-# elif defined PTRDIFF_MAX
-#  ifndef ptrdiff_t
-#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  endif
-#  define YYPTRDIFF_T ptrdiff_t
-#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
-# else
-#  define YYPTRDIFF_T long
-#  define YYPTRDIFF_MAXIMUM LONG_MAX
-# endif
-#endif
-
 #ifndef YYSIZE_T
 # ifdef __SIZE_TYPE__
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -854,19 +798,7 @@ typedef int yytype_uint16;
 # endif
 #endif
 
-#define YYSIZE_MAXIMUM                                  \
-  YY_CAST (YYPTRDIFF_T,                                 \
-           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
-            ? YYPTRDIFF_MAXIMUM                         \
-            : YY_CAST (YYSIZE_T, -1)))
-
-#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
-
-/* Stored state numbers (used for stacks). */
-typedef yytype_int16 yy_state_t;
-
-/* State numbers in computations.  */
-typedef int yy_state_fast_t;
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -880,20 +812,22 @@ typedef int yy_state_fast_t;
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE_PURE
-# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
-#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
 # else
-#  define YY_ATTRIBUTE_PURE
+#  define YY_ATTRIBUTE(Spec) /* empty */
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
 #ifndef YY_ATTRIBUTE_UNUSED
-# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
-#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-# else
-#  define YY_ATTRIBUTE_UNUSED
-# endif
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
@@ -905,11 +839,11 @@ typedef int yy_state_fast_t;
 
 #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
     _Pragma ("GCC diagnostic pop")
 #else
 # define YY_INITIAL_VALUE(Value) Value
@@ -922,18 +856,6 @@ typedef int yy_state_fast_t;
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
-# define YY_IGNORE_USELESS_CAST_BEGIN                          \
-    _Pragma ("GCC diagnostic push")                            \
-    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
-# define YY_IGNORE_USELESS_CAST_END            \
-    _Pragma ("GCC diagnostic pop")
-#endif
-#ifndef YY_IGNORE_USELESS_CAST_BEGIN
-# define YY_IGNORE_USELESS_CAST_BEGIN
-# define YY_IGNORE_USELESS_CAST_END
-#endif
-
 
 #define YY_ASSERT(E) ((void) (0 && (E)))
 
@@ -1012,17 +934,17 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yy_state_t yyss_alloc;
+  yytype_int16 yyss_alloc;
   YYSTYPE yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 # define YYCOPY_NEEDED 1
@@ -1035,11 +957,11 @@ union yyalloc
 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     do                                                                  \
       {                                                                 \
-        YYPTRDIFF_T yynewbytes;                                         \
+        YYSIZE_T yynewbytes;                                            \
         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
         Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                 \
     while (0)
 
@@ -1051,12 +973,12 @@ union yyalloc
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
 #  else
 #   define YYCOPY(Dst, Src, Count)              \
       do                                        \
         {                                       \
-          YYPTRDIFF_T yyi;                      \
+          YYSIZE_T yyi;                         \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
@@ -1082,15 +1004,14 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   554
 
-
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
-  (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
-static const yytype_int16 yytranslate[] =
+static const yytype_uint16 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1152,7 +1073,7 @@ static const yytype_int16 yytranslate[] =
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_int16 yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
        0,   184,   184,   184,   185,   185,   186,   186,   187,   187,
      187,   188,   188,   189,   189,   190,   190,   191,   193,   199,
@@ -1187,36 +1108,36 @@ static const yytype_int16 yyrline[] =
      685,   698,   713,   722,   731,   740,   749,   758,   767,   776,
      785,   794,   803,   812,   821,   830,   839,   852,   861,   874,
      883,   892,   901,   908,   915,   924,   931,   940,   948,   955,
-     962,   970,   979,   986,  1002,  1010,  1018,  1026,  1034,  1043,
-    1052,  1066,  1075,  1084,  1093,  1102,  1111,  1120,  1127,  1134,
-    1160,  1168,  1175,  1182,  1189,  1196,  1204,  1212,  1220,  1227,
-    1238,  1249,  1256,  1265,  1274,  1283,  1290,  1297,  1305,  1313,
-    1323,  1333,  1343,  1357,  1365,  1378,  1389,  1397,  1410,  1419,
-    1428,  1437,  1447,  1457,  1465,  1478,  1487,  1495,  1504,  1512,
-    1525,  1534,  1541,  1551,  1561,  1571,  1581,  1591,  1601,  1611,
-    1621,  1628,  1635,  1642,  1651,  1660,  1669,  1678,  1685,  1695,
-    1715,  1722,  1740,  1753,  1766,  1775,  1784,  1793,  1802,  1812,
-    1822,  1833,  1842,  1851,  1860,  1869,  1878,  1887,  1900,  1913,
-    1922,  1929,  1938,  1947,  1956,  1965,  1973,  1986,  1994,  2035,
-    2042,  2057,  2067,  2077,  2084,  2091,  2098,  2107,  2115,  2129,
-    2150,  2171,  2183,  2195,  2207,  2216,  2237,  2247,  2256,  2264,
-    2272,  2285,  2298,  2313,  2328,  2337,  2346,  2352,  2361,  2370,
-    2380,  2390,  2403,  2416,  2428,  2442,  2454,  2468,  2483,  2494,
-    2504,  2511,  2518,  2527,  2536,  2546,  2556,  2566,  2573,  2580,
-    2589,  2598,  2608,  2618,  2625,  2632,  2639,  2647,  2657,  2667,
-    2677,  2687,  2726,  2736,  2744,  2752,  2767,  2776,  2781,  2782,
-    2783,  2783,  2783,  2784,  2784,  2784,  2785,  2785,  2787,  2797,
-    2806,  2813,  2820,  2827,  2834,  2841,  2848,  2853,  2854,  2855,
-    2855,  2855,  2856,  2856,  2856,  2857,  2858,  2858,  2859,  2859,
-    2860,  2860,  2861,  2862,  2863,  2864,  2865,  2866,  2868,  2877,
-    2887,  2894,  2901,  2910,  2917,  2924,  2931,  2938,  2947,  2956,
-    2963,  2970,  2980,  2990,  3000,  3010,  3020,  3030,  3035,  3036,
-    3037,  3039,  3045,  3050,  3051,  3052,  3054,  3060,  3070,  3077,
-    3086,  3094,  3099,  3100,  3102,  3102,  3102,  3103,  3103,  3104,
-    3105,  3106,  3107,  3108,  3110,  3120,  3129,  3136,  3145,  3152,
-    3161,  3169,  3182,  3190,  3203,  3208,  3209,  3210,  3210,  3211,
-    3211,  3211,  3212,  3214,  3226,  3238,  3250,  3265,  3278,  3291,
-    3302,  3307,  3308,  3309,  3309,  3311,  3326
+     962,   970,   979,   987,  1003,  1011,  1019,  1027,  1035,  1044,
+    1053,  1067,  1076,  1085,  1094,  1103,  1112,  1121,  1128,  1135,
+    1161,  1169,  1176,  1183,  1190,  1197,  1205,  1213,  1221,  1228,
+    1239,  1250,  1257,  1266,  1275,  1284,  1291,  1298,  1306,  1314,
+    1324,  1334,  1344,  1358,  1366,  1379,  1390,  1398,  1411,  1420,
+    1429,  1438,  1448,  1458,  1466,  1479,  1488,  1496,  1505,  1513,
+    1526,  1535,  1542,  1552,  1562,  1572,  1582,  1592,  1602,  1612,
+    1622,  1629,  1636,  1643,  1652,  1661,  1670,  1679,  1686,  1696,
+    1716,  1723,  1741,  1754,  1767,  1776,  1785,  1794,  1803,  1813,
+    1823,  1834,  1843,  1852,  1861,  1870,  1879,  1888,  1901,  1914,
+    1923,  1930,  1939,  1948,  1957,  1966,  1974,  1987,  1995,  2036,
+    2043,  2058,  2068,  2078,  2085,  2092,  2099,  2108,  2116,  2130,
+    2151,  2172,  2184,  2196,  2208,  2217,  2238,  2248,  2257,  2265,
+    2273,  2286,  2299,  2314,  2329,  2338,  2347,  2353,  2362,  2371,
+    2381,  2391,  2404,  2417,  2429,  2443,  2455,  2469,  2484,  2495,
+    2505,  2512,  2519,  2528,  2537,  2547,  2557,  2567,  2574,  2581,
+    2590,  2599,  2609,  2619,  2626,  2633,  2640,  2648,  2658,  2668,
+    2678,  2688,  2727,  2737,  2745,  2753,  2768,  2777,  2782,  2783,
+    2784,  2784,  2784,  2785,  2785,  2785,  2786,  2786,  2788,  2798,
+    2807,  2814,  2821,  2828,  2835,  2842,  2849,  2854,  2855,  2856,
+    2856,  2856,  2857,  2857,  2857,  2858,  2859,  2859,  2860,  2860,
+    2861,  2861,  2862,  2863,  2864,  2865,  2866,  2867,  2869,  2878,
+    2888,  2895,  2902,  2911,  2918,  2925,  2932,  2939,  2948,  2957,
+    2964,  2971,  2981,  2991,  3001,  3011,  3021,  3031,  3036,  3037,
+    3038,  3040,  3046,  3051,  3052,  3053,  3055,  3061,  3071,  3078,
+    3087,  3095,  3100,  3101,  3103,  3103,  3103,  3104,  3104,  3105,
+    3106,  3107,  3108,  3109,  3111,  3121,  3130,  3137,  3146,  3153,
+    3162,  3170,  3183,  3191,  3204,  3209,  3210,  3211,  3211,  3212,
+    3212,  3212,  3213,  3215,  3227,  3239,  3251,  3266,  3279,  3292,
+    3303,  3308,  3309,  3310,  3310,  3312,  3327
 };
 #endif
 
@@ -1472,7 +1393,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_int16 yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -1507,14 +1428,14 @@ static const yytype_int16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF (-288)
+#define YYPACT_NINF -288
 
-#define yypact_value_is_default(Yyn) \
-  ((Yyn) == YYPACT_NINF)
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-288)))
 
-#define YYTABLE_NINF (-1)
+#define YYTABLE_NINF -1
 
-#define yytable_value_is_error(Yyn) \
+#define yytable_value_is_error(Yytable_value) \
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1619,7 +1540,7 @@ static const yytype_int16 yypact[] =
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
      Performed when YYTABLE does not specify something else to do.  Zero
      means the default is an error.  */
-static const yytype_int16 yydefact[] =
+static const yytype_uint16 yydefact[] =
 {
        2,     0,     1,    18,    19,   224,   234,   507,   567,   526,
      243,   581,   604,   253,   620,   269,   572,     3,    17,    21,
@@ -1795,7 +1716,7 @@ static const yytype_int16 yydefgoto[] =
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
      positive, shift that token.  If negative, reduce the rule whose
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_int16 yytable[] =
+static const yytype_uint16 yytable[] =
 {
        2,   493,   478,   450,   582,   451,   452,   465,   622,   623,
      585,     3,     4,   627,   628,   466,   467,   609,   610,   611,
@@ -1933,7 +1854,7 @@ static const yytype_int16 yycheck[] =
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
-static const yytype_int16 yystos[] =
+static const yytype_uint16 yystos[] =
 {
        0,   301,     0,    11,    12,    46,    52,    96,   112,   159,
      218,   236,   253,   262,   286,   290,   296,   302,   303,   304,
@@ -2031,7 +1952,7 @@ static const yytype_int16 yystos[] =
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_int16 yyr1[] =
+static const yytype_uint16 yyr1[] =
 {
        0,   300,   301,   301,   302,   302,   302,   302,   302,   302,
      302,   302,   302,   302,   302,   302,   302,   302,   303,   304,
@@ -2099,7 +2020,7 @@ static const yytype_int16 yyr1[] =
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_int8 yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     0,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     1,     1,     1,
@@ -2249,9 +2170,7 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
   if (yytype < YYNTOKENS)
     YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
@@ -2275,7 +2194,7 @@ yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 `------------------------------------------------------------------*/
 
 static void
-yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -2298,19 +2217,19 @@ do {                                                            \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
-  int yylno = yyrline[yyrule];
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
              yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystos[+yyssp[yyi + 1 - yynrhs]],
+                       yystos[yyssp[yyi + 1 - yynrhs]],
                        &yyvsp[(yyi + 1) - (yynrhs)]
                                               );
       YYFPRINTF (stderr, "\n");
@@ -2355,13 +2274,13 @@ int yydebug;
 
 # ifndef yystrlen
 #  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
+#   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-static YYPTRDIFF_T
+static YYSIZE_T
 yystrlen (const char *yystr)
 {
-  YYPTRDIFF_T yylen;
+  YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
     continue;
   return yylen;
@@ -2397,12 +2316,12 @@ yystpcpy (char *yydest, const char *yysrc)
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-static YYPTRDIFF_T
+static YYSIZE_T
 yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
-      YYPTRDIFF_T yyn = 0;
+      YYSIZE_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -2433,10 +2352,10 @@ yytnamerr (char *yyres, const char *yystr)
     do_not_strip_quotes: ;
     }
 
-  if (yyres)
-    return yystpcpy (yyres, yystr) - yyres;
-  else
+  if (! yyres)
     return yystrlen (yystr);
+
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -2449,19 +2368,19 @@ yytnamerr (char *yyres, const char *yystr)
    *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
    required number of bytes is too large to store.  */
 static int
-yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
-                yy_state_t *yyssp, int yytoken)
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat: reported tokens (one for the "unexpected",
-     one per "expected"). */
+  /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Actual size of YYARG. */
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
   int yycount = 0;
-  /* Cumulated lengths of YYARG.  */
-  YYPTRDIFF_T yysize = 0;
 
   /* There are many possibilities here to consider:
      - If this state is a consistent state with a default action, then
@@ -2488,9 +2407,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
   */
   if (yytoken != YYEMPTY)
     {
-      int yyn = yypact[+*yyssp];
-      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-      yysize = yysize0;
+      int yyn = yypact[*yyssp];
       yyarg[yycount++] = yytname[yytoken];
       if (!yypact_value_is_default (yyn))
         {
@@ -2515,8 +2432,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYPTRDIFF_T yysize1
-                    = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
                   if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
                     yysize = yysize1;
                   else
@@ -2543,9 +2459,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
     }
 
   {
-    /* Don't count the "%s"s in the final size, but reserve room for
-       the terminator.  */
-    YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
     if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
       yysize = yysize1;
     else
@@ -2575,8 +2489,8 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
         }
       else
         {
-          ++yyp;
-          ++yyformat;
+          yyp++;
+          yyformat++;
         }
   }
   return 0;
@@ -2619,7 +2533,7 @@ int yynerrs;
 int
 yyparse (void)
 {
-    yy_state_fast_t yystate;
+    int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
@@ -2631,16 +2545,16 @@ yyparse (void)
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
-    yy_state_t yyssa[YYINITDEPTH];
-    yy_state_t *yyss;
-    yy_state_t *yyssp;
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
     /* The semantic value stack.  */
     YYSTYPE yyvsa[YYINITDEPTH];
     YYSTYPE *yyvs;
     YYSTYPE *yyvsp;
 
-    YYPTRDIFF_T yystacksize;
+    YYSIZE_T yystacksize;
 
   int yyn;
   int yyresult;
@@ -2654,7 +2568,7 @@ yyparse (void)
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
   char *yymsg = yymsgbuf;
-  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
@@ -2686,14 +2600,12 @@ yynewstate:
 
 
 /*--------------------------------------------------------------------.
-| yysetstate -- set current state (the top of the stack) to yystate.  |
+| yynewstate -- set current state (the top of the stack) to yystate.  |
 `--------------------------------------------------------------------*/
 yysetstate:
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
   YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
-  YY_IGNORE_USELESS_CAST_BEGIN
-  *yyssp = YY_CAST (yy_state_t, yystate);
-  YY_IGNORE_USELESS_CAST_END
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -2701,23 +2613,23 @@ yysetstate:
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYPTRDIFF_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
 # if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
-        yy_state_t *yyss1 = yyss;
         YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
 
         /* Each stack pointer address is followed by the size of the
            data in use in that stack, in bytes.  This used to be a
            conditional around just the two extra args, but that might
            be undefined if yyoverflow is a macro.  */
         yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * YYSIZEOF (*yyssp),
-                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
                     &yystacksize);
         yyss = yyss1;
         yyvs = yyvs1;
@@ -2731,10 +2643,9 @@ yysetstate:
         yystacksize = YYMAXDEPTH;
 
       {
-        yy_state_t *yyss1 = yyss;
+        yytype_int16 *yyss1 = yyss;
         union yyalloc *yyptr =
-          YY_CAST (union yyalloc *,
-                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
         if (! yyptr)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
@@ -2748,10 +2659,8 @@ yysetstate:
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-      YY_IGNORE_USELESS_CAST_BEGIN
-      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
-                  YY_CAST (long, yystacksize)));
-      YY_IGNORE_USELESS_CAST_END
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
@@ -2817,13 +2726,14 @@ yybackup:
 
   /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
   yystate = yyn;
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
   goto yynewstate;
 
 
@@ -2860,23 +2770,23 @@ yyreduce:
     {
   case 18:
 #line 194 "./util/configparser.y"
-        {
+    {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2867 "util/configparser.c"
+#line 2777 "util/configparser.c"
     break;
 
   case 19:
 #line 200 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2875 "util/configparser.c"
+#line 2785 "util/configparser.c"
     break;
 
   case 224:
 #line 298 "./util/configparser.y"
-        {
+    {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -2886,12 +2796,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2890 "util/configparser.c"
+#line 2800 "util/configparser.c"
     break;
 
   case 234:
 #line 315 "./util/configparser.y"
-        {
+    {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -2901,12 +2811,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2905 "util/configparser.c"
+#line 2815 "util/configparser.c"
     break;
 
   case 243:
 #line 332 "./util/configparser.y"
-        {
+    {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
 		s = (struct config_view*)calloc(1, sizeof(struct config_view));
@@ -2918,12 +2828,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2922 "util/configparser.c"
+#line 2832 "util/configparser.c"
     break;
 
   case 253:
 #line 351 "./util/configparser.y"
-        {
+    {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -2938,12 +2848,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2942 "util/configparser.c"
+#line 2852 "util/configparser.c"
     break;
 
   case 264:
 #line 375 "./util/configparser.y"
-        {
+    {
 		uint8_t* bitlist;
 		size_t len = 0;
 		OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str)));
@@ -2959,12 +2869,12 @@ yyreduce:
 
 		}
 	}
-#line 2963 "util/configparser.c"
+#line 2873 "util/configparser.c"
     break;
 
   case 265:
 #line 394 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
 		   strcmp((yyvsp[0].str), "passthru")!=0 && strcmp((yyvsp[0].str), "drop")!=0 &&
@@ -2978,44 +2888,44 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2982 "util/configparser.c"
+#line 2892 "util/configparser.c"
     break;
 
   case 266:
 #line 411 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2992 "util/configparser.c"
+#line 2902 "util/configparser.c"
     break;
 
   case 267:
 #line 419 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3004 "util/configparser.c"
+#line 2914 "util/configparser.c"
     break;
 
   case 268:
 #line 429 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 3014 "util/configparser.c"
+#line 2924 "util/configparser.c"
     break;
 
   case 269:
 #line 437 "./util/configparser.y"
-        {
+    {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -3030,36 +2940,36 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3034 "util/configparser.c"
+#line 2944 "util/configparser.c"
     break;
 
   case 282:
 #line 460 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3046 "util/configparser.c"
+#line 2956 "util/configparser.c"
     break;
 
   case 283:
 #line 469 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3058 "util/configparser.c"
+#line 2968 "util/configparser.c"
     break;
 
   case 284:
 #line 478 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
 			cfg_parser->cfg->stat_interval = 0;
@@ -3068,48 +2978,48 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3072 "util/configparser.c"
+#line 2982 "util/configparser.c"
     break;
 
   case 285:
 #line 489 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3084 "util/configparser.c"
+#line 2994 "util/configparser.c"
     break;
 
   case 286:
 #line 498 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3096 "util/configparser.c"
+#line 3006 "util/configparser.c"
     break;
 
   case 287:
 #line 507 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3108 "util/configparser.c"
+#line 3018 "util/configparser.c"
     break;
 
   case 288:
 #line 516 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
 			cfg_parser->cfg->shm_key = 0;
@@ -3118,24 +3028,24 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3122 "util/configparser.c"
+#line 3032 "util/configparser.c"
     break;
 
   case 289:
 #line 527 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3134 "util/configparser.c"
+#line 3044 "util/configparser.c"
     break;
 
   case 290:
 #line 536 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet, (yyvsp[0].str)))
@@ -3145,12 +3055,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3149 "util/configparser.c"
+#line 3059 "util/configparser.c"
     break;
 
   case 291:
 #line 548 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet_zone,
@@ -3161,12 +3071,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3165 "util/configparser.c"
+#line 3075 "util/configparser.c"
     break;
 
   case 292:
 #line 562 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3179,12 +3089,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3183 "util/configparser.c"
+#line 3093 "util/configparser.c"
     break;
 
   case 293:
 #line 577 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
 		OUTYY(("P(Deprecated option, ignoring)\n"));
@@ -3193,12 +3103,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3197 "util/configparser.c"
+#line 3107 "util/configparser.c"
     break;
 
   case 294:
 #line 588 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3213,12 +3123,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3217 "util/configparser.c"
+#line 3127 "util/configparser.c"
     break;
 
   case 295:
 #line 605 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3233,12 +3143,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3237 "util/configparser.c"
+#line 3147 "util/configparser.c"
     break;
 
   case 296:
 #line 622 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3253,12 +3163,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3257 "util/configparser.c"
+#line 3167 "util/configparser.c"
     break;
 
   case 297:
 #line 639 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3273,12 +3183,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3277 "util/configparser.c"
+#line 3187 "util/configparser.c"
     break;
 
   case 298:
 #line 656 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3291,12 +3201,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3295 "util/configparser.c"
+#line 3205 "util/configparser.c"
     break;
 
   case 299:
 #line 671 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3309,12 +3219,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3313 "util/configparser.c"
+#line 3223 "util/configparser.c"
     break;
 
   case 300:
 #line 686 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
 			cfg_parser->cfg->ifs = calloc(1, sizeof(char*));
@@ -3325,12 +3235,12 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3329 "util/configparser.c"
+#line 3239 "util/configparser.c"
     break;
 
   case 301:
 #line 699 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
 			cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*));
@@ -3343,180 +3253,180 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3347 "util/configparser.c"
+#line 3257 "util/configparser.c"
     break;
 
   case 302:
 #line 714 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3359 "util/configparser.c"
+#line 3269 "util/configparser.c"
     break;
 
   case 303:
 #line 723 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
 			cfg_parser->cfg->outgoing_avail_ports, 65536))
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3371 "util/configparser.c"
+#line 3281 "util/configparser.c"
     break;
 
   case 304:
 #line 732 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
 			cfg_parser->cfg->outgoing_avail_ports, 65536))
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3383 "util/configparser.c"
+#line 3293 "util/configparser.c"
     break;
 
   case 305:
 #line 741 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3395 "util/configparser.c"
+#line 3305 "util/configparser.c"
     break;
 
   case 306:
 #line 750 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3407 "util/configparser.c"
+#line 3317 "util/configparser.c"
     break;
 
   case 307:
 #line 759 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3419 "util/configparser.c"
+#line 3329 "util/configparser.c"
     break;
 
   case 308:
 #line 768 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3431 "util/configparser.c"
+#line 3341 "util/configparser.c"
     break;
 
   case 309:
 #line 777 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3443 "util/configparser.c"
+#line 3353 "util/configparser.c"
     break;
 
   case 310:
 #line 786 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3455 "util/configparser.c"
+#line 3365 "util/configparser.c"
     break;
 
   case 311:
 #line 795 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3467 "util/configparser.c"
+#line 3377 "util/configparser.c"
     break;
 
   case 312:
 #line 804 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3479 "util/configparser.c"
+#line 3389 "util/configparser.c"
     break;
 
   case 313:
 #line 813 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3491 "util/configparser.c"
+#line 3401 "util/configparser.c"
     break;
 
   case 314:
 #line 822 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                         yyerror("number expected");
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3503 "util/configparser.c"
+#line 3413 "util/configparser.c"
     break;
 
   case 315:
 #line 831 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3515 "util/configparser.c"
+#line 3425 "util/configparser.c"
     break;
 
   case 316:
 #line 840 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
@@ -3527,24 +3437,24 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3531 "util/configparser.c"
+#line 3441 "util/configparser.c"
     break;
 
   case 317:
 #line 853 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3543 "util/configparser.c"
+#line 3453 "util/configparser.c"
     break;
 
   case 318:
 #line 862 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
@@ -3555,167 +3465,168 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3559 "util/configparser.c"
+#line 3469 "util/configparser.c"
     break;
 
   case 319:
 #line 875 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3571 "util/configparser.c"
+#line 3481 "util/configparser.c"
     break;
 
   case 320:
 #line 884 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3583 "util/configparser.c"
+#line 3493 "util/configparser.c"
     break;
 
   case 321:
 #line 893 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3595 "util/configparser.c"
+#line 3505 "util/configparser.c"
     break;
 
   case 322:
 #line 902 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3605 "util/configparser.c"
+#line 3515 "util/configparser.c"
     break;
 
   case 323:
 #line 909 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3615 "util/configparser.c"
+#line 3525 "util/configparser.c"
     break;
 
   case 324:
 #line 916 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3627 "util/configparser.c"
+#line 3537 "util/configparser.c"
     break;
 
   case 325:
 #line 925 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3637 "util/configparser.c"
+#line 3547 "util/configparser.c"
     break;
 
   case 326:
 #line 932 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3649 "util/configparser.c"
+#line 3559 "util/configparser.c"
     break;
 
   case 327:
 #line 941 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3660 "util/configparser.c"
+#line 3570 "util/configparser.c"
     break;
 
   case 328:
 #line 949 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3670 "util/configparser.c"
+#line 3580 "util/configparser.c"
     break;
 
   case 329:
 #line 956 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3680 "util/configparser.c"
+#line 3590 "util/configparser.c"
     break;
 
   case 330:
 #line 963 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3691 "util/configparser.c"
+#line 3601 "util/configparser.c"
     break;
 
   case 331:
 #line 971 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3703 "util/configparser.c"
+#line 3613 "util/configparser.c"
     break;
 
   case 332:
 #line 980 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
+		free((yyvsp[0].str));
 	}
-#line 3714 "util/configparser.c"
+#line 3625 "util/configparser.c"
     break;
 
   case 333:
-#line 987 "./util/configparser.y"
-        {
+#line 988 "./util/configparser.y"
+    {
 		OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->http_endpoint);
 		if((yyvsp[0].str) && (yyvsp[0].str)[0] != '/') {
@@ -3730,84 +3641,84 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3734 "util/configparser.c"
+#line 3645 "util/configparser.c"
     break;
 
   case 334:
-#line 1003 "./util/configparser.y"
-        {
+#line 1004 "./util/configparser.y"
+    {
 		OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3746 "util/configparser.c"
+#line 3657 "util/configparser.c"
     break;
 
   case 335:
-#line 1011 "./util/configparser.y"
-        {
+#line 1012 "./util/configparser.y"
+    {
 		OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str),
 			&cfg_parser->cfg->http_query_buffer_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3758 "util/configparser.c"
+#line 3669 "util/configparser.c"
     break;
 
   case 336:
-#line 1019 "./util/configparser.y"
-        {
+#line 1020 "./util/configparser.y"
+    {
 		OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str),
 			&cfg_parser->cfg->http_response_buffer_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3770 "util/configparser.c"
+#line 3681 "util/configparser.c"
     break;
 
   case 337:
-#line 1027 "./util/configparser.y"
-        {
+#line 1028 "./util/configparser.y"
+    {
 		OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3782 "util/configparser.c"
+#line 3693 "util/configparser.c"
     break;
 
   case 338:
-#line 1035 "./util/configparser.y"
-        {
+#line 1036 "./util/configparser.y"
+    {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3794 "util/configparser.c"
+#line 3705 "util/configparser.c"
     break;
 
   case 339:
-#line 1044 "./util/configparser.y"
-        {
+#line 1045 "./util/configparser.y"
+    {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3806 "util/configparser.c"
+#line 3717 "util/configparser.c"
     break;
 
   case 340:
-#line 1053 "./util/configparser.y"
-        {
+#line 1054 "./util/configparser.y"
+    {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -3819,104 +3730,104 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3823 "util/configparser.c"
+#line 3734 "util/configparser.c"
     break;
 
   case 341:
-#line 1067 "./util/configparser.y"
-        {
+#line 1068 "./util/configparser.y"
+    {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3835 "util/configparser.c"
+#line 3746 "util/configparser.c"
     break;
 
   case 342:
-#line 1076 "./util/configparser.y"
-        {
+#line 1077 "./util/configparser.y"
+    {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3847 "util/configparser.c"
+#line 3758 "util/configparser.c"
     break;
 
   case 343:
-#line 1085 "./util/configparser.y"
-  {
+#line 1086 "./util/configparser.y"
+    {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
   		yyerror("expected yes or no.");
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3859 "util/configparser.c"
+#line 3770 "util/configparser.c"
     break;
 
   case 344:
-#line 1094 "./util/configparser.y"
-  {
+#line 1095 "./util/configparser.y"
+    {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
   		yyerror("expected yes or no.");
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3871 "util/configparser.c"
+#line 3782 "util/configparser.c"
     break;
 
   case 345:
-#line 1103 "./util/configparser.y"
-        {
+#line 1104 "./util/configparser.y"
+    {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3883 "util/configparser.c"
+#line 3794 "util/configparser.c"
     break;
 
   case 346:
-#line 1112 "./util/configparser.y"
-  {
+#line 1113 "./util/configparser.y"
+    {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
   		yyerror("expected yes or no.");
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3895 "util/configparser.c"
+#line 3806 "util/configparser.c"
     break;
 
   case 347:
-#line 1121 "./util/configparser.y"
-        {
+#line 1122 "./util/configparser.y"
+    {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3905 "util/configparser.c"
+#line 3816 "util/configparser.c"
     break;
 
   case 348:
-#line 1128 "./util/configparser.y"
-        {
+#line 1129 "./util/configparser.y"
+    {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3915 "util/configparser.c"
+#line 3826 "util/configparser.c"
     break;
 
   case 349:
-#line 1135 "./util/configparser.y"
-        {
+#line 1136 "./util/configparser.y"
+    {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
 		cfg_parser->cfg->directory = (yyvsp[0].str);
@@ -3940,106 +3851,106 @@ yyreduce:
 			}
 		}
 	}
-#line 3944 "util/configparser.c"
+#line 3855 "util/configparser.c"
     break;
 
   case 350:
-#line 1161 "./util/configparser.y"
-        {
+#line 1162 "./util/configparser.y"
+    {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3955 "util/configparser.c"
+#line 3866 "util/configparser.c"
     break;
 
   case 351:
-#line 1169 "./util/configparser.y"
-        {
+#line 1170 "./util/configparser.y"
+    {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3965 "util/configparser.c"
+#line 3876 "util/configparser.c"
     break;
 
   case 352:
-#line 1176 "./util/configparser.y"
-        {
+#line 1177 "./util/configparser.y"
+    {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3975 "util/configparser.c"
+#line 3886 "util/configparser.c"
     break;
 
   case 353:
-#line 1183 "./util/configparser.y"
-        {
+#line 1184 "./util/configparser.y"
+    {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 3985 "util/configparser.c"
+#line 3896 "util/configparser.c"
     break;
 
   case 354:
-#line 1190 "./util/configparser.y"
-        {
+#line 1191 "./util/configparser.y"
+    {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 3995 "util/configparser.c"
+#line 3906 "util/configparser.c"
     break;
 
   case 355:
-#line 1197 "./util/configparser.y"
-        {
+#line 1198 "./util/configparser.y"
+    {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4006 "util/configparser.c"
+#line 3917 "util/configparser.c"
     break;
 
   case 356:
-#line 1205 "./util/configparser.y"
-        {
+#line 1206 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4017 "util/configparser.c"
+#line 3928 "util/configparser.c"
     break;
 
   case 357:
-#line 1213 "./util/configparser.y"
-        {
+#line 1214 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4028 "util/configparser.c"
+#line 3939 "util/configparser.c"
     break;
 
   case 358:
-#line 1221 "./util/configparser.y"
-        {
+#line 1222 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4038 "util/configparser.c"
+#line 3949 "util/configparser.c"
     break;
 
   case 359:
-#line 1228 "./util/configparser.y"
-        {
+#line 1229 "./util/configparser.y"
+    {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4048,12 +3959,12 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4052 "util/configparser.c"
+#line 3963 "util/configparser.c"
     break;
 
   case 360:
-#line 1239 "./util/configparser.y"
-        {
+#line 1240 "./util/configparser.y"
+    {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4062,99 +3973,99 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4066 "util/configparser.c"
+#line 3977 "util/configparser.c"
     break;
 
   case 361:
-#line 1250 "./util/configparser.y"
-        {
+#line 1251 "./util/configparser.y"
+    {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4076 "util/configparser.c"
+#line 3987 "util/configparser.c"
     break;
 
   case 362:
-#line 1257 "./util/configparser.y"
-        {
+#line 1258 "./util/configparser.y"
+    {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4088 "util/configparser.c"
+#line 3999 "util/configparser.c"
     break;
 
   case 363:
-#line 1266 "./util/configparser.y"
-        {
+#line 1267 "./util/configparser.y"
+    {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4100 "util/configparser.c"
+#line 4011 "util/configparser.c"
     break;
 
   case 364:
-#line 1275 "./util/configparser.y"
-        {
+#line 1276 "./util/configparser.y"
+    {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4112 "util/configparser.c"
+#line 4023 "util/configparser.c"
     break;
 
   case 365:
-#line 1284 "./util/configparser.y"
-        {
+#line 1285 "./util/configparser.y"
+    {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 4122 "util/configparser.c"
+#line 4033 "util/configparser.c"
     break;
 
   case 366:
-#line 1291 "./util/configparser.y"
-        {
+#line 1292 "./util/configparser.y"
+    {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 4132 "util/configparser.c"
+#line 4043 "util/configparser.c"
     break;
 
   case 367:
-#line 1298 "./util/configparser.y"
-        {
+#line 1299 "./util/configparser.y"
+    {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4143 "util/configparser.c"
+#line 4054 "util/configparser.c"
     break;
 
   case 368:
-#line 1306 "./util/configparser.y"
-        {
+#line 1307 "./util/configparser.y"
+    {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4154 "util/configparser.c"
+#line 4065 "util/configparser.c"
     break;
 
   case 369:
-#line 1314 "./util/configparser.y"
+#line 1315 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4163,11 +4074,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4167 "util/configparser.c"
+#line 4078 "util/configparser.c"
     break;
 
   case 370:
-#line 1324 "./util/configparser.y"
+#line 1325 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4176,11 +4087,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4180 "util/configparser.c"
+#line 4091 "util/configparser.c"
     break;
 
   case 371:
-#line 1334 "./util/configparser.y"
+#line 1335 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4189,12 +4100,12 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4193 "util/configparser.c"
+#line 4104 "util/configparser.c"
     break;
 
   case 372:
-#line 1344 "./util/configparser.y"
-        {
+#line 1345 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
@@ -4206,23 +4117,23 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4210 "util/configparser.c"
+#line 4121 "util/configparser.c"
     break;
 
   case 373:
-#line 1358 "./util/configparser.y"
-        {
+#line 1359 "./util/configparser.y"
+    {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4221 "util/configparser.c"
+#line 4132 "util/configparser.c"
     break;
 
   case 374:
-#line 1366 "./util/configparser.y"
-        {
+#line 1367 "./util/configparser.y"
+    {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4233,12 +4144,12 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4237 "util/configparser.c"
+#line 4148 "util/configparser.c"
     break;
 
   case 375:
-#line 1379 "./util/configparser.y"
-        {
+#line 1380 "./util/configparser.y"
+    {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4247,23 +4158,23 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4251 "util/configparser.c"
+#line 4162 "util/configparser.c"
     break;
 
   case 376:
-#line 1390 "./util/configparser.y"
-        {
+#line 1391 "./util/configparser.y"
+    {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4262 "util/configparser.c"
+#line 4173 "util/configparser.c"
     break;
 
   case 377:
-#line 1398 "./util/configparser.y"
-        {
+#line 1399 "./util/configparser.y"
+    {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4274,48 +4185,48 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4278 "util/configparser.c"
+#line 4189 "util/configparser.c"
     break;
 
   case 378:
-#line 1411 "./util/configparser.y"
-        {
+#line 1412 "./util/configparser.y"
+    {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4290 "util/configparser.c"
+#line 4201 "util/configparser.c"
     break;
 
   case 379:
-#line 1420 "./util/configparser.y"
-        {
+#line 1421 "./util/configparser.y"
+    {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4302 "util/configparser.c"
+#line 4213 "util/configparser.c"
     break;
 
   case 380:
-#line 1429 "./util/configparser.y"
-        {
+#line 1430 "./util/configparser.y"
+    {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4314 "util/configparser.c"
+#line 4225 "util/configparser.c"
     break;
 
   case 381:
-#line 1438 "./util/configparser.y"
-        {
+#line 1439 "./util/configparser.y"
+    {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4323,12 +4234,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4327 "util/configparser.c"
+#line 4238 "util/configparser.c"
     break;
 
   case 382:
-#line 1448 "./util/configparser.y"
-        {
+#line 1449 "./util/configparser.y"
+    {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4336,23 +4247,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4340 "util/configparser.c"
+#line 4251 "util/configparser.c"
     break;
 
   case 383:
-#line 1458 "./util/configparser.y"
-        {
+#line 1459 "./util/configparser.y"
+    {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4351 "util/configparser.c"
+#line 4262 "util/configparser.c"
     break;
 
   case 384:
-#line 1466 "./util/configparser.y"
-        {
+#line 1467 "./util/configparser.y"
+    {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4363,58 +4274,58 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4367 "util/configparser.c"
+#line 4278 "util/configparser.c"
     break;
 
   case 385:
-#line 1479 "./util/configparser.y"
-        {
+#line 1480 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4379 "util/configparser.c"
+#line 4290 "util/configparser.c"
     break;
 
   case 386:
-#line 1488 "./util/configparser.y"
-        {
+#line 1489 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4390 "util/configparser.c"
+#line 4301 "util/configparser.c"
     break;
 
   case 387:
-#line 1496 "./util/configparser.y"
-        {
+#line 1497 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4402 "util/configparser.c"
+#line 4313 "util/configparser.c"
     break;
 
   case 388:
-#line 1505 "./util/configparser.y"
-        {
+#line 1506 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4413 "util/configparser.c"
+#line 4324 "util/configparser.c"
     break;
 
   case 389:
-#line 1513 "./util/configparser.y"
-        {
+#line 1514 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4425,34 +4336,34 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4429 "util/configparser.c"
+#line 4340 "util/configparser.c"
     break;
 
   case 390:
-#line 1526 "./util/configparser.y"
-        {
+#line 1527 "./util/configparser.y"
+    {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4441 "util/configparser.c"
+#line 4352 "util/configparser.c"
     break;
 
   case 391:
-#line 1535 "./util/configparser.y"
-        {
+#line 1536 "./util/configparser.y"
+    {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4451 "util/configparser.c"
+#line 4362 "util/configparser.c"
     break;
 
   case 392:
-#line 1542 "./util/configparser.y"
-        {
+#line 1543 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4460,12 +4371,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4464 "util/configparser.c"
+#line 4375 "util/configparser.c"
     break;
 
   case 393:
-#line 1552 "./util/configparser.y"
-        {
+#line 1553 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4473,12 +4384,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4477 "util/configparser.c"
+#line 4388 "util/configparser.c"
     break;
 
   case 394:
-#line 1562 "./util/configparser.y"
-        {
+#line 1563 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4486,12 +4397,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4490 "util/configparser.c"
+#line 4401 "util/configparser.c"
     break;
 
   case 395:
-#line 1572 "./util/configparser.y"
-        {
+#line 1573 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4499,12 +4410,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4503 "util/configparser.c"
+#line 4414 "util/configparser.c"
     break;
 
   case 396:
-#line 1582 "./util/configparser.y"
-        {
+#line 1583 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4512,12 +4423,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4516 "util/configparser.c"
+#line 4427 "util/configparser.c"
     break;
 
   case 397:
-#line 1592 "./util/configparser.y"
-        {
+#line 1593 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4525,12 +4436,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4529 "util/configparser.c"
+#line 4440 "util/configparser.c"
     break;
 
   case 398:
-#line 1602 "./util/configparser.y"
-        {
+#line 1603 "./util/configparser.y"
+    {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4538,12 +4449,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4542 "util/configparser.c"
+#line 4453 "util/configparser.c"
     break;
 
   case 399:
-#line 1612 "./util/configparser.y"
-        {
+#line 1613 "./util/configparser.y"
+    {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4551,100 +4462,100 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4555 "util/configparser.c"
+#line 4466 "util/configparser.c"
     break;
 
   case 400:
-#line 1622 "./util/configparser.y"
-        {
+#line 1623 "./util/configparser.y"
+    {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4565 "util/configparser.c"
+#line 4476 "util/configparser.c"
     break;
 
   case 401:
-#line 1629 "./util/configparser.y"
-        {
+#line 1630 "./util/configparser.y"
+    {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4575 "util/configparser.c"
+#line 4486 "util/configparser.c"
     break;
 
   case 402:
-#line 1636 "./util/configparser.y"
-        {
+#line 1637 "./util/configparser.y"
+    {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4585 "util/configparser.c"
+#line 4496 "util/configparser.c"
     break;
 
   case 403:
-#line 1643 "./util/configparser.y"
-        {
+#line 1644 "./util/configparser.y"
+    {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4597 "util/configparser.c"
+#line 4508 "util/configparser.c"
     break;
 
   case 404:
-#line 1652 "./util/configparser.y"
-        {
+#line 1653 "./util/configparser.y"
+    {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4609 "util/configparser.c"
+#line 4520 "util/configparser.c"
     break;
 
   case 405:
-#line 1661 "./util/configparser.y"
-        {
+#line 1662 "./util/configparser.y"
+    {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4621 "util/configparser.c"
+#line 4532 "util/configparser.c"
     break;
 
   case 406:
-#line 1670 "./util/configparser.y"
-        {
+#line 1671 "./util/configparser.y"
+    {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4633 "util/configparser.c"
+#line 4544 "util/configparser.c"
     break;
 
   case 407:
-#line 1679 "./util/configparser.y"
-        {
+#line 1680 "./util/configparser.y"
+    {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4643 "util/configparser.c"
+#line 4554 "util/configparser.c"
     break;
 
   case 408:
-#line 1686 "./util/configparser.y"
-        {
+#line 1687 "./util/configparser.y"
+    {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4652,12 +4563,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4656 "util/configparser.c"
+#line 4567 "util/configparser.c"
     break;
 
   case 409:
-#line 1696 "./util/configparser.y"
-        {
+#line 1697 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
 			strcmp((yyvsp[0].str), "deny_non_local")!=0 &&
@@ -4675,22 +4586,22 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4679 "util/configparser.c"
+#line 4590 "util/configparser.c"
     break;
 
   case 410:
-#line 1716 "./util/configparser.y"
-        {
+#line 1717 "./util/configparser.y"
+    {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4689 "util/configparser.c"
+#line 4600 "util/configparser.c"
     break;
 
   case 411:
-#line 1723 "./util/configparser.y"
-        {
+#line 1724 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
 			cfg_parser->cfg->val_date_override = 0;
@@ -4706,12 +4617,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4710 "util/configparser.c"
+#line 4621 "util/configparser.c"
     break;
 
   case 412:
-#line 1741 "./util/configparser.y"
-        {
+#line 1742 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
 			cfg_parser->cfg->val_sig_skew_min = 0;
@@ -4722,12 +4633,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4726 "util/configparser.c"
+#line 4637 "util/configparser.c"
     break;
 
   case 413:
-#line 1754 "./util/configparser.y"
-        {
+#line 1755 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
 			cfg_parser->cfg->val_sig_skew_max = 0;
@@ -4738,60 +4649,60 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4742 "util/configparser.c"
+#line 4653 "util/configparser.c"
     break;
 
   case 414:
-#line 1767 "./util/configparser.y"
-        {
+#line 1768 "./util/configparser.y"
+    {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4754 "util/configparser.c"
+#line 4665 "util/configparser.c"
     break;
 
   case 415:
-#line 1776 "./util/configparser.y"
-        {
+#line 1777 "./util/configparser.y"
+    {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4766 "util/configparser.c"
+#line 4677 "util/configparser.c"
     break;
 
   case 416:
-#line 1785 "./util/configparser.y"
-        {
+#line 1786 "./util/configparser.y"
+    {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4778 "util/configparser.c"
+#line 4689 "util/configparser.c"
     break;
 
   case 417:
-#line 1794 "./util/configparser.y"
-        {
+#line 1795 "./util/configparser.y"
+    {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4790 "util/configparser.c"
+#line 4701 "util/configparser.c"
     break;
 
   case 418:
-#line 1803 "./util/configparser.y"
-        {
+#line 1804 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4799,12 +4710,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4803 "util/configparser.c"
+#line 4714 "util/configparser.c"
     break;
 
   case 419:
-#line 1813 "./util/configparser.y"
-        {
+#line 1814 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4812,12 +4723,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4816 "util/configparser.c"
+#line 4727 "util/configparser.c"
     break;
 
   case 420:
-#line 1823 "./util/configparser.y"
-        {
+#line 1824 "./util/configparser.y"
+    {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4826,84 +4737,84 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4830 "util/configparser.c"
+#line 4741 "util/configparser.c"
     break;
 
   case 421:
-#line 1834 "./util/configparser.y"
-        {
+#line 1835 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4842 "util/configparser.c"
+#line 4753 "util/configparser.c"
     break;
 
   case 422:
-#line 1843 "./util/configparser.y"
-        {
+#line 1844 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4854 "util/configparser.c"
+#line 4765 "util/configparser.c"
     break;
 
   case 423:
-#line 1852 "./util/configparser.y"
-        {
+#line 1853 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4866 "util/configparser.c"
+#line 4777 "util/configparser.c"
     break;
 
   case 424:
-#line 1861 "./util/configparser.y"
-        {
+#line 1862 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4878 "util/configparser.c"
+#line 4789 "util/configparser.c"
     break;
 
   case 425:
-#line 1870 "./util/configparser.y"
-        {
+#line 1871 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4890 "util/configparser.c"
+#line 4801 "util/configparser.c"
     break;
 
   case 426:
-#line 1879 "./util/configparser.y"
-        {
+#line 1880 "./util/configparser.y"
+    {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4902 "util/configparser.c"
+#line 4813 "util/configparser.c"
     break;
 
   case 427:
-#line 1888 "./util/configparser.y"
-        {
+#line 1889 "./util/configparser.y"
+    {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4914,12 +4825,12 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4918 "util/configparser.c"
+#line 4829 "util/configparser.c"
     break;
 
   case 428:
-#line 1901 "./util/configparser.y"
-        {
+#line 1902 "./util/configparser.y"
+    {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4930,70 +4841,70 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4934 "util/configparser.c"
+#line 4845 "util/configparser.c"
     break;
 
   case 429:
-#line 1914 "./util/configparser.y"
-        {
+#line 1915 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4946 "util/configparser.c"
+#line 4857 "util/configparser.c"
     break;
 
   case 430:
-#line 1923 "./util/configparser.y"
-        {
+#line 1924 "./util/configparser.y"
+    {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4956 "util/configparser.c"
+#line 4867 "util/configparser.c"
     break;
 
   case 431:
-#line 1930 "./util/configparser.y"
-        {
+#line 1931 "./util/configparser.y"
+    {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4968 "util/configparser.c"
+#line 4879 "util/configparser.c"
     break;
 
   case 432:
-#line 1939 "./util/configparser.y"
-        {
+#line 1940 "./util/configparser.y"
+    {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4980 "util/configparser.c"
+#line 4891 "util/configparser.c"
     break;
 
   case 433:
-#line 1948 "./util/configparser.y"
-        {
+#line 1949 "./util/configparser.y"
+    {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4992 "util/configparser.c"
+#line 4903 "util/configparser.c"
     break;
 
   case 434:
-#line 1957 "./util/configparser.y"
-        {
+#line 1958 "./util/configparser.y"
+    {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5001,23 +4912,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5005 "util/configparser.c"
+#line 4916 "util/configparser.c"
     break;
 
   case 435:
-#line 1966 "./util/configparser.y"
-        {
+#line 1967 "./util/configparser.y"
+    {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5016 "util/configparser.c"
+#line 4927 "util/configparser.c"
     break;
 
   case 436:
-#line 1974 "./util/configparser.y"
-        {
+#line 1975 "./util/configparser.y"
+    {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -5028,23 +4939,23 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5032 "util/configparser.c"
+#line 4943 "util/configparser.c"
     break;
 
   case 437:
-#line 1987 "./util/configparser.y"
-        {
+#line 1988 "./util/configparser.y"
+    {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5043 "util/configparser.c"
+#line 4954 "util/configparser.c"
     break;
 
   case 438:
-#line 1995 "./util/configparser.y"
-        {
+#line 1996 "./util/configparser.y"
+    {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
 		   strcmp((yyvsp[0].str), "refuse")!=0 && strcmp((yyvsp[0].str), "redirect")!=0 &&
@@ -5083,22 +4994,22 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5087 "util/configparser.c"
+#line 4998 "util/configparser.c"
     break;
 
   case 439:
-#line 2036 "./util/configparser.y"
-        {
+#line 2037 "./util/configparser.y"
+    {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 5097 "util/configparser.c"
+#line 5008 "util/configparser.c"
     break;
 
   case 440:
-#line 2043 "./util/configparser.y"
-        {
+#line 2044 "./util/configparser.y"
+    {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -5111,12 +5022,12 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5115 "util/configparser.c"
+#line 5026 "util/configparser.c"
     break;
 
   case 441:
-#line 2058 "./util/configparser.y"
-        {
+#line 2059 "./util/configparser.y"
+    {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5124,12 +5035,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5128 "util/configparser.c"
+#line 5039 "util/configparser.c"
     break;
 
   case 442:
-#line 2068 "./util/configparser.y"
-        {
+#line 2069 "./util/configparser.y"
+    {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5137,65 +5048,65 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5141 "util/configparser.c"
+#line 5052 "util/configparser.c"
     break;
 
   case 443:
-#line 2078 "./util/configparser.y"
-        {
+#line 2079 "./util/configparser.y"
+    {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5151 "util/configparser.c"
+#line 5062 "util/configparser.c"
     break;
 
   case 444:
-#line 2085 "./util/configparser.y"
-        {
+#line 2086 "./util/configparser.y"
+    {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5161 "util/configparser.c"
+#line 5072 "util/configparser.c"
     break;
 
   case 445:
-#line 2092 "./util/configparser.y"
-        {
+#line 2093 "./util/configparser.y"
+    {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 5171 "util/configparser.c"
+#line 5082 "util/configparser.c"
     break;
 
   case 446:
-#line 2099 "./util/configparser.y"
-        {
+#line 2100 "./util/configparser.y"
+    {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5183 "util/configparser.c"
+#line 5094 "util/configparser.c"
     break;
 
   case 447:
-#line 2108 "./util/configparser.y"
-        {
+#line 2109 "./util/configparser.y"
+    {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 5194 "util/configparser.c"
+#line 5105 "util/configparser.c"
     break;
 
   case 448:
-#line 2116 "./util/configparser.y"
-        {
+#line 2117 "./util/configparser.y"
+    {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
 		while((p=strsep(&s, " \t\n")) != NULL) {
@@ -5207,12 +5118,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5211 "util/configparser.c"
+#line 5122 "util/configparser.c"
     break;
 
   case 449:
-#line 2130 "./util/configparser.y"
-        {
+#line 2131 "./util/configparser.y"
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5231,12 +5142,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5235 "util/configparser.c"
+#line 5146 "util/configparser.c"
     break;
 
   case 450:
-#line 2151 "./util/configparser.y"
-        {
+#line 2152 "./util/configparser.y"
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5255,12 +5166,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5259 "util/configparser.c"
+#line 5170 "util/configparser.c"
     break;
 
   case 451:
-#line 2172 "./util/configparser.y"
-        {
+#line 2173 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
 			(yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
@@ -5270,12 +5181,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5274 "util/configparser.c"
+#line 5185 "util/configparser.c"
     break;
 
   case 452:
-#line 2184 "./util/configparser.y"
-        {
+#line 2185 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
 			(yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
@@ -5285,12 +5196,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5289 "util/configparser.c"
+#line 5200 "util/configparser.c"
     break;
 
   case 453:
-#line 2196 "./util/configparser.y"
-        {
+#line 2197 "./util/configparser.y"
+    {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
 			(yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
@@ -5300,24 +5211,24 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5304 "util/configparser.c"
+#line 5215 "util/configparser.c"
     break;
 
   case 454:
-#line 2208 "./util/configparser.y"
-        {
+#line 2209 "./util/configparser.y"
+    {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
 			(yyvsp[-1].str), (yyvsp[0].str))) {
 			yyerror("out of memory");
 		}
 	}
-#line 5316 "util/configparser.c"
+#line 5227 "util/configparser.c"
     break;
 
   case 455:
-#line 2217 "./util/configparser.y"
-        {
+#line 2218 "./util/configparser.y"
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5336,58 +5247,58 @@ yyreduce:
 			}
 		}
 	}
-#line 5340 "util/configparser.c"
+#line 5251 "util/configparser.c"
     break;
 
   case 456:
-#line 2238 "./util/configparser.y"
-        { 
+#line 2239 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5352 "util/configparser.c"
+#line 5263 "util/configparser.c"
     break;
 
   case 457:
-#line 2248 "./util/configparser.y"
-        { 
+#line 2249 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5364 "util/configparser.c"
+#line 5275 "util/configparser.c"
     break;
 
   case 458:
-#line 2257 "./util/configparser.y"
-  {
+#line 2258 "./util/configparser.y"
+    {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5375 "util/configparser.c"
+#line 5286 "util/configparser.c"
     break;
 
   case 459:
-#line 2265 "./util/configparser.y"
-        {
+#line 2266 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5386 "util/configparser.c"
+#line 5297 "util/configparser.c"
     break;
 
   case 460:
-#line 2273 "./util/configparser.y"
-  {
+#line 2274 "./util/configparser.y"
+    {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -5398,12 +5309,12 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5402 "util/configparser.c"
+#line 5313 "util/configparser.c"
     break;
 
   case 461:
-#line 2286 "./util/configparser.y"
-        {
+#line 2287 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -5414,12 +5325,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5418 "util/configparser.c"
+#line 5329 "util/configparser.c"
     break;
 
   case 462:
-#line 2299 "./util/configparser.y"
-        {
+#line 2300 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
 			yyerror("number expected");
@@ -5432,12 +5343,12 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5436 "util/configparser.c"
+#line 5347 "util/configparser.c"
     break;
 
   case 463:
-#line 2314 "./util/configparser.y"
-        {
+#line 2315 "./util/configparser.y"
+    {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
 			yyerror("number expected");
@@ -5450,69 +5361,69 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5454 "util/configparser.c"
+#line 5365 "util/configparser.c"
     break;
 
   case 464:
-#line 2329 "./util/configparser.y"
-  { 
+#line 2330 "./util/configparser.y"
+    { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
   		yyerror("number expected");
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5466 "util/configparser.c"
+#line 5377 "util/configparser.c"
     break;
 
   case 465:
-#line 2338 "./util/configparser.y"
-        { 
+#line 2339 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5478 "util/configparser.c"
+#line 5389 "util/configparser.c"
     break;
 
   case 466:
-#line 2347 "./util/configparser.y"
-        { 
+#line 2348 "./util/configparser.y"
+    { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5487 "util/configparser.c"
+#line 5398 "util/configparser.c"
     break;
 
   case 467:
-#line 2353 "./util/configparser.y"
-        { 
+#line 2354 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5499 "util/configparser.c"
+#line 5410 "util/configparser.c"
     break;
 
   case 468:
-#line 2362 "./util/configparser.y"
-        { 
+#line 2363 "./util/configparser.y"
+    { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("number expected");
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5511 "util/configparser.c"
+#line 5422 "util/configparser.c"
     break;
 
   case 469:
-#line 2371 "./util/configparser.y"
-        {
+#line 2372 "./util/configparser.y"
+    {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5520,12 +5431,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5524 "util/configparser.c"
+#line 5435 "util/configparser.c"
     break;
 
   case 470:
-#line 2381 "./util/configparser.y"
-        {
+#line 2382 "./util/configparser.y"
+    {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5533,12 +5444,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5537 "util/configparser.c"
+#line 5448 "util/configparser.c"
     break;
 
   case 471:
-#line 2391 "./util/configparser.y"
-        {
+#line 2392 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5549,12 +5460,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5553 "util/configparser.c"
+#line 5464 "util/configparser.c"
     break;
 
   case 472:
-#line 2404 "./util/configparser.y"
-        {
+#line 2405 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5565,12 +5476,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5569 "util/configparser.c"
+#line 5480 "util/configparser.c"
     break;
 
   case 473:
-#line 2417 "./util/configparser.y"
-        {
+#line 2418 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ipsecmod_hook);
@@ -5580,12 +5491,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5584 "util/configparser.c"
+#line 5495 "util/configparser.c"
     break;
 
   case 474:
-#line 2429 "./util/configparser.y"
-        {
+#line 2430 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5597,12 +5508,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5601 "util/configparser.c"
+#line 5512 "util/configparser.c"
     break;
 
   case 475:
-#line 2443 "./util/configparser.y"
-        {
+#line 2444 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->ipsecmod_whitelist, (yyvsp[0].str)))
@@ -5612,12 +5523,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5616 "util/configparser.c"
+#line 5527 "util/configparser.c"
     break;
 
   case 476:
-#line 2455 "./util/configparser.y"
-        {
+#line 2456 "./util/configparser.y"
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5629,12 +5540,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5633 "util/configparser.c"
+#line 5544 "util/configparser.c"
     break;
 
   case 477:
-#line 2469 "./util/configparser.y"
-        {
+#line 2470 "./util/configparser.y"
+    {
 		int tag_data;
 		OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		tag_data = atoi((yyvsp[0].str));
@@ -5647,12 +5558,12 @@ yyreduce:
 			fatal_exit("out of memory adding "
 				"edns-client-tag");
 	}
-#line 5651 "util/configparser.c"
+#line 5562 "util/configparser.c"
     break;
 
   case 478:
-#line 2484 "./util/configparser.y"
-        {
+#line 2485 "./util/configparser.y"
+    {
 		OUTYY(("P(edns_client_tag_opcode:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("option code expected");
@@ -5661,12 +5572,12 @@ yyreduce:
 		else cfg_parser->cfg->edns_client_tag_opcode = atoi((yyvsp[0].str));
 
 	}
-#line 5665 "util/configparser.c"
+#line 5576 "util/configparser.c"
     break;
 
   case 479:
-#line 2495 "./util/configparser.y"
-        {
+#line 2496 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
 			yyerror("stub name override, there must be one name "
@@ -5674,56 +5585,56 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5678 "util/configparser.c"
+#line 5589 "util/configparser.c"
     break;
 
   case 480:
-#line 2505 "./util/configparser.y"
-        {
+#line 2506 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5688 "util/configparser.c"
+#line 5599 "util/configparser.c"
     break;
 
   case 481:
-#line 2512 "./util/configparser.y"
-        {
+#line 2513 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5698 "util/configparser.c"
+#line 5609 "util/configparser.c"
     break;
 
   case 482:
-#line 2519 "./util/configparser.y"
-        {
+#line 2520 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5710 "util/configparser.c"
+#line 5621 "util/configparser.c"
     break;
 
   case 483:
-#line 2528 "./util/configparser.y"
-        {
+#line 2529 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5722 "util/configparser.c"
+#line 5633 "util/configparser.c"
     break;
 
   case 484:
-#line 2537 "./util/configparser.y"
-        {
+#line 2538 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5731,12 +5642,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5735 "util/configparser.c"
+#line 5646 "util/configparser.c"
     break;
 
   case 485:
-#line 2547 "./util/configparser.y"
-        {
+#line 2548 "./util/configparser.y"
+    {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5744,12 +5655,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5748 "util/configparser.c"
+#line 5659 "util/configparser.c"
     break;
 
   case 486:
-#line 2557 "./util/configparser.y"
-        {
+#line 2558 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
 			yyerror("forward name override, there must be one "
@@ -5757,56 +5668,56 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5761 "util/configparser.c"
+#line 5672 "util/configparser.c"
     break;
 
   case 487:
-#line 2567 "./util/configparser.y"
-        {
+#line 2568 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5771 "util/configparser.c"
+#line 5682 "util/configparser.c"
     break;
 
   case 488:
-#line 2574 "./util/configparser.y"
-        {
+#line 2575 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5781 "util/configparser.c"
+#line 5692 "util/configparser.c"
     break;
 
   case 489:
-#line 2581 "./util/configparser.y"
-        {
+#line 2582 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5793 "util/configparser.c"
+#line 5704 "util/configparser.c"
     break;
 
   case 490:
-#line 2590 "./util/configparser.y"
-        {
+#line 2591 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5805 "util/configparser.c"
+#line 5716 "util/configparser.c"
     break;
 
   case 491:
-#line 2599 "./util/configparser.y"
-        {
+#line 2600 "./util/configparser.y"
+    {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5814,12 +5725,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5818 "util/configparser.c"
+#line 5729 "util/configparser.c"
     break;
 
   case 492:
-#line 2609 "./util/configparser.y"
-        {
+#line 2610 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
 			yyerror("auth name override, there must be one name "
@@ -5827,53 +5738,53 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5831 "util/configparser.c"
+#line 5742 "util/configparser.c"
     break;
 
   case 493:
-#line 2619 "./util/configparser.y"
-        {
+#line 2620 "./util/configparser.y"
+    {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5841 "util/configparser.c"
+#line 5752 "util/configparser.c"
     break;
 
   case 494:
-#line 2626 "./util/configparser.y"
-        {
+#line 2627 "./util/configparser.y"
+    {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5851 "util/configparser.c"
+#line 5762 "util/configparser.c"
     break;
 
   case 495:
-#line 2633 "./util/configparser.y"
-        {
+#line 2634 "./util/configparser.y"
+    {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5861 "util/configparser.c"
+#line 5772 "util/configparser.c"
     break;
 
   case 496:
-#line 2640 "./util/configparser.y"
-        {
+#line 2641 "./util/configparser.y"
+    {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5872 "util/configparser.c"
+#line 5783 "util/configparser.c"
     break;
 
   case 497:
-#line 2648 "./util/configparser.y"
-        {
+#line 2649 "./util/configparser.y"
+    {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5881,12 +5792,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5885 "util/configparser.c"
+#line 5796 "util/configparser.c"
     break;
 
   case 498:
-#line 2658 "./util/configparser.y"
-        {
+#line 2659 "./util/configparser.y"
+    {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5894,12 +5805,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5898 "util/configparser.c"
+#line 5809 "util/configparser.c"
     break;
 
   case 499:
-#line 2668 "./util/configparser.y"
-        {
+#line 2669 "./util/configparser.y"
+    {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -5907,12 +5818,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5911 "util/configparser.c"
+#line 5822 "util/configparser.c"
     break;
 
   case 500:
-#line 2678 "./util/configparser.y"
-        {
+#line 2679 "./util/configparser.y"
+    {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
 			yyerror("view name override, there must be one "
@@ -5920,12 +5831,12 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5924 "util/configparser.c"
+#line 5835 "util/configparser.c"
     break;
 
   case 501:
-#line 2688 "./util/configparser.y"
-        {
+#line 2689 "./util/configparser.y"
+    {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
 		   strcmp((yyvsp[0].str), "refuse")!=0 && strcmp((yyvsp[0].str), "redirect")!=0 &&
@@ -5962,12 +5873,12 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5966 "util/configparser.c"
+#line 5877 "util/configparser.c"
     break;
 
   case 502:
-#line 2727 "./util/configparser.y"
-        {
+#line 2728 "./util/configparser.y"
+    {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
 		if(!cfg_str2list_insert(
@@ -5975,34 +5886,34 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5979 "util/configparser.c"
+#line 5890 "util/configparser.c"
     break;
 
   case 503:
-#line 2737 "./util/configparser.y"
-        {
+#line 2738 "./util/configparser.y"
+    {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5990 "util/configparser.c"
+#line 5901 "util/configparser.c"
     break;
 
   case 504:
-#line 2745 "./util/configparser.y"
-        {
+#line 2746 "./util/configparser.y"
+    {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 6001 "util/configparser.c"
+#line 5912 "util/configparser.c"
     break;
 
   case 505:
-#line 2753 "./util/configparser.y"
-        {
+#line 2754 "./util/configparser.y"
+    {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -6015,32 +5926,32 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 6019 "util/configparser.c"
+#line 5930 "util/configparser.c"
     break;
 
   case 506:
-#line 2768 "./util/configparser.y"
-        {
+#line 2769 "./util/configparser.y"
+    {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6031 "util/configparser.c"
+#line 5942 "util/configparser.c"
     break;
 
   case 507:
-#line 2777 "./util/configparser.y"
-        { 
+#line 2778 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6039 "util/configparser.c"
+#line 5950 "util/configparser.c"
     break;
 
   case 518:
-#line 2788 "./util/configparser.y"
-        {
+#line 2789 "./util/configparser.y"
+    {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6048,104 +5959,104 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6052 "util/configparser.c"
+#line 5963 "util/configparser.c"
     break;
 
   case 519:
-#line 2798 "./util/configparser.y"
-        {
+#line 2799 "./util/configparser.y"
+    {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("control port number expected");
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6064 "util/configparser.c"
+#line 5975 "util/configparser.c"
     break;
 
   case 520:
-#line 2807 "./util/configparser.y"
-        {
+#line 2808 "./util/configparser.y"
+    {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6074 "util/configparser.c"
+#line 5985 "util/configparser.c"
     break;
 
   case 521:
-#line 2814 "./util/configparser.y"
-        {
+#line 2815 "./util/configparser.y"
+    {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6084 "util/configparser.c"
+#line 5995 "util/configparser.c"
     break;
 
   case 522:
-#line 2821 "./util/configparser.y"
-        {
+#line 2822 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 6094 "util/configparser.c"
+#line 6005 "util/configparser.c"
     break;
 
   case 523:
-#line 2828 "./util/configparser.y"
-        {
+#line 2829 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 6104 "util/configparser.c"
+#line 6015 "util/configparser.c"
     break;
 
   case 524:
-#line 2835 "./util/configparser.y"
-        {
+#line 2836 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 6114 "util/configparser.c"
+#line 6025 "util/configparser.c"
     break;
 
   case 525:
-#line 2842 "./util/configparser.y"
-        {
+#line 2843 "./util/configparser.y"
+    {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 6124 "util/configparser.c"
+#line 6035 "util/configparser.c"
     break;
 
   case 526:
-#line 2849 "./util/configparser.y"
-        {
+#line 2850 "./util/configparser.y"
+    {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6132 "util/configparser.c"
+#line 6043 "util/configparser.c"
     break;
 
   case 548:
-#line 2869 "./util/configparser.y"
-        {
+#line 2870 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6144 "util/configparser.c"
+#line 6055 "util/configparser.c"
     break;
 
   case 549:
-#line 2878 "./util/configparser.y"
-        {
+#line 2879 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6153,128 +6064,128 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6157 "util/configparser.c"
+#line 6068 "util/configparser.c"
     break;
 
   case 550:
-#line 2888 "./util/configparser.y"
-        {
+#line 2889 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 6167 "util/configparser.c"
+#line 6078 "util/configparser.c"
     break;
 
   case 551:
-#line 2895 "./util/configparser.y"
-        {
+#line 2896 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 6177 "util/configparser.c"
+#line 6088 "util/configparser.c"
     break;
 
   case 552:
-#line 2902 "./util/configparser.y"
-        {
+#line 2903 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6189 "util/configparser.c"
+#line 6100 "util/configparser.c"
     break;
 
   case 553:
-#line 2911 "./util/configparser.y"
-        {
+#line 2912 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 6199 "util/configparser.c"
+#line 6110 "util/configparser.c"
     break;
 
   case 554:
-#line 2918 "./util/configparser.y"
-        {
+#line 2919 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 6209 "util/configparser.c"
+#line 6120 "util/configparser.c"
     break;
 
   case 555:
-#line 2925 "./util/configparser.y"
-        {
+#line 2926 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 6219 "util/configparser.c"
+#line 6130 "util/configparser.c"
     break;
 
   case 556:
-#line 2932 "./util/configparser.y"
-        {
+#line 2933 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 6229 "util/configparser.c"
+#line 6140 "util/configparser.c"
     break;
 
   case 557:
-#line 2939 "./util/configparser.y"
-        {
+#line 2940 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6241 "util/configparser.c"
+#line 6152 "util/configparser.c"
     break;
 
   case 558:
-#line 2948 "./util/configparser.y"
-        {
+#line 2949 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6253 "util/configparser.c"
+#line 6164 "util/configparser.c"
     break;
 
   case 559:
-#line 2957 "./util/configparser.y"
-        {
+#line 2958 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6263 "util/configparser.c"
+#line 6174 "util/configparser.c"
     break;
 
   case 560:
-#line 2964 "./util/configparser.y"
-        {
+#line 2965 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6273 "util/configparser.c"
+#line 6184 "util/configparser.c"
     break;
 
   case 561:
-#line 2971 "./util/configparser.y"
-        {
+#line 2972 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6282,12 +6193,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6286 "util/configparser.c"
+#line 6197 "util/configparser.c"
     break;
 
   case 562:
-#line 2981 "./util/configparser.y"
-        {
+#line 2982 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6295,12 +6206,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6299 "util/configparser.c"
+#line 6210 "util/configparser.c"
     break;
 
   case 563:
-#line 2991 "./util/configparser.y"
-        {
+#line 2992 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6308,12 +6219,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6312 "util/configparser.c"
+#line 6223 "util/configparser.c"
     break;
 
   case 564:
-#line 3001 "./util/configparser.y"
-        {
+#line 3002 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6321,12 +6232,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6325 "util/configparser.c"
+#line 6236 "util/configparser.c"
     break;
 
   case 565:
-#line 3011 "./util/configparser.y"
-        {
+#line 3012 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6334,12 +6245,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6338 "util/configparser.c"
+#line 6249 "util/configparser.c"
     break;
 
   case 566:
-#line 3021 "./util/configparser.y"
-        {
+#line 3022 "./util/configparser.y"
+    {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6347,48 +6258,48 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6351 "util/configparser.c"
+#line 6262 "util/configparser.c"
     break;
 
   case 567:
-#line 3031 "./util/configparser.y"
-        { 
+#line 3032 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6359 "util/configparser.c"
+#line 6270 "util/configparser.c"
     break;
 
   case 571:
-#line 3040 "./util/configparser.y"
-        {
+#line 3041 "./util/configparser.y"
+    {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6369 "util/configparser.c"
+#line 6280 "util/configparser.c"
     break;
 
   case 572:
-#line 3046 "./util/configparser.y"
-        { 
+#line 3047 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6377 "util/configparser.c"
+#line 6288 "util/configparser.c"
     break;
 
   case 576:
-#line 3055 "./util/configparser.y"
-        {
+#line 3056 "./util/configparser.y"
+    {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6387 "util/configparser.c"
+#line 6298 "util/configparser.c"
     break;
 
   case 577:
-#line 3061 "./util/configparser.y"
-        {
+#line 3062 "./util/configparser.y"
+    {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -6396,132 +6307,132 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6400 "util/configparser.c"
+#line 6311 "util/configparser.c"
     break;
 
   case 578:
-#line 3071 "./util/configparser.y"
-        {
+#line 3072 "./util/configparser.y"
+    {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6410 "util/configparser.c"
+#line 6321 "util/configparser.c"
     break;
 
   case 579:
-#line 3078 "./util/configparser.y"
-        {
+#line 3079 "./util/configparser.y"
+    {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_actions,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6422 "util/configparser.c"
+#line 6333 "util/configparser.c"
     break;
 
   case 580:
-#line 3087 "./util/configparser.y"
-        {
+#line 3088 "./util/configparser.y"
+    {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6433 "util/configparser.c"
+#line 6344 "util/configparser.c"
     break;
 
   case 581:
-#line 3095 "./util/configparser.y"
-        {
+#line 3096 "./util/configparser.y"
+    {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6441 "util/configparser.c"
+#line 6352 "util/configparser.c"
     break;
 
   case 594:
-#line 3111 "./util/configparser.y"
-        {
+#line 3112 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6453 "util/configparser.c"
+#line 6364 "util/configparser.c"
     break;
 
   case 595:
-#line 3121 "./util/configparser.y"
-        {
+#line 3122 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6465 "util/configparser.c"
+#line 6376 "util/configparser.c"
     break;
 
   case 596:
-#line 3130 "./util/configparser.y"
-        {
+#line 3131 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6475 "util/configparser.c"
+#line 6386 "util/configparser.c"
     break;
 
   case 597:
-#line 3137 "./util/configparser.y"
-        {
+#line 3138 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			log_warn("dnscrypt-provider-cert %s is a duplicate", (yyvsp[0].str));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6487 "util/configparser.c"
+#line 6398 "util/configparser.c"
     break;
 
   case 598:
-#line 3146 "./util/configparser.y"
-        {
+#line 3147 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6497 "util/configparser.c"
+#line 6408 "util/configparser.c"
     break;
 
   case 599:
-#line 3153 "./util/configparser.y"
-        {
+#line 3154 "./util/configparser.y"
+    {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			log_warn("dnscrypt-secret-key: %s is a duplicate", (yyvsp[0].str));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6509 "util/configparser.c"
+#line 6420 "util/configparser.c"
     break;
 
   case 600:
-#line 3162 "./util/configparser.y"
-  {
+#line 3163 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6520 "util/configparser.c"
+#line 6431 "util/configparser.c"
     break;
 
   case 601:
-#line 3170 "./util/configparser.y"
-  {
+#line 3171 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -6532,23 +6443,23 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6536 "util/configparser.c"
+#line 6447 "util/configparser.c"
     break;
 
   case 602:
-#line 3183 "./util/configparser.y"
-  {
+#line 3184 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6547 "util/configparser.c"
+#line 6458 "util/configparser.c"
     break;
 
   case 603:
-#line 3191 "./util/configparser.y"
-  {
+#line 3192 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -6559,20 +6470,20 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6563 "util/configparser.c"
+#line 6474 "util/configparser.c"
     break;
 
   case 604:
-#line 3204 "./util/configparser.y"
-        {
+#line 3205 "./util/configparser.y"
+    {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6571 "util/configparser.c"
+#line 6482 "util/configparser.c"
     break;
 
   case 613:
-#line 3215 "./util/configparser.y"
-        {
+#line 3216 "./util/configparser.y"
+    {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_backend);
@@ -6582,12 +6493,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6586 "util/configparser.c"
+#line 6497 "util/configparser.c"
     break;
 
   case 614:
-#line 3227 "./util/configparser.y"
-        {
+#line 3228 "./util/configparser.y"
+    {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_secret);
@@ -6597,12 +6508,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6601 "util/configparser.c"
+#line 6512 "util/configparser.c"
     break;
 
   case 615:
-#line 3239 "./util/configparser.y"
-        {
+#line 3240 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->redis_server_host);
@@ -6612,12 +6523,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6616 "util/configparser.c"
+#line 6527 "util/configparser.c"
     break;
 
   case 616:
-#line 3251 "./util/configparser.y"
-        {
+#line 3252 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
 		OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str)));
@@ -6630,12 +6541,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6634 "util/configparser.c"
+#line 6545 "util/configparser.c"
     break;
 
   case 617:
-#line 3266 "./util/configparser.y"
-        {
+#line 3267 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6646,12 +6557,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6650 "util/configparser.c"
+#line 6561 "util/configparser.c"
     break;
 
   case 618:
-#line 3279 "./util/configparser.y"
-        {
+#line 3280 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6662,12 +6573,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6666 "util/configparser.c"
+#line 6577 "util/configparser.c"
     break;
 
   case 619:
-#line 3292 "./util/configparser.y"
-        {
+#line 3293 "./util/configparser.y"
+    {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
 			yyerror("positive number expected");
@@ -6676,20 +6587,20 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6680 "util/configparser.c"
+#line 6591 "util/configparser.c"
     break;
 
   case 620:
-#line 3303 "./util/configparser.y"
-                {
+#line 3304 "./util/configparser.y"
+    {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6688 "util/configparser.c"
+#line 6599 "util/configparser.c"
     break;
 
   case 625:
-#line 3312 "./util/configparser.y"
-                {
+#line 3313 "./util/configparser.y"
+    {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v4)
@@ -6702,12 +6613,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6706 "util/configparser.c"
+#line 6617 "util/configparser.c"
     break;
 
   case 626:
-#line 3327 "./util/configparser.y"
-        {
+#line 3328 "./util/configparser.y"
+    {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v6)
@@ -6720,11 +6631,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6724 "util/configparser.c"
+#line 6635 "util/configparser.c"
     break;
 
 
-#line 6728 "util/configparser.c"
+#line 6639 "util/configparser.c"
 
       default: break;
     }
@@ -6788,7 +6699,7 @@ yyerrlab:
           {
             if (yymsg != yymsgbuf)
               YYSTACK_FREE (yymsg);
-            yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
             if (!yymsg)
               {
                 yymsg = yymsgbuf;
@@ -6943,7 +6854,7 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[+*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -6956,7 +6867,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3341 "./util/configparser.y"
+#line 3342 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 3a5ea579d..627d4cbf9 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5.1.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/util/configparser.y b/util/configparser.y
index 43a886f24..675645fbd 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -982,6 +982,7 @@ server_https_port: VAR_HTTPS_PORT STRING_ARG
 		if(atoi($2) == 0)
 			yyerror("port number expected");
 		else cfg_parser->cfg->https_port = atoi($2);
+		free($2);
 	};
 server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG
 	{

From a3e2bfbb0cdcc264ed139233f391cca55ad1b526 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 10:24:03 +0200
Subject: [PATCH 098/108] - Fix #330: [Feature request] Add unencrypted DNS
 over HTTPS support.   This adds the option http-notls-downstream: yesno to
 change that,   and the dohclient test code has the -n option.

---
 daemon/worker.c           |    4 +-
 doc/Changelog             |    3 +
 doc/example.conf.in       |    3 +
 doc/unbound.conf.5.in     |    4 +
 services/listen_dnsport.c |   17 +-
 services/listen_dnsport.h |    6 +-
 testcode/dohclient.c      |  136 +-
 testcode/fake_event.c     |    1 +
 util/config_file.c        |    2 +
 util/config_file.h        |    2 +
 util/configlexer.c        | 4446 +++++++++++++++++++------------------
 util/configlexer.lex      |    1 +
 util/configparser.c       | 3354 ++++++++++++++--------------
 util/configparser.h       |  612 ++---
 util/configparser.y       |   12 +-
 util/netevent.c           |  192 +-
 16 files changed, 4488 insertions(+), 4307 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 5ad8ce4e4..458afa04e 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1789,8 +1789,8 @@ worker_init(struct worker* worker, struct config_file *cfg,
 			? cfg->tcp_keepalive_timeout
 			: cfg->tcp_idle_timeout,
 		cfg->harden_large_queries, cfg->http_max_streams,
-		cfg->http_endpoint, worker->daemon->tcl,
-		worker->daemon->listen_sslctx,
+		cfg->http_endpoint, cfg->http_notls_downstream,
+		worker->daemon->tcl, worker->daemon->listen_sslctx,
 		dtenv, worker_handle_request, worker);
 	if(!worker->front) {
 		log_err("could not create listening sockets");
diff --git a/doc/Changelog b/doc/Changelog
index 49dab107c..24d544c7a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,9 @@
 	  http-endpoint, http-max-streams, http-query-buffer-size,
 	  http-response-buffer-size, and http-nodelay.
 	- Fix memory leak of https port string when reading config.
+	- Fix #330: [Feature request] Add unencrypted DNS over HTTPS support.
+	  This adds the option http-notls-downstream: yesno to change that,
+	  and the dohclient test code has the -n option.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 852cccaed..b6f311c7f 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -788,6 +788,9 @@ server:
 	# service.
 	# http-nodelay: yes
 
+	# Disable TLS for DNS-over-HTTP downstream service.
+	# http-notls-downstream: no
+
 	# DNS64 prefix. Must be specified when DNS64 is use.
 	# Enable dns64 in module-config.  Used to synthesize IPv6 from IPv4.
 	# dns64-prefix: 64:ff9b::0/96
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 95c4aaa99..c2e389c6e 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -587,6 +587,10 @@ megabytes or gigabytes (1024*1024 bytes in a megabyte).
 Set TCP_NODELAY socket option on sockets used to provide DNS-over-HTTPS service.
 Ignored if the option is not available. Default is yes.
 .TP
+.B http\-notls\-downstream: \fI<yes or no>
+Disable use of TLS for the downstream DNS-over-HTTP connections.  Useful for
+local back end servers.  Default is no.
+.TP
 .B use\-systemd: \fI<yes or no>
 Enable or disable systemd socket activation.
 Default is no.
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index ad73fad01..d4f912db5 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1244,8 +1244,9 @@ struct listen_dnsport*
 listen_create(struct comm_base* base, struct listen_port* ports,
 	size_t bufsize, int tcp_accept_count, int tcp_idle_timeout,
 	int harden_large_queries, uint32_t http_max_streams,
-	char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx,
-	struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg)
+	char* http_endpoint, int http_notls, struct tcl_list* tcp_conn_limit,
+	void* sslctx, struct dt_env* dtenv, comm_point_callback_type* cb,
+	void *cb_arg)
 {
 	struct listen_dnsport* front = (struct listen_dnsport*)
 		malloc(sizeof(struct listen_dnsport));
@@ -1295,15 +1296,19 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 				http_max_streams, http_endpoint,
 				tcp_conn_limit, bufsize, front->udp_buff,
 				ports->ftype, cb, cb_arg);
-			cp->ssl = sslctx;
+			if(http_notls && ports->ftype == listen_type_http)
+				cp->ssl = NULL;
+			else
+				cp->ssl = sslctx;
 			if(ports->ftype == listen_type_http) {
-				if(!sslctx) {
-				log_warn("HTTPS port configured, but no TLS "
+				if(!sslctx && !http_notls) {
+				  log_warn("HTTPS port configured, but no TLS "
 					"tls-service-key or tls-service-pem "
 					"set");
 				}
 #ifndef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-				log_warn("Unbound is not compiled with an "
+				if(!http_notls)
+				  log_warn("Unbound is not compiled with an "
 					"OpenSSL version supporting ALPN "
 					" (OpenSSL >= 1.0.2). This is required "
 					"to use DNS-over-HTTPS");
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index 4bbde0691..9d6ea2c33 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -159,6 +159,7 @@ int resolve_interface_names(struct config_file* cfg, char*** resif,
  * @param harden_large_queries: whether query size should be limited.
  * @param http_max_streams: maximum number of HTTP/2 streams per connection.
  * @param http_endpoint: HTTP endpoint to service queries on
+ * @param http_notls: no TLS for http downstream
  * @param tcp_conn_limit: TCP connection limit info.
  * @param sslctx: nonNULL if ssl context.
  * @param dtenv: nonNULL if dnstap enabled.
@@ -171,8 +172,9 @@ struct listen_dnsport*
 listen_create(struct comm_base* base, struct listen_port* ports,
 	size_t bufsize, int tcp_accept_count, int tcp_idle_timeout,
 	int harden_large_queries, uint32_t http_max_streams,
-	char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx,
-	struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg);
+	char* http_endpoint, int http_notls, struct tcl_list* tcp_conn_limit,
+	void* sslctx, struct dt_env* dtenv, comm_point_callback_type* cb,
+	void *cb_arg);
 
 /**
  * delete the listening structure
diff --git a/testcode/dohclient.c b/testcode/dohclient.c
index adcc7d831..263418049 100644
--- a/testcode/dohclient.c
+++ b/testcode/dohclient.c
@@ -90,6 +90,7 @@ static void usage(char* argv[])
 	printf("-e		HTTP endpoint, default: /dns-query\n");
 	printf("-c		Content-type in request, default: "
 		"application/dns-message\n");
+	printf("-n		no-tls, TLS is disabled\n");
 	printf("-h 		This help text\n");
 	exit(1);
 }
@@ -185,7 +186,10 @@ submit_query(struct http2_session* h2_session, struct sldns_buffer* buf)
 	headers[1].name = (uint8_t*)":path";
 	headers[1].value = (uint8_t*)h2_stream->path;
 	headers[2].name = (uint8_t*)":scheme";
-	headers[2].value = (uint8_t*)"https";
+	if(h2_session->ssl)
+		headers[2].value = (uint8_t*)"https";
+	else
+		headers[2].value = (uint8_t*)"http";
 	headers[3].name = (uint8_t*)":authority";
 	headers[3].value = (uint8_t*)h2_session->authority;
 	headers[4].name = (uint8_t*)"content-type";
@@ -246,6 +250,7 @@ static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 {
 	struct http2_session* h2_session = (struct http2_session*)cb_arg;
 	int r;
+	ssize_t ret;
 	struct timeval tv, *waittv;
 	fd_set rfd;
 	ERR_clear_error();
@@ -267,35 +272,58 @@ static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session),
 		return NGHTTP2_ERR_WOULDBLOCK;
 	}
 
-	r = SSL_read(h2_session->ssl, buf, len);
-	if(r <= 0) {
-		int want = SSL_get_error(h2_session->ssl, r);
-		if(want == SSL_ERROR_ZERO_RETURN) {
+	if(h2_session->ssl) {
+		r = SSL_read(h2_session->ssl, buf, len);
+		if(r <= 0) {
+			int want = SSL_get_error(h2_session->ssl, r);
+			if(want == SSL_ERROR_ZERO_RETURN) {
+				return NGHTTP2_ERR_EOF;
+			}
+			log_crypto_err("could not SSL_read");
 			return NGHTTP2_ERR_EOF;
 		}
-		log_crypto_err("could not SSL_read");
+		return r;
+	}
+
+	ret = read(h2_session->fd, buf, len);
+	if(ret == 0) {
+		return NGHTTP2_ERR_EOF;
+	} else if(ret < 0) {
+		log_err("could not http2 read: %s", strerror(errno));
 		return NGHTTP2_ERR_EOF;
 	}
-	return r;
+	return ret;
 }
 
 static ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session),
 	const uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg)
 {
 	struct http2_session* h2_session = (struct http2_session*)cb_arg;
+	ssize_t ret;
 
-	int r;
-	ERR_clear_error();
-	r = SSL_write(h2_session->ssl, buf, len);
-	if(r <= 0) {
-		int want = SSL_get_error(h2_session->ssl, r);
-		if(want == SSL_ERROR_ZERO_RETURN) {
+	if(h2_session->ssl) {
+		int r;
+		ERR_clear_error();
+		r = SSL_write(h2_session->ssl, buf, len);
+		if(r <= 0) {
+			int want = SSL_get_error(h2_session->ssl, r);
+			if(want == SSL_ERROR_ZERO_RETURN) {
+				return NGHTTP2_ERR_CALLBACK_FAILURE;
+			}
+			log_crypto_err("could not SSL_write");
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 		}
-		log_crypto_err("could not SSL_write");
+		return r;
+	}
+
+	ret = write(h2_session->fd, buf, len);
+	if(ret == 0) {
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	} else if(ret < 0) {
+		log_err("could not http2 write: %s", strerror(errno));
 		return NGHTTP2_ERR_CALLBACK_FAILURE;
 	}
-	return r;
+	return ret;
 }
 
 static int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session),
@@ -459,7 +487,7 @@ http2_read(struct http2_session* h2_session)
 }
 
 static void
-run(struct http2_session* h2_session, int port, int count, char** q)
+run(struct http2_session* h2_session, int port, int no_tls, int count, char** q)
 {
 	int i;
 	SSL_CTX* ctx = NULL;
@@ -470,26 +498,28 @@ run(struct http2_session* h2_session, int port, int count, char** q)
 	fd = open_svr(h2_session->authority, port);
 	h2_session->fd = fd;
 
-	ctx = connect_sslctx_create(NULL, NULL, NULL, 0);
-	if(!ctx) fatal_exit("cannot create ssl ctx");
-	SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3);
-	ssl = outgoing_ssl_fd(ctx, fd);
-	if(!ssl) {
-		printf("cannot create ssl\n");
-		exit(1);
-	}
-	h2_session->ssl = ssl;
-	while(1) {
-		int r;
-		ERR_clear_error();
-		if( (r=SSL_do_handshake(ssl)) == 1)
-			break;
-		r = SSL_get_error(ssl, r);
-		if(r != SSL_ERROR_WANT_READ &&
-			r != SSL_ERROR_WANT_WRITE) {
-			log_crypto_err("could not ssl_handshake");
+	if(!no_tls) {
+		ctx = connect_sslctx_create(NULL, NULL, NULL, 0);
+		if(!ctx) fatal_exit("cannot create ssl ctx");
+		SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3);
+		ssl = outgoing_ssl_fd(ctx, fd);
+		if(!ssl) {
+			printf("cannot create ssl\n");
 			exit(1);
 		}
+		h2_session->ssl = ssl;
+		while(1) {
+			int r;
+			ERR_clear_error();
+			if( (r=SSL_do_handshake(ssl)) == 1)
+				break;
+			r = SSL_get_error(ssl, r);
+			if(r != SSL_ERROR_WANT_READ &&
+				r != SSL_ERROR_WANT_WRITE) {
+				log_crypto_err("could not ssl_handshake");
+				exit(1);
+			}
+		}
 	}
 
 	http2_submit_setting(h2_session);
@@ -511,9 +541,13 @@ run(struct http2_session* h2_session, int port, int count, char** q)
 
 	/* shutdown */
 	http2_session_delete(h2_session);
-	SSL_shutdown(ssl);
-	SSL_free(ssl);
-	SSL_CTX_free(ctx);
+	if(ssl) {
+		SSL_shutdown(ssl);
+		SSL_free(ssl);
+	}
+	if(ctx) {
+		SSL_CTX_free(ctx);
+	}
 	close(fd);
 }
 
@@ -524,10 +558,21 @@ extern char* optarg;
 int main(int argc, char** argv)
 {
 	int c;
-	int port = UNBOUND_DNS_OVER_HTTPS_PORT;
-	struct http2_session* h2_session = http2_session_create();
-	if(!h2_session) fatal_exit("out of memory");
+	int port = UNBOUND_DNS_OVER_HTTPS_PORT, no_tls = 0;
+	struct http2_session* h2_session;
 
+#ifdef USE_WINSOCK
+	WSADATA wsa_data;
+	if(WSAStartup(MAKEWORD(2,2), &wsa_data) != 0) {
+		printf("WSAStartup failed\n");
+		return 1;
+	}
+#endif
+	log_init(0, 0, 0);
+	checklock_start();
+
+	h2_session = http2_session_create();
+	if(!h2_session) fatal_exit("out of memory");
 	if(argc == 1) {
 		usage(argv);
 	}
@@ -537,7 +582,7 @@ int main(int argc, char** argv)
 	h2_session->endpoint = "/dns-query";
 	h2_session->content_type = "application/dns-message";
 
-	while((c=getopt(argc, argv, "c:e:hs:p:P")) != -1) {
+	while((c=getopt(argc, argv, "c:e:hns:p:P")) != -1) {
 		switch(c) {
 			case 'c':
 				h2_session->content_type = optarg;
@@ -545,6 +590,9 @@ int main(int argc, char** argv)
 			case 'e':
 				h2_session->endpoint = optarg;
 				break;
+			case 'n':
+				no_tls = 1;
+				break;
 			case 'p':
 				if(atoi(optarg)==0 && strcmp(optarg,"0")!=0) {
 					printf("error parsing port, "
@@ -573,8 +621,12 @@ int main(int argc, char** argv)
 	}
 
 
-	run(h2_session, port, argc, argv);
+	run(h2_session, port, no_tls, argc, argv);
 
+	checklock_stop();
+#ifdef USE_WINSOCK
+	WSACleanup();
+#endif
 	return 0;
 }
 #else
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index d8df76492..e8fc84746 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -872,6 +872,7 @@ listen_create(struct comm_base* base, struct listen_port* ATTR_UNUSED(ports),
 	int ATTR_UNUSED(harden_large_queries),
 	uint32_t ATTR_UNUSED(http_max_streams),
 	char* ATTR_UNUSED(http_endpoint),
+	int ATTR_UNUSED(http_notls),
 	struct tcl_list* ATTR_UNUSED(tcp_conn_limit),
 	void* ATTR_UNUSED(sslctx), struct dt_env* ATTR_UNUSED(dtenv),
 	comm_point_callback_type* cb, void *cb_arg)
diff --git a/util/config_file.c b/util/config_file.c
index 25cba18b7..79774b5ac 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -527,6 +527,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size)
 	else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size)
 	else S_YNO("http-nodelay:", http_nodelay)
+	else S_YNO("http-notls-downstream:", http_notls_downstream)
 	else S_YNO("interface-automatic:", if_automatic)
 	else S_YNO("use-systemd:", use_systemd)
 	else S_YNO("do-daemonize:", do_daemonize)
@@ -990,6 +991,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_MEM(opt, "http-query-buffer-size", http_query_buffer_size)
 	else O_MEM(opt, "http-response-buffer-size", http_response_buffer_size)
 	else O_YNO(opt, "http-nodelay", http_nodelay)
+	else O_YNO(opt, "http-notls-downstream", http_notls_downstream)
 	else O_YNO(opt, "use-systemd", use_systemd)
 	else O_YNO(opt, "do-daemonize", do_daemonize)
 	else O_STR(opt, "chroot", chrootdir)
diff --git a/util/config_file.h b/util/config_file.h
index 7750eaa0e..543484aed 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -143,6 +143,8 @@ struct config_file {
 	size_t http_response_buffer_size;
 	/** set TCP_NODELAY option for http sockets */
 	int http_nodelay;
+	/** Disable TLS for http sockets downstream */
+	int http_notls_downstream;
 
 	/** outgoing port range number of ports (per thread) */
 	int outgoing_num_ports;
diff --git a/util/configlexer.c b/util/configlexer.c
index a00f50b74..fac0a1bf8 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1,7 +1,7 @@
 #include "config.h"
 #include "util/configyyrename.h"
 
-#line 3 "<stdout>"
+#line 2 "<stdout>"
 
 #define  YY_INT_ALIGNED short int
 
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 334
-#define YY_END_OF_BUFFER 335
+#define YY_NUM_RULES 335
+#define YY_END_OF_BUFFER 336
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,366 +363,367 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3253] =
+static const flex_int16_t yy_accept[3268] =
     {   0,
-        1,    1,  308,  308,  312,  312,  316,  316,  320,  320,
-        1,    1,  324,  324,  328,  328,  335,  332,    1,  306,
-      306,  333,    2,  333,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  308,  309,  309,  310,
-      333,  312,  313,  313,  314,  333,  319,  316,  317,  317,
-      318,  333,  320,  321,  321,  322,  333,  331,  307,    2,
-      311,  333,  331,  327,  324,  325,  325,  326,  333,  328,
-      329,  329,  330,  333,  332,    0,    1,    2,    2,    2,
-        2,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+        1,    1,  309,  309,  313,  313,  317,  317,  321,  321,
+        1,    1,  325,  325,  329,  329,  336,  333,    1,  307,
+      307,  334,    2,  334,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  309,  310,  310,  311,
+      334,  313,  314,  314,  315,  334,  320,  317,  318,  318,
+      319,  334,  321,  322,  322,  323,  334,  332,  308,    2,
+      312,  334,  332,  328,  325,  326,  326,  327,  334,  329,
+      330,  330,  331,  334,  333,    0,    1,    2,    2,    2,
+        2,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  308,    0,  312,
-        0,  319,    0,  316,  320,    0,  331,    0,    2,    2,
-      331,  327,    0,  324,  328,    0,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  309,    0,  313,
+        0,  320,    0,  317,  321,    0,  332,    0,    2,    2,
+      332,  328,    0,  325,  329,    0,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  331,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  332,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  122,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  131,  332,  332,  332,  332,  332,  332,
-      332,  331,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  123,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  132,  333,  333,  333,  333,  333,  333,
+      333,  332,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      106,  332,  332,  332,  332,  332,  332,    8,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  123,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      107,  333,  333,  333,  333,  333,  333,    8,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  124,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  136,  332,  331,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  299,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  137,  333,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  300,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  331,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  332,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,   63,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  235,  332,   14,
-       15,  332,   19,   18,  332,  332,  219,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  129,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,   64,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  236,  333,   14,
+       15,  333,   19,   18,  333,  333,  220,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  130,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  217,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,    3,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  331,  332,  332,  332,  332,  332,  332,  332,
-      293,  332,  332,  292,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  218,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,    3,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  332,  333,  333,  333,  333,  333,  333,  333,
+      294,  333,  333,  293,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      315,  332,  332,  332,  332,  332,  332,  332,   62,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,   66,  332,  266,  332,  332,
-      332,  332,  332,  332,  332,  332,  300,  301,  332,  332,
-      332,  332,  332,   67,  332,  332,  130,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  316,  333,  333,  333,  333,  333,  333,  333,   63,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,   67,  333,  267,  333,
+      333,  333,  333,  333,  333,  333,  333,  301,  302,  333,
+      333,  333,  333,  333,   68,  333,  333,  131,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  126,  332,  332,  332,  332,  332,  332,  332,  332,
-      206,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,   21,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      155,  332,  332,  331,  315,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  104,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  127,  333,  333,  333,  333,  333,  333,  333,
+      333,  207,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,   21,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  156,  333,  333,  332,  316,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  105,  333,  333,
 
-      332,  332,  332,  332,  274,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  178,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  154,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  103,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  275,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  179,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  155,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  104,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,   32,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,   33,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,   64,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  128,  331,  332,  332,
-      332,  332,  332,  121,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,   65,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,   32,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,   33,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,   65,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  129,  332,
+      333,  333,  333,  333,  333,  122,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,   66,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  239,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  179,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,   53,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  240,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  180,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,   54,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  257,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,   57,  332,   58,  332,  332,  332,  332,  332,
-      107,  332,  108,  332,  332,  332,  332,  105,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,    7,  332,  331,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  228,  332,  332,
-      332,  332,  157,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  258,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,   58,  333,   59,  333,  333,
+      333,  333,  333,  108,  333,  109,  333,  333,  333,  333,
+      106,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,    7,
+      333,  332,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      229,  333,  333,  333,  333,  158,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  240,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,   45,  332,  332,  332,  332,
-      332,  332,  332,  332,   54,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  198,
-      332,  197,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,   16,   17,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  241,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,   45,
+      333,  333,  333,  333,  333,  333,  333,  333,   55,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  199,  333,  198,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,   68,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  205,  332,  332,  332,  332,
-      332,  332,  110,  332,  109,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  189,  332,  332,  332,
-      332,  332,  332,  332,  332,  137,  331,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,   98,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,   87,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,   16,   17,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,   69,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  206,
+      333,  333,  333,  333,  333,  333,  111,  333,  110,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      190,  333,  333,  333,  333,  333,  333,  333,  333,  138,
+      332,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,   99,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,   88,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  218,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,   91,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,   61,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  192,  193,  332,  332,  332,  268,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,    6,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  219,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,   92,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,   62,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  193,  194,  333,  333,
+      333,  269,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,    6,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  272,  332,  332,  332,  332,  332,  332,  294,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,   42,
-      332,  332,  332,  332,   44,  332,  332,  332,  332,  332,
-      332,  332,  332,   51,  332,  332,  332,  332,  332,  332,
-      332,  331,  332,  185,  332,  332,  332,  132,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  210,  332,
-      186,  332,  332,  332,  225,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  273,  333,  333,  333,
+      333,  333,  333,  295,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,   42,  333,  333,  333,  333,   44,
+      333,  333,  333,  333,  333,  333,  333,  333,   52,  333,
+      333,  333,  333,  333,  333,  333,  332,  333,  186,  333,
+      333,  333,  133,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  211,  333,  187,  333,  333,  333,  226,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,   52,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  134,  115,  332,  116,
-      332,  332,  332,  114,  332,  332,  332,  332,  332,  332,
-      332,  332,  152,  332,  332,   50,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      256,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      187,  332,  332,  332,  332,  332,  190,  332,  196,  332,
-      332,  332,  332,  332,  224,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  102,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+       53,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  135,  116,  333,  117,  333,  333,  333,  115,  333,
+      333,  333,  333,  333,  333,  333,  333,  153,  333,  333,
+       50,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  257,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  188,  333,  333,  333,
+      333,  333,  191,  333,  197,  333,  333,  333,  333,  333,
+      225,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  103,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  127,  332,
-      332,  332,  332,  332,  332,   59,  332,  332,  332,   26,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,   20,
-      332,  332,  332,  332,  332,  332,   27,   36,  332,  162,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  331,  332,  332,  332,  332,  332,  332,
-       76,   78,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  276,  332,  332,  332,  332,
-      236,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  128,  333,  333,  333,  333,  333,
+      333,   60,  333,  333,  333,   26,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,   20,  333,  333,  333,  333,
+      333,  333,   27,   36,  333,  163,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  332,
+      333,  333,  333,  333,  333,  333,   77,   79,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  277,  333,  333,  333,  333,  237,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  117,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  151,  332,   46,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  287,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  156,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  216,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  297,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      173,  332,  332,  332,  332,  332,  332,  332,  332,  111,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  118,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  152,
+      333,   46,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  288,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  157,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  217,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  298,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  174,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  168,
-      332,  180,  332,  332,  332,  332,  331,  332,  140,  332,
-      332,  332,  332,  332,   97,  332,  332,  332,  332,  208,
-      332,  332,  332,  332,  332,  332,  226,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  248,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  133,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  172,  332,
-      332,  332,  332,  332,  332,   79,   80,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  112,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  169,  333,  181,  333,
+      333,  333,  333,  332,  333,  141,  333,  333,  333,  333,
+      333,   98,  333,  333,  333,  333,  209,  333,  333,  333,
+      333,  333,  333,  227,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      249,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  134,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  173,  333,  333,  333,
 
-      332,  332,   60,  290,  332,  332,  332,  332,  332,   86,
-      181,  332,  199,  332,  229,  332,  332,  191,  269,  332,
-      332,  332,  332,  332,   72,  332,  183,  332,  332,  332,
-      332,  332,    9,  332,  332,  332,  101,  332,  332,  332,
-      332,  261,  332,  332,  332,  332,  207,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  331,  332,  332,  332,  332,  171,  332,  332,
+      333,  333,  333,   80,   81,  333,  333,  333,  333,  333,
+       61,  291,  333,  333,  333,  333,  333,   87,  182,  333,
+      200,  333,  230,  333,  333,  192,  270,  333,  333,  333,
+      333,  333,   73,  333,  184,  333,  333,  333,  333,  333,
+        9,  333,  333,  333,  102,  333,  333,  333,  333,  262,
+      333,  333,  333,  333,  208,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  158,  332,
-      275,  332,  332,  332,  332,  332,  247,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  220,  332,
-      332,  304,  332,  332,  332,  267,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  291,  332,  182,  332,  332,  332,
-      332,  332,  332,  332,   71,   73,  332,  332,  332,  332,
-      332,  332,  332,  100,  332,  332,  332,  332,  259,  332,
-      332,  332,  332,  271,  332,  332,  332,  332,  332,  332,
+      332,  333,  333,  333,  333,  172,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  159,  333,  276,  333,
+      333,  333,  333,  333,  248,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  221,  333,  333,  305,
+      333,  333,  333,  268,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  292,  333,  183,  333,  333,  333,  333,
+      333,  333,  333,   72,   74,  333,  333,  333,  333,  333,
+      333,  333,  101,  333,  333,  333,  333,  260,  333,  333,
 
-      332,  332,  332,  332,  332,  212,   34,   28,   30,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,   35,  332,
-       29,   31,  332,  332,  332,  332,  332,  332,  332,  332,
-       96,  332,  332,  332,  332,  332,  332,  331,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  214,
-      211,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,   70,
-      332,  332,  332,  135,  332,  118,  332,  332,  332,  332,
-      332,  332,  332,  332,  153,   47,  332,  332,  323,   13,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  285,
+      333,  333,  272,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  213,   34,   28,   30,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,   35,  333,   29,
+       31,  333,  333,  333,  333,  333,  333,  333,  333,   97,
+      333,  333,  333,  333,  333,  333,  332,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  215,  212,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,   71,  333,
+      333,  333,  136,  333,  119,  333,  333,  333,  333,  333,
+      333,  333,  333,  154,   47,  333,  333,  333,  324,   13,
 
-      332,  288,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,   12,  332,  332,   22,  332,  332,  332,  265,
-      332,  332,  332,  332,  273,  332,  332,  332,   74,  332,
-      222,  332,  332,  332,  332,  213,  332,  332,   69,  332,
-      332,  332,  332,   23,  332,   43,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  167,  166,
-      323,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      215,  209,  332,  227,  332,  332,  277,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  286,
+      333,  289,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,   12,  333,  333,   22,  333,  333,  333,  266,
+      333,  333,  333,  333,  274,  333,  333,  333,   75,  333,
+      223,  333,  333,  333,  333,  214,  333,  333,   70,  333,
+      333,  333,  333,   23,  333,   43,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  168,  167,
+      324,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      216,  210,  333,  228,  333,  333,  278,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,   81,  332,
-      332,  332,  260,  332,  332,  332,  332,  195,  332,  332,
-      332,  332,  221,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  295,  296,  164,  332,  332,   75,  332,  332,
-      332,  332,  174,  332,  332,  112,  113,  332,  332,  332,
-      332,  159,  332,  161,  332,  200,  332,  332,  332,  332,
-      165,  332,  332,  230,  332,  332,  332,  332,  332,  332,
-      332,  142,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  238,  332,  332,  332,  332,  332,
-      332,  332,  332,   24,  332,  270,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,   82,
+      333,  333,  333,  261,  333,  333,  333,  333,  196,  333,
+      333,  333,  333,  222,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  296,  297,  165,  333,  333,   76,  333,
+      333,  333,  333,  175,  333,  333,  113,  114,  333,  333,
+      333,  333,  160,  333,  162,  333,  201,  333,  333,  333,
+      333,  166,  333,  333,  231,  333,  333,  333,  333,  333,
+      333,  333,  143,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  239,  333,  333,  333,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  201,
-      332,  332,  258,  332,  289,  332,  194,  332,  332,  332,
-      332,   55,  332,  332,  332,  332,    4,  332,  332,  332,
-      332,  125,  141,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  233,   37,   38,  332,  332,  332,  332,  332,  332,
-      332,  278,  332,  332,  332,  332,  332,  332,  332,  246,
-      332,  332,  332,  332,  332,  332,  332,  332,  204,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-       84,  332,   56,  264,  332,  234,  332,  332,  332,  332,
+      333,  333,  333,  333,   24,  333,  271,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  202,  333,  333,  259,  333,  290,  333,  195,  333,
+      333,  333,  333,   56,  333,  333,  333,  333,    4,  333,
+      333,  333,  333,  126,  142,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  234,   37,   38,  333,  333,  333,  333,
+      333,  333,  333,  279,  333,  333,  333,  333,  333,  333,
+      333,  247,  333,  333,  333,  333,  333,  333,  333,  333,
+      205,  333,  333,  333,  333,  333,  333,  333,  333,  333,
 
-       11,  332,  332,  332,  332,  332,  332,  124,  332,  332,
-      332,  332,  202,   88,  332,   40,  332,  332,  332,  332,
-      332,  332,  332,  332,  170,  332,  332,  332,  332,  332,
-      144,  332,  332,  332,  332,  237,  332,  332,  332,  332,
-      332,  245,  332,  332,  332,  332,  138,  332,  332,  332,
-      119,  120,  332,  332,  332,   90,   94,   89,  332,  332,
-      332,   82,  332,  332,  332,  332,  332,   10,  332,  332,
-      332,  262,  298,  332,  332,  332,  332,  303,   39,  332,
-      332,  332,  332,  332,  169,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,   85,  333,   57,  265,  333,  235,  333,
+      333,  333,  333,   11,  333,  333,  333,  333,  333,  333,
+      125,  333,  333,  333,  333,  203,   89,  333,   40,  333,
+      333,  333,  333,  333,  333,  333,  333,  171,  333,  333,
+      333,  333,  333,  145,  333,  333,  333,  333,  238,  333,
+      333,  333,  333,  333,  246,  333,  333,  333,  333,  139,
+      333,  333,  333,  120,  121,  333,  333,  333,   91,   95,
+       90,  333,  333,  333,  333,   83,  333,  333,  333,  333,
+      333,   10,  333,  333,  333,  263,  299,  333,  333,  333,
+      333,  304,   39,  333,  333,  333,  333,  333,  170,  333,
 
-      332,  332,  332,  332,  332,  332,  332,  332,   95,   93,
-      332,  332,  332,   83,  286,  332,  332,  332,  332,  332,
-      332,  332,  188,  332,  332,  332,  332,  332,  203,  332,
-      332,  332,  332,  332,  332,  332,  332,  160,   77,  332,
-      332,  332,  332,  332,  279,  332,  332,  332,  332,  332,
-      332,  332,  242,  332,  332,  241,  139,  305,  332,   92,
-       48,  332,  145,  146,  149,  150,  147,  148,   85,  332,
-      263,  332,  332,  332,  332,  163,  332,  332,  332,  332,
-      332,  232,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,   96,   94,  333,   51,  333,  333,   84,  287,
+      333,  333,  333,  333,  333,  333,  333,  189,  333,  333,
+      333,  333,  333,  204,  333,  333,  333,  333,  333,  333,
+      333,  333,  161,   78,  333,  333,  333,  333,  333,  280,
+      333,  333,  333,  333,  333,  333,  333,  243,  333,  333,
+      242,  140,  306,  333,   93,   48,  333,  146,  147,  150,
+      151,  148,  149,   86,  333,  264,  333,  333,  333,  333,
+      164,  333,  333,  333,  333,  333,  233,  333,  333,  333,
 
-      176,  175,   41,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,   99,  332,
-      231,  332,  255,  283,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,   49,    5,  332,  332,
-      223,  332,  332,  284,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  243,   25,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  244,  332,  332,
-      332,  143,  332,  332,  332,  332,  332,  332,  332,  332,
-      177,  332,  184,  332,  332,  332,  332,  332,  332,  332,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  177,  176,   41,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  100,  333,  232,  333,  256,  284,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,   49,    5,  333,  333,  224,  333,  333,  285,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  244,   25,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  245,  333,  333,  333,  144,  333,  333,  333,
 
-      332,  332,  280,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      302,  332,  332,  251,  332,  332,  332,  332,  332,  281,
-      332,  332,  332,  332,  332,  332,  282,  332,  332,  332,
-      249,  332,  252,  253,  332,  332,  332,  332,  332,  250,
-      254,    0
+      333,  333,  333,  333,  333,  178,  333,  185,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  281,  333,  333,
+      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+      333,  333,  333,  333,  333,  303,  333,  333,  252,  333,
+      333,  333,  333,  333,  282,  333,  333,  333,  333,  333,
+      333,  283,  333,  333,  333,  250,  333,  253,  254,  333,
+      333,  333,  333,  333,  251,  255,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -765,17 +766,17 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3271] =
+static const flex_int16_t yy_base[3286] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 3165, 3121,   81, 6365,
-     6365, 6365,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 3868, 3794,   81, 6384,
+     6384, 6384,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  184,  145,
-      185,  205,  194,  204,  178,  123, 3093, 6365, 6365, 6365,
-      107, 2724, 6365, 6365, 6365,  154, 2535, 2515, 6365, 6365,
-     6365,  226, 2454, 6365, 6365, 6365,  163, 2353, 6365,  238,
-     6365,  242,  148, 2067, 1986, 6365, 6365, 6365,  246, 1743,
-     6365, 6365, 6365,  250, 1651,  254,  219,    0,  258,    0,
+      185,  205,  194,  204,  178,  123, 3568, 6384, 6384, 6384,
+      107, 3343, 6384, 6384, 6384,  154, 2940, 2739, 6384, 6384,
+     6384,  226, 2537, 6384, 6384, 6384,  163, 2356, 6384,  238,
+     6384,  242,  148, 2314, 2201, 6384, 6384, 6384,  246, 1728,
+     6384, 6384, 6384,  250, 1651,  254,  219,    0,  258,    0,
         0,  165,  250,  191,  215,  243,  252,  256,   92,  260,
 
       261,  262,  264,  265,  266,  273,  270,  277,  278,  281,
@@ -805,9 +806,9 @@ static const flex_int16_t yy_base[3271] =
       745,  743,  747,  749,  750,  766,  754,  739,  759,  767,
       758,  760,  768,  774,  793,  779,  781,  789,  790,  791,
       795,  797,  805,  807,  796,  809,  803,  810,  812,  813,
-      822,  818, 6365,  817,  820,  833,  826,  834,  835,  836,
+      822,  818, 6384,  817,  820,  833,  826,  834,  835,  836,
       841,  842,  823,  849,  847,  848,  852,  874,  856,  858,
-      854,  863,  866, 6365,  864,  868,  898,  870,  872,  892,
+      854,  863,  866, 6384,  864,  868,  898,  870,  872,  892,
       888,  884,  887,  889,  899,  896,  909,  902,  907,  911,
       922,  918,  919,  920,  921,  924,  930,  937,  932,  934,
 
@@ -817,21 +818,21 @@ static const flex_int16_t yy_base[3271] =
      1006, 1007, 1013, 1009, 1008, 1017, 1019, 1021, 1022, 1023,
      1024, 1035, 1030, 1031, 1033, 1037, 1038, 1039, 1041, 1044,
      1045, 1047, 1049, 1051, 1050, 1056, 1060, 1058, 1066, 1061,
-     6365, 1068, 1070, 1072, 1073, 1074, 1075, 6365, 1077, 1071,
+     6384, 1068, 1070, 1072, 1073, 1074, 1075, 6384, 1077, 1071,
      1076, 1078, 1090, 1093, 1104, 1081, 1085, 1100, 1103, 1101,
      1105, 1113, 1109, 1114, 1116, 1112, 1118, 1119, 1121, 1124,
-     1122, 1125, 1130, 1131, 1132, 1133, 1152, 6365, 1136, 1139,
+     1122, 1125, 1130, 1131, 1132, 1133, 1152, 6384, 1136, 1139,
 
      1144, 1138, 1143, 1145, 1164, 1150, 1162, 1161, 1170, 1181,
      1174, 1182, 1176, 1163, 1187, 1184, 1191, 1189, 1193, 1195,
-     1194, 1196, 1197, 1198, 1200, 1201, 1206, 6365, 1208, 1211,
+     1194, 1196, 1197, 1198, 1200, 1201, 1206, 6384, 1208, 1211,
      1220, 1221, 1222, 1223, 1224, 1225, 1137, 1226, 1228, 1227,
      1231, 1235, 1245, 1252, 1236, 1253, 1239, 1254, 1249, 1250,
      1256, 1259, 1258, 1260, 1270, 1266, 1272, 1281, 1284, 1283,
      1286, 1293, 1295, 1275, 1288, 1298, 1268, 1290, 1291, 1302,
      1292, 1303, 1304, 1306, 1313, 1308, 1311, 1314, 1316, 1317,
      1320, 1315, 1322, 1321, 1324, 1331, 1328, 1332, 1339, 1334,
-     1340, 1338, 1343, 1345, 1348, 1349, 1354, 6365, 1361, 1357,
+     1340, 1338, 1343, 1345, 1348, 1349, 1354, 6384, 1361, 1357,
 
      1362, 1360, 1367, 1368, 1370, 1358, 1373, 1376, 1377, 1379,
      1378, 1381, 1385, 1382, 1387, 1388, 1392, 1395, 1393, 1402,
@@ -845,653 +846,657 @@ static const flex_int16_t yy_base[3271] =
      1545, 1546, 1555, 1547, 1556, 1558, 1548, 1559, 1561, 1564,
 
      1571, 1566, 1572, 1575, 1576, 1578, 1577, 1580, 1581, 1588,
-     1589, 1593, 6365, 1585, 1601, 1583, 1596, 1597, 1599, 1605,
-     1612, 1607, 1610, 1608, 1611, 1613, 1637, 6365, 1614, 6365,
-     6365,  315, 6365, 6365, 1616, 1621, 6365, 1622, 1631, 1618,
+     1589, 1593, 6384, 1585, 1601, 1583, 1596, 1597, 1599, 1605,
+     1612, 1607, 1610, 1608, 1611, 1613, 1637, 6384, 1614, 6384,
+     6384,  315, 6384, 6384, 1616, 1621, 6384, 1622, 1631, 1618,
      1641, 1619, 1643, 1647, 1630, 1638, 1635, 1660, 1661, 1664,
      1632, 1666, 1667, 1650, 1672, 1670, 1677, 1678, 1681, 1682,
      1689, 1687, 1690, 1686, 1697, 1695, 1699, 1703, 1705, 1707,
-     1710, 1692, 1712, 1713, 1715, 1717, 1718, 1714, 1721, 1723,
-     1720, 1727, 1726, 1736, 1732, 1741, 1750, 6365, 1742, 1751,
-     1752, 1753, 1760, 1728, 1755, 1756, 1763, 1766, 1759, 1757,
+     1710, 1711, 1712, 1713, 1715, 1717, 1718, 1714, 1721, 1723,
+     1720, 1727, 1726, 1737, 1736, 1743, 1746, 6384, 1744, 1753,
+     1756, 1752, 1760, 1755, 1759, 1761, 1763, 1767, 1764, 1768,
 
-     1768, 1769, 1770, 1772, 1774, 1777, 1779, 1786, 1781, 6365,
-     1782, 1784, 1787, 1790, 1788, 1796, 1798, 1792, 1794, 1801,
-     1802, 1813, 1804, 1808, 1809, 1816, 1814, 1818, 6365, 1820,
-     1827, 1824, 1830, 1831, 1817, 1833, 1832, 1836, 1834, 1839,
-     1840, 1841, 1842, 1855, 1848, 1846, 1847, 1850, 1863, 1851,
-     1867, 1871, 1860, 1868, 1873, 1874, 1875, 1876, 1878, 1879,
-     1887, 1889, 1886, 1890, 1885, 1894, 1902, 1903, 1891, 1892,
-     1901, 1908, 1913, 1915, 1916, 1917, 1911, 1926, 1918, 1922,
-     1923, 1925, 1933, 1928, 1936, 1944, 1931, 1934, 1937, 1939,
-     6365, 1946, 1947, 6365, 1949, 1948, 1950, 1972, 1951, 1955,
+     1770, 1771, 1732, 1774, 1776, 1779, 1781, 1783, 1782, 6384,
+     1784, 1788, 1789, 1790, 1791, 1796, 1798, 1792, 1794, 1802,
+     1804, 1815, 1807, 1805, 1810, 1812, 1816, 1822, 6384, 1824,
+     1828, 1818, 1830, 1823, 1831, 1832, 1834, 1837, 1836, 1838,
+     1842, 1841, 1843, 1853, 1849, 1848, 1850, 1854, 1864, 1863,
+     1866, 1873, 1855, 1865, 1867, 1876, 1878, 1879, 1880, 1882,
+     1889, 1891, 1881, 1892, 1888, 1896, 1900, 1893, 1903, 1904,
+     1905, 1906, 1911, 1913, 1914, 1915, 1918, 1925, 1909, 1921,
+     1923, 1930, 1938, 1928, 1936, 1944, 1926, 1934, 1942, 1939,
+     6384, 1946, 1949, 6384, 1951, 1952, 1950, 1973, 1955, 1953,
 
-     1963, 1957, 1960, 1965, 1964, 1966, 1982, 1976, 1992, 1989,
-     1994, 1995, 1997, 2000, 1984, 2001, 2002, 2003, 2004, 2010,
-     1967, 2009, 2013, 2023, 2021, 2027, 2031, 2026, 2028, 2032,
-     2051, 2029, 2030, 2039, 2033, 2036, 2038, 2034, 2040, 2044,
-     2049, 2046, 2061, 2064, 2056, 2060, 2066, 2073, 2075, 2058,
-     6365, 2086, 2082, 2081, 2083, 2093, 2089, 2088, 6365, 2090,
-     2092, 2095, 2097, 2103, 2098, 2104, 2102, 2105, 2106, 2108,
-     2114, 2115, 2110, 2113, 2127, 6365, 2118, 6365, 2125, 2128,
-     2131, 2129, 2133, 2132, 2135, 2136, 6365, 6365, 2137, 2144,
-     2145, 2155, 2152, 6365, 2138, 2162, 6365, 2159, 2164, 2157,
+     1959, 1961, 1962, 1965, 1966, 1977, 1975, 1979, 1996, 1983,
+     1985, 1997, 1988, 2000, 1986, 2002, 2004, 2006, 2008, 2010,
+     2011, 2009, 2026, 2029, 1968, 2021, 2030, 2012, 2025, 2028,
+     2047, 2031, 2032, 2035, 2033, 2038, 2036, 2042, 2040, 2051,
+     2052, 2056, 2063, 2059, 2062, 2058, 2065, 2060, 2069, 2075,
+     2077, 6384, 2086, 2082, 2083, 2087, 2090, 2088, 2089, 6384,
+     2092, 2094, 2091, 2104, 2096, 2095, 2106, 2099, 2109, 2110,
+     2112, 2113, 2116, 2115, 2117, 2126, 6384, 2127, 6384, 2118,
+     2128, 2131, 2133, 2135, 2129, 2136, 2137, 6384, 6384, 2140,
+     2146, 2138, 2157, 2149, 6384, 2152, 2160, 6384, 2163, 2158,
 
-     2158, 2166, 2168, 2170, 2169, 2179, 2172, 2180, 2175, 2176,
-     2177, 6365, 2185, 2187, 2189, 2193, 2195, 2196, 2197, 2200,
-     6365, 2199, 2203, 2204, 2213, 2215, 2209, 2206, 2217, 2221,
-     2216, 2223, 2225, 2226, 2227, 2236, 2237, 2228, 2238, 2239,
-     2241, 6365, 2232, 2246, 2253, 2249, 2252, 2248, 2255, 2256,
-     2258, 2259, 2260, 2261, 2265, 2267, 2268, 2275, 2276, 2271,
-     2273, 2281, 2282, 2284, 2285, 2292, 2289, 2290, 2291, 2293,
-     6365, 2294, 2296, 2300,  171, 2302, 2304, 2303, 2306, 2305,
-     2309, 2312, 2323, 2327, 2322, 2324, 2326, 2325, 2331, 2333,
-     2334, 2335, 2336, 2337, 2341, 2340, 6365, 2343, 2346, 2348,
+     2156, 2165, 2166, 2169, 2171, 2173, 2178, 2174, 2181, 2176,
+     2190, 2179, 6384, 2177, 2183, 2192, 2196, 2186, 2198, 2200,
+     2199, 6384, 2206, 2207, 2208, 2215, 2217, 2210, 2213, 2218,
+     2224, 2220, 2222, 2226, 2227, 2229, 2234, 2239, 2232, 2235,
+     2243, 2250, 6384, 2236, 2245, 2253, 2251, 2258, 2252, 2255,
+     2249, 2259, 2260, 2266, 2262, 2268, 2270, 2271, 2280, 2281,
+     2272, 2279, 2277, 2283, 2285, 2288, 2293, 2291, 2292, 2294,
+     2295, 6384, 2296, 2298, 2303,  171, 2304, 2306, 2305, 2307,
+     2310, 2325, 2308, 2322, 2332, 2311, 2329, 2331, 2330, 2336,
+     2337, 2338, 2339, 2340, 2341, 2342, 2344, 6384, 2346, 2347,
 
-     2349, 2351, 2352, 2362, 6365, 2354, 2368, 2365, 2374, 2375,
-     2363, 2380, 2371, 2361, 2384, 2386, 2385, 2387, 2389, 2388,
-     2392, 2395, 6365, 2397, 2400, 2401, 2398, 2407, 2409, 2408,
-     2410, 2411, 2415, 2416, 2420, 2422, 2419, 2421, 2423, 2424,
-     2427, 2430, 2432, 2436, 2437, 2438, 2439, 2443, 2441, 2447,
-     2448, 6365, 2457, 2449, 2459, 2461, 2450, 2460, 2463, 2477,
-     2467, 2474, 2472, 2478, 2489, 2480, 2482, 2487, 2483, 2495,
-     2492, 2505, 2504, 2506, 2513, 2496, 2515, 2518, 2507, 2510,
-     2520, 2519, 2525, 2522, 2524, 2532, 2537, 2533, 2540, 2534,
-     2545, 2558, 2549, 6365, 2547, 2553, 2541, 2557, 2570, 2562,
+     2349, 2353, 2352, 2355, 2360, 6384, 2362, 2369, 2372, 2381,
+     2364, 2373, 2382, 2378, 2383, 2384, 2386, 2388, 2390, 2389,
+     2392, 2398, 2395, 6384, 2400, 2403, 2405, 2396, 2412, 2411,
+     2404, 2418, 2419, 2420, 2423, 2421, 2422, 2425, 2424, 2426,
+     2427, 2432, 2431, 2428, 2430, 2440, 2441, 2442, 2451, 2452,
+     2444, 2453, 2454, 6384, 2464, 2455, 2459, 2457, 2460, 2462,
+     2466, 2482, 2472, 2475, 2477, 2483, 2492, 2485, 2479, 2502,
+     2486, 2494, 2495, 2509, 2507, 2508, 2516, 2506, 2518, 2520,
+     2510, 2514, 2522, 2521, 2524, 2526, 2528, 2539, 2542, 2538,
+     2544, 2545, 2534, 2552, 2547, 6384, 2551, 2553, 2556, 2557,
 
-     2561, 2567, 2563, 2565, 2573, 2575, 2576, 2584, 2579, 2581,
-     2582, 2586, 2585, 2588, 2587, 2593, 2595, 2602, 2598, 2604,
-     2606, 6365, 2607, 2609, 2611, 2612, 2616, 2617, 2620, 2622,
-     2624, 2625, 2626, 2628, 2631, 2632, 2633, 2634, 2636, 2638,
-     2641, 6365, 2649, 2642, 2643, 2644, 2650, 2654, 2656, 2660,
-     2663, 2666, 2667, 2668, 2669, 2670, 6365, 2678, 2679, 2675,
-     2687, 2677, 2682, 2684, 2689, 2690, 6365, 2691, 2692, 2693,
-     2700, 2702, 2697, 6365, 2704, 2699, 2705, 2707, 2708, 2709,
-     2711, 2714, 2717, 2718, 2721, 2726, 2733, 2722, 2730, 6365,
-     2728, 2742, 2734, 2740, 2738, 2744, 2748, 2750, 2751, 2753,
+     2570, 2562, 2560, 2567, 2573, 2575, 2576, 2577, 2578, 2585,
+     2580, 2583, 2586, 2588, 2589, 2590, 2594, 2597, 2601, 2605,
+     2598, 2608, 2609, 6384, 2614, 2610, 2602, 2616, 2619, 2620,
+     2624, 2626, 2628, 2629, 2630, 2632, 2634, 2635, 2636, 2637,
+     2639, 2641, 2644, 6384, 2646, 2645, 2647, 2653, 2658, 2657,
+     2659, 2661, 2668, 2670, 2655, 2671, 2672, 2674, 6384, 2682,
+     2684, 2680, 2689, 2681, 2686, 2688, 2692, 2693, 6384, 2694,
+     2695, 2696, 2703, 2704, 2700, 6384, 2707, 2702, 2708, 2710,
+     2711, 2712, 2714, 2717, 2720, 2721, 2724, 2729, 2736, 2725,
+     2733, 6384, 2731, 2745, 2737, 2743, 2741, 2747, 2751, 2753,
 
-     2755, 2760, 6365, 2767, 2766, 2764, 2777, 2754, 2769, 2772,
-     2778, 2779, 2780, 2781, 2782, 2785, 6365, 2786, 2788, 2789,
-     2791, 2793, 2794, 2796, 2808, 2799, 2803, 2804, 2809, 2810,
-     2813, 2814, 2816, 2821, 2817, 2820, 2827, 2830, 2831, 2833,
-     2836, 2844, 2834, 2842, 2843, 2839, 2846, 2847, 2856, 2857,
-     2858, 2860, 6365, 2863, 2864, 2865, 2854, 2866, 2869, 2870,
-     2873, 2875, 2871, 2879, 2877, 2881, 2884, 2894, 2898, 2886,
-     2889, 2896, 2899, 2900, 2902, 2901, 2904, 2905, 2914, 2911,
-     2910, 2919, 2912, 2921, 2928, 2925, 2926, 2929, 2930, 2932,
-     2917, 2935, 2933, 2937, 2939, 2942, 2953, 2954, 2943, 2955,
+     2754, 2756, 2758, 2763, 6384, 2770, 2769, 2767, 2780, 2757,
+     2772, 2775, 2781, 2782, 2783, 2784, 2785, 2788, 6384, 2789,
+     2791, 2792, 2794, 2796, 2797, 2799, 2811, 2802, 2806, 2807,
+     2812, 2813, 2816, 2817, 2819, 2824, 2820, 2823, 2830, 2833,
+     2834, 2836, 2839, 2847, 2850, 2837, 2846, 2849, 2842, 2852,
+     2854, 2863, 2866, 2861, 2864, 6384, 2868, 2870, 2869, 2853,
+     2872, 2875, 2876, 2879, 2880, 2877, 2882, 2883, 2885, 2887,
+     2901, 2904, 2892, 2893, 2896, 2902, 2905, 2908, 2907, 2909,
+     2910, 2917, 2918, 2916, 2925, 2920, 2924, 2933, 2922, 2931,
+     2932, 2934, 2935, 2936, 2937, 2943, 2945, 2946, 2955, 2960,
 
-     2956, 2957, 2958, 6365, 2961, 2962, 2963, 2966, 2969, 2972,
-     2975, 2982, 2973, 2974, 2984, 2990, 2991, 2981, 2992, 2983,
-     2999, 2997, 6365, 2998, 6365, 3000, 3002, 3004, 3012, 3008,
-     6365, 3014, 6365, 3015, 3020, 3009, 3011, 6365, 3023, 3017,
-     3022, 3029, 3024, 3032, 3033, 3035, 3034, 3041, 3036, 3038,
-     3043, 3044, 3046, 3049, 3050, 3054, 3051, 3061, 3067, 3055,
-     3064, 3057, 3062, 3070, 3072, 3076, 6365, 3078, 3080, 3082,
-     3083, 3084, 3085, 3086, 3087, 3089, 3090, 3092, 3102, 3098,
-     3108, 3095, 3114, 3117, 3124, 3105, 3126, 6365, 3109, 3128,
-     3119, 3129, 6365, 3131, 3106, 3132, 3139, 3134, 3137, 3141,
+     2956, 2962, 2963, 2938, 2964, 2965, 6384, 2968, 2969, 2970,
+     2972, 2973, 2979, 2975, 2987, 2982, 2983, 2988, 2990, 2991,
+     2998, 2999, 3000, 3007, 3003, 6384, 3004, 6384, 3005, 3006,
+     3008, 3016, 3012, 6384, 3014, 6384, 3021, 3028, 3015, 3019,
+     6384, 3030, 3023, 3025, 3036, 3029, 3038, 3039, 3040, 3041,
+     3046, 3042, 3048, 3049, 3050, 3052, 3054, 3056, 3057, 3061,
+     3070, 3063, 3060, 3071, 3065, 3073, 3077, 3078, 3083, 6384,
+     3086, 3079, 3082, 3089, 3090, 3091, 3092, 3093, 3096, 3098,
+     3099, 3107, 3102, 3108, 3104, 3112, 3115, 3122, 3121, 3129,
+     6384, 3125, 3127, 3128, 3130, 6384, 3132, 3131, 3133, 3142,
 
-     3142, 3143, 3146, 3147, 3149, 3154, 3158, 3161, 3162, 6365,
-     3167, 3163, 3150, 3170, 3178, 3180, 3185, 3182, 3183, 3188,
-     3192, 3190, 3191, 3153, 3193, 3194, 3196, 3203, 3206, 3202,
-     3211, 3198, 3208, 3210, 3215, 3201, 3216, 3217, 3218, 3224,
-     3225, 3222, 3223, 3226, 3227, 6365, 3229, 3230, 3231, 3249,
-     3233, 3234, 3245, 3235, 6365, 3251, 3247, 3252, 3258, 3260,
-     3262, 3255, 3263, 3264, 3265, 3266, 3268, 3271, 3272, 6365,
-     3276, 6365, 3273, 3286, 3279, 3285, 3290, 3292, 3294, 3300,
-     3293, 3295, 3303, 3304, 3301, 3305, 3307, 3311, 3313, 3315,
-     3318, 3327, 3317, 3319, 3323, 3328, 3329, 3331, 6365, 6365,
+     3135, 3138, 3144, 3145, 3150, 3140, 3152, 3146, 3154, 3167,
+     3163, 3162, 6384, 3169, 3170, 3171, 3173, 3180, 3183, 3188,
+     3184, 3185, 3190, 3193, 3192, 3194, 3195, 3198, 3199, 3200,
+     3208, 3210, 3201, 3211, 3209, 3215, 3222, 3218, 3212, 3214,
+     3216, 3224, 3225, 3226, 3227, 3228, 3229, 3235, 3231, 6384,
+     3242, 3243, 3244, 3247, 3246, 3248, 3249, 3153, 6384, 3252,
+     3256, 3259, 3258, 3260, 3262, 3265, 3267, 3269, 3271, 3273,
+     3274, 3283, 3278, 6384, 3282, 6384, 3275, 3286, 3285, 3299,
+     3293, 3272, 3301, 3307, 3296, 3303, 3308, 3310, 3311, 3312,
+     3314, 3316, 3317, 3318, 3325, 3321, 3324, 3332, 3331, 3333,
 
-     3333, 3334, 3335, 3338, 3339, 3344, 3346, 3350, 3351, 3353,
-     3355, 3357, 3366, 6365, 3363, 3364, 3367, 3368, 3378, 3369,
-     3381, 3388, 3385, 3392, 3391, 6365, 3374, 3370, 3399, 3383,
-     3395, 3406, 6365, 3401, 6365, 3402, 3403, 3405, 3407, 3410,
-     3411, 3412, 3414, 3418, 3425, 3433, 3429, 3431, 3415, 3420,
-     3432, 3434, 3443, 3436, 3440, 3441, 6365, 3445, 3446, 3448,
-     3449, 3450, 3457, 3460, 3453, 6365, 3461, 3463, 3465, 3467,
-     3468, 3470, 3472, 3474, 3475, 3479, 3481, 6365, 3477, 3483,
-     3490, 3485, 3487, 3492, 3495, 3499, 3501, 6365, 3504, 3506,
-     3513, 3511, 3508, 3512, 3516, 3517, 3518, 3521, 3523, 3522,
+     3334, 3336, 6384, 6384, 3337, 3338, 3339, 3341, 3342, 3353,
+     3354, 3352, 3360, 3359, 3346, 3363, 3372, 6384, 3368, 3370,
+     3373, 3374, 3384, 3375, 3387, 3389, 3391, 3394, 3392, 6384,
+     3380, 3376, 3403, 3399, 3401, 3408, 6384, 3405, 6384, 3406,
+     3407, 3409, 3411, 3414, 3415, 3416, 3418, 3422, 3429, 3437,
+     3433, 3435, 3419, 3424, 3436, 3438, 3447, 3440, 3444, 3445,
+     6384, 3449, 3450, 3452, 3453, 3454, 3461, 3464, 3457, 6384,
+     3465, 3467, 3469, 3471, 3472, 3474, 3476, 3478, 3479, 3483,
+     3485, 6384, 3481, 3487, 3494, 3489, 3491, 3496, 3499, 3503,
+     3505, 6384, 3508, 3510, 3517, 3515, 3512, 3516, 3520, 3521,
 
-     3524, 3525, 3526, 3528, 3530, 3533, 3531, 3544, 3545, 3532,
-     3553, 3554, 3536, 6365, 3546, 3558, 3559, 3560, 3561, 3567,
-     3568, 3571, 3573, 3562, 3577, 3584, 3566, 3574, 3589, 3586,
-     3597, 3593, 6365, 3598, 3594, 3605, 3579, 3600, 3602, 3606,
-     3608, 3610, 3607, 3611, 3614, 3617, 3624, 3619, 3620, 3621,
-     3629, 3625, 6365, 3636, 3634, 3627, 3637, 3643, 3644, 3652,
-     3647, 3649, 3650, 3658, 3651, 3660, 3653, 3662, 3663, 3666,
-     3655, 6365, 6365, 3668, 3670, 3672, 6365, 3674, 3676, 3685,
-     3687, 3678, 3688, 3682, 3691, 3680, 3692, 3690, 3694, 6365,
-     3696, 3704, 3702, 3705, 3713, 3714, 3718, 3715, 3719, 3709,
+     3522, 3525, 3527, 3526, 3528, 3529, 3530, 3532, 3534, 3537,
+     3535, 3548, 3549, 3536, 3557, 3558, 3540, 6384, 3550, 3562,
+     3563, 3564, 3565, 3571, 3572, 3575, 3577, 3566, 3581, 3588,
+     3570, 3578, 3593, 3590, 3601, 3597, 6384, 3602, 3598, 3609,
+     3583, 3604, 3606, 3610, 3612, 3614, 3611, 3615, 3618, 3619,
+     3622, 3631, 3621, 3624, 3628, 3638, 3629, 6384, 3643, 3639,
+     3641, 3645, 3646, 3650, 3658, 3651, 3654, 3655, 3662, 3659,
+     3663, 3666, 3667, 3668, 3671, 3672, 6384, 6384, 3678, 3673,
+     3675, 6384, 3679, 3680, 3687, 3683, 3690, 3691, 3693, 3694,
+     3695, 3696, 3699, 3702, 6384, 3704, 3713, 3708, 3705, 3716,
 
-     3711, 3721, 3723, 3724, 3725, 3731, 3740, 3741, 3727, 3737,
-     3739, 6365, 3736, 3738, 3744, 3746, 3748, 3750, 6365, 3753,
-     3754, 3755, 3757, 3763, 3764, 3769, 3771, 3773, 3774, 3776,
-     3777, 3778, 3779, 3781, 3786, 3784, 3791, 3792, 3783, 6365,
-     3796, 3797, 3800, 3803, 6365, 3807, 3810, 3817, 3818, 3814,
-     3816, 3815, 3825, 6365, 3822, 3824, 3823, 3826, 3836, 3831,
-     3838, 3837, 3829, 6365, 3833, 3839, 3843, 6365, 3844, 3849,
-     3855, 3857, 3846, 3865, 3861, 3863, 3864, 3860, 6365, 3871,
-     6365, 3872, 3862, 3877, 6365, 3873, 3879, 3881, 3883, 3880,
-     3887, 3888, 3894, 3896, 3884, 3890, 3898, 3900, 3901, 3902,
+     3720, 3723, 3719, 3717, 3715, 3727, 3729, 3730, 3731, 3732,
+     3736, 3740, 3744, 3739, 3742, 3743, 6384, 3745, 3748, 3750,
+     3752, 3753, 3754, 6384, 3756, 3760, 3761, 3762, 3774, 3776,
+     3766, 3779, 3768, 3781, 3783, 3785, 3784, 3786, 3793, 3788,
+     3791, 3798, 3799, 3801, 6384, 3807, 3808, 3792, 3810, 6384,
+     3814, 3821, 3817, 3828, 3818, 3825, 3823, 3832, 6384, 3827,
+     3829, 3831, 3834, 3842, 3838, 3846, 3845, 3837, 6384, 3841,
+     3847, 3851, 6384, 3852, 3857, 3862, 3864, 3848, 3871, 3867,
+     3869, 3870, 3872, 6384, 3875, 6384, 3879, 3877, 3883, 6384,
+     3878, 3885, 3886, 3888, 3892, 3893, 3894, 3900, 3896, 3902,
 
-     3909, 3906, 3908, 3910, 3911, 6365, 3914, 3912, 3913, 3920,
-     3931, 3918, 3923, 3929, 3933, 3934, 6365, 6365, 3937, 6365,
-     3939, 3940, 3941, 6365, 3943, 3945, 3952, 3944, 3948, 3951,
-     3955, 3960, 6365, 3963, 3964, 6365, 3966, 3973, 3969, 3970,
-     3971, 3974, 3977, 3978, 3981, 3982, 3983, 3979, 3985, 3984,
-     6365, 3987, 3988, 3989, 3997, 3980, 4002, 4006, 4008, 4004,
-     6365, 4010, 4012, 4016, 4018, 4019, 6365, 4020, 6365, 4017,
-     4021, 4025, 4031, 4027, 6365, 4036, 4028, 4040, 4032, 4043,
-     4045, 4044, 4050, 4041, 4051, 4060, 4052, 4053, 4056, 6365,
-     4061, 4062, 4068, 4069, 4063, 4065, 4079, 4072, 4081, 4074,
+     3904, 3905, 3906, 3907, 3909, 3916, 3908, 3912, 3915, 3917,
+     6384, 3918, 3920, 3927, 3928, 3934, 3932, 3937, 3924, 3939,
+     3940, 6384, 6384, 3943, 6384, 3947, 3946, 3948, 6384, 3951,
+     3954, 3958, 3955, 3956, 3959, 3970, 3963, 6384, 3974, 3975,
+     6384, 3960, 3978, 3985, 3980, 3967, 3977, 3981, 3986, 3988,
+     3990, 3991, 3992, 3993, 3996, 3994, 6384, 3998, 3999, 4005,
+     4007, 4008, 4001, 4012, 4020, 4010, 6384, 4023, 4014, 4024,
+     4027, 4029, 6384, 4031, 6384, 4033, 4034, 4035, 4037, 4038,
+     6384, 4044, 4041, 4049, 4045, 4053, 4050, 4054, 4056, 4060,
+     4062, 4069, 4065, 4064, 4066, 6384, 4067, 4073, 4076, 4079,
 
-     4082, 4087, 4084, 4088, 4093, 4091, 4097, 4095, 6365, 4099,
-     4101, 4104, 4115, 4107, 4105, 6365, 4106, 4119, 4121, 6365,
-     4110, 4112, 4120, 4128, 4122, 4130, 4131, 4135, 4136, 6365,
-     4133, 4134, 4137, 4138, 4139, 4141, 6365, 6365, 4152, 6365,
-     4153, 4142, 4154, 4155, 4156, 4161, 4163, 4166, 4168, 4160,
-     4172, 4177, 4174, 4164, 4184, 4191, 4194, 4189, 4190, 4180,
-     6365, 6365, 4196, 4201, 4197, 4204, 4207, 4193, 4199, 4215,
-     4213, 4210, 4220, 4221, 4228, 6365, 4225, 4212, 4230, 4223,
-     6365, 4214, 4231, 4224, 4233, 4235, 4237, 4238, 4241, 4244,
-     4242, 4246, 4252, 4250, 4253, 4251, 4259, 4257, 4260, 4262,
+     4068, 4072, 4090, 4088, 4089, 4081, 4094, 4096, 4085, 4100,
+     4103, 4098, 4106, 4105, 6384, 4108, 4112, 4109, 4119, 4115,
+     4116, 6384, 4121, 4122, 4126, 6384, 4125, 4129, 4132, 4135,
+     4136, 4137, 4140, 4139, 4142, 6384, 4146, 4147, 4143, 4145,
+     4160, 4152, 6384, 6384, 4162, 6384, 4164, 4144, 4151, 4169,
+     4148, 4171, 4175, 4176, 4178, 4172, 4179, 4184, 4182, 4186,
+     4194, 4196, 4198, 4197, 4199, 4201, 6384, 6384, 4203, 4204,
+     4206, 4210, 4211, 4213, 4214, 4222, 4218, 4226, 4229, 4231,
+     4239, 6384, 4220, 4217, 4234, 4235, 6384, 4240, 4241, 4243,
+     4242, 4244, 4245, 4248, 4247, 4251, 4250, 4253, 4254, 4259,
 
-     4263, 4268, 4271, 6365, 4272, 4273, 4274, 4275, 4278, 4281,
-     4282, 4283, 4284, 6365, 4289, 6365, 4288, 4285, 4294, 4307,
-     4308, 4287, 4297, 4309, 4299, 4314, 4317, 4319, 4311, 4320,
-     4321, 4325, 4328, 4330, 4331, 6365, 4335, 4324, 4332, 4338,
-     4342, 4346, 4339, 4348, 4343, 4354, 4349, 4351, 4360, 4363,
-     4355, 4357, 4365, 4367, 6365, 4368, 4371, 4372, 4375, 4376,
-     4377, 4378, 4384, 4388, 4380, 4382, 4389, 4393, 6365, 4390,
-     4395, 4396, 4398, 4404, 4401, 4407, 4406, 4409, 6365, 4414,
-     4405, 4415, 4416, 4417, 4419, 4423, 4426, 4429, 4431, 4436,
-     6365, 4428, 4441, 4442, 4432, 4445, 4434, 4443, 4444, 6365,
+     4268, 4260, 4262, 4270, 4261, 4271, 4275, 4277, 4279, 6384,
+     4281, 4283, 4284, 4285, 4287, 4290, 4291, 4292, 4293, 6384,
+     4298, 6384, 4294, 4296, 4299, 4315, 4301, 4316, 4319, 4318,
+     4306, 4323, 4324, 4327, 4329, 4330, 4333, 4334, 4332, 4338,
+     4340, 4342, 6384, 4343, 4349, 4350, 4351, 4353, 4355, 4356,
+     4358, 4359, 4361, 4364, 4362, 4366, 4372, 4368, 4374, 4373,
+     4376, 6384, 4380, 4389, 4378, 4391, 4381, 4386, 4393, 4400,
+     4403, 4394, 4404, 4398, 4406, 6384, 4407, 4408, 4409, 4410,
+     4412, 4415, 4418, 4420, 4421, 6384, 4426, 4422, 4430, 4429,
+     4428, 4432, 4433, 4438, 4440, 4445, 4448, 6384, 4441, 4452,
 
-     4459, 4460, 4451, 4467, 4450, 4468, 4469, 4472, 4453, 4463,
-     4479, 4475, 4480, 4481, 4483, 4473, 4491, 4494, 4493, 6365,
-     4486, 6365, 4495, 4498, 4502, 4500, 4503, 4505, 6365, 4507,
-     4510, 4512, 4513, 4515, 6365, 4517, 4514, 4516, 4520, 6365,
-     4518, 4533, 4519, 4522, 4536, 4540, 6365, 4543, 4544, 4545,
-     4552, 4554, 4549, 4556, 4537, 4559, 4553, 4557, 4561, 4562,
-     4570, 4567, 4568, 6365, 4572, 4566, 4575, 4577, 4584, 4579,
-     4585, 4586, 4592, 4587, 6365, 4589, 4593, 4595, 4596, 4597,
-     4598, 4599, 4608, 4603, 4606, 4607, 4611, 4612, 6365, 4617,
-     4614, 4620, 4627, 4623, 4632, 6365, 6365, 4622, 4637, 4639,
+     4455, 4444, 4454, 4456, 4458, 4461, 6384, 4465, 4471, 4464,
+     4478, 4462, 4480, 4481, 4484, 4473, 4475, 4482, 4490, 4491,
+     4492, 4493, 4494, 4503, 4510, 4505, 6384, 4495, 6384, 4507,
+     4511, 4519, 4517, 4520, 4514, 6384, 4506, 4521, 4524, 4527,
+     4529, 6384, 4528, 4530, 4532, 4531, 6384, 4541, 4545, 4533,
+     4539, 4549, 4554, 6384, 4557, 4558, 4559, 4566, 4568, 4563,
+     4570, 4565, 4573, 4571, 4567, 4575, 4576, 4584, 4582, 4580,
+     6384, 4586, 4588, 4593, 4595, 4603, 4589, 4587, 4601, 4609,
+     4599, 6384, 4606, 4604, 4610, 4613, 4614, 4615, 4616, 4623,
+     4619, 4620, 4622, 4626, 4628, 4629, 6384, 4631, 4632, 4634,
 
-     4619, 4640, 6365, 6365, 4643, 4650, 4646, 4649, 4651, 6365,
-     6365, 4653, 6365, 4654, 6365, 4655, 4657, 6365, 6365, 4656,
-     4659, 4662, 4663, 4665, 6365, 4671, 6365, 4680, 4675, 4666,
-     4677, 4678, 6365, 4679, 4681, 4687, 6365, 4688, 4690, 4689,
-     4691, 6365, 4695, 4700, 4692, 4696, 6365, 4701, 4705, 4708,
-     4709, 4710, 4712, 4716, 4715, 4720, 4721, 4723, 4722, 4725,
-     4732, 4736, 4738, 4740, 4741, 4726, 4743, 4745, 4749, 4747,
-     4751, 4752, 4754, 4756, 4757, 4761, 4765, 4758, 4762, 4628,
-     4766, 4767, 4768, 4771, 4775, 4780, 4777, 4781, 4782, 4783,
-     4784, 4785, 4788, 4789, 4792, 4794, 4797, 6365, 4793, 4798,
+     4642, 4644, 4647, 6384, 6384, 4637, 4653, 4655, 4640, 4656,
+     6384, 6384, 4659, 4667, 4660, 4665, 4662, 6384, 6384, 4669,
+     6384, 4670, 6384, 4673, 4674, 6384, 6384, 4675, 4676, 4677,
+     4678, 4685, 6384, 4692, 6384, 4695, 4693, 4681, 4679, 4698,
+     6384, 4686, 4696, 4700, 6384, 4704, 4712, 4707, 4709, 6384,
+     4711, 4714, 4715, 4718, 6384, 4719, 4722, 4723, 4726, 4729,
+     4727, 4731, 4716, 4735, 4739, 4737, 4740, 4741, 4748, 4753,
+     4755, 4757, 4750, 4743, 4758, 4764, 4766, 4759, 4768, 4769,
+     4770, 4773, 4774, 4776, 4778, 4779, 4782, 4781, 4783, 4784,
+     4787, 4785, 4791, 4797, 4798, 4799, 4800, 4801, 4802, 4803,
 
-     4803, 4810, 4804, 4814, 4816, 4806, 4823, 4824, 6365, 4827,
-     6365, 4829, 4815, 4831, 4817, 4832, 6365, 4834, 4835, 4837,
-     4838, 4839, 4840, 4841, 4844, 4845, 4849, 4850, 6365, 4856,
-     4846, 6365, 4852, 4857, 4869, 6365, 4862, 4873, 4865, 4870,
-     4875, 4876, 4877, 4878, 4881, 4879, 4885, 4887, 4889, 4893,
-     4901, 4903, 4910, 4890, 4894, 4892, 4912, 4905, 4906, 4913,
-     4914, 4920, 4921, 4928, 6365, 4915, 6365, 4922, 4924, 4929,
-     4930, 4932, 4933, 4935, 6365, 6365, 4936, 4939, 4945, 4940,
-     4946, 4948, 4957, 6365, 4951, 4958, 4960, 4952, 6365, 4963,
-     4949, 4967, 4971, 6365, 4968, 4972, 4973, 4975, 4976, 4983,
+     4806, 4808, 4810, 4812, 4813, 6384, 4815, 4816, 4821, 4829,
+     4822, 4830, 4834, 4824, 4841, 4842, 6384, 4845, 6384, 4847,
+     4831, 4850, 4837, 4851, 6384, 4852, 4853, 4854, 4855, 4858,
+     4857, 4860, 4859, 4863, 4864, 4868, 6384, 4874, 4865, 6384,
+     4870, 4878, 4884, 6384, 4885, 4889, 4886, 4890, 4891, 4895,
+     4893, 4896, 4897, 4899, 4901, 4903, 4905, 4906, 4909, 4917,
+     4920, 4927, 4912, 4907, 4923, 4926, 4928, 4929, 4932, 4933,
+     4939, 4934, 4941, 6384, 4943, 6384, 4944, 4945, 4946, 4947,
+     4950, 4951, 4954, 6384, 6384, 4952, 4956, 4961, 4963, 4957,
+     4966, 4970, 6384, 4968, 4976, 4982, 4977, 6384, 4969, 4979,
 
-     4979, 4985, 4986, 4988, 4990, 6365, 6365, 6365, 6365, 4991,
-     4993, 4997, 4998, 4999, 5001, 5004, 5006, 5003, 6365, 5008,
-     6365, 6365, 5009, 5016, 5017, 5019, 5020, 5022, 5023, 5025,
-     6365, 5027, 5029, 5030, 5036, 5038, 5040, 5044, 5045, 5048,
-     5046, 5047, 5055, 5054, 5056, 5058, 5061, 5063, 5068, 6365,
-     6365, 5069, 5071, 5072, 5080, 5076, 5078, 5077, 5090, 5085,
-     5087, 5086, 5088, 5093, 5094, 5102, 5104, 5100, 5097, 6365,
-     5106, 5107, 5108, 6365, 5113, 6365, 5114, 5116, 5099, 5110,
-     5118, 5120, 5130, 5124, 6365, 6365, 5132, 5128, 6365, 6365,
-     5135, 5136, 5138, 5140, 5141, 5137, 5143, 5145, 5142, 6365,
+     4985, 4987, 6384, 4988, 4989, 4991, 4993, 4994, 4997, 5001,
+     5002, 5003, 5004, 5008, 6384, 6384, 6384, 6384, 5009, 5012,
+     5015, 5017, 5018, 5020, 5023, 5022, 5024, 6384, 5026, 6384,
+     6384, 5028, 5035, 5027, 5037, 5036, 5038, 5043, 5045, 6384,
+     5046, 5049, 5050, 5047, 5059, 5064, 5066, 5060, 5051, 5068,
+     5069, 5076, 5072, 5073, 5075, 5078, 5080, 5082, 6384, 6384,
+     5071, 5089, 5091, 5098, 5095, 5096, 5085, 5108, 5103, 5104,
+     5105, 5106, 5110, 5111, 5119, 5122, 5112, 5115, 6384, 5120,
+     5123, 5126, 6384, 5125, 6384, 5130, 5133, 5124, 5131, 5134,
+     5139, 5140, 5145, 6384, 6384, 5146, 5153, 5149, 6384, 6384,
 
-     5147, 6365, 5148, 5149, 5151, 5152, 5165, 5169, 5170, 5167,
-     5171, 5173, 6365, 5172, 5174, 6365, 5176, 5175, 5182, 6365,
-     5183, 5185, 5191, 5193, 6365, 5195, 5196, 5199, 6365, 5202,
-     6365, 5186, 5205, 5207, 5214, 6365, 5198, 5211, 6365, 5216,
-     5221, 5222, 5217, 6365, 5209, 6365, 5223, 5229, 5231, 5234,
-     5224, 5236, 5237, 5226, 5238, 5246, 5242, 5245, 6365, 6365,
-      135, 5254, 5247, 5251, 5255, 5256, 5263, 5258, 5260, 5266,
-     6365, 6365, 5267, 6365, 5261, 5273, 6365, 5259, 5274, 5278,
-     5268, 5282, 5280, 5281, 5288, 5290, 5291, 5292, 5293, 5294,
-     5296, 5297, 5312, 5299, 5309, 5314, 5316, 5319, 5321, 5310,
+     5150, 5151, 5156, 5158, 5159, 5152, 5162, 5166, 5160, 6384,
+     5167, 6384, 5163, 5168, 5174, 5170, 5186, 5187, 5190, 5189,
+     5185, 5191, 6384, 5192, 5194, 6384, 5198, 5197, 5199, 6384,
+     5203, 5200, 5206, 5209, 6384, 5213, 5215, 5216, 6384, 5223,
+     6384, 5210, 5220, 5217, 5232, 6384, 5224, 5227, 6384, 5234,
+     5236, 5237, 5238, 6384, 5239, 6384, 5241, 5243, 5245, 5248,
+     5249, 5253, 5250, 5254, 5255, 5262, 5259, 5266, 6384, 6384,
+      135, 5274, 5260, 5265, 5267, 5271, 5281, 5276, 5278, 5280,
+     6384, 6384, 5284, 6384, 5286, 5288, 6384, 5290, 5292, 5296,
+     5293, 5298, 5299, 5300, 5302, 5305, 5307, 5319, 5309, 5306,
 
-     5323, 5324, 5325, 5327, 5329, 5330, 5332, 5333, 6365, 5336,
-     5337, 5331, 6365, 5342, 5338, 5348, 5350, 6365, 5357, 5354,
-     5358, 5359, 6365, 5343, 5365, 5362, 5360, 5370, 5377, 5373,
-     5372, 5374, 6365, 6365, 6365, 5375, 5383, 6365, 5388, 5379,
-     5384, 5389, 6365, 5390, 5391, 6365, 6365, 5392, 5395, 5394,
-     5402, 6365, 5398, 6365, 5397, 6365, 5400, 5401, 5411, 5413,
-     6365, 5415, 5423, 6365, 5426, 5429, 5431, 5432, 5416, 5419,
-     5434, 6365, 5443, 5435, 5442, 5445, 5433, 5446, 5448, 5449,
-     5450, 5459, 5452, 5456, 6365, 5457, 5460, 5462, 5463, 5466,
-     5471, 5472, 5470, 6365, 5474, 6365, 5408, 5475, 5476, 5482,
+     5318, 5324, 5314, 5312, 5329, 5332, 5334, 5336, 5338, 5340,
+     5341, 5342, 5343, 5344, 5345, 5347, 5348, 5350, 5351, 6384,
+     5354, 5355, 5359, 6384, 5361, 5365, 5367, 5363, 6384, 5374,
+     5375, 5376, 5378, 6384, 5379, 5381, 5382, 5383, 5388, 5395,
+     5391, 5390, 5396, 6384, 6384, 6384, 5393, 5402, 6384, 5406,
+     5407, 5408, 5409, 6384, 5410, 5411, 6384, 6384, 5412, 5413,
+     5414, 5424, 6384, 5416, 6384, 5415, 6384, 5420, 5426, 5429,
+     5432, 6384, 5435, 5438, 6384, 5444, 5446, 5448, 5449, 5450,
+     5452, 5451, 6384, 5459, 5455, 5457, 5464, 5454, 5461, 5465,
+     5469, 5466, 5481, 5467, 5477, 6384, 5478, 5480, 5483, 5489,
 
-     5478, 5479, 5481, 5492, 5484, 5483, 5495, 5500, 5496, 6365,
-     5503, 5505, 6365, 5506, 6365, 5508, 6365, 5509, 5510, 5512,
-     5511, 6365, 5514, 5517, 5518, 5519, 6365, 5522, 5520, 5524,
-     5530, 6365, 6365, 5531, 5539, 5535, 5532, 5545, 5547, 5536,
-     5549, 5542, 5550, 5552, 5561, 5557, 5558, 5560, 5563, 5564,
-     5565, 6365, 6365, 6365, 5569, 5571, 5579, 5575, 5582, 5583,
-     5578, 6365, 5584, 5587, 5588, 5590, 5598, 5594, 5600, 6365,
-     5595, 5597, 5601, 5603, 5605, 5602, 5606, 5608, 6365, 5614,
-     5619, 5620, 5622, 5623, 5630, 5632, 5634, 5624, 5641, 5637,
-     6365, 5639, 6365, 6365, 5627, 6365, 5640, 5643, 5644, 5647,
+     5468, 5479, 5491, 5493, 6384, 5496, 6384, 5497, 5498, 5499,
+     5500, 5501, 5502, 5504, 5514, 5507, 5515, 5505, 5516, 5526,
+     5518, 6384, 5528, 5530, 6384, 5520, 6384, 5532, 6384, 5522,
+     5533, 5534, 5535, 6384, 5544, 5536, 5539, 5545, 6384, 5546,
+     5551, 5548, 5553, 6384, 6384, 5554, 5561, 5558, 5557, 5560,
+     5569, 5566, 5571, 5572, 5573, 5575, 5584, 5577, 5576, 5580,
+     5592, 5594, 5598, 6384, 6384, 6384, 5581, 5585, 5607, 5603,
+     5606, 5610, 5608, 6384, 5611, 5613, 5614, 5615, 5623, 5618,
+     5621, 6384, 5625, 5622, 5624, 5628, 5630, 5627, 5638, 5639,
+     6384, 5632, 5644, 5645, 5633, 5651, 5653, 5655, 5658, 5659,
 
-     6365, 5652, 5645, 5649, 5654, 5656, 5658, 6365, 5667, 5653,
-     5660, 5670, 6365, 6365, 5672, 6365, 5677, 5678, 5668, 5680,
-     5681, 5684, 5686, 5689, 6365, 5687, 5688, 5690, 5691, 5696,
-     6365, 5697, 5698, 5699, 5700, 6365, 5704, 5709, 5706, 5710,
-     5711, 6365, 5713, 5701, 5732, 5728, 6365, 5714, 5730, 5727,
-     6365, 6365, 5737, 5739, 5741, 6365, 6365, 6365, 5742, 5729,
-     5744, 6365, 5750, 5754, 5758, 5762, 5753, 6365, 5764, 5761,
-     5766, 6365, 6365, 5765, 5767, 5768, 5770, 6365, 6365, 5746,
-     5774, 5772, 5775, 5777, 6365, 5778, 5782, 5788, 5794, 5798,
-     5786, 5790, 5799, 5806, 5809, 5802, 5804, 5807, 5810, 5812,
+     5660, 5667, 5663, 6384, 5665, 6384, 6384, 5662, 6384, 5666,
+     5669, 5670, 5673, 6384, 5676, 5671, 5677, 5678, 5680, 5683,
+     6384, 5690, 5689, 5693, 5694, 6384, 6384, 5696, 6384, 5701,
+     5698, 5702, 5710, 5705, 5706, 5708, 5713, 6384, 5711, 5715,
+     5719, 5720, 5721, 6384, 5722, 5723, 5725, 5726, 6384, 5729,
+     5728, 5733, 5734, 5736, 6384, 5738, 5737, 5754, 5753, 6384,
+     5739, 5756, 5749, 6384, 6384, 5764, 5766, 5767, 6384, 6384,
+     6384, 5769, 5770, 5760, 5773, 6384, 5777, 5783, 5787, 5791,
+     5774, 6384, 5793, 5782, 5790, 6384, 6384, 5786, 5794, 5796,
+     5798, 6384, 6384, 5795, 5802, 5799, 5807, 5808, 6384, 5810,
 
-     5813, 5821, 5822, 5818, 5826, 5830, 5834, 5831, 6365, 6365,
-     5838, 5840, 5814, 6365, 6365, 5842, 5844, 5846, 5848, 5850,
-     5852, 5854, 6365, 5855, 5857, 5858, 5859, 5860, 6365, 5862,
-     5866, 5861, 5869, 5863, 5872, 5868, 5878, 6365, 6365, 5870,
-     5712, 5874, 5884, 5879, 6365, 5886, 5893, 5890, 5891, 5892,
-     5894, 5898, 6365, 5895, 5899, 6365, 6365, 6365, 5902, 6365,
-     6365, 5903, 6365, 6365, 6365, 6365, 6365, 6365, 6365, 5906,
-     6365, 5905, 5916, 5920, 5922, 6365, 5907, 5923, 5924, 5913,
-     5925, 6365, 5926, 5927, 5931, 5935, 5940, 5941, 5934, 5943,
-     5945, 5944, 5946, 5950, 5948, 5952, 5951, 5953, 5954, 5956,
+     5812, 5817, 5825, 5827, 5815, 5829, 5831, 5838, 5811, 5819,
+     5833, 5835, 5836, 5842, 5839, 5846, 5855, 5851, 5853, 5860,
+     5862, 5863, 6384, 6384, 5865, 6384, 5867, 5813, 6384, 6384,
+     5870, 5872, 5874, 5876, 5878, 5880, 5882, 6384, 5883, 5885,
+     5886, 5740, 5887, 6384, 5889, 5891, 5888, 5893, 5897, 5898,
+     5896, 5901, 6384, 6384, 5894, 5902, 5904, 5913, 5910, 6384,
+     5915, 5922, 5917, 5919, 5920, 5923, 5921, 6384, 5926, 5925,
+     6384, 6384, 6384, 5927, 6384, 6384, 5929, 6384, 6384, 6384,
+     6384, 6384, 6384, 6384, 5933, 6384, 5935, 5944, 5946, 5950,
+     6384, 5938, 5947, 5850, 5940, 5951, 6384, 5952, 5953, 5954,
 
-     6365, 6365, 6365, 5959, 5966, 5968, 5969, 5976, 5979, 5982,
-     5984, 5970, 5977, 5985, 5987, 5990, 5991, 5993, 6000, 5996,
-     5999, 5998, 6001, 6005, 6007, 6002, 6009, 6013, 6365, 6014,
-     6365, 6015, 6365, 6365, 6019, 6022, 6024, 6020, 6031, 6036,
-     6026, 6034, 6027, 6037, 6044, 6049, 6365, 6365, 6035, 6038,
-     6365, 6041, 6050, 6365, 6045, 6052, 6051, 6053, 6059, 6060,
-     6062, 6063, 6074, 6365, 6365, 6061, 6064, 6069, 6076, 6078,
-     6077, 6084, 6086, 6087, 6089, 6080, 6096, 6365, 6098, 6095,
-     6102, 6365, 6103, 6093, 6104, 6105, 6106, 6114, 6109, 6110,
-     6365, 6115, 6365, 6118, 6120, 6121, 6119, 6122, 6127, 6130,
+     5587, 5957, 5962, 5958, 5966, 5968, 5967, 5969, 5973, 5970,
+     5977, 5974, 5976, 5978, 5982, 6384, 6384, 6384, 5990, 5980,
+     5992, 5984, 5997, 6001, 6006, 6008, 5999, 6003, 6009, 6010,
+     6011, 6013, 6014, 6025, 6017, 6020, 6021, 6022, 6028, 6034,
+     6024, 6030, 6036, 6384, 6037, 6384, 6040, 6384, 6384, 6044,
+     6045, 6047, 6041, 6054, 6056, 6051, 6053, 6057, 6059, 6062,
+     6068, 6384, 6384, 6063, 6069, 6384, 6071, 6070, 6384, 6072,
+     6073, 6075, 6077, 6080, 6079, 6081, 6082, 6096, 6384, 6384,
+     6083, 6088, 6091, 6100, 6097, 6107, 6104, 6108, 6109, 6111,
+     6112, 6121, 6384, 6118, 6119, 6123, 6384, 6125, 6120, 6126,
 
-     6134, 6133, 6365, 6135, 6136, 6143, 6144, 6147, 6149, 6150,
-     6151, 6153, 6155, 6156, 6164, 6159, 6165, 6167, 6168, 6169,
-     6365, 6175, 6171, 6365, 6176, 6177, 6178, 6179, 6183, 6365,
-     6192, 6180, 6185, 6193, 6196, 6200, 6365, 6202, 6206, 6203,
-     6365, 6208, 6365, 6365, 6209, 6211, 6212, 6216, 6218, 6365,
-     6365, 6365, 6245, 6252, 6259, 6266, 6273, 6280, 6287,   88,
-     6294, 6301, 6308, 6315, 6322, 6329, 6336, 6343, 6350, 6357
+     6127, 6128, 6136, 6132, 6135, 6384, 6137, 6384, 6141, 6143,
+     6144, 6134, 6142, 6145, 6156, 6154, 6150, 6384, 6160, 6164,
+     6162, 6166, 6168, 6170, 6171, 6172, 6174, 6177, 6183, 6180,
+     6187, 6188, 6184, 6192, 6189, 6384, 6199, 6190, 6384, 6196,
+     6200, 6193, 6202, 6206, 6384, 6211, 6204, 6213, 6214, 6217,
+     6218, 6384, 6220, 6227, 6222, 6384, 6228, 6384, 6384, 6230,
+     6224, 6231, 6237, 6239, 6384, 6384, 6384, 6264, 6271, 6278,
+     6285, 6292, 6299, 6306,   88, 6313, 6320, 6327, 6334, 6341,
+     6348, 6355, 6362, 6369, 6376
     } ;
 
-static const flex_int16_t yy_def[3271] =
+static const flex_int16_t yy_def[3286] =
     {   0,
-     3252,    1, 3253, 3253, 3254, 3254, 3255, 3255, 3256, 3256,
-     3257, 3257, 3258, 3258, 3259, 3259, 3252, 3260, 3252, 3252,
-     3252, 3252, 3261, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3262, 3252, 3252, 3252,
-     3262, 3263, 3252, 3252, 3252, 3263, 3264, 3252, 3252, 3252,
-     3252, 3264, 3265, 3252, 3252, 3252, 3265, 3266, 3252, 3267,
-     3252, 3266, 3266, 3268, 3252, 3252, 3252, 3252, 3268, 3269,
-     3252, 3252, 3252, 3269, 3260, 3260, 3252, 3270, 3261, 3270,
-     3261, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3267,    1, 3268, 3268, 3269, 3269, 3270, 3270, 3271, 3271,
+     3272, 3272, 3273, 3273, 3274, 3274, 3267, 3275, 3267, 3267,
+     3267, 3267, 3276, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3277, 3267, 3267, 3267,
+     3277, 3278, 3267, 3267, 3267, 3278, 3279, 3267, 3267, 3267,
+     3267, 3279, 3280, 3267, 3267, 3267, 3280, 3281, 3267, 3282,
+     3267, 3281, 3281, 3283, 3267, 3267, 3267, 3267, 3283, 3284,
+     3267, 3267, 3267, 3284, 3275, 3275, 3267, 3285, 3276, 3285,
+     3276, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3262, 3262, 3263,
-     3263, 3264, 3264, 3252, 3265, 3265, 3266, 3266, 3267, 3267,
-     3266, 3268, 3268, 3252, 3269, 3269, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3277, 3277, 3278,
+     3278, 3279, 3279, 3267, 3280, 3280, 3281, 3281, 3282, 3282,
+     3281, 3283, 3283, 3267, 3284, 3284, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3266, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3281, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3281, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3266,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3281,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3266,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3281,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252,
-     3252, 3260, 3252, 3252, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267,
+     3267, 3275, 3267, 3267, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3281, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3267, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3267, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3266, 3266, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3281, 3281, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3266, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3281,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3266, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3281, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3266, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3267, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3281, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3267, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3266, 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3281, 3275, 3267, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3252,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3267, 3275, 3267, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3267, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3281,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3252, 3260, 3260, 3260, 3260, 3266, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3281, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
 
-     3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3252,
-     3252, 3260, 3252, 3260, 3252, 3260, 3260, 3252, 3252, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3266, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
+     3275, 3275, 3275, 3267, 3267, 3275, 3275, 3275, 3275, 3275,
+     3267, 3267, 3275, 3275, 3275, 3275, 3275, 3267, 3267, 3275,
+     3267, 3275, 3267, 3275, 3275, 3267, 3267, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
+     3281, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3267,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3252, 3252, 3252, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3266, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3252, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3267, 3267, 3267, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3281, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3267, 3275, 3275, 3275, 3267, 3267,
 
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3252, 3260,
-     3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252,
-     3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3252, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3267, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3267, 3275,
+     3267, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3267,
+     3281, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3267, 3275, 3267, 3275, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3252, 3252, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3252, 3252, 3260, 3260, 3260,
-     3260, 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3267, 3267, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3267, 3267, 3275, 3275,
+     3275, 3275, 3267, 3275, 3267, 3275, 3267, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3252, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3267, 3275, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3267, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3267, 3267, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
 
-     3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3260, 3252, 3252, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3252, 3252, 3260, 3260, 3260, 3252, 3252, 3252, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3252, 3252, 3260, 3260, 3260, 3260, 3252, 3252, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3267, 3275, 3267, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3267, 3267, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3267, 3267, 3275, 3275, 3275, 3267, 3267,
+     3267, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3267, 3267, 3275, 3275, 3275,
+     3275, 3267, 3267, 3275, 3275, 3275, 3275, 3275, 3267, 3275,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252,
-     3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260,
-     3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3252, 3260, 3260, 3252, 3252, 3252, 3260, 3252,
-     3252, 3260, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3260,
-     3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3267, 3275, 3267, 3275, 3275, 3267, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3267, 3275, 3275, 3275, 3275, 3275, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3267, 3267, 3267, 3275, 3267, 3267, 3275, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3275, 3267, 3275, 3275, 3275, 3275,
+     3267, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
 
-     3252, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260,
-     3252, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260,
-     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260,
-     3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3267, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3267, 3275, 3267, 3275, 3267, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3267, 3275, 3275, 3267, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3267,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3267, 3275, 3275, 3275, 3267, 3275, 3275, 3275,
 
-     3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252,
-     3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260,
-     3252, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3252,
-     3252,    0, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275, 3275,
+     3275, 3275, 3275, 3275, 3275, 3267, 3275, 3275, 3267, 3275,
+     3275, 3275, 3275, 3275, 3267, 3275, 3275, 3275, 3275, 3275,
+     3275, 3267, 3275, 3275, 3275, 3267, 3275, 3267, 3267, 3275,
+     3275, 3275, 3275, 3275, 3267, 3267,    0, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3267
     } ;
 
-static const flex_int16_t yy_nxt[6406] =
+static const flex_int16_t yy_nxt[6425] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1677,530 +1682,532 @@ static const flex_int16_t yy_nxt[6406] =
        86,   86,  910,  922,   86,  911,   86,  926,  924,  912,
        86,  928,  913,   86,   86,  929,  940,  931,  930,  914,
       915,  927,  916,   86,   86,  932,  933,   86,  934,   86,
-       86,  935,  939,   86,  942,   86,  936,  943,  945,  944,
-       86,   86,  937,  938,   86,   86,  950,  941,  949,   86,
+       86,  935,  939,   86,  942,   86,  936,  943,  946,  944,
+       86,   86,  937,  938,   86,   86,  951,  941,  950,   86,
 
-       86,  951,   86,   86,  953,   86,  947,  952,   86,  946,
-       86,  955,   86,  956,  954,  957,   86,  959,   86,  948,
-       86,  958,  960,   86,  962,   86,   86,   86,   86,  963,
-       86,   86,  967,   86,   86,  961,   86,  970,  966,   86,
-       86,   86,  968,  974,  984,   86,  964,  965,  969,   86,
-      975,  971,  972,  976,   86,   86,  176,  977,  980,  981,
-      979,  973,  978,   86,   86,   86,   86,  983,   86,   86,
-       86,  982,   86,   86,  985,  987,   86,  986,  988,   86,
-      989,   86,   86,   86,  994,   86,  991,   86,  990,  992,
-       86,  997,   86,  998,   86,   86,  995,   86,  996,   86,
+       86,  952,   86,   86,  954,  945,  948,  953,   86,  947,
+       86,  956,   86,  957,  955,  958,   86,  960,   86,  949,
+       86,  959,  961,   86,   86,   86,   86,   86,   86,  964,
+       86,   86,  968,   86,   86,  962,   86,  971,  967,   86,
+       86,  176,  969,  963,  975,   86,  965,  966,  970,   86,
+       86,  972,  973,  978,  976,  977,   86,   86,  979,   86,
+      981,  974,  980,  982,  994,   86,   86,  984,   86,   86,
+      983,  985,   86,   86,   86,  988,   86,   86,  986,  989,
+       86,   86,  987,   86,   86,  990,  995,   86,  992,   86,
+      999,  993,   86,  998,   86,   86,   86,   86,  996,  991,
 
-       86,   86,  993,   86, 1000,   86, 1001,   86, 1003,   86,
-     1004,   86, 1005,  999,   86,   86, 1006,   86, 1013, 1007,
-     1011,   86,   86, 1009, 1002, 1012,   86,   86, 1010,   86,
-       86,   86, 1008,   86, 1018, 1020, 1014,   86, 1016, 1021,
-       86, 1015, 1019,   86,   86,   86,   86,   86, 1023,   86,
-     1025, 1017,   86,   86,   86,   86, 1029, 1031, 1022,   86,
-       86,   86, 1034,   86,   86, 1024, 1026, 1027,   86, 1028,
-     1035, 1036, 1032,   86, 1033, 1030,   86, 1038, 1040, 1037,
-       86,   86, 1039, 1042,   86, 1041,   86,   86,   86,   86,
-     1044,   86,   86, 1043, 1051, 1046, 1052, 1054,   86,   86,
+      997,   86,   86,   86,   86,   86, 1001,   86, 1004,   86,
+     1002,   86, 1006, 1005, 1000,   86, 1007,   86,   86, 1008,
+       86, 1014, 1012,   86, 1010,   86, 1003, 1013,   86,   86,
+     1011,   86, 1009, 1015, 1017,   86,   86,   86, 1019, 1021,
+     1022,   86, 1016,   86,   86,   86, 1020,   86, 1024,   86,
+       86,   86, 1023, 1018,   86,   86,   86, 1025, 1030, 1032,
+     1035,   86,   86,   86, 1026, 1027,   86,   86,   86, 1028,
+     1029, 1036, 1033, 1037, 1031, 1034,   86,   86,   86,   86,
+       86, 1039, 1038, 1040, 1042, 1043,   86, 1045, 1044,   86,
+     1041,   86,   86,   86,   86,   86, 1052, 1047, 1053, 1055,
 
-       86, 1056,   86,   86,   86,   86, 1045,   86, 1047, 1057,
-     1049, 1048, 1050, 1053,   86,   86,   86, 1060, 1055, 1062,
-     1058,   86, 1065, 1059,   86, 1061,   86, 1064,   86,   86,
-       86,   86, 1066, 1069, 1071,   86,   86, 1068,   86,   86,
-     1074,   86, 1063, 1073,   86, 1075,  168,   86, 1067,   86,
-       86, 1070,   86, 1077, 1072, 1081, 1076,   86, 1078,   86,
-       86,   86,   86,   86,   86, 1094, 1079, 1080,   86, 1097,
-       86, 1082, 1095,   86, 1084, 1085,   86,   86,   86,   86,
-       86, 1086, 1099, 1083, 1087,   86, 1119,  174, 1088,   86,
-     1089, 1096, 1100, 1101, 1090,   86, 1091,   86, 1098, 1104,
+     1046,   86,   86, 1057,   86,   86,   86, 1058, 1054,   86,
+     1059, 1048, 1050,   86, 1049, 1051,   86,   86,   86,   86,
+     1066, 1056,   86, 1063,   86, 1065,   86,   86,   86, 1061,
+     1067,   86, 1070, 1072,   86, 1060,   86, 1062,   86,   86,
+     1064,   86, 1071,   86, 1069, 1075, 1068,   86, 1074,   86,
+     1076,  168,   86, 1078, 1073,   86, 1077,   86, 1079,   86,
+     1082, 1080,   86,   86,   86,   86,   86, 1081,   86, 1095,
+     1096, 1083,   86, 1098,   86,   86, 1085, 1086,   86,   86,
+     1124,   86, 1100, 1084, 1088, 1087,   86, 1097,   86, 1089,
+       86, 1090,   86, 1103, 1101, 1091,   86, 1092,   86,   86,
 
-     1102, 1092,   86, 1103, 1105,   86, 1093,   86,   86, 1113,
-       86, 1106, 1108,   86,   86,   86,   86,   86, 1111, 1114,
-     1121, 1107,   86,   86, 1109, 1110,   86, 1120, 1112, 1115,
-     1122, 1117, 1118, 1123,   86, 1124,   86, 1116, 1125,   86,
-       86,   86,   86,   86,   86,   86,   86,   86, 1137,   86,
-     1140,   86,   86,   86, 1136, 1142, 1141,   86, 1139,   86,
-     1127, 1126,   86, 1128,   86, 1129, 1138, 1143, 1147,   86,
-     1130,   86, 1131,   86,   86, 1146, 1144,   86, 1132,   86,
-      173, 1145, 1148, 1133, 1134, 1152,   86, 1149,   86, 1150,
-     1135, 1154, 1153, 1155,   86,   86,   86, 1151, 1156,   86,
+     1099,   86, 1093, 1105, 1102, 1107, 1104, 1094, 1106,   86,
+       86, 1114, 1108,   86, 1109,   86, 1111,   86, 1112,   86,
+     1115,   86,   86,   86,   86,   86, 1110, 1121, 1113, 1125,
+     1120, 1116, 1119, 1122,   86, 1118, 1123, 1126,   86,   86,
+     1117,   86,   86,   86,   86,   86,   86, 1127,   86,   86,
+     1138,   86, 1141,   86, 1142,   86, 1137, 1128, 1140, 1129,
+       86, 1130, 1139, 1143,   86,   86, 1131, 1144, 1132,   86,
+     1148,   86,   86,   86, 1133,   86,   86, 1149,   86, 1134,
+     1135, 1154,   86, 1145, 1146, 1147, 1136, 1150,   86, 1151,
+       86, 1153, 1155, 1157, 1152,   86,   86, 1161, 1158,   86,
 
-     1159,   86,   86,   86, 1165,   86,   86, 1160,   86, 1158,
-       86,   86, 1162, 1157, 1163,   86,   86,   86,   86,   86,
-     1161,   86, 1168,   86, 1164, 1166,   86,   86,   86, 1175,
-     1167,   86, 1170, 1172, 1177, 1169, 1173, 1174,   86, 1171,
-       86,   86,   86, 1176,   86,   86,   86, 1178,   86,   86,
-       86,   86, 1179, 1185, 1186, 1187, 1182,   86,   86, 1189,
-     1184, 1180, 1190, 1181, 1183,   86, 1188, 1192,   86, 1193,
-       86,   86,   86, 1195, 1194,   86, 1196,   86, 1191,   86,
-     1197,   86,   86,   86, 1198,   86, 1204, 1206,   86,   86,
-       86, 1199,   86,   86, 1208, 1200, 1202, 1203,   86, 1201,
+       86,   86,   86,   86,   86,   86, 1162,   86,   86,   86,
+     1156, 1167,   86, 1160, 1164, 1159, 1165,   86, 1168,   86,
+     1166, 1163,   86,   86, 1170,   86,   86, 1169,   86,   86,
+       86,   86, 1171, 1179, 1177, 1175, 1172, 1174, 1176,   86,
+       86,   86,   86, 1173,   86, 1181,   86, 1178,   86,   86,
+       86,   86, 1191,   86, 1187, 1188, 1180, 1186, 1189,   86,
+     1184, 1182,   86, 1183, 1192,   86, 1185, 1195, 1190,   86,
+       86,   86, 1196,   86, 1199, 1193,   86, 1197,   86,   86,
+     1198, 1194,   86, 1200,   86, 1206,   86,   86, 1208,   86,
+       86,   86,   86, 1212,   86, 1202,   86, 1204, 1201,   86,
 
-       86, 1210,   86, 1207, 1209, 1205,   86, 1212,   86,   86,
-       86, 1213,   86,   86, 1215, 1216,   86,   86, 1218,   86,
-     1221, 1211,   86, 1220, 1214, 1217,   86, 1222,   86,   86,
-       86, 1223, 1219, 1225,   86, 1226,   86, 1224,   86,   86,
-       86,   86, 1230, 1232, 1233,   86, 1234, 1227, 1237,   86,
-       86,   86,   86, 1231,   86, 1228, 1235, 1236, 1229,   86,
-     1240,   86,   86, 1238, 1242,   86,   86, 1241,   86,   86,
-     1243,   86,   86,   86,   86, 1247, 1248, 1244,   86, 1239,
-       86,   86, 1253, 1254,   86, 1249,   86, 1245,   86,   86,
-     1246, 1256, 1251, 1257,   86,   86, 1250,   86,   86, 1255,
+     1203, 1205,  174,   86, 1209,   86, 1211, 1207, 1210,   86,
+     1214,   86,   86,   86, 1215, 1216, 1217, 1213, 1218,   86,
+       86,   86, 1223,   86, 1219, 1220,   86, 1222,   86, 1224,
+       86,   86, 1225,   86, 1227,   86, 1221,   86, 1228,   86,
+       86, 1234,   86, 1232, 1226,   86, 1235,   86,   86,   86,
+     1236, 1229,   86, 1237, 1230, 1233,   86, 1239,   86, 1231,
+     1242, 1238,   86,   86,   86,   86,   86, 1240,   86, 1243,
+     1244,   86,   86,   86, 1245,   86, 1249, 1246, 1241,   86,
+     1247,   86, 1250,   86,   86,   86, 1251, 1255, 1256, 1259,
+       86, 1248,   86,   86,   86, 1253,   86, 1258,   86, 1252,
 
-     1252, 1261,   86,   86,   86,   86,   86,   86, 1267,   86,
-     1260, 1259, 1263,  168, 1258,   86,   86,   86,   86,   86,
-     1262, 1274,   86, 1264, 1272,   86, 1266, 1273, 1271, 1269,
-     1276, 1265, 1270, 1268, 1277,   86,   86,   86,   86,   86,
-       86, 1280, 1279, 1281,   86, 1275,   86,   86,   86,   86,
-       86, 1278, 1284,   86,   86, 1290,   86, 1287, 1282,   86,
-     1283,   86,   86, 1285,   86,   86,  168,   86, 1286, 1288,
-     1294, 1300, 1289, 1291,   86,   86,   86, 1293,   86, 1292,
-     1296,   86, 1301, 1302,   86, 1295, 1303,   86,   86, 1297,
-     1305, 1298, 1308,   86, 1299, 1304, 1306,   86,   86,   86,
+     1257,   86, 1263, 1254,   86,   86,   86,   86,   86,   86,
+     1269,   86, 1261, 1262, 1265, 1260,  168,   86,   86,   86,
+       86,   86, 1264,   86,   86, 1274, 1266,  173, 1268, 1278,
+     1273, 1271, 1275, 1267, 1272,   86, 1270, 1276,   86, 1279,
+     1280, 1277,   86,   86,   86,   86, 1282, 1281, 1283,   86,
+       86,   86,   86,   86,   86,   86, 1286,   86, 1292,   86,
+       86, 1289,   86, 1284, 1285,   86,   86, 1287,   86,  168,
+     1290, 1296, 1288,   86, 1293,   86, 1291,   86, 1298, 1302,
+     1294, 1295,   86, 1303, 1306,   86,   86, 1299, 1297, 1300,
+     1304,   86, 1301, 1305,   86,   86,   86,   86, 1308,   86,
 
-       86,   86,   86, 1307, 1310,   86, 1309, 1313,   86, 1317,
-       86,   86, 1312,   86,   86, 1314, 1315, 1311, 1318, 1319,
-       86,   86,   86,   86,   86, 1321, 1322, 1316,   86,   86,
-     1323, 1320,   86,   86,   86,   86,   86,   86, 1324, 1325,
-       86, 1327, 1329,   86, 1330,   86, 1334, 1326, 1328,   86,
-       86,   86,   86, 1331,   86, 1333,   86, 1332, 1335, 1338,
-       86,   86,   86,   86, 1345, 1336, 1339,  166, 1341, 1337,
-       86, 1340,   86,   86,   86, 1343,   86, 1346, 1350, 1342,
-       86, 1344, 1348, 1349, 1352,   86, 1347,   86, 1351, 1353,
-       86,   86, 1357,   86, 1367,   86,   86, 1368, 1356, 1354,
+     1307,   86,   86,   86, 1312,   86, 1311, 1315,   86,   86,
+     1309,   86, 1319,   86, 1310, 1314,   86,   86,   86, 1316,
+     1313, 1320, 1317, 1321,   86,   86, 1325, 1318, 1324, 1322,
+     1323,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86, 1331,   86,   86,   86, 1326, 1327, 1329, 1330,
+     1332, 1336, 1328,   86,   86,   86, 1333,   86, 1335, 1337,
+     1334, 1338, 1340, 1339,   86,   86,   86,   86,   86, 1341,
+       86, 1348,   86,   86, 1342,   86, 1343,   86, 1351,   86,
+     1353, 1346, 1345, 1349, 1344,   86, 1350, 1347,   86, 1355,
+       86, 1354,   86, 1352, 1356,   86,   86, 1360,   86,   86,
 
-       86, 1355,   86, 1358, 1366,   86, 1365, 1359,   86,   86,
-     1360, 1361, 1371, 1369, 1370, 1362,  164,   86,   86,   86,
-       86, 1363, 1372,   86, 1373, 1364,   86, 1374,   86, 1376,
-     1375,   86,   86,   86, 1377,   86, 1378,   86,   86, 1386,
-     1379, 1380, 1381, 1383, 1387,   86,   86,   86,  163, 1384,
-       86, 1388, 1382,   86,   86, 1385, 1390, 1389,   86, 1395,
-       86, 1391,   86, 1392, 1399, 1393,   86, 1394, 1396, 1397,
-       86,   86, 1401, 1398,   86,   86,   86, 1403,   86, 1402,
-       86, 1400, 1404,   86, 1405, 1407,   86, 1409,   86,   86,
-     1408, 1413,   86, 1414,   86,   86, 1406,   86,   86,   86,
+     1371, 1369, 1358, 1359, 1357,   86, 1361,   86,   86, 1370,
+     1362, 1368, 1372, 1363, 1364,   86, 1374, 1373, 1365,   86,
+       86,   86,   86,   86, 1366, 1375, 1376,   86, 1367,   86,
+     1377,   86, 1379,   86,   86,   86, 1380,   86, 1381,   86,
+     1378,   86, 1386, 1382, 1384, 1383, 1389,   86, 1398, 1390,
+      166,   86,   86, 1387, 1385,   86, 1391,   86,   86, 1388,
+       86, 1392, 1399, 1400,   86,   86,   86, 1393, 1402,   86,
+       86, 1401, 1394,   86, 1395,   86, 1396, 1406, 1397, 1405,
+       86, 1403, 1407,   86, 1408, 1410,   86, 1404,   86,   86,
+       86,   86, 1416,   86, 1417, 1409,   86, 1412,   86,   86,
 
-       86,   86, 1415, 1412, 1417, 1410,   86, 1411,   86, 1416,
-     1419,   86, 1418, 1422, 1423,   86, 1425,   86, 1420,   86,
-       86, 1426,   86, 1427,   86,   86, 1424, 1428, 1431,   86,
-       86, 1421, 1433,   86, 1430,   86, 1434,   86,   86,   86,
-     1438,   86, 1435, 1429,   86,   86,   86,   86, 1440,   86,
-     1432,   86, 1442, 1444,   86,   86,   86,   86, 1443, 1436,
-     1437, 1448,   86,   86, 1439, 1446, 1441,   86, 1450,   86,
-     1447, 1449, 1445,   86, 1452, 1451,   86, 1454, 1453,   86,
-       86,   86,   86,   86, 1455, 1460, 1461, 1457,   86, 1458,
-       86,   86,   86, 1462, 1463,   86, 1459,   86, 1456, 1464,
+     1411,   86,   86,   86, 1418, 1415, 1420,   86, 1413, 1414,
+       86,   86, 1422, 1419,   86,   86, 1421, 1426,   86, 1425,
+     1428,   86,   86,   86, 1429, 1423, 1427,   86, 1431,   86,
+     1430, 1434,   86,   86, 1432, 1424, 1436,   86, 1433,   86,
+     1437,   86,   86,   86, 1441,   86, 1438,   86,   86,   86,
+       86, 1443,   86, 1435,   86, 1445, 1447,   86,   86,   86,
+       86, 1446, 1449, 1439, 1440, 1451,   86, 1442,   86, 1444,
+       86,   86,   86, 1450,   86, 1448, 1453, 1455, 1454, 1456,
+     1452,   86, 1457,   86,   86,   86, 1459,   86, 1458, 1463,
+     1460, 1464, 1461,   86,   86,   86, 1466,   86, 1465,   86,
 
-       86, 1467,   86,   86,  168,   86,   86, 1472, 1466, 1473,
-       86, 1475,   86,   86, 1465,   86, 1474,   86,   86, 1469,
-       86,   86,   86, 1468,   86, 1470, 1476,   86, 1483, 1471,
-       86,   86, 1477, 1480,   86,   86, 1481,  161, 1478,   86,
-     1479,   86, 1482,   86, 1487, 1488,   86,   86, 1490, 1492,
-     1484,   86, 1486,   86, 1493,   86, 1485,   86, 1489, 1496,
-     1491,   86, 1495,   86,   86, 1494,   86,   86,   86, 1501,
-     1504, 1497, 1502,   86, 1506, 1503, 1498,   86, 1499,   86,
-       86, 1500,   86, 1507, 1509,   86, 1511, 1505, 1508, 1510,
-       86,   86,   86,   86,   86,   86, 1514, 1515,   86,   86,
+     1462,   86,   86, 1467, 1470,   86,   86,  168,   86,   86,
+     1475, 1476, 1469,   86, 1478,   86,   86,   86, 1468, 1477,
+       86,   86, 1472,   86,   86,   86, 1471,   86, 1473, 1479,
+       86, 1486, 1474,   86,   86, 1480, 1483,   86,   86, 1484,
+      164, 1481,   86, 1482,   86, 1485,   86, 1490, 1491,   86,
+       86, 1493, 1495, 1487,   86, 1489,   86, 1496,   86, 1488,
+       86, 1492, 1499, 1494,   86, 1498,   86,   86, 1497,   86,
+       86,   86, 1504, 1507, 1500, 1505,   86, 1509, 1506, 1501,
+       86, 1502,   86,   86, 1503,   86, 1510, 1512,   86, 1514,
+     1508, 1511, 1513,   86,   86,   86,   86,   86,   86, 1517,
 
-     1518,   86,   86, 1513,   86, 1523,   86,   86, 1512,   86,
-     1524, 1516,   86, 1520, 1517, 1527,   86,   86, 1519, 1521,
-     1522,   86,   86,   86, 1528, 1525,   86,   86, 1526,   86,
-       86, 1530, 1534,   86,   86, 1529, 1535, 1531, 1532, 1536,
-       86, 1539, 1538,   86,   86, 1533,   86,   86, 1537,   86,
-     1543, 1544,   86, 1541, 1546,   86,   86,   86, 1540,   86,
-       86, 1545, 1547, 1551, 1552, 1550, 1542,   86, 1548,   86,
-       86,   86, 1553,   86, 1554, 1555,   86,   86,   86,   86,
-     1549, 1556,   86,   86,   86, 1558,   86, 1557,   86, 1563,
-       86, 1559,   86, 1562,   86, 1566, 1560,   86, 1561,   86,
+     1518,   86,   86, 1521,   86,   86, 1516,   86, 1526,   86,
+       86, 1515,   86, 1527, 1519,   86, 1523, 1520, 1530,   86,
+       86, 1522, 1524, 1525,   86,   86,   86, 1531, 1528,   86,
+       86, 1529,   86,   86, 1533, 1537,   86,   86, 1532, 1538,
+     1534, 1535, 1539,   86, 1542, 1541,   86,   86, 1536,   86,
+       86, 1540,   86, 1546, 1547,   86, 1544, 1548, 1550,   86,
+       86, 1543,   86,   86, 1549,   86,   86,   86, 1551, 1545,
+     1555, 1552, 1554, 1556,   86, 1557,   86,   86, 1558,   86,
+     1559,   86,   86,   86, 1562,   86, 1553, 1560,   86,   86,
+       86, 1561,   86,   86, 1567,   86,   86, 1563,   86, 1566,
 
-     1565, 1569,   86, 1574, 1564, 1571, 1570,   86, 1567,   86,
-     1572,   86,   86,   86,   86,   86, 1568,   86,   86, 1573,
-     1578, 1582, 1577,   86,   86,   86, 1585,   86, 1575, 1583,
-       86, 1576,   86, 1579,   86, 1588, 1581, 1580,   86,   86,
-     1587,   86,   86,   86, 1586,   86,   86, 1596,   86, 1584,
-       86, 1594,   86, 1597, 1599,   86,   86, 1589, 1590, 1593,
-     1602, 1591, 1592, 1595, 1598, 1600,   86,   86,   86,   86,
-       86,   86, 1601, 1606,   86,   86,   86, 1607, 1604,   86,
-     1610, 1603,   86, 1605, 1614,   86,   86,   86,   86, 1616,
-     1608, 1611, 1609, 1615,   86,   86,   86,   86, 1613, 1612,
+       86, 1570, 1564, 1569, 1565,   86,   86, 1578, 1573,   86,
+     1568, 1575, 1571, 1574,   86,   86, 1576,   86,   86, 1572,
+       86,   86,   86,   86, 1586, 1577, 1582, 1581, 1579,   86,
+       86,   86, 1589,   86, 1580,   86, 1587,   86,   86, 1583,
+     1592, 1585, 1584, 1591,   86,   86,   86,   86,   86,   86,
+       86,   86, 1590,  163, 1593, 1588,   86, 1600,   86,   86,
+     1608, 1601, 1597, 1594, 1595, 1599, 1596, 1603,   86,   86,
+     1598, 1602, 1604,   86, 1605,   86,   86,   86,   86, 1606,
+     1610,   86,   86,   86, 1611,   86,   86, 1614,   86, 1607,
+     1609, 1618,   86, 1619, 1620,   86,   86, 1612, 1615, 1613,
 
-     1618, 1617, 1619,   86,   86,   86, 1625, 1620, 1621, 1626,
-       86,   86,   86,   86, 1622,   86, 1624,   86, 1630, 1631,
-     1629,   86,   86, 1623,   86,   86, 1633,   86,   86, 1627,
-       86, 1634, 1635,   86, 1628,   86,   86,   86, 1636, 1638,
-     1637, 1632,   86, 1641, 1640,   86,   86,   86,   86,   86,
-     1639,   86, 1642, 1645,   86, 1647,   86,   86, 1648,   86,
-     1652, 1646,   86,   86,   86, 1644, 1643,   86,   86, 1649,
-       86, 1650, 1655, 1657,   86,   86, 1653,   86, 1660, 1656,
-       86, 1654, 1651,   86, 1658,   86, 1662, 1663, 1659,   86,
-     1666,   86, 1661,  168, 1665,   86,   86,   86,   86,   86,
+       86,   86, 1617,   86,   86, 1616, 1623, 1624, 1625, 1622,
+     1621,   86,   86,   86, 1629, 1630,   86,   86,   86,   86,
+       86,   86, 1634, 1635, 1633,   86, 1637,   86,   86,   86,
+     1627, 1626,   86, 1628,   86, 1631,   86, 1638,   86, 1632,
+     1639,   86,   86,   86, 1640, 1636, 1642, 1644, 1641,   86,
+     1645,   86,   86,   86,   86,   86, 1643, 1646, 1649,   86,
+     1651,   86,   86,   86, 1652,   86, 1656,   86, 1650,   86,
+       86, 1648, 1647,   86,   86, 1659,   86, 1654,   86, 1653,
+     1662, 1657, 1661,   86,   86, 1664,   86, 1658, 1655, 1660,
+       86,   86,  168, 1663, 1667,   86,   86, 1666, 1670,   86,
 
-       86, 1674,   86,   86, 1664,   86,  159, 1675,   86, 1667,
-     1669,   86, 1672, 1668, 1678,   86, 1670, 1671,   86,   86,
-     1679,   86,   86, 1676, 1673, 1677, 1680,   86, 1681, 1682,
-       86, 1684,   86, 1686,   86, 1683, 1687,   86, 1685,   86,
-     1688,   86,   86, 1692,   86,   86, 1693,   86, 1690, 1691,
-       86, 1689,   86, 1694,   86,   86,   86, 1699, 1698,   86,
-       86, 1695,   86,   86, 3252, 1706,   86,   86, 1696, 1697,
-     1703,   86, 1701, 1704,   86,   86,   86, 1700, 1708, 1707,
-       86, 1711, 1702,   86, 1723, 1705, 1713, 1715, 1712, 1710,
-     1714,   86, 1716,   86, 1709,   86,   86, 1718,   86, 1720,
+     1665, 1669,   86,   86,   86,   86,   86, 1678, 1671,   86,
+     1668,   86,   86, 1672, 1679,   86, 1673,   86, 1676, 1682,
+       86,   86, 1674, 1675, 1683,   86, 1684, 1686,   86, 1688,
+     1677, 1680, 1681, 1687,   86,   86, 1690, 1685,   86, 1692,
+       86,   86,   86,   86,   86,   86,   86, 1697,   86, 1694,
+     1695,   86, 1691,   86, 1689,   86, 1698,   86,   86,   86,
+     1693, 1702, 1699,   86, 1703,   86,   86,   86, 1696, 1700,
+     1707, 1704, 1701, 1708, 1710,   86,   86, 1705, 1712, 1706,
+       86, 1711,   86,   86,   86, 1709,   86, 1757, 1715, 1717,
+     1719, 1714, 1718,   86, 1713, 1720,   86,   86,   86, 1722,
 
-     1717,   86, 1719,   86,   86,   86,   86,   86, 1721,   86,
-     1727,   86, 1726, 1728,   86,   86,   86, 1722, 1730,   86,
-     1729,   86, 1733,   86,   86, 1724, 1732, 1725,   86,   86,
-       86,   86, 1735, 1734, 1731,   86,   86,   86,   86,   86,
-       86, 1743,   86,   86,   86, 1738,   86,   86,   86, 1736,
-     1737, 1739, 1740, 1741, 1745, 1746, 1748, 1747,   86, 1744,
-       86, 1742,   86, 1753,   86,   86, 1749, 1750,   86, 1752,
-     1755,   86, 1751,   86, 1757,   86,   86,   86,   86,   86,
-     1754,   86, 1759, 1756,   86,   86,   86, 1762, 1764,   86,
-     1758, 1772,   86, 1765, 1763, 1761, 1766, 1773,   86,   86,
+     1724,   86, 1721,   86, 1723,   86,   86,   86,   86, 1716,
+     1725,   86,   86,   86,   86, 1731, 1730, 1732, 1734, 1733,
+     1726,   86,   86,   86,   86,   86, 1727,   86,   86,   86,
+     1728,   86, 1729, 1736, 1737,   86, 1738,   86,   86,   86,
+       86,   86,   86, 1739,   86, 1735, 1747, 1740,   86, 1741,
+     1748, 1742, 1743, 1744, 1753,   86,   86,   86, 1745,   86,
+       86,   86,   86, 1749, 1758,   86, 1746, 1750, 1751,   86,
+     1752,   86,   86,   86, 1762,   86, 1756, 1760,   86, 1754,
+       86, 1755,   86, 1761,   86,   86,   86,   86,   86, 1759,
+     1763,   86, 1764, 1767, 1769,   86,   86, 1777,   86,   86,
 
-     1760, 1767, 1771,   86, 1768,   86,   86,   86,   86, 1769,
-     1776, 1770, 1777,   86,   86, 1774,   86,   86,   86, 1778,
-       86, 1780, 1781, 1775,   86, 1789,   86, 1779,   86, 1784,
-       86,   86,   86, 1782, 1783, 1786,   86, 1788, 1787, 1790,
-       86,   86,   86, 1785,   86, 1792,   86,   86,   86, 1799,
-     1791,   86,   86, 3252, 1793, 1794, 1796,   86, 1795,   86,
-     1803, 1801, 1802,   86,   86, 1798,   86, 1800,   86, 1807,
-       86, 1797, 1805, 1811, 1804, 1806,   86,   86, 1812,   86,
-       86,   86,   86,   86, 1808, 1817, 1816,   86, 1810, 1809,
-     1813,   86, 1814, 1819,   86, 1820,   86, 1825,   86, 1822,
+     1766, 1768, 1776, 1780, 1765, 1770,   86, 1772, 1771,   86,
+     1773, 1778,   86, 1775,   86, 1774,   86, 1781, 1779, 1782,
+       86,   86, 1783,   86,   86,   86, 1785,   86, 1786,   86,
+       86,   86, 1794, 1795,   86, 1784, 1789,   86,   86, 1791,
+     1793, 1788, 1792, 1787,   86,   86,   86,   86, 1790,   86,
+       86,   86,   86, 1804,   86,   86,  161, 1796, 1797,   86,
+     1799, 1801, 1798, 1800, 1806,   86,   86,   86, 1808, 1803,
+     1805, 1807,   86,   86, 1810, 1802,   86, 1811, 1812, 1816,
+     1814,   86, 1809,   86, 1817,   86,   86,   86,   86,   86,
+     1813, 1822, 1821,   86, 1815, 1818, 1825,   86, 1819, 1824,
 
-     1818,   86, 1815, 1821,   86,   86, 1826, 1824,   86, 1827,
-     1823, 1828,   86, 1830,   86,   86,   86, 1829,   86,   86,
-       86, 3252, 1831,   86,   86,   86, 1834,   86,   86, 1835,
-     1840,   86, 1842,   86, 1832, 1833, 1836, 1837,   86, 1838,
-     1843, 1839,   86, 1845,   86,   86,   86,   86, 1846,   86,
-     1850, 1847, 1841,   86,   86, 1844,   86, 1854,   86,   86,
-     1849,   86,   86,   86, 1848, 1856,   86, 1857, 1858, 1852,
-       86, 1851, 1853,   86,  168, 1859,   86, 1864,   86, 1855,
-       86,   86, 1860,   86, 1868,   86, 1862,   86,   86, 1861,
-       86, 1863,   86, 1866,   86, 1870,   86, 1875,   86, 1865,
+       86, 1827,   86, 1830,   86,   86, 1823,   86, 1820, 1826,
+     1831, 1828,   86, 1829,   86, 1835,   86, 1833,   86,   86,
+       86,   86,   86, 1834,   86, 1832, 1836,   86,   86,   86,
+     1839,   86,   86, 1840, 1845,   86, 1847,   86, 1837, 1838,
+     1841, 1842,   86, 1843, 1848, 1844,   86, 1850,   86,   86,
+       86,   86, 1851,   86, 1855, 1852, 1846,   86,   86, 1849,
+       86, 1859,   86,   86, 1854,   86,   86,   86, 1853, 1861,
+       86, 1862, 1863, 1857,   86, 1856, 1858,   86,  168, 1864,
+       86, 1869,   86, 1860,   86,   86, 1865,   86, 1873,   86,
+     1867,   86,   86, 1866,   86, 1868,   86, 1871,   86, 1875,
 
-       86, 1869, 1867,   86, 1871,   86, 1872, 1879,   86, 1873,
-     1876, 1878,   86, 1881,   86, 1880, 1874,   86, 1877,   86,
-     1884,   86, 1882, 1885,   86,   86,   86, 1887, 1883,   86,
-       86,   86, 1888, 1886,   86,   86,   86,   86,   86,   86,
-     1893,   86, 1894,   86,   86,   86,   86, 1895, 1898,   86,
-     1889, 1896, 1891, 1890, 1892, 1899, 1897,   86,   86,   86,
-     1905, 1907, 1902, 1904, 1901, 1906,   86,   86, 1900, 1903,
-     1908,   86,   86,   86,   86,   86, 1913, 3252, 1909,   86,
-       86,   86, 1916, 1917,   86, 1918,   86,   86, 1911, 1920,
-       86, 1910,   86, 1912, 1914, 1919, 1915,   86, 1921,   86,
+       86, 1880,   86, 1870,   86, 1874, 1872,   86, 1876,   86,
+     1877, 1884,   86, 1878, 1881, 1883,   86, 1886,   86, 1885,
+     1879,   86, 1882,   86, 1889,   86, 1887, 1890,   86,   86,
+       86, 1892, 1888,   86,   86,   86, 1893, 1891,   86,   86,
+       86,   86,   86,   86, 1898,   86, 1899,   86,   86,   86,
+       86, 1900, 1903,   86, 1894, 1901, 1896, 1895, 1897, 1904,
+     1902,   86,   86,   86, 1910, 1912, 1907, 1909, 1906, 1911,
+       86,   86, 1905, 1908, 1913,   86,   86,   86,   86,   86,
+     1918,  159, 1914,   86,   86,   86, 1921, 1922,   86, 1923,
+       86,   86, 1916, 1925,   86, 1915,   86, 1917, 1919, 1924,
 
-     1922, 1924,   86, 1925, 1926, 1928,   86,   86, 1923, 1927,
-       86,   86, 1930,   86, 1933,   86, 1932, 1931,   86,   86,
-       86,   86, 1936,   86,   86, 1929, 1935,   86, 1939, 1938,
-       86, 1941,   86,   86,   86, 1940, 1948,   86,   86, 1934,
-       86, 1937,   86, 1950, 1942, 1943, 1944,   86, 1951,   86,
-       86, 1945, 1954, 1946, 1947, 1953,   86,   86, 1949, 1957,
-       86, 1952,   86,   86,   86,   86,   86, 1955,   86, 1958,
-     1961,   86, 1956,   86, 1963,   86,   86, 1966, 1967,   86,
-     1969,   86, 1959,   86, 1960,   86, 1964,   86, 1968,   86,
-     1962,   86, 1974,   86, 1971,   86, 1972, 1965,   86, 1975,
+     1920,   86, 1926,   86, 1927, 1929,   86, 1930, 1931, 1933,
+       86,   86, 1928, 1932,   86,   86, 1935,   86, 1938,   86,
+     1937, 1936,   86,   86,   86,   86, 1941,   86,   86, 1934,
+     1940,   86,   86, 1945,   86,   86, 1944,   86, 1947, 1942,
+     1946,   86,   86, 1939,   86, 1954, 1948, 1949, 1950, 1943,
+     1956,   86,   86, 1951,   86, 1957,   86, 1952,   86,   86,
+     1960, 1953, 1955,   86,   86, 1963, 1958,   86,   86, 1959,
+     1961,   86,   86, 1964, 1967,   86,   86, 1969, 1962,   86,
+       86,   86, 1972, 1973,   86,   86,   86, 1965,   86, 1966,
+     1975,   86,   86,   86, 1980, 1981,   86, 1977, 1968, 1970,
 
-       86,   86, 1978,   86,   86,   86, 1981,   86, 1970,   86,
-     1973, 1985, 1976, 1979, 1984,   86, 1977,   86,   86, 1980,
-     1988, 1989,   86, 1983,   86, 1987,   86,   86,   86, 1982,
-     1990,   86,   86, 1991,   86, 1986,   86,   86,   86, 1996,
-       86, 1992, 1993, 1994,   86, 1999, 1995, 2000, 2001,   86,
-       86,   86,   86,   86,   86, 1997, 2004,   86, 2009,   86,
-     2002,   86, 2008,   86, 1998, 2003,   86,   86,   86, 2006,
-       86, 2013, 2005, 2007, 2014, 2016,   86,   86, 2011, 2015,
-     2010, 2017,   86, 2020,   86, 2012,   86,   86, 2027,   86,
-       86,   86,   86, 2018,   86, 2024,   86,   86, 2019,   86,
+       86, 1978, 1971,   86,   86, 1974,   86,   86,   86,   86,
+     1987, 1976,   86, 1984, 1979,   86, 1985,   86,   86, 1983,
+     1991,   86, 1990, 1994, 1982, 1993,   86, 1995,   86,   86,
+       86, 1989,   86,   86, 1986, 1996,   86, 1997, 1988, 1998,
+       86, 1992,   86,   86,   86,   86, 2002, 2006, 1999,   86,
+     2005, 2007,   86,   86, 2001,   86,   86,   86,   86, 2000,
+     2010,   86, 2003,   86, 2015,   86,   86,   86, 2014,   86,
+     2009, 2004, 2008,   86,   86,   86, 2011, 2019, 2012,   86,
+     2020,   86, 2017, 2013, 2021, 2016, 2022,   86, 2018,   86,
+     2024, 2026,   86, 2023,   86, 2025,   86,   86,   86,   86,
 
-     2032, 2022, 2029, 2030,   86,   86, 2031, 2021, 2023,   86,
-       86, 2025, 2026,   86, 2028, 2037,   86, 2039, 2033, 2038,
-       86, 2034, 2040,   86, 2041, 2042, 2035,   86,   86,   86,
-       86,   86, 2046, 2036, 2044,   86,   86,   86,   86,   86,
-     2045, 2048,   86, 2051,   86, 2053,   86, 2047, 2049,   86,
-      168,   86,   86, 2043, 2055, 2054,   86,   86, 2056,   86,
-     2059, 2058,   86, 2060, 2050, 3252, 2052, 2061,   86, 2062,
-       86, 2057, 2064,   86,   86,   86,   86,   86,   86, 2063,
-     2065, 2066, 2068, 2067,   86,   86,   86, 2071, 2070, 2069,
-       86, 2072,   86,   86,   86, 2076,   86,   86, 2073, 2075,
+     2033,   86, 2027, 2030,   86,   86,   86,   86, 2028, 2035,
+     2036,   86,   86, 2037,   86, 2029, 2034, 2031, 2038, 2032,
+       86,   86, 2043,   86, 2047, 2042, 2044,   86, 2045, 2039,
+       86,   86, 2040, 2046,   86, 2048,   86, 2041,   86, 2052,
+       86,   86,   86, 2050,   86,   86, 2054,   86, 2051, 2057,
+       86,   86, 2053, 2059,   86,   86, 2055, 2049,  168,   86,
+       86,   86, 2061, 2060,   86,   86, 2062, 3267, 2065, 2064,
+       86, 2066, 2056, 2058, 2067,   86, 2068,   86, 2070, 2063,
+       86, 2069,   86,   86,   86,   86, 2071, 2072,   86, 2073,
+       86,   86,   86, 2075, 2074, 2076,   86, 2078,   86,   86,
 
-       86,   86, 2077,   86, 2074, 2078, 2079,   86, 2081,   86,
-     2080,   86, 2083,   86,   86,   86, 2088, 2082, 2086,   86,
-     2087,   86,   86,   86,   86,   86,   86,   86, 2093, 2084,
-     2090,   86, 2085,   86, 2097, 2096,   86, 2089, 2092, 2094,
-     2099, 2091,   86, 2095,   86, 2098,   86,   86, 2100, 2104,
-       86, 2102,   86,   86,   86, 2105,   86,   86,   86, 2110,
-     2103,   86, 2112, 2101,   86,   86, 2113, 2114,   86, 2106,
-     2107, 2108, 2109,   86, 2111, 2116,   86,   86, 2117,   86,
-     2119, 2115,   86,   86,   86, 2118,   86,   86, 2123, 2120,
-       86,   86,   86,   86,   86,   86,   86,   86,   86, 2124,
+     2082,   86, 2077, 2079, 2081,   86,   86,   86, 2087,   86,
+     2080, 2084, 2085,   86, 2083,   86, 2086,   86,   86,   86,
+       86,   86,   86, 2094, 2092,   86, 2089, 2093,   86,   86,
+       86,   86, 2099,   86, 2096, 2088, 2090,   86, 2091, 2095,
+       86,   86, 2103, 2100, 2098,   86, 2097,   86, 2104, 2102,
+       86, 2101,   86,   86, 2105, 2110,   86, 2108, 2107,   86,
+       86,   86, 2106, 2111,   86, 2116, 2109,   86,   86,   86,
+     2118,   86,   86,   86, 2119, 2112,   86, 2113, 3267, 2114,
+       86, 2115, 2120,   86, 2121, 2117, 2122,   86,   86, 2123,
+       86,   86, 2126,   86,   86, 2130, 2124, 2125,   86,   86,
 
-       86,   86,   86, 2131, 2122, 2121, 2126, 2127, 2128, 2136,
-       86, 2137, 2125, 2130, 2135,   86, 2132,   86, 2129,   86,
-     2133,   86, 2139,   86, 2134,   86, 2140, 2143, 2142,   86,
-       86,   86,   86,   86,   86, 2138, 2145, 2141,   86, 2146,
-       86,   86, 2147, 2149,   86,   86, 2151, 2144, 2148,   86,
-     2150, 2153, 2155,   86,   86, 2154,   86,   86,   86, 2152,
-     2158, 2157, 2159,   86,   86,   86,   86, 2163, 2160,   86,
-     2164, 2156, 2161,   86,   86,   86,   86, 2166,   86, 2165,
-     2169,   86,   86, 2170, 2162,   86, 2173,   86, 3252, 2168,
-     2174, 2171,   86, 2167,   86,   86, 2175,   86, 2172, 2179,
+     2127,   86, 2128,   86,   86,   86,   86,   86, 2131,   86,
+     2129,   86,   86, 2138,   86, 2133, 2134, 2135,   86, 2143,
+       86,   86, 2132,   86, 2137,   86, 2139,   86, 2146, 2150,
+     2142, 2140, 2136,   86, 2145, 2141,   86,   86, 2147, 2144,
+       86, 2149,   86, 2148,   86, 2152,   86,   86,   86, 2153,
+       86,   86, 2158, 2154,   86, 2151, 2156,   86,   86, 2160,
+     2157, 2162,   86,   86, 2155, 2165,   86,   86, 2161,   86,
+     2159, 2164, 2166,   86, 2167,   86, 2170,   86,   86,   86,
+       86,   86,   86, 2171, 2163,   86,   86, 2173, 2176,   86,
+     2172, 2168,   86, 2177,   86, 2169, 2178, 2180,   86, 2174,
 
-       86,   86, 2181, 2177,   86, 2176,   86, 2182,   86, 2180,
-       86, 2178,   86, 2183,   86, 2184, 2188,   86,   86,   86,
-       86, 2186, 2190,   86, 2187,   86, 2185, 2191,   86, 2192,
-     2193, 2194,   86,   86,   86,   86, 2197, 2195, 2189, 2196,
-     2200,   86, 2199,   86,   86, 2198,   86,   86,   86,   86,
-       86,   86,   86, 2201,   86,   86, 2209, 2210, 2206, 2207,
-     2203, 2202, 2204, 2211, 2205,   86,   86,   86,   86,   86,
-     2208, 2212, 2214,   86,   86, 2220,   86,  168, 2215,   86,
-     2222,   86, 2216, 2219, 2213,   86, 2217,   86, 2221, 2224,
-       86, 2228, 2223,   86, 2218, 2225, 2229,   86, 2230, 2227,
+     2175,   86,   86,   86, 2182, 2179, 2181,   86, 2186,   86,
+     2187,   86, 2183,   86, 2188, 2184,   86, 2189,   86,   86,
+     2190,   86,   86, 2185, 2191,   86, 2197, 2195,   86,   86,
+     2193, 2198,   86, 2194,   86,   86, 2192, 2199,   86,   86,
+     2202, 2200,   86, 2196, 2203,   86, 2201, 2207,   86,   86,
+       86, 2204,   86,   86, 2206,   86,   86,   86,   86,   86,
+       86,   86, 2205, 2216,   86,   86, 2211, 2208, 2209, 2210,
+     2212, 2213, 2214,   86, 2218,   86, 2215,   86, 2217, 2223,
+     2222, 2219,   86, 2221,   86,   86, 2225, 2227,   86,   86,
+     2229,   86,   86, 2226, 2220,   86, 2231,   86, 2228,  168,
 
-     2226, 2231,   86,   86,   86, 2232,   86,   86, 2235,   86,
-       86, 2233,   86, 2234,   86, 2236, 2240,   86, 2242, 2239,
-       86, 2241, 2244,   86, 2246,   86,   86,   86,   86, 2237,
-     2243, 2245, 2247,   86,   86, 2249,   86,   86,   86, 2248,
-     2238,   86, 2250,   86,   86, 2251,   86, 2252,   86, 2255,
-       86,   86, 2254, 2258,   86,   86, 2253,   86, 2264,   86,
-     2256, 2257, 2262,   86,   86,   86,   86, 2260, 2259, 2265,
-       86, 2267,   86,   86, 2261,   86,   86, 2263, 2266, 2269,
-     2272,   86, 2270, 2275,   86,   86,   86,   86,   86, 2273,
-     2268,   86, 2271, 2276,   86,   86,   86,   86,   86, 2274,
+     2224, 2235, 2232, 2237, 2230, 2238, 2236,   86, 2233,   86,
+       86,   86,   86, 2239,   86, 2242,   86,   86, 2243,   86,
+     2240, 2234, 2247,   86,   86, 2248,   86,   86, 2246, 2251,
+       86,   86, 2244,   86, 2241,   86, 2252, 2257, 2249,   86,
+     2253, 2254,   86, 2245,   86, 2250, 2256,   86,   86, 2255,
+     2258, 2259,   86,   86,   86,   86,   86,   86,   86, 2262,
+       86,   86, 2265,   86,   86, 2271,   86,   86, 2260, 2269,
+     2264, 2272,   86,   86,   86,   86, 2266, 2267, 2261, 2263,
+     2268,   86, 2276,   86,   86, 2270, 2274, 2273,   86, 2279,
+       86, 2282,   86, 2278,   86, 2277,   86,   86,   86, 2275,
 
-       86,   86,   86, 2291, 2287, 2277, 2278,   86, 2283, 2288,
-       86, 2279,   86, 2281, 2286, 2280, 2282, 2285, 2284, 2289,
-       86,   86,   86, 2292,   86, 2294, 2290,   86, 2295, 2296,
-       86, 2297,   86,   86,   86, 2300, 2293,   86,   86, 2298,
-     2303,   86, 2304,   86,   86,   86, 2299, 2301,   86, 2305,
-     2302,   86,   86, 2306, 2310,   86,   86, 2307, 2311,   86,
-     2313,   86,   86, 2309,   86, 2308, 2315,   86,   86, 2317,
-       86, 2312, 2318,   86, 2314, 2319,   86, 2316,   86, 2321,
-       86,   86, 2320, 2325,   86,   86, 2324, 2327,   86,   86,
-       86,   86, 2322,   86, 2330,   86, 2329,   86, 2331, 2323,
+       86, 2280, 2283,   86,   86,   86,   86,   86, 2281,   86,
+     3267,   86,   86, 2297,   86, 2284, 2285, 2290, 2295,   86,
+     2293, 2286, 2288, 2294, 2287, 2289, 2292, 2291,   86,   86,
+     2296,   86,   86, 2301, 2298, 2299,   86,   86, 2303, 2304,
+       86, 2305,   86,   86, 2300,   86,   86,   86, 2308, 2302,
+     2311,   86, 2312,   86, 2309,   86,   86, 2310, 2306, 2307,
+     2313, 2314,   86,   86,   86, 2318,   86, 2319,   86,   86,
+     2321,   86,   86, 2323,   86,   86, 2317,   86, 2326,   86,
+     2325,   86, 2315, 2316, 2327,   86,   86,   86, 2320,   86,
+     2322,   86, 2324,   86,   86, 2328, 2329, 3267, 2332,   86,
 
-     2333,   86,   86,   86, 2326, 2337,   86, 2328,   86,   86,
-     2335,   86, 2334, 2332,   86, 2341, 2342,   86,   86,   86,
-       86, 2336,   86, 2338, 2340, 2344, 2347,   86,   86,   86,
-       86, 2339,   86, 2343, 2345, 2349,   86, 2346, 2348,   86,
-     2354,   86,   86, 2350,   86,   86, 2356,   86, 2351,   86,
-     2352, 2355, 2357, 2360,   86,   86,   86,   86,   86, 2361,
-     2362, 2366, 2353,   86,   86, 3252,   86, 2358, 2365, 2359,
-     2363, 2364,   86,   86, 2371, 2373,   86, 2368, 2369, 2370,
-       86,   86,   86, 2367, 2372,   86,   86, 2374,   86, 2377,
-     2375, 2376,   86,   86,   86, 2378,   86, 2379, 2384,   86,
+     2330, 2333,   86, 2335,   86, 2337,   86,   86, 2331, 2338,
+     2334,   86, 2336,   86, 2339, 2341,   86,   86, 2345,   86,
+       86,   86,   86,   86, 2350,   86, 2342, 2349,   86, 2340,
+     2344,   86, 2343,   86,   86,   86, 2352, 2348, 2355,   86,
+     2346,   86,   86,   86, 2347,   86,   86, 2351, 2353, 2354,
+     2357,   86, 2362,   86,   86, 2356, 2358,   86,   86, 2359,
+     2364,   86, 2363, 2360, 2365,   86, 2368,   86,   86,   86,
+     2369,   86, 2361, 2370,   86,   86, 2374,   86,   86, 2366,
+     2372, 2367, 2371, 2376,   86, 2379,   86, 2381,   86, 2377,
+     2373,   86, 2378,   86,   86,   86, 2380,   86, 2386, 2382,
 
-     2383, 2385, 2380, 2381,   86, 2382,   86,   86,   86, 2390,
-     2386,   86, 2389,   86, 2391,   86,  168, 2388,   86, 2387,
-       86, 2393, 2392,   86, 2398,   86,   86,   86,   86,   86,
-       86,   86,   86,   86, 2405,   86, 2396, 2400, 2394, 2397,
-     2395, 2399, 2401, 2402, 2403, 2404,   86, 2408, 2409,   86,
-       86, 2406, 2407,   86, 2410, 2411,   86,   86,   86, 2414,
-     2412, 2415,   86, 2413, 2418,   86,   86,   86, 2417,   86,
-       86, 2416,   86, 2419,   86,   86, 2423, 2424, 2420,   86,
-       86,   86, 2428,   86, 2421,   86, 2426, 2429,   86, 2427,
-       86, 2431,   86, 2422, 2425, 2430, 2432,   86,   86,   86,
+     2375, 2385, 2383,   86,   86,   86,   86,   86,   86, 3267,
+     2392, 2384, 2387, 2388, 2389, 2390,   86, 2393,   86,   86,
+       86, 2391, 2394,   86,   86, 2397, 2398,   86, 2395, 2396,
+       86, 2399,   86,  168,   86, 2404, 2406,   86, 2401, 2400,
+       86,   86,   86,   86,   86,   86,   86, 2402, 3267, 2403,
+     2405, 2408,   86, 2409,   86, 2407, 2412, 2413,   86, 2410,
+     2411, 2417,   86, 2414, 2416, 3267, 2415,   86, 2418, 2419,
+       86,   86,   86, 2422, 2420, 2423,   86, 2421,   86,   86,
+       86,   86, 2425,   86,   86, 2424,   86, 2427,   86,   86,
+     2431, 2432, 2426,   86, 2429,   86, 2428,   86, 2434,   86,
 
-       86, 2433,   86, 2435, 2436,   86,   86, 2438,   86,   86,
-       86,   86,   86, 2437, 2442, 2445,   86, 2444, 2434,   86,
-       86,   86, 2446, 2441,   86,   86, 2439,   86, 2440, 2449,
-       86, 2443,   86,   86, 2454,   86,   86, 2447, 2453, 2448,
-       86,   86, 2451, 2452, 2455,   86, 2450, 2456, 2525, 2457,
-       86, 2458,   86,   86, 2461, 2459,   86, 2463, 2460,   86,
-     2462, 2465,   86,   86,   86, 2467,   86,   86,   86,   86,
-       86, 2464,   86, 2466, 2471,   86,   86, 2475,   86,   86,
-     2473, 2474, 2469, 2476,   86, 2468, 2470, 2477,   86, 2478,
-       86,   86,   86,   86,   86, 2479, 2481, 2486, 2472, 2484,
+       86,   86,   86, 2435, 2436, 2437,   86, 2430,   86, 2433,
+     2439, 2441,   86, 2438,   86, 2440,   86,   86, 2443,   86,
+     2442, 2444,   86,   86, 2446, 2445,   86,   86,   86,   86,
+     2453, 2450,   86,   86, 2452,   86,   86, 2447, 2454,   86,
+     2449,   86,   86, 2448,   86,   86, 2458,   86, 2451, 2463,
+       86, 2455, 2462,   86, 2456,   86, 2460,   86, 2457, 3267,
+       86, 2461, 2465, 2459, 2466, 2464,   86, 2467,   86,   86,
+     2470, 2468,   86,   86, 2472,   86, 2471, 2474,   86, 2469,
+       86, 2476,   86,   86, 2475, 2473,   86,   86,   86,   86,
+       86,   86,   86, 2480,   86, 2482, 2483, 2484,   86,   86,
 
-       86,   86,   86,   86,   86,   86, 2483, 2489,   86,   86,
-     2485, 2482, 2480,   86,   86, 2493, 2490, 2494,   86, 2488,
-     2487,   86,   86,   86, 2491,   86, 2495, 2492,   86,   86,
-     2498, 2499, 2497,   86,   86,   86,   86, 3252,   86,   86,
-     2496, 2503, 2500, 2505, 2506,   86, 2502, 2501, 2507,   86,
-     2508,   86, 2509,   86,   86, 2504,   86, 2511,   86, 2513,
-       86, 2512,   86, 2514,   86,   86, 2510,   86, 2519,   86,
-       86,   86, 2515, 2521,   86,   86, 2516, 2522,   86,   86,
-       86,   86, 2523, 2518,   86, 2517, 2528, 2524,   86, 2520,
-       86, 2526, 2531,   86,   86,   86,   86,   86,   86, 2532,
+     2478, 2477, 2486, 2479, 2485,   86,   86, 2487,   86,   86,
+     2488,   86, 2493,   86, 2489, 2481, 2490,   86, 2491, 2495,
+       86, 2492,   86, 2498,   86,   86, 2494,   86,   86,   86,
+     2499,   86,   86, 2502, 2503,   86,   86, 2497, 2496,   86,
+       86, 2504,   86, 2509,   86, 2507, 2508, 2500,   86, 2501,
+       86, 2506,   86,   86,   86, 2512,   86, 2505, 3267, 2514,
+     2515,   86, 2510,   86, 2511, 2516,   86, 2517,   86, 2518,
+       86,   86,   86, 2513, 2520, 2519, 2521,   86, 2522,   86,
+     2523,   86,   86,   86, 2524, 2528,   86,   86, 2530,   86,
+     2531,   86,   86, 2525,   86,   86,   86,   86,   86, 2527,
 
-     2527,  168,   86, 2539, 2529,   86,   86,   86, 2530, 2535,
-       86,   86, 2537, 2538, 2540, 2534,   86,   86, 2550,   86,
-     2533, 2536, 2541,   86, 2543, 2542, 2546,   86,   86,   86,
-       86, 2547, 2548, 2544, 2549, 2551,   86,   86, 2552, 2545,
-       86, 2553,   86, 2554,   86,   86, 2555,   86,   86, 2557,
-       86,   86,   86,   86,   86, 2556, 2565,   86,   86,   86,
-     2558, 2563,   86,   86, 2569,   86, 2560, 2559, 2570,   86,
-       86, 2562, 2561, 2564, 2571,   86, 2567, 2566,   86, 2573,
-     2568, 2574,   86,   86, 2575, 2576,   86, 2572,   86,   86,
-       86,   86,   86, 3252,   86, 2579, 2577, 2585,   86, 2586,
+       86, 2534, 2526, 2532,   86, 2537, 2529, 2533, 2535, 2540,
+       86,   86,   86,   86,   86,   86,   86, 2536, 2538,  168,
+     2541,   86, 2548,   86, 2539,   86,   86, 2544,   86,   86,
+     2546, 2547, 2549, 2543,   86,   86, 2559,   86, 2542, 2545,
+     2550, 2551,   86,   86,   86, 2555, 2552,   86, 2557, 2556,
+       86, 2553, 2558, 2560,   86,   86, 2561, 2554,   86, 2562,
+       86, 2563, 2564,   86,   86,   86,   86,   86,   86, 2566,
+       86,   86,   86,   86, 2565, 2574,   86,   86,   86, 2567,
+     2572,   86, 2578,   86, 2569, 2568, 2579,   86, 2571, 2570,
+     2573,   86, 2575, 2580, 2576, 2577, 2583,   86,   86,   86,
 
-       86, 2578,   86,   86, 2580,   86,   86,   86, 2581, 2582,
-     2583, 2584, 2588, 2589,   86, 2590,   86, 2591,   86,   86,
-     2587, 2592, 2593,   86, 2594,   86,   86,   86,   86, 2599,
-     2595, 2598, 2600,   86,   86,   86, 2601,   86, 2596, 2597,
-     2602,   86,   86,   86, 2604,   86,   86, 2603,   86,   86,
-     2608, 3252,   86,   86, 2606, 2612, 2605, 2613,   86,   86,
-     2616,   86,   86, 2607,   86,   86, 2609, 2610, 2614, 2611,
-       86,   86, 2620,   86, 2617, 2619,   86, 2615, 2621, 2618,
-       86,   86, 2623, 2625,   86,   86,   86, 2629,   86,   86,
-     2628, 2622,   86, 2626, 2627, 2631,   86, 2632,   86,   86,
+     2582, 2585,   86,   86,   86, 2581,   86, 2584,   86,   86,
+       86, 2588,   86, 2594,   86, 2595,   86, 2586,   86,   86,
+       86, 2587,   86, 2589, 2590,   86, 2592, 2591, 2598, 2599,
+       86, 2593, 2600,   86, 2601, 2603,   86, 2597, 2596,   86,
+       86,   86,   86, 2602, 2605,   86,   86,   86, 2609, 2611,
+     2608, 2610,   86, 2612,   86, 2604,   86,   86,   86,   86,
+       86, 2606, 2607,   86,   86,   86, 2614,   86, 2618,   86,
+       86, 2616, 2622, 2623,   86, 2613,   86, 2615, 2626,   86,
+     2617,   86,   86,   86, 2619, 2621, 2620, 2627, 2625,   86,
+       86, 2624,   86, 2629, 2630,   86, 2628, 2632,   86, 2635,
 
-     2624,   86, 2636,   86,   86, 2637,   86, 2633, 2630, 2639,
-       86,   86,   86, 2635,   86, 2634,   86,   86, 2644,   86,
-     2646,   86,   86, 2642, 2640, 2641, 2643, 2647, 2638,   86,
-       86, 2645,   86,   86, 2648,   86,   86, 2650,   86, 3252,
-       86, 2651,   86,   86, 2649, 2653, 2654, 2656, 2657,   86,
-     2659,   86, 2660,   86, 2652, 2655, 2661,  168,   86,   86,
-       86,   86, 2666, 3252, 2658, 2662, 2663,   86,   86,   86,
-     2668,   86, 2667, 3252,   86, 2671,   86, 2664, 2665, 2670,
-     2672,   86,   86, 2674,   86,   86, 2669, 2676, 2675,   86,
-       86,   86, 2677,   86, 2678, 2673, 2679, 2681,   86,   86,
+       86,   86,   86, 2631,   86, 2639,   86,   86, 2638, 2641,
+       86, 2637, 2633, 2636,   86,   86,   86,   86, 2634, 2642,
+     2646,   86,   86, 2647, 2643,   86, 2640, 2649,   86, 2645,
+       86,   86, 2644,   86, 2654,   86,   86,   86, 2656,   86,
+       86,   86, 2652, 2650, 2651, 2653, 2657, 2648,   86,   86,
+       86,   86, 2655, 2658, 2659, 2660,   86, 2661,   86,   86,
+       86, 3267,   86,   86,   86, 2663, 2664, 2666, 2667, 2673,
+     2662, 2669,   86,   86, 2665, 2668, 2670,   86, 2671,  168,
+     2672,   86,   86, 2676,   86,   86,   86, 2678,   86,   86,
+     2677,   86, 2681,   86, 2682,   86, 2680, 2683,   86, 2674,
 
-       86,   86, 2682,   86, 2680, 2683,   86,   86, 2684, 2688,
-       86, 2689,   86,   86, 2686,   86, 2685,   86, 2690,   86,
-       86,   86, 2691,   86, 2694, 2693,   86,   86, 2687,   86,
-     2698,   86, 2696,   86, 2697, 2692, 2699,   86, 2695, 2704,
-     2700,   86, 2701,   86, 2702,   86, 2703, 2705,   86,   86,
-       86,   86, 2709,   86,   86,   86,   86, 2713,   86, 2711,
-       86,   86,   86, 2718,   86,   86, 2717, 2706, 3252, 2707,
-     2708, 2712, 2720, 2710, 2714, 2715, 2721, 2722,   86, 2723,
-       86, 2716,   86,   86,   86,   86,   86,   86,   86,   86,
-     2719, 2725, 2724, 2728, 2726,   86,   86, 2731,   86,   86,
+     2675, 2684,   86, 2679,   86, 2686, 3267, 2685,   86,   86,
+     2687,   86, 2690, 2688, 2689, 2691,   86,   86,   86,   86,
+     2692,   86, 2693,   86,   86,   86, 2698, 2694,   86, 2699,
+     2700, 2696,   86,   86, 2695,   86,   86,   86,   86,   86,
+     2701, 2703, 2704,   86,   86, 2697,   86,   86, 2706, 2702,
+     2705, 2707,   86,   86, 2712, 2708, 2710, 2709,   86,   86,
+     2715, 2711,   86,   86,   86,   86,   86, 2713, 2716,   86,
+     2720,   86,   86,   86, 2722,   86,   86, 2714, 2724,   86,
+       86,   86, 2717,   86, 2718, 2728, 2729,   86, 2719, 3267,
+     2723, 2721, 2725, 2731, 2732, 2726, 2727, 2733,   86,   86,
 
-     2727, 3252, 2729, 2733,   86, 2734,   86, 2735,   86,   86,
-     2730,   86,   86, 2736, 2738,   86, 2732, 2737,   86, 2739,
-       86, 2742,   86, 2740,   86, 2745, 2743,   86, 2746,   86,
-       86, 2744, 2741, 2747,   86,   86,   86,   86, 2748,   86,
-     2750, 2752,   86, 2749,   86, 2753, 2754,   86, 2756,   86,
-       86,   86, 2755, 2760, 2761,   86, 2751, 2758,   86,   86,
-       86, 2763, 2762, 2757,   86, 2759, 2764,   86,   86,   86,
-     2769,   86,   86,   86,   86, 2768,   86, 2771, 2772,   86,
-       86,   86, 2774, 2765, 2766, 2773,   86,   86, 2767, 2775,
-     2777,   86, 2778,   86,   86,   86, 2770, 2776, 2779, 2780,
+       86, 2734,   86,   86,   86,   86, 2735,   86, 2730, 2736,
+       86,   86,   86,   86, 2737, 2739,   86, 2742, 2744,   86,
+     2738, 2745,   86,   86, 2740, 2746,   86, 2741,   86,   86,
+       86, 2743, 2747,   86, 2748, 2749,   86,   86, 2751, 2753,
+       86, 2756, 2752, 2750, 2754,   86, 2757,   86, 2758,   86,
+       86,   86,   86, 2759,   86, 2763,   86, 2755,   86, 2764,
+     2765,   86,   86,   86, 2760, 2767,   86,   86,   86, 2771,
+     2761, 2772,   86,   86, 2762,   86, 2768, 2766,   86,   86,
+       86, 2774, 2770, 2773,   86, 2769, 2775,   86, 2780,   86,
+     2779,   86, 2783,   86,   86, 2782, 2776,   86, 2777,   86,
 
-     2781,   86, 2785,   86,   86,   86,   86,   86, 2787,   86,
-       86, 2782,   86, 2792, 2783, 2784, 2788, 2791, 2786, 2793,
-     2789, 2796,   86,   86, 2794,   86, 2790,   86, 2797,   86,
-     2798, 2795,   86, 2799,   86, 2800,   86,   86,   86, 2801,
-       86, 2802,   86,   86,   86,   86,   86, 2806, 2810,   86,
-       86,   86, 2807, 2811, 2813,   86,   86, 2803, 2814, 2805,
-     2815,   86, 2812,   86, 2804, 2808, 2809,   86, 2816, 2817,
-       86,   86,   86,   86, 2821,   86, 2818, 2822,   86, 2823,
-     2819, 2820, 2824,   86, 2826,   86,   86,   86,   86, 2827,
-       86, 2830,   86, 2831, 2829, 2832,   86,   86, 2825, 2828,
+     2778,   86, 2784,   86, 2786,   86,   86, 2785, 2788,   86,
+     2789,   86,   86,   86, 2781,   86, 2792, 2796,   86,   86,
+       86, 2804,   86, 2790, 2791,   86, 2805,   86, 2787, 2795,
+     2793,   86,   86, 2794, 2797, 2798, 2800,   86, 2801, 2802,
+     2803, 2807,   86, 2799, 2806,   86, 2808,   86, 2809,   86,
+     2810,   86, 2811,   86,   86,   86,   86,   86,   86, 2813,
+       86,   86, 2816,   86,   86, 2818, 2822,   86,   86, 2812,
+     2819, 2823,   86, 2825,   86, 2814,   86, 2817,   86, 2827,
+       86, 2828, 2815, 2820, 2821, 2826, 2829,   86,   86,   86,
+     2824,   86,   86, 2834,   86,   86,   86, 2830, 2831, 2835,
 
-     2833,   86,   86,   86,   86,   86, 2834,   86,   86, 2842,
-       86,   86, 2837,   86,   86,   86, 2838, 2840, 2845, 2846,
-     2836,   86, 2835, 2843,   86, 2847,   86, 2841,   86,   86,
-     2839, 2844,   86, 2849, 2880, 2848,   86, 2850, 2852,   86,
-     2851, 2853,   86, 2854,   86,   86,   86,   86,   86, 2856,
-     2859, 2857, 2858, 2860, 2855,   86,   86, 2862,   86,   86,
-     2861,   86,   86,   86, 2863,   86, 2868, 2866, 2870,   86,
-       86, 2864,   86,   86, 2871,   86,   86, 2874, 2872,   86,
-     2873, 2867, 2865,   86,   86,   86, 2879,   86,   86,   86,
-     2869,   86,   86, 2882,   86,   86,   86,   86, 2875, 2876,
+     2832,   86, 2838,   86,   86, 2836,   86, 2839,   86,   86,
+     2833, 2843, 2841, 2842, 2844,   86, 2837, 2840, 2845,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+     3267, 2854, 2849,   86, 2846, 2852, 2850,   86, 2857,   86,
+     2848, 2855,   86, 2859, 2858,   86, 2847, 2853,   86, 2856,
+     2851,   86, 2862, 2861, 2860, 2863, 2864,   86, 2865,   86,
+     2866,   86,   86,   86,   86,   86, 2871,   86,   86, 2870,
+       86, 2867,   86, 2872,   86, 2873, 2874,   86,   86,   86,
+       86,   86,   86, 2868, 2869, 2875, 2876, 2878, 2880, 2882,
+       86,   86,   86,   86,   86, 2883,   86, 2879, 2884, 2877,
 
-     2877, 2881, 2886, 2878, 2883,   86, 2888, 2884,   86,   86,
-     2887, 2885, 2891,   86, 2889, 2893,   86, 2894,   86,   86,
-     2896,   86,   86,   86,   86,   86, 2901,   86, 2892, 2900,
-       86,   86,   86,   86, 2890,   86, 2905,   86, 2897, 2898,
-     2895, 2899, 2908,   86,   86,   86, 2910, 2906,   86,   86,
-     2902, 2904,   86, 2911, 2903,   86, 2907, 2913,   86, 2914,
-       86, 2916,   86,   86, 2909,   86, 2918, 2912, 2921, 2915,
-       86,   86, 2919,   86,   86, 2925,   86,   86,   86, 2927,
-     2926, 2917,   86, 2923,   86, 2920, 2930, 2931,   86, 2922,
-     2933,   86,   86, 2924, 2928,   86,   86,   86, 2932, 2936,
+     2887, 2885,   86, 2886,   86, 2881,   86, 2888, 2891,   86,
+       86,   86,   86,   86,   86,   86, 2894,   86,   86, 2889,
+       86, 2900, 2895, 2892, 2893, 2898, 2890,   86,   86,   86,
+     2896,   86, 2899,   86, 2897,   86, 2902, 2901, 2904,   86,
+     2906,   86, 2907,   86, 2909,   86,   86,   86,   86,   86,
+     2905, 2910,   86, 2913, 2908, 2903, 2914,   86,   86,   86,
+     2918,   86, 2911, 2912,   86, 2921,   86,   86, 2923, 2915,
+       86,   86, 2926,   86,   86, 2916, 2924, 2917, 2919,   86,
+     2920, 2927,   86, 2929,   86,   86,   86, 2922,   86,   86,
+       86, 2934, 2925,   86,   86, 2932, 2931,   86,   86, 2928,
 
-       86,   86, 2935,   86, 2929, 2939, 2937,   86,   86, 2934,
-       86,   86, 2942,   86,   86,   86,   86, 2947,   86,   86,
-     2943,   86, 2938, 2949, 2940, 2941, 2951,   86, 2944, 2946,
-     2950, 2952,   86,   86, 2948,   86,   86,   86, 2953, 2945,
-       86, 2955, 2956,   86, 2957,   86, 2958,   86, 2960, 2954,
-       86, 2962,   86,   86,   86, 2961,   86,   86,   86, 2963,
-       86, 2967,   86, 2959, 2968,   86,   86,   86, 2972,   86,
-     2973,   86, 2969,   86, 2974, 2964, 2971, 3252, 2965, 2966,
-       86,   86, 2970,   86, 2978,   86, 2975, 2982, 2977, 2979,
-       86,   86, 2976,   86,   86, 2981, 2980,   86, 2985,   86,
+       86, 2936, 3127, 2930, 2938,   86, 2941,   86, 2933, 2935,
+     2939,   86, 2940, 2937, 2943, 2944,   86, 2946, 2942,   86,
+       86,   86, 2945,   86,   86, 2949,   86,   86,   86, 2948,
+     2952,   86, 2950, 2955,   86,   86,   86,   86,   86, 2947,
+       86,   86, 2960,   86, 2964,   86,   86, 2951, 2953, 2954,
+     2956,   86,   86, 2957, 2959, 2962, 2965,   86,   86, 2961,
+     2967, 2963, 2958, 2966,   86, 2969,   86, 2970,   86, 2968,
+     2971,   86,   86,   86, 2974,   86,   86, 2976,   86,   86,
+       86, 2975,   86,   86,   86, 2972,   86, 2981, 2982,   86,
+       86,   86, 2986,   86, 2977, 2987,   86, 2988, 2983, 2973,
 
-       86,   86,   86,   86,   86, 2984, 2983, 2986, 2989,   86,
-       86,   86,   86,   86,   86, 2991, 2990,   86, 2992,   86,
-     2987, 2988,   86,   86,   86,   86,   86,   86, 3084, 3001,
-     2993, 3002, 2994, 2995, 3003, 2996, 2998, 2999, 2997, 3004,
-       86,   86,   86,   86, 3000,   86, 3005, 3006, 3007, 3009,
-       86, 3010,   86, 3008,   86,   86, 3014,   86, 3011,   86,
-     3012, 3013, 3015,   86, 3016, 3017,   86,   86, 3018, 3019,
-     3022,   86, 3020, 3021,   86,   86, 3023,   86,   86,   86,
-       86,   86, 3029,   86, 3030,   86, 3028,   86,   86, 3032,
-       86,   86, 3024, 3025, 3031,   86, 3252, 3033, 3026,   86,
+     2985, 2978,   86,   86, 2979, 2980,   86,   86, 2992,   86,
+     2984,   86, 2991, 2993,   86,   86, 2994, 2996,   86,   86,
+     2999,   86, 2989,   86,   86, 2990,   86, 2998,   86, 2995,
+     2997, 3000,   86,   86,   86,   86,   86, 3003,   86,   86,
+     3005,   86,   86, 3006, 3001, 3004,   86,   86, 3002,   86,
+       86,   86,   86,   86, 3015, 3007, 3016, 3011, 3008, 3009,
+     3010, 3018,   86, 3012, 3013, 3088,   86,   86, 3014,   86,
+     3017, 3019, 3020,   86, 3021, 3022, 3023,   86, 3024,   86,
+       86, 3026,   86,   86, 3025, 3029,   86,   86, 3027, 3030,
+       86, 3037, 3028, 3031, 3032,   86,   86, 3033, 3034,   86,
 
-     3027,   86, 3037,   86, 3036, 3034, 3038,   86, 3041, 3035,
-     3039,   86,   86, 3044, 3040,   86, 3046,   86, 3045,   86,
-       86, 3042,   86,   86, 3043,   86,   86,   86, 3050, 3054,
-     3051,   86, 3048, 3053,   86,   86, 3062, 3055, 3056,   86,
-     3047, 3049, 3057,   86,   86, 3052, 3058,   86, 3252, 3059,
-     3060,   86, 3061,   86, 3063,   86, 3064,   86, 3065,   86,
-     3066,   86, 3067,   86, 3068,   86, 3069,   86,   86, 3071,
-       86,   86,   86,   86,   86,   86,   86, 3070, 3076,   86,
-     3072,   86,   86,   86, 3073,   86, 3080,   86, 3079, 3077,
-     3082,   86,   86, 3074, 3075, 3078, 3081,   86, 3086,   86,
+       86, 3035, 3036,   86,   86, 3038,   86,   86,   86,   86,
+     3044,   86,   86, 3039, 3043,   86, 3047, 3040, 3061, 3041,
+       86,   86, 3046,   86,   86,   86,   86, 3042,   86, 3048,
+       86, 3052,   86, 3045, 3051, 3077, 3049, 3053,   86, 3054,
+       86, 3050,   86, 3055,   86, 3059,   86, 3056,   86,   86,
+     3060,   86,   86, 3057, 3065,   86, 3058, 3062, 3068,   86,
+     3066, 3063, 3069,   86,   86, 3071,   86, 3121,   86, 3064,
+     3070, 3067, 3072,   86, 3073,   86,   86, 3075,   86, 3076,
+       86, 3074, 3078,   86, 3079,   86, 3080,   86, 3081,   86,
+     3082,   86, 3083,   86, 3084,   86,   86, 3086,   86,   86,
 
-     3089, 3083, 3088,   86,   86,   86,   86,   86,   86, 3091,
-     3087,   86,   86, 3085, 3095,   86,   86, 3090,   86,   86,
-       86, 3096, 3099, 3252, 3092, 3093,   86, 3094, 3101,   86,
-     3097, 3100, 3102,   86, 3103,   86,   86,   86,   86,   86,
-       86, 3106, 3098, 3104,   86, 3105, 3107,   86,   86, 3111,
-     3112, 3110, 3108,   86,   86, 3114,   86,   86,   86,   86,
-     3115,   86, 3109,   86,   86,   86,   86,   86, 3113,   86,
-     3121, 3124,   86, 3118, 3126, 3116, 3117, 3122, 3120,   86,
-     3129,   86,   86,   86, 3119, 3123, 3127, 3125, 3131,   86,
-       86, 3130,   86, 3132, 3133,   86, 3134,   86,   86, 3128,
+       86,   86,   86, 3091,   86, 3085,   86,   86, 3087,   86,
+       86,   86, 3095, 3097,   86,   86, 3092,   86, 3099, 3093,
+     3089, 3090, 3094,   86, 3096, 3098,   86, 3101,   86, 3104,
+       86, 3103,   86,   86,   86,   86,   86, 3106,   86,   86,
+       86, 3102,   86, 3100, 3105, 3110,   86, 3111,   86, 3114,
+     3109,   86, 3107,   86, 3108, 3112, 3116,   86, 3117,   86,
+       86, 3115, 3118,   86,   86,   86,   86,   86, 3113, 3120,
+       86,   86, 3126, 3122, 3119,   86, 3129, 3125, 3123,   86,
+       86,   86,   86,   86, 3130, 3128,   86,   86, 3124,   86,
+       86,   86, 3136,   86, 3139,   86, 3133,   86, 3131, 3132,
 
-       86, 3137, 3135,   86,   86, 3138,   86, 3142, 3139,   86,
-     3136,   86,   86,   86,   86,   86, 3145, 3147,   86, 3148,
-       86, 3141,   86, 3143, 3144, 3151,   86,   86,   86, 3140,
-     3149, 3154,   86,   86, 3146,   86, 3155,   86, 3158,   86,
-       86, 3150, 3152, 3159,   86, 3156, 3153,   86,   86,   86,
-       86,   86, 3157, 3160,   86, 3163, 3164,   86,   86, 3162,
-     3161, 3165,   86,   86,   86,   86,   86, 3169, 3168, 3166,
-     3171, 3167,   86,   86,   86,   86,   86,   86, 3170, 3173,
-     3176, 3177,   86, 3172, 3184, 3174, 3178,   86, 3182,   86,
-       86,   86, 3175,   86, 3179, 3180, 3183,   86, 3185,   86,
+     3141, 3135, 3137,   86, 3144,   86, 3145, 3134, 3138, 3146,
+       86, 3140,   86, 3143,   86, 3147,   86, 3142, 3148,   86,
+     3149,   86,   86,   86,   86, 3152,   86,   86, 3153, 3154,
+       86, 3150, 3157,   86,   86,   86, 3151,   86,   86, 3160,
+     3162,   86, 3156,   86, 3158, 3159, 3163,   86, 3166,   86,
+       86, 3155, 3164,   86,   86, 3161, 3169,   86,   86, 3170,
+       86, 3173, 3165, 3174,   86, 3167,   86,   86, 3171,   86,
+       86, 3168,   86, 3172, 3179,   86,   86, 3178, 3175, 3176,
+     3180,   86,   86,   86,   86,   86,   86, 3184,   86, 3177,
+       86, 3186,   86,   86,   86,   86,   86, 3181, 3183, 3191,
 
-       86, 3181,   86, 3190, 3186, 3187,   86, 3188,   86,   86,
-     3191,   86, 3189, 3192, 3193,   86,   86,   86,   86,   86,
-     3194, 3199,   86,   86, 3196, 3195, 3252,   86,   86, 3202,
-     3203,   86,   86,   86,   86,   86, 3201, 3197, 3198, 3206,
-       86, 3200, 3204,   86, 3210, 3205,   86,   86,   86,   86,
-     3214, 3207, 3211, 3209, 3208, 3252,   86,   86, 3216, 3212,
-       86, 3217,   86,   86,   86, 3221,   86, 3218,   86,   86,
-     3219, 3223,   86, 3222, 3213, 3215, 3224,   86,   86, 3225,
-       86,   86,   86, 3220,   86, 3226, 3228, 3230,   86,   86,
-       86,   86,   86,   86, 3232, 3233,   86, 3236,   86, 3227,
+     3192,   86, 3182, 3188,   86, 3185, 3189, 3187, 3193,   86,
+       86, 3190, 3197,   86, 3199, 3198, 3194,   86, 3200, 3195,
+       86,   86,   86, 3196,   86,   86, 3201, 3202, 3205, 3203,
+     3206,   86,   86,   86,   86, 3208,   86, 3207,   86,   86,
+       86,   86, 3209, 3214, 3204,   86, 3211,   86,   86,   86,
+       86, 3217, 3210, 3218,   86,   86,   86,   86,   86, 3212,
+     3213, 3216, 3221,   86, 3215, 3219, 3222,   86, 3220,   86,
+     3225, 3224, 3226,   86, 3223,   86, 3227,   86, 3229,   86,
+     3231,   86, 3232,   86,   86,   86, 3236,   86, 3233, 3267,
+       86, 3234, 3239,   86, 3230, 3237,   86,   86, 3238, 3228,
 
-     3252, 3229, 3252, 3231, 3237,   86,   86, 3240, 3241,   86,
-     3234, 3235, 3238,   86, 3243,   86,   86, 3239, 3244,   86,
-     3242,   86,   86, 3245,   86,   86, 3246, 3247, 3250,   86,
-     3251,   86, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3248, 3249,   47,   47,   47,   47,   47,
-       47,   47,   52,   52,   52,   52,   52,   52,   52,   57,
-       57,   57,   57,   57,   57,   57,   63,   63,   63,   63,
-       63,   63,   63,   68,   68,   68,   68,   68,   68,   68,
-       74,   74,   74,   74,   74,   74,   74,   80,   80,   80,
-       80,   80,   80,   80,   89,   89, 3252,   89,   89,   89,
+       86,   86,   86,   86, 3235,   86,   86, 3240, 3241,   86,
+     3243, 3245,   86,   86, 3247,   86, 3242,   86, 3248,   86,
+     3251, 3244, 3246, 3252,   86, 3249,   86,   86, 3255, 3256,
+       86,   86, 3258,   86, 3250,   86, 3253,   86, 3257, 3259,
+       86,   86, 3260,   86,   86, 3254, 3261, 3267, 3262, 3265,
+       86, 3266,   86, 3267, 3267, 3267, 3263, 3267, 3267, 3267,
+     3267, 3267, 3267, 3264,   47,   47,   47,   47,   47,   47,
+       47,   52,   52,   52,   52,   52,   52,   52,   57,   57,
+       57,   57,   57,   57,   57,   63,   63,   63,   63,   63,
+       63,   63,   68,   68,   68,   68,   68,   68,   68,   74,
 
-       89,  158,  158, 3252, 3252, 3252,  158,  158,  160,  160,
-     3252, 3252,  160, 3252,  160,  162, 3252, 3252, 3252, 3252,
-     3252,  162,  165,  165, 3252, 3252, 3252,  165,  165,  167,
-     3252, 3252, 3252, 3252, 3252,  167,  169,  169, 3252,  169,
-      169,  169,  169,  172, 3252, 3252, 3252, 3252, 3252,  172,
-      175,  175, 3252, 3252, 3252,  175,  175,   90,   90, 3252,
-       90,   90,   90,   90,   17, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+       74,   74,   74,   74,   74,   74,   80,   80,   80,   80,
+       80,   80,   80,   89,   89, 3267,   89,   89,   89,   89,
+      158,  158, 3267, 3267, 3267,  158,  158,  160,  160, 3267,
+     3267,  160, 3267,  160,  162, 3267, 3267, 3267, 3267, 3267,
+      162,  165,  165, 3267, 3267, 3267,  165,  165,  167, 3267,
+     3267, 3267, 3267, 3267,  167,  169,  169, 3267,  169,  169,
+      169,  169,  172, 3267, 3267, 3267, 3267, 3267,  172,  175,
+      175, 3267, 3267, 3267,  175,  175,   90,   90, 3267,   90,
+       90,   90,   90,   17, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
 
-     3252, 3252, 3252, 3252, 3252
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267
     } ;
 
-static const flex_int16_t yy_chk[6406] =
+static const flex_int16_t yy_chk[6425] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2210,18 +2217,18 @@ static const flex_int16_t yy_chk[6406] =
         5,    3,    6,   24,    4,   24,   24,    5,   24,    6,
         7,    7,    7,    7,   24,    7,    8,    8,    8,    8,
        33,    8,    7,    9,    9,    9,   26,   26,    8,   10,
-       10,   10,   19,   29,    9,   33,   19,   29, 3260,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3275,   35,
        10,   11,   11,   11,   11,   11,   11,   13,   13,   13,
 
        13,   34,   13,   11,   35,   99,   34,   29,   38,   13,
        51,   51,   11,   12,   12,   12,   12,   12,   12,   14,
        14,   14,   14,   99,   14,   12,   15,   15,   15,   38,
        23,   14,   23,   23,   12,   23,   46,   15,   16,   16,
-       16,   23,   23,   25,   27,   27,   25,   25, 2661,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2671,   16,
        25,   46,   27,   30,   30,   25,   27,   56,   40,   27,
        56,   73,   31,   31,   25,   28,   67,   67,   30,   32,
        28,   31,   40,   32,   28,   73,   32,   28,   92,   28,
-       28,   92,   31,   32, 1075,   32,   36,   36,   37,   37,
+       28,   92,   31,   32, 1076,   32,   36,   36,   37,   37,
        28,   45,   45,   37,  175,   36,   45,   39,   41,   41,
 
        45,   36,   39,   41,   94,   36,   39,   43,   43,   37,
@@ -2389,524 +2396,526 @@ static const flex_int16_t yy_chk[6406] =
       753,  749,  750,  756,  753,  755,  749,  754,  756,  755,
       757,  758,  749,  749,  759,  760,  761,  752,  760,  764,
 
-      762,  761,  761,  763,  763,  772,  758,  762,  766,  757,
+      762,  761,  761,  763,  763,  755,  758,  762,  766,  757,
       765,  765,  767,  766,  764,  767,  768,  769,  769,  759,
       770,  768,  770,  771,  772,  773,  774,  778,  775,  773,
       776,  777,  777,  781,  779,  771,  780,  780,  776,  783,
-      782,  794,  778,  784,  794,  785,  774,  775,  779,  784,
-      785,  781,  782,  786,  786,  789,   80,  787,  790,  791,
-      789,  783,  787,  787,  790,  791,  792,  793,  795,  796,
-      800,  792,  799,  793,  795,  797,  797,  796,  798,  798,
-      799,  801,  802,  803,  804,  804,  801,  805,  800,  802,
-      806,  807,  807,  808,  809,  811,  805,  812,  806,  808,
+      782,   80,  778,  772,  784,  803,  774,  775,  779,  785,
+      784,  781,  782,  787,  785,  786,  786,  789,  787,  787,
+      790,  783,  789,  791,  803,  792,  790,  793,  794,  791,
+      792,  794,  795,  793,  796,  797,  797,  799,  795,  798,
+      798,  800,  796,  801,  802,  799,  804,  804,  801,  805,
+      808,  802,  806,  807,  807,  809,  808,  811,  805,  800,
 
-      813,  815,  803,  814,  811,  818,  812,  819,  814,  816,
-      815,  817,  816,  809,  820,  821,  817,  823,  823,  818,
-      822,  824,  825,  820,  813,  822,  822,  827,  821,  826,
-      835,  828,  819,  830,  828,  830,  824,  832,  826,  831,
-      831,  825,  828,  833,  834,  837,  836,  839,  833,  838,
-      835,  827,  840,  841,  842,  843,  839,  841,  832,  846,
-      847,  845,  844,  848,  850,  834,  836,  837,  844,  838,
-      845,  846,  842,  853,  843,  840,  849,  848,  850,  847,
-      851,  854,  849,  852,  852,  851,  855,  856,  857,  858,
-      854,  859,  860,  853,  861,  856,  862,  864,  865,  863,
+      806,  812,  813,  814,  815,  818,  811,  819,  814,  816,
+      812,  817,  816,  815,  809,  820,  817,  821,  824,  818,
+      823,  823,  822,  825,  820,  826,  813,  822,  822,  827,
+      821,  832,  819,  824,  826,  828,  834,  830,  828,  830,
+      831,  831,  825,  833,  835,  836,  828,  837,  833,  839,
+      838,  840,  832,  827,  842,  841,  843,  834,  839,  841,
+      844,  846,  845,  847,  835,  836,  844,  848,  853,  837,
+      838,  845,  842,  846,  840,  843,  850,  849,  854,  851,
+      855,  848,  847,  849,  851,  852,  852,  854,  853,  856,
+      850,  857,  858,  859,  863,  860,  861,  856,  862,  864,
 
-      861,  866,  862,  864,  869,  870,  855,  866,  857,  867,
-      859,  858,  860,  863,  871,  867,  868,  870,  865,  871,
-      868,  872,  874,  869,  877,  870,  873,  873,  874,  875,
-      876,  879,  875,  878,  880,  880,  881,  877,  882,  878,
-      883,  884,  872,  882,  887,  883,  883,  888,  876,  885,
-      889,  879,  890,  885,  881,  889,  884,  886,  886,  892,
-      893,  896,  895,  897,  899,  899,  887,  888,  900,  902,
-      902,  890,  900,  903,  893,  895,  901,  905,  904,  906,
-      921,  896,  904,  892,  897,  898,  921,   75,  898,  908,
-      898,  901,  905,  906,  898,  907,  898,  915,  903,  909,
+      855,  865,  861,  866,  862,  864,  868,  867,  863,  866,
+      868,  857,  859,  867,  858,  860,  869,  870,  871,  872,
+      874,  865,  879,  871,  873,  873,  874,  875,  876,  870,
+      875,  877,  878,  880,  880,  869,  881,  870,  878,  887,
+      872,  884,  879,  882,  877,  883,  876,  888,  882,  885,
+      883,  883,  890,  885,  881,  889,  884,  886,  886,  892,
+      889,  887,  893,  897,  895,  896,  900,  888,  899,  899,
+      900,  890,  901,  902,  902,  903,  893,  895,  904,  905,
+      925,  925,  904,  892,  897,  896,  898,  901,  907,  898,
+      906,  898,  908,  907,  905,  898,  910,  898,  911,  915,
 
-      907,  898,  910,  908,  909,  909,  898,  911,  912,  915,
-      913,  910,  912,  914,  916,  917,  918,  919,  914,  916,
-      923,  911,  922,  920,  912,  913,  923,  922,  914,  917,
-      924,  919,  920,  925,  925,  926,  924,  918,  927,  928,
-      926,  929,  932,  933,  927,  930,  935,  938,  933,  936,
-      936,  937,  934,  939,  932,  938,  937,  940,  935,  942,
-      929,  928,  941,  930,  931,  931,  934,  939,  943,  945,
-      931,  950,  931,  946,  943,  942,  940,  944,  931,  947,
-       74,  941,  944,  931,  931,  948,  948,  945,  949,  946,
-      931,  950,  949,  952,  954,  953,  955,  947,  953,  952,
+      903,  913,  898,  909,  906,  910,  908,  898,  909,  909,
+      912,  915,  911,  914,  912,  916,  913,  917,  914,  918,
+      916,  919,  922,  920,  921,  928,  912,  922,  914,  926,
+      921,  917,  920,  923,  926,  919,  924,  927,  929,  923,
+      918,  930,  924,  927,  932,  933,  935,  928,  934,  937,
+      933,  936,  936,  939,  937,  938,  932,  929,  935,  930,
+      931,  931,  934,  938,  940,  941,  931,  939,  931,  942,
+      943,  946,  944,  948,  931,  945,  943,  944,  947,  931,
+      931,  949,  949,  940,  941,  942,  931,  945,  950,  946,
+      951,  948,  950,  953,  947,  954,  955,  957,  954,  953,
 
-      956,  958,  957,  960,  963,  961,  956,  957,  962,  955,
-      963,  965,  960,  954,  961,  967,  964,  966,  968,  969,
-      958,  970,  966,  973,  962,  964,  974,  971,  972,  973,
-      965,  977,  968,  970,  975,  967,  971,  972,  979,  969,
-      975,  980,  982,  974,  981,  984,  983,  977,  985,  986,
-      989,  995,  979,  985,  986,  989,  982,  990,  991,  991,
-      984,  980,  992,  981,  983,  993,  990,  995,  992,  996,
-     1000, 1001,  998,  998,  996,  996,  998,  999,  993, 1002,
-      999, 1003, 1005, 1004, 1000, 1007, 1006, 1008, 1009, 1010,
-     1011, 1001, 1006, 1008, 1010, 1002, 1004, 1005, 1013, 1003,
+      956,  958,  959,  957,  963,  961,  958,  962,  966,  965,
+      951,  964,  968,  956,  961,  955,  962,  964,  965,  967,
+      963,  959,  969,  970,  967,  971,  972,  966,  974,  973,
+      975,  980,  968,  976,  974,  972,  969,  971,  973,  976,
+      978,  981,  985,  970,  982,  980,  983,  975,  984,  986,
+      987,  992,  992,  990,  986,  987,  978,  985,  990,  991,
+      983,  981,  994,  982,  993,  996,  984,  997,  991, 1001,
+      993, 1000,  997,  997, 1000,  994,  999,  999, 1002, 1003,
+      999,  996, 1004, 1001, 1005, 1007, 1006, 1008, 1009, 1010,
+     1014, 1007, 1012, 1014, 1009, 1003, 1015, 1005, 1002, 1018,
 
-     1014, 1013, 1015, 1009, 1011, 1007, 1016, 1015, 1017, 1018,
-     1019, 1016, 1022, 1020, 1018, 1019, 1023, 1024, 1022, 1028,
-     1025, 1014, 1027, 1024, 1017, 1020, 1025, 1026, 1026, 1031,
-     1029, 1027, 1023, 1029, 1030, 1030, 1032, 1028, 1033, 1034,
-     1035, 1038, 1034, 1036, 1037, 1043, 1038, 1031, 1041, 1036,
-     1037, 1039, 1040, 1035, 1041, 1032, 1039, 1040, 1033, 1044,
-     1045, 1048, 1046, 1043, 1047, 1047, 1045, 1046, 1049, 1050,
-     1048, 1051, 1052, 1053, 1054, 1052, 1053, 1049, 1055, 1044,
-     1056, 1057, 1058, 1059, 1060, 1054, 1061, 1050, 1058, 1059,
-     1051, 1061, 1056, 1062, 1062, 1063, 1055, 1064, 1065, 1060,
+     1004, 1006,   75, 1011, 1010, 1016, 1012, 1008, 1011, 1017,
+     1016, 1019, 1021, 1020, 1017, 1018, 1019, 1015, 1020, 1023,
+     1024, 1025, 1026, 1028, 1021, 1023, 1029, 1025, 1026, 1027,
+     1027, 1030, 1028, 1032, 1030, 1033, 1024, 1031, 1031, 1034,
+     1035, 1037, 1036, 1035, 1029, 1039, 1038, 1037, 1040, 1044,
+     1039, 1032, 1038, 1040, 1033, 1036, 1041, 1042, 1045, 1034,
+     1046, 1041, 1051, 1042, 1047, 1049, 1046, 1044, 1050, 1047,
+     1048, 1048, 1052, 1053, 1049, 1055, 1053, 1050, 1045, 1054,
+     1051, 1056, 1054, 1057, 1058, 1061, 1055, 1059, 1060, 1063,
+     1063, 1052, 1062, 1059, 1060, 1057, 1064, 1062, 1065, 1056,
 
-     1057, 1066, 1067, 1068, 1069, 1066, 1070, 1072, 1073, 1073,
-     1065, 1064, 1068, 1074, 1063, 1076, 1078, 1077, 1080, 1079,
-     1067, 1081, 1081, 1069, 1079, 1082, 1072, 1080, 1078, 1076,
-     1083, 1070, 1077, 1074, 1084, 1085, 1083, 1086, 1088, 1087,
-     1084, 1087, 1086, 1088, 1089, 1082, 1090, 1091, 1092, 1093,
-     1094, 1085, 1091, 1096, 1095, 1098, 1098, 1094, 1089, 1099,
-     1090, 1100, 1101, 1092, 1102, 1103,   68, 1106, 1093, 1095,
-     1102, 1106, 1096, 1099, 1114, 1104, 1111, 1101, 1108, 1100,
-     1104, 1107, 1107, 1108, 1113, 1103, 1109, 1109, 1110, 1104,
-     1111, 1104, 1114, 1112, 1104, 1110, 1112, 1115, 1117, 1116,
+     1061, 1066, 1067, 1058, 1068, 1069, 1067, 1070, 1071, 1073,
+     1074, 1074, 1065, 1066, 1069, 1064, 1075, 1077, 1079, 1078,
+     1080, 1083, 1068, 1081, 1086, 1080, 1070,   74, 1073, 1084,
+     1079, 1077, 1081, 1071, 1078, 1084, 1075, 1082, 1082, 1085,
+     1086, 1083, 1087, 1089, 1088, 1085, 1088, 1087, 1089, 1090,
+     1091, 1092, 1093, 1094, 1095, 1096, 1092, 1097, 1099, 1099,
+     1100, 1095, 1101, 1090, 1091, 1103, 1102, 1093, 1104,   68,
+     1096, 1103, 1094, 1105, 1100, 1107, 1097, 1111, 1105, 1107,
+     1101, 1102, 1108, 1108, 1111, 1109, 1112, 1105, 1104, 1105,
+     1109, 1114, 1105, 1110, 1110, 1113, 1115, 1116, 1113, 1117,
 
-     1118, 1120, 1119, 1113, 1116, 1121, 1115, 1119, 1122, 1124,
-     1124, 1127, 1118, 1125, 1126, 1120, 1121, 1117, 1125, 1126,
-     1128, 1130, 1129, 1131, 1132, 1128, 1129, 1122, 1133, 1134,
-     1130, 1127, 1137, 1135, 1138, 1136, 1139, 1140, 1131, 1132,
-     1141, 1134, 1136, 1142, 1137, 1143, 1141, 1133, 1135, 1144,
-     1145, 1146, 1147, 1138, 1149, 1140, 1148, 1139, 1142, 1145,
-     1150, 1151, 1154, 1157, 1153, 1143, 1146,   63, 1148, 1144,
-     1153, 1147, 1155, 1158, 1156, 1150, 1159, 1154, 1158, 1149,
-     1161, 1151, 1156, 1157, 1160, 1163, 1155, 1162, 1159, 1160,
-     1160, 1164, 1164, 1166, 1168, 1167, 1169, 1169, 1163, 1161,
+     1112, 1118, 1120, 1119, 1117, 1121, 1116, 1120, 1123, 1128,
+     1114, 1122, 1125, 1125, 1115, 1119, 1126, 1131, 1127, 1121,
+     1118, 1126, 1122, 1127, 1130, 1129, 1131, 1123, 1130, 1128,
+     1129, 1132, 1133, 1134, 1136, 1137, 1135, 1139, 1138, 1140,
+     1141, 1144, 1137, 1145, 1143, 1142, 1132, 1133, 1135, 1136,
+     1138, 1142, 1134, 1146, 1147, 1148, 1139, 1151, 1141, 1143,
+     1140, 1144, 1146, 1145, 1149, 1150, 1152, 1153, 1156, 1147,
+     1158, 1155, 1157, 1159, 1148, 1160, 1149, 1155, 1158, 1161,
+     1160, 1152, 1151, 1156, 1150, 1163, 1157, 1153, 1164, 1162,
+     1165, 1161, 1169, 1159, 1162, 1162, 1166, 1166, 1168, 1171,
 
-     1168, 1162, 1165, 1165, 1167, 1171, 1166, 1165, 1170, 1176,
-     1165, 1165, 1172, 1170, 1171, 1165,   58, 1173, 1172, 1174,
-     1179, 1165, 1173, 1180, 1174, 1165, 1175, 1175, 1177, 1177,
-     1176, 1178, 1182, 1181, 1178, 1184, 1178, 1185, 1183, 1186,
-     1179, 1180, 1181, 1183, 1187, 1186, 1188, 1190,   57, 1184,
-     1187, 1188, 1182, 1189, 1197, 1185, 1190, 1189, 1191, 1191,
-     1195, 1190, 1193, 1190, 1195, 1190, 1196, 1190, 1192, 1192,
-     1198, 1192, 1197, 1193, 1201, 1200, 1203, 1199, 1204, 1198,
-     1202, 1196, 1199, 1199, 1200, 1202, 1205, 1204, 1206, 1207,
-     1203, 1208, 1209, 1209, 1210, 1211, 1201, 1208, 1213, 1212,
+     1171, 1169, 1164, 1165, 1163, 1167, 1167, 1172, 1173, 1170,
+     1167, 1168, 1172, 1167, 1167, 1170, 1174, 1173, 1167, 1178,
+     1175, 1176, 1174, 1181, 1167, 1175, 1176, 1182, 1167, 1177,
+     1177, 1179, 1179, 1180, 1184, 1183, 1180, 1185, 1180, 1186,
+     1178, 1187, 1185, 1181, 1183, 1182, 1188, 1193, 1193, 1189,
+       63, 1190, 1188, 1186, 1184, 1189, 1190, 1191, 1192, 1187,
+     1195, 1191, 1194, 1194, 1197, 1194, 1198, 1192, 1197, 1199,
+     1200, 1195, 1192, 1203, 1192, 1202, 1192, 1201, 1192, 1200,
+     1204, 1198, 1201, 1201, 1202, 1204, 1205, 1199, 1206, 1207,
+     1208, 1209, 1210, 1211, 1211, 1203, 1212, 1206, 1210, 1213,
 
-     1215, 1214, 1210, 1207, 1212, 1205, 1216, 1206, 1217, 1211,
-     1214, 1219, 1213, 1217, 1218, 1218, 1220, 1220, 1215, 1221,
-     1223, 1221, 1224, 1223, 1225, 1226, 1219, 1224, 1227, 1227,
-     1228, 1216, 1229, 1229, 1226, 1230, 1230, 1231, 1232, 1233,
-     1234, 1234, 1231, 1225, 1235, 1236, 1237, 1238, 1236, 1239,
-     1228, 1240, 1238, 1240, 1241, 1244, 1245, 1246, 1239, 1232,
-     1233, 1245, 1243, 1247, 1235, 1243, 1237, 1248, 1247, 1249,
-     1244, 1246, 1241, 1250, 1249, 1248, 1251, 1251, 1250, 1252,
-     1253, 1254, 1255, 1256, 1252, 1258, 1259, 1254, 1260, 1255,
-     1262, 1258, 1259, 1260, 1261, 1263, 1256, 1264, 1253, 1262,
+     1205, 1214, 1215, 1216, 1212, 1209, 1214, 1217, 1207, 1208,
+     1218, 1221, 1216, 1213, 1219, 1227, 1215, 1220, 1220, 1219,
+     1222, 1222, 1223, 1226, 1223, 1217, 1221, 1225, 1226, 1228,
+     1225, 1229, 1229, 1230, 1227, 1218, 1231, 1231, 1228, 1232,
+     1232, 1233, 1234, 1235, 1236, 1236, 1233, 1237, 1238, 1239,
+     1240, 1238, 1241, 1230, 1242, 1240, 1242, 1243, 1246, 1245,
+     1247, 1241, 1245, 1234, 1235, 1247, 1248, 1237, 1255, 1239,
+     1250, 1249, 1251, 1246, 1252, 1243, 1249, 1251, 1250, 1252,
+     1248, 1253, 1253, 1254, 1256, 1257, 1255, 1258, 1254, 1260,
+     1256, 1261, 1257, 1262, 1264, 1260, 1263, 1261, 1262, 1265,
 
-     1261, 1265, 1265, 1266, 1268, 1269, 1270, 1271, 1264, 1272,
-     1273, 1275, 1276, 1271, 1263, 1272, 1273, 1275, 1277, 1268,
-     1278, 1279, 1280, 1266, 1281, 1269, 1276, 1282, 1282, 1270,
-     1283, 1284, 1276, 1279, 1285, 1288, 1280,   52, 1277, 1286,
-     1278, 1291, 1281, 1289, 1286, 1287, 1287, 1293, 1289, 1292,
-     1283, 1295, 1285, 1294, 1292, 1292, 1284, 1296, 1288, 1295,
-     1291, 1297, 1294, 1298, 1299, 1293, 1300, 1308, 1301, 1299,
-     1301, 1296, 1299, 1302, 1304, 1300, 1297, 1306, 1298, 1305,
-     1304, 1298, 1309, 1305, 1307, 1310, 1308, 1302, 1306, 1307,
-     1307, 1311, 1312, 1313, 1314, 1315, 1311, 1312, 1316, 1318,
+     1258, 1266, 1263, 1264, 1267, 1267, 1268, 1270, 1271, 1272,
+     1273, 1274, 1266, 1275, 1277, 1278, 1273, 1274, 1265, 1275,
+     1277, 1279, 1270, 1280, 1281, 1282, 1268, 1283, 1271, 1278,
+     1284, 1284, 1272, 1285, 1286, 1278, 1281, 1287, 1290, 1282,
+       58, 1279, 1288, 1280, 1293, 1283, 1291, 1288, 1289, 1289,
+     1295, 1291, 1294, 1285, 1297, 1287, 1296, 1294, 1294, 1286,
+     1298, 1290, 1297, 1293, 1299, 1296, 1300, 1301, 1295, 1302,
+     1310, 1303, 1301, 1303, 1298, 1301, 1304, 1306, 1302, 1299,
+     1308, 1300, 1307, 1306, 1300, 1311, 1307, 1309, 1312, 1310,
+     1304, 1308, 1309, 1309, 1313, 1314, 1315, 1316, 1317, 1313,
 
-     1315, 1319, 1320, 1310, 1321, 1321, 1322, 1323, 1309, 1324,
-     1322, 1313, 1326, 1318, 1314, 1325, 1327, 1328, 1316, 1319,
-     1320, 1325, 1329, 1330, 1326, 1323, 1331, 1332, 1324, 1333,
-     1335, 1328, 1332, 1336, 1334, 1327, 1333, 1329, 1330, 1334,
-     1337, 1337, 1336, 1338, 1339, 1331, 1340, 1343, 1335, 1341,
-     1341, 1342, 1346, 1339, 1344, 1344, 1345, 1342, 1338, 1347,
-     1348, 1343, 1345, 1349, 1350, 1348, 1340, 1357, 1346, 1349,
-     1350, 1351, 1351, 1352, 1352, 1354, 1354, 1355, 1356, 1358,
-     1347, 1355, 1359, 1360, 1363, 1357, 1361, 1356, 1362, 1362,
-     1365, 1358, 1364, 1361, 1366, 1365, 1359, 1367, 1360, 1370,
+     1314, 1318, 1320, 1317, 1321, 1322, 1312, 1323, 1323, 1324,
+     1325, 1311, 1326, 1324, 1315, 1328, 1320, 1316, 1327, 1329,
+     1330, 1318, 1321, 1322, 1327, 1331, 1332, 1328, 1325, 1333,
+     1334, 1326, 1335, 1337, 1330, 1334, 1338, 1336, 1329, 1335,
+     1331, 1332, 1336, 1339, 1339, 1338, 1340, 1341, 1333, 1342,
+     1346, 1337, 1343, 1343, 1344, 1349, 1341, 1345, 1347, 1347,
+     1344, 1340, 1348, 1345, 1346, 1350, 1360, 1351, 1348, 1342,
+     1352, 1349, 1351, 1353, 1354, 1354, 1352, 1355, 1355, 1353,
+     1357, 1357, 1359, 1358, 1360, 1361, 1350, 1358, 1362, 1363,
+     1366, 1359, 1364, 1365, 1365, 1367, 1368, 1361, 1369, 1364,
 
-     1364, 1368, 1371, 1371, 1363, 1369, 1368, 1368, 1366, 1372,
-     1369, 1369, 1373, 1374, 1376, 1375, 1367, 1377, 1378, 1370,
-     1375, 1379, 1374, 1381, 1380, 1383, 1382, 1379, 1372, 1380,
-     1391, 1373, 1382, 1376, 1384, 1385, 1378, 1377, 1386, 1387,
-     1384, 1385, 1388, 1389, 1383, 1390, 1393, 1393, 1392, 1381,
-     1394, 1391, 1395, 1394, 1396, 1396, 1399, 1386, 1387, 1390,
-     1399, 1388, 1389, 1392, 1395, 1397, 1397, 1398, 1400, 1401,
-     1402, 1403, 1398, 1403, 1405, 1406, 1407, 1403, 1401, 1408,
-     1406, 1400, 1409, 1402, 1410, 1410, 1413, 1414, 1411, 1412,
-     1403, 1407, 1405, 1411, 1418, 1412, 1420, 1415, 1409, 1408,
+     1370, 1368, 1362, 1367, 1363, 1373, 1374, 1374, 1371, 1375,
+     1366, 1372, 1369, 1371, 1371, 1376, 1372, 1372, 1377, 1370,
+     1379, 1378, 1380, 1381, 1382, 1373, 1378, 1377, 1375, 1384,
+     1382, 1383, 1385, 1386, 1376, 1389, 1383, 1387, 1385, 1379,
+     1388, 1381, 1380, 1387, 1390, 1391, 1388, 1392, 1393, 1394,
+     1395, 1404, 1386,   57, 1389, 1384, 1396, 1396, 1397, 1398,
+     1404, 1397, 1393, 1390, 1391, 1395, 1392, 1399, 1399, 1401,
+     1394, 1398, 1400, 1400, 1401, 1402, 1403, 1405, 1406, 1402,
+     1406, 1408, 1409, 1410, 1406, 1411, 1412, 1409, 1414, 1403,
+     1405, 1413, 1413, 1414, 1415, 1416, 1417, 1406, 1410, 1408,
 
-     1414, 1413, 1415, 1416, 1417, 1419, 1421, 1416, 1417, 1422,
-     1422, 1424, 1421, 1426, 1418, 1427, 1420, 1428, 1428, 1429,
-     1427, 1430, 1436, 1419, 1437, 1429, 1432, 1432, 1434, 1424,
-     1440, 1434, 1435, 1435, 1426, 1441, 1439, 1443, 1436, 1439,
-     1437, 1430, 1442, 1442, 1441, 1444, 1445, 1447, 1446, 1449,
-     1440, 1450, 1443, 1446, 1448, 1448, 1451, 1452, 1449, 1453,
-     1453, 1447, 1454, 1455, 1457, 1445, 1444, 1456, 1460, 1450,
-     1462, 1451, 1456, 1458, 1458, 1463, 1454, 1461, 1461, 1457,
-     1459, 1455, 1452, 1464, 1459, 1465, 1463, 1464, 1460, 1466,
-     1468, 1468, 1462, 1469, 1466, 1470, 1471, 1472, 1473, 1474,
+     1415, 1418, 1412, 1419, 1420, 1411, 1418, 1419, 1420, 1417,
+     1416, 1421, 1422, 1423, 1424, 1425, 1425, 1427, 1429, 1430,
+     1424, 1431, 1431, 1432, 1430, 1433, 1435, 1435, 1439, 1432,
+     1422, 1421, 1440, 1423, 1437, 1427, 1443, 1437, 1444, 1429,
+     1438, 1438, 1446, 1442, 1439, 1433, 1442, 1444, 1440, 1445,
+     1445, 1447, 1448, 1449, 1450, 1452, 1443, 1446, 1449, 1451,
+     1451, 1453, 1454, 1455, 1452, 1456, 1456, 1457, 1450, 1458,
+     1459, 1448, 1447, 1463, 1460, 1459, 1462, 1454, 1465, 1453,
+     1462, 1457, 1461, 1461, 1464, 1464, 1466, 1458, 1455, 1460,
+     1467, 1468, 1472, 1463, 1467, 1473, 1469, 1466, 1471, 1471,
 
-     1475, 1475, 1476, 1477, 1465, 1478,   47, 1476, 1482, 1469,
-     1471, 1480, 1473, 1470, 1479, 1479, 1472, 1472, 1486, 1495,
-     1480, 1481, 1489, 1477, 1474, 1478, 1481, 1483, 1482, 1483,
-     1484, 1485, 1491, 1487,   18, 1484, 1489, 1485, 1486, 1487,
-     1490, 1490, 1492, 1495, 1494, 1496, 1496, 1498, 1492, 1494,
-     1499, 1491, 1497, 1497, 1500, 1501, 1502, 1502, 1501, 1503,
-     1504, 1498, 1505, 1513,   17, 1507, 1524, 1506, 1499, 1500,
-     1506, 1507, 1504, 1506, 1508, 1509, 1512, 1503, 1509, 1508,
-     1511, 1512, 1505, 1514, 1524, 1506, 1514, 1516, 1513, 1511,
-     1515, 1515, 1517, 1516, 1509, 1518, 1519, 1519, 1517, 1521,
+     1465, 1469, 1474, 1475, 1476, 1477, 1478, 1478, 1472, 1479,
+     1468, 1480, 1481, 1473, 1479, 1483, 1474, 1485, 1476, 1482,
+     1482, 1484, 1475, 1475, 1483, 1486, 1484, 1486, 1487, 1488,
+     1477, 1480, 1481, 1487, 1489, 1488, 1490, 1485, 1492, 1493,
+     1493, 1494, 1490, 1495, 1498, 1497, 1499, 1499, 1501, 1495,
+     1497, 1502, 1492, 1506, 1489, 1500, 1500, 1503, 1504, 1508,
+     1494, 1504, 1501, 1505, 1505, 1507, 1558, 1509, 1498, 1502,
+     1509, 1506, 1503, 1509, 1510, 1512, 1511, 1507, 1512, 1508,
+     1510, 1511, 1514, 1515, 1516, 1509, 1517, 1558, 1515, 1517,
+     1519, 1514, 1518, 1518, 1512, 1520, 1519, 1521, 1522, 1522,
 
-     1518, 1520, 1520, 1522, 1523, 1521, 1525, 1526, 1522, 1527,
-     1528, 1532, 1527, 1529, 1536, 1530, 1528, 1523, 1531, 1529,
-     1530, 1533, 1534, 1534, 1531, 1525, 1533, 1526, 1535, 1537,
-     1538, 1539, 1536, 1535, 1532, 1542, 1543, 1540, 1541, 1544,
-     1545, 1544, 1547, 1548, 1549, 1539, 1551, 1552, 1554, 1537,
-     1538, 1540, 1541, 1542, 1547, 1548, 1550, 1549, 1553, 1545,
-     1557, 1543, 1550, 1556, 1556, 1558, 1551, 1552, 1562, 1554,
-     1558, 1559, 1553, 1560, 1560, 1561, 1563, 1564, 1565, 1566,
-     1557, 1567, 1562, 1559, 1568, 1569, 1573, 1565, 1567, 1571,
-     1561, 1575, 1575, 1568, 1566, 1564, 1568, 1576, 1576, 1574,
+     1524, 1520, 1521, 1523, 1523, 1525, 1524, 1526, 1527, 1516,
+     1525, 1528, 1529, 1530, 1533, 1531, 1530, 1532, 1534, 1533,
+     1526, 1531, 1535, 1532, 1534, 1539, 1527, 1540, 1536, 1541,
+     1528, 1538, 1529, 1536, 1537, 1537, 1538, 1542, 1543, 1544,
+     1545, 1546, 1547, 1539, 1549, 1535, 1547, 1540, 1548, 1541,
+     1548, 1542, 1543, 1544, 1554, 1551, 1552, 1553, 1545, 1555,
+     1554, 1556, 1557, 1549, 1560, 1560, 1546, 1551, 1552, 1561,
+     1553, 1563, 1562, 1564, 1564, 1565, 1557, 1562, 1566, 1555,
+     1567, 1556, 1568, 1563, 1569, 1582, 1570, 1571, 1577, 1561,
+     1565, 1573, 1566, 1569, 1571, 1575, 1572, 1579, 1579, 1578,
 
-     1563, 1569, 1574, 1577, 1571, 1578, 1581, 1579, 1582, 1571,
-     1579, 1573, 1580, 1580, 1585, 1577, 1583, 1584, 1586, 1581,
-     1587, 1583, 1584, 1578, 1588, 1591, 1589, 1582, 1590, 1587,
-     1593, 1591, 1594, 1585, 1586, 1589, 1595, 1590, 1589, 1592,
-     1592, 1596, 1597, 1588, 1598, 1594, 1601, 1602, 1603, 1603,
-     1593, 1604, 1605,    0, 1595, 1596, 1598, 1606, 1597, 1607,
-     1607, 1605, 1606, 1608, 1609, 1602, 1610, 1604, 1611, 1609,
-     1612, 1601, 1608, 1613, 1607, 1608, 1615, 1616, 1613, 1613,
-     1617, 1618, 1620, 1628, 1610, 1619, 1618, 1627, 1612, 1611,
-     1615, 1619, 1616, 1621, 1621, 1622, 1630, 1628, 1623, 1624,
+     1568, 1570, 1578, 1582, 1567, 1572, 1581, 1573, 1572, 1585,
+     1575, 1580, 1580, 1577, 1583, 1575, 1586, 1583, 1581, 1584,
+     1584, 1587, 1585, 1588, 1589, 1590, 1587, 1591, 1588, 1592,
+     1593, 1594, 1595, 1596, 1596, 1586, 1591, 1597, 1595, 1593,
+     1594, 1590, 1593, 1589, 1599, 1598, 1600, 1601, 1592, 1602,
+     1605, 1606, 1607, 1607, 1608, 1609,   52, 1597, 1598, 1615,
+     1600, 1602, 1599, 1601, 1609, 1612, 1610, 1611, 1611, 1606,
+     1608, 1610, 1614, 1613, 1612, 1605, 1616, 1612, 1613, 1617,
+     1615, 1619, 1611, 1620, 1617, 1617, 1621, 1622, 1624, 1632,
+     1614, 1623, 1622, 1631, 1616, 1619, 1626, 1623, 1620, 1625,
 
-     1620, 1622, 1617, 1623, 1625, 1624, 1629, 1627, 1631, 1630,
-     1625, 1631, 1629, 1632, 1634, 1636, 1637, 1631, 1638, 1632,
-     1639,    0, 1634, 1640, 1641, 1642, 1638, 1643, 1649, 1639,
-     1644, 1644, 1645, 1650, 1636, 1637, 1640, 1641, 1645, 1642,
-     1646, 1643, 1647, 1648, 1648, 1651, 1646, 1652, 1649, 1654,
-     1653, 1650, 1644, 1655, 1656, 1647, 1653, 1658, 1658, 1659,
-     1652, 1660, 1661, 1662, 1651, 1660, 1665, 1661, 1662, 1655,
-     1663, 1654, 1656, 1664, 1667, 1663, 1668, 1669, 1669, 1659,
-     1670, 1671, 1664, 1672, 1673, 1673, 1667, 1674, 1675, 1665,
-     1679, 1668, 1676, 1671, 1677, 1675, 1680, 1681, 1682, 1670,
+     1625, 1628, 1626, 1632, 1627, 1629, 1624, 1628, 1621, 1627,
+     1633, 1629, 1634, 1631, 1635, 1636, 1633, 1635, 1638, 1640,
+     1641, 1636, 1642, 1635, 1643, 1634, 1638, 1644, 1645, 1646,
+     1642, 1647, 1653, 1643, 1648, 1648, 1649, 1654, 1640, 1641,
+     1644, 1645, 1649, 1646, 1650, 1647, 1651, 1652, 1652, 1655,
+     1650, 1656, 1653, 1658, 1657, 1654, 1648, 1659, 1660, 1651,
+     1657, 1662, 1662, 1663, 1656, 1664, 1665, 1666, 1655, 1664,
+     1669, 1665, 1666, 1659, 1667, 1658, 1660, 1668, 1671, 1667,
+     1672, 1673, 1673, 1663, 1674, 1675, 1668, 1676, 1677, 1677,
+     1671, 1678, 1679, 1669, 1683, 1672, 1680, 1675, 1681, 1679,
 
-     1683, 1674, 1672, 1681, 1676, 1684, 1677, 1685, 1685, 1679,
-     1682, 1684, 1686, 1687, 1687, 1686, 1680, 1689, 1683, 1690,
-     1691, 1693, 1689, 1692, 1692, 1694, 1691, 1694, 1690, 1695,
-     1696, 1697, 1695, 1693, 1698, 1700, 1699, 1701, 1702, 1703,
-     1700, 1704, 1701, 1705, 1707, 1710, 1706, 1702, 1705, 1713,
-     1696, 1703, 1698, 1697, 1699, 1706, 1704, 1708, 1709, 1715,
-     1710, 1712, 1708, 1709, 1707, 1711, 1711, 1712, 1706, 1708,
-     1713, 1716, 1717, 1718, 1719, 1724, 1719,    0, 1715, 1727,
-     1720, 1721, 1721, 1722, 1722, 1723, 1723, 1728, 1717, 1725,
-     1725, 1716, 1737, 1718, 1720, 1724, 1720, 1726, 1726, 1730,
+     1684, 1685, 1686, 1674, 1687, 1678, 1676, 1685, 1680, 1688,
+     1681, 1689, 1689, 1683, 1686, 1688, 1690, 1691, 1691, 1690,
+     1684, 1693, 1687, 1694, 1695, 1697, 1693, 1696, 1696, 1698,
+     1695, 1698, 1694, 1699, 1700, 1701, 1699, 1697, 1702, 1704,
+     1703, 1705, 1706, 1707, 1704, 1708, 1705, 1709, 1711, 1714,
+     1710, 1706, 1709, 1717, 1700, 1707, 1702, 1701, 1703, 1710,
+     1708, 1712, 1713, 1719, 1714, 1716, 1712, 1713, 1711, 1715,
+     1715, 1716, 1710, 1712, 1717, 1720, 1721, 1722, 1723, 1728,
+     1723,   47, 1719, 1731, 1724, 1725, 1725, 1726, 1726, 1727,
+     1727, 1732, 1721, 1729, 1729, 1720, 1741, 1722, 1724, 1728,
 
-     1727, 1729, 1729, 1730, 1731, 1734, 1732, 1735, 1728, 1732,
-     1731, 1734, 1736, 1738, 1739, 1739, 1738, 1737, 1736, 1740,
-     1743, 1741, 1742, 1742, 1744, 1735, 1741, 1745, 1745, 1744,
-     1746, 1747, 1748, 1749, 1750, 1746, 1751, 1747, 1752, 1740,
-     1756, 1743, 1751, 1754, 1748, 1748, 1748, 1755, 1754, 1754,
-     1757, 1748, 1757, 1749, 1750, 1756, 1758, 1759, 1752, 1760,
-     1761, 1755, 1762, 1763, 1765, 1760, 1767, 1758, 1771, 1761,
-     1764, 1764, 1759, 1766, 1766, 1768, 1769, 1769, 1770, 1770,
-     1774, 1774, 1762, 1775, 1763, 1776, 1767, 1778, 1771, 1779,
-     1765, 1782, 1780, 1786, 1776, 1784, 1778, 1768, 1780, 1781,
+     1724, 1730, 1730, 1734, 1731, 1733, 1733, 1734, 1735, 1738,
+     1736, 1739, 1732, 1736, 1735, 1738, 1740, 1742, 1743, 1743,
+     1742, 1741, 1740, 1744, 1747, 1745, 1746, 1746, 1748, 1739,
+     1745, 1749, 1750, 1750, 1753, 1751, 1749, 1754, 1752, 1747,
+     1751, 1755, 1757, 1744, 1752, 1756, 1753, 1753, 1753, 1748,
+     1759, 1756, 1760, 1753, 1761, 1759, 1759, 1754, 1762, 1763,
+     1762, 1755, 1757, 1764, 1766, 1765, 1760, 1767, 1768, 1761,
+     1763, 1765, 1770, 1766, 1769, 1769, 1771, 1771, 1764, 1772,
+     1773, 1774, 1774, 1775, 1775, 1776, 1780, 1767, 1781, 1768,
+     1779, 1779, 1783, 1784, 1785, 1786, 1786, 1781, 1770, 1772,
 
-     1781, 1783, 1784, 1788, 1785, 1787, 1787, 1789, 1775, 1791,
-     1779, 1792, 1782, 1785, 1791, 1793, 1783, 1792, 1794, 1786,
-     1795, 1796, 1800, 1789, 1801, 1794, 1795, 1796, 1798, 1788,
-     1797, 1797, 1799, 1798, 1802, 1793, 1803, 1804, 1805, 1803,
-     1809, 1799, 1800, 1801, 1806, 1806, 1802, 1807, 1808, 1813,
-     1810, 1814, 1811, 1807, 1808, 1804, 1811, 1815, 1816, 1816,
-     1809, 1817, 1815, 1818, 1805, 1810, 1820, 1821, 1822, 1813,
-     1823, 1821, 1811, 1814, 1822, 1824, 1824, 1825, 1818, 1823,
-     1817, 1825, 1826, 1827, 1827, 1820, 1828, 1829, 1834, 1830,
-     1831, 1832, 1833, 1826, 1834, 1831, 1839, 1836, 1826, 1835,
+     1785, 1783, 1773, 1787, 1788, 1776, 1789, 1790, 1791, 1792,
+     1792, 1780, 1793, 1789, 1784, 1794, 1790, 1796, 1799, 1788,
+     1797, 1798, 1796, 1800, 1787, 1799, 1797, 1801, 1805, 1800,
+     1804, 1794, 1803, 1801, 1791, 1802, 1802, 1803, 1793, 1804,
+     1806, 1798, 1807, 1808, 1809, 1810, 1808, 1812, 1805, 1811,
+     1811, 1813, 1814, 1812, 1807, 1815, 1816, 1813, 1818, 1806,
+     1816, 1819, 1809, 1820, 1821, 1821, 1822, 1823, 1820, 1825,
+     1815, 1810, 1814, 1826, 1827, 1828, 1816, 1826, 1818, 1831,
+     1827, 1833, 1823, 1819, 1828, 1822, 1829, 1829, 1825, 1830,
+     1831, 1832, 1832, 1830, 1834, 1831, 1835, 1837, 1836, 1838,
 
-     1839, 1829, 1836, 1837, 1837, 1838, 1838, 1828, 1830, 1841,
-     1842, 1832, 1833, 1843, 1835, 1844, 1844, 1847, 1841, 1846,
-     1846, 1842, 1847, 1847, 1848, 1849, 1842, 1850, 1852, 1851,
-     1848, 1849, 1853, 1843, 1851, 1855, 1857, 1856, 1853, 1858,
-     1852, 1856, 1863, 1859, 1860, 1861, 1865, 1855, 1857, 1859,
-     1862, 1861, 1866, 1850, 1863, 1862, 1867, 1869, 1865, 1873,
-     1869, 1867, 1870, 1870, 1858,    0, 1860, 1871, 1871, 1872,
-     1872, 1866, 1874, 1878, 1875, 1883, 1876, 1877, 1874, 1873,
-     1875, 1876, 1878, 1877, 1880, 1882, 1886, 1883, 1882, 1880,
-     1884, 1884, 1887, 1890, 1888, 1889, 1889, 1895, 1886, 1888,
+     1839, 1840, 1833, 1836, 1841, 1848, 1839,   18, 1834, 1841,
+     1842, 1842, 1843, 1843, 1844, 1835, 1840, 1837, 1844, 1838,
+     1846, 1847, 1849, 1849, 1853, 1848, 1851, 1851, 1852, 1846,
+     1853, 1855, 1847, 1852, 1852, 1854, 1857, 1847, 1856, 1858,
+     1860, 1854, 1861, 1856, 1862, 1858, 1861, 1863, 1857, 1864,
+     1868, 1865, 1860, 1866, 1870, 1864, 1862, 1855, 1867, 1866,
+     1871, 1878, 1868, 1867, 1872, 1874, 1870,   17, 1874, 1872,
+     1875, 1875, 1863, 1865, 1876, 1876, 1877, 1877, 1879, 1871,
+     1880, 1878, 1881, 1882, 1879, 1883, 1880, 1881, 1885, 1882,
+     1888, 1891, 1887, 1885, 1883, 1887, 1889, 1889, 1892, 1893,
 
-     1891, 1892, 1890, 1896, 1887, 1891, 1892, 1893, 1894, 1894,
-     1893, 1897, 1896, 1898, 1899, 1900, 1901, 1895, 1899, 1902,
-     1900, 1903, 1901, 1904, 1905, 1908, 1909, 1907, 1907, 1897,
-     1903, 1912, 1898, 1910, 1910, 1909, 1913, 1902, 1905, 1907,
-     1912, 1904, 1914, 1908, 1911, 1911, 1915, 1916, 1913, 1919,
-     1919, 1915, 1921, 1922, 1923, 1921, 1925, 1928, 1926, 1927,
-     1916, 1929, 1929, 1914, 1930, 1927, 1930, 1931, 1931, 1922,
-     1923, 1925, 1926, 1932, 1928, 1934, 1934, 1935, 1935, 1937,
-     1938, 1932, 1939, 1940, 1941, 1937, 1938, 1942, 1942, 1939,
-     1943, 1944, 1948, 1956, 1945, 1946, 1947, 1950, 1949, 1943,
+     1894, 1894, 1888, 1891, 1893, 1895, 1896, 1897, 1899, 1899,
+     1892, 1896, 1897, 1898, 1895, 1900, 1898, 1901, 1902, 1903,
+     1904, 1907, 1905, 1906, 1904, 1908, 1901, 1905, 1909, 1906,
+     1910, 1912, 1912, 1913, 1908, 1900, 1902, 1919, 1903, 1907,
+     1914, 1915, 1915, 1912, 1910, 1917, 1909, 1916, 1916, 1914,
+     1918, 1913, 1920, 1921, 1917, 1924, 1924, 1920, 1919, 1927,
+     1926, 1928, 1918, 1926, 1930, 1932, 1921, 1931, 1933, 1934,
+     1934, 1932, 1935, 1942, 1935, 1927, 1937, 1928,    0, 1930,
+     1946, 1931, 1936, 1936, 1937, 1933, 1939, 1939, 1940, 1940,
+     1947, 1943, 1944, 1945, 1948, 1948, 1942, 1943, 1944, 1949,
 
-     1952, 1953, 1954, 1950, 1941, 1940, 1945, 1946, 1947, 1955,
-     1955, 1956, 1944, 1949, 1954, 1957, 1950, 1960, 1948, 1958,
-     1952, 1959, 1958, 1962, 1953, 1963, 1959, 1963, 1962, 1964,
-     1970, 1965, 1966, 1968, 1971, 1957, 1965, 1960, 1972, 1966,
-     1974, 1977, 1968, 1971, 1973, 1979, 1973, 1964, 1970, 1976,
-     1972, 1976, 1978, 1978, 1984, 1977, 1980, 1982, 1981, 1974,
-     1981, 1980, 1982, 1983, 1985, 1987, 1988, 1986, 1983, 1989,
-     1987, 1979, 1984, 1986, 1991, 1992, 1995, 1989, 1996, 1988,
-     1993, 1993, 1994, 1994, 1985, 1998, 1997, 2000,    0, 1992,
-     1998, 1995, 1997, 1991, 1999, 2001, 1999, 2003, 1996, 2002,
+     1945, 1950, 1946, 1951, 1952, 1953, 1954, 1956, 1949, 1955,
+     1947, 1958, 1959, 1956, 1963, 1951, 1952, 1953, 1960, 1961,
+     1961, 1962, 1950, 1966, 1955, 1964, 1956, 1969, 1964, 1969,
+     1960, 1958, 1954, 1965, 1963, 1959, 1968, 1970, 1965, 1962,
+     1971, 1968, 1972, 1966, 1974, 1971, 1976, 1977, 1978, 1972,
+     1979, 1980, 1979, 1974, 1983, 1970, 1977, 1982, 1985, 1982,
+     1978, 1984, 1984, 1987, 1976, 1987, 1986, 1988, 1983, 1989,
+     1980, 1986, 1988, 1990, 1989, 1991, 1992, 1994, 1993, 1995,
+     1997, 2001, 1992, 1993, 1985, 2002, 1998, 1995, 1999, 1999,
+     1994, 1990, 2000, 2000, 2006, 1991, 2001, 2003, 2009, 1997,
 
-     2002, 2004, 2004, 2001, 2006, 2000, 2005, 2005, 2008, 2003,
-     2007, 2001, 2010, 2006, 2011, 2007, 2011, 2012, 2015, 2017,
-     2014, 2010, 2013, 2021, 2010, 2022, 2008, 2013, 2013, 2014,
-     2015, 2017, 2018, 2023, 2019, 2025, 2021, 2018, 2012, 2019,
-     2024, 2024, 2023, 2026, 2027, 2022, 2031, 2032, 2028, 2029,
-     2033, 2034, 2035, 2025, 2036, 2042, 2034, 2035, 2031, 2032,
-     2027, 2026, 2028, 2036, 2029, 2039, 2041, 2043, 2044, 2045,
-     2033, 2039, 2041, 2050, 2046, 2047, 2047, 2054, 2042, 2048,
-     2049, 2049, 2043, 2046, 2039, 2051, 2044, 2053, 2048, 2051,
-     2052, 2055, 2050, 2060, 2045, 2052, 2055, 2055, 2056, 2054,
+     1998, 2004, 2005, 2003, 2005, 2002, 2004, 2007, 2008, 2008,
+     2009, 2012, 2006, 2010, 2010, 2007, 2011, 2011, 2014, 2013,
+     2012, 2016, 2018, 2007, 2013, 2017, 2019, 2017, 2020, 2021,
+     2016, 2019, 2019, 2016, 2023, 2024, 2014, 2020, 2027, 2025,
+     2024, 2021, 2028, 2018, 2025, 2029, 2023, 2030, 2030, 2031,
+     2032, 2027, 2034, 2033, 2029, 2035, 2039, 2048, 2040, 2037,
+     2038, 2051, 2028, 2040, 2049, 2042, 2034, 2031, 2032, 2033,
+     2035, 2037, 2038, 2041, 2042, 2045, 2039, 2047, 2041, 2049,
+     2048, 2045, 2050, 2047, 2052, 2056, 2051, 2053, 2053, 2054,
+     2055, 2055, 2057, 2052, 2045, 2059, 2057, 2058, 2054, 2060,
 
-     2053, 2057, 2058, 2059, 2056, 2058, 2068, 2057, 2063, 2063,
-     2065, 2059, 2069, 2060, 2064, 2064, 2066, 2066, 2068, 2065,
-     2067, 2067, 2070, 2072, 2072, 2078, 2071, 2082, 2070, 2064,
-     2069, 2071, 2073, 2073, 2074, 2075, 2080, 2084, 2077, 2074,
-     2064, 2075, 2077, 2079, 2083, 2078, 2085, 2079, 2086, 2083,
-     2087, 2088, 2082, 2086, 2089, 2091, 2080, 2090, 2092, 2092,
-     2084, 2085, 2090, 2094, 2096, 2093, 2095, 2088, 2087, 2093,
-     2098, 2095, 2097, 2099, 2089, 2100, 2101, 2091, 2094, 2097,
-     2100, 2102, 2098, 2103, 2103, 2105, 2106, 2107, 2108, 2101,
-     2096, 2109, 2099, 2105, 2110, 2111, 2112, 2113, 2118, 2102,
+     2050, 2061, 2058, 2062, 2056, 2063, 2061, 2061, 2059, 2062,
+     2064, 2063, 2065, 2064, 2066, 2069, 2069, 2070, 2070, 2071,
+     2065, 2060, 2072, 2072, 2073, 2073, 2074, 2075, 2071, 2076,
+     2084, 2077, 2070, 2083, 2066, 2076, 2077, 2083, 2074, 2078,
+     2078, 2079, 2079, 2070, 2080, 2075, 2081, 2085, 2086, 2080,
+     2084, 2085, 2081, 2088, 2089, 2091, 2090, 2092, 2093, 2089,
+     2095, 2094, 2092, 2097, 2096, 2098, 2098, 2099, 2086, 2096,
+     2091, 2099, 2100, 2102, 2105, 2103, 2093, 2094, 2088, 2090,
+     2095, 2101, 2103, 2104, 2106, 2097, 2101, 2100, 2107, 2106,
+     2108, 2109, 2109, 2105, 2111, 2104, 2112, 2113, 2114, 2102,
 
-     2122, 2117, 2115, 2122, 2118, 2106, 2107, 2119, 2112, 2119,
-     2123, 2108, 2125, 2110, 2117, 2109, 2111, 2115, 2113, 2120,
-     2120, 2121, 2124, 2123, 2129, 2125, 2121, 2126, 2126, 2127,
-     2127, 2128, 2128, 2130, 2131, 2131, 2124, 2138, 2132, 2129,
-     2133, 2133, 2134, 2134, 2135, 2139, 2130, 2132, 2137, 2135,
-     2132, 2140, 2143, 2137, 2141, 2141, 2145, 2138, 2142, 2142,
-     2144, 2144, 2147, 2140, 2148, 2139, 2146, 2146, 2151, 2148,
-     2152, 2143, 2149, 2149, 2145, 2150, 2150, 2147, 2153, 2152,
-     2154, 2156, 2151, 2157, 2157, 2158, 2156, 2159, 2159, 2160,
-     2161, 2162, 2153, 2165, 2162, 2166, 2161, 2163, 2163, 2154,
+     2115, 2107, 2111, 2116, 2117, 2118, 2119, 2123, 2108, 2124,
+        0, 2121, 2125, 2127, 2127, 2112, 2113, 2118, 2125, 2131,
+     2123, 2114, 2116, 2124, 2115, 2117, 2121, 2119, 2126, 2128,
+     2126, 2130, 2129, 2131, 2128, 2129, 2132, 2133, 2133, 2134,
+     2134, 2135, 2135, 2136, 2130, 2139, 2137, 2138, 2138, 2132,
+     2140, 2140, 2141, 2141, 2139, 2142, 2144, 2139, 2136, 2137,
+     2142, 2144, 2145, 2146, 2147, 2148, 2148, 2149, 2149, 2150,
+     2151, 2151, 2152, 2153, 2153, 2155, 2147, 2154, 2156, 2156,
+     2155, 2158, 2145, 2146, 2157, 2157, 2160, 2159, 2150, 2161,
+     2152, 2165, 2154, 2163, 2167, 2158, 2159,    0, 2163, 2168,
 
-     2164, 2164, 2167, 2170, 2158, 2168, 2168, 2160, 2171, 2172,
-     2166, 2173, 2165, 2163, 2175, 2173, 2174, 2174, 2181, 2177,
-     2176, 2167, 2178, 2170, 2172, 2176, 2180, 2180, 2182, 2183,
-     2184, 2171, 2185, 2175, 2177, 2182, 2186, 2178, 2181, 2187,
-     2187, 2192, 2188, 2183, 2189, 2195, 2189, 2197, 2184, 2190,
-     2185, 2188, 2190, 2192, 2193, 2194, 2198, 2199, 2196, 2193,
-     2194, 2198, 2186, 2205, 2203,    0, 2209, 2190, 2197, 2190,
-     2195, 2196, 2201, 2202, 2204, 2206, 2210, 2201, 2202, 2203,
-     2204, 2206, 2207, 2199, 2205, 2208, 2216, 2207, 2212, 2210,
-     2208, 2209, 2211, 2213, 2214, 2211, 2215, 2212, 2217, 2221,
+     2160, 2164, 2164, 2166, 2166, 2168, 2169, 2172, 2161, 2169,
+     2165, 2174, 2167, 2170, 2170, 2171, 2171, 2173, 2175, 2175,
+     2177, 2178, 2179, 2180, 2181, 2181, 2172, 2180, 2182, 2170,
+     2174, 2183, 2173, 2184, 2185, 2188, 2183, 2179, 2187, 2187,
+     2177, 2191, 2190, 2189, 2178, 2192, 2193, 2182, 2184, 2185,
+     2189, 2194, 2194, 2195, 2199, 2188, 2190, 2202, 2196, 2191,
+     2196, 2197, 2195, 2192, 2197, 2200, 2199, 2203, 2201, 2204,
+     2200, 2205, 2193, 2201, 2206, 2212, 2205, 2210, 2208, 2197,
+     2203, 2197, 2202, 2208, 2209, 2211, 2216, 2213, 2217, 2209,
+     2204, 2211, 2210, 2213, 2214, 2218, 2212, 2215, 2218, 2214,
 
-     2216, 2218, 2213, 2214, 2217, 2215, 2219, 2218, 2223, 2225,
-     2219, 2224, 2224, 2226, 2226, 2225, 2227, 2223, 2228, 2221,
-     2230, 2227, 2226, 2231, 2232, 2232, 2233, 2237, 2234, 2238,
-     2236, 2241, 2243, 2239, 2241, 2244, 2230, 2234, 2228, 2231,
-     2228, 2233, 2236, 2237, 2238, 2239, 2242, 2244, 2245, 2245,
-     2255, 2242, 2243, 2246, 2246, 2248, 2248, 2249, 2250, 2251,
-     2249, 2252, 2253, 2250, 2255, 2251, 2257, 2252, 2254, 2254,
-     2258, 2253, 2256, 2256, 2259, 2260, 2260, 2261, 2257, 2266,
-     2262, 2263, 2266, 2261, 2258, 2265, 2263, 2267, 2267, 2265,
-     2268, 2269, 2270, 2259, 2262, 2268, 2269, 2269, 2271, 2272,
+     2206, 2217, 2215, 2219, 2220, 2221, 2222, 2223, 2228,    0,
+     2224, 2216, 2219, 2220, 2221, 2222, 2224, 2225, 2226, 2237,
+     2230, 2223, 2226, 2225, 2231, 2231, 2232, 2235, 2228, 2230,
+     2233, 2233, 2232, 2234, 2238, 2237, 2239, 2239, 2234, 2233,
+     2240, 2243, 2241, 2244, 2246, 2245, 2250, 2235,    0, 2235,
+     2238, 2241, 2251, 2243, 2248, 2240, 2246, 2248, 2249, 2244,
+     2245, 2252, 2252, 2249, 2251,    0, 2250, 2253, 2253, 2255,
+     2255, 2256, 2257, 2258, 2256, 2259, 2260, 2257, 2262, 2258,
+     2265, 2259, 2261, 2261, 2264, 2260, 2263, 2263, 2266, 2267,
+     2267, 2268, 2262, 2270, 2265, 2269, 2264, 2268, 2270, 2272,
 
-     2274, 2270, 2276, 2272, 2273, 2273, 2277, 2276, 2278, 2279,
-     2280, 2281, 2282, 2274, 2280, 2283, 2284, 2282, 2271, 2285,
-     2286, 2283, 2284, 2279, 2287, 2288, 2277, 2291, 2278, 2287,
-     2290, 2281, 2301, 2292, 2293, 2298, 2294, 2285, 2292, 2286,
-     2293, 2380, 2290, 2291, 2294, 2295, 2288, 2295, 2380, 2298,
-     2299, 2299, 2300, 2302, 2302, 2300, 2305, 2306, 2301, 2307,
-     2305, 2308, 2308, 2306, 2309, 2312, 2312, 2314, 2316, 2320,
-     2317, 2307, 2321, 2309, 2320, 2322, 2323, 2324, 2324, 2330,
-     2322, 2323, 2316, 2326, 2326, 2314, 2317, 2328, 2329, 2329,
-     2331, 2332, 2334, 2328, 2335, 2330, 2332, 2339, 2321, 2336,
+     2278, 2273, 2277, 2272, 2273, 2274, 2274, 2266, 2275, 2269,
+     2276, 2277, 2281, 2275, 2279, 2276, 2276, 2284, 2279, 2283,
+     2278, 2280, 2280, 2285, 2283, 2281, 2286, 2287, 2288, 2289,
+     2290, 2287, 2291, 2292, 2289, 2293, 2290, 2284, 2291, 2294,
+     2286, 2295, 2296, 2285, 2298, 2299, 2295, 2300, 2288, 2301,
+     2306, 2292, 2300, 2309, 2293, 2301, 2298, 2302, 2294,    0,
+     2303, 2299, 2303, 2296, 2306, 2302, 2307, 2307, 2308, 2310,
+     2310, 2308, 2313, 2315, 2314, 2317, 2313, 2316, 2316, 2309,
+     2314, 2320, 2320, 2322, 2317, 2315, 2324, 2325, 2328, 2329,
+     2330, 2331, 2339, 2328, 2338, 2330, 2331, 2332, 2332, 2342,
 
-     2336, 2338, 2340, 2339, 2341, 2345, 2335, 2343, 2343, 2346,
-     2338, 2334, 2331, 2344, 2348, 2348, 2344, 2349, 2349, 2341,
-     2340, 2350, 2351, 2352, 2345, 2353, 2350, 2346, 2355, 2354,
-     2353, 2354, 2352, 2356, 2357, 2359, 2358,    0, 2360, 2366,
-     2351, 2358, 2355, 2360, 2361, 2361, 2357, 2356, 2362, 2362,
-     2363, 2363, 2364, 2364, 2365, 2359, 2367, 2366, 2368, 2368,
-     2370, 2367, 2369, 2369, 2371, 2372, 2365, 2373, 2374, 2374,
-     2375, 2378, 2370, 2376, 2376, 2379, 2371, 2377, 2377, 2381,
-     2382, 2383, 2378, 2373, 2384, 2372, 2383, 2379, 2385, 2375,
-     2387, 2381, 2386, 2386, 2388, 2389, 2390, 2391, 2392, 2387,
+     2324, 2322, 2336, 2325, 2334, 2334, 2337, 2337, 2336, 2343,
+     2338, 2340, 2344, 2344, 2339, 2329, 2340, 2346, 2342, 2347,
+     2348, 2343, 2349, 2351, 2351, 2347, 2346, 2352, 2353, 2363,
+     2352, 2354, 2356, 2356, 2357, 2357, 2358, 2349, 2348, 2359,
+     2361, 2358, 2360, 2363, 2362, 2361, 2362, 2353, 2364, 2354,
+     2366, 2360, 2365, 2367, 2368, 2366, 2374, 2359,    0, 2368,
+     2369, 2369, 2364, 2373, 2365, 2370, 2370, 2371, 2371, 2372,
+     2372, 2375, 2378, 2367, 2374, 2373, 2375, 2376, 2376, 2377,
+     2377, 2379, 2380, 2381, 2378, 2382, 2382, 2383, 2384, 2384,
+     2385, 2385, 2386, 2379, 2388, 2387, 2389, 2390, 2392, 2381,
 
-     2382, 2393, 2394, 2394, 2384, 2395, 2399, 2396, 2385, 2390,
-     2397, 2400, 2392, 2393, 2395, 2389, 2401, 2403, 2406, 2406,
-     2388, 2391, 2396, 2402, 2399, 2397, 2402, 2404, 2413, 2405,
-     2415, 2403, 2404, 2400, 2405, 2407, 2407, 2408, 2408, 2401,
-     2410, 2410, 2412, 2412, 2414, 2416, 2413, 2418, 2419, 2415,
-     2420, 2421, 2422, 2423, 2424, 2414, 2424, 2425, 2426, 2431,
-     2416, 2422, 2427, 2428, 2428, 2433, 2419, 2418, 2430, 2430,
-     2434, 2421, 2420, 2423, 2431, 2437, 2426, 2425, 2439, 2434,
-     2427, 2435, 2435, 2440, 2437, 2438, 2438, 2433, 2441, 2442,
-     2443, 2444, 2446,    0, 2445, 2441, 2439, 2447, 2447, 2448,
+     2391, 2388, 2380, 2386, 2393, 2391, 2383, 2387, 2389, 2394,
+     2394, 2395, 2396, 2397, 2398, 2399, 2400, 2390, 2392, 2401,
+     2395, 2402, 2402, 2403, 2393, 2404, 2405, 2398, 2407, 2408,
+     2400, 2401, 2403, 2397, 2409, 2411, 2414, 2414, 2396, 2399,
+     2404, 2405, 2410, 2412, 2421, 2410, 2407, 2413, 2412, 2411,
+     2423, 2408, 2413, 2415, 2415, 2416, 2416, 2409, 2418, 2418,
+     2420, 2420, 2421, 2422, 2424, 2426, 2427, 2428, 2429, 2423,
+     2431, 2430, 2433, 2432, 2422, 2432, 2434, 2435, 2439, 2424,
+     2430, 2436, 2436, 2441, 2427, 2426, 2438, 2438, 2429, 2428,
+     2431, 2442, 2433, 2439, 2434, 2435, 2443, 2443, 2445, 2447,
 
-     2448, 2440, 2449, 2454, 2442, 2456, 2450, 2455, 2443, 2444,
-     2445, 2446, 2450, 2451, 2451, 2452, 2452, 2453, 2458, 2459,
-     2449, 2454, 2455, 2453, 2456, 2457, 2460, 2461, 2466, 2461,
-     2457, 2460, 2462, 2462, 2463, 2468, 2463, 2469, 2458, 2459,
-     2464, 2464, 2470, 2471, 2468, 2472, 2473, 2466, 2474, 2477,
-     2472,    0, 2478, 2480, 2470, 2478, 2469, 2479, 2479, 2481,
-     2482, 2482, 2491, 2471, 2485, 2488, 2473, 2474, 2480, 2477,
-     2483, 2486, 2487, 2487, 2483, 2486, 2490, 2481, 2488, 2485,
-     2492, 2495, 2491, 2493, 2493, 2496, 2497, 2498, 2498, 2499,
-     2497, 2490, 2501, 2495, 2496, 2500, 2500, 2501, 2502, 2503,
+     2442, 2446, 2446, 2448, 2449, 2441, 2451, 2445, 2450, 2452,
+     2453, 2449, 2454, 2455, 2455, 2456, 2456, 2447, 2457, 2458,
+     2464, 2448, 2459, 2450, 2451, 2463, 2453, 2452, 2459, 2460,
+     2460, 2454, 2461, 2461, 2462, 2464, 2465, 2458, 2457, 2466,
+     2462, 2467, 2468, 2463, 2466, 2469, 2470, 2472, 2470, 2472,
+     2469, 2471, 2471, 2473, 2473, 2465, 2475, 2477, 2478, 2479,
+     2480, 2467, 2468, 2481, 2482, 2486, 2477, 2483, 2481, 2487,
+     2490, 2479, 2487, 2488, 2488, 2475, 2489, 2478, 2491, 2491,
+     2480, 2494, 2499, 2492, 2482, 2486, 2483, 2492, 2490, 2495,
+     2497, 2489, 2500, 2495, 2496, 2496, 2494, 2499, 2501, 2502,
 
-     2492, 2504, 2505, 2505, 2510, 2510, 2511, 2502, 2499, 2512,
-     2512, 2513, 2514, 2504, 2515, 2503, 2518, 2516, 2517, 2517,
-     2520, 2520, 2523, 2515, 2513, 2514, 2516, 2523, 2511, 2524,
-     2525, 2518, 2526, 2527, 2524, 2528, 2529, 2526, 2530,    0,
-     2532, 2527, 2533, 2534, 2525, 2529, 2530, 2533, 2534, 2535,
-     2536, 2536, 2537, 2537, 2528, 2532, 2538, 2538, 2539, 2541,
-     2542, 2540, 2543,    0, 2535, 2539, 2540, 2544, 2543, 2545,
-     2545, 2546, 2544,    0, 2547, 2548, 2548, 2541, 2542, 2547,
-     2549, 2549, 2552, 2553, 2553, 2554, 2546, 2555, 2554, 2556,
-     2558, 2557, 2555, 2555, 2556, 2552, 2557, 2559, 2560, 2562,
+     2502, 2504, 2505, 2497, 2506, 2507, 2507, 2508, 2506, 2509,
+     2509, 2505, 2500, 2504, 2510, 2511, 2512, 2513, 2501, 2510,
+     2514, 2514, 2519, 2519, 2511, 2520, 2508, 2521, 2521, 2513,
+     2522, 2523, 2512, 2524, 2526, 2526, 2525, 2527, 2529, 2529,
+     2534, 2532, 2524, 2522, 2523, 2525, 2532, 2520, 2533, 2536,
+     2535, 2537, 2527, 2533, 2534, 2535, 2538, 2536, 2539, 2541,
+     2544,    0, 2542, 2543, 2549, 2538, 2539, 2542, 2543, 2549,
+     2537, 2545, 2545, 2548, 2541, 2544, 2546, 2546, 2547, 2547,
+     2548, 2550, 2551, 2552, 2561, 2553, 2554, 2554, 2555, 2552,
+     2553, 2556, 2557, 2557, 2558, 2558, 2556, 2561, 2567, 2550,
 
-     2561, 2563, 2560, 2559, 2558, 2561, 2564, 2565, 2562, 2566,
-     2569, 2567, 2579, 2568, 2564, 2566, 2563, 2567, 2568, 2571,
-     2572, 2573, 2569, 2580, 2573, 2572, 2575, 2577, 2565, 2578,
-     2579, 2581, 2577, 2582, 2578, 2571, 2580, 2584, 2575, 2587,
-     2581, 2588, 2582, 2583, 2583, 2587, 2584, 2588, 2591, 2592,
-     2596, 2593, 2594, 2594, 2595, 2599, 2597, 2598, 2598, 2596,
-     2601, 2603, 2604, 2605, 2605, 2606, 2604, 2591,    0, 2592,
-     2593, 2597, 2607, 2595, 2599, 2601, 2608, 2609, 2607, 2610,
-     2610, 2603, 2608, 2609, 2611, 2614, 2612, 2615, 2618, 2617,
-     2606, 2612, 2611, 2617, 2614, 2619, 2621, 2621, 2622, 2632,
+     2551, 2562, 2562, 2555, 2563, 2564,    0, 2563, 2565, 2566,
+     2564, 2564, 2567, 2565, 2566, 2568, 2569, 2570, 2571, 2572,
+     2569, 2568, 2570, 2573, 2574, 2577, 2575, 2571, 2578, 2576,
+     2577, 2573, 2575, 2580, 2572, 2576, 2581, 2588, 2584, 2582,
+     2578, 2581, 2582, 2586, 2589, 2574, 2587, 2590, 2586, 2580,
+     2584, 2587, 2591, 2592, 2592, 2588, 2590, 2589, 2593, 2596,
+     2597, 2591, 2598, 2601, 2602, 2606, 2597, 2593, 2598, 2603,
+     2604, 2604, 2605, 2609, 2606, 2607, 2613, 2596, 2608, 2608,
+     2611, 2614, 2601, 2616, 2602, 2614, 2615, 2615, 2603,    0,
+     2607, 2605, 2609, 2617, 2618, 2611, 2613, 2619, 2621, 2617,
 
-     2615,    0, 2618, 2623, 2623, 2624, 2624, 2626, 2626, 2627,
-     2619, 2637, 2628, 2627, 2630, 2630, 2622, 2628, 2633, 2632,
-     2634, 2635, 2645, 2633, 2638, 2638, 2635, 2635, 2640, 2640,
-     2643, 2637, 2634, 2641, 2641, 2642, 2647, 2651, 2642, 2654,
-     2645, 2648, 2648, 2643, 2649, 2649, 2650, 2650, 2652, 2652,
-     2653, 2655, 2651, 2656, 2657, 2657, 2647, 2654, 2658, 2656,
-     2663, 2662, 2658, 2653, 2664, 2655, 2662, 2662, 2665, 2666,
-     2667, 2668, 2678, 2669, 2675, 2666, 2667, 2669, 2670, 2670,
-     2673, 2681, 2675, 2663, 2664, 2673, 2676, 2679, 2665, 2676,
-     2679, 2680, 2680, 2683, 2684, 2682, 2668, 2678, 2681, 2681,
+     2618, 2620, 2620, 2619, 2622, 2624, 2621, 2625, 2616, 2622,
+     2628, 2627, 2629, 2632, 2624, 2627, 2631, 2631, 2633, 2633,
+     2625, 2634, 2634, 2642, 2628, 2636, 2636, 2629, 2637, 2638,
+     2644, 2632, 2637, 2643, 2638, 2640, 2640, 2647, 2643, 2645,
+     2648, 2648, 2644, 2642, 2645, 2645, 2650, 2650, 2651, 2651,
+     2652, 2653, 2655, 2652, 2657, 2658, 2658, 2647, 2659, 2659,
+     2660, 2660, 2661, 2663, 2653, 2662, 2662, 2664, 2665, 2666,
+     2655, 2667, 2667, 2673, 2657, 2666, 2663, 2661, 2674, 2668,
+     2675, 2672, 2665, 2668, 2676, 2664, 2672, 2672, 2677, 2678,
+     2676, 2679, 2680, 2680, 2677, 2679, 2673, 2683, 2674, 2685,
 
-     2682, 2685, 2686, 2686, 2687, 2688, 2689, 2690, 2688, 2691,
-     2692, 2683, 2694, 2692, 2684, 2685, 2688, 2691, 2687, 2693,
-     2689, 2695, 2695, 2700, 2693, 2693, 2690, 2696, 2696, 2697,
-     2697, 2694, 2698, 2698, 2699, 2699, 2701, 2702, 2703, 2700,
-     2704, 2701, 2705, 2706, 2712, 2707, 2708, 2705, 2710, 2710,
-     2711, 2715, 2706, 2711, 2714, 2714, 2724, 2702, 2715, 2704,
-     2716, 2716, 2712, 2717, 2703, 2707, 2708, 2720, 2717, 2719,
-     2719, 2721, 2722, 2727, 2724, 2726, 2720, 2725, 2725, 2726,
-     2721, 2722, 2727, 2728, 2729, 2731, 2730, 2732, 2736, 2729,
-     2729, 2732, 2740, 2736, 2731, 2737, 2737, 2741, 2728, 2730,
+     2675, 2686, 2683, 2688, 2686, 2689, 2691, 2685, 2689, 2690,
+     2690, 2692, 2693, 2694, 2678, 2695, 2692, 2696, 2696, 2700,
+     2697, 2703, 2699, 2691, 2691, 2704, 2703, 2703, 2688, 2695,
+     2693, 2701, 2698, 2694, 2697, 2698, 2699, 2702, 2700, 2701,
+     2702, 2705, 2705, 2698, 2704, 2706, 2706, 2707, 2707, 2708,
+     2708, 2709, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2711,
+     2716, 2717, 2714, 2718, 2719, 2716, 2721, 2721, 2722, 2710,
+     2717, 2722, 2723, 2725, 2725, 2712, 2728, 2715, 2726, 2727,
+     2727, 2728, 2713, 2718, 2719, 2726, 2730, 2730, 2731, 2732,
+     2723, 2733, 2735, 2736, 2736, 2737, 2738, 2731, 2732, 2737,
 
-     2739, 2739, 2742, 2744, 2745, 2748, 2740, 2750, 2749, 2751,
-     2755, 2753, 2744, 2757, 2758, 2751, 2745, 2749, 2757, 2758,
-     2742, 2797, 2741, 2753, 2759, 2759, 2760, 2750, 2762, 2769,
-     2748, 2755, 2770, 2762, 2797, 2760, 2763, 2763, 2765, 2765,
-     2763, 2766, 2766, 2767, 2767, 2768, 2777, 2771, 2774, 2769,
-     2773, 2770, 2771, 2774, 2768, 2775, 2773, 2776, 2776, 2778,
-     2775, 2779, 2780, 2781, 2777, 2783, 2782, 2780, 2784, 2784,
-     2786, 2778, 2782, 2787, 2786, 2788, 2789, 2789, 2787, 2790,
-     2788, 2781, 2779, 2793, 2791, 2792, 2795, 2795, 2798, 2799,
-     2783, 2801, 2802, 2799, 2803, 2800, 2806, 2805, 2790, 2791,
+     2733, 2739, 2740, 2742, 2741, 2738, 2747, 2740, 2740, 2743,
+     2735, 2747, 2742, 2743, 2748, 2748, 2739, 2741, 2750, 2750,
+     2751, 2752, 2753, 2755, 2756, 2759, 2760, 2761, 2766, 2764,
+        0, 2762, 2755, 2768, 2751, 2760, 2756, 2762, 2768, 2769,
+     2753, 2764, 2770, 2770, 2769, 2771, 2752, 2761, 2773, 2766,
+     2759, 2774, 2774, 2773, 2771, 2774, 2776, 2776, 2777, 2777,
+     2778, 2778, 2779, 2780, 2782, 2781, 2784, 2788, 2785, 2782,
+     2786, 2779, 2784, 2785, 2789, 2786, 2787, 2787, 2790, 2792,
+     2794, 2801, 2791, 2780, 2781, 2788, 2789, 2791, 2793, 2795,
+     2795, 2797, 2802, 2798, 2793, 2797, 2799, 2792, 2798, 2790,
 
-     2792, 2798, 2803, 2793, 2800, 2804, 2805, 2801, 2807, 2809,
-     2804, 2802, 2808, 2808, 2806, 2811, 2811, 2812, 2812, 2814,
-     2816, 2816, 2818, 2819, 2821, 2820, 2823, 2823, 2809, 2821,
-     2824, 2825, 2826, 2829, 2807, 2828, 2828, 2830, 2818, 2819,
-     2814, 2820, 2831, 2831, 2834, 2837, 2835, 2829, 2836, 2840,
-     2824, 2826, 2835, 2836, 2825, 2842, 2830, 2838, 2838, 2839,
-     2839, 2841, 2841, 2843, 2834, 2844, 2842, 2837, 2845, 2840,
-     2846, 2847, 2843, 2848, 2845, 2849, 2849, 2850, 2851, 2851,
-     2850, 2841, 2855, 2847, 2856, 2844, 2857, 2858, 2858, 2846,
-     2860, 2861, 2857, 2848, 2855, 2859, 2860, 2863, 2859, 2864,
+     2801, 2799, 2800, 2800, 2803, 2794, 2804, 2802, 2806, 2806,
+     2808, 2809, 2810, 2811, 2812, 2813, 2810, 2814, 2818, 2803,
+     2816, 2816, 2811, 2808, 2809, 2814, 2804, 2815, 2817, 2819,
+     2812, 2821, 2815, 2826, 2813, 2830, 2818, 2817, 2820, 2820,
+     2823, 2823, 2824, 2824, 2828, 2828, 2831, 2832, 2833, 2836,
+     2821, 2830, 2837, 2833, 2826, 2819, 2835, 2835, 2838, 2840,
+     2840, 2842, 2831, 2832, 2841, 2843, 2843, 2846, 2847, 2836,
+     2849, 2848, 2850, 2850, 2847, 2837, 2848, 2838, 2841, 2852,
+     2842, 2851, 2851, 2853, 2853, 2854, 2855, 2846, 2856, 2859,
+     2858, 2857, 2849, 2860, 2867, 2855, 2854, 2857, 2868, 2852,
 
-     2864, 2865, 2863, 2866, 2856, 2867, 2865, 2868, 2871, 2861,
-     2872, 2867, 2869, 2869, 2873, 2876, 2874, 2875, 2875, 2877,
-     2871, 2878, 2866, 2877, 2868, 2868, 2880, 2880, 2872, 2874,
-     2878, 2881, 2881, 2882, 2876, 2883, 2884, 2888, 2882, 2873,
-     2895, 2884, 2885, 2885, 2886, 2886, 2887, 2887, 2889, 2883,
-     2890, 2892, 2892, 2897, 2889, 2890, 2898, 2899, 2903, 2895,
-     2900, 2900, 2904, 2888, 2902, 2902, 2910, 2905, 2906, 2906,
-     2907, 2907, 2903, 2911, 2909, 2897, 2905,    0, 2898, 2899,
-     2909, 2919, 2904, 2912, 2915, 2915, 2910, 2920, 2912, 2917,
-     2917, 2918, 2911, 2920, 2921, 2919, 2918, 2922, 2923, 2923,
+     3101, 2859, 3101, 2853, 2861, 2861, 2867, 2862, 2856, 2858,
+     2862, 2863, 2863, 2860, 2869, 2870, 2870, 2872, 2868, 2871,
+     2869, 2873, 2871, 2872, 2875, 2876, 2876, 2877, 2878, 2875,
+     2879, 2880, 2877, 2881, 2881, 2884, 2879, 2885, 2883, 2873,
+     2888, 2886, 2887, 2887, 2892, 2892, 2895, 2878, 2880, 2880,
+     2883, 2889, 2890, 2884, 2886, 2889, 2893, 2893, 2894, 2888,
+     2895, 2890, 2885, 2894, 2896, 2897, 2897, 2898, 2898, 2896,
+     2899, 2899, 2900, 2901, 2902, 2908, 2903, 2905, 2905, 2910,
+     2902, 2903, 2911, 2912, 2916, 2900, 2913, 2913, 2915, 2915,
+     2917, 2918, 2919, 2919, 2908, 2920, 2920, 2922, 2916, 2901,
 
-     2926, 2927, 2924, 2928, 2929, 2922, 2921, 2924, 2928, 2930,
-     2932, 2933, 2934, 2935, 2944, 2930, 2929, 2937, 2932, 2939,
-     2926, 2927, 2938, 2940, 2941, 3041, 2943, 2948, 3041, 2941,
-     2933, 2943, 2934, 2935, 2944, 2937, 2939, 2939, 2938, 2945,
-     2950, 2946, 2960, 2949, 2940, 2945, 2946, 2948, 2949, 2953,
-     2953, 2954, 2954, 2950, 2955, 2959, 2961, 2961, 2955, 2980,
-     2959, 2960, 2963, 2963, 2964, 2964, 2967, 2964, 2965, 2965,
-     2967, 2965, 2966, 2966, 2970, 2966, 2969, 2969, 2974, 2971,
-     2975, 2976, 2977, 2977, 2980, 2982, 2976, 2981, 2983, 2982,
-     2984, 2986, 2970, 2971, 2981, 2987,    0, 2983, 2974, 2991,
+     2918, 2910, 2923, 2922, 2911, 2912, 2924, 2925, 2928, 2928,
+     2917, 2931, 2925, 2930, 2930, 2932, 2931, 2933, 2934, 2935,
+     2936, 2936, 2923, 2933, 2939, 2924, 2937, 2935, 2940, 2932,
+     2934, 2937, 2941, 2942, 2943, 2945, 2946, 2941, 2947, 2948,
+     2943, 2951, 2950, 2945, 2939, 2942, 2952, 2953, 2940, 2954,
+     2957, 2956, 2961, 3042, 2954, 2946, 2956, 2951, 2947, 2948,
+     2950, 2958, 2963, 2952, 2952, 3042, 2959, 2958, 2953, 2962,
+     2957, 2959, 2961, 2974, 2962, 2963, 2966, 2966, 2967, 2967,
+     2968, 2972, 2972, 2973, 2968, 2975, 2975, 2981, 2973, 2977,
+     2977, 2981, 2974, 2978, 2978, 2984, 2978, 2979, 2979, 2988,
 
-     2975, 2988, 2988, 2992, 2987, 2984, 2989, 2989, 2992, 2986,
-     2990, 2990, 2993, 2994, 2991, 2996, 2995, 2997, 2994, 2994,
-     2998, 2993, 2995, 2999, 2993, 3000, 3001, 3013, 2999, 3003,
-     3000, 3004, 2997, 3002, 3002, 3003, 3013, 3004, 3005, 3005,
-     2996, 2998, 3006, 3006, 3008, 3001, 3007, 3007,    0, 3008,
-     3011, 3011, 3012, 3012, 3016, 3016, 3017, 3017, 3018, 3018,
-     3019, 3019, 3020, 3020, 3021, 3021, 3022, 3022, 3024, 3025,
-     3025, 3026, 3027, 3028, 3032, 3030, 3034, 3024, 3031, 3031,
-     3026, 3036, 3033, 3040, 3027, 3035, 3035, 3042, 3034, 3032,
-     3037, 3037, 3044, 3028, 3030, 3033, 3036, 3043, 3043, 3046,
+     2979, 2980, 2980, 2985, 2980, 2983, 2983, 2989, 2994, 2990,
+     2991, 2991, 2996, 2984, 2990, 2995, 2996, 2985, 3009, 2988,
+     2997, 2998, 2995, 3000, 3009, 3001, 3028, 2989, 3005, 2997,
+     3002, 3002, 3010, 2994, 3001, 3028, 2998, 3003, 3003, 3004,
+     3004, 3000, 3006, 3005, 3007, 3008, 3011, 3006, 3012, 3013,
+     3008, 3008, 3015, 3007, 3013, 3014, 3007, 3010, 3016, 3016,
+     3014, 3011, 3017, 3094, 3018, 3019, 3019, 3094, 3017, 3012,
+     3018, 3015, 3020, 3020, 3021, 3021, 3022, 3025, 3025, 3027,
+     3027, 3022, 3031, 3031, 3032, 3032, 3033, 3033, 3034, 3034,
+     3035, 3035, 3036, 3036, 3037, 3037, 3039, 3040, 3040, 3041,
 
-     3047, 3040, 3046, 3048, 3049, 3050, 3047, 3051, 3054, 3049,
-     3044, 3052, 3055, 3042, 3054, 3059, 3062, 3048, 3072, 3070,
-     3077, 3055, 3070,    0, 3050, 3051, 3080, 3052, 3073, 3073,
-     3059, 3072, 3074, 3074, 3075, 3075, 3078, 3079, 3081, 3083,
-     3084, 3079, 3062, 3077, 3085, 3078, 3080, 3089, 3086, 3085,
-     3086, 3084, 3081, 3087, 3088, 3088, 3090, 3092, 3091, 3093,
-     3089, 3095, 3083, 3094, 3097, 3096, 3098, 3099, 3087, 3100,
-     3095, 3098, 3104, 3092, 3100, 3090, 3091, 3096, 3094, 3105,
-     3106, 3106, 3107, 3112, 3093, 3097, 3104, 3099, 3108, 3108,
-     3113, 3107, 3109, 3109, 3110, 3110, 3111, 3111, 3114, 3105,
+     3043, 3047, 3045, 3046, 3046, 3039, 3048, 3055, 3041, 3051,
+     3049, 3050, 3050, 3052, 3052, 3056, 3047, 3057, 3056, 3048,
+     3043, 3045, 3049, 3059, 3051, 3055, 3058, 3058, 3061, 3062,
+     3063, 3061, 3064, 3065, 3067, 3062, 3066, 3064, 3070, 3069,
+     3074, 3059, 3077, 3057, 3063, 3069, 3085, 3070, 3087, 3085,
+     3067, 3092, 3065, 3095, 3066, 3074, 3088, 3088, 3089, 3089,
+     3093, 3087, 3090, 3090, 3096, 3098, 3099, 3100, 3077, 3093,
+     3102, 3104, 3100, 3095, 3092, 3103, 3103, 3099, 3096, 3105,
+     3107, 3106, 3108, 3110, 3104, 3102, 3109, 3112, 3098, 3113,
+     3111, 3114, 3110, 3120, 3113, 3115, 3107, 3122, 3105, 3106,
 
-     3115, 3114, 3112, 3116, 3117, 3115, 3118, 3119, 3116, 3120,
-     3113, 3122, 3121, 3119, 3123, 3126, 3122, 3124, 3124, 3125,
-     3125, 3118, 3127, 3120, 3121, 3128, 3128, 3130, 3132, 3117,
-     3126, 3135, 3135, 3138, 3123, 3136, 3136, 3137, 3139, 3141,
-     3143, 3127, 3130, 3140, 3139, 3137, 3132, 3142, 3149, 3140,
-     3144, 3150, 3138, 3141, 3152, 3144, 3145, 3145, 3155, 3143,
-     3142, 3146, 3146, 3153, 3157, 3156, 3158, 3153, 3152, 3149,
-     3156, 3150, 3159, 3160, 3166, 3161, 3162, 3167, 3155, 3158,
-     3161, 3162, 3168, 3157, 3171, 3159, 3163, 3163, 3169, 3169,
-     3171, 3170, 3160, 3176, 3166, 3167, 3170, 3172, 3172, 3173,
+     3115, 3109, 3111, 3119, 3121, 3121, 3122, 3108, 3112, 3123,
+     3123, 3114, 3127, 3120, 3124, 3124, 3128, 3119, 3125, 3125,
+     3126, 3126, 3129, 3130, 3131, 3129, 3132, 3133, 3130, 3131,
+     3135, 3127, 3134, 3136, 3137, 3138, 3128, 3141, 3134, 3137,
+     3139, 3139, 3133, 3142, 3135, 3136, 3140, 3140, 3143, 3143,
+     3145, 3132, 3141, 3147, 3153, 3138, 3150, 3150, 3151, 3151,
+     3152, 3154, 3142, 3155, 3156, 3145, 3157, 3154, 3152, 3155,
+     3158, 3147, 3159, 3153, 3160, 3160, 3164, 3159, 3156, 3157,
+     3161, 3161, 3165, 3168, 3167, 3170, 3171, 3168, 3172, 3158,
+     3173, 3171, 3175, 3174, 3176, 3177, 3181, 3164, 3167, 3176,
 
-     3174, 3168, 3175, 3177, 3173, 3174, 3184, 3175, 3180, 3177,
-     3179, 3179, 3176, 3180, 3181, 3181, 3183, 3185, 3186, 3187,
-     3183, 3188, 3189, 3190, 3185, 3184,    0, 3188, 3192, 3192,
-     3194, 3194, 3197, 3195, 3196, 3198, 3190, 3186, 3187, 3196,
-     3199, 3189, 3195, 3200, 3200, 3195, 3202, 3201, 3204, 3205,
-     3205, 3197, 3201, 3199, 3198,    0, 3206, 3207, 3207, 3202,
-     3208, 3208, 3209, 3210, 3211, 3212, 3212, 3209, 3213, 3214,
-     3210, 3214, 3216, 3213, 3204, 3206, 3215, 3215, 3217, 3216,
-     3218, 3219, 3220, 3211, 3223, 3217, 3219, 3222, 3222, 3225,
-     3226, 3227, 3228, 3232, 3225, 3226, 3229, 3229, 3233, 3218,
+     3177, 3182, 3165, 3173, 3183, 3170, 3174, 3172, 3178, 3178,
+     3185, 3175, 3184, 3184, 3186, 3185, 3181, 3187, 3187, 3182,
+     3186, 3188, 3189, 3183, 3190, 3191, 3188, 3189, 3192, 3190,
+     3194, 3194, 3195, 3199, 3192, 3196, 3196, 3195, 3198, 3200,
+     3201, 3202, 3198, 3203, 3191, 3204, 3200, 3212, 3205, 3203,
+     3207, 3207, 3199, 3209, 3209, 3213, 3210, 3211, 3214, 3201,
+     3202, 3205, 3211, 3217, 3204, 3210, 3212, 3216, 3210, 3215,
+     3215, 3214, 3216, 3219, 3213, 3221, 3217, 3220, 3220, 3222,
+     3222, 3223, 3223, 3224, 3225, 3226, 3227, 3227, 3224,    0,
+     3228, 3225, 3230, 3230, 3221, 3228, 3229, 3233, 3229, 3219,
 
-        0, 3220,    0, 3223, 3231, 3231, 3234, 3234, 3235, 3235,
-     3227, 3228, 3232, 3236, 3238, 3238, 3240, 3233, 3239, 3239,
-     3236, 3242, 3245, 3240, 3246, 3247, 3242, 3245, 3248, 3248,
-     3249, 3249,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0, 3246, 3247, 3253, 3253, 3253, 3253, 3253,
-     3253, 3253, 3254, 3254, 3254, 3254, 3254, 3254, 3254, 3255,
-     3255, 3255, 3255, 3255, 3255, 3255, 3256, 3256, 3256, 3256,
-     3256, 3256, 3256, 3257, 3257, 3257, 3257, 3257, 3257, 3257,
-     3258, 3258, 3258, 3258, 3258, 3258, 3258, 3259, 3259, 3259,
-     3259, 3259, 3259, 3259, 3261, 3261,    0, 3261, 3261, 3261,
+     3231, 3232, 3235, 3238, 3226, 3234, 3242, 3231, 3232, 3240,
+     3234, 3237, 3237, 3241, 3240, 3243, 3233, 3247, 3241, 3244,
+     3244, 3235, 3238, 3246, 3246, 3242, 3248, 3249, 3249, 3250,
+     3250, 3251, 3253, 3253, 3243, 3255, 3247, 3261, 3251, 3254,
+     3254, 3257, 3255, 3260, 3262, 3248, 3257,    0, 3260, 3263,
+     3263, 3264, 3264,    0,    0,    0, 3261,    0,    0,    0,
+        0,    0,    0, 3262, 3268, 3268, 3268, 3268, 3268, 3268,
+     3268, 3269, 3269, 3269, 3269, 3269, 3269, 3269, 3270, 3270,
+     3270, 3270, 3270, 3270, 3270, 3271, 3271, 3271, 3271, 3271,
+     3271, 3271, 3272, 3272, 3272, 3272, 3272, 3272, 3272, 3273,
 
-     3261, 3262, 3262,    0,    0,    0, 3262, 3262, 3263, 3263,
-        0,    0, 3263,    0, 3263, 3264,    0,    0,    0,    0,
-        0, 3264, 3265, 3265,    0,    0,    0, 3265, 3265, 3266,
-        0,    0,    0,    0,    0, 3266, 3267, 3267,    0, 3267,
-     3267, 3267, 3267, 3268,    0,    0,    0,    0,    0, 3268,
-     3269, 3269,    0,    0,    0, 3269, 3269, 3270, 3270,    0,
-     3270, 3270, 3270, 3270, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
-     3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252,
+     3273, 3273, 3273, 3273, 3273, 3273, 3274, 3274, 3274, 3274,
+     3274, 3274, 3274, 3276, 3276,    0, 3276, 3276, 3276, 3276,
+     3277, 3277,    0,    0,    0, 3277, 3277, 3278, 3278,    0,
+        0, 3278,    0, 3278, 3279,    0,    0,    0,    0,    0,
+     3279, 3280, 3280,    0,    0,    0, 3280, 3280, 3281,    0,
+        0,    0,    0,    0, 3281, 3282, 3282,    0, 3282, 3282,
+     3282, 3282, 3283,    0,    0,    0,    0,    0, 3283, 3284,
+     3284,    0,    0,    0, 3284, 3284, 3285, 3285,    0, 3285,
+     3285, 3285, 3285, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
 
-     3252, 3252, 3252, 3252, 3252
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267, 3267,
+     3267, 3267, 3267, 3267
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3112,7 +3121,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3114 "<stdout>"
+#line 3122 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3121,9 +3130,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3123 "<stdout>"
+#line 3131 "<stdout>"
 
-#line 3125 "<stdout>"
+#line 3133 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3347,7 +3356,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3349 "<stdout>"
+#line 3357 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3380,13 +3389,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3253 )
+				if ( yy_current_state >= 3268 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 6365 );
+		while ( yy_base[yy_current_state] != 6384 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3666,17 +3675,17 @@ YY_RULE_SETUP
 case 51:
 YY_RULE_SETUP
 #line 265 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSTEMD) }
+{ YDVAR(1, VAR_HTTP_NOTLS_DOWNSTREAM) }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 266 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_DAEMONIZE) }
+{ YDVAR(1, VAR_USE_SYSTEMD) }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 267 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE) }
+{ YDVAR(1, VAR_DO_DAEMONIZE) }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
@@ -3686,217 +3695,217 @@ YY_RULE_SETUP
 case 55:
 YY_RULE_SETUP
 #line 269 "./util/configlexer.lex"
-{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
+{ YDVAR(1, VAR_INTERFACE) }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 270 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
+{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 271 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_RCVBUF) }
+{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 272 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_SNDBUF) }
+{ YDVAR(1, VAR_SO_RCVBUF) }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 273 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SO_REUSEPORT) }
+{ YDVAR(1, VAR_SO_SNDBUF) }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 274 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_TRANSPARENT) }
+{ YDVAR(1, VAR_SO_REUSEPORT) }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 275 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_FREEBIND) }
+{ YDVAR(1, VAR_IP_TRANSPARENT) }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 276 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_DSCP) }
+{ YDVAR(1, VAR_IP_FREEBIND) }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 277 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CHROOT) }
+{ YDVAR(1, VAR_IP_DSCP) }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 278 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USERNAME) }
+{ YDVAR(1, VAR_CHROOT) }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 279 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DIRECTORY) }
+{ YDVAR(1, VAR_USERNAME) }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 280 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOGFILE) }
+{ YDVAR(1, VAR_DIRECTORY) }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 281 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PIDFILE) }
+{ YDVAR(1, VAR_LOGFILE) }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 282 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_HINTS) }
+{ YDVAR(1, VAR_PIDFILE) }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 283 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STREAM_WAIT_SIZE) }
+{ YDVAR(1, VAR_ROOT_HINTS) }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 284 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
+{ YDVAR(1, VAR_STREAM_WAIT_SIZE) }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 285 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
+{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 286 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
+{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 287 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
+{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 288 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
+{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 289 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
+{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 290 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MAX_TTL) }
+{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 291 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) }
+{ YDVAR(1, VAR_CACHE_MAX_TTL) }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 292 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHE_MIN_TTL) }
+{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 293 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_HOST_TTL) }
+{ YDVAR(1, VAR_CACHE_MIN_TTL) }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 294 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_LAME_TTL) }
+{ YDVAR(1, VAR_INFRA_HOST_TTL) }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 295 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
+{ YDVAR(1, VAR_INFRA_LAME_TTL) }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 296 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
+{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 297 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
+{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 298 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
+{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 299 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
+{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 300 "./util/configlexer.lex"
-{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
+{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 301 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DELAY_CLOSE) }
+{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 302 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
+{ YDVAR(1, VAR_DELAY_CLOSE) }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 303 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
+{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 304 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
+{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 305 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_GLUE) }
+{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 306 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
+{ YDVAR(1, VAR_HARDEN_GLUE) }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 307 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
+{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 308 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
+{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 309 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
+{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 310 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
+{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 311 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CAPS_WHITELIST) }
+{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
@@ -3906,72 +3915,72 @@ YY_RULE_SETUP
 case 99:
 YY_RULE_SETUP
 #line 313 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
+{ YDVAR(1, VAR_CAPS_WHITELIST) }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 314 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
+{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 315 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
+{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 316 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH_KEY) }
+{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 317 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH) }
+{ YDVAR(1, VAR_PREFETCH_KEY) }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 318 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DENY_ANY) }
+{ YDVAR(1, VAR_PREFETCH) }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 319 "./util/configlexer.lex"
-{ YDVAR(0, VAR_STUB_ZONE) }
+{ YDVAR(1, VAR_DENY_ANY) }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 320 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NAME) }
+{ YDVAR(0, VAR_STUB_ZONE) }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 321 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_ADDR) }
+{ YDVAR(1, VAR_NAME) }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 322 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_HOST) }
+{ YDVAR(1, VAR_STUB_ADDR) }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_PRIME) }
+{ YDVAR(1, VAR_STUB_HOST) }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_FIRST) }
+{ YDVAR(1, VAR_STUB_PRIME) }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_NO_CACHE) }
+{ YDVAR(1, VAR_STUB_FIRST) }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 326 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_NO_CACHE) }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
@@ -3981,32 +3990,32 @@ YY_RULE_SETUP
 case 114:
 YY_RULE_SETUP
 #line 328 "./util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 329 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_FIRST) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 333 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
@@ -4016,47 +4025,47 @@ YY_RULE_SETUP
 case 121:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(0, VAR_AUTH_ZONE) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 336 "./util/configlexer.lex"
-{ YDVAR(0, VAR_RPZ) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 337 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TAGS) }
+{ YDVAR(0, VAR_RPZ) }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 338 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
+{ YDVAR(1, VAR_TAGS) }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
+{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 340 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG) }
+{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG_NAME) }
+{ YDVAR(1, VAR_RPZ_LOG) }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEFILE) }
+{ YDVAR(1, VAR_RPZ_LOG_NAME) }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MASTER) }
+{ YDVAR(1, VAR_ZONEFILE) }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
@@ -4066,701 +4075,701 @@ YY_RULE_SETUP
 case 131:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_URL) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 346 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ALLOW_NOTIFY) }
+{ YDVAR(1, VAR_URL) }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+{ YDVAR(1, VAR_ALLOW_NOTIFY) }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_UPSTREAM) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FALLBACK_ENABLED) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(1, VAR_FALLBACK_ENABLED) }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(0, VAR_VIEW) }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_IDENTITY) }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_VERSION) }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_MODULE_CONF) }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 382 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 383 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 384 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 385 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 388 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 389 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 397 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 398 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 399 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 422 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 423 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 424 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 425 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 426 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 427 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 428 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 429 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 430 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DYNLIB_FILE) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DYNLIB) }
+{ YDVAR(1, VAR_DYNLIB_FILE) }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_DYNLIB) }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 438 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 439 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 440 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 441 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 442 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 443 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 444 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 445 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
 #line 446 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
 #line 447 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 448 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
 #line 449 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
 #line 450 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
 #line 451 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
 #line 452 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
 #line 453 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
 #line 454 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
 #line 455 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(1, VAR_DNSTAP_IP) }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
 #line 456 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(1, VAR_DNSTAP_TLS) }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
 #line 457 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
 #line 458 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
-#line 460 "./util/configlexer.lex"
+#line 459 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
-#line 462 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 461 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
 #line 463 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
 #line 464 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
 #line 465 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
 #line 466 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
-#line 468 "./util/configlexer.lex"
+#line 467 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
-#line 470 "./util/configlexer.lex"
+#line 469 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
-#line 472 "./util/configlexer.lex"
+#line 471 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
-#line 474 "./util/configlexer.lex"
+#line 473 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
-#line 476 "./util/configlexer.lex"
+#line 475 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
-#line 478 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 477 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
 #line 479 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 257:
 YY_RULE_SETUP
 #line 480 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 258:
 YY_RULE_SETUP
 #line 481 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 482 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
 #line 483 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 261:
 YY_RULE_SETUP
 #line 484 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 262:
 YY_RULE_SETUP
 #line 485 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
 #line 486 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
 #line 487 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 488 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 489 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 490 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(1, VAR_LOW_RTT) }
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
 #line 491 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
 	YY_BREAK
 case 269:
 YY_RULE_SETUP
@@ -4775,99 +4784,99 @@ YY_RULE_SETUP
 case 271:
 YY_RULE_SETUP
 #line 494 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 272:
 YY_RULE_SETUP
 #line 495 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 273:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 503 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 504 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
-#line 506 "./util/configlexer.lex"
+#line 505 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
-#line 508 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 507 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 509 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 510 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 511 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 512 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 513 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 514 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 290:
 YY_RULE_SETUP
@@ -4877,113 +4886,118 @@ YY_RULE_SETUP
 case 291:
 YY_RULE_SETUP
 #line 516 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 292:
 YY_RULE_SETUP
 #line 517 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 293:
 YY_RULE_SETUP
 #line 518 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 294:
 YY_RULE_SETUP
 #line 519 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 295:
 YY_RULE_SETUP
 #line 520 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 296:
 YY_RULE_SETUP
 #line 521 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 297:
 YY_RULE_SETUP
 #line 522 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 298:
 YY_RULE_SETUP
 #line 523 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 299:
 YY_RULE_SETUP
 #line 524 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
 	YY_BREAK
 case 300:
 YY_RULE_SETUP
 #line 525 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(0, VAR_IPSET) }
 	YY_BREAK
 case 301:
 YY_RULE_SETUP
 #line 526 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
 	YY_BREAK
 case 302:
 YY_RULE_SETUP
 #line 527 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
 	YY_BREAK
 case 303:
 YY_RULE_SETUP
 #line 528 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 	YY_BREAK
 case 304:
 YY_RULE_SETUP
 #line 529 "./util/configlexer.lex"
-{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
 	YY_BREAK
 case 305:
 YY_RULE_SETUP
 #line 530 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
 	YY_BREAK
 case 306:
-/* rule 306 can match eol */
 YY_RULE_SETUP
 #line 531 "./util/configlexer.lex"
+{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+	YY_BREAK
+case 307:
+/* rule 307 can match eol */
+YY_RULE_SETUP
+#line 532 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 307:
+case 308:
 YY_RULE_SETUP
-#line 534 "./util/configlexer.lex"
+#line 535 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 535 "./util/configlexer.lex"
+#line 536 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 308:
-YY_RULE_SETUP
-#line 540 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 309:
-/* rule 309 can match eol */
 YY_RULE_SETUP
 #line 541 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 310:
+/* rule 310 can match eol */
+YY_RULE_SETUP
+#line 542 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 310:
+case 311:
 YY_RULE_SETUP
-#line 543 "./util/configlexer.lex"
+#line 544 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4996,34 +5010,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 311:
+case 312:
 YY_RULE_SETUP
-#line 555 "./util/configlexer.lex"
+#line 556 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 556 "./util/configlexer.lex"
+#line 557 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 312:
-YY_RULE_SETUP
-#line 561 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 313:
-/* rule 313 can match eol */
 YY_RULE_SETUP
 #line 562 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 314:
+/* rule 314 can match eol */
+YY_RULE_SETUP
+#line 563 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 314:
+case 315:
 YY_RULE_SETUP
-#line 564 "./util/configlexer.lex"
+#line 565 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5036,38 +5050,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 315:
+case 316:
 YY_RULE_SETUP
-#line 576 "./util/configlexer.lex"
+#line 577 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 578 "./util/configlexer.lex"
+#line 579 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 316:
-YY_RULE_SETUP
-#line 582 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 317:
-/* rule 317 can match eol */
 YY_RULE_SETUP
 #line 583 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 318:
+/* rule 318 can match eol */
 YY_RULE_SETUP
 #line 584 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 319:
 YY_RULE_SETUP
 #line 585 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 320:
+YY_RULE_SETUP
+#line 586 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -5075,27 +5089,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 590 "./util/configlexer.lex"
+#line 591 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 320:
-YY_RULE_SETUP
-#line 594 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 321:
-/* rule 321 can match eol */
 YY_RULE_SETUP
 #line 595 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 322:
+/* rule 322 can match eol */
+YY_RULE_SETUP
+#line 596 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 322:
+case 323:
 YY_RULE_SETUP
-#line 597 "./util/configlexer.lex"
+#line 598 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5105,7 +5119,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 603 "./util/configlexer.lex"
+#line 604 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5120,39 +5134,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 323:
+case 324:
 YY_RULE_SETUP
-#line 617 "./util/configlexer.lex"
+#line 618 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 620 "./util/configlexer.lex"
+#line 621 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 324:
-YY_RULE_SETUP
-#line 624 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
 case 325:
-/* rule 325 can match eol */
 YY_RULE_SETUP
 #line 625 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
 	YY_BREAK
 case 326:
+/* rule 326 can match eol */
 YY_RULE_SETUP
 #line 626 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 case 327:
 YY_RULE_SETUP
 #line 627 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 328:
+YY_RULE_SETUP
+#line 628 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5161,29 +5175,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 633 "./util/configlexer.lex"
+#line 634 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 328:
-YY_RULE_SETUP
-#line 637 "./util/configlexer.lex"
-{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 329:
-/* rule 329 can match eol */
 YY_RULE_SETUP
 #line 638 "./util/configlexer.lex"
+{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 330:
+/* rule 330 can match eol */
+YY_RULE_SETUP
+#line 639 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 330:
+case 331:
 YY_RULE_SETUP
-#line 642 "./util/configlexer.lex"
+#line 643 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5192,33 +5206,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 331:
+case 332:
 YY_RULE_SETUP
-#line 650 "./util/configlexer.lex"
+#line 651 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 332:
+case 333:
 YY_RULE_SETUP
-#line 654 "./util/configlexer.lex"
+#line 655 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 333:
+case 334:
 YY_RULE_SETUP
-#line 658 "./util/configlexer.lex"
+#line 659 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 334:
+case 335:
 YY_RULE_SETUP
-#line 662 "./util/configlexer.lex"
+#line 663 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5220 "<stdout>"
+#line 5233 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5513,7 +5527,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3253 )
+			if ( yy_current_state >= 3268 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5541,11 +5555,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3253 )
+		if ( yy_current_state >= 3268 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3252);
+	yy_is_jam = (yy_current_state == 3267);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6184,6 +6198,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 662 "./util/configlexer.lex"
+#line 663 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index ea7c1cf72..a4af4e8cb 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -262,6 +262,7 @@ http-max-streams{COLON}		{ YDVAR(1, VAR_HTTP_MAX_STREAMS) }
 http-query-buffer-size{COLON}	{ YDVAR(1, VAR_HTTP_QUERY_BUFFER_SIZE) }
 http-response-buffer-size{COLON} { YDVAR(1, VAR_HTTP_RESPONSE_BUFFER_SIZE) }
 http-nodelay{COLON}		{ YDVAR(1, VAR_HTTP_NODELAY) }
+http-notls-downstream{COLON}	{ YDVAR(1, VAR_HTTP_NOTLS_DOWNSTREAM) }
 use-systemd{COLON}		{ YDVAR(1, VAR_USE_SYSTEMD) }
 do-daemonize{COLON}		{ YDVAR(1, VAR_DO_DAEMONIZE) }
 interface{COLON}		{ YDVAR(1, VAR_INTERFACE) }
diff --git a/util/configparser.c b/util/configparser.c
index 50788a0c5..85565951e 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -279,158 +279,159 @@ extern int yydebug;
     VAR_HTTP_QUERY_BUFFER_SIZE = 400,
     VAR_HTTP_RESPONSE_BUFFER_SIZE = 401,
     VAR_HTTP_NODELAY = 402,
-    VAR_STUB_FIRST = 403,
-    VAR_MINIMAL_RESPONSES = 404,
-    VAR_RRSET_ROUNDROBIN = 405,
-    VAR_MAX_UDP_SIZE = 406,
-    VAR_DELAY_CLOSE = 407,
-    VAR_UNBLOCK_LAN_ZONES = 408,
-    VAR_INSECURE_LAN_ZONES = 409,
-    VAR_INFRA_CACHE_MIN_RTT = 410,
-    VAR_DNS64_PREFIX = 411,
-    VAR_DNS64_SYNTHALL = 412,
-    VAR_DNS64_IGNORE_AAAA = 413,
-    VAR_DNSTAP = 414,
-    VAR_DNSTAP_ENABLE = 415,
-    VAR_DNSTAP_SOCKET_PATH = 416,
-    VAR_DNSTAP_IP = 417,
-    VAR_DNSTAP_TLS = 418,
-    VAR_DNSTAP_TLS_SERVER_NAME = 419,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 420,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 421,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 422,
-    VAR_DNSTAP_SEND_IDENTITY = 423,
-    VAR_DNSTAP_SEND_VERSION = 424,
-    VAR_DNSTAP_BIDIRECTIONAL = 425,
-    VAR_DNSTAP_IDENTITY = 426,
-    VAR_DNSTAP_VERSION = 427,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 428,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 429,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 430,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 431,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 432,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 433,
-    VAR_RESPONSE_IP_TAG = 434,
-    VAR_RESPONSE_IP = 435,
-    VAR_RESPONSE_IP_DATA = 436,
-    VAR_HARDEN_ALGO_DOWNGRADE = 437,
-    VAR_IP_TRANSPARENT = 438,
-    VAR_IP_DSCP = 439,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 440,
-    VAR_IP_RATELIMIT = 441,
-    VAR_IP_RATELIMIT_SLABS = 442,
-    VAR_IP_RATELIMIT_SIZE = 443,
-    VAR_RATELIMIT = 444,
-    VAR_RATELIMIT_SLABS = 445,
-    VAR_RATELIMIT_SIZE = 446,
-    VAR_RATELIMIT_FOR_DOMAIN = 447,
-    VAR_RATELIMIT_BELOW_DOMAIN = 448,
-    VAR_IP_RATELIMIT_FACTOR = 449,
-    VAR_RATELIMIT_FACTOR = 450,
-    VAR_SEND_CLIENT_SUBNET = 451,
-    VAR_CLIENT_SUBNET_ZONE = 452,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 453,
-    VAR_CLIENT_SUBNET_OPCODE = 454,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 455,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 456,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 457,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 458,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 459,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 460,
-    VAR_CAPS_WHITELIST = 461,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 462,
-    VAR_PERMIT_SMALL_HOLDDOWN = 463,
-    VAR_QNAME_MINIMISATION = 464,
-    VAR_QNAME_MINIMISATION_STRICT = 465,
-    VAR_IP_FREEBIND = 466,
-    VAR_DEFINE_TAG = 467,
-    VAR_LOCAL_ZONE_TAG = 468,
-    VAR_ACCESS_CONTROL_TAG = 469,
-    VAR_LOCAL_ZONE_OVERRIDE = 470,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 471,
-    VAR_ACCESS_CONTROL_TAG_DATA = 472,
-    VAR_VIEW = 473,
-    VAR_ACCESS_CONTROL_VIEW = 474,
-    VAR_VIEW_FIRST = 475,
-    VAR_SERVE_EXPIRED = 476,
-    VAR_SERVE_EXPIRED_TTL = 477,
-    VAR_SERVE_EXPIRED_TTL_RESET = 478,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 479,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 480,
-    VAR_FAKE_DSA = 481,
-    VAR_FAKE_SHA1 = 482,
-    VAR_LOG_IDENTITY = 483,
-    VAR_HIDE_TRUSTANCHOR = 484,
-    VAR_TRUST_ANCHOR_SIGNALING = 485,
-    VAR_AGGRESSIVE_NSEC = 486,
-    VAR_USE_SYSTEMD = 487,
-    VAR_SHM_ENABLE = 488,
-    VAR_SHM_KEY = 489,
-    VAR_ROOT_KEY_SENTINEL = 490,
-    VAR_DNSCRYPT = 491,
-    VAR_DNSCRYPT_ENABLE = 492,
-    VAR_DNSCRYPT_PORT = 493,
-    VAR_DNSCRYPT_PROVIDER = 494,
-    VAR_DNSCRYPT_SECRET_KEY = 495,
-    VAR_DNSCRYPT_PROVIDER_CERT = 496,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 497,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 498,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 499,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 500,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 501,
-    VAR_IPSECMOD_ENABLED = 502,
-    VAR_IPSECMOD_HOOK = 503,
-    VAR_IPSECMOD_IGNORE_BOGUS = 504,
-    VAR_IPSECMOD_MAX_TTL = 505,
-    VAR_IPSECMOD_WHITELIST = 506,
-    VAR_IPSECMOD_STRICT = 507,
-    VAR_CACHEDB = 508,
-    VAR_CACHEDB_BACKEND = 509,
-    VAR_CACHEDB_SECRETSEED = 510,
-    VAR_CACHEDB_REDISHOST = 511,
-    VAR_CACHEDB_REDISPORT = 512,
-    VAR_CACHEDB_REDISTIMEOUT = 513,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 514,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 515,
-    VAR_FOR_UPSTREAM = 516,
-    VAR_AUTH_ZONE = 517,
-    VAR_ZONEFILE = 518,
-    VAR_MASTER = 519,
-    VAR_URL = 520,
-    VAR_FOR_DOWNSTREAM = 521,
-    VAR_FALLBACK_ENABLED = 522,
-    VAR_TLS_ADDITIONAL_PORT = 523,
-    VAR_LOW_RTT = 524,
-    VAR_LOW_RTT_PERMIL = 525,
-    VAR_FAST_SERVER_PERMIL = 526,
-    VAR_FAST_SERVER_NUM = 527,
-    VAR_ALLOW_NOTIFY = 528,
-    VAR_TLS_WIN_CERT = 529,
-    VAR_TCP_CONNECTION_LIMIT = 530,
-    VAR_FORWARD_NO_CACHE = 531,
-    VAR_STUB_NO_CACHE = 532,
-    VAR_LOG_SERVFAIL = 533,
-    VAR_DENY_ANY = 534,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 535,
-    VAR_LOG_TAG_QUERYREPLY = 536,
-    VAR_STREAM_WAIT_SIZE = 537,
-    VAR_TLS_CIPHERS = 538,
-    VAR_TLS_CIPHERSUITES = 539,
-    VAR_TLS_USE_SNI = 540,
-    VAR_IPSET = 541,
-    VAR_IPSET_NAME_V4 = 542,
-    VAR_IPSET_NAME_V6 = 543,
-    VAR_TLS_SESSION_TICKET_KEYS = 544,
-    VAR_RPZ = 545,
-    VAR_TAGS = 546,
-    VAR_RPZ_ACTION_OVERRIDE = 547,
-    VAR_RPZ_CNAME_OVERRIDE = 548,
-    VAR_RPZ_LOG = 549,
-    VAR_RPZ_LOG_NAME = 550,
-    VAR_DYNLIB = 551,
-    VAR_DYNLIB_FILE = 552,
-    VAR_EDNS_CLIENT_TAG = 553,
-    VAR_EDNS_CLIENT_TAG_OPCODE = 554
+    VAR_HTTP_NOTLS_DOWNSTREAM = 403,
+    VAR_STUB_FIRST = 404,
+    VAR_MINIMAL_RESPONSES = 405,
+    VAR_RRSET_ROUNDROBIN = 406,
+    VAR_MAX_UDP_SIZE = 407,
+    VAR_DELAY_CLOSE = 408,
+    VAR_UNBLOCK_LAN_ZONES = 409,
+    VAR_INSECURE_LAN_ZONES = 410,
+    VAR_INFRA_CACHE_MIN_RTT = 411,
+    VAR_DNS64_PREFIX = 412,
+    VAR_DNS64_SYNTHALL = 413,
+    VAR_DNS64_IGNORE_AAAA = 414,
+    VAR_DNSTAP = 415,
+    VAR_DNSTAP_ENABLE = 416,
+    VAR_DNSTAP_SOCKET_PATH = 417,
+    VAR_DNSTAP_IP = 418,
+    VAR_DNSTAP_TLS = 419,
+    VAR_DNSTAP_TLS_SERVER_NAME = 420,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 421,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 422,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 423,
+    VAR_DNSTAP_SEND_IDENTITY = 424,
+    VAR_DNSTAP_SEND_VERSION = 425,
+    VAR_DNSTAP_BIDIRECTIONAL = 426,
+    VAR_DNSTAP_IDENTITY = 427,
+    VAR_DNSTAP_VERSION = 428,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 429,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 430,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 431,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 432,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 433,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 434,
+    VAR_RESPONSE_IP_TAG = 435,
+    VAR_RESPONSE_IP = 436,
+    VAR_RESPONSE_IP_DATA = 437,
+    VAR_HARDEN_ALGO_DOWNGRADE = 438,
+    VAR_IP_TRANSPARENT = 439,
+    VAR_IP_DSCP = 440,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 441,
+    VAR_IP_RATELIMIT = 442,
+    VAR_IP_RATELIMIT_SLABS = 443,
+    VAR_IP_RATELIMIT_SIZE = 444,
+    VAR_RATELIMIT = 445,
+    VAR_RATELIMIT_SLABS = 446,
+    VAR_RATELIMIT_SIZE = 447,
+    VAR_RATELIMIT_FOR_DOMAIN = 448,
+    VAR_RATELIMIT_BELOW_DOMAIN = 449,
+    VAR_IP_RATELIMIT_FACTOR = 450,
+    VAR_RATELIMIT_FACTOR = 451,
+    VAR_SEND_CLIENT_SUBNET = 452,
+    VAR_CLIENT_SUBNET_ZONE = 453,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 454,
+    VAR_CLIENT_SUBNET_OPCODE = 455,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 456,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 457,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 458,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 459,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 460,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 461,
+    VAR_CAPS_WHITELIST = 462,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 463,
+    VAR_PERMIT_SMALL_HOLDDOWN = 464,
+    VAR_QNAME_MINIMISATION = 465,
+    VAR_QNAME_MINIMISATION_STRICT = 466,
+    VAR_IP_FREEBIND = 467,
+    VAR_DEFINE_TAG = 468,
+    VAR_LOCAL_ZONE_TAG = 469,
+    VAR_ACCESS_CONTROL_TAG = 470,
+    VAR_LOCAL_ZONE_OVERRIDE = 471,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 472,
+    VAR_ACCESS_CONTROL_TAG_DATA = 473,
+    VAR_VIEW = 474,
+    VAR_ACCESS_CONTROL_VIEW = 475,
+    VAR_VIEW_FIRST = 476,
+    VAR_SERVE_EXPIRED = 477,
+    VAR_SERVE_EXPIRED_TTL = 478,
+    VAR_SERVE_EXPIRED_TTL_RESET = 479,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 480,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 481,
+    VAR_FAKE_DSA = 482,
+    VAR_FAKE_SHA1 = 483,
+    VAR_LOG_IDENTITY = 484,
+    VAR_HIDE_TRUSTANCHOR = 485,
+    VAR_TRUST_ANCHOR_SIGNALING = 486,
+    VAR_AGGRESSIVE_NSEC = 487,
+    VAR_USE_SYSTEMD = 488,
+    VAR_SHM_ENABLE = 489,
+    VAR_SHM_KEY = 490,
+    VAR_ROOT_KEY_SENTINEL = 491,
+    VAR_DNSCRYPT = 492,
+    VAR_DNSCRYPT_ENABLE = 493,
+    VAR_DNSCRYPT_PORT = 494,
+    VAR_DNSCRYPT_PROVIDER = 495,
+    VAR_DNSCRYPT_SECRET_KEY = 496,
+    VAR_DNSCRYPT_PROVIDER_CERT = 497,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 498,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 499,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 500,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 501,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 502,
+    VAR_IPSECMOD_ENABLED = 503,
+    VAR_IPSECMOD_HOOK = 504,
+    VAR_IPSECMOD_IGNORE_BOGUS = 505,
+    VAR_IPSECMOD_MAX_TTL = 506,
+    VAR_IPSECMOD_WHITELIST = 507,
+    VAR_IPSECMOD_STRICT = 508,
+    VAR_CACHEDB = 509,
+    VAR_CACHEDB_BACKEND = 510,
+    VAR_CACHEDB_SECRETSEED = 511,
+    VAR_CACHEDB_REDISHOST = 512,
+    VAR_CACHEDB_REDISPORT = 513,
+    VAR_CACHEDB_REDISTIMEOUT = 514,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 515,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 516,
+    VAR_FOR_UPSTREAM = 517,
+    VAR_AUTH_ZONE = 518,
+    VAR_ZONEFILE = 519,
+    VAR_MASTER = 520,
+    VAR_URL = 521,
+    VAR_FOR_DOWNSTREAM = 522,
+    VAR_FALLBACK_ENABLED = 523,
+    VAR_TLS_ADDITIONAL_PORT = 524,
+    VAR_LOW_RTT = 525,
+    VAR_LOW_RTT_PERMIL = 526,
+    VAR_FAST_SERVER_PERMIL = 527,
+    VAR_FAST_SERVER_NUM = 528,
+    VAR_ALLOW_NOTIFY = 529,
+    VAR_TLS_WIN_CERT = 530,
+    VAR_TCP_CONNECTION_LIMIT = 531,
+    VAR_FORWARD_NO_CACHE = 532,
+    VAR_STUB_NO_CACHE = 533,
+    VAR_LOG_SERVFAIL = 534,
+    VAR_DENY_ANY = 535,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 536,
+    VAR_LOG_TAG_QUERYREPLY = 537,
+    VAR_STREAM_WAIT_SIZE = 538,
+    VAR_TLS_CIPHERS = 539,
+    VAR_TLS_CIPHERSUITES = 540,
+    VAR_TLS_USE_SNI = 541,
+    VAR_IPSET = 542,
+    VAR_IPSET_NAME_V4 = 543,
+    VAR_IPSET_NAME_V6 = 544,
+    VAR_TLS_SESSION_TICKET_KEYS = 545,
+    VAR_RPZ = 546,
+    VAR_TAGS = 547,
+    VAR_RPZ_ACTION_OVERRIDE = 548,
+    VAR_RPZ_CNAME_OVERRIDE = 549,
+    VAR_RPZ_LOG = 550,
+    VAR_RPZ_LOG_NAME = 551,
+    VAR_DYNLIB = 552,
+    VAR_DYNLIB_FILE = 553,
+    VAR_EDNS_CLIENT_TAG = 554,
+    VAR_EDNS_CLIENT_TAG_OPCODE = 555
   };
 #endif
 /* Tokens.  */
@@ -579,158 +580,159 @@ extern int yydebug;
 #define VAR_HTTP_QUERY_BUFFER_SIZE 400
 #define VAR_HTTP_RESPONSE_BUFFER_SIZE 401
 #define VAR_HTTP_NODELAY 402
-#define VAR_STUB_FIRST 403
-#define VAR_MINIMAL_RESPONSES 404
-#define VAR_RRSET_ROUNDROBIN 405
-#define VAR_MAX_UDP_SIZE 406
-#define VAR_DELAY_CLOSE 407
-#define VAR_UNBLOCK_LAN_ZONES 408
-#define VAR_INSECURE_LAN_ZONES 409
-#define VAR_INFRA_CACHE_MIN_RTT 410
-#define VAR_DNS64_PREFIX 411
-#define VAR_DNS64_SYNTHALL 412
-#define VAR_DNS64_IGNORE_AAAA 413
-#define VAR_DNSTAP 414
-#define VAR_DNSTAP_ENABLE 415
-#define VAR_DNSTAP_SOCKET_PATH 416
-#define VAR_DNSTAP_IP 417
-#define VAR_DNSTAP_TLS 418
-#define VAR_DNSTAP_TLS_SERVER_NAME 419
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 420
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 421
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 422
-#define VAR_DNSTAP_SEND_IDENTITY 423
-#define VAR_DNSTAP_SEND_VERSION 424
-#define VAR_DNSTAP_BIDIRECTIONAL 425
-#define VAR_DNSTAP_IDENTITY 426
-#define VAR_DNSTAP_VERSION 427
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 428
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 429
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 430
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 431
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 432
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 433
-#define VAR_RESPONSE_IP_TAG 434
-#define VAR_RESPONSE_IP 435
-#define VAR_RESPONSE_IP_DATA 436
-#define VAR_HARDEN_ALGO_DOWNGRADE 437
-#define VAR_IP_TRANSPARENT 438
-#define VAR_IP_DSCP 439
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 440
-#define VAR_IP_RATELIMIT 441
-#define VAR_IP_RATELIMIT_SLABS 442
-#define VAR_IP_RATELIMIT_SIZE 443
-#define VAR_RATELIMIT 444
-#define VAR_RATELIMIT_SLABS 445
-#define VAR_RATELIMIT_SIZE 446
-#define VAR_RATELIMIT_FOR_DOMAIN 447
-#define VAR_RATELIMIT_BELOW_DOMAIN 448
-#define VAR_IP_RATELIMIT_FACTOR 449
-#define VAR_RATELIMIT_FACTOR 450
-#define VAR_SEND_CLIENT_SUBNET 451
-#define VAR_CLIENT_SUBNET_ZONE 452
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 453
-#define VAR_CLIENT_SUBNET_OPCODE 454
-#define VAR_MAX_CLIENT_SUBNET_IPV4 455
-#define VAR_MAX_CLIENT_SUBNET_IPV6 456
-#define VAR_MIN_CLIENT_SUBNET_IPV4 457
-#define VAR_MIN_CLIENT_SUBNET_IPV6 458
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 459
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 460
-#define VAR_CAPS_WHITELIST 461
-#define VAR_CACHE_MAX_NEGATIVE_TTL 462
-#define VAR_PERMIT_SMALL_HOLDDOWN 463
-#define VAR_QNAME_MINIMISATION 464
-#define VAR_QNAME_MINIMISATION_STRICT 465
-#define VAR_IP_FREEBIND 466
-#define VAR_DEFINE_TAG 467
-#define VAR_LOCAL_ZONE_TAG 468
-#define VAR_ACCESS_CONTROL_TAG 469
-#define VAR_LOCAL_ZONE_OVERRIDE 470
-#define VAR_ACCESS_CONTROL_TAG_ACTION 471
-#define VAR_ACCESS_CONTROL_TAG_DATA 472
-#define VAR_VIEW 473
-#define VAR_ACCESS_CONTROL_VIEW 474
-#define VAR_VIEW_FIRST 475
-#define VAR_SERVE_EXPIRED 476
-#define VAR_SERVE_EXPIRED_TTL 477
-#define VAR_SERVE_EXPIRED_TTL_RESET 478
-#define VAR_SERVE_EXPIRED_REPLY_TTL 479
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 480
-#define VAR_FAKE_DSA 481
-#define VAR_FAKE_SHA1 482
-#define VAR_LOG_IDENTITY 483
-#define VAR_HIDE_TRUSTANCHOR 484
-#define VAR_TRUST_ANCHOR_SIGNALING 485
-#define VAR_AGGRESSIVE_NSEC 486
-#define VAR_USE_SYSTEMD 487
-#define VAR_SHM_ENABLE 488
-#define VAR_SHM_KEY 489
-#define VAR_ROOT_KEY_SENTINEL 490
-#define VAR_DNSCRYPT 491
-#define VAR_DNSCRYPT_ENABLE 492
-#define VAR_DNSCRYPT_PORT 493
-#define VAR_DNSCRYPT_PROVIDER 494
-#define VAR_DNSCRYPT_SECRET_KEY 495
-#define VAR_DNSCRYPT_PROVIDER_CERT 496
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 497
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 498
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 499
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 500
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 501
-#define VAR_IPSECMOD_ENABLED 502
-#define VAR_IPSECMOD_HOOK 503
-#define VAR_IPSECMOD_IGNORE_BOGUS 504
-#define VAR_IPSECMOD_MAX_TTL 505
-#define VAR_IPSECMOD_WHITELIST 506
-#define VAR_IPSECMOD_STRICT 507
-#define VAR_CACHEDB 508
-#define VAR_CACHEDB_BACKEND 509
-#define VAR_CACHEDB_SECRETSEED 510
-#define VAR_CACHEDB_REDISHOST 511
-#define VAR_CACHEDB_REDISPORT 512
-#define VAR_CACHEDB_REDISTIMEOUT 513
-#define VAR_CACHEDB_REDISEXPIRERECORDS 514
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 515
-#define VAR_FOR_UPSTREAM 516
-#define VAR_AUTH_ZONE 517
-#define VAR_ZONEFILE 518
-#define VAR_MASTER 519
-#define VAR_URL 520
-#define VAR_FOR_DOWNSTREAM 521
-#define VAR_FALLBACK_ENABLED 522
-#define VAR_TLS_ADDITIONAL_PORT 523
-#define VAR_LOW_RTT 524
-#define VAR_LOW_RTT_PERMIL 525
-#define VAR_FAST_SERVER_PERMIL 526
-#define VAR_FAST_SERVER_NUM 527
-#define VAR_ALLOW_NOTIFY 528
-#define VAR_TLS_WIN_CERT 529
-#define VAR_TCP_CONNECTION_LIMIT 530
-#define VAR_FORWARD_NO_CACHE 531
-#define VAR_STUB_NO_CACHE 532
-#define VAR_LOG_SERVFAIL 533
-#define VAR_DENY_ANY 534
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 535
-#define VAR_LOG_TAG_QUERYREPLY 536
-#define VAR_STREAM_WAIT_SIZE 537
-#define VAR_TLS_CIPHERS 538
-#define VAR_TLS_CIPHERSUITES 539
-#define VAR_TLS_USE_SNI 540
-#define VAR_IPSET 541
-#define VAR_IPSET_NAME_V4 542
-#define VAR_IPSET_NAME_V6 543
-#define VAR_TLS_SESSION_TICKET_KEYS 544
-#define VAR_RPZ 545
-#define VAR_TAGS 546
-#define VAR_RPZ_ACTION_OVERRIDE 547
-#define VAR_RPZ_CNAME_OVERRIDE 548
-#define VAR_RPZ_LOG 549
-#define VAR_RPZ_LOG_NAME 550
-#define VAR_DYNLIB 551
-#define VAR_DYNLIB_FILE 552
-#define VAR_EDNS_CLIENT_TAG 553
-#define VAR_EDNS_CLIENT_TAG_OPCODE 554
+#define VAR_HTTP_NOTLS_DOWNSTREAM 403
+#define VAR_STUB_FIRST 404
+#define VAR_MINIMAL_RESPONSES 405
+#define VAR_RRSET_ROUNDROBIN 406
+#define VAR_MAX_UDP_SIZE 407
+#define VAR_DELAY_CLOSE 408
+#define VAR_UNBLOCK_LAN_ZONES 409
+#define VAR_INSECURE_LAN_ZONES 410
+#define VAR_INFRA_CACHE_MIN_RTT 411
+#define VAR_DNS64_PREFIX 412
+#define VAR_DNS64_SYNTHALL 413
+#define VAR_DNS64_IGNORE_AAAA 414
+#define VAR_DNSTAP 415
+#define VAR_DNSTAP_ENABLE 416
+#define VAR_DNSTAP_SOCKET_PATH 417
+#define VAR_DNSTAP_IP 418
+#define VAR_DNSTAP_TLS 419
+#define VAR_DNSTAP_TLS_SERVER_NAME 420
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 421
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 422
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 423
+#define VAR_DNSTAP_SEND_IDENTITY 424
+#define VAR_DNSTAP_SEND_VERSION 425
+#define VAR_DNSTAP_BIDIRECTIONAL 426
+#define VAR_DNSTAP_IDENTITY 427
+#define VAR_DNSTAP_VERSION 428
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 429
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 430
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 431
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 432
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 433
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 434
+#define VAR_RESPONSE_IP_TAG 435
+#define VAR_RESPONSE_IP 436
+#define VAR_RESPONSE_IP_DATA 437
+#define VAR_HARDEN_ALGO_DOWNGRADE 438
+#define VAR_IP_TRANSPARENT 439
+#define VAR_IP_DSCP 440
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 441
+#define VAR_IP_RATELIMIT 442
+#define VAR_IP_RATELIMIT_SLABS 443
+#define VAR_IP_RATELIMIT_SIZE 444
+#define VAR_RATELIMIT 445
+#define VAR_RATELIMIT_SLABS 446
+#define VAR_RATELIMIT_SIZE 447
+#define VAR_RATELIMIT_FOR_DOMAIN 448
+#define VAR_RATELIMIT_BELOW_DOMAIN 449
+#define VAR_IP_RATELIMIT_FACTOR 450
+#define VAR_RATELIMIT_FACTOR 451
+#define VAR_SEND_CLIENT_SUBNET 452
+#define VAR_CLIENT_SUBNET_ZONE 453
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 454
+#define VAR_CLIENT_SUBNET_OPCODE 455
+#define VAR_MAX_CLIENT_SUBNET_IPV4 456
+#define VAR_MAX_CLIENT_SUBNET_IPV6 457
+#define VAR_MIN_CLIENT_SUBNET_IPV4 458
+#define VAR_MIN_CLIENT_SUBNET_IPV6 459
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 460
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 461
+#define VAR_CAPS_WHITELIST 462
+#define VAR_CACHE_MAX_NEGATIVE_TTL 463
+#define VAR_PERMIT_SMALL_HOLDDOWN 464
+#define VAR_QNAME_MINIMISATION 465
+#define VAR_QNAME_MINIMISATION_STRICT 466
+#define VAR_IP_FREEBIND 467
+#define VAR_DEFINE_TAG 468
+#define VAR_LOCAL_ZONE_TAG 469
+#define VAR_ACCESS_CONTROL_TAG 470
+#define VAR_LOCAL_ZONE_OVERRIDE 471
+#define VAR_ACCESS_CONTROL_TAG_ACTION 472
+#define VAR_ACCESS_CONTROL_TAG_DATA 473
+#define VAR_VIEW 474
+#define VAR_ACCESS_CONTROL_VIEW 475
+#define VAR_VIEW_FIRST 476
+#define VAR_SERVE_EXPIRED 477
+#define VAR_SERVE_EXPIRED_TTL 478
+#define VAR_SERVE_EXPIRED_TTL_RESET 479
+#define VAR_SERVE_EXPIRED_REPLY_TTL 480
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 481
+#define VAR_FAKE_DSA 482
+#define VAR_FAKE_SHA1 483
+#define VAR_LOG_IDENTITY 484
+#define VAR_HIDE_TRUSTANCHOR 485
+#define VAR_TRUST_ANCHOR_SIGNALING 486
+#define VAR_AGGRESSIVE_NSEC 487
+#define VAR_USE_SYSTEMD 488
+#define VAR_SHM_ENABLE 489
+#define VAR_SHM_KEY 490
+#define VAR_ROOT_KEY_SENTINEL 491
+#define VAR_DNSCRYPT 492
+#define VAR_DNSCRYPT_ENABLE 493
+#define VAR_DNSCRYPT_PORT 494
+#define VAR_DNSCRYPT_PROVIDER 495
+#define VAR_DNSCRYPT_SECRET_KEY 496
+#define VAR_DNSCRYPT_PROVIDER_CERT 497
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 498
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 499
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 500
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 501
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 502
+#define VAR_IPSECMOD_ENABLED 503
+#define VAR_IPSECMOD_HOOK 504
+#define VAR_IPSECMOD_IGNORE_BOGUS 505
+#define VAR_IPSECMOD_MAX_TTL 506
+#define VAR_IPSECMOD_WHITELIST 507
+#define VAR_IPSECMOD_STRICT 508
+#define VAR_CACHEDB 509
+#define VAR_CACHEDB_BACKEND 510
+#define VAR_CACHEDB_SECRETSEED 511
+#define VAR_CACHEDB_REDISHOST 512
+#define VAR_CACHEDB_REDISPORT 513
+#define VAR_CACHEDB_REDISTIMEOUT 514
+#define VAR_CACHEDB_REDISEXPIRERECORDS 515
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 516
+#define VAR_FOR_UPSTREAM 517
+#define VAR_AUTH_ZONE 518
+#define VAR_ZONEFILE 519
+#define VAR_MASTER 520
+#define VAR_URL 521
+#define VAR_FOR_DOWNSTREAM 522
+#define VAR_FALLBACK_ENABLED 523
+#define VAR_TLS_ADDITIONAL_PORT 524
+#define VAR_LOW_RTT 525
+#define VAR_LOW_RTT_PERMIL 526
+#define VAR_FAST_SERVER_PERMIL 527
+#define VAR_FAST_SERVER_NUM 528
+#define VAR_ALLOW_NOTIFY 529
+#define VAR_TLS_WIN_CERT 530
+#define VAR_TCP_CONNECTION_LIMIT 531
+#define VAR_FORWARD_NO_CACHE 532
+#define VAR_STUB_NO_CACHE 533
+#define VAR_LOG_SERVFAIL 534
+#define VAR_DENY_ANY 535
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 536
+#define VAR_LOG_TAG_QUERYREPLY 537
+#define VAR_STREAM_WAIT_SIZE 538
+#define VAR_TLS_CIPHERS 539
+#define VAR_TLS_CIPHERSUITES 540
+#define VAR_TLS_USE_SNI 541
+#define VAR_IPSET 542
+#define VAR_IPSET_NAME_V4 543
+#define VAR_IPSET_NAME_V6 544
+#define VAR_TLS_SESSION_TICKET_KEYS 545
+#define VAR_RPZ 546
+#define VAR_TAGS 547
+#define VAR_RPZ_ACTION_OVERRIDE 548
+#define VAR_RPZ_CNAME_OVERRIDE 549
+#define VAR_RPZ_LOG 550
+#define VAR_RPZ_LOG_NAME 551
+#define VAR_DYNLIB 552
+#define VAR_DYNLIB_FILE 553
+#define VAR_EDNS_CLIENT_TAG 554
+#define VAR_EDNS_CLIENT_TAG_OPCODE 555
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -740,7 +742,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 744 "util/configparser.c"
+#line 746 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -990,19 +992,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   635
+#define YYLAST   637
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  300
+#define YYNTOKENS  301
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  325
+#define YYNNTS  326
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  626
+#define YYNRULES  628
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  930
+#define YYNSTATES  933
 
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   554
+#define YYMAXUTOK   555
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
@@ -1068,7 +1070,7 @@ static const yytype_uint16 yytranslate[] =
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299
+     295,   296,   297,   298,   299,   300
 };
 
 #if YYDEBUG
@@ -1088,56 +1090,56 @@ static const yytype_uint16 yyrline[] =
      239,   240,   240,   241,   241,   242,   242,   242,   243,   243,
      244,   244,   244,   245,   245,   245,   246,   246,   246,   247,
      247,   247,   247,   248,   249,   249,   249,   250,   250,   250,
-     251,   251,   252,   253,   253,   253,   254,   254,   255,   255,
-     256,   256,   256,   257,   257,   258,   258,   258,   259,   260,
-     260,   261,   261,   262,   263,   263,   264,   264,   265,   265,
-     266,   267,   267,   268,   268,   269,   269,   270,   270,   271,
-     271,   272,   272,   272,   273,   273,   274,   274,   275,   275,
-     276,   276,   277,   277,   278,   278,   279,   279,   279,   280,
-     280,   280,   281,   281,   281,   282,   282,   283,   284,   284,
-     285,   285,   286,   286,   287,   287,   288,   288,   288,   289,
-     289,   289,   290,   290,   290,   291,   291,   292,   292,   293,
-     293,   294,   294,   295,   297,   309,   310,   311,   311,   311,
-     311,   311,   312,   312,   314,   326,   327,   328,   328,   328,
-     328,   329,   329,   331,   345,   346,   347,   347,   347,   347,
-     348,   348,   348,   350,   367,   368,   369,   369,   369,   369,
-     370,   370,   370,   371,   374,   393,   410,   418,   428,   436,
-     453,   454,   455,   455,   455,   455,   455,   456,   456,   456,
-     457,   457,   459,   468,   477,   488,   497,   506,   515,   526,
-     535,   547,   561,   576,   587,   604,   621,   638,   655,   670,
-     685,   698,   713,   722,   731,   740,   749,   758,   767,   776,
-     785,   794,   803,   812,   821,   830,   839,   852,   861,   874,
-     883,   892,   901,   908,   915,   924,   931,   940,   948,   955,
-     962,   970,   979,   987,  1003,  1011,  1019,  1027,  1035,  1044,
-    1053,  1067,  1076,  1085,  1094,  1103,  1112,  1121,  1128,  1135,
-    1161,  1169,  1176,  1183,  1190,  1197,  1205,  1213,  1221,  1228,
-    1239,  1250,  1257,  1266,  1275,  1284,  1291,  1298,  1306,  1314,
-    1324,  1334,  1344,  1358,  1366,  1379,  1390,  1398,  1411,  1420,
-    1429,  1438,  1448,  1458,  1466,  1479,  1488,  1496,  1505,  1513,
-    1526,  1535,  1542,  1552,  1562,  1572,  1582,  1592,  1602,  1612,
-    1622,  1629,  1636,  1643,  1652,  1661,  1670,  1679,  1686,  1696,
-    1716,  1723,  1741,  1754,  1767,  1776,  1785,  1794,  1803,  1813,
-    1823,  1834,  1843,  1852,  1861,  1870,  1879,  1888,  1901,  1914,
-    1923,  1930,  1939,  1948,  1957,  1966,  1974,  1987,  1995,  2036,
-    2043,  2058,  2068,  2078,  2085,  2092,  2099,  2108,  2116,  2130,
-    2151,  2172,  2184,  2196,  2208,  2217,  2238,  2248,  2257,  2265,
-    2273,  2286,  2299,  2314,  2329,  2338,  2347,  2353,  2362,  2371,
-    2381,  2391,  2404,  2417,  2429,  2443,  2455,  2469,  2484,  2495,
-    2505,  2512,  2519,  2528,  2537,  2547,  2557,  2567,  2574,  2581,
-    2590,  2599,  2609,  2619,  2626,  2633,  2640,  2648,  2658,  2668,
-    2678,  2688,  2727,  2737,  2745,  2753,  2768,  2777,  2782,  2783,
-    2784,  2784,  2784,  2785,  2785,  2785,  2786,  2786,  2788,  2798,
-    2807,  2814,  2821,  2828,  2835,  2842,  2849,  2854,  2855,  2856,
-    2856,  2856,  2857,  2857,  2857,  2858,  2859,  2859,  2860,  2860,
-    2861,  2861,  2862,  2863,  2864,  2865,  2866,  2867,  2869,  2878,
-    2888,  2895,  2902,  2911,  2918,  2925,  2932,  2939,  2948,  2957,
-    2964,  2971,  2981,  2991,  3001,  3011,  3021,  3031,  3036,  3037,
-    3038,  3040,  3046,  3051,  3052,  3053,  3055,  3061,  3071,  3078,
-    3087,  3095,  3100,  3101,  3103,  3103,  3103,  3104,  3104,  3105,
-    3106,  3107,  3108,  3109,  3111,  3121,  3130,  3137,  3146,  3153,
-    3162,  3170,  3183,  3191,  3204,  3209,  3210,  3211,  3211,  3212,
-    3212,  3212,  3213,  3215,  3227,  3239,  3251,  3266,  3279,  3292,
-    3303,  3308,  3309,  3310,  3310,  3312,  3327
+     251,   251,   252,   252,   253,   253,   253,   254,   254,   255,
+     255,   256,   256,   256,   257,   257,   258,   258,   258,   259,
+     260,   260,   261,   261,   262,   263,   263,   264,   264,   265,
+     265,   266,   267,   267,   268,   268,   269,   269,   270,   270,
+     271,   271,   272,   272,   272,   273,   273,   274,   274,   275,
+     275,   276,   276,   277,   277,   278,   278,   279,   279,   279,
+     280,   280,   280,   281,   281,   281,   282,   282,   283,   284,
+     284,   285,   285,   286,   286,   287,   287,   288,   288,   288,
+     289,   289,   289,   290,   290,   290,   291,   291,   292,   292,
+     293,   293,   294,   294,   295,   297,   309,   310,   311,   311,
+     311,   311,   311,   312,   312,   314,   326,   327,   328,   328,
+     328,   328,   329,   329,   331,   345,   346,   347,   347,   347,
+     347,   348,   348,   348,   350,   367,   368,   369,   369,   369,
+     369,   370,   370,   370,   371,   374,   393,   410,   418,   428,
+     436,   453,   454,   455,   455,   455,   455,   455,   456,   456,
+     456,   457,   457,   459,   468,   477,   488,   497,   506,   515,
+     526,   535,   547,   561,   576,   587,   604,   621,   638,   655,
+     670,   685,   698,   713,   722,   731,   740,   749,   758,   767,
+     776,   785,   794,   803,   812,   821,   830,   839,   852,   861,
+     874,   883,   892,   901,   908,   915,   924,   931,   940,   948,
+     955,   962,   970,   979,   987,  1003,  1011,  1019,  1027,  1035,
+    1043,  1052,  1061,  1075,  1084,  1093,  1102,  1111,  1120,  1129,
+    1136,  1143,  1169,  1177,  1184,  1191,  1198,  1205,  1213,  1221,
+    1229,  1236,  1247,  1258,  1265,  1274,  1283,  1292,  1299,  1306,
+    1314,  1322,  1332,  1342,  1352,  1366,  1374,  1387,  1398,  1406,
+    1419,  1428,  1437,  1446,  1456,  1466,  1474,  1487,  1496,  1504,
+    1513,  1521,  1534,  1543,  1550,  1560,  1570,  1580,  1590,  1600,
+    1610,  1620,  1630,  1637,  1644,  1651,  1660,  1669,  1678,  1687,
+    1694,  1704,  1724,  1731,  1749,  1762,  1775,  1784,  1793,  1802,
+    1811,  1821,  1831,  1842,  1851,  1860,  1869,  1878,  1887,  1896,
+    1909,  1922,  1931,  1938,  1947,  1956,  1965,  1974,  1982,  1995,
+    2003,  2044,  2051,  2066,  2076,  2086,  2093,  2100,  2107,  2116,
+    2124,  2138,  2159,  2180,  2192,  2204,  2216,  2225,  2246,  2256,
+    2265,  2273,  2281,  2294,  2307,  2322,  2337,  2346,  2355,  2361,
+    2370,  2379,  2389,  2399,  2412,  2425,  2437,  2451,  2463,  2477,
+    2492,  2503,  2513,  2520,  2527,  2536,  2545,  2555,  2565,  2575,
+    2582,  2589,  2598,  2607,  2617,  2627,  2634,  2641,  2648,  2656,
+    2666,  2676,  2686,  2696,  2735,  2745,  2753,  2761,  2776,  2785,
+    2790,  2791,  2792,  2792,  2792,  2793,  2793,  2793,  2794,  2794,
+    2796,  2806,  2815,  2822,  2829,  2836,  2843,  2850,  2857,  2862,
+    2863,  2864,  2864,  2864,  2865,  2865,  2865,  2866,  2867,  2867,
+    2868,  2868,  2869,  2869,  2870,  2871,  2872,  2873,  2874,  2875,
+    2877,  2886,  2896,  2903,  2910,  2919,  2926,  2933,  2940,  2947,
+    2956,  2965,  2972,  2979,  2989,  2999,  3009,  3019,  3029,  3039,
+    3044,  3045,  3046,  3048,  3054,  3059,  3060,  3061,  3063,  3069,
+    3079,  3086,  3095,  3103,  3108,  3109,  3111,  3111,  3111,  3112,
+    3112,  3113,  3114,  3115,  3116,  3117,  3119,  3129,  3138,  3145,
+    3154,  3161,  3170,  3178,  3191,  3199,  3212,  3217,  3218,  3219,
+    3219,  3220,  3220,  3220,  3221,  3223,  3235,  3247,  3259,  3274,
+    3287,  3300,  3311,  3316,  3317,  3318,  3318,  3320,  3335
 };
 #endif
 
@@ -1194,9 +1196,9 @@ static const char *const yytname[] =
   "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_HTTPS_PORT",
   "VAR_HTTP_ENDPOINT", "VAR_HTTP_MAX_STREAMS",
   "VAR_HTTP_QUERY_BUFFER_SIZE", "VAR_HTTP_RESPONSE_BUFFER_SIZE",
-  "VAR_HTTP_NODELAY", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES",
-  "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE",
-  "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES",
+  "VAR_HTTP_NODELAY", "VAR_HTTP_NOTLS_DOWNSTREAM", "VAR_STUB_FIRST",
+  "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE",
+  "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES",
   "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL",
   "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE",
   "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP", "VAR_DNSTAP_TLS",
@@ -1288,47 +1290,47 @@ static const char *const yytname[] =
   "server_tls_use_sni", "server_https_port", "server_http_endpoint",
   "server_http_max_streams", "server_http_query_buffer_size",
   "server_http_response_buffer_size", "server_http_nodelay",
-  "server_use_systemd", "server_do_daemonize", "server_use_syslog",
-  "server_log_time_ascii", "server_log_queries", "server_log_replies",
-  "server_log_tag_queryreply", "server_log_servfail",
-  "server_log_local_actions", "server_chroot", "server_username",
-  "server_directory", "server_logfile", "server_pidfile",
-  "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor",
-  "server_auto_trust_anchor_file", "server_trust_anchor_file",
-  "server_trusted_keys_file", "server_trust_anchor",
-  "server_trust_anchor_signaling", "server_root_key_sentinel",
-  "server_domain_insecure", "server_hide_identity", "server_hide_version",
-  "server_hide_trustanchor", "server_identity", "server_version",
-  "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport",
-  "server_ip_transparent", "server_ip_freebind", "server_ip_dscp",
-  "server_stream_wait_size", "server_edns_buffer_size",
-  "server_msg_buffer_size", "server_msg_cache_size",
-  "server_msg_cache_slabs", "server_num_queries_per_thread",
-  "server_jostle_timeout", "server_delay_close",
-  "server_unblock_lan_zones", "server_insecure_lan_zones",
-  "server_rrset_cache_size", "server_rrset_cache_slabs",
-  "server_infra_host_ttl", "server_infra_lame_ttl",
-  "server_infra_cache_numhosts", "server_infra_cache_lame_size",
-  "server_infra_cache_slabs", "server_infra_cache_min_rtt",
-  "server_target_fetch_policy", "server_harden_short_bufsize",
-  "server_harden_large_queries", "server_harden_glue",
-  "server_harden_dnssec_stripped", "server_harden_below_nxdomain",
-  "server_harden_referral_path", "server_harden_algo_downgrade",
-  "server_use_caps_for_id", "server_caps_whitelist",
-  "server_private_address", "server_private_domain", "server_prefetch",
-  "server_prefetch_key", "server_deny_any",
-  "server_unwanted_reply_threshold", "server_do_not_query_address",
-  "server_do_not_query_localhost", "server_access_control",
-  "server_module_conf", "server_val_override_date",
-  "server_val_sig_skew_min", "server_val_sig_skew_max",
-  "server_cache_max_ttl", "server_cache_max_negative_ttl",
-  "server_cache_min_ttl", "server_bogus_ttl",
-  "server_val_clean_additional", "server_val_permissive_mode",
-  "server_aggressive_nsec", "server_ignore_cd_flag",
-  "server_serve_expired", "server_serve_expired_ttl",
-  "server_serve_expired_ttl_reset", "server_serve_expired_reply_ttl",
-  "server_serve_expired_client_timeout", "server_fake_dsa",
-  "server_fake_sha1", "server_val_log_level",
+  "server_http_notls_downstream", "server_use_systemd",
+  "server_do_daemonize", "server_use_syslog", "server_log_time_ascii",
+  "server_log_queries", "server_log_replies", "server_log_tag_queryreply",
+  "server_log_servfail", "server_log_local_actions", "server_chroot",
+  "server_username", "server_directory", "server_logfile",
+  "server_pidfile", "server_root_hints", "server_dlv_anchor_file",
+  "server_dlv_anchor", "server_auto_trust_anchor_file",
+  "server_trust_anchor_file", "server_trusted_keys_file",
+  "server_trust_anchor", "server_trust_anchor_signaling",
+  "server_root_key_sentinel", "server_domain_insecure",
+  "server_hide_identity", "server_hide_version", "server_hide_trustanchor",
+  "server_identity", "server_version", "server_so_rcvbuf",
+  "server_so_sndbuf", "server_so_reuseport", "server_ip_transparent",
+  "server_ip_freebind", "server_ip_dscp", "server_stream_wait_size",
+  "server_edns_buffer_size", "server_msg_buffer_size",
+  "server_msg_cache_size", "server_msg_cache_slabs",
+  "server_num_queries_per_thread", "server_jostle_timeout",
+  "server_delay_close", "server_unblock_lan_zones",
+  "server_insecure_lan_zones", "server_rrset_cache_size",
+  "server_rrset_cache_slabs", "server_infra_host_ttl",
+  "server_infra_lame_ttl", "server_infra_cache_numhosts",
+  "server_infra_cache_lame_size", "server_infra_cache_slabs",
+  "server_infra_cache_min_rtt", "server_target_fetch_policy",
+  "server_harden_short_bufsize", "server_harden_large_queries",
+  "server_harden_glue", "server_harden_dnssec_stripped",
+  "server_harden_below_nxdomain", "server_harden_referral_path",
+  "server_harden_algo_downgrade", "server_use_caps_for_id",
+  "server_caps_whitelist", "server_private_address",
+  "server_private_domain", "server_prefetch", "server_prefetch_key",
+  "server_deny_any", "server_unwanted_reply_threshold",
+  "server_do_not_query_address", "server_do_not_query_localhost",
+  "server_access_control", "server_module_conf",
+  "server_val_override_date", "server_val_sig_skew_min",
+  "server_val_sig_skew_max", "server_cache_max_ttl",
+  "server_cache_max_negative_ttl", "server_cache_min_ttl",
+  "server_bogus_ttl", "server_val_clean_additional",
+  "server_val_permissive_mode", "server_aggressive_nsec",
+  "server_ignore_cd_flag", "server_serve_expired",
+  "server_serve_expired_ttl", "server_serve_expired_ttl_reset",
+  "server_serve_expired_reply_ttl", "server_serve_expired_client_timeout",
+  "server_fake_dsa", "server_fake_sha1", "server_val_log_level",
   "server_val_nsec3_keysize_iterations", "server_add_holddown",
   "server_del_holddown", "server_keep_missing",
   "server_permit_small_holddown", "server_key_cache_size",
@@ -1424,14 +1426,15 @@ static const yytype_uint16 yytoknum[] =
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546,   547,   548,   549,   550,   551,   552,   553,   554
+     545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
+     555
 };
 # endif
 
-#define YYPACT_NINF -288
+#define YYPACT_NINF -289
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-288)))
+  (!!((Yystate) == (-289)))
 
 #define YYTABLE_NINF -1
 
@@ -1442,99 +1445,100 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -288,     0,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,   284,   -42,   -38,   -43,   -21,   -44,   -11,   -93,
-    -109,  -287,  -212,  -237,  -279,     3,     4,    13,    25,    26,
+    -289,     0,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,   285,   -42,   -38,   -43,   -21,   -44,   -11,   -94,
+    -109,  -288,  -213,  -238,  -280,     3,     4,    13,    25,    26,
       27,    30,    31,    32,    33,    34,    35,    37,    38,    39,
       40,    41,    43,    44,    45,    46,    47,    48,    49,    50,
       51,    52,    54,    55,    84,    85,    88,    89,    91,    93,
-      94,    95,    97,    98,    99,   100,   101,   103,   104,   105,
+      94,    95,    96,    98,    99,   100,   101,   103,   104,   105,
      106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
      116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     126,   127,   130,   131,   132,   133,   134,   135,   136,   137,
      138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   168,   169,
+     148,   149,   151,   152,   153,   154,   155,   156,   157,   158,
+     159,   160,   161,   162,   163,   164,   165,   166,   167,   169,
      170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
      180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
      190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   212,   213,
-     214,   215,   216,   217,   218,   220,   221,   222,   223,   224,
-     227,   229,   231,   244,   245,   246,   247,   248,   249,   250,
-     251,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   213,
+     214,   215,   216,   217,   218,   219,   221,   222,   223,   224,
+     225,   228,   230,   232,   245,   246,   247,   248,   249,   250,
+     251,   252,   254,   255,   256,   257,   258,   259,   260,   261,
      262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,   277,   278,   279,   281,   282,   283,
-     285,   319,   320,   321,   322,   326,   327,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-     328,   370,   371,   372,   373,   374,   375,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,   376,   377,   378,   382,   386,
-     387,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   412,   413,
-     414,   422,   433,   434,   435,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,   436,   437,   438,   439,   440,   441,   442,
-     443,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-     444,   445,   446,   447,   448,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,   449,   450,   451,   452,
-     492,   494,   510,   511,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   527,   528,   529,   530,   531,   532,   533,   535,
-     536,   537,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,   538,  -288,  -288,   539,  -288,  -288,   540,   541,
-     544,   547,   550,   551,   560,   561,   562,   564,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   565,
-     566,   567,   568,   569,   570,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,   571,   574,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,   575,   576,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-     577,   578,   579,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,   580,   581,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,   582,   583,   584,   585,   586,   587,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,   588,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,   589,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,   590,  -288,  -288,   591,   592,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,   593,   594,
-     595,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288
+     272,   273,   274,   275,   276,   278,   279,   280,   282,   283,
+     284,   286,   320,   321,   322,   323,   327,   328,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,   329,   371,   372,   373,   374,   375,   376,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,   377,   378,   379,
+     383,   387,   388,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+     413,   414,   415,   424,   435,   436,   437,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,   438,   439,   440,   441,   442,
+     443,   444,   445,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,   446,   447,   448,   449,   450,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,   451,   452,
+     453,   454,   494,   496,   512,   513,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,   514,   515,   516,   517,   518,
+     519,   520,   521,   522,   529,   530,   531,   532,   533,   534,
+     535,   537,   538,   539,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,   540,  -289,  -289,   541,  -289,  -289,
+     542,   543,   546,   549,   552,   553,   562,   563,   564,   566,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,   567,   568,   569,   570,   571,   572,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,   573,   576,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,   577,
+     578,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,   579,   580,   581,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,   582,   583,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,   584,   585,   586,
+     587,   588,   589,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+     590,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+     591,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,   592,  -289,  -289,   593,
+     594,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,   595,   596,   597,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1542,10 +1546,10 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    18,    19,   224,   234,   507,   567,   526,
-     243,   581,   604,   253,   620,   269,   572,     3,    17,    21,
-     226,   236,   245,   255,   271,   509,   528,   569,   574,   583,
-     606,   622,     4,     5,     6,    10,    14,    15,     8,     9,
+       2,     0,     1,    18,    19,   225,   235,   509,   569,   528,
+     244,   583,   606,   254,   622,   270,   574,     3,    17,    21,
+     227,   237,   246,   256,   272,   511,   530,   571,   576,   585,
+     608,   624,     4,     5,     6,    10,    14,    15,     8,     9,
        7,    16,    11,    12,    13,     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,
@@ -1566,151 +1570,152 @@ static const yytype_uint16 yydefact[] =
        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,     0,     0,     0,     0,     0,     0,    20,    22,    23,
-      86,    89,    98,   192,   193,    24,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,    37,    77,    25,    90,
-      91,    48,    70,    85,    26,    27,    30,    31,    28,    29,
-      32,    33,    34,    35,    36,   121,   204,   122,   124,   125,
-     126,   206,   211,   207,   218,   219,   220,   221,   127,   128,
-     129,   130,   131,   132,   188,    87,    76,   102,   119,   120,
-     216,   213,   123,    38,    39,    40,    41,    42,    78,    92,
-      93,   108,    64,    74,    65,   196,   197,   103,    58,    59,
-     195,    60,    61,   112,   116,   136,   145,   171,   148,   217,
-     113,    71,    43,    44,    45,   100,   137,   138,   139,    46,
-      47,    49,    50,    52,    53,    51,   143,    54,    55,    56,
-      62,    81,   117,    95,   144,    88,   167,    96,    97,   114,
-     115,   214,   101,    57,    79,    82,    63,    66,   104,   105,
-      80,   168,   106,    67,    68,    69,   205,   118,   181,   182,
-     183,   184,   185,   186,   194,   107,    75,   109,   110,   111,
-     169,    72,    73,    94,    83,    84,    99,   133,   134,   215,
-     135,   140,   141,   142,   172,   173,   175,   177,   178,   176,
-     179,   189,   146,   147,   151,   152,   149,   150,   153,   154,
-     156,   155,   208,   210,   209,   170,   180,   198,   200,   199,
-     201,   202,   203,   222,   223,   174,   187,   190,   191,   212,
-       0,     0,     0,     0,     0,     0,     0,   225,   227,   228,
-     229,   231,   232,   233,   230,     0,     0,     0,     0,     0,
-       0,   235,   237,   238,   239,   240,   241,   242,     0,     0,
-       0,     0,     0,     0,     0,   244,   246,   247,   250,   251,
-     248,   252,   249,     0,     0,     0,     0,     0,     0,     0,
-       0,   254,   256,   257,   258,   259,   263,   260,   261,   262,
-       0,     0,     0,     0,     0,   274,   278,   279,   280,   281,
-     270,   272,   273,   275,   276,   277,     0,     0,     0,     0,
-       0,     0,     0,     0,   508,   510,   512,   511,   517,   513,
-     514,   515,   516,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    20,    22,
+      23,    86,    89,    98,   193,   194,    24,   158,   159,   160,
+     161,   162,   163,   164,   165,   166,   167,    37,    77,    25,
+      90,    91,    48,    70,    85,    26,    27,    30,    31,    28,
+      29,    32,    33,    34,    35,    36,   121,   205,   122,   124,
+     125,   126,   207,   212,   208,   219,   220,   221,   222,   127,
+     128,   129,   130,   131,   132,   133,   189,    87,    76,   102,
+     119,   120,   217,   214,   123,    38,    39,    40,    41,    42,
+      78,    92,    93,   108,    64,    74,    65,   197,   198,   103,
+      58,    59,   196,    60,    61,   112,   116,   137,   146,   172,
+     149,   218,   113,    71,    43,    44,    45,   100,   138,   139,
+     140,    46,    47,    49,    50,    52,    53,    51,   144,    54,
+      55,    56,    62,    81,   117,    95,   145,    88,   168,    96,
+      97,   114,   115,   215,   101,    57,    79,    82,    63,    66,
+     104,   105,    80,   169,   106,    67,    68,    69,   206,   118,
+     182,   183,   184,   185,   186,   187,   195,   107,    75,   109,
+     110,   111,   170,    72,    73,    94,    83,    84,    99,   134,
+     135,   216,   136,   141,   142,   143,   173,   174,   176,   178,
+     179,   177,   180,   190,   147,   148,   152,   153,   150,   151,
+     154,   155,   157,   156,   209,   211,   210,   171,   181,   199,
+     201,   200,   202,   203,   204,   223,   224,   175,   188,   191,
+     192,   213,     0,     0,     0,     0,     0,     0,     0,   226,
+     228,   229,   230,   232,   233,   234,   231,     0,     0,     0,
+       0,     0,     0,   236,   238,   239,   240,   241,   242,   243,
+       0,     0,     0,     0,     0,     0,     0,   245,   247,   248,
+     251,   252,   249,   253,   250,     0,     0,     0,     0,     0,
+       0,     0,     0,   255,   257,   258,   259,   260,   264,   261,
+     262,   263,     0,     0,     0,     0,     0,   275,   279,   280,
+     281,   282,   271,   273,   274,   276,   277,   278,     0,     0,
+       0,     0,     0,     0,     0,     0,   510,   512,   514,   513,
+     519,   515,   516,   517,   518,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   527,   529,   531,   530,   532,   533,   534,   535,
+       0,     0,     0,     0,   529,   531,   533,   532,   534,   535,
      536,   537,   538,   539,   540,   541,   542,   543,   544,   545,
-     546,   547,     0,   568,   570,     0,   573,   575,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   582,   584,
-     585,   586,   588,   589,   587,   590,   591,   592,   593,     0,
-       0,     0,     0,     0,     0,   605,   607,   608,   609,   610,
-     611,   612,     0,     0,   621,   623,   624,   283,   282,   289,
-     302,   300,   312,   308,   309,   313,   310,   311,   314,   315,
-     316,   317,   318,   347,   348,   349,   350,   351,   376,   377,
-     378,   383,   384,   305,   385,   386,   389,   387,   388,   391,
-     392,   393,   407,   362,   363,   365,   366,   394,   410,   356,
-     358,   411,   417,   418,   419,   306,   375,   435,   436,   357,
-     430,   340,   301,   352,   408,   414,   395,     0,     0,   439,
-     307,   284,   339,   399,   285,   303,   304,   353,   354,   437,
-     397,   401,   402,   286,   440,   379,   406,   341,   361,   412,
-     413,   416,   429,   355,   433,   431,   432,   367,   374,   403,
-     404,   368,   369,   396,   421,   342,   343,   346,   319,   321,
-     322,   323,   324,   325,   332,   333,   334,   335,   336,   337,
-     441,   442,   444,   380,   381,   382,   390,   445,   446,   447,
-       0,     0,     0,   398,   370,   372,   577,   456,   460,   458,
-     457,   461,   459,     0,     0,   464,   465,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   400,   415,   434,
-     469,   470,   371,   448,     0,     0,     0,     0,     0,     0,
-     422,   423,   424,   425,   426,   427,   428,   578,   364,   359,
-     420,   338,   287,   288,   360,   471,   473,   472,   474,   475,
-     476,   320,   327,   466,   468,   467,   326,     0,   345,   405,
-     443,   344,   373,   328,   329,   331,   330,     0,   478,   479,
-     480,   481,   485,   484,   482,   483,   486,   487,   488,   489,
-     491,   490,   500,     0,   504,   505,     0,     0,   506,   492,
-     498,   493,   494,   495,   497,   499,   496,   264,   265,   266,
-     267,   268,   518,   520,   519,   522,   523,   524,   525,   521,
-     548,   550,   551,   552,   553,   554,   555,   556,   557,   558,
-     549,   559,   560,   561,   562,   563,   564,   565,   566,   571,
-     576,   594,   595,   596,   599,   597,   598,   600,   601,   602,
-     603,   613,   614,   615,   616,   617,   618,   625,   626,   409,
-     438,   455,   579,   580,   462,   463,   449,   450,     0,     0,
-       0,   454,   619,   477,   501,   502,   503,   453,   451,   452
+     546,   547,   548,   549,     0,   570,   572,     0,   575,   577,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     584,   586,   587,   588,   590,   591,   589,   592,   593,   594,
+     595,     0,     0,     0,     0,     0,     0,   607,   609,   610,
+     611,   612,   613,   614,     0,     0,   623,   625,   626,   284,
+     283,   290,   303,   301,   313,   309,   310,   314,   311,   312,
+     315,   316,   317,   318,   319,   349,   350,   351,   352,   353,
+     378,   379,   380,   385,   386,   306,   387,   388,   391,   389,
+     390,   393,   394,   395,   409,   364,   365,   367,   368,   396,
+     412,   358,   360,   413,   419,   420,   421,   307,   377,   437,
+     438,   359,   432,   342,   302,   354,   410,   416,   397,     0,
+       0,   441,   308,   285,   341,   401,   286,   304,   305,   355,
+     356,   439,   399,   403,   404,   287,   442,   381,   408,   343,
+     363,   414,   415,   418,   431,   357,   435,   433,   434,   369,
+     376,   405,   406,   370,   371,   398,   423,   344,   345,   348,
+     320,   322,   323,   324,   325,   326,   333,   334,   335,   336,
+     337,   338,   339,   443,   444,   446,   382,   383,   384,   392,
+     447,   448,   449,     0,     0,     0,   400,   372,   374,   579,
+     458,   462,   460,   459,   463,   461,     0,     0,   466,   467,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+     402,   417,   436,   471,   472,   373,   450,     0,     0,     0,
+       0,     0,     0,   424,   425,   426,   427,   428,   429,   430,
+     580,   366,   361,   422,   340,   288,   289,   362,   473,   475,
+     474,   476,   477,   478,   321,   328,   468,   470,   469,   327,
+       0,   347,   407,   445,   346,   375,   329,   330,   332,   331,
+       0,   480,   481,   482,   483,   487,   486,   484,   485,   488,
+     489,   490,   491,   493,   492,   502,     0,   506,   507,     0,
+       0,   508,   494,   500,   495,   496,   497,   499,   501,   498,
+     265,   266,   267,   268,   269,   520,   522,   521,   524,   525,
+     526,   527,   523,   550,   552,   553,   554,   555,   556,   557,
+     558,   559,   560,   551,   561,   562,   563,   564,   565,   566,
+     567,   568,   573,   578,   596,   597,   598,   601,   599,   600,
+     602,   603,   604,   605,   615,   616,   617,   618,   619,   620,
+     627,   628,   411,   440,   457,   581,   582,   464,   465,   451,
+     452,     0,     0,     0,   456,   621,   479,   503,   504,   505,
+     455,   453,   454
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,   572,   573,   596,
-     597,   598,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,  -288,
-    -288,  -288,  -288,  -288,  -288
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,   574,   575,
+     598,   599,   600,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,  -289,
+    -289,  -289,  -289,  -289,  -289,  -289
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    17,    18,    19,    32,   247,    20,    33,   457,
-      21,    34,   471,    22,    35,   485,    23,    36,   501,   515,
-     516,   517,   518,   519,    24,    37,   520,   248,   249,   250,
-     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
-     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
-     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
-     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
-     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
-     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
-     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
-     361,   362,   363,   364,   365,   366,   367,   368,   369,   370,
-     371,   372,   373,   374,   375,   376,   377,   378,   379,   380,
-     381,   382,   383,   384,   385,   386,   387,   388,   389,   390,
-     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
-     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
-     411,   412,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   458,   459,   460,   461,   462,   463,
-     464,   472,   473,   474,   475,   476,   477,   502,   503,   504,
-     505,   506,   507,   508,   509,   486,   487,   488,   489,   490,
-     491,   492,    25,    38,   534,   535,   536,   537,   538,   539,
-     540,   541,   542,    26,    39,   562,   563,   564,   565,   566,
-     567,   568,   569,   570,   571,   572,   573,   574,   575,   576,
-     577,   578,   579,   580,   581,    27,    40,   583,   584,    28,
-      41,   586,   587,   445,   446,   447,   448,    29,    42,   598,
-     599,   600,   601,   602,   603,   604,   605,   606,   607,   608,
-      30,    43,   615,   616,   617,   618,   619,   620,   621,   449,
-      31,    44,   624,   625,   626
+      -1,     1,    17,    18,    19,    32,   248,    20,    33,   459,
+      21,    34,   473,    22,    35,   487,    23,    36,   503,   517,
+     518,   519,   520,   521,    24,    37,   522,   249,   250,   251,
+     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
+     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
+     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
+     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
+     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
+     352,   353,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,   389,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   460,   461,   462,   463,   464,
+     465,   466,   474,   475,   476,   477,   478,   479,   504,   505,
+     506,   507,   508,   509,   510,   511,   488,   489,   490,   491,
+     492,   493,   494,    25,    38,   536,   537,   538,   539,   540,
+     541,   542,   543,   544,    26,    39,   564,   565,   566,   567,
+     568,   569,   570,   571,   572,   573,   574,   575,   576,   577,
+     578,   579,   580,   581,   582,   583,    27,    40,   585,   586,
+      28,    41,   588,   589,   447,   448,   449,   450,    29,    42,
+     600,   601,   602,   603,   604,   605,   606,   607,   608,   609,
+     610,    30,    43,   617,   618,   619,   620,   621,   622,   623,
+     451,    31,    44,   626,   627,   628
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1718,149 +1723,149 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   493,   478,   450,   582,   451,   452,   465,   622,   623,
-     585,     3,     4,   627,   628,   466,   467,   609,   610,   611,
-     612,   613,   614,   629,   493,   588,   589,   590,   591,   592,
-     593,   594,   595,   596,   597,   630,   631,   632,   479,   480,
-     633,   634,   635,   636,   637,   638,     5,   639,   640,   641,
-     642,   643,     6,   644,   645,   646,   647,   648,   649,   650,
-     651,   652,   653,   481,   654,   655,   453,   543,   544,   545,
-     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
-     556,   557,   558,   559,   560,   561,   526,   527,   528,   529,
-     530,   531,   532,   533,   656,   657,     7,   454,   658,   659,
-     468,   660,   469,   661,   662,   663,   455,   664,   665,   666,
-     667,   668,     8,   669,   670,   671,   672,   673,   674,   675,
-     676,   677,   678,   679,   680,   681,   682,   683,   684,   685,
-     686,   687,   688,   689,   690,   691,   692,   482,   483,   693,
-     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
-     704,   705,   706,   707,   708,   709,   710,   711,   712,     9,
-     713,   714,   715,   716,   717,   718,   719,   720,   721,   722,
-     723,   724,   725,   726,   727,   728,   729,   484,   730,   731,
-     732,   733,   734,   735,   736,   737,   738,   739,   740,   741,
-     742,   743,   744,   745,   746,   747,   748,   749,   750,   751,
-     752,   753,   754,   755,   756,   757,   758,   759,   760,   761,
-     762,   763,   764,   765,   766,   767,   768,   769,    10,   495,
-     496,   497,   770,   771,   772,   773,   774,   775,   776,   500,
-     777,   778,   779,   780,   781,   456,    11,   782,   470,   783,
-     494,   784,   495,   496,   497,   498,   499,   510,   511,   512,
-     513,   514,   500,    12,   785,   786,   787,   788,   789,   790,
-     791,   792,    13,   793,   794,   795,   796,   797,   798,   799,
-     800,   801,   802,   803,   804,   805,   806,   807,   808,   809,
-     810,   811,   812,   813,   814,   815,    14,   816,   817,   818,
-      15,   819,   820,   821,     0,   822,    16,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,   823,
-     824,   825,   826,    77,    78,    79,   827,   828,   829,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     830,   831,   832,   833,   834,   835,   836,   837,   838,   121,
-     122,   123,   839,   124,   125,   126,   840,   841,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   842,   843,   844,   151,   152,   153,   154,   155,
-     156,   157,   845,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   846,   847,   848,   849,   850,   851,   852,
-     853,   854,   855,   856,   857,   858,   859,   860,   861,   862,
-     863,   864,   865,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   866,   207,   867,   208,   209,   210,   211,   212,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     868,   869,   870,   871,   872,   873,   874,   875,   876,   877,
-     878,   223,   224,   225,   226,   227,   228,   879,   880,   881,
-     882,   883,   884,   885,   229,   886,   887,   888,   889,   890,
-     891,   892,   230,   231,   893,   232,   233,   894,   234,   235,
-     895,   896,   236,   237,   238,   239,   240,   241,   242,   243,
-     897,   898,   899,   244,   900,   901,   902,   903,   904,   905,
-     906,   907,   245,   246,   908,   909,   910,   911,   912,   913,
-     914,   915,   916,   917,   918,   919,   920,   921,   922,   923,
-     924,   925,   926,   927,   928,   929,     0,     0,     0,   521,
-     522,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       2,   495,   480,   452,   584,   453,   454,   467,   624,   625,
+     587,     3,     4,   629,   630,   468,   469,   611,   612,   613,
+     614,   615,   616,   631,   495,   590,   591,   592,   593,   594,
+     595,   596,   597,   598,   599,   632,   633,   634,   481,   482,
+     635,   636,   637,   638,   639,   640,     5,   641,   642,   643,
+     644,   645,     6,   646,   647,   648,   649,   650,   651,   652,
+     653,   654,   655,   483,   656,   657,   455,   545,   546,   547,
+     548,   549,   550,   551,   552,   553,   554,   555,   556,   557,
+     558,   559,   560,   561,   562,   563,   528,   529,   530,   531,
+     532,   533,   534,   535,   658,   659,     7,   456,   660,   661,
+     470,   662,   471,   663,   664,   665,   666,   457,   667,   668,
+     669,   670,     8,   671,   672,   673,   674,   675,   676,   677,
+     678,   679,   680,   681,   682,   683,   684,   685,   686,   687,
+     688,   689,   690,   691,   692,   693,   694,   695,   484,   485,
+     696,   697,   698,   699,   700,   701,   702,   703,   704,   705,
+     706,   707,   708,   709,   710,   711,   712,   713,   714,   715,
+       9,   716,   717,   718,   719,   720,   721,   722,   723,   724,
+     725,   726,   727,   728,   729,   730,   731,   732,   486,   733,
+     734,   735,   736,   737,   738,   739,   740,   741,   742,   743,
+     744,   745,   746,   747,   748,   749,   750,   751,   752,   753,
+     754,   755,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,    10,
+     497,   498,   499,   773,   774,   775,   776,   777,   778,   779,
+     502,   780,   781,   782,   783,   784,   458,    11,   785,   472,
+     786,   496,   787,   497,   498,   499,   500,   501,   512,   513,
+     514,   515,   516,   502,    12,   788,   789,   790,   791,   792,
+     793,   794,   795,    13,   796,   797,   798,   799,   800,   801,
+     802,   803,   804,   805,   806,   807,   808,   809,   810,   811,
+     812,   813,   814,   815,   816,   817,   818,    14,   819,   820,
+     821,    15,   822,   823,   824,     0,   825,    16,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+     826,   827,   828,   829,    77,    78,    79,   830,   831,   832,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   833,   834,   835,   836,   837,   838,   839,   840,   841,
+     121,   122,   123,   842,   124,   125,   126,   843,   844,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   845,   846,   847,   151,   152,   153,   154,
+     155,   156,   157,   158,   848,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   849,   850,   851,   852,   853,
+     854,   855,   856,   857,   858,   859,   860,   861,   862,   863,
+     864,   865,   866,   867,   868,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   869,   208,   870,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   871,   872,   873,   874,   875,   876,   877,   878,
+     879,   880,   881,   224,   225,   226,   227,   228,   229,   882,
+     883,   884,   885,   886,   887,   888,   230,   889,   890,   891,
+     892,   893,   894,   895,   231,   232,   896,   233,   234,   897,
+     235,   236,   898,   899,   237,   238,   239,   240,   241,   242,
+     243,   244,   900,   901,   902,   245,   903,   904,   905,   906,
+     907,   908,   909,   910,   246,   247,   911,   912,   913,   914,
+     915,   916,   917,   918,   919,   920,   921,   922,   923,   924,
+     925,   926,   927,   928,   929,   930,   931,   932,     0,     0,
+       0,   523,   524,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   523,   524,   525
+       0,     0,     0,     0,     0,   525,   526,   527
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    45,    45,    45,   113,    47,    48,    45,   287,   288,
-     297,    11,    12,    10,    10,    53,    54,   254,   255,   256,
-     257,   258,   259,    10,    45,   237,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,    10,    10,    10,    81,    82,
+       0,    45,    45,    45,   113,    47,    48,    45,   288,   289,
+     298,    11,    12,    10,    10,    53,    54,   255,   256,   257,
+     258,   259,   260,    10,    45,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   247,    10,    10,    10,    81,    82,
       10,    10,    10,    10,    10,    10,    46,    10,    10,    10,
       10,    10,    52,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,   106,    10,    10,   108,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,    97,    98,    99,   100,
+      10,    10,    10,   106,    10,    10,   108,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,    97,    98,    99,   100,
      101,   102,   103,   104,    10,    10,    96,   139,    10,    10,
-     138,    10,   140,    10,    10,    10,   148,    10,    10,    10,
+     138,    10,   140,    10,    10,    10,    10,   149,    10,    10,
       10,    10,   112,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,   180,   181,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,   181,   182,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   159,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,   220,    10,    10,
+     160,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,   221,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,   218,   263,
-     264,   265,    10,    10,    10,    10,    10,    10,    10,   273,
-      10,    10,    10,    10,    10,   277,   236,    10,   276,    10,
-     261,    10,   263,   264,   265,   266,   267,   291,   292,   293,
-     294,   295,   273,   253,    10,    10,    10,    10,    10,    10,
-      10,    10,   262,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,   219,
+     264,   265,   266,    10,    10,    10,    10,    10,    10,    10,
+     274,    10,    10,    10,    10,    10,   278,   237,    10,   277,
+      10,   262,    10,   264,   265,   266,   267,   268,   292,   293,
+     294,   295,   296,   274,   254,    10,    10,    10,    10,    10,
+      10,    10,    10,   263,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,   286,    10,    10,    10,
-     290,    10,    10,    10,    -1,    10,   296,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    10,
-      10,    10,    10,    49,    50,    51,    10,    10,    10,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   105,
-     106,   107,    10,   109,   110,   111,    10,    10,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,    10,    10,    10,   141,   142,   143,   144,   145,
-     146,   147,    10,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   158,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,   287,    10,    10,
+      10,   291,    10,    10,    10,    -1,    10,   297,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      10,    10,    10,    10,    49,    50,    51,    10,    10,    10,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+     105,   106,   107,    10,   109,   110,   111,    10,    10,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,    10,    10,    10,   141,   142,   143,   144,
+     145,   146,   147,   148,    10,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
-     216,   217,    10,   219,    10,   221,   222,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+      10,    10,    10,    10,    10,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,    10,   220,    10,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,   248,   249,   250,   251,   252,   253,    10,
+      10,    10,    10,    10,    10,    10,   261,    10,    10,    10,
+      10,    10,    10,    10,   269,   270,    10,   272,   273,    10,
+     275,   276,    10,    10,   279,   280,   281,   282,   283,   284,
+     285,   286,    10,    10,    10,   290,    10,    10,    10,    10,
+      10,    10,    10,    10,   299,   300,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,   247,   248,   249,   250,   251,   252,    10,    10,    10,
-      10,    10,    10,    10,   260,    10,    10,    10,    10,    10,
-      10,    10,   268,   269,    10,   271,   272,    10,   274,   275,
-      10,    10,   278,   279,   280,   281,   282,   283,   284,   285,
-      10,    10,    10,   289,    10,    10,    10,    10,    10,    10,
-      10,    10,   298,   299,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    -1,    -1,    -1,    37,
-      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      10,    10,    10,    10,    10,    10,    10,    10,    -1,    -1,
+      -1,    37,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    37,    37,    37
+      -1,    -1,    -1,    -1,    -1,    37,    37,    37
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   301,     0,    11,    12,    46,    52,    96,   112,   159,
-     218,   236,   253,   262,   286,   290,   296,   302,   303,   304,
-     307,   310,   313,   316,   324,   552,   563,   585,   589,   597,
-     610,   620,   305,   308,   311,   314,   317,   325,   553,   564,
-     586,   590,   598,   611,   621,    13,    14,    15,    16,    17,
+       0,   302,     0,    11,    12,    46,    52,    96,   112,   160,
+     219,   237,   254,   263,   287,   291,   297,   303,   304,   305,
+     308,   311,   314,   317,   325,   554,   565,   587,   591,   599,
+     612,   622,   306,   309,   312,   315,   318,   326,   555,   566,
+     588,   592,   600,   613,   623,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    49,    50,    51,
@@ -1871,16 +1876,16 @@ static const yytype_uint16 yystos[] =
       95,   105,   106,   107,   109,   110,   111,   114,   115,   116,
      117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
      127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   141,   142,   143,   144,   145,   146,   147,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   179,   180,
+     137,   141,   142,   143,   144,   145,   146,   147,   148,   150,
+     151,   152,   153,   154,   155,   156,   157,   158,   159,   180,
      181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
      191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
      201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   219,   221,   222,
+     211,   212,   213,   214,   215,   216,   217,   218,   220,   222,
      223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   247,   248,   249,   250,   251,   252,   260,
-     268,   269,   271,   272,   274,   275,   278,   279,   280,   281,
-     282,   283,   284,   285,   289,   298,   299,   306,   327,   328,
+     233,   234,   235,   236,   248,   249,   250,   251,   252,   253,
+     261,   269,   270,   272,   273,   275,   276,   279,   280,   281,
+     282,   283,   284,   285,   286,   290,   299,   300,   307,   328,
      329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
      339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
      349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
@@ -1900,25 +1905,25 @@ static const yytype_uint16 yystos[] =
      489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
      499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
      509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,   593,   594,   595,   596,   619,
-      45,    47,    48,   108,   139,   148,   277,   309,   524,   525,
-     526,   527,   528,   529,   530,    45,    53,    54,   138,   140,
-     276,   312,   531,   532,   533,   534,   535,   536,    45,    81,
-      82,   106,   180,   181,   220,   315,   545,   546,   547,   548,
-     549,   550,   551,    45,   261,   263,   264,   265,   266,   267,
-     273,   318,   537,   538,   539,   540,   541,   542,   543,   544,
-     291,   292,   293,   294,   295,   319,   320,   321,   322,   323,
-     326,   537,   538,   539,   540,   541,    97,    98,    99,   100,
-     101,   102,   103,   104,   554,   555,   556,   557,   558,   559,
-     560,   561,   562,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   565,   566,   567,   568,   569,   570,   571,   572,
+     519,   520,   521,   522,   523,   524,   525,   595,   596,   597,
+     598,   621,    45,    47,    48,   108,   139,   149,   278,   310,
+     526,   527,   528,   529,   530,   531,   532,    45,    53,    54,
+     138,   140,   277,   313,   533,   534,   535,   536,   537,   538,
+      45,    81,    82,   106,   181,   182,   221,   316,   547,   548,
+     549,   550,   551,   552,   553,    45,   262,   264,   265,   266,
+     267,   268,   274,   319,   539,   540,   541,   542,   543,   544,
+     545,   546,   292,   293,   294,   295,   296,   320,   321,   322,
+     323,   324,   327,   539,   540,   541,   542,   543,    97,    98,
+      99,   100,   101,   102,   103,   104,   556,   557,   558,   559,
+     560,   561,   562,   563,   564,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   567,   568,   569,   570,   571,   572,
      573,   574,   575,   576,   577,   578,   579,   580,   581,   582,
-     583,   584,   113,   587,   588,   297,   591,   592,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   599,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   254,
-     255,   256,   257,   258,   259,   612,   613,   614,   615,   616,
-     617,   618,   287,   288,   622,   623,   624,    10,    10,    10,
+     583,   584,   585,   586,   113,   589,   590,   298,   593,   594,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
+     611,   255,   256,   257,   258,   259,   260,   614,   615,   616,
+     617,   618,   619,   620,   288,   289,   624,   625,   626,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1948,41 +1953,42 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   300,   301,   301,   302,   302,   302,   302,   302,   302,
-     302,   302,   302,   302,   302,   302,   302,   302,   303,   304,
-     305,   305,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
-     306,   306,   306,   306,   307,   308,   308,   309,   309,   309,
-     309,   309,   309,   309,   310,   311,   311,   312,   312,   312,
-     312,   312,   312,   313,   314,   314,   315,   315,   315,   315,
-     315,   315,   315,   316,   317,   317,   318,   318,   318,   318,
-     318,   318,   318,   318,   319,   320,   321,   322,   323,   324,
-     325,   325,   326,   326,   326,   326,   326,   326,   326,   326,
-     326,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+       0,   301,   302,   302,   303,   303,   303,   303,   303,   303,
+     303,   303,   303,   303,   303,   303,   303,   303,   304,   305,
+     306,   306,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+     307,   307,   307,   307,   307,   308,   309,   309,   310,   310,
+     310,   310,   310,   310,   310,   311,   312,   312,   313,   313,
+     313,   313,   313,   313,   314,   315,   315,   316,   316,   316,
+     316,   316,   316,   316,   317,   318,   318,   319,   319,   319,
+     319,   319,   319,   319,   319,   320,   321,   322,   323,   324,
+     325,   326,   326,   327,   327,   327,   327,   327,   327,   327,
+     327,   327,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
@@ -2004,19 +2010,19 @@ static const yytype_uint16 yyr1[] =
      515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
      525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
      535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
-     545,   546,   547,   548,   549,   550,   551,   552,   553,   553,
-     554,   554,   554,   554,   554,   554,   554,   554,   555,   556,
-     557,   558,   559,   560,   561,   562,   563,   564,   564,   565,
-     565,   565,   565,   565,   565,   565,   565,   565,   565,   565,
-     565,   565,   565,   565,   565,   565,   565,   565,   566,   567,
+     545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
+     555,   555,   556,   556,   556,   556,   556,   556,   556,   556,
+     557,   558,   559,   560,   561,   562,   563,   564,   565,   566,
+     566,   567,   567,   567,   567,   567,   567,   567,   567,   567,
+     567,   567,   567,   567,   567,   567,   567,   567,   567,   567,
      568,   569,   570,   571,   572,   573,   574,   575,   576,   577,
-     578,   579,   580,   581,   582,   583,   584,   585,   586,   586,
-     587,   588,   589,   590,   590,   591,   592,   593,   594,   595,
-     596,   597,   598,   598,   599,   599,   599,   599,   599,   599,
-     599,   599,   599,   599,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,   611,   611,   612,   612,   612,
-     612,   612,   612,   613,   614,   615,   616,   617,   618,   619,
-     620,   621,   621,   622,   622,   623,   624
+     578,   579,   580,   581,   582,   583,   584,   585,   586,   587,
+     588,   588,   589,   590,   591,   592,   592,   593,   594,   595,
+     596,   597,   598,   599,   600,   600,   601,   601,   601,   601,
+     601,   601,   601,   601,   601,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,   611,   612,   613,   613,   614,
+     614,   614,   614,   614,   614,   615,   616,   617,   618,   619,
+     620,   621,   622,   623,   623,   624,   624,   625,   626
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -2044,47 +2050,47 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     0,     1,     1,
        1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
        1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     1,
+       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     3,     4,     4,     4,     3,     3,     2,     2,
+       2,     2,     2,     2,     3,     3,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     3,     3,     3,     2,     2,     2,     1,
        2,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
-       3,     4,     4,     4,     3,     3,     2,     2,     2,     2,
-       2,     2,     3,     3,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     3,     3,     3,     2,     2,     2,     1,     2,     0,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
+       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     1,     2,     0,
-       1,     2,     1,     2,     0,     1,     2,     2,     2,     3,
-       3,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     2,     2,     2,     2,     2,     2,     3,
-       1,     2,     0,     1,     1,     2,     2
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     1,
+       2,     0,     1,     2,     1,     2,     0,     1,     2,     2,
+       2,     3,     3,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       2,     3,     1,     2,     0,     1,     1,     2,     2
 };
 
 
@@ -2773,7 +2779,7 @@ yyreduce:
     {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2777 "util/configparser.c"
+#line 2783 "util/configparser.c"
     break;
 
   case 19:
@@ -2781,10 +2787,10 @@ yyreduce:
     { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2785 "util/configparser.c"
+#line 2791 "util/configparser.c"
     break;
 
-  case 224:
+  case 225:
 #line 298 "./util/configparser.y"
     {
 		struct config_stub* s;
@@ -2796,10 +2802,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2800 "util/configparser.c"
+#line 2806 "util/configparser.c"
     break;
 
-  case 234:
+  case 235:
 #line 315 "./util/configparser.y"
     {
 		struct config_stub* s;
@@ -2811,10 +2817,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2815 "util/configparser.c"
+#line 2821 "util/configparser.c"
     break;
 
-  case 243:
+  case 244:
 #line 332 "./util/configparser.y"
     {
 		struct config_view* s;
@@ -2828,10 +2834,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2832 "util/configparser.c"
+#line 2838 "util/configparser.c"
     break;
 
-  case 253:
+  case 254:
 #line 351 "./util/configparser.y"
     {
 		struct config_auth* s;
@@ -2848,10 +2854,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2852 "util/configparser.c"
+#line 2858 "util/configparser.c"
     break;
 
-  case 264:
+  case 265:
 #line 375 "./util/configparser.y"
     {
 		uint8_t* bitlist;
@@ -2869,10 +2875,10 @@ yyreduce:
 
 		}
 	}
-#line 2873 "util/configparser.c"
+#line 2879 "util/configparser.c"
     break;
 
-  case 265:
+  case 266:
 #line 394 "./util/configparser.y"
     {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
@@ -2888,20 +2894,20 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2892 "util/configparser.c"
+#line 2898 "util/configparser.c"
     break;
 
-  case 266:
+  case 267:
 #line 411 "./util/configparser.y"
     {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2902 "util/configparser.c"
+#line 2908 "util/configparser.c"
     break;
 
-  case 267:
+  case 268:
 #line 419 "./util/configparser.y"
     {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
@@ -2910,20 +2916,20 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2914 "util/configparser.c"
+#line 2920 "util/configparser.c"
     break;
 
-  case 268:
+  case 269:
 #line 429 "./util/configparser.y"
     {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 2924 "util/configparser.c"
+#line 2930 "util/configparser.c"
     break;
 
-  case 269:
+  case 270:
 #line 437 "./util/configparser.y"
     {
 		struct config_auth* s;
@@ -2940,10 +2946,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2944 "util/configparser.c"
+#line 2950 "util/configparser.c"
     break;
 
-  case 282:
+  case 283:
 #line 460 "./util/configparser.y"
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
@@ -2952,10 +2958,10 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2956 "util/configparser.c"
+#line 2962 "util/configparser.c"
     break;
 
-  case 283:
+  case 284:
 #line 469 "./util/configparser.y"
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
@@ -2964,10 +2970,10 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2968 "util/configparser.c"
+#line 2974 "util/configparser.c"
     break;
 
-  case 284:
+  case 285:
 #line 478 "./util/configparser.y"
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
@@ -2978,10 +2984,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2982 "util/configparser.c"
+#line 2988 "util/configparser.c"
     break;
 
-  case 285:
+  case 286:
 #line 489 "./util/configparser.y"
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
@@ -2990,10 +2996,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2994 "util/configparser.c"
+#line 3000 "util/configparser.c"
     break;
 
-  case 286:
+  case 287:
 #line 498 "./util/configparser.y"
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
@@ -3002,10 +3008,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3006 "util/configparser.c"
+#line 3012 "util/configparser.c"
     break;
 
-  case 287:
+  case 288:
 #line 507 "./util/configparser.y"
     {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
@@ -3014,10 +3020,10 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3018 "util/configparser.c"
+#line 3024 "util/configparser.c"
     break;
 
-  case 288:
+  case 289:
 #line 516 "./util/configparser.y"
     { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
@@ -3028,10 +3034,10 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3032 "util/configparser.c"
+#line 3038 "util/configparser.c"
     break;
 
-  case 289:
+  case 290:
 #line 527 "./util/configparser.y"
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
@@ -3040,10 +3046,10 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3044 "util/configparser.c"
+#line 3050 "util/configparser.c"
     break;
 
-  case 290:
+  case 291:
 #line 536 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3055,10 +3061,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3059 "util/configparser.c"
+#line 3065 "util/configparser.c"
     break;
 
-  case 291:
+  case 292:
 #line 548 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3071,10 +3077,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3075 "util/configparser.c"
+#line 3081 "util/configparser.c"
     break;
 
-  case 292:
+  case 293:
 #line 562 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3089,10 +3095,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3093 "util/configparser.c"
+#line 3099 "util/configparser.c"
     break;
 
-  case 293:
+  case 294:
 #line 577 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3103,10 +3109,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3107 "util/configparser.c"
+#line 3113 "util/configparser.c"
     break;
 
-  case 294:
+  case 295:
 #line 588 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3123,10 +3129,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3127 "util/configparser.c"
+#line 3133 "util/configparser.c"
     break;
 
-  case 295:
+  case 296:
 #line 605 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3143,10 +3149,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3147 "util/configparser.c"
+#line 3153 "util/configparser.c"
     break;
 
-  case 296:
+  case 297:
 #line 622 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3163,10 +3169,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3167 "util/configparser.c"
+#line 3173 "util/configparser.c"
     break;
 
-  case 297:
+  case 298:
 #line 639 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3183,10 +3189,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3187 "util/configparser.c"
+#line 3193 "util/configparser.c"
     break;
 
-  case 298:
+  case 299:
 #line 656 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3201,10 +3207,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3205 "util/configparser.c"
+#line 3211 "util/configparser.c"
     break;
 
-  case 299:
+  case 300:
 #line 671 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3219,10 +3225,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3223 "util/configparser.c"
+#line 3229 "util/configparser.c"
     break;
 
-  case 300:
+  case 301:
 #line 686 "./util/configparser.y"
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
@@ -3235,10 +3241,10 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3239 "util/configparser.c"
+#line 3245 "util/configparser.c"
     break;
 
-  case 301:
+  case 302:
 #line 699 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
@@ -3253,10 +3259,10 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3257 "util/configparser.c"
+#line 3263 "util/configparser.c"
     break;
 
-  case 302:
+  case 303:
 #line 714 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
@@ -3265,10 +3271,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3269 "util/configparser.c"
+#line 3275 "util/configparser.c"
     break;
 
-  case 303:
+  case 304:
 #line 723 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
@@ -3277,10 +3283,10 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3281 "util/configparser.c"
+#line 3287 "util/configparser.c"
     break;
 
-  case 304:
+  case 305:
 #line 732 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
@@ -3289,10 +3295,10 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3293 "util/configparser.c"
+#line 3299 "util/configparser.c"
     break;
 
-  case 305:
+  case 306:
 #line 741 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -3301,10 +3307,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3305 "util/configparser.c"
+#line 3311 "util/configparser.c"
     break;
 
-  case 306:
+  case 307:
 #line 750 "./util/configparser.y"
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -3313,10 +3319,10 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3317 "util/configparser.c"
+#line 3323 "util/configparser.c"
     break;
 
-  case 307:
+  case 308:
 #line 759 "./util/configparser.y"
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
@@ -3325,10 +3331,10 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3329 "util/configparser.c"
+#line 3335 "util/configparser.c"
     break;
 
-  case 308:
+  case 309:
 #line 768 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
@@ -3337,10 +3343,10 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3341 "util/configparser.c"
+#line 3347 "util/configparser.c"
     break;
 
-  case 309:
+  case 310:
 #line 777 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
@@ -3349,10 +3355,10 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3353 "util/configparser.c"
+#line 3359 "util/configparser.c"
     break;
 
-  case 310:
+  case 311:
 #line 786 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
@@ -3361,10 +3367,10 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3365 "util/configparser.c"
+#line 3371 "util/configparser.c"
     break;
 
-  case 311:
+  case 312:
 #line 795 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
@@ -3373,10 +3379,10 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3377 "util/configparser.c"
+#line 3383 "util/configparser.c"
     break;
 
-  case 312:
+  case 313:
 #line 804 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
@@ -3385,10 +3391,10 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3389 "util/configparser.c"
+#line 3395 "util/configparser.c"
     break;
 
-  case 313:
+  case 314:
 #line 813 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
@@ -3397,10 +3403,10 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3401 "util/configparser.c"
+#line 3407 "util/configparser.c"
     break;
 
-  case 314:
+  case 315:
 #line 822 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -3409,10 +3415,10 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3413 "util/configparser.c"
+#line 3419 "util/configparser.c"
     break;
 
-  case 315:
+  case 316:
 #line 831 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -3421,10 +3427,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3425 "util/configparser.c"
+#line 3431 "util/configparser.c"
     break;
 
-  case 316:
+  case 317:
 #line 840 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
@@ -3437,10 +3443,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3441 "util/configparser.c"
+#line 3447 "util/configparser.c"
     break;
 
-  case 317:
+  case 318:
 #line 853 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
@@ -3449,10 +3455,10 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3453 "util/configparser.c"
+#line 3459 "util/configparser.c"
     break;
 
-  case 318:
+  case 319:
 #line 862 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
@@ -3465,10 +3471,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3469 "util/configparser.c"
+#line 3475 "util/configparser.c"
     break;
 
-  case 319:
+  case 320:
 #line 875 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
@@ -3477,10 +3483,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3481 "util/configparser.c"
+#line 3487 "util/configparser.c"
     break;
 
-  case 320:
+  case 321:
 #line 884 "./util/configparser.y"
     {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
@@ -3489,10 +3495,10 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3493 "util/configparser.c"
+#line 3499 "util/configparser.c"
     break;
 
-  case 321:
+  case 322:
 #line 893 "./util/configparser.y"
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
@@ -3501,30 +3507,30 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3505 "util/configparser.c"
+#line 3511 "util/configparser.c"
     break;
 
-  case 322:
+  case 323:
 #line 902 "./util/configparser.y"
     {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3515 "util/configparser.c"
+#line 3521 "util/configparser.c"
     break;
 
-  case 323:
+  case 324:
 #line 909 "./util/configparser.y"
     {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3525 "util/configparser.c"
+#line 3531 "util/configparser.c"
     break;
 
-  case 324:
+  case 325:
 #line 916 "./util/configparser.y"
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
@@ -3533,20 +3539,20 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3537 "util/configparser.c"
+#line 3543 "util/configparser.c"
     break;
 
-  case 325:
+  case 326:
 #line 925 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3547 "util/configparser.c"
+#line 3553 "util/configparser.c"
     break;
 
-  case 326:
+  case 327:
 #line 932 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
@@ -3555,10 +3561,10 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3559 "util/configparser.c"
+#line 3565 "util/configparser.c"
     break;
 
-  case 327:
+  case 328:
 #line 941 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
@@ -3566,30 +3572,30 @@ yyreduce:
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3570 "util/configparser.c"
+#line 3576 "util/configparser.c"
     break;
 
-  case 328:
+  case 329:
 #line 949 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3580 "util/configparser.c"
+#line 3586 "util/configparser.c"
     break;
 
-  case 329:
+  case 330:
 #line 956 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3590 "util/configparser.c"
+#line 3596 "util/configparser.c"
     break;
 
-  case 330:
+  case 331:
 #line 963 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
@@ -3597,10 +3603,10 @@ yyreduce:
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3601 "util/configparser.c"
+#line 3607 "util/configparser.c"
     break;
 
-  case 331:
+  case 332:
 #line 971 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
@@ -3609,10 +3615,10 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3613 "util/configparser.c"
+#line 3619 "util/configparser.c"
     break;
 
-  case 332:
+  case 333:
 #line 980 "./util/configparser.y"
     {
 		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
@@ -3621,10 +3627,10 @@ yyreduce:
 		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3625 "util/configparser.c"
+#line 3631 "util/configparser.c"
     break;
 
-  case 333:
+  case 334:
 #line 988 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str)));
@@ -3641,10 +3647,10 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3645 "util/configparser.c"
+#line 3651 "util/configparser.c"
     break;
 
-  case 334:
+  case 335:
 #line 1004 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str)));
@@ -3653,10 +3659,10 @@ yyreduce:
 		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3657 "util/configparser.c"
+#line 3663 "util/configparser.c"
     break;
 
-  case 335:
+  case 336:
 #line 1012 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -3665,10 +3671,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3669 "util/configparser.c"
+#line 3675 "util/configparser.c"
     break;
 
-  case 336:
+  case 337:
 #line 1020 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -3677,10 +3683,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3681 "util/configparser.c"
+#line 3687 "util/configparser.c"
     break;
 
-  case 337:
+  case 338:
 #line 1028 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str)));
@@ -3689,11 +3695,23 @@ yyreduce:
 		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3693 "util/configparser.c"
+#line 3699 "util/configparser.c"
     break;
 
-  case 338:
+  case 339:
 #line 1036 "./util/configparser.y"
+    {
+		OUTYY(("P(server_http_notls_downstream:%s)\n", (yyvsp[0].str)));
+		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0);
+		free((yyvsp[0].str));
+	}
+#line 3711 "util/configparser.c"
+    break;
+
+  case 340:
+#line 1044 "./util/configparser.y"
     {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3701,11 +3719,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3705 "util/configparser.c"
+#line 3723 "util/configparser.c"
     break;
 
-  case 339:
-#line 1045 "./util/configparser.y"
+  case 341:
+#line 1053 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3713,11 +3731,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3717 "util/configparser.c"
+#line 3735 "util/configparser.c"
     break;
 
-  case 340:
-#line 1054 "./util/configparser.y"
+  case 342:
+#line 1062 "./util/configparser.y"
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3730,11 +3748,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3734 "util/configparser.c"
+#line 3752 "util/configparser.c"
     break;
 
-  case 341:
-#line 1068 "./util/configparser.y"
+  case 343:
+#line 1076 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3742,11 +3760,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3746 "util/configparser.c"
+#line 3764 "util/configparser.c"
     break;
 
-  case 342:
-#line 1077 "./util/configparser.y"
+  case 344:
+#line 1085 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3754,11 +3772,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3758 "util/configparser.c"
+#line 3776 "util/configparser.c"
     break;
 
-  case 343:
-#line 1086 "./util/configparser.y"
+  case 345:
+#line 1094 "./util/configparser.y"
     {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3766,11 +3784,11 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3770 "util/configparser.c"
+#line 3788 "util/configparser.c"
     break;
 
-  case 344:
-#line 1095 "./util/configparser.y"
+  case 346:
+#line 1103 "./util/configparser.y"
     {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3778,11 +3796,11 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3782 "util/configparser.c"
+#line 3800 "util/configparser.c"
     break;
 
-  case 345:
-#line 1104 "./util/configparser.y"
+  case 347:
+#line 1112 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3790,11 +3808,11 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3794 "util/configparser.c"
+#line 3812 "util/configparser.c"
     break;
 
-  case 346:
-#line 1113 "./util/configparser.y"
+  case 348:
+#line 1121 "./util/configparser.y"
     {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3802,31 +3820,31 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3806 "util/configparser.c"
+#line 3824 "util/configparser.c"
     break;
 
-  case 347:
-#line 1122 "./util/configparser.y"
+  case 349:
+#line 1130 "./util/configparser.y"
     {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3816 "util/configparser.c"
+#line 3834 "util/configparser.c"
     break;
 
-  case 348:
-#line 1129 "./util/configparser.y"
+  case 350:
+#line 1137 "./util/configparser.y"
     {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3826 "util/configparser.c"
+#line 3844 "util/configparser.c"
     break;
 
-  case 349:
-#line 1136 "./util/configparser.y"
+  case 351:
+#line 1144 "./util/configparser.y"
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3851,105 +3869,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3855 "util/configparser.c"
+#line 3873 "util/configparser.c"
     break;
 
-  case 350:
-#line 1162 "./util/configparser.y"
+  case 352:
+#line 1170 "./util/configparser.y"
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3866 "util/configparser.c"
+#line 3884 "util/configparser.c"
     break;
 
-  case 351:
-#line 1170 "./util/configparser.y"
+  case 353:
+#line 1178 "./util/configparser.y"
     {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3876 "util/configparser.c"
+#line 3894 "util/configparser.c"
     break;
 
-  case 352:
-#line 1177 "./util/configparser.y"
+  case 354:
+#line 1185 "./util/configparser.y"
     {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3886 "util/configparser.c"
+#line 3904 "util/configparser.c"
     break;
 
-  case 353:
-#line 1184 "./util/configparser.y"
+  case 355:
+#line 1192 "./util/configparser.y"
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 3896 "util/configparser.c"
+#line 3914 "util/configparser.c"
     break;
 
-  case 354:
-#line 1191 "./util/configparser.y"
+  case 356:
+#line 1199 "./util/configparser.y"
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 3906 "util/configparser.c"
+#line 3924 "util/configparser.c"
     break;
 
-  case 355:
-#line 1198 "./util/configparser.y"
+  case 357:
+#line 1206 "./util/configparser.y"
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3917 "util/configparser.c"
+#line 3935 "util/configparser.c"
     break;
 
-  case 356:
-#line 1206 "./util/configparser.y"
+  case 358:
+#line 1214 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3928 "util/configparser.c"
+#line 3946 "util/configparser.c"
     break;
 
-  case 357:
-#line 1214 "./util/configparser.y"
+  case 359:
+#line 1222 "./util/configparser.y"
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3939 "util/configparser.c"
+#line 3957 "util/configparser.c"
     break;
 
-  case 358:
-#line 1222 "./util/configparser.y"
+  case 360:
+#line 1230 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3949 "util/configparser.c"
+#line 3967 "util/configparser.c"
     break;
 
-  case 359:
-#line 1229 "./util/configparser.y"
+  case 361:
+#line 1237 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3959,11 +3977,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3963 "util/configparser.c"
+#line 3981 "util/configparser.c"
     break;
 
-  case 360:
-#line 1240 "./util/configparser.y"
+  case 362:
+#line 1248 "./util/configparser.y"
     {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3973,21 +3991,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3977 "util/configparser.c"
+#line 3995 "util/configparser.c"
     break;
 
-  case 361:
-#line 1251 "./util/configparser.y"
+  case 363:
+#line 1259 "./util/configparser.y"
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3987 "util/configparser.c"
+#line 4005 "util/configparser.c"
     break;
 
-  case 362:
-#line 1258 "./util/configparser.y"
+  case 364:
+#line 1266 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3995,11 +4013,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3999 "util/configparser.c"
+#line 4017 "util/configparser.c"
     break;
 
-  case 363:
-#line 1267 "./util/configparser.y"
+  case 365:
+#line 1275 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4007,11 +4025,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4011 "util/configparser.c"
+#line 4029 "util/configparser.c"
     break;
 
-  case 364:
-#line 1276 "./util/configparser.y"
+  case 366:
+#line 1284 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4019,53 +4037,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4023 "util/configparser.c"
+#line 4041 "util/configparser.c"
     break;
 
-  case 365:
-#line 1285 "./util/configparser.y"
+  case 367:
+#line 1293 "./util/configparser.y"
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 4033 "util/configparser.c"
+#line 4051 "util/configparser.c"
     break;
 
-  case 366:
-#line 1292 "./util/configparser.y"
+  case 368:
+#line 1300 "./util/configparser.y"
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 4043 "util/configparser.c"
+#line 4061 "util/configparser.c"
     break;
 
-  case 367:
-#line 1299 "./util/configparser.y"
+  case 369:
+#line 1307 "./util/configparser.y"
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4054 "util/configparser.c"
+#line 4072 "util/configparser.c"
     break;
 
-  case 368:
-#line 1307 "./util/configparser.y"
+  case 370:
+#line 1315 "./util/configparser.y"
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4065 "util/configparser.c"
+#line 4083 "util/configparser.c"
     break;
 
-  case 369:
-#line 1315 "./util/configparser.y"
+  case 371:
+#line 1323 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4074,11 +4092,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4078 "util/configparser.c"
+#line 4096 "util/configparser.c"
     break;
 
-  case 370:
-#line 1325 "./util/configparser.y"
+  case 372:
+#line 1333 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4087,11 +4105,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4091 "util/configparser.c"
+#line 4109 "util/configparser.c"
     break;
 
-  case 371:
-#line 1335 "./util/configparser.y"
+  case 373:
+#line 1343 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4100,11 +4118,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4104 "util/configparser.c"
+#line 4122 "util/configparser.c"
     break;
 
-  case 372:
-#line 1345 "./util/configparser.y"
+  case 374:
+#line 1353 "./util/configparser.y"
     {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4117,22 +4135,22 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4121 "util/configparser.c"
+#line 4139 "util/configparser.c"
     break;
 
-  case 373:
-#line 1359 "./util/configparser.y"
+  case 375:
+#line 1367 "./util/configparser.y"
     {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4132 "util/configparser.c"
+#line 4150 "util/configparser.c"
     break;
 
-  case 374:
-#line 1367 "./util/configparser.y"
+  case 376:
+#line 1375 "./util/configparser.y"
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4144,11 +4162,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4148 "util/configparser.c"
+#line 4166 "util/configparser.c"
     break;
 
-  case 375:
-#line 1380 "./util/configparser.y"
+  case 377:
+#line 1388 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4158,22 +4176,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4162 "util/configparser.c"
+#line 4180 "util/configparser.c"
     break;
 
-  case 376:
-#line 1391 "./util/configparser.y"
+  case 378:
+#line 1399 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4173 "util/configparser.c"
+#line 4191 "util/configparser.c"
     break;
 
-  case 377:
-#line 1399 "./util/configparser.y"
+  case 379:
+#line 1407 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4185,11 +4203,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4189 "util/configparser.c"
+#line 4207 "util/configparser.c"
     break;
 
-  case 378:
-#line 1412 "./util/configparser.y"
+  case 380:
+#line 1420 "./util/configparser.y"
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4197,11 +4215,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4201 "util/configparser.c"
+#line 4219 "util/configparser.c"
     break;
 
-  case 379:
-#line 1421 "./util/configparser.y"
+  case 381:
+#line 1429 "./util/configparser.y"
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4209,11 +4227,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4213 "util/configparser.c"
+#line 4231 "util/configparser.c"
     break;
 
-  case 380:
-#line 1430 "./util/configparser.y"
+  case 382:
+#line 1438 "./util/configparser.y"
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4221,11 +4239,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4225 "util/configparser.c"
+#line 4243 "util/configparser.c"
     break;
 
-  case 381:
-#line 1439 "./util/configparser.y"
+  case 383:
+#line 1447 "./util/configparser.y"
     {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4234,11 +4252,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4238 "util/configparser.c"
+#line 4256 "util/configparser.c"
     break;
 
-  case 382:
-#line 1449 "./util/configparser.y"
+  case 384:
+#line 1457 "./util/configparser.y"
     {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4247,22 +4265,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4251 "util/configparser.c"
+#line 4269 "util/configparser.c"
     break;
 
-  case 383:
-#line 1459 "./util/configparser.y"
+  case 385:
+#line 1467 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4262 "util/configparser.c"
+#line 4280 "util/configparser.c"
     break;
 
-  case 384:
-#line 1467 "./util/configparser.y"
+  case 386:
+#line 1475 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4274,11 +4292,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4278 "util/configparser.c"
+#line 4296 "util/configparser.c"
     break;
 
-  case 385:
-#line 1480 "./util/configparser.y"
+  case 387:
+#line 1488 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4286,22 +4304,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4290 "util/configparser.c"
+#line 4308 "util/configparser.c"
     break;
 
-  case 386:
-#line 1489 "./util/configparser.y"
+  case 388:
+#line 1497 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4301 "util/configparser.c"
+#line 4319 "util/configparser.c"
     break;
 
-  case 387:
-#line 1497 "./util/configparser.y"
+  case 389:
+#line 1505 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4309,22 +4327,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4313 "util/configparser.c"
+#line 4331 "util/configparser.c"
     break;
 
-  case 388:
-#line 1506 "./util/configparser.y"
+  case 390:
+#line 1514 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4324 "util/configparser.c"
+#line 4342 "util/configparser.c"
     break;
 
-  case 389:
-#line 1514 "./util/configparser.y"
+  case 391:
+#line 1522 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4336,11 +4354,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4340 "util/configparser.c"
+#line 4358 "util/configparser.c"
     break;
 
-  case 390:
-#line 1527 "./util/configparser.y"
+  case 392:
+#line 1535 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4348,21 +4366,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4352 "util/configparser.c"
+#line 4370 "util/configparser.c"
     break;
 
-  case 391:
-#line 1536 "./util/configparser.y"
+  case 393:
+#line 1544 "./util/configparser.y"
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4362 "util/configparser.c"
+#line 4380 "util/configparser.c"
     break;
 
-  case 392:
-#line 1543 "./util/configparser.y"
+  case 394:
+#line 1551 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4371,11 +4389,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4375 "util/configparser.c"
+#line 4393 "util/configparser.c"
     break;
 
-  case 393:
-#line 1553 "./util/configparser.y"
+  case 395:
+#line 1561 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4384,11 +4402,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4388 "util/configparser.c"
+#line 4406 "util/configparser.c"
     break;
 
-  case 394:
-#line 1563 "./util/configparser.y"
+  case 396:
+#line 1571 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4397,11 +4415,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4401 "util/configparser.c"
+#line 4419 "util/configparser.c"
     break;
 
-  case 395:
-#line 1573 "./util/configparser.y"
+  case 397:
+#line 1581 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4410,11 +4428,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4414 "util/configparser.c"
+#line 4432 "util/configparser.c"
     break;
 
-  case 396:
-#line 1583 "./util/configparser.y"
+  case 398:
+#line 1591 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4423,11 +4441,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4427 "util/configparser.c"
+#line 4445 "util/configparser.c"
     break;
 
-  case 397:
-#line 1593 "./util/configparser.y"
+  case 399:
+#line 1601 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4436,11 +4454,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4440 "util/configparser.c"
+#line 4458 "util/configparser.c"
     break;
 
-  case 398:
-#line 1603 "./util/configparser.y"
+  case 400:
+#line 1611 "./util/configparser.y"
     {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4449,11 +4467,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4453 "util/configparser.c"
+#line 4471 "util/configparser.c"
     break;
 
-  case 399:
-#line 1613 "./util/configparser.y"
+  case 401:
+#line 1621 "./util/configparser.y"
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4462,41 +4480,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4466 "util/configparser.c"
+#line 4484 "util/configparser.c"
     break;
 
-  case 400:
-#line 1623 "./util/configparser.y"
+  case 402:
+#line 1631 "./util/configparser.y"
     {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4476 "util/configparser.c"
+#line 4494 "util/configparser.c"
     break;
 
-  case 401:
-#line 1630 "./util/configparser.y"
+  case 403:
+#line 1638 "./util/configparser.y"
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4486 "util/configparser.c"
+#line 4504 "util/configparser.c"
     break;
 
-  case 402:
-#line 1637 "./util/configparser.y"
+  case 404:
+#line 1645 "./util/configparser.y"
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4496 "util/configparser.c"
+#line 4514 "util/configparser.c"
     break;
 
-  case 403:
-#line 1644 "./util/configparser.y"
+  case 405:
+#line 1652 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4504,11 +4522,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4508 "util/configparser.c"
+#line 4526 "util/configparser.c"
     break;
 
-  case 404:
-#line 1653 "./util/configparser.y"
+  case 406:
+#line 1661 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4516,11 +4534,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4520 "util/configparser.c"
+#line 4538 "util/configparser.c"
     break;
 
-  case 405:
-#line 1662 "./util/configparser.y"
+  case 407:
+#line 1670 "./util/configparser.y"
     {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4528,11 +4546,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4532 "util/configparser.c"
+#line 4550 "util/configparser.c"
     break;
 
-  case 406:
-#line 1671 "./util/configparser.y"
+  case 408:
+#line 1679 "./util/configparser.y"
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4540,21 +4558,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4544 "util/configparser.c"
+#line 4562 "util/configparser.c"
     break;
 
-  case 407:
-#line 1680 "./util/configparser.y"
+  case 409:
+#line 1688 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4554 "util/configparser.c"
+#line 4572 "util/configparser.c"
     break;
 
-  case 408:
-#line 1687 "./util/configparser.y"
+  case 410:
+#line 1695 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4563,11 +4581,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4567 "util/configparser.c"
+#line 4585 "util/configparser.c"
     break;
 
-  case 409:
-#line 1697 "./util/configparser.y"
+  case 411:
+#line 1705 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -4586,21 +4604,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4590 "util/configparser.c"
+#line 4608 "util/configparser.c"
     break;
 
-  case 410:
-#line 1717 "./util/configparser.y"
+  case 412:
+#line 1725 "./util/configparser.y"
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4600 "util/configparser.c"
+#line 4618 "util/configparser.c"
     break;
 
-  case 411:
-#line 1724 "./util/configparser.y"
+  case 413:
+#line 1732 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4617,11 +4635,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4621 "util/configparser.c"
+#line 4639 "util/configparser.c"
     break;
 
-  case 412:
-#line 1742 "./util/configparser.y"
+  case 414:
+#line 1750 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4633,11 +4651,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4637 "util/configparser.c"
+#line 4655 "util/configparser.c"
     break;
 
-  case 413:
-#line 1755 "./util/configparser.y"
+  case 415:
+#line 1763 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4649,11 +4667,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4653 "util/configparser.c"
+#line 4671 "util/configparser.c"
     break;
 
-  case 414:
-#line 1768 "./util/configparser.y"
+  case 416:
+#line 1776 "./util/configparser.y"
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4661,11 +4679,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4665 "util/configparser.c"
+#line 4683 "util/configparser.c"
     break;
 
-  case 415:
-#line 1777 "./util/configparser.y"
+  case 417:
+#line 1785 "./util/configparser.y"
     {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4673,11 +4691,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4677 "util/configparser.c"
+#line 4695 "util/configparser.c"
     break;
 
-  case 416:
-#line 1786 "./util/configparser.y"
+  case 418:
+#line 1794 "./util/configparser.y"
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4685,11 +4703,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4689 "util/configparser.c"
+#line 4707 "util/configparser.c"
     break;
 
-  case 417:
-#line 1795 "./util/configparser.y"
+  case 419:
+#line 1803 "./util/configparser.y"
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4697,11 +4715,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4701 "util/configparser.c"
+#line 4719 "util/configparser.c"
     break;
 
-  case 418:
-#line 1804 "./util/configparser.y"
+  case 420:
+#line 1812 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4710,11 +4728,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4714 "util/configparser.c"
+#line 4732 "util/configparser.c"
     break;
 
-  case 419:
-#line 1814 "./util/configparser.y"
+  case 421:
+#line 1822 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4723,11 +4741,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4727 "util/configparser.c"
+#line 4745 "util/configparser.c"
     break;
 
-  case 420:
-#line 1824 "./util/configparser.y"
+  case 422:
+#line 1832 "./util/configparser.y"
     {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4737,11 +4755,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4741 "util/configparser.c"
+#line 4759 "util/configparser.c"
     break;
 
-  case 421:
-#line 1835 "./util/configparser.y"
+  case 423:
+#line 1843 "./util/configparser.y"
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4749,11 +4767,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4753 "util/configparser.c"
+#line 4771 "util/configparser.c"
     break;
 
-  case 422:
-#line 1844 "./util/configparser.y"
+  case 424:
+#line 1852 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4761,11 +4779,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4765 "util/configparser.c"
+#line 4783 "util/configparser.c"
     break;
 
-  case 423:
-#line 1853 "./util/configparser.y"
+  case 425:
+#line 1861 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4773,11 +4791,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4777 "util/configparser.c"
+#line 4795 "util/configparser.c"
     break;
 
-  case 424:
-#line 1862 "./util/configparser.y"
+  case 426:
+#line 1870 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4785,11 +4803,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4789 "util/configparser.c"
+#line 4807 "util/configparser.c"
     break;
 
-  case 425:
-#line 1871 "./util/configparser.y"
+  case 427:
+#line 1879 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4797,11 +4815,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4801 "util/configparser.c"
+#line 4819 "util/configparser.c"
     break;
 
-  case 426:
-#line 1880 "./util/configparser.y"
+  case 428:
+#line 1888 "./util/configparser.y"
     {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4809,11 +4827,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4813 "util/configparser.c"
+#line 4831 "util/configparser.c"
     break;
 
-  case 427:
-#line 1889 "./util/configparser.y"
+  case 429:
+#line 1897 "./util/configparser.y"
     {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4825,11 +4843,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4829 "util/configparser.c"
+#line 4847 "util/configparser.c"
     break;
 
-  case 428:
-#line 1902 "./util/configparser.y"
+  case 430:
+#line 1910 "./util/configparser.y"
     {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4841,11 +4859,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4845 "util/configparser.c"
+#line 4863 "util/configparser.c"
     break;
 
-  case 429:
-#line 1915 "./util/configparser.y"
+  case 431:
+#line 1923 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4853,21 +4871,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4857 "util/configparser.c"
+#line 4875 "util/configparser.c"
     break;
 
-  case 430:
-#line 1924 "./util/configparser.y"
+  case 432:
+#line 1932 "./util/configparser.y"
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 4867 "util/configparser.c"
+#line 4885 "util/configparser.c"
     break;
 
-  case 431:
-#line 1931 "./util/configparser.y"
+  case 433:
+#line 1939 "./util/configparser.y"
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4875,11 +4893,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4879 "util/configparser.c"
+#line 4897 "util/configparser.c"
     break;
 
-  case 432:
-#line 1940 "./util/configparser.y"
+  case 434:
+#line 1948 "./util/configparser.y"
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4887,11 +4905,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4891 "util/configparser.c"
+#line 4909 "util/configparser.c"
     break;
 
-  case 433:
-#line 1949 "./util/configparser.y"
+  case 435:
+#line 1957 "./util/configparser.y"
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4899,11 +4917,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4903 "util/configparser.c"
+#line 4921 "util/configparser.c"
     break;
 
-  case 434:
-#line 1958 "./util/configparser.y"
+  case 436:
+#line 1966 "./util/configparser.y"
     {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4912,22 +4930,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4916 "util/configparser.c"
+#line 4934 "util/configparser.c"
     break;
 
-  case 435:
-#line 1967 "./util/configparser.y"
+  case 437:
+#line 1975 "./util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4927 "util/configparser.c"
+#line 4945 "util/configparser.c"
     break;
 
-  case 436:
-#line 1975 "./util/configparser.y"
+  case 438:
+#line 1983 "./util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4939,22 +4957,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4943 "util/configparser.c"
+#line 4961 "util/configparser.c"
     break;
 
-  case 437:
-#line 1988 "./util/configparser.y"
+  case 439:
+#line 1996 "./util/configparser.y"
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4954 "util/configparser.c"
+#line 4972 "util/configparser.c"
     break;
 
-  case 438:
-#line 1996 "./util/configparser.y"
+  case 440:
+#line 2004 "./util/configparser.y"
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4994,21 +5012,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4998 "util/configparser.c"
+#line 5016 "util/configparser.c"
     break;
 
-  case 439:
-#line 2037 "./util/configparser.y"
+  case 441:
+#line 2045 "./util/configparser.y"
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 5008 "util/configparser.c"
+#line 5026 "util/configparser.c"
     break;
 
-  case 440:
-#line 2044 "./util/configparser.y"
+  case 442:
+#line 2052 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5022,11 +5040,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5026 "util/configparser.c"
+#line 5044 "util/configparser.c"
     break;
 
-  case 441:
-#line 2059 "./util/configparser.y"
+  case 443:
+#line 2067 "./util/configparser.y"
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5035,11 +5053,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5039 "util/configparser.c"
+#line 5057 "util/configparser.c"
     break;
 
-  case 442:
-#line 2069 "./util/configparser.y"
+  case 444:
+#line 2077 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5048,41 +5066,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5052 "util/configparser.c"
+#line 5070 "util/configparser.c"
     break;
 
-  case 443:
-#line 2079 "./util/configparser.y"
+  case 445:
+#line 2087 "./util/configparser.y"
     {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5062 "util/configparser.c"
+#line 5080 "util/configparser.c"
     break;
 
-  case 444:
-#line 2086 "./util/configparser.y"
+  case 446:
+#line 2094 "./util/configparser.y"
     {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5072 "util/configparser.c"
+#line 5090 "util/configparser.c"
     break;
 
-  case 445:
-#line 2093 "./util/configparser.y"
+  case 447:
+#line 2101 "./util/configparser.y"
     {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 5082 "util/configparser.c"
+#line 5100 "util/configparser.c"
     break;
 
-  case 446:
-#line 2100 "./util/configparser.y"
+  case 448:
+#line 2108 "./util/configparser.y"
     {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5090,22 +5108,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5094 "util/configparser.c"
+#line 5112 "util/configparser.c"
     break;
 
-  case 447:
-#line 2109 "./util/configparser.y"
+  case 449:
+#line 2117 "./util/configparser.y"
     {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 5105 "util/configparser.c"
+#line 5123 "util/configparser.c"
     break;
 
-  case 448:
-#line 2117 "./util/configparser.y"
+  case 450:
+#line 2125 "./util/configparser.y"
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -5118,11 +5136,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5122 "util/configparser.c"
+#line 5140 "util/configparser.c"
     break;
 
-  case 449:
-#line 2131 "./util/configparser.y"
+  case 451:
+#line 2139 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5142,11 +5160,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5146 "util/configparser.c"
+#line 5164 "util/configparser.c"
     break;
 
-  case 450:
-#line 2152 "./util/configparser.y"
+  case 452:
+#line 2160 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5166,11 +5184,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5170 "util/configparser.c"
+#line 5188 "util/configparser.c"
     break;
 
-  case 451:
-#line 2173 "./util/configparser.y"
+  case 453:
+#line 2181 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -5181,11 +5199,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5185 "util/configparser.c"
+#line 5203 "util/configparser.c"
     break;
 
-  case 452:
-#line 2185 "./util/configparser.y"
+  case 454:
+#line 2193 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -5196,11 +5214,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5200 "util/configparser.c"
+#line 5218 "util/configparser.c"
     break;
 
-  case 453:
-#line 2197 "./util/configparser.y"
+  case 455:
+#line 2205 "./util/configparser.y"
     {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -5211,11 +5229,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5215 "util/configparser.c"
+#line 5233 "util/configparser.c"
     break;
 
-  case 454:
-#line 2209 "./util/configparser.y"
+  case 456:
+#line 2217 "./util/configparser.y"
     {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -5223,11 +5241,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5227 "util/configparser.c"
+#line 5245 "util/configparser.c"
     break;
 
-  case 455:
-#line 2218 "./util/configparser.y"
+  case 457:
+#line 2226 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5247,11 +5265,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5251 "util/configparser.c"
+#line 5269 "util/configparser.c"
     break;
 
-  case 456:
-#line 2239 "./util/configparser.y"
+  case 458:
+#line 2247 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5259,11 +5277,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5263 "util/configparser.c"
+#line 5281 "util/configparser.c"
     break;
 
-  case 457:
-#line 2249 "./util/configparser.y"
+  case 459:
+#line 2257 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5271,33 +5289,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5275 "util/configparser.c"
+#line 5293 "util/configparser.c"
     break;
 
-  case 458:
-#line 2258 "./util/configparser.y"
+  case 460:
+#line 2266 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5286 "util/configparser.c"
+#line 5304 "util/configparser.c"
     break;
 
-  case 459:
-#line 2266 "./util/configparser.y"
+  case 461:
+#line 2274 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5297 "util/configparser.c"
+#line 5315 "util/configparser.c"
     break;
 
-  case 460:
-#line 2274 "./util/configparser.y"
+  case 462:
+#line 2282 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5309,11 +5327,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5313 "util/configparser.c"
+#line 5331 "util/configparser.c"
     break;
 
-  case 461:
-#line 2287 "./util/configparser.y"
+  case 463:
+#line 2295 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5325,11 +5343,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5329 "util/configparser.c"
+#line 5347 "util/configparser.c"
     break;
 
-  case 462:
-#line 2300 "./util/configparser.y"
+  case 464:
+#line 2308 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5343,11 +5361,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5347 "util/configparser.c"
+#line 5365 "util/configparser.c"
     break;
 
-  case 463:
-#line 2315 "./util/configparser.y"
+  case 465:
+#line 2323 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5361,11 +5379,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5365 "util/configparser.c"
+#line 5383 "util/configparser.c"
     break;
 
-  case 464:
-#line 2330 "./util/configparser.y"
+  case 466:
+#line 2338 "./util/configparser.y"
     { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5373,11 +5391,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5377 "util/configparser.c"
+#line 5395 "util/configparser.c"
     break;
 
-  case 465:
-#line 2339 "./util/configparser.y"
+  case 467:
+#line 2347 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5385,20 +5403,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5389 "util/configparser.c"
+#line 5407 "util/configparser.c"
     break;
 
-  case 466:
-#line 2348 "./util/configparser.y"
+  case 468:
+#line 2356 "./util/configparser.y"
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5398 "util/configparser.c"
+#line 5416 "util/configparser.c"
     break;
 
-  case 467:
-#line 2354 "./util/configparser.y"
+  case 469:
+#line 2362 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5406,11 +5424,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5410 "util/configparser.c"
+#line 5428 "util/configparser.c"
     break;
 
-  case 468:
-#line 2363 "./util/configparser.y"
+  case 470:
+#line 2371 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5418,11 +5436,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5422 "util/configparser.c"
+#line 5440 "util/configparser.c"
     break;
 
-  case 469:
-#line 2372 "./util/configparser.y"
+  case 471:
+#line 2380 "./util/configparser.y"
     {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5431,11 +5449,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5435 "util/configparser.c"
+#line 5453 "util/configparser.c"
     break;
 
-  case 470:
-#line 2382 "./util/configparser.y"
+  case 472:
+#line 2390 "./util/configparser.y"
     {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5444,11 +5462,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5448 "util/configparser.c"
+#line 5466 "util/configparser.c"
     break;
 
-  case 471:
-#line 2392 "./util/configparser.y"
+  case 473:
+#line 2400 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5460,11 +5478,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5464 "util/configparser.c"
+#line 5482 "util/configparser.c"
     break;
 
-  case 472:
-#line 2405 "./util/configparser.y"
+  case 474:
+#line 2413 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5476,11 +5494,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5480 "util/configparser.c"
+#line 5498 "util/configparser.c"
     break;
 
-  case 473:
-#line 2418 "./util/configparser.y"
+  case 475:
+#line 2426 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5491,11 +5509,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5495 "util/configparser.c"
+#line 5513 "util/configparser.c"
     break;
 
-  case 474:
-#line 2430 "./util/configparser.y"
+  case 476:
+#line 2438 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5508,11 +5526,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5512 "util/configparser.c"
+#line 5530 "util/configparser.c"
     break;
 
-  case 475:
-#line 2444 "./util/configparser.y"
+  case 477:
+#line 2452 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5523,11 +5541,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5527 "util/configparser.c"
+#line 5545 "util/configparser.c"
     break;
 
-  case 476:
-#line 2456 "./util/configparser.y"
+  case 478:
+#line 2464 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5540,11 +5558,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5544 "util/configparser.c"
+#line 5562 "util/configparser.c"
     break;
 
-  case 477:
-#line 2470 "./util/configparser.y"
+  case 479:
+#line 2478 "./util/configparser.y"
     {
 		int tag_data;
 		OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5558,11 +5576,11 @@ yyreduce:
 			fatal_exit("out of memory adding "
 				"edns-client-tag");
 	}
-#line 5562 "util/configparser.c"
+#line 5580 "util/configparser.c"
     break;
 
-  case 478:
-#line 2485 "./util/configparser.y"
+  case 480:
+#line 2493 "./util/configparser.y"
     {
 		OUTYY(("P(edns_client_tag_opcode:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5572,11 +5590,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_client_tag_opcode = atoi((yyvsp[0].str));
 
 	}
-#line 5576 "util/configparser.c"
+#line 5594 "util/configparser.c"
     break;
 
-  case 479:
-#line 2496 "./util/configparser.y"
+  case 481:
+#line 2504 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5585,31 +5603,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5589 "util/configparser.c"
+#line 5607 "util/configparser.c"
     break;
 
-  case 480:
-#line 2506 "./util/configparser.y"
+  case 482:
+#line 2514 "./util/configparser.y"
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5599 "util/configparser.c"
+#line 5617 "util/configparser.c"
     break;
 
-  case 481:
-#line 2513 "./util/configparser.y"
+  case 483:
+#line 2521 "./util/configparser.y"
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5609 "util/configparser.c"
+#line 5627 "util/configparser.c"
     break;
 
-  case 482:
-#line 2520 "./util/configparser.y"
+  case 484:
+#line 2528 "./util/configparser.y"
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5617,11 +5635,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5621 "util/configparser.c"
+#line 5639 "util/configparser.c"
     break;
 
-  case 483:
-#line 2529 "./util/configparser.y"
+  case 485:
+#line 2537 "./util/configparser.y"
     {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5629,11 +5647,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5633 "util/configparser.c"
+#line 5651 "util/configparser.c"
     break;
 
-  case 484:
-#line 2538 "./util/configparser.y"
+  case 486:
+#line 2546 "./util/configparser.y"
     {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5642,11 +5660,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5646 "util/configparser.c"
+#line 5664 "util/configparser.c"
     break;
 
-  case 485:
-#line 2548 "./util/configparser.y"
+  case 487:
+#line 2556 "./util/configparser.y"
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5655,11 +5673,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5659 "util/configparser.c"
+#line 5677 "util/configparser.c"
     break;
 
-  case 486:
-#line 2558 "./util/configparser.y"
+  case 488:
+#line 2566 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5668,31 +5686,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5672 "util/configparser.c"
+#line 5690 "util/configparser.c"
     break;
 
-  case 487:
-#line 2568 "./util/configparser.y"
+  case 489:
+#line 2576 "./util/configparser.y"
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5682 "util/configparser.c"
+#line 5700 "util/configparser.c"
     break;
 
-  case 488:
-#line 2575 "./util/configparser.y"
+  case 490:
+#line 2583 "./util/configparser.y"
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5692 "util/configparser.c"
+#line 5710 "util/configparser.c"
     break;
 
-  case 489:
-#line 2582 "./util/configparser.y"
+  case 491:
+#line 2590 "./util/configparser.y"
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5700,11 +5718,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5704 "util/configparser.c"
+#line 5722 "util/configparser.c"
     break;
 
-  case 490:
-#line 2591 "./util/configparser.y"
+  case 492:
+#line 2599 "./util/configparser.y"
     {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5712,11 +5730,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5716 "util/configparser.c"
+#line 5734 "util/configparser.c"
     break;
 
-  case 491:
-#line 2600 "./util/configparser.y"
+  case 493:
+#line 2608 "./util/configparser.y"
     {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5725,11 +5743,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5729 "util/configparser.c"
+#line 5747 "util/configparser.c"
     break;
 
-  case 492:
-#line 2610 "./util/configparser.y"
+  case 494:
+#line 2618 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5738,52 +5756,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5742 "util/configparser.c"
+#line 5760 "util/configparser.c"
     break;
 
-  case 493:
-#line 2620 "./util/configparser.y"
+  case 495:
+#line 2628 "./util/configparser.y"
     {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 5752 "util/configparser.c"
+#line 5770 "util/configparser.c"
     break;
 
-  case 494:
-#line 2627 "./util/configparser.y"
+  case 496:
+#line 2635 "./util/configparser.y"
     {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5762 "util/configparser.c"
+#line 5780 "util/configparser.c"
     break;
 
-  case 495:
-#line 2634 "./util/configparser.y"
+  case 497:
+#line 2642 "./util/configparser.y"
     {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5772 "util/configparser.c"
+#line 5790 "util/configparser.c"
     break;
 
-  case 496:
-#line 2641 "./util/configparser.y"
+  case 498:
+#line 2649 "./util/configparser.y"
     {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5783 "util/configparser.c"
+#line 5801 "util/configparser.c"
     break;
 
-  case 497:
-#line 2649 "./util/configparser.y"
+  case 499:
+#line 2657 "./util/configparser.y"
     {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5792,11 +5810,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5796 "util/configparser.c"
+#line 5814 "util/configparser.c"
     break;
 
-  case 498:
-#line 2659 "./util/configparser.y"
+  case 500:
+#line 2667 "./util/configparser.y"
     {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5805,11 +5823,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5809 "util/configparser.c"
+#line 5827 "util/configparser.c"
     break;
 
-  case 499:
-#line 2669 "./util/configparser.y"
+  case 501:
+#line 2677 "./util/configparser.y"
     {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5818,11 +5836,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5822 "util/configparser.c"
+#line 5840 "util/configparser.c"
     break;
 
-  case 500:
-#line 2679 "./util/configparser.y"
+  case 502:
+#line 2687 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5831,11 +5849,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5835 "util/configparser.c"
+#line 5853 "util/configparser.c"
     break;
 
-  case 501:
-#line 2689 "./util/configparser.y"
+  case 503:
+#line 2697 "./util/configparser.y"
     {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5873,11 +5891,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5877 "util/configparser.c"
+#line 5895 "util/configparser.c"
     break;
 
-  case 502:
-#line 2728 "./util/configparser.y"
+  case 504:
+#line 2736 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5886,33 +5904,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5890 "util/configparser.c"
+#line 5908 "util/configparser.c"
     break;
 
-  case 503:
-#line 2738 "./util/configparser.y"
+  case 505:
+#line 2746 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5901 "util/configparser.c"
+#line 5919 "util/configparser.c"
     break;
 
-  case 504:
-#line 2746 "./util/configparser.y"
+  case 506:
+#line 2754 "./util/configparser.y"
     {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 5912 "util/configparser.c"
+#line 5930 "util/configparser.c"
     break;
 
-  case 505:
-#line 2754 "./util/configparser.y"
+  case 507:
+#line 2762 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5926,11 +5944,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5930 "util/configparser.c"
+#line 5948 "util/configparser.c"
     break;
 
-  case 506:
-#line 2769 "./util/configparser.y"
+  case 508:
+#line 2777 "./util/configparser.y"
     {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5938,19 +5956,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5942 "util/configparser.c"
+#line 5960 "util/configparser.c"
     break;
 
-  case 507:
-#line 2778 "./util/configparser.y"
+  case 509:
+#line 2786 "./util/configparser.y"
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5950 "util/configparser.c"
+#line 5968 "util/configparser.c"
     break;
 
-  case 518:
-#line 2789 "./util/configparser.y"
+  case 520:
+#line 2797 "./util/configparser.y"
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5959,11 +5977,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5963 "util/configparser.c"
+#line 5981 "util/configparser.c"
     break;
 
-  case 519:
-#line 2799 "./util/configparser.y"
+  case 521:
+#line 2807 "./util/configparser.y"
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5971,79 +5989,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5975 "util/configparser.c"
+#line 5993 "util/configparser.c"
     break;
 
-  case 520:
-#line 2808 "./util/configparser.y"
+  case 522:
+#line 2816 "./util/configparser.y"
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 5985 "util/configparser.c"
+#line 6003 "util/configparser.c"
     break;
 
-  case 521:
-#line 2815 "./util/configparser.y"
+  case 523:
+#line 2823 "./util/configparser.y"
     {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5995 "util/configparser.c"
+#line 6013 "util/configparser.c"
     break;
 
-  case 522:
-#line 2822 "./util/configparser.y"
+  case 524:
+#line 2830 "./util/configparser.y"
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 6005 "util/configparser.c"
+#line 6023 "util/configparser.c"
     break;
 
-  case 523:
-#line 2829 "./util/configparser.y"
+  case 525:
+#line 2837 "./util/configparser.y"
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 6015 "util/configparser.c"
+#line 6033 "util/configparser.c"
     break;
 
-  case 524:
-#line 2836 "./util/configparser.y"
+  case 526:
+#line 2844 "./util/configparser.y"
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 6025 "util/configparser.c"
+#line 6043 "util/configparser.c"
     break;
 
-  case 525:
-#line 2843 "./util/configparser.y"
+  case 527:
+#line 2851 "./util/configparser.y"
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 6035 "util/configparser.c"
+#line 6053 "util/configparser.c"
     break;
 
-  case 526:
-#line 2850 "./util/configparser.y"
+  case 528:
+#line 2858 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6043 "util/configparser.c"
+#line 6061 "util/configparser.c"
     break;
 
-  case 548:
-#line 2870 "./util/configparser.y"
+  case 550:
+#line 2878 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6051,11 +6069,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6055 "util/configparser.c"
+#line 6073 "util/configparser.c"
     break;
 
-  case 549:
-#line 2879 "./util/configparser.y"
+  case 551:
+#line 2887 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6064,31 +6082,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6068 "util/configparser.c"
+#line 6086 "util/configparser.c"
     break;
 
-  case 550:
-#line 2889 "./util/configparser.y"
+  case 552:
+#line 2897 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 6078 "util/configparser.c"
+#line 6096 "util/configparser.c"
     break;
 
-  case 551:
-#line 2896 "./util/configparser.y"
+  case 553:
+#line 2904 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 6088 "util/configparser.c"
+#line 6106 "util/configparser.c"
     break;
 
-  case 552:
-#line 2903 "./util/configparser.y"
+  case 554:
+#line 2911 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6096,51 +6114,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6100 "util/configparser.c"
+#line 6118 "util/configparser.c"
     break;
 
-  case 553:
-#line 2912 "./util/configparser.y"
+  case 555:
+#line 2920 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 6110 "util/configparser.c"
+#line 6128 "util/configparser.c"
     break;
 
-  case 554:
-#line 2919 "./util/configparser.y"
+  case 556:
+#line 2927 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 6120 "util/configparser.c"
+#line 6138 "util/configparser.c"
     break;
 
-  case 555:
-#line 2926 "./util/configparser.y"
+  case 557:
+#line 2934 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 6130 "util/configparser.c"
+#line 6148 "util/configparser.c"
     break;
 
-  case 556:
-#line 2933 "./util/configparser.y"
+  case 558:
+#line 2941 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 6140 "util/configparser.c"
+#line 6158 "util/configparser.c"
     break;
 
-  case 557:
-#line 2940 "./util/configparser.y"
+  case 559:
+#line 2948 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6148,11 +6166,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6152 "util/configparser.c"
+#line 6170 "util/configparser.c"
     break;
 
-  case 558:
-#line 2949 "./util/configparser.y"
+  case 560:
+#line 2957 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6160,31 +6178,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6164 "util/configparser.c"
+#line 6182 "util/configparser.c"
     break;
 
-  case 559:
-#line 2958 "./util/configparser.y"
+  case 561:
+#line 2966 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6174 "util/configparser.c"
+#line 6192 "util/configparser.c"
     break;
 
-  case 560:
-#line 2965 "./util/configparser.y"
+  case 562:
+#line 2973 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6184 "util/configparser.c"
+#line 6202 "util/configparser.c"
     break;
 
-  case 561:
-#line 2972 "./util/configparser.y"
+  case 563:
+#line 2980 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6193,11 +6211,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6197 "util/configparser.c"
+#line 6215 "util/configparser.c"
     break;
 
-  case 562:
-#line 2982 "./util/configparser.y"
+  case 564:
+#line 2990 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6206,11 +6224,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6210 "util/configparser.c"
+#line 6228 "util/configparser.c"
     break;
 
-  case 563:
-#line 2992 "./util/configparser.y"
+  case 565:
+#line 3000 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6219,11 +6237,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6223 "util/configparser.c"
+#line 6241 "util/configparser.c"
     break;
 
-  case 564:
-#line 3002 "./util/configparser.y"
+  case 566:
+#line 3010 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6232,11 +6250,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6236 "util/configparser.c"
+#line 6254 "util/configparser.c"
     break;
 
-  case 565:
-#line 3012 "./util/configparser.y"
+  case 567:
+#line 3020 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6245,11 +6263,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6249 "util/configparser.c"
+#line 6267 "util/configparser.c"
     break;
 
-  case 566:
-#line 3022 "./util/configparser.y"
+  case 568:
+#line 3030 "./util/configparser.y"
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6258,47 +6276,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6262 "util/configparser.c"
+#line 6280 "util/configparser.c"
     break;
 
-  case 567:
-#line 3032 "./util/configparser.y"
+  case 569:
+#line 3040 "./util/configparser.y"
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6270 "util/configparser.c"
+#line 6288 "util/configparser.c"
     break;
 
-  case 571:
-#line 3041 "./util/configparser.y"
+  case 573:
+#line 3049 "./util/configparser.y"
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6280 "util/configparser.c"
+#line 6298 "util/configparser.c"
     break;
 
-  case 572:
-#line 3047 "./util/configparser.y"
+  case 574:
+#line 3055 "./util/configparser.y"
     { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6288 "util/configparser.c"
+#line 6306 "util/configparser.c"
     break;
 
-  case 576:
-#line 3056 "./util/configparser.y"
+  case 578:
+#line 3064 "./util/configparser.y"
     {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6298 "util/configparser.c"
+#line 6316 "util/configparser.c"
     break;
 
-  case 577:
-#line 3062 "./util/configparser.y"
+  case 579:
+#line 3070 "./util/configparser.y"
     {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6307,21 +6325,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6311 "util/configparser.c"
+#line 6329 "util/configparser.c"
     break;
 
-  case 578:
-#line 3072 "./util/configparser.y"
+  case 580:
+#line 3080 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6321 "util/configparser.c"
+#line 6339 "util/configparser.c"
     break;
 
-  case 579:
-#line 3079 "./util/configparser.y"
+  case 581:
+#line 3087 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6329,30 +6347,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6333 "util/configparser.c"
+#line 6351 "util/configparser.c"
     break;
 
-  case 580:
-#line 3088 "./util/configparser.y"
+  case 582:
+#line 3096 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6344 "util/configparser.c"
+#line 6362 "util/configparser.c"
     break;
 
-  case 581:
-#line 3096 "./util/configparser.y"
+  case 583:
+#line 3104 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6352 "util/configparser.c"
+#line 6370 "util/configparser.c"
     break;
 
-  case 594:
-#line 3112 "./util/configparser.y"
+  case 596:
+#line 3120 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6360,11 +6378,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6364 "util/configparser.c"
+#line 6382 "util/configparser.c"
     break;
 
-  case 595:
-#line 3122 "./util/configparser.y"
+  case 597:
+#line 3130 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6372,21 +6390,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6376 "util/configparser.c"
+#line 6394 "util/configparser.c"
     break;
 
-  case 596:
-#line 3131 "./util/configparser.y"
+  case 598:
+#line 3139 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6386 "util/configparser.c"
+#line 6404 "util/configparser.c"
     break;
 
-  case 597:
-#line 3138 "./util/configparser.y"
+  case 599:
+#line 3146 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6394,21 +6412,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6398 "util/configparser.c"
+#line 6416 "util/configparser.c"
     break;
 
-  case 598:
-#line 3147 "./util/configparser.y"
+  case 600:
+#line 3155 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6408 "util/configparser.c"
+#line 6426 "util/configparser.c"
     break;
 
-  case 599:
-#line 3154 "./util/configparser.y"
+  case 601:
+#line 3162 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6416,22 +6434,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6420 "util/configparser.c"
+#line 6438 "util/configparser.c"
     break;
 
-  case 600:
-#line 3163 "./util/configparser.y"
+  case 602:
+#line 3171 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6431 "util/configparser.c"
+#line 6449 "util/configparser.c"
     break;
 
-  case 601:
-#line 3171 "./util/configparser.y"
+  case 603:
+#line 3179 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6443,22 +6461,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6447 "util/configparser.c"
+#line 6465 "util/configparser.c"
     break;
 
-  case 602:
-#line 3184 "./util/configparser.y"
+  case 604:
+#line 3192 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 6458 "util/configparser.c"
+#line 6476 "util/configparser.c"
     break;
 
-  case 603:
-#line 3192 "./util/configparser.y"
+  case 605:
+#line 3200 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6470,19 +6488,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6474 "util/configparser.c"
+#line 6492 "util/configparser.c"
     break;
 
-  case 604:
-#line 3205 "./util/configparser.y"
+  case 606:
+#line 3213 "./util/configparser.y"
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6482 "util/configparser.c"
+#line 6500 "util/configparser.c"
     break;
 
-  case 613:
-#line 3216 "./util/configparser.y"
+  case 615:
+#line 3224 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6493,11 +6511,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6497 "util/configparser.c"
+#line 6515 "util/configparser.c"
     break;
 
-  case 614:
-#line 3228 "./util/configparser.y"
+  case 616:
+#line 3236 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6508,11 +6526,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6512 "util/configparser.c"
+#line 6530 "util/configparser.c"
     break;
 
-  case 615:
-#line 3240 "./util/configparser.y"
+  case 617:
+#line 3248 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6523,11 +6541,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6527 "util/configparser.c"
+#line 6545 "util/configparser.c"
     break;
 
-  case 616:
-#line 3252 "./util/configparser.y"
+  case 618:
+#line 3260 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6541,11 +6559,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6545 "util/configparser.c"
+#line 6563 "util/configparser.c"
     break;
 
-  case 617:
-#line 3267 "./util/configparser.y"
+  case 619:
+#line 3275 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6557,11 +6575,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6561 "util/configparser.c"
+#line 6579 "util/configparser.c"
     break;
 
-  case 618:
-#line 3280 "./util/configparser.y"
+  case 620:
+#line 3288 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6573,11 +6591,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6577 "util/configparser.c"
+#line 6595 "util/configparser.c"
     break;
 
-  case 619:
-#line 3293 "./util/configparser.y"
+  case 621:
+#line 3301 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6587,19 +6605,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6591 "util/configparser.c"
+#line 6609 "util/configparser.c"
     break;
 
-  case 620:
-#line 3304 "./util/configparser.y"
+  case 622:
+#line 3312 "./util/configparser.y"
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6599 "util/configparser.c"
+#line 6617 "util/configparser.c"
     break;
 
-  case 625:
-#line 3313 "./util/configparser.y"
+  case 627:
+#line 3321 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6613,11 +6631,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6617 "util/configparser.c"
+#line 6635 "util/configparser.c"
     break;
 
-  case 626:
-#line 3328 "./util/configparser.y"
+  case 628:
+#line 3336 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6631,11 +6649,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6635 "util/configparser.c"
+#line 6653 "util/configparser.c"
     break;
 
 
-#line 6639 "util/configparser.c"
+#line 6657 "util/configparser.c"
 
       default: break;
     }
@@ -6867,7 +6885,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3342 "./util/configparser.y"
+#line 3350 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 627d4cbf9..6dcafd644 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -194,158 +194,159 @@ extern int yydebug;
     VAR_HTTP_QUERY_BUFFER_SIZE = 400,
     VAR_HTTP_RESPONSE_BUFFER_SIZE = 401,
     VAR_HTTP_NODELAY = 402,
-    VAR_STUB_FIRST = 403,
-    VAR_MINIMAL_RESPONSES = 404,
-    VAR_RRSET_ROUNDROBIN = 405,
-    VAR_MAX_UDP_SIZE = 406,
-    VAR_DELAY_CLOSE = 407,
-    VAR_UNBLOCK_LAN_ZONES = 408,
-    VAR_INSECURE_LAN_ZONES = 409,
-    VAR_INFRA_CACHE_MIN_RTT = 410,
-    VAR_DNS64_PREFIX = 411,
-    VAR_DNS64_SYNTHALL = 412,
-    VAR_DNS64_IGNORE_AAAA = 413,
-    VAR_DNSTAP = 414,
-    VAR_DNSTAP_ENABLE = 415,
-    VAR_DNSTAP_SOCKET_PATH = 416,
-    VAR_DNSTAP_IP = 417,
-    VAR_DNSTAP_TLS = 418,
-    VAR_DNSTAP_TLS_SERVER_NAME = 419,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 420,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 421,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 422,
-    VAR_DNSTAP_SEND_IDENTITY = 423,
-    VAR_DNSTAP_SEND_VERSION = 424,
-    VAR_DNSTAP_BIDIRECTIONAL = 425,
-    VAR_DNSTAP_IDENTITY = 426,
-    VAR_DNSTAP_VERSION = 427,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 428,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 429,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 430,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 431,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 432,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 433,
-    VAR_RESPONSE_IP_TAG = 434,
-    VAR_RESPONSE_IP = 435,
-    VAR_RESPONSE_IP_DATA = 436,
-    VAR_HARDEN_ALGO_DOWNGRADE = 437,
-    VAR_IP_TRANSPARENT = 438,
-    VAR_IP_DSCP = 439,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 440,
-    VAR_IP_RATELIMIT = 441,
-    VAR_IP_RATELIMIT_SLABS = 442,
-    VAR_IP_RATELIMIT_SIZE = 443,
-    VAR_RATELIMIT = 444,
-    VAR_RATELIMIT_SLABS = 445,
-    VAR_RATELIMIT_SIZE = 446,
-    VAR_RATELIMIT_FOR_DOMAIN = 447,
-    VAR_RATELIMIT_BELOW_DOMAIN = 448,
-    VAR_IP_RATELIMIT_FACTOR = 449,
-    VAR_RATELIMIT_FACTOR = 450,
-    VAR_SEND_CLIENT_SUBNET = 451,
-    VAR_CLIENT_SUBNET_ZONE = 452,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 453,
-    VAR_CLIENT_SUBNET_OPCODE = 454,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 455,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 456,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 457,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 458,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 459,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 460,
-    VAR_CAPS_WHITELIST = 461,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 462,
-    VAR_PERMIT_SMALL_HOLDDOWN = 463,
-    VAR_QNAME_MINIMISATION = 464,
-    VAR_QNAME_MINIMISATION_STRICT = 465,
-    VAR_IP_FREEBIND = 466,
-    VAR_DEFINE_TAG = 467,
-    VAR_LOCAL_ZONE_TAG = 468,
-    VAR_ACCESS_CONTROL_TAG = 469,
-    VAR_LOCAL_ZONE_OVERRIDE = 470,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 471,
-    VAR_ACCESS_CONTROL_TAG_DATA = 472,
-    VAR_VIEW = 473,
-    VAR_ACCESS_CONTROL_VIEW = 474,
-    VAR_VIEW_FIRST = 475,
-    VAR_SERVE_EXPIRED = 476,
-    VAR_SERVE_EXPIRED_TTL = 477,
-    VAR_SERVE_EXPIRED_TTL_RESET = 478,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 479,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 480,
-    VAR_FAKE_DSA = 481,
-    VAR_FAKE_SHA1 = 482,
-    VAR_LOG_IDENTITY = 483,
-    VAR_HIDE_TRUSTANCHOR = 484,
-    VAR_TRUST_ANCHOR_SIGNALING = 485,
-    VAR_AGGRESSIVE_NSEC = 486,
-    VAR_USE_SYSTEMD = 487,
-    VAR_SHM_ENABLE = 488,
-    VAR_SHM_KEY = 489,
-    VAR_ROOT_KEY_SENTINEL = 490,
-    VAR_DNSCRYPT = 491,
-    VAR_DNSCRYPT_ENABLE = 492,
-    VAR_DNSCRYPT_PORT = 493,
-    VAR_DNSCRYPT_PROVIDER = 494,
-    VAR_DNSCRYPT_SECRET_KEY = 495,
-    VAR_DNSCRYPT_PROVIDER_CERT = 496,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 497,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 498,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 499,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 500,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 501,
-    VAR_IPSECMOD_ENABLED = 502,
-    VAR_IPSECMOD_HOOK = 503,
-    VAR_IPSECMOD_IGNORE_BOGUS = 504,
-    VAR_IPSECMOD_MAX_TTL = 505,
-    VAR_IPSECMOD_WHITELIST = 506,
-    VAR_IPSECMOD_STRICT = 507,
-    VAR_CACHEDB = 508,
-    VAR_CACHEDB_BACKEND = 509,
-    VAR_CACHEDB_SECRETSEED = 510,
-    VAR_CACHEDB_REDISHOST = 511,
-    VAR_CACHEDB_REDISPORT = 512,
-    VAR_CACHEDB_REDISTIMEOUT = 513,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 514,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 515,
-    VAR_FOR_UPSTREAM = 516,
-    VAR_AUTH_ZONE = 517,
-    VAR_ZONEFILE = 518,
-    VAR_MASTER = 519,
-    VAR_URL = 520,
-    VAR_FOR_DOWNSTREAM = 521,
-    VAR_FALLBACK_ENABLED = 522,
-    VAR_TLS_ADDITIONAL_PORT = 523,
-    VAR_LOW_RTT = 524,
-    VAR_LOW_RTT_PERMIL = 525,
-    VAR_FAST_SERVER_PERMIL = 526,
-    VAR_FAST_SERVER_NUM = 527,
-    VAR_ALLOW_NOTIFY = 528,
-    VAR_TLS_WIN_CERT = 529,
-    VAR_TCP_CONNECTION_LIMIT = 530,
-    VAR_FORWARD_NO_CACHE = 531,
-    VAR_STUB_NO_CACHE = 532,
-    VAR_LOG_SERVFAIL = 533,
-    VAR_DENY_ANY = 534,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 535,
-    VAR_LOG_TAG_QUERYREPLY = 536,
-    VAR_STREAM_WAIT_SIZE = 537,
-    VAR_TLS_CIPHERS = 538,
-    VAR_TLS_CIPHERSUITES = 539,
-    VAR_TLS_USE_SNI = 540,
-    VAR_IPSET = 541,
-    VAR_IPSET_NAME_V4 = 542,
-    VAR_IPSET_NAME_V6 = 543,
-    VAR_TLS_SESSION_TICKET_KEYS = 544,
-    VAR_RPZ = 545,
-    VAR_TAGS = 546,
-    VAR_RPZ_ACTION_OVERRIDE = 547,
-    VAR_RPZ_CNAME_OVERRIDE = 548,
-    VAR_RPZ_LOG = 549,
-    VAR_RPZ_LOG_NAME = 550,
-    VAR_DYNLIB = 551,
-    VAR_DYNLIB_FILE = 552,
-    VAR_EDNS_CLIENT_TAG = 553,
-    VAR_EDNS_CLIENT_TAG_OPCODE = 554
+    VAR_HTTP_NOTLS_DOWNSTREAM = 403,
+    VAR_STUB_FIRST = 404,
+    VAR_MINIMAL_RESPONSES = 405,
+    VAR_RRSET_ROUNDROBIN = 406,
+    VAR_MAX_UDP_SIZE = 407,
+    VAR_DELAY_CLOSE = 408,
+    VAR_UNBLOCK_LAN_ZONES = 409,
+    VAR_INSECURE_LAN_ZONES = 410,
+    VAR_INFRA_CACHE_MIN_RTT = 411,
+    VAR_DNS64_PREFIX = 412,
+    VAR_DNS64_SYNTHALL = 413,
+    VAR_DNS64_IGNORE_AAAA = 414,
+    VAR_DNSTAP = 415,
+    VAR_DNSTAP_ENABLE = 416,
+    VAR_DNSTAP_SOCKET_PATH = 417,
+    VAR_DNSTAP_IP = 418,
+    VAR_DNSTAP_TLS = 419,
+    VAR_DNSTAP_TLS_SERVER_NAME = 420,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 421,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 422,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 423,
+    VAR_DNSTAP_SEND_IDENTITY = 424,
+    VAR_DNSTAP_SEND_VERSION = 425,
+    VAR_DNSTAP_BIDIRECTIONAL = 426,
+    VAR_DNSTAP_IDENTITY = 427,
+    VAR_DNSTAP_VERSION = 428,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 429,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 430,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 431,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 432,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 433,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 434,
+    VAR_RESPONSE_IP_TAG = 435,
+    VAR_RESPONSE_IP = 436,
+    VAR_RESPONSE_IP_DATA = 437,
+    VAR_HARDEN_ALGO_DOWNGRADE = 438,
+    VAR_IP_TRANSPARENT = 439,
+    VAR_IP_DSCP = 440,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 441,
+    VAR_IP_RATELIMIT = 442,
+    VAR_IP_RATELIMIT_SLABS = 443,
+    VAR_IP_RATELIMIT_SIZE = 444,
+    VAR_RATELIMIT = 445,
+    VAR_RATELIMIT_SLABS = 446,
+    VAR_RATELIMIT_SIZE = 447,
+    VAR_RATELIMIT_FOR_DOMAIN = 448,
+    VAR_RATELIMIT_BELOW_DOMAIN = 449,
+    VAR_IP_RATELIMIT_FACTOR = 450,
+    VAR_RATELIMIT_FACTOR = 451,
+    VAR_SEND_CLIENT_SUBNET = 452,
+    VAR_CLIENT_SUBNET_ZONE = 453,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 454,
+    VAR_CLIENT_SUBNET_OPCODE = 455,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 456,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 457,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 458,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 459,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 460,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 461,
+    VAR_CAPS_WHITELIST = 462,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 463,
+    VAR_PERMIT_SMALL_HOLDDOWN = 464,
+    VAR_QNAME_MINIMISATION = 465,
+    VAR_QNAME_MINIMISATION_STRICT = 466,
+    VAR_IP_FREEBIND = 467,
+    VAR_DEFINE_TAG = 468,
+    VAR_LOCAL_ZONE_TAG = 469,
+    VAR_ACCESS_CONTROL_TAG = 470,
+    VAR_LOCAL_ZONE_OVERRIDE = 471,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 472,
+    VAR_ACCESS_CONTROL_TAG_DATA = 473,
+    VAR_VIEW = 474,
+    VAR_ACCESS_CONTROL_VIEW = 475,
+    VAR_VIEW_FIRST = 476,
+    VAR_SERVE_EXPIRED = 477,
+    VAR_SERVE_EXPIRED_TTL = 478,
+    VAR_SERVE_EXPIRED_TTL_RESET = 479,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 480,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 481,
+    VAR_FAKE_DSA = 482,
+    VAR_FAKE_SHA1 = 483,
+    VAR_LOG_IDENTITY = 484,
+    VAR_HIDE_TRUSTANCHOR = 485,
+    VAR_TRUST_ANCHOR_SIGNALING = 486,
+    VAR_AGGRESSIVE_NSEC = 487,
+    VAR_USE_SYSTEMD = 488,
+    VAR_SHM_ENABLE = 489,
+    VAR_SHM_KEY = 490,
+    VAR_ROOT_KEY_SENTINEL = 491,
+    VAR_DNSCRYPT = 492,
+    VAR_DNSCRYPT_ENABLE = 493,
+    VAR_DNSCRYPT_PORT = 494,
+    VAR_DNSCRYPT_PROVIDER = 495,
+    VAR_DNSCRYPT_SECRET_KEY = 496,
+    VAR_DNSCRYPT_PROVIDER_CERT = 497,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 498,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 499,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 500,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 501,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 502,
+    VAR_IPSECMOD_ENABLED = 503,
+    VAR_IPSECMOD_HOOK = 504,
+    VAR_IPSECMOD_IGNORE_BOGUS = 505,
+    VAR_IPSECMOD_MAX_TTL = 506,
+    VAR_IPSECMOD_WHITELIST = 507,
+    VAR_IPSECMOD_STRICT = 508,
+    VAR_CACHEDB = 509,
+    VAR_CACHEDB_BACKEND = 510,
+    VAR_CACHEDB_SECRETSEED = 511,
+    VAR_CACHEDB_REDISHOST = 512,
+    VAR_CACHEDB_REDISPORT = 513,
+    VAR_CACHEDB_REDISTIMEOUT = 514,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 515,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 516,
+    VAR_FOR_UPSTREAM = 517,
+    VAR_AUTH_ZONE = 518,
+    VAR_ZONEFILE = 519,
+    VAR_MASTER = 520,
+    VAR_URL = 521,
+    VAR_FOR_DOWNSTREAM = 522,
+    VAR_FALLBACK_ENABLED = 523,
+    VAR_TLS_ADDITIONAL_PORT = 524,
+    VAR_LOW_RTT = 525,
+    VAR_LOW_RTT_PERMIL = 526,
+    VAR_FAST_SERVER_PERMIL = 527,
+    VAR_FAST_SERVER_NUM = 528,
+    VAR_ALLOW_NOTIFY = 529,
+    VAR_TLS_WIN_CERT = 530,
+    VAR_TCP_CONNECTION_LIMIT = 531,
+    VAR_FORWARD_NO_CACHE = 532,
+    VAR_STUB_NO_CACHE = 533,
+    VAR_LOG_SERVFAIL = 534,
+    VAR_DENY_ANY = 535,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 536,
+    VAR_LOG_TAG_QUERYREPLY = 537,
+    VAR_STREAM_WAIT_SIZE = 538,
+    VAR_TLS_CIPHERS = 539,
+    VAR_TLS_CIPHERSUITES = 540,
+    VAR_TLS_USE_SNI = 541,
+    VAR_IPSET = 542,
+    VAR_IPSET_NAME_V4 = 543,
+    VAR_IPSET_NAME_V6 = 544,
+    VAR_TLS_SESSION_TICKET_KEYS = 545,
+    VAR_RPZ = 546,
+    VAR_TAGS = 547,
+    VAR_RPZ_ACTION_OVERRIDE = 548,
+    VAR_RPZ_CNAME_OVERRIDE = 549,
+    VAR_RPZ_LOG = 550,
+    VAR_RPZ_LOG_NAME = 551,
+    VAR_DYNLIB = 552,
+    VAR_DYNLIB_FILE = 553,
+    VAR_EDNS_CLIENT_TAG = 554,
+    VAR_EDNS_CLIENT_TAG_OPCODE = 555
   };
 #endif
 /* Tokens.  */
@@ -494,158 +495,159 @@ extern int yydebug;
 #define VAR_HTTP_QUERY_BUFFER_SIZE 400
 #define VAR_HTTP_RESPONSE_BUFFER_SIZE 401
 #define VAR_HTTP_NODELAY 402
-#define VAR_STUB_FIRST 403
-#define VAR_MINIMAL_RESPONSES 404
-#define VAR_RRSET_ROUNDROBIN 405
-#define VAR_MAX_UDP_SIZE 406
-#define VAR_DELAY_CLOSE 407
-#define VAR_UNBLOCK_LAN_ZONES 408
-#define VAR_INSECURE_LAN_ZONES 409
-#define VAR_INFRA_CACHE_MIN_RTT 410
-#define VAR_DNS64_PREFIX 411
-#define VAR_DNS64_SYNTHALL 412
-#define VAR_DNS64_IGNORE_AAAA 413
-#define VAR_DNSTAP 414
-#define VAR_DNSTAP_ENABLE 415
-#define VAR_DNSTAP_SOCKET_PATH 416
-#define VAR_DNSTAP_IP 417
-#define VAR_DNSTAP_TLS 418
-#define VAR_DNSTAP_TLS_SERVER_NAME 419
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 420
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 421
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 422
-#define VAR_DNSTAP_SEND_IDENTITY 423
-#define VAR_DNSTAP_SEND_VERSION 424
-#define VAR_DNSTAP_BIDIRECTIONAL 425
-#define VAR_DNSTAP_IDENTITY 426
-#define VAR_DNSTAP_VERSION 427
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 428
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 429
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 430
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 431
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 432
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 433
-#define VAR_RESPONSE_IP_TAG 434
-#define VAR_RESPONSE_IP 435
-#define VAR_RESPONSE_IP_DATA 436
-#define VAR_HARDEN_ALGO_DOWNGRADE 437
-#define VAR_IP_TRANSPARENT 438
-#define VAR_IP_DSCP 439
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 440
-#define VAR_IP_RATELIMIT 441
-#define VAR_IP_RATELIMIT_SLABS 442
-#define VAR_IP_RATELIMIT_SIZE 443
-#define VAR_RATELIMIT 444
-#define VAR_RATELIMIT_SLABS 445
-#define VAR_RATELIMIT_SIZE 446
-#define VAR_RATELIMIT_FOR_DOMAIN 447
-#define VAR_RATELIMIT_BELOW_DOMAIN 448
-#define VAR_IP_RATELIMIT_FACTOR 449
-#define VAR_RATELIMIT_FACTOR 450
-#define VAR_SEND_CLIENT_SUBNET 451
-#define VAR_CLIENT_SUBNET_ZONE 452
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 453
-#define VAR_CLIENT_SUBNET_OPCODE 454
-#define VAR_MAX_CLIENT_SUBNET_IPV4 455
-#define VAR_MAX_CLIENT_SUBNET_IPV6 456
-#define VAR_MIN_CLIENT_SUBNET_IPV4 457
-#define VAR_MIN_CLIENT_SUBNET_IPV6 458
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 459
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 460
-#define VAR_CAPS_WHITELIST 461
-#define VAR_CACHE_MAX_NEGATIVE_TTL 462
-#define VAR_PERMIT_SMALL_HOLDDOWN 463
-#define VAR_QNAME_MINIMISATION 464
-#define VAR_QNAME_MINIMISATION_STRICT 465
-#define VAR_IP_FREEBIND 466
-#define VAR_DEFINE_TAG 467
-#define VAR_LOCAL_ZONE_TAG 468
-#define VAR_ACCESS_CONTROL_TAG 469
-#define VAR_LOCAL_ZONE_OVERRIDE 470
-#define VAR_ACCESS_CONTROL_TAG_ACTION 471
-#define VAR_ACCESS_CONTROL_TAG_DATA 472
-#define VAR_VIEW 473
-#define VAR_ACCESS_CONTROL_VIEW 474
-#define VAR_VIEW_FIRST 475
-#define VAR_SERVE_EXPIRED 476
-#define VAR_SERVE_EXPIRED_TTL 477
-#define VAR_SERVE_EXPIRED_TTL_RESET 478
-#define VAR_SERVE_EXPIRED_REPLY_TTL 479
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 480
-#define VAR_FAKE_DSA 481
-#define VAR_FAKE_SHA1 482
-#define VAR_LOG_IDENTITY 483
-#define VAR_HIDE_TRUSTANCHOR 484
-#define VAR_TRUST_ANCHOR_SIGNALING 485
-#define VAR_AGGRESSIVE_NSEC 486
-#define VAR_USE_SYSTEMD 487
-#define VAR_SHM_ENABLE 488
-#define VAR_SHM_KEY 489
-#define VAR_ROOT_KEY_SENTINEL 490
-#define VAR_DNSCRYPT 491
-#define VAR_DNSCRYPT_ENABLE 492
-#define VAR_DNSCRYPT_PORT 493
-#define VAR_DNSCRYPT_PROVIDER 494
-#define VAR_DNSCRYPT_SECRET_KEY 495
-#define VAR_DNSCRYPT_PROVIDER_CERT 496
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 497
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 498
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 499
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 500
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 501
-#define VAR_IPSECMOD_ENABLED 502
-#define VAR_IPSECMOD_HOOK 503
-#define VAR_IPSECMOD_IGNORE_BOGUS 504
-#define VAR_IPSECMOD_MAX_TTL 505
-#define VAR_IPSECMOD_WHITELIST 506
-#define VAR_IPSECMOD_STRICT 507
-#define VAR_CACHEDB 508
-#define VAR_CACHEDB_BACKEND 509
-#define VAR_CACHEDB_SECRETSEED 510
-#define VAR_CACHEDB_REDISHOST 511
-#define VAR_CACHEDB_REDISPORT 512
-#define VAR_CACHEDB_REDISTIMEOUT 513
-#define VAR_CACHEDB_REDISEXPIRERECORDS 514
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 515
-#define VAR_FOR_UPSTREAM 516
-#define VAR_AUTH_ZONE 517
-#define VAR_ZONEFILE 518
-#define VAR_MASTER 519
-#define VAR_URL 520
-#define VAR_FOR_DOWNSTREAM 521
-#define VAR_FALLBACK_ENABLED 522
-#define VAR_TLS_ADDITIONAL_PORT 523
-#define VAR_LOW_RTT 524
-#define VAR_LOW_RTT_PERMIL 525
-#define VAR_FAST_SERVER_PERMIL 526
-#define VAR_FAST_SERVER_NUM 527
-#define VAR_ALLOW_NOTIFY 528
-#define VAR_TLS_WIN_CERT 529
-#define VAR_TCP_CONNECTION_LIMIT 530
-#define VAR_FORWARD_NO_CACHE 531
-#define VAR_STUB_NO_CACHE 532
-#define VAR_LOG_SERVFAIL 533
-#define VAR_DENY_ANY 534
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 535
-#define VAR_LOG_TAG_QUERYREPLY 536
-#define VAR_STREAM_WAIT_SIZE 537
-#define VAR_TLS_CIPHERS 538
-#define VAR_TLS_CIPHERSUITES 539
-#define VAR_TLS_USE_SNI 540
-#define VAR_IPSET 541
-#define VAR_IPSET_NAME_V4 542
-#define VAR_IPSET_NAME_V6 543
-#define VAR_TLS_SESSION_TICKET_KEYS 544
-#define VAR_RPZ 545
-#define VAR_TAGS 546
-#define VAR_RPZ_ACTION_OVERRIDE 547
-#define VAR_RPZ_CNAME_OVERRIDE 548
-#define VAR_RPZ_LOG 549
-#define VAR_RPZ_LOG_NAME 550
-#define VAR_DYNLIB 551
-#define VAR_DYNLIB_FILE 552
-#define VAR_EDNS_CLIENT_TAG 553
-#define VAR_EDNS_CLIENT_TAG_OPCODE 554
+#define VAR_HTTP_NOTLS_DOWNSTREAM 403
+#define VAR_STUB_FIRST 404
+#define VAR_MINIMAL_RESPONSES 405
+#define VAR_RRSET_ROUNDROBIN 406
+#define VAR_MAX_UDP_SIZE 407
+#define VAR_DELAY_CLOSE 408
+#define VAR_UNBLOCK_LAN_ZONES 409
+#define VAR_INSECURE_LAN_ZONES 410
+#define VAR_INFRA_CACHE_MIN_RTT 411
+#define VAR_DNS64_PREFIX 412
+#define VAR_DNS64_SYNTHALL 413
+#define VAR_DNS64_IGNORE_AAAA 414
+#define VAR_DNSTAP 415
+#define VAR_DNSTAP_ENABLE 416
+#define VAR_DNSTAP_SOCKET_PATH 417
+#define VAR_DNSTAP_IP 418
+#define VAR_DNSTAP_TLS 419
+#define VAR_DNSTAP_TLS_SERVER_NAME 420
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 421
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 422
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 423
+#define VAR_DNSTAP_SEND_IDENTITY 424
+#define VAR_DNSTAP_SEND_VERSION 425
+#define VAR_DNSTAP_BIDIRECTIONAL 426
+#define VAR_DNSTAP_IDENTITY 427
+#define VAR_DNSTAP_VERSION 428
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 429
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 430
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 431
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 432
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 433
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 434
+#define VAR_RESPONSE_IP_TAG 435
+#define VAR_RESPONSE_IP 436
+#define VAR_RESPONSE_IP_DATA 437
+#define VAR_HARDEN_ALGO_DOWNGRADE 438
+#define VAR_IP_TRANSPARENT 439
+#define VAR_IP_DSCP 440
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 441
+#define VAR_IP_RATELIMIT 442
+#define VAR_IP_RATELIMIT_SLABS 443
+#define VAR_IP_RATELIMIT_SIZE 444
+#define VAR_RATELIMIT 445
+#define VAR_RATELIMIT_SLABS 446
+#define VAR_RATELIMIT_SIZE 447
+#define VAR_RATELIMIT_FOR_DOMAIN 448
+#define VAR_RATELIMIT_BELOW_DOMAIN 449
+#define VAR_IP_RATELIMIT_FACTOR 450
+#define VAR_RATELIMIT_FACTOR 451
+#define VAR_SEND_CLIENT_SUBNET 452
+#define VAR_CLIENT_SUBNET_ZONE 453
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 454
+#define VAR_CLIENT_SUBNET_OPCODE 455
+#define VAR_MAX_CLIENT_SUBNET_IPV4 456
+#define VAR_MAX_CLIENT_SUBNET_IPV6 457
+#define VAR_MIN_CLIENT_SUBNET_IPV4 458
+#define VAR_MIN_CLIENT_SUBNET_IPV6 459
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 460
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 461
+#define VAR_CAPS_WHITELIST 462
+#define VAR_CACHE_MAX_NEGATIVE_TTL 463
+#define VAR_PERMIT_SMALL_HOLDDOWN 464
+#define VAR_QNAME_MINIMISATION 465
+#define VAR_QNAME_MINIMISATION_STRICT 466
+#define VAR_IP_FREEBIND 467
+#define VAR_DEFINE_TAG 468
+#define VAR_LOCAL_ZONE_TAG 469
+#define VAR_ACCESS_CONTROL_TAG 470
+#define VAR_LOCAL_ZONE_OVERRIDE 471
+#define VAR_ACCESS_CONTROL_TAG_ACTION 472
+#define VAR_ACCESS_CONTROL_TAG_DATA 473
+#define VAR_VIEW 474
+#define VAR_ACCESS_CONTROL_VIEW 475
+#define VAR_VIEW_FIRST 476
+#define VAR_SERVE_EXPIRED 477
+#define VAR_SERVE_EXPIRED_TTL 478
+#define VAR_SERVE_EXPIRED_TTL_RESET 479
+#define VAR_SERVE_EXPIRED_REPLY_TTL 480
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 481
+#define VAR_FAKE_DSA 482
+#define VAR_FAKE_SHA1 483
+#define VAR_LOG_IDENTITY 484
+#define VAR_HIDE_TRUSTANCHOR 485
+#define VAR_TRUST_ANCHOR_SIGNALING 486
+#define VAR_AGGRESSIVE_NSEC 487
+#define VAR_USE_SYSTEMD 488
+#define VAR_SHM_ENABLE 489
+#define VAR_SHM_KEY 490
+#define VAR_ROOT_KEY_SENTINEL 491
+#define VAR_DNSCRYPT 492
+#define VAR_DNSCRYPT_ENABLE 493
+#define VAR_DNSCRYPT_PORT 494
+#define VAR_DNSCRYPT_PROVIDER 495
+#define VAR_DNSCRYPT_SECRET_KEY 496
+#define VAR_DNSCRYPT_PROVIDER_CERT 497
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 498
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 499
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 500
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 501
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 502
+#define VAR_IPSECMOD_ENABLED 503
+#define VAR_IPSECMOD_HOOK 504
+#define VAR_IPSECMOD_IGNORE_BOGUS 505
+#define VAR_IPSECMOD_MAX_TTL 506
+#define VAR_IPSECMOD_WHITELIST 507
+#define VAR_IPSECMOD_STRICT 508
+#define VAR_CACHEDB 509
+#define VAR_CACHEDB_BACKEND 510
+#define VAR_CACHEDB_SECRETSEED 511
+#define VAR_CACHEDB_REDISHOST 512
+#define VAR_CACHEDB_REDISPORT 513
+#define VAR_CACHEDB_REDISTIMEOUT 514
+#define VAR_CACHEDB_REDISEXPIRERECORDS 515
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 516
+#define VAR_FOR_UPSTREAM 517
+#define VAR_AUTH_ZONE 518
+#define VAR_ZONEFILE 519
+#define VAR_MASTER 520
+#define VAR_URL 521
+#define VAR_FOR_DOWNSTREAM 522
+#define VAR_FALLBACK_ENABLED 523
+#define VAR_TLS_ADDITIONAL_PORT 524
+#define VAR_LOW_RTT 525
+#define VAR_LOW_RTT_PERMIL 526
+#define VAR_FAST_SERVER_PERMIL 527
+#define VAR_FAST_SERVER_NUM 528
+#define VAR_ALLOW_NOTIFY 529
+#define VAR_TLS_WIN_CERT 530
+#define VAR_TCP_CONNECTION_LIMIT 531
+#define VAR_FORWARD_NO_CACHE 532
+#define VAR_STUB_NO_CACHE 533
+#define VAR_LOG_SERVFAIL 534
+#define VAR_DENY_ANY 535
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 536
+#define VAR_LOG_TAG_QUERYREPLY 537
+#define VAR_STREAM_WAIT_SIZE 538
+#define VAR_TLS_CIPHERS 539
+#define VAR_TLS_CIPHERSUITES 540
+#define VAR_TLS_USE_SNI 541
+#define VAR_IPSET 542
+#define VAR_IPSET_NAME_V4 543
+#define VAR_IPSET_NAME_V6 544
+#define VAR_TLS_SESSION_TICKET_KEYS 545
+#define VAR_RPZ 546
+#define VAR_TAGS 547
+#define VAR_RPZ_ACTION_OVERRIDE 548
+#define VAR_RPZ_CNAME_OVERRIDE 549
+#define VAR_RPZ_LOG 550
+#define VAR_RPZ_LOG_NAME 551
+#define VAR_DYNLIB 552
+#define VAR_DYNLIB_FILE 553
+#define VAR_EDNS_CLIENT_TAG 554
+#define VAR_EDNS_CLIENT_TAG_OPCODE 555
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -655,7 +657,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 659 "util/configparser.h"
+#line 661 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 675645fbd..2b20707c7 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -114,7 +114,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_STUB_SSL_UPSTREAM VAR_FORWARD_SSL_UPSTREAM VAR_TLS_CERT_BUNDLE
 %token VAR_HTTPS_PORT VAR_HTTP_ENDPOINT VAR_HTTP_MAX_STREAMS
 %token VAR_HTTP_QUERY_BUFFER_SIZE VAR_HTTP_RESPONSE_BUFFER_SIZE
-%token VAR_HTTP_NODELAY
+%token VAR_HTTP_NODELAY VAR_HTTP_NOTLS_DOWNSTREAM
 %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN
 %token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE
 %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES
@@ -249,7 +249,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_ssl_service_key | server_ssl_service_pem | server_ssl_port |
 	server_https_port | server_http_endpoint | server_http_max_streams |
 	server_http_query_buffer_size | server_http_response_buffer_size |
-	server_http_nodelay |
+	server_http_nodelay | server_http_notls_downstream |
 	server_minimal_responses | server_rrset_roundrobin | server_max_udp_size |
 	server_so_reuseport | server_delay_close |
 	server_unblock_lan_zones | server_insecure_lan_zones |
@@ -1031,6 +1031,14 @@ server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->http_nodelay = (strcmp($2, "yes")==0);
 		free($2);
+	}
+server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG
+	{
+		OUTYY(("P(server_http_notls_downstream:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->http_notls_downstream = (strcmp($2, "yes")==0);
+		free($2);
 	};
 server_use_systemd: VAR_USE_SYSTEMD STRING_ARG
 	{
diff --git a/util/netevent.c b/util/netevent.c
index 545f09742..e8aba4736 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -978,6 +978,10 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
 			log_warn("failed to submit http2 settings");
 			return;
 		}
+		if(!c->ssl) {
+			c_hdl->tcp_do_toggle_rw = 0;
+			c_hdl->use_h2 = 1;
+		}
 #endif
 		c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1,
 			UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT,
@@ -2359,48 +2363,76 @@ int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session),
 ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf,
 	size_t len, int ATTR_UNUSED(flags), void* cb_arg)
 {
-#ifdef HAVE_SSL
 	struct http2_session* h2_session = (struct http2_session*)cb_arg;
-	int r;
+	ssize_t ret;
 
 	log_assert(h2_session->c->type == comm_http);
 	log_assert(h2_session->c->h2_session);
 
-	if(!h2_session->c->ssl)
-		return 0;
-
-	ERR_clear_error();
-	r = SSL_read(h2_session->c->ssl, buf, len);
-	if(r <= 0) {
-		int want = SSL_get_error(h2_session->c->ssl, r);
-		if(want == SSL_ERROR_ZERO_RETURN) {
-			return NGHTTP2_ERR_EOF;
-		} else if(want == SSL_ERROR_WANT_READ) {
-			return NGHTTP2_ERR_WOULDBLOCK;
-		} else if(want == SSL_ERROR_WANT_WRITE) {
-			h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write;
-			comm_point_listen_for_rw(h2_session->c, 0, 1);
-			return NGHTTP2_ERR_WOULDBLOCK;
-		} else if(want == SSL_ERROR_SYSCALL) {
+#ifdef HAVE_SSL
+	if(h2_session->c->ssl) {
+		int r;
+		ERR_clear_error();
+		r = SSL_read(h2_session->c->ssl, buf, len);
+		if(r <= 0) {
+			int want = SSL_get_error(h2_session->c->ssl, r);
+			if(want == SSL_ERROR_ZERO_RETURN) {
+				return NGHTTP2_ERR_EOF;
+			} else if(want == SSL_ERROR_WANT_READ) {
+				return NGHTTP2_ERR_WOULDBLOCK;
+			} else if(want == SSL_ERROR_WANT_WRITE) {
+				h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write;
+				comm_point_listen_for_rw(h2_session->c, 0, 1);
+				return NGHTTP2_ERR_WOULDBLOCK;
+			} else if(want == SSL_ERROR_SYSCALL) {
 #ifdef ECONNRESET
-			if(errno == ECONNRESET && verbosity < 2)
-				return NGHTTP2_ERR_CALLBACK_FAILURE;
+				if(errno == ECONNRESET && verbosity < 2)
+					return NGHTTP2_ERR_CALLBACK_FAILURE;
 #endif
-			if(errno != 0)
-				log_err("SSL_read syscall: %s",
-					strerror(errno));
+				if(errno != 0)
+					log_err("SSL_read syscall: %s",
+						strerror(errno));
+				return NGHTTP2_ERR_CALLBACK_FAILURE;
+			}
+			log_crypto_err("could not SSL_read");
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 		}
-		log_crypto_err("could not SSL_read");
+		return r;
+	}
+#endif /* HAVE_SSL */
+
+	ret = recv(h2_session->c->fd, buf, len, 0);
+	if(ret == 0) {
+		return NGHTTP2_ERR_EOF;
+	} else if(ret < 0) {
+#ifndef USE_WINSOCK
+		if(errno == EINTR || errno == EAGAIN)
+			return NGHTTP2_ERR_WOULDBLOCK;
+#ifdef ECONNRESET
+		if(errno == ECONNRESET && verbosity < 2)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+#endif
+		log_err_addr("could not http2 recv: %s", strerror(errno),
+			&h2_session->c->repinfo.addr,
+			h2_session->c->repinfo.addrlen);
+#else /* USE_WINSOCK */
+		if(WSAGetLastError() == WSAECONNRESET)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		if(WSAGetLastError() == WSAEINPROGRESS)
+			return NGHTTP2_ERR_WOULDBLOCK;
+		if(WSAGetLastError() == WSAEWOULDBLOCK) {
+			ub_winsock_tcp_wouldblock(h2_session->c->ev->ev,
+				UB_EV_READ);
+			return NGHTTP2_ERR_WOULDBLOCK;
+		}
+		log_err_addr("could not http2 recv: %s",
+			wsa_strerror(WSAGetLastError()),
+			&h2_session->c->repinfo.addr,
+			h2_session->c->repinfo.addrlen);
+#endif
 		return NGHTTP2_ERR_CALLBACK_FAILURE;
 	}
-	return r;
-#else
-	(void)buf;
-	(void)len;
-	(void)cb_arg;
-	return -1;
-#endif
+	return ret;
 }
 #endif /* HAVE_NGHTTP2 */
 
@@ -2411,7 +2443,6 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c)
 #ifdef HAVE_NGHTTP2
 	int ret;
 	log_assert(c->h2_session);
-	log_assert(c->ssl);
 
 	/* reading until recv cb returns NGHTTP2_ERR_WOULDBLOCK */
 	ret = nghttp2_session_recv(c->h2_session->session);
@@ -2648,47 +2679,81 @@ http_write_more(int fd, struct comm_point* c)
 ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf,
 	size_t len, int ATTR_UNUSED(flags), void* cb_arg)
 {
-#ifdef HAVE_SSL
-	int r;
+	ssize_t ret;
 	struct http2_session* h2_session = (struct http2_session*)cb_arg;
 	log_assert(h2_session->c->type == comm_http);
 	log_assert(h2_session->c->h2_session);
 
-	if(!h2_session->c->ssl)
-		return 0;
-
-	ERR_clear_error();
-	r = SSL_write(h2_session->c->ssl, buf, len);
-	if(r <= 0) {
-		int want = SSL_get_error(h2_session->c->ssl, r);
-		if(want == SSL_ERROR_ZERO_RETURN) {
-			return NGHTTP2_ERR_CALLBACK_FAILURE;
-		} else if(want == SSL_ERROR_WANT_READ) {
-			h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read;
-			comm_point_listen_for_rw(h2_session->c, 1, 0);
-			return NGHTTP2_ERR_WOULDBLOCK;
-		} else if(want == SSL_ERROR_WANT_WRITE) {
-			return NGHTTP2_ERR_WOULDBLOCK;
-		} else if(want == SSL_ERROR_SYSCALL) {
-#ifdef EPIPE
-			if(errno == EPIPE && verbosity < 2)
+#ifdef HAVE_SSL
+	if(h2_session->c->ssl) {
+		int r;
+		ERR_clear_error();
+		r = SSL_write(h2_session->c->ssl, buf, len);
+		if(r <= 0) {
+			int want = SSL_get_error(h2_session->c->ssl, r);
+			if(want == SSL_ERROR_ZERO_RETURN) {
 				return NGHTTP2_ERR_CALLBACK_FAILURE;
+			} else if(want == SSL_ERROR_WANT_READ) {
+				h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read;
+				comm_point_listen_for_rw(h2_session->c, 1, 0);
+				return NGHTTP2_ERR_WOULDBLOCK;
+			} else if(want == SSL_ERROR_WANT_WRITE) {
+				return NGHTTP2_ERR_WOULDBLOCK;
+			} else if(want == SSL_ERROR_SYSCALL) {
+#ifdef EPIPE
+				if(errno == EPIPE && verbosity < 2)
+					return NGHTTP2_ERR_CALLBACK_FAILURE;
 #endif
-			if(errno != 0)
-				log_err("SSL_write syscall: %s",
-					strerror(errno));
+				if(errno != 0)
+					log_err("SSL_write syscall: %s",
+						strerror(errno));
+				return NGHTTP2_ERR_CALLBACK_FAILURE;
+			}
+			log_crypto_err("could not SSL_write");
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 		}
-		log_crypto_err("could not SSL_write");
+		return r;
+	}
+#endif /* HAVE_SSL */
+
+	ret = send(h2_session->c->fd, buf, len, 0);
+	if(ret == 0) {
+		return NGHTTP2_ERR_CALLBACK_FAILURE;
+	} else if(ret < 0) {
+#ifndef USE_WINSOCK
+		if(errno == EINTR || errno == EAGAIN)
+			return NGHTTP2_ERR_WOULDBLOCK;
+#ifdef EPIPE
+		if(errno == EPIPE && verbosity < 2)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+#endif
+#ifdef ECONNRESET
+		if(errno == ECONNRESET && verbosity < 2)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+#endif
+		log_err_addr("could not http2 write: %s", strerror(errno),
+			&h2_session->c->repinfo.addr,
+			h2_session->c->repinfo.addrlen);
+#else /* USE_WINSOCK */
+		if(WSAGetLastError() == WSAENOTCONN)
+			return NGHTTP2_ERR_WOULDBLOCK;
+		if(WSAGetLastError() == WSAEINPROGRESS)
+			return NGHTTP2_ERR_WOULDBLOCK;
+		if(WSAGetLastError() == WSAEWOULDBLOCK) {
+			ub_winsock_tcp_wouldblock(h2_session->c->ev->ev,
+				UB_EV_WRITE);
+			return NGHTTP2_ERR_WOULDBLOCK;
+		}
+		if(WSAGetLastError() == WSAECONNRESET && verbosity < 2)
+			return NGHTTP2_ERR_CALLBACK_FAILURE;
+		log_err_addr("could not http2 write: %s",
+			wsa_strerror(WSAGetLastError()),
+			&h2_session->c->repinfo.addr,
+			h2_session->c->repinfo.addrlen);
+#endif
 		return NGHTTP2_ERR_CALLBACK_FAILURE;
 	}
-	return r;
-#else
-	(void)buf;
-	(void)len;
-	(void)cb_arg;
-	return -1;
-#endif
+	return ret;
 }
 #endif /* HAVE_NGHTTP2 */
 
@@ -2699,7 +2764,6 @@ comm_point_http2_handle_write(int ATTR_UNUSED(fd), struct comm_point* c)
 #ifdef HAVE_NGHTTP2
 	int ret;
 	log_assert(c->h2_session);
-	log_assert(c->ssl);
 
 	ret = nghttp2_session_send(c->h2_session->session);
 	if(ret) {

From c8390e390d8f4d966a268e9ac4e81d6982ef4325 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 10:41:03 +0200
Subject: [PATCH 099/108] - Fix python documentation warning on functions.rst
 inplace_cb_reply.

---
 doc/Changelog                       | 1 +
 pythonmod/doc/modules/functions.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 24d544c7a..978febe61 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
 	- Fix #330: [Feature request] Add unencrypted DNS over HTTPS support.
 	  This adds the option http-notls-downstream: yesno to change that,
 	  and the dohclient test code has the -n option.
+	- Fix python documentation warning on functions.rst inplace_cb_reply.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/pythonmod/doc/modules/functions.rst b/pythonmod/doc/modules/functions.rst
index 6ded3bf7a..333f696b8 100644
--- a/pythonmod/doc/modules/functions.rst
+++ b/pythonmod/doc/modules/functions.rst
@@ -103,7 +103,7 @@ Inplace callbacks
     :param opt_list_out: :class:`edns_option`. EDNS option list to append options to.
     :param region: :class:`regional`
     :param \*\*kwargs: Dictionary that may contain parameters added in a future
-                     release. Current parameters:
+        release. Current parameters:
         ``repinfo``: :class:`comm_reply`. Reply information for a communication point.
 
 .. function:: inplace_cb_query(qinfo, flags, qstate, addr, zone, region)

From 5cd2d10fe5263fe71e407c55015f66fc4663fc98 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 10:43:35 +0200
Subject: [PATCH 100/108] - Fix dnstap test to wait for log timer to see if
 queries are logged.

---
 doc/Changelog                    | 1 +
 testdata/dnstap.tdir/dnstap.test | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 978febe61..7bcef8c94 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
 	  This adds the option http-notls-downstream: yesno to change that,
 	  and the dohclient test code has the -n option.
 	- Fix python documentation warning on functions.rst inplace_cb_reply.
+	- Fix dnstap test to wait for log timer to see if queries are logged.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/testdata/dnstap.tdir/dnstap.test b/testdata/dnstap.tdir/dnstap.test
index d548e2dad..fbf8565ff 100644
--- a/testdata/dnstap.tdir/dnstap.test
+++ b/testdata/dnstap.tdir/dnstap.test
@@ -59,6 +59,8 @@ dig @127.0.0.1 -p $UNBOUND_PORT q7.example.net.
 dig @127.0.0.1 -p $UNBOUND_PORT q8.example.net.
 dig @127.0.0.1 -p $UNBOUND_PORT q9.example.net.
 dig @127.0.0.1 -p $UNBOUND_PORT q10.example.net.
+echo "> wait for log to happen on timer"
+sleep 3
 for x in q1 q2 q3 q4 5 q6 q7 q8 q9 q10; do
 	if grep "$x.example.net" tap.log >/dev/null; then :; else sleep 1; fi
 	if grep "$x.example.net" tap.log >/dev/null; then :; else sleep 1; fi

From ca6e8ec6c29a4ca8592d08fab297a4c572474558 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 10:59:41 +0200
Subject: [PATCH 101/108] Unit test for doh downstream notls.

---
 .../doh_downstream_notls.conf                 |  28 ++
 .../doh_downstream_notls.dsc                  |  16 +
 .../doh_downstream_notls.post                 |  13 +
 .../doh_downstream_notls.pre                  |  33 ++
 .../doh_downstream_notls.test                 | 339 ++++++++++++++++++
 .../doh_downstream_notls.testns               |  74 ++++
 .../unbound_server.key                        |  15 +
 .../unbound_server.pem                        |  11 +
 8 files changed, 529 insertions(+)
 create mode 100644 testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf
 create mode 100644 testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc
 create mode 100644 testdata/doh_downstream_notls.tdir/doh_downstream_notls.post
 create mode 100644 testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre
 create mode 100644 testdata/doh_downstream_notls.tdir/doh_downstream_notls.test
 create mode 100644 testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns
 create mode 100644 testdata/doh_downstream_notls.tdir/unbound_server.key
 create mode 100644 testdata/doh_downstream_notls.tdir/unbound_server.pem

diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf
new file mode 100644
index 000000000..bdca45645
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf
@@ -0,0 +1,28 @@
+server:
+	verbosity: 2
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	https-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	http-query-buffer-size: 1G
+	http-response-buffer-size: 1G
+	http-max-streams: 200
+	http-notls-downstream: yes
+
+	local-zone: "example.net" static
+	local-data: "www1.example.net. IN A 1.2.3.1"
+	local-data: "www2.example.net. IN A 1.2.3.2"
+	local-data: "www3.example.net. IN A 1.2.3.3"
+	local-zone: "drop.net" deny
+	tcp-upstream: yes
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc
new file mode 100644
index 000000000..4b908e052
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc
@@ -0,0 +1,16 @@
+BaseName: doh_downstream_notls
+Version: 1.0
+Description: Test DNS-over-HTTP query processing with no-tls
+CreationDate: Mon Jun 12 12:00:00 CET 2020
+Maintainer:
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: doh_downstream_notls.pre
+Post: doh_downstream_notls.post
+Test: doh_downstream_notls.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post
new file mode 100644
index 000000000..3ceaeade8
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post
@@ -0,0 +1,13 @@
+# #-- doh_downstream_notls.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+PRE="../.."
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+. ../common.sh
+kill_pid $FWD_PID
+kill_pid $UNBOUND_PID
+cat unbound.log
diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre
new file mode 100644
index 000000000..e1f30a575
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre
@@ -0,0 +1,33 @@
+# #-- doh_downstream_notls.pre--#
+# 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="../.."
+. ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
+get_random_port 2
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+
+# start forwarder
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT doh_downstream_notls.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < doh_downstream_notls.conf > ub.conf
+# start unbound in the background
+$PRE/unbound -vvvv -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_ldns_testns_up fwd.log
+wait_unbound_up unbound.log
+
diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test
new file mode 100644
index 000000000..87ff560d3
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test
@@ -0,0 +1,339 @@
+# #-- doh_downstream_notls.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="../.."
+. ../common.sh
+if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+get_make
+(cd $PRE; $MAKE dohclient)
+
+
+# this test query should just work (server is up)
+echo "> query www1.example.net."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+
+# multiple requests (from localdata)
+echo "> query www1.example.net. www2.example.net. www3.example.net."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+echo ""
+echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www.example.com" outfile | grep "10.20.30.40"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.com" outfile | grep "10.20.30.42"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+# www.example.com present twice, answered twice.
+echo ""
+echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www.example.com" outfile | grep "10.20.30.40"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+# out of order requests, the example.com elements take 2 seconds to wait.
+# www3.example.com present twice, answered twice.
+echo ""
+echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.net" outfile | grep "1.2.3.1"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www2.example.net" outfile | grep "1.2.3.2"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www3.example.com" outfile | grep "10.20.30.43"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+echo ""
+echo "> query www4.example.com. www3.example.net."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www3.example.net" outfile | grep "1.2.3.3"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+if grep "www4.example.com" outfile | grep "10.20.30.44"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+
+echo ""
+echo "> query a1.example.com. - a90.example.com."
+$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+num_ans=$(grep -B 3 "a.example.com.	IN	A" outfile | grep "rcode: NOERROR" | wc -l )
+if test "$num_ans" -ne 90; then
+	echo "number of answers not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat fwd.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+
+echo "OK"
+exit 0
diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns
new file mode 100644
index 000000000..c53941b67
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns
@@ -0,0 +1,74 @@
+; nameserver test file
+$ORIGIN example.com.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www2	IN	A
+SECTION ANSWER
+www2	IN	A	10.20.30.42
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www3	IN	A
+SECTION ANSWER
+www3	IN	A	10.20.30.43
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www4	IN	A
+SECTION ANSWER
+www4	IN	A	10.20.30.44
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www5	IN	A
+SECTION ANSWER
+www5	IN	A	10.20.30.45
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id sleep=2
+SECTION QUESTION
+www6	IN	A
+SECTION ANSWER
+www6	IN	A	10.20.30.46
+ENTRY_END
+
+; lots of noerror/nodata answers for other queries (a.. queries)
+ENTRY_BEGIN
+MATCH opcode qtype subdomain
+REPLY QR AA NOERROR
+ADJUST copy_id copy_query
+SECTION QUESTION
+a.example.com.	IN	A
+SECTION AUTHORITY
+example.com.	IN SOA ns hostmaster 2019 28800 7200 604800 3600
+ENTRY_END
diff --git a/testdata/doh_downstream_notls.tdir/unbound_server.key b/testdata/doh_downstream_notls.tdir/unbound_server.key
new file mode 100644
index 000000000..4256c421d
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/unbound_server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA
+3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s
+RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB
+AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS
+6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds
+sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi
+XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3
+fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL
+CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP
+0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2
+oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l
+In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S
+LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/doh_downstream_notls.tdir/unbound_server.pem b/testdata/doh_downstream_notls.tdir/unbound_server.pem
new file mode 100644
index 000000000..aeda3ff11
--- /dev/null
+++ b/testdata/doh_downstream_notls.tdir/unbound_server.pem
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1
+bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE
+AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS
+y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/
+/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu
+g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ
+9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG
+l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH
+Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg==
+-----END CERTIFICATE-----

From ab9d732796901a4851491934d130320c45610387 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 11:06:55 +0200
Subject: [PATCH 102/108] - Log ip address when http session recv fails, eg.
 due to tls fail.

---
 doc/Changelog   | 1 +
 util/netevent.c | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 7bcef8c94..a84f73edf 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -8,6 +8,7 @@
 	  and the dohclient test code has the -n option.
 	- Fix python documentation warning on functions.rst inplace_cb_reply.
 	- Fix dnstap test to wait for log timer to see if queries are logged.
+	- Log ip address when http session recv fails, eg. due to tls fail.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/util/netevent.c b/util/netevent.c
index e8aba4736..a40f44dd0 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2449,8 +2449,11 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c)
 	if(ret) {
 		if(ret != NGHTTP2_ERR_EOF &&
 			ret != NGHTTP2_ERR_CALLBACK_FAILURE) {
-			verbose(VERB_QUERY, "http2: session_recv failed, "
-				"error: %s", nghttp2_strerror(ret));
+			char a[256];
+			addr_to_str(&c->repinfo.addr, c->repinfo.addrlen,
+				a, sizeof(a));
+			verbose(VERB_QUERY, "http2: session_recv from %s failed, "
+				"error: %s", a, nghttp2_strerror(ret));
 		}
 		return 0;
 	}

From 8861fb17fa1f0b71dbab787b66f23aa4b9ba46c7 Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 11:22:38 +0200
Subject: [PATCH 103/108] Changelog entry for local-zone out of chunk regional
 allocation

---
 doc/Changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index a84f73edf..b09e0aeee 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+19 October 2020: Ralph
+	- local-zone regional allocations outside of chunk
+
 19 October 2020: Wouter
 	- Fix that http settings have colon in set_option, for
 	  http-endpoint, http-max-streams, http-query-buffer-size,

From 68c57314c4e02079569ed697b9273fa9faaafeb6 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 12:55:43 +0200
Subject: [PATCH 104/108] - Fix to set the tcp handler event toggle flag back
 to default when   the handler structure is reused.

---
 doc/Changelog   | 2 ++
 util/netevent.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index b09e0aeee..3f1c70a8d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -12,6 +12,8 @@
 	- Fix python documentation warning on functions.rst inplace_cb_reply.
 	- Fix dnstap test to wait for log timer to see if queries are logged.
 	- Log ip address when http session recv fails, eg. due to tls fail.
+	- Fix to set the tcp handler event toggle flag back to default when
+	  the handler structure is reused.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/util/netevent.c b/util/netevent.c
index a40f44dd0..1e501b9ab 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -965,6 +965,7 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
 	/* clear leftover flags from previous use, and then set the
 	 * correct event base for the event structure for libevent */
 	ub_event_free(c_hdl->ev->ev);
+	c_hdl->tcp_do_toggle_rw = 1;
 
 	if(c_hdl->type == comm_http) {
 #ifdef HAVE_NGHTTP2

From 531ce9e85c4d715c0e5f801fcaf0c56c71602b8a Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 13:36:53 +0200
Subject: [PATCH 105/108] Fixup for clear of tcp handler structure.

---
 util/netevent.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/util/netevent.c b/util/netevent.c
index 1e501b9ab..2428417fa 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -965,7 +965,10 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
 	/* clear leftover flags from previous use, and then set the
 	 * correct event base for the event structure for libevent */
 	ub_event_free(c_hdl->ev->ev);
-	c_hdl->tcp_do_toggle_rw = 1;
+	if((c_hdl->type == comm_tcp && c_hdl->tcp_req_info) ||
+		c_hdl->type == comm_local || c_hdl->type == comm_raw)
+		c_hdl->tcp_do_toggle_rw = 0;
+	else	c_hdl->tcp_do_toggle_rw = 1;
 
 	if(c_hdl->type == comm_http) {
 #ifdef HAVE_NGHTTP2

From 61922ce9dacb7f4088d66d38ba1644170cc46105 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 13:39:02 +0200
Subject: [PATCH 106/108] - Clean the fix for out of order TCP processing
 limits on number   of queries.  It was tested to work.

---
 doc/Changelog             | 2 ++
 services/listen_dnsport.c | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 3f1c70a8d..89c26958f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -14,6 +14,8 @@
 	- Log ip address when http session recv fails, eg. due to tls fail.
 	- Fix to set the tcp handler event toggle flag back to default when
 	  the handler structure is reused.
+	- Clean the fix for out of order TCP processing limits on number
+	  of queries.  It was tested to work.
 
 16 October 2020: Wouter
 	- Fix that the out of order TCP processing does not limit the
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index d4f912db5..e506eeb31 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -81,9 +81,6 @@
 /** number of queued TCP connections for listen() */
 #define TCP_BACKLOG 256 
 
-/** number of simultaneous requests a client can have */
-/* #define TCP_MAX_REQ_SIMULTANEOUS 32 */
-
 #ifndef THREADS_DISABLED
 /** lock on the counter of stream buffer memory */
 static lock_basic_type stream_wait_count_lock;
@@ -1809,8 +1806,7 @@ tcp_req_info_setup_listen(struct tcp_req_info* req)
 
 	if(!req->cp->tcp_is_reading)
 		wr = 1;
-	if(/*req->num_open_req + req->num_done_req < TCP_MAX_REQ_SIMULTANEOUS &&*/
-		!req->read_is_closed)
+	if(!req->read_is_closed)
 		rd = 1;
 	
 	if(wr) {

From 50178d764aa2a0b42128e739a13a648deb4af296 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 15:00:30 +0200
Subject: [PATCH 107/108] - Fix for attaching the X509v3 extensions to the
 client certificate.

---
 smallapp/unbound-control-setup.sh.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in
index 6b5e0dbbf..eaf1d082c 100644
--- a/smallapp/unbound-control-setup.sh.in
+++ b/smallapp/unbound-control-setup.sh.in
@@ -120,6 +120,7 @@ if [ ! -f "$SVR_BASE.key" ]; then
 fi
 
 cat >server.cnf <<EOF
+[req]
 default_bits=$BITS
 default_md=$HASH
 prompt=no
@@ -189,6 +190,8 @@ if [ ! -f "$CTL_BASE.pem" -o $RECREATE -eq 1 ]; then
                   -CAkey "$SVR_BASE.key" \
                   -CAcreateserial \
                   -$HASH \
+                  -extfile client.cnf \
+                  -extensions v3_req \
                   -out "$CTL_BASE.pem"
 
     [ ! -f "CTL_BASE.pem" ] || fatal "cannot create signed client certificate"

From 6fdc822aa036afccb5f92c1258f54b181f35b39f Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 19 Oct 2020 15:10:17 +0200
Subject: [PATCH 108/108] - Changelog entry for PR #324: Add modern X.509v3
 extensions to   unbound-control TLS certificates, by James Renken.

---
 doc/Changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 89c26958f..61d2d4859 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+19 October 2020: George
+	- Merge PR #324 from James Renken: Add modern X.509v3 extensions to
+	  unbound-control TLS certificates.
+	- Fix for PR #324 to attach the x509v3 extensions to the client
+	  certificate.
+
 19 October 2020: Ralph
 	- local-zone regional allocations outside of chunk