From 57aefd102e0bb80af6d4042795731e6ab6ad6946 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 16 Jan 2020 17:12:32 +0100
Subject: [PATCH 001/208] Stream reuse branch, for TCP and TLS stream reuse.
 This is for upstream pipes and using them again for the next query.

Signposted code for reuse_tcp structure in outside_network.h
---
 services/outside_network.c | 302 ++++++++++++++++++++++++++++++++++---
 services/outside_network.h |  68 +++++++++
 testcode/fake_event.c      |   6 +
 util/fptr_wlist.c          |   1 +
 4 files changed, 356 insertions(+), 21 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index f865f13c1..a5724a42f 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -131,6 +131,34 @@ serviced_cmp(const void* key1, const void* key2)
 	return sockaddr_cmp(&q1->addr, q1->addrlen, &q2->addr, q2->addrlen);
 }
 
+int
+reuse_cmp(const void* key1, const void* key2)
+{
+	struct reuse_tcp* r1 = (struct reuse_tcp*)key1;
+	struct reuse_tcp* r2 = (struct reuse_tcp*)key2;
+	int r;
+	/* make sure the entries are in use (have a waiting_tcp entry) */
+	if(!r1->pending->query && !r2->pending->query)
+		return 0;
+	if(r1->pending->query && !r2->pending->query)
+		return 1;
+	if(!r1->pending->query && r2->pending->query)
+		return -1;
+
+	/* compare address and port */
+	r = sockaddr_cmp(&r1->pending->query->addr, r1->pending->query->addrlen,
+		&r2->pending->query->addr, r2->pending->query->addrlen);
+	if(r != 0)
+		return r;
+
+	/* compare if SSL-enabled */
+	if(r1->pending->c->ssl && !r2->pending->c->ssl)
+		return 1;
+	if(!r1->pending->c->ssl && r2->pending->c->ssl)
+		return -1;
+	return 0;
+}
+
 /** delete waiting_tcp entry. Does not unlink from waiting list. 
  * @param w: to delete.
  */
@@ -281,6 +309,20 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen)
 	return 1;
 }
 
+/** use the buffer to setup writing the query */
+static void
+outnet_tcp_take_query_setup(int s, struct pending_tcp* pend, uint8_t* pkt,
+	size_t pkt_len)
+{
+	pend->id = LDNS_ID_WIRE(pkt);
+	sldns_buffer_clear(pend->c->buffer);
+	sldns_buffer_write(pend->c->buffer, pkt, pkt_len);
+	sldns_buffer_flip(pend->c->buffer);
+	pend->c->tcp_is_reading = 0;
+	pend->c->tcp_byte_count = 0;
+	comm_point_start_listening(pend->c, s, -1);
+}
+
 /** use next free buffer to service a tcp query */
 static int
 outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
@@ -412,19 +454,13 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 	}
 	w->pkt = NULL;
 	w->next_waiting = (void*)pend;
-	pend->id = LDNS_ID_WIRE(pkt);
 	w->outnet->num_tcp_outgoing++;
 	w->outnet->tcp_free = pend->next_free;
 	pend->next_free = NULL;
 	pend->query = w;
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
-	sldns_buffer_clear(pend->c->buffer);
-	sldns_buffer_write(pend->c->buffer, pkt, pkt_len);
-	sldns_buffer_flip(pend->c->buffer);
-	pend->c->tcp_is_reading = 0;
-	pend->c->tcp_byte_count = 0;
-	comm_point_start_listening(pend->c, s, -1);
+	outnet_tcp_take_query_setup(s, pend, pkt, pkt_len);
 	return 1;
 }
 
@@ -449,6 +485,42 @@ use_free_buffer(struct outside_network* outnet)
 	}
 }
 
+/** remove reused element from tree and lru list */
+static void
+reuse_tcp_remove_tree_list(struct outside_network* outnet,
+	struct reuse_tcp* reuse)
+{
+	if(reuse->node.key) {
+		/* delete it from reuse tree */
+		(void)rbtree_delete(&outnet->tcp_reuse, &reuse->node);
+		reuse->node.key = NULL;
+	}
+	/* delete from reuse list */
+	if(reuse->pending) {
+		if(reuse->prev) {
+			/* assert that members of the lru list are waiting
+			 * and thus have a pending pointer to the struct */
+			log_assert(reuse->prev->pending);
+			reuse->prev->next = reuse->next;
+		} else {
+			log_assert(!reuse->next || reuse->next->pending);
+			outnet->tcp_reuse_first =
+				(reuse->next?reuse->next->pending:NULL);
+		}
+		if(reuse->next) {
+			/* assert that members of the lru list are waiting
+			 * and thus have a pending pointer to the struct */
+			log_assert(reuse->next->pending);
+			reuse->next->prev = reuse->prev;
+		} else {
+			log_assert(!reuse->prev || reuse->prev->pending);
+			outnet->tcp_reuse_last =
+				(reuse->prev?reuse->prev->pending:NULL);
+		}
+		reuse->pending = NULL;
+	}
+}
+
 /** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */
 static void
 decommission_pending_tcp(struct outside_network* outnet, 
@@ -464,9 +536,37 @@ decommission_pending_tcp(struct outside_network* outnet,
 	comm_point_close(pend->c);
 	pend->next_free = outnet->tcp_free;
 	outnet->tcp_free = pend;
+	if(pend->reuse.pending) {
+		/* needs unlink from the reuse tree to get deleted */
+		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
+	}
 	waiting_tcp_delete(pend->query);
 	pend->query = NULL;
-	use_free_buffer(outnet);
+}
+
+/** insert into reuse tcp tree and LRU, false on failure (duplicate) */
+static int
+reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
+{
+	pend_tcp->reuse.node.key = &pend_tcp->reuse;
+	pend_tcp->reuse.pending = pend_tcp;
+	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
+		/* this is a duplicate connection, close this one */
+		pend_tcp->reuse.node.key = NULL;
+		pend_tcp->reuse.pending = NULL;
+		return 0;
+	}
+	/* insert into LRU, first is newest */
+	pend_tcp->reuse.prev = NULL;
+	if(outnet->tcp_reuse_first) {
+		pend_tcp->reuse.next = &outnet->tcp_reuse_first->reuse;
+		outnet->tcp_reuse_first->reuse.prev = &pend_tcp->reuse;
+	} else {
+		pend_tcp->reuse.next = NULL;
+		outnet->tcp_reuse_last = pend_tcp;
+	}
+	outnet->tcp_reuse_first = pend_tcp;
+	return 1;
 }
 
 int 
@@ -489,9 +589,21 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			error = NETEVENT_CLOSED;
 		}
 	}
+	if(error == NETEVENT_NOERROR) {
+		/* add to reuse tree so it can be reused, if not a failure.
+		 * This is possible if the state machine wants to make a tcp
+		 * query again to the same destination. */
+		(void)reuse_tcp_insert(outnet, pend);
+	}
 	fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
 	(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
+	/* if reused, it should not be decommissioned, TODO */
+	/* or if another query wants to write, write that and read for more
+	 * or more outstanding queries on the stream.  TODO */
+	/* TODO also write multiple queries over the stream, even if no
+	 * replies have returned yet */
 	decommission_pending_tcp(outnet, pend);
+	use_free_buffer(outnet);
 	return 0;
 }
 
@@ -816,6 +928,8 @@ outside_network_create(struct comm_base *base, size_t bufsize,
 		outside_network_delete(outnet);
 		return NULL;
 	}
+	rbtree_init(&outnet->tcp_reuse, reuse_cmp);
+	outnet->tcp_reuse_max = num_tcp;
 
 	/* allocate commpoints */
 	for(k=0; k<num_ports; k++) {
@@ -977,6 +1091,8 @@ outside_network_delete(struct outside_network* outnet)
 			if(outnet->tcp_conns[i]) {
 				comm_point_delete(outnet->tcp_conns[i]->c);
 				waiting_tcp_delete(outnet->tcp_conns[i]->query);
+				/* TODO: loop over tcpwrite wait list and
+				 * delete waiting_tcp_delete them */
 				free(outnet->tcp_conns[i]);
 			}
 		free(outnet->tcp_conns);
@@ -989,6 +1105,10 @@ outside_network_delete(struct outside_network* outnet)
 			p = np;
 		}
 	}
+	/* was allocated in struct pending that was deleted above */
+	rbtree_init(&outnet->tcp_reuse, reuse_cmp);
+	outnet->tcp_reuse_first = NULL;
+	outnet->tcp_reuse_last = NULL;
 	if(outnet->udp_wait_first) {
 		struct pending* p = outnet->udp_wait_first, *np;
 		while(p) {
@@ -1283,14 +1403,20 @@ outnet_tcptimer(void* arg)
 {
 	struct waiting_tcp* w = (struct waiting_tcp*)arg;
 	struct outside_network* outnet = w->outnet;
-	comm_point_callback_type* cb;
-	void* cb_arg;
+	int do_callback = 1;
 	if(w->pkt) {
 		/* it is on the waiting list */
 		waiting_list_remove(outnet, w);
 	} else {
 		/* it was in use */
 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;
+		/* see if it needs unlink from reuse tree */
+		if(pend->reuse.pending) {
+			reuse_tcp_remove_tree_list(outnet, &pend->reuse);
+			do_callback = 0;
+		}
+		/* do failure callbacks for all the queries in the
+		 * wait for write list and in the id-tree TODO */
 		if(pend->c->ssl) {
 #ifdef HAVE_SSL
 			SSL_shutdown(pend->c->ssl);
@@ -1303,23 +1429,100 @@ outnet_tcptimer(void* arg)
 		pend->next_free = outnet->tcp_free;
 		outnet->tcp_free = pend;
 	}
-	cb = w->cb;
-	cb_arg = w->cb_arg;
-	waiting_tcp_delete(w);
-	fptr_ok(fptr_whitelist_pending_tcp(cb));
-	(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
+	if(do_callback) {
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		waiting_tcp_delete(w);
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
+	} else {
+		waiting_tcp_delete(w);
+	}
 	use_free_buffer(outnet);
 }
 
+/** close the oldest reuse_tcp connection to make a fd and struct pend
+ * available for a new stream connection */
+static void
+reuse_tcp_close_oldest(struct outside_network* outnet)
+{
+	struct pending_tcp* pend;
+	if(!outnet->tcp_reuse_last) return;
+	pend = outnet->tcp_reuse_last;
+
+	/* snip off of LRU */
+	log_assert(pend->reuse.next == NULL);
+	if(pend->reuse.prev) {
+		log_assert(pend->reuse.prev->pending);
+		outnet->tcp_reuse_last = pend->reuse.prev->pending;
+		pend->reuse.prev->next = NULL;
+	} else {
+		outnet->tcp_reuse_last = NULL;
+		outnet->tcp_reuse_first = NULL;
+	}
+
+	/* TODO should only close unused in tree, not ones that are in use,
+	 * for which we need also a tree to find in-use streams for multiple
+	 * queries on them */
+	/* free up */
+	decommission_pending_tcp(outnet, pend);
+}
+
+/** find reuse tcp stream to destination for query, or NULL if none */
+static struct reuse_tcp*
+reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
+{
+	struct waiting_tcp key_w;
+	struct pending_tcp key_p;
+	struct comm_point c;
+	memset(&key_w, 0, sizeof(key_w));
+	memset(&key_p, 0, sizeof(key_p));
+	memset(&c, 0, sizeof(c));
+	key_p.query = &key_w;
+	key_p.c = &c;
+	key_p.reuse.pending = &key_p;
+	key_p.reuse.node.key = &key_p.reuse;
+	if(sq->ssl_upstream) /* something nonNULL for comparisons in tree */
+		key_p.c->ssl = (void*)1;
+	if(sq->addrlen > sizeof(key_w.addr))
+		return NULL;
+	memmove(&key_w.addr, &sq->addr, sq->addrlen);
+	key_w.addrlen = sq->addrlen;
+
+	return (struct reuse_tcp*)rbtree_search(&outnet->tcp_reuse,
+		&key_p.reuse.node);
+}
+
 struct waiting_tcp*
 pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	int timeout, comm_point_callback_type* callback, void* callback_arg)
 {
 	struct pending_tcp* pend = sq->outnet->tcp_free;
+	struct reuse_tcp* reuse = NULL;
 	struct waiting_tcp* w;
 	struct timeval tv;
 	uint16_t id;
+
+	/* find out if a reused stream to the target exists */
+	/* if so, take it into use */
+	reuse = reuse_tcp_find(sq->outnet, sq);
+	if(reuse) {
+		log_assert(reuse->pending);
+		pend = reuse->pending;
+	}
+
+	/* if !pend but we have reuse streams, close a reuse stream
+	 * to be able to open a new one to this target, no use waiting
+	 * to reuse a file descriptor while another query needs to use
+	 * that buffer and file descriptor now. */
+	if(!pend) {
+		reuse_tcp_close_oldest(sq->outnet);
+		pend = sq->outnet->tcp_free;
+	}
+
 	/* if no buffer is free allocate space to store query */
+	/* TODO: if reuse cannot write right now, store query even though
+	 * pend is nonNULL */
 	w = (struct waiting_tcp*)malloc(sizeof(struct waiting_tcp) 
 		+ (pend?0:sldns_buffer_limit(packet)));
 	if(!w) {
@@ -1347,10 +1550,26 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	comm_timer_set(w->timer, &tv);
 	if(pend) {
 		/* we have a buffer available right now */
-		if(!outnet_tcp_take_into_use(w, sldns_buffer_begin(packet),
-			sldns_buffer_limit(packet))) {
-			waiting_tcp_delete(w);
-			return NULL;
+		if(reuse) {
+			/* if cannot write now, store query and put it
+			 * in the waiting list for this stream TODO */
+			/* and also delete it from waitlst if query gone,
+			 * eg. sq is deleted TODO */
+			/* and also servfail all waiting queries if
+			 * stream closes TODO */
+			/* reuse existing fd, write query and continue */
+			outnet_tcp_take_query_setup(pend->c->fd, pend,
+				sldns_buffer_begin(packet),
+				sldns_buffer_limit(packet));
+		} else {
+			/* create new fd and connect to addr, setup to
+			 * write query */
+			if(!outnet_tcp_take_into_use(w,
+				sldns_buffer_begin(packet),
+				sldns_buffer_limit(packet))) {
+				waiting_tcp_delete(w);
+				return NULL;
+			}
 		}
 #ifdef USE_DNSTAP
 		if(sq->outnet->dtenv &&
@@ -1502,6 +1721,42 @@ waiting_list_remove(struct outside_network* outnet, struct waiting_tcp* w)
 	}
 }
 
+/** reuse tcp stream, remove serviced query from stream,
+ * return true if the stream is kept, false if it is to be closed */
+static int
+reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
+	struct serviced_query* sq)
+{
+	struct pending_tcp* pend_tcp = (struct pending_tcp*)w->next_waiting;
+	/* see if can be entered in reuse tree
+	 * for that the FD has to be non-1 */
+	if(pend_tcp->c->fd == -1) {
+		return 0;
+	}
+	/* if in tree and used by other queries */
+	if(pend_tcp->reuse.node.key) {
+		/* note less use of stream */
+		/* remove id value used by this svcd. */
+		/* do not reset the keepalive timer, for that
+		 * we'd need traffic, and this is where the servicedq is
+		 * removed due to state machine internal reasons,
+		 * eg. iterator no longer interested in this query */
+		return 1;
+	}
+	/* if still open and want to keep it open */
+	if(pend_tcp->c->fd != -1 && sq->outnet->tcp_reuse.count <
+		sq->outnet->tcp_reuse_max) {
+		/* note less use of stream */
+		/* remove id value used by this svcd. */
+		/* set a keepalive timer on it */
+		if(!reuse_tcp_insert(sq->outnet, pend_tcp)) {
+			return 0;
+		}
+		return 1;
+	}
+	return 0;
+}
+
 /** cleanup serviced query entry */
 static void
 serviced_delete(struct serviced_query* sq)
@@ -1522,9 +1777,14 @@ serviced_delete(struct serviced_query* sq)
 		} else {
 			struct waiting_tcp* p = (struct waiting_tcp*)
 				sq->pending;
+			/* TODO: if on stream-write-waiting list then
+			 * remove from waiting list and waiting_tcp_delete */
 			if(p->pkt == NULL) {
-				decommission_pending_tcp(sq->outnet, 
-					(struct pending_tcp*)p->next_waiting);
+				if(!reuse_tcp_remove_serviced_keep(p, sq)) {
+					decommission_pending_tcp(sq->outnet,
+					  (struct pending_tcp*)p->next_waiting);
+					use_free_buffer(sq->outnet);
+				}
 			} else {
 				waiting_list_remove(sq->outnet, p);
 				waiting_tcp_delete(p);
diff --git a/services/outside_network.h b/services/outside_network.h
index 3456a3da3..a0b277b1e 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -52,6 +52,7 @@ struct ub_randstate;
 struct pending_tcp;
 struct waiting_tcp;
 struct waiting_udp;
+struct reuse_tcp;
 struct infra_cache;
 struct port_comm;
 struct port_if;
@@ -150,6 +151,21 @@ struct outside_network {
 	size_t num_tcp;
 	/** number of tcp communication points in use. */
 	size_t num_tcp_outgoing;
+	/**
+	 * tree of still-open and waiting tcp connections for reuse.
+	 * can be closed and reopened to get a new tcp connection.
+	 * or reused to the same destination again.  with timeout to close.
+	 * Entries are of type struct reuse_tcp.
+	 * The entries are both active and empty connections.
+	 */
+	rbtree_type tcp_reuse;
+	/** max number of tcp_reuse entries we want to keep open */
+	size_t tcp_reuse_max;
+	/** first and last(oldest) in lru list of reuse connections.
+	 * the oldest can be closed to get a new free pending_tcp if needed
+	 * The list contains empty connections, that wait for timeout or
+	 * a new query that can use the existing connection. */
+	struct pending_tcp* tcp_reuse_first, *tcp_reuse_last;
 	/** list of tcp comm points that are free for use */
 	struct pending_tcp* tcp_free;
 	/** list of tcp queries waiting for a buffer */
@@ -205,6 +221,43 @@ struct port_comm {
 	struct comm_point* cp;
 };
 
+/**
+ * Reuse TCP connection, still open can be used again.
+ */
+struct reuse_tcp {
+	/** rbtree node with links in tcp_reuse tree. key is NULL when not
+	 * in tree. Both active and empty connections are in the tree. */
+	rbnode_type node;
+	/** lru chain, so that the oldest can be removed to get a new
+	 * connection when all are in (re)use. oldest is last in list.
+	 * The lru only contains empty connections waiting for reuse,
+	 * the ones with active queries are not on the list because they
+	 * do not need to be closed to make space for others.  They already
+	 * service a query so the close for another query does not help
+	 * service a larger number of queries.
+	 * TODO
+	 */
+	struct reuse_tcp* next, *prev;
+	/** the connection to reuse, the fd is non-1 and is open.
+	 * the addr and port determine where the connection is going,
+	 * and is key to the rbtree.  The SSL ptr determines if it is
+	 * a TLS connection or a plain TCP connection there.  And TLS
+	 * or not is also part of the key to the rbtree.
+	 * There is a timeout and read event on the fd, to close it.
+	 */
+	struct pending_tcp* pending;
+	/** rbtree with other queries waiting on the connection, by ID number,
+	 * of type struct waiting_tcp. It is for looking up received
+	 * answers to the structure for callback.  And also to see if ID
+	 * numbers are unused and can be used for a new query. TODO */
+	rbtree_type tree_by_id;
+	/** list of queries waiting to be written on the channel,
+	 * if NULL no queries are waiting to be written and the pending->query
+	 * is the query currently serviced.  The first is the next in line.
+	 * Once written, a query moves to the tree_by_id. TODO */
+	struct waiting_tcp* write_wait_first, *write_wait_last;
+};
+
 /**
  * A query that has an answer pending for it.
  */
@@ -255,6 +308,11 @@ struct pending_tcp {
 	struct comm_point* c;
 	/** the query being serviced, NULL if the pending_tcp is unused. */
 	struct waiting_tcp* query;
+	/** the pre-allocated reuse tcp structure.  if ->pending is nonNULL
+	 * it is in use and the connection is waiting for reuse.
+	 * It is here for memory pre-allocation, and used to make this
+	 * pending_tcp wait for reuse. */
+	struct reuse_tcp reuse;
 };
 
 /**
@@ -266,6 +324,13 @@ struct waiting_tcp {
 	 * if pkt==0, this points to the pending_tcp structure.
 	 */
 	struct waiting_tcp* next_waiting;
+	/** next and prev in query waiting list for stream connection */
+	struct waiting_tcp* write_wait_prev, *write_wait_next;
+	/** true if the waiting_tcp structure is on the write_wait queue */
+	int write_wait_queued;
+	/** entry in reuse.tree_by_id, if key is NULL, not in tree, otherwise,
+	 * this struct is key and sorted by ID from pending_tcp->id. */
+	rbnode_type id_node;
 	/** timeout event; timer keeps running whether the query is
 	 * waiting for a buffer or the tcp reply is pending */
 	struct comm_timer* timer;
@@ -635,4 +700,7 @@ int pending_cmp(const void* key1, const void* key2);
 /** compare function of serviced query rbtree */
 int serviced_cmp(const void* key1, const void* key2);
 
+/** compare function of reuse_tcp rbtree */
+int reuse_cmp(const void* key1, const void* key2);
+
 #endif /* OUTSIDE_NETWORK_H */
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index d6e904a4d..b04543f1e 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1488,6 +1488,12 @@ int serviced_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b))
 	return 0;
 }
 
+int reuse_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b))
+{
+	log_assert(0);
+	return 0;
+}
+
 /* timers in testbound for autotrust. statistics tested in tdir. */
 struct comm_timer* comm_timer_create(struct comm_base* base, 
 	void (*cb)(void*), void* cb_arg)
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index f5da501de..84b185160 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -210,6 +210,7 @@ fptr_whitelist_rbtree_cmp(int (*fptr) (const void *, const void *))
 	else if(fptr == &fwd_cmp) return 1;
 	else if(fptr == &pending_cmp) return 1;
 	else if(fptr == &serviced_cmp) return 1;
+	else if(fptr == &reuse_cmp) return 1;
 	else if(fptr == &name_tree_compare) return 1;
 	else if(fptr == &order_lock_cmp) return 1;
 	else if(fptr == &codeline_cmp) return 1;

From 4f78b37c61b1d94ea43ae76d5589ab39b4c71f9b Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 2 Apr 2020 18:34:03 +0200
Subject: [PATCH 002/208] Down- and upstream padding a la RFC7830 & RFC8467

---
 daemon/worker.c            |     1 +
 doc/example.conf.in        |    12 +
 doc/unbound.conf.5.in      |    20 +
 libunbound/libworker.c     |     1 +
 services/authzone.c        |     2 +
 services/outside_network.c |    17 +-
 services/outside_network.h |     2 +
 testcode/fake_event.c      |     1 +
 util/config_file.c         |    12 +
 util/config_file.h         |    11 +
 util/configlexer.c         |  4408 ++++++-------
 util/configlexer.lex       |     4 +
 util/configparser.c        | 11727 +++++++++++++++--------------------
 util/configparser.h        |   935 +--
 util/configparser.y        |    40 +
 util/data/msgencode.c      |    46 +-
 util/data/msgparse.c       |     2 +
 util/data/msgparse.h       |     2 +
 util/edns.c                |    10 +
 validator/autotrust.c      |     1 +
 20 files changed, 7866 insertions(+), 9388 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 201e77336..9f8db159f 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1286,6 +1286,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			edns.udp_size = EDNS_ADVERTISED_SIZE;
 			edns.bits &= EDNS_DO;
 			edns.opt_list = NULL;
+			edns.padding_block_size = 0;
 			verbose(VERB_ALGO, "query with bad edns version.");
 			log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
 			error_encode(c->buffer, EDNS_RCODE_BADVERS&0xf, &qinfo,
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 091948e2d..7374a564a 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -746,6 +746,12 @@ server:
 	# cipher setting for TLSv1.3
 	# tls-ciphersuites: "TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256"
 
+	# Pad responses to padded queries received over TLS
+	# pad-responses: yes
+
+	# Padded responses will be padded to the closest multiple of this size.
+	# pad-responses-block-size: 468
+
 	# Add the secret file for TLS Session Ticket.
 	# Secret file must be 80 bytes of random data.
 	# First key use to encrypt and decrypt TLS session tickets.
@@ -764,6 +770,12 @@ server:
 	# Add system certs to the cert bundle, from the Windows Cert Store
 	# tls-win-cert: no
 
+	# Pad queries over TLS upstreams
+	# pad-queries: no
+
+	# Padded queries will be padded to the closest multiple of this size.
+	# pad-queries-block-size: 128
+
 	# Also serve tls on these port numbers (eg. 443, ...), by listing
 	# tls-additional-port: portno for each of the port numbers.
 
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index cd219c79a..01fd0bd7f 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -546,6 +546,26 @@ and that is the default.
 Set the list of ciphersuites to allow when serving TLS.  This is for newer
 TLS 1.3 connections.  Use "" for defaults, and that is the default.
 .TP
+.B pad\-responses: \fI<yes or no>
+If enabled, TLS serviced queries that contained an EDNS Padding option will
+cause responses padded to the closest multiple of the size specified in
+\fBpad\-responses\-block\-size\fR.
+Default is yes.
+.TP
+.B pad\-responses\-block\-size: \fI<number>
+The block size with which to pad responses serviced over TLS. Only responses
+to padded queries will be padded.
+Default is 468.
+.TP
+.B pad\-queries: \fI<yes or no>
+If enabled, all queries sent over TLS upstreams will be padded to the closest
+multiple of the size specified in \fBpad\-queries\-block\-size\fR.
+Default is no.
+.TP
+.B pad\-queries\-block\-size: \fI<number>
+The block size with which to pad queries sent over TLS upstreams.
+Default is 128.
+.TP
 .B use\-systemd: \fI<yes or no>
 Enable or disable systemd socket activation.
 Default is no.
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 24233f1d0..be32c3ae8 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -574,6 +574,7 @@ setup_qinfo_edns(struct libworker* w, struct ctx_query* q,
 	edns->edns_version = 0;
 	edns->bits = EDNS_DO;
 	edns->opt_list = NULL;
+	edns->padding_block_size = 0;
 	if(sldns_buffer_capacity(w->back->udp_buff) < 65535)
 		edns->udp_size = (uint16_t)sldns_buffer_capacity(
 			w->back->udp_buff);
diff --git a/services/authzone.c b/services/authzone.c
index 70fe27a5e..be02610e8 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -5091,6 +5091,7 @@ xfr_transfer_lookup_host(struct auth_xfer* xfr, struct module_env* env)
 	edns.edns_version = 0;
 	edns.bits = EDNS_DO;
 	edns.opt_list = NULL;
+	edns.padding_block_size = 0;
 	if(sldns_buffer_capacity(buf) < 65535)
 		edns.udp_size = (uint16_t)sldns_buffer_capacity(buf);
 	else	edns.udp_size = 65535;
@@ -6278,6 +6279,7 @@ xfr_probe_lookup_host(struct auth_xfer* xfr, struct module_env* env)
 	edns.edns_version = 0;
 	edns.bits = EDNS_DO;
 	edns.opt_list = NULL;
+	edns.padding_block_size = 0;
 	if(sldns_buffer_capacity(buf) < 65535)
 		edns.udp_size = (uint16_t)sldns_buffer_capacity(buf);
 	else	edns.udp_size = 65535;
diff --git a/services/outside_network.c b/services/outside_network.c
index 978e98b0e..ec380c86d 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1415,7 +1415,8 @@ static struct serviced_query*
 serviced_create(struct outside_network* outnet, sldns_buffer* buff, int dnssec,
 	int want_dnssec, int nocaps, int tcp_upstream, int ssl_upstream,
 	char* tls_auth_name, struct sockaddr_storage* addr, socklen_t addrlen,
-	uint8_t* zone, size_t zonelen, int qtype, struct edns_option* opt_list)
+	uint8_t* zone, size_t zonelen, int qtype, struct edns_option* opt_list,
+	size_t pad_queries_block_size)
 {
 	struct serviced_query* sq = (struct serviced_query*)malloc(sizeof(*sq));
 #ifdef UNBOUND_DEBUG
@@ -1473,6 +1474,7 @@ serviced_create(struct outside_network* outnet, sldns_buffer* buff, int dnssec,
 	sq->status = serviced_initial;
 	sq->retry = 0;
 	sq->to_be_deleted = 0;
+	sq->padding_block_size = pad_queries_block_size;
 #ifdef UNBOUND_DEBUG
 	ins = 
 #else
@@ -1591,6 +1593,7 @@ serviced_encode(struct serviced_query* sq, sldns_buffer* buff, int with_edns)
 	if(with_edns) {
 		/* add edns section */
 		struct edns_data edns;
+		struct edns_option padding_option;
 		edns.edns_present = 1;
 		edns.ext_rcode = 0;
 		edns.edns_version = EDNS_ADVERTISED_VERSION;
@@ -1613,6 +1616,14 @@ serviced_encode(struct serviced_query* sq, sldns_buffer* buff, int with_edns)
 			edns.bits = EDNS_DO;
 		if(sq->dnssec & BIT_CD)
 			LDNS_CD_SET(sldns_buffer_begin(buff));
+		if (sq->ssl_upstream && sq->padding_block_size) {
+			padding_option.opt_code = LDNS_EDNS_PADDING;
+			padding_option.opt_len = 0;
+			padding_option.opt_data = NULL;
+			padding_option.next = edns.opt_list;
+			edns.opt_list = &padding_option;
+			edns.padding_block_size = sq->padding_block_size;
+		}
 		attach_edns_record(buff, &edns);
 	}
 }
@@ -2125,7 +2136,9 @@ outnet_serviced_query(struct outside_network* outnet,
 		sq = serviced_create(outnet, buff, dnssec, want_dnssec, nocaps,
 			tcp_upstream, ssl_upstream, tls_auth_name, addr,
 			addrlen, zone, zonelen, (int)qinfo->qtype,
-			qstate->edns_opts_back_out);
+			qstate->edns_opts_back_out,
+			( ssl_upstream && env->cfg->pad_queries
+			? env->cfg->pad_queries_block_size : 0));
 		if(!sq) {
 			free(cb);
 			return NULL;
diff --git a/services/outside_network.h b/services/outside_network.h
index 3fc5dde45..eeb77bb92 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -390,6 +390,8 @@ struct serviced_query {
 	struct service_callback* cblist;
 	/** the UDP or TCP query that is pending, see status which */
 	void* pending;
+	/** block size with which to pad encrypted queries (default: 128) */
+	size_t padding_block_size;
 };
 
 /**
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index c69fb9bfd..209257921 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1222,6 +1222,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 		edns.opt_list = qstate->edns_opts_back_out;
 		if(dnssec)
 			edns.bits = EDNS_DO;
+		edns.padding_block_size = 0;
 		attach_edns_record(pend->buffer, &edns);
 	}
 	memcpy(&pend->addr, addr, addrlen);
diff --git a/util/config_file.c b/util/config_file.c
index 767d76b29..bd9fd278d 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -322,6 +322,10 @@ config_create(void)
 	cfg->dnscrypt_shared_secret_cache_slabs = 4;
 	cfg->dnscrypt_nonce_cache_size = 4*1024*1024;
 	cfg->dnscrypt_nonce_cache_slabs = 4;
+	cfg->pad_responses = 1;
+	cfg->pad_responses_block_size = 468; /* from RFC8467 */
+	cfg->pad_queries = 0;
+	cfg->pad_queries_block_size = 128; /* from RFC8467 */
 #ifdef USE_IPSECMOD
 	cfg->ipsecmod_enabled = 1;
 	cfg->ipsecmod_ignore_bogus = 0;
@@ -693,6 +697,10 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_NUMBER_OR_ZERO("fast-server-permil:", fast_server_permil)
 	else S_YNO("qname-minimisation:", qname_minimisation)
 	else S_YNO("qname-minimisation-strict:", qname_minimisation_strict)
+	else S_YNO("pad-responses:", pad_responses)
+	else S_SIZET_NONZERO("pad-responses-block-size:", pad_responses_block_size)
+	else S_YNO("pad-queries:", pad_queries)
+	else S_SIZET_NONZERO("pad-queries-block-size:", pad_queries_block_size)
 #ifdef USE_IPSECMOD
 	else S_YNO("ipsecmod-enabled:", ipsecmod_enabled)
 	else S_YNO("ipsecmod-ignore-bogus:", ipsecmod_ignore_bogus)
@@ -1120,6 +1128,10 @@ 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_YNO(opt, "pad-responses", pad_responses)
+	else O_DEC(opt, "pad-responses-block-size", pad_responses_block_size)
+	else O_YNO(opt, "pad-queries", pad_queries)
+	else O_DEC(opt, "pad-queries-block-size", pad_queries_block_size)
 #ifdef USE_IPSECMOD
 	else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled)
 	else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus)
diff --git a/util/config_file.h b/util/config_file.h
index 49c9610ce..454b88734 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -569,6 +569,17 @@ struct config_file {
 	size_t dnscrypt_nonce_cache_size;
 	/** number of slabs for dnscrypt nonces cache */
 	size_t dnscrypt_nonce_cache_slabs;
+
+	/** EDNS padding according to FC7830 and RFC8467 */
+	/** true to enable padding of responses (default: on) */
+	int pad_responses;
+	/** block size with which to pad encrypted responses (default: 468) */
+	size_t pad_responses_block_size;
+	/** true to enable padding of queries (default: off) */
+	int pad_queries;
+	/** block size with which to pad encrypted queries (default: 128) */
+	size_t pad_queries_block_size;
+
 	/** IPsec module */
 #ifdef USE_IPSECMOD
 	/** false to bypass the IPsec module */
diff --git a/util/configlexer.c b/util/configlexer.c
index 194569a64..6e185a1ad 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 310
-#define YY_END_OF_BUFFER 311
+#define YY_NUM_RULES 314
+#define YY_END_OF_BUFFER 315
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,343 +363,349 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3049] =
+static const flex_int16_t yy_accept[3094] =
     {   0,
-        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,
+        1,    1,  296,  296,  300,  300,  304,  304,  308,  308,
+        1,    1,  315,  312,    1,  294,  294,  313,    2,  313,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  296,  297,  297,  298,  313,  300,  301,  301,
+      302,  313,  307,  304,  305,  305,  306,  313,  308,  309,
+      309,  310,  313,  311,  295,    2,  299,  313,  311,  312,
+        0,    1,    2,    2,    2,    2,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  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,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  296,    0,  300,    0,  307,    0,  304,  308,    0,
+      311,    0,    2,    2,  311,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  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,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  311,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  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,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  114,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  122,
+      312,  312,  312,  312,  312,  312,  312,  311,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  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,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,   98,  312,  312,  312,  312,  312,  312,
+      312,  312,    8,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  115,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  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,  308,  308,
+      312,  127,  312,  311,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  289,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  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,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  311,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,   56,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  224,  312,   14,   15,  312,   19,   18,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  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,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  121,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  208,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,    3,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,  308,  308,  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,  299,  308,  308,  308,  308,  308,
-      308,  308,   55,  308,  308,  308,  308,  308,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  311,  312,  312,  312,
+      312,  312,  312,  312,  284,  312,  312,  283,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  303,  312,  312,  312,  312,  312,  312,
 
-      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,  308,  308,
+      312,   55,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,   59,  312,
+      254,  312,  312,  312,  312,  312,  312,  312,  312,  290,
+      291,  312,  312,  312,  312,  312,  312,  312,   60,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  118,  312,  312,  312,  312,  312,
+      312,  312,  312,  197,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,   21,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,  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,  308,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  146,  312,  312,  303,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,   96,  312,  312,  312,
+      312,  312,  312,  312,  262,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  169,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  145,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,  308,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,   95,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,   32,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,   33,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,   57,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  120,  312,  312,  312,
 
-      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,   46,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
+      312,  312,  113,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,   58,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  227,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  170,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+       46,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,   50,  308,   51,  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,  308,  308,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  245,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+       50,  312,   51,  312,  312,  312,  312,  312,   99,  312,
+      100,  312,  312,  312,  312,   97,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,    7,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,  308,  308,  308,
-      308,  308,  308,  308,   47,  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,  308,  308,  308,  308,  308,
+      312,  312,  217,  312,  312,  312,  312,  148,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  228,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,   47,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  189,  312,  188,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,  308,  308,  308,  308,  308,
+      312,  312,  312,  312,   16,   17,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,   61,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      196,  312,  312,  312,  312,  312,  312,  102,  312,  101,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      180,  312,  312,  312,  312,  312,  312,  312,  312,  128,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,   80,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,   54,  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,  308,  308,  308,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,   84,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,   54,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  183,  184,  312,  312,  312,  256,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,    6,  312,  312,  312,  312,  312,  312,  275,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      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,   44,  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,   45,  308,  308,  308,
-      308,  308,  308,  308,  308,  308,  125,  107,  308,  108,
-      308,  308,  308,  106,  308,  308,  308,  308,  308,  308,
+      312,  312,  312,  312,  312,  260,  312,  312,  312,  312,
+      312,  312,  285,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,   42,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,   44,  312,  312,  312,
+      312,  312,  312,  312,  312,  176,  312,  312,  312,  123,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      201,  312,  177,  312,  312,  312,  214,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,   45,  312,  312,  312,
 
-      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,   52,  308,  308,
-      308,   26,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,   20,  308,  308,  308,  308,  308,  308,   27,   36,
+      312,  312,  312,  312,  312,  312,  125,  107,  312,  108,
+      312,  312,  312,  106,  312,  312,  312,  312,  312,  312,
+      312,  312,  143,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  244,  312,  312,  312,  312,  312,
+      312,  312,  312,  178,  312,  312,  312,  312,  312,  181,
+      312,  187,  312,  312,  312,  312,  312,  213,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,   94,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  119,  312,  312,  312,  312,  312,  312,   52,
 
-      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,  308,  308,  308,  308,  308,
+      312,  312,  312,   26,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,   20,  312,  312,  312,  312,  312,  312,
+       27,   36,  312,  153,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,   69,   71,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  264,  312,
+      312,  312,  225,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  109,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  142,  312,  312,  312,  312,  312,
 
-      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,  308,  308,  215,  308,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      279,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  147,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  273,  312,  312,  312,  207,  312,  312,  312,
+      312,  312,  312,  312,  312,  288,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  164,  312,  312,
+      312,  312,  312,  312,  312,  312,  103,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  159,  312,  171,  312,
 
-      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,   53,  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,  308,  308,  308,  308,  308,
+      312,  312,  312,  312,  131,  312,  312,  312,  312,  312,
+       90,  312,  312,  312,  312,  199,  312,  312,  312,  312,
+      312,  312,  215,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  236,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  124,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  163,
+      312,  312,  312,  312,  312,   72,   73,  312,  312,  312,
+      312,  312,   53,  312,  312,  312,  312,  312,   79,  172,
+      312,  190,  312,  218,  312,  312,  182,  257,  312,  312,
+      312,  312,  312,   65,  312,  174,  312,  312,  312,  312,
 
-      308,  308,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  308,  308,  308,  308,  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,  308,  308,  308,  308,  278,
+      312,    9,  312,  312,  312,  312,  312,   93,  312,  312,
+      312,  312,  249,  312,  312,  312,  198,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  162,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  149,  312,  263,
+      312,  312,  312,  312,  235,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  209,  312,  312,  312,
 
-      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,  308,  308,  308,  308,  308,
+      312,  255,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  282,  312,  173,  312,
+      312,  312,  312,  312,  312,  312,   64,   66,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,   92,  312,  312,
+      312,  312,  247,  312,  312,  312,  259,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  203,   34,
+       28,   30,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,   35,  312,   29,   31,  312,  312,  312,  312,  312,
+      312,  312,  312,   89,  312,  312,  312,  312,  312,  312,
 
-      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,  206,  200,  308,  216,  308,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  205,  202,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+       63,  312,  312,  126,  312,  110,  312,  312,  312,  312,
+      312,  312,  312,  312,  144,   13,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  277,  312,  280,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,   12,  312,
+      312,   22,  312,  312,  312,  312,  312,  253,  312,  312,
+      312,  261,  312,  312,  312,   67,  312,  211,  312,  312,
+      312,  312,  204,  312,  312,   62,  312,  312,  312,  312,
 
-      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,  308,  308,  308,  308,  308,
+       23,  312,   43,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  158,  157,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  206,  200,  312,  216,
+      312,  312,  265,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+       74,  312,  312,  312,  248,  312,  312,  312,  312,  186,
+      312,  312,  312,  312,  210,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  286,  287,  155,  312,  312,
+       68,  312,  312,  312,  312,  165,  312,  312,  104,  105,
 
-      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,   48,  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,  308,  308,  308,  308,  308,
+      312,  312,  312,  312,  150,  312,  152,  312,  191,  312,
+      312,  312,  312,  156,  312,  312,  219,  312,  312,  312,
+      312,  312,  312,  312,  133,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  226,  312,  312,  312,
+      312,  312,  312,  312,   24,  312,  258,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  192,  312,
+      312,  246,  312,  281,  312,  185,  312,  312,  312,  312,
+       48,  312,  312,  312,  312,  312,  312,    4,  312,  312,
+      312,  117,  132,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
 
-      308,   77,  308,   49,  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,  308,  308,  308,  308,  308,
+      312,  222,   37,   38,  312,  312,  312,  312,  312,  312,
+      312,  266,  312,  312,  312,  312,  312,  312,  234,  312,
+      312,  312,  312,  312,  312,  312,  195,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,   77,  312,   49,  252,
+      312,  223,  312,  312,  312,  312,   11,  312,  312,  312,
+      312,  312,  312,  312,  116,  312,  312,  312,  312,  193,
+       81,  312,   40,  312,  312,  312,  312,  312,  312,  312,
+      312,  161,  312,  312,  312,  312,  312,  135,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  233,  312,  312,
+      312,  312,  129,  312,  312,  111,  112,  312,  312,  312,
 
-      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,  308,  308,  308,  167,  166,
+       83,   87,   82,  312,   75,  312,  312,  312,  312,  312,
+       10,  312,  312,  312,  312,  312,  250,  312,  312,  312,
+      312,  293,   39,  312,  312,  312,  312,  312,  160,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,   88,   86,  312,   76,  278,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  179,  312,  312,  312,  312,
+      312,  194,  312,  312,  312,  312,  312,  312,  312,  312,
+      151,   70,  312,  312,  312,  312,  312,  267,  312,  312,
+      312,  312,  312,  312,  312,  230,  312,  312,  229,  130,
 
-       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,  308,  308,  308,  268,  308,
+      312,   85,  136,  137,  140,  141,  138,  139,   78,  276,
+      312,  312,  251,  312,  312,  312,  312,  154,  312,  312,
+      312,  312,  312,  221,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  167,  166,   41,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  274,  312,  312,  312,  312,
+       91,  312,  220,  312,  243,  271,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,    5,  312,
+      312,  212,  312,  312,  272,  312,  312,  312,  312,  312,
+
+      312,  312,  312,  312,  231,   25,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  232,  312,
+      312,  312,  134,  312,  312,  312,  312,  312,  312,  312,
+      312,  168,  312,  175,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  268,  312,  312,  312,  312,  312,  312,
+      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      312,  292,  312,  312,  239,  312,  312,  312,  312,  312,
+      269,  312,  312,  312,  312,  312,  312,  270,  312,  312,
+      312,  237,  312,  240,  241,  312,  312,  312,  312,  312,
+      238,  242,    0
 
-      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,689 +748,699 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3063] =
+static const flex_int16_t yy_base[3108] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112, 2327, 1999,   81, 5940, 5940, 5940,   96,   52,
+       90,  112, 1946, 1584,   81, 6029, 6029, 6029,   96,   52,
       106,   63,  107,  111,   70,  128,  130,  133,   57,   88,
-       76,  135,  141,  117,  148,  145,  160,  164,  185,  177,
-      189,  152, 1735, 5940, 5940, 5940,  107, 1527, 5940, 5940,
-     5940,  165, 1302, 1259, 5940, 5940, 5940,  211, 1131, 5940,
-     5940, 5940,  180,  948, 5940,  217, 5940,  221,  168,  767,
-      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,  135,  141,  117,  163,  134,  151,  165,  174,  179,
+      190,  145, 1331, 6029, 6029, 6029,  107, 1281, 6029, 6029,
+     6029,  165, 1175, 1158, 6029, 6029, 6029,  212, 1094, 6029,
+     6029, 6029,  216,  816, 6029,  220, 6029,  224,  157,  782,
+      228,  234,    0,  240,    0,    0,  201,  225,   85,  182,
+      176,  232,  234,  114,  236,  209,  241,  224,  238,  244,
+      252,  248,  249,  256,  254,  258,  257,  259,  266,  271,
 
-      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,
-      723,  379,  595,  381,  503,  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,  477,  464,
-      465,  463,  486,  472,  488,  490,  487,  498,  499,  475,
+      279,  251,  278,  281,  282,  285,  289,  287,  292,  295,
+      296,  297,  307,  300,  308,  310,  314,  313,  315,  320,
+      322,  321,  161,  324,  331,  325,  159,  327,  329,  337,
+      332,  342,  346,  352,  351,  354,  358,  357,  359,  360,
+      356,  729,  381,  686,  383,  599,  390,  452,  286,  394,
+      189,  398,  402,    0,  379,  394,  403,  387,  396,  398,
+      364,  400,  401,  404,  409,  407,  415,  416,  418,  421,
+      422,  431,  430,  432,  434,  429,  437,  439,  445,  438,
+      455,  447,  454,  456,  460,  461,  462,  463,  464,  481,
+      466,  472,  467,  490,  488,  497,  500,  486,  502,  504,
 
-      506,  504,  511,  516,  512,  489,  514,  501,  517,  491,
-      518,  515,  522,  524,  525,  529,  530,  537,  534,  535,
-      538,  532,  547,  543,  552,  544,  551,  555,  548,  558,
-      566,  569,  549,  576,  559,  572,  573,  578,  581,  585,
-      582,  580,  583,  590,  587,  589,  591,  593,  592,  600,
-      610,  607,  608,  620,  609,  605,  616,  617,  618,  596,
-      628,  627,  623,  632,  638,  629,  636,  639,  641,  643,
-      642,  644,  646,  656,  649,  659,  652,  666,  661,  667,
-      664,  676,  651,  662,  672,  673,  674,  678,  677,  679,
-      684,  687,  688,  690,  691,  685,  698,  696,  700,  713,
+      474,  511,  507,  514,  515,  510,  522,  518,  519,  520,
+      521,  523,  524,  526,  528,  529,  534,  477,  530,  542,
+      543,  535,  547,  537,  552,  544,  560,  555,  556,  564,
+      557,  558,  573,  574,  569,  577,  570,  465,  578,  581,
+      589,  590,  585,  572,  586,  593,  592,  594,  596,  598,
+      597,  606,  614,  610,  612,  619,  609,  618,  621,  622,
+      623,  601,  633,  625,  635,  629,  641,  634,  642,  644,
+      640,  646,  647,  649,  648,  660,  651,  664,  666,  669,
+      655,  670,  662,  678,  673,  674,  675,  677,  679,  681,
+      682,  683,  685,  688,  694,  689,  698,  691,  705,  708,
 
-      701,  702,  704,  714,  715,  716,  724,  737,  727,  738,
-      728,  734,  742,  743,  707,  750,  746,  744,  753,  754,
-      756,  757,  761,  768,  769, 5940,  760,  773,  771,  774,
-      782,  783,  784,  789,  785,  763,  796,  800,  797,  803,
-      825,  791,  801,  804,  814,  795, 5940,  815,  807,  849,
-      817,  827,  839,  831,  835,  823,  830,  850,  843,  853,
-      840,  854,  855,  873,  857,  858,  870,  860,  871,  872,
-      885,  881,  883,  884,  886,  894,  889,  891,  892,  901,
-      893,  895,  902,  905,  904,  908,  916,  909,  915,  917,
-      921,  922,  925,  927,  929,  923,  926,  933,  950,  931,
+      697,  719,  712,  702,  710,  722,  713,  717,  714,  732,
+      746,  741,  733,  742,  747,  749,  751,  724,  754,  755,
+      748,  761,  762,  752,  767,  768,  775,  776, 6029,  770,
+      773,  786,  784,  791,  792,  785,  798,  772,  793,  806,
+      804,  805,  809,  831,  807,  808,  811,  813,  821, 6029,
+      820,  824,  855,  825,  833,  849,  845,  815,  837,  844,
+      853,  841,  872,  861,  863,  864,  881,  865,  873,  876,
+      877,  879,  880,  897,  889,  882,  886,  894,  905,  900,
+      901,  904,  913,  903,  906,  912,  907,  914,  915,  920,
+      926,  918,  929,  930,  931,  933,  932,  936,  935,  938,
 
-      945,  953,  943,  954,  941,  955,  958,  963,  960,  964,
-      966,  974,  969,  970,  972,  975,  976,  978,  982,  983,
-      984,  986,  988,  992,  989,  999,  990,  997, 1004, 1006,
-     5940, 1007, 1009, 1011, 1012, 1013, 1010, 5940, 1014, 1015,
-     1017, 1026, 1016, 1029, 1036, 1024, 1037, 1039, 1040, 1043,
-     1050, 1027, 1046, 1057, 1052, 1055, 1056, 1053, 1059, 1062,
-     1061, 1064, 1065, 1068, 1070, 1088, 5940, 1071, 1077, 1080,
-     1079, 1085, 1082, 1090, 1097, 1100, 1093, 1106, 1116, 1103,
-     1117, 1111, 1113, 1072, 1118, 1122, 1124, 1125, 1126, 1127,
-     1128, 1130, 1129, 1132, 1140, 1136, 5940, 1144, 1145, 1154,
+      948,  956,  943,  953,  951,  958,  960,  962,  966,  963,
+      969,  970,  971,  972,  980,  977,  978,  979,  983,  985,
+      986,  989,  991,  992,  994,  996,  998,  997, 1003, 1007,
+     1005, 1013,  846, 6029, 1015, 1008, 1017, 1018, 1019, 1023,
+     1021, 1020, 6029, 1024, 1030, 1022, 1037, 1034, 1039, 1046,
+     1035, 1045, 1052, 1047, 1048, 1060, 1038, 1059, 1070, 1057,
+     1067, 1065, 1068, 1069, 1074, 1066, 1075, 1076, 1077, 1078,
+     1097, 6029, 1082, 1084, 1086, 1085, 1093, 1106, 1115, 1107,
+     1095, 1112, 1118, 1114, 1121, 1126, 1125, 1130, 1131, 1133,
+     1134, 1136, 1140, 1138, 1141, 1139, 1142, 1145, 1143, 1144,
 
-     1147, 1152, 1156, 1157, 1158, 1160, 1161, 1163, 1162, 1166,
-     1169, 1183, 1170, 1185, 1172, 1186, 1180, 1181, 1187, 1188,
-     1190, 1195, 1203, 1200, 1205, 1208, 1216, 1215, 1218, 1225,
-     1201, 1220, 1193, 1212, 1221, 1224, 1228, 1226, 1232, 1230,
-     1241, 1236, 1237, 1238, 1239, 1248, 1245, 1244, 1253, 1246,
-     1262, 1252, 1257, 1266, 1267, 1254, 1260, 5940, 1280, 1269,
-     1276, 1277, 1282, 1283, 1284, 1285, 1288,  813, 1291, 1290,
-     1292, 1294, 1296, 1297, 1298, 1299, 1307, 1315, 1311, 1310,
-     1323, 1322, 1324, 1300, 1326, 1333, 1330, 1334, 1336, 1332,
-     1344, 1341, 1342, 1331, 1352, 1345, 1347, 1348, 1349, 1357,
+     1149, 6029, 1156, 1163, 1170, 1157, 1166, 1168, 1171, 1173,
+     1083, 1172, 1177, 1178, 1174, 1184, 1192, 1179, 1195, 1193,
+     1194, 1196, 1198, 1199, 1200, 1202, 1201, 1215, 1206, 1208,
+     1223, 1226, 1225, 1228, 1235, 1212, 1231, 1232, 1230, 1236,
+     1238, 1240, 1216, 1242, 1243, 1252, 1250, 1248, 1251, 1253,
+     1263, 1255, 1258, 1259, 1264, 1268, 1265, 1270, 1274, 1275,
+     1276, 1277, 6029, 1284, 1285, 1288, 1289, 1295, 1296, 1297,
+     1287, 1298, 1301, 1304, 1305, 1306, 1312, 1309, 1313, 1307,
+     1319, 1321, 1320, 1324, 1322, 1337, 1336, 1338, 1327, 1340,
+     1341, 1329, 1350, 1342, 1355, 1353, 1352, 1364, 1359, 1360,
 
-     1359, 1360, 1367, 1362, 1365, 1377, 1372, 1368, 1379, 1375,
-     1380, 1383, 1384, 1385, 1386, 1387, 1395, 1388, 1390, 1391,
-     1396, 1397, 1398, 1400, 1404, 1414, 1409, 1410, 1413, 1416,
-     1420, 1418, 1421, 1425, 1426, 1427, 1428, 1429, 1434, 1431,
-     1440, 1433, 1448, 1439, 1441, 1449, 1452, 1456, 1457, 1458,
-     1465, 1454, 1466, 1467, 1468, 1469, 1471, 1474, 1477, 1481,
-     1475, 1484, 1486, 1488, 1487, 1491, 1494, 1497, 1498, 5940,
-     1492, 1505, 1500, 1506, 1504, 1509, 1512, 1519, 1514, 1517,
-     1515, 1518, 1521, 1544, 5940, 1523, 5940, 5940, 1525, 5940,
-     5940, 1526, 1531, 1529, 1528, 1539, 1546, 1548, 1536, 1551,
+     1351, 1367, 1362, 1365, 1375, 1366, 1368, 1376, 1379, 1384,
+     1377, 1385, 1393, 1394, 1388, 1396, 1391, 1399, 1400, 1402,
+     1403, 1404, 1405, 1412, 1407, 1408, 1409, 1414, 1415, 1416,
+     1419, 1422, 1432, 1427, 1428, 1430, 1434, 1438, 1436, 1439,
+     1443, 1444, 1445, 1446, 1447, 1452, 1450, 1457, 1451, 1466,
+     1458, 1459, 1467, 1470, 1476, 1472, 1482, 1483, 1473, 1485,
+     1475, 1486, 1489, 1490, 1494, 1493, 1497, 1495, 1503, 1504,
+     1506, 1505, 1508, 1513, 1511, 1515, 6029, 1516, 1523, 1518,
+     1521, 1527, 1528, 1529, 1536, 1532, 1534, 1531, 1533, 1537,
+     1559, 6029, 1545, 6029, 6029, 1544, 6029, 6029, 1542, 1546,
 
-     1550, 1558, 1571, 1555, 1561, 1562, 1567, 1574, 1569, 1579,
-     1584, 1576, 1587, 1593, 1594, 1595, 1602, 1603, 1596, 1599,
-     1606, 1604, 1607, 1609, 1611, 1613, 1615, 1619, 1614, 1621,
-     1616, 1631, 1622, 1635, 1642, 5940, 1639, 1643, 1646, 1645,
-     1653, 1648, 1649, 1652, 1657, 1659, 1654, 1661, 1663, 1623,
-     1664, 1666, 1667, 1669, 1678, 1670, 5940, 1671, 1673, 1681,
-     1675, 1685, 1687, 1690, 1674, 1691, 1693, 1702, 1694, 1697,
-     1698, 1705, 1557, 1707, 5940, 1709, 1716, 1703, 1708, 1719,
-     1721, 1722, 1723, 1726, 1720, 1725, 1727, 1732, 1728, 1736,
-     1734, 1737, 1733, 1739, 1738, 1751, 1754, 1756, 1757, 1758,
+     1550, 1563, 1554, 1569, 1562, 1556, 1572, 1565, 1582, 1587,
+     1543, 1575, 1577, 1583, 1590, 1598, 1600, 1601, 1603, 1609,
+     1611, 1612, 1614, 1621, 1622, 1580, 1604, 1613, 1625, 1627,
+     1626, 1628, 1632, 1630, 1635, 1631, 1638, 1633, 1643, 1648,
+     1640, 1657, 6029, 1654, 1658, 1666, 1662, 1669, 1661, 1665,
+     1668, 1642, 1673, 1670, 1674, 1675, 1677, 1679, 1682, 1681,
+     1686, 1687, 1683, 1694, 1689, 6029, 1690, 1693, 1701, 1695,
+     1707, 1709, 1703, 1705, 1711, 1712, 1719, 1715, 1721, 1722,
+     1723, 1724, 1726, 6029, 1731, 1728, 1734, 1735, 1738, 1742,
+     1743, 1739, 1744, 1745, 1746, 1747, 1749, 1752, 1756, 1757,
 
-     1760, 1761, 1762, 1763, 1764, 1766, 1774, 1770, 1778, 1771,
-     1779, 1781, 1788, 1776, 1787, 1789, 1790, 1796, 1804, 1800,
-     1801, 1793, 1808, 1805, 1810, 1812, 1813, 1815, 1816, 1817,
-     1822, 1820, 1824, 1827, 1826, 5940, 1828, 1829, 5940, 1833,
-     1834, 1856, 1835, 1837, 1839, 1847, 1838, 1858, 1849, 1857,
-     1868, 1860, 1876, 1866, 1878, 1869, 1881, 1879, 1883, 1885,
-     1887, 1889, 1892, 1901, 1906, 1851, 1902, 1910, 1890, 1905,
-     1893, 1925, 1907, 1909, 1913, 1916, 1917, 1915, 1840, 1921,
-     1922, 1923, 1930, 1932, 5940, 1940, 1943, 1937, 1947, 1954,
-     1950, 1938, 5940, 1949, 1952, 1953, 1965, 1962, 1963, 1967,
+     1753, 1758, 1760, 1770, 1768, 1773, 1780, 1772, 1775, 1781,
+     1783, 1785, 1786, 1787, 1789, 1794, 1790, 1799, 1795, 1802,
+     1803, 1807, 1798, 1800, 1813, 1810, 1821, 1825, 1823, 1814,
+     1816, 1830, 1827, 1834, 1828, 1835, 1837, 1838, 1839, 1841,
+     1844, 1845, 1849, 1848, 6029, 1850, 1855, 6029, 1851, 1852,
+     1875, 1856, 1858, 1861, 1860, 1863, 1864, 1870, 1879, 1872,
+     1881, 1898, 1887, 1890, 1889, 1900, 1899, 1902, 1903, 1908,
+     1909, 1910, 1918, 1919, 1883, 1925, 1927, 1914, 1922, 1924,
+     1943, 1926, 1928, 1931, 1934, 1939, 1930, 1947, 1950, 1937,
+     1948, 1953, 1954, 6029, 1965, 1968, 1960, 1961, 1972, 1970,
 
-     1964, 1966, 1968, 1973, 1970, 1974, 1975, 1976, 1992, 5940,
-     1978, 5940, 1977, 1987, 1989, 1990, 1995, 1996, 1997, 1998,
-     5940, 5940, 2000, 2001, 2014, 2012, 2009, 5940, 2016, 2024,
-     2025, 2017, 2019, 2021, 2027, 2030, 2031, 2034, 2035, 2042,
-     2037, 2039, 2040, 5940, 2047, 2038, 2048, 2051, 2049, 2057,
-     2058, 2060, 5940, 2061, 2064, 2068, 2075, 2071, 2073, 2066,
-     2076, 2077, 2081, 2083, 2085, 2086, 2087, 2094, 2096, 2092,
-     2093, 2101, 2109, 5940, 2095, 2091, 2110, 2107, 2115, 2108,
-     2116, 2118, 2119, 2120, 2121, 2124, 2126, 2127, 2134, 2135,
-     2130, 2139, 2141, 2131, 2133, 2137, 2152, 2143, 2151, 2153,
+     1973, 6029, 1976, 1977, 1978, 1987, 1980, 1982, 1983, 1984,
+     1991, 1990, 1995, 1993, 1997, 2003, 1996, 2014, 6029, 1999,
+     6029, 1998, 2000, 2011, 2017, 2016, 2018, 2019, 2021, 6029,
+     6029, 2022, 2023, 2028, 2041, 2036, 2025, 2037, 6029, 2038,
+     2048, 2051, 2043, 2039, 2044, 2049, 2056, 2057, 2065, 2058,
+     2066, 2061, 2063, 2070, 6029, 2071, 2062, 2075, 2077, 2073,
+     2081, 2085, 2079, 6029, 2087, 2088, 2092, 2100, 2096, 2097,
+     2099, 2102, 2107, 2101, 2103, 2109, 2110, 2111, 2118, 2120,
+     2116, 2123, 2125, 2132, 6029, 2115, 2127, 2137, 2134, 2136,
+     2140, 2141, 2138, 2142, 2143, 2144, 2148, 2151, 2152, 2159,
 
-     2154, 5940, 2155, 2157,  124, 2159, 2162, 2158, 2163, 2166,
-     2165, 2167, 2182, 2184, 2180, 2169, 2181, 2183, 2188, 2189,
-     2190, 2191, 2192, 2193, 2195, 5940, 2201, 2198, 2203, 2196,
-     2207, 2204, 2215, 5940, 2216, 2218, 2226, 2228, 2219, 2206,
-     2222, 2227, 2230, 2232, 2236, 2238, 2240, 2242, 5940, 2247,
-     2244, 2248, 2250, 2252, 2254, 2256, 2259, 2260, 2262, 2264,
-     2263, 2266, 2267, 2268, 2269, 2271, 2277, 2280, 2272, 2282,
-     2284, 5940, 2291, 2286, 2288, 2294, 2298, 2297, 2305, 2301,
-     2307, 2306, 2310, 2322, 2312, 2308, 2324, 2315, 2323, 2329,
-     2332, 2334, 2337, 2343, 2333, 2346, 2348, 2336, 2340, 2350,
+     2160, 2157, 2162, 2165, 2158, 2161, 2168, 2173, 2170, 2174,
+     2176, 2178, 6029, 2179, 2182,  124, 2185, 2186, 2184, 2187,
+     2191, 2190, 2193, 2208, 2210, 2206, 2205, 2209, 2212, 2215,
+     2216, 2217, 2218, 2220, 2219, 2222, 6029, 2224, 2225, 2228,
+     2230, 2236, 2231, 2233, 6029, 2243, 2235, 2254, 2248, 2250,
+     2194, 2256, 2258, 2257, 2260, 2259, 2262, 2261, 2263, 6029,
+     2269, 2274, 2280, 2270, 2281, 2273, 2283, 2284, 2287, 2288,
+     2289, 2291, 2293, 2296, 2294, 2295, 2297, 2298, 2303, 2305,
+     2309, 2310, 6029, 2317, 2312, 2314, 2320, 2323, 2321, 2336,
+     2324, 2327, 2331, 2337, 2345, 2334, 2339, 2352, 2355, 2357,
 
-     2349, 2352, 2360, 2355, 2367, 2368, 2365, 2371, 2363, 2384,
-     2389, 2380, 5940, 2378, 2388, 2376, 2390, 2398, 2393, 2395,
-     2396, 2402, 2401, 2404, 2405, 2412, 2407, 2409, 2413, 2416,
-     2414, 2422, 2418, 2424, 2425, 2433, 2426, 2435, 2364, 5940,
-     2437, 2438, 2429, 2442, 2445, 2439, 2447, 2452, 2450, 2454,
-     2456, 2458, 2460, 2461, 2462, 2463, 2465, 2467, 2466, 5940,
-     2470, 2471, 2476, 2478, 2479, 2485, 2488, 2491, 2489, 2495,
-     2496, 2497, 2498, 5940, 2505, 2506, 2503, 2507, 2509, 2510,
-     2512, 2515, 2516, 5940, 2517, 2519, 2526, 2527, 2522, 5940,
-     2530, 2525, 2531, 2532, 2533, 2534, 2540, 2535, 2538, 2543,
+     2342, 2365, 2361, 2367, 2369, 2360, 2373, 2375, 2363, 2371,
+     2376, 2377, 2379, 2382, 2386, 2393, 2394, 2390, 2398, 2391,
+     2401, 2399, 2414, 2419, 2392, 6029, 2408, 2410, 2418, 2420,
+     2427, 2422, 2423, 2424, 2430, 2431, 2432, 2433, 2440, 2441,
+     2435, 2445, 2448, 2446, 2449, 2437, 2452, 2456, 2463, 2454,
+     2465, 2466, 6029, 2467, 2471, 2472, 2473, 2475, 2478, 2480,
+     2483, 2481, 2485, 2487, 2489, 2490, 2492, 2493, 2494, 2496,
+     2500, 2497, 6029, 2501, 2503, 2507, 2509, 2511, 2516, 2517,
+     2523, 2520, 2526, 2527, 2528, 2529, 6029, 2536, 2537, 2534,
+     2538, 2540, 2541, 2543, 2546, 2547, 6029, 2548, 2550, 2557,
 
-     2548, 2550, 2546, 2554, 5940, 2556, 2566, 2558, 2562, 2564,
-     2567, 2568, 2570, 2574, 2578, 2573, 5940, 2590, 2589, 2586,
-     2600, 2577, 2591, 2592, 2598, 2595, 2601, 2602, 5940, 2604,
-     2605, 2607, 2608, 2611, 2612, 2614, 2626, 2616, 2619, 2621,
-     2624, 2627, 2629, 2631, 2634, 2632, 2640, 2643, 2644, 2646,
-     2647, 2649, 2650, 2657, 2660, 2662, 2664, 5940, 2667, 2668,
-     2669, 2656, 2659, 2671, 2675, 2676, 2679, 2680, 2684, 2681,
-     2683, 2691, 2693, 2694, 2696, 2698, 2700, 2701, 2703, 2704,
-     2705, 2706, 2713, 2711, 2709, 2718, 2715, 2720, 2727, 2722,
-     2728, 2729, 2730, 2731, 2732, 2736, 2737, 2739, 2740, 2744,
+     2558, 2553, 6029, 2561, 2556, 2562, 2563, 2564, 2565, 2571,
+     2566, 2569, 2574, 2579, 2581, 2577, 2585, 6029, 2587, 2597,
+     2589, 2593, 2595, 2598, 2599, 2601, 2605, 2609, 2604, 6029,
+     2621, 2620, 2617, 2631, 2608, 2622, 2623, 2629, 2626, 2632,
+     2633, 6029, 2635, 2636, 2638, 2639, 2642, 2643, 2645, 2657,
+     2647, 2650, 2652, 2655, 2658, 2660, 2662, 2665, 2663, 2671,
+     2674, 2675, 2677, 2678, 2680, 2681, 2688, 2691, 2693, 2695,
+     6029, 2698, 2699, 2700, 2687, 2690, 2702, 2706, 2707, 2710,
+     2711, 2715, 2712, 2714, 2722, 2724, 2725, 2727, 2729, 2731,
+     2732, 2734, 2735, 2736, 2737, 2744, 2742, 2740, 2749, 2746,
 
-     2755, 2756, 2746, 2757, 2758, 2759, 2760, 5940, 2763, 2765,
-     2764, 2769, 2774, 2771, 2781, 2777, 2778, 2782, 2786, 2789,
-     2783, 2788, 2794, 2801, 2797, 5940, 2798, 5940, 2799, 2800,
-     2807, 2810, 2802, 5940, 2812, 5940, 2815, 2824, 2809, 2813,
-     5940, 2827, 2817, 2819, 2831, 2821, 2826, 2833, 2834, 2835,
-     2840, 2838, 2842, 2843, 2844, 2846, 2848, 2850, 2854, 2859,
-     2861, 2851, 2862, 2853, 2867, 2870, 2864, 2872, 5940, 2880,
-     2873, 2876, 2881, 2882, 2884, 2885, 2887, 2888, 2893, 2889,
-     2894, 2895, 2902, 2905, 2903, 2906, 2917, 5940, 2907, 2919,
-     2912, 2914, 5940, 2922, 2916, 2923, 2928, 2925, 2930, 2932,
+     2751, 2758, 2753, 2759, 2760, 2761, 2762, 2763, 2767, 2768,
+     2770, 2764, 2771, 2774, 2788, 2792, 2789, 2777, 2785, 2793,
+     2795, 2797, 6029, 2796, 2800, 2804, 2805, 2807, 2809, 2817,
+     2810, 2813, 2818, 2827, 2828, 2819, 2812, 2820, 2835, 2834,
+     6029, 2836, 6029, 2822, 2837, 2844, 2847, 2838, 6029, 2849,
+     6029, 2850, 2852, 2846, 2855, 6029, 2856, 2857, 2860, 2863,
+     2861, 2865, 2866, 2867, 2868, 2873, 2870, 2875, 2878, 2879,
+     2881, 2883, 2884, 2887, 2892, 2893, 2894, 2898, 2896, 2900,
+     2904, 2905, 2907, 6029, 2910, 2913, 2906, 2915, 2916, 2917,
+     2921, 2923, 2919, 2925, 2927, 2932, 2926, 2938, 2943, 2947,
 
-     2933, 2934, 2937, 2938, 2950, 2951, 2941, 2952, 5940, 2954,
-     2957, 2942, 2961, 2965, 2969, 2943, 2972, 2966, 2970, 2976,
-     2977, 2978, 2979, 2980, 2987, 2988, 2985, 2992, 2984, 2991,
-     2994, 2998, 3000, 3001, 3002, 3005, 3006, 3004, 3010, 3014,
-     3009, 3011, 3012, 3013, 5940, 3025, 3015, 3027, 3036, 3028,
-     3030, 3017, 3033, 3038, 3039, 3042, 3046, 3040, 5940, 3045,
-     5940, 3048, 3050, 3062, 3064, 3057, 3052, 3068, 3067, 3059,
-     3074, 3075, 3076, 3077, 3078, 3079, 3082, 3083, 3089, 3090,
-     3086, 3087, 3091, 3097, 3099, 3100, 3102, 5940, 5940, 3103,
-     3105, 3108, 3106, 3110, 3112, 3120, 3118, 3111, 3124, 3125,
+     2929, 2950, 6029, 2951, 2953, 2954, 2955, 6029, 2957, 2956,
+     2958, 2963, 2960, 2966, 2967, 2968, 2969, 2975, 2972, 2983,
+     2985, 2976, 2988, 6029, 2990, 2993, 2977, 2994, 3006, 3003,
+     2995, 3004, 3015, 3011, 3010, 3012, 3013, 3014, 3017, 3024,
+     3025, 3021, 3028, 3027, 3031, 3038, 3035, 3029, 3033, 3039,
+     3041, 3042, 3045, 3048, 3049, 3044, 3046, 3051, 3052, 6029,
+     3063, 3054, 3067, 3068, 3060, 3070, 3058, 3071, 3076, 3077,
+     3079, 3078, 3080, 6029, 3083, 6029, 3081, 3088, 3094, 3100,
+     3095, 3097, 3101, 3109, 3105, 3102, 3111, 3112, 3110, 3114,
+     3113, 3119, 3123, 3124, 3126, 3128, 3125, 3131, 3134, 3136,
 
-     3132, 5940, 3133, 3134, 3136, 3137, 3144, 3139, 3141, 3152,
-     3148, 3156, 3154, 5940, 3151, 3155, 3165, 3161, 3163, 3168,
-     5940, 3167, 5940, 3164, 3170, 3173, 3176, 3177, 3178, 3179,
-     3180, 3187, 3188, 3198, 3184, 3195, 3196, 3199, 3200, 3207,
-     3202, 3203, 3204, 5940, 3206, 3209, 3212, 3220, 3221, 3223,
-     3227, 3210, 5940, 3217, 3231, 3234, 3235, 3237, 3239, 3240,
-     3241, 3243, 3245, 3242, 3244, 3252, 3250, 3249, 3259, 3269,
-     3260, 3271, 5940, 3272, 3266, 3279, 3281, 3274, 3276, 3282,
-     3283, 3284, 3287, 3289, 3288, 3290, 3292, 3294, 3291, 3301,
-     3295, 3308, 3297, 3311, 3317, 3318, 3298, 3314, 3321, 3322,
+     3137, 3147, 3143, 3139, 6029, 6029, 3140, 3142, 3154, 3156,
+     3149, 3157, 3163, 3159, 3161, 3166, 3167, 3175, 6029, 3170,
+     3173, 3176, 3177, 3186, 3181, 3190, 3197, 3195, 3202, 3201,
+     6029, 3183, 3192, 3210, 3205, 3208, 3215, 6029, 3212, 6029,
+     3194, 3214, 3216, 3219, 3221, 3222, 3223, 3225, 3227, 3236,
+     3238, 3229, 3231, 3240, 3241, 3243, 3250, 3245, 3246, 3247,
+     6029, 3253, 3249, 3255, 3261, 3263, 3270, 3264, 3254, 6029,
+     3257, 3279, 3271, 3274, 3276, 3281, 3282, 3284, 3285, 3287,
+     3283, 3288, 3298, 3289, 3293, 3294, 3304, 3306, 3313, 6029,
+     3305, 3307, 3320, 3318, 3315, 3319, 3322, 3323, 3324, 3326,
 
-     3325, 3324, 3328, 3331, 3335, 3332, 3344, 3345, 3336, 3339,
-     3348, 3349, 3356, 3351, 5940, 3361, 3341, 3364, 3362, 3363,
-     3368, 3369, 3371, 3372, 3373, 3374, 3381, 3376, 5940, 3383,
-     3378, 3388, 3389, 3380, 3403, 3398, 3379, 3401, 3405, 3402,
-     3408, 3406, 3410, 3411, 3414, 3415, 5940, 5940, 3417, 3418,
-     3420, 5940, 3421, 3419, 3431, 3424, 3427, 3434, 3251, 3433,
-     3436, 3437, 3439, 3441, 5940, 3445, 3452, 3444, 3447, 3459,
-     3461, 3467, 3451, 3460, 3458, 3463, 3468, 3470, 3471, 3472,
-     3474, 3483, 3476, 3479, 3481, 5940, 3484, 3486, 3487, 3491,
-     3488, 3495, 5940, 3493, 3499, 3500, 3502, 3514, 3505, 3515,
+     3329, 3328, 3330, 3336, 3334, 3332, 3331, 3335, 3345, 3351,
+     3352, 3342, 3360, 3338, 3358, 3362, 3361, 3363, 3366, 3368,
+     3371, 3373, 3364, 3375, 3385, 3376, 3379, 3388, 3389, 3396,
+     3391, 6029, 3398, 3383, 3405, 3395, 3403, 3408, 3409, 3417,
+     3402, 3404, 3412, 3419, 3418, 6029, 3428, 3423, 3429, 3425,
+     3426, 3439, 3434, 3430, 3435, 3445, 3440, 3446, 3442, 3448,
+     3451, 3454, 3449, 6029, 6029, 3458, 3455, 3459, 6029, 3463,
+     3460, 3467, 3465, 3471, 3473, 3475, 3474, 3476, 3477, 3479,
+     3484, 6029, 3485, 3493, 3486, 3489, 3497, 3499, 6029, 3494,
+     3504, 3508, 3509, 3503, 3495, 3510, 3511, 3516, 3517, 3518,
 
-     3517, 3497, 3519, 3520, 3522, 3521, 3523, 3530, 3525, 3529,
-     3536, 3537, 3528, 5940, 3542, 3544, 3545, 3547, 3549, 3558,
-     3556, 3559, 3554, 3561, 3562, 3569, 5940, 3564, 3567, 3570,
-     3568, 3578, 3573, 3581, 3577, 5940, 3579, 3583, 3585, 5940,
-     3584, 3596, 3599, 3601, 3586, 3594, 3603, 3605, 3607, 3608,
-     5940, 3611, 5940, 3612, 3592, 3618, 5940, 3614, 3620, 3622,
-     3624, 3621, 3628, 3629, 3636, 3625, 3631, 3637, 3638, 3639,
-     3641, 3648, 3644, 3647, 3649, 3650, 5940, 3651, 3653, 3659,
-     3660, 3665, 3654, 3658, 3670, 3669, 5940, 5940, 3673, 5940,
-     3677, 3676, 3678, 5940, 3681, 3683, 3690, 3685, 3686, 3689,
+     3520, 3528, 3525, 3524, 3526, 6029, 3527, 3531, 3532, 3534,
+     3536, 3541, 6029, 3538, 3548, 3543, 3542, 3559, 3550, 3560,
+     3562, 3563, 3564, 3566, 3565, 3567, 3568, 3575, 3574, 3572,
+     3580, 3581, 3586, 6029, 3583, 3591, 3573, 3595, 3597, 3604,
+     3605, 3606, 3601, 3608, 3609, 3616, 6029, 3611, 3614, 3612,
+     3615, 3625, 3617, 3626, 3622, 6029, 3629, 3628, 3630, 6029,
+     3633, 3631, 3638, 3643, 3644, 3651, 3646, 3648, 3649, 3650,
+     6029, 3656, 6029, 3654, 3658, 3662, 6029, 3660, 3665, 3666,
+     3668, 3669, 3674, 3675, 3682, 3673, 3676, 3683, 3684, 3686,
+     3687, 3694, 3689, 3691, 3695, 3696, 6029, 3697, 3699, 3702,
 
-     3699, 3693, 5940, 3688, 3700, 3703, 3705, 3706, 3707, 3709,
-     3710, 3708, 3711, 3712, 5940, 3713, 3716, 3724, 3717, 3725,
-     3729, 3736, 3730, 5940, 3737, 3738, 3739, 3743, 3744, 5940,
-     3746, 5940, 3747, 3749, 3752, 3754, 3753, 5940, 3759, 3760,
-     3763, 3766, 3768, 3767, 3770, 3771, 3777, 3778, 3785, 3781,
-     3780, 3782, 5940, 3783, 3787, 3789, 3796, 3784, 3791, 3800,
-     3803, 3804, 3805, 3810, 3807, 3814, 3816, 3818, 3820, 3812,
-     5940, 3822, 3824, 3823, 3838, 3833, 3828, 5940, 3829, 3843,
-     3845, 5940, 3836, 3835, 3847, 3852, 3839, 3846, 3853, 3854,
-     3858, 5940, 3859, 3860, 3861, 3862, 3865, 3866, 5940, 5940,
+     3704, 3706, 3708, 3712, 3714, 3716, 6029, 6029, 3722, 6029,
+     3723, 3718, 3724, 6029, 3727, 3725, 3736, 2332, 3731, 3735,
+     3744, 3738, 6029, 3741, 3745, 3749, 3747, 3751, 3752, 3754,
+     3755, 3753, 3758, 3757, 6029, 3760, 3759, 3762, 3768, 3769,
+     3774, 3770, 3778, 6029, 3782, 3781, 3784, 3785, 3788, 6029,
+     3791, 6029, 3792, 3794, 3793, 3797, 3796, 6029, 3804, 3807,
+     3809, 3801, 3811, 3812, 3813, 3817, 3819, 3820, 3829, 3825,
+     3826, 3824, 3834, 3835, 6029, 3831, 3832, 3842, 3844, 3838,
+     3847, 3854, 3851, 3855, 3852, 3859, 3849, 3862, 3864, 3866,
+     3869, 3870, 6029, 3871, 3876, 3872, 3885, 3873, 3877, 6029,
 
-     3874, 5940, 3876, 3863, 3877, 3878, 3879, 3885, 3884, 3888,
-     3890, 3887, 3891, 3898, 3899, 3908, 3911, 3915, 3910, 3914,
-     3900, 5940, 5940, 3917, 3918, 3921, 3924, 3925, 3927, 3928,
-     3935, 3931, 3937, 3941, 3942, 3949, 5940, 3948, 3934, 3951,
-     5940, 3932, 3945, 3953, 3956, 3958, 3959, 3962, 3960, 3961,
-     3964, 3968, 3965, 3970, 3974, 3972, 3975, 3973, 3983, 3981,
-     3982, 3990, 5940, 3991, 3984, 3993, 3995, 3996, 3997, 4001,
-     4002, 4004, 5940, 4006, 4008, 4010, 4011, 4005, 4015, 4026,
-     4030, 4032, 4023, 4033, 4034, 4036, 4040, 4037, 5940, 4044,
-     4041, 4043, 4047, 4051, 4053, 4054, 4056, 4057, 4065, 4062,
+     3886, 3887, 3890, 6029, 3881, 3891, 3896, 3900, 3897, 3901,
+     3902, 3903, 3906, 6029, 3904, 3908, 3907, 3909, 3923, 3913,
+     6029, 6029, 3924, 6029, 3925, 3910, 3926, 3929, 3912, 3935,
+     3939, 3936, 3949, 3932, 3942, 3950, 3940, 3958, 3960, 3962,
+     3961, 3959, 3963, 6029, 6029, 3966, 3969, 3968, 3972, 3973,
+     3975, 3976, 3985, 3981, 3988, 3991, 3992, 3999, 6029, 3978,
+     3980, 3998, 6029, 3996, 4001, 4003, 4004, 4005, 4007, 4008,
+     4009, 4011, 4012, 4014, 4018, 4015, 4023, 4017, 4020, 4027,
+     4031, 4035, 4033, 4038, 6029, 4039, 4040, 4041, 4042, 4044,
+     4045, 4049, 4050, 4052, 6029, 4054, 4056, 4058, 4053, 4057,
 
-     4066, 4068, 4070, 4058, 4074, 4076, 4060, 5940, 4080, 4082,
-     4078, 4087, 4084, 4088, 4089, 4095, 4099, 4091, 4093, 4100,
-     4104, 5940, 4101, 4105, 4107, 4109, 4115, 4106, 4112, 4116,
-     5940, 4118, 4120, 4123, 4124, 4126, 4129, 4132, 4133, 4136,
-     4135, 4139, 5940, 4141, 4143, 4146, 4149, 4150, 4152, 4155,
-     4154, 5940, 4156, 4162, 4164, 4171, 4166, 4175, 4172, 4176,
-     4168, 4170, 4182, 4186, 4188, 4189, 4190, 4178, 4200, 4202,
-     4201, 5940, 4184, 5940, 4203, 4206, 4214, 4209, 4191, 5940,
-     4215, 4216, 4220, 4221, 4217, 5940, 4222, 4223, 4225, 4229,
-     5940, 4224, 4228, 4230, 4235, 4238, 4242, 5940, 4245, 4246,
+     4063, 4074, 4078, 4080, 4067, 4072, 4083, 4081, 4087, 4089,
+     6029, 4091, 4088, 4092, 4095, 4098, 4100, 4101, 4103, 4104,
+     4106, 4109, 4110, 4114, 4117, 4111, 4118, 4119, 4121, 6029,
+     4123, 4130, 4126, 4132, 4134, 4135, 4136, 4137, 4143, 4144,
+     4146, 4147, 6029, 4150, 4148, 4155, 6029, 4151, 4156, 4157,
+     4158, 4160, 4164, 4166, 4169, 6029, 4174, 4168, 4170, 4175,
+     4176, 4178, 4180, 4185, 4182, 4190, 4195, 6029, 4187, 4197,
+     4200, 4193, 4201, 4203, 4204, 4207, 6029, 4211, 4212, 4208,
+     4225, 4210, 4226, 4222, 4229, 4221, 4228, 4232, 4230, 4236,
+     4238, 4240, 4237, 4248, 4250, 4252, 6029, 4243, 6029, 4253,
 
-     4248, 4257, 4258, 4255, 4256, 4259, 4261, 4262, 4263, 4264,
-     4272, 4267, 4269, 5940, 4271, 4277, 4279, 4283, 4284, 4285,
-     4286, 4292, 4287, 5940, 4289, 4295, 4296, 4297, 4298, 4299,
-     4301, 4309, 4304, 4307, 5940, 4308, 4312, 4320, 4009, 4321,
-     5940, 5940, 4313, 4328, 4330, 4318, 4331, 5940, 4322, 4340,
-     4335, 4337, 4339, 5940, 5940, 4342, 5940, 4338, 5940, 4343,
-     4345, 5940, 5940, 4346, 4349, 4350, 4353, 4360, 5940, 4363,
-     5940, 4370, 4365, 4352, 4354, 4367, 5940, 4369, 4371, 4374,
-     5940, 4377, 4384, 4379, 4380, 5940, 4382, 4385, 4387, 5940,
-     4389, 4392, 4393, 4394, 4399, 4396, 4400, 4403, 4406, 4407,
+     4254, 4264, 4259, 4257, 6029, 4265, 4266, 4270, 4261, 4271,
+     6029, 4272, 4267, 4273, 4274, 6029, 4275, 4285, 4287, 4289,
+     4292, 4293, 6029, 4296, 4297, 4298, 4305, 4308, 4310, 4304,
+     4311, 4313, 4306, 4314, 4315, 4323, 4321, 4319, 6029, 4322,
+     4327, 4329, 4331, 4332, 4334, 4338, 4340, 4337, 6029, 4343,
+     4344, 4345, 4346, 4347, 4349, 4352, 4359, 4355, 4356, 6029,
+     4362, 4358, 4372, 4367, 4368, 6029, 6029, 4371, 4376, 4379,
+     4373, 4380, 6029, 4383, 4390, 4386, 4389, 4391, 6029, 6029,
+     4393, 6029, 4394, 6029, 4395, 4397, 6029, 6029, 4396, 4402,
+     4403, 4405, 4407, 6029, 4415, 6029, 4417, 4418, 4404, 4416,
 
-     4409, 4410, 4411, 4422, 4424, 4426, 4428, 4429, 4413, 4432,
-     4433, 4435, 4438, 4439, 4440, 4442, 4444, 4445, 4447, 4449,
-     4452, 4453, 4454, 4455, 4456, 4457, 4459, 4466, 4469, 4471,
-     4470, 4472, 4474, 4473, 4475, 4477, 4481, 4483, 4484, 5940,
-     4482, 4485, 4488, 4415, 4491, 4501, 4503, 4494, 4510, 4512,
-     5940, 4514, 5940, 4516, 4502, 4518, 4504, 5940, 4519, 4522,
-     4521, 4524, 4525, 4526, 4528, 4527, 4531, 4532, 4535, 5940,
-     4538, 4533, 4542, 4553, 5940, 4545, 4557, 4541, 4548, 4558,
-     4560, 4561, 4562, 4567, 4563, 4569, 4571, 4578, 4573, 4574,
-     4576, 4581, 4564, 4577, 4585, 4592, 4588, 4596, 4600, 5940,
+     4421, 6029, 4422, 4424, 4423, 4425, 4430, 6029, 4431, 4439,
+     4432, 4434, 6029, 4443, 4436, 4444, 6029, 4445, 4448, 4451,
+     4452, 4454, 4453, 4457, 4460, 4461, 4464, 4466, 4465, 4467,
+     4469, 4478, 4480, 4482, 4483, 4473, 4484, 4486, 4492, 4488,
+     4490, 4494, 4496, 4498, 4499, 4504, 4506, 4508, 4501, 4509,
+     4510, 4507, 4515, 4511, 4517, 4524, 4521, 4525, 4526, 4528,
+     4529, 4533, 4534, 4536, 4539, 4540, 6029, 4532, 4538, 4542,
+     4549, 4543, 4556, 4558, 4567, 4569, 4570, 6029, 4572, 6029,
+     4574, 4544, 4548, 4564, 6029, 4576, 4577, 4578, 4579, 4580,
+     4581, 4582, 4585, 4586, 4588, 4590, 6029, 4593, 4587, 4594,
 
-     4593, 5940, 4601, 4602, 4603, 4604, 4606, 4605, 4607, 5940,
-     5940, 4608, 4613, 4618, 4614, 4609, 4620, 4630, 5940, 4622,
-     4631, 4633, 4623, 5940, 4638, 4639, 4641, 5940, 4642, 4643,
-     4644, 4646, 4647, 4650, 4651, 4653, 4655, 4657, 4661, 5940,
-     5940, 5940, 5940, 4663, 4665, 4668, 4670, 4672, 4673, 4675,
-     4677, 4674, 5940, 4679, 5940, 5940, 4681, 4688, 4680, 4690,
-     4691, 4692, 4696, 4698, 5940, 4697, 4702, 4703, 4700, 4710,
-     4714, 4716, 4717, 4701, 4718, 4726, 4724, 4727, 4725, 4730,
-     4732, 4734, 5940, 5940, 4737, 4739, 4741, 4748, 4746, 4749,
-     4758, 4753, 4755, 4756, 4759, 4761, 4743, 4768, 4772, 4770,
+     4598, 6029, 4602, 4608, 4610, 4612, 4613, 4614, 4615, 4616,
+     4619, 4617, 4622, 4624, 4631, 4626, 4627, 4618, 4638, 4632,
+     4639, 4640, 4646, 4650, 4651, 4655, 6029, 4641, 6029, 4647,
+     4657, 4658, 4661, 4662, 4663, 4665, 6029, 6029, 4666, 4668,
+     4673, 4664, 4669, 4675, 4677, 4678, 4685, 6029, 4680, 4690,
+     4692, 4696, 6029, 4682, 4697, 4699, 6029, 4700, 4701, 4703,
+     4705, 4706, 4714, 4711, 4715, 4718, 4708, 4722, 6029, 6029,
+     6029, 6029, 4726, 4719, 4729, 4723, 4730, 4731, 4733, 4738,
+     4732, 6029, 4745, 6029, 6029, 4746, 4748, 4735, 4750, 4752,
+     4739, 4754, 4756, 6029, 4757, 4761, 4762, 4759, 4769, 4771,
 
-     4767, 5940, 4771, 4777, 5940, 4773, 5940, 4778, 4781, 4745,
-     4782, 4784, 4787, 4788, 4790, 5940, 5940, 4791, 4792, 4794,
-     4798, 4800, 4802, 4801, 4804, 4805, 5940, 4806, 5940, 4807,
-     4814, 4809, 4815, 4823, 4826, 4828, 4830, 4825, 4831, 5940,
-     4832, 4834, 5940, 4835, 4837, 4838, 5940, 4842, 4845, 4849,
-     5940, 4855, 4846, 4852, 5940, 4859, 5940, 4856, 4860, 4861,
-     4868, 5940, 4863, 4869, 5940, 4872, 4875, 4877, 4866, 5940,
-     4864, 5940, 4878, 4885, 4886, 4889, 4881, 4891, 4892, 4893,
-     4894, 4901, 4900, 4902, 5940, 5940, 4910, 4897, 4903, 4907,
-     4912, 4919, 4914, 4917, 4916, 5940, 5940, 4924, 5940, 4922,
+     4773, 4776, 4765, 4775, 4784, 4777, 4785, 4779, 4787, 4789,
+     4791, 6029, 6029, 4795, 4797, 4798, 4805, 4802, 4806, 4809,
+     4810, 4812, 4813, 4800, 4816, 4818, 4825, 4826, 4823, 4821,
+     6029, 4827, 4831, 6029, 4829, 6029, 4830, 4837, 4836, 4838,
+     4840, 4843, 4844, 4846, 6029, 6029, 4847, 4848, 4850, 4857,
+     4853, 4858, 4859, 4861, 4862, 6029, 4863, 6029, 4864, 4871,
+     4877, 4865, 4879, 4886, 4888, 4892, 4885, 4889, 6029, 4887,
+     4870, 6029, 4901, 4897, 4898, 4899, 4903, 6029, 4904, 4907,
+     4909, 6029, 4911, 4912, 4914, 6029, 4921, 6029, 4915, 4917,
+     4924, 4929, 6029, 4925, 4926, 6029, 4931, 4933, 4934, 4938,
 
-     4925, 5940, 4926, 4931, 4932, 4933, 4935, 4936, 4940, 4942,
-     4943, 4944, 4945, 4946, 4952, 4964, 4948, 4962, 4968, 4970,
-     4972, 4974, 4966, 4976, 4977, 4978, 4979, 4980, 4983, 5940,
-     4985, 4986, 4987, 5940, 4991, 4992, 4994, 4996, 5940, 5007,
-     5002, 5008, 5009, 5940, 4995, 5015, 5012, 5010, 5020, 5027,
-     5023, 5022, 5940, 5940, 5940, 5024, 5033, 5940, 5038, 5025,
-     5028, 5030, 5940, 5034, 5040, 5940, 5940, 5041, 5042, 5044,
-     5055, 5940, 5045, 5940, 5046, 5940, 5054, 5056, 5062, 5060,
-     5940, 5065, 5071, 5940, 5074, 5077, 5079, 5080, 5068, 5081,
-     5082, 5940, 5090, 5086, 5092, 5094, 5083, 5085, 5098, 5095,
+     6029, 4939, 6029, 4940, 4942, 4943, 4947, 4948, 4950, 4952,
+     4953, 4954, 4961, 4959, 4962, 6029, 6029, 4970, 4956, 4967,
+     4972, 4974, 4981, 4973, 4978, 4977, 6029, 6029, 4983, 6029,
+     4985, 4986, 6029, 4984, 4991, 4990, 4995, 4996, 4997, 4999,
+     5002, 5004, 5012, 5005, 5003, 5016, 5026, 5010, 5028, 5030,
+     5032, 5034, 5036, 5038, 5006, 5021, 5039, 5040, 5042, 5043,
+     6029, 5045, 5047, 5046, 6029, 5052, 5048, 5057, 5053, 6029,
+     5060, 5061, 5066, 5067, 6029, 5068, 5072, 5069, 5074, 5077,
+     5078, 5079, 5088, 5080, 5081, 6029, 6029, 6029, 5092, 5085,
+     6029, 5099, 5091, 5095, 5100, 6029, 5101, 5102, 6029, 6029,
 
-     5102, 5099, 5105, 5940, 5107, 5109, 5110, 5116, 5108, 5118,
-     5112, 5940, 5120, 5940, 5121, 5122, 5125, 5128, 5123, 5126,
-     5050, 5131, 5130, 5141, 5138, 5940, 5143, 5147, 5940, 5144,
-     5940, 5149, 5940, 5150, 5151, 5152, 5153, 5940, 5155, 5159,
-     5160, 5161, 5940, 5162, 5164, 5170, 5940, 5940, 5171, 5181,
-     5172, 5173, 5185, 5187, 5174, 5189, 5182, 5190, 5176, 5198,
-     5197, 5200, 5201, 5203, 5204, 5205, 5940, 5940, 5940, 5210,
-     5209, 5217, 5214, 5215, 5225, 5220, 5940, 5223, 5226, 5224,
-     5233, 5230, 5235, 5940, 5232, 5236, 5237, 5239, 5241, 5242,
-     5246, 5940, 5250, 5257, 5253, 5245, 5260, 5264, 5267, 5269,
+     5103, 5104, 5106, 5115, 6029, 5107, 6029, 5108, 6029, 5111,
+     5112, 5121, 5123, 6029, 5125, 5133, 6029, 5136, 5139, 5141,
+     5142, 5124, 5127, 5143, 6029, 5153, 5145, 5149, 5156, 5152,
+     5157, 5158, 5159, 5166, 5161, 5165, 6029, 5167, 5168, 5169,
+     5175, 5162, 5172, 5179, 6029, 5183, 6029, 5180, 5184, 5185,
+     5191, 5188, 5190, 5194, 5196, 5192, 5206, 5195, 6029, 5208,
+     5211, 6029, 5198, 6029, 5213, 6029, 5215, 5216, 5217, 5220,
+     6029, 5222, 5203, 5226, 5230, 5227, 5228, 6029, 5236, 5229,
+     5239, 6029, 6029, 5234, 5246, 5244, 5241, 5252, 5256, 5242,
+     5258, 5248, 5260, 5245, 5267, 5253, 5264, 5266, 5271, 5275,
 
-     5270, 5940, 5272, 5940, 5940, 5273, 5940, 5274, 5276, 5277,
-     5278, 5940, 5281, 5283, 5282, 5284, 5286, 5940, 5294, 5287,
-     5289, 5290, 5940, 5940, 5301, 5940, 5304, 5305, 5306, 5315,
-     5311, 5313, 5317, 5314, 5940, 5312, 5318, 5322, 5324, 5325,
-     5940, 5326, 5328, 5329, 5330, 5333, 5337, 5339, 5340, 5341,
-     5940, 5343, 5335, 5358, 5354, 5940, 5342, 5360, 5940, 5940,
-     5345, 5364, 5365, 5940, 5940, 5940, 5367, 5940, 5371, 5377,
-     5381, 5385, 5368, 5940, 5387, 5376, 5384, 5940, 5380, 5388,
-     5390, 5392, 5940, 5940, 5389, 5396, 5393, 5401, 5402, 5940,
-     5404, 5406, 5411, 5419, 5421, 5409, 5423, 5425, 5432, 5405,
+     5273, 6029, 6029, 6029, 5268, 5279, 5287, 5283, 5285, 5290,
+     5289, 6029, 5291, 5292, 5293, 5300, 5298, 5302, 6029, 5305,
+     5295, 5303, 5306, 5309, 5304, 5311, 6029, 5322, 5325, 5326,
+     5318, 5329, 5336, 5338, 5340, 5341, 6029, 5343, 6029, 6029,
+     5314, 6029, 5327, 5330, 5344, 5347, 6029, 5351, 5345, 5353,
+     5354, 5355, 5356, 5358, 6029, 5367, 5359, 5362, 5364, 6029,
+     6029, 5374, 6029, 5377, 5378, 5370, 5386, 5382, 5385, 5388,
+     5390, 6029, 5389, 5391, 5392, 5396, 5398, 6029, 5399, 5400,
+     5401, 5402, 5405, 5410, 5412, 5403, 5413, 6029, 5415, 5414,
+     5431, 5427, 6029, 5416, 5428, 6029, 6029, 5438, 5440, 5442,
 
-     5413, 5427, 5429, 5430, 5436, 5433, 5440, 5449, 5445, 5447,
-     5454, 5455, 5940, 5940, 5457, 5940, 5940, 5459, 5462, 5464,
-     5466, 5468, 5470, 5472, 5940, 5407, 5474, 5475, 5476, 5477,
-     5940, 5479, 5481, 5478, 5482, 5487, 5485, 5489, 5491, 5940,
-     5940, 5483, 5500, 5492, 5505, 5494, 5940, 5507, 5502, 5508,
-     5509, 5511, 5513, 5516, 5940, 5515, 5517, 5940, 5940, 5519,
-     5940, 5940, 5940, 5940, 5940, 5940, 5940, 5940, 5520, 5940,
-     5524, 5528, 5536, 5539, 5940, 5525, 5533, 5444, 5529, 5540,
-     5940, 5541, 5544, 5545, 5551, 5543, 5546, 5552, 5556, 5559,
-     5557, 5560, 5561, 5562, 5566, 5563, 5567, 5569, 5940, 5940,
+     6029, 6029, 6029, 5444, 6029, 5448, 5452, 5456, 5460, 5451,
+     6029, 5459, 5461, 5463, 5417, 5465, 6029, 5466, 5467, 5468,
+     5472, 6029, 6029, 5469, 5474, 5476, 5475, 5477, 6029, 5478,
+     5482, 5488, 5498, 5500, 5490, 5501, 5495, 5509, 5516, 5493,
+     5502, 5511, 5514, 5515, 5512, 5522, 5529, 5524, 5526, 5528,
+     5533, 6029, 6029, 5535, 6029, 6029, 5537, 5540, 5542, 5544,
+     5546, 5548, 5550, 5552, 5553, 6029, 5554, 5556, 5557, 5433,
+     5558, 6029, 5561, 5560, 5562, 5568, 5564, 5569, 5567, 5572,
+     6029, 6029, 5565, 5360, 5573, 5574, 5584, 6029, 5585, 5592,
+     5587, 5589, 5590, 5593, 5591, 6029, 5597, 5595, 6029, 6029,
 
-     5940, 5568, 5570, 5580, 5572, 5589, 5591, 5594, 5596, 5583,
-     5586, 5597, 5598, 5599, 5601, 5605, 5613, 5608, 5609, 5610,
-     5611, 5617, 5612, 5614, 5619, 5940, 5623, 5940, 5624, 5940,
-     5940, 5629, 5634, 5632, 5625, 5636, 5643, 5639, 5641, 5645,
-     5646, 5648, 5650, 5940, 5652, 5655, 5940, 5656, 5657, 5940,
-     5658, 5660, 5662, 5659, 5663, 5666, 5669, 5677, 5668, 5940,
-     5940, 5671, 5679, 5680, 5684, 5687, 5694, 5689, 5693, 5695,
-     5696, 5686, 5708, 5940, 5704, 5706, 5710, 5940, 5712, 5707,
-     5713, 5714, 5715, 5723, 5718, 5719, 5940, 5721, 5940, 5725,
-     5727, 5730, 5728, 5729, 5731, 5740, 5738, 5742, 5940, 5745,
+     5598, 6029, 6029, 6029, 6029, 6029, 6029, 6029, 6029, 6029,
+     5600, 5612, 6029, 5606, 5617, 5621, 5623, 6029, 5608, 5618,
+     5610, 5624, 5625, 6029, 5626, 5629, 5628, 5483, 5630, 5634,
+     5637, 5632, 5636, 5641, 5638, 5643, 5646, 5647, 5648, 5653,
+     5642, 5656, 6029, 6029, 6029, 5660, 5664, 5666, 5667, 5671,
+     5672, 5678, 5680, 5668, 5675, 5682, 5681, 5683, 5689, 5690,
+     5697, 5692, 5696, 5693, 5699, 6029, 5701, 5694, 5702, 5704,
+     6029, 5707, 6029, 5710, 6029, 6029, 5712, 5715, 5717, 5713,
+     5724, 5726, 5723, 5727, 5729, 5730, 5734, 5739, 6029, 5731,
+     5736, 6029, 5741, 5742, 6029, 5743, 5744, 5745, 5747, 5753,
 
-     5749, 5746, 5751, 5753, 5756, 5757, 5758, 5760, 5762, 5766,
-     5770, 5772, 5773, 5763, 5776, 5774, 5940, 5784, 5775, 5940,
-     5785, 5786, 5778, 5787, 5788, 5940, 5796, 5792, 5798, 5799,
-     5802, 5803, 5940, 5805, 5808, 5809, 5940, 5813, 5940, 5940,
-     5814, 5812, 5815, 5821, 5823, 5940, 5940, 5940, 5848, 5855,
-     5862, 5869, 5876,   88, 5883, 5890, 5897, 5904, 5911, 5918,
-     5925, 5932
+     5750, 5754, 5757, 5768, 6029, 6029, 5751, 5758, 5761, 5773,
+     5765, 5781, 5777, 5774, 5782, 5783, 5784, 5791, 6029, 5790,
+     5792, 5794, 6029, 5795, 5786, 5800, 5796, 5798, 5808, 5801,
+     5806, 6029, 5809, 6029, 5812, 5804, 5818, 5814, 5821, 5822,
+     5824, 5826, 5828, 6029, 5827, 5829, 5832, 5836, 5838, 5842,
+     5843, 5844, 5846, 5849, 5855, 5859, 5860, 5861, 5852, 5864,
+     5856, 6029, 5866, 5862, 6029, 5872, 5873, 5870, 5874, 5879,
+     6029, 5883, 5876, 5884, 5885, 5888, 5890, 6029, 5892, 5899,
+     5894, 6029, 5900, 6029, 6029, 5902, 5896, 5904, 5909, 5911,
+     6029, 6029, 6029, 5937, 5944, 5951, 5958, 5965,   88, 5972,
+
+     5979, 5986, 5993, 6000, 6007, 6014, 6021
     } ;
 
-static const flex_int16_t yy_def[3063] =
+static const flex_int16_t yy_def[3108] =
     {   0,
-     3048,    1, 3049, 3049, 3050, 3050, 3051, 3051, 3052, 3052,
-     3053, 3053, 3048, 3054, 3048, 3048, 3048, 3048, 3055, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3056, 3048, 3048, 3048, 3056, 3057, 3048, 3048,
-     3048, 3057, 3058, 3048, 3048, 3048, 3048, 3058, 3059, 3048,
-     3048, 3048, 3059, 3060, 3048, 3061, 3048, 3060, 3060, 3054,
-     3054, 3048, 3062, 3055, 3062, 3055, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3093,    1, 3094, 3094, 3095, 3095, 3096, 3096, 3097, 3097,
+     3098, 3098, 3093, 3099, 3093, 3093, 3093, 3093, 3100, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3101, 3093, 3093, 3093, 3101, 3102, 3093, 3093,
+     3093, 3102, 3103, 3093, 3093, 3093, 3093, 3103, 3104, 3093,
+     3093, 3093, 3104, 3105, 3093, 3106, 3093, 3105, 3105, 3099,
+     3099, 3093, 3107, 3100, 3107, 3100, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3056, 3056, 3057, 3057, 3058, 3058, 3048, 3059, 3059, 3060,
-     3060, 3061, 3061, 3060, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3101, 3101, 3102, 3102, 3103, 3103, 3093, 3104, 3104,
+     3105, 3105, 3106, 3106, 3105, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3060, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3105, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3060, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3105, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3060, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3093, 3099, 3105, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3060, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3048, 3048, 3054, 3048,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3105, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3093, 3093, 3099, 3093, 3093, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3060, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3105, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3048, 3054, 3054, 3060, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3105, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3048, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3093, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3048, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3048, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3048, 3054, 3048,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3093, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
 
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3048,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3093, 3099, 3093,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
 
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3093, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3093, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3048, 3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3048, 3048, 3054, 3048, 3054, 3048, 3054,
-     3054, 3048, 3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3093,
+     3099, 3093, 3099, 3093, 3099, 3099, 3093, 3093, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3093, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3048, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3093,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
 
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3048, 3048, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3048, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3093,
+     3093, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3093, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3048, 3054, 3054, 3048, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3048, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3048, 3054, 3048, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3048,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3048, 3054, 3048, 3054,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3093, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3093, 3099, 3093, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
 
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3048, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3048, 3048, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3048, 3048, 3054, 3054, 3054,
-     3054, 3048, 3054, 3048, 3054, 3048, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3093, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3093, 3099, 3093,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3093,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3093, 3093, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3093, 3093,
 
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3048, 3054,
-     3048, 3054, 3048, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3048, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3048, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3099, 3099, 3099, 3093, 3099, 3093, 3099, 3093, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3093, 3099, 3093, 3099, 3093, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3093, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3048, 3054, 3048, 3048, 3054, 3048, 3054, 3054, 3054,
-     3054, 3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3048, 3048, 3054, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3048, 3048,
-     3054, 3054, 3054, 3048, 3048, 3048, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3048, 3048, 3054, 3054, 3054, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
+     3099, 3093, 3093, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3093, 3093,
+     3099, 3093, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3093,
+     3093, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3093, 3099, 3099, 3093, 3093, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3048, 3054, 3048, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3048, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3048, 3048, 3054,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3054, 3048,
-     3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054, 3054,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3048,
+     3093, 3093, 3093, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099,
+     3099, 3093, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3093, 3099, 3093, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3093, 3093, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3093, 3093,
 
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3048, 3054, 3048,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3048, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048,
-     3048, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3048, 3054, 3054, 3054, 3048, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3048, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054,
+     3099, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3093, 3093, 3093, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099,
+     3093, 3099, 3093, 3099, 3093, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3093, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
 
-     3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054, 3054,
-     3054, 3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3048,
-     3054, 3054, 3054, 3054, 3054, 3048, 3054, 3054, 3054, 3054,
-     3054, 3054, 3048, 3054, 3054, 3054, 3048, 3054, 3048, 3048,
-     3054, 3054, 3054, 3054, 3054, 3048, 3048,    0, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048
+     3099, 3099, 3099, 3099, 3093, 3093, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099,
+     3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099,
+     3099, 3093, 3099, 3099, 3093, 3099, 3099, 3099, 3099, 3099,
+     3093, 3099, 3099, 3099, 3099, 3099, 3099, 3093, 3099, 3099,
+     3099, 3093, 3099, 3093, 3093, 3099, 3099, 3099, 3099, 3099,
+     3093, 3093,    0, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+
+     3093, 3093, 3093, 3093, 3093, 3093, 3093
     } ;
 
-static const flex_int16_t yy_nxt[5981] =
+static const flex_int16_t yy_nxt[6070] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   14,   18,   20,   21,   22,   23,   24,   25,   26,
@@ -1437,655 +1453,665 @@ static const flex_int16_t yy_nxt[5981] =
        61,   62,   72,   71,   63,  102,   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,  104,  158,  103,   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,
+       71,   80,   85,   88,   69,   86,   89,  152,   90,   91,
+       81,   71,   94,   71,   96,  164,   71,   71,   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,
+      100,  119,  101,  107,   71,  120,  226,  108,  144,  121,
+      152,  144,   71,  141,   71,  111,   71,  113,   71,  122,
+      123,  114,  124,  125,  155,  115,  126,   71,  130,   71,
+      131,  116,   71,  127,  117,   71,  134,  128,  129,  132,
 
-      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,
+      220,  118,  152,   71,  138,  133,  135,  159,  139,  160,
+      136,  137,  140,  146,   71,  146,  146,  156,  146,  149,
+      149,   75,   71,   75,   75,  151,   75,  151,  151,   70,
+      151,   70,   70,  154,   70,   72,  166,   71,   71,   73,
+       70,   75,  157,   75,   75,   71,   75,   71,  161,   71,
+      162,   71,   75,   76,   71,  170,  171,   71,  165,  174,
+      167,   71,   71,  163,   71,   71,  168,   71,  169,   71,
+       71,   71,   71,  172,  183,  176,  173,  184,  175,   71,
+      178,  179,  177,  192,   71,  181,  190,  186,  180,  182,
+      187,   71,   71,  185,   71,   71,  193,  195,   71,  150,
 
-      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,  196,   71,  188,  189,   71,  201,  202,   71,   71,
+       71,  191,  200,   71,  198,  204,  194,  197,  203,  199,
+       71,   71,  205,   71,  207,  209,   71,   71,   71,  214,
+      206,  208,  211,   71,   71,   71,  212,   71,   71,  216,
+       71,  210,   71,  228,   71,   71,  213,  222,  217,  219,
+       71,  225,  227,  215,  218,   71,  221,  231,  223,   71,
+      229,  233,  224,  230,   71,   71,  237,   71,  232,   71,
+       71,   71,   71,   71,  234,  238,  241,   71,  244,  240,
+      235,  236,  242,  245,  142,  142,  144,  239,  254,  144,
+      243,  146,  152,  146,  146,  246,  146,  149,  149,  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,   71,   71,  288,
-      289,  285,  295,  284,  286,   71,  299,  280,   71,  287,
-       71,  290,  297,  298,  291,  300,  292,  302,  296,   71,
+       71,  151,  151,   75,  151,   75,   75,   71,   75,   71,
+      248,   71,  247,   71,   71,  154,   71,   71,  250,  252,
+       71,  255,   71,  261,  251,  249,  253,  258,   71,   71,
+      262,   71,  257,  256,   71,   71,  265,  260,  266,  264,
+      259,  267,   71,   71,   71,   71,  268,   71,  275,  270,
+       71,   71,   71,  148,  271,  277,  263,  278,   71,  272,
+       71,  276,  281,  269,  283,  273,  274,   71,   71,   71,
+      279,  280,  284,   71,   71,   71,   71,   71,   71,   71,
+       71,  290,  291,  285,  297,   71,  287,   71,  286,  288,
+       71,  282,  348,  289,   71,  292,  299,  300,  293,   71,
 
-       71,   71,   71,   71,   71,  304,  305,  301,  293,  307,
-      294,   71,   71,  308,   71,  313,  146,   71,  310,   71,
-      303,  306,  309,  311,   71,   71,  317,   71,   71,   71,
-       71,   71,  312,  314,  315,   71,  316,   71,   71,  318,
-      320,  319,   71,   71,  325,   71,  321,   71,   71,  326,
-       71,   71,  327,  322,  331,  329,   71,   71,  323,  334,
-       71,   71,   71,  324,   71,   71,  328,  330,   71,  336,
-      337,   71,   71,  340,  332,  333,  341,  335,  339,   71,
-      338,  342,   71,  343,  344,   71,   71,  346,  348,   71,
-      347,   71,  350,   71,   71,   71,   71,  351,   71,  345,
+      294,   71,  301,   71,  302,  298,  326,  304,  309,  306,
+       71,  307,  295,   71,  296,   71,  303,   71,  310,  305,
+       71,  312,  313,   71,   71,  311,  308,   71,   71,  315,
+      314,   71,   71,   71,   71,   71,   71,   71,  317,   71,
+      319,   71,   71,   71,  316,  321,  323,   71,   71,  328,
+       71,  324,  322,  318,  329,   71,   71,   71,  320,  334,
+       71,  330,  325,  327,  332,   71,  331,  337,   71,   71,
+       71,   71,  333,   71,  339,  335,  336,   71,  342,  340,
+      343,  344,   71,   71,  346,   71,   71,   71,  338,  341,
+       71,   71,  349,  350,   71,  347,  351,  353,   71,   71,
 
-       71,  354,   71,  151,   71,   71,   71,  361,  144,   71,
-      357,  359,  349,   71,  352,  355,  353,  362,   71,  356,
-       71,   71,   71,   71,  358,  363,  364,  365,  360,   71,
-       71,   71,  367,   71,  371,  372,   71,  366,  374,  370,
-       71,   71,   71,  373,  369,   71,  375,  368,  376,   71,
-      378,   71,   71,  379,   71,   71,   71,   71,  382,   71,
-      377,  383,   71,  385,   71,   71,  387,  388,  384,   71,
-      380,  381,   71,  389,   71,   71,  386,   71,  390,   71,
-       71,  392,  393,  394,  395,   71,   71,   71,  399,   71,
-       71,   71,   71,  396,  400,  391,  402,   71,   71,  398,
+      354,  345,   71,   71,  357,   71,  152,   71,  356,   71,
+       71,   71,  147,  364,   71,  360,  362,  355,  358,   71,
+      352,  365,   71,   71,  359,   71,  368,   71,  366,  361,
+      367,   71,   71,  363,   71,   71,   71,  369,   71,  374,
+      375,  376,   71,  378,  373,  370,   71,   71,   71,  372,
+      377,  379,  371,   71,   71,   71,  381,   71,  382,   71,
+       71,   71,   71,  385,   71,  380,  386,  388,   71,  383,
+      387,  390,  393,   71,  384,   71,  392,   71,  389,   71,
+      396,  391,   71,   71,  395,  397,   71,   71,   71,  394,
+       71,   71,   71,  402,   71,   71,   71,  403,   71,  145,
 
-       71,   71,  405,   71,   71,  410,  397,  407,  401,   71,
-      409,   71,  411,   71,   71,   71,  403,   71,  404,  438,
-       71,  406,  421,  419,  408,  412,   71,   71,   71,   71,
-      422,  425,  423,  420,  430,  413,  142,   71,  414,  431,
-       71,   71,  426,  415,  416,  417,  418,   71,  424,  427,
-       71,   71,  428,  429,  432,   71,   71,   71,  433,   71,
-      440,  434,  435,   71,  436,  437,   71,   71,  439,   71,
-       71,  442,  441,   71,   71,  447,   71,  465,  453,  443,
-       71,   71,   71,  448,   71,  449,   71,   71,  444,  446,
-      445,  452,  454,  451,  450,   71,   71,   71,   71,  457,
+      405,   71,   71,  401,   71,  399,  398,   71,  408,  400,
+       71,   71,  413,  404,  410,   71,  412,  406,   71,  407,
+      409,   71,  415,   71,  414,   71,   71,   71,  424,  428,
+       71,  411,   71,  423,  422,   71,  443,   71,  425,  430,
+      426,  416,  143,  429,  417,   71,   71,  431,  432,  418,
+      419,  420,  421,  433,   71,   71,  427,  435,  434,   71,
+       71,   71,   71,  436,   71,   71,  437,   71,   71,  445,
+      438,  441,  444,  442,   71,   71,  446,  439,  440,  447,
+       71,   71,  452,   71,  449,   71,   71,  448,   71,   71,
+      453,  457,  454,  458,  469,   71,  451,   71,   71,   71,
 
-      455,  458,   71,  466,   71,  460,  456,  464,   71,   71,
-       71,  459,  467,   71,   71,  468,   71,   71,  461,  469,
-       71,  462,  483,  463,  479,  470,   71,   71,   71,  471,
-       71,  484,  481,  732,  486,  480,   71,  472,   71,  473,
-       71,  474,  482,   71,   71,  494,  496,  485,  151,  495,
-      498,  497,   71,   71,  475,  500,   71,  476,  501,  477,
-      504,  478,   71,   71,  487,  488,   71,   71,   71,  499,
-       71,   71,  502,   71,  489,  503,  490,  491,  492,  505,
-      508,  493,  507,   71,   71,   71,   71,  506,  513,  514,
-      509,  511,  516,  510,   71,  517,   71,   71,   71,   71,
+      450,  455,  459,  456,   71,   71,   71,  470,  462,  460,
+      463,   71,  464,  471,  465,  461,  472,   71,   71,   71,
+       71,   71,   71,  473,   71,  474,   71,  466,  152,  152,
+      467,  475,  468,   71,   71,  476,  489,   71,   71,  486,
+      484,  487,  485,  477,   71,  478,   71,  479,  488,  504,
+       71,  491,  490,  499,   71,  500,  501,   71,   71,   71,
+      480,  502,   71,  481,  503,  482,   71,  483,   71,  505,
+      492,  493,  506,  508,   71,  507,   71,   71,   71,  509,
+      494,  586,  495,  496,  497,   71,   71,  498,  513,   71,
+       71,  512,   71,   71,   71,   71,  511,  519,  514,   71,
 
-      515,  521,   71,  512,   71,   71,   71,   71,   71,  519,
-      524,  525,  526,  520,   71,   71,  518,   71,   71,  531,
-      523,   71,   71,  536,  528,  533,  527,  522,   71,   71,
-       71,  529,  530,  534,   71,   71,   71,  532,   71,   71,
-       71,  546,   71,  547,   71,  538,   71,  537,  535,  542,
-      539,  545,  541,  540,   71,  548,   71,  549,   71,  553,
-      543,  151,  544,   71,  551,  550,   71,   71,   71,  556,
-      552,   71,  554,   71,  555,  558,   71,   71,  559,   71,
-      561,  562,   71,   71,  557,   71,  563,   71,   71,   71,
-      560,   71,  568,  566,  567,   71,   71,   71,  564,   71,
+      510,  515,   71,  522,  521,  518,  516,   71,  520,  517,
+       71,  524,  526,   71,   71,  523,   71,   71,   71,   71,
+       71,  525,  529,  530,  531,   71,   71,   71,   71,  536,
+      528,   71,  538,   71,  535,  533,  532,  539,  527,   71,
+      541,  534,   71,   71,   71,   71,   71,  537,   71,   71,
+      542,   71,  540,  551,  547,  552,   71,  543,  550,  544,
+      546,   71,  545,  554,   71,  548,   71,  549,  557,   71,
+      553,   71,  556,   71,  558,   71,   71,  555,  559,   71,
+      561,  563,   71,   71,   71,   71,  566,  567,  564,  562,
+       71,   71,   71,   71,  568,  560,   71,  565,   71,   71,
 
-      569,   71,   71,   71,  574,   71,  565,  570,  578,  575,
-       71,  573,   71,  577,  576,  572,  571,   71,  580,   71,
-       71,  582,   71,   71,   71,   71,   71,   71,   71,   71,
-       71,  579,  584,  592,  585,  587,  594,   71,  593,   71,
-       71,  581,   71,  583,  591,  588,  586,  589,  590,   71,
-       71,  596,   71,   71,  595,  599,   71,  602,  597,   71,
-      603,  598,  604,   71,  605,   71,   71,  600,   71,   71,
-       71,  601,   71,  608,   71,   71,  611,   71,   71,  607,
-      612,   71,  614,   71,   71,   71,  644,  610,  606,  613,
-       71,  609,   71,   71,  615,   71,  617,  628,   71,  631,
+      573,  571,   71,  572,   71,   71,  569,   71,  574,   71,
+       71,   71,  579,  570,  575,  580,   71,  582,   71,  578,
+       71,   71,  581,  577,  576,  583,   71,  585,   71,  587,
+       71,   71,   71,   71,   71,   71,   71,   71,  589,  584,
+      590,  592,  588,   71,  599,  594,  601,   71,   71,  598,
+       71,   71,   71,  591,  593,  595,  600,  596,   71,   71,
+       71,   71,  603,  597,  602,   71,  604,  609,  606,  605,
+       71,  610,   71,   71,  607,  611,  608,  612,   71,   71,
+       71,   71,   71,   71,  614,  615,  618,   71,   71,   71,
+       71,   71,  619,  621,  620,   71,   71,   71,   71,   71,
 
-      616,   71,  618,   71,  626,  627,   71,  619,  632,  620,
-       71,  629,  633,   71,  630,  621,   71,  622,  635,   71,
-      623,  624,  636,  638,   71,  634,   71,  625,  637,   71,
-       71,   71,  640,  641,  639,   71,  646,   71,   71,   71,
-       71,   71,   71,   71,  149,   71,  643,  642,  652,   71,
-      648,  653,  647,   71,  649,  656,  645,   71,  151,  650,
-       71,  659,  658,  651,  654,   71,  657,   71,  655,   71,
-       71,   71,  660,   71,   71,   71,   71,  668,  666,   71,
-      661,  670,   71,   71,  663,   71,  664,  669,  662,  667,
-      671,  665,  673,   71,   71,  672,   71,  674,   71,   71,
+      616,  613,  617,  635,  624,  622,   71,  150,   71,  623,
+       71,  625,  634,  642,  672,  633,  626,  636,  627,   71,
+       71,  645,  637,  638,  628,   71,  629,   71,   71,  630,
+      631,   71,  646,  639,   71,  641,  632,  640,   71,   71,
+      644,  643,  648,   71,   71,  651,   71,   71,  653,   71,
+      647,   71,   71,   71,   71,   71,   71,   71,   71,  148,
+      659,  649,   71,  650,  654,  655,  656,  660,  663,   71,
+       71,  652,  662,  657,  658,  661,  152,  666,  664,   71,
+      665,   71,  667,   71,   71,   71,   71,   71,  147,  673,
+       71,   71,   71,  675,  668,  676,  677,   71,  670,  678,
 
-       71,   71,  675,   71,  679,  678,   71,  676,   71,  677,
-      684,  695,  680,   71,   71,  685,   71,  687,   71,  681,
-      688,   71,  682,  689,  683,   71,  686,  690,   71,   71,
-      691,   71,  692,   71,   71,  693,  694,   71,   71,   71,
-      698,   71,  697,   71,  696,   71,  699,  702,  703,   71,
-       71,   71,   71,  704,   71,  708,  706,   71,   71,   71,
-      147,   71,  700,  709,  701,   71,   71,   71,  705,  711,
-       71,  710,  707,   71,  712,   71,  715,  714,  713,   71,
-       71,  720,   71,  716,  718,  719,  717,  722,  721,   71,
-       71,  723,  724,   71,  725,   71,   71,   71,   71,  728,
+      669,  671,  680,  674,  679,   71,   71,   71,   71,   71,
+      682,   71,   71,   71,   71,   71,  686,  685,  681,   71,
+      694,   71,  691,  683,  687,   71,  684,  692,   71,   71,
+      690,  688,  693,  696,  689,  695,   71,  697,   71,   71,
+      698,   71,  699,   71,   71,   71,  700,  701,   71,   71,
+      702,   71,  707,   71,  705,   71,   71,  704,  706,  710,
+      709,   71,  703,   71,   71,   71,   71,  711,   71,  713,
+      715,   71,   71,  716,  708,  718,   71,   71,   71,  712,
+      719,   71,  722,   71,  720,  717,  714,   71,   71,   71,
+       71,  729,  725,  726,  145,  721,  723,   71,   71,  724,
 
-      727,   71,  729,   71,   71,   71,  736,   71,  734,   71,
-       71,   71,   71,   71,  730,  146,  726,  733,  737,  731,
-       71,  740,  742,   71,   71,  735,  744,  739,   71,  738,
-      743,  749,  741,  745,  746,   71,   71,   71,  747,   71,
-      751,  753,  748,   71,   71,   71,   71,   71,  752,   71,
-      755,  756,  754,  750,   71,   71,  757,   71,   71,  762,
-       71,   71,   71,  760,  761,   71,  765,  758,  759,  764,
-       71,  767,   71,   71,  771,   71,  769,  763,   71,  768,
-       71,   71,  766,  773,  774,   71,  776,  772,   71,  775,
-       71,  770,   71,   71,  778,  780,   71,   71,   71,   71,
+       71,   71,   71,  727,  731,  728,  732,  730,   71,   71,
+       71,   71,  735,  734,   71,  736,  737,   71,   71,   71,
+       71,  739,   71,  741,  743,   71,   71,  749,  733,  738,
+      740,  744,   71,   71,   71,   71,  746,   71,  751,  742,
+       71,  747,   71,  750,  143,  745,  748,  752,  753,   71,
+       71,   71,  754,   71,   71,   71,  755,  760,  756,  758,
+      761,  759,  762,   71,   71,   71,   71,  757,   71,  763,
+      764,  765,   71,   71,  771,   71,  766,   71,   71,   71,
+       71,   71,  776,  769,  770,  767,  768,  773,   71,   71,
+       71,  780,   71,  774,  772,  778,  777,   71,   71,  775,
 
-       71,   71,  786,   71,   71,  787,  777,  779,   71,   71,
-       71,   71,  788,   71,  781,  782,  783,   71,  784,  789,
-      785,  795,   71,   71,  790,  793,   71,   71,  791,   71,
-      792,   71,  794,   71,   71,  797,  796,  800,   71,   71,
-       71,   71,   71,  808,   71,  798,   71,   71,  799,  801,
-      802,  809,   71,   71,   71,  807,  803,  804,  805,  806,
-      812,   71,   71,  810,  811,   71,  813,   71,  814,   71,
-       71,   71,  817,  815,  818,  816,  820,  819,   71,   71,
-       71,   71,   71,  821,   71,  822,  823,  151,   71,  824,
-       71,  826,  828,  829,   71,  825,  827,   71,  830,   71,
+      783,   71,  781,  782,   71,  784,   71,   71,  785,   71,
+      779,  787,   71,   71,  789,   71,   71,   71,   71,  795,
+       71,   71,   71,  788,  796,   71,  786,   71,   71,   71,
+      797,  790,   71,  791,  792,   71,  793,  798,  794,  804,
+       71,   71,  799,   71,  802,   71,  800,   71,  801,   71,
+      803,   71,   71,  806,  805,  809,   71,   71,   71,   71,
+       71,  817,  807,   71,   71,   71,  808,  810,  811,  818,
+       71,   71,   71,  816,  812,  813,  814,  815,  821,   71,
+       71,  820,  819,   71,  822,   71,   71,  823,   71,   71,
+      826,  824,  828,  825,  827,   71,   71,  833,   71,   71,
 
-       71,   71,  831,  836,   71,   71,  832,   71,  837,  839,
-       71,   71,  842,   71,  833,  834,  838,   71,   71,   71,
-      840,  835,   71,  844,  841,   71,  848,   71,   71,  845,
-       71,   71,   71,  843,   71,  849,   71,  850,   71,   71,
-      144,   71,   71,  847,   71,  865,  851,  846,  862,   71,
-      863,  860,   71,  866,  853,  861,  852,   71,  864,   71,
-      867,   71,  854,   71,   71,  872,  855,  869,   71,  856,
-       71,   71,  868,  880,   71,   71,  857,  858,  870,  859,
-       71,  885,   71,  871,   71,  873,  874,   71,  875,   71,
-      884,  876,   71,  882,  949,  881,  877,   71,  887,  886,
+      829,  830,   71,   71,  831,  832,   71,  152,   71,  838,
+       71,  835,  837,  834,  839,  836,   71,   71,   71,   71,
+      845,   71,  840,  848,   71,  841,   71,  846,   71,   71,
+      851,   71,  842,  843,   71,  847,   71,  849,  853,  844,
+       71,   71,   71,  857,   71,   71,   71,   71,  850,   71,
+       71,  852,  854,  858,  859,   71,   71,   71,   71,   71,
+      856,  889,  860,   71,  871,  872,  855,   71,  875,   71,
+      862,  861,   71,  869,  870,   71,   71,  863,   71,  873,
+      874,  864,   71,  876,  865,   71,  877,  878,   71,  881,
+       71,  866,  867,   71,  868,   71,   71,   71,  880,  879,
 
-       71,  889,  878,  879,  888,  883,   71,   71,   71,   71,
-      891,  890,   71,  892,  893,   71,   71,   71,  894,   71,
-       71,  895,   71,  897,   71,  901,   71,   71,   71,   71,
-      900,  896,   71,  904,   71,   71,   71,  898,  908,  899,
-      909,  902,  903,  926,   71,  905,  906,  910,   71,  911,
-      914,  907,   71,  915,  912,   71,   71,  913,   71,   71,
-      917,   71,   71,  916,  918,   71,   71,   71,  919,  921,
-       71,  922,   71,  920,   71,  923,   71,   71,  928,   71,
-       71,  925,   71,   71,   71,  931,   71,   71,   71,  929,
-      930,   71,  924,  933,   71,  934,  927,  936,   71,  935,
+       71,  882,  883,   71,  884,  904,  893,  885,  891,  890,
+      894,   71,  886,   71,   71,  896,   71,   71,  887,  888,
+      895,  892,   71,  898,   71,   71,   71,   71,  900,  899,
+      906,  897,  901,  902,   71,   71,  905,  903,   71,   71,
+       71,   71,  910,   71,   71,   71,   71,  909,   71,  913,
+      917,   71,  919,   71,  930,   71,   71,  912,  907,  908,
+      911,   71,  914,  915,  920,  923,  918,   71,  916,  921,
+       71,   71,  922,  924,   71,   71,  926,  927,   71,   71,
+      925,   71,   71,   71,  928,  931,   71,   71,   71,  929,
+       71,  932,   71,  934,   71,   71,   71,  935,  939,   71,
 
-       71,  937,  932,   71,   71,  938,   71,   71,  945,  943,
-       71,   71,  940,  941,  944,   71,   71,  939,   71,  942,
-       71,   71,   71,  950,  952,  946,  955,  948,  953,   71,
-      947,  951,   71,   71,   71,   71,   71,  954,   71,   71,
-       71,   71,  961,  966,  963,   71,   71,   71,  142,   71,
-       71,   71,   71,  956,  957,  958,  967,  971,  959,  960,
-      965,  962,  968,  964,   71,  969,  970,   71,  974,   71,
-       71,   71,  973,   71,   71,   71,   71,   71,  972,   71,
-      976,  983,  978,   71,   71,  985,  987,   71,  988,   71,
-      975,   71,   71,  977,   71,  979,  981,  984,  980,  982,
+       71,  942,   71,   71,  941,  933,   71,   71,   71,  940,
+      936,  937,  944,  938,   71,  945,   71,  947,   71,  946,
+       71,  943,   71,  948,   71,   71,  954,  949,   71,  956,
+      950,  955,   71,  952,   71,   71,   71,   71,  953,   71,
+      964,   71,  961,  951,   71,  959,  963,   71,   71,  957,
+      962,   71,   71,  966,  958,   71,   71,   71,   71,   71,
+       71,  960,   71,  977,  974,   71,   71,  972,  965,   71,
+       71,   71,  967,   71,  970,  968,  969,  971,  979,  978,
+      975,   71,  973,   71,  976,   71,   71,  981,   71,  982,
+      980,  984,  985,   71,   71,  983,   71,  987,   71,   71,
 
-       71,   71,   71,   71,  986,  989,   71,  993,  990,   71,
-      995,  996,  991,   71,   71, 1000,  997,   71,   71,  999,
-      992,   71, 1002,   71,  994,   71,   71, 1005,  151,   71,
-       71, 1004,  998,   71, 1007,   71, 1008,   71, 1001,   71,
-       71,   71,   71, 1003, 1006, 1011,   71,   71,   71, 1023,
-       71,   71,   71,   71, 1024, 1009, 1014, 1010, 1012, 1026,
-       71, 1068,   71, 1049,   71, 1013, 1015, 1025, 1016,   71,
-       71,   71, 1017,   71, 1018, 1028, 1027, 1029, 1019,   71,
-     1020,   71,   71, 1033, 1030, 1021, 1031, 1032, 1034,   71,
-     1022,   71,   71, 1035,   71, 1036,   71, 1038,   71, 1039,
+       71,  994,   71,   71,  989,  986,  996,   71,   71,  998,
+      999,   71,   71,   71,  988,   71,   71,  995,  990,  992,
+       71,  991,  993,   71, 1000, 1002,   71,   71,  997,   71,
+     1001, 1004, 1007, 1003,   71, 1006,   71, 1011,   71, 1008,
+       71,   71, 1010,   71, 1005, 1009, 1013,   71,   71, 1016,
+      152,   71,   71, 1015,   71, 1019, 1018,   71,   71, 1014,
+     1012,   71,   71,   71,   71,   71, 1017, 1022,   71,   71,
+     1034,   71, 1037,   71,   71, 1035,   71,   71, 1021, 1020,
+     1023, 1039, 1025,   71, 1026,   71, 1027, 1024,   71, 1036,
+     1042, 1028,   71, 1029,   71, 1060,   71, 1030, 1040, 1031,
 
-       71, 1042,   71,   71, 1041,   71,   71, 1037, 1047, 1040,
-     1050, 1046, 1043, 1048,   71,   71, 1045, 1051,   71,   71,
-       71, 1044,   71,   71, 1054, 1052,   71, 1063,   71,   71,
-       71, 1066, 1062, 1067,   71,   71,   71, 1053,   71, 1055,
-     1064, 1065, 1072,   71, 1056,   71, 1057, 1074, 1069, 1073,
-       71,   71, 1058,   71, 1070, 1071,   71, 1059, 1060, 1075,
-       71, 1078,   71,   71, 1061,   71,   71,   71, 1079, 1076,
-     1080, 1081, 1084, 1077, 1082,   71,   71,   71,   71,   71,
-       71,   71, 1083,   71, 1085, 1087,   71,   71,   71,   71,
-       71,   71, 1092, 1089, 1094, 1086, 1093, 1088, 1091, 1096,
+       71, 1038,   71,   71, 1032, 1044, 1041, 1047, 1043, 1033,
+     1045,   71,   71,   71, 1046,   71,   71, 1049, 1050, 1048,
+     1053,   71,   71,   71, 1052, 1058, 1059,   71, 1051, 1057,
+     1054,   71,   71, 1061, 1062,   71, 1056,   71,   71,   71,
+       71,   71, 1055,   71,   71, 3093, 1074,   71, 1078, 1063,
+       71, 1073,   71, 1077, 1064, 1065,   71, 1066, 1075, 1076,
+       71,   71, 1067,   71, 1068, 1083,   71,   71, 1079, 1081,
+     1069, 1084, 1085,   71,   71, 1070, 1071, 1080,   71, 1089,
+     1082,   71, 1072,   71, 1086,   71,   71, 1088, 1090,   71,
+       71,   71, 1087,   71, 1095,   71,   71,   71, 1092, 1093,
 
-       71, 1090,   71,   71, 1098,   71, 1095, 1097,   71,   71,
-       71,   71,   71,   71,   71, 1104, 1105, 1101, 1106, 1109,
-     1099, 1100,   71, 1107, 1103,   71, 1102,   71, 1108,   71,
-       71, 1112,   71, 1116,   71, 1110, 1113,   71,   71, 1114,
-       71, 1122, 1115,   71,   71, 1111, 1117,   71,   71, 1124,
-       71,   71,   71,   71, 1118,   71, 1120, 1126, 1119, 1121,
-       71,   71,   71, 1128,   71, 1125, 1130, 1127, 1123, 1131,
-       71,   71, 1129,   71,   71, 1133, 1134,   71, 1132,   71,
-     1136,   71, 1139, 1140,   71, 1135,   71, 1138,   71,   71,
-       71, 1144, 1143, 1137,   71, 1141,   71, 1142,   71,   71,
+       71, 1098, 1096,   71,   71, 1091,   71, 1094,   71,   71,
+       71,   71,   71,   71, 1097, 1103,   71, 1099, 1100, 1104,
+     1102, 1107, 1105, 1101,   71, 1109, 1106,   71, 1108,   71,
+       71,   71,   71, 1110,   71,   71,   71, 1115,   71, 1116,
+     1117,   71, 1119, 1111, 1112, 1118, 1114, 1113, 1120,   71,
+       71,   71,   71, 1122,   71, 1125,   71,   71, 1121, 1129,
+     1126,   71,   71, 1123,   71, 1127, 1130, 1124, 1128,   71,
+       71,   71, 1135, 1137,   71,   71,   71, 1131,   71,   71,
+     1132, 1139, 1133,   71,   71, 1134,   71, 1141,   71, 1138,
+       71, 1136,   71, 1143,   71, 1144, 1142, 1140,   71, 1146,
 
-       71, 1150, 1148, 1151,   71,   71,   71,   71,   71,   71,
-     1152, 1153, 1145, 1149,   71, 1146, 1155, 1158, 1147, 1154,
-       71,   71,   71,   71, 1157, 1159, 1156, 1160,   71,   71,
-     1161,   71,   71,   71,   71, 1164, 1165,   71, 1162,   71,
-       71, 1170, 1171,   71,   71, 1166,   71,   71,   71, 1163,
-       71, 1168,   71, 1174,   71, 1167,   71, 1173, 1172, 1169,
-     1176, 1178, 1177, 1175,   71,   71,   71,   71,   71, 1184,
-       71,   71,   71, 1180, 1179,   71,   71, 1190,   71,   71,
-       71, 1188,   71, 1187, 1195, 1181, 1185, 1183, 1189, 1192,
-     1186, 1193, 1182,   71,   71,   71,   71,   71, 1194, 1196,
+       71,   71, 1145, 1147, 1148,   71, 1149, 1152, 1153,   71,
+       71, 1151,   71,   71,   71,   71,   71, 1150, 1156, 1154,
+       71, 1157,   71,   71,   71, 1163, 1161, 1164,   71,   71,
+     1155,   71, 1158,   71, 1165, 1159,   71, 1162,   71, 1168,
+       71, 1166, 1160, 1167, 1171,   71, 1169,   71, 1173,   71,
+       71,   71, 1172,   71,   71,   71,   71,   71, 1177, 1178,
+     1170,   71, 1174, 1175,   71,   71, 1183, 1184, 1179, 1176,
+       71,   71,   71,   71,   71,   71, 1181, 1187,   71, 1180,
+     1186,   71, 1191,   71, 1182, 1185,   71,   71, 1189,   71,
+     1188,   71,   71, 1190, 1197,   71, 1193,   71,   71,   71,
 
-     1191,   71,   71,   71,   71,   71,   71, 1199,   71,   71,
-     1197,   71, 1202, 1205,   71, 1198,   71,   71, 1200,   71,
-       71, 1203, 1220, 1201, 1208, 1206, 1209, 1204,   71,   71,
-     1215,   71,   71, 1211, 1207,   71, 1216, 1210, 1217,   71,
-       71,   71, 1212,   71, 1213,   71, 1219, 1214, 1218,   71,
-     1224,   71, 1223,   71, 1221,   71, 1226,   71, 1222, 1229,
-       71,   71, 1230,   71, 1227,   71, 1231,   71, 1225,   71,
-     1233, 1234,   71,   71, 1228,   71,   71,   71, 1235,   71,
-       71,   71,   71, 1232,   71,   71, 1241, 1236, 1237, 1239,
-       71, 1240, 1242,   71, 1238,   71, 1246,   71, 1251,   71,
+       71, 1192, 1203,   71,   71, 1201,   71,   71, 1194, 1200,
+     1233, 1196, 1198, 1202, 1199, 1205, 1195, 1206,   71,   71,
+     1208,   71,   71,   71, 1207,   71, 1204, 1209,   71,   71,
+       71,   71,   71,   71, 1212,   71, 1218,   71,   71, 1210,
+     1215,   71, 1211,   71,   71, 1213,   71, 1216,   71,   71,
+     1214, 1224, 1219, 1229, 1217, 1222,   71, 1228, 1221, 1220,
+     1225,   71, 1226,   71, 1223, 1227, 1230,   71, 1231,   71,
+       71,   71,   71,   71,   71,   71,   71, 1232, 1237, 1236,
+     1239, 1242,   71,   71, 3093, 1240,   71,   71, 1234, 1235,
+     1247, 1238, 1243,   71,   71, 1241,   71,   71, 1244, 1246,
 
-     1243,   71, 1245, 1244,   71, 1248, 1250,   71, 1247, 1253,
-       71,   71, 1257, 1252,   71, 1249, 1255, 1258,   71,   71,
-       71,   71, 1256,   71, 1262,   71, 3048, 1254,   71, 1272,
-     1270, 1271, 1261, 1259, 1260,   71,   71,   71, 1269, 1275,
-     1263, 1273,   71, 1264, 1265,   71,   71,   71, 1266,   71,
-       71, 1274, 1276,   71, 1267, 1277,   71, 1278, 1268,   71,
-     1280,   71,   71,   71, 1281,   71, 1282, 1279,   71, 1283,
-     1287, 1284, 1285,   71, 1290, 1291,   71,   71,   71, 1329,
-       71,   71, 1286, 1292,   71, 1294, 1289, 1288, 1293,   71,
-     1295,   71, 1296,   71, 1297, 1303, 1298,   71, 1299, 1300,
+       71,   71,   71, 1245,   71, 1248,   71,   71,   71,   71,
+       71,   71, 1249, 1254, 1252, 1250,   71, 1259,   71, 1253,
+     1251, 1255,   71,   71, 1264,   71, 1256,   71, 1258, 1257,
+       71, 1260, 1263,   71,   71, 1266,   71,   71, 1261, 1265,
+       71, 1268, 1262, 1270,   71,   71, 1269,   71, 1271,   71,
+       71, 1275,   71, 1267, 1273,   71, 1272, 1274,   71, 1284,
+     1282, 1283, 1992, 1276, 1287,   71, 1277, 1278,   71, 1285,
+       71, 1279, 1288,   71,   71, 1286,   71, 1280,   71, 1289,
+       71, 1281,   71, 1291,   71, 1290,   71, 1293,   71,   71,
+       71, 1294,   71, 1295, 1292,   71, 1296, 1300, 1298,   71,
 
-     1301,   71,   71,   71, 1302, 1307,   71, 1305,   71,   71,
-     1308,   71, 1306, 1310,   71,   71, 1304,   71,   71, 1316,
-       71, 1317,   71, 1311, 1312,   71,   71,   71, 1309,   71,
-     1318,   71, 1315, 1313, 1320,   71, 1314,   71,   71,   71,
-     1319, 1321,   71, 1325, 1322, 1326,   71, 1328,   71, 1323,
-       71,   71,   71, 1330, 1327,   71, 1331, 1334,   71, 1336,
-       71, 1332, 1324,   71, 1333,   71, 1337,   71, 1338,   71,
-     1341,   71, 1335,   71,   71,   71,   71, 1343,   71,   71,
-       71, 1345, 1347,   71,   71, 3048, 1349, 1346, 1339,   71,
-     1340,   71,   71, 1342, 1351, 1344, 1352, 1348,   71, 1350,
+     1303, 1304, 1297,   71,   71,   71,   71,   71, 1305, 1301,
+     1299,   71,   71, 1307,   71, 1306, 1317, 1302, 1308, 1312,
+     1309,   71, 1310,   71, 1311, 1318, 1313,   71, 1314, 1315,
+     1316,   71,   71,   71, 1322,   71,   71,   71, 1319, 1323,
+       71, 1325, 1321,   71,   71,   71,   71, 1331,   71, 1320,
+       71, 1326, 1327,   71,   71, 1332, 1333, 1324,   71,   71,
+     1330,   71,   71, 1328, 1329,   71, 1335,   71, 1338,   71,
+     3093, 1337, 1334, 1336, 1340, 1341,   71, 1343,   71,   71,
+       71, 1344, 1342, 1345,   71,   71,   71, 1349,   71, 1346,
+     1339,   71, 1351,   71,   71, 1348,   71, 1352,   71, 1353,
 
-     1353,   71,   71, 1354,   71, 1356, 1355, 1357,   71,   71,
-       71,   71, 1362, 1363, 1365, 1359,   71, 1360,   71,   71,
-       71, 1364,   71,   71, 1361,   71, 1358, 1369,   71,   71,
-       71, 1366,   71, 1373, 1374,   71, 1368, 1376,   71,   71,
-       71, 1375, 1367,   71,   71,   71,   71,   71,   71, 1370,
-     1371,   71, 1377,   71, 1383, 1372,   71, 1380, 1378,   71,
-     1381,   71, 1388,   71, 1379, 1382, 1387,   71, 1384,   71,
-     3048,   71, 1390, 1392, 1386,   71, 1385,   71, 1393,   71,
-       71,   71, 1389,   71, 1395, 1396,   71,   71, 1391, 1394,
-       71,   71, 1401, 1403, 1397, 1402, 1398, 1405, 1399,   71,
+       71, 1356,   71,   71, 1347,   71,   71,   71, 1358,   71,
+       71, 1350, 1360,   71,   71, 1362,   71, 1364, 1361, 1354,
+       71, 1355,   71, 1357,   71, 1366, 1359, 1367, 1363,   71,
+       71, 1365, 1368,   71, 1369, 1370,   71, 1371, 1372,   71,
+       71,   71,   71, 1377, 1378, 1380, 1374,   71, 1375,   71,
+       71,   71, 1379,   71,   71, 1376,   71, 1373, 1384,   71,
+       71,   71, 1381,   71, 1388, 1389,   71, 1383, 1391,   71,
+       71,   71, 1390, 1382,   71,   71,   71,   71,   71,   71,
+     1385, 1386,   71, 1392,   71, 1398, 1387,   71, 1395, 1393,
+       71, 1396,   71, 1403,   71, 1394, 1397, 1402,   71, 1399,
 
-     1404, 1400,   71,   71,   71,   71, 1406, 1408,   71, 1410,
-     1407,   71, 1409,   71,   71,   71, 1413,   71,   71, 1415,
-       71,   71, 1420, 1412,   71,   71, 1414,   71, 1421,   71,
-     1411, 1417,   71, 1424,   71, 1416, 1418,   71, 1419,   71,
-       71, 1425,   71, 1422,   71,   71, 1423,   71, 1427, 1431,
-     1433, 1426, 1428,   71, 1432, 1429,   71,   71, 1436,   71,
-       71, 1430,   71,   71, 1441, 1435, 1438, 1442, 1440,   71,
-       71, 1434,   71,   71, 1437,   71, 1443,   71, 1444, 1445,
-       71,   71,   71, 1439,   71, 1446, 1449, 1448,   71,   71,
-     1452, 1447,   71,   71,   71, 1451,   71,   71, 1458, 1450,
+       71, 3093,   71, 1405, 1407, 1401,   71, 1400,   71, 1408,
+       71,   71,   71, 1404,   71, 1410, 1411,   71,   71, 1406,
+     1409,   71,   71, 1416, 1418, 1412, 1417, 1413, 1420, 1414,
+       71, 1419, 1415,   71,   71,   71,   71, 1421, 1423,   71,
+     1425, 1422,   71, 1424,   71,   71,   71, 1428,   71,   71,
+     1430,   71,   71, 1435, 1427,   71,   71, 1429,   71, 1436,
+       71, 1426, 1432,   71, 1439,   71, 1431, 1433,   71, 1434,
+       71,   71, 1440,   71, 1437,   71,   71, 1438,   71, 1442,
+     1446, 1448, 1441, 1443,   71, 1447, 1444,   71,   71, 1451,
+       71,   71, 1445,   71,   71, 1456, 1450, 1453, 1457, 1455,
 
-     1460, 1454, 1455, 1459,   71, 1461,   71,   71, 1456,   71,
-     1463,   71, 1453,   71,   71, 1457,   71,   71,   71,   71,
-     1471, 1467,   71, 1466,   71, 1474,   71, 1462,   71, 1472,
-     1464,   71, 1465,   71, 1477,   71, 1468, 1470, 1469, 1476,
-       71,   71,   71,   71,   71,   71, 3048, 1475, 1473,   71,
-       71, 1485,   71,   71, 1478, 1486, 1488,   71, 1482,   71,
-     1479, 1480, 1481, 1491, 1484, 1487, 1483, 1489,   71,   71,
-       71,   71,   71,   71, 1490, 1495,   71,   71,   71, 1496,
-     1493, 1498,   71, 1492,   71, 1494, 1502,   71, 1504, 1503,
-       71,   71, 1497, 1499,   71,   71,   71, 1500, 1501,   71,
+       71,   71, 1449,   71,   71, 1452,   71, 1458,   71, 1459,
+     1460,   71,   71,   71, 1454,   71, 1461, 1464, 1463,   71,
+       71, 1467, 1462,   71,   71,   71, 1466,   71,   71, 1473,
+     1465, 1475, 1469, 1470, 1474,   71, 1476,   71,   71, 1471,
+       71, 1478,   71, 1468,   71,   71, 1472,   71,   71,   71,
+       71, 1486, 1482,   71, 1481,   71, 1489,   71, 1477,   71,
+     1487, 1479,   71, 1480,   71, 1492,   71, 1483, 1485, 1484,
+     1491,   71,   71,   71,   71,   71,   71,   71, 1490, 1488,
+       71,   71, 1500,   71,   71, 1493, 1501,   71, 3093, 1497,
+       71, 1494, 1495, 1496, 1508, 1499, 1502, 1498,   71, 1504,
 
-     1507,   71,   71, 1508, 1506, 1505, 1509,   71, 1513, 1514,
-       71,   71,   71,   71,   71,   71, 1510, 1519, 1517, 1511,
-       71, 1518,   71,   71, 1521,   71,   71, 1512,   71, 1515,
-       71, 1522,   71, 1516,   71, 1520, 1523,   71, 1524,   71,
-       71, 1528, 1525, 1526,   71, 1529,   71,   71,   71, 1530,
-     1527,   71, 1533,   71, 1535,   71,   71,   71, 1539,   71,
-     1531,   71, 1534,   71,   71, 1532,   71,   71, 1542, 1536,
-     1537, 1544,   71, 1540,   71,   71, 1547,   71, 1545, 1541,
-       71, 1538, 1543,   71, 1546,   71,   71, 1550, 1548,   71,
-     1552, 1549, 1553,   71,   71,   71, 1551,   71,   71, 1560,
+     1505,   71,   71, 1503, 1506,   71,   71, 1507,   71,   71,
+       71, 1509, 1512,   71, 1515, 1510, 1513,   71,   71, 1519,
+       71, 1511,   71,   71, 1521,   71,   71, 1520, 1516, 1514,
+       71,   71,   71,   71, 1518,   71, 1524, 1517, 1522, 1523,
+       71,   71, 1530, 1528, 1525, 1526, 1531,   71,   71,   71,
+       71,   71, 1527, 1529, 1536, 1534, 1533,   71, 1535,   71,
+       71, 1538,   71,   71, 1540,   71, 1539, 1532,   71,   71,
+       71, 1537, 1543,   71,   71, 1541,   71, 1546,   71,   71,
+       71,   71, 1545,   71, 1542, 1550,   71, 1552,   71, 1547,
+     1544,   71,   71, 1556,   71, 1551,   71,   71, 1549, 1548,
 
-       71,   71,   71, 1555, 1554, 1561,   71,   71,   71, 1558,
-     1569, 1564, 1565, 1556, 1557,   71,   71, 1567,   71,   71,
-       71, 1562, 1559, 1568, 1571,   71, 1563,   71, 1566,   71,
-       71, 1573,   71, 1575, 1572,   71,   71, 1578,   71, 1570,
-     1576,   71, 1579,   71, 1574,   71,   71,   71, 1584, 1583,
-       71,   71, 1580, 1577,   71,   71,   71, 1600, 1590, 1591,
-     1582, 1581, 1585,   71,   71,   71, 1587,   71, 1592, 1588,
-       71, 1586, 1598, 1602,   71, 1595, 1594, 1597,   71,   71,
-     1596, 1589,   71,   71, 1593,   71, 1601, 1599, 1603,   71,
-       71,   71,   71,   71, 1609, 1610, 1608,   71,   71, 1612,
+       71, 1553, 1559, 1554, 1561,   71,   71,   71, 1557,   71,
+     1562,   71, 1564,   71, 1558, 1560, 1555,   71,   71,   71,
+       71, 1567, 1570,   71, 1566, 1569,   71, 1563,   71,   71,
+       71, 1565,   71, 1572,   71, 1577,   71, 1568,   71,   71,
+       71, 1578,   71, 1575, 1571,   71, 3093, 1573, 1574, 1581,
+     1582,   71, 1579, 1584, 1586, 1576,   71, 1588, 1580, 1583,
+       71, 1585, 1587,   71,   71, 1590,   71,   71,   71,   71,
+       71,   71, 1595,   71, 1592, 1593,   71, 1596, 1589,   71,
+       71,   71,   71, 1601, 1600,   71, 1591, 1597,   71,   71,
+       71, 3093, 1607, 1594, 1608, 1599,   71, 1598,   71, 1604,
 
-       71,   71, 1604, 1611,   71,   71, 1615,   71, 1605, 1614,
-     1606,   71, 1607,   71,   71,   71, 1616,   71,   71,   71,
-     1613, 1624,   71,   71,   71,   71,   71,   71,   71, 1622,
-       71, 1617, 1620, 1621, 1618, 1619, 1623, 1629,   71, 1627,
-       71,   71, 1625,   71, 1626, 1631,   71, 1628, 1630,   71,
-     1632,   71,   71,   71, 1635,   71, 1633, 1634,   71,   71,
-     1637,   71, 1639,   71, 1636,   71, 1646, 1638, 1640, 1642,
-       71, 1641,   71, 1643, 1647,   71, 1648,   71, 1644, 1652,
-       71,   71, 1649, 1650, 1651, 1653, 1645,   71,   71,   71,
-       71,   71,   71, 1655, 1656,   71,   71, 1664, 1665,   71,
+     1602,   71, 1605,   71, 1609, 1603,   71,   71,   71, 1617,
+     1614, 1612, 1611, 1615, 1606, 1613,   71,   71, 1618,   71,
+     1610, 1616, 1619,   71,   71,   71,   71,   71,   71, 1620,
+       71, 1626, 1627, 1625,   71, 1629, 1621,   71,   71, 1628,
+       71,   71,   71, 1622,   71, 1623,   71, 1624,   71, 1631,
+     1632,   71,   71, 1633,   71,   71, 1641,   71,   71,   71,
+     1634,   71,   71, 1630,   71,   71, 1635,   71, 1637, 1638,
+     1639,   71, 1636,   71, 1640, 1646,   71, 1642, 1644, 1643,
+       71,   71, 1649,   71,   71, 1648, 1645, 1647, 1650,   71,
+       71,   71,   71,   71,   71, 1652,   71, 1651, 1654, 1656,
 
-       71, 1659,   71,   71,   71, 1661, 1654, 1658, 1662, 1657,
-       71, 1663,   71,   71, 1660,   71,   71, 1667,   71,   71,
-     1666,   71, 1674,   71,   71,   71, 1669, 1671, 1668, 1670,
-     1677,   71, 1676,   71, 1678, 1675, 1673,   71,   71, 1685,
-     1680, 1672, 1682, 1681, 1686,   71,   71,   71, 1679,   71,
-       71, 1691,   71, 1693,   71, 1690, 1684,   71, 1683, 1694,
-     1687,   71, 1688, 1696,   71,   71, 1695,   71,   71,   71,
-     1692, 1689, 1700, 1697,   71, 1704,   71,   71,   71, 1702,
-       71,   71, 1699,   71, 1698, 1703,   71, 1701, 1705,   71,
-       71,   71,   71,   71, 1708, 1716, 1706,   71, 1709, 1714,
+     1657,   71, 1653, 1658, 1663, 1655, 1664,   71,   71, 1659,
+       71, 1660, 1665,   71,   71,   71, 1661, 1668,   71, 1662,
+     1666, 1669,   71,   71,   71,   71,   71,   71, 1667, 1672,
+     1673, 1670,   71, 1681, 1671, 1676,   71,   71,   71,   71,
+     1682,   71, 1674, 1675,   71, 1678, 1680,   71, 1679,   71,
+       71, 1677,   71,   71, 1688,   71,   71, 1684, 1683, 1689,
+       71, 1690,   71, 1686, 1691, 1685, 1687,   71, 1694,   71,
+       71, 1696,   71, 1693,   71, 1697,   71, 1698, 1692,   71,
+       71, 1700, 1705,   71, 1701, 1695,   71, 1706,   71,   71,
+       71, 1699, 1702, 1711,   71, 1710,   71, 1707, 1704,   71,
 
-       71,   71, 1707, 1710, 1711, 1717, 1712, 1713,   71,   71,
-     1718,   71,   71,   71, 1723,   71,   71,   71, 1727,   71,
-       71, 1715,   71,   71, 3048,   71, 1722, 1720, 1719, 1729,
-       71, 1721, 1725,   71,   71, 1726,   71, 1724, 1730, 1731,
-       71, 1732, 1728, 1736,   71, 1735, 1734,   71,   71, 1733,
-       71, 1740,   71,   71,   71,   71,   71,   71,   71, 1747,
-     1738, 1742,   71,   71,   71,   71, 1737, 1741, 1743, 1739,
-     1744, 1841,   71,   71, 1745, 1748, 1752, 1746, 1750,   71,
-     1749, 1751,   71, 1753,   71,   71, 1756,   71, 1755,   71,
-     1754, 1759,   71, 1757,   71,   71,   71,   71, 1760, 1758,
+     1703, 1708, 1713,   71, 1714,   71, 3093,   71,   71, 1716,
+       71, 1709, 1712, 1715,   71,   71, 1718, 1720,   71, 1719,
+     1717,   71, 1724,   71, 1722,   71, 1726,   71,   71,   71,
+     1723, 1721,   71, 1725,   71,   71,   71, 1728,   71, 1734,
+       71, 1729,   71, 1736,   71, 1737, 1727, 1730, 1731,   71,
+     1732,   71, 1733,   71,   71, 1738,   71, 1743,   71,   71,
+       71, 1735,   71,   71, 1739, 1747,   71,   71,   71, 1742,
+       71, 1740, 1749, 1741,   71, 1745,   71,   71, 1746, 1750,
+     1744, 1751, 1748,   71,   71, 1755, 1753,   71, 1752,   71,
+     1754, 1756,   71, 1760,   71,   71,   71,   71,   71, 1758,
 
-       71,   71,   71,   71,   71,   71, 1765,   71,   71, 1769,
-       71,   71, 1766, 3048,   71, 1775, 1761, 1767, 1763, 1762,
-     1764,   71, 1768, 1770,   71, 1778, 1773,   71, 1772, 1777,
-       71,   71, 1779, 1774,   71,   71, 1771,   71,   71, 1776,
-     1783,   71, 1786, 1787,   71,   71, 1780, 1788,   71,   71,
-     1781, 1784,   71, 1785,   71, 1782, 1790,   71,   71, 1791,
-     1794,   71,   71, 1796,   71, 1789, 1795, 1797, 1798,   71,
-     1792, 1800, 1799, 1793,   71,   71,   71,   71, 1805, 1802,
-     1803,   71,   71, 1804,   71,   71,   71,   71, 1812,   71,
-     1814,   71,   71,   71,   71, 1815,   71, 1806, 1807, 1808,
+       71,   71,   71, 1757, 1762, 1767,   71,   71, 1759, 1761,
+     1763,   71, 1764, 1770, 1768, 1765, 1771,   71,   71,   71,
+       71, 1766, 1772, 1774, 1769, 1773,   71, 1776,   71, 1775,
+     1777,   71,   71,   71, 1779,   71,   71,   71, 1780,   71,
+     1778,   71,   71,   71,   71,   71, 1785,   71,   71,   71,
+     1789,   71, 1786, 1790, 1797,   71, 1781, 1783,   71, 1782,
+     1784, 1787, 1788, 1793,   71,   71, 1791, 1798, 1792, 1795,
+     1794,   71, 1799,   71,   71,   71,   71,   71, 1803,   71,
+     1796,   71, 1806, 1807,   71, 1808,   71, 1810,   71,   71,
+     1800, 1801,   71, 1804, 1802, 1805,   71, 1809,   71, 1811,
 
-     1801,   71,   71, 1817, 1809, 1816, 1810, 1811, 1819, 1813,
-     1820,   71, 1822, 1818,   71,   71,   71, 1824,   71,   71,
-     1821,   71, 1826,   71,   71, 1829, 1830,   71,   71, 1832,
-       71,   71,   71,   71,   71, 1823, 1838,   71, 1837, 1827,
-       71, 1825, 1834, 1835,   71, 1828,   71,   71, 1831,   71,
-       71, 1844,   71, 1836,   71, 1842, 1833,   71,   71, 1848,
-       71, 1839, 1840, 1847,   71,   71, 1851, 1850, 1852, 1854,
-     1846,   71,   71,   71,   71, 1843,   71, 1849, 1845, 1853,
-       71,   71, 1855,   71,   71,   71, 1859,   71, 1862,   71,
-     1863, 1856,   71, 1858,   71, 1857,   71,   71, 1866,   71,
+     1814,   71,   71, 1816,   71, 1818, 1815, 1817,   71,   71,
+     1812,   71, 1820, 1813, 1819,   71,   71,   71,   71, 1822,
+     1823,   71,   71, 1824, 1825,   71, 1832, 1826, 1827, 1828,
+       71,   71,   71, 1821, 1829, 1834,   71, 1830,   71,   71,
+     1835,   71,   71,   71, 1837, 1831, 1840,   71,   71, 1838,
+     1836, 1833,   71,   71, 1839,   71, 1841, 1844,   71,   71,
+     1846,   71,   71, 1842,   71, 1849, 1850,   71,   71, 1843,
+     1852,   71,   71,   71, 1857, 1847,   71, 1858,   71, 1845,
+       71, 1854, 1851, 1848,   71, 1855,   71,   71,   71,   71,
+       71, 1864,   71, 1853, 1856, 1861, 1862,   71,   71,   71,
 
-       71,   71, 1860, 1871,   71, 1870,   71, 1865,   71, 1864,
-       71, 1861,   71,   71, 1867,   71, 1875, 1868,   71, 1876,
-     1872, 1869, 1879, 1873, 1877, 1874, 1878,   71,   71, 1882,
-       71, 1883,   71,   71,   71,   71,   71, 1889,   71, 1880,
-     1886,   71,   71,   71, 1881, 1894, 1884, 1891, 1892,   71,
-       71, 1893, 1885, 1890, 1887,   71, 1888,   71,   71, 1899,
-       71, 1900,   71, 1903, 1895, 1901, 1904,   71, 1896,   71,
-     1902,   71,   71, 1897,   71,   71, 1908,   71, 1898, 1906,
-       71,   71,   71,   71, 1910, 1913,   71, 1907, 1915, 1909,
-       71,   71,   71, 1905,   71, 1911,   71,   71,   71,   71,
+     1868, 1860,   71, 1867, 1871, 1859,   71,   71,   71, 1870,
+       71, 1874,   71, 1866, 1872, 1863,   71,   71, 1865, 1869,
+     1875,   71,   71,   71,   71, 1877, 1873, 1876, 1878,   71,
+       71,   71, 1881,   71, 1884, 1885, 1880,   71,   71,   71,
+       71,   71, 1879, 1888,   71,   71, 1893,   71, 1882,   71,
+     1892,   71, 1887, 3093,   71,   71,   71, 1883, 1886, 1889,
+     1890,   71, 1898,   71, 1899, 1897, 1891, 1901, 1894, 1895,
+     1896, 1900,   71,   71, 1904,   71,   71,   71,   71,   71,
+       71,   71, 1911, 1908, 1902,   71,   71,   71,   71, 1903,
+     1913, 1906, 1914,   71,   71, 1915,   71, 1905, 1907,   71,
 
-     1920, 1925, 1916, 1919, 1917,   71, 1912,   71, 1914,   71,
-     1921, 1922,   71, 1923,   71, 1918,   71, 1932,   71, 1924,
-       71,   71, 1926, 1927,   71,   71, 1928,   71, 1931, 1930,
-     1929,   71, 1933,   71,   71,   71, 1937,   71,   71, 1934,
-     1936,   71,   71, 1938,   71, 1935, 1939, 1940, 1941,   71,
-       71,   71,   71, 1943,   71, 1948, 1946,   71, 1942, 1947,
-       71,   71,   71,   71,   71, 1953,   71,   71, 1944, 1950,
-     1945,   71,   71,   71, 1957, 1949, 1954, 1952,   71, 1959,
-     1951, 1956,   71,   71, 1955, 1963,   71, 1958, 1961,   71,
-       71,   71, 1960, 1964,   71, 1962,   71, 1969,   71,   71,
+     1909, 1910, 1912, 1916,   71, 1917, 1920, 1921,   71, 1922,
+       71, 1923, 1925, 1926,   71, 1918, 1924,   71,   71,   71,
+     1919,   71,   71, 1930,   71,   71, 1928,   71,   71,   71,
+       71, 1932, 1935, 1937, 1929,   71, 1931, 1933,   71,   71,
+     1927,   71,   71,   71,   71, 1943,   71, 1938, 1941, 1942,
+     1944,   71, 1936, 1934, 1939, 1945,   71,   71, 1947,   71,
+     1940,   71,   71,   71,   71, 1948, 1949,   71, 1950,   71,
+     1953,   71, 1951,   71, 1952,   71, 1955, 1946,   71,   71,
+     1959,   71,   71, 1954, 1958, 1956,   71,   71,   71,   71,
+     1957, 1960, 1961, 1962, 1963,   71,   71,   71, 1965,   71,
 
-     1971,   71,   71,   71, 1972, 1965,   71, 1966, 1975, 1967,
-     1968, 1973,   71,   71, 1974, 1970,   71, 1977,   71,   71,
-       71,   71,   71,   71,   71,   71,   71, 1978, 3048,   71,
-       71, 1985, 1980, 1976, 1981, 1982, 1989,   71,   71, 1984,
-     1979, 1988,   71,   71, 1986, 1992, 1987, 1983, 1990,   71,
-       71,   71,   71, 1996, 1993, 1995,   71,   71, 1991,   71,
-       71, 1998,   71, 1994, 1999,   71,   71,   71, 2000, 2004,
-     1997, 2002,   71,   71, 2006, 2008,   71, 2003, 2001,   71,
-       71,   71, 2011,   71,   71, 2005, 2010, 2007, 2012, 2013,
-       71,   71, 2016,   71,   71,   71,   71,   71,   71, 2017,
+       71, 1970,   71, 1968,   71, 1969, 1964,   71,   71,   71,
+       71, 1975,   71, 1972, 1966,   71, 1967,   71, 1979,   71,
+     1971,   71, 1976, 1974, 1978,   71, 1973,   71, 1980,   71,
+     1977,   71, 1983, 1981, 1985,   71,   71,   71,   71, 1986,
+       71, 3093, 1984, 1991,   71, 1993, 1982, 1987,   71,   71,
+     1994,   71, 1990, 1988,   71, 1989, 1995,   71,   71, 1996,
+       71, 1997,   71, 1999,   71,   71,   71,   71,   71, 2000,
+       71,   71,   71,   71, 2011,   71, 2007, 2002, 1998, 2003,
+     2004,   71,   71,   71, 2010, 2001, 2006,   71, 2015, 2008,
+     2014,   71, 2005, 2009,   71,   71, 2018,   71,   71, 2012,
 
-       71, 2022,   71, 2019,   71, 2009, 2018, 2026, 2014,   71,
-     2023, 2015, 2024,   71, 2021, 2020,   71,   71,   71, 2028,
-       71, 2027, 2031,   71, 2025,   71, 2029,   71, 2033,   71,
-     2034,   71, 2032,   71, 2030,   71,   71,   71, 2036, 2040,
-     2035,   71,   71, 2037, 2038, 2042,   71, 2039,   71,   71,
-     2043,   71,   71, 2045, 2046, 2044,   71, 2041,   71,   71,
-       71, 2047, 2049, 2048, 2052,   71,   71,   71, 2050, 2051,
-     2053,   71,   71,   71,   71,   71,   71, 2054,   71,   71,
-     2061, 2056, 2055, 2062, 2058, 2059, 2057,   71, 2063,   71,
-       71,   71,   71, 2064, 2060, 2066, 2072,   71,   71, 2067,
+     2017,   71, 2013, 2020,   71,   71,   71,   71, 2021,   71,
+       71, 2016, 2026, 2022,   71, 2019, 2024,   71, 2025, 2028,
+       71, 2030,   71, 2023,   71,   71,   71, 2033, 2027, 2032,
+       71, 2034,   71,   71, 2029, 2035, 2038,   71,   71,   71,
+     2031, 2042,   71, 2039,   71,   71, 2043,   71,   71, 2041,
+     2036,   71, 2040, 2037, 2047,   71, 2044,   71, 2048, 2046,
+       71, 2051,   71, 2045,   71,   71, 2049,   71,   71, 2052,
+     2053, 2056,   71, 2054, 2057,   71, 2058,   71, 2059,   71,
+     2050, 2055,   71,   71,   71,   71,   71, 2061, 2060,   71,
+       71, 2065, 2067, 2063,   71, 2069, 2064, 2068,   71,   71,
 
-       71,   71, 2074,   71,   71, 2068, 2065, 2071, 2076, 2069,
-     2073,   71,   71,   71, 3048, 2079, 2077, 2070, 2081, 2075,
-     2080,   71, 2082,   71,   71, 2078, 2083,   71,   71, 2086,
-       71,   71, 2087, 2085,   71, 2084, 2091,   71,   71, 2092,
-       71,   71, 2095, 2090,   71,   71, 2088,   71,   71, 2096,
-       71, 2097, 2093, 2098,   71,   71, 2100, 2089,   71, 2094,
-     2099,   71,   71, 2105,   71, 2101,   71, 2102, 2103,   71,
-     2104,   71,   71,   71,   71,   71, 2108,   71,   71, 2112,
-     2114,   71, 2115,   71, 2107,   71,   71,   71,   71, 2106,
-     2109, 2110, 2117, 2111,   71,   71,   71,   71, 2116, 2113,
+       71, 2062, 2070,   71,   71, 2072, 2066, 2074, 2073,   71,
+       71, 2071, 2077,   71,   71,   71,   71,   71, 2076,   71,
+       71,   71,   71,   71, 2075,   71,   71, 2086, 2078, 2083,
+     2081, 2080, 2079, 2084, 2082, 2088,   71,   71,   71,   71,
+     2085, 2087,   71, 2089, 2091,   71, 2092, 3093,   71,   71,
+     2095, 2097,   71,   71, 2093,   71, 2090, 2096, 2098, 2101,
+     2094, 2099,   71,   71, 2100, 2104, 2103, 2106, 2102, 2107,
+     2105,   71,   71,   71,   71,   71,   71, 2108, 2111,   71,
+     2109,   71,   71, 2112, 2116,   71,   71, 2117,   71,   71,
+     2115,   71, 2120,   71,   71, 2126, 2110, 2113,   71, 2121,
 
-     2119, 2121, 2124,   71,   71, 2120,   71, 2122,   71,   71,
-       71, 2118, 2125, 2123,   71,   71, 2126,   71,   71,   71,
-     2135,   71,   71,   71,   71, 2127, 2136, 2132,   71, 2130,
-     2290, 2128, 2138, 2129, 2134, 2131,   71, 2137, 2133,   71,
-     2140, 2139, 2141,   71, 2142,   71,   71,   71, 2145,   71,
-       71, 2143, 2148,   71,   71, 2149,   71,   71, 2146, 2144,
-       71, 2147, 2150, 2154,   71, 2155,   71,   71, 2157,   71,
-       71,   71, 2153,   71, 2151,   71, 2152, 2159,   71,   71,
-     2162,   71, 2163,   71, 2161, 2164, 2156,   71, 2158,   71,
-     2160,   71, 2167,   71, 2169,   71, 2165,   71, 2168, 2171,
+     2118,   71, 2122, 2123,   71,   71, 2125, 2119, 2114,   71,
+     2124,   71,   71, 2127,   71, 2128,   71,   71,   71, 2130,
+       71,   71,   71, 2133,   71,   71, 2139,   71,   71, 2137,
+       71,   71, 2132,   71, 2129, 2140,   71, 2135, 2134, 2131,
+       71, 2142, 2136, 2141,   71, 2144,   71, 2138,   71, 2146,
+     2149,   71,   71,   71,   71,   71, 2143,   71,   71, 2145,
+     2150, 2147,   71,   71, 2148,   71,   71,   71, 2160,   71,
+       71,   71, 2151, 2152, 2161, 2157,   71, 2155, 2153, 2162,
+       71, 2154, 2159, 2156, 2163,   71, 2158,   71, 2165, 2164,
+     2166,   71, 2167,   71,   71, 2168,   71, 2170, 2169, 2173,
 
-       71,   71,   71, 2166,   71, 2174,   71, 2173,   71, 2175,
-     2170, 2177,   71,   71,   71, 2172, 2181,   71,   71,   71,
-       71, 2179,   71, 2178, 2176,   71, 2185, 2186,   71,   71,
-     2190,   71, 2180,   71, 2182, 2184,   71,   71, 2187,   71,
-     2188, 2183,   71, 2192, 2189,   71,   71, 2197,   71,   71,
-     2199, 2193,   71, 2191,   71, 2200,   71, 2194, 2198,   71,
-     2195, 2204,   71,   71, 2205,   71, 2203,   71,   71,   71,
-     2201, 2196, 2202, 2209, 2211,   71, 2207,   71, 2214,   71,
-     2212,   71, 2216,   71,   71,   71, 2208, 2206,   71,   71,
-     2217,   71, 2213, 2210, 2218,   71, 2220,   71, 2221,   71,
+       71,   71,   71, 2171,   71,   71, 2172, 2174,   71, 2175,
+     2179,   71, 2180,   71,   71, 2182,   71,   71, 2184,   71,
+     2178, 2176,   71,   71,   71, 2177, 2187,   71, 2186, 2188,
+       71,   71,   71, 2181,   71, 2183,   71, 2185, 2189,   71,
+     2190, 2193, 2194,   71, 2196,   71, 2191,   71,   71,   71,
+       71, 2200, 2199, 2192, 2198, 2202,   71,   71, 2195,   71,
+       71,   71, 2205,   71,   71, 2197, 2201, 2208,   71,   71,
+       71,   71, 2213,   71, 2204, 2212, 2203,   71, 2206,   71,
+     2207,   71,   71,   71, 2209, 2211, 2217,   71,   71,   71,
+     2219,   71, 2210,   71, 2215,   71, 2214, 2216,   71, 2224,
 
-     2215,   71,   71,   71,   71, 2226, 2219, 2227, 2222, 2228,
-     2223, 2224, 2225,   71,   71,   71,   71, 2230, 2229,   71,
-     2232, 2233,   71, 2234, 2236, 2231, 2237,   71,   71,   71,
-       71, 2235, 2240,   71,   71,   71,   71,   71,   71, 2242,
-     2247,   71,   71,   71, 2238, 2239, 2248, 2243,   71, 2241,
-     2251,   71, 2244, 2245, 2246,   71, 2252, 2253,   71,   71,
-     2250,   71, 2254, 2249, 2256, 2257, 2255, 2258,   71,   71,
-       71,   71,   71, 2260,   71,   71,   71,   71, 2264, 2265,
-       71, 3048,   71, 2259,   71,   71, 2261, 2267, 2268, 2262,
-       71, 2270,   71, 2269, 2266, 2263,   71,   71,   71,   71,
+       71, 2218, 2220,   71, 2225, 2226,   71, 2221,   71, 2222,
+       71, 2227, 2230,   71,   71, 2231,   71,   71, 2232, 2223,
+       71,   71, 2236,   71,   71,   71, 2228, 2234, 2229, 2238,
+     2239, 2233, 2241, 2243,   71,   71, 2240, 2235,   71,   71,
+     2244,   71,   71,   71, 2242,   71, 2237, 2245, 2248,   71,
+       71,   71, 2249,   71, 2247, 2254,   71, 2255, 2250, 2246,
+     2251,   71, 2252,   71, 2253,   71,   71,   71, 2259, 2256,
+       71, 2260,   71, 2261,   71, 2258, 2257,   71,   71,   71,
+       71, 2262, 2267,   71,   71,   71,   71,   71,   71, 2268,
+     2263, 2274, 2264, 2269, 2265, 2266, 2271, 2270,   71, 2273,
 
-       71, 2271,   71, 2274, 2275,   71, 2272, 2277,   71,   71,
-       71,   71,   71, 2276,   71, 2281, 2284,   71, 2273, 2283,
-       71,   71,   71, 2285, 2280,   71,   71, 2289, 2278, 2279,
-     2288,   71, 2282,   71,   71,   71, 2291, 2287, 2286, 2297,
-     2292,   71, 2293,   71,   71, 2296, 2294, 2298,   71, 2300,
-       71,   71,   71,   71, 2302,   71,   71, 2295,   71,   71,
-     2299, 2301,   71,   71, 2306,   71,   71,   71, 2308, 2303,
-     2304, 2309, 2310,   71, 2305, 2311,   71, 2312,   71, 2313,
-       71, 2314,   71,   71,   71, 2316, 2319,   71, 2307, 2315,
-       71, 2321,   71,   71, 2324,   71, 2318,   71,   71, 2320,
+       71, 2272,   71, 2275, 2278,   71,   71, 2279, 2280,   71,
+       71,   71, 2283, 2281, 2277, 2284, 2282,   71,   71,   71,
+     2276,   71, 2285,   71,   71, 2287,   71,   71,   71, 2291,
+     2292, 2286,   71, 2289,   71,   71,   71, 2294, 2288, 2295,
+       71, 2297,   71, 2296,   71,   71, 2290,   71, 2293, 2298,
+       71,   71, 2302,   71, 2299, 2301,   71,   71,   71,   71,
+       71, 2304,   71, 2303, 2308,   71, 2311, 2300,   71,   71,
+     2310,   71,   71, 2307, 2312,   71, 2315, 2305, 2306, 2316,
+       71,   71, 2309, 2318,   71,   71,   71, 2313, 2317,   71,
+     2320, 2314,   71,   71, 2323, 2321,   71, 2325, 2319,   71,
 
-       71, 2317,   71, 2327, 2328,   71,   71,   71, 2323,   71,
-     2322, 2329,   71,   71, 2332, 2333,   71, 2325, 2326,   71,
-       71, 2331,   71,   71,   71, 2330,   71, 2337,   71, 2339,
-     2334, 2379, 2336, 2335, 2340,   71, 2341,   71, 2342,   71,
-     2343,   71,   71, 2338, 2345,   71,   71, 2347,   71, 2348,
-     2346,   71,   71,   71, 2344,   71, 2353,   71,   71, 2355,
-       71, 2356,   71, 2349, 2350,   71,   71,   71,   71,   71,
-       71, 2352,   71, 2351, 2359, 2362, 2357, 2354, 2358,   71,
-     2360, 2365,   71,   71,   71,   71,   71,   71,   71, 2361,
-       71, 2372, 2363, 2366,   71,   71,   71,   71,   71, 2364,
+     2324, 2327,   71,   71,   71, 2329,   71,   71,   71,   71,
+       71, 2326, 2322, 2328, 2333,   71,   71,   71,   71, 2337,
+       71, 2335, 2331, 2336, 2339, 2330, 2332, 2338,   71,   71,
+       71,   71, 2340, 2341,   71,   71,   71,   71,   71, 2343,
+     2345, 2334, 2348,   71,   71,   71, 2350,   71, 2346,   71,
+     2347, 2342,   71, 2349, 2344, 2353,   71,   71,   71, 2356,
+     2357,   71, 2352, 2351,   71,   71,   71,   71, 2354, 2358,
+       71, 2361, 2362,   71,   71, 2355, 2360,   71,   71,   71,
+       71, 2369,   71, 2359, 2366, 2368,   71, 2363, 2364, 2365,
+     2370,   71, 2371,   71, 2372,   71,   71,   71, 2367,   71,
 
-     2369,   71, 2371, 2373,   71, 2368, 2383,   71, 3048, 2367,
-     2370, 2374, 2375, 2376,   71,   71,   71,   71, 2380, 2381,
-     2377, 2382, 2384,   71, 2378,   71, 2385,   71, 2386,   71,
-     2387,   71,   71, 2388,   71,   71, 2390,   71,   71,   71,
-       71,   71, 2389, 2397,   71,   71,   71, 2395,   71, 2401,
-     2402,   71, 2391, 2392,   71,   71, 2393, 2394,   71, 2396,
-     2398,   71, 2399, 2400, 2404, 2405,   71, 2406, 2403, 2407,
-       71,   71, 2408,   71,   71,   71,   71,   71, 2410, 2409,
-       71, 2416,   71, 2417,   71, 2418,   71,   71, 2411,   71,
-       71,   71, 2412, 2413,   71, 2415, 2414, 2423,   71, 2422,
+     2376,   71, 2375,   71, 2374,   71, 2377,   71, 2373,   71,
+     2382,   71,   71, 2378,   71, 2379, 2384,   71, 2385,   71,
+       71,   71,   71,   71,   71, 2381, 2387, 2380,   71, 2388,
+       71, 2383, 2386, 2391,   71, 2389, 2394,   71,   71,   71,
+     2390,   71,   71, 2395, 2392,   71,   71,   71, 2401,   71,
+     2393,   71,   71,   71, 2398,   71,   71,   71, 2402, 2397,
+     2400,   71,   71, 2405, 2396, 2408, 2399, 2403, 2404,   71,
+     2409,   71, 2418, 2406, 2410, 2417, 2411,   71, 2407, 2412,
+       71, 2413,   71,   71, 2414,   71, 2415,   71, 2416,   71,
+       71,   71,   71,   71,   71,   71, 2419, 2426,   71,   71,
 
-     2427,   71, 2420, 2425, 2419,   71,   71, 2426, 2421,   71,
-     2424, 2428, 2429,   71,   71,   71,   71,   71,   71,   71,
-       71,   71,   71, 2431, 2435, 2430,   71,   71, 2433, 2439,
-     2440,   71, 2443,   71, 2432,   71,   71, 2434, 2436, 2437,
-     2442, 2438, 2441,   71,   71, 2447,   71, 2444, 2446, 2448,
-     2445,   71,   71, 2451,   71,   71,   71,   71, 2455,   71,
-       71, 2454, 2457,   71,   71, 2453,   71, 2452,   71, 2458,
-       71, 2449, 2450, 2462,   71, 2459,   71, 2463,   71, 2456,
-     2465,   71, 2461,   71, 2460,   71,   71,   71,   71, 2470,
-       71, 2472,   71,   71,   71, 2468, 2466, 2469, 2467, 2473,
+       71,   71, 2424,   71, 2430, 2431,   71,   71, 2421, 2420,
+     2434,   71, 2423, 2422, 2425,   71, 2433, 2428, 2427, 2429,
+     2436,   71, 2432,   71, 2435,   71,   71,   71,   71,   71,
+       71,   71,   71, 2439, 2445,   71, 2446,   71, 2447,   71,
+       71, 2437, 2440, 2438,   71,   71, 2441, 2442, 2443, 2444,
+     2450,   71,   71,   71,   71, 2449, 2451, 2448, 2454,   71,
+       71, 2455, 2456,   71,   71, 2452, 2457, 2458,   71, 2460,
+       71,   71, 2453, 2459,   71,   71,   71,   71,   71,   71,
+     2464,   71,   71, 2462, 2468, 2469,   71, 2472,   71, 2461,
+       71,   71, 2470,   71, 2463,   71, 2465, 2466,   71, 2467,
 
-     2464,   71, 2471,   71,   71,   71, 2474, 2475, 2476,   71,
-       71,   71, 2477,   71,   71,   71,   71, 3048, 2479, 2480,
-     2482, 2483, 2485,   71, 2478, 2481, 2486,   71, 2484,   71,
-       71,   71, 2489, 2491, 3048, 2488, 2487,   71,   71,   71,
-       71, 2493, 2492,   71, 2496,   71, 2497,   71, 2495, 2490,
-       71, 2499,   71, 2494,   71, 2501,   71, 2500,   71,   71,
-     2502,   71,   71, 2498, 2503, 2505,   71, 2504,   71,   71,
-     2506,   71,   71, 2507,   71, 2512, 2521, 2511, 2508, 2513,
-       71,   71, 2510,   71,   71,   71,   71, 2509, 2514, 2516,
-       71,   71, 2515, 2517,   71,   71, 2519,   71, 2518, 2520,
+     2471, 2473, 2475,   71, 2478,   71, 2474, 2477, 2476,   71,
+       71, 2482,   71,   71,   71, 2480,   71, 2486,   71,   71,
+     2485,   71, 2479, 2484,   71, 2483, 2488,   71,   71, 2489,
+     2481,   71,   71, 2492, 2493,   71,   71, 2490, 2487,   71,
+     2494, 2496,   71,   71,   71,   71,   71, 2491,   71, 2497,
+     2501,   71,   71, 2499, 2495, 2500, 2498, 2503,   71,   71,
+     2502,   71, 2506,   71, 2504,   71, 2505,   71, 2507,   71,
+       71, 2509,   71, 2508,   71,   71, 2510, 2511,   71, 2513,
+     2514, 2516,   71, 2517,   71, 2512,   71, 2515,   71,   71,
+       71, 2522,   71, 2518, 2519, 2523, 2520,   71,   71, 2524,
 
-       71,   71, 2525,   71,   71,   71, 2523,   71, 2522, 2524,
-     2530,   71, 2526,   71,   71,   71, 2534,   71,   71,   71,
-       71, 2539,   71, 2527, 2532, 2528, 2529,   71,   71, 2533,
-     2541, 2538, 2531, 2542, 2536, 2543,   71, 2535,   71,   71,
-     2537,   71, 2544,   71,   71,   71, 2545,   71,   71, 2546,
-       71,   71, 2549, 2540, 2547,   71, 2552, 2553,   71,   71,
-     2548, 2554,   71, 2556, 2550,   71, 2551, 2555,   71,   71,
-     2557, 2558,   71,   71,   71, 2562,   71,   71, 2560,   71,
-     2563,   71,   71, 2565, 2566,   71, 2561, 2567,   71, 2559,
-       71,   71, 2569, 2568,   71, 2570, 2564, 2572,   71,   71,
+       71, 2527,   71, 2528,   71, 2526, 2521, 2525,   71, 2530,
+       71,   71, 2532,   71, 2531,   71, 2536, 2533,   71,   71,
+     2534, 2529,   71,   71, 2535,   71,   71, 2537, 2540,   71,
+     2538,   71, 2543, 2544,   71, 2539,   71, 2541,   71,   71,
+       71, 2545,   71,   71,   71, 2547, 2546, 2548, 2550,   71,
+       71,   71, 2542,   71, 2549, 2551,   71,   71, 2556,   71,
+       71,   71, 2554,   71, 2553, 2555,   71, 2552, 2557, 2561,
+       71,   71,   71, 2565,   71,   71,   71,   71,   71, 2558,
+     2563, 2559, 2560,   71,   71, 2562, 2572, 2564, 2569, 2570,
+       71, 2567,   71, 2573, 2566, 2574, 2579, 2568,   71,   71,
 
-     2573, 2574,   71, 2576,   71,   71,   71,   71, 2580, 2575,
-       71, 2571, 2581,   71,   71,   71,   71, 2583, 2577, 2582,
-       71, 2579, 2584,   71, 2578,   71, 2589,   71, 2592,   71,
-       71, 2588,   71, 2585, 2591,   71, 2586,   71,   71,   71,
-     2587, 2595, 2593, 2594,   71,   71,   71, 2597,   71,   71,
-     3048, 2600, 2590,   71, 2604,   71,   71,   71,   71,   71,
-     2606,   71, 2598, 2599, 2596,   71, 2601, 2603, 2607, 2602,
-     2605, 2611, 2608, 2610, 2614,   71, 2612,   71, 2609,   71,
-     2613,   71, 2615,   71, 2616,   71, 2617,   71, 2618,   71,
-       71,   71,   71,   71, 2620, 2619,   71, 2626,   71,   71,
+       71,   71,   71, 2571, 2575,   71, 2576, 2577, 2580, 2578,
+       71,   71,   71, 2581,   71, 2582,   71,   71, 2585, 2586,
+       71, 2587,   71, 2588,   71,   71, 2583,   71,   71, 2589,
+       71, 2584, 2590, 2591,   71, 2593, 2595,   71,   71,   71,
+     2598, 2596,   71, 2599,   71, 2600,   71,   71, 2592, 2594,
+     2601,   71,   71,   71, 2605,   71,   71, 2606, 2597, 2607,
+       71,   71, 2609,   71, 2602,   71,   71,   71, 2613,   71,
+     2603, 2614,   71, 2604,   71,   71, 2608, 2616, 2610, 2615,
+       71, 2612, 2617,   71, 2611,   71,   71,   71, 2622, 2625,
+       71,   71, 2618, 2621,   71, 2624,   71,   71,   71,   71,
 
-       71, 2623, 2627, 2629,   71,   71, 2631,   71,   71,   71,
-     2621, 3048, 2630, 2624, 2632,   71, 2625, 2622, 2628, 2633,
-       71,   71,   71,   71, 2634,   71, 2637, 2638,   71, 2639,
-     2635, 2636, 2640,   71, 2642,   71,   71,   71,   71, 2643,
-       71,   71, 2646,   71, 2645, 2647,   71,   71, 2641, 2644,
-     2648,   71, 2649,   71,   71,   71, 2652,   71,   71,   71,
-     3048, 2651, 2657,   71, 2655, 2653, 2650,   71,   71,   71,
-     2658, 2699, 2660,   71, 2661,   71, 2662, 2656,   71, 2654,
-     2659,   71, 2663, 2664,   71, 2665, 2667,   71, 2666, 2668,
-       71, 2669,   71,   71,   71,   71,   71, 2674,   71,   71,
+     2619, 2626, 2628,   71,   71, 2620, 2627, 2630,   71,   71,
+       71, 2623,   71, 2633, 2637,   71,   71,   71,   71,   71,
+     2631, 2632, 2629,   71, 2653,   71, 2636, 2634, 2639,   71,
+     2635, 2638, 2641, 2644,   71, 2642, 2640, 2643, 2645,   71,
+     2647,   71, 2646,   71, 2648,   71, 2649,   71, 2650,   71,
+     2651,   71,   71,   71, 2654,   71,   71, 2659,   71,   71,
+       71,   71, 2656, 2660, 2662,   71,   71, 2652, 2663, 2664,
+       71, 2665, 2666,   71,   71, 2657, 2658, 2661, 2655,   71,
+       71,   71,   71, 2667, 2671,   71, 2672,   71, 2668, 2669,
+       71,   71,   71,   71,   71, 2677, 2673, 2682,   71, 2670,
 
-     2673, 2671, 2670,   71, 2675,   71, 2677,   71,   71, 2682,
-     2676,   71,   71, 2672, 2678,   71, 2680, 2684,   71, 2679,
-       71,   71,   71,   71, 2685,   71, 2681, 2686, 2687,   71,
-     2688,   71, 2692,   71,   71,   71,   71, 2683,   71,   71,
-     2689,   71, 2695,   71,   71, 2691, 2690, 2693, 2694, 2700,
-     2696,   71, 2697, 2702,   71, 2704,   71,   71, 2698, 2705,
-       71, 2707,   71,   71,   71,   71,   71, 2712,   71, 2701,
-     2703, 2711,   71,   71,   71,   71, 2716,   71, 2706, 2708,
-     2709, 2710, 2718,   71,   71,   71,   71,   71, 2720,   71,
-     2721, 2717, 2713, 2715,   71,   71, 2714, 2723,   71, 2724,
+     2678,   71, 2675, 2680,   71,   71, 2679, 2676,   71, 2674,
+     2681, 2683,   71,   71,   71,   71,   71,   71, 2684,   71,
+       71,   71, 2692, 2687,   71,   71, 2690, 2688,   71, 2695,
+     2696, 2686, 2693, 2685,   71, 2697,   71,   71,   71, 2691,
+       71, 2689, 2694, 2699, 3093, 2698,   71, 2700, 2702,   71,
+     2701, 2703,   71, 2704,   71,   71,   71, 2706,   71, 2707,
+     2709, 2708,   71, 2710, 2705,   71,   71, 2711, 2712,   71,
+       71,   71,   71, 2717,   71,   71, 2715, 2719,   71,   71,
+       71,   71,   71, 2713, 2720,   71, 2721, 2722,   71, 2723,
+     2716, 2714,   71,   71, 2724, 2727,   71,   71,   71, 2718,
 
-       71, 2726,   71,   71, 2719, 2731, 2728, 2725, 2722, 2730,
-       71,   71, 2729,   71,   71, 2735,   71,   71,   71, 2737,
-     2736, 2727,   71,   71, 2740, 2733, 2741,   71,   71, 2732,
-       71, 2742, 2743,   71, 2734, 2738,   71,   71,   71,   71,
-     2748, 2745, 2739,   71, 2746,   71,   71, 2751,   71,   71,
-       71, 2744,   71, 2756,   71,   71, 2747, 2752,   71,   71,
-     2749, 2750, 2759,   71, 3048, 2755,   71, 2753, 2758, 2760,
-       71, 2761, 2762,   71, 2757, 2754, 2764,   71, 2763, 2765,
-       71, 2766,   71,   71, 2768,   71,   71,   71, 2767,   71,
-       71,   71, 2773, 2774,   71,   71,   71,   71, 2778,   71,
+     2725,   71, 2730,   71,   71,   71, 2728,   71,   71,   71,
+     2729,   71, 2726, 2731, 2735, 2734,   71, 2732, 2737,   71,
+     2739,   71, 2733, 2740,   71, 2742,   71, 2738,   71,   71,
+       71, 2736, 2741,   71, 2747,   71, 2748, 2750, 2746,   71,
+       71,   71,   71,   71, 2743, 2744, 2745,   71, 2749,   71,
+     2753, 2755,   71, 2757,   71,   71, 2754,   71,   71,   71,
+     2752,   71, 2758, 2751, 2760,   71,   71, 2756, 2761,   71,
+     2763,   71, 2765,   71, 2768, 2762, 2759,   71, 2767,   71,
+       71,   71, 2766, 2772,   71, 2769,   71, 2774,   71, 2770,
+     2764, 2773,   71, 2775, 2777, 2778,   71, 2780,   71, 2771,
 
-       71, 2779,   71,   71, 3048, 2769, 2777,   71, 2782, 2770,
-     2775, 2771, 2772, 2783,   71, 2776, 2784,   71,   71,   71,
-     2780, 2781, 2787, 2785,   71,   71,   71,   71,   71, 2790,
-       71,   71, 2791, 2786, 2789,   71, 2788,   71,   71,   71,
-     2794,   71,   71,   71, 2796, 2792,   71, 2797,   71, 2795,
-       71, 2793,   71,   71,   71,   71,   71, 2813,   71, 2806,
-     2798, 2807, 2799, 2800, 2801, 2809, 2802,   71, 2808, 2803,
-     2804,   71, 2810,   71, 2805, 2811, 2814,   71,   71, 2816,
-       71,   71, 2815, 2817,   71, 2824, 2812, 2818, 2819,   71,
-       71, 2820, 2821,   71,   71, 2822, 2823,   71,   71, 2825,
+       71, 2779,   71,   71,   71,   71,   71, 2785,   71, 2782,
+     2783,   71, 2776,   71, 2788,   71,   71,   71,   71,   71,
+     2781, 2793,   71, 3093,   71, 2784, 2790,   71, 2786, 2787,
+     2789,   71, 2792, 2795, 2796,   71, 2794, 2797,   71,   71,
+       71, 2791,   71,   71, 2798, 2799, 2806, 2800, 2801,   71,
+     2802,   71, 2803,   71,   71, 2805,   71,   71,   71, 2804,
+       71, 2810, 2807, 2811,   71, 2808,   71,   71,   71,   71,
+     2817,   71,   71,   71, 2818,   71, 2926,   71, 2816, 2809,
+       71, 2814, 2821,   71, 2812, 2813, 2822,   71, 2815, 2823,
+       71,   71, 2819, 2826, 2820,   71, 2824, 2825,   71,   71,
 
-       71,   71,   71,   71, 2831,   71,   71, 2826, 2830,   71,
-     2834, 2827, 2848, 2828,   71,   71, 2833,   71,   71,   71,
-       71, 2829,   71, 2835,   71, 2839,   71, 2832, 2838, 2869,
-     2836, 2840,   71, 2841,   71, 2837,   71, 2842,   71, 2846,
-       71, 2843,   71,   71, 2847,   71,   71, 2844, 2852,   71,
-     2845, 2849, 2855,   71, 2853, 2850, 2856,   71,   71, 2858,
-       71, 2904,   71, 2851, 2857, 2854, 2859,   71,   71, 2861,
-       71, 2862,   71, 2860, 2863,   71, 2864,   71, 2865,   71,
-     2866,   71, 2867,   71, 2868,   71, 2870,   71,   71,   71,
-       71,   71,   71, 2875,   71,   71,   71, 2871,   71, 2879,
+     2829,   71,   71,   71,   71,   71, 2828, 2827, 2830,   71,
+     2833,   71,   71,   71,   71,   71,   71, 2835,   71, 3093,
+     2836, 2834, 2831,   71, 2832,   71,   71,   71,   71,   71,
+       71, 2845, 2837, 2846, 2838, 2839, 2840, 2844, 2848, 2841,
+       71,   71, 2842, 2843,   71, 2849,   71, 2847, 2867, 2850,
+     2852,   71, 2853,   71, 2851,   71, 2855,   71, 2915, 2854,
+     2856,   71, 2857, 2858,   71,   71, 2859, 2860, 2863,   71,
+     2861, 2862,   71,   71,   71, 2866,   71, 2864,   71,   71,
+       71,   71,   71, 2865, 2872,   71, 2871,   71,   71,   71,
+       71,   71, 2868, 2875, 2874,   71,   71, 2876, 2954, 2869,
 
-       71, 2872,   71, 2881,   71,   71, 2876,   71, 2877, 2888,
-     2873, 2874, 2878,   71, 2882,   71, 2883, 2880,   71, 2885,
-       71,   71,   71, 2887,   71, 2886,   71, 2890,   71,   71,
-       71, 2884,   71,   71, 2894, 2889, 2897,   71,   71, 2895,
-     2899,   71,   71, 2891, 2892, 2893,   71, 2896, 2900,   71,
-     2898, 2901,   71,   71,   71, 2903,   71,   71,   71,   71,
-     2912, 2902, 2905, 2909,   71,   71, 2910, 2906, 2908,   71,
-       71, 2911,   71,   71,   71,   71,   71, 2907, 2913,   71,
-       71,   71,   71,   71, 2919,   71, 2916, 2923, 2914, 2918,
-     2915, 2920, 2926,   71, 2927, 2924,   71, 2921, 2917,   71,
+     2870,   71, 2880,   71, 2879, 2877,   71, 2873,   71, 2878,
+     2881,   71, 2882,   71,   71,   71, 2887, 2885, 2883, 2884,
+     2886, 2888,   71, 2889,   71,   71, 3093,   71,   71,   71,
+     2891, 2890, 2893, 2894, 2896,   71, 2897,   71, 2899,   71,
+     2900,   71,   71, 2898, 2895, 2892,   71, 2902,   71, 2903,
+       71, 2901, 2904,   71, 2905,   71, 2906,   71, 2907,   71,
+     2908,   71, 2909,   71, 2910,   71,   71,   71, 2913,   71,
+       71,   71, 2918,   71,   71,   71, 2912,   71,   71, 2914,
+       71,   71,   71, 2922, 2924,   71,   71,   71, 2928, 2921,
+     2919, 2916, 2911, 2917, 2920, 2923, 2925,   71,   71, 2931,
 
-     2922, 2928,   71, 2925,   71, 2929, 2930,   71, 2931,   71,
-       71,   71,   71, 2934,   71, 2932, 2935, 2936,   71, 2933,
-     2939,   71,   71,   71,   71,   71,   71,   71, 2942, 2944,
-       71, 2947,   71, 2938, 2941, 2940,   71,   71,   71, 2937,
-     2945, 2950,   71, 2954, 2943,   71, 2946,   71, 2951,   71,
-     2955, 2948,   71, 2952,   71, 2949,   71, 2953,   71,   71,
-     2960,   71, 2961,   71, 2959,   71, 2956, 2957,   71,   71,
-       71,   71,   71,   71, 2965,   71,   71, 2958, 2967,   71,
-     2974,   71,   71, 2964,   71, 2969, 2962, 2972, 2963, 2970,
-       71, 2966,   71,   71, 2968, 2973, 2978,   71, 2971,   71,
+       71, 2930,   71,   71,   71,   71,   71, 2933,   71, 3093,
+       71,   71, 2927,   71, 2932, 2929, 2937, 2938, 2940,   71,
+     2936,   71, 2934,   71, 2935,   71, 2939, 2948, 2941, 2943,
+       71,   71, 2942, 2944,   71, 2945,   71,   71,   71,   71,
+     2947,   71,   71,   71, 2946,   71, 2953,   71, 2956,   71,
+       71,   71, 2950, 2952,   71,   71,   71, 2949, 2955,   71,
+       71,   71, 2951, 2957, 2958, 2966,   71, 2959, 2963,   71,
+     2960, 2962, 2964,   71, 2968, 2967, 2961,   71, 2971,   71,
+       71,   71, 2965, 2973,   71,   71, 2974, 2969,   71, 2972,
+     2975,   71, 2976,   71,   71,   71,   71, 2970, 2979, 2980,
 
-       71, 2980,   71, 2981, 2975, 2979,   71,   71,   71,   71,
-     2976, 2982, 2977, 2983, 2984, 2986, 2987,   71, 2985,   71,
-       71,   71, 2989,   71, 2988,   71,   71,   71,   71, 2990,
-     2995,   71,   71, 2992,   71, 2998,   71, 2999,   71, 2991,
-       71,   71,   71,   71,   71, 2997, 2993, 2994, 3002, 3000,
-     2996,   71, 3001,   71, 3006,   71, 3007, 3005,   71,   71,
-     3003, 3004,   71, 3010,   71, 3012,   71, 3013, 3008,   71,
-       71,   71, 3017,   71, 3014,   71,   71, 3015, 3011,   71,
-     3018, 3019, 3020,   71, 3009,   71,   71,   71,   71,   71,
-     3016,   71, 3021, 3022, 3024, 3023, 3026,   71,   71,   71,
+     2977, 2981,   71,   71, 2984,   71,   71,   71, 2978,   71,
+       71, 2987,   71, 2989,   71,   71, 2992,   71, 2983, 2985,
+       71, 2986, 2990,   71, 2995,   71,   71, 2982,   71, 2996,
+       71, 2999, 2988, 3000, 2991, 2993,   71,   71, 2997,   71,
+       71, 2994,   71,   71,   71, 2998, 3005,   71, 3004,   71,
+     3001, 3006,   71, 3002,   71,   71,   71,   71,   71, 3010,
+       71, 3003, 3012,   71,   71, 3007,   71,   71, 3009, 3008,
+       71,   71, 3017, 3014,   71, 3018, 3011, 3013,   71, 3015,
+     3019,   71, 3016, 3024, 3020, 3023,   71,   71, 3025, 3021,
+       71, 3026, 3027, 3022,   71,   71,   71,   71, 3031,   71,
 
-       71,   71, 3032, 3028, 3029,   71, 3025, 3027, 3033,   71,
-     3030,   71,   71, 3036, 3037,   71,   71, 3039,   71, 3031,
-     3040,   71,   71, 3038, 3034,   71,   71,   71,   71, 3041,
-     3035, 3042, 3043, 3046,   71, 3047,   71, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3044, 3048, 3048, 3045,   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, 3048,   74,   74,   74,   74,
-      141,  141, 3048, 3048, 3048,  141,  141,  143,  143, 3048,
+     3028, 3029, 3032,   71,   71,   71, 3034,   71,   71,   71,
+     3033,   71, 3035,   71,   71, 3040, 3030,   71, 3036,   71,
+     3037,   71,   71, 3043, 3044,   71, 3045,   71, 3038, 3046,
+     3039,   71, 3042, 3041,   71,   71, 3047,   71, 3051,   71,
+       71,   71,   71, 3055, 3052,   71, 3048, 3093, 3050,   71,
+     3057,   71, 3058, 3049, 3053,   71,   71,   71, 3062,   71,
+     3059, 3093,   71, 3060, 3056,   71, 3054, 3063,   71,   71,
+     3064, 3065,   71,   71,   71,   71, 3061,   71, 3071,   71,
+     3066, 3067, 3069,   71, 3068,   71,   71,   71, 3070,   71,
+     3073, 3074,   71, 3077, 3072, 3078,   71,   71,   71, 3081,
 
-     3048,  143, 3048,  143,  145, 3048, 3048, 3048, 3048, 3048,
-      145,  148,  148, 3048, 3048, 3048,  148,  148,  150, 3048,
-     3048, 3048, 3048, 3048,  150,  152,  152, 3048,  152,  152,
-      152,  152,   75,   75, 3048,   75,   75,   75,   75,   13,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048
+     3082,   71, 3075,   71, 3084,   71, 3076,   71, 3079,   71,
+     3083, 3085,   71,   71, 3086,   71, 3080,   71, 3087, 3093,
+     3088, 3091,   71, 3092,   71, 3093, 3093, 3093, 3089, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3090,   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, 3093,   74,   74,   74,   74,  142,
+      142, 3093, 3093, 3093,  142,  142,  144,  144, 3093, 3093,
+      144, 3093,  144,  146, 3093, 3093, 3093, 3093, 3093,  146,
+
+      149,  149, 3093, 3093, 3093,  149,  149,  151, 3093, 3093,
+     3093, 3093, 3093,  151,  153,  153, 3093,  153,  153,  153,
+      153,   75,   75, 3093,   75,   75,   75,   75,   13, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093
     } ;
 
-static const flex_int16_t yy_chk[5981] =
+static const flex_int16_t yy_chk[6070] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2095,655 +2121,665 @@ static const flex_int16_t yy_chk[5981] =
         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, 3054,   31,
+       10,   10,   15,   25,    9,   29,   15,   25, 3099,   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, 1005,   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,   84,   23,   24,
+       34,   21,   23,   24,   12,   23,   24, 1016,   24,   24,
+       21,   26,   26,   27,   27,   84,   28,   36,   32,   32,
+       28,   34,   27,   28,   33,   33,   26,   32,   42,   33,
+       28,   36,   28,   32,   37,   37,  127,   32,   52,   37,
+       69,   52,  127,   42,  123,   33,   35,   35,   38,   37,
+       37,   35,   37,   38,   69,   35,   38,   39,   39,   81,
+       39,   35,   40,   38,   35,   80,   40,   38,   38,   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,
+      123,   35,  151,   41,   41,   39,   40,   80,   41,   81,
+       40,   40,   41,   58,   77,   58,   58,   77,   58,   63,
+       63,   66,   86,   66,   66,   68,   66,   68,   68,   71,
+       68,   71,   71,   66,   71,   72,   86,   88,   78,   72,
+       71,   74,   78,   74,   74,   82,   74,   83,   82,   85,
+       83,   89,   74,   74,   87,   88,   88,   90,   85,   91,
+       87,   92,   93,   83,  102,   91,   87,   95,   87,   94,
+       97,   96,   98,   89,   97,   92,   90,   98,   91,   99,
+       94,   94,   93,  102,  100,   95,  101,  100,   94,   96,
+      100,  103,  101,   99,  104,  105,  103,  104,  106,  149,
 
-      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,
+      108,  104,  107,  100,  100,  109,  107,  108,  110,  111,
+      112,  101,  106,  114,  105,  110,  103,  104,  109,  105,
+      113,  115,  111,  116,  113,  115,  118,  117,  119,  119,
+      112,  114,  117,  120,  122,  121,  117,  124,  126,  121,
+      128,  116,  129,  129,  125,  131,  118,  125,  121,  122,
+      130,  126,  128,  120,  121,  132,  124,  130,  125,  133,
+      129,  131,  125,  129,  135,  134,  135,  136,  130,  141,
+      138,  137,  139,  140,  132,  135,  137,  161,  140,  136,
+      133,  134,  138,  141,  143,  143,  145,  135,  161,  145,
+      139,  147,  155,  147,  147,  155,  147,  150,  150,  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,  192,  190,  191,  187,
-      188,  185,  190,  184,  185,  194,  194,  180,  200,  186,
-      189,  189,  192,  193,  189,  195,  189,  196,  191,  193,
+      158,  152,  152,  153,  152,  153,  153,  156,  153,  159,
+      157,  160,  156,  162,  163,  153,  157,  164,  158,  160,
+      166,  162,  165,  168,  159,  157,  160,  165,  167,  168,
+      168,  169,  164,  163,  170,  171,  171,  167,  172,  170,
+      166,  173,  176,  173,  172,  174,  173,  175,  175,  174,
+      177,  180,  178,  148,  174,  177,  169,  178,  179,  174,
+      182,  176,  181,  173,  182,  174,  174,  183,  181,  184,
+      179,  180,  183,  185,  186,  187,  188,  189,  238,  191,
+      193,  188,  189,  184,  191,  192,  186,  201,  185,  186,
+      218,  181,  238,  187,  190,  190,  193,  194,  190,  198,
 
-      197,  195,  206,  196,  210,  198,  199,  195,  189,  200,
-      189,  198,  199,  201,  208,  206,  145,  202,  203,  201,
-      197,  199,  202,  204,  203,  205,  210,  207,  212,  204,
-      209,  211,  205,  207,  208,  213,  209,  214,  215,  211,
-      213,  212,  216,  217,  218,  222,  214,  219,  220,  218,
-      218,  221,  219,  215,  223,  221,  224,  226,  216,  225,
-      223,  229,  233,  217,  227,  225,  220,  222,  228,  227,
-      228,  230,  235,  231,  224,  224,  232,  226,  230,  231,
-      229,  233,  232,  234,  235,  236,  237,  237,  239,  234,
-      238,  238,  240,  242,  239,  241,  243,  241,  240,  236,
+      190,  195,  195,  194,  196,  192,  218,  197,  201,  199,
+      196,  200,  190,  197,  190,  199,  196,  200,  202,  198,
+      203,  204,  205,  206,  202,  203,  200,  204,  205,  207,
+      206,  208,  209,  210,  211,  207,  212,  213,  209,  214,
+      211,  215,  216,  219,  208,  213,  215,  217,  222,  220,
+      224,  216,  214,  210,  220,  220,  221,  226,  212,  225,
+      223,  221,  217,  219,  223,  225,  222,  227,  228,  229,
+      231,  232,  224,  227,  229,  226,  226,  230,  232,  230,
+      233,  234,  235,  237,  236,  244,  233,  234,  228,  231,
+      236,  239,  239,  240,  240,  237,  241,  242,  243,  245,
 
-      245,  243,  246,  244,  247,  249,  248,  250,  143,  260,
-      246,  248,  239,  250,  241,  244,  242,  251,  256,  245,
-      252,  253,  255,  251,  247,  252,  253,  254,  249,  257,
-      258,  259,  256,  254,  260,  261,  263,  255,  263,  259,
-      262,  261,  266,  262,  258,  264,  264,  257,  265,  267,
-      267,  265,  268,  268,  269,  271,  270,  272,  271,  273,
-      266,  272,  275,  274,  283,  277,  276,  277,  273,  274,
-      269,  270,  276,  278,  279,  284,  275,  281,  279,  278,
-      280,  280,  281,  282,  283,  285,  286,  287,  287,  282,
-      289,  288,  290,  284,  288,  279,  290,  291,  296,  286,
+      243,  235,  241,  242,  245,  247,  246,  248,  244,  249,
+      251,  250,  146,  252,  262,  248,  250,  243,  246,  252,
+      241,  253,  257,  254,  247,  255,  256,  253,  254,  249,
+      255,  258,  256,  251,  259,  260,  261,  257,  264,  262,
+      263,  264,  266,  266,  261,  258,  263,  268,  265,  260,
+      265,  267,  259,  271,  267,  269,  269,  270,  270,  272,
+      273,  275,  274,  273,  277,  268,  274,  276,  281,  271,
+      275,  278,  281,  276,  272,  283,  280,  278,  277,  279,
+      283,  279,  280,  282,  282,  284,  285,  286,  287,  281,
+      288,  284,  289,  289,  290,  291,  292,  290,  293,  144,
 
-      292,  293,  293,  294,  295,  297,  285,  295,  289,  298,
-      296,  297,  298,  299,  301,  302,  291,  303,  292,  315,
-      315,  294,  303,  301,  295,  299,  300,  304,  305,  306,
-      304,  305,  304,  302,  309,  300,  141,  307,  300,  309,
-      309,  311,  306,  300,  300,  300,  300,  312,  304,  307,
-      308,  310,  308,  308,  310,  313,  314,  318,  311,  317,
-      317,  311,  312,  316,  313,  314,  319,  320,  316,  321,
-      322,  319,  318,  327,  323,  324,  336,  336,  329,  320,
-       70,  324,  325,  325,  329,  325,  328,  330,  321,  323,
-      322,  328,  330,  327,  325,  331,  332,  333,  335,  332,
+      292,  294,  296,  288,  298,  286,  285,  295,  295,  287,
+      301,  297,  299,  291,  297,  304,  298,  293,  299,  294,
+      296,  300,  301,  305,  300,  303,  307,  309,  305,  307,
+      308,  297,  302,  304,  303,  306,  318,  318,  306,  309,
+      306,  302,  142,  308,  302,  310,  313,  310,  310,  302,
+      302,  302,  302,  311,  312,  314,  306,  312,  311,  311,
+      315,  321,  316,  313,  317,  324,  313,  319,  320,  320,
+      314,  316,  319,  317,  322,  323,  321,  315,  315,  322,
+      325,  326,  327,  330,  324,  338,  331,  323,  327,  328,
+      328,  331,  328,  332,  338,   70,  326,  333,  336,  332,
 
-      331,  332,  334,  337,  342,  334,  331,  335,  346,  337,
-      339,  333,  338,  338,  343,  339,  340,  344,  334,  340,
-      349,  334,  346,  334,  342,  340,  568,  345,  348,  340,
-      351,  348,  344,  568,  349,  343,  356,  340,  341,  341,
-      352,  341,  345,  357,  354,  351,  353,  348,  355,  352,
-      354,  353,  353,  361,  341,  356,  359,  341,  357,  341,
-      360,  341,  350,  358,  350,  350,  360,  362,  363,  355,
-      365,  366,  358,  368,  350,  359,  350,  350,  350,  361,
-      364,  350,  363,  367,  369,  370,  364,  362,  368,  369,
-      364,  366,  371,  365,  372,  372,  373,  374,  371,  375,
+      325,  328,  333,  330,  334,  335,  339,  339,  335,  334,
+      335,  337,  336,  340,  337,  334,  341,  341,  342,  340,
+      345,  346,  343,  342,  347,  343,  348,  337,  358,   64,
+      337,  343,  337,  351,  349,  343,  351,  352,  354,  347,
+      345,  348,  346,  343,  344,  344,  355,  344,  349,  358,
+      359,  352,  351,  354,  362,  355,  356,  360,  357,  433,
+      344,  356,  356,  344,  357,  344,  361,  344,  353,  359,
+      353,  353,  360,  362,  364,  361,  365,  366,  368,  363,
+      353,  433,  353,  353,  353,  363,  369,  353,  367,  370,
+      371,  366,  372,  373,  367,  376,  365,  372,  367,  377,
 
-      370,  376,  377,  367,  378,  379,  381,  376,  382,  374,
-      379,  380,  380,  375,  380,  383,  373,  385,  384,  385,
-      378,  386,  388,  388,  382,  386,  381,  377,  389,  387,
-      390,  383,  384,  387,  391,  392,  396,  385,  393,  397,
-      394,  396,  395,  397,  400,  390,  398,  389,  387,  394,
-      391,  395,  393,  392,  405,  398,  403,  399,  401,  403,
-      394,   64,  394,  399,  401,  400,  402,  404,  406,  406,
-      402,  407,  404,  409,  405,  408,  408,  410,  409,  411,
-      411,  412,  413,  414,  407,  415,  413,  412,  416,  417,
-      410,  418,  418,  416,  417,  419,  420,  421,  414,  422,
+      364,  368,  375,  375,  374,  371,  369,  378,  373,  370,
+      374,  377,  379,  380,  381,  376,  384,  382,  379,  385,
+      387,  378,  382,  383,  383,  386,  383,  388,  389,  388,
+      381,  392,  389,  390,  387,  385,  384,  390,  380,  391,
+      391,  386,  393,  394,  395,  397,  396,  388,  399,  398,
+      392,  400,  390,  399,  397,  400,  403,  393,  398,  394,
+      396,  401,  395,  402,  405,  397,  404,  397,  405,  402,
+      401,  406,  404,  407,  406,  408,  410,  403,  407,  409,
+      409,  411,  411,  412,  413,  414,  414,  415,  412,  410,
+      416,  417,  418,  415,  416,  408,  419,  413,  420,  421,
 
-      418,  423,  425,  427,  423,  424,  415,  419,  427,  424,
-      428,  422,  426,  426,  425,  421,  420,  429,  429,  430,
-      432,  432,  433,  437,  434,  435,  436,  439,  440,  443,
-      441,  428,  434,  442,  435,  437,  444,  446,  443,  442,
-      452,  430,  444,  433,  441,  439,  436,  439,  440,  445,
-      447,  446,  448,  449,  445,  448,  450,  451,  447,  453,
-      452,  447,  453,  451,  454,  455,  458,  449,  456,  457,
-      454,  450,  459,  456,  461,  460,  459,  462,  463,  455,
-      460,  464,  462,  465,  468,  484,  484,  458,  454,  461,
-      469,  457,  471,  470,  463,  473,  465,  470,  472,  473,
+      421,  419,  422,  420,  423,  424,  417,  425,  421,  426,
+      428,  427,  426,  418,  422,  427,  429,  429,  431,  425,
+      430,  436,  428,  424,  423,  430,  432,  432,  435,  435,
+      437,  438,  439,  442,  441,  446,  440,  444,  437,  431,
+      438,  440,  436,  445,  447,  442,  449,  448,  451,  446,
+      447,  457,  449,  439,  441,  444,  448,  444,  452,  450,
+      454,  455,  451,  445,  450,  453,  452,  456,  453,  452,
+      460,  457,  458,  456,  454,  458,  455,  459,  462,  466,
+      461,  463,  464,  459,  460,  461,  464,  465,  467,  468,
+      469,  470,  465,  467,  466,  473,  511,  474,  476,  475,
 
-      464,  466,  466,  474,  468,  469,  477,  466,  474,  466,
-      475,  471,  474,  476,  472,  466,  480,  466,  476,  478,
-      466,  466,  477,  479,  482,  475,  483,  466,  478,  479,
-      481,  485,  480,  481,  479,  486,  486,  487,  488,  489,
-      490,  491,  493,  492,   59,  494,  483,  482,  492,  496,
-      488,  493,  487,  495,  489,  496,  485,  498,  499,  490,
-      501,  500,  499,  491,  494,  502,  498,  500,  495,  503,
-      504,  505,  501,  506,  507,  509,  508,  509,  507,  510,
-      502,  511,  511,  513,  504,  515,  505,  510,  503,  508,
-      512,  506,  514,  517,  518,  513,  512,  515,  514,  516,
+      462,  459,  463,  475,  470,  468,  477,   59,  481,  469,
+      471,  471,  474,  481,  511,  473,  471,  476,  471,  478,
+      480,  484,  477,  478,  471,  482,  471,  484,  479,  471,
+      471,  483,  484,  479,  485,  480,  471,  479,  487,  486,
+      483,  482,  486,  488,  489,  489,  490,  491,  491,  492,
+      485,  494,  496,  493,  495,  497,  499,  500,  498,   54,
+      497,  487,  501,  488,  492,  493,  494,  498,  501,  503,
+      506,  490,  500,  495,  496,  499,  504,  505,  503,  507,
+      504,  508,  506,  505,  509,  512,  510,  515,   53,  512,
+      513,  514,  518,  514,  507,  515,  516,  516,  509,  517,
 
-      519,  520,  516,  521,  520,  519,  533,  517,  522,  518,
-      523,  533,  521,  524,  531,  523,  523,  525,  525,  521,
-      526,  526,  521,  527,  522,  534,  524,  528,  528,  527,
-      529,  529,  530,  532,  535,  531,  532,  536,  530,  538,
-      536,  537,  535,  540,  534,  539,  537,  540,  541,  542,
-      543,  544,  545,  542,  541,  546,  544,  548,  547,  550,
-       54,  546,  538,  547,  539,  552,  549,  556,  543,  549,
-      553,  548,  545,  557,  549,  551,  551,  550,  549,  554,
-      555,  556,  560,  552,  554,  555,  553,  559,  557,  561,
-      562,  560,  561,  559,  562,  563,  564,  565,  566,  564,
+      508,  510,  519,  513,  518,  517,  520,  521,  519,  522,
+      521,  523,  524,  525,  527,  526,  525,  524,  520,  529,
+      530,  530,  528,  522,  526,  536,  523,  528,  528,  543,
+      527,  526,  529,  532,  526,  531,  531,  533,  533,  532,
+      534,  534,  535,  539,  537,  538,  536,  537,  535,  540,
+      538,  541,  543,  542,  541,  544,  545,  540,  542,  546,
+      545,  548,  539,  547,  549,  546,  550,  547,  552,  549,
+      551,  553,  554,  552,  544,  554,  551,  555,  557,  548,
+      554,  556,  556,  558,  554,  553,  550,  559,  560,  561,
+      562,  564,  559,  560,   48,  555,  557,  564,  565,  558,
 
-      563,  567,  565,  570,  569,  571,  572,  572,  570,  573,
-      574,  575,  576,  584,  566,   53,  562,  569,  573,  567,
-      577,  576,  578,  580,  579,  571,  580,  575,  578,  574,
-      579,  584,  577,  581,  581,  582,  581,  583,  582,  585,
-      586,  588,  583,  587,  594,  590,  586,  588,  587,  589,
-      590,  591,  589,  585,  592,  593,  591,  591,  596,  595,
-      597,  598,  599,  594,  594,  595,  598,  592,  593,  597,
-      600,  600,  601,  602,  603,  604,  602,  596,  605,  601,
-      603,  608,  599,  605,  606,  607,  607,  604,  610,  606,
-      606,  602,  609,  611,  609,  611,  612,  613,  614,  615,
+      571,  566,  567,  561,  566,  562,  567,  565,  568,  569,
+      570,  572,  569,  568,  573,  570,  571,  574,  575,  576,
+      580,  573,  578,  575,  577,  577,  579,  583,  567,  572,
+      574,  578,  581,  583,  582,  585,  580,  584,  585,  576,
+      589,  581,  592,  584,   43,  579,  582,  586,  586,  587,
+      586,  588,  587,  590,  591,  594,  588,  593,  589,  591,
+      594,  592,  595,  593,  601,  597,  596,  590,  595,  596,
+      597,  598,  599,  600,  602,  603,  598,  598,  604,  606,
+      602,  607,  607,  601,  601,  599,  600,  604,  605,  608,
+      611,  610,  609,  605,  603,  609,  608,  610,  612,  606,
 
-      616,  618,  617,  619,  620,  618,  608,  610,  617,  621,
-      622,  623,  619,  624,  612,  613,  614,  625,  615,  620,
-      616,  626,  627,  628,  621,  624,  629,  626,  622,  630,
-      623,  632,  625,  631,  633,  628,  627,  631,  634,  635,
-      636,  637,  638,  638,  640,  629,  642,  639,  630,  632,
-      633,  639,  644,  641,  645,  637,  634,  635,  635,  636,
-      642,  643,  646,  640,  641,  647,  643,  652,  644,  648,
-      649,  650,  647,  645,  648,  646,  650,  649,  651,  653,
-      654,  655,  656,  651,  657,  652,  653,  658,  661,  654,
-      659,  656,  658,  659,  660,  655,  657,  662,  660,  663,
+      613,  615,  611,  612,  617,  613,  613,  614,  614,  616,
+      609,  616,  618,  619,  618,  620,  621,  622,  623,  624,
+      625,  626,  627,  617,  625,  624,  615,  628,  629,  630,
+      626,  619,  631,  620,  621,  632,  622,  627,  623,  633,
+      634,  635,  628,  636,  631,  633,  629,  637,  630,  639,
+      632,  638,  640,  635,  634,  638,  641,  642,  643,  644,
+      645,  645,  636,  647,  649,  646,  637,  639,  640,  646,
+      648,  651,  652,  644,  641,  642,  642,  643,  649,  650,
+      653,  648,  647,  654,  650,  656,  659,  651,  661,  655,
+      654,  652,  656,  653,  655,  657,  658,  661,  660,  662,
 
-      665,  664,  661,  666,  666,  671,  662,  667,  667,  668,
-      668,  669,  672,  673,  663,  664,  667,  675,  672,  674,
-      669,  665,  676,  674,  671,  677,  678,  679,  681,  675,
-      680,  682,  678,  673,  683,  679,  686,  680,  689,  692,
-       48,  695,  694,  677,  693,  695,  681,  676,  692,  699,
-      693,  686,  696,  696,  683,  689,  682,  684,  694,  697,
-      697,  698,  684,  701,  700,  702,  684,  699,  704,  684,
-      773,  702,  698,  704,  705,  706,  684,  684,  700,  684,
-      707,  709,  709,  701,  703,  703,  703,  708,  703,  712,
-      708,  703,  710,  706,  773,  705,  703,  711,  711,  710,
+      657,  658,  663,  664,  659,  660,  666,  665,  668,  666,
+      667,  663,  665,  662,  667,  664,  669,  670,  672,  671,
+      673,  673,  668,  675,  675,  669,  674,  674,  676,  678,
+      679,  680,  670,  671,  681,  674,  679,  676,  681,  672,
+      682,  683,  684,  685,  688,  686,  689,  687,  678,  685,
+      690,  680,  682,  686,  687,  699,  711,  696,  693,  700,
+      684,  711,  688,  701,  699,  700,  683,  703,  703,  706,
+      690,  689,  691,  693,  696,  705,  702,  691,  708,  701,
+      702,  691,  704,  704,  691,  707,  705,  706,  712,  709,
+      713,  691,  691,  726,  691,  709,  714,   14,  708,  707,
 
-      713,  713,  703,  703,  712,  707,  714,  715,  716,  719,
-      715,  714,  720,  716,  717,  717,  718,  722,  718,  721,
-      723,  719,  724,  721,  725,  725,  726,  729,  727,  731,
-      724,  720,  728,  728,  730,  733,  750,  722,  732,  723,
-      733,  726,  727,  750,  732,  729,  730,  734,  734,  735,
-      738,  731,  737,  739,  735,  735,  738,  737,  740,  739,
-      741,  742,  743,  740,  742,  744,  741,  747,  743,  745,
-      745,  746,  746,  744,  748,  747,  749,  751,  752,  752,
-      753,  749,  754,  756,  758,  755,  759,  765,  761,  753,
-      754,  755,  748,  758,  760,  759,  751,  761,  762,  760,
+      710,  710,  710,  715,  710,  726,  715,  710,  713,  712,
+      716,  716,  710,  717,  718,  718,  719,  727,  710,  710,
+      717,  714,  720,  720,  721,  722,  728,  723,  722,  721,
+      728,  719,  723,  724,  724,  725,  727,  725,  729,  731,
+      730,  732,  732,  734,  736,  733,  738,  731,  735,  735,
+      739,  737,  741,  741,  752,  752,  739,  734,  729,  730,
+      733,  740,  736,  737,  742,  745,  740,  744,  738,  742,
+      742,  745,  744,  746,  749,  747,  748,  749,  750,  746,
+      747,  751,  748,  754,  750,  753,  753,  755,  756,  751,
+      757,  754,  758,  756,  760,  759,  763,  757,  761,  761,
 
-      763,  762,  756,  764,  766,  763,  767,  769,  769,  768,
-      770,  771,  765,  766,  768,  768,  778,  764,  772,  767,
-      774,  779,  776,  774,  776,  770,  779,  772,  777,  777,
-      771,  774,  780,  785,  781,  782,  783,  778,  786,  784,
-      787,  789,  785,  790,  787,  788,  793,  791,   43,  790,
-      792,  795,  794,  780,  781,  782,  791,  795,  783,  784,
-      789,  786,  792,  788,  796,  793,  794,  797,  798,  798,
-      799,  800,  797,  801,  802,  803,  804,  805,  796,  806,
-      800,  807,  802,  808,  810,  809,  811,  807,  812,  814,
-      799,  809,  811,  801,  812,  803,  805,  808,  804,  806,
+      762,  764,  765,  767,  763,  755,  768,  764,  770,  762,
+      758,  759,  767,  760,  769,  768,  773,  770,  774,  769,
+      771,  765,  772,  771,  775,  776,  777,  772,  778,  778,
+      773,  777,  777,  775,  779,  780,  781,  782,  776,  783,
+      786,  786,  783,  774,  785,  781,  785,  787,  788,  779,
+      783,  789,  792,  788,  780,  790,  791,  793,  794,  795,
+      796,  782,  797,  799,  796,  798,  801,  794,  787,  799,
+      800,  802,  789,  803,  792,  790,  791,  793,  801,  800,
+      797,  805,  795,  804,  798,  808,  806,  803,  809,  804,
+      802,  806,  807,  807,  810,  805,  811,  809,  812,  813,
 
-      815,  813,  816,  817,  810,  813,  822,  816,  814,  818,
-      818,  819,  815,  820,  821,  823,  820,  819,  824,  822,
-      815,  823,  825,  825,  817,  826,  827,  828,  828,  829,
-      830,  827,  821,  832,  830,  831,  831,  833,  824,  835,
-      834,  837,  838,  826,  829,  834,  840,  841,  843,  843,
-      844,  847,  845,  879,  844,  832,  838,  833,  835,  846,
-      846,  879,  849,  866,  866,  837,  840,  845,  841,  842,
-      850,  848,  842,  852,  842,  848,  847,  849,  842,  854,
-      842,  851,  856,  853,  850,  842,  851,  852,  853,  853,
-      842,  855,  858,  854,  857,  855,  859,  856,  860,  857,
+      814,  816,  815,  817,  811,  808,  818,  816,  819,  820,
+      821,  823,  818,  824,  810,  820,  821,  817,  812,  814,
+      822,  813,  815,  826,  822,  824,  825,  830,  819,  831,
+      823,  825,  828,  824,  827,  827,  829,  832,  828,  829,
+      833,  835,  831,  832,  826,  830,  834,  834,  836,  837,
+      837,  838,  839,  836,  840,  840,  839,  841,  842,  835,
+      833,  844,  843,  846,  849,  850,  838,  843,  847,  852,
+      852,  853,  855,  855,  854,  853,  856,  857,  842,  841,
+      844,  857,  847,  858,  849,  860,  850,  846,  851,  854,
+      860,  851,  859,  851,  861,  875,  875,  851,  858,  851,
 
-      861,  859,  862,  869,  858,  863,  871,  855,  864,  857,
-      867,  863,  860,  865,  864,  867,  862,  868,  870,  865,
-      873,  861,  874,  868,  871,  869,  875,  874,  878,  876,
-      877,  877,  873,  878,  880,  881,  882,  870,  872,  872,
-      875,  876,  883,  883,  872,  884,  872,  886,  880,  884,
-      888,  892,  872,  886,  881,  882,  887,  872,  872,  887,
-      889,  890,  894,  891,  872,  895,  896,  890,  891,  888,
-      892,  894,  897,  889,  895,  898,  899,  901,  897,  902,
-      900,  903,  896,  905,  898,  900,  904,  906,  907,  908,
-      913,  911,  905,  902,  907,  899,  906,  901,  904,  909,
+      863,  856,  865,  864,  851,  862,  859,  864,  861,  851,
+      862,  862,  867,  866,  863,  868,  869,  865,  866,  864,
+      868,  870,  871,  872,  867,  873,  874,  878,  866,  872,
+      869,  873,  874,  876,  877,  879,  871,  880,  876,  882,
+      877,  883,  870,  887,  884,   13,  883,  885,  887,  878,
+      890,  882,  886,  886,  879,  880,  881,  881,  884,  885,
+      888,  891,  881,  889,  881,  892,  892,  893,  888,  890,
+      881,  893,  895,  897,  898,  881,  881,  889,  895,  899,
+      891,  896,  881,  900,  896,  899,  901,  898,  900,  903,
+      904,  905,  897,  907,  906,  908,  909,  910,  903,  904,
 
-      914,  903,  915,  916,  913,  909,  908,  911,  917,  918,
-      919,  920,   14,  923,  924,  919,  920,  916,  923,  926,
-      914,  915,  927,  924,  918,  926,  917,  925,  925,  929,
-      932,  930,  933,  932,  934,  927,  930,  930,  931,  931,
-      935,  938,  931,  936,  937,  929,  933,  938,  939,  940,
-      941,  946,  942,  943,  934,  940,  936,  942,  935,  937,
-      945,  947,  949,  945,  948,  941,  947,  943,  939,  948,
-      950,  951,  946,  952,  954,  950,  951,  955,  949,  960,
-      954,  956,  957,  958,  958,  952,  959,  956,  957,  961,
-      962,  962,  961,  955,  963,  959,  964,  960,  965,  966,
+      906,  909,  907,  912,  911,  901,  914,  905,  913,  917,
+      915,  922,  920,  923,  908,  914,  916,  910,  911,  915,
+      913,  918,  916,  912,  924,  922,  917,  918,  920,  926,
+      925,  927,  928,  923,  929,  932,  933,  928,  937,  929,
+      932,  934,  934,  924,  925,  933,  927,  926,  935,  936,
+      938,  940,  944,  937,  935,  941,  943,  945,  936,  943,
+      941,  941,  946,  938,  942,  942,  944,  940,  942,  947,
+      948,  950,  949,  951,  952,  957,  953,  945,  949,  951,
+      946,  953,  947,  954,  956,  948,  960,  956,  958,  952,
+      959,  950,  963,  958,  961,  959,  957,  954,  962,  961,
 
-      967,  968,  966,  969,  976,  970,  971,  968,  975,  969,
-      970,  971,  963,  967,  972,  964,  973,  977,  965,  972,
-      978,  980,  973,  977,  976,  978,  975,  979,  979,  981,
-      980,  982,  983,  984,  985,  983,  984,  986,  981,  987,
-      988,  989,  990,  991,  994,  985,  995,  989,  990,  982,
-      996,  987,  992,  993,  993,  986,  998,  992,  991,  988,
-      995,  997,  996,  994,  999,  997, 1000, 1001, 1003, 1004,
-     1004, 1008, 1006,  999,  998, 1007, 1009, 1011, 1011, 1010,
-     1012, 1009, 1016, 1008, 1016, 1000, 1006, 1003, 1010, 1013,
-     1007, 1014, 1001, 1015, 1017, 1013, 1018, 1014, 1015, 1017,
+      965,  966,  960,  962,  963,  967,  965,  968,  969,  969,
+      970,  967,  971,  968,  974,  972,  975,  966,  972,  970,
+      973,  973,  976,  977,  978,  979,  977,  980,  986,  981,
+      971,  979,  974,  980,  981,  975,  982,  978,  983,  984,
+      987,  982,  976,  983,  988,  984,  986,  989,  990,  990,
+      988,  993,  989,  991,  992,  994,  995,  996,  994,  995,
+      987,  997,  991,  992,  998,  999, 1000, 1001,  996,  993,
+     1002, 1005, 1000, 1001, 1006, 1003,  998, 1004, 1004,  997,
+     1003, 1007, 1008, 1009,  999, 1002, 1008, 1010, 1006, 1011,
+     1005, 1012, 1014, 1007, 1015, 1015, 1010, 1019, 1017, 1018,
 
-     1012, 1019, 1020, 1021, 1022, 1023, 1024, 1020, 1025, 1030,
-     1018, 1028, 1023, 1027, 1027, 1019, 1029, 1032, 1021, 1040,
-     1031, 1024, 1040, 1022, 1030, 1028, 1031, 1025, 1033, 1035,
-     1035, 1036, 1039, 1033, 1029, 1041, 1036, 1032, 1037, 1037,
-     1042, 1038, 1033, 1043, 1033, 1044, 1039, 1033, 1038, 1045,
-     1044, 1046, 1043, 1047, 1041, 1048, 1046, 1051, 1042, 1050,
-     1050, 1052, 1051, 1053, 1047, 1054, 1052, 1055, 1045, 1056,
-     1054, 1055, 1057, 1058, 1048, 1059, 1061, 1060, 1056, 1062,
-     1063, 1064, 1065, 1053, 1066, 1069, 1062, 1057, 1058, 1060,
-     1067, 1061, 1063, 1068, 1059, 1070, 1067, 1071, 1073, 1074,
+     1020, 1009, 1022, 1022, 1021, 1020, 1023, 1051, 1011, 1019,
+     1051, 1014, 1017, 1021, 1018, 1024, 1012, 1025, 1027, 1026,
+     1027, 1024, 1028, 1025, 1026, 1029, 1023, 1028, 1030, 1031,
+     1032, 1033, 1035, 1034, 1031, 1036, 1038, 1038, 1039, 1029,
+     1034, 1040, 1030, 1041, 1043, 1032, 1044, 1035, 1047, 1042,
+     1033, 1044, 1039, 1047, 1036, 1042, 1046, 1046, 1041, 1040,
+     1044, 1049, 1044, 1050, 1043, 1044, 1048, 1048, 1049, 1052,
+     1054, 1053, 1056, 1055, 1058, 1057, 1059, 1050, 1055, 1054,
+     1057, 1061, 1061, 1064,    0, 1058, 1066, 1062, 1052, 1053,
+     1066, 1056, 1062, 1063, 1065, 1059, 1067, 1068, 1063, 1065,
 
-     1064, 1075, 1066, 1065, 1073, 1069, 1071, 1076, 1068, 1075,
-     1078, 1077, 1079, 1074, 1080, 1070, 1077, 1079, 1079, 1082,
-     1081, 1086, 1078, 1083, 1083, 1085,   13, 1076, 1088, 1088,
-     1086, 1087, 1082, 1080, 1081, 1084, 1089, 1087, 1085, 1091,
-     1084, 1089, 1090, 1084, 1084, 1091, 1095, 1092, 1084, 1098,
-     1093, 1090, 1092, 1099, 1084, 1093, 1094, 1094, 1084, 1096,
-     1096, 1097, 1101, 1100, 1097, 1102, 1097, 1095, 1104, 1098,
-     1102, 1099, 1100, 1103, 1105, 1106, 1109, 1139, 1107, 1139,
-     1105, 1106, 1101, 1107, 1108, 1109, 1104, 1103, 1108, 1116,
-     1109, 1114, 1109, 1112, 1109, 1114, 1109, 1110, 1110, 1111,
+     1069, 1070, 1071, 1064, 1072, 1067, 1073, 1075, 1076, 1074,
+     1077, 1078, 1068, 1073, 1071, 1069, 1079, 1078, 1080, 1072,
+     1070, 1074, 1081, 1082, 1084, 1085, 1075, 1086, 1077, 1076,
+     1084, 1079, 1082, 1087, 1089, 1086, 1088, 1091, 1080, 1085,
+     1092, 1088, 1081, 1090, 1093, 1818, 1089, 1096, 1090, 1090,
+     1094, 1094, 1097, 1087, 1092, 1101, 1091, 1093, 1095, 1098,
+     1096, 1097, 1818, 1095, 1101, 1098, 1095, 1095, 1099, 1099,
+     1100, 1095, 1102, 1106, 1103, 1100, 1109, 1095, 1102, 1103,
+     1104, 1095, 1105, 1105, 1110, 1104, 1107, 1107, 1108, 1111,
+     1112, 1108, 1113, 1108, 1106, 1114, 1109, 1113, 1111, 1115,
 
-     1111, 1115, 1111, 1117, 1112, 1118, 1119, 1116, 1120, 1121,
-     1118, 1118, 1117, 1120, 1123, 1122, 1115, 1124, 1125, 1126,
-     1127, 1127, 1128, 1121, 1122, 1126, 1129, 1131, 1119, 1130,
-     1128, 1133, 1125, 1123, 1130, 1132, 1124, 1134, 1135, 1137,
-     1129, 1131, 1143, 1135, 1132, 1136, 1136, 1138, 1138, 1133,
-     1141, 1142, 1146, 1141, 1137, 1144, 1142, 1145, 1145, 1147,
-     1147, 1143, 1134, 1149, 1144, 1148, 1148, 1150, 1149, 1151,
-     1152, 1152, 1146, 1153, 1154, 1155, 1156, 1154, 1157, 1159,
-     1158, 1156, 1158, 1161, 1162,    0, 1161, 1157, 1150, 1163,
-     1151, 1164, 1165, 1153, 1163, 1155, 1164, 1159, 1166, 1162,
+     1116, 1117, 1110, 1118, 1120, 1125, 1116, 1117, 1118, 1114,
+     1112, 1119, 1122, 1120, 1121, 1119, 1125, 1115, 1120, 1121,
+     1120, 1127, 1120, 1128, 1120, 1127, 1122, 1123, 1123, 1124,
+     1124, 1129, 1124, 1130, 1131, 1132, 1133, 1134, 1128, 1131,
+     1131, 1133, 1130, 1135, 1136, 1137, 1138, 1139, 1141, 1129,
+     1146, 1134, 1135, 1139, 1140, 1140, 1141, 1132, 1142, 1144,
+     1138, 1143, 1145, 1136, 1137, 1147, 1143, 1150, 1146, 1148,
+        0, 1145, 1142, 1144, 1148, 1149, 1149, 1151, 1151, 1152,
+     1154, 1152, 1150, 1154, 1155, 1156, 1157, 1158, 1158, 1155,
+     1147, 1159, 1160, 1160, 1162, 1157, 1161, 1161, 1163, 1162,
 
-     1165, 1167, 1169, 1166, 1168, 1168, 1167, 1169, 1170, 1171,
-     1172, 1173, 1175, 1176, 1178, 1171, 1177, 1172, 1175, 1176,
-     1178, 1177, 1179, 1180, 1173, 1181, 1170, 1182, 1182, 1183,
-     1185, 1179, 1186, 1187, 1188, 1189, 1181, 1191, 1192, 1187,
-     1188, 1189, 1180, 1191, 1193, 1194, 1195, 1196, 1198, 1183,
-     1185, 1199, 1192, 1197, 1197, 1186, 1200, 1194, 1192, 1203,
-     1195, 1201, 1202, 1202, 1193, 1196, 1201, 1204, 1198, 1206,
-        0, 1208, 1204, 1207, 1200, 1209, 1199, 1210, 1207, 1207,
-     1211, 1212, 1203, 1213, 1209, 1210, 1216, 1214, 1206, 1208,
-     1222, 1215, 1214, 1215, 1211, 1214, 1212, 1218, 1213, 1220,
+     1164, 1165, 1165, 1166, 1156, 1167, 1168, 1169, 1167, 1170,
+     1172, 1159, 1169, 1171, 1174, 1171, 1175, 1174, 1170, 1163,
+     1176, 1164, 1177, 1166, 1178, 1176, 1168, 1177, 1172, 1179,
+     1180, 1175, 1178, 1182, 1179, 1180, 1181, 1181, 1182, 1183,
+     1184, 1185, 1186, 1188, 1189, 1191, 1184, 1190, 1185, 1188,
+     1189, 1191, 1190, 1192, 1193, 1186, 1194, 1183, 1195, 1195,
+     1196, 1198, 1192, 1199, 1200, 1201, 1202, 1194, 1204, 1205,
+     1200, 1201, 1202, 1193, 1204, 1206, 1207, 1208, 1209, 1211,
+     1196, 1198, 1212, 1205, 1210, 1210, 1199, 1213, 1207, 1205,
+     1216, 1208, 1214, 1215, 1215, 1206, 1209, 1214, 1217, 1211,
 
-     1216, 1213, 1219, 1218, 1223, 1224, 1219, 1221, 1226, 1222,
-     1220, 1225, 1221, 1221, 1227, 1228, 1225, 1230, 1231, 1227,
-     1232, 1233, 1233, 1224, 1234, 1235, 1226, 1236, 1234, 1238,
-     1223, 1230, 1239, 1237, 1240, 1228, 1231, 1241, 1232, 1237,
-     1242, 1238, 1243, 1235, 1244, 1246, 1236, 1245, 1240, 1244,
-     1246, 1239, 1241, 1247, 1245, 1242, 1248, 1249, 1249, 1250,
-     1251, 1243, 1252, 1253, 1254, 1248, 1251, 1255, 1253, 1262,
-     1254, 1247, 1263, 1255, 1250, 1256, 1256, 1257, 1257, 1259,
-     1259, 1260, 1261, 1252, 1264, 1260, 1263, 1262, 1265, 1266,
-     1266, 1261, 1267, 1268, 1270, 1265, 1271, 1269, 1272, 1264,
+     1219,    0, 1221, 1217, 1220, 1213, 1222, 1212, 1223, 1220,
+     1220, 1224, 1225, 1216, 1226, 1222, 1223, 1229, 1227, 1219,
+     1221, 1235, 1228, 1227, 1228, 1224, 1227, 1225, 1231, 1226,
+     1233, 1229, 1226, 1232, 1231, 1236, 1237, 1232, 1234, 1239,
+     1235, 1233, 1238, 1234, 1234, 1240, 1241, 1238, 1243, 1244,
+     1240, 1245, 1246, 1246, 1237, 1247, 1248, 1239, 1249, 1247,
+     1251, 1236, 1243, 1252, 1250, 1253, 1241, 1244, 1254, 1245,
+     1250, 1255, 1251, 1256, 1248, 1257, 1259, 1249, 1258, 1253,
+     1257, 1259, 1252, 1254, 1260, 1258, 1255, 1261, 1262, 1262,
+     1263, 1264, 1256, 1265, 1266, 1267, 1261, 1264, 1268, 1266,
 
-     1273, 1268, 1269, 1272, 1272, 1273, 1273, 1274, 1270, 1275,
-     1275, 1276, 1267, 1277, 1278, 1271, 1279, 1280, 1281, 1282,
-     1283, 1279, 1285, 1278, 1284, 1286, 1283, 1274, 1287, 1284,
-     1276, 1286, 1277, 1288, 1289, 1290, 1280, 1282, 1281, 1288,
-     1289, 1291, 1292, 1293, 1294, 1295,    0, 1287, 1285, 1296,
-     1297, 1297, 1298, 1299, 1290, 1298, 1300, 1300, 1294, 1303,
-     1291, 1292, 1293, 1303, 1296, 1299, 1295, 1301, 1301, 1302,
-     1304, 1305, 1306, 1307, 1302, 1307, 1309, 1311, 1310, 1307,
-     1305, 1309, 1312, 1304, 1314, 1306, 1313, 1313, 1315, 1314,
-     1316, 1317, 1307, 1310, 1315, 1318, 1321, 1311, 1312, 1319,
+     1275, 1267, 1260, 1276, 1268, 1263, 1269, 1269, 1270, 1270,
+     1272, 1272, 1273, 1274, 1265, 1277, 1273, 1276, 1275, 1278,
+     1279, 1279, 1274, 1280, 1281, 1283, 1278, 1284, 1282, 1285,
+     1277, 1286, 1281, 1282, 1285, 1285, 1286, 1286, 1287, 1283,
+     1288, 1288, 1289, 1280, 1290, 1291, 1284, 1292, 1293, 1294,
+     1295, 1296, 1292, 1298, 1291, 1297, 1299, 1296, 1287, 1300,
+     1297, 1289, 1299, 1290, 1301, 1302, 1303, 1293, 1295, 1294,
+     1301, 1302, 1304, 1305, 1306, 1307, 1308, 1312, 1300, 1298,
+     1309, 1310, 1310, 1311, 1313, 1303, 1311, 1314,    0, 1307,
+     1318, 1304, 1305, 1306, 1318, 1309, 1312, 1308, 1319, 1314,
 
-     1318, 1322, 1320, 1319, 1317, 1316, 1320, 1323, 1324, 1325,
-     1325, 1327, 1329, 1330, 1324, 1333, 1321, 1332, 1330, 1322,
-     1331, 1331, 1339, 1332, 1335, 1335, 1340, 1323, 1337, 1327,
-     1343, 1337, 1344, 1329, 1346, 1333, 1338, 1338, 1339, 1347,
-     1342, 1344, 1340, 1342, 1345, 1345, 1348, 1349, 1350, 1346,
-     1343, 1352, 1349, 1351, 1351, 1353, 1354, 1355, 1355, 1356,
-     1347, 1357, 1350, 1358, 1362, 1348, 1364, 1359, 1358, 1352,
-     1353, 1360, 1360, 1356, 1361, 1363, 1363, 1367, 1361, 1357,
-     1365, 1354, 1359, 1366, 1362, 1368, 1371, 1366, 1364, 1372,
-     1368, 1365, 1370, 1370, 1373, 1374, 1367, 1375, 1376, 1376,
+     1315, 1315, 1317, 1313, 1316, 1316, 1320, 1317, 1321, 1324,
+     1322, 1319, 1322, 1325, 1324, 1320, 1322, 1326, 1327, 1328,
+     1328, 1321, 1329, 1331, 1330, 1337, 1332, 1329, 1325, 1322,
+     1330, 1333, 1336, 1338, 1327, 1344, 1333, 1326, 1331, 1332,
+     1334, 1335, 1339, 1337, 1334, 1335, 1340, 1340, 1339, 1342,
+     1345, 1348, 1336, 1338, 1347, 1345, 1344, 1346, 1346, 1354,
+     1347, 1350, 1350, 1352, 1353, 1353, 1352, 1342, 1355, 1357,
+     1358, 1348, 1357, 1359, 1361, 1354, 1360, 1360, 1362, 1363,
+     1364, 1365, 1359, 1367, 1355, 1364, 1366, 1366, 1368, 1361,
+     1358, 1369, 1370, 1370, 1371, 1365, 1372, 1373, 1363, 1362,
 
-     1377, 1378, 1380, 1372, 1371, 1377, 1379, 1381, 1382, 1374,
-     1385, 1380, 1381, 1373, 1373, 1383, 1385, 1383, 1384, 1386,
-     1389, 1378, 1375, 1384, 1387, 1391, 1379, 1392, 1382, 1395,
-     1387, 1390, 1390, 1392, 1389, 1394, 1396, 1396, 1398, 1386,
-     1394, 1397, 1397, 1399, 1391, 1400, 1401, 1402, 1402, 1401,
-     1403, 1404, 1398, 1395, 1407, 1412, 1416, 1416, 1406, 1407,
-     1400, 1399, 1403, 1405, 1406, 1408, 1405, 1410, 1408, 1405,
-     1411, 1404, 1414, 1418, 1413, 1411, 1410, 1413, 1414, 1418,
-     1412, 1405, 1415, 1419, 1408, 1417, 1417, 1415, 1419, 1420,
-     1421, 1422, 1423, 1424, 1425, 1426, 1424, 1429, 1427, 1428,
+     1374, 1367, 1373, 1368, 1375, 1375, 1376, 1377, 1371, 1379,
+     1376, 1378, 1378, 1380, 1372, 1374, 1369, 1381, 1382, 1387,
+     1383, 1381, 1385, 1385, 1380, 1383, 1386, 1377, 1388, 1389,
+     1390, 1379, 1393, 1387, 1391, 1391, 1392, 1382, 1394, 1397,
+     1395, 1392, 1401, 1389, 1386, 1396,    0, 1388, 1388, 1395,
+     1396, 1398, 1393, 1398, 1400, 1390, 1399, 1402, 1394, 1397,
+     1400, 1399, 1401, 1402, 1404, 1405, 1405, 1406, 1407, 1410,
+     1409, 1411, 1411, 1413, 1407, 1409, 1412, 1412, 1404, 1414,
+     1415, 1416, 1417, 1417, 1416, 1419, 1406, 1413, 1418, 1422,
+     1427,    0, 1421, 1410, 1422, 1415, 1420, 1414, 1421, 1420,
 
-     1425, 1426, 1420, 1427, 1430, 1428, 1431, 1431, 1421, 1430,
-     1422, 1432, 1423, 1433, 1434, 1435, 1432, 1438, 1436, 1437,
-     1429, 1440, 1441, 1439, 1442, 1443, 1444, 1440, 1447, 1438,
-     1452, 1433, 1436, 1437, 1434, 1435, 1439, 1446, 1446, 1443,
-     1448, 1450, 1441, 1451, 1442, 1448, 1453, 1444, 1447, 1449,
-     1449, 1454, 1455, 1458, 1452, 1456, 1450, 1451, 1460, 1457,
-     1454, 1462, 1456, 1463, 1453, 1467, 1463, 1455, 1457, 1458,
-     1466, 1457, 1470, 1460, 1464, 1464, 1465, 1465, 1460, 1469,
-     1469, 1468, 1466, 1467, 1468, 1470, 1462, 1471, 1472, 1473,
-     1474, 1475, 1476, 1472, 1473, 1477, 1478, 1480, 1481, 1481,
+     1418, 1423, 1420, 1425, 1423, 1419, 1426, 1428, 1431, 1431,
+     1428, 1426, 1425, 1429, 1420, 1427, 1430, 1432, 1432, 1429,
+     1423, 1430, 1433, 1435, 1434, 1436, 1437, 1438, 1433, 1434,
+     1439, 1440, 1441, 1439, 1442, 1443, 1435, 1440, 1441, 1442,
+     1444, 1443, 1448, 1436, 1445, 1437, 1449, 1438, 1447, 1445,
+     1446, 1446, 1450, 1447, 1451, 1452, 1455, 1456, 1453, 1457,
+     1448, 1454, 1455, 1444, 1458, 1459, 1449, 1462, 1451, 1452,
+     1453, 1467, 1450, 1465, 1454, 1461, 1461, 1456, 1458, 1457,
+     1463, 1464, 1464, 1466, 1468, 1463, 1459, 1462, 1465, 1469,
+     1470, 1472, 1471, 1473, 1477, 1467, 1475, 1466, 1469, 1471,
 
-     1482, 1476, 1479, 1480, 1483, 1478, 1471, 1475, 1478, 1474,
-     1484, 1479, 1485, 1486, 1477, 1487, 1490, 1483, 1491, 1493,
-     1482, 1492, 1492, 1494, 1498, 1495, 1485, 1487, 1484, 1486,
-     1495, 1497, 1494, 1496, 1496, 1493, 1491, 1499, 1500, 1501,
-     1497, 1490, 1498, 1497, 1501, 1501, 1503, 1504, 1496, 1505,
-     1506, 1507, 1508, 1509, 1509, 1506, 1500, 1507, 1499, 1510,
-     1503, 1511, 1504, 1512, 1515, 1510, 1511, 1513, 1516, 1512,
-     1508, 1505, 1517, 1513, 1518, 1520, 1519, 1524, 1517, 1519,
-     1522, 1520, 1516, 1525, 1515, 1519, 1526, 1518, 1522, 1527,
-     1528, 1529, 1530, 1531, 1526, 1533, 1524, 1535, 1527, 1532,
+     1472, 1478, 1468, 1472, 1478, 1470, 1479, 1479, 1481, 1473,
+     1482, 1475, 1480, 1480, 1483, 1486, 1475, 1483, 1485, 1477,
+     1481, 1484, 1484, 1489, 1487, 1488, 1491, 1490, 1482, 1487,
+     1488, 1485, 1492, 1495, 1486, 1491, 1493, 1494, 1497, 1495,
+     1496, 1496, 1489, 1490, 1498, 1493, 1494, 1499, 1493, 1500,
+     1501, 1492, 1504, 1507, 1502, 1508, 1503, 1498, 1497, 1502,
+     1502, 1503, 1511, 1500, 1504, 1499, 1501, 1509, 1509, 1510,
+     1512, 1511, 1514, 1508, 1515, 1512, 1513, 1513, 1507, 1516,
+     1517, 1514, 1518, 1520, 1514, 1510, 1521, 1518, 1518, 1522,
+     1523, 1513, 1515, 1524, 1525, 1523, 1532, 1520, 1517, 1524,
 
-     1532, 1533, 1525, 1528, 1529, 1534, 1530, 1531, 1536, 1537,
-     1535, 1534, 1538, 1539, 1540, 1541, 1542, 1543, 1545, 1545,
-     1540, 1532, 1546, 1552,    0, 1547, 1539, 1537, 1536, 1547,
-     1554, 1538, 1542, 1548, 1549, 1543, 1550, 1541, 1548, 1549,
-     1551, 1550, 1546, 1555, 1555, 1554, 1552, 1556, 1557, 1551,
-     1558, 1559, 1559, 1560, 1561, 1564, 1562, 1565, 1563, 1566,
-     1557, 1561, 1568, 1567, 1659, 1566, 1556, 1560, 1562, 1558,
-     1563, 1659, 1569, 1571, 1564, 1567, 1571, 1565, 1569, 1575,
-     1568, 1570, 1570, 1572, 1572, 1574, 1576, 1578, 1575, 1579,
-     1574, 1579, 1576, 1577, 1577, 1580, 1581, 1582, 1580, 1578,
+     1516, 1521, 1526, 1526, 1527, 1533,    0, 1541, 1528, 1529,
+     1527, 1522, 1525, 1528, 1530, 1529, 1532, 1534, 1535, 1533,
+     1530, 1536, 1537, 1534, 1536, 1539, 1541, 1542, 1537, 1543,
+     1536, 1535, 1544, 1539, 1545, 1546, 1547, 1543, 1548, 1549,
+     1549, 1544, 1552, 1550, 1553, 1551, 1542, 1545, 1546, 1550,
+     1547, 1551, 1548, 1554, 1555, 1552, 1556, 1557, 1558, 1559,
+     1560, 1549, 1563, 1557, 1553, 1562, 1562, 1569, 1564, 1556,
+     1571, 1554, 1564, 1555, 1565, 1559, 1566, 1568, 1560, 1565,
+     1558, 1566, 1563, 1567, 1573, 1571, 1568, 1574, 1567, 1575,
+     1569, 1572, 1572, 1576, 1576, 1577, 1581, 1578, 1579, 1574,
 
-     1583, 1585, 1584, 1586, 1589, 1587, 1585, 1588, 1591, 1589,
-     1593, 1597, 1586,    0, 1590, 1593, 1581, 1587, 1583, 1582,
-     1584, 1592, 1588, 1590, 1594, 1596, 1592, 1598, 1591, 1595,
-     1595, 1596, 1597, 1592, 1599, 1600, 1590, 1602, 1601, 1594,
-     1601, 1603, 1603, 1604, 1604, 1606, 1598, 1605, 1605, 1609,
-     1599, 1602, 1610, 1602, 1617, 1600, 1607, 1607, 1608, 1608,
-     1611, 1611, 1612, 1613, 1614, 1606, 1612, 1614, 1616, 1613,
-     1609, 1618, 1617, 1610, 1616, 1619, 1620, 1618, 1623, 1620,
-     1621, 1621, 1622, 1622, 1623, 1624, 1625, 1626, 1627, 1628,
-     1630, 1631, 1637, 1634, 1627, 1630, 1630, 1624, 1624, 1624,
+     1580, 1582, 1584, 1573, 1578, 1583, 1585, 1586, 1575, 1577,
+     1579, 1583, 1580, 1586, 1584, 1581, 1587, 1587, 1591, 1588,
+     1592, 1582, 1588, 1591, 1585, 1589, 1589, 1593, 1595, 1592,
+     1594, 1594, 1596, 1593, 1596, 1597, 1598, 1599, 1597, 1600,
+     1595, 1602, 1601, 1603, 1607, 1606, 1602, 1605, 1608, 1604,
+     1606, 1614, 1603, 1607, 1612, 1612, 1598, 1600, 1609, 1599,
+     1601, 1604, 1605, 1609, 1610, 1611, 1607, 1613, 1608, 1610,
+     1609, 1615, 1614, 1613, 1617, 1616, 1618, 1623, 1618, 1619,
+     1611, 1620, 1620, 1621, 1621, 1622, 1622, 1624, 1624, 1626,
+     1615, 1616, 1627, 1619, 1617, 1619, 1634, 1623, 1625, 1625,
 
-     1619, 1632, 1633, 1632, 1624, 1631, 1625, 1626, 1634, 1628,
-     1635, 1636, 1637, 1633, 1638, 1640, 1635, 1639, 1639, 1642,
-     1636, 1641, 1641, 1643, 1644, 1644, 1645, 1645, 1646, 1649,
-     1649, 1650, 1654, 1651, 1653, 1638, 1656, 1656, 1655, 1642,
-     1657, 1640, 1651, 1653, 1655, 1643, 1660, 1658, 1646, 1661,
-     1662, 1662, 1663, 1654, 1664, 1660, 1650, 1668, 1666, 1667,
-     1669, 1657, 1658, 1666, 1673, 1667, 1670, 1669, 1671, 1673,
-     1664, 1675, 1670, 1674, 1671, 1661, 1676, 1668, 1663, 1672,
-     1672, 1677, 1674, 1678, 1679, 1680, 1678, 1681, 1681, 1683,
-     1682, 1675, 1684, 1677, 1685, 1676, 1682, 1687, 1685, 1688,
+     1628, 1628, 1629, 1630, 1631, 1633, 1629, 1631, 1636, 1630,
+     1626, 1633, 1635, 1627, 1634, 1641, 1637, 1642, 1635, 1637,
+     1638, 1638, 1639, 1639, 1640, 1643, 1644, 1641, 1641, 1641,
+     1640, 1645, 1644, 1636, 1641, 1647, 1648, 1642, 1650, 1651,
+     1647, 1647, 1649, 1654, 1649, 1643, 1652, 1653, 1655, 1650,
+     1648, 1645, 1652, 1657, 1651, 1659, 1653, 1656, 1656, 1658,
+     1658, 1660, 1663, 1654, 1661, 1661, 1662, 1662, 1667, 1655,
+     1666, 1666, 1668, 1671, 1672, 1659, 1670, 1673, 1673, 1657,
+     1672, 1668, 1663, 1660, 1674, 1670, 1675, 1677, 1676, 1678,
+     1679, 1679, 1680, 1667, 1671, 1676, 1677, 1681, 1683, 1685,
 
-     1689, 1691, 1679, 1690, 1690, 1689, 1694, 1684, 1692, 1683,
-     1702, 1680, 1695, 1696, 1685, 1697, 1695, 1687, 1699, 1696,
-     1691, 1688, 1699, 1692, 1697, 1694, 1698, 1698, 1700, 1701,
-     1701, 1702, 1703, 1704, 1706, 1705, 1707, 1708, 1709, 1700,
-     1705, 1713, 1710, 1708, 1700, 1713, 1703, 1710, 1711, 1711,
-     1712, 1712, 1704, 1709, 1706, 1715, 1707, 1716, 1717, 1718,
-     1718, 1719, 1719, 1721, 1715, 1720, 1722, 1723, 1716, 1721,
-     1720, 1720, 1722, 1716, 1724, 1725, 1726, 1728, 1717, 1724,
-     1729, 1731, 1726, 1730, 1729, 1732, 1733, 1725, 1734, 1728,
-     1735, 1732, 1737, 1723, 1734, 1730, 1738, 1741, 1739, 1745,
+     1684, 1675, 1686, 1683, 1687, 1674, 1684, 1690, 1695, 1686,
+     1687, 1691, 1688, 1681, 1688, 1678, 1694, 1691, 1680, 1685,
+     1692, 1692, 1693, 1696, 1697, 1694, 1690, 1693, 1695, 1698,
+     1699, 1700, 1698, 1701, 1701, 1702, 1697, 1704, 1703, 1705,
+     1707, 1702, 1696, 1705, 1708, 1709, 1710, 1710, 1699, 1711,
+     1709, 1714, 1704,    0, 1712, 1717, 1716, 1700, 1703, 1705,
+     1707, 1715, 1716, 1719, 1717, 1715, 1708, 1719, 1711, 1712,
+     1714, 1718, 1718, 1720, 1721, 1721, 1722, 1723, 1725, 1724,
+     1726, 1727, 1728, 1725, 1720, 1730, 1737, 1729, 1728, 1720,
+     1730, 1723, 1731, 1731, 1732, 1732, 1735, 1722, 1724, 1733,
 
-     1741, 1746, 1735, 1739, 1737, 1755, 1731, 1746, 1733, 1742,
-     1742, 1743, 1743, 1744, 1744, 1738, 1747, 1755, 1748, 1745,
-     1749, 1750, 1747, 1748, 1752, 1754, 1749, 1758, 1754, 1752,
-     1750, 1756, 1756, 1759, 1762, 1760, 1761, 1761, 1766, 1758,
-     1760, 1763, 1764, 1762, 1767, 1759, 1763, 1764, 1765, 1765,
-     1768, 1769, 1770, 1767, 1771, 1772, 1770, 1773, 1766, 1771,
-     1774, 1772, 1775, 1776, 1778, 1778, 1779, 1783, 1768, 1774,
-     1769, 1784, 1780, 1781, 1781, 1773, 1778, 1776, 1782, 1783,
-     1775, 1780, 1786, 1785, 1779, 1789, 1789, 1782, 1785, 1792,
-     1791, 1793, 1784, 1791, 1795, 1786, 1796, 1797, 1798, 1799,
+     1726, 1727, 1729, 1733, 1736, 1735, 1737, 1738, 1738, 1739,
+     1739, 1740, 1741, 1742, 1743, 1736, 1740, 1740, 1741, 1742,
+     1736, 1744, 1745, 1746, 1748, 1750, 1744, 1749, 1751, 1746,
+     1753, 1749, 1752, 1754, 1745, 1755, 1748, 1750, 1752, 1754,
+     1743, 1758, 1757, 1759, 1762, 1762, 1761, 1755, 1759, 1761,
+     1763, 1763, 1753, 1751, 1757, 1764, 1764, 1765, 1766, 1767,
+     1758, 1768, 1769, 1770, 1766, 1767, 1768, 1774, 1769, 1772,
+     1774, 1775, 1770, 1778, 1772, 1776, 1776, 1765, 1779, 1780,
+     1781, 1781, 1782, 1775, 1780, 1778, 1786, 1783, 1784, 1787,
+     1779, 1782, 1783, 1784, 1785, 1785, 1788, 1789, 1787, 1790,
 
-     1799, 1804, 1800, 1797, 1800, 1792, 1802, 1793, 1804, 1795,
-     1796, 1801, 1801, 1805, 1802, 1798, 1806, 1806, 1807, 1808,
-     1809, 1812, 1810, 1811, 1813, 1814, 1816, 1807,    0, 1817,
-     1819, 1814, 1809, 1805, 1810, 1811, 1818, 1818, 1820, 1813,
-     1808, 1817, 1821, 1823, 1814, 1821, 1816, 1812, 1819, 1822,
-     1825, 1826, 1827, 1826, 1822, 1825, 1828, 1829, 1820, 1831,
-     1833, 1828, 1834, 1823, 1829, 1835, 1837, 1836, 1831, 1836,
-     1827, 1834, 1839, 1840, 1839, 1841, 1841, 1835, 1833, 1842,
-     1844, 1843, 1844, 1845, 1846, 1837, 1843, 1840, 1845, 1846,
-     1847, 1848, 1849, 1851, 1850, 1852, 1854, 1858, 1849, 1850,
+     1791, 1792, 1793, 1790, 1794, 1791, 1786, 1792, 1795, 1796,
+     1798, 1798, 1799, 1794, 1788, 1800, 1789, 1801, 1801, 1802,
+     1793, 1803, 1798, 1796, 1800, 1804, 1795, 1805, 1802, 1806,
+     1799, 1812, 1805, 1803, 1809, 1809, 1811, 1813, 1816, 1811,
+     1815,    0, 1806, 1817, 1819, 1819, 1804, 1812, 1820, 1817,
+     1820, 1822, 1816, 1813, 1824, 1815, 1821, 1821, 1825, 1822,
+     1827, 1824, 1826, 1826, 1828, 1829, 1832, 1830, 1831, 1827,
+     1834, 1833, 1837, 1836, 1838, 1838, 1834, 1829, 1825, 1830,
+     1831, 1839, 1840, 1842, 1837, 1828, 1833, 1841, 1842, 1834,
+     1841, 1843, 1832, 1836, 1846, 1845, 1846, 1847, 1848, 1839,
 
-     1855, 1856, 1856, 1852, 1859, 1842, 1851, 1860, 1847, 1857,
-     1857, 1848, 1858, 1860, 1855, 1854, 1861, 1862, 1863, 1862,
-     1865, 1861, 1864, 1864, 1859, 1870, 1863, 1866, 1866, 1867,
-     1867, 1868, 1865, 1869, 1863, 1872, 1874, 1873, 1869, 1873,
-     1868, 1877, 1879, 1870, 1872, 1875, 1876, 1872, 1884, 1883,
-     1875, 1875, 1887, 1877, 1879, 1876, 1880, 1874, 1881, 1888,
-     1885, 1880, 1883, 1881, 1886, 1886, 1889, 1890, 1884, 1885,
-     1887, 1891, 1893, 1894, 1895, 1896, 1904, 1888, 1897, 1898,
-     1896, 1890, 1889, 1897, 1893, 1894, 1891, 1901, 1898, 1903,
-     1905, 1906, 1907, 1901, 1895, 1903, 1909, 1909, 1908, 1904,
+     1845, 1849, 1840, 1848, 1851, 1853, 1855, 1854, 1849, 1857,
+     1856, 1843, 1856, 1851, 1862, 1847, 1854, 1859, 1855, 1859,
+     1860, 1861, 1861, 1853, 1863, 1864, 1865, 1864, 1857, 1863,
+     1866, 1865, 1867, 1868, 1860, 1866, 1869, 1872, 1870, 1871,
+     1862, 1873, 1869, 1870, 1876, 1877, 1873, 1873, 1874, 1872,
+     1867, 1880, 1871, 1868, 1878, 1878, 1874, 1879, 1879, 1877,
+     1881, 1882, 1887, 1876, 1883, 1885, 1880, 1882, 1884, 1883,
+     1884, 1886, 1886, 1885, 1887, 1888, 1888, 1889, 1889, 1890,
+     1881, 1885, 1891, 1892, 1894, 1896, 1898, 1891, 1890, 1895,
+     1899, 1895, 1897, 1894, 1905, 1898, 1894, 1897, 1897, 1901,
 
-     1912, 1910, 1911, 1911, 1913, 1905, 1901, 1908, 1913, 1906,
-     1910, 1914, 1915, 1921,    0, 1916, 1914, 1907, 1917, 1912,
-     1916, 1916, 1918, 1919, 1917, 1915, 1919, 1920, 1918, 1924,
-     1924, 1925, 1925, 1921, 1926, 1920, 1927, 1927, 1928, 1928,
-     1929, 1930, 1931, 1926, 1932, 1942, 1925, 1939, 1931, 1932,
-     1933, 1933, 1929, 1934, 1934, 1935, 1936, 1925, 1943, 1930,
-     1935, 1938, 1936, 1943, 1940, 1938, 1944, 1939, 1940, 1945,
-     1942, 1946, 1947, 1949, 1950, 1948, 1946, 1951, 1953, 1950,
-     1952, 1952, 1953, 1954, 1945, 1956, 1958, 1955, 1957, 1944,
-     1947, 1948, 1955, 1949, 1960, 1961, 1959, 1965, 1954, 1951,
+     1902, 1892, 1899, 1903, 1906, 1902, 1896, 1905, 1903, 1907,
+     1909, 1901, 1908, 1908, 1910, 1911, 1912, 1915, 1907, 1913,
+     1917, 1916, 1918, 1926, 1906, 1929, 1920, 1918, 1909, 1915,
+     1912, 1911, 1910, 1916, 1913, 1920, 1919, 1923, 1925, 1927,
+     1917, 1919, 1928, 1923, 1925, 1934, 1926,    0, 1930, 1932,
+     1929, 1931, 1931, 1937, 1927, 1935, 1923, 1930, 1932, 1935,
+     1928, 1933, 1933, 1936, 1934, 1938, 1937, 1939, 1936, 1940,
+     1938, 1938, 1942, 1939, 1941, 1940, 1943, 1941, 1946, 1946,
+     1942, 1948, 1947, 1947, 1949, 1949, 1950, 1950, 1951, 1952,
+     1948, 1960, 1953, 1961, 1954, 1960, 1943, 1947, 1953, 1954,
 
-     1957, 1959, 1962, 1962, 1964, 1958, 1966, 1960, 1967, 1968,
-     1969, 1956, 1964, 1961, 1970, 1971, 1965, 1972, 1978, 1974,
-     1975, 1975, 2139, 1976, 1977, 1966, 1976, 1971, 1979, 1969,
-     2139, 1967, 1978, 1968, 1974, 1970, 1983, 1977, 1972, 1980,
-     1980, 1979, 1981, 1981, 1982, 1982, 1984, 1985, 1985, 1986,
-     1988, 1983, 1987, 1987, 1991, 1988, 1992, 1990, 1986, 1984,
-     1993, 1986, 1990, 1994, 1994, 1995, 1995, 1996, 1997, 1997,
-     1998, 2004, 1993, 2007, 1991, 2000, 1992, 1999, 1999, 2001,
-     2002, 2002, 2003, 2003, 2001, 2004, 1996, 2005, 1998, 2006,
-     2000, 2011, 2007, 2009, 2010, 2010, 2005, 2013, 2009, 2012,
+     1951, 1955, 1955, 1956, 1956, 1957, 1958, 1952, 1947, 1964,
+     1957, 1962, 1958, 1961, 1965, 1962, 1966, 1967, 1968, 1965,
+     1969, 1970, 1971, 1968, 1972, 1973, 1974, 1974, 1976, 1972,
+     1978, 1975, 1967, 1979, 1964, 1975, 1977, 1970, 1969, 1966,
+     1980, 1977, 1971, 1976, 1981, 1979, 1983, 1973, 1982, 1981,
+     1984, 1984, 1986, 1987, 1988, 1989, 1978, 1990, 1991, 1980,
+     1986, 1982, 1992, 1993, 1983, 1994, 1999, 1996, 1997, 1997,
+     2000, 1998, 1987, 1988, 1998, 1993, 2001, 1991, 1989, 1999,
+     2005, 1990, 1996, 1992, 2000, 2006, 1994, 2002, 2002, 2001,
+     2003, 2003, 2004, 2004, 2008, 2005, 2007, 2007, 2006, 2009,
 
-     2012, 2014, 2015, 2006, 2018, 2015, 2019, 2014, 2016, 2016,
-     2011, 2017, 2017, 2020, 2023, 2013, 2021, 2021, 2024, 2028,
-     2025, 2019, 2026, 2018, 2016, 2029, 2026, 2027, 2027, 2030,
-     2032, 2032, 2020, 2033, 2023, 2025, 2034, 2035, 2028, 2036,
-     2029, 2024, 2037, 2034, 2030, 2038, 2039, 2039, 2041, 2040,
-     2041, 2035, 2042, 2033, 2044, 2042, 2045, 2036, 2040, 2046,
-     2037, 2045, 2047, 2048, 2046, 2049, 2044, 2051, 2050, 2053,
-     2042, 2038, 2042, 2050, 2053, 2054, 2048, 2055, 2056, 2057,
-     2054, 2061, 2058, 2062, 2056, 2059, 2049, 2047, 2058, 2060,
-     2059, 2068, 2055, 2051, 2060, 2063, 2062, 2073, 2063, 2064,
+     2009, 2013, 2010, 2008, 2012, 2014, 2008, 2010, 2015, 2012,
+     2016, 2016, 2017, 2017, 2018, 2019, 2019, 2020, 2021, 2021,
+     2015, 2013, 2022, 2023, 2026, 2014, 2024, 2024, 2023, 2025,
+     2025, 2027, 2028, 2018, 2029, 2020, 2031, 2022, 2026, 2033,
+     2027, 2031, 2032, 2032, 2034, 2034, 2028, 2035, 2036, 2037,
+     2038, 2038, 2037, 2029, 2036, 2039, 2039, 2040, 2033, 2041,
+     2042, 2045, 2042, 2044, 2048, 2035, 2038, 2046, 2046, 2049,
+     2050, 2051, 2052, 2052, 2041, 2051, 2040, 2053, 2044, 2054,
+     2045, 2058, 2055, 2059, 2048, 2050, 2057, 2057, 2060, 2061,
+     2059, 2062, 2049, 2063, 2054, 2065, 2053, 2055, 2064, 2064,
 
-     2057, 2065, 2066, 2067, 2079, 2068, 2061, 2069, 2064, 2070,
-     2065, 2066, 2067, 2069, 2071, 2070, 2075, 2073, 2071, 2076,
-     2076, 2077, 2078, 2078, 2079, 2075, 2079, 2077, 2081, 2082,
-     2085, 2078, 2083, 2083, 2084, 2087, 2088, 2092, 2089, 2085,
-     2092, 2093, 2090, 2094, 2081, 2082, 2093, 2087, 2095, 2084,
-     2096, 2096, 2088, 2089, 2090, 2097, 2097, 2099, 2099, 2100,
-     2095, 2101, 2100, 2094, 2102, 2103, 2101, 2104, 2104, 2105,
-     2102, 2103, 2106, 2106, 2107, 2108, 2109, 2110, 2110, 2111,
-     2112,    0, 2113, 2105, 2115, 2111, 2107, 2113, 2115, 2108,
-     2116, 2117, 2117, 2116, 2112, 2109, 2118, 2119, 2120, 2121,
+     2069, 2058, 2060, 2066, 2065, 2066, 2072, 2061, 2067, 2062,
+     2070, 2067, 2069, 2071, 2073, 2070, 2074, 2075, 2071, 2063,
+     2076, 2080, 2075, 2082, 2078, 2079, 2067, 2073, 2067, 2078,
+     2079, 2072, 2081, 2083, 2086, 2084, 2080, 2074, 2081, 2083,
+     2084, 2087, 2085, 2089, 2082, 2088, 2076, 2085, 2088, 2090,
+     2093, 2091, 2089, 2092, 2087, 2094, 2098, 2095, 2090, 2086,
+     2091, 2094, 2092, 2095, 2093, 2096, 2100, 2101, 2101, 2096,
+     2104, 2102, 2103, 2103, 2109, 2100, 2098, 2102, 2106, 2107,
+     2113, 2103, 2108, 2108, 2110, 2112, 2114, 2115, 2117, 2109,
+     2104, 2117, 2104, 2110, 2106, 2107, 2113, 2112, 2118, 2115,
 
-     2123, 2118, 2125, 2121, 2122, 2122, 2119, 2125, 2126, 2127,
-     2128, 2129, 2130, 2123, 2131, 2129, 2132, 2133, 2120, 2131,
-     2134, 2136, 2132, 2133, 2128, 2137, 2143, 2138, 2126, 2127,
-     2137, 2146, 2130, 2138, 2140, 2149, 2140, 2136, 2134, 2149,
-     2143, 2144, 2144, 2145, 2147, 2147, 2145, 2150, 2151, 2152,
-     2152, 2158, 2153, 2150, 2156, 2156, 2160, 2146, 2161, 2164,
-     2151, 2153, 2165, 2166, 2164, 2174, 2167, 2175, 2166, 2158,
-     2160, 2167, 2168, 2168, 2161, 2170, 2170, 2172, 2173, 2173,
-     2176, 2174, 2178, 2172, 2179, 2176, 2180, 2180, 2165, 2175,
-     2182, 2183, 2184, 2185, 2187, 2187, 2179, 2183, 2188, 2182,
+     2119, 2114, 2120, 2118, 2121, 2121, 2122, 2122, 2124, 2124,
+     2125, 2126, 2127, 2125, 2120, 2128, 2126, 2130, 2127, 2133,
+     2119, 2128, 2129, 2129, 2131, 2131, 2132, 2134, 2135, 2135,
+     2136, 2130, 2138, 2133, 2137, 2140, 2136, 2138, 2132, 2140,
+     2141, 2142, 2142, 2141, 2143, 2144, 2134, 2145, 2137, 2143,
+     2148, 2146, 2147, 2147, 2144, 2146, 2150, 2151, 2152, 2153,
+     2154, 2150, 2155, 2148, 2154, 2156, 2157, 2145, 2158, 2159,
+     2156, 2162, 2157, 2153, 2158, 2161, 2162, 2151, 2152, 2163,
+     2164, 2165, 2155, 2165, 2168, 2163, 2171, 2159, 2164, 2169,
+     2169, 2161, 2170, 2172, 2172, 2170, 2174, 2175, 2168, 2176,
 
-     2189, 2178, 2191, 2191, 2192, 2192, 2193, 2194, 2185, 2196,
-     2184, 2193, 2195, 2197, 2196, 2197, 2198, 2188, 2189, 2199,
-     2200, 2195, 2201, 2202, 2203, 2194, 2209, 2201, 2244, 2203,
-     2198, 2244, 2200, 2199, 2204, 2204, 2205, 2205, 2206, 2206,
-     2207, 2207, 2208, 2202, 2209, 2210, 2211, 2211, 2212, 2212,
-     2210, 2213, 2214, 2215, 2208, 2216, 2217, 2217, 2218, 2219,
-     2219, 2220, 2220, 2213, 2214, 2221, 2222, 2223, 2224, 2225,
-     2226, 2216, 2227, 2215, 2223, 2226, 2221, 2218, 2222, 2228,
-     2224, 2229, 2229, 2231, 2230, 2232, 2234, 2233, 2235, 2225,
-     2236, 2236, 2227, 2230, 2237, 2241, 2238, 2239, 2242, 2228,
+     2174, 2177, 2177, 2175, 2178, 2181, 2181, 2183, 2185, 2189,
+     2186, 2176, 2171, 2178, 2189, 2190, 2191, 2199, 2192, 2193,
+     2193, 2191, 2185, 2192, 2197, 2183, 2186, 2195, 2195, 2200,
+     2197, 2198, 2198, 2199, 2201, 2203, 2205, 2204, 2206, 2201,
+     2204, 2190, 2207, 2207, 2209, 2211, 2210, 2212, 2205, 2215,
+     2206, 2200, 2210, 2209, 2203, 2214, 2214, 2216, 2218, 2218,
+     2219, 2219, 2212, 2211, 2220, 2221, 2223, 2222, 2215, 2220,
+     2224, 2223, 2224, 2225, 2226, 2216, 2222, 2227, 2229, 2228,
+     2230, 2231, 2231, 2221, 2228, 2230, 2236, 2225, 2226, 2227,
+     2232, 2232, 2233, 2233, 2234, 2234, 2235, 2237, 2229, 2238,
 
-     2233, 2243, 2235, 2237, 2245, 2232, 2248, 2248,    0, 2231,
-     2234, 2238, 2239, 2241, 2246, 2255, 2247, 2257, 2245, 2246,
-     2242, 2247, 2249, 2249, 2243, 2250, 2250, 2252, 2252, 2254,
-     2254, 2256, 2259, 2255, 2261, 2260, 2257, 2262, 2263, 2264,
-     2266, 2265, 2256, 2265, 2267, 2268, 2272, 2263, 2269, 2269,
-     2271, 2271, 2259, 2260, 2278, 2273, 2261, 2262, 2276, 2264,
-     2266, 2279, 2267, 2268, 2273, 2274, 2274, 2276, 2272, 2277,
-     2277, 2280, 2278, 2281, 2282, 2283, 2285, 2293, 2280, 2279,
-     2284, 2286, 2286, 2287, 2287, 2288, 2289, 2290, 2281, 2291,
-     2294, 2288, 2282, 2283, 2292, 2285, 2284, 2293, 2295, 2292,
+     2238, 2240, 2237, 2241, 2236, 2239, 2239, 2242, 2235, 2243,
+     2244, 2244, 2245, 2240, 2249, 2241, 2246, 2246, 2247, 2247,
+     2252, 2248, 2250, 2251, 2254, 2243, 2249, 2242, 2253, 2250,
+     2255, 2245, 2248, 2253, 2257, 2251, 2256, 2256, 2258, 2259,
+     2252, 2260, 2261, 2257, 2254, 2268, 2262, 2263, 2263, 2264,
+     2255, 2269, 2265, 2266, 2260, 2270, 2272, 2282, 2264, 2259,
+     2262, 2283, 2271, 2268, 2258, 2271, 2261, 2265, 2266, 2273,
+     2272, 2274, 2283, 2269, 2273, 2282, 2274, 2284, 2270, 2275,
+     2275, 2276, 2276, 2277, 2277, 2279, 2279, 2281, 2281, 2286,
+     2287, 2288, 2289, 2290, 2291, 2292, 2284, 2292, 2293, 2294,
 
-     2297, 2297, 2290, 2295, 2289, 2296, 2301, 2296, 2291, 2298,
-     2294, 2298, 2299, 2299, 2303, 2304, 2305, 2306, 2308, 2307,
-     2309, 2312, 2316, 2303, 2307, 2301, 2313, 2315, 2305, 2313,
-     2314, 2314, 2317, 2317, 2304, 2320, 2323, 2306, 2308, 2309,
-     2316, 2312, 2315, 2318, 2321, 2322, 2322, 2318, 2321, 2323,
-     2320, 2325, 2326, 2327, 2327, 2329, 2330, 2331, 2332, 2332,
-     2333, 2331, 2334, 2334, 2335, 2330, 2336, 2329, 2337, 2335,
-     2338, 2325, 2326, 2339, 2339, 2336, 2344, 2344, 2345, 2333,
-     2346, 2346, 2338, 2347, 2337, 2348, 2349, 2352, 2350, 2351,
-     2351, 2354, 2354, 2359, 2357, 2349, 2347, 2350, 2348, 2357,
+     2299, 2295, 2290, 2296, 2296, 2298, 2298, 2300, 2287, 2286,
+     2301, 2301, 2289, 2288, 2291, 2303, 2300, 2294, 2293, 2295,
+     2304, 2304, 2299, 2305, 2303, 2306, 2307, 2308, 2309, 2310,
+     2312, 2318, 2311, 2307, 2313, 2313, 2314, 2314, 2315, 2316,
+     2317, 2305, 2308, 2306, 2315, 2320, 2309, 2310, 2311, 2312,
+     2318, 2319, 2321, 2322, 2328, 2317, 2319, 2316, 2322, 2323,
+     2330, 2323, 2324, 2324, 2325, 2320, 2325, 2326, 2326, 2330,
+     2331, 2332, 2321, 2328, 2333, 2334, 2335, 2342, 2336, 2339,
+     2334, 2340, 2343, 2332, 2340, 2341, 2341, 2344, 2344, 2331,
+     2345, 2346, 2342, 2349, 2333, 2354, 2335, 2336, 2347, 2339,
 
-     2345, 2358, 2352, 2360, 2361, 2362, 2358, 2359, 2360, 2363,
-     2366, 2364, 2361, 2369, 2374, 2367, 2368,    0, 2363, 2364,
-     2367, 2368, 2370, 2370, 2362, 2366, 2371, 2371, 2369, 2372,
-     2373, 2375, 2374, 2376,    0, 2373, 2372, 2377, 2379, 2376,
-     2378, 2378, 2377, 2380, 2381, 2381, 2382, 2382, 2380, 2375,
-     2385, 2386, 2386, 2379, 2387, 2388, 2397, 2387, 2410, 2389,
-     2388, 2388, 2390, 2385, 2389, 2391, 2392, 2390, 2393, 2394,
-     2392, 2391, 2395, 2393, 2396, 2398, 2410, 2397, 2394, 2399,
-     2401, 2398, 2396, 2400, 2403, 2399, 2406, 2395, 2400, 2403,
-     2404, 2408, 2401, 2404, 2409, 2411, 2408, 2412, 2406, 2409,
+     2343, 2345, 2347, 2350, 2351, 2351, 2346, 2350, 2349, 2352,
+     2355, 2356, 2356, 2358, 2359, 2354, 2360, 2361, 2361, 2362,
+     2360, 2367, 2352, 2359, 2364, 2358, 2363, 2363, 2365, 2364,
+     2355, 2366, 2374, 2367, 2368, 2368, 2376, 2365, 2362, 2373,
+     2373, 2375, 2375, 2377, 2378, 2381, 2379, 2366, 2388, 2376,
+     2380, 2380, 2391, 2378, 2374, 2379, 2377, 2383, 2383, 2386,
+     2381, 2387, 2388, 2389, 2386, 2390, 2387, 2392, 2389, 2393,
+     2395, 2391, 2398, 2390, 2396, 2397, 2392, 2393, 2403, 2396,
+     2397, 2399, 2399, 2400, 2400, 2395, 2401, 2398, 2404, 2402,
+     2406, 2405, 2408, 2401, 2402, 2406, 2403, 2405, 2407, 2407,
 
-     2413, 2414, 2414, 2415, 2418, 2419, 2412, 2420, 2411, 2413,
-     2421, 2421, 2415, 2422, 2424, 2423, 2425, 2425, 2426, 2428,
-     2430, 2432, 2432, 2418, 2423, 2419, 2420, 2431, 2433, 2424,
-     2434, 2431, 2422, 2435, 2428, 2436, 2434, 2426, 2438, 2435,
-     2430, 2436, 2437, 2437, 2439, 2441, 2438, 2442, 2444, 2439,
-     2445, 2446, 2444, 2433, 2441, 2448, 2448, 2449, 2449, 2453,
-     2442, 2450, 2450, 2453, 2445, 2454, 2446, 2452, 2452, 2458,
-     2454, 2456, 2456, 2459, 2460, 2461, 2463, 2471, 2459, 2469,
-     2461, 2461, 2464, 2464, 2466, 2466, 2460, 2467, 2467, 2458,
-     2468, 2473, 2469, 2468, 2477, 2471, 2463, 2474, 2474, 2475,
+     2409, 2410, 2410, 2411, 2411, 2409, 2404, 2408, 2414, 2415,
+     2415, 2416, 2417, 2424, 2416, 2418, 2420, 2417, 2417, 2419,
+     2418, 2414, 2420, 2421, 2419, 2422, 2423, 2421, 2424, 2425,
+     2422, 2426, 2427, 2428, 2430, 2423, 2429, 2425, 2427, 2428,
+     2432, 2429, 2435, 2437, 2433, 2432, 2430, 2433, 2437, 2439,
+     2438, 2440, 2426, 2441, 2435, 2438, 2442, 2443, 2443, 2444,
+     2447, 2448, 2441, 2449, 2440, 2442, 2451, 2439, 2444, 2450,
+     2450, 2452, 2453, 2454, 2454, 2455, 2457, 2459, 2462, 2447,
+     2452, 2448, 2449, 2471, 2460, 2451, 2463, 2453, 2460, 2461,
+     2461, 2457, 2463, 2464, 2455, 2465, 2471, 2459, 2467, 2464,
 
-     2475, 2476, 2476, 2478, 2478, 2479, 2480, 2481, 2482, 2477,
-     2488, 2473, 2483, 2483, 2482, 2484, 2489, 2487, 2479, 2484,
-     2490, 2481, 2487, 2487, 2480, 2491, 2492, 2493, 2495, 2495,
-     2494, 2491, 2492, 2488, 2494, 2500, 2489, 2498, 2501, 2503,
-     2490, 2501, 2498, 2500, 2504, 2505, 2506, 2504, 2507, 2508,
-        0, 2506, 2493, 2509, 2510, 2510, 2511, 2512, 2513, 2514,
-     2512, 2517, 2505, 2505, 2503, 2515, 2507, 2509, 2512, 2508,
-     2511, 2516, 2513, 2515, 2518, 2518, 2516, 2516, 2514, 2523,
-     2517, 2519, 2519, 2520, 2520, 2521, 2521, 2522, 2522, 2524,
-     2525, 2526, 2527, 2528, 2524, 2523, 2529, 2531, 2531, 2532,
+     2470, 2465, 2468, 2462, 2466, 2466, 2467, 2468, 2473, 2470,
+     2474, 2475, 2476, 2474, 2473, 2475, 2477, 2479, 2479, 2480,
+     2480, 2481, 2481, 2483, 2483, 2484, 2476, 2485, 2489, 2484,
+     2490, 2477, 2485, 2487, 2487, 2490, 2492, 2491, 2494, 2495,
+     2495, 2492, 2492, 2497, 2497, 2498, 2498, 2499, 2489, 2491,
+     2499, 2500, 2502, 2504, 2505, 2505, 2506, 2506, 2494, 2507,
+     2507, 2508, 2509, 2509, 2500, 2510, 2511, 2512, 2513, 2519,
+     2502, 2514, 2514, 2504, 2513, 2515, 2508, 2518, 2510, 2515,
+     2520, 2512, 2518, 2518, 2511, 2521, 2524, 2522, 2523, 2526,
+     2526, 2525, 2519, 2522, 2523, 2525, 2529, 2534, 2531, 2532,
 
-     2533, 2527, 2532, 2535, 2535, 2536, 2537, 2537, 2545, 2538,
-     2525,    0, 2536, 2528, 2538, 2541, 2529, 2526, 2533, 2540,
-     2540, 2542, 2543, 2548, 2541, 2547, 2545, 2546, 2546, 2547,
-     2542, 2543, 2548, 2549, 2550, 2552, 2551, 2556, 2560, 2550,
-     2550, 2561, 2556, 2562, 2552, 2557, 2557, 2564, 2549, 2551,
-     2559, 2559, 2560, 2565, 2568, 2569, 2564, 2570, 2573, 2575,
-        0, 2562, 2571, 2621, 2569, 2565, 2561, 2577, 2571, 2578,
-     2573, 2621, 2577, 2580, 2578, 2579, 2579, 2570, 2582, 2568,
-     2575, 2589, 2580, 2582, 2583, 2583, 2585, 2585, 2583, 2586,
-     2586, 2587, 2587, 2588, 2590, 2591, 2597, 2593, 2598, 2594,
+     2520, 2529, 2532, 2536, 2535, 2521, 2531, 2535, 2537, 2538,
+     2539, 2524, 2540, 2537, 2541, 2541, 2545, 2542, 2544, 2555,
+     2536, 2536, 2534, 2548, 2555, 2543, 2540, 2538, 2543, 2546,
+     2539, 2542, 2544, 2547, 2556, 2545, 2543, 2546, 2547, 2547,
+     2549, 2549, 2548, 2550, 2550, 2551, 2551, 2552, 2552, 2553,
+     2553, 2554, 2557, 2558, 2556, 2559, 2560, 2562, 2562, 2564,
+     2563, 2567, 2558, 2563, 2566, 2566, 2569, 2554, 2567, 2568,
+     2568, 2569, 2571, 2571, 2572, 2559, 2560, 2564, 2557, 2573,
+     2574, 2576, 2578, 2572, 2577, 2577, 2578, 2579, 2573, 2574,
+     2580, 2581, 2582, 2584, 2585, 2583, 2579, 2590, 2590, 2576,
 
-     2591, 2589, 2588, 2593, 2594, 2595, 2596, 2596, 2600, 2601,
-     2595, 2599, 2602, 2590, 2597, 2601, 2599, 2603, 2603, 2598,
-     2605, 2609, 2606, 2607, 2605, 2611, 2600, 2606, 2607, 2608,
-     2608, 2610, 2613, 2613, 2615, 2616, 2619, 2602, 2617, 2620,
-     2609, 2618, 2617, 2623, 2622, 2611, 2610, 2615, 2616, 2622,
-     2618, 2625, 2619, 2624, 2624, 2627, 2627, 2630, 2620, 2628,
-     2628, 2632, 2632, 2634, 2635, 2636, 2637, 2639, 2639, 2623,
-     2625, 2637, 2640, 2641, 2642, 2644, 2644, 2645, 2630, 2634,
-     2635, 2636, 2646, 2646, 2649, 2651, 2652, 2655, 2650, 2659,
-     2651, 2645, 2640, 2642, 2650, 2657, 2641, 2653, 2653, 2654,
+     2583, 2583, 2581, 2585, 2593, 2589, 2584, 2582, 2594, 2580,
+     2589, 2592, 2592, 2595, 2597, 2598, 2601, 2602, 2593, 2603,
+     2606, 2608, 2604, 2597, 2610, 2611, 2602, 2598, 2604, 2610,
+     2611, 2595, 2606, 2594, 2612, 2612, 2613, 2622, 2615, 2603,
+     2623, 2601, 2608, 2615,    0, 2613, 2616, 2616, 2618, 2618,
+     2616, 2619, 2619, 2620, 2620, 2621, 2624, 2622, 2627, 2623,
+     2626, 2624, 2628, 2627, 2621, 2630, 2626, 2628, 2629, 2629,
+     2631, 2632, 2633, 2634, 2635, 2642, 2632, 2636, 2636, 2634,
+     2638, 2639, 2640, 2630, 2638, 2643, 2639, 2640, 2641, 2641,
+     2633, 2631, 2644, 2648, 2642, 2646, 2646, 2649, 2650, 2635,
 
-     2654, 2656, 2656, 2658, 2649, 2660, 2657, 2655, 2652, 2659,
-     2661, 2660, 2658, 2662, 2663, 2664, 2664, 2665, 2666, 2666,
-     2665, 2656, 2671, 2670, 2672, 2662, 2673, 2673, 2674, 2661,
-     2672, 2674, 2675, 2676, 2663, 2670, 2678, 2680, 2675, 2679,
-     2681, 2678, 2671, 2682, 2679, 2685, 2681, 2683, 2683, 2686,
-     2687, 2676, 2688, 2689, 2689, 2690, 2680, 2685, 2696, 2691,
-     2682, 2682, 2693, 2693,    0, 2688, 2695, 2686, 2691, 2694,
-     2694, 2695, 2696, 2697, 2690, 2687, 2698, 2698, 2697, 2699,
-     2699, 2700, 2700, 2701, 2703, 2703, 2706, 2708, 2701, 2709,
-     2710, 2711, 2711, 2713, 2713, 2715, 2714, 2716, 2717, 2717,
+     2643, 2652, 2650, 2653, 2651, 2656, 2648, 2654, 2658, 2655,
+     2649, 2663, 2644, 2651, 2655, 2654, 2673, 2652, 2657, 2657,
+     2660, 2660, 2653, 2661, 2661, 2665, 2665, 2658, 2667, 2668,
+     2669, 2656, 2663, 2670, 2672, 2672, 2673, 2675, 2670, 2674,
+     2676, 2677, 2680, 2675, 2667, 2668, 2669, 2684, 2674, 2679,
+     2679, 2681, 2681, 2685, 2687, 2690, 2680, 2686, 2694, 2685,
+     2677, 2692, 2686, 2676, 2688, 2688, 2696, 2684, 2689, 2689,
+     2691, 2691, 2692, 2693, 2695, 2690, 2687, 2697, 2694, 2698,
+     2695, 2705, 2693, 2699, 2699, 2696, 2701, 2701, 2700, 2697,
+     2691, 2700, 2706, 2705, 2707, 2708, 2708, 2710, 2709, 2698,
 
-     2720, 2719, 2721, 2722,    0, 2706, 2716, 2719, 2722, 2708,
-     2714, 2709, 2710, 2725, 2725, 2715, 2727, 2727, 2728, 2729,
-     2720, 2721, 2730, 2728, 2731, 2736, 2732, 2734, 2730, 2733,
-     2733, 2737, 2734, 2729, 2732, 2738, 2731, 2739, 2740, 2742,
-     2738, 2743, 2744, 2745, 2740, 2736, 2746, 2742, 2753, 2739,
-     2747, 2737, 2748, 2749, 2750, 2757, 2752, 2761, 2761, 2750,
-     2743, 2752, 2744, 2745, 2746, 2754, 2747, 2755, 2753, 2748,
-     2748, 2754, 2755, 2758, 2749, 2757, 2762, 2762, 2763, 2767,
-     2767, 2773, 2763, 2769, 2769, 2773, 2758, 2770, 2770, 2776,
-     2770, 2771, 2771, 2779, 2771, 2772, 2772, 2777, 2772, 2775,
+     2707, 2709, 2711, 2710, 2713, 2714, 2715, 2716, 2721, 2713,
+     2714, 2717, 2706, 2716, 2718, 2718, 2722, 2725, 2720, 2723,
+     2711, 2724, 2724,    0, 2726, 2715, 2721, 2741, 2717, 2717,
+     2720, 2731, 2723, 2726, 2728, 2728, 2725, 2729, 2729, 2730,
+     2743, 2722, 2732, 2744, 2730, 2731, 2741, 2732, 2733, 2733,
+     2734, 2734, 2735, 2735, 2736, 2738, 2738, 2745, 2749, 2736,
+     2746, 2746, 2743, 2748, 2748, 2744, 2750, 2751, 2752, 2753,
+     2754, 2754, 2757, 2884, 2756, 2758, 2884, 2759, 2753, 2745,
+     2756, 2751, 2759, 2766, 2749, 2750, 2762, 2762, 2752, 2764,
+     2764, 2765, 2757, 2767, 2758, 2768, 2765, 2766, 2769, 2767,
 
-     2775, 2780, 2785, 2781, 2782, 2782, 2787, 2776, 2781, 2786,
-     2787, 2777, 2800, 2779, 2788, 2789, 2786, 2791, 2800, 2792,
-     2826, 2780, 2796, 2788, 2793, 2793, 2801, 2785, 2792, 2826,
-     2789, 2794, 2794, 2795, 2795, 2791, 2797, 2796, 2798, 2799,
-     2802, 2797, 2803, 2804, 2799, 2799, 2806, 2798, 2804, 2805,
-     2798, 2801, 2807, 2807, 2805, 2802, 2808, 2878, 2809, 2810,
-     2810, 2878, 2808, 2803, 2809, 2806, 2811, 2811, 2812, 2815,
-     2815, 2818, 2818, 2812, 2819, 2819, 2820, 2820, 2821, 2821,
-     2822, 2822, 2823, 2823, 2824, 2824, 2827, 2827, 2828, 2829,
-     2830, 2834, 2832, 2833, 2833, 2835, 2842, 2828, 2837, 2837,
+     2770, 2770, 2773, 2771, 2774, 2775, 2769, 2768, 2771, 2776,
+     2775, 2777, 2779, 2780, 2781, 2782, 2786, 2777, 2783,    0,
+     2779, 2776, 2773, 2784, 2774, 2785, 2787, 2790, 2789, 2794,
+     2815, 2787, 2780, 2789, 2781, 2782, 2783, 2786, 2791, 2784,
+     2792, 2795, 2785, 2785, 2791, 2792, 2870, 2790, 2815, 2794,
+     2798, 2798, 2799, 2799, 2795, 2800, 2804, 2804, 2870, 2800,
+     2806, 2806, 2807, 2807, 2810, 2807, 2808, 2808, 2810, 2808,
+     2809, 2809, 2812, 2809, 2813, 2814, 2814, 2812, 2816, 2818,
+     2819, 2820, 2824, 2813, 2821, 2821, 2820, 2825, 2827, 2826,
+     2828, 2830, 2816, 2826, 2825, 2831, 2928, 2827, 2928, 2818,
 
-     2836, 2829, 2838, 2839, 2839, 2844, 2834, 2846, 2835, 2849,
-     2830, 2832, 2836, 2843, 2842, 2849, 2843, 2838, 2845, 2845,
-     2848, 2850, 2851, 2848, 2852, 2846, 2853, 2851, 2856, 2854,
-     2857, 2844, 2860, 2869, 2856, 2850, 2869, 2871, 2876, 2857,
-     2872, 2872, 2879, 2852, 2853, 2854, 2877, 2860, 2873, 2873,
-     2871, 2874, 2874, 2880, 2882, 2877, 2886, 2883, 2884, 2887,
-     2887, 2876, 2879, 2884, 2885, 2888, 2885, 2880, 2883, 2889,
-     2891, 2886, 2890, 2892, 2893, 2894, 2896, 2882, 2888, 2895,
-     2897, 2902, 2898, 2903, 2894, 2905, 2891, 2898, 2889, 2893,
-     2890, 2895, 2904, 2904, 2905, 2902, 2910, 2896, 2892, 2911,
+     2819, 2832, 2832, 2835, 2831, 2828, 2840, 2824, 2837, 2830,
+     2833, 2833, 2834, 2834, 2836, 2841, 2838, 2837, 2835, 2836,
+     2837, 2838, 2838, 2839, 2842, 2845,    0, 2843, 2844, 2839,
+     2841, 2840, 2843, 2844, 2846, 2846, 2847, 2848, 2849, 2849,
+     2850, 2850, 2847, 2848, 2845, 2842, 2851, 2854, 2854, 2857,
+     2857, 2851, 2858, 2858, 2859, 2859, 2860, 2860, 2861, 2861,
+     2862, 2862, 2863, 2863, 2864, 2864, 2865, 2867, 2868, 2868,
+     2869, 2871, 2874, 2874, 2873, 2875, 2867, 2877, 2883, 2869,
+     2879, 2876, 2878, 2878, 2880, 2880, 2885, 2886, 2886, 2877,
+     2875, 2871, 2865, 2873, 2876, 2879, 2883, 2887, 2889, 2890,
 
-     2897, 2906, 2906, 2903, 2907, 2907, 2908, 2908, 2909, 2909,
-     2912, 2913, 2914, 2912, 2915, 2910, 2913, 2914, 2916, 2911,
-     2917, 2918, 2919, 2920, 2921, 2923, 2917, 2924, 2920, 2922,
-     2922, 2925, 2925, 2916, 2919, 2918, 2927, 2929, 2935, 2915,
-     2923, 2932, 2932, 2936, 2921, 2934, 2924, 2933, 2933, 2936,
-     2937, 2927, 2938, 2934, 2939, 2929, 2937, 2935, 2940, 2941,
-     2942, 2942, 2943, 2943, 2941, 2945, 2938, 2939, 2946, 2948,
-     2949, 2951, 2954, 2952, 2949, 2953, 2955, 2940, 2952, 2956,
-     2959, 2959, 2957, 2948, 2962, 2954, 2945, 2957, 2946, 2955,
-     2958, 2951, 2963, 2964, 2953, 2958, 2965, 2965, 2956, 2972,
+     2891, 2889, 2892, 2893, 2895, 2890, 2894, 2892, 2898,    0,
+     2897, 2901, 2885, 2911, 2891, 2887, 2897, 2898, 2911, 2914,
+     2895, 2919, 2893, 2921, 2894, 2912, 2901, 2921, 2912, 2915,
+     2915, 2920, 2914, 2916, 2916, 2917, 2917, 2922, 2923, 2925,
+     2920, 2927, 2926, 2929, 2919, 2932, 2927, 2930, 2930, 2933,
+     2931, 2935, 2923, 2926, 2934, 2941, 2936, 2922, 2929, 2937,
+     2938, 2939, 2925, 2931, 2932, 2940, 2940, 2933, 2937, 2942,
+     2934, 2936, 2938, 2946, 2942, 2941, 2935, 2947, 2948, 2948,
+     2949, 2954, 2939, 2950, 2950, 2951, 2951, 2946, 2955, 2949,
+     2952, 2952, 2953, 2953, 2957, 2956, 2958, 2947, 2956, 2957,
 
-     2966, 2967, 2968, 2968, 2962, 2966, 2969, 2967, 2970, 2971,
-     2963, 2969, 2964, 2970, 2971, 2973, 2975, 2975, 2972, 2976,
-     2980, 2973, 2977, 2977, 2976, 2979, 2981, 2982, 2983, 2979,
-     2984, 2985, 2986, 2981, 2988, 2988, 2984, 2990, 2990, 2980,
-     2991, 2993, 2994, 2992, 2995, 2986, 2982, 2983, 2992, 2991,
-     2985, 2997, 2991, 2996, 2996, 2998, 2997, 2995, 3000, 3002,
-     2993, 2994, 3001, 3001, 3003, 3003, 3004, 3004, 2998, 3005,
-     3006, 3007, 3008, 3008, 3005, 3009, 3014, 3006, 3002, 3010,
-     3009, 3010, 3011, 3011, 3000, 3012, 3013, 3016, 3019, 3015,
-     3007, 3023, 3012, 3013, 3015, 3014, 3018, 3018, 3021, 3022,
+     2954, 2958, 2959, 2960, 2961, 2962, 2964, 2968, 2955, 2963,
+     2961, 2964, 2965, 2967, 2967, 2969, 2970, 2970, 2960, 2962,
+     2972, 2963, 2968, 2974, 2977, 2977, 2980, 2959, 2978, 2978,
+     2979, 2981, 2965, 2982, 2969, 2972, 2983, 2981, 2979, 2982,
+     2984, 2974, 2985, 2986, 2990, 2980, 2987, 2987, 2986, 2991,
+     2983, 2988, 2988, 2984, 2993, 2994, 2996, 2997, 2998, 2994,
+     2999, 2985, 2997, 3001, 3007, 2990, 3000, 3002, 2993, 2991,
+     3003, 3008, 3002, 2999, 3009, 3003, 2996, 2998, 3011, 3000,
+     3004, 3004, 3001, 3011, 3007, 3010, 3010, 3014, 3012, 3008,
+     3013, 3013, 3014, 3009, 3012, 3015, 3016, 3017, 3018, 3025,
 
-     3024, 3025, 3025, 3021, 3022, 3028, 3016, 3019, 3027, 3027,
-     3023, 3029, 3030, 3030, 3031, 3031, 3032, 3034, 3034, 3024,
-     3035, 3035, 3036, 3032, 3028, 3042, 3038, 3041, 3043, 3036,
-     3029, 3038, 3041, 3044, 3044, 3045, 3045,    0,    0,    0,
-        0,    0,    0,    0, 3042,    0,    0, 3043, 3049, 3049,
-     3049, 3049, 3049, 3049, 3049, 3050, 3050, 3050, 3050, 3050,
-     3050, 3050, 3051, 3051, 3051, 3051, 3051, 3051, 3051, 3052,
-     3052, 3052, 3052, 3052, 3052, 3052, 3053, 3053, 3053, 3053,
-     3053, 3053, 3053, 3055, 3055,    0, 3055, 3055, 3055, 3055,
-     3056, 3056,    0,    0,    0, 3056, 3056, 3057, 3057,    0,
+     3015, 3016, 3020, 3020, 3018, 3021, 3022, 3022, 3024, 3027,
+     3021, 3028, 3024, 3026, 3030, 3029, 3017, 3036, 3025, 3031,
+     3026, 3029, 3033, 3033, 3035, 3035, 3036, 3038, 3027, 3036,
+     3028, 3037, 3031, 3030, 3039, 3040, 3037, 3041, 3041, 3042,
+     3045, 3043, 3046, 3046, 3042, 3047, 3038,    0, 3040, 3048,
+     3048, 3049, 3049, 3039, 3043, 3050, 3051, 3052, 3053, 3053,
+     3050,    0, 3054, 3051, 3047, 3059, 3045, 3054, 3055, 3061,
+     3055, 3056, 3056, 3057, 3058, 3064, 3052, 3060, 3063, 3063,
+     3057, 3058, 3060, 3068, 3059, 3066, 3067, 3069, 3061, 3073,
+     3066, 3067, 3070, 3070, 3064, 3072, 3072, 3074, 3075, 3075,
 
-        0, 3057,    0, 3057, 3058,    0,    0,    0,    0,    0,
-     3058, 3059, 3059,    0,    0,    0, 3059, 3059, 3060,    0,
-        0,    0,    0,    0, 3060, 3061, 3061,    0, 3061, 3061,
-     3061, 3061, 3062, 3062,    0, 3062, 3062, 3062, 3062, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048,
-     3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048
+     3076, 3076, 3068, 3077, 3079, 3079, 3069, 3081, 3073, 3087,
+     3077, 3080, 3080, 3083, 3081, 3086, 3074, 3088, 3083,    0,
+     3086, 3089, 3089, 3090, 3090,    0,    0,    0, 3087,    0,
+        0,    0,    0,    0,    0,    0, 3088, 3094, 3094, 3094,
+     3094, 3094, 3094, 3094, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3096, 3096, 3096, 3096, 3096, 3096, 3096, 3097, 3097,
+     3097, 3097, 3097, 3097, 3097, 3098, 3098, 3098, 3098, 3098,
+     3098, 3098, 3100, 3100,    0, 3100, 3100, 3100, 3100, 3101,
+     3101,    0,    0,    0, 3101, 3101, 3102, 3102,    0,    0,
+     3102,    0, 3102, 3103,    0,    0,    0,    0,    0, 3103,
+
+     3104, 3104,    0,    0,    0, 3104, 3104, 3105,    0,    0,
+        0,    0,    0, 3105, 3106, 3106,    0, 3106, 3106, 3106,
+     3106, 3107, 3107,    0, 3107, 3107, 3107, 3107, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093,
+     3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093, 3093
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2942,7 +2978,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 2943 "<stdout>"
+#line 2980 "<stdout>"
 #define YY_NO_INPUT 1
 #line 184 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -2951,9 +2987,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 2952 "<stdout>"
+#line 2989 "<stdout>"
 
-#line 2954 "<stdout>"
+#line 2991 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3175,7 +3211,7 @@ YY_DECL
 	{
 #line 204 "./util/configlexer.lex"
 
-#line 3176 "<stdout>"
+#line 3213 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3208,13 +3244,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 >= 3049 )
+				if ( yy_current_state >= 3094 )
 					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] != 5940 );
+		while ( yy_base[yy_current_state] != 6029 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -4615,123 +4651,143 @@ YY_RULE_SETUP
 case 273:
 YY_RULE_SETUP
 #line 491 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_PAD_RESPONSES) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
 #line 492 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_PAD_RESPONSES_BLOCK_SIZE) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 493 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_PAD_QUERIES) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 494 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_PAD_QUERIES_BLOCK_SIZE) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 495 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 503 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 504 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 505 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 506 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 507 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(0, VAR_IPSET) }
 	YY_BREAK
 case 290:
-/* rule 290 can match eol */
 YY_RULE_SETUP
 #line 508 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
+	YY_BREAK
+case 291:
+YY_RULE_SETUP
+#line 509 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
+	YY_BREAK
+case 292:
+YY_RULE_SETUP
+#line 510 "./util/configlexer.lex"
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+	YY_BREAK
+case 293:
+YY_RULE_SETUP
+#line 511 "./util/configlexer.lex"
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+	YY_BREAK
+case 294:
+/* rule 294 can match eol */
+YY_RULE_SETUP
+#line 512 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 291:
+case 295:
 YY_RULE_SETUP
-#line 511 "./util/configlexer.lex"
+#line 515 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 512 "./util/configlexer.lex"
+#line 516 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 292:
+case 296:
 YY_RULE_SETUP
-#line 517 "./util/configlexer.lex"
+#line 521 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 293:
-/* rule 293 can match eol */
+case 297:
+/* rule 297 can match eol */
 YY_RULE_SETUP
-#line 518 "./util/configlexer.lex"
+#line 522 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 294:
+case 298:
 YY_RULE_SETUP
-#line 520 "./util/configlexer.lex"
+#line 524 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4744,34 +4800,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 295:
+case 299:
 YY_RULE_SETUP
-#line 532 "./util/configlexer.lex"
+#line 536 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 533 "./util/configlexer.lex"
+#line 537 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 296:
+case 300:
 YY_RULE_SETUP
-#line 538 "./util/configlexer.lex"
+#line 542 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 297:
-/* rule 297 can match eol */
+case 301:
+/* rule 301 can match eol */
 YY_RULE_SETUP
-#line 539 "./util/configlexer.lex"
+#line 543 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 298:
+case 302:
 YY_RULE_SETUP
-#line 541 "./util/configlexer.lex"
+#line 545 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4784,38 +4840,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 299:
+case 303:
 YY_RULE_SETUP
-#line 553 "./util/configlexer.lex"
+#line 557 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 555 "./util/configlexer.lex"
+#line 559 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 300:
+case 304:
 YY_RULE_SETUP
-#line 559 "./util/configlexer.lex"
+#line 563 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
-case 301:
-/* rule 301 can match eol */
+case 305:
+/* rule 305 can match eol */
 YY_RULE_SETUP
-#line 560 "./util/configlexer.lex"
+#line 564 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
-case 302:
+case 306:
 YY_RULE_SETUP
-#line 561 "./util/configlexer.lex"
+#line 565 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
 	YY_BREAK
-case 303:
+case 307:
 YY_RULE_SETUP
-#line 562 "./util/configlexer.lex"
+#line 566 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext);
@@ -4823,27 +4879,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 567 "./util/configlexer.lex"
+#line 571 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 304:
+case 308:
 YY_RULE_SETUP
-#line 571 "./util/configlexer.lex"
+#line 575 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 305:
-/* rule 305 can match eol */
+case 309:
+/* rule 309 can match eol */
 YY_RULE_SETUP
-#line 572 "./util/configlexer.lex"
+#line 576 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 306:
+case 310:
 YY_RULE_SETUP
-#line 574 "./util/configlexer.lex"
+#line 578 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -4853,7 +4909,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 580 "./util/configlexer.lex"
+#line 584 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -4865,33 +4921,33 @@ case YY_STATE_EOF(val):
 	}
 }
 	YY_BREAK
-case 307:
+case 311:
 YY_RULE_SETUP
-#line 591 "./util/configlexer.lex"
+#line 595 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 308:
+case 312:
 YY_RULE_SETUP
-#line 595 "./util/configlexer.lex"
+#line 599 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 309:
+case 313:
 YY_RULE_SETUP
-#line 599 "./util/configlexer.lex"
+#line 603 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 310:
+case 314:
 YY_RULE_SETUP
-#line 603 "./util/configlexer.lex"
+#line 607 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 4892 "<stdout>"
+#line 4949 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5186,7 +5242,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 >= 3049 )
+			if ( yy_current_state >= 3094 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5214,11 +5270,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 >= 3049 )
+		if ( yy_current_state >= 3094 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3048);
+	yy_is_jam = (yy_current_state == 3093);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -5857,6 +5913,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 603 "./util/configlexer.lex"
+#line 607 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index e4baf13f9..5200a5f2f 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -488,6 +488,10 @@ dnscrypt-shared-secret-cache-slabs{COLON}	{
 		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 dnscrypt-nonce-cache-size{COLON}	{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 dnscrypt-nonce-cache-slabs{COLON}	{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+pad-responses{COLON}		{ YDVAR(1, VAR_PAD_RESPONSES) }
+pad-responses-block-size{COLON}	{ YDVAR(1, VAR_PAD_RESPONSES_BLOCK_SIZE) }
+pad-queries{COLON}		{ YDVAR(1, VAR_PAD_QUERIES) }
+pad-queries-block-size{COLON}	{ YDVAR(1, VAR_PAD_QUERIES_BLOCK_SIZE) }
 ipsecmod-enabled{COLON}		{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 ipsecmod-ignore-bogus{COLON}	{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 ipsecmod-hook{COLON}		{ YDVAR(1, VAR_IPSECMOD_HOOK) }
diff --git a/util/configparser.c b/util/configparser.c
index 657f99579..6f3e29eea 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,73 +1,23 @@
-/* A Bison parser, made by GNU Bison 3.4.1.  */
+/* original parser id follows */
+/* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
+/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
-/* Bison implementation for Yacc-like parsers in C
+#define YYBYACC 1
+#define YYMAJOR 1
+#define YYMINOR 9
+#define YYPATCH 20140715
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
-   Inc.
+#define YYEMPTY        (-1)
+#define yyclearin      (yychar = YYEMPTY)
+#define yyerrok        (yyerrflag = 0)
+#define YYRECOVERING() (yyerrflag != 0)
+#define YYENOMEM       (-2)
+#define YYEOF          0
+#define YYPREFIX "yy"
 
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program 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/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   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"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
-
-
-
-/* First part of user prologue.  */
-#line 38 "./util/configparser.y"
-
+#line 39 "./util/configparser.y"
 #include "config.h"
 
 #include <stdarg.h>
@@ -94,6531 +44,1751 @@ extern struct config_parser_state* cfg_parser;
 #define OUTYY(s)
 #endif
 
-
-#line 99 "util/configparser.c"
-
-# ifndef YY_NULLPTR
-#  if defined __cplusplus
-#   if 201103L <= __cplusplus
-#    define YY_NULLPTR nullptr
-#   else
-#    define YY_NULLPTR 0
-#   endif
-#  else
-#   define YY_NULLPTR ((void*)0)
-#  endif
-# endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Use api.header.include to #include this header
-   instead of duplicating it here.  */
-#ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
-# define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    SPACE = 258,
-    LETTER = 259,
-    NEWLINE = 260,
-    COMMENT = 261,
-    COLON = 262,
-    ANY = 263,
-    ZONESTR = 264,
-    STRING_ARG = 265,
-    VAR_SERVER = 266,
-    VAR_VERBOSITY = 267,
-    VAR_NUM_THREADS = 268,
-    VAR_PORT = 269,
-    VAR_OUTGOING_RANGE = 270,
-    VAR_INTERFACE = 271,
-    VAR_PREFER_IP4 = 272,
-    VAR_DO_IP4 = 273,
-    VAR_DO_IP6 = 274,
-    VAR_PREFER_IP6 = 275,
-    VAR_DO_UDP = 276,
-    VAR_DO_TCP = 277,
-    VAR_TCP_MSS = 278,
-    VAR_OUTGOING_TCP_MSS = 279,
-    VAR_TCP_IDLE_TIMEOUT = 280,
-    VAR_EDNS_TCP_KEEPALIVE = 281,
-    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282,
-    VAR_CHROOT = 283,
-    VAR_USERNAME = 284,
-    VAR_DIRECTORY = 285,
-    VAR_LOGFILE = 286,
-    VAR_PIDFILE = 287,
-    VAR_MSG_CACHE_SIZE = 288,
-    VAR_MSG_CACHE_SLABS = 289,
-    VAR_NUM_QUERIES_PER_THREAD = 290,
-    VAR_RRSET_CACHE_SIZE = 291,
-    VAR_RRSET_CACHE_SLABS = 292,
-    VAR_OUTGOING_NUM_TCP = 293,
-    VAR_INFRA_HOST_TTL = 294,
-    VAR_INFRA_LAME_TTL = 295,
-    VAR_INFRA_CACHE_SLABS = 296,
-    VAR_INFRA_CACHE_NUMHOSTS = 297,
-    VAR_INFRA_CACHE_LAME_SIZE = 298,
-    VAR_NAME = 299,
-    VAR_STUB_ZONE = 300,
-    VAR_STUB_HOST = 301,
-    VAR_STUB_ADDR = 302,
-    VAR_TARGET_FETCH_POLICY = 303,
-    VAR_HARDEN_SHORT_BUFSIZE = 304,
-    VAR_HARDEN_LARGE_QUERIES = 305,
-    VAR_FORWARD_ZONE = 306,
-    VAR_FORWARD_HOST = 307,
-    VAR_FORWARD_ADDR = 308,
-    VAR_DO_NOT_QUERY_ADDRESS = 309,
-    VAR_HIDE_IDENTITY = 310,
-    VAR_HIDE_VERSION = 311,
-    VAR_IDENTITY = 312,
-    VAR_VERSION = 313,
-    VAR_HARDEN_GLUE = 314,
-    VAR_MODULE_CONF = 315,
-    VAR_TRUST_ANCHOR_FILE = 316,
-    VAR_TRUST_ANCHOR = 317,
-    VAR_VAL_OVERRIDE_DATE = 318,
-    VAR_BOGUS_TTL = 319,
-    VAR_VAL_CLEAN_ADDITIONAL = 320,
-    VAR_VAL_PERMISSIVE_MODE = 321,
-    VAR_INCOMING_NUM_TCP = 322,
-    VAR_MSG_BUFFER_SIZE = 323,
-    VAR_KEY_CACHE_SIZE = 324,
-    VAR_KEY_CACHE_SLABS = 325,
-    VAR_TRUSTED_KEYS_FILE = 326,
-    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327,
-    VAR_USE_SYSLOG = 328,
-    VAR_OUTGOING_INTERFACE = 329,
-    VAR_ROOT_HINTS = 330,
-    VAR_DO_NOT_QUERY_LOCALHOST = 331,
-    VAR_CACHE_MAX_TTL = 332,
-    VAR_HARDEN_DNSSEC_STRIPPED = 333,
-    VAR_ACCESS_CONTROL = 334,
-    VAR_LOCAL_ZONE = 335,
-    VAR_LOCAL_DATA = 336,
-    VAR_INTERFACE_AUTOMATIC = 337,
-    VAR_STATISTICS_INTERVAL = 338,
-    VAR_DO_DAEMONIZE = 339,
-    VAR_USE_CAPS_FOR_ID = 340,
-    VAR_STATISTICS_CUMULATIVE = 341,
-    VAR_OUTGOING_PORT_PERMIT = 342,
-    VAR_OUTGOING_PORT_AVOID = 343,
-    VAR_DLV_ANCHOR_FILE = 344,
-    VAR_DLV_ANCHOR = 345,
-    VAR_NEG_CACHE_SIZE = 346,
-    VAR_HARDEN_REFERRAL_PATH = 347,
-    VAR_PRIVATE_ADDRESS = 348,
-    VAR_PRIVATE_DOMAIN = 349,
-    VAR_REMOTE_CONTROL = 350,
-    VAR_CONTROL_ENABLE = 351,
-    VAR_CONTROL_INTERFACE = 352,
-    VAR_CONTROL_PORT = 353,
-    VAR_SERVER_KEY_FILE = 354,
-    VAR_SERVER_CERT_FILE = 355,
-    VAR_CONTROL_KEY_FILE = 356,
-    VAR_CONTROL_CERT_FILE = 357,
-    VAR_CONTROL_USE_CERT = 358,
-    VAR_EXTENDED_STATISTICS = 359,
-    VAR_LOCAL_DATA_PTR = 360,
-    VAR_JOSTLE_TIMEOUT = 361,
-    VAR_STUB_PRIME = 362,
-    VAR_UNWANTED_REPLY_THRESHOLD = 363,
-    VAR_LOG_TIME_ASCII = 364,
-    VAR_DOMAIN_INSECURE = 365,
-    VAR_PYTHON = 366,
-    VAR_PYTHON_SCRIPT = 367,
-    VAR_VAL_SIG_SKEW_MIN = 368,
-    VAR_VAL_SIG_SKEW_MAX = 369,
-    VAR_CACHE_MIN_TTL = 370,
-    VAR_VAL_LOG_LEVEL = 371,
-    VAR_AUTO_TRUST_ANCHOR_FILE = 372,
-    VAR_KEEP_MISSING = 373,
-    VAR_ADD_HOLDDOWN = 374,
-    VAR_DEL_HOLDDOWN = 375,
-    VAR_SO_RCVBUF = 376,
-    VAR_EDNS_BUFFER_SIZE = 377,
-    VAR_PREFETCH = 378,
-    VAR_PREFETCH_KEY = 379,
-    VAR_SO_SNDBUF = 380,
-    VAR_SO_REUSEPORT = 381,
-    VAR_HARDEN_BELOW_NXDOMAIN = 382,
-    VAR_IGNORE_CD_FLAG = 383,
-    VAR_LOG_QUERIES = 384,
-    VAR_LOG_REPLIES = 385,
-    VAR_LOG_LOCAL_ACTIONS = 386,
-    VAR_TCP_UPSTREAM = 387,
-    VAR_SSL_UPSTREAM = 388,
-    VAR_SSL_SERVICE_KEY = 389,
-    VAR_SSL_SERVICE_PEM = 390,
-    VAR_SSL_PORT = 391,
-    VAR_FORWARD_FIRST = 392,
-    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_IP_DSCP = 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.  */
-#define SPACE 258
-#define LETTER 259
-#define NEWLINE 260
-#define COMMENT 261
-#define COLON 262
-#define ANY 263
-#define ZONESTR 264
-#define STRING_ARG 265
-#define VAR_SERVER 266
-#define VAR_VERBOSITY 267
-#define VAR_NUM_THREADS 268
-#define VAR_PORT 269
-#define VAR_OUTGOING_RANGE 270
-#define VAR_INTERFACE 271
-#define VAR_PREFER_IP4 272
-#define VAR_DO_IP4 273
-#define VAR_DO_IP6 274
-#define VAR_PREFER_IP6 275
-#define VAR_DO_UDP 276
-#define VAR_DO_TCP 277
-#define VAR_TCP_MSS 278
-#define VAR_OUTGOING_TCP_MSS 279
-#define VAR_TCP_IDLE_TIMEOUT 280
-#define VAR_EDNS_TCP_KEEPALIVE 281
-#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 282
-#define VAR_CHROOT 283
-#define VAR_USERNAME 284
-#define VAR_DIRECTORY 285
-#define VAR_LOGFILE 286
-#define VAR_PIDFILE 287
-#define VAR_MSG_CACHE_SIZE 288
-#define VAR_MSG_CACHE_SLABS 289
-#define VAR_NUM_QUERIES_PER_THREAD 290
-#define VAR_RRSET_CACHE_SIZE 291
-#define VAR_RRSET_CACHE_SLABS 292
-#define VAR_OUTGOING_NUM_TCP 293
-#define VAR_INFRA_HOST_TTL 294
-#define VAR_INFRA_LAME_TTL 295
-#define VAR_INFRA_CACHE_SLABS 296
-#define VAR_INFRA_CACHE_NUMHOSTS 297
-#define VAR_INFRA_CACHE_LAME_SIZE 298
-#define VAR_NAME 299
-#define VAR_STUB_ZONE 300
-#define VAR_STUB_HOST 301
-#define VAR_STUB_ADDR 302
-#define VAR_TARGET_FETCH_POLICY 303
-#define VAR_HARDEN_SHORT_BUFSIZE 304
-#define VAR_HARDEN_LARGE_QUERIES 305
-#define VAR_FORWARD_ZONE 306
-#define VAR_FORWARD_HOST 307
-#define VAR_FORWARD_ADDR 308
-#define VAR_DO_NOT_QUERY_ADDRESS 309
-#define VAR_HIDE_IDENTITY 310
-#define VAR_HIDE_VERSION 311
-#define VAR_IDENTITY 312
-#define VAR_VERSION 313
-#define VAR_HARDEN_GLUE 314
-#define VAR_MODULE_CONF 315
-#define VAR_TRUST_ANCHOR_FILE 316
-#define VAR_TRUST_ANCHOR 317
-#define VAR_VAL_OVERRIDE_DATE 318
-#define VAR_BOGUS_TTL 319
-#define VAR_VAL_CLEAN_ADDITIONAL 320
-#define VAR_VAL_PERMISSIVE_MODE 321
-#define VAR_INCOMING_NUM_TCP 322
-#define VAR_MSG_BUFFER_SIZE 323
-#define VAR_KEY_CACHE_SIZE 324
-#define VAR_KEY_CACHE_SLABS 325
-#define VAR_TRUSTED_KEYS_FILE 326
-#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 327
-#define VAR_USE_SYSLOG 328
-#define VAR_OUTGOING_INTERFACE 329
-#define VAR_ROOT_HINTS 330
-#define VAR_DO_NOT_QUERY_LOCALHOST 331
-#define VAR_CACHE_MAX_TTL 332
-#define VAR_HARDEN_DNSSEC_STRIPPED 333
-#define VAR_ACCESS_CONTROL 334
-#define VAR_LOCAL_ZONE 335
-#define VAR_LOCAL_DATA 336
-#define VAR_INTERFACE_AUTOMATIC 337
-#define VAR_STATISTICS_INTERVAL 338
-#define VAR_DO_DAEMONIZE 339
-#define VAR_USE_CAPS_FOR_ID 340
-#define VAR_STATISTICS_CUMULATIVE 341
-#define VAR_OUTGOING_PORT_PERMIT 342
-#define VAR_OUTGOING_PORT_AVOID 343
-#define VAR_DLV_ANCHOR_FILE 344
-#define VAR_DLV_ANCHOR 345
-#define VAR_NEG_CACHE_SIZE 346
-#define VAR_HARDEN_REFERRAL_PATH 347
-#define VAR_PRIVATE_ADDRESS 348
-#define VAR_PRIVATE_DOMAIN 349
-#define VAR_REMOTE_CONTROL 350
-#define VAR_CONTROL_ENABLE 351
-#define VAR_CONTROL_INTERFACE 352
-#define VAR_CONTROL_PORT 353
-#define VAR_SERVER_KEY_FILE 354
-#define VAR_SERVER_CERT_FILE 355
-#define VAR_CONTROL_KEY_FILE 356
-#define VAR_CONTROL_CERT_FILE 357
-#define VAR_CONTROL_USE_CERT 358
-#define VAR_EXTENDED_STATISTICS 359
-#define VAR_LOCAL_DATA_PTR 360
-#define VAR_JOSTLE_TIMEOUT 361
-#define VAR_STUB_PRIME 362
-#define VAR_UNWANTED_REPLY_THRESHOLD 363
-#define VAR_LOG_TIME_ASCII 364
-#define VAR_DOMAIN_INSECURE 365
-#define VAR_PYTHON 366
-#define VAR_PYTHON_SCRIPT 367
-#define VAR_VAL_SIG_SKEW_MIN 368
-#define VAR_VAL_SIG_SKEW_MAX 369
-#define VAR_CACHE_MIN_TTL 370
-#define VAR_VAL_LOG_LEVEL 371
-#define VAR_AUTO_TRUST_ANCHOR_FILE 372
-#define VAR_KEEP_MISSING 373
-#define VAR_ADD_HOLDDOWN 374
-#define VAR_DEL_HOLDDOWN 375
-#define VAR_SO_RCVBUF 376
-#define VAR_EDNS_BUFFER_SIZE 377
-#define VAR_PREFETCH 378
-#define VAR_PREFETCH_KEY 379
-#define VAR_SO_SNDBUF 380
-#define VAR_SO_REUSEPORT 381
-#define VAR_HARDEN_BELOW_NXDOMAIN 382
-#define VAR_IGNORE_CD_FLAG 383
-#define VAR_LOG_QUERIES 384
-#define VAR_LOG_REPLIES 385
-#define VAR_LOG_LOCAL_ACTIONS 386
-#define VAR_TCP_UPSTREAM 387
-#define VAR_SSL_UPSTREAM 388
-#define VAR_SSL_SERVICE_KEY 389
-#define VAR_SSL_SERVICE_PEM 390
-#define VAR_SSL_PORT 391
-#define VAR_FORWARD_FIRST 392
-#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_IP_DSCP 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"
-
+#ifdef YYSTYPE
+#undef  YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
+#endif
+#ifndef YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
+typedef union {
 	char*	str;
+} YYSTYPE;
+#endif /* !YYSTYPE_IS_DECLARED */
+#line 59 "util/configparser.c"
 
-#line 716 "util/configparser.c"
-
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
-
-
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
-#endif
-
-#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
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
+/* compatibility with bison */
+#ifdef YYPARSE_PARAM
+/* compatibility with FreeBSD */
+# ifdef YYPARSE_PARAM_TYPE
+#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
 # else
-#  define YYSIZE_T unsigned
+#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
 # endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-
-#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(Spec) /* empty */
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
-#ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(E) /* empty */
+# define YYPARSE_DECL() yyparse(void)
 #endif
 
-#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\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
+/* Parameters sent to lex. */
+#ifdef YYLEX_PARAM
+# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
+# define YYLEX yylex(YYLEX_PARAM)
 #else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+# define YYLEX_DECL() yylex(void)
+# define YYLEX yylex()
 #endif
 
+/* Parameters sent to yyerror. */
+#ifndef YYERROR_DECL
+#define YYERROR_DECL() yyerror(const char *s)
+#endif
+#ifndef YYERROR_CALL
+#define YYERROR_CALL(msg) yyerror(msg)
+#endif
 
-#define YY_ASSERT(E) ((void) (0 && (E)))
+extern int YYPARSE_DECL();
 
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
+#define SPACE 257
+#define LETTER 258
+#define NEWLINE 259
+#define COMMENT 260
+#define COLON 261
+#define ANY 262
+#define ZONESTR 263
+#define STRING_ARG 264
+#define VAR_SERVER 265
+#define VAR_VERBOSITY 266
+#define VAR_NUM_THREADS 267
+#define VAR_PORT 268
+#define VAR_OUTGOING_RANGE 269
+#define VAR_INTERFACE 270
+#define VAR_PREFER_IP4 271
+#define VAR_DO_IP4 272
+#define VAR_DO_IP6 273
+#define VAR_PREFER_IP6 274
+#define VAR_DO_UDP 275
+#define VAR_DO_TCP 276
+#define VAR_TCP_MSS 277
+#define VAR_OUTGOING_TCP_MSS 278
+#define VAR_TCP_IDLE_TIMEOUT 279
+#define VAR_EDNS_TCP_KEEPALIVE 280
+#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 281
+#define VAR_CHROOT 282
+#define VAR_USERNAME 283
+#define VAR_DIRECTORY 284
+#define VAR_LOGFILE 285
+#define VAR_PIDFILE 286
+#define VAR_MSG_CACHE_SIZE 287
+#define VAR_MSG_CACHE_SLABS 288
+#define VAR_NUM_QUERIES_PER_THREAD 289
+#define VAR_RRSET_CACHE_SIZE 290
+#define VAR_RRSET_CACHE_SLABS 291
+#define VAR_OUTGOING_NUM_TCP 292
+#define VAR_INFRA_HOST_TTL 293
+#define VAR_INFRA_LAME_TTL 294
+#define VAR_INFRA_CACHE_SLABS 295
+#define VAR_INFRA_CACHE_NUMHOSTS 296
+#define VAR_INFRA_CACHE_LAME_SIZE 297
+#define VAR_NAME 298
+#define VAR_STUB_ZONE 299
+#define VAR_STUB_HOST 300
+#define VAR_STUB_ADDR 301
+#define VAR_TARGET_FETCH_POLICY 302
+#define VAR_HARDEN_SHORT_BUFSIZE 303
+#define VAR_HARDEN_LARGE_QUERIES 304
+#define VAR_FORWARD_ZONE 305
+#define VAR_FORWARD_HOST 306
+#define VAR_FORWARD_ADDR 307
+#define VAR_DO_NOT_QUERY_ADDRESS 308
+#define VAR_HIDE_IDENTITY 309
+#define VAR_HIDE_VERSION 310
+#define VAR_IDENTITY 311
+#define VAR_VERSION 312
+#define VAR_HARDEN_GLUE 313
+#define VAR_MODULE_CONF 314
+#define VAR_TRUST_ANCHOR_FILE 315
+#define VAR_TRUST_ANCHOR 316
+#define VAR_VAL_OVERRIDE_DATE 317
+#define VAR_BOGUS_TTL 318
+#define VAR_VAL_CLEAN_ADDITIONAL 319
+#define VAR_VAL_PERMISSIVE_MODE 320
+#define VAR_INCOMING_NUM_TCP 321
+#define VAR_MSG_BUFFER_SIZE 322
+#define VAR_KEY_CACHE_SIZE 323
+#define VAR_KEY_CACHE_SLABS 324
+#define VAR_TRUSTED_KEYS_FILE 325
+#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 326
+#define VAR_USE_SYSLOG 327
+#define VAR_OUTGOING_INTERFACE 328
+#define VAR_ROOT_HINTS 329
+#define VAR_DO_NOT_QUERY_LOCALHOST 330
+#define VAR_CACHE_MAX_TTL 331
+#define VAR_HARDEN_DNSSEC_STRIPPED 332
+#define VAR_ACCESS_CONTROL 333
+#define VAR_LOCAL_ZONE 334
+#define VAR_LOCAL_DATA 335
+#define VAR_INTERFACE_AUTOMATIC 336
+#define VAR_STATISTICS_INTERVAL 337
+#define VAR_DO_DAEMONIZE 338
+#define VAR_USE_CAPS_FOR_ID 339
+#define VAR_STATISTICS_CUMULATIVE 340
+#define VAR_OUTGOING_PORT_PERMIT 341
+#define VAR_OUTGOING_PORT_AVOID 342
+#define VAR_DLV_ANCHOR_FILE 343
+#define VAR_DLV_ANCHOR 344
+#define VAR_NEG_CACHE_SIZE 345
+#define VAR_HARDEN_REFERRAL_PATH 346
+#define VAR_PRIVATE_ADDRESS 347
+#define VAR_PRIVATE_DOMAIN 348
+#define VAR_REMOTE_CONTROL 349
+#define VAR_CONTROL_ENABLE 350
+#define VAR_CONTROL_INTERFACE 351
+#define VAR_CONTROL_PORT 352
+#define VAR_SERVER_KEY_FILE 353
+#define VAR_SERVER_CERT_FILE 354
+#define VAR_CONTROL_KEY_FILE 355
+#define VAR_CONTROL_CERT_FILE 356
+#define VAR_CONTROL_USE_CERT 357
+#define VAR_EXTENDED_STATISTICS 358
+#define VAR_LOCAL_DATA_PTR 359
+#define VAR_JOSTLE_TIMEOUT 360
+#define VAR_STUB_PRIME 361
+#define VAR_UNWANTED_REPLY_THRESHOLD 362
+#define VAR_LOG_TIME_ASCII 363
+#define VAR_DOMAIN_INSECURE 364
+#define VAR_PYTHON 365
+#define VAR_PYTHON_SCRIPT 366
+#define VAR_VAL_SIG_SKEW_MIN 367
+#define VAR_VAL_SIG_SKEW_MAX 368
+#define VAR_CACHE_MIN_TTL 369
+#define VAR_VAL_LOG_LEVEL 370
+#define VAR_AUTO_TRUST_ANCHOR_FILE 371
+#define VAR_KEEP_MISSING 372
+#define VAR_ADD_HOLDDOWN 373
+#define VAR_DEL_HOLDDOWN 374
+#define VAR_SO_RCVBUF 375
+#define VAR_EDNS_BUFFER_SIZE 376
+#define VAR_PREFETCH 377
+#define VAR_PREFETCH_KEY 378
+#define VAR_SO_SNDBUF 379
+#define VAR_SO_REUSEPORT 380
+#define VAR_HARDEN_BELOW_NXDOMAIN 381
+#define VAR_IGNORE_CD_FLAG 382
+#define VAR_LOG_QUERIES 383
+#define VAR_LOG_REPLIES 384
+#define VAR_LOG_LOCAL_ACTIONS 385
+#define VAR_TCP_UPSTREAM 386
+#define VAR_SSL_UPSTREAM 387
+#define VAR_SSL_SERVICE_KEY 388
+#define VAR_SSL_SERVICE_PEM 389
+#define VAR_SSL_PORT 390
+#define VAR_FORWARD_FIRST 391
+#define VAR_STUB_SSL_UPSTREAM 392
+#define VAR_FORWARD_SSL_UPSTREAM 393
+#define VAR_TLS_CERT_BUNDLE 394
+#define VAR_STUB_FIRST 395
+#define VAR_MINIMAL_RESPONSES 396
+#define VAR_RRSET_ROUNDROBIN 397
+#define VAR_MAX_UDP_SIZE 398
+#define VAR_DELAY_CLOSE 399
+#define VAR_UNBLOCK_LAN_ZONES 400
+#define VAR_INSECURE_LAN_ZONES 401
+#define VAR_INFRA_CACHE_MIN_RTT 402
+#define VAR_DNS64_PREFIX 403
+#define VAR_DNS64_SYNTHALL 404
+#define VAR_DNS64_IGNORE_AAAA 405
+#define VAR_DNSTAP 406
+#define VAR_DNSTAP_ENABLE 407
+#define VAR_DNSTAP_SOCKET_PATH 408
+#define VAR_DNSTAP_IP 409
+#define VAR_DNSTAP_TLS 410
+#define VAR_DNSTAP_TLS_SERVER_NAME 411
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 412
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 413
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 414
+#define VAR_DNSTAP_SEND_IDENTITY 415
+#define VAR_DNSTAP_SEND_VERSION 416
+#define VAR_DNSTAP_IDENTITY 417
+#define VAR_DNSTAP_VERSION 418
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 419
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 420
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 421
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 422
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 423
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 424
+#define VAR_RESPONSE_IP_TAG 425
+#define VAR_RESPONSE_IP 426
+#define VAR_RESPONSE_IP_DATA 427
+#define VAR_HARDEN_ALGO_DOWNGRADE 428
+#define VAR_IP_TRANSPARENT 429
+#define VAR_IP_DSCP 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_PAD_RESPONSES 493
+#define VAR_PAD_RESPONSES_BLOCK_SIZE 494
+#define VAR_PAD_QUERIES 495
+#define VAR_PAD_QUERIES_BLOCK_SIZE 496
+#define VAR_IPSECMOD_ENABLED 497
+#define VAR_IPSECMOD_HOOK 498
+#define VAR_IPSECMOD_IGNORE_BOGUS 499
+#define VAR_IPSECMOD_MAX_TTL 500
+#define VAR_IPSECMOD_WHITELIST 501
+#define VAR_IPSECMOD_STRICT 502
+#define VAR_CACHEDB 503
+#define VAR_CACHEDB_BACKEND 504
+#define VAR_CACHEDB_SECRETSEED 505
+#define VAR_CACHEDB_REDISHOST 506
+#define VAR_CACHEDB_REDISPORT 507
+#define VAR_CACHEDB_REDISTIMEOUT 508
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 509
+#define VAR_FOR_UPSTREAM 510
+#define VAR_AUTH_ZONE 511
+#define VAR_ZONEFILE 512
+#define VAR_MASTER 513
+#define VAR_URL 514
+#define VAR_FOR_DOWNSTREAM 515
+#define VAR_FALLBACK_ENABLED 516
+#define VAR_TLS_ADDITIONAL_PORT 517
+#define VAR_LOW_RTT 518
+#define VAR_LOW_RTT_PERMIL 519
+#define VAR_FAST_SERVER_PERMIL 520
+#define VAR_FAST_SERVER_NUM 521
+#define VAR_ALLOW_NOTIFY 522
+#define VAR_TLS_WIN_CERT 523
+#define VAR_TCP_CONNECTION_LIMIT 524
+#define VAR_FORWARD_NO_CACHE 525
+#define VAR_STUB_NO_CACHE 526
+#define VAR_LOG_SERVFAIL 527
+#define VAR_DENY_ANY 528
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 529
+#define VAR_LOG_TAG_QUERYREPLY 530
+#define VAR_STREAM_WAIT_SIZE 531
+#define VAR_TLS_CIPHERS 532
+#define VAR_TLS_CIPHERSUITES 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 YYERRCODE 256
+typedef short YYINT;
+static const YYINT yylhs[] = {                           -1,
+    0,    0,    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    2,    3,    3,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
+    4,    5,    5,  220,  220,  220,  220,  220,  220,  220,
+    6,    7,    7,  228,  228,  228,  228,  228,  228,   14,
+   15,   15,  235,  235,  235,  235,  235,  235,  235,   22,
+   23,   23,  243,  243,  243,  243,  243,  243,  243,  243,
+  252,  253,  254,  255,  256,   24,   25,   25,  257,  257,
+  257,  257,  257,  257,  257,  257,  257,  257,   27,   28,
+   91,   94,  103,  191,  192,   29,  156,  157,  158,  159,
+  160,  161,  162,  163,  164,  165,   42,   82,   30,   95,
+   96,   53,   75,   90,   31,   32,   35,   36,   33,   34,
+   37,   38,   39,   40,   41,  126,  203,  127,  129,  130,
+  131,  205,  210,  206,  217,  218,  219,  187,   92,   81,
+  107,  124,  125,  215,  212,  128,   43,   44,   45,   46,
+   47,   83,   97,   98,  113,   69,   79,   70,  195,  196,
+  108,   63,   64,  194,   65,   66,  117,  121,  135,  144,
+  170,  147,  216,  118,   76,   48,   49,   50,  105,  136,
+  137,  138,   51,   52,   54,   55,   57,   58,   56,  142,
+   59,   60,   61,   67,   86,  122,  100,  143,   93,  166,
+  101,  102,  119,  120,  213,  106,   62,   84,   87,   68,
+   71,  109,  110,   85,  167,  111,   72,   73,   74,  204,
+  123,  180,  181,  182,  183,  184,  185,  193,  112,   80,
+  114,  115,  116,  168,   77,   78,   99,   88,   89,  104,
+  132,  133,  214,  134,  139,  140,  141,  171,  172,  174,
+  176,  177,  175,  178,  188,  145,  146,  150,  151,  148,
+  149,  152,  153,  155,  154,  207,  209,  208,  169,  179,
+  258,  259,  260,  261,  197,  199,  198,  200,  201,  202,
+  221,  222,  223,  225,  226,  227,  224,  229,  230,  231,
+  232,  233,  234,  244,  245,  246,  247,  251,  248,  249,
+  250,  236,  237,  240,  241,  238,  242,  239,   10,   11,
+   11,  262,  262,  262,  262,  262,  262,  262,  262,  263,
+  265,  264,  270,  266,  267,  268,  269,   12,   13,   13,
+  271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+  271,  271,  271,  271,  271,  271,  271,  271,  272,  273,
+  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,    8,    9,    9,  290,
+  291,  173,  186,  189,  190,   16,   17,   17,  292,  292,
+  292,  292,  292,  292,  292,  292,  292,  292,  293,  294,
+  295,  297,  298,  296,  299,  300,  301,  302,   18,   19,
+   19,  303,  303,  303,  303,  303,  304,  305,  306,  307,
+  308,  211,   20,   21,   21,  309,  309,  310,  311,
 };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# 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) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
-
-# define YYCOPY_NEEDED 1
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (0)
-
-#endif
-
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (0)
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  2
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   606
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  286
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  309
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  596
-/* YYNSTATES -- Number of states.  */
-#define YYNSTATES  887
-
-#define YYUNDEFTOK  2
-#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)
-
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex.  */
-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,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    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,    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,    72,    73,    74,
-      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,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   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,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   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
+static const YYINT yylen[] = {                            2,
+    0,    2,    2,    2,    2,    2,    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,    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,    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,
+    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,    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,    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,    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,    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,    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,
 };
-
+static const YYINT yydefred[] = {                         1,
+    0,   15,  211,  221,  489,  547,  508,  230,  556,  579,
+  240,  593,  256,    2,   17,  213,  223,  549,  491,  510,
+  232,  558,  581,  595,  242,  258,    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,    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,    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,    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,    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,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   16,   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,   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,   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,
+  116,  117,  118,  119,  120,  121,  122,  123,  124,  125,
+  126,  127,  128,  129,  130,  131,  132,  133,  134,  135,
+  136,  137,  138,  139,  140,  141,  142,  143,  144,  145,
+  146,  147,  148,  149,  150,  151,  152,  153,  154,  155,
+  156,  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,  195,
+  196,  197,  198,  199,  200,  201,  202,  203,  204,  205,
+  206,  207,  208,  209,  210,    0,    0,    0,    0,    0,
+    0,    0,  212,  214,  215,  216,  217,  218,  219,  220,
+    0,    0,    0,    0,    0,    0,  222,  224,  225,  226,
+  227,  228,  229,    0,  548,  550,    0,    0,    0,    0,
+    0,    0,    0,    0,  490,  492,  493,  494,  495,  496,
+  497,  498,  499,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  509,  511,  512,  513,  514,  515,  516,  517,  518,
+  519,  520,  521,  522,  523,  524,  525,  526,  527,  528,
+    0,    0,    0,    0,    0,    0,    0,  231,  233,  234,
+  235,  236,  237,  238,  239,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  557,  559,  560,  561,  562,
+  563,  564,  565,  566,  567,  568,    0,    0,    0,    0,
+    0,  580,  582,  583,  584,  585,  586,    0,    0,  594,
+  596,  597,    0,    0,    0,    0,    0,    0,    0,    0,
+  241,  243,  244,  245,  246,  247,  248,  249,  250,    0,
+    0,    0,    0,    0,  259,  260,  262,  263,  264,  261,
+  265,  266,  267,  268,  257,  270,  269,  276,  289,  287,
+  299,  295,  296,  300,  297,  298,  301,  302,  303,  304,
+  305,  327,  328,  329,  330,  331,  356,  357,  358,  363,
+  364,  292,  365,  366,  369,  367,  368,  371,  372,  373,
+  387,  342,  343,  345,  346,  374,  390,  336,  338,  391,
+  397,  398,  399,  293,  355,  415,  416,  337,  410,  320,
+  288,  332,  388,  394,  375,    0,    0,  419,  294,  271,
+  319,  379,  272,  290,  291,  333,  334,  417,  377,  381,
+  382,  273,  420,  359,  386,  321,  341,  392,  393,  396,
+  409,  335,  413,  411,  412,  347,  354,  383,  384,  348,
+  349,  376,  401,  322,  323,  326,  306,  308,  309,  310,
+  311,  312,  421,  422,  424,  360,  361,  362,  370,  425,
+  426,  427,    0,    0,    0,  378,  350,  352,  552,  436,
+  440,  438,  437,  441,  439,    0,    0,  444,  445,  277,
+  278,  279,  280,  281,  282,  283,  284,  285,  286,  380,
+  395,  414,  449,  450,  351,  428,    0,    0,    0,    0,
+    0,    0,  402,  403,  404,  405,  406,  407,  408,  553,
+  344,  339,  400,  318,  274,  275,  340,  455,  457,  456,
+  458,  459,  460,  307,  314,  446,  448,  447,  313,    0,
+  325,  385,  423,  324,  353,  315,  316,  317,  461,  462,
+  463,  467,  466,  464,  465,  468,  469,  470,  471,  473,
+  472,  551,  500,  502,  501,  504,  505,  506,  507,  503,
+  529,  530,  531,  532,  533,  534,  535,  536,  537,  538,
+  539,  540,  541,  542,  543,  544,  545,  546,  482,    0,
+  486,  487,    0,    0,  488,  569,  570,  571,  574,  572,
+  573,  575,  576,  577,  578,  587,  588,  589,  590,  591,
+  598,  599,  474,  480,  475,  476,  477,  479,  481,  478,
+  251,  252,  253,  254,  255,  389,  418,  435,  554,  555,
+  442,  443,  429,  430,    0,    0,    0,  434,  592,  483,
+  484,  485,  433,  431,  432,
+};
+static const YYINT yydgoto[] = {                          1,
+   14,   15,   27,   16,   28,   17,   29,   18,   30,   19,
+   31,   20,   32,   21,   33,   22,   34,   23,   35,   24,
+   36,   25,   37,   26,   38,  232,  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,  420,  421,  422,  423,  424,  425,  433,
+  434,  435,  436,  437,  438,  439,  440,  447,  448,  449,
+  450,  451,  452,  453,  518,  519,  520,  521,  522,  523,
+  524,  525,  571,  572,  573,  574,  575,  576,  577,  578,
+  579,  590,  591,  592,  593,  594,  595,    0,    0,    0,
+    0,  465,  466,  467,  468,  469,  470,  471,  472,  473,
+  492,  493,  494,  495,  496,  497,  498,  499,  500,  501,
+  502,  503,  504,  505,  506,  507,  508,  509,  510,  455,
+  456,  536,  537,  538,  539,  540,  541,  542,  543,  544,
+  545,  546,  552,  553,  554,  555,  556,  557,  560,  561,
+  562,
+};
+static const YYINT yysindex[] = {                         0,
+ -248,    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,  369, -290, -280, -357,
+ -322, -335, -298, -445, -485, -529, -240, -293, -252, -239,
+ -216, -215, -214, -212, -211, -210, -209, -208, -205, -204,
+ -202, -201, -200, -199, -198, -197, -196, -195, -194, -174,
+ -173, -172, -167, -166, -165, -164, -161, -160, -158, -157,
+ -156, -155, -154, -152, -150, -149, -148, -146, -145, -144,
+ -143, -142, -141, -140, -139, -138, -137, -134, -133, -132,
+ -131, -130, -129, -128, -127, -126, -125, -124, -123, -122,
+ -121, -120, -119, -118, -117, -116, -115, -114, -113, -112,
+ -111, -110, -109, -108, -107, -105, -104, -103, -102, -101,
+ -100,  -99,  -98,  -97,  -95,  -94,  -93,  -92,  -91,  -90,
+  -89,  -88,  -87,  -86,  -85,  -84,  -83,  -82,  -81,  -80,
+  -79,  -78,  -77,  -76,  -75,  -74,  -73,  -72,  -71,  -70,
+  -69,  -68,  -67,  -66,  -65,  -64,  -63,  -62,  -61,  -60,
+  -59,  -58,  -57,  -56,  -55,  -54,  -53,  -52,  -51,  -50,
+  -49,  -47,  -46,  -42,  -41,  -40,  -39,  -38,  -37,  -36,
+  -34,  -33,  -32,  -31,  -29,  -27,  -26,  -25,  -24,  -23,
+  -22,  -21,  -20,  -13,  -12,  -11,  -10,   -8,   -7,   -6,
+   -5,   -4,   -3,   -2,    7,   19,   20,   21,   23,   24,
+   25,   27,   28,   29,   30,   31,   32,   33,   34,   35,
+   40,   41,   46,   47,   52,   53,   58,   59,   60,   61,
+   62,    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,
+    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,    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,    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,    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,   63,   64,   65,   66,   67,
+   68,   69,    0,    0,    0,    0,    0,    0,    0,    0,
+   70,   71,   72,   73,   74,   75,    0,    0,    0,    0,
+    0,    0,    0,   76,    0,    0,   77,   78,   79,   80,
+   81,   82,   83,   84,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   85,   90,   91,   92,  106,  107,  108,
+  109,  110,  111,  112,  113,  118,  119,  120,  121,  122,
+  123,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  124,  125,  126,  127,  132,  133,  138,    0,    0,    0,
+    0,    0,    0,    0,    0,  139,  140,  141,  142,  147,
+  148,  149,  150,  151,  152,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  153,  154,  159,  160,
+  161,    0,    0,    0,    0,    0,    0,  162,  163,    0,
+    0,    0,  164,  165,  166,  167,  168,  169,  170,  171,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  172,
+  173,  174,  175,  176,    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,    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,  177,  182,    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,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  183,  184,  185,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  186,  187,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  188,  189,  190,  191,
+  192,  193,    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,  198,
+    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,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  199,
+    0,    0,  200,  205,    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,    0,  206,  207,  208,    0,    0,    0,
+    0,    0,    0,    0,    0,
+};
+static const YYINT yyrindex[] = {                         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,    1,    2,    3,    4,
+   13,   14,   15,   16,   93,   94,   95,   96,    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,    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,    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,    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,    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,    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,    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,    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,
+    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,    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,    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,    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,    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,    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,    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,    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,    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,    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,
+    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,    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,    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,    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,
+};
+static const YYINT yygindex[] = {                         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,    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,    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,    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,    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,    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,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  -14,  226,  227,  239,    0,    0,    0,
+  319,    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,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,
+};
+#define YYTABLESIZE 906
+static const YYINT yytable[] = {                        511,
+    3,    4,    5,    6,  563,  558,  559,  426,  454,  427,
+  428,  596,    7,    8,    9,   10,    2,  441,  547,  548,
+  549,  550,  551,  585,  597,  442,  443,  457,  458,  459,
+  460,  461,  462,  463,  464,  512,  513,  526,  527,  528,
+  529,  530,  531,  532,  533,  534,  535,  598,  599,  600,
+    3,  601,  602,  603,  604,  605,    4,  563,  606,  607,
+  514,  608,  609,  610,  611,  612,  613,  614,  615,  616,
+  429,  474,  475,  476,  477,  478,  479,  480,  481,  482,
+  483,  484,  485,  486,  487,  488,  489,  490,  491,  617,
+  618,  619,   11,   12,   13,   14,  620,  621,  622,  623,
+    5,  430,  624,  625,  431,  626,  627,  628,  629,  630,
+  444,  631,  445,  632,  633,  634,    6,  635,  636,  637,
+  638,  639,  640,  641,  642,  643,  644,  515,  516,  645,
+  646,  647,  648,  649,  650,  651,  652,  653,  654,  655,
+  656,  657,  658,  659,  660,  661,  662,  663,  664,  665,
+  666,  667,  668,  669,  670,  671,  672,    7,  673,  674,
+  675,  676,  677,  678,  679,  680,  681,  517,  682,  683,
+  684,  685,  686,  687,  688,  689,  690,  691,  692,  693,
+  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,    8,  729,  730,  565,  566,
+  567,  731,  732,  733,  734,  735,  736,  737,  570,  738,
+  739,  740,  741,    9,  742,  432,  743,  744,  745,  746,
+  747,  748,  749,  750,  446,  580,  581,  582,  583,  584,
+  751,  752,  753,  754,   10,  755,  756,  757,  758,  759,
+  760,  761,   11,  586,  587,    3,    4,    5,    6,  564,
+  762,  565,  566,  567,  568,  569,  588,    7,    8,    9,
+   10,  570,  763,  764,  765,   12,  766,  767,  768,   13,
+  769,  770,  771,  772,  773,  774,  775,  776,  777,    3,
+    4,    5,    6,  778,  779,    3,    4,    5,    6,  780,
+  781,    7,    8,    9,   10,  782,  783,    7,    8,    9,
+   10,  784,  785,  786,  787,  788,  789,  790,  791,  792,
+  793,  794,  795,  796,  797,  798,  799,  800,  801,  802,
+  803,  804,  805,  806,  807,  808,  809,  810,  811,    3,
+    4,    5,    6,  812,  813,  814,  589,   11,   12,   13,
+   14,    7,    8,    9,   10,    3,    4,    5,    6,  815,
+  816,  817,  818,  819,  820,  821,  822,    7,    8,    9,
+   10,  823,  824,  825,  826,  827,  828,  829,  830,  831,
+  832,   11,   12,   13,   14,  833,  834,   11,   12,   13,
+   14,  835,  836,  837,  838,  839,    3,    4,    5,    6,
+  840,  841,  842,  843,  844,  845,  846,  847,    7,    8,
+    9,   10,  848,  849,  850,  851,  852,  853,  854,  855,
+  856,  857,  858,  859,  860,  861,  862,  863,  864,  865,
+  866,   11,   12,   13,   14,  867,  868,  869,  870,  871,
+  872,  873,  874,  875,  876,  877,  878,   11,   12,   13,
+   14,  879,  880,  881,    3,    4,    5,    6,  882,  883,
+  884,  885,    0,    0,    0,    0,    7,    8,    9,   10,
+    0,    0,    3,    4,    5,    6,    0,    0,    0,    0,
+    0,    0,    0,    0,    7,    8,    9,   10,   11,   12,
+   13,   14,    0,    3,    4,    5,    6,    0,    0,    0,
+    0,    3,    4,    5,    6,    7,    8,    9,   10,    0,
+    0,    0,    0,    7,    8,    9,   10,    0,    0,    0,
+    0,    0,    0,    0,    3,    4,    5,    6,    3,    4,
+    5,    6,    0,    0,    0,    0,    7,    8,    9,   10,
+    7,    8,    9,   10,    0,    0,   11,   12,   13,   14,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   11,   12,   13,   14,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   11,   12,   13,   14,    0,
+    0,    0,    0,   11,   12,   13,   14,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   11,   12,   13,   14,
+   11,   12,   13,   14,   39,   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,    0,    0,    0,    0,
+   71,   72,   73,    0,    0,    0,   74,   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,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  115,  116,  117,    0,
+  118,  119,  120,    0,    0,  121,  122,  123,  124,  125,
+  126,  127,  128,  129,  130,  131,  132,  133,  134,  135,
+  136,  137,  138,  139,  140,  141,  142,  143,  144,    0,
+    0,    0,  145,    0,  146,  147,  148,  149,  150,  151,
+  152,  153,  154,  155,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  156,  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,    0,  195,    0,  196,  197,  198,  199,  200,
+  201,  202,  203,  204,  205,  206,  207,  208,  209,  210,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  211,  212,  213,  214,  215,
+  216,    0,    0,    0,    0,    0,    0,  217,    0,    0,
+    0,    0,    0,    0,    0,  218,  219,    0,  220,  221,
+    0,  222,  223,    0,    0,  224,  225,  226,  227,  228,
+  229,  230,    0,    0,    0,  231,
+};
+static const YYINT yycheck[] = {                        298,
+    0,    0,    0,    0,  298,  535,  536,  298,  366,  300,
+  301,  264,    0,    0,    0,    0,  265,  298,  504,  505,
+  506,  507,  508,   38,  264,  306,  307,  350,  351,  352,
+  353,  354,  355,  356,  357,  334,  335,  483,  484,  485,
+  486,  487,  488,  489,  490,  491,  492,  264,  264,  264,
+  299,  264,  264,  264,  264,  264,  305,  298,  264,  264,
+  359,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  361,  407,  408,  409,  410,  411,  412,  413,  414,  415,
+  416,  417,  418,  419,  420,  421,  422,  423,  424,  264,
+  264,  264,    0,    0,    0,    0,  264,  264,  264,  264,
+  349,  392,  264,  264,  395,  264,  264,  264,  264,  264,
+  391,  264,  393,  264,  264,  264,  365,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  426,  427,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  406,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  466,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  464,  264,  264,  512,  513,
+  514,  264,  264,  264,  264,  264,  264,  264,  522,  264,
+  264,  264,  264,  482,  264,  526,  264,  264,  264,  264,
+  264,  264,  264,  264,  525,  539,  540,  541,  542,  543,
+  264,  264,  264,  264,  503,  264,  264,  264,  264,  264,
+  264,  264,  511,   38,   38,  265,  265,  265,  265,  510,
+  264,  512,  513,  514,  515,  516,   38,  265,  265,  265,
+  265,  522,  264,  264,  264,  534,  264,  264,  264,  538,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  299,
+  299,  299,  299,  264,  264,  305,  305,  305,  305,  264,
+  264,  299,  299,  299,  299,  264,  264,  305,  305,  305,
+  305,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  349,
+  349,  349,  349,  264,  264,  264,   38,  265,  265,  265,
+  265,  349,  349,  349,  349,  365,  365,  365,  365,  264,
+  264,  264,  264,  264,  264,  264,  264,  365,  365,  365,
+  365,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  299,  299,  299,  299,  264,  264,  305,  305,  305,
+  305,  264,  264,  264,  264,  264,  406,  406,  406,  406,
+  264,  264,  264,  264,  264,  264,  264,  264,  406,  406,
+  406,  406,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
+  264,  349,  349,  349,  349,  264,  264,  264,  264,  264,
+  264,  264,  264,  264,  264,  264,  264,  365,  365,  365,
+  365,  264,  264,  264,  464,  464,  464,  464,  264,  264,
+  264,  264,   -1,   -1,   -1,   -1,  464,  464,  464,  464,
+   -1,   -1,  482,  482,  482,  482,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  482,  482,  482,  482,  406,  406,
+  406,  406,   -1,  503,  503,  503,  503,   -1,   -1,   -1,
+   -1,  511,  511,  511,  511,  503,  503,  503,  503,   -1,
+   -1,   -1,   -1,  511,  511,  511,  511,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  534,  534,  534,  534,  538,  538,
+  538,  538,   -1,   -1,   -1,   -1,  534,  534,  534,  534,
+  538,  538,  538,  538,   -1,   -1,  464,  464,  464,  464,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  482,  482,  482,  482,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  503,  503,  503,  503,   -1,
+   -1,   -1,   -1,  511,  511,  511,  511,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  534,  534,  534,  534,
+  538,  538,  538,  538,  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,   -1,   -1,   -1,   -1,
+  302,  303,  304,   -1,   -1,   -1,  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,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  358,  359,  360,   -1,
+  362,  363,  364,   -1,   -1,  367,  368,  369,  370,  371,
+  372,  373,  374,  375,  376,  377,  378,  379,  380,  381,
+  382,  383,  384,  385,  386,  387,  388,  389,  390,   -1,
+   -1,   -1,  394,   -1,  396,  397,  398,  399,  400,  401,
+  402,  403,  404,  405,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  425,  426,  427,  428,  429,  430,  431,
+  432,  433,  434,  435,  436,  437,  438,  439,  440,  441,
+  442,  443,  444,  445,  446,  447,  448,  449,  450,  451,
+  452,  453,  454,  455,  456,  457,  458,  459,  460,  461,
+  462,  463,   -1,  465,   -1,  467,  468,  469,  470,  471,
+  472,  473,  474,  475,  476,  477,  478,  479,  480,  481,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  497,  498,  499,  500,  501,
+  502,   -1,   -1,   -1,   -1,   -1,   -1,  509,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  517,  518,   -1,  520,  521,
+   -1,  523,  524,   -1,   -1,  527,  528,  529,  530,  531,
+  532,  533,   -1,   -1,   -1,  537,
+};
+#define YYFINAL 1
+#ifndef YYDEBUG
+#define YYDEBUG 0
+#endif
+#define YYMAXTOKEN 543
+#define YYUNDFTOKEN 857
+#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a))
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       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,   239,   239,   240,   240,   241,
-     241,   242,   242,   242,   243,   243,   244,   244,   244,   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,   986,   995,  1004,  1013,  1022,  1031,  1040,  1047,
-    1054,  1080,  1088,  1095,  1102,  1109,  1116,  1124,  1132,  1140,
-    1147,  1158,  1169,  1176,  1185,  1194,  1203,  1210,  1217,  1225,
-    1233,  1243,  1253,  1263,  1277,  1285,  1298,  1309,  1317,  1330,
-    1339,  1348,  1357,  1367,  1377,  1385,  1398,  1407,  1415,  1424,
-    1432,  1445,  1454,  1461,  1471,  1481,  1491,  1501,  1511,  1521,
-    1531,  1541,  1548,  1555,  1562,  1571,  1580,  1589,  1598,  1605,
-    1615,  1635,  1642,  1660,  1673,  1686,  1695,  1704,  1713,  1722,
-    1732,  1742,  1753,  1762,  1771,  1780,  1789,  1798,  1807,  1820,
-    1833,  1842,  1849,  1858,  1867,  1876,  1885,  1893,  1906,  1914,
-    1955,  1962,  1977,  1987,  1997,  2004,  2011,  2018,  2027,  2035,
-    2049,  2070,  2091,  2103,  2115,  2127,  2136,  2157,  2167,  2176,
-    2184,  2192,  2205,  2218,  2233,  2248,  2257,  2266,  2272,  2281,
-    2290,  2300,  2310,  2323,  2336,  2348,  2362,  2374,  2388,  2398,
-    2405,  2412,  2421,  2430,  2440,  2450,  2460,  2467,  2474,  2483,
-    2492,  2502,  2512,  2519,  2526,  2533,  2541,  2551,  2561,  2571,
-    2581,  2620,  2630,  2638,  2646,  2661,  2670,  2675,  2676,  2677,
-    2677,  2677,  2678,  2678,  2678,  2679,  2679,  2681,  2691,  2700,
-    2707,  2714,  2721,  2728,  2735,  2742,  2747,  2748,  2749,  2749,
-    2750,  2750,  2750,  2751,  2752,  2752,  2753,  2753,  2754,  2754,
-    2755,  2756,  2757,  2758,  2759,  2760,  2762,  2771,  2778,  2785,
-    2794,  2801,  2808,  2815,  2822,  2831,  2840,  2847,  2854,  2864,
-    2874,  2884,  2894,  2904,  2914,  2919,  2920,  2921,  2923,  2929,
-    2939,  2946,  2955,  2963,  2968,  2969,  2971,  2971,  2971,  2972,
-    2972,  2973,  2974,  2975,  2976,  2977,  2979,  2989,  2998,  3005,
-    3014,  3021,  3030,  3038,  3051,  3059,  3072,  3077,  3078,  3079,
-    3079,  3080,  3080,  3080,  3082,  3094,  3106,  3118,  3133,  3146,
-    3157,  3162,  3163,  3164,  3164,  3166,  3181
+static const char *const yyname[] = {
+
+"end-of-file",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,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,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,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"SPACE","LETTER","NEWLINE",
+"COMMENT","COLON","ANY","ZONESTR","STRING_ARG","VAR_SERVER","VAR_VERBOSITY",
+"VAR_NUM_THREADS","VAR_PORT","VAR_OUTGOING_RANGE","VAR_INTERFACE",
+"VAR_PREFER_IP4","VAR_DO_IP4","VAR_DO_IP6","VAR_PREFER_IP6","VAR_DO_UDP",
+"VAR_DO_TCP","VAR_TCP_MSS","VAR_OUTGOING_TCP_MSS","VAR_TCP_IDLE_TIMEOUT",
+"VAR_EDNS_TCP_KEEPALIVE","VAR_EDNS_TCP_KEEPALIVE_TIMEOUT","VAR_CHROOT",
+"VAR_USERNAME","VAR_DIRECTORY","VAR_LOGFILE","VAR_PIDFILE","VAR_MSG_CACHE_SIZE",
+"VAR_MSG_CACHE_SLABS","VAR_NUM_QUERIES_PER_THREAD","VAR_RRSET_CACHE_SIZE",
+"VAR_RRSET_CACHE_SLABS","VAR_OUTGOING_NUM_TCP","VAR_INFRA_HOST_TTL",
+"VAR_INFRA_LAME_TTL","VAR_INFRA_CACHE_SLABS","VAR_INFRA_CACHE_NUMHOSTS",
+"VAR_INFRA_CACHE_LAME_SIZE","VAR_NAME","VAR_STUB_ZONE","VAR_STUB_HOST",
+"VAR_STUB_ADDR","VAR_TARGET_FETCH_POLICY","VAR_HARDEN_SHORT_BUFSIZE",
+"VAR_HARDEN_LARGE_QUERIES","VAR_FORWARD_ZONE","VAR_FORWARD_HOST",
+"VAR_FORWARD_ADDR","VAR_DO_NOT_QUERY_ADDRESS","VAR_HIDE_IDENTITY",
+"VAR_HIDE_VERSION","VAR_IDENTITY","VAR_VERSION","VAR_HARDEN_GLUE",
+"VAR_MODULE_CONF","VAR_TRUST_ANCHOR_FILE","VAR_TRUST_ANCHOR",
+"VAR_VAL_OVERRIDE_DATE","VAR_BOGUS_TTL","VAR_VAL_CLEAN_ADDITIONAL",
+"VAR_VAL_PERMISSIVE_MODE","VAR_INCOMING_NUM_TCP","VAR_MSG_BUFFER_SIZE",
+"VAR_KEY_CACHE_SIZE","VAR_KEY_CACHE_SLABS","VAR_TRUSTED_KEYS_FILE",
+"VAR_VAL_NSEC3_KEYSIZE_ITERATIONS","VAR_USE_SYSLOG","VAR_OUTGOING_INTERFACE",
+"VAR_ROOT_HINTS","VAR_DO_NOT_QUERY_LOCALHOST","VAR_CACHE_MAX_TTL",
+"VAR_HARDEN_DNSSEC_STRIPPED","VAR_ACCESS_CONTROL","VAR_LOCAL_ZONE",
+"VAR_LOCAL_DATA","VAR_INTERFACE_AUTOMATIC","VAR_STATISTICS_INTERVAL",
+"VAR_DO_DAEMONIZE","VAR_USE_CAPS_FOR_ID","VAR_STATISTICS_CUMULATIVE",
+"VAR_OUTGOING_PORT_PERMIT","VAR_OUTGOING_PORT_AVOID","VAR_DLV_ANCHOR_FILE",
+"VAR_DLV_ANCHOR","VAR_NEG_CACHE_SIZE","VAR_HARDEN_REFERRAL_PATH",
+"VAR_PRIVATE_ADDRESS","VAR_PRIVATE_DOMAIN","VAR_REMOTE_CONTROL",
+"VAR_CONTROL_ENABLE","VAR_CONTROL_INTERFACE","VAR_CONTROL_PORT",
+"VAR_SERVER_KEY_FILE","VAR_SERVER_CERT_FILE","VAR_CONTROL_KEY_FILE",
+"VAR_CONTROL_CERT_FILE","VAR_CONTROL_USE_CERT","VAR_EXTENDED_STATISTICS",
+"VAR_LOCAL_DATA_PTR","VAR_JOSTLE_TIMEOUT","VAR_STUB_PRIME",
+"VAR_UNWANTED_REPLY_THRESHOLD","VAR_LOG_TIME_ASCII","VAR_DOMAIN_INSECURE",
+"VAR_PYTHON","VAR_PYTHON_SCRIPT","VAR_VAL_SIG_SKEW_MIN","VAR_VAL_SIG_SKEW_MAX",
+"VAR_CACHE_MIN_TTL","VAR_VAL_LOG_LEVEL","VAR_AUTO_TRUST_ANCHOR_FILE",
+"VAR_KEEP_MISSING","VAR_ADD_HOLDDOWN","VAR_DEL_HOLDDOWN","VAR_SO_RCVBUF",
+"VAR_EDNS_BUFFER_SIZE","VAR_PREFETCH","VAR_PREFETCH_KEY","VAR_SO_SNDBUF",
+"VAR_SO_REUSEPORT","VAR_HARDEN_BELOW_NXDOMAIN","VAR_IGNORE_CD_FLAG",
+"VAR_LOG_QUERIES","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_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES",
+"VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES",
+"VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES",
+"VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES",
+"VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES",
+"VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES","VAR_RESPONSE_IP_TAG",
+"VAR_RESPONSE_IP","VAR_RESPONSE_IP_DATA","VAR_HARDEN_ALGO_DOWNGRADE",
+"VAR_IP_TRANSPARENT","VAR_IP_DSCP","VAR_DISABLE_DNSSEC_LAME_CHECK",
+"VAR_IP_RATELIMIT","VAR_IP_RATELIMIT_SLABS","VAR_IP_RATELIMIT_SIZE",
+"VAR_RATELIMIT","VAR_RATELIMIT_SLABS","VAR_RATELIMIT_SIZE",
+"VAR_RATELIMIT_FOR_DOMAIN","VAR_RATELIMIT_BELOW_DOMAIN",
+"VAR_IP_RATELIMIT_FACTOR","VAR_RATELIMIT_FACTOR","VAR_SEND_CLIENT_SUBNET",
+"VAR_CLIENT_SUBNET_ZONE","VAR_CLIENT_SUBNET_ALWAYS_FORWARD",
+"VAR_CLIENT_SUBNET_OPCODE","VAR_MAX_CLIENT_SUBNET_IPV4",
+"VAR_MAX_CLIENT_SUBNET_IPV6","VAR_MIN_CLIENT_SUBNET_IPV4",
+"VAR_MIN_CLIENT_SUBNET_IPV6","VAR_MAX_ECS_TREE_SIZE_IPV4",
+"VAR_MAX_ECS_TREE_SIZE_IPV6","VAR_CAPS_WHITELIST","VAR_CACHE_MAX_NEGATIVE_TTL",
+"VAR_PERMIT_SMALL_HOLDDOWN","VAR_QNAME_MINIMISATION",
+"VAR_QNAME_MINIMISATION_STRICT","VAR_IP_FREEBIND","VAR_DEFINE_TAG",
+"VAR_LOCAL_ZONE_TAG","VAR_ACCESS_CONTROL_TAG","VAR_LOCAL_ZONE_OVERRIDE",
+"VAR_ACCESS_CONTROL_TAG_ACTION","VAR_ACCESS_CONTROL_TAG_DATA","VAR_VIEW",
+"VAR_ACCESS_CONTROL_VIEW","VAR_VIEW_FIRST","VAR_SERVE_EXPIRED",
+"VAR_SERVE_EXPIRED_TTL","VAR_SERVE_EXPIRED_TTL_RESET",
+"VAR_SERVE_EXPIRED_REPLY_TTL","VAR_SERVE_EXPIRED_CLIENT_TIMEOUT","VAR_FAKE_DSA",
+"VAR_FAKE_SHA1","VAR_LOG_IDENTITY","VAR_HIDE_TRUSTANCHOR",
+"VAR_TRUST_ANCHOR_SIGNALING","VAR_AGGRESSIVE_NSEC","VAR_USE_SYSTEMD",
+"VAR_SHM_ENABLE","VAR_SHM_KEY","VAR_ROOT_KEY_SENTINEL","VAR_DNSCRYPT",
+"VAR_DNSCRYPT_ENABLE","VAR_DNSCRYPT_PORT","VAR_DNSCRYPT_PROVIDER",
+"VAR_DNSCRYPT_SECRET_KEY","VAR_DNSCRYPT_PROVIDER_CERT",
+"VAR_DNSCRYPT_PROVIDER_CERT_ROTATED","VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE",
+"VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS","VAR_DNSCRYPT_NONCE_CACHE_SIZE",
+"VAR_DNSCRYPT_NONCE_CACHE_SLABS","VAR_PAD_RESPONSES",
+"VAR_PAD_RESPONSES_BLOCK_SIZE","VAR_PAD_QUERIES","VAR_PAD_QUERIES_BLOCK_SIZE",
+"VAR_IPSECMOD_ENABLED","VAR_IPSECMOD_HOOK","VAR_IPSECMOD_IGNORE_BOGUS",
+"VAR_IPSECMOD_MAX_TTL","VAR_IPSECMOD_WHITELIST","VAR_IPSECMOD_STRICT",
+"VAR_CACHEDB","VAR_CACHEDB_BACKEND","VAR_CACHEDB_SECRETSEED",
+"VAR_CACHEDB_REDISHOST","VAR_CACHEDB_REDISPORT","VAR_CACHEDB_REDISTIMEOUT",
+"VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM","VAR_FOR_UPSTREAM","VAR_AUTH_ZONE",
+"VAR_ZONEFILE","VAR_MASTER","VAR_URL","VAR_FOR_DOWNSTREAM",
+"VAR_FALLBACK_ENABLED","VAR_TLS_ADDITIONAL_PORT","VAR_LOW_RTT",
+"VAR_LOW_RTT_PERMIL","VAR_FAST_SERVER_PERMIL","VAR_FAST_SERVER_NUM",
+"VAR_ALLOW_NOTIFY","VAR_TLS_WIN_CERT","VAR_TCP_CONNECTION_LIMIT",
+"VAR_FORWARD_NO_CACHE","VAR_STUB_NO_CACHE","VAR_LOG_SERVFAIL","VAR_DENY_ANY",
+"VAR_UNKNOWN_SERVER_TIME_LIMIT","VAR_LOG_TAG_QUERYREPLY","VAR_STREAM_WAIT_SIZE",
+"VAR_TLS_CIPHERS","VAR_TLS_CIPHERSUITES","VAR_IPSET","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",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,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,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,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,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,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,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,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,0,"illegal-symbol",
+};
+static const char *const yyrule[] = {
+"$accept : toplevelvars",
+"toplevelvars :",
+"toplevelvars : toplevelvars toplevelvar",
+"toplevelvar : serverstart contents_server",
+"toplevelvar : stubstart contents_stub",
+"toplevelvar : forwardstart contents_forward",
+"toplevelvar : pythonstart contents_py",
+"toplevelvar : rcstart contents_rc",
+"toplevelvar : dtstart contents_dt",
+"toplevelvar : viewstart contents_view",
+"toplevelvar : dnscstart contents_dnsc",
+"toplevelvar : cachedbstart contents_cachedb",
+"toplevelvar : ipsetstart contents_ipset",
+"toplevelvar : authstart contents_auth",
+"toplevelvar : rpzstart contents_rpz",
+"serverstart : VAR_SERVER",
+"contents_server : contents_server content_server",
+"contents_server :",
+"content_server : server_num_threads",
+"content_server : server_verbosity",
+"content_server : server_port",
+"content_server : server_outgoing_range",
+"content_server : server_do_ip4",
+"content_server : server_do_ip6",
+"content_server : server_prefer_ip4",
+"content_server : server_prefer_ip6",
+"content_server : server_do_udp",
+"content_server : server_do_tcp",
+"content_server : server_tcp_mss",
+"content_server : server_outgoing_tcp_mss",
+"content_server : server_tcp_idle_timeout",
+"content_server : server_tcp_keepalive",
+"content_server : server_tcp_keepalive_timeout",
+"content_server : server_interface",
+"content_server : server_chroot",
+"content_server : server_username",
+"content_server : server_directory",
+"content_server : server_logfile",
+"content_server : server_pidfile",
+"content_server : server_msg_cache_size",
+"content_server : server_msg_cache_slabs",
+"content_server : server_num_queries_per_thread",
+"content_server : server_rrset_cache_size",
+"content_server : server_rrset_cache_slabs",
+"content_server : server_outgoing_num_tcp",
+"content_server : server_infra_host_ttl",
+"content_server : server_infra_lame_ttl",
+"content_server : server_infra_cache_slabs",
+"content_server : server_infra_cache_numhosts",
+"content_server : server_infra_cache_lame_size",
+"content_server : server_target_fetch_policy",
+"content_server : server_harden_short_bufsize",
+"content_server : server_harden_large_queries",
+"content_server : server_do_not_query_address",
+"content_server : server_hide_identity",
+"content_server : server_hide_version",
+"content_server : server_identity",
+"content_server : server_version",
+"content_server : server_harden_glue",
+"content_server : server_module_conf",
+"content_server : server_trust_anchor_file",
+"content_server : server_trust_anchor",
+"content_server : server_val_override_date",
+"content_server : server_bogus_ttl",
+"content_server : server_val_clean_additional",
+"content_server : server_val_permissive_mode",
+"content_server : server_incoming_num_tcp",
+"content_server : server_msg_buffer_size",
+"content_server : server_key_cache_size",
+"content_server : server_key_cache_slabs",
+"content_server : server_trusted_keys_file",
+"content_server : server_val_nsec3_keysize_iterations",
+"content_server : server_use_syslog",
+"content_server : server_outgoing_interface",
+"content_server : server_root_hints",
+"content_server : server_do_not_query_localhost",
+"content_server : server_cache_max_ttl",
+"content_server : server_harden_dnssec_stripped",
+"content_server : server_access_control",
+"content_server : server_local_zone",
+"content_server : server_local_data",
+"content_server : server_interface_automatic",
+"content_server : server_statistics_interval",
+"content_server : server_do_daemonize",
+"content_server : server_use_caps_for_id",
+"content_server : server_statistics_cumulative",
+"content_server : server_outgoing_port_permit",
+"content_server : server_outgoing_port_avoid",
+"content_server : server_dlv_anchor_file",
+"content_server : server_dlv_anchor",
+"content_server : server_neg_cache_size",
+"content_server : server_harden_referral_path",
+"content_server : server_private_address",
+"content_server : server_private_domain",
+"content_server : server_extended_statistics",
+"content_server : server_local_data_ptr",
+"content_server : server_jostle_timeout",
+"content_server : server_unwanted_reply_threshold",
+"content_server : server_log_time_ascii",
+"content_server : server_domain_insecure",
+"content_server : server_val_sig_skew_min",
+"content_server : server_val_sig_skew_max",
+"content_server : server_cache_min_ttl",
+"content_server : server_val_log_level",
+"content_server : server_auto_trust_anchor_file",
+"content_server : server_add_holddown",
+"content_server : server_del_holddown",
+"content_server : server_keep_missing",
+"content_server : server_so_rcvbuf",
+"content_server : server_edns_buffer_size",
+"content_server : server_prefetch",
+"content_server : server_prefetch_key",
+"content_server : server_so_sndbuf",
+"content_server : server_harden_below_nxdomain",
+"content_server : server_ignore_cd_flag",
+"content_server : server_log_queries",
+"content_server : server_log_replies",
+"content_server : server_tcp_upstream",
+"content_server : server_ssl_upstream",
+"content_server : server_log_local_actions",
+"content_server : server_ssl_service_key",
+"content_server : server_ssl_service_pem",
+"content_server : server_ssl_port",
+"content_server : server_minimal_responses",
+"content_server : server_rrset_roundrobin",
+"content_server : server_max_udp_size",
+"content_server : server_so_reuseport",
+"content_server : server_delay_close",
+"content_server : server_unblock_lan_zones",
+"content_server : server_insecure_lan_zones",
+"content_server : server_dns64_prefix",
+"content_server : server_dns64_synthall",
+"content_server : server_dns64_ignore_aaaa",
+"content_server : server_infra_cache_min_rtt",
+"content_server : server_harden_algo_downgrade",
+"content_server : server_ip_transparent",
+"content_server : server_ip_ratelimit",
+"content_server : server_ratelimit",
+"content_server : server_ip_dscp",
+"content_server : server_ip_ratelimit_slabs",
+"content_server : server_ratelimit_slabs",
+"content_server : server_ip_ratelimit_size",
+"content_server : server_ratelimit_size",
+"content_server : server_ratelimit_for_domain",
+"content_server : server_ratelimit_below_domain",
+"content_server : server_ratelimit_factor",
+"content_server : server_ip_ratelimit_factor",
+"content_server : server_send_client_subnet",
+"content_server : server_client_subnet_zone",
+"content_server : server_client_subnet_always_forward",
+"content_server : server_client_subnet_opcode",
+"content_server : server_max_client_subnet_ipv4",
+"content_server : server_max_client_subnet_ipv6",
+"content_server : server_min_client_subnet_ipv4",
+"content_server : server_min_client_subnet_ipv6",
+"content_server : server_max_ecs_tree_size_ipv4",
+"content_server : server_max_ecs_tree_size_ipv6",
+"content_server : server_caps_whitelist",
+"content_server : server_cache_max_negative_ttl",
+"content_server : server_permit_small_holddown",
+"content_server : server_qname_minimisation",
+"content_server : server_ip_freebind",
+"content_server : server_define_tag",
+"content_server : server_local_zone_tag",
+"content_server : server_disable_dnssec_lame_check",
+"content_server : server_access_control_tag",
+"content_server : server_local_zone_override",
+"content_server : server_access_control_tag_action",
+"content_server : server_access_control_tag_data",
+"content_server : server_access_control_view",
+"content_server : server_qname_minimisation_strict",
+"content_server : server_serve_expired",
+"content_server : server_serve_expired_ttl",
+"content_server : server_serve_expired_ttl_reset",
+"content_server : server_serve_expired_reply_ttl",
+"content_server : server_serve_expired_client_timeout",
+"content_server : server_fake_dsa",
+"content_server : server_log_identity",
+"content_server : server_use_systemd",
+"content_server : server_response_ip_tag",
+"content_server : server_response_ip",
+"content_server : server_response_ip_data",
+"content_server : server_shm_enable",
+"content_server : server_shm_key",
+"content_server : server_fake_sha1",
+"content_server : server_hide_trustanchor",
+"content_server : server_trust_anchor_signaling",
+"content_server : server_root_key_sentinel",
+"content_server : server_ipsecmod_enabled",
+"content_server : server_ipsecmod_hook",
+"content_server : server_ipsecmod_ignore_bogus",
+"content_server : server_ipsecmod_max_ttl",
+"content_server : server_ipsecmod_whitelist",
+"content_server : server_ipsecmod_strict",
+"content_server : server_udp_upstream_without_downstream",
+"content_server : server_aggressive_nsec",
+"content_server : server_tls_cert_bundle",
+"content_server : server_tls_additional_port",
+"content_server : server_low_rtt",
+"content_server : server_fast_server_permil",
+"content_server : server_fast_server_num",
+"content_server : server_tls_win_cert",
+"content_server : server_tcp_connection_limit",
+"content_server : server_log_servfail",
+"content_server : server_deny_any",
+"content_server : server_unknown_server_time_limit",
+"content_server : server_log_tag_queryreply",
+"content_server : server_stream_wait_size",
+"content_server : server_tls_ciphers",
+"content_server : server_tls_ciphersuites",
+"content_server : server_tls_session_ticket_keys",
+"stubstart : VAR_STUB_ZONE",
+"contents_stub : contents_stub content_stub",
+"contents_stub :",
+"content_stub : stub_name",
+"content_stub : stub_host",
+"content_stub : stub_addr",
+"content_stub : stub_prime",
+"content_stub : stub_first",
+"content_stub : stub_no_cache",
+"content_stub : stub_ssl_upstream",
+"forwardstart : VAR_FORWARD_ZONE",
+"contents_forward : contents_forward content_forward",
+"contents_forward :",
+"content_forward : forward_name",
+"content_forward : forward_host",
+"content_forward : forward_addr",
+"content_forward : forward_first",
+"content_forward : forward_no_cache",
+"content_forward : forward_ssl_upstream",
+"viewstart : VAR_VIEW",
+"contents_view : contents_view content_view",
+"contents_view :",
+"content_view : view_name",
+"content_view : view_local_zone",
+"content_view : view_local_data",
+"content_view : view_first",
+"content_view : view_response_ip",
+"content_view : view_response_ip_data",
+"content_view : view_local_data_ptr",
+"authstart : VAR_AUTH_ZONE",
+"contents_auth : contents_auth content_auth",
+"contents_auth :",
+"content_auth : auth_name",
+"content_auth : auth_zonefile",
+"content_auth : auth_master",
+"content_auth : auth_url",
+"content_auth : auth_for_downstream",
+"content_auth : auth_for_upstream",
+"content_auth : auth_fallback_enabled",
+"content_auth : auth_allow_notify",
+"rpz_tag : VAR_TAGS STRING_ARG",
+"rpz_action_override : VAR_RPZ_ACTION_OVERRIDE STRING_ARG",
+"rpz_cname_override : VAR_RPZ_CNAME_OVERRIDE STRING_ARG",
+"rpz_log : VAR_RPZ_LOG STRING_ARG",
+"rpz_log_name : VAR_RPZ_LOG_NAME STRING_ARG",
+"rpzstart : VAR_RPZ",
+"contents_rpz : contents_rpz content_rpz",
+"contents_rpz :",
+"content_rpz : auth_name",
+"content_rpz : auth_zonefile",
+"content_rpz : rpz_tag",
+"content_rpz : auth_master",
+"content_rpz : auth_url",
+"content_rpz : auth_allow_notify",
+"content_rpz : rpz_action_override",
+"content_rpz : rpz_cname_override",
+"content_rpz : rpz_log",
+"content_rpz : rpz_log_name",
+"server_num_threads : VAR_NUM_THREADS STRING_ARG",
+"server_verbosity : VAR_VERBOSITY STRING_ARG",
+"server_statistics_interval : VAR_STATISTICS_INTERVAL STRING_ARG",
+"server_statistics_cumulative : VAR_STATISTICS_CUMULATIVE STRING_ARG",
+"server_extended_statistics : VAR_EXTENDED_STATISTICS STRING_ARG",
+"server_shm_enable : VAR_SHM_ENABLE STRING_ARG",
+"server_shm_key : VAR_SHM_KEY STRING_ARG",
+"server_port : VAR_PORT STRING_ARG",
+"server_send_client_subnet : VAR_SEND_CLIENT_SUBNET STRING_ARG",
+"server_client_subnet_zone : VAR_CLIENT_SUBNET_ZONE STRING_ARG",
+"server_client_subnet_always_forward : VAR_CLIENT_SUBNET_ALWAYS_FORWARD STRING_ARG",
+"server_client_subnet_opcode : VAR_CLIENT_SUBNET_OPCODE STRING_ARG",
+"server_max_client_subnet_ipv4 : VAR_MAX_CLIENT_SUBNET_IPV4 STRING_ARG",
+"server_max_client_subnet_ipv6 : VAR_MAX_CLIENT_SUBNET_IPV6 STRING_ARG",
+"server_min_client_subnet_ipv4 : VAR_MIN_CLIENT_SUBNET_IPV4 STRING_ARG",
+"server_min_client_subnet_ipv6 : VAR_MIN_CLIENT_SUBNET_IPV6 STRING_ARG",
+"server_max_ecs_tree_size_ipv4 : VAR_MAX_ECS_TREE_SIZE_IPV4 STRING_ARG",
+"server_max_ecs_tree_size_ipv6 : VAR_MAX_ECS_TREE_SIZE_IPV6 STRING_ARG",
+"server_interface : VAR_INTERFACE STRING_ARG",
+"server_outgoing_interface : VAR_OUTGOING_INTERFACE STRING_ARG",
+"server_outgoing_range : VAR_OUTGOING_RANGE STRING_ARG",
+"server_outgoing_port_permit : VAR_OUTGOING_PORT_PERMIT STRING_ARG",
+"server_outgoing_port_avoid : VAR_OUTGOING_PORT_AVOID STRING_ARG",
+"server_outgoing_num_tcp : VAR_OUTGOING_NUM_TCP STRING_ARG",
+"server_incoming_num_tcp : VAR_INCOMING_NUM_TCP STRING_ARG",
+"server_interface_automatic : VAR_INTERFACE_AUTOMATIC STRING_ARG",
+"server_do_ip4 : VAR_DO_IP4 STRING_ARG",
+"server_do_ip6 : VAR_DO_IP6 STRING_ARG",
+"server_do_udp : VAR_DO_UDP STRING_ARG",
+"server_do_tcp : VAR_DO_TCP STRING_ARG",
+"server_prefer_ip4 : VAR_PREFER_IP4 STRING_ARG",
+"server_prefer_ip6 : VAR_PREFER_IP6 STRING_ARG",
+"server_tcp_mss : VAR_TCP_MSS STRING_ARG",
+"server_outgoing_tcp_mss : VAR_OUTGOING_TCP_MSS STRING_ARG",
+"server_tcp_idle_timeout : VAR_TCP_IDLE_TIMEOUT STRING_ARG",
+"server_tcp_keepalive : VAR_EDNS_TCP_KEEPALIVE STRING_ARG",
+"server_tcp_keepalive_timeout : VAR_EDNS_TCP_KEEPALIVE_TIMEOUT STRING_ARG",
+"server_tcp_upstream : VAR_TCP_UPSTREAM STRING_ARG",
+"server_udp_upstream_without_downstream : VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM STRING_ARG",
+"server_ssl_upstream : VAR_SSL_UPSTREAM STRING_ARG",
+"server_ssl_service_key : VAR_SSL_SERVICE_KEY STRING_ARG",
+"server_ssl_service_pem : VAR_SSL_SERVICE_PEM STRING_ARG",
+"server_ssl_port : VAR_SSL_PORT STRING_ARG",
+"server_tls_cert_bundle : VAR_TLS_CERT_BUNDLE STRING_ARG",
+"server_tls_win_cert : VAR_TLS_WIN_CERT STRING_ARG",
+"server_tls_additional_port : VAR_TLS_ADDITIONAL_PORT STRING_ARG",
+"server_tls_ciphers : VAR_TLS_CIPHERS STRING_ARG",
+"server_tls_ciphersuites : VAR_TLS_CIPHERSUITES STRING_ARG",
+"server_tls_session_ticket_keys : VAR_TLS_SESSION_TICKET_KEYS STRING_ARG",
+"server_use_systemd : VAR_USE_SYSTEMD STRING_ARG",
+"server_do_daemonize : VAR_DO_DAEMONIZE STRING_ARG",
+"server_use_syslog : VAR_USE_SYSLOG STRING_ARG",
+"server_log_time_ascii : VAR_LOG_TIME_ASCII STRING_ARG",
+"server_log_queries : VAR_LOG_QUERIES STRING_ARG",
+"server_log_replies : VAR_LOG_REPLIES STRING_ARG",
+"server_log_tag_queryreply : VAR_LOG_TAG_QUERYREPLY STRING_ARG",
+"server_log_servfail : VAR_LOG_SERVFAIL STRING_ARG",
+"server_log_local_actions : VAR_LOG_LOCAL_ACTIONS STRING_ARG",
+"server_chroot : VAR_CHROOT STRING_ARG",
+"server_username : VAR_USERNAME STRING_ARG",
+"server_directory : VAR_DIRECTORY STRING_ARG",
+"server_logfile : VAR_LOGFILE STRING_ARG",
+"server_pidfile : VAR_PIDFILE STRING_ARG",
+"server_root_hints : VAR_ROOT_HINTS STRING_ARG",
+"server_dlv_anchor_file : VAR_DLV_ANCHOR_FILE STRING_ARG",
+"server_dlv_anchor : VAR_DLV_ANCHOR STRING_ARG",
+"server_auto_trust_anchor_file : VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG",
+"server_trust_anchor_file : VAR_TRUST_ANCHOR_FILE STRING_ARG",
+"server_trusted_keys_file : VAR_TRUSTED_KEYS_FILE STRING_ARG",
+"server_trust_anchor : VAR_TRUST_ANCHOR STRING_ARG",
+"server_trust_anchor_signaling : VAR_TRUST_ANCHOR_SIGNALING STRING_ARG",
+"server_root_key_sentinel : VAR_ROOT_KEY_SENTINEL STRING_ARG",
+"server_domain_insecure : VAR_DOMAIN_INSECURE STRING_ARG",
+"server_hide_identity : VAR_HIDE_IDENTITY STRING_ARG",
+"server_hide_version : VAR_HIDE_VERSION STRING_ARG",
+"server_hide_trustanchor : VAR_HIDE_TRUSTANCHOR STRING_ARG",
+"server_identity : VAR_IDENTITY STRING_ARG",
+"server_version : VAR_VERSION STRING_ARG",
+"server_so_rcvbuf : VAR_SO_RCVBUF STRING_ARG",
+"server_so_sndbuf : VAR_SO_SNDBUF STRING_ARG",
+"server_so_reuseport : VAR_SO_REUSEPORT STRING_ARG",
+"server_ip_transparent : VAR_IP_TRANSPARENT STRING_ARG",
+"server_ip_freebind : VAR_IP_FREEBIND STRING_ARG",
+"server_ip_dscp : VAR_IP_DSCP STRING_ARG",
+"server_stream_wait_size : VAR_STREAM_WAIT_SIZE STRING_ARG",
+"server_edns_buffer_size : VAR_EDNS_BUFFER_SIZE STRING_ARG",
+"server_msg_buffer_size : VAR_MSG_BUFFER_SIZE STRING_ARG",
+"server_msg_cache_size : VAR_MSG_CACHE_SIZE STRING_ARG",
+"server_msg_cache_slabs : VAR_MSG_CACHE_SLABS STRING_ARG",
+"server_num_queries_per_thread : VAR_NUM_QUERIES_PER_THREAD STRING_ARG",
+"server_jostle_timeout : VAR_JOSTLE_TIMEOUT STRING_ARG",
+"server_delay_close : VAR_DELAY_CLOSE STRING_ARG",
+"server_unblock_lan_zones : VAR_UNBLOCK_LAN_ZONES STRING_ARG",
+"server_insecure_lan_zones : VAR_INSECURE_LAN_ZONES STRING_ARG",
+"server_rrset_cache_size : VAR_RRSET_CACHE_SIZE STRING_ARG",
+"server_rrset_cache_slabs : VAR_RRSET_CACHE_SLABS STRING_ARG",
+"server_infra_host_ttl : VAR_INFRA_HOST_TTL STRING_ARG",
+"server_infra_lame_ttl : VAR_INFRA_LAME_TTL STRING_ARG",
+"server_infra_cache_numhosts : VAR_INFRA_CACHE_NUMHOSTS STRING_ARG",
+"server_infra_cache_lame_size : VAR_INFRA_CACHE_LAME_SIZE STRING_ARG",
+"server_infra_cache_slabs : VAR_INFRA_CACHE_SLABS STRING_ARG",
+"server_infra_cache_min_rtt : VAR_INFRA_CACHE_MIN_RTT STRING_ARG",
+"server_target_fetch_policy : VAR_TARGET_FETCH_POLICY STRING_ARG",
+"server_harden_short_bufsize : VAR_HARDEN_SHORT_BUFSIZE STRING_ARG",
+"server_harden_large_queries : VAR_HARDEN_LARGE_QUERIES STRING_ARG",
+"server_harden_glue : VAR_HARDEN_GLUE STRING_ARG",
+"server_harden_dnssec_stripped : VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG",
+"server_harden_below_nxdomain : VAR_HARDEN_BELOW_NXDOMAIN STRING_ARG",
+"server_harden_referral_path : VAR_HARDEN_REFERRAL_PATH STRING_ARG",
+"server_harden_algo_downgrade : VAR_HARDEN_ALGO_DOWNGRADE STRING_ARG",
+"server_use_caps_for_id : VAR_USE_CAPS_FOR_ID STRING_ARG",
+"server_caps_whitelist : VAR_CAPS_WHITELIST STRING_ARG",
+"server_private_address : VAR_PRIVATE_ADDRESS STRING_ARG",
+"server_private_domain : VAR_PRIVATE_DOMAIN STRING_ARG",
+"server_prefetch : VAR_PREFETCH STRING_ARG",
+"server_prefetch_key : VAR_PREFETCH_KEY STRING_ARG",
+"server_deny_any : VAR_DENY_ANY STRING_ARG",
+"server_unwanted_reply_threshold : VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG",
+"server_do_not_query_address : VAR_DO_NOT_QUERY_ADDRESS STRING_ARG",
+"server_do_not_query_localhost : VAR_DO_NOT_QUERY_LOCALHOST STRING_ARG",
+"server_access_control : VAR_ACCESS_CONTROL STRING_ARG STRING_ARG",
+"server_module_conf : VAR_MODULE_CONF STRING_ARG",
+"server_val_override_date : VAR_VAL_OVERRIDE_DATE STRING_ARG",
+"server_val_sig_skew_min : VAR_VAL_SIG_SKEW_MIN STRING_ARG",
+"server_val_sig_skew_max : VAR_VAL_SIG_SKEW_MAX STRING_ARG",
+"server_cache_max_ttl : VAR_CACHE_MAX_TTL STRING_ARG",
+"server_cache_max_negative_ttl : VAR_CACHE_MAX_NEGATIVE_TTL STRING_ARG",
+"server_cache_min_ttl : VAR_CACHE_MIN_TTL STRING_ARG",
+"server_bogus_ttl : VAR_BOGUS_TTL STRING_ARG",
+"server_val_clean_additional : VAR_VAL_CLEAN_ADDITIONAL STRING_ARG",
+"server_val_permissive_mode : VAR_VAL_PERMISSIVE_MODE STRING_ARG",
+"server_aggressive_nsec : VAR_AGGRESSIVE_NSEC STRING_ARG",
+"server_ignore_cd_flag : VAR_IGNORE_CD_FLAG STRING_ARG",
+"server_serve_expired : VAR_SERVE_EXPIRED STRING_ARG",
+"server_serve_expired_ttl : VAR_SERVE_EXPIRED_TTL STRING_ARG",
+"server_serve_expired_ttl_reset : VAR_SERVE_EXPIRED_TTL_RESET STRING_ARG",
+"server_serve_expired_reply_ttl : VAR_SERVE_EXPIRED_REPLY_TTL STRING_ARG",
+"server_serve_expired_client_timeout : VAR_SERVE_EXPIRED_CLIENT_TIMEOUT STRING_ARG",
+"server_fake_dsa : VAR_FAKE_DSA STRING_ARG",
+"server_fake_sha1 : VAR_FAKE_SHA1 STRING_ARG",
+"server_val_log_level : VAR_VAL_LOG_LEVEL STRING_ARG",
+"server_val_nsec3_keysize_iterations : VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG",
+"server_add_holddown : VAR_ADD_HOLDDOWN STRING_ARG",
+"server_del_holddown : VAR_DEL_HOLDDOWN STRING_ARG",
+"server_keep_missing : VAR_KEEP_MISSING STRING_ARG",
+"server_permit_small_holddown : VAR_PERMIT_SMALL_HOLDDOWN STRING_ARG",
+"server_key_cache_size : VAR_KEY_CACHE_SIZE STRING_ARG",
+"server_key_cache_slabs : VAR_KEY_CACHE_SLABS STRING_ARG",
+"server_neg_cache_size : VAR_NEG_CACHE_SIZE STRING_ARG",
+"server_local_zone : VAR_LOCAL_ZONE STRING_ARG STRING_ARG",
+"server_local_data : VAR_LOCAL_DATA STRING_ARG",
+"server_local_data_ptr : VAR_LOCAL_DATA_PTR STRING_ARG",
+"server_minimal_responses : VAR_MINIMAL_RESPONSES STRING_ARG",
+"server_rrset_roundrobin : VAR_RRSET_ROUNDROBIN STRING_ARG",
+"server_unknown_server_time_limit : VAR_UNKNOWN_SERVER_TIME_LIMIT STRING_ARG",
+"server_max_udp_size : VAR_MAX_UDP_SIZE STRING_ARG",
+"server_dns64_prefix : VAR_DNS64_PREFIX STRING_ARG",
+"server_dns64_synthall : VAR_DNS64_SYNTHALL STRING_ARG",
+"server_dns64_ignore_aaaa : VAR_DNS64_IGNORE_AAAA STRING_ARG",
+"server_define_tag : VAR_DEFINE_TAG STRING_ARG",
+"server_local_zone_tag : VAR_LOCAL_ZONE_TAG STRING_ARG STRING_ARG",
+"server_access_control_tag : VAR_ACCESS_CONTROL_TAG STRING_ARG STRING_ARG",
+"server_access_control_tag_action : VAR_ACCESS_CONTROL_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG",
+"server_access_control_tag_data : VAR_ACCESS_CONTROL_TAG_DATA STRING_ARG STRING_ARG STRING_ARG",
+"server_local_zone_override : VAR_LOCAL_ZONE_OVERRIDE STRING_ARG STRING_ARG STRING_ARG",
+"server_access_control_view : VAR_ACCESS_CONTROL_VIEW STRING_ARG STRING_ARG",
+"server_response_ip_tag : VAR_RESPONSE_IP_TAG STRING_ARG STRING_ARG",
+"server_ip_ratelimit : VAR_IP_RATELIMIT STRING_ARG",
+"server_ratelimit : VAR_RATELIMIT STRING_ARG",
+"server_ip_ratelimit_size : VAR_IP_RATELIMIT_SIZE STRING_ARG",
+"server_ratelimit_size : VAR_RATELIMIT_SIZE STRING_ARG",
+"server_ip_ratelimit_slabs : VAR_IP_RATELIMIT_SLABS STRING_ARG",
+"server_ratelimit_slabs : VAR_RATELIMIT_SLABS STRING_ARG",
+"server_ratelimit_for_domain : VAR_RATELIMIT_FOR_DOMAIN STRING_ARG STRING_ARG",
+"server_ratelimit_below_domain : VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG",
+"server_ip_ratelimit_factor : VAR_IP_RATELIMIT_FACTOR STRING_ARG",
+"server_ratelimit_factor : VAR_RATELIMIT_FACTOR STRING_ARG",
+"server_low_rtt : VAR_LOW_RTT STRING_ARG",
+"server_fast_server_num : VAR_FAST_SERVER_NUM STRING_ARG",
+"server_fast_server_permil : VAR_FAST_SERVER_PERMIL STRING_ARG",
+"server_qname_minimisation : VAR_QNAME_MINIMISATION STRING_ARG",
+"server_qname_minimisation_strict : VAR_QNAME_MINIMISATION_STRICT STRING_ARG",
+"server_pad_responses : VAR_PAD_RESPONSES STRING_ARG",
+"server_pad_responses_block_size : VAR_PAD_RESPONSES_BLOCK_SIZE STRING_ARG",
+"server_pad_queries : VAR_PAD_QUERIES STRING_ARG",
+"server_pad_queries_block_size : VAR_PAD_QUERIES_BLOCK_SIZE STRING_ARG",
+"server_ipsecmod_enabled : VAR_IPSECMOD_ENABLED STRING_ARG",
+"server_ipsecmod_ignore_bogus : VAR_IPSECMOD_IGNORE_BOGUS STRING_ARG",
+"server_ipsecmod_hook : VAR_IPSECMOD_HOOK STRING_ARG",
+"server_ipsecmod_max_ttl : VAR_IPSECMOD_MAX_TTL STRING_ARG",
+"server_ipsecmod_whitelist : VAR_IPSECMOD_WHITELIST STRING_ARG",
+"server_ipsecmod_strict : VAR_IPSECMOD_STRICT STRING_ARG",
+"stub_name : VAR_NAME STRING_ARG",
+"stub_host : VAR_STUB_HOST STRING_ARG",
+"stub_addr : VAR_STUB_ADDR STRING_ARG",
+"stub_first : VAR_STUB_FIRST STRING_ARG",
+"stub_no_cache : VAR_STUB_NO_CACHE STRING_ARG",
+"stub_ssl_upstream : VAR_STUB_SSL_UPSTREAM STRING_ARG",
+"stub_prime : VAR_STUB_PRIME STRING_ARG",
+"forward_name : VAR_NAME STRING_ARG",
+"forward_host : VAR_FORWARD_HOST STRING_ARG",
+"forward_addr : VAR_FORWARD_ADDR STRING_ARG",
+"forward_first : VAR_FORWARD_FIRST STRING_ARG",
+"forward_no_cache : VAR_FORWARD_NO_CACHE STRING_ARG",
+"forward_ssl_upstream : VAR_FORWARD_SSL_UPSTREAM STRING_ARG",
+"auth_name : VAR_NAME STRING_ARG",
+"auth_zonefile : VAR_ZONEFILE STRING_ARG",
+"auth_master : VAR_MASTER STRING_ARG",
+"auth_url : VAR_URL STRING_ARG",
+"auth_allow_notify : VAR_ALLOW_NOTIFY STRING_ARG",
+"auth_for_downstream : VAR_FOR_DOWNSTREAM STRING_ARG",
+"auth_for_upstream : VAR_FOR_UPSTREAM STRING_ARG",
+"auth_fallback_enabled : VAR_FALLBACK_ENABLED STRING_ARG",
+"view_name : VAR_NAME STRING_ARG",
+"view_local_zone : VAR_LOCAL_ZONE STRING_ARG STRING_ARG",
+"view_response_ip : VAR_RESPONSE_IP STRING_ARG STRING_ARG",
+"view_response_ip_data : VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG",
+"view_local_data : VAR_LOCAL_DATA STRING_ARG",
+"view_local_data_ptr : VAR_LOCAL_DATA_PTR STRING_ARG",
+"view_first : VAR_VIEW_FIRST STRING_ARG",
+"rcstart : VAR_REMOTE_CONTROL",
+"contents_rc : contents_rc content_rc",
+"contents_rc :",
+"content_rc : rc_control_enable",
+"content_rc : rc_control_interface",
+"content_rc : rc_control_port",
+"content_rc : rc_server_key_file",
+"content_rc : rc_server_cert_file",
+"content_rc : rc_control_key_file",
+"content_rc : rc_control_cert_file",
+"content_rc : rc_control_use_cert",
+"rc_control_enable : VAR_CONTROL_ENABLE STRING_ARG",
+"rc_control_port : VAR_CONTROL_PORT STRING_ARG",
+"rc_control_interface : VAR_CONTROL_INTERFACE STRING_ARG",
+"rc_control_use_cert : VAR_CONTROL_USE_CERT STRING_ARG",
+"rc_server_key_file : VAR_SERVER_KEY_FILE STRING_ARG",
+"rc_server_cert_file : VAR_SERVER_CERT_FILE STRING_ARG",
+"rc_control_key_file : VAR_CONTROL_KEY_FILE STRING_ARG",
+"rc_control_cert_file : VAR_CONTROL_CERT_FILE STRING_ARG",
+"dtstart : VAR_DNSTAP",
+"contents_dt : contents_dt content_dt",
+"contents_dt :",
+"content_dt : dt_dnstap_enable",
+"content_dt : dt_dnstap_socket_path",
+"content_dt : dt_dnstap_ip",
+"content_dt : dt_dnstap_tls",
+"content_dt : dt_dnstap_tls_server_name",
+"content_dt : dt_dnstap_tls_cert_bundle",
+"content_dt : dt_dnstap_tls_client_key_file",
+"content_dt : dt_dnstap_tls_client_cert_file",
+"content_dt : dt_dnstap_send_identity",
+"content_dt : dt_dnstap_send_version",
+"content_dt : dt_dnstap_identity",
+"content_dt : dt_dnstap_version",
+"content_dt : dt_dnstap_log_resolver_query_messages",
+"content_dt : dt_dnstap_log_resolver_response_messages",
+"content_dt : dt_dnstap_log_client_query_messages",
+"content_dt : dt_dnstap_log_client_response_messages",
+"content_dt : dt_dnstap_log_forwarder_query_messages",
+"content_dt : dt_dnstap_log_forwarder_response_messages",
+"dt_dnstap_enable : VAR_DNSTAP_ENABLE STRING_ARG",
+"dt_dnstap_socket_path : VAR_DNSTAP_SOCKET_PATH STRING_ARG",
+"dt_dnstap_ip : VAR_DNSTAP_IP STRING_ARG",
+"dt_dnstap_tls : VAR_DNSTAP_TLS STRING_ARG",
+"dt_dnstap_tls_server_name : VAR_DNSTAP_TLS_SERVER_NAME STRING_ARG",
+"dt_dnstap_tls_cert_bundle : VAR_DNSTAP_TLS_CERT_BUNDLE STRING_ARG",
+"dt_dnstap_tls_client_key_file : VAR_DNSTAP_TLS_CLIENT_KEY_FILE STRING_ARG",
+"dt_dnstap_tls_client_cert_file : VAR_DNSTAP_TLS_CLIENT_CERT_FILE STRING_ARG",
+"dt_dnstap_send_identity : VAR_DNSTAP_SEND_IDENTITY STRING_ARG",
+"dt_dnstap_send_version : VAR_DNSTAP_SEND_VERSION STRING_ARG",
+"dt_dnstap_identity : VAR_DNSTAP_IDENTITY STRING_ARG",
+"dt_dnstap_version : VAR_DNSTAP_VERSION STRING_ARG",
+"dt_dnstap_log_resolver_query_messages : VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES STRING_ARG",
+"dt_dnstap_log_resolver_response_messages : VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES STRING_ARG",
+"dt_dnstap_log_client_query_messages : VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES STRING_ARG",
+"dt_dnstap_log_client_response_messages : VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES STRING_ARG",
+"dt_dnstap_log_forwarder_query_messages : VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES STRING_ARG",
+"dt_dnstap_log_forwarder_response_messages : VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES STRING_ARG",
+"pythonstart : VAR_PYTHON",
+"contents_py : contents_py content_py",
+"contents_py :",
+"content_py : py_script",
+"py_script : VAR_PYTHON_SCRIPT STRING_ARG",
+"server_disable_dnssec_lame_check : VAR_DISABLE_DNSSEC_LAME_CHECK STRING_ARG",
+"server_log_identity : VAR_LOG_IDENTITY STRING_ARG",
+"server_response_ip : VAR_RESPONSE_IP STRING_ARG STRING_ARG",
+"server_response_ip_data : VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG",
+"dnscstart : VAR_DNSCRYPT",
+"contents_dnsc : contents_dnsc content_dnsc",
+"contents_dnsc :",
+"content_dnsc : dnsc_dnscrypt_enable",
+"content_dnsc : dnsc_dnscrypt_port",
+"content_dnsc : dnsc_dnscrypt_provider",
+"content_dnsc : dnsc_dnscrypt_secret_key",
+"content_dnsc : dnsc_dnscrypt_provider_cert",
+"content_dnsc : dnsc_dnscrypt_provider_cert_rotated",
+"content_dnsc : dnsc_dnscrypt_shared_secret_cache_size",
+"content_dnsc : dnsc_dnscrypt_shared_secret_cache_slabs",
+"content_dnsc : dnsc_dnscrypt_nonce_cache_size",
+"content_dnsc : dnsc_dnscrypt_nonce_cache_slabs",
+"dnsc_dnscrypt_enable : VAR_DNSCRYPT_ENABLE STRING_ARG",
+"dnsc_dnscrypt_port : VAR_DNSCRYPT_PORT STRING_ARG",
+"dnsc_dnscrypt_provider : VAR_DNSCRYPT_PROVIDER STRING_ARG",
+"dnsc_dnscrypt_provider_cert : VAR_DNSCRYPT_PROVIDER_CERT STRING_ARG",
+"dnsc_dnscrypt_provider_cert_rotated : VAR_DNSCRYPT_PROVIDER_CERT_ROTATED STRING_ARG",
+"dnsc_dnscrypt_secret_key : VAR_DNSCRYPT_SECRET_KEY STRING_ARG",
+"dnsc_dnscrypt_shared_secret_cache_size : VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE STRING_ARG",
+"dnsc_dnscrypt_shared_secret_cache_slabs : VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS STRING_ARG",
+"dnsc_dnscrypt_nonce_cache_size : VAR_DNSCRYPT_NONCE_CACHE_SIZE STRING_ARG",
+"dnsc_dnscrypt_nonce_cache_slabs : VAR_DNSCRYPT_NONCE_CACHE_SLABS STRING_ARG",
+"cachedbstart : VAR_CACHEDB",
+"contents_cachedb : contents_cachedb content_cachedb",
+"contents_cachedb :",
+"content_cachedb : cachedb_backend_name",
+"content_cachedb : cachedb_secret_seed",
+"content_cachedb : redis_server_host",
+"content_cachedb : redis_server_port",
+"content_cachedb : redis_timeout",
+"cachedb_backend_name : VAR_CACHEDB_BACKEND STRING_ARG",
+"cachedb_secret_seed : VAR_CACHEDB_SECRETSEED STRING_ARG",
+"redis_server_host : VAR_CACHEDB_REDISHOST STRING_ARG",
+"redis_server_port : VAR_CACHEDB_REDISPORT STRING_ARG",
+"redis_timeout : VAR_CACHEDB_REDISTIMEOUT STRING_ARG",
+"server_tcp_connection_limit : VAR_TCP_CONNECTION_LIMIT STRING_ARG STRING_ARG",
+"ipsetstart : VAR_IPSET",
+"contents_ipset : contents_ipset content_ipset",
+"contents_ipset :",
+"content_ipset : ipset_name_v4",
+"content_ipset : ipset_name_v6",
+"ipset_name_v4 : VAR_IPSET_NAME_V4 STRING_ARG",
+"ipset_name_v6 : VAR_IPSET_NAME_V6 STRING_ARG",
+
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "SPACE", "LETTER", "NEWLINE", "COMMENT",
-  "COLON", "ANY", "ZONESTR", "STRING_ARG", "VAR_SERVER", "VAR_VERBOSITY",
-  "VAR_NUM_THREADS", "VAR_PORT", "VAR_OUTGOING_RANGE", "VAR_INTERFACE",
-  "VAR_PREFER_IP4", "VAR_DO_IP4", "VAR_DO_IP6", "VAR_PREFER_IP6",
-  "VAR_DO_UDP", "VAR_DO_TCP", "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS",
-  "VAR_TCP_IDLE_TIMEOUT", "VAR_EDNS_TCP_KEEPALIVE",
-  "VAR_EDNS_TCP_KEEPALIVE_TIMEOUT", "VAR_CHROOT", "VAR_USERNAME",
-  "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE", "VAR_MSG_CACHE_SIZE",
-  "VAR_MSG_CACHE_SLABS", "VAR_NUM_QUERIES_PER_THREAD",
-  "VAR_RRSET_CACHE_SIZE", "VAR_RRSET_CACHE_SLABS", "VAR_OUTGOING_NUM_TCP",
-  "VAR_INFRA_HOST_TTL", "VAR_INFRA_LAME_TTL", "VAR_INFRA_CACHE_SLABS",
-  "VAR_INFRA_CACHE_NUMHOSTS", "VAR_INFRA_CACHE_LAME_SIZE", "VAR_NAME",
-  "VAR_STUB_ZONE", "VAR_STUB_HOST", "VAR_STUB_ADDR",
-  "VAR_TARGET_FETCH_POLICY", "VAR_HARDEN_SHORT_BUFSIZE",
-  "VAR_HARDEN_LARGE_QUERIES", "VAR_FORWARD_ZONE", "VAR_FORWARD_HOST",
-  "VAR_FORWARD_ADDR", "VAR_DO_NOT_QUERY_ADDRESS", "VAR_HIDE_IDENTITY",
-  "VAR_HIDE_VERSION", "VAR_IDENTITY", "VAR_VERSION", "VAR_HARDEN_GLUE",
-  "VAR_MODULE_CONF", "VAR_TRUST_ANCHOR_FILE", "VAR_TRUST_ANCHOR",
-  "VAR_VAL_OVERRIDE_DATE", "VAR_BOGUS_TTL", "VAR_VAL_CLEAN_ADDITIONAL",
-  "VAR_VAL_PERMISSIVE_MODE", "VAR_INCOMING_NUM_TCP", "VAR_MSG_BUFFER_SIZE",
-  "VAR_KEY_CACHE_SIZE", "VAR_KEY_CACHE_SLABS", "VAR_TRUSTED_KEYS_FILE",
-  "VAR_VAL_NSEC3_KEYSIZE_ITERATIONS", "VAR_USE_SYSLOG",
-  "VAR_OUTGOING_INTERFACE", "VAR_ROOT_HINTS", "VAR_DO_NOT_QUERY_LOCALHOST",
-  "VAR_CACHE_MAX_TTL", "VAR_HARDEN_DNSSEC_STRIPPED", "VAR_ACCESS_CONTROL",
-  "VAR_LOCAL_ZONE", "VAR_LOCAL_DATA", "VAR_INTERFACE_AUTOMATIC",
-  "VAR_STATISTICS_INTERVAL", "VAR_DO_DAEMONIZE", "VAR_USE_CAPS_FOR_ID",
-  "VAR_STATISTICS_CUMULATIVE", "VAR_OUTGOING_PORT_PERMIT",
-  "VAR_OUTGOING_PORT_AVOID", "VAR_DLV_ANCHOR_FILE", "VAR_DLV_ANCHOR",
-  "VAR_NEG_CACHE_SIZE", "VAR_HARDEN_REFERRAL_PATH", "VAR_PRIVATE_ADDRESS",
-  "VAR_PRIVATE_DOMAIN", "VAR_REMOTE_CONTROL", "VAR_CONTROL_ENABLE",
-  "VAR_CONTROL_INTERFACE", "VAR_CONTROL_PORT", "VAR_SERVER_KEY_FILE",
-  "VAR_SERVER_CERT_FILE", "VAR_CONTROL_KEY_FILE", "VAR_CONTROL_CERT_FILE",
-  "VAR_CONTROL_USE_CERT", "VAR_EXTENDED_STATISTICS", "VAR_LOCAL_DATA_PTR",
-  "VAR_JOSTLE_TIMEOUT", "VAR_STUB_PRIME", "VAR_UNWANTED_REPLY_THRESHOLD",
-  "VAR_LOG_TIME_ASCII", "VAR_DOMAIN_INSECURE", "VAR_PYTHON",
-  "VAR_PYTHON_SCRIPT", "VAR_VAL_SIG_SKEW_MIN", "VAR_VAL_SIG_SKEW_MAX",
-  "VAR_CACHE_MIN_TTL", "VAR_VAL_LOG_LEVEL", "VAR_AUTO_TRUST_ANCHOR_FILE",
-  "VAR_KEEP_MISSING", "VAR_ADD_HOLDDOWN", "VAR_DEL_HOLDDOWN",
-  "VAR_SO_RCVBUF", "VAR_EDNS_BUFFER_SIZE", "VAR_PREFETCH",
-  "VAR_PREFETCH_KEY", "VAR_SO_SNDBUF", "VAR_SO_REUSEPORT",
-  "VAR_HARDEN_BELOW_NXDOMAIN", "VAR_IGNORE_CD_FLAG", "VAR_LOG_QUERIES",
-  "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_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES",
-  "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES",
-  "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES",
-  "VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES",
-  "VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES",
-  "VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES", "VAR_RESPONSE_IP_TAG",
-  "VAR_RESPONSE_IP", "VAR_RESPONSE_IP_DATA", "VAR_HARDEN_ALGO_DOWNGRADE",
-  "VAR_IP_TRANSPARENT", "VAR_IP_DSCP", "VAR_DISABLE_DNSSEC_LAME_CHECK",
-  "VAR_IP_RATELIMIT", "VAR_IP_RATELIMIT_SLABS", "VAR_IP_RATELIMIT_SIZE",
-  "VAR_RATELIMIT", "VAR_RATELIMIT_SLABS", "VAR_RATELIMIT_SIZE",
-  "VAR_RATELIMIT_FOR_DOMAIN", "VAR_RATELIMIT_BELOW_DOMAIN",
-  "VAR_IP_RATELIMIT_FACTOR", "VAR_RATELIMIT_FACTOR",
-  "VAR_SEND_CLIENT_SUBNET", "VAR_CLIENT_SUBNET_ZONE",
-  "VAR_CLIENT_SUBNET_ALWAYS_FORWARD", "VAR_CLIENT_SUBNET_OPCODE",
-  "VAR_MAX_CLIENT_SUBNET_IPV4", "VAR_MAX_CLIENT_SUBNET_IPV6",
-  "VAR_MIN_CLIENT_SUBNET_IPV4", "VAR_MIN_CLIENT_SUBNET_IPV6",
-  "VAR_MAX_ECS_TREE_SIZE_IPV4", "VAR_MAX_ECS_TREE_SIZE_IPV6",
-  "VAR_CAPS_WHITELIST", "VAR_CACHE_MAX_NEGATIVE_TTL",
-  "VAR_PERMIT_SMALL_HOLDDOWN", "VAR_QNAME_MINIMISATION",
-  "VAR_QNAME_MINIMISATION_STRICT", "VAR_IP_FREEBIND", "VAR_DEFINE_TAG",
-  "VAR_LOCAL_ZONE_TAG", "VAR_ACCESS_CONTROL_TAG",
-  "VAR_LOCAL_ZONE_OVERRIDE", "VAR_ACCESS_CONTROL_TAG_ACTION",
-  "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW",
-  "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_SERVE_EXPIRED_TTL",
-  "VAR_SERVE_EXPIRED_TTL_RESET", "VAR_SERVE_EXPIRED_REPLY_TTL",
-  "VAR_SERVE_EXPIRED_CLIENT_TIMEOUT", "VAR_FAKE_DSA", "VAR_FAKE_SHA1",
-  "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING",
-  "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE",
-  "VAR_SHM_KEY", "VAR_ROOT_KEY_SENTINEL", "VAR_DNSCRYPT",
-  "VAR_DNSCRYPT_ENABLE", "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER",
-  "VAR_DNSCRYPT_SECRET_KEY", "VAR_DNSCRYPT_PROVIDER_CERT",
-  "VAR_DNSCRYPT_PROVIDER_CERT_ROTATED",
-  "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE",
-  "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS",
-  "VAR_DNSCRYPT_NONCE_CACHE_SIZE", "VAR_DNSCRYPT_NONCE_CACHE_SLABS",
-  "VAR_IPSECMOD_ENABLED", "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS",
-  "VAR_IPSECMOD_MAX_TTL", "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT",
-  "VAR_CACHEDB", "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED",
-  "VAR_CACHEDB_REDISHOST", "VAR_CACHEDB_REDISPORT",
-  "VAR_CACHEDB_REDISTIMEOUT", "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM",
-  "VAR_FOR_UPSTREAM", "VAR_AUTH_ZONE", "VAR_ZONEFILE", "VAR_MASTER",
-  "VAR_URL", "VAR_FOR_DOWNSTREAM", "VAR_FALLBACK_ENABLED",
-  "VAR_TLS_ADDITIONAL_PORT", "VAR_LOW_RTT", "VAR_LOW_RTT_PERMIL",
-  "VAR_FAST_SERVER_PERMIL", "VAR_FAST_SERVER_NUM", "VAR_ALLOW_NOTIFY",
-  "VAR_TLS_WIN_CERT", "VAR_TCP_CONNECTION_LIMIT", "VAR_FORWARD_NO_CACHE",
-  "VAR_STUB_NO_CACHE", "VAR_LOG_SERVFAIL", "VAR_DENY_ANY",
-  "VAR_UNKNOWN_SERVER_TIME_LIMIT", "VAR_LOG_TAG_QUERYREPLY",
-  "VAR_STREAM_WAIT_SIZE", "VAR_TLS_CIPHERS", "VAR_TLS_CIPHERSUITES",
-  "VAR_IPSET", "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", "$accept", "toplevelvars", "toplevelvar",
-  "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",
-  "server_max_ecs_tree_size_ipv4", "server_max_ecs_tree_size_ipv6",
-  "server_interface", "server_outgoing_interface", "server_outgoing_range",
-  "server_outgoing_port_permit", "server_outgoing_port_avoid",
-  "server_outgoing_num_tcp", "server_incoming_num_tcp",
-  "server_interface_automatic", "server_do_ip4", "server_do_ip6",
-  "server_do_udp", "server_do_tcp", "server_prefer_ip4",
-  "server_prefer_ip6", "server_tcp_mss", "server_outgoing_tcp_mss",
-  "server_tcp_idle_timeout", "server_tcp_keepalive",
-  "server_tcp_keepalive_timeout", "server_tcp_upstream",
-  "server_udp_upstream_without_downstream", "server_ssl_upstream",
-  "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port",
-  "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_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",
-  "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone",
-  "server_local_data", "server_local_data_ptr", "server_minimal_responses",
-  "server_rrset_roundrobin", "server_unknown_server_time_limit",
-  "server_max_udp_size", "server_dns64_prefix", "server_dns64_synthall",
-  "server_dns64_ignore_aaaa", "server_define_tag", "server_local_zone_tag",
-  "server_access_control_tag", "server_access_control_tag_action",
-  "server_access_control_tag_data", "server_local_zone_override",
-  "server_access_control_view", "server_response_ip_tag",
-  "server_ip_ratelimit", "server_ratelimit", "server_ip_ratelimit_size",
-  "server_ratelimit_size", "server_ip_ratelimit_slabs",
-  "server_ratelimit_slabs", "server_ratelimit_for_domain",
-  "server_ratelimit_below_domain", "server_ip_ratelimit_factor",
-  "server_ratelimit_factor", "server_low_rtt", "server_fast_server_num",
-  "server_fast_server_permil", "server_qname_minimisation",
-  "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",
-  "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",
-  "contents_rc", "content_rc", "rc_control_enable", "rc_control_port",
-  "rc_control_interface", "rc_control_use_cert", "rc_server_key_file",
-  "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file",
-  "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable",
-  "dt_dnstap_socket_path", "dt_dnstap_ip", "dt_dnstap_tls",
-  "dt_dnstap_tls_server_name", "dt_dnstap_tls_cert_bundle",
-  "dt_dnstap_tls_client_key_file", "dt_dnstap_tls_client_cert_file",
-  "dt_dnstap_send_identity", "dt_dnstap_send_version",
-  "dt_dnstap_identity", "dt_dnstap_version",
-  "dt_dnstap_log_resolver_query_messages",
-  "dt_dnstap_log_resolver_response_messages",
-  "dt_dnstap_log_client_query_messages",
-  "dt_dnstap_log_client_response_messages",
-  "dt_dnstap_log_forwarder_query_messages",
-  "dt_dnstap_log_forwarder_response_messages", "pythonstart",
-  "contents_py", "content_py", "py_script",
-  "server_disable_dnssec_lame_check", "server_log_identity",
-  "server_response_ip", "server_response_ip_data", "dnscstart",
-  "contents_dnsc", "content_dnsc", "dnsc_dnscrypt_enable",
-  "dnsc_dnscrypt_port", "dnsc_dnscrypt_provider",
-  "dnsc_dnscrypt_provider_cert", "dnsc_dnscrypt_provider_cert_rotated",
-  "dnsc_dnscrypt_secret_key", "dnsc_dnscrypt_shared_secret_cache_size",
-  "dnsc_dnscrypt_shared_secret_cache_slabs",
-  "dnsc_dnscrypt_nonce_cache_size", "dnsc_dnscrypt_nonce_cache_slabs",
-  "cachedbstart", "contents_cachedb", "content_cachedb",
-  "cachedb_backend_name", "cachedb_secret_seed", "redis_server_host",
-  "redis_server_port", "redis_timeout", "server_tcp_connection_limit",
-  "ipsetstart", "contents_ipset", "content_ipset", "ipset_name_v4",
-  "ipset_name_v6", YY_NULLPTR
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-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,
-     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,   447,   448,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   466,   467,   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,   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,   528,   529,   530,   531,   532,   533,   534,
-     535,   536,   537,   538,   539,   540
-};
-# endif
-
-#define YYPACT_NINF -270
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-270)))
-
-#define YYTABLE_NINF -1
-
-#define yytable_value_is_error(Yytable_value) \
-  0
-
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
-{
-    -270,     0,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,   269,   -42,
-     -37,   -41,   -21,   -43,   -44,   -87,  -106,  -205,  -229,  -269,
-       2,     3,     4,    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,
-      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,
-     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,   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,   199,   204,   205,
-     206,   207,   208,   209,   210,   212,   213,   214,   215,   217,
-     219,   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,   265,   267,   268,   303,   304,   305,   306,   310,   311,
-     312,   354,   355,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   356,   357,   358,
-     359,   360,   361,   362,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,   366,   370,   371,   396,   397,   398,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,   400,   411,   412,   413,   414,
-     415,   416,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-     417,   418,   419,   420,   421,   422,   423,   424,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   425,   426,   427,
-     428,   429,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,   469,   471,   487,   488,   489,   490,   491,
-     492,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-     493,   494,   495,   496,   497,   504,   505,   506,   507,   508,
-     509,   511,   512,   513,   514,   515,   516,   517,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   520,  -270,  -270,
-     523,   526,   527,   535,   536,   537,   539,   540,   541,   542,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,   543,   544,   545,   546,   547,  -270,  -270,  -270,  -270,
-    -270,  -270,   548,   549,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   550,   551,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,   552,   553,   554,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   555,   556,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,   557,   558,
-     559,   560,   561,   562,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,   563,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,   564,  -270,  -270,   565,   566,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,   567,   568,   569,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270
-};
-
-  /* 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_uint16 yydefact[] =
-{
-       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,
-       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,     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,     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,     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,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     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,   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,   127,   136,   162,   139,   208,   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,   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,   124,   125,   206,   126,
-     131,   132,   133,   163,   164,   166,   168,   169,   167,   170,
-     180,   137,   138,   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,     0,     0,   506,   508,
-     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
-     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,   328,   329,   330,   331,   332,   357,   358,
-     359,   364,   365,   293,   366,   367,   370,   368,   369,   372,
-     373,   374,   388,   343,   344,   346,   347,   375,   391,   337,
-     339,   392,   398,   399,   400,   294,   356,   416,   417,   338,
-     411,   321,   289,   333,   389,   395,   376,     0,     0,   420,
-     295,   272,   320,   380,   273,   291,   292,   334,   335,   418,
-     378,   382,   383,   274,   421,   360,   387,   322,   342,   393,
-     394,   397,   410,   336,   414,   412,   413,   348,   355,   384,
-     385,   349,   350,   377,   402,   323,   324,   327,   307,   309,
-     310,   311,   312,   313,   422,   423,   425,   361,   362,   363,
-     371,   426,   427,   428,     0,     0,     0,   379,   351,   353,
-     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,   352,   429,     0,     0,
-       0,     0,     0,     0,   403,   404,   405,   406,   407,   408,
-     409,   550,   345,   340,   401,   319,   275,   276,   341,   452,
-     454,   453,   455,   456,   457,   308,   315,   447,   449,   448,
-     314,     0,   326,   386,   424,   325,   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[] =
-{
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   -23,   570,   571,
-     572,   573,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270
-};
-
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -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
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_uint16 yytable[] =
-{
-       2,   470,   427,   455,   428,   429,   557,   442,   592,   593,
-     498,     3,   597,   598,   599,   443,   444,   581,   582,   583,
-     584,   585,   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,   432,
-     445,   632,   446,   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,   459,   460,   660,   661,   662,   663,   664,   665,   666,
-     667,   668,   669,   670,   671,   672,   673,   674,   675,   676,
-     677,   678,     8,   679,   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,   747,
-     447,   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,
-     803,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   804,   805,   806,   807,   808,   809,   810,   811,   812,
-     813,   814,   815,   816,   817,   818,   819,   820,   821,   822,
-     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,   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,     0,     0,   499,   500,   501,   502
-};
-
-static const yytype_int16 yycheck[] =
-{
-       0,    44,    44,    44,    46,    47,   112,    44,   277,   278,
-      33,    11,    10,    10,    10,    52,    53,   246,   247,   248,
-     249,   250,    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,   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,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   152,    10,    10,    10,    10,    10,    10,    10,
-      10,    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,    10,
-     210,   254,   255,   256,    10,    10,    10,    10,    10,    10,
-      10,   264,    10,    10,    10,    10,   268,    10,   228,    10,
-     267,   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,
-      10,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,    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,   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,    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
-};
-
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint16 yystos[] =
-{
-       0,   287,     0,    11,    45,    51,    95,   111,   152,   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,
-      42,    43,    48,    49,    50,    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,   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,
-     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,   211,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     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,
-     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,   447,
-     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,   464,   465,   466,   467,
-     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,
-     498,   499,   564,   565,   566,   567,   589,    44,    46,    47,
-     107,   138,   141,   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,   172,
-     173,   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,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   541,   542,
-     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
-     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,
-      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,    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,    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,    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,    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,   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,
-     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,   447,   448,   449,   450,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,   464,   465,   466,   467,   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,   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,   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,   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.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     2,     2,     2,     2,     2,     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,     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,     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,     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,
-       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,     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,     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,
-       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
-};
-
-
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-#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)
-
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (0)
-
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (0)
-
-
-/*-----------------------------------.
-| Print this symbol's value on YYO.  |
-`-----------------------------------*/
-
-static void
-yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
-{
-  FILE *yyoutput = yyo;
-  YYUSE (yyoutput);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
-# endif
-  YYUSE (yytype);
-}
-
-
-/*---------------------------.
-| Print this symbol on YYO.  |
-`---------------------------*/
-
-static void
-yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
-{
-  YYFPRINTF (yyo, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
-
-  yy_symbol_value_print (yyo, yytype, yyvaluep);
-  YYFPRINTF (yyo, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
-{
-  unsigned long yylno = yyrline[yyrule];
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  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]],
-                       &yyvsp[(yyi + 1) - (yynrhs)]
-                                              );
-      YYFPRINTF (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-yystrlen (const char *yystr)
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   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 YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            else
-              goto append;
-
-          append:
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *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 (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. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                    yysize = yysize1;
-                  else
-                    return 2;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      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"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-      yysize = yysize1;
-    else
-      return 2;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-{
-  YYUSE (yyvaluep);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-}
-
-
-
-
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-int
-yyparse (void)
-{
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-  goto yysetstate;
-
-
-/*------------------------------------------------------------.
-| yynewstate -- push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
-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;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-#if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    goto yyexhaustedlab;
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
+/* define the initial stack-sizes */
+#ifdef YYSTACKSIZE
+#undef YYMAXDEPTH
+#define YYMAXDEPTH  YYSTACKSIZE
 #else
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      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.  */
-        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 * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
-# else /* defined YYSTACK_RELOCATE */
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
-    }
-#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
-
-  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.  */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex ();
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* 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
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     '$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-  case 16:
-#line 189 "./util/configparser.y"
-    { 
-		OUTYY(("\nP(server:)\n")); 
-	}
-#line 2706 "util/configparser.c"
-    break;
-
-  case 212:
-#line 282 "./util/configparser.y"
-    {
-		struct config_stub* s;
-		OUTYY(("\nP(stub_zone:)\n")); 
-		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
-		if(s) {
-			s->next = cfg_parser->cfg->stubs;
-			cfg_parser->cfg->stubs = s;
-		} else 
-			yyerror("out of memory");
-	}
-#line 2721 "util/configparser.c"
-    break;
-
-  case 222:
-#line 299 "./util/configparser.y"
-    {
-		struct config_stub* s;
-		OUTYY(("\nP(forward_zone:)\n")); 
-		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
-		if(s) {
-			s->next = cfg_parser->cfg->forwards;
-			cfg_parser->cfg->forwards = s;
-		} else 
-			yyerror("out of memory");
-	}
-#line 2736 "util/configparser.c"
-    break;
-
-  case 231:
-#line 316 "./util/configparser.y"
-    {
-		struct config_view* s;
-		OUTYY(("\nP(view:)\n")); 
-		s = (struct config_view*)calloc(1, sizeof(struct config_view));
-		if(s) {
-			s->next = cfg_parser->cfg->views;
-			if(s->next && !s->next->name)
-				yyerror("view without name");
-			cfg_parser->cfg->views = s;
-		} else 
-			yyerror("out of memory");
-	}
-#line 2753 "util/configparser.c"
-    break;
-
-  case 241:
-#line 335 "./util/configparser.y"
-    {
-		struct config_auth* s;
-		OUTYY(("\nP(auth_zone:)\n")); 
-		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
-		if(s) {
-			s->next = cfg_parser->cfg->auths;
-			cfg_parser->cfg->auths = s;
-			/* defaults for auth zone */
-			s->for_downstream = 1;
-			s->for_upstream = 1;
-			s->fallback_enabled = 0;
-			s->isrpz = 0;
-		} else 
-			yyerror("out of memory");
-	}
-#line 2773 "util/configparser.c"
-    break;
-
-  case 252:
-#line 359 "./util/configparser.y"
-    {
-		uint8_t* bitlist;
-		size_t len = 0;
-		OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str)));
-		bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
-			&len);
-		free((yyvsp[0].str));
-		if(!bitlist) {
-			yyerror("could not parse tags, (define-tag them first)");
-		}
-		if(bitlist) {
-			cfg_parser->cfg->auths->rpz_taglist = bitlist;
-			cfg_parser->cfg->auths->rpz_taglistlen = len;
-
-		}
-	}
-#line 2794 "util/configparser.c"
-    break;
-
-  case 253:
-#line 378 "./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 &&
-		   strcmp((yyvsp[0].str), "cname")!=0 && strcmp((yyvsp[0].str), "disabled")!=0) {
-			yyerror("rpz-action-override action: expected nxdomain, "
-				"nodata, passthru, drop, cname or disabled");
-			free((yyvsp[0].str));
-			cfg_parser->cfg->auths->rpz_action_override = NULL;
-		}
-		else {
-			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
-		}
-	}
-#line 2813 "util/configparser.c"
-    break;
-
-  case 254:
-#line 395 "./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 2823 "util/configparser.c"
-    break;
-
-  case 255:
-#line 403 "./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 2835 "util/configparser.c"
-    break;
-
-  case 256:
-#line 413 "./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 2845 "util/configparser.c"
-    break;
-
-  case 257:
-#line 421 "./util/configparser.y"
-    {
-		struct config_auth* s;
-		OUTYY(("\nP(rpz:)\n")); 
-		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
-		if(s) {
-			s->next = cfg_parser->cfg->auths;
-			cfg_parser->cfg->auths = s;
-			/* defaults for RPZ auth zone */
-			s->for_downstream = 0;
-			s->for_upstream = 0;
-			s->fallback_enabled = 0;
-			s->isrpz = 1;
-		} else 
-			yyerror("out of memory");
-	}
-#line 2865 "util/configparser.c"
-    break;
-
-  case 270:
-#line 444 "./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 2877 "util/configparser.c"
-    break;
-
-  case 271:
-#line 453 "./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 2889 "util/configparser.c"
-    break;
-
-  case 272:
-#line 462 "./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;
-		else if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 2903 "util/configparser.c"
-    break;
-
-  case 273:
-#line 473 "./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 2915 "util/configparser.c"
-    break;
-
-  case 274:
-#line 482 "./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 2927 "util/configparser.c"
-    break;
-
-  case 275:
-#line 491 "./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 2939 "util/configparser.c"
-    break;
-
-  case 276:
-#line 500 "./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;
-		else if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 2953 "util/configparser.c"
-    break;
-
-  case 277:
-#line 511 "./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 2965 "util/configparser.c"
-    break;
-
-  case 278:
-#line 520 "./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)))
-			fatal_exit("out of memory adding client-subnet");
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 2980 "util/configparser.c"
-    break;
-
-  case 279:
-#line 532 "./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,
-			(yyvsp[0].str)))
-			fatal_exit("out of memory adding client-subnet-zone");
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 2996 "util/configparser.c"
-    break;
-
-  case 280:
-#line 546 "./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)
-			yyerror("expected yes or no.");
-		else
-			cfg_parser->cfg->client_subnet_always_forward =
-				(strcmp((yyvsp[0].str), "yes")==0);
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3014 "util/configparser.c"
-    break;
-
-  case 281:
-#line 561 "./util/configparser.y"
-    {
-	#ifdef CLIENT_SUBNET
-		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
-		OUTYY(("P(Deprecated option, ignoring)\n"));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3028 "util/configparser.c"
-    break;
-
-  case 282:
-#line 572 "./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)
-			yyerror("IPv4 subnet length expected");
-		else if (atoi((yyvsp[0].str)) > 32)
-			cfg_parser->cfg->max_client_subnet_ipv4 = 32;
-		else if (atoi((yyvsp[0].str)) < 0)
-			cfg_parser->cfg->max_client_subnet_ipv4 = 0;
-		else cfg_parser->cfg->max_client_subnet_ipv4 = (uint8_t)atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3048 "util/configparser.c"
-    break;
-
-  case 283:
-#line 589 "./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)
-			yyerror("Ipv6 subnet length expected");
-		else if (atoi((yyvsp[0].str)) > 128)
-			cfg_parser->cfg->max_client_subnet_ipv6 = 128;
-		else if (atoi((yyvsp[0].str)) < 0)
-			cfg_parser->cfg->max_client_subnet_ipv6 = 0;
-		else cfg_parser->cfg->max_client_subnet_ipv6 = (uint8_t)atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3068 "util/configparser.c"
-    break;
-
-  case 284:
-#line 606 "./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)
-			yyerror("IPv4 subnet length expected");
-		else if (atoi((yyvsp[0].str)) > 32)
-			cfg_parser->cfg->min_client_subnet_ipv4 = 32;
-		else if (atoi((yyvsp[0].str)) < 0)
-			cfg_parser->cfg->min_client_subnet_ipv4 = 0;
-		else cfg_parser->cfg->min_client_subnet_ipv4 = (uint8_t)atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3088 "util/configparser.c"
-    break;
-
-  case 285:
-#line 623 "./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)
-			yyerror("Ipv6 subnet length expected");
-		else if (atoi((yyvsp[0].str)) > 128)
-			cfg_parser->cfg->min_client_subnet_ipv6 = 128;
-		else if (atoi((yyvsp[0].str)) < 0)
-			cfg_parser->cfg->min_client_subnet_ipv6 = 0;
-		else cfg_parser->cfg->min_client_subnet_ipv6 = (uint8_t)atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3108 "util/configparser.c"
-    break;
-
-  case 286:
-#line 640 "./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)
-			yyerror("IPv4 ECS tree size expected");
-		else if (atoi((yyvsp[0].str)) < 0)
-			cfg_parser->cfg->max_ecs_tree_size_ipv4 = 0;
-		else cfg_parser->cfg->max_ecs_tree_size_ipv4 = (uint32_t)atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3126 "util/configparser.c"
-    break;
-
-  case 287:
-#line 655 "./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)
-			yyerror("IPv6 ECS tree size expected");
-		else if (atoi((yyvsp[0].str)) < 0)
-			cfg_parser->cfg->max_ecs_tree_size_ipv6 = 0;
-		else cfg_parser->cfg->max_ecs_tree_size_ipv6 = (uint32_t)atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 3144 "util/configparser.c"
-    break;
-
-  case 288:
-#line 670 "./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*));
-		else 	cfg_parser->cfg->ifs = realloc(cfg_parser->cfg->ifs,
-				(cfg_parser->cfg->num_ifs+1)*sizeof(char*));
-		if(!cfg_parser->cfg->ifs)
-			yyerror("out of memory");
-		else
-			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
-	}
-#line 3160 "util/configparser.c"
-    break;
-
-  case 289:
-#line 683 "./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*));
-		else 	cfg_parser->cfg->out_ifs = realloc(
-			cfg_parser->cfg->out_ifs, 
-			(cfg_parser->cfg->num_out_ifs+1)*sizeof(char*));
-		if(!cfg_parser->cfg->out_ifs)
-			yyerror("out of memory");
-		else
-			cfg_parser->cfg->out_ifs[
-				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
-	}
-#line 3178 "util/configparser.c"
-    break;
-
-  case 290:
-#line 698 "./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 3190 "util/configparser.c"
-    break;
-
-  case 291:
-#line 707 "./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 3202 "util/configparser.c"
-    break;
-
-  case 292:
-#line 716 "./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 3214 "util/configparser.c"
-    break;
-
-  case 293:
-#line 725 "./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 3226 "util/configparser.c"
-    break;
-
-  case 294:
-#line 734 "./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 3238 "util/configparser.c"
-    break;
-
-  case 295:
-#line 743 "./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 3250 "util/configparser.c"
-    break;
-
-  case 296:
-#line 752 "./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 3262 "util/configparser.c"
-    break;
-
-  case 297:
-#line 761 "./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 3274 "util/configparser.c"
-    break;
-
-  case 298:
-#line 770 "./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 3286 "util/configparser.c"
-    break;
-
-  case 299:
-#line 779 "./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 3298 "util/configparser.c"
-    break;
-
-  case 300:
-#line 788 "./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 3310 "util/configparser.c"
-    break;
-
-  case 301:
-#line 797 "./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 3322 "util/configparser.c"
-    break;
-
-  case 302:
-#line 806 "./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 3334 "util/configparser.c"
-    break;
-
-  case 303:
-#line 815 "./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 3346 "util/configparser.c"
-    break;
-
-  case 304:
-#line 824 "./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");
-		else if (atoi((yyvsp[0].str)) > 120000)
-			cfg_parser->cfg->tcp_idle_timeout = 120000;
-		else if (atoi((yyvsp[0].str)) < 1)
-			cfg_parser->cfg->tcp_idle_timeout = 1;
-		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 3362 "util/configparser.c"
-    break;
-
-  case 305:
-#line 837 "./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 3374 "util/configparser.c"
-    break;
-
-  case 306:
-#line 846 "./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");
-		else if (atoi((yyvsp[0].str)) > 6553500)
-			cfg_parser->cfg->tcp_keepalive_timeout = 6553500;
-		else if (atoi((yyvsp[0].str)) < 1)
-			cfg_parser->cfg->tcp_keepalive_timeout = 0;
-		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 3390 "util/configparser.c"
-    break;
-
-  case 307:
-#line 859 "./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 3402 "util/configparser.c"
-    break;
-
-  case 308:
-#line 868 "./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 3414 "util/configparser.c"
-    break;
-
-  case 309:
-#line 877 "./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 3426 "util/configparser.c"
-    break;
-
-  case 310:
-#line 886 "./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 3436 "util/configparser.c"
-    break;
-
-  case 311:
-#line 893 "./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 3446 "util/configparser.c"
-    break;
-
-  case 312:
-#line 900 "./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 3458 "util/configparser.c"
-    break;
-
-  case 313:
-#line 909 "./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 3468 "util/configparser.c"
-    break;
-
-  case 314:
-#line 916 "./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 3480 "util/configparser.c"
-    break;
-
-  case 315:
-#line 925 "./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 3491 "util/configparser.c"
-    break;
-
-  case 316:
-#line 933 "./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 3501 "util/configparser.c"
-    break;
-
-  case 317:
-#line 940 "./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 3511 "util/configparser.c"
-    break;
-
-  case 318:
-#line 947 "./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 3522 "util/configparser.c"
-    break;
-
-  case 319:
-#line 955 "./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 3534 "util/configparser.c"
-    break;
-
-  case 320:
-#line 964 "./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 3546 "util/configparser.c"
-    break;
-
-  case 321:
-#line 973 "./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.");
-		else cfg_parser->cfg->use_syslog = (strcmp((yyvsp[0].str), "yes")==0);
-#if !defined(HAVE_SYSLOG_H) && !defined(UB_ON_WINDOWS)
-		if(strcmp((yyvsp[0].str), "yes") == 0)
-			yyerror("no syslog services are available. "
-				"(reconfigure and compile to add)");
-#endif
-		free((yyvsp[0].str));
-	}
-#line 3563 "util/configparser.c"
-    break;
-
-  case 322:
-#line 987 "./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 3575 "util/configparser.c"
-    break;
-
-  case 323:
-#line 996 "./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 3587 "util/configparser.c"
-    break;
-
-  case 324:
-#line 1005 "./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 3599 "util/configparser.c"
-    break;
-
-  case 325:
-#line 1014 "./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 3611 "util/configparser.c"
-    break;
-
-  case 326:
-#line 1023 "./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 3623 "util/configparser.c"
-    break;
-
-  case 327:
-#line 1032 "./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 3635 "util/configparser.c"
-    break;
-
-  case 328:
-#line 1041 "./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 3645 "util/configparser.c"
-    break;
-
-  case 329:
-#line 1048 "./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 3655 "util/configparser.c"
-    break;
-
-  case 330:
-#line 1055 "./util/configparser.y"
-    {
-		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
-		free(cfg_parser->cfg->directory);
-		cfg_parser->cfg->directory = (yyvsp[0].str);
-		/* change there right away for includes relative to this */
-		if((yyvsp[0].str)[0]) {
-			char* d;
-#ifdef UB_ON_WINDOWS
-			w_config_adjust_directory(cfg_parser->cfg);
-#endif
-			d = cfg_parser->cfg->directory;
-			/* adjust directory if we have already chroot,
-			 * like, we reread after sighup */
-			if(cfg_parser->chroot && cfg_parser->chroot[0] &&
-				strncmp(d, cfg_parser->chroot, strlen(
-				cfg_parser->chroot)) == 0)
-				d += strlen(cfg_parser->chroot);
-			if(d[0]) {
-			    if(chdir(d))
-				log_err("cannot chdir to directory: %s (%s)",
-					d, strerror(errno));
-			}
-		}
-	}
-#line 3684 "util/configparser.c"
-    break;
-
-  case 331:
-#line 1081 "./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 3695 "util/configparser.c"
-    break;
-
-  case 332:
-#line 1089 "./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 3705 "util/configparser.c"
-    break;
-
-  case 333:
-#line 1096 "./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 3715 "util/configparser.c"
-    break;
-
-  case 334:
-#line 1103 "./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 3725 "util/configparser.c"
-    break;
-
-  case 335:
-#line 1110 "./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 3735 "util/configparser.c"
-    break;
-
-  case 336:
-#line 1117 "./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 3746 "util/configparser.c"
-    break;
-
-  case 337:
-#line 1125 "./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 3757 "util/configparser.c"
-    break;
-
-  case 338:
-#line 1133 "./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 3768 "util/configparser.c"
-    break;
-
-  case 339:
-#line 1141 "./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 3778 "util/configparser.c"
-    break;
-
-  case 340:
-#line 1148 "./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.");
-		else
-			cfg_parser->cfg->trust_anchor_signaling =
-				(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 3792 "util/configparser.c"
-    break;
-
-  case 341:
-#line 1159 "./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.");
-		else
-			cfg_parser->cfg->root_key_sentinel =
-				(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 3806 "util/configparser.c"
-    break;
-
-  case 342:
-#line 1170 "./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 3816 "util/configparser.c"
-    break;
-
-  case 343:
-#line 1177 "./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 3828 "util/configparser.c"
-    break;
-
-  case 344:
-#line 1186 "./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 3840 "util/configparser.c"
-    break;
-
-  case 345:
-#line 1195 "./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 3852 "util/configparser.c"
-    break;
-
-  case 346:
-#line 1204 "./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 3862 "util/configparser.c"
-    break;
-
-  case 347:
-#line 1211 "./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 3872 "util/configparser.c"
-    break;
-
-  case 348:
-#line 1218 "./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 3883 "util/configparser.c"
-    break;
-
-  case 349:
-#line 1226 "./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 3894 "util/configparser.c"
-    break;
-
-  case 350:
-#line 1234 "./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)
-            yyerror("expected yes or no.");
-        else cfg_parser->cfg->so_reuseport =
-            (strcmp((yyvsp[0].str), "yes")==0);
-        free((yyvsp[0].str));
-    }
-#line 3907 "util/configparser.c"
-    break;
-
-  case 351:
-#line 1244 "./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)
-            yyerror("expected yes or no.");
-        else cfg_parser->cfg->ip_transparent =
-            (strcmp((yyvsp[0].str), "yes")==0);
-        free((yyvsp[0].str));
-    }
-#line 3920 "util/configparser.c"
-    break;
-
-  case 352:
-#line 1254 "./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)
-            yyerror("expected yes or no.");
-        else cfg_parser->cfg->ip_freebind =
-            (strcmp((yyvsp[0].str), "yes")==0);
-        free((yyvsp[0].str));
-    }
-#line 3933 "util/configparser.c"
-    break;
-
-  case 353:
-#line 1264 "./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");
-		else if (atoi((yyvsp[0].str)) > 63)
-			yyerror("value too large (max 63)");
-		else if (atoi((yyvsp[0].str)) < 0)
-			yyerror("value too small (min 0)");
-		else
-			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 3950 "util/configparser.c"
-    break;
-
-  case 354:
-#line 1278 "./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 3961 "util/configparser.c"
-    break;
-
-  case 355:
-#line 1286 "./util/configparser.y"
-    {
-		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else if (atoi((yyvsp[0].str)) < 12)
-			yyerror("edns buffer size too small");
-		else if (atoi((yyvsp[0].str)) > 65535)
-			cfg_parser->cfg->edns_buffer_size = 65535;
-		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 3977 "util/configparser.c"
-    break;
-
-  case 356:
-#line 1299 "./util/configparser.y"
-    {
-		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else if (atoi((yyvsp[0].str)) < 4096)
-			yyerror("message buffer size too small (use 4096)");
-		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	}
-#line 3991 "util/configparser.c"
-    break;
-
-  case 357:
-#line 1310 "./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 4002 "util/configparser.c"
-    break;
-
-  case 358:
-#line 1318 "./util/configparser.y"
-    {
-		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->msg_cache_slabs = atoi((yyvsp[0].str));
-			if(!is_pow2(cfg_parser->cfg->msg_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free((yyvsp[0].str));
-	}
-#line 4018 "util/configparser.c"
-    break;
-
-  case 359:
-#line 1331 "./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 4030 "util/configparser.c"
-    break;
-
-  case 360:
-#line 1340 "./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 4042 "util/configparser.c"
-    break;
-
-  case 361:
-#line 1349 "./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 4054 "util/configparser.c"
-    break;
-
-  case 362:
-#line 1358 "./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.");
-		else cfg_parser->cfg->unblock_lan_zones = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4067 "util/configparser.c"
-    break;
-
-  case 363:
-#line 1368 "./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.");
-		else cfg_parser->cfg->insecure_lan_zones = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4080 "util/configparser.c"
-    break;
-
-  case 364:
-#line 1378 "./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 4091 "util/configparser.c"
-    break;
-
-  case 365:
-#line 1386 "./util/configparser.y"
-    {
-		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->rrset_cache_slabs = atoi((yyvsp[0].str));
-			if(!is_pow2(cfg_parser->cfg->rrset_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free((yyvsp[0].str));
-	}
-#line 4107 "util/configparser.c"
-    break;
-
-  case 366:
-#line 1399 "./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 4119 "util/configparser.c"
-    break;
-
-  case 367:
-#line 1408 "./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 4130 "util/configparser.c"
-    break;
-
-  case 368:
-#line 1416 "./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 4142 "util/configparser.c"
-    break;
-
-  case 369:
-#line 1425 "./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 4153 "util/configparser.c"
-    break;
-
-  case 370:
-#line 1433 "./util/configparser.y"
-    {
-		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->infra_cache_slabs = atoi((yyvsp[0].str));
-			if(!is_pow2(cfg_parser->cfg->infra_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free((yyvsp[0].str));
-	}
-#line 4169 "util/configparser.c"
-    break;
-
-  case 371:
-#line 1446 "./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 4181 "util/configparser.c"
-    break;
-
-  case 372:
-#line 1455 "./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 4191 "util/configparser.c"
-    break;
-
-  case 373:
-#line 1462 "./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.");
-		else cfg_parser->cfg->harden_short_bufsize = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4204 "util/configparser.c"
-    break;
-
-  case 374:
-#line 1472 "./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.");
-		else cfg_parser->cfg->harden_large_queries = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4217 "util/configparser.c"
-    break;
-
-  case 375:
-#line 1482 "./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.");
-		else cfg_parser->cfg->harden_glue = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4230 "util/configparser.c"
-    break;
-
-  case 376:
-#line 1492 "./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.");
-		else cfg_parser->cfg->harden_dnssec_stripped = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4243 "util/configparser.c"
-    break;
-
-  case 377:
-#line 1502 "./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.");
-		else cfg_parser->cfg->harden_below_nxdomain = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4256 "util/configparser.c"
-    break;
-
-  case 378:
-#line 1512 "./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.");
-		else cfg_parser->cfg->harden_referral_path = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4269 "util/configparser.c"
-    break;
-
-  case 379:
-#line 1522 "./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.");
-		else cfg_parser->cfg->harden_algo_downgrade = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4282 "util/configparser.c"
-    break;
-
-  case 380:
-#line 1532 "./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.");
-		else cfg_parser->cfg->use_caps_bits_for_id = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4295 "util/configparser.c"
-    break;
-
-  case 381:
-#line 1542 "./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 4305 "util/configparser.c"
-    break;
-
-  case 382:
-#line 1549 "./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 4315 "util/configparser.c"
-    break;
-
-  case 383:
-#line 1556 "./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 4325 "util/configparser.c"
-    break;
-
-  case 384:
-#line 1563 "./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 4337 "util/configparser.c"
-    break;
-
-  case 385:
-#line 1572 "./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 4349 "util/configparser.c"
-    break;
-
-  case 386:
-#line 1581 "./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 4361 "util/configparser.c"
-    break;
-
-  case 387:
-#line 1590 "./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 4373 "util/configparser.c"
-    break;
-
-  case 388:
-#line 1599 "./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 4383 "util/configparser.c"
-    break;
-
-  case 389:
-#line 1606 "./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.");
-		else cfg_parser->cfg->donotquery_localhost = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4396 "util/configparser.c"
-    break;
-
-  case 390:
-#line 1616 "./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 &&
-			strcmp((yyvsp[0].str), "refuse_non_local")!=0 &&
-			strcmp((yyvsp[0].str), "allow_setrd")!=0 && 
-			strcmp((yyvsp[0].str), "allow")!=0 && 
-			strcmp((yyvsp[0].str), "allow_snoop")!=0) {
-			yyerror("expected deny, refuse, deny_non_local, "
-				"refuse_non_local, allow, allow_setrd or "
-				"allow_snoop in access control action");
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		} else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[-1].str), (yyvsp[0].str)))
-				fatal_exit("out of memory adding acl");
-		}
-	}
-#line 4419 "util/configparser.c"
-    break;
-
-  case 391:
-#line 1636 "./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 4429 "util/configparser.c"
-    break;
-
-  case 392:
-#line 1643 "./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;
-		} else if(strlen((yyvsp[0].str)) == 14) {
-			cfg_parser->cfg->val_date_override = 
-				cfg_convert_timeval((yyvsp[0].str));
-			if(!cfg_parser->cfg->val_date_override)
-				yyerror("bad date/time specification");
-		} else {
-			if(atoi((yyvsp[0].str)) == 0)
-				yyerror("number expected");
-			cfg_parser->cfg->val_date_override = atoi((yyvsp[0].str));
-		}
-		free((yyvsp[0].str));
-	}
-#line 4450 "util/configparser.c"
-    break;
-
-  case 393:
-#line 1661 "./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;
-		} else {
-			cfg_parser->cfg->val_sig_skew_min = atoi((yyvsp[0].str));
-			if(!cfg_parser->cfg->val_sig_skew_min)
-				yyerror("number expected");
-		}
-		free((yyvsp[0].str));
-	}
-#line 4466 "util/configparser.c"
-    break;
-
-  case 394:
-#line 1674 "./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;
-		} else {
-			cfg_parser->cfg->val_sig_skew_max = atoi((yyvsp[0].str));
-			if(!cfg_parser->cfg->val_sig_skew_max)
-				yyerror("number expected");
-		}
-		free((yyvsp[0].str));
-	}
-#line 4482 "util/configparser.c"
-    break;
-
-  case 395:
-#line 1687 "./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 4494 "util/configparser.c"
-    break;
-
-  case 396:
-#line 1696 "./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 4506 "util/configparser.c"
-    break;
-
-  case 397:
-#line 1705 "./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 4518 "util/configparser.c"
-    break;
-
-  case 398:
-#line 1714 "./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 4530 "util/configparser.c"
-    break;
-
-  case 399:
-#line 1723 "./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.");
-		else cfg_parser->cfg->val_clean_additional = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4543 "util/configparser.c"
-    break;
-
-  case 400:
-#line 1733 "./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.");
-		else cfg_parser->cfg->val_permissive_mode = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4556 "util/configparser.c"
-    break;
-
-  case 401:
-#line 1743 "./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.");
-		else
-			cfg_parser->cfg->aggressive_nsec =
-				(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4570 "util/configparser.c"
-    break;
-
-  case 402:
-#line 1754 "./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 4582 "util/configparser.c"
-    break;
-
-  case 403:
-#line 1763 "./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 4594 "util/configparser.c"
-    break;
-
-  case 404:
-#line 1772 "./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 4606 "util/configparser.c"
-    break;
-
-  case 405:
-#line 1781 "./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 4618 "util/configparser.c"
-    break;
-
-  case 406:
-#line 1790 "./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 4630 "util/configparser.c"
-    break;
-
-  case 407:
-#line 1799 "./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 4642 "util/configparser.c"
-    break;
-
-  case 408:
-#line 1808 "./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.");
-#if defined(HAVE_SSL) || defined(HAVE_NETTLE)
-		else fake_dsa = (strcmp((yyvsp[0].str), "yes")==0);
-		if(fake_dsa)
-			log_warn("test option fake_dsa is enabled");
-#endif
-		free((yyvsp[0].str));
-	}
-#line 4658 "util/configparser.c"
-    break;
-
-  case 409:
-#line 1821 "./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.");
-#if defined(HAVE_SSL) || defined(HAVE_NETTLE)
-		else fake_sha1 = (strcmp((yyvsp[0].str), "yes")==0);
-		if(fake_sha1)
-			log_warn("test option fake_sha1 is enabled");
-#endif
-		free((yyvsp[0].str));
-	}
-#line 4674 "util/configparser.c"
-    break;
-
-  case 410:
-#line 1834 "./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 4686 "util/configparser.c"
-    break;
-
-  case 411:
-#line 1843 "./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 4696 "util/configparser.c"
-    break;
-
-  case 412:
-#line 1850 "./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 4708 "util/configparser.c"
-    break;
-
-  case 413:
-#line 1859 "./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 4720 "util/configparser.c"
-    break;
-
-  case 414:
-#line 1868 "./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 4732 "util/configparser.c"
-    break;
-
-  case 415:
-#line 1877 "./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.");
-		else cfg_parser->cfg->permit_small_holddown =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4745 "util/configparser.c"
-    break;
-
-  case 416:
-#line 1886 "./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 4756 "util/configparser.c"
-    break;
-
-  case 417:
-#line 1894 "./util/configparser.y"
-    {
-		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->key_cache_slabs = atoi((yyvsp[0].str));
-			if(!is_pow2(cfg_parser->cfg->key_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free((yyvsp[0].str));
-	}
-#line 4772 "util/configparser.c"
-    break;
-
-  case 418:
-#line 1907 "./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 4783 "util/configparser.c"
-    break;
-
-  case 419:
-#line 1915 "./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 &&
-		   strcmp((yyvsp[0].str), "transparent")!=0 && strcmp((yyvsp[0].str), "nodefault")!=0
-		   && strcmp((yyvsp[0].str), "typetransparent")!=0
-		   && strcmp((yyvsp[0].str), "always_transparent")!=0
-		   && strcmp((yyvsp[0].str), "always_refuse")!=0
-		   && strcmp((yyvsp[0].str), "always_nxdomain")!=0
-		   && strcmp((yyvsp[0].str), "noview")!=0
-		   && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0
-		   && strcmp((yyvsp[0].str), "inform_redirect") != 0
-			 && strcmp((yyvsp[0].str), "ipset") != 0) {
-			yyerror("local-zone type: expected static, deny, "
-				"refuse, redirect, transparent, "
-				"typetransparent, inform, inform_deny, "
-				"inform_redirect, always_transparent, "
-				"always_refuse, always_nxdomain, noview "
-				", nodefault or ipset");
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		} else if(strcmp((yyvsp[0].str), "nodefault")==0) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->
-				local_zones_nodefault, (yyvsp[-1].str)))
-				fatal_exit("out of memory adding local-zone");
-			free((yyvsp[0].str));
-#ifdef USE_IPSET
-		} else if(strcmp((yyvsp[0].str), "ipset")==0) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->
-				local_zones_ipset, (yyvsp[-1].str)))
-				fatal_exit("out of memory adding local-zone");
-			free((yyvsp[0].str));
-#endif
-		} else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->local_zones, 
-				(yyvsp[-1].str), (yyvsp[0].str)))
-				fatal_exit("out of memory adding local-zone");
-		}
-	}
-#line 4827 "util/configparser.c"
-    break;
-
-  case 420:
-#line 1956 "./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 4837 "util/configparser.c"
-    break;
-
-  case 421:
-#line 1963 "./util/configparser.y"
-    {
-		char* ptr;
-		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
-		ptr = cfg_ptr_reverse((yyvsp[0].str));
-		free((yyvsp[0].str));
-		if(ptr) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->
-				local_data, ptr))
-				fatal_exit("out of memory adding local-data");
-		} else {
-			yyerror("local-data-ptr could not be reversed");
-		}
-	}
-#line 4855 "util/configparser.c"
-    break;
-
-  case 422:
-#line 1978 "./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.");
-		else cfg_parser->cfg->minimal_responses =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4868 "util/configparser.c"
-    break;
-
-  case 423:
-#line 1988 "./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.");
-		else cfg_parser->cfg->rrset_roundrobin =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 4881 "util/configparser.c"
-    break;
-
-  case 424:
-#line 1998 "./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 4891 "util/configparser.c"
-    break;
-
-  case 425:
-#line 2005 "./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 4901 "util/configparser.c"
-    break;
-
-  case 426:
-#line 2012 "./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 4911 "util/configparser.c"
-    break;
-
-  case 427:
-#line 2019 "./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 4923 "util/configparser.c"
-    break;
-
-  case 428:
-#line 2028 "./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 4934 "util/configparser.c"
-    break;
-
-  case 429:
-#line 2036 "./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) {
-			if(*p) {
-				if(!config_add_tag(cfg_parser->cfg, p))
-					yyerror("could not define-tag, "
-						"out of memory");
-			}
-		}
-		free((yyvsp[0].str));
-	}
-#line 4951 "util/configparser.c"
-    break;
-
-  case 430:
-#line 2050 "./util/configparser.y"
-    {
-		size_t len = 0;
-		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
-			&len);
-		free((yyvsp[0].str));
-		OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[-1].str)));
-		if(!bitlist) {
-			yyerror("could not parse tags, (define-tag them first)");
-			free((yyvsp[-1].str));
-		}
-		if(bitlist) {
-			if(!cfg_strbytelist_insert(
-				&cfg_parser->cfg->local_zone_tags,
-				(yyvsp[-1].str), bitlist, len)) {
-				yyerror("out of memory");
-				free((yyvsp[-1].str));
-			}
-		}
-	}
-#line 4975 "util/configparser.c"
-    break;
-
-  case 431:
-#line 2071 "./util/configparser.y"
-    {
-		size_t len = 0;
-		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
-			&len);
-		free((yyvsp[0].str));
-		OUTYY(("P(server_access_control_tag:%s)\n", (yyvsp[-1].str)));
-		if(!bitlist) {
-			yyerror("could not parse tags, (define-tag them first)");
-			free((yyvsp[-1].str));
-		}
-		if(bitlist) {
-			if(!cfg_strbytelist_insert(
-				&cfg_parser->cfg->acl_tags,
-				(yyvsp[-1].str), bitlist, len)) {
-				yyerror("out of memory");
-				free((yyvsp[-1].str));
-			}
-		}
-	}
-#line 4999 "util/configparser.c"
-    break;
-
-  case 432:
-#line 2092 "./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))) {
-			yyerror("out of memory");
-			free((yyvsp[-2].str));
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		}
-	}
-#line 5014 "util/configparser.c"
-    break;
-
-  case 433:
-#line 2104 "./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))) {
-			yyerror("out of memory");
-			free((yyvsp[-2].str));
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		}
-	}
-#line 5029 "util/configparser.c"
-    break;
-
-  case 434:
-#line 2116 "./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))) {
-			yyerror("out of memory");
-			free((yyvsp[-2].str));
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		}
-	}
-#line 5044 "util/configparser.c"
-    break;
-
-  case 435:
-#line 2128 "./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 5056 "util/configparser.c"
-    break;
-
-  case 436:
-#line 2137 "./util/configparser.y"
-    {
-		size_t len = 0;
-		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
-			&len);
-		free((yyvsp[0].str));
-		OUTYY(("P(response_ip_tag:%s)\n", (yyvsp[-1].str)));
-		if(!bitlist) {
-			yyerror("could not parse tags, (define-tag them first)");
-			free((yyvsp[-1].str));
-		}
-		if(bitlist) {
-			if(!cfg_strbytelist_insert(
-				&cfg_parser->cfg->respip_tags,
-				(yyvsp[-1].str), bitlist, len)) {
-				yyerror("out of memory");
-				free((yyvsp[-1].str));
-			}
-		}
-	}
-#line 5080 "util/configparser.c"
-    break;
-
-  case 437:
-#line 2158 "./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 5092 "util/configparser.c"
-    break;
-
-  case 438:
-#line 2168 "./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 5104 "util/configparser.c"
-    break;
-
-  case 439:
-#line 2177 "./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 5115 "util/configparser.c"
-    break;
-
-  case 440:
-#line 2185 "./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 5126 "util/configparser.c"
-    break;
-
-  case 441:
-#line 2193 "./util/configparser.y"
-    {
-  	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
-  	if(atoi((yyvsp[0].str)) == 0)
-  		yyerror("number expected");
-  	else {
-  		cfg_parser->cfg->ip_ratelimit_slabs = atoi((yyvsp[0].str));
-  		if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
-  			yyerror("must be a power of 2");
-  	}
-  	free((yyvsp[0].str));
-  }
-#line 5142 "util/configparser.c"
-    break;
-
-  case 442:
-#line 2206 "./util/configparser.y"
-    {
-		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
-		if(atoi((yyvsp[0].str)) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->ratelimit_slabs = atoi((yyvsp[0].str));
-			if(!is_pow2(cfg_parser->cfg->ratelimit_slabs))
-				yyerror("must be a power of 2");
-		}
-		free((yyvsp[0].str));
-	}
-#line 5158 "util/configparser.c"
-    break;
-
-  case 443:
-#line 2219 "./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");
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		} else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->
-				ratelimit_for_domain, (yyvsp[-1].str), (yyvsp[0].str)))
-				fatal_exit("out of memory adding "
-					"ratelimit-for-domain");
-		}
-	}
-#line 5176 "util/configparser.c"
-    break;
-
-  case 444:
-#line 2234 "./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");
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		} else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->
-				ratelimit_below_domain, (yyvsp[-1].str), (yyvsp[0].str)))
-				fatal_exit("out of memory adding "
-					"ratelimit-below-domain");
-		}
-	}
-#line 5194 "util/configparser.c"
-    break;
-
-  case 445:
-#line 2249 "./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 5206 "util/configparser.c"
-    break;
-
-  case 446:
-#line 2258 "./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 5218 "util/configparser.c"
-    break;
-
-  case 447:
-#line 2267 "./util/configparser.y"
-    { 
-		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
-		free((yyvsp[0].str));
-	}
-#line 5227 "util/configparser.c"
-    break;
-
-  case 448:
-#line 2273 "./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 5239 "util/configparser.c"
-    break;
-
-  case 449:
-#line 2282 "./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 5251 "util/configparser.c"
-    break;
-
-  case 450:
-#line 2291 "./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.");
-		else cfg_parser->cfg->qname_minimisation = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5264 "util/configparser.c"
-    break;
-
-  case 451:
-#line 2301 "./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.");
-		else cfg_parser->cfg->qname_minimisation_strict = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5277 "util/configparser.c"
-    break;
-
-  case 452:
-#line 2311 "./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)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->ipsecmod_enabled = (strcmp((yyvsp[0].str), "yes")==0);
-	#else
-		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 5293 "util/configparser.c"
-    break;
-
-  case 453:
-#line 2324 "./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)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->ipsecmod_ignore_bogus = (strcmp((yyvsp[0].str), "yes")==0);
-	#else
-		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 5309 "util/configparser.c"
-    break;
-
-  case 454:
-#line 2337 "./util/configparser.y"
-    {
-	#ifdef USE_IPSECMOD
-		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
-		free(cfg_parser->cfg->ipsecmod_hook);
-		cfg_parser->cfg->ipsecmod_hook = (yyvsp[0].str);
-	#else
-		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 5324 "util/configparser.c"
-    break;
-
-  case 455:
-#line 2349 "./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)
-			yyerror("number expected");
-		else cfg_parser->cfg->ipsecmod_max_ttl = atoi((yyvsp[0].str));
-		free((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 5341 "util/configparser.c"
-    break;
-
-  case 456:
-#line 2363 "./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)))
-			yyerror("out of memory");
-	#else
-		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 5356 "util/configparser.c"
-    break;
-
-  case 457:
-#line 2375 "./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)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->ipsecmod_strict = (strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 5373 "util/configparser.c"
-    break;
-
-  case 458:
-#line 2389 "./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 "
-				"for one stub-zone");
-		free(cfg_parser->cfg->stubs->name);
-		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
-	}
-#line 5386 "util/configparser.c"
-    break;
-
-  case 459:
-#line 2399 "./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 5396 "util/configparser.c"
-    break;
-
-  case 460:
-#line 2406 "./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 5406 "util/configparser.c"
-    break;
-
-  case 461:
-#line 2413 "./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 5418 "util/configparser.c"
-    break;
-
-  case 462:
-#line 2422 "./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 5430 "util/configparser.c"
-    break;
-
-  case 463:
-#line 2431 "./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.");
-		else cfg_parser->cfg->stubs->ssl_upstream = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5443 "util/configparser.c"
-    break;
-
-  case 464:
-#line 2441 "./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.");
-		else cfg_parser->cfg->stubs->isprime = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5456 "util/configparser.c"
-    break;
-
-  case 465:
-#line 2451 "./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 "
-				"name for one forward-zone");
-		free(cfg_parser->cfg->forwards->name);
-		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
-	}
-#line 5469 "util/configparser.c"
-    break;
-
-  case 466:
-#line 2461 "./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 5479 "util/configparser.c"
-    break;
-
-  case 467:
-#line 2468 "./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 5489 "util/configparser.c"
-    break;
-
-  case 468:
-#line 2475 "./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 5501 "util/configparser.c"
-    break;
-
-  case 469:
-#line 2484 "./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 5513 "util/configparser.c"
-    break;
-
-  case 470:
-#line 2493 "./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.");
-		else cfg_parser->cfg->forwards->ssl_upstream = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5526 "util/configparser.c"
-    break;
-
-  case 471:
-#line 2503 "./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 "
-				"for one auth-zone");
-		free(cfg_parser->cfg->auths->name);
-		cfg_parser->cfg->auths->name = (yyvsp[0].str);
-	}
-#line 5539 "util/configparser.c"
-    break;
-
-  case 472:
-#line 2513 "./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 5549 "util/configparser.c"
-    break;
-
-  case 473:
-#line 2520 "./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 5559 "util/configparser.c"
-    break;
-
-  case 474:
-#line 2527 "./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 5569 "util/configparser.c"
-    break;
-
-  case 475:
-#line 2534 "./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 5580 "util/configparser.c"
-    break;
-
-  case 476:
-#line 2542 "./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.");
-		else cfg_parser->cfg->auths->for_downstream =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5593 "util/configparser.c"
-    break;
-
-  case 477:
-#line 2552 "./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.");
-		else cfg_parser->cfg->auths->for_upstream =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5606 "util/configparser.c"
-    break;
-
-  case 478:
-#line 2562 "./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.");
-		else cfg_parser->cfg->auths->fallback_enabled =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5619 "util/configparser.c"
-    break;
-
-  case 479:
-#line 2572 "./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 "
-				"name for one view");
-		free(cfg_parser->cfg->views->name);
-		cfg_parser->cfg->views->name = (yyvsp[0].str);
-	}
-#line 5632 "util/configparser.c"
-    break;
-
-  case 480:
-#line 2582 "./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 &&
-		   strcmp((yyvsp[0].str), "transparent")!=0 && strcmp((yyvsp[0].str), "nodefault")!=0
-		   && strcmp((yyvsp[0].str), "typetransparent")!=0
-		   && strcmp((yyvsp[0].str), "always_transparent")!=0
-		   && strcmp((yyvsp[0].str), "always_refuse")!=0
-		   && strcmp((yyvsp[0].str), "always_nxdomain")!=0
-		   && strcmp((yyvsp[0].str), "noview")!=0
-		   && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0) {
-			yyerror("local-zone type: expected static, deny, "
-				"refuse, redirect, transparent, "
-				"typetransparent, inform, inform_deny, "
-				"always_transparent, always_refuse, "
-				"always_nxdomain, noview or nodefault");
-			free((yyvsp[-1].str));
-			free((yyvsp[0].str));
-		} else if(strcmp((yyvsp[0].str), "nodefault")==0) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->views->
-				local_zones_nodefault, (yyvsp[-1].str)))
-				fatal_exit("out of memory adding local-zone");
-			free((yyvsp[0].str));
-#ifdef USE_IPSET
-		} else if(strcmp((yyvsp[0].str), "ipset")==0) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->views->
-				local_zones_ipset, (yyvsp[-1].str)))
-				fatal_exit("out of memory adding local-zone");
-			free((yyvsp[0].str));
-#endif
-		} else {
-			if(!cfg_str2list_insert(
-				&cfg_parser->cfg->views->local_zones, 
-				(yyvsp[-1].str), (yyvsp[0].str)))
-				fatal_exit("out of memory adding local-zone");
-		}
-	}
-#line 5674 "util/configparser.c"
-    break;
-
-  case 481:
-#line 2621 "./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(
-			&cfg_parser->cfg->views->respip_actions, (yyvsp[-1].str), (yyvsp[0].str)))
-			fatal_exit("out of memory adding per-view "
-				"response-ip action");
-	}
-#line 5687 "util/configparser.c"
-    break;
-
-  case 482:
-#line 2631 "./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 5698 "util/configparser.c"
-    break;
-
-  case 483:
-#line 2639 "./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 5709 "util/configparser.c"
-    break;
-
-  case 484:
-#line 2647 "./util/configparser.y"
-    {
-		char* ptr;
-		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
-		ptr = cfg_ptr_reverse((yyvsp[0].str));
-		free((yyvsp[0].str));
-		if(ptr) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->views->
-				local_data, ptr))
-				fatal_exit("out of memory adding local-data");
-		} else {
-			yyerror("local-data-ptr could not be reversed");
-		}
-	}
-#line 5727 "util/configparser.c"
-    break;
-
-  case 485:
-#line 2662 "./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 5739 "util/configparser.c"
-    break;
-
-  case 486:
-#line 2671 "./util/configparser.y"
-    { 
-		OUTYY(("\nP(remote-control:)\n")); 
-	}
-#line 5747 "util/configparser.c"
-    break;
-
-  case 497:
-#line 2682 "./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.");
-		else cfg_parser->cfg->remote_control_enable = 
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5760 "util/configparser.c"
-    break;
-
-  case 498:
-#line 2692 "./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 5772 "util/configparser.c"
-    break;
-
-  case 499:
-#line 2701 "./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 5782 "util/configparser.c"
-    break;
-
-  case 500:
-#line 2708 "./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 5792 "util/configparser.c"
-    break;
-
-  case 501:
-#line 2715 "./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 5802 "util/configparser.c"
-    break;
-
-  case 502:
-#line 2722 "./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 5812 "util/configparser.c"
-    break;
-
-  case 503:
-#line 2729 "./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 5822 "util/configparser.c"
-    break;
-
-  case 504:
-#line 2736 "./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 5832 "util/configparser.c"
-    break;
-
-  case 505:
-#line 2743 "./util/configparser.y"
-    {
-		OUTYY(("\nP(dnstap:)\n"));
-	}
-#line 5840 "util/configparser.c"
-    break;
-
-  case 526:
-#line 2763 "./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 5852 "util/configparser.c"
-    break;
-
-  case 527:
-#line 2772 "./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 5862 "util/configparser.c"
-    break;
-
-  case 528:
-#line 2779 "./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 5872 "util/configparser.c"
-    break;
-
-  case 529:
-#line 2786 "./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 5884 "util/configparser.c"
-    break;
-
-  case 530:
-#line 2795 "./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 5894 "util/configparser.c"
-    break;
-
-  case 531:
-#line 2802 "./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 5904 "util/configparser.c"
-    break;
-
-  case 532:
-#line 2809 "./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 5914 "util/configparser.c"
-    break;
-
-  case 533:
-#line 2816 "./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 5924 "util/configparser.c"
-    break;
-
-  case 534:
-#line 2823 "./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 5936 "util/configparser.c"
-    break;
-
-  case 535:
-#line 2832 "./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 5948 "util/configparser.c"
-    break;
-
-  case 536:
-#line 2841 "./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 5958 "util/configparser.c"
-    break;
-
-  case 537:
-#line 2848 "./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 5968 "util/configparser.c"
-    break;
-
-  case 538:
-#line 2855 "./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.");
-		else cfg_parser->cfg->dnstap_log_resolver_query_messages =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5981 "util/configparser.c"
-    break;
-
-  case 539:
-#line 2865 "./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.");
-		else cfg_parser->cfg->dnstap_log_resolver_response_messages =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 5994 "util/configparser.c"
-    break;
-
-  case 540:
-#line 2875 "./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.");
-		else cfg_parser->cfg->dnstap_log_client_query_messages =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 6007 "util/configparser.c"
-    break;
-
-  case 541:
-#line 2885 "./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.");
-		else cfg_parser->cfg->dnstap_log_client_response_messages =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 6020 "util/configparser.c"
-    break;
-
-  case 542:
-#line 2895 "./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.");
-		else cfg_parser->cfg->dnstap_log_forwarder_query_messages =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 6033 "util/configparser.c"
-    break;
-
-  case 543:
-#line 2905 "./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.");
-		else cfg_parser->cfg->dnstap_log_forwarder_response_messages =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 6046 "util/configparser.c"
-    break;
-
-  case 544:
-#line 2915 "./util/configparser.y"
-    { 
-		OUTYY(("\nP(python:)\n")); 
-	}
-#line 6054 "util/configparser.c"
-    break;
-
-  case 548:
-#line 2924 "./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 6064 "util/configparser.c"
-    break;
-
-  case 549:
-#line 2930 "./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.");
-		else cfg_parser->cfg->disable_dnssec_lame_check =
-			(strcmp((yyvsp[0].str), "yes")==0);
-		free((yyvsp[0].str));
-	}
-#line 6077 "util/configparser.c"
-    break;
-
-  case 550:
-#line 2940 "./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 6087 "util/configparser.c"
-    break;
-
-  case 551:
-#line 2947 "./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 6099 "util/configparser.c"
-    break;
-
-  case 552:
-#line 2956 "./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 6110 "util/configparser.c"
-    break;
-
-  case 553:
-#line 2964 "./util/configparser.y"
-    {
-		OUTYY(("\nP(dnscrypt:)\n"));
-	}
-#line 6118 "util/configparser.c"
-    break;
-
-  case 566:
-#line 2980 "./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 6130 "util/configparser.c"
-    break;
-
-  case 567:
-#line 2990 "./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 6142 "util/configparser.c"
-    break;
-
-  case 568:
-#line 2999 "./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 6152 "util/configparser.c"
-    break;
-
-  case 569:
-#line 3006 "./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 6164 "util/configparser.c"
-    break;
-
-  case 570:
-#line 3015 "./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 6174 "util/configparser.c"
-    break;
-
-  case 571:
-#line 3022 "./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 6186 "util/configparser.c"
-    break;
-
-  case 572:
-#line 3031 "./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 6197 "util/configparser.c"
-    break;
-
-  case 573:
-#line 3039 "./util/configparser.y"
-    {
-  	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
-  	if(atoi((yyvsp[0].str)) == 0)
-  		yyerror("number expected");
-  	else {
-  		cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs = atoi((yyvsp[0].str));
-  		if(!is_pow2(cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs))
-  			yyerror("must be a power of 2");
-  	}
-  	free((yyvsp[0].str));
-  }
-#line 6213 "util/configparser.c"
-    break;
-
-  case 574:
-#line 3052 "./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 6224 "util/configparser.c"
-    break;
-
-  case 575:
-#line 3060 "./util/configparser.y"
-    {
-  	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
-  	if(atoi((yyvsp[0].str)) == 0)
-  		yyerror("number expected");
-  	else {
-  		cfg_parser->cfg->dnscrypt_nonce_cache_slabs = atoi((yyvsp[0].str));
-  		if(!is_pow2(cfg_parser->cfg->dnscrypt_nonce_cache_slabs))
-  			yyerror("must be a power of 2");
-  	}
-  	free((yyvsp[0].str));
-  }
-#line 6240 "util/configparser.c"
-    break;
-
-  case 576:
-#line 3073 "./util/configparser.y"
-    {
-		OUTYY(("\nP(cachedb:)\n"));
-	}
-#line 6248 "util/configparser.c"
-    break;
-
-  case 584:
-#line 3083 "./util/configparser.y"
-    {
-	#ifdef USE_CACHEDB
-		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
-		free(cfg_parser->cfg->cachedb_backend);
-		cfg_parser->cfg->cachedb_backend = (yyvsp[0].str);
-	#else
-		OUTYY(("P(Compiled without cachedb, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 6263 "util/configparser.c"
-    break;
-
-  case 585:
-#line 3095 "./util/configparser.y"
-    {
-	#ifdef USE_CACHEDB
-		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
-		free(cfg_parser->cfg->cachedb_secret);
-		cfg_parser->cfg->cachedb_secret = (yyvsp[0].str);
-	#else
-		OUTYY(("P(Compiled without cachedb, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 6278 "util/configparser.c"
-    break;
-
-  case 586:
-#line 3107 "./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);
-		cfg_parser->cfg->redis_server_host = (yyvsp[0].str);
-	#else
-		OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
-		free((yyvsp[0].str));
-	#endif
-	}
-#line 6293 "util/configparser.c"
-    break;
-
-  case 587:
-#line 3119 "./util/configparser.y"
-    {
-	#if defined(USE_CACHEDB) && defined(USE_REDIS)
-		int port;
-		OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str)));
-		port = atoi((yyvsp[0].str));
-		if(port == 0 || port < 0 || port > 65535)
-			yyerror("valid redis server port number expected");
-		else cfg_parser->cfg->redis_server_port = port;
-	#else
-		OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 6311 "util/configparser.c"
-    break;
-
-  case 588:
-#line 3134 "./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)
-			yyerror("redis timeout value expected");
-		else cfg_parser->cfg->redis_timeout = atoi((yyvsp[0].str));
-	#else
-		OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
-	#endif
-		free((yyvsp[0].str));
-	}
-#line 6327 "util/configparser.c"
-    break;
-
-  case 589:
-#line 3147 "./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");
-		else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->tcp_connection_limits, (yyvsp[-1].str), (yyvsp[0].str)))
-				fatal_exit("out of memory adding tcp connection limit");
-		}
-	}
-#line 6341 "util/configparser.c"
-    break;
-
-  case 590:
-#line 3158 "./util/configparser.y"
-    {
-			OUTYY(("\nP(ipset:)\n"));
-		}
-#line 6349 "util/configparser.c"
-    break;
-
-  case 595:
-#line 3167 "./util/configparser.y"
-    {
-		#ifdef USE_IPSET
-			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
-			if(cfg_parser->cfg->ipset_name_v4)
-				yyerror("ipset name v4 override, there must be one "
-					"name for ip v4");
-			free(cfg_parser->cfg->ipset_name_v4);
-			cfg_parser->cfg->ipset_name_v4 = (yyvsp[0].str);
-		#else
-			OUTYY(("P(Compiled without ipset, ignoring)\n"));
-			free((yyvsp[0].str));
-		#endif
-		}
-#line 6367 "util/configparser.c"
-    break;
-
-  case 596:
-#line 3182 "./util/configparser.y"
-    {
-		#ifdef USE_IPSET
-			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
-			if(cfg_parser->cfg->ipset_name_v6)
-				yyerror("ipset name v6 override, there must be one "
-					"name for ip v6");
-			free(cfg_parser->cfg->ipset_name_v6);
-			cfg_parser->cfg->ipset_name_v6 = (yyvsp[0].str);
-		#else
-			OUTYY(("P(Compiled without ipset, ignoring)\n"));
-			free((yyvsp[0].str));
-		#endif
-		}
-#line 6385 "util/configparser.c"
-    break;
-
-
-#line 6389 "util/configparser.c"
-
-      default: break;
-    }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-  /* 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]);
-  }
-
-  goto yynewstate;
-
-
-/*--------------------------------------.
-| yyerrlab -- here on detecting error.  |
-`--------------------------------------*/
-yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
+#ifdef YYMAXDEPTH
+#define YYSTACKSIZE YYMAXDEPTH
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval);
-          yychar = YYEMPTY;
-        }
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| 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;
-
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-
-
-      yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
 #endif
 
+#define YYINITSTACKSIZE 200
 
-/*-----------------------------------------------------.
-| yyreturn -- parsing is finished, return the result.  |
-`-----------------------------------------------------*/
-yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  return yyresult;
-}
-#line 3196 "./util/configparser.y"
-
+typedef struct {
+    unsigned stacksize;
+    YYINT    *s_base;
+    YYINT    *s_mark;
+    YYINT    *s_last;
+    YYSTYPE  *l_base;
+    YYSTYPE  *l_mark;
+} YYSTACKDATA;
+/* variables for the parser stack */
+static YYSTACKDATA yystack;
+#line 3237 "./util/configparser.y"
 
 /* parse helper routines could be here */
 static void
@@ -6639,3 +1809,3430 @@ validate_respip_action(const char* action)
 }
 
 
+#line 1813 "util/configparser.c"
+
+#if YYDEBUG
+#include <stdio.h>		/* needed for printf */
+#endif
+
+#include <stdlib.h>	/* needed for malloc, etc */
+#include <string.h>	/* needed for memset */
+
+/* allocate initial stack or double stack size, up to YYMAXDEPTH */
+static int yygrowstack(YYSTACKDATA *data)
+{
+    int i;
+    unsigned newsize;
+    YYINT *newss;
+    YYSTYPE *newvs;
+
+    if ((newsize = data->stacksize) == 0)
+        newsize = YYINITSTACKSIZE;
+    else if (newsize >= YYMAXDEPTH)
+        return YYENOMEM;
+    else if ((newsize *= 2) > YYMAXDEPTH)
+        newsize = YYMAXDEPTH;
+
+    i = (int) (data->s_mark - data->s_base);
+    newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss));
+    if (newss == 0)
+        return YYENOMEM;
+
+    data->s_base = newss;
+    data->s_mark = newss + i;
+
+    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
+    if (newvs == 0)
+        return YYENOMEM;
+
+    data->l_base = newvs;
+    data->l_mark = newvs + i;
+
+    data->stacksize = newsize;
+    data->s_last = data->s_base + newsize - 1;
+    return 0;
+}
+
+#if YYPURE || defined(YY_NO_LEAKS)
+static void yyfreestack(YYSTACKDATA *data)
+{
+    free(data->s_base);
+    free(data->l_base);
+    memset(data, 0, sizeof(*data));
+}
+#else
+#define yyfreestack(data) /* nothing */
+#endif
+
+#define YYABORT  goto yyabort
+#define YYREJECT goto yyabort
+#define YYACCEPT goto yyaccept
+#define YYERROR  goto yyerrlab
+
+int
+YYPARSE_DECL()
+{
+    int yym, yyn, yystate;
+#if YYDEBUG
+    const char *yys;
+
+    if ((yys = getenv("YYDEBUG")) != 0)
+    {
+        yyn = *yys;
+        if (yyn >= '0' && yyn <= '9')
+            yydebug = yyn - '0';
+    }
+#endif
+
+    yynerrs = 0;
+    yyerrflag = 0;
+    yychar = YYEMPTY;
+    yystate = 0;
+
+#if YYPURE
+    memset(&yystack, 0, sizeof(yystack));
+#endif
+
+    if (yystack.s_base == NULL && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
+    yystack.s_mark = yystack.s_base;
+    yystack.l_mark = yystack.l_base;
+    yystate = 0;
+    *yystack.s_mark = 0;
+
+yyloop:
+    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
+    if (yychar < 0)
+    {
+        if ((yychar = YYLEX) < 0) yychar = YYEOF;
+#if YYDEBUG
+        if (yydebug)
+        {
+            yys = yyname[YYTRANSLATE(yychar)];
+            printf("%sdebug: state %d, reading %d (%s)\n",
+                    YYPREFIX, yystate, yychar, yys);
+        }
+#endif
+    }
+    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    {
+#if YYDEBUG
+        if (yydebug)
+            printf("%sdebug: state %d, shifting to state %d\n",
+                    YYPREFIX, yystate, yytable[yyn]);
+#endif
+        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
+        {
+            goto yyoverflow;
+        }
+        yystate = yytable[yyn];
+        *++yystack.s_mark = yytable[yyn];
+        *++yystack.l_mark = yylval;
+        yychar = YYEMPTY;
+        if (yyerrflag > 0)  --yyerrflag;
+        goto yyloop;
+    }
+    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    {
+        yyn = yytable[yyn];
+        goto yyreduce;
+    }
+    if (yyerrflag) goto yyinrecovery;
+
+    YYERROR_CALL("syntax error");
+
+    goto yyerrlab;
+
+yyerrlab:
+    ++yynerrs;
+
+yyinrecovery:
+    if (yyerrflag < 3)
+    {
+        yyerrflag = 3;
+        for (;;)
+        {
+            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
+                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
+            {
+#if YYDEBUG
+                if (yydebug)
+                    printf("%sdebug: state %d, error recovery shifting\
+ to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
+#endif
+                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
+                {
+                    goto yyoverflow;
+                }
+                yystate = yytable[yyn];
+                *++yystack.s_mark = yytable[yyn];
+                *++yystack.l_mark = yylval;
+                goto yyloop;
+            }
+            else
+            {
+#if YYDEBUG
+                if (yydebug)
+                    printf("%sdebug: error recovery discarding state %d\n",
+                            YYPREFIX, *yystack.s_mark);
+#endif
+                if (yystack.s_mark <= yystack.s_base) goto yyabort;
+                --yystack.s_mark;
+                --yystack.l_mark;
+            }
+        }
+    }
+    else
+    {
+        if (yychar == YYEOF) goto yyabort;
+#if YYDEBUG
+        if (yydebug)
+        {
+            yys = yyname[YYTRANSLATE(yychar)];
+            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
+                    YYPREFIX, yystate, yychar, yys);
+        }
+#endif
+        yychar = YYEMPTY;
+        goto yyloop;
+    }
+
+yyreduce:
+#if YYDEBUG
+    if (yydebug)
+        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
+                YYPREFIX, yystate, yyn, yyrule[yyn]);
+#endif
+    yym = yylen[yyn];
+    if (yym)
+        yyval = yystack.l_mark[1-yym];
+    else
+        memset(&yyval, 0, sizeof yyval);
+    switch (yyn)
+    {
+case 15:
+#line 191 "./util/configparser.y"
+	{ 
+		OUTYY(("\nP(server:)\n")); 
+	}
+break;
+case 211:
+#line 284 "./util/configparser.y"
+	{
+		struct config_stub* s;
+		OUTYY(("\nP(stub_zone:)\n")); 
+		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
+		if(s) {
+			s->next = cfg_parser->cfg->stubs;
+			cfg_parser->cfg->stubs = s;
+		} else 
+			yyerror("out of memory");
+	}
+break;
+case 221:
+#line 301 "./util/configparser.y"
+	{
+		struct config_stub* s;
+		OUTYY(("\nP(forward_zone:)\n")); 
+		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
+		if(s) {
+			s->next = cfg_parser->cfg->forwards;
+			cfg_parser->cfg->forwards = s;
+		} else 
+			yyerror("out of memory");
+	}
+break;
+case 230:
+#line 318 "./util/configparser.y"
+	{
+		struct config_view* s;
+		OUTYY(("\nP(view:)\n")); 
+		s = (struct config_view*)calloc(1, sizeof(struct config_view));
+		if(s) {
+			s->next = cfg_parser->cfg->views;
+			if(s->next && !s->next->name)
+				yyerror("view without name");
+			cfg_parser->cfg->views = s;
+		} else 
+			yyerror("out of memory");
+	}
+break;
+case 240:
+#line 337 "./util/configparser.y"
+	{
+		struct config_auth* s;
+		OUTYY(("\nP(auth_zone:)\n")); 
+		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
+		if(s) {
+			s->next = cfg_parser->cfg->auths;
+			cfg_parser->cfg->auths = s;
+			/* defaults for auth zone */
+			s->for_downstream = 1;
+			s->for_upstream = 1;
+			s->fallback_enabled = 0;
+			s->isrpz = 0;
+		} else 
+			yyerror("out of memory");
+	}
+break;
+case 251:
+#line 361 "./util/configparser.y"
+	{
+		uint8_t* bitlist;
+		size_t len = 0;
+		OUTYY(("P(server_local_zone_tag:%s)\n", yystack.l_mark[0].str));
+		bitlist = config_parse_taglist(cfg_parser->cfg, yystack.l_mark[0].str,
+			&len);
+		free(yystack.l_mark[0].str);
+		if(!bitlist) {
+			yyerror("could not parse tags, (define-tag them first)");
+		}
+		if(bitlist) {
+			cfg_parser->cfg->auths->rpz_taglist = bitlist;
+			cfg_parser->cfg->auths->rpz_taglistlen = len;
+
+		}
+	}
+break;
+case 252:
+#line 380 "./util/configparser.y"
+	{
+		OUTYY(("P(rpz_action_override:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "nxdomain")!=0 && strcmp(yystack.l_mark[0].str, "nodata")!=0 &&
+		   strcmp(yystack.l_mark[0].str, "passthru")!=0 && strcmp(yystack.l_mark[0].str, "drop")!=0 &&
+		   strcmp(yystack.l_mark[0].str, "cname")!=0 && strcmp(yystack.l_mark[0].str, "disabled")!=0) {
+			yyerror("rpz-action-override action: expected nxdomain, "
+				"nodata, passthru, drop, cname or disabled");
+			free(yystack.l_mark[0].str);
+			cfg_parser->cfg->auths->rpz_action_override = NULL;
+		}
+		else {
+			cfg_parser->cfg->auths->rpz_action_override = yystack.l_mark[0].str;
+		}
+	}
+break;
+case 253:
+#line 397 "./util/configparser.y"
+	{
+		OUTYY(("P(rpz_cname_override:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->auths->rpz_cname);
+		cfg_parser->cfg->auths->rpz_cname = yystack.l_mark[0].str;
+	}
+break;
+case 254:
+#line 405 "./util/configparser.y"
+	{
+		OUTYY(("P(rpz_log:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->rpz_log = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 255:
+#line 415 "./util/configparser.y"
+	{
+		OUTYY(("P(rpz_log_name:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->auths->rpz_log_name);
+		cfg_parser->cfg->auths->rpz_log_name = yystack.l_mark[0].str;
+	}
+break;
+case 256:
+#line 423 "./util/configparser.y"
+	{
+		struct config_auth* s;
+		OUTYY(("\nP(rpz:)\n")); 
+		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
+		if(s) {
+			s->next = cfg_parser->cfg->auths;
+			cfg_parser->cfg->auths = s;
+			/* defaults for RPZ auth zone */
+			s->for_downstream = 0;
+			s->for_upstream = 0;
+			s->fallback_enabled = 0;
+			s->isrpz = 1;
+		} else 
+			yyerror("out of memory");
+	}
+break;
+case 269:
+#line 446 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_num_threads:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->num_threads = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 270:
+#line 455 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_verbosity:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->verbosity = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 271:
+#line 464 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_statistics_interval:%s)\n", yystack.l_mark[0].str)); 
+		if(strcmp(yystack.l_mark[0].str, "") == 0 || strcmp(yystack.l_mark[0].str, "0") == 0)
+			cfg_parser->cfg->stat_interval = 0;
+		else if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->stat_interval = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 272:
+#line 475 "./util/configparser.y"
+	{
+		OUTYY(("P(server_statistics_cumulative:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->stat_cumulative = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 273:
+#line 484 "./util/configparser.y"
+	{
+		OUTYY(("P(server_extended_statistics:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->stat_extended = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 274:
+#line 493 "./util/configparser.y"
+	{
+		OUTYY(("P(server_shm_enable:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->shm_enable = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 275:
+#line 502 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_shm_key:%s)\n", yystack.l_mark[0].str)); 
+		if(strcmp(yystack.l_mark[0].str, "") == 0 || strcmp(yystack.l_mark[0].str, "0") == 0)
+			cfg_parser->cfg->shm_key = 0;
+		else if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->shm_key = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 276:
+#line 513 "./util/configparser.y"
+	{
+		OUTYY(("P(server_port:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->port = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 277:
+#line 522 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(server_send_client_subnet:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding client-subnet");
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 278:
+#line 534 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(server_client_subnet_zone:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet_zone,
+			yystack.l_mark[0].str))
+			fatal_exit("out of memory adding client-subnet-zone");
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 279:
+#line 548 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(server_client_subnet_always_forward:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else
+			cfg_parser->cfg->client_subnet_always_forward =
+				(strcmp(yystack.l_mark[0].str, "yes")==0);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 280:
+#line 563 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(client_subnet_opcode:%s)\n", yystack.l_mark[0].str));
+		OUTYY(("P(Deprecated option, ignoring)\n"));
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 281:
+#line 574 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(max_client_subnet_ipv4:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("IPv4 subnet length expected");
+		else if (atoi(yystack.l_mark[0].str) > 32)
+			cfg_parser->cfg->max_client_subnet_ipv4 = 32;
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			cfg_parser->cfg->max_client_subnet_ipv4 = 0;
+		else cfg_parser->cfg->max_client_subnet_ipv4 = (uint8_t)atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 282:
+#line 591 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(max_client_subnet_ipv6:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("Ipv6 subnet length expected");
+		else if (atoi(yystack.l_mark[0].str) > 128)
+			cfg_parser->cfg->max_client_subnet_ipv6 = 128;
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			cfg_parser->cfg->max_client_subnet_ipv6 = 0;
+		else cfg_parser->cfg->max_client_subnet_ipv6 = (uint8_t)atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 283:
+#line 608 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(min_client_subnet_ipv4:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("IPv4 subnet length expected");
+		else if (atoi(yystack.l_mark[0].str) > 32)
+			cfg_parser->cfg->min_client_subnet_ipv4 = 32;
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			cfg_parser->cfg->min_client_subnet_ipv4 = 0;
+		else cfg_parser->cfg->min_client_subnet_ipv4 = (uint8_t)atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 284:
+#line 625 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(min_client_subnet_ipv6:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("Ipv6 subnet length expected");
+		else if (atoi(yystack.l_mark[0].str) > 128)
+			cfg_parser->cfg->min_client_subnet_ipv6 = 128;
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			cfg_parser->cfg->min_client_subnet_ipv6 = 0;
+		else cfg_parser->cfg->min_client_subnet_ipv6 = (uint8_t)atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 285:
+#line 642 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("IPv4 ECS tree size expected");
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			cfg_parser->cfg->max_ecs_tree_size_ipv4 = 0;
+		else cfg_parser->cfg->max_ecs_tree_size_ipv4 = (uint32_t)atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 286:
+#line 657 "./util/configparser.y"
+	{
+	#ifdef CLIENT_SUBNET
+		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("IPv6 ECS tree size expected");
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			cfg_parser->cfg->max_ecs_tree_size_ipv6 = 0;
+		else cfg_parser->cfg->max_ecs_tree_size_ipv6 = (uint32_t)atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 287:
+#line 672 "./util/configparser.y"
+	{
+		OUTYY(("P(server_interface:%s)\n", yystack.l_mark[0].str));
+		if(cfg_parser->cfg->num_ifs == 0)
+			cfg_parser->cfg->ifs = calloc(1, sizeof(char*));
+		else 	cfg_parser->cfg->ifs = realloc(cfg_parser->cfg->ifs,
+				(cfg_parser->cfg->num_ifs+1)*sizeof(char*));
+		if(!cfg_parser->cfg->ifs)
+			yyerror("out of memory");
+		else
+			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = yystack.l_mark[0].str;
+	}
+break;
+case 288:
+#line 685 "./util/configparser.y"
+	{
+		OUTYY(("P(server_outgoing_interface:%s)\n", yystack.l_mark[0].str));
+		if(cfg_parser->cfg->num_out_ifs == 0)
+			cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*));
+		else 	cfg_parser->cfg->out_ifs = realloc(
+			cfg_parser->cfg->out_ifs, 
+			(cfg_parser->cfg->num_out_ifs+1)*sizeof(char*));
+		if(!cfg_parser->cfg->out_ifs)
+			yyerror("out of memory");
+		else
+			cfg_parser->cfg->out_ifs[
+				cfg_parser->cfg->num_out_ifs++] = yystack.l_mark[0].str;
+	}
+break;
+case 289:
+#line 700 "./util/configparser.y"
+	{
+		OUTYY(("P(server_outgoing_range:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->outgoing_num_ports = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 290:
+#line 709 "./util/configparser.y"
+	{
+		OUTYY(("P(server_outgoing_port_permit:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_mark_ports(yystack.l_mark[0].str, 1, 
+			cfg_parser->cfg->outgoing_avail_ports, 65536))
+			yyerror("port number or range (\"low-high\") expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 291:
+#line 718 "./util/configparser.y"
+	{
+		OUTYY(("P(server_outgoing_port_avoid:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_mark_ports(yystack.l_mark[0].str, 0, 
+			cfg_parser->cfg->outgoing_avail_ports, 65536))
+			yyerror("port number or range (\"low-high\") expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 292:
+#line 727 "./util/configparser.y"
+	{
+		OUTYY(("P(server_outgoing_num_tcp:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->outgoing_num_tcp = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 293:
+#line 736 "./util/configparser.y"
+	{
+		OUTYY(("P(server_incoming_num_tcp:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->incoming_num_tcp = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 294:
+#line 745 "./util/configparser.y"
+	{
+		OUTYY(("P(server_interface_automatic:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->if_automatic = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 295:
+#line 754 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_ip4:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->do_ip4 = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 296:
+#line 763 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_ip6:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->do_ip6 = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 297:
+#line 772 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_udp:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->do_udp = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 298:
+#line 781 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_tcp:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->do_tcp = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 299:
+#line 790 "./util/configparser.y"
+	{
+		OUTYY(("P(server_prefer_ip4:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->prefer_ip4 = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 300:
+#line 799 "./util/configparser.y"
+	{
+		OUTYY(("P(server_prefer_ip6:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->prefer_ip6 = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 301:
+#line 808 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tcp_mss:%s)\n", yystack.l_mark[0].str));
+                if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+                        yyerror("number expected");
+                else cfg_parser->cfg->tcp_mss = atoi(yystack.l_mark[0].str);
+                free(yystack.l_mark[0].str);
+	}
+break;
+case 302:
+#line 817 "./util/configparser.y"
+	{
+		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->outgoing_tcp_mss = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 303:
+#line 826 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tcp_idle_timeout:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else if (atoi(yystack.l_mark[0].str) > 120000)
+			cfg_parser->cfg->tcp_idle_timeout = 120000;
+		else if (atoi(yystack.l_mark[0].str) < 1)
+			cfg_parser->cfg->tcp_idle_timeout = 1;
+		else cfg_parser->cfg->tcp_idle_timeout = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 304:
+#line 839 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tcp_keepalive:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->do_tcp_keepalive = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 305:
+#line 848 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else if (atoi(yystack.l_mark[0].str) > 6553500)
+			cfg_parser->cfg->tcp_keepalive_timeout = 6553500;
+		else if (atoi(yystack.l_mark[0].str) < 1)
+			cfg_parser->cfg->tcp_keepalive_timeout = 0;
+		else cfg_parser->cfg->tcp_keepalive_timeout = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 306:
+#line 861 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tcp_upstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->tcp_upstream = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 307:
+#line 870 "./util/configparser.y"
+	{
+		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 308:
+#line 879 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ssl_upstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->ssl_upstream = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 309:
+#line 888 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ssl_service_key:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->ssl_service_key);
+		cfg_parser->cfg->ssl_service_key = yystack.l_mark[0].str;
+	}
+break;
+case 310:
+#line 895 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ssl_service_pem:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->ssl_service_pem);
+		cfg_parser->cfg->ssl_service_pem = yystack.l_mark[0].str;
+	}
+break;
+case 311:
+#line 902 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ssl_port:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->ssl_port = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 312:
+#line 911 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tls_cert_bundle:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->tls_cert_bundle);
+		cfg_parser->cfg->tls_cert_bundle = yystack.l_mark[0].str;
+	}
+break;
+case 313:
+#line 918 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tls_win_cert:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->tls_win_cert = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 314:
+#line 927 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tls_additional_port:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
+			yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 315:
+#line 935 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tls_ciphers:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->tls_ciphers);
+		cfg_parser->cfg->tls_ciphers = yystack.l_mark[0].str;
+	}
+break;
+case 316:
+#line 942 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tls_ciphersuites:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->tls_ciphersuites);
+		cfg_parser->cfg->tls_ciphersuites = yystack.l_mark[0].str;
+	}
+break;
+case 317:
+#line 949 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
+			yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 318:
+#line 957 "./util/configparser.y"
+	{
+		OUTYY(("P(server_use_systemd:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->use_systemd = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 319:
+#line 966 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_daemonize:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->do_daemonize = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 320:
+#line 975 "./util/configparser.y"
+	{
+		OUTYY(("P(server_use_syslog:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->use_syslog = (strcmp(yystack.l_mark[0].str, "yes")==0);
+#if !defined(HAVE_SYSLOG_H) && !defined(UB_ON_WINDOWS)
+		if(strcmp(yystack.l_mark[0].str, "yes") == 0)
+			yyerror("no syslog services are available. "
+				"(reconfigure and compile to add)");
+#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 321:
+#line 989 "./util/configparser.y"
+	{
+		OUTYY(("P(server_log_time_ascii:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->log_time_ascii = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 322:
+#line 998 "./util/configparser.y"
+	{
+		OUTYY(("P(server_log_queries:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->log_queries = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 323:
+#line 1007 "./util/configparser.y"
+	{
+  	OUTYY(("P(server_log_replies:%s)\n", yystack.l_mark[0].str));
+  	if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+  		yyerror("expected yes or no.");
+  	else cfg_parser->cfg->log_replies = (strcmp(yystack.l_mark[0].str, "yes")==0);
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 324:
+#line 1016 "./util/configparser.y"
+	{
+  	OUTYY(("P(server_log_tag_queryreply:%s)\n", yystack.l_mark[0].str));
+  	if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+  		yyerror("expected yes or no.");
+  	else cfg_parser->cfg->log_tag_queryreply = (strcmp(yystack.l_mark[0].str, "yes")==0);
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 325:
+#line 1025 "./util/configparser.y"
+	{
+		OUTYY(("P(server_log_servfail:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->log_servfail = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 326:
+#line 1034 "./util/configparser.y"
+	{
+  	OUTYY(("P(server_log_local_actions:%s)\n", yystack.l_mark[0].str));
+  	if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+  		yyerror("expected yes or no.");
+  	else cfg_parser->cfg->log_local_actions = (strcmp(yystack.l_mark[0].str, "yes")==0);
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 327:
+#line 1043 "./util/configparser.y"
+	{
+		OUTYY(("P(server_chroot:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->chrootdir);
+		cfg_parser->cfg->chrootdir = yystack.l_mark[0].str;
+	}
+break;
+case 328:
+#line 1050 "./util/configparser.y"
+	{
+		OUTYY(("P(server_username:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->username);
+		cfg_parser->cfg->username = yystack.l_mark[0].str;
+	}
+break;
+case 329:
+#line 1057 "./util/configparser.y"
+	{
+		OUTYY(("P(server_directory:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->directory);
+		cfg_parser->cfg->directory = yystack.l_mark[0].str;
+		/* change there right away for includes relative to this */
+		if(yystack.l_mark[0].str[0]) {
+			char* d;
+#ifdef UB_ON_WINDOWS
+			w_config_adjust_directory(cfg_parser->cfg);
+#endif
+			d = cfg_parser->cfg->directory;
+			/* adjust directory if we have already chroot,
+			 * like, we reread after sighup */
+			if(cfg_parser->chroot && cfg_parser->chroot[0] &&
+				strncmp(d, cfg_parser->chroot, strlen(
+				cfg_parser->chroot)) == 0)
+				d += strlen(cfg_parser->chroot);
+			if(d[0]) {
+			    if(chdir(d))
+				log_err("cannot chdir to directory: %s (%s)",
+					d, strerror(errno));
+			}
+		}
+	}
+break;
+case 330:
+#line 1083 "./util/configparser.y"
+	{
+		OUTYY(("P(server_logfile:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->logfile);
+		cfg_parser->cfg->logfile = yystack.l_mark[0].str;
+		cfg_parser->cfg->use_syslog = 0;
+	}
+break;
+case 331:
+#line 1091 "./util/configparser.y"
+	{
+		OUTYY(("P(server_pidfile:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->pidfile);
+		cfg_parser->cfg->pidfile = yystack.l_mark[0].str;
+	}
+break;
+case 332:
+#line 1098 "./util/configparser.y"
+	{
+		OUTYY(("P(server_root_hints:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 333:
+#line 1105 "./util/configparser.y"
+	{
+		OUTYY(("P(server_dlv_anchor_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dlv_anchor_file);
+		cfg_parser->cfg->dlv_anchor_file = yystack.l_mark[0].str;
+	}
+break;
+case 334:
+#line 1112 "./util/configparser.y"
+	{
+		OUTYY(("P(server_dlv_anchor:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 335:
+#line 1119 "./util/configparser.y"
+	{
+		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->
+			auto_trust_anchor_file_list, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 336:
+#line 1127 "./util/configparser.y"
+	{
+		OUTYY(("P(server_trust_anchor_file:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->
+			trust_anchor_file_list, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 337:
+#line 1135 "./util/configparser.y"
+	{
+		OUTYY(("P(server_trusted_keys_file:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->
+			trusted_keys_file_list, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 338:
+#line 1143 "./util/configparser.y"
+	{
+		OUTYY(("P(server_trust_anchor:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 339:
+#line 1150 "./util/configparser.y"
+	{
+		OUTYY(("P(server_trust_anchor_signaling:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else
+			cfg_parser->cfg->trust_anchor_signaling =
+				(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 340:
+#line 1161 "./util/configparser.y"
+	{
+		OUTYY(("P(server_root_key_sentinel:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else
+			cfg_parser->cfg->root_key_sentinel =
+				(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 341:
+#line 1172 "./util/configparser.y"
+	{
+		OUTYY(("P(server_domain_insecure:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 342:
+#line 1179 "./util/configparser.y"
+	{
+		OUTYY(("P(server_hide_identity:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->hide_identity = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 343:
+#line 1188 "./util/configparser.y"
+	{
+		OUTYY(("P(server_hide_version:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->hide_version = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 344:
+#line 1197 "./util/configparser.y"
+	{
+		OUTYY(("P(server_hide_trustanchor:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->hide_trustanchor = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 345:
+#line 1206 "./util/configparser.y"
+	{
+		OUTYY(("P(server_identity:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->identity);
+		cfg_parser->cfg->identity = yystack.l_mark[0].str;
+	}
+break;
+case 346:
+#line 1213 "./util/configparser.y"
+	{
+		OUTYY(("P(server_version:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->version);
+		cfg_parser->cfg->version = yystack.l_mark[0].str;
+	}
+break;
+case 347:
+#line 1220 "./util/configparser.y"
+	{
+		OUTYY(("P(server_so_rcvbuf:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->so_rcvbuf))
+			yyerror("buffer size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 348:
+#line 1228 "./util/configparser.y"
+	{
+		OUTYY(("P(server_so_sndbuf:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->so_sndbuf))
+			yyerror("buffer size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 349:
+#line 1236 "./util/configparser.y"
+	{
+        OUTYY(("P(server_so_reuseport:%s)\n", yystack.l_mark[0].str));
+        if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+            yyerror("expected yes or no.");
+        else cfg_parser->cfg->so_reuseport =
+            (strcmp(yystack.l_mark[0].str, "yes")==0);
+        free(yystack.l_mark[0].str);
+    }
+break;
+case 350:
+#line 1246 "./util/configparser.y"
+	{
+        OUTYY(("P(server_ip_transparent:%s)\n", yystack.l_mark[0].str));
+        if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+            yyerror("expected yes or no.");
+        else cfg_parser->cfg->ip_transparent =
+            (strcmp(yystack.l_mark[0].str, "yes")==0);
+        free(yystack.l_mark[0].str);
+    }
+break;
+case 351:
+#line 1256 "./util/configparser.y"
+	{
+        OUTYY(("P(server_ip_freebind:%s)\n", yystack.l_mark[0].str));
+        if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+            yyerror("expected yes or no.");
+        else cfg_parser->cfg->ip_freebind =
+            (strcmp(yystack.l_mark[0].str, "yes")==0);
+        free(yystack.l_mark[0].str);
+    }
+break;
+case 352:
+#line 1266 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ip_dscp:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else if (atoi(yystack.l_mark[0].str) > 63)
+			yyerror("value too large (max 63)");
+		else if (atoi(yystack.l_mark[0].str) < 0)
+			yyerror("value too small (min 0)");
+		else
+			cfg_parser->cfg->ip_dscp = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 353:
+#line 1280 "./util/configparser.y"
+	{
+		OUTYY(("P(server_stream_wait_size:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->stream_wait_size))
+			yyerror("memory size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 354:
+#line 1288 "./util/configparser.y"
+	{
+		OUTYY(("P(server_edns_buffer_size:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else if (atoi(yystack.l_mark[0].str) < 12)
+			yyerror("edns buffer size too small");
+		else if (atoi(yystack.l_mark[0].str) > 65535)
+			cfg_parser->cfg->edns_buffer_size = 65535;
+		else cfg_parser->cfg->edns_buffer_size = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 355:
+#line 1301 "./util/configparser.y"
+	{
+		OUTYY(("P(server_msg_buffer_size:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else if (atoi(yystack.l_mark[0].str) < 4096)
+			yyerror("message buffer size too small (use 4096)");
+		else cfg_parser->cfg->msg_buffer_size = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 356:
+#line 1312 "./util/configparser.y"
+	{
+		OUTYY(("P(server_msg_cache_size:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->msg_cache_size))
+			yyerror("memory size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 357:
+#line 1320 "./util/configparser.y"
+	{
+		OUTYY(("P(server_msg_cache_slabs:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else {
+			cfg_parser->cfg->msg_cache_slabs = atoi(yystack.l_mark[0].str);
+			if(!is_pow2(cfg_parser->cfg->msg_cache_slabs))
+				yyerror("must be a power of 2");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 358:
+#line 1333 "./util/configparser.y"
+	{
+		OUTYY(("P(server_num_queries_per_thread:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->num_queries_per_thread = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 359:
+#line 1342 "./util/configparser.y"
+	{
+		OUTYY(("P(server_jostle_timeout:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->jostle_time = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 360:
+#line 1351 "./util/configparser.y"
+	{
+		OUTYY(("P(server_delay_close:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->delay_close = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 361:
+#line 1360 "./util/configparser.y"
+	{
+		OUTYY(("P(server_unblock_lan_zones:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->unblock_lan_zones = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 362:
+#line 1370 "./util/configparser.y"
+	{
+		OUTYY(("P(server_insecure_lan_zones:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->insecure_lan_zones = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 363:
+#line 1380 "./util/configparser.y"
+	{
+		OUTYY(("P(server_rrset_cache_size:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->rrset_cache_size))
+			yyerror("memory size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 364:
+#line 1388 "./util/configparser.y"
+	{
+		OUTYY(("P(server_rrset_cache_slabs:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else {
+			cfg_parser->cfg->rrset_cache_slabs = atoi(yystack.l_mark[0].str);
+			if(!is_pow2(cfg_parser->cfg->rrset_cache_slabs))
+				yyerror("must be a power of 2");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 365:
+#line 1401 "./util/configparser.y"
+	{
+		OUTYY(("P(server_infra_host_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->host_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 366:
+#line 1410 "./util/configparser.y"
+	{
+		OUTYY(("P(server_infra_lame_ttl:%s)\n", yystack.l_mark[0].str));
+		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
+			"removed, use infra-host-ttl)", yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 367:
+#line 1418 "./util/configparser.y"
+	{
+		OUTYY(("P(server_infra_cache_numhosts:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->infra_cache_numhosts = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 368:
+#line 1427 "./util/configparser.y"
+	{
+		OUTYY(("P(server_infra_cache_lame_size:%s)\n", yystack.l_mark[0].str));
+		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
+			"(option removed, use infra-cache-numhosts)", yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 369:
+#line 1435 "./util/configparser.y"
+	{
+		OUTYY(("P(server_infra_cache_slabs:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else {
+			cfg_parser->cfg->infra_cache_slabs = atoi(yystack.l_mark[0].str);
+			if(!is_pow2(cfg_parser->cfg->infra_cache_slabs))
+				yyerror("must be a power of 2");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 370:
+#line 1448 "./util/configparser.y"
+	{
+		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->infra_cache_min_rtt = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 371:
+#line 1457 "./util/configparser.y"
+	{
+		OUTYY(("P(server_target_fetch_policy:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->target_fetch_policy);
+		cfg_parser->cfg->target_fetch_policy = yystack.l_mark[0].str;
+	}
+break;
+case 372:
+#line 1464 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_short_bufsize:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_short_bufsize = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 373:
+#line 1474 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_large_queries:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_large_queries = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 374:
+#line 1484 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_glue:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_glue = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 375:
+#line 1494 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_dnssec_stripped = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 376:
+#line 1504 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_below_nxdomain:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_below_nxdomain = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 377:
+#line 1514 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_referral_path:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_referral_path = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 378:
+#line 1524 "./util/configparser.y"
+	{
+		OUTYY(("P(server_harden_algo_downgrade:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->harden_algo_downgrade = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 379:
+#line 1534 "./util/configparser.y"
+	{
+		OUTYY(("P(server_use_caps_for_id:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->use_caps_bits_for_id = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 380:
+#line 1544 "./util/configparser.y"
+	{
+		OUTYY(("P(server_caps_whitelist:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 381:
+#line 1551 "./util/configparser.y"
+	{
+		OUTYY(("P(server_private_address:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 382:
+#line 1558 "./util/configparser.y"
+	{
+		OUTYY(("P(server_private_domain:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 383:
+#line 1565 "./util/configparser.y"
+	{
+		OUTYY(("P(server_prefetch:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->prefetch = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 384:
+#line 1574 "./util/configparser.y"
+	{
+		OUTYY(("P(server_prefetch_key:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->prefetch_key = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 385:
+#line 1583 "./util/configparser.y"
+	{
+		OUTYY(("P(server_deny_any:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->deny_any = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 386:
+#line 1592 "./util/configparser.y"
+	{
+		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->unwanted_threshold = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 387:
+#line 1601 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_not_query_address:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 388:
+#line 1608 "./util/configparser.y"
+	{
+		OUTYY(("P(server_do_not_query_localhost:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->donotquery_localhost = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 389:
+#line 1618 "./util/configparser.y"
+	{
+		OUTYY(("P(server_access_control:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "deny")!=0 && strcmp(yystack.l_mark[0].str, "refuse")!=0 &&
+			strcmp(yystack.l_mark[0].str, "deny_non_local")!=0 &&
+			strcmp(yystack.l_mark[0].str, "refuse_non_local")!=0 &&
+			strcmp(yystack.l_mark[0].str, "allow_setrd")!=0 && 
+			strcmp(yystack.l_mark[0].str, "allow")!=0 && 
+			strcmp(yystack.l_mark[0].str, "allow_snoop")!=0) {
+			yyerror("expected deny, refuse, deny_non_local, "
+				"refuse_non_local, allow, allow_setrd or "
+				"allow_snoop in access control action");
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		} else {
+			if(!cfg_str2list_insert(&cfg_parser->cfg->acls, yystack.l_mark[-1].str, yystack.l_mark[0].str))
+				fatal_exit("out of memory adding acl");
+		}
+	}
+break;
+case 390:
+#line 1638 "./util/configparser.y"
+	{
+		OUTYY(("P(server_module_conf:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->module_conf);
+		cfg_parser->cfg->module_conf = yystack.l_mark[0].str;
+	}
+break;
+case 391:
+#line 1645 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_override_date:%s)\n", yystack.l_mark[0].str));
+		if(*yystack.l_mark[0].str == '\0' || strcmp(yystack.l_mark[0].str, "0") == 0) {
+			cfg_parser->cfg->val_date_override = 0;
+		} else if(strlen(yystack.l_mark[0].str) == 14) {
+			cfg_parser->cfg->val_date_override = 
+				cfg_convert_timeval(yystack.l_mark[0].str);
+			if(!cfg_parser->cfg->val_date_override)
+				yyerror("bad date/time specification");
+		} else {
+			if(atoi(yystack.l_mark[0].str) == 0)
+				yyerror("number expected");
+			cfg_parser->cfg->val_date_override = atoi(yystack.l_mark[0].str);
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 392:
+#line 1663 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_sig_skew_min:%s)\n", yystack.l_mark[0].str));
+		if(*yystack.l_mark[0].str == '\0' || strcmp(yystack.l_mark[0].str, "0") == 0) {
+			cfg_parser->cfg->val_sig_skew_min = 0;
+		} else {
+			cfg_parser->cfg->val_sig_skew_min = atoi(yystack.l_mark[0].str);
+			if(!cfg_parser->cfg->val_sig_skew_min)
+				yyerror("number expected");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 393:
+#line 1676 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_sig_skew_max:%s)\n", yystack.l_mark[0].str));
+		if(*yystack.l_mark[0].str == '\0' || strcmp(yystack.l_mark[0].str, "0") == 0) {
+			cfg_parser->cfg->val_sig_skew_max = 0;
+		} else {
+			cfg_parser->cfg->val_sig_skew_max = atoi(yystack.l_mark[0].str);
+			if(!cfg_parser->cfg->val_sig_skew_max)
+				yyerror("number expected");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 394:
+#line 1689 "./util/configparser.y"
+	{
+		OUTYY(("P(server_cache_max_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->max_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 395:
+#line 1698 "./util/configparser.y"
+	{
+		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->max_negative_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 396:
+#line 1707 "./util/configparser.y"
+	{
+		OUTYY(("P(server_cache_min_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->min_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 397:
+#line 1716 "./util/configparser.y"
+	{
+		OUTYY(("P(server_bogus_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->bogus_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 398:
+#line 1725 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_clean_additional:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->val_clean_additional = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 399:
+#line 1735 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_permissive_mode:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->val_permissive_mode = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 400:
+#line 1745 "./util/configparser.y"
+	{
+		OUTYY(("P(server_aggressive_nsec:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else
+			cfg_parser->cfg->aggressive_nsec =
+				(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 401:
+#line 1756 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ignore_cd_flag:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->ignore_cd = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 402:
+#line 1765 "./util/configparser.y"
+	{
+		OUTYY(("P(server_serve_expired:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->serve_expired = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 403:
+#line 1774 "./util/configparser.y"
+	{
+		OUTYY(("P(server_serve_expired_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->serve_expired_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 404:
+#line 1783 "./util/configparser.y"
+	{
+		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 405:
+#line 1792 "./util/configparser.y"
+	{
+		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->serve_expired_reply_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 406:
+#line 1801 "./util/configparser.y"
+	{
+		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->serve_expired_client_timeout = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 407:
+#line 1810 "./util/configparser.y"
+	{
+		OUTYY(("P(server_fake_dsa:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+#if defined(HAVE_SSL) || defined(HAVE_NETTLE)
+		else fake_dsa = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		if(fake_dsa)
+			log_warn("test option fake_dsa is enabled");
+#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 408:
+#line 1823 "./util/configparser.y"
+	{
+		OUTYY(("P(server_fake_sha1:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+#if defined(HAVE_SSL) || defined(HAVE_NETTLE)
+		else fake_sha1 = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		if(fake_sha1)
+			log_warn("test option fake_sha1 is enabled");
+#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 409:
+#line 1836 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_log_level:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->val_log_level = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 410:
+#line 1845 "./util/configparser.y"
+	{
+		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->val_nsec3_key_iterations);
+		cfg_parser->cfg->val_nsec3_key_iterations = yystack.l_mark[0].str;
+	}
+break;
+case 411:
+#line 1852 "./util/configparser.y"
+	{
+		OUTYY(("P(server_add_holddown:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->add_holddown = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 412:
+#line 1861 "./util/configparser.y"
+	{
+		OUTYY(("P(server_del_holddown:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->del_holddown = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 413:
+#line 1870 "./util/configparser.y"
+	{
+		OUTYY(("P(server_keep_missing:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->keep_missing = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 414:
+#line 1879 "./util/configparser.y"
+	{
+		OUTYY(("P(server_permit_small_holddown:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->permit_small_holddown =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 415:
+#line 1888 "./util/configparser.y"
+	{
+		OUTYY(("P(server_key_cache_size:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->key_cache_size))
+			yyerror("memory size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 416:
+#line 1896 "./util/configparser.y"
+	{
+		OUTYY(("P(server_key_cache_slabs:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else {
+			cfg_parser->cfg->key_cache_slabs = atoi(yystack.l_mark[0].str);
+			if(!is_pow2(cfg_parser->cfg->key_cache_slabs))
+				yyerror("must be a power of 2");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 417:
+#line 1909 "./util/configparser.y"
+	{
+		OUTYY(("P(server_neg_cache_size:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->neg_cache_size))
+			yyerror("memory size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 418:
+#line 1917 "./util/configparser.y"
+	{
+		OUTYY(("P(server_local_zone:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "static")!=0 && strcmp(yystack.l_mark[0].str, "deny")!=0 &&
+		   strcmp(yystack.l_mark[0].str, "refuse")!=0 && strcmp(yystack.l_mark[0].str, "redirect")!=0 &&
+		   strcmp(yystack.l_mark[0].str, "transparent")!=0 && strcmp(yystack.l_mark[0].str, "nodefault")!=0
+		   && strcmp(yystack.l_mark[0].str, "typetransparent")!=0
+		   && strcmp(yystack.l_mark[0].str, "always_transparent")!=0
+		   && strcmp(yystack.l_mark[0].str, "always_refuse")!=0
+		   && strcmp(yystack.l_mark[0].str, "always_nxdomain")!=0
+		   && strcmp(yystack.l_mark[0].str, "noview")!=0
+		   && strcmp(yystack.l_mark[0].str, "inform")!=0 && strcmp(yystack.l_mark[0].str, "inform_deny")!=0
+		   && strcmp(yystack.l_mark[0].str, "inform_redirect") != 0
+			 && strcmp(yystack.l_mark[0].str, "ipset") != 0) {
+			yyerror("local-zone type: expected static, deny, "
+				"refuse, redirect, transparent, "
+				"typetransparent, inform, inform_deny, "
+				"inform_redirect, always_transparent, "
+				"always_refuse, always_nxdomain, noview "
+				", nodefault or ipset");
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		} else if(strcmp(yystack.l_mark[0].str, "nodefault")==0) {
+			if(!cfg_strlist_insert(&cfg_parser->cfg->
+				local_zones_nodefault, yystack.l_mark[-1].str))
+				fatal_exit("out of memory adding local-zone");
+			free(yystack.l_mark[0].str);
+#ifdef USE_IPSET
+		} else if(strcmp(yystack.l_mark[0].str, "ipset")==0) {
+			if(!cfg_strlist_insert(&cfg_parser->cfg->
+				local_zones_ipset, yystack.l_mark[-1].str))
+				fatal_exit("out of memory adding local-zone");
+			free(yystack.l_mark[0].str);
+#endif
+		} else {
+			if(!cfg_str2list_insert(&cfg_parser->cfg->local_zones, 
+				yystack.l_mark[-1].str, yystack.l_mark[0].str))
+				fatal_exit("out of memory adding local-zone");
+		}
+	}
+break;
+case 419:
+#line 1958 "./util/configparser.y"
+	{
+		OUTYY(("P(server_local_data:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding local-data");
+	}
+break;
+case 420:
+#line 1965 "./util/configparser.y"
+	{
+		char* ptr;
+		OUTYY(("P(server_local_data_ptr:%s)\n", yystack.l_mark[0].str));
+		ptr = cfg_ptr_reverse(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+		if(ptr) {
+			if(!cfg_strlist_insert(&cfg_parser->cfg->
+				local_data, ptr))
+				fatal_exit("out of memory adding local-data");
+		} else {
+			yyerror("local-data-ptr could not be reversed");
+		}
+	}
+break;
+case 421:
+#line 1980 "./util/configparser.y"
+	{
+		OUTYY(("P(server_minimal_responses:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->minimal_responses =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 422:
+#line 1990 "./util/configparser.y"
+	{
+		OUTYY(("P(server_rrset_roundrobin:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->rrset_roundrobin =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 423:
+#line 2000 "./util/configparser.y"
+	{
+		OUTYY(("P(server_unknown_server_time_limit:%s)\n", yystack.l_mark[0].str));
+		cfg_parser->cfg->unknown_server_time_limit = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 424:
+#line 2007 "./util/configparser.y"
+	{
+		OUTYY(("P(server_max_udp_size:%s)\n", yystack.l_mark[0].str));
+		cfg_parser->cfg->max_udp_size = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 425:
+#line 2014 "./util/configparser.y"
+	{
+		OUTYY(("P(dns64_prefix:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dns64_prefix);
+		cfg_parser->cfg->dns64_prefix = yystack.l_mark[0].str;
+	}
+break;
+case 426:
+#line 2021 "./util/configparser.y"
+	{
+		OUTYY(("P(server_dns64_synthall:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dns64_synthall = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 427:
+#line 2030 "./util/configparser.y"
+	{
+		OUTYY(("P(dns64_ignore_aaaa:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
+			yystack.l_mark[0].str))
+			fatal_exit("out of memory adding dns64-ignore-aaaa");
+	}
+break;
+case 428:
+#line 2038 "./util/configparser.y"
+	{
+		char* p, *s = yystack.l_mark[0].str;
+		OUTYY(("P(server_define_tag:%s)\n", yystack.l_mark[0].str));
+		while((p=strsep(&s, " \t\n")) != NULL) {
+			if(*p) {
+				if(!config_add_tag(cfg_parser->cfg, p))
+					yyerror("could not define-tag, "
+						"out of memory");
+			}
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 429:
+#line 2052 "./util/configparser.y"
+	{
+		size_t len = 0;
+		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, yystack.l_mark[0].str,
+			&len);
+		free(yystack.l_mark[0].str);
+		OUTYY(("P(server_local_zone_tag:%s)\n", yystack.l_mark[-1].str));
+		if(!bitlist) {
+			yyerror("could not parse tags, (define-tag them first)");
+			free(yystack.l_mark[-1].str);
+		}
+		if(bitlist) {
+			if(!cfg_strbytelist_insert(
+				&cfg_parser->cfg->local_zone_tags,
+				yystack.l_mark[-1].str, bitlist, len)) {
+				yyerror("out of memory");
+				free(yystack.l_mark[-1].str);
+			}
+		}
+	}
+break;
+case 430:
+#line 2073 "./util/configparser.y"
+	{
+		size_t len = 0;
+		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, yystack.l_mark[0].str,
+			&len);
+		free(yystack.l_mark[0].str);
+		OUTYY(("P(server_access_control_tag:%s)\n", yystack.l_mark[-1].str));
+		if(!bitlist) {
+			yyerror("could not parse tags, (define-tag them first)");
+			free(yystack.l_mark[-1].str);
+		}
+		if(bitlist) {
+			if(!cfg_strbytelist_insert(
+				&cfg_parser->cfg->acl_tags,
+				yystack.l_mark[-1].str, bitlist, len)) {
+				yyerror("out of memory");
+				free(yystack.l_mark[-1].str);
+			}
+		}
+	}
+break;
+case 431:
+#line 2094 "./util/configparser.y"
+	{
+		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", yystack.l_mark[-2].str, yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
+			yystack.l_mark[-2].str, yystack.l_mark[-1].str, yystack.l_mark[0].str)) {
+			yyerror("out of memory");
+			free(yystack.l_mark[-2].str);
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		}
+	}
+break;
+case 432:
+#line 2106 "./util/configparser.y"
+	{
+		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", yystack.l_mark[-2].str, yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
+			yystack.l_mark[-2].str, yystack.l_mark[-1].str, yystack.l_mark[0].str)) {
+			yyerror("out of memory");
+			free(yystack.l_mark[-2].str);
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		}
+	}
+break;
+case 433:
+#line 2118 "./util/configparser.y"
+	{
+		OUTYY(("P(server_local_zone_override:%s %s %s)\n", yystack.l_mark[-2].str, yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
+			yystack.l_mark[-2].str, yystack.l_mark[-1].str, yystack.l_mark[0].str)) {
+			yyerror("out of memory");
+			free(yystack.l_mark[-2].str);
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		}
+	}
+break;
+case 434:
+#line 2130 "./util/configparser.y"
+	{
+		OUTYY(("P(server_access_control_view:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
+			yystack.l_mark[-1].str, yystack.l_mark[0].str)) {
+			yyerror("out of memory");
+		}
+	}
+break;
+case 435:
+#line 2139 "./util/configparser.y"
+	{
+		size_t len = 0;
+		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, yystack.l_mark[0].str,
+			&len);
+		free(yystack.l_mark[0].str);
+		OUTYY(("P(response_ip_tag:%s)\n", yystack.l_mark[-1].str));
+		if(!bitlist) {
+			yyerror("could not parse tags, (define-tag them first)");
+			free(yystack.l_mark[-1].str);
+		}
+		if(bitlist) {
+			if(!cfg_strbytelist_insert(
+				&cfg_parser->cfg->respip_tags,
+				yystack.l_mark[-1].str, bitlist, len)) {
+				yyerror("out of memory");
+				free(yystack.l_mark[-1].str);
+			}
+		}
+	}
+break;
+case 436:
+#line 2160 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_ip_ratelimit:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->ip_ratelimit = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 437:
+#line 2170 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_ratelimit:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->ratelimit = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 438:
+#line 2179 "./util/configparser.y"
+	{
+  	OUTYY(("P(server_ip_ratelimit_size:%s)\n", yystack.l_mark[0].str));
+  	if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->ip_ratelimit_size))
+  		yyerror("memory size expected");
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 439:
+#line 2187 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ratelimit_size:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->ratelimit_size))
+			yyerror("memory size expected");
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 440:
+#line 2195 "./util/configparser.y"
+	{
+  	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", yystack.l_mark[0].str));
+  	if(atoi(yystack.l_mark[0].str) == 0)
+  		yyerror("number expected");
+  	else {
+  		cfg_parser->cfg->ip_ratelimit_slabs = atoi(yystack.l_mark[0].str);
+  		if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
+  			yyerror("must be a power of 2");
+  	}
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 441:
+#line 2208 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ratelimit_slabs:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else {
+			cfg_parser->cfg->ratelimit_slabs = atoi(yystack.l_mark[0].str);
+			if(!is_pow2(cfg_parser->cfg->ratelimit_slabs))
+				yyerror("must be a power of 2");
+		}
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 442:
+#line 2221 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) {
+			yyerror("number expected");
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		} else {
+			if(!cfg_str2list_insert(&cfg_parser->cfg->
+				ratelimit_for_domain, yystack.l_mark[-1].str, yystack.l_mark[0].str))
+				fatal_exit("out of memory adding "
+					"ratelimit-for-domain");
+		}
+	}
+break;
+case 443:
+#line 2236 "./util/configparser.y"
+	{
+		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) {
+			yyerror("number expected");
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		} else {
+			if(!cfg_str2list_insert(&cfg_parser->cfg->
+				ratelimit_below_domain, yystack.l_mark[-1].str, yystack.l_mark[0].str))
+				fatal_exit("out of memory adding "
+					"ratelimit-below-domain");
+		}
+	}
+break;
+case 444:
+#line 2251 "./util/configparser.y"
+	{ 
+  	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", yystack.l_mark[0].str)); 
+  	if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+  		yyerror("number expected");
+  	else cfg_parser->cfg->ip_ratelimit_factor = atoi(yystack.l_mark[0].str);
+  	free(yystack.l_mark[0].str);
+	}
+break;
+case 445:
+#line 2260 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_ratelimit_factor:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->ratelimit_factor = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 446:
+#line 2269 "./util/configparser.y"
+	{ 
+		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 447:
+#line 2275 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_fast_server_num:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) <= 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->fast_server_num = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 448:
+#line 2284 "./util/configparser.y"
+	{ 
+		OUTYY(("P(server_fast_server_permil:%s)\n", yystack.l_mark[0].str)); 
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->fast_server_permil = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 449:
+#line 2293 "./util/configparser.y"
+	{
+		OUTYY(("P(server_qname_minimisation:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->qname_minimisation = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 450:
+#line 2303 "./util/configparser.y"
+	{
+		OUTYY(("P(server_qname_minimisation_strict:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->qname_minimisation_strict = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 451:
+#line 2313 "./util/configparser.y"
+	{
+		OUTYY(("P(server_pad_responses:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->pad_responses = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 452:
+#line 2323 "./util/configparser.y"
+	{
+		OUTYY(("P(server_pad_responses_block_size:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->pad_responses_block_size = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 453:
+#line 2332 "./util/configparser.y"
+	{
+		OUTYY(("P(server_pad_queries:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->pad_queries = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 454:
+#line 2342 "./util/configparser.y"
+	{
+		OUTYY(("P(server_pad_queries_block_size:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->pad_queries_block_size = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 455:
+#line 2351 "./util/configparser.y"
+	{
+	#ifdef USE_IPSECMOD
+		OUTYY(("P(server_ipsecmod_enabled:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->ipsecmod_enabled = (strcmp(yystack.l_mark[0].str, "yes")==0);
+	#else
+		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 456:
+#line 2364 "./util/configparser.y"
+	{
+	#ifdef USE_IPSECMOD
+		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->ipsecmod_ignore_bogus = (strcmp(yystack.l_mark[0].str, "yes")==0);
+	#else
+		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 457:
+#line 2377 "./util/configparser.y"
+	{
+	#ifdef USE_IPSECMOD
+		OUTYY(("P(server_ipsecmod_hook:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->ipsecmod_hook);
+		cfg_parser->cfg->ipsecmod_hook = yystack.l_mark[0].str;
+	#else
+		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 458:
+#line 2389 "./util/configparser.y"
+	{
+	#ifdef USE_IPSECMOD
+		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->ipsecmod_max_ttl = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 459:
+#line 2403 "./util/configparser.y"
+	{
+	#ifdef USE_IPSECMOD
+		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->ipsecmod_whitelist, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	#else
+		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 460:
+#line 2415 "./util/configparser.y"
+	{
+	#ifdef USE_IPSECMOD
+		OUTYY(("P(server_ipsecmod_strict:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->ipsecmod_strict = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 461:
+#line 2429 "./util/configparser.y"
+	{
+		OUTYY(("P(name:%s)\n", yystack.l_mark[0].str));
+		if(cfg_parser->cfg->stubs->name)
+			yyerror("stub name override, there must be one name "
+				"for one stub-zone");
+		free(cfg_parser->cfg->stubs->name);
+		cfg_parser->cfg->stubs->name = yystack.l_mark[0].str;
+	}
+break;
+case 462:
+#line 2439 "./util/configparser.y"
+	{
+		OUTYY(("P(stub-host:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 463:
+#line 2446 "./util/configparser.y"
+	{
+		OUTYY(("P(stub-addr:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 464:
+#line 2453 "./util/configparser.y"
+	{
+		OUTYY(("P(stub-first:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->stubs->isfirst=(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 465:
+#line 2462 "./util/configparser.y"
+	{
+		OUTYY(("P(stub-no-cache:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->stubs->no_cache=(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 466:
+#line 2471 "./util/configparser.y"
+	{
+		OUTYY(("P(stub-ssl-upstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->stubs->ssl_upstream = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 467:
+#line 2481 "./util/configparser.y"
+	{
+		OUTYY(("P(stub-prime:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->stubs->isprime = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 468:
+#line 2491 "./util/configparser.y"
+	{
+		OUTYY(("P(name:%s)\n", yystack.l_mark[0].str));
+		if(cfg_parser->cfg->forwards->name)
+			yyerror("forward name override, there must be one "
+				"name for one forward-zone");
+		free(cfg_parser->cfg->forwards->name);
+		cfg_parser->cfg->forwards->name = yystack.l_mark[0].str;
+	}
+break;
+case 469:
+#line 2501 "./util/configparser.y"
+	{
+		OUTYY(("P(forward-host:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 470:
+#line 2508 "./util/configparser.y"
+	{
+		OUTYY(("P(forward-addr:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 471:
+#line 2515 "./util/configparser.y"
+	{
+		OUTYY(("P(forward-first:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->forwards->isfirst=(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 472:
+#line 2524 "./util/configparser.y"
+	{
+		OUTYY(("P(forward-no-cache:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->forwards->no_cache=(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 473:
+#line 2533 "./util/configparser.y"
+	{
+		OUTYY(("P(forward-ssl-upstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->forwards->ssl_upstream = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 474:
+#line 2543 "./util/configparser.y"
+	{
+		OUTYY(("P(name:%s)\n", yystack.l_mark[0].str));
+		if(cfg_parser->cfg->auths->name)
+			yyerror("auth name override, there must be one name "
+				"for one auth-zone");
+		free(cfg_parser->cfg->auths->name);
+		cfg_parser->cfg->auths->name = yystack.l_mark[0].str;
+	}
+break;
+case 475:
+#line 2553 "./util/configparser.y"
+	{
+		OUTYY(("P(zonefile:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->auths->zonefile);
+		cfg_parser->cfg->auths->zonefile = yystack.l_mark[0].str;
+	}
+break;
+case 476:
+#line 2560 "./util/configparser.y"
+	{
+		OUTYY(("P(master:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 477:
+#line 2567 "./util/configparser.y"
+	{
+		OUTYY(("P(url:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 478:
+#line 2574 "./util/configparser.y"
+	{
+		OUTYY(("P(allow-notify:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
+			yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 479:
+#line 2582 "./util/configparser.y"
+	{
+		OUTYY(("P(for-downstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->for_downstream =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 480:
+#line 2592 "./util/configparser.y"
+	{
+		OUTYY(("P(for-upstream:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->for_upstream =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 481:
+#line 2602 "./util/configparser.y"
+	{
+		OUTYY(("P(fallback-enabled:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->fallback_enabled =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 482:
+#line 2612 "./util/configparser.y"
+	{
+		OUTYY(("P(name:%s)\n", yystack.l_mark[0].str));
+		if(cfg_parser->cfg->views->name)
+			yyerror("view name override, there must be one "
+				"name for one view");
+		free(cfg_parser->cfg->views->name);
+		cfg_parser->cfg->views->name = yystack.l_mark[0].str;
+	}
+break;
+case 483:
+#line 2622 "./util/configparser.y"
+	{
+		OUTYY(("P(view_local_zone:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "static")!=0 && strcmp(yystack.l_mark[0].str, "deny")!=0 &&
+		   strcmp(yystack.l_mark[0].str, "refuse")!=0 && strcmp(yystack.l_mark[0].str, "redirect")!=0 &&
+		   strcmp(yystack.l_mark[0].str, "transparent")!=0 && strcmp(yystack.l_mark[0].str, "nodefault")!=0
+		   && strcmp(yystack.l_mark[0].str, "typetransparent")!=0
+		   && strcmp(yystack.l_mark[0].str, "always_transparent")!=0
+		   && strcmp(yystack.l_mark[0].str, "always_refuse")!=0
+		   && strcmp(yystack.l_mark[0].str, "always_nxdomain")!=0
+		   && strcmp(yystack.l_mark[0].str, "noview")!=0
+		   && strcmp(yystack.l_mark[0].str, "inform")!=0 && strcmp(yystack.l_mark[0].str, "inform_deny")!=0) {
+			yyerror("local-zone type: expected static, deny, "
+				"refuse, redirect, transparent, "
+				"typetransparent, inform, inform_deny, "
+				"always_transparent, always_refuse, "
+				"always_nxdomain, noview or nodefault");
+			free(yystack.l_mark[-1].str);
+			free(yystack.l_mark[0].str);
+		} else if(strcmp(yystack.l_mark[0].str, "nodefault")==0) {
+			if(!cfg_strlist_insert(&cfg_parser->cfg->views->
+				local_zones_nodefault, yystack.l_mark[-1].str))
+				fatal_exit("out of memory adding local-zone");
+			free(yystack.l_mark[0].str);
+#ifdef USE_IPSET
+		} else if(strcmp(yystack.l_mark[0].str, "ipset")==0) {
+			if(!cfg_strlist_insert(&cfg_parser->cfg->views->
+				local_zones_ipset, yystack.l_mark[-1].str))
+				fatal_exit("out of memory adding local-zone");
+			free(yystack.l_mark[0].str);
+#endif
+		} else {
+			if(!cfg_str2list_insert(
+				&cfg_parser->cfg->views->local_zones, 
+				yystack.l_mark[-1].str, yystack.l_mark[0].str))
+				fatal_exit("out of memory adding local-zone");
+		}
+	}
+break;
+case 484:
+#line 2661 "./util/configparser.y"
+	{
+		OUTYY(("P(view_response_ip:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		validate_respip_action(yystack.l_mark[0].str);
+		if(!cfg_str2list_insert(
+			&cfg_parser->cfg->views->respip_actions, yystack.l_mark[-1].str, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding per-view "
+				"response-ip action");
+	}
+break;
+case 485:
+#line 2671 "./util/configparser.y"
+	{
+		OUTYY(("P(view_response_ip_data:%s)\n", yystack.l_mark[-1].str));
+		if(!cfg_str2list_insert(
+			&cfg_parser->cfg->views->respip_data, yystack.l_mark[-1].str, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding response-ip-data");
+	}
+break;
+case 486:
+#line 2679 "./util/configparser.y"
+	{
+		OUTYY(("P(view_local_data:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, yystack.l_mark[0].str)) {
+			fatal_exit("out of memory adding local-data");
+		}
+	}
+break;
+case 487:
+#line 2687 "./util/configparser.y"
+	{
+		char* ptr;
+		OUTYY(("P(view_local_data_ptr:%s)\n", yystack.l_mark[0].str));
+		ptr = cfg_ptr_reverse(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+		if(ptr) {
+			if(!cfg_strlist_insert(&cfg_parser->cfg->views->
+				local_data, ptr))
+				fatal_exit("out of memory adding local-data");
+		} else {
+			yyerror("local-data-ptr could not be reversed");
+		}
+	}
+break;
+case 488:
+#line 2702 "./util/configparser.y"
+	{
+		OUTYY(("P(view-first:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->views->isfirst=(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 489:
+#line 2711 "./util/configparser.y"
+	{ 
+		OUTYY(("\nP(remote-control:)\n")); 
+	}
+break;
+case 500:
+#line 2722 "./util/configparser.y"
+	{
+		OUTYY(("P(control_enable:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->remote_control_enable = 
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 501:
+#line 2732 "./util/configparser.y"
+	{
+		OUTYY(("P(control_port:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("control port number expected");
+		else cfg_parser->cfg->control_port = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 502:
+#line 2741 "./util/configparser.y"
+	{
+		OUTYY(("P(control_interface:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 503:
+#line 2748 "./util/configparser.y"
+	{
+		OUTYY(("P(control_use_cert:%s)\n", yystack.l_mark[0].str));
+		cfg_parser->cfg->control_use_cert = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 504:
+#line 2755 "./util/configparser.y"
+	{
+		OUTYY(("P(rc_server_key_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->server_key_file);
+		cfg_parser->cfg->server_key_file = yystack.l_mark[0].str;
+	}
+break;
+case 505:
+#line 2762 "./util/configparser.y"
+	{
+		OUTYY(("P(rc_server_cert_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->server_cert_file);
+		cfg_parser->cfg->server_cert_file = yystack.l_mark[0].str;
+	}
+break;
+case 506:
+#line 2769 "./util/configparser.y"
+	{
+		OUTYY(("P(rc_control_key_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->control_key_file);
+		cfg_parser->cfg->control_key_file = yystack.l_mark[0].str;
+	}
+break;
+case 507:
+#line 2776 "./util/configparser.y"
+	{
+		OUTYY(("P(rc_control_cert_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->control_cert_file);
+		cfg_parser->cfg->control_cert_file = yystack.l_mark[0].str;
+	}
+break;
+case 508:
+#line 2783 "./util/configparser.y"
+	{
+		OUTYY(("\nP(dnstap:)\n"));
+	}
+break;
+case 529:
+#line 2803 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_enable:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 530:
+#line 2812 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_socket_path:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_socket_path);
+		cfg_parser->cfg->dnstap_socket_path = yystack.l_mark[0].str;
+	}
+break;
+case 531:
+#line 2819 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_ip:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_ip);
+		cfg_parser->cfg->dnstap_ip = yystack.l_mark[0].str;
+	}
+break;
+case 532:
+#line 2826 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_tls:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_tls = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 533:
+#line 2835 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_tls_server_name);
+		cfg_parser->cfg->dnstap_tls_server_name = yystack.l_mark[0].str;
+	}
+break;
+case 534:
+#line 2842 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
+		cfg_parser->cfg->dnstap_tls_cert_bundle = yystack.l_mark[0].str;
+	}
+break;
+case 535:
+#line 2849 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_tls_client_key_file);
+		cfg_parser->cfg->dnstap_tls_client_key_file = yystack.l_mark[0].str;
+	}
+break;
+case 536:
+#line 2856 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
+		cfg_parser->cfg->dnstap_tls_client_cert_file = yystack.l_mark[0].str;
+	}
+break;
+case 537:
+#line 2863 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_send_identity:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_send_identity = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 538:
+#line 2872 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_send_version:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_send_version = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 539:
+#line 2881 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_identity:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_identity);
+		cfg_parser->cfg->dnstap_identity = yystack.l_mark[0].str;
+	}
+break;
+case 540:
+#line 2888 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_version:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnstap_version);
+		cfg_parser->cfg->dnstap_version = yystack.l_mark[0].str;
+	}
+break;
+case 541:
+#line 2895 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_log_resolver_query_messages =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 542:
+#line 2905 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_log_resolver_response_messages =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 543:
+#line 2915 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_log_client_query_messages =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 544:
+#line 2925 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_log_client_response_messages =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 545:
+#line 2935 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_log_forwarder_query_messages =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 546:
+#line 2945 "./util/configparser.y"
+	{
+		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnstap_log_forwarder_response_messages =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 547:
+#line 2955 "./util/configparser.y"
+	{ 
+		OUTYY(("\nP(python:)\n")); 
+	}
+break;
+case 551:
+#line 2964 "./util/configparser.y"
+	{
+		OUTYY(("P(python-script:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, yystack.l_mark[0].str))
+			yyerror("out of memory");
+	}
+break;
+case 552:
+#line 2970 "./util/configparser.y"
+	{
+		OUTYY(("P(disable_dnssec_lame_check:%s)\n", yystack.l_mark[0].str));
+		if (strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->disable_dnssec_lame_check =
+			(strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 553:
+#line 2980 "./util/configparser.y"
+	{
+		OUTYY(("P(server_log_identity:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->log_identity);
+		cfg_parser->cfg->log_identity = yystack.l_mark[0].str;
+	}
+break;
+case 554:
+#line 2987 "./util/configparser.y"
+	{
+		OUTYY(("P(server_response_ip:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		validate_respip_action(yystack.l_mark[0].str);
+		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_actions,
+			yystack.l_mark[-1].str, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding response-ip");
+	}
+break;
+case 555:
+#line 2996 "./util/configparser.y"
+	{
+		OUTYY(("P(server_response_ip_data:%s)\n", yystack.l_mark[-1].str));
+		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
+			yystack.l_mark[-1].str, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding response-ip-data");
+	}
+break;
+case 556:
+#line 3004 "./util/configparser.y"
+	{
+		OUTYY(("\nP(dnscrypt:)\n"));
+	}
+break;
+case 569:
+#line 3020 "./util/configparser.y"
+	{
+		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", yystack.l_mark[0].str));
+		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->dnscrypt = (strcmp(yystack.l_mark[0].str, "yes")==0);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 570:
+#line 3030 "./util/configparser.y"
+	{
+		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("port number expected");
+		else cfg_parser->cfg->dnscrypt_port = atoi(yystack.l_mark[0].str);
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 571:
+#line 3039 "./util/configparser.y"
+	{
+		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->dnscrypt_provider);
+		cfg_parser->cfg->dnscrypt_provider = yystack.l_mark[0].str;
+	}
+break;
+case 572:
+#line 3046 "./util/configparser.y"
+	{
+		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", yystack.l_mark[0].str));
+		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, yystack.l_mark[0].str))
+			log_warn("dnscrypt-provider-cert %s is a duplicate", yystack.l_mark[0].str);
+		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding dnscrypt-provider-cert");
+	}
+break;
+case 573:
+#line 3055 "./util/configparser.y"
+	{
+		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", yystack.l_mark[0].str));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
+	}
+break;
+case 574:
+#line 3062 "./util/configparser.y"
+	{
+		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", yystack.l_mark[0].str));
+		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, yystack.l_mark[0].str))
+			log_warn("dnscrypt-secret-key: %s is a duplicate", yystack.l_mark[0].str);
+		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, yystack.l_mark[0].str))
+			fatal_exit("out of memory adding dnscrypt-secret-key");
+	}
+break;
+case 575:
+#line 3071 "./util/configparser.y"
+	{
+  	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", yystack.l_mark[0].str));
+  	if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
+  		yyerror("memory size expected");
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 576:
+#line 3079 "./util/configparser.y"
+	{
+  	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", yystack.l_mark[0].str));
+  	if(atoi(yystack.l_mark[0].str) == 0)
+  		yyerror("number expected");
+  	else {
+  		cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs = atoi(yystack.l_mark[0].str);
+  		if(!is_pow2(cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs))
+  			yyerror("must be a power of 2");
+  	}
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 577:
+#line 3092 "./util/configparser.y"
+	{
+  	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", yystack.l_mark[0].str));
+  	if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->dnscrypt_nonce_cache_size))
+  		yyerror("memory size expected");
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 578:
+#line 3100 "./util/configparser.y"
+	{
+  	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", yystack.l_mark[0].str));
+  	if(atoi(yystack.l_mark[0].str) == 0)
+  		yyerror("number expected");
+  	else {
+  		cfg_parser->cfg->dnscrypt_nonce_cache_slabs = atoi(yystack.l_mark[0].str);
+  		if(!is_pow2(cfg_parser->cfg->dnscrypt_nonce_cache_slabs))
+  			yyerror("must be a power of 2");
+  	}
+  	free(yystack.l_mark[0].str);
+  }
+break;
+case 579:
+#line 3113 "./util/configparser.y"
+	{
+		OUTYY(("\nP(cachedb:)\n"));
+	}
+break;
+case 587:
+#line 3123 "./util/configparser.y"
+	{
+	#ifdef USE_CACHEDB
+		OUTYY(("P(backend:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->cachedb_backend);
+		cfg_parser->cfg->cachedb_backend = yystack.l_mark[0].str;
+	#else
+		OUTYY(("P(Compiled without cachedb, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 588:
+#line 3135 "./util/configparser.y"
+	{
+	#ifdef USE_CACHEDB
+		OUTYY(("P(secret-seed:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->cachedb_secret);
+		cfg_parser->cfg->cachedb_secret = yystack.l_mark[0].str;
+	#else
+		OUTYY(("P(Compiled without cachedb, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 589:
+#line 3147 "./util/configparser.y"
+	{
+	#if defined(USE_CACHEDB) && defined(USE_REDIS)
+		OUTYY(("P(redis_server_host:%s)\n", yystack.l_mark[0].str));
+		free(cfg_parser->cfg->redis_server_host);
+		cfg_parser->cfg->redis_server_host = yystack.l_mark[0].str;
+	#else
+		OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
+		free(yystack.l_mark[0].str);
+	#endif
+	}
+break;
+case 590:
+#line 3159 "./util/configparser.y"
+	{
+	#if defined(USE_CACHEDB) && defined(USE_REDIS)
+		int port;
+		OUTYY(("P(redis_server_port:%s)\n", yystack.l_mark[0].str));
+		port = atoi(yystack.l_mark[0].str);
+		if(port == 0 || port < 0 || port > 65535)
+			yyerror("valid redis server port number expected");
+		else cfg_parser->cfg->redis_server_port = port;
+	#else
+		OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 591:
+#line 3174 "./util/configparser.y"
+	{
+	#if defined(USE_CACHEDB) && defined(USE_REDIS)
+		OUTYY(("P(redis_timeout:%s)\n", yystack.l_mark[0].str));
+		if(atoi(yystack.l_mark[0].str) == 0)
+			yyerror("redis timeout value expected");
+		else cfg_parser->cfg->redis_timeout = atoi(yystack.l_mark[0].str);
+	#else
+		OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
+	#endif
+		free(yystack.l_mark[0].str);
+	}
+break;
+case 592:
+#line 3187 "./util/configparser.y"
+	{
+		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
+		if (atoi(yystack.l_mark[0].str) < 0)
+			yyerror("positive number expected");
+		else {
+			if(!cfg_str2list_insert(&cfg_parser->cfg->tcp_connection_limits, yystack.l_mark[-1].str, yystack.l_mark[0].str))
+				fatal_exit("out of memory adding tcp connection limit");
+		}
+	}
+break;
+case 593:
+#line 3198 "./util/configparser.y"
+	{
+			OUTYY(("\nP(ipset:)\n"));
+		}
+break;
+case 598:
+#line 3207 "./util/configparser.y"
+	{
+		#ifdef USE_IPSET
+			OUTYY(("P(name-v4:%s)\n", yystack.l_mark[0].str));
+			if(cfg_parser->cfg->ipset_name_v4)
+				yyerror("ipset name v4 override, there must be one "
+					"name for ip v4");
+			free(cfg_parser->cfg->ipset_name_v4);
+			cfg_parser->cfg->ipset_name_v4 = yystack.l_mark[0].str;
+		#else
+			OUTYY(("P(Compiled without ipset, ignoring)\n"));
+			free(yystack.l_mark[0].str);
+		#endif
+		}
+break;
+case 599:
+#line 3222 "./util/configparser.y"
+	{
+		#ifdef USE_IPSET
+			OUTYY(("P(name-v6:%s)\n", yystack.l_mark[0].str));
+			if(cfg_parser->cfg->ipset_name_v6)
+				yyerror("ipset name v6 override, there must be one "
+					"name for ip v6");
+			free(cfg_parser->cfg->ipset_name_v6);
+			cfg_parser->cfg->ipset_name_v6 = yystack.l_mark[0].str;
+		#else
+			OUTYY(("P(Compiled without ipset, ignoring)\n"));
+			free(yystack.l_mark[0].str);
+		#endif
+		}
+break;
+#line 5180 "util/configparser.c"
+    }
+    yystack.s_mark -= yym;
+    yystate = *yystack.s_mark;
+    yystack.l_mark -= yym;
+    yym = yylhs[yyn];
+    if (yystate == 0 && yym == 0)
+    {
+#if YYDEBUG
+        if (yydebug)
+            printf("%sdebug: after reduction, shifting from state 0 to\
+ state %d\n", YYPREFIX, YYFINAL);
+#endif
+        yystate = YYFINAL;
+        *++yystack.s_mark = YYFINAL;
+        *++yystack.l_mark = yyval;
+        if (yychar < 0)
+        {
+            if ((yychar = YYLEX) < 0) yychar = YYEOF;
+#if YYDEBUG
+            if (yydebug)
+            {
+                yys = yyname[YYTRANSLATE(yychar)];
+                printf("%sdebug: state %d, reading %d (%s)\n",
+                        YYPREFIX, YYFINAL, yychar, yys);
+            }
+#endif
+        }
+        if (yychar == YYEOF) goto yyaccept;
+        goto yyloop;
+    }
+    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
+        yystate = yytable[yyn];
+    else
+        yystate = yydgoto[yym];
+#if YYDEBUG
+    if (yydebug)
+        printf("%sdebug: after reduction, shifting from state %d \
+to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
+#endif
+    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
+    {
+        goto yyoverflow;
+    }
+    *++yystack.s_mark = (YYINT) yystate;
+    *++yystack.l_mark = yyval;
+    goto yyloop;
+
+yyoverflow:
+    YYERROR_CALL("yacc stack overflow");
+
+yyabort:
+    yyfreestack(&yystack);
+    return (1);
+
+yyaccept:
+    yyfreestack(&yystack);
+    return (0);
+}
diff --git a/util/configparser.h b/util/configparser.h
index f5958de4b..0b383b6d1 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,643 +1,298 @@
-/* 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-2019 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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program 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/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   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.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
+#define SPACE 257
+#define LETTER 258
+#define NEWLINE 259
+#define COMMENT 260
+#define COLON 261
+#define ANY 262
+#define ZONESTR 263
+#define STRING_ARG 264
+#define VAR_SERVER 265
+#define VAR_VERBOSITY 266
+#define VAR_NUM_THREADS 267
+#define VAR_PORT 268
+#define VAR_OUTGOING_RANGE 269
+#define VAR_INTERFACE 270
+#define VAR_PREFER_IP4 271
+#define VAR_DO_IP4 272
+#define VAR_DO_IP6 273
+#define VAR_PREFER_IP6 274
+#define VAR_DO_UDP 275
+#define VAR_DO_TCP 276
+#define VAR_TCP_MSS 277
+#define VAR_OUTGOING_TCP_MSS 278
+#define VAR_TCP_IDLE_TIMEOUT 279
+#define VAR_EDNS_TCP_KEEPALIVE 280
+#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 281
+#define VAR_CHROOT 282
+#define VAR_USERNAME 283
+#define VAR_DIRECTORY 284
+#define VAR_LOGFILE 285
+#define VAR_PIDFILE 286
+#define VAR_MSG_CACHE_SIZE 287
+#define VAR_MSG_CACHE_SLABS 288
+#define VAR_NUM_QUERIES_PER_THREAD 289
+#define VAR_RRSET_CACHE_SIZE 290
+#define VAR_RRSET_CACHE_SLABS 291
+#define VAR_OUTGOING_NUM_TCP 292
+#define VAR_INFRA_HOST_TTL 293
+#define VAR_INFRA_LAME_TTL 294
+#define VAR_INFRA_CACHE_SLABS 295
+#define VAR_INFRA_CACHE_NUMHOSTS 296
+#define VAR_INFRA_CACHE_LAME_SIZE 297
+#define VAR_NAME 298
+#define VAR_STUB_ZONE 299
+#define VAR_STUB_HOST 300
+#define VAR_STUB_ADDR 301
+#define VAR_TARGET_FETCH_POLICY 302
+#define VAR_HARDEN_SHORT_BUFSIZE 303
+#define VAR_HARDEN_LARGE_QUERIES 304
+#define VAR_FORWARD_ZONE 305
+#define VAR_FORWARD_HOST 306
+#define VAR_FORWARD_ADDR 307
+#define VAR_DO_NOT_QUERY_ADDRESS 308
+#define VAR_HIDE_IDENTITY 309
+#define VAR_HIDE_VERSION 310
+#define VAR_IDENTITY 311
+#define VAR_VERSION 312
+#define VAR_HARDEN_GLUE 313
+#define VAR_MODULE_CONF 314
+#define VAR_TRUST_ANCHOR_FILE 315
+#define VAR_TRUST_ANCHOR 316
+#define VAR_VAL_OVERRIDE_DATE 317
+#define VAR_BOGUS_TTL 318
+#define VAR_VAL_CLEAN_ADDITIONAL 319
+#define VAR_VAL_PERMISSIVE_MODE 320
+#define VAR_INCOMING_NUM_TCP 321
+#define VAR_MSG_BUFFER_SIZE 322
+#define VAR_KEY_CACHE_SIZE 323
+#define VAR_KEY_CACHE_SLABS 324
+#define VAR_TRUSTED_KEYS_FILE 325
+#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 326
+#define VAR_USE_SYSLOG 327
+#define VAR_OUTGOING_INTERFACE 328
+#define VAR_ROOT_HINTS 329
+#define VAR_DO_NOT_QUERY_LOCALHOST 330
+#define VAR_CACHE_MAX_TTL 331
+#define VAR_HARDEN_DNSSEC_STRIPPED 332
+#define VAR_ACCESS_CONTROL 333
+#define VAR_LOCAL_ZONE 334
+#define VAR_LOCAL_DATA 335
+#define VAR_INTERFACE_AUTOMATIC 336
+#define VAR_STATISTICS_INTERVAL 337
+#define VAR_DO_DAEMONIZE 338
+#define VAR_USE_CAPS_FOR_ID 339
+#define VAR_STATISTICS_CUMULATIVE 340
+#define VAR_OUTGOING_PORT_PERMIT 341
+#define VAR_OUTGOING_PORT_AVOID 342
+#define VAR_DLV_ANCHOR_FILE 343
+#define VAR_DLV_ANCHOR 344
+#define VAR_NEG_CACHE_SIZE 345
+#define VAR_HARDEN_REFERRAL_PATH 346
+#define VAR_PRIVATE_ADDRESS 347
+#define VAR_PRIVATE_DOMAIN 348
+#define VAR_REMOTE_CONTROL 349
+#define VAR_CONTROL_ENABLE 350
+#define VAR_CONTROL_INTERFACE 351
+#define VAR_CONTROL_PORT 352
+#define VAR_SERVER_KEY_FILE 353
+#define VAR_SERVER_CERT_FILE 354
+#define VAR_CONTROL_KEY_FILE 355
+#define VAR_CONTROL_CERT_FILE 356
+#define VAR_CONTROL_USE_CERT 357
+#define VAR_EXTENDED_STATISTICS 358
+#define VAR_LOCAL_DATA_PTR 359
+#define VAR_JOSTLE_TIMEOUT 360
+#define VAR_STUB_PRIME 361
+#define VAR_UNWANTED_REPLY_THRESHOLD 362
+#define VAR_LOG_TIME_ASCII 363
+#define VAR_DOMAIN_INSECURE 364
+#define VAR_PYTHON 365
+#define VAR_PYTHON_SCRIPT 366
+#define VAR_VAL_SIG_SKEW_MIN 367
+#define VAR_VAL_SIG_SKEW_MAX 368
+#define VAR_CACHE_MIN_TTL 369
+#define VAR_VAL_LOG_LEVEL 370
+#define VAR_AUTO_TRUST_ANCHOR_FILE 371
+#define VAR_KEEP_MISSING 372
+#define VAR_ADD_HOLDDOWN 373
+#define VAR_DEL_HOLDDOWN 374
+#define VAR_SO_RCVBUF 375
+#define VAR_EDNS_BUFFER_SIZE 376
+#define VAR_PREFETCH 377
+#define VAR_PREFETCH_KEY 378
+#define VAR_SO_SNDBUF 379
+#define VAR_SO_REUSEPORT 380
+#define VAR_HARDEN_BELOW_NXDOMAIN 381
+#define VAR_IGNORE_CD_FLAG 382
+#define VAR_LOG_QUERIES 383
+#define VAR_LOG_REPLIES 384
+#define VAR_LOG_LOCAL_ACTIONS 385
+#define VAR_TCP_UPSTREAM 386
+#define VAR_SSL_UPSTREAM 387
+#define VAR_SSL_SERVICE_KEY 388
+#define VAR_SSL_SERVICE_PEM 389
+#define VAR_SSL_PORT 390
+#define VAR_FORWARD_FIRST 391
+#define VAR_STUB_SSL_UPSTREAM 392
+#define VAR_FORWARD_SSL_UPSTREAM 393
+#define VAR_TLS_CERT_BUNDLE 394
+#define VAR_STUB_FIRST 395
+#define VAR_MINIMAL_RESPONSES 396
+#define VAR_RRSET_ROUNDROBIN 397
+#define VAR_MAX_UDP_SIZE 398
+#define VAR_DELAY_CLOSE 399
+#define VAR_UNBLOCK_LAN_ZONES 400
+#define VAR_INSECURE_LAN_ZONES 401
+#define VAR_INFRA_CACHE_MIN_RTT 402
+#define VAR_DNS64_PREFIX 403
+#define VAR_DNS64_SYNTHALL 404
+#define VAR_DNS64_IGNORE_AAAA 405
+#define VAR_DNSTAP 406
+#define VAR_DNSTAP_ENABLE 407
+#define VAR_DNSTAP_SOCKET_PATH 408
+#define VAR_DNSTAP_IP 409
+#define VAR_DNSTAP_TLS 410
+#define VAR_DNSTAP_TLS_SERVER_NAME 411
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 412
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 413
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 414
+#define VAR_DNSTAP_SEND_IDENTITY 415
+#define VAR_DNSTAP_SEND_VERSION 416
+#define VAR_DNSTAP_IDENTITY 417
+#define VAR_DNSTAP_VERSION 418
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 419
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 420
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 421
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 422
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 423
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 424
+#define VAR_RESPONSE_IP_TAG 425
+#define VAR_RESPONSE_IP 426
+#define VAR_RESPONSE_IP_DATA 427
+#define VAR_HARDEN_ALGO_DOWNGRADE 428
+#define VAR_IP_TRANSPARENT 429
+#define VAR_IP_DSCP 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_PAD_RESPONSES 493
+#define VAR_PAD_RESPONSES_BLOCK_SIZE 494
+#define VAR_PAD_QUERIES 495
+#define VAR_PAD_QUERIES_BLOCK_SIZE 496
+#define VAR_IPSECMOD_ENABLED 497
+#define VAR_IPSECMOD_HOOK 498
+#define VAR_IPSECMOD_IGNORE_BOGUS 499
+#define VAR_IPSECMOD_MAX_TTL 500
+#define VAR_IPSECMOD_WHITELIST 501
+#define VAR_IPSECMOD_STRICT 502
+#define VAR_CACHEDB 503
+#define VAR_CACHEDB_BACKEND 504
+#define VAR_CACHEDB_SECRETSEED 505
+#define VAR_CACHEDB_REDISHOST 506
+#define VAR_CACHEDB_REDISPORT 507
+#define VAR_CACHEDB_REDISTIMEOUT 508
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 509
+#define VAR_FOR_UPSTREAM 510
+#define VAR_AUTH_ZONE 511
+#define VAR_ZONEFILE 512
+#define VAR_MASTER 513
+#define VAR_URL 514
+#define VAR_FOR_DOWNSTREAM 515
+#define VAR_FALLBACK_ENABLED 516
+#define VAR_TLS_ADDITIONAL_PORT 517
+#define VAR_LOW_RTT 518
+#define VAR_LOW_RTT_PERMIL 519
+#define VAR_FAST_SERVER_PERMIL 520
+#define VAR_FAST_SERVER_NUM 521
+#define VAR_ALLOW_NOTIFY 522
+#define VAR_TLS_WIN_CERT 523
+#define VAR_TCP_CONNECTION_LIMIT 524
+#define VAR_FORWARD_NO_CACHE 525
+#define VAR_STUB_NO_CACHE 526
+#define VAR_LOG_SERVFAIL 527
+#define VAR_DENY_ANY 528
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 529
+#define VAR_LOG_TAG_QUERYREPLY 530
+#define VAR_STREAM_WAIT_SIZE 531
+#define VAR_TLS_CIPHERS 532
+#define VAR_TLS_CIPHERSUITES 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
+#ifdef YYSTYPE
+#undef  YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
 #endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    SPACE = 258,
-    LETTER = 259,
-    NEWLINE = 260,
-    COMMENT = 261,
-    COLON = 262,
-    ANY = 263,
-    ZONESTR = 264,
-    STRING_ARG = 265,
-    VAR_SERVER = 266,
-    VAR_VERBOSITY = 267,
-    VAR_NUM_THREADS = 268,
-    VAR_PORT = 269,
-    VAR_OUTGOING_RANGE = 270,
-    VAR_INTERFACE = 271,
-    VAR_PREFER_IP4 = 272,
-    VAR_DO_IP4 = 273,
-    VAR_DO_IP6 = 274,
-    VAR_PREFER_IP6 = 275,
-    VAR_DO_UDP = 276,
-    VAR_DO_TCP = 277,
-    VAR_TCP_MSS = 278,
-    VAR_OUTGOING_TCP_MSS = 279,
-    VAR_TCP_IDLE_TIMEOUT = 280,
-    VAR_EDNS_TCP_KEEPALIVE = 281,
-    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282,
-    VAR_CHROOT = 283,
-    VAR_USERNAME = 284,
-    VAR_DIRECTORY = 285,
-    VAR_LOGFILE = 286,
-    VAR_PIDFILE = 287,
-    VAR_MSG_CACHE_SIZE = 288,
-    VAR_MSG_CACHE_SLABS = 289,
-    VAR_NUM_QUERIES_PER_THREAD = 290,
-    VAR_RRSET_CACHE_SIZE = 291,
-    VAR_RRSET_CACHE_SLABS = 292,
-    VAR_OUTGOING_NUM_TCP = 293,
-    VAR_INFRA_HOST_TTL = 294,
-    VAR_INFRA_LAME_TTL = 295,
-    VAR_INFRA_CACHE_SLABS = 296,
-    VAR_INFRA_CACHE_NUMHOSTS = 297,
-    VAR_INFRA_CACHE_LAME_SIZE = 298,
-    VAR_NAME = 299,
-    VAR_STUB_ZONE = 300,
-    VAR_STUB_HOST = 301,
-    VAR_STUB_ADDR = 302,
-    VAR_TARGET_FETCH_POLICY = 303,
-    VAR_HARDEN_SHORT_BUFSIZE = 304,
-    VAR_HARDEN_LARGE_QUERIES = 305,
-    VAR_FORWARD_ZONE = 306,
-    VAR_FORWARD_HOST = 307,
-    VAR_FORWARD_ADDR = 308,
-    VAR_DO_NOT_QUERY_ADDRESS = 309,
-    VAR_HIDE_IDENTITY = 310,
-    VAR_HIDE_VERSION = 311,
-    VAR_IDENTITY = 312,
-    VAR_VERSION = 313,
-    VAR_HARDEN_GLUE = 314,
-    VAR_MODULE_CONF = 315,
-    VAR_TRUST_ANCHOR_FILE = 316,
-    VAR_TRUST_ANCHOR = 317,
-    VAR_VAL_OVERRIDE_DATE = 318,
-    VAR_BOGUS_TTL = 319,
-    VAR_VAL_CLEAN_ADDITIONAL = 320,
-    VAR_VAL_PERMISSIVE_MODE = 321,
-    VAR_INCOMING_NUM_TCP = 322,
-    VAR_MSG_BUFFER_SIZE = 323,
-    VAR_KEY_CACHE_SIZE = 324,
-    VAR_KEY_CACHE_SLABS = 325,
-    VAR_TRUSTED_KEYS_FILE = 326,
-    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327,
-    VAR_USE_SYSLOG = 328,
-    VAR_OUTGOING_INTERFACE = 329,
-    VAR_ROOT_HINTS = 330,
-    VAR_DO_NOT_QUERY_LOCALHOST = 331,
-    VAR_CACHE_MAX_TTL = 332,
-    VAR_HARDEN_DNSSEC_STRIPPED = 333,
-    VAR_ACCESS_CONTROL = 334,
-    VAR_LOCAL_ZONE = 335,
-    VAR_LOCAL_DATA = 336,
-    VAR_INTERFACE_AUTOMATIC = 337,
-    VAR_STATISTICS_INTERVAL = 338,
-    VAR_DO_DAEMONIZE = 339,
-    VAR_USE_CAPS_FOR_ID = 340,
-    VAR_STATISTICS_CUMULATIVE = 341,
-    VAR_OUTGOING_PORT_PERMIT = 342,
-    VAR_OUTGOING_PORT_AVOID = 343,
-    VAR_DLV_ANCHOR_FILE = 344,
-    VAR_DLV_ANCHOR = 345,
-    VAR_NEG_CACHE_SIZE = 346,
-    VAR_HARDEN_REFERRAL_PATH = 347,
-    VAR_PRIVATE_ADDRESS = 348,
-    VAR_PRIVATE_DOMAIN = 349,
-    VAR_REMOTE_CONTROL = 350,
-    VAR_CONTROL_ENABLE = 351,
-    VAR_CONTROL_INTERFACE = 352,
-    VAR_CONTROL_PORT = 353,
-    VAR_SERVER_KEY_FILE = 354,
-    VAR_SERVER_CERT_FILE = 355,
-    VAR_CONTROL_KEY_FILE = 356,
-    VAR_CONTROL_CERT_FILE = 357,
-    VAR_CONTROL_USE_CERT = 358,
-    VAR_EXTENDED_STATISTICS = 359,
-    VAR_LOCAL_DATA_PTR = 360,
-    VAR_JOSTLE_TIMEOUT = 361,
-    VAR_STUB_PRIME = 362,
-    VAR_UNWANTED_REPLY_THRESHOLD = 363,
-    VAR_LOG_TIME_ASCII = 364,
-    VAR_DOMAIN_INSECURE = 365,
-    VAR_PYTHON = 366,
-    VAR_PYTHON_SCRIPT = 367,
-    VAR_VAL_SIG_SKEW_MIN = 368,
-    VAR_VAL_SIG_SKEW_MAX = 369,
-    VAR_CACHE_MIN_TTL = 370,
-    VAR_VAL_LOG_LEVEL = 371,
-    VAR_AUTO_TRUST_ANCHOR_FILE = 372,
-    VAR_KEEP_MISSING = 373,
-    VAR_ADD_HOLDDOWN = 374,
-    VAR_DEL_HOLDDOWN = 375,
-    VAR_SO_RCVBUF = 376,
-    VAR_EDNS_BUFFER_SIZE = 377,
-    VAR_PREFETCH = 378,
-    VAR_PREFETCH_KEY = 379,
-    VAR_SO_SNDBUF = 380,
-    VAR_SO_REUSEPORT = 381,
-    VAR_HARDEN_BELOW_NXDOMAIN = 382,
-    VAR_IGNORE_CD_FLAG = 383,
-    VAR_LOG_QUERIES = 384,
-    VAR_LOG_REPLIES = 385,
-    VAR_LOG_LOCAL_ACTIONS = 386,
-    VAR_TCP_UPSTREAM = 387,
-    VAR_SSL_UPSTREAM = 388,
-    VAR_SSL_SERVICE_KEY = 389,
-    VAR_SSL_SERVICE_PEM = 390,
-    VAR_SSL_PORT = 391,
-    VAR_FORWARD_FIRST = 392,
-    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_IP_DSCP = 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.  */
-#define SPACE 258
-#define LETTER 259
-#define NEWLINE 260
-#define COMMENT 261
-#define COLON 262
-#define ANY 263
-#define ZONESTR 264
-#define STRING_ARG 265
-#define VAR_SERVER 266
-#define VAR_VERBOSITY 267
-#define VAR_NUM_THREADS 268
-#define VAR_PORT 269
-#define VAR_OUTGOING_RANGE 270
-#define VAR_INTERFACE 271
-#define VAR_PREFER_IP4 272
-#define VAR_DO_IP4 273
-#define VAR_DO_IP6 274
-#define VAR_PREFER_IP6 275
-#define VAR_DO_UDP 276
-#define VAR_DO_TCP 277
-#define VAR_TCP_MSS 278
-#define VAR_OUTGOING_TCP_MSS 279
-#define VAR_TCP_IDLE_TIMEOUT 280
-#define VAR_EDNS_TCP_KEEPALIVE 281
-#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 282
-#define VAR_CHROOT 283
-#define VAR_USERNAME 284
-#define VAR_DIRECTORY 285
-#define VAR_LOGFILE 286
-#define VAR_PIDFILE 287
-#define VAR_MSG_CACHE_SIZE 288
-#define VAR_MSG_CACHE_SLABS 289
-#define VAR_NUM_QUERIES_PER_THREAD 290
-#define VAR_RRSET_CACHE_SIZE 291
-#define VAR_RRSET_CACHE_SLABS 292
-#define VAR_OUTGOING_NUM_TCP 293
-#define VAR_INFRA_HOST_TTL 294
-#define VAR_INFRA_LAME_TTL 295
-#define VAR_INFRA_CACHE_SLABS 296
-#define VAR_INFRA_CACHE_NUMHOSTS 297
-#define VAR_INFRA_CACHE_LAME_SIZE 298
-#define VAR_NAME 299
-#define VAR_STUB_ZONE 300
-#define VAR_STUB_HOST 301
-#define VAR_STUB_ADDR 302
-#define VAR_TARGET_FETCH_POLICY 303
-#define VAR_HARDEN_SHORT_BUFSIZE 304
-#define VAR_HARDEN_LARGE_QUERIES 305
-#define VAR_FORWARD_ZONE 306
-#define VAR_FORWARD_HOST 307
-#define VAR_FORWARD_ADDR 308
-#define VAR_DO_NOT_QUERY_ADDRESS 309
-#define VAR_HIDE_IDENTITY 310
-#define VAR_HIDE_VERSION 311
-#define VAR_IDENTITY 312
-#define VAR_VERSION 313
-#define VAR_HARDEN_GLUE 314
-#define VAR_MODULE_CONF 315
-#define VAR_TRUST_ANCHOR_FILE 316
-#define VAR_TRUST_ANCHOR 317
-#define VAR_VAL_OVERRIDE_DATE 318
-#define VAR_BOGUS_TTL 319
-#define VAR_VAL_CLEAN_ADDITIONAL 320
-#define VAR_VAL_PERMISSIVE_MODE 321
-#define VAR_INCOMING_NUM_TCP 322
-#define VAR_MSG_BUFFER_SIZE 323
-#define VAR_KEY_CACHE_SIZE 324
-#define VAR_KEY_CACHE_SLABS 325
-#define VAR_TRUSTED_KEYS_FILE 326
-#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 327
-#define VAR_USE_SYSLOG 328
-#define VAR_OUTGOING_INTERFACE 329
-#define VAR_ROOT_HINTS 330
-#define VAR_DO_NOT_QUERY_LOCALHOST 331
-#define VAR_CACHE_MAX_TTL 332
-#define VAR_HARDEN_DNSSEC_STRIPPED 333
-#define VAR_ACCESS_CONTROL 334
-#define VAR_LOCAL_ZONE 335
-#define VAR_LOCAL_DATA 336
-#define VAR_INTERFACE_AUTOMATIC 337
-#define VAR_STATISTICS_INTERVAL 338
-#define VAR_DO_DAEMONIZE 339
-#define VAR_USE_CAPS_FOR_ID 340
-#define VAR_STATISTICS_CUMULATIVE 341
-#define VAR_OUTGOING_PORT_PERMIT 342
-#define VAR_OUTGOING_PORT_AVOID 343
-#define VAR_DLV_ANCHOR_FILE 344
-#define VAR_DLV_ANCHOR 345
-#define VAR_NEG_CACHE_SIZE 346
-#define VAR_HARDEN_REFERRAL_PATH 347
-#define VAR_PRIVATE_ADDRESS 348
-#define VAR_PRIVATE_DOMAIN 349
-#define VAR_REMOTE_CONTROL 350
-#define VAR_CONTROL_ENABLE 351
-#define VAR_CONTROL_INTERFACE 352
-#define VAR_CONTROL_PORT 353
-#define VAR_SERVER_KEY_FILE 354
-#define VAR_SERVER_CERT_FILE 355
-#define VAR_CONTROL_KEY_FILE 356
-#define VAR_CONTROL_CERT_FILE 357
-#define VAR_CONTROL_USE_CERT 358
-#define VAR_EXTENDED_STATISTICS 359
-#define VAR_LOCAL_DATA_PTR 360
-#define VAR_JOSTLE_TIMEOUT 361
-#define VAR_STUB_PRIME 362
-#define VAR_UNWANTED_REPLY_THRESHOLD 363
-#define VAR_LOG_TIME_ASCII 364
-#define VAR_DOMAIN_INSECURE 365
-#define VAR_PYTHON 366
-#define VAR_PYTHON_SCRIPT 367
-#define VAR_VAL_SIG_SKEW_MIN 368
-#define VAR_VAL_SIG_SKEW_MAX 369
-#define VAR_CACHE_MIN_TTL 370
-#define VAR_VAL_LOG_LEVEL 371
-#define VAR_AUTO_TRUST_ANCHOR_FILE 372
-#define VAR_KEEP_MISSING 373
-#define VAR_ADD_HOLDDOWN 374
-#define VAR_DEL_HOLDDOWN 375
-#define VAR_SO_RCVBUF 376
-#define VAR_EDNS_BUFFER_SIZE 377
-#define VAR_PREFETCH 378
-#define VAR_PREFETCH_KEY 379
-#define VAR_SO_SNDBUF 380
-#define VAR_SO_REUSEPORT 381
-#define VAR_HARDEN_BELOW_NXDOMAIN 382
-#define VAR_IGNORE_CD_FLAG 383
-#define VAR_LOG_QUERIES 384
-#define VAR_LOG_REPLIES 385
-#define VAR_LOG_LOCAL_ACTIONS 386
-#define VAR_TCP_UPSTREAM 387
-#define VAR_SSL_UPSTREAM 388
-#define VAR_SSL_SERVICE_KEY 389
-#define VAR_SSL_SERVICE_PEM 390
-#define VAR_SSL_PORT 391
-#define VAR_FORWARD_FIRST 392
-#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_IP_DSCP 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"
-
+#ifndef YYSTYPE_IS_DECLARED
+#define YYSTYPE_IS_DECLARED 1
+typedef union {
 	char*	str;
-
-#line 631 "util/configparser.h"
-
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
+} YYSTYPE;
+#endif /* !YYSTYPE_IS_DECLARED */
 extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
diff --git a/util/configparser.y b/util/configparser.y
index f7be1019c..bbefeb431 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -158,6 +158,8 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS
 %token VAR_DNSCRYPT_NONCE_CACHE_SIZE
 %token VAR_DNSCRYPT_NONCE_CACHE_SLABS
+%token VAR_PAD_RESPONSES VAR_PAD_RESPONSES_BLOCK_SIZE
+%token VAR_PAD_QUERIES VAR_PAD_QUERIES_BLOCK_SIZE
 %token VAR_IPSECMOD_ENABLED VAR_IPSECMOD_HOOK VAR_IPSECMOD_IGNORE_BOGUS
 %token VAR_IPSECMOD_MAX_TTL VAR_IPSECMOD_WHITELIST VAR_IPSECMOD_STRICT
 %token VAR_CACHEDB VAR_CACHEDB_BACKEND VAR_CACHEDB_SECRETSEED
@@ -2307,6 +2309,44 @@ server_qname_minimisation_strict: VAR_QNAME_MINIMISATION_STRICT STRING_ARG
 		free($2);
 	}
 	;
+server_pad_responses: VAR_PAD_RESPONSES STRING_ARG
+	{
+		OUTYY(("P(server_pad_responses:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->pad_responses = 
+			(strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
+server_pad_responses_block_size: VAR_PAD_RESPONSES_BLOCK_SIZE STRING_ARG
+	{
+		OUTYY(("P(server_pad_responses_block_size:%s)\n", $2));
+		if(atoi($2) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->pad_responses_block_size = atoi($2);
+		free($2);
+	}
+	;
+server_pad_queries: VAR_PAD_QUERIES STRING_ARG
+	{
+		OUTYY(("P(server_pad_queries:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->pad_queries = 
+			(strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
+server_pad_queries_block_size: VAR_PAD_QUERIES_BLOCK_SIZE STRING_ARG
+	{
+		OUTYY(("P(server_pad_queries_block_size:%s)\n", $2));
+		if(atoi($2) == 0)
+			yyerror("number expected");
+		else cfg_parser->cfg->pad_queries_block_size = atoi($2);
+		free($2);
+	}
+	;
 server_ipsecmod_enabled: VAR_IPSECMOD_ENABLED STRING_ARG
 	{
 	#ifdef USE_IPSECMOD
diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index be69f628a..debb9eed1 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -798,14 +798,14 @@ calc_edns_field_size(struct edns_data* edns)
 	return 1 + 2 + 2 + 4 + 2 + rdatalen;
 }
 
-void
-attach_edns_record(sldns_buffer* pkt, struct edns_data* edns)
+static void
+attach_edns_record_max_msg_sz(sldns_buffer* pkt, struct edns_data* edns,
+	uint16_t max_msg_sz)
 {
 	size_t len;
 	size_t rdatapos;
 	struct edns_option* opt;
-	if(!edns || !edns->edns_present)
-		return;
+	struct edns_option* padding_option = NULL;
 	/* inc additional count */
 	sldns_buffer_write_u16_at(pkt, 10,
 		sldns_buffer_read_u16_at(pkt, 10) + 1);
@@ -823,17 +823,53 @@ attach_edns_record(sldns_buffer* pkt, struct edns_data* edns)
 	sldns_buffer_write_u16(pkt, 0); /* rdatalen */
 	/* write rdata */
 	for(opt=edns->opt_list; opt; opt=opt->next) {
+		if (opt->opt_code == LDNS_EDNS_PADDING) {
+			padding_option = opt;
+			continue;
+		}
 		sldns_buffer_write_u16(pkt, opt->opt_code);
 		sldns_buffer_write_u16(pkt, opt->opt_len);
 		if(opt->opt_len != 0)
 			sldns_buffer_write(pkt, opt->opt_data, opt->opt_len);
 	}
+	if (padding_option && edns->padding_block_size ) {
+		size_t pad_pos = sldns_buffer_position(pkt);
+		size_t msg_sz = ((pad_pos + 3) / edns->padding_block_size + 1)
+		                               * edns->padding_block_size;
+		size_t pad_sz;
+		
+		if (msg_sz > max_msg_sz)
+			msg_sz = max_msg_sz;
+
+		/* By use of calc_edns_field_size, calling functions should
+		 * have made sure that there is enough space for at least a
+		 * zero sized padding option, but it cannot harm to leave it
+		 * out if there isn't.
+		 */
+		log_assert(pad_pos + 4 <= msg_sz);
+
+		pad_sz = msg_sz - pad_pos - 4;
+		sldns_buffer_write_u16(pkt, LDNS_EDNS_PADDING);
+		sldns_buffer_write_u16(pkt, pad_sz);
+		if (pad_sz) {
+			memset(sldns_buffer_current(pkt), 0, pad_sz);
+			sldns_buffer_skip(pkt, pad_sz);
+		}
+	}
 	if(edns->opt_list)
 		sldns_buffer_write_u16_at(pkt, rdatapos, 
 			sldns_buffer_position(pkt)-rdatapos-2);
 	sldns_buffer_flip(pkt);
 }
 
+void
+attach_edns_record(sldns_buffer* pkt, struct edns_data* edns)
+{
+	if(!edns || !edns->edns_present)
+		return;
+	attach_edns_record_max_msg_sz(pkt, edns, edns->udp_size);
+}
+
 int 
 reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep, 
 	uint16_t id, uint16_t qflags, sldns_buffer* pkt, time_t timenow,
@@ -882,7 +918,7 @@ reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep,
 	}
 	if(attach_edns && sldns_buffer_capacity(pkt) >=
 		sldns_buffer_limit(pkt)+attach_edns)
-		attach_edns_record(pkt, edns);
+		attach_edns_record_max_msg_sz(pkt, edns, udpsize+attach_edns);
 	return 1;
 }
 
diff --git a/util/data/msgparse.c b/util/data/msgparse.c
index fb3123703..d553472bf 100644
--- a/util/data/msgparse.c
+++ b/util/data/msgparse.c
@@ -1016,6 +1016,7 @@ parse_extract_edns(struct msg_parse* msg, struct edns_data* edns,
 	edns->bits = sldns_read_uint16(&found->rr_last->ttl_data[2]);
 	edns->udp_size = ntohs(found->rrset_class);
 	edns->opt_list = NULL;
+	edns->padding_block_size = 0;
 
 	/* take the options */
 	rdata_len = found->rr_first->size-2;
@@ -1089,6 +1090,7 @@ parse_edns_from_pkt(sldns_buffer* pkt, struct edns_data* edns,
 	edns->edns_version = sldns_buffer_read_u8(pkt);
 	edns->bits = sldns_buffer_read_u16(pkt);
 	edns->opt_list = NULL;
+	edns->padding_block_size = 0;
 
 	/* take the options */
 	rdata_len = sldns_buffer_read_u16(pkt);
diff --git a/util/data/msgparse.h b/util/data/msgparse.h
index fd04f9f6f..533130c79 100644
--- a/util/data/msgparse.h
+++ b/util/data/msgparse.h
@@ -225,6 +225,8 @@ struct edns_data {
 	uint16_t udp_size;
 	/** rdata element list, or NULL if none */
 	struct edns_option* opt_list;
+	/** block size to pad */
+	uint16_t padding_block_size;
 };
 
 /**
diff --git a/util/edns.c b/util/edns.c
index d19952df0..8376fb1c5 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -79,5 +79,15 @@ int apply_edns_options(struct edns_data* edns_out, struct edns_data* edns_in,
 		!edns_keepalive(edns_out, edns_in, c, region))
 		return 0;
 
+	if(!cfg->pad_responses || c->type != comm_tcp || !c->ssl
+	|| !edns_opt_list_find(edns_in->opt_list, LDNS_EDNS_PADDING))
+	       ; /* pass */
+
+	else if(!edns_opt_list_append(&edns_out->opt_list, LDNS_EDNS_PADDING
+	                                                 , 0, NULL, region))
+		return 0;
+	else
+		edns_out->padding_block_size = cfg->pad_responses_block_size;
+
 	return 1;
 }
diff --git a/validator/autotrust.c b/validator/autotrust.c
index fd9fb3cf1..7ce07e0d8 100644
--- a/validator/autotrust.c
+++ b/validator/autotrust.c
@@ -2365,6 +2365,7 @@ probe_anchor(struct module_env* env, struct trust_anchor* tp)
 	edns.edns_version = 0;
 	edns.bits = EDNS_DO;
 	edns.opt_list = NULL;
+	edns.padding_block_size = 0;
 	if(sldns_buffer_capacity(buf) < 65535)
 		edns.udp_size = (uint16_t)sldns_buffer_capacity(buf);
 	else	edns.udp_size = 65535;

From 2c8a91c2f9de8a4bfde7ef0567c317ff1301b382 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 14 Apr 2020 08:52:51 +0200
Subject: [PATCH 003/208] pad-queries default yes

---
 doc/example.conf.in   | 2 +-
 doc/unbound.conf.5.in | 2 +-
 util/config_file.c    | 2 +-
 util/data/msgencode.c | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/example.conf.in b/doc/example.conf.in
index ff68db014..ac282950f 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -771,7 +771,7 @@ server:
 	# tls-win-cert: no
 
 	# Pad queries over TLS upstreams
-	# pad-queries: no
+	# pad-queries: yes
 
 	# Padded queries will be padded to the closest multiple of this size.
 	# pad-queries-block-size: 128
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 12c2b20f6..107ccb938 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -560,7 +560,7 @@ Default is 468.
 .B pad\-queries: \fI<yes or no>
 If enabled, all queries sent over TLS upstreams will be padded to the closest
 multiple of the size specified in \fBpad\-queries\-block\-size\fR.
-Default is no.
+Default is yes.
 .TP
 .B pad\-queries\-block\-size: \fI<number>
 The block size with which to pad queries sent over TLS upstreams.
diff --git a/util/config_file.c b/util/config_file.c
index 7f7f2dc22..1071f9a7b 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -324,7 +324,7 @@ config_create(void)
 	cfg->dnscrypt_nonce_cache_slabs = 4;
 	cfg->pad_responses = 1;
 	cfg->pad_responses_block_size = 468; /* from RFC8467 */
-	cfg->pad_queries = 0;
+	cfg->pad_queries = 1;
 	cfg->pad_queries_block_size = 128; /* from RFC8467 */
 #ifdef USE_IPSECMOD
 	cfg->ipsecmod_enabled = 1;
diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index debb9eed1..49e48954b 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -843,8 +843,7 @@ attach_edns_record_max_msg_sz(sldns_buffer* pkt, struct edns_data* edns,
 
 		/* By use of calc_edns_field_size, calling functions should
 		 * have made sure that there is enough space for at least a
-		 * zero sized padding option, but it cannot harm to leave it
-		 * out if there isn't.
+		 * zero sized padding option.
 		 */
 		log_assert(pad_pos + 4 <= msg_sz);
 

From 1a6cc6e5dc12069c0a9b06a8c59f366535b2f654 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 26 May 2020 08:46:36 +0200
Subject: [PATCH 004/208] fixup lru list presence boolean.

---
 services/outside_network.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/outside_network.h b/services/outside_network.h
index 9290864a6..0230829a8 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -244,6 +244,8 @@ struct reuse_tcp {
 	 * TODO
 	 */
 	struct reuse_tcp* next, *prev;
+	/** true if the reuse_tcp item is on the lru list with empty items */
+	int item_on_lru_list;
 	/** the connection to reuse, the fd is non-1 and is open.
 	 * the addr and port determine where the connection is going,
 	 * and is key to the rbtree.  The SSL ptr determines if it is

From aad363ddd1e9e3b75faa0ad1aac5c4b25d4b8ec7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 26 May 2020 13:41:07 +0200
Subject: [PATCH 005/208] rename next,prev to lru_next,lru_prev for clarity.

---
 services/outside_network.c | 45 ++++++++++++++++++--------------------
 services/outside_network.h | 15 +++++--------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index c3350517d..9b3458922 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -484,25 +484,23 @@ reuse_tcp_remove_tree_list(struct outside_network* outnet,
 	}
 	/* delete from reuse list */
 	if(reuse->pending) {
-		if(reuse->prev) {
+		if(reuse->lru_prev) {
 			/* assert that members of the lru list are waiting
 			 * and thus have a pending pointer to the struct */
-			log_assert(reuse->prev->pending);
-			reuse->prev->next = reuse->next;
+			log_assert(reuse->lru_prev->pending);
+			reuse->lru_prev->lru_next = reuse->lru_next;
 		} else {
-			log_assert(!reuse->next || reuse->next->pending);
-			outnet->tcp_reuse_first =
-				(reuse->next?reuse->next->pending:NULL);
+			log_assert(!reuse->lru_next || reuse->lru_next->pending);
+			outnet->tcp_reuse_first = reuse->lru_next;
 		}
-		if(reuse->next) {
+		if(reuse->lru_next) {
 			/* assert that members of the lru list are waiting
 			 * and thus have a pending pointer to the struct */
-			log_assert(reuse->next->pending);
-			reuse->next->prev = reuse->prev;
+			log_assert(reuse->lru_next->pending);
+			reuse->lru_next->lru_prev = reuse->lru_prev;
 		} else {
-			log_assert(!reuse->prev || reuse->prev->pending);
-			outnet->tcp_reuse_last =
-				(reuse->prev?reuse->prev->pending:NULL);
+			log_assert(!reuse->lru_prev || reuse->lru_prev->pending);
+			outnet->tcp_reuse_last = reuse->lru_prev;
 		}
 		reuse->pending = NULL;
 	}
@@ -544,15 +542,15 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 		return 0;
 	}
 	/* insert into LRU, first is newest */
-	pend_tcp->reuse.prev = NULL;
+	pend_tcp->reuse.lru_prev = NULL;
 	if(outnet->tcp_reuse_first) {
-		pend_tcp->reuse.next = &outnet->tcp_reuse_first->reuse;
-		outnet->tcp_reuse_first->reuse.prev = &pend_tcp->reuse;
+		pend_tcp->reuse.lru_next = outnet->tcp_reuse_first;
+		outnet->tcp_reuse_first->lru_prev = &pend_tcp->reuse;
 	} else {
-		pend_tcp->reuse.next = NULL;
-		outnet->tcp_reuse_last = pend_tcp;
+		pend_tcp->reuse.lru_next = NULL;
+		outnet->tcp_reuse_last = &pend_tcp->reuse;
 	}
-	outnet->tcp_reuse_first = pend_tcp;
+	outnet->tcp_reuse_first = &pend_tcp->reuse;
 	return 1;
 }
 
@@ -1452,14 +1450,13 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 {
 	struct pending_tcp* pend;
 	if(!outnet->tcp_reuse_last) return;
-	pend = outnet->tcp_reuse_last;
+	pend = outnet->tcp_reuse_last->pending;
 
 	/* snip off of LRU */
-	log_assert(pend->reuse.next == NULL);
-	if(pend->reuse.prev) {
-		log_assert(pend->reuse.prev->pending);
-		outnet->tcp_reuse_last = pend->reuse.prev->pending;
-		pend->reuse.prev->next = NULL;
+	log_assert(pend->reuse.lru_next == NULL);
+	if(pend->reuse.lru_prev) {
+		outnet->tcp_reuse_last = pend->reuse.lru_prev;
+		pend->reuse.lru_prev->lru_next = NULL;
 	} else {
 		outnet->tcp_reuse_last = NULL;
 		outnet->tcp_reuse_first = NULL;
diff --git a/services/outside_network.h b/services/outside_network.h
index 0230829a8..f8f62238d 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -169,7 +169,7 @@ struct outside_network {
 	 * the oldest can be closed to get a new free pending_tcp if needed
 	 * The list contains empty connections, that wait for timeout or
 	 * a new query that can use the existing connection. */
-	struct pending_tcp* tcp_reuse_first, *tcp_reuse_last;
+	struct reuse_tcp* tcp_reuse_first, *tcp_reuse_last;
 	/** list of tcp comm points that are free for use */
 	struct pending_tcp* tcp_free;
 	/** list of tcp queries waiting for a buffer */
@@ -240,10 +240,8 @@ struct reuse_tcp {
 	 * the ones with active queries are not on the list because they
 	 * do not need to be closed to make space for others.  They already
 	 * service a query so the close for another query does not help
-	 * service a larger number of queries.
-	 * TODO
-	 */
-	struct reuse_tcp* next, *prev;
+	 * service a larger number of queries. */
+	struct reuse_tcp* lru_next, *lru_prev;
 	/** true if the reuse_tcp item is on the lru list with empty items */
 	int item_on_lru_list;
 	/** the connection to reuse, the fd is non-1 and is open.
@@ -251,18 +249,17 @@ struct reuse_tcp {
 	 * and is key to the rbtree.  The SSL ptr determines if it is
 	 * a TLS connection or a plain TCP connection there.  And TLS
 	 * or not is also part of the key to the rbtree.
-	 * There is a timeout and read event on the fd, to close it.
-	 */
+	 * There is a timeout and read event on the fd, to close it. */
 	struct pending_tcp* pending;
 	/** rbtree with other queries waiting on the connection, by ID number,
 	 * of type struct waiting_tcp. It is for looking up received
 	 * answers to the structure for callback.  And also to see if ID
-	 * numbers are unused and can be used for a new query. TODO */
+	 * numbers are unused and can be used for a new query. */
 	rbtree_type tree_by_id;
 	/** list of queries waiting to be written on the channel,
 	 * if NULL no queries are waiting to be written and the pending->query
 	 * is the query currently serviced.  The first is the next in line.
-	 * Once written, a query moves to the tree_by_id. TODO */
+	 * Once written, a query moves to the tree_by_id. */
 	struct waiting_tcp* write_wait_first, *write_wait_last;
 };
 

From d1904bd50905c4278ace5d616a4e693466b8c710 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 26 May 2020 16:27:45 +0200
Subject: [PATCH 006/208] tree key addr

---
 services/outside_network.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/outside_network.h b/services/outside_network.h
index f8f62238d..12c72c990 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -232,8 +232,15 @@ struct port_comm {
  */
 struct reuse_tcp {
 	/** rbtree node with links in tcp_reuse tree. key is NULL when not
-	 * in tree. Both active and empty connections are in the tree. */
+	 * in tree. Both active and empty connections are in the tree.
+	 * key is this structure, the sockaddr and then ptr value for
+	 * several times same address in tree */
 	rbnode_type node;
+	/** the key for the tcp_reuse tree. address of peer, ip4 or ip6,
+	 * and port number of peer */
+	struct sockaddr_storage addr;
+	/** length of addr */
+	socklen_t addrlen;
 	/** lru chain, so that the oldest can be removed to get a new
 	 * connection when all are in (re)use. oldest is last in list.
 	 * The lru only contains empty connections waiting for reuse,

From d9afcae34645b14815f5cd8befc4604769a1fc10 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 3 Jun 2020 09:38:02 +0200
Subject: [PATCH 007/208] add debug printout

---
 services/outside_network.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/services/outside_network.c b/services/outside_network.c
index 9b3458922..951d8bce5 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -477,6 +477,7 @@ static void
 reuse_tcp_remove_tree_list(struct outside_network* outnet,
 	struct reuse_tcp* reuse)
 {
+	verbose(5, "reuse_tcp_remove_tree_list");
 	if(reuse->node.key) {
 		/* delete it from reuse tree */
 		(void)rbtree_delete(&outnet->tcp_reuse, &reuse->node);
@@ -511,6 +512,7 @@ static void
 decommission_pending_tcp(struct outside_network* outnet, 
 	struct pending_tcp* pend)
 {
+	verbose(5, "decommision_pending_tcp");
 	if(pend->c->ssl) {
 #ifdef HAVE_SSL
 		SSL_shutdown(pend->c->ssl);
@@ -533,10 +535,12 @@ decommission_pending_tcp(struct outside_network* outnet,
 static int
 reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 {
+	verbose(5, "reuse_tcp_insert");
 	pend_tcp->reuse.node.key = &pend_tcp->reuse;
 	pend_tcp->reuse.pending = pend_tcp;
 	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
 		/* this is a duplicate connection, close this one */
+		verbose(5, "reuse_tcp_insert: duplicate connection");
 		pend_tcp->reuse.node.key = NULL;
 		pend_tcp->reuse.pending = NULL;
 		return 0;
@@ -1406,6 +1410,7 @@ outnet_tcptimer(void* arg)
 	struct waiting_tcp* w = (struct waiting_tcp*)arg;
 	struct outside_network* outnet = w->outnet;
 	int do_callback = 1;
+	verbose(5, "outnet_tcptimer");
 	if(w->pkt) {
 		/* it is on the waiting list */
 		waiting_list_remove(outnet, w);
@@ -1449,6 +1454,7 @@ static void
 reuse_tcp_close_oldest(struct outside_network* outnet)
 {
 	struct pending_tcp* pend;
+	verbose(5, "reuse_tcp_close_oldest");
 	if(!outnet->tcp_reuse_last) return;
 	pend = outnet->tcp_reuse_last->pending;
 
@@ -1476,6 +1482,7 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	struct waiting_tcp key_w;
 	struct pending_tcp key_p;
 	struct comm_point c;
+	verbose(5, "reuse_tcp_find");
 	memset(&key_w, 0, sizeof(key_w));
 	memset(&key_p, 0, sizeof(key_p));
 	memset(&c, 0, sizeof(c));
@@ -1504,10 +1511,12 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	struct timeval tv;
 	uint16_t id;
 
+	verbose(5, "pending_tcp_query");
 	/* find out if a reused stream to the target exists */
 	/* if so, take it into use */
 	reuse = reuse_tcp_find(sq->outnet, sq);
 	if(reuse) {
+		verbose(5, "pending_tcp_query: found reuse");
 		log_assert(reuse->pending);
 		pend = reuse->pending;
 	}
@@ -1552,6 +1561,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	if(pend) {
 		/* we have a buffer available right now */
 		if(reuse) {
+			verbose(5, "pending_tcp_query: reuse, store");
 			/* if cannot write now, store query and put it
 			 * in the waiting list for this stream TODO */
 			/* and also delete it from waitlst if query gone,
@@ -1563,6 +1573,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 				sldns_buffer_begin(packet),
 				sldns_buffer_limit(packet));
 		} else {
+			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
 			 * write query */
 			if(!outnet_tcp_take_into_use(w,
@@ -1581,6 +1592,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 #endif
 	} else {
 		/* queue up */
+		verbose(5, "pending_tcp_query: queue to wait");
 		w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp);
 		w->pkt_len = sldns_buffer_limit(packet);
 		memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len);
@@ -1729,13 +1741,16 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	struct serviced_query* sq)
 {
 	struct pending_tcp* pend_tcp = (struct pending_tcp*)w->next_waiting;
+	verbose(5, "reuse_tcp_remove_serviced_keep");
 	/* see if can be entered in reuse tree
 	 * for that the FD has to be non-1 */
 	if(pend_tcp->c->fd == -1) {
+		verbose(5, "reuse_tcp_remove_serviced_keep: -1 fd");
 		return 0;
 	}
 	/* if in tree and used by other queries */
 	if(pend_tcp->reuse.node.key) {
+		verbose(5, "reuse_tcp_remove_serviced_keep: in use by other queries");
 		/* note less use of stream */
 		/* remove id value used by this svcd. */
 		/* do not reset the keepalive timer, for that
@@ -1747,6 +1762,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	/* if still open and want to keep it open */
 	if(pend_tcp->c->fd != -1 && sq->outnet->tcp_reuse.count <
 		sq->outnet->tcp_reuse_max) {
+		verbose(5, "reuse_tcp_remove_serviced_keep: keep open");
 		/* note less use of stream */
 		/* remove id value used by this svcd. */
 		/* set a keepalive timer on it */
@@ -1762,6 +1778,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 static void
 serviced_delete(struct serviced_query* sq)
 {
+	verbose(5, "serviced_delete");
 	if(sq->pending) {
 		/* clear up the pending query */
 		if(sq->status == serviced_query_UDP_EDNS ||
@@ -1769,6 +1786,7 @@ serviced_delete(struct serviced_query* sq)
 			sq->status == serviced_query_UDP_EDNS_FRAG ||
 			sq->status == serviced_query_UDP_EDNS_fallback) {
 			struct pending* p = (struct pending*)sq->pending;
+			verbose(5, "serviced_delete: UDP");
 			if(p->pc)
 				portcomm_loweruse(sq->outnet, p->pc);
 			pending_delete(sq->outnet, p);
@@ -1778,15 +1796,18 @@ serviced_delete(struct serviced_query* sq)
 		} else {
 			struct waiting_tcp* p = (struct waiting_tcp*)
 				sq->pending;
+			verbose(5, "serviced_delete: TCP");
 			/* TODO: if on stream-write-waiting list then
 			 * remove from waiting list and waiting_tcp_delete */
 			if(p->pkt == NULL) {
+				verbose(5, "serviced_delete: tcpreusekeep");
 				if(!reuse_tcp_remove_serviced_keep(p, sq)) {
 					decommission_pending_tcp(sq->outnet,
 					  (struct pending_tcp*)p->next_waiting);
 					use_free_buffer(sq->outnet);
 				}
 			} else {
+				verbose(5, "serviced_delete: tcpwait");
 				waiting_list_remove(sq->outnet, p);
 				waiting_tcp_delete(p);
 			}

From 7b4606702986cc06d65887f65dc12664c58ef27d Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 3 Jun 2020 10:01:51 +0200
Subject: [PATCH 008/208] add test for tcp reuse

---
 testdata/tcp_reuse.tdir/tcp_reuse.conf  | 17 +++++++
 testdata/tcp_reuse.tdir/tcp_reuse.conf2 | 29 +++++++++++
 testdata/tcp_reuse.tdir/tcp_reuse.dsc   | 16 ++++++
 testdata/tcp_reuse.tdir/tcp_reuse.post  | 18 +++++++
 testdata/tcp_reuse.tdir/tcp_reuse.pre   | 34 +++++++++++++
 testdata/tcp_reuse.tdir/tcp_reuse.test  | 65 +++++++++++++++++++++++++
 6 files changed, 179 insertions(+)
 create mode 100644 testdata/tcp_reuse.tdir/tcp_reuse.conf
 create mode 100644 testdata/tcp_reuse.tdir/tcp_reuse.conf2
 create mode 100644 testdata/tcp_reuse.tdir/tcp_reuse.dsc
 create mode 100644 testdata/tcp_reuse.tdir/tcp_reuse.post
 create mode 100644 testdata/tcp_reuse.tdir/tcp_reuse.pre
 create mode 100644 testdata/tcp_reuse.tdir/tcp_reuse.test

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf b/testdata/tcp_reuse.tdir/tcp_reuse.conf
new file mode 100644
index 000000000..e8de8d3f8
--- /dev/null
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf
@@ -0,0 +1,17 @@
+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
+
+	tcp-upstream: yes
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf2 b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
new file mode 100644
index 000000000..308107094
--- /dev/null
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
@@ -0,0 +1,29 @@
+# this is the upstream server that has pipelining and responds to queries.
+server:
+	verbosity: 1
+	# num-threads: 1
+	interface: 127.0.0.1
+	port: @PORT@
+	use-syslog: no
+	directory: .
+	pidfile: "unbound2.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+
+	log-queries: yes
+	log-replies: yes
+	log-identity: "upstream"
+
+	local-zone: "." refuse
+	local-zone: "example.com" static
+	local-data: "www.example.com  A 10.20.30.40"
+	local-data: "www1.example.com  A 10.20.30.41"
+	local-data: "www2.example.com  A 10.20.30.42"
+	local-data: "www3.example.com  A 10.20.30.43"
+	local-data: "www4.example.com  A 10.20.30.44"
+
+# if queries escape, send them to localhost
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.dsc b/testdata/tcp_reuse.tdir/tcp_reuse.dsc
new file mode 100644
index 000000000..8a780480d
--- /dev/null
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.dsc
@@ -0,0 +1,16 @@
+BaseName: tcp_reuse
+Version: 1.0
+Description: Test tcp stream reuse.
+CreationDate: Wed Jun 03 09:37:00 CET 2020
+Maintainer: Wouter Wijngaards
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: tcp_reuse.pre
+Post: tcp_reuse.post
+Test: tcp_reuse.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.post b/testdata/tcp_reuse.tdir/tcp_reuse.post
new file mode 100644
index 000000000..7399d3603
--- /dev/null
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.post
@@ -0,0 +1,18 @@
+# #-- tcp_reuse.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 $UPSTREAM_PID
+kill_pid $UNBOUND_PID
+if test -f unbound2.log; then
+	echo ">>> upstream log"
+	cat unbound2.log
+fi
+if test -f unbound.log; then
+	echo ">>> unbound log"
+	cat unbound.log
+fi
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre
new file mode 100644
index 000000000..511dbc6f7
--- /dev/null
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre
@@ -0,0 +1,34 @@
+# #-- tcp_reuse.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
+get_random_port 2
+UNBOUND_PORT=$RND_PORT
+UPSTREAM_PORT=$(($RND_PORT + 1))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf > ub.conf
+# start unbound in the background
+#$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+wait_unbound_up unbound.log
+
+# make upstream config file
+sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf2 > ub2.conf
+# start upstream unbound in the background
+#$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
+$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
+UPSTREAM_PID=$!
+echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test
+wait_unbound_up unbound2.log
+
+cat .tpkg.var.test
+
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
new file mode 100644
index 000000000..4b006afc4
--- /dev/null
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -0,0 +1,65 @@
+# #-- tcp_reuse.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 streamtcp)
+
+echo "> query www1.example.com."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www1.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 unbound2.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.com" outfile | grep "10.20.30.41"; then
+	echo "content OK"
+else
+	echo "result contents not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+echo "OK"
+echo ""
+
+# this should be reused on the same tcp stream:
+echo "> query www2.example.com."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www2.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 unbound2.log 
+	cat unbound.log
+	echo "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 unbound2.log 
+	cat unbound.log
+	echo "result contents not OK"
+	exit 1
+fi
+
+echo "OK"
+exit 0

From 0f3c638193e0ac58413dde42052c88aef6e92a88 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 3 Jun 2020 12:10:31 +0200
Subject: [PATCH 009/208] find reuse find tcp loop code for multiple
 connections to the same destination find spare id value in reused connection.

---
 services/outside_network.c | 186 ++++++++++++++++++++++++++++++++++---
 services/outside_network.h |  14 ++-
 2 files changed, 181 insertions(+), 19 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 951d8bce5..b30666945 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -131,20 +131,14 @@ serviced_cmp(const void* key1, const void* key2)
 	return sockaddr_cmp(&q1->addr, q1->addrlen, &q2->addr, q2->addrlen);
 }
 
-int
-reuse_cmp(const void* key1, const void* key2)
+/** compare if the reuse element has the same address, port and same ssl-is
+ * used-for-it characteristic */
+static int
+reuse_cmp_addrportssl(const void* key1, const void* key2)
 {
 	struct reuse_tcp* r1 = (struct reuse_tcp*)key1;
 	struct reuse_tcp* r2 = (struct reuse_tcp*)key2;
 	int r;
-	/* make sure the entries are in use (have a waiting_tcp entry) */
-	if(!r1->pending->query && !r2->pending->query)
-		return 0;
-	if(r1->pending->query && !r2->pending->query)
-		return 1;
-	if(!r1->pending->query && r2->pending->query)
-		return -1;
-
 	/* compare address and port */
 	r = sockaddr_cmp(&r1->pending->query->addr, r1->pending->query->addrlen,
 		&r2->pending->query->addr, r2->pending->query->addrlen);
@@ -159,6 +153,22 @@ reuse_cmp(const void* key1, const void* key2)
 	return 0;
 }
 
+int
+reuse_cmp(const void* key1, const void* key2)
+{
+	struct reuse_tcp* r1 = (struct reuse_tcp*)key1;
+	struct reuse_tcp* r2 = (struct reuse_tcp*)key2;
+	int r;
+	r = reuse_cmp_addrportssl(key1, key2);
+	if(r != 0)
+		return r;
+
+	/* compare ptr value */
+	if(r1 < r2) return -1;
+	if(r1 > r2) return 1;
+	return 0;
+}
+
 /** delete waiting_tcp entry. Does not unlink from waiting list. 
  * @param w: to delete.
  */
@@ -531,11 +541,24 @@ decommission_pending_tcp(struct outside_network* outnet,
 	pend->query = NULL;
 }
 
+/** log reuse item addr and ptr with message */
+static void
+log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
+{
+	uint16_t port;
+	char addrbuf[128];
+	if(verbosity < v) return;
+	addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf));
+	port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port);
+	verbose(v, "%s %s %u %lx", msg, addrbuf, (unsigned)port,
+		(unsigned long)reuse);
+}
+
 /** insert into reuse tcp tree and LRU, false on failure (duplicate) */
 static int
 reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 {
-	verbose(5, "reuse_tcp_insert");
+	log_reuse_tcp(5, "reuse_tcp_insert", &pend_tcp->reuse);
 	pend_tcp->reuse.node.key = &pend_tcp->reuse;
 	pend_tcp->reuse.pending = pend_tcp;
 	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
@@ -1482,6 +1505,7 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	struct waiting_tcp key_w;
 	struct pending_tcp key_p;
 	struct comm_point c;
+	rbnode_type* result = NULL, *prev;
 	verbose(5, "reuse_tcp_find");
 	memset(&key_w, 0, sizeof(key_w));
 	memset(&key_p, 0, sizeof(key_p));
@@ -1497,8 +1521,135 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	memmove(&key_w.addr, &sq->addr, sq->addrlen);
 	key_w.addrlen = sq->addrlen;
 
-	return (struct reuse_tcp*)rbtree_search(&outnet->tcp_reuse,
-		&key_p.reuse.node);
+	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node,
+		&result)) {
+		/* exact match */
+		/* but the key is on stack, and ptr is compared, impossible */
+		log_assert(&key_p.reuse != (struct reuse_tcp*)result);
+		log_assert(&key_p != ((struct reuse_tcp*)result)->pending);
+	}
+	/* not found, return null */
+	if(!result || result == RBTREE_NULL)
+		return NULL;
+	/* inexact match, find one of possibly several connections to the
+	 * same destination address, with the correct port, ssl, and
+	 * also less than max number of open queries, or else, fail to open
+	 * a new one */
+	/* rewind to start of sequence of same address,port,ssl */
+	prev = rbtree_previous(result);
+	while(prev && prev != RBTREE_NULL &&
+		reuse_cmp_addrportssl(prev->key, &key_p.reuse) == 0) {
+		result = prev;
+		prev = rbtree_previous(result);
+	}
+
+	/* loop to find first one that has correct characteristics */
+	while(result && result != RBTREE_NULL &&
+		reuse_cmp_addrportssl(result->key, &key_p.reuse) == 0) {
+		if(((struct reuse_tcp*)result)->tree_by_id.count <
+			MAX_REUSE_TCP_QUERIES) {
+			/* same address, port, ssl-yes-or-no, and has
+			 * space for another query */
+			return (struct reuse_tcp*)result;
+		}
+		result = rbtree_next(result);
+	}
+	return NULL;
+}
+
+/** find element in tree by id */
+static struct waiting_tcp*
+reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
+{
+	struct waiting_tcp key_w;
+	struct pending_tcp key_p;
+	memset(&key_w, 0, sizeof(key_w));
+	memset(&key_p, 0, sizeof(key_p));
+	key_w.next_waiting = (void*)&key_p;
+	key_w.id_node.key = &key_w;
+	key_p.id = id;
+	return (struct waiting_tcp*)rbtree_search(&reuse->tree_by_id, &key_w);
+}
+
+/** return ID value of rbnode in tree_by_id */
+static uint16_t
+tree_by_id_get_id(rbnode_type* node)
+{
+	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
+	return ((struct pending_tcp*)w->next_waiting)->id;
+}
+
+/** find spare ID value for reuse tcp stream.  That is random and also does
+ * not collide with an existing query ID that is in use or waiting */
+static uint16_t
+reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
+{
+	uint16_t id = 0;
+	const int try_random = 2000;
+	int i;
+	rbnode_type* pos, *node;
+	for(i = 0; i<try_random; i++) {
+		id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;
+		if(!reuse_tcp_by_id_find(reuse, id)) {
+			return id;
+		}
+	}
+	/** cannot probe a random element from the list, we pick one from
+	 * the list that is unused */
+	pos = (rbnode_type*)reuse_tcp_by_id_find(reuse, id);
+	if(!pos)
+		return id;
+	/* search for first available id number after the random position */
+	/* pick a random position, find the first unused range and pick
+	 * a random number from that range */
+	node = pos;
+	while(node && node != RBTREE_NULL) {
+		rbnode_type* next = rbtree_next(node);
+		if(next && next != RBTREE_NULL) {
+			/* next value, is there a value in between? */
+			uint16_t curid = tree_by_id_get_id(node);
+			uint16_t nextid = tree_by_id_get_id(next);
+			if(curid != 0xffff && curid + 1 < nextid) {
+				if(curid + 2 == nextid)
+					return curid + 1;
+				/* pick random value between this and next */
+				return curid + 1 + ub_random_max(outnet->rnd,
+					nextid - curid - 1);
+			}
+		} else {
+			/* no next, but are there larger ID numbers? */
+			uint16_t curid = tree_by_id_get_id(node);
+			if(curid < 0xffff) {
+				if(curid + 1 == 0xffff)
+					return 0xffff;
+				return curid + 1 + ub_random_max(outnet->rnd,
+					0xffff - curid - 1);
+			}
+
+		}
+		node = next;
+	}
+	/* search before pos */
+	node = rbtree_first(&reuse->tree_by_id);
+	while(node != pos && node && node != RBTREE_NULL) {
+		rbnode_type* next = rbtree_next(node);
+		if(next && next != RBTREE_NULL) {
+			/* next value, is there a value in between? */
+			uint16_t curid = tree_by_id_get_id(node);
+			uint16_t nextid = tree_by_id_get_id(next);
+			if(curid != 0xffff && curid + 1 < nextid) {
+				if(curid + 2 == nextid)
+					return curid + 1;
+				/* pick random value between this and next */
+				return curid + 1 + ub_random_max(outnet->rnd,
+					nextid - curid - 1);
+			}
+		}
+		node = next;
+	}
+	/* not possible, we have less than max elements */
+	log_assert(reuse->tree_by_id.count < 0xffff);
+	return 0;
 }
 
 struct waiting_tcp*
@@ -1516,7 +1667,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	/* if so, take it into use */
 	reuse = reuse_tcp_find(sq->outnet, sq);
 	if(reuse) {
-		verbose(5, "pending_tcp_query: found reuse");
+		log_reuse_tcp(5, "pending_tcp_query: found reuse", reuse);
 		log_assert(reuse->pending);
 		pend = reuse->pending;
 	}
@@ -1544,7 +1695,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	}
 	w->pkt = NULL;
 	w->pkt_len = 0;
-	id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff;
+	if(reuse)
+		id = reuse_tcp_select_id(reuse, sq->outnet);
+	else	id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff;
 	LDNS_ID_SET(sldns_buffer_begin(packet), id);
 	memcpy(&w->addr, &sq->addr, sq->addrlen);
 	w->addrlen = sq->addrlen;
@@ -1564,6 +1717,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			verbose(5, "pending_tcp_query: reuse, store");
 			/* if cannot write now, store query and put it
 			 * in the waiting list for this stream TODO */
+			/* and insert in tree_by_id */
 			/* and also delete it from waitlst if query gone,
 			 * eg. sq is deleted TODO */
 			/* and also servfail all waiting queries if
@@ -1576,6 +1730,8 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
 			 * write query */
+			memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
+			pend->reuse.addrlen = sq->addrlen;
 			if(!outnet_tcp_take_into_use(w,
 				sldns_buffer_begin(packet),
 				sldns_buffer_limit(packet))) {
diff --git a/services/outside_network.h b/services/outside_network.h
index 12c72c990..7328283c6 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -233,8 +233,8 @@ struct port_comm {
 struct reuse_tcp {
 	/** rbtree node with links in tcp_reuse tree. key is NULL when not
 	 * in tree. Both active and empty connections are in the tree.
-	 * key is this structure, the sockaddr and then ptr value for
-	 * several times same address in tree */
+	 * key is this structure, the sockaddr and and then is-ssl bool,
+	 * and then ptr value for several times same address in tree */
 	rbnode_type node;
 	/** the key for the tcp_reuse tree. address of peer, ip4 or ip6,
 	 * and port number of peer */
@@ -261,15 +261,21 @@ struct reuse_tcp {
 	/** rbtree with other queries waiting on the connection, by ID number,
 	 * of type struct waiting_tcp. It is for looking up received
 	 * answers to the structure for callback.  And also to see if ID
-	 * numbers are unused and can be used for a new query. */
+	 * numbers are unused and can be used for a new query.
+	 * The write_wait elements are also in the tree, so that ID numbers
+	 * can be looked up also for them.  They are bool write_wait_queued. */
 	rbtree_type tree_by_id;
 	/** list of queries waiting to be written on the channel,
 	 * if NULL no queries are waiting to be written and the pending->query
 	 * is the query currently serviced.  The first is the next in line.
-	 * Once written, a query moves to the tree_by_id. */
+	 * They are also in the tree_by_id. Once written, the are removed
+	 * from this list, but stay in the tree. */
 	struct waiting_tcp* write_wait_first, *write_wait_last;
 };
 
+/** max number of queries on a reuse connection */
+#define MAX_REUSE_TCP_QUERIES 65000
+
 /**
  * A query that has an answer pending for it.
  */

From 150e1b0491cebb678a171d0a62ce2409619e43b1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 3 Jun 2020 14:03:34 +0200
Subject: [PATCH 010/208] spare id random selection better.

---
 services/outside_network.c | 97 ++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index b30666945..cfc467af1 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1584,72 +1584,67 @@ tree_by_id_get_id(rbnode_type* node)
 static uint16_t
 reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 {
-	uint16_t id = 0;
+	uint16_t id = 0, curid, nextid;
 	const int try_random = 2000;
 	int i;
-	rbnode_type* pos, *node;
+	unsigned select, count, space;
+	rbnode_type* node;
 	for(i = 0; i<try_random; i++) {
 		id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;
 		if(!reuse_tcp_by_id_find(reuse, id)) {
 			return id;
 		}
 	}
-	/** cannot probe a random element from the list, we pick one from
-	 * the list that is unused */
-	pos = (rbnode_type*)reuse_tcp_by_id_find(reuse, id);
-	if(!pos)
+
+	/* make really sure the tree is not empty */
+	if(reuse->tree_by_id.count == 0) {
+		id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;
 		return id;
-	/* search for first available id number after the random position */
-	/* pick a random position, find the first unused range and pick
-	 * a random number from that range */
-	node = pos;
+	}
+
+	/* equally pick a random unused element from the tree that is
+	 * not in use.  Pick a the n-th index of an ununused number,
+	 * then loop over the empty spaces in the tree and find it */
+	log_assert(reuse->tree_by_id.count < 0xffff);
+	select = ub_random_max(outnet->rnd, 0xffff - reuse->tree_by_id.count);
+	/* select value now in 0 .. num free - 1 */
+
+	count = 0; /* number of free spaces passed by */
+	node = rbtree_first(&reuse->tree_by_id);
+	log_assert(node && node != RBTREE_NULL); /* tree not empty */
+	/* see if select is before first node */
+	if(select < tree_by_id_get_id(node))
+		return select;
+	count += tree_by_id_get_id(node);
+	/* perhaps select is between nodes */
 	while(node && node != RBTREE_NULL) {
 		rbnode_type* next = rbtree_next(node);
 		if(next && next != RBTREE_NULL) {
-			/* next value, is there a value in between? */
-			uint16_t curid = tree_by_id_get_id(node);
-			uint16_t nextid = tree_by_id_get_id(next);
+			curid = tree_by_id_get_id(node);
+			nextid = tree_by_id_get_id(next);
 			if(curid != 0xffff && curid + 1 < nextid) {
-				if(curid + 2 == nextid)
-					return curid + 1;
-				/* pick random value between this and next */
-				return curid + 1 + ub_random_max(outnet->rnd,
-					nextid - curid - 1);
-			}
-		} else {
-			/* no next, but are there larger ID numbers? */
-			uint16_t curid = tree_by_id_get_id(node);
-			if(curid < 0xffff) {
-				if(curid + 1 == 0xffff)
-					return 0xffff;
-				return curid + 1 + ub_random_max(outnet->rnd,
-					0xffff - curid - 1);
+				/* space between nodes */
+				space = nextid - curid - 1;
+				if(select < count + space) {
+					/* here it is */
+					return curid + 1 + ub_random_max(
+						outnet->rnd, space);
+				}
+				count += space;
 			}
+		}
+		node = next;
+	}
 
-		}
-		node = next;
-	}
-	/* search before pos */
-	node = rbtree_first(&reuse->tree_by_id);
-	while(node != pos && node && node != RBTREE_NULL) {
-		rbnode_type* next = rbtree_next(node);
-		if(next && next != RBTREE_NULL) {
-			/* next value, is there a value in between? */
-			uint16_t curid = tree_by_id_get_id(node);
-			uint16_t nextid = tree_by_id_get_id(next);
-			if(curid != 0xffff && curid + 1 < nextid) {
-				if(curid + 2 == nextid)
-					return curid + 1;
-				/* pick random value between this and next */
-				return curid + 1 + ub_random_max(outnet->rnd,
-					nextid - curid - 1);
-			}
-		}
-		node = next;
-	}
-	/* not possible, we have less than max elements */
-	log_assert(reuse->tree_by_id.count < 0xffff);
-	return 0;
+	/* select is after the last node */
+	/* count is the number of free positions before the nodes in the
+	 * tree */
+	node = rbtree_last(&reuse->tree_by_id);
+	log_assert(node && node != RBTREE_NULL); /* tree not empty */
+	curid = tree_by_id_get_id(node);
+	space = 0xffff - curid;
+	log_assert(select < count + space);
+	return curid + 1 + ub_random_max(outnet->rnd, space);
 }
 
 struct waiting_tcp*

From 7cc6a89e21124362987a137f50fcba81ac55e197 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 3 Jun 2020 14:23:06 +0200
Subject: [PATCH 011/208] fix spare id random selection.

---
 services/outside_network.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index cfc467af1..8710c637a 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1589,12 +1589,6 @@ reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 	int i;
 	unsigned select, count, space;
 	rbnode_type* node;
-	for(i = 0; i<try_random; i++) {
-		id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;
-		if(!reuse_tcp_by_id_find(reuse, id)) {
-			return id;
-		}
-	}
 
 	/* make really sure the tree is not empty */
 	if(reuse->tree_by_id.count == 0) {
@@ -1602,6 +1596,14 @@ reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 		return id;
 	}
 
+	/* try to find random empty spots by picking them */
+	for(i = 0; i<try_random; i++) {
+		id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;
+		if(!reuse_tcp_by_id_find(reuse, id)) {
+			return id;
+		}
+	}
+
 	/* equally pick a random unused element from the tree that is
 	 * not in use.  Pick a the n-th index of an ununused number,
 	 * then loop over the empty spaces in the tree and find it */
@@ -1627,8 +1629,7 @@ reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 				space = nextid - curid - 1;
 				if(select < count + space) {
 					/* here it is */
-					return curid + 1 + ub_random_max(
-						outnet->rnd, space);
+					return curid + 1 + (select - count);
 				}
 				count += space;
 			}
@@ -1642,9 +1643,7 @@ reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 	node = rbtree_last(&reuse->tree_by_id);
 	log_assert(node && node != RBTREE_NULL); /* tree not empty */
 	curid = tree_by_id_get_id(node);
-	space = 0xffff - curid;
-	log_assert(select < count + space);
-	return curid + 1 + ub_random_max(outnet->rnd, space);
+	return curid + 1 + (select - count);
 }
 
 struct waiting_tcp*

From fd723aed277f9f5ee491cb94b2c872fb2456f818 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 3 Jun 2020 17:24:26 +0200
Subject: [PATCH 012/208] tcp connection is stored and picked up for reuse fix
 that comm_point_start_listening does not close the same fd that is started.

---
 services/outside_network.c             | 34 +++++++++++++++++---------
 testdata/tcp_reuse.tdir/tcp_reuse.post |  3 ++-
 testdata/tcp_reuse.tdir/tcp_reuse.pre  |  2 +-
 util/netevent.c                        |  4 ++-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 8710c637a..bb0792c06 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -494,7 +494,7 @@ reuse_tcp_remove_tree_list(struct outside_network* outnet,
 		reuse->node.key = NULL;
 	}
 	/* delete from reuse list */
-	if(reuse->pending) {
+	if(reuse->item_on_lru_list) {
 		if(reuse->lru_prev) {
 			/* assert that members of the lru list are waiting
 			 * and thus have a pending pointer to the struct */
@@ -513,7 +513,7 @@ reuse_tcp_remove_tree_list(struct outside_network* outnet,
 			log_assert(!reuse->lru_prev || reuse->lru_prev->pending);
 			outnet->tcp_reuse_last = reuse->lru_prev;
 		}
-		reuse->pending = NULL;
+		reuse->item_on_lru_list = 0;
 	}
 }
 
@@ -559,13 +559,14 @@ static int
 reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 {
 	log_reuse_tcp(5, "reuse_tcp_insert", &pend_tcp->reuse);
+	if(pend_tcp->reuse.item_on_lru_list)
+		return 1;
 	pend_tcp->reuse.node.key = &pend_tcp->reuse;
 	pend_tcp->reuse.pending = pend_tcp;
 	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
 		/* this is a duplicate connection, close this one */
 		verbose(5, "reuse_tcp_insert: duplicate connection");
 		pend_tcp->reuse.node.key = NULL;
-		pend_tcp->reuse.pending = NULL;
 		return 0;
 	}
 	/* insert into LRU, first is newest */
@@ -578,6 +579,7 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 		outnet->tcp_reuse_last = &pend_tcp->reuse;
 	}
 	outnet->tcp_reuse_first = &pend_tcp->reuse;
+	pend_tcp->reuse.item_on_lru_list = 1;
 	return 1;
 }
 
@@ -605,15 +607,21 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		/* add to reuse tree so it can be reused, if not a failure.
 		 * This is possible if the state machine wants to make a tcp
 		 * query again to the same destination. */
-		(void)reuse_tcp_insert(outnet, pend);
+		if(outnet->tcp_reuse.count < outnet->tcp_reuse_max) {
+			(void)reuse_tcp_insert(outnet, pend);
+		}
 	}
 	fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
 	(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
-	/* if reused, it should not be decommissioned, TODO */
-	/* or if another query wants to write, write that and read for more
-	 * or more outstanding queries on the stream.  TODO */
-	/* TODO also write multiple queries over the stream, even if no
-	 * replies have returned yet */
+	verbose(5, "outnet_tcp_cb reuse after cb");
+	if(pend->reuse.node.key) {
+		verbose(5, "outnet_tcp_cb reuse after cb: keep it");
+		/* it is in the reuse_tcp tree, with other queries, or
+		 * on the empty list. do not decommission it */
+		return 0;
+	}
+	verbose(5, "outnet_tcp_cb reuse after cb: decommission it");
+	/* no queries on it, no space to keep it. Close it */
 	decommission_pending_tcp(outnet, pend);
 	use_free_buffer(outnet);
 	return 0;
@@ -1491,9 +1499,6 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 		outnet->tcp_reuse_first = NULL;
 	}
 
-	/* TODO should only close unused in tree, not ones that are in use,
-	 * for which we need also a tree to find in-use streams for multiple
-	 * queries on them */
 	/* free up */
 	decommission_pending_tcp(outnet, pend);
 }
@@ -1521,6 +1526,8 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	memmove(&key_w.addr, &sq->addr, sq->addrlen);
 	key_w.addrlen = sq->addrlen;
 
+	verbose(5, "reuse_tcp_find: num reuse streams %u",
+		(unsigned)outnet->tcp_reuse.count);
 	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node,
 		&result)) {
 		/* exact match */
@@ -1531,6 +1538,7 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	/* not found, return null */
 	if(!result || result == RBTREE_NULL)
 		return NULL;
+	verbose(5, "reuse_tcp_find check inexact match");
 	/* inexact match, find one of possibly several connections to the
 	 * same destination address, with the correct port, ssl, and
 	 * also less than max number of open queries, or else, fail to open
@@ -1717,6 +1725,8 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			/* and also servfail all waiting queries if
 			 * stream closes TODO */
 			/* reuse existing fd, write query and continue */
+			w->next_waiting = (void*)pend;
+			pend->query = w;
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
 				sldns_buffer_begin(packet),
 				sldns_buffer_limit(packet));
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.post b/testdata/tcp_reuse.tdir/tcp_reuse.post
index 7399d3603..a1cdef9ab 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.post
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.post
@@ -7,11 +7,12 @@
 # do your teardown here
 . ../common.sh
 kill_pid $UPSTREAM_PID
-kill_pid $UNBOUND_PID
 if test -f unbound2.log; then
 	echo ">>> upstream log"
 	cat unbound2.log
 fi
+#kill_pid $UNBOUND_PID
+kill_pid `cat unbound.pid`
 if test -f unbound.log; then
 	echo ">>> unbound log"
 	cat unbound.log
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre
index 511dbc6f7..30dbdc96f 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.pre
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre
@@ -16,7 +16,7 @@ echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf > ub.conf
 # start unbound in the background
 #$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
-$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log
diff --git a/util/netevent.c b/util/netevent.c
index f7bb9b897..5dd746633 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3066,6 +3066,7 @@ comm_point_close(struct comm_point* c)
 	if(!c)
 		return;
 	if(c->fd != -1) {
+		verbose(5, "comm_point_close of %d: event_del", c->fd);
 		if(ub_event_del(c->ev->ev) != 0) {
 			log_err("could not event_del on close");
 		}
@@ -3225,7 +3226,8 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 		else	ub_event_add_bits(c->ev->ev, UB_EV_WRITE);
 	}
 	if(newfd != -1) {
-		if(c->fd != -1) {
+		if(c->fd != -1 && c->fd != newfd) {
+			verbose(5, "cpsl close of fd %d for %d", c->fd, newfd);
 #ifndef USE_WINSOCK
 			close(c->fd);
 #else

From d8b7b5ee27c002682228a69a07c7ed7a152422d5 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 9 Jun 2020 09:14:01 +0200
Subject: [PATCH 013/208] fix to set pending pointer in reuse tcp structure fix
 debug output of reuse tcp and test leak of process

---
 services/outside_network.c             | 6 ++++--
 testdata/tcp_reuse.tdir/tcp_reuse.post | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index bb0792c06..f11999d7c 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -457,6 +457,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 	pend->query = w;
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
+	pend->reuse.pending = pend;
 	outnet_tcp_take_query_setup(s, pend, pkt, pkt_len);
 	return 1;
 }
@@ -550,8 +551,8 @@ log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
 	if(verbosity < v) return;
 	addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf));
 	port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port);
-	verbose(v, "%s %s %u %lx", msg, addrbuf, (unsigned)port,
-		(unsigned long)reuse);
+	verbose(v, "%s %s#%u 0x%llx fd %d", msg, addrbuf, (unsigned)port,
+		(unsigned long long)reuse, reuse->pending->c->fd);
 }
 
 /** insert into reuse tcp tree and LRU, false on failure (duplicate) */
@@ -1734,6 +1735,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
 			 * write query */
+			pend->reuse.pending = pend;
 			memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
 			pend->reuse.addrlen = sq->addrlen;
 			if(!outnet_tcp_take_into_use(w,
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.post b/testdata/tcp_reuse.tdir/tcp_reuse.post
index a1cdef9ab..ca7535471 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.post
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.post
@@ -6,7 +6,7 @@
 #
 # do your teardown here
 . ../common.sh
-kill_pid $UPSTREAM_PID
+kill_pid `cat unbound2.pid`
 if test -f unbound2.log; then
 	echo ">>> upstream log"
 	cat unbound2.log

From a695ba447c6d57f982a5133533067bd822886323 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 9 Jun 2020 16:15:03 +0200
Subject: [PATCH 014/208] set timeout to wait for reuse add comm_point
 indicator for write events for reuse stream writes.

---
 services/outside_network.c | 17 +++++++++++++++--
 services/outside_network.h |  2 ++
 util/netevent.h            |  7 +++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index f11999d7c..b885c3a1a 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -341,8 +341,8 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend, uint8_t* pkt,
 	sldns_buffer_clear(pend->c->buffer);
 	sldns_buffer_write(pend->c->buffer, pkt, pkt_len);
 	sldns_buffer_flip(pend->c->buffer);
-	pend->c->tcp_is_reading = 0;
-	pend->c->tcp_byte_count = 0;
+	pend->c->tcp_write_and_read = 1;
+	pend->c->tcp_write_byte_count = 0;
 	comm_point_start_listening(pend->c, s, -1);
 }
 
@@ -584,6 +584,17 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 	return 1;
 }
 
+/** set timeout on tcp fd and setup read event to catch incoming dns msgs */
+static void
+reuse_tcp_setup_readtimeout(struct pending_tcp* pend_tcp)
+{
+	log_reuse_tcp(5, "reuse_tcp_setup_readtimeout", &pend_tcp->reuse);
+	sldns_buffer_clear(pend_tcp->c->buffer);
+	pend_tcp->c->tcp_is_reading = 1;
+	pend_tcp->c->tcp_byte_count = 0;
+	comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT);
+}
+
 int 
 outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	struct comm_reply *reply_info)
@@ -610,6 +621,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		 * query again to the same destination. */
 		if(outnet->tcp_reuse.count < outnet->tcp_reuse_max) {
 			(void)reuse_tcp_insert(outnet, pend);
+			reuse_tcp_setup_readtimeout(pend);
 		}
 	}
 	fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
@@ -1931,6 +1943,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 		if(!reuse_tcp_insert(sq->outnet, pend_tcp)) {
 			return 0;
 		}
+		reuse_tcp_setup_readtimeout(pend_tcp);
 		return 1;
 	}
 	return 0;
diff --git a/services/outside_network.h b/services/outside_network.h
index 7328283c6..40501da18 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -275,6 +275,8 @@ struct reuse_tcp {
 
 /** max number of queries on a reuse connection */
 #define MAX_REUSE_TCP_QUERIES 65000
+/** timeout for REUSE entries in milliseconds. */
+#define REUSE_TIMEOUT 30000
 
 /**
  * A query that has an answer pending for it.
diff --git a/util/netevent.h b/util/netevent.h
index bb2cd1e53..019855468 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -247,6 +247,13 @@ struct comm_point {
 	    and after read/write completes. No callback is done. */
 	int tcp_do_close;
 
+	/** flag that indicates the stream is both written and read from. */
+	int tcp_write_and_read;
+
+	/** byte count for written length over write channel, for when
+	 * tcp_write_and_read is enabled */
+	size_t tcp_write_byte_count;
+
 	/** if set, read/write completes:
 		read/write state of tcp is toggled.
 		buffer reset/bytecount reset.

From a1babfff1efceda6e1c1ea931ad16eb649c23a7b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 19 Jun 2020 17:31:36 +0200
Subject: [PATCH 015/208] add bool if on tcp waiting list, so that pkt can be
 stored. remove pkt args from outnet_tcp_take_into_use, use w.pkt.

---
 services/outside_network.c | 38 +++++++++++++++++---------------------
 services/outside_network.h |  6 +++++-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index b885c3a1a..a4d3b332d 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -348,12 +348,13 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend, uint8_t* pkt,
 
 /** use next free buffer to service a tcp query */
 static int
-outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
+outnet_tcp_take_into_use(struct waiting_tcp* w)
 {
 	struct pending_tcp* pend = w->outnet->tcp_free;
 	int s;
 	log_assert(pend);
-	log_assert(pkt);
+	log_assert(w->pkt);
+	log_assert(w->pkt_len > 0);
 	log_assert(w->addrlen > 0);
 	/* open socket */
 	s = outnet_get_tcp_fd(&w->addr, w->addrlen, w->outnet->tcp_mss, w->outnet->ip_dscp);
@@ -449,7 +450,6 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 			return 0;
 		}
 	}
-	w->pkt = NULL;
 	w->next_waiting = (void*)pend;
 	w->outnet->num_tcp_outgoing++;
 	w->outnet->tcp_free = pend->next_free;
@@ -458,7 +458,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len)
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
-	outnet_tcp_take_query_setup(s, pend, pkt, pkt_len);
+	outnet_tcp_take_query_setup(s, pend, w->pkt, w->pkt_len);
 	return 1;
 }
 
@@ -473,7 +473,8 @@ use_free_buffer(struct outside_network* outnet)
 		outnet->tcp_wait_first = w->next_waiting;
 		if(outnet->tcp_wait_last == w)
 			outnet->tcp_wait_last = NULL;
-		if(!outnet_tcp_take_into_use(w, w->pkt, w->pkt_len)) {
+		w->on_tcp_waiting_list = 0;
+		if(!outnet_tcp_take_into_use(w)) {
 			comm_point_callback_type* cb = w->cb;
 			void* cb_arg = w->cb_arg;
 			waiting_tcp_delete(w);
@@ -1455,7 +1456,7 @@ outnet_tcptimer(void* arg)
 	struct outside_network* outnet = w->outnet;
 	int do_callback = 1;
 	verbose(5, "outnet_tcptimer");
-	if(w->pkt) {
+	if(w->on_tcp_waiting_list) {
 		/* it is on the waiting list */
 		waiting_list_remove(outnet, w);
 	} else {
@@ -1696,11 +1697,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		pend = sq->outnet->tcp_free;
 	}
 
-	/* if no buffer is free allocate space to store query */
-	/* TODO: if reuse cannot write right now, store query even though
-	 * pend is nonNULL */
+	/* allocate space to store query */
 	w = (struct waiting_tcp*)malloc(sizeof(struct waiting_tcp) 
-		+ (pend?0:sldns_buffer_limit(packet)));
+		+ sldns_buffer_limit(packet));
 	if(!w) {
 		return NULL;
 	}
@@ -1708,8 +1707,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		free(w);
 		return NULL;
 	}
-	w->pkt = NULL;
-	w->pkt_len = 0;
+	w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp);
+	w->pkt_len = sldns_buffer_limit(packet);
+	memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len);
 	if(reuse)
 		id = reuse_tcp_select_id(reuse, sq->outnet);
 	else	id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff;
@@ -1741,8 +1741,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			w->next_waiting = (void*)pend;
 			pend->query = w;
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
-				sldns_buffer_begin(packet),
-				sldns_buffer_limit(packet));
+				w->pkt, w->pkt_len);
 		} else {
 			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
@@ -1750,9 +1749,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			pend->reuse.pending = pend;
 			memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
 			pend->reuse.addrlen = sq->addrlen;
-			if(!outnet_tcp_take_into_use(w,
-				sldns_buffer_begin(packet),
-				sldns_buffer_limit(packet))) {
+			if(!outnet_tcp_take_into_use(w)) {
 				waiting_tcp_delete(w);
 				return NULL;
 			}
@@ -1767,14 +1764,12 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	} else {
 		/* queue up */
 		verbose(5, "pending_tcp_query: queue to wait");
-		w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp);
-		w->pkt_len = sldns_buffer_limit(packet);
-		memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len);
 		w->next_waiting = NULL;
 		if(sq->outnet->tcp_wait_last)
 			sq->outnet->tcp_wait_last->next_waiting = w;
 		else	sq->outnet->tcp_wait_first = w;
 		sq->outnet->tcp_wait_last = w;
+		w->on_tcp_waiting_list = 1;
 	}
 	return w;
 }
@@ -1893,6 +1888,7 @@ static void
 waiting_list_remove(struct outside_network* outnet, struct waiting_tcp* w)
 {
 	struct waiting_tcp* p = outnet->tcp_wait_first, *prev = NULL;
+	w->on_tcp_waiting_list = 0;
 	while(p) {
 		if(p == w) {
 			/* remove w */
@@ -1974,7 +1970,7 @@ serviced_delete(struct serviced_query* sq)
 			verbose(5, "serviced_delete: TCP");
 			/* TODO: if on stream-write-waiting list then
 			 * remove from waiting list and waiting_tcp_delete */
-			if(p->pkt == NULL) {
+			if(!p->on_tcp_waiting_list) {
 				verbose(5, "serviced_delete: tcpreusekeep");
 				if(!reuse_tcp_remove_serviced_keep(p, sq)) {
 					decommission_pending_tcp(sq->outnet,
diff --git a/services/outside_network.h b/services/outside_network.h
index 40501da18..8e6347ed4 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -274,7 +274,7 @@ struct reuse_tcp {
 };
 
 /** max number of queries on a reuse connection */
-#define MAX_REUSE_TCP_QUERIES 65000
+#define MAX_REUSE_TCP_QUERIES 200
 /** timeout for REUSE entries in milliseconds. */
 #define REUSE_TIMEOUT 30000
 
@@ -344,6 +344,10 @@ struct waiting_tcp {
 	 * if pkt==0, this points to the pending_tcp structure.
 	 */
 	struct waiting_tcp* next_waiting;
+	/** if true the item is on the tcp waiting list and next_waiting
+	 * is used for that.  If false, the next_waiting points to the
+	 * pending_tcp */
+	int on_tcp_waiting_list;
 	/** next and prev in query waiting list for stream connection */
 	struct waiting_tcp* write_wait_prev, *write_wait_next;
 	/** true if the waiting_tcp structure is on the write_wait queue */

From 4b6e41e3deafd8a54e881390f65bf19c2e6cd09c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 19 Jun 2020 17:37:23 +0200
Subject: [PATCH 016/208] fix documentation for waiting_tcp pkt NULL setting.

---
 services/outside_network.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/outside_network.h b/services/outside_network.h
index 8e6347ed4..341bd5223 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -341,7 +341,7 @@ struct pending_tcp {
 struct waiting_tcp {
 	/** 
 	 * next in waiting list.
-	 * if pkt==0, this points to the pending_tcp structure.
+	 * if on_tcp_waiting_list==0, this points to the pending_tcp structure.
 	 */
 	struct waiting_tcp* next_waiting;
 	/** if true the item is on the tcp waiting list and next_waiting
@@ -367,8 +367,6 @@ struct waiting_tcp {
 	/** 
 	 * The query itself, the query packet to send.
 	 * allocated after the waiting_tcp structure.
-	 * set to NULL when the query is serviced and it part of pending_tcp.
-	 * if this is NULL, the next_waiting points to the pending_tcp.
 	 */
 	uint8_t* pkt;
 	/** length of query packet. */

From 0e0c57734aaedf0f4ea734adf6571ab19f729a31 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 19 Jun 2020 17:40:45 +0200
Subject: [PATCH 017/208] fix uninit after malloc for on_tcp_waiting_list.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index a4d3b332d..0b155616f 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1717,6 +1717,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	memcpy(&w->addr, &sq->addr, sq->addrlen);
 	w->addrlen = sq->addrlen;
 	w->outnet = sq->outnet;
+	w->on_tcp_waiting_list = 0;
 	w->cb = callback;
 	w->cb_arg = callback_arg;
 	w->ssl_upstream = sq->ssl_upstream;

From d96e718f802baa1fed344c76cc22770c0a521c3f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 19 Jun 2020 18:04:12 +0200
Subject: [PATCH 018/208] fix crash on cleanup.

---
 services/outside_network.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 0b155616f..99b969026 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1488,7 +1488,8 @@ outnet_tcptimer(void* arg)
 		fptr_ok(fptr_whitelist_pending_tcp(cb));
 		(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
 	} else {
-		waiting_tcp_delete(w);
+		/* waiting_tcp_delete(w); -- should be deleted if entire
+		 * stream with reuse elements is gone. TODO remove this? */
 	}
 	use_free_buffer(outnet);
 }
@@ -1718,6 +1719,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	w->addrlen = sq->addrlen;
 	w->outnet = sq->outnet;
 	w->on_tcp_waiting_list = 0;
+	w->next_waiting = NULL;
 	w->cb = callback;
 	w->cb_arg = callback_arg;
 	w->ssl_upstream = sq->ssl_upstream;

From c809bb9ece278a3a685fa4982a4f71aa5d279ef8 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 23 Jun 2020 15:29:40 +0200
Subject: [PATCH 019/208] tcp reuse timeout event cleanup and callbacks.

---
 services/outside_network.c | 97 ++++++++++++++++++++++++++++++++------
 1 file changed, 83 insertions(+), 14 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 99b969026..7e58b1c99 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1449,26 +1449,95 @@ pending_udp_query(struct serviced_query* sq, struct sldns_buffer* packet,
 	return pend;
 }
 
+/** perform failure callbacks for waiting queries in reuse write list */
+static void reuse_cb_writewait_for_failure(struct pending_tcp* pend, int err)
+{
+	struct waiting_tcp* w;
+	w = pend->reuse.write_wait_first;
+	while(w) {
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, err, NULL);
+		w = w->write_wait_next;
+	}
+}
+
+/** perform failure callbacks for waiting queries in reuse read rbtree */
+static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
+{
+	rbnode_type* node;
+	node = rbtree_first(&pend->reuse.tree_by_id);
+	while(node && node != RBTREE_NULL) {
+		struct waiting_tcp* w = (struct waiting_tcp*)node->key;
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, err, NULL);
+		node = rbtree_next(node);
+	}
+}
+
+/** perform failure callbacks for current written query in reuse struct */
+static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
+{
+	struct waiting_tcp* w = pend->query;
+	if(w) {
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, err, NULL);
+	}
+}
+
+/** helper function that deletes and element from the tree of readwait
+ * elements in tcp reuse structure */
+static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
+{
+	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
+	waiting_tcp_delete(w);
+}
+
+/** delete readwait waiting_tcp elements, deletes the elements in the list */
+static void reuse_del_readwait(struct pending_tcp* pend)
+{
+	traverse_postorder(&pend->reuse.tree_by_id, &reuse_del_readwait_elem,
+		NULL);
+}
+
+/** delete writewait waiting_tcp elements, deletes the elements in the list */
+static void reuse_del_writewait(struct pending_tcp* pend)
+{
+	struct waiting_tcp* w, *n;
+	w = pend->reuse.write_wait_first;
+	while(w) {
+		n = w->write_wait_next;
+		waiting_tcp_delete(w);
+		w = n;
+	}
+}
+
 void
 outnet_tcptimer(void* arg)
 {
 	struct waiting_tcp* w = (struct waiting_tcp*)arg;
 	struct outside_network* outnet = w->outnet;
-	int do_callback = 1;
 	verbose(5, "outnet_tcptimer");
 	if(w->on_tcp_waiting_list) {
 		/* it is on the waiting list */
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
 		waiting_list_remove(outnet, w);
+		waiting_tcp_delete(w);
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
 	} else {
 		/* it was in use */
 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;
 		/* see if it needs unlink from reuse tree */
 		if(pend->reuse.pending) {
 			reuse_tcp_remove_tree_list(outnet, &pend->reuse);
-			do_callback = 0;
 		}
-		/* do failure callbacks for all the queries in the
-		 * wait for write list and in the id-tree TODO */
 		if(pend->c->ssl) {
 #ifdef HAVE_SSL
 			SSL_shutdown(pend->c->ssl);
@@ -1477,20 +1546,20 @@ outnet_tcptimer(void* arg)
 #endif
 		}
 		comm_point_close(pend->c);
+		/* do failure callbacks for all the queries in the
+		 * wait for write list and in the id-tree */
+		/* callback for 'w' arg already in list of curquery,
+		 * readwait list, writewait list */
+		reuse_cb_curquery_for_failure(pend, NETEVENT_TIMEOUT);
+		reuse_cb_readwait_for_failure(pend, NETEVENT_TIMEOUT);
+		reuse_cb_writewait_for_failure(pend, NETEVENT_TIMEOUT);
+		waiting_tcp_delete(pend->query); /* del curquery */
+		reuse_del_readwait(pend);
+		reuse_del_writewait(pend);
 		pend->query = NULL;
 		pend->next_free = outnet->tcp_free;
 		outnet->tcp_free = pend;
 	}
-	if(do_callback) {
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		waiting_tcp_delete(w);
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
-	} else {
-		/* waiting_tcp_delete(w); -- should be deleted if entire
-		 * stream with reuse elements is gone. TODO remove this? */
-	}
 	use_free_buffer(outnet);
 }
 

From 6f9310173db5bb34ddd4634cb4fa4a6940510a08 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 23 Jun 2020 17:32:33 +0200
Subject: [PATCH 020/208] Fix grammar.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index 7e58b1c99..6c2cfd543 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1490,7 +1490,7 @@ static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
 	}
 }
 
-/** helper function that deletes and element from the tree of readwait
+/** helper function that deletes an element from the tree of readwait
  * elements in tcp reuse structure */
 static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
 {

From 8ca34be36a4a18ce69b8dcdd303af19c5c301de5 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 10:09:49 +0200
Subject: [PATCH 021/208] fix reuse tcp crash, use addr in reuse struct, free
 leaked tcp entries.

---
 services/outside_network.c | 29 +++++++++++++++++++++--------
 services/outside_network.h |  2 ++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 6c2cfd543..bf71856ca 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -140,8 +140,7 @@ reuse_cmp_addrportssl(const void* key1, const void* key2)
 	struct reuse_tcp* r2 = (struct reuse_tcp*)key2;
 	int r;
 	/* compare address and port */
-	r = sockaddr_cmp(&r1->pending->query->addr, r1->pending->query->addrlen,
-		&r2->pending->query->addr, r2->pending->query->addrlen);
+	r = sockaddr_cmp(&r1->addr, r1->addrlen, &r2->addr, r2->addrlen);
 	if(r != 0)
 		return r;
 
@@ -455,6 +454,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	w->outnet->tcp_free = pend->next_free;
 	pend->next_free = NULL;
 	pend->query = w;
+	pend->reuse.outnet = w->outnet;
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
@@ -535,7 +535,7 @@ decommission_pending_tcp(struct outside_network* outnet,
 	comm_point_close(pend->c);
 	pend->next_free = outnet->tcp_free;
 	outnet->tcp_free = pend;
-	if(pend->reuse.pending) {
+	if(pend->reuse.node.key) {
 		/* needs unlink from the reuse tree to get deleted */
 		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
 	}
@@ -601,7 +601,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	struct comm_reply *reply_info)
 {
 	struct pending_tcp* pend = (struct pending_tcp*)arg;
-	struct outside_network* outnet = pend->query->outnet;
+	struct outside_network* outnet = pend->reuse.outnet;
 	verbose(VERB_ALGO, "outnettcp cb");
 	if(error != NETEVENT_NOERROR) {
 		verbose(VERB_QUERY, "outnettcp got tcp error %d", error);
@@ -612,7 +612,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			LDNS_ID_WIRE(sldns_buffer_begin(c->buffer))!=pend->id) {
 			log_addr(VERB_QUERY, 
 				"outnettcp: bad ID in reply, from:",
-				&pend->query->addr, pend->query->addrlen);
+				&pend->reuse.addr, pend->reuse.addrlen);
 			error = NETEVENT_CLOSED;
 		}
 	}
@@ -625,8 +625,12 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			reuse_tcp_setup_readtimeout(pend);
 		}
 	}
-	fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
-	(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
+	if(pend->query) {
+		fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
+		(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
+		waiting_tcp_delete(pend->query);
+		pend->query = NULL;
+	}
 	verbose(5, "outnet_tcp_cb reuse after cb");
 	if(pend->reuse.node.key) {
 		verbose(5, "outnet_tcp_cb reuse after cb: keep it");
@@ -1467,6 +1471,9 @@ static void reuse_cb_writewait_for_failure(struct pending_tcp* pend, int err)
 static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 {
 	rbnode_type* node;
+	if(pend->reuse.tree_by_id.root == NULL ||
+		pend->reuse.tree_by_id.root == RBTREE_NULL)
+		return;
 	node = rbtree_first(&pend->reuse.tree_by_id);
 	while(node && node != RBTREE_NULL) {
 		struct waiting_tcp* w = (struct waiting_tcp*)node->key;
@@ -1501,6 +1508,9 @@ static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
 /** delete readwait waiting_tcp elements, deletes the elements in the list */
 static void reuse_del_readwait(struct pending_tcp* pend)
 {
+	if(pend->reuse.tree_by_id.root == NULL ||
+		pend->reuse.tree_by_id.root == RBTREE_NULL)
+		return;
 	traverse_postorder(&pend->reuse.tree_by_id, &reuse_del_readwait_elem,
 		NULL);
 }
@@ -1535,7 +1545,7 @@ outnet_tcptimer(void* arg)
 		/* it was in use */
 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;
 		/* see if it needs unlink from reuse tree */
-		if(pend->reuse.pending) {
+		if(pend->reuse.node.key) {
 			reuse_tcp_remove_tree_list(outnet, &pend->reuse);
 		}
 		if(pend->c->ssl) {
@@ -1612,6 +1622,9 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 
 	verbose(5, "reuse_tcp_find: num reuse streams %u",
 		(unsigned)outnet->tcp_reuse.count);
+	if(outnet->tcp_reuse.root == NULL ||
+		outnet->tcp_reuse.root == RBTREE_NULL)
+		return NULL;
 	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node,
 		&result)) {
 		/* exact match */
diff --git a/services/outside_network.h b/services/outside_network.h
index 341bd5223..dfac321ce 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -271,6 +271,8 @@ struct reuse_tcp {
 	 * They are also in the tree_by_id. Once written, the are removed
 	 * from this list, but stay in the tree. */
 	struct waiting_tcp* write_wait_first, *write_wait_last;
+	/** the outside network it is part of */
+	struct outside_network* outnet;
 };
 
 /** max number of queries on a reuse connection */

From 04d805b0eb8a32968ee951847d7203868eab4382 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 12:57:15 +0200
Subject: [PATCH 022/208] reuse tcp lookup with correct address as key.

---
 services/outside_network.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index bf71856ca..bec24e571 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1615,10 +1615,10 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	key_p.reuse.node.key = &key_p.reuse;
 	if(sq->ssl_upstream) /* something nonNULL for comparisons in tree */
 		key_p.c->ssl = (void*)1;
-	if(sq->addrlen > sizeof(key_w.addr))
+	if(sq->addrlen > sizeof(key_p.reuse.addr))
 		return NULL;
-	memmove(&key_w.addr, &sq->addr, sq->addrlen);
-	key_w.addrlen = sq->addrlen;
+	memmove(&key_p.reuse.addr, &sq->addr, sq->addrlen);
+	key_p.reuse.addrlen = sq->addrlen;
 
 	verbose(5, "reuse_tcp_find: num reuse streams %u",
 		(unsigned)outnet->tcp_reuse.count);

From 75da272afe1f02480eb9984533b239eae895e546 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 16:28:42 +0200
Subject: [PATCH 023/208] reuse tcp id_cmp function. clear list and tree after
 delete. clear when decommisioned. callbacks when closed for lru space, and
 when closed because not kept open.

---
 services/outside_network.c | 91 +++++++++++++++++++++++++-------------
 services/outside_network.h |  5 ++-
 util/fptr_wlist.c          |  1 +
 3 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index bec24e571..14532b1f4 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -168,6 +168,19 @@ reuse_cmp(const void* key1, const void* key2)
 	return 0;
 }
 
+int reuse_id_cmp(const void* key1, const void* key2)
+{
+	struct waiting_tcp* w1 = (struct waiting_tcp*)key1;
+	struct waiting_tcp* w2 = (struct waiting_tcp*)key2;
+	struct pending_tcp* p1 = (struct pending_tcp*)w1->next_waiting;
+	struct pending_tcp* p2 = (struct pending_tcp*)w2->next_waiting;
+	if(p1->id < p2->id)
+		return -1;
+	if(p1->id > p2->id)
+		return 1;
+	return 0;
+}
+
 /** delete waiting_tcp entry. Does not unlink from waiting list. 
  * @param w: to delete.
  */
@@ -519,6 +532,39 @@ reuse_tcp_remove_tree_list(struct outside_network* outnet,
 	}
 }
 
+/** helper function that deletes an element from the tree of readwait
+ * elements in tcp reuse structure */
+static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
+{
+	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
+	waiting_tcp_delete(w);
+}
+
+/** delete readwait waiting_tcp elements, deletes the elements in the list */
+static void reuse_del_readwait(struct pending_tcp* pend)
+{
+	if(pend->reuse.tree_by_id.root == NULL ||
+		pend->reuse.tree_by_id.root == RBTREE_NULL)
+		return;
+	traverse_postorder(&pend->reuse.tree_by_id, &reuse_del_readwait_elem,
+		NULL);
+	rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
+}
+
+/** delete writewait waiting_tcp elements, deletes the elements in the list */
+static void reuse_del_writewait(struct pending_tcp* pend)
+{
+	struct waiting_tcp* w, *n;
+	w = pend->reuse.write_wait_first;
+	while(w) {
+		n = w->write_wait_next;
+		waiting_tcp_delete(w);
+		w = n;
+	}
+	pend->reuse.write_wait_first = NULL;
+	pend->reuse.write_wait_last = NULL;
+}
+
 /** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */
 static void
 decommission_pending_tcp(struct outside_network* outnet, 
@@ -541,6 +587,8 @@ decommission_pending_tcp(struct outside_network* outnet,
 	}
 	waiting_tcp_delete(pend->query);
 	pend->query = NULL;
+	reuse_del_readwait(pend);
+	reuse_del_writewait(pend);
 }
 
 /** log reuse item addr and ptr with message */
@@ -1497,36 +1545,6 @@ static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
 	}
 }
 
-/** helper function that deletes an element from the tree of readwait
- * elements in tcp reuse structure */
-static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
-{
-	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
-	waiting_tcp_delete(w);
-}
-
-/** delete readwait waiting_tcp elements, deletes the elements in the list */
-static void reuse_del_readwait(struct pending_tcp* pend)
-{
-	if(pend->reuse.tree_by_id.root == NULL ||
-		pend->reuse.tree_by_id.root == RBTREE_NULL)
-		return;
-	traverse_postorder(&pend->reuse.tree_by_id, &reuse_del_readwait_elem,
-		NULL);
-}
-
-/** delete writewait waiting_tcp elements, deletes the elements in the list */
-static void reuse_del_writewait(struct pending_tcp* pend)
-{
-	struct waiting_tcp* w, *n;
-	w = pend->reuse.write_wait_first;
-	while(w) {
-		n = w->write_wait_next;
-		waiting_tcp_delete(w);
-		w = n;
-	}
-}
-
 void
 outnet_tcptimer(void* arg)
 {
@@ -1594,6 +1612,9 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 	}
 
 	/* free up */
+	reuse_cb_curquery_for_failure(pend, NETEVENT_CLOSED);
+	reuse_cb_readwait_for_failure(pend, NETEVENT_CLOSED);
+	reuse_cb_writewait_for_failure(pend, NETEVENT_CLOSED);
 	decommission_pending_tcp(outnet, pend);
 }
 
@@ -1831,6 +1852,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
 			 * write query */
+			rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
 			pend->reuse.pending = pend;
 			memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
 			pend->reuse.addrlen = sq->addrlen;
@@ -2058,6 +2080,15 @@ serviced_delete(struct serviced_query* sq)
 			if(!p->on_tcp_waiting_list) {
 				verbose(5, "serviced_delete: tcpreusekeep");
 				if(!reuse_tcp_remove_serviced_keep(p, sq)) {
+					reuse_cb_curquery_for_failure(
+						(struct pending_tcp*)p->
+						next_waiting, NETEVENT_CLOSED);
+					reuse_cb_readwait_for_failure(
+						(struct pending_tcp*)p->
+						next_waiting, NETEVENT_CLOSED);
+					reuse_cb_writewait_for_failure(
+						(struct pending_tcp*)p->
+						next_waiting, NETEVENT_CLOSED);
 					decommission_pending_tcp(sq->outnet,
 					  (struct pending_tcp*)p->next_waiting);
 					use_free_buffer(sq->outnet);
diff --git a/services/outside_network.h b/services/outside_network.h
index dfac321ce..cefee3b08 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -726,7 +726,10 @@ int pending_cmp(const void* key1, const void* key2);
 /** compare function of serviced query rbtree */
 int serviced_cmp(const void* key1, const void* key2);
 
-/** compare function of reuse_tcp rbtree */
+/** compare function of reuse_tcp rbtree in outside_network struct */
 int reuse_cmp(const void* key1, const void* key2);
 
+/** compare function of reuse_tcp tree_by_id rbtree */
+int reuse_id_cmp(const void* key1, const void* key2);
+
 #endif /* OUTSIDE_NETWORK_H */
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index ea9928606..e3baec8c2 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -227,6 +227,7 @@ fptr_whitelist_rbtree_cmp(int (*fptr) (const void *, const void *))
 	else if(fptr == &pending_cmp) return 1;
 	else if(fptr == &serviced_cmp) return 1;
 	else if(fptr == &reuse_cmp) return 1;
+	else if(fptr == &reuse_id_cmp) return 1;
 	else if(fptr == &name_tree_compare) return 1;
 	else if(fptr == &order_lock_cmp) return 1;
 	else if(fptr == &codeline_cmp) return 1;

From 4aaccef8f2cc883ecde4bcb114bdaa1105bdfce4 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 24 Jun 2020 16:31:10 +0200
Subject: [PATCH 024/208] fix testcode for added function whitelist item.

---
 testcode/fake_event.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 1159278fd..acfd0ce7a 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1496,6 +1496,12 @@ int reuse_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b))
 	return 0;
 }
 
+int reuse_id_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b))
+{
+	log_assert(0);
+	return 0;
+}
+
 /* timers in testbound for autotrust. statistics tested in tdir. */
 struct comm_timer* comm_timer_create(struct comm_base* base, 
 	void (*cb)(void*), void* cb_arg)

From 5f5cdd3be1468ab608c4bf51db0577500742e48f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 13:06:21 +0200
Subject: [PATCH 025/208] comm point write and read structure members.

---
 util/netevent.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/util/netevent.h b/util/netevent.h
index 019855468..c044f8938 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -87,6 +87,9 @@ typedef int comm_point_callback_type(struct comm_point*, void*, int,
 #define NETEVENT_CAPSFAIL -3
 /** to pass done transfer to callback function; http file is complete */
 #define NETEVENT_DONE -4
+/** to pass write of the write packet is done to callback function
+ * used when tcp_write_and_read is enabled */
+#define NETEVENT_PKT_WRITTEN -5
 
 /** timeout to slow accept calls when not possible, in msec. */
 #define NETEVENT_SLOW_ACCEPT_TIME 2000
@@ -254,6 +257,12 @@ struct comm_point {
 	 * tcp_write_and_read is enabled */
 	size_t tcp_write_byte_count;
 
+	/** packet to write currently over the write channel. for when
+	 * tcp_write_and_read is enabled */
+	uint8_t* tcp_write_pkt;
+	/** length of tcp_write_pkt in bytes */
+	size_t tcp_write_pkt_len;
+
 	/** if set, read/write completes:
 		read/write state of tcp is toggled.
 		buffer reset/bytecount reset.

From 39a50f30a33cd8d4a50ecf483bc13bff7eeca38e Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 14:26:29 +0200
Subject: [PATCH 026/208] tcp callback handle timeout event for read and reuse
 keepalive.

---
 services/outside_network.c | 213 ++++++++++++++++++++++++++-----------
 services/outside_network.h |   2 +
 util/netevent.c            |   4 +-
 3 files changed, 155 insertions(+), 64 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 14532b1f4..b65bf19f9 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -346,16 +346,27 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen)
 
 /** use the buffer to setup writing the query */
 static void
-outnet_tcp_take_query_setup(int s, struct pending_tcp* pend, uint8_t* pkt,
-	size_t pkt_len)
+outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
+	struct waiting_tcp* w)
 {
-	pend->id = LDNS_ID_WIRE(pkt);
-	sldns_buffer_clear(pend->c->buffer);
-	sldns_buffer_write(pend->c->buffer, pkt, pkt_len);
-	sldns_buffer_flip(pend->c->buffer);
+	struct timeval tv;
+	pend->id = LDNS_ID_WIRE(w->pkt);
+	pend->c->tcp_write_pkt = w->pkt;
+	pend->c->tcp_write_pkt_len = w->pkt_len;
 	pend->c->tcp_write_and_read = 1;
 	pend->c->tcp_write_byte_count = 0;
 	comm_point_start_listening(pend->c, s, -1);
+	/* set timer on the waiting_tcp entry, this is the write timeout
+	 * for the written packet.  The timer on pend->c is the timer
+	 * for when there is no written packet and we have readtimeouts */
+#ifndef S_SPLINT_S
+	tv.tv_sec = w->timeout/1000;
+	tv.tv_usec = (w->timeout%1000)*1000;
+#endif
+	/* if the waiting_tcp was previously waiting for a buffer in the
+	 * outside_network.tcpwaitlist, then the timer is reset now that
+	 * we start writing it */
+	comm_timer_set(w->timer, &tv);
 }
 
 /** use next free buffer to service a tcp query */
@@ -471,7 +482,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
-	outnet_tcp_take_query_setup(s, pend, w->pkt, w->pkt_len);
+	outnet_tcp_take_query_setup(s, pend, w);
 	return 1;
 }
 
@@ -570,7 +581,7 @@ static void
 decommission_pending_tcp(struct outside_network* outnet, 
 	struct pending_tcp* pend)
 {
-	verbose(5, "decommision_pending_tcp");
+	verbose(5, "decommission_pending_tcp");
 	if(pend->c->ssl) {
 #ifdef HAVE_SSL
 		SSL_shutdown(pend->c->ssl);
@@ -633,6 +644,75 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 	return 1;
 }
 
+/** perform failure callbacks for waiting queries in reuse write list */
+static void reuse_cb_writewait_for_failure(struct pending_tcp* pend, int err)
+{
+	struct waiting_tcp* w;
+	w = pend->reuse.write_wait_first;
+	while(w) {
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, err, NULL);
+		w = w->write_wait_next;
+	}
+}
+
+/** perform failure callbacks for waiting queries in reuse read rbtree */
+static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
+{
+	rbnode_type* node;
+	if(pend->reuse.tree_by_id.root == NULL ||
+		pend->reuse.tree_by_id.root == RBTREE_NULL)
+		return;
+	node = rbtree_first(&pend->reuse.tree_by_id);
+	while(node && node != RBTREE_NULL) {
+		struct waiting_tcp* w = (struct waiting_tcp*)node->key;
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, err, NULL);
+		node = rbtree_next(node);
+	}
+}
+
+/** perform failure callbacks for current written query in reuse struct */
+static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
+{
+	struct waiting_tcp* w = pend->query;
+	if(w) {
+		comm_point_callback_type* cb = w->cb;
+		void* cb_arg = w->cb_arg;
+		fptr_ok(fptr_whitelist_pending_tcp(cb));
+		(void)(*cb)(NULL, cb_arg, err, NULL);
+	}
+}
+
+/** delete element from tree by id */
+static void
+reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
+{
+	log_assert(w->id_node.key != NULL);
+	rbtree_delete(&reuse->tree_by_id, w);
+	w->id_node.key = NULL;
+}
+
+/** pop the first element from the writewait list */
+static struct waiting_tcp* reuse_write_wait_pop(struct pending_tcp* pend)
+{
+	struct waiting_tcp* w = pend->reuse.write_wait_first;
+	if(!w)
+		return NULL;
+	if(w->write_wait_prev)
+		w->write_wait_prev->write_wait_next = w->write_wait_next;
+	else	pend->reuse.write_wait_first = w->write_wait_next;
+	if(w->write_wait_next)
+		w->write_wait_next->write_wait_prev = w->write_wait_prev;
+	else	pend->reuse.write_wait_last = w->write_wait_prev;
+	w->write_wait_queued = 0;
+	return w;
+}
+
 /** set timeout on tcp fd and setup read event to catch incoming dns msgs */
 static void
 reuse_tcp_setup_readtimeout(struct pending_tcp* pend_tcp)
@@ -651,7 +731,38 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	struct pending_tcp* pend = (struct pending_tcp*)arg;
 	struct outside_network* outnet = pend->reuse.outnet;
 	verbose(VERB_ALGO, "outnettcp cb");
-	if(error != NETEVENT_NOERROR) {
+	if(error == NETEVENT_TIMEOUT) {
+		if(pend->c->tcp_write_and_read)
+			verbose(VERB_QUERY, "outnettcp got tcp timeout "
+				"for read, ignored because write underway");
+		else verbose(VERB_QUERY, "outnettcp got tcp timeout %s",
+			(pend->reuse.tree_by_id.count?"for reading pkt":
+			"for keepalive for reuse"));
+		/* if we are writing, ignore readtimer, wait for write timer
+		 * or write is done */
+		if(pend->c->tcp_write_and_read)
+			return 0;
+		/* must be timeout for reading or keepalive reuse,
+		 * close it. */
+		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
+	} else if(error == NETEVENT_PKT_WRITTEN) {
+		/* the packet we want to write has been written. */
+		log_assert(c == pend->c);
+		log_assert(pend->query->pkt == pend->c->tcp_write_pkt);
+		log_assert(pend->query->pkt_len == pend->c->tcp_write_pkt_len);
+		pend->c->tcp_write_pkt = NULL;
+		pend->c->tcp_write_pkt_len = 0;
+		/* the pend.query is already in tree_by_id */
+		pend->query = NULL;
+		/* setup to write next packet or setup read timeout */
+		if(pend->reuse.write_wait_first) {
+			pend->query = reuse_write_wait_pop(pend);
+			outnet_tcp_take_query_setup(pend->c->fd, pend,
+				pend->query);
+		} else {
+			reuse_tcp_setup_readtimeout(pend);
+		}
+	} else if(error != NETEVENT_NOERROR) {
 		verbose(VERB_QUERY, "outnettcp got tcp error %d", error);
 		/* pass error below and exit */
 	} else {
@@ -674,6 +785,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		}
 	}
 	if(pend->query) {
+		reuse_tree_by_id_delete(&pend->reuse, pend->query);
 		fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
 		(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
 		waiting_tcp_delete(pend->query);
@@ -687,7 +799,12 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		return 0;
 	}
 	verbose(5, "outnet_tcp_cb reuse after cb: decommission it");
-	/* no queries on it, no space to keep it. Close it */
+	/* no queries on it, no space to keep it. or timeout or closed due
+	 * to error.  Close it */
+	reuse_cb_readwait_for_failure(pend, (error==NETEVENT_TIMEOUT?
+		NETEVENT_TIMEOUT:NETEVENT_CLOSED));
+	reuse_cb_writewait_for_failure(pend, (error==NETEVENT_TIMEOUT?
+		NETEVENT_TIMEOUT:NETEVENT_CLOSED));
 	decommission_pending_tcp(outnet, pend);
 	use_free_buffer(outnet);
 	return 0;
@@ -1501,50 +1618,6 @@ pending_udp_query(struct serviced_query* sq, struct sldns_buffer* packet,
 	return pend;
 }
 
-/** perform failure callbacks for waiting queries in reuse write list */
-static void reuse_cb_writewait_for_failure(struct pending_tcp* pend, int err)
-{
-	struct waiting_tcp* w;
-	w = pend->reuse.write_wait_first;
-	while(w) {
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, err, NULL);
-		w = w->write_wait_next;
-	}
-}
-
-/** perform failure callbacks for waiting queries in reuse read rbtree */
-static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
-{
-	rbnode_type* node;
-	if(pend->reuse.tree_by_id.root == NULL ||
-		pend->reuse.tree_by_id.root == RBTREE_NULL)
-		return;
-	node = rbtree_first(&pend->reuse.tree_by_id);
-	while(node && node != RBTREE_NULL) {
-		struct waiting_tcp* w = (struct waiting_tcp*)node->key;
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, err, NULL);
-		node = rbtree_next(node);
-	}
-}
-
-/** perform failure callbacks for current written query in reuse struct */
-static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
-{
-	struct waiting_tcp* w = pend->query;
-	if(w) {
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, err, NULL);
-	}
-}
-
 void
 outnet_tcptimer(void* arg)
 {
@@ -1683,6 +1756,15 @@ reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
 	return NULL;
 }
 
+/** insert element in tree by id */
+static void
+reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w)
+{
+	log_assert(w->id_node.key == NULL);
+	w->id_node.key = w;
+	rbtree_insert(&reuse->tree_by_id, &w->id_node);
+}
+
 /** find element in tree by id */
 static struct waiting_tcp*
 reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
@@ -1779,7 +1861,6 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	struct pending_tcp* pend = sq->outnet->tcp_free;
 	struct reuse_tcp* reuse = NULL;
 	struct waiting_tcp* w;
-	struct timeval tv;
 	uint16_t id;
 
 	verbose(5, "pending_tcp_query");
@@ -1827,11 +1908,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	w->cb_arg = callback_arg;
 	w->ssl_upstream = sq->ssl_upstream;
 	w->tls_auth_name = sq->tls_auth_name;
-#ifndef S_SPLINT_S
-	tv.tv_sec = timeout/1000;
-	tv.tv_usec = (timeout%1000)*1000;
-#endif
-	comm_timer_set(w->timer, &tv);
+	w->timeout = timeout;
 	if(pend) {
 		/* we have a buffer available right now */
 		if(reuse) {
@@ -1839,15 +1916,19 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			/* if cannot write now, store query and put it
 			 * in the waiting list for this stream TODO */
 			/* and insert in tree_by_id */
+			reuse_tree_by_id_insert(&pend->reuse, w);
 			/* and also delete it from waitlst if query gone,
 			 * eg. sq is deleted TODO */
 			/* and also servfail all waiting queries if
 			 * stream closes TODO */
 			/* reuse existing fd, write query and continue */
 			w->next_waiting = (void*)pend;
-			pend->query = w;
-			outnet_tcp_take_query_setup(pend->c->fd, pend,
-				w->pkt, w->pkt_len);
+			if(pend->query == NULL) {
+				/* write straight away */
+				pend->query = w;
+				outnet_tcp_take_query_setup(pend->c->fd, pend,
+					w);
+			}
 		} else {
 			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
@@ -1869,6 +1950,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		comm_tcp, sq->zone, sq->zonelen, packet);
 #endif
 	} else {
+		struct timeval tv;
 		/* queue up */
 		verbose(5, "pending_tcp_query: queue to wait");
 		w->next_waiting = NULL;
@@ -1877,6 +1959,11 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		else	sq->outnet->tcp_wait_first = w;
 		sq->outnet->tcp_wait_last = w;
 		w->on_tcp_waiting_list = 1;
+#ifndef S_SPLINT_S
+		tv.tv_sec = timeout/1000;
+		tv.tv_usec = (timeout%1000)*1000;
+#endif
+		comm_timer_set(w->timer, &tv);
 	}
 	return w;
 }
diff --git a/services/outside_network.h b/services/outside_network.h
index cefee3b08..7c061938a 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -360,6 +360,8 @@ struct waiting_tcp {
 	/** timeout event; timer keeps running whether the query is
 	 * waiting for a buffer or the tcp reply is pending */
 	struct comm_timer* timer;
+	/** timeout in msec */
+	int timeout;
 	/** the outside network it is part of */
 	struct outside_network* outnet;
 	/** remote address. */
diff --git a/util/netevent.c b/util/netevent.c
index 5dd746633..2ca92b92d 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3221,7 +3221,9 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 	}
 	if(c->type == comm_tcp || c->type == comm_http) {
 		ub_event_del_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
-		if(c->tcp_is_reading)
+		if(c->tcp_write_and_read)
+			ub_event_add_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
+		else if(c->tcp_is_reading)
 			ub_event_add_bits(c->ev->ev, UB_EV_READ);
 		else	ub_event_add_bits(c->ev->ev, UB_EV_WRITE);
 	}

From 34c063701e19f2736da4d1d855dac88860e1a011 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 16:05:25 +0200
Subject: [PATCH 027/208] in outside_network.c: also log messages that end up
 on the waiting list. with dnstap. for tcp use_free_buffer reuse existing
 entry if second wait entry on the same addr as the other waiting.

---
 services/outside_network.c | 290 +++++++++++++++++++++----------------
 1 file changed, 164 insertions(+), 126 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index b65bf19f9..f76b0ed3a 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -344,6 +344,127 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen)
 	return 1;
 }
 
+/** log reuse item addr and ptr with message */
+static void
+log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
+{
+	uint16_t port;
+	char addrbuf[128];
+	if(verbosity < v) return;
+	addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf));
+	port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port);
+	verbose(v, "%s %s#%u 0x%llx fd %d", msg, addrbuf, (unsigned)port,
+		(unsigned long long)reuse, reuse->pending->c->fd);
+}
+
+/** pop the first element from the writewait list */
+static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse)
+{
+	struct waiting_tcp* w = reuse->write_wait_first;
+	if(!w)
+		return NULL;
+	log_assert(w->write_wait_queued);
+	if(w->write_wait_prev)
+		w->write_wait_prev->write_wait_next = w->write_wait_next;
+	else	reuse->write_wait_first = w->write_wait_next;
+	if(w->write_wait_next)
+		w->write_wait_next->write_wait_prev = w->write_wait_prev;
+	else	reuse->write_wait_last = w->write_wait_prev;
+	w->write_wait_queued = 0;
+	return w;
+}
+
+/** push the element after the last on the writewait list */
+static void reuse_write_wait_push_back(struct reuse_tcp* reuse,
+	struct waiting_tcp* w)
+{
+	if(!w) return;
+	log_assert(!w->write_wait_queued);
+	if(reuse->write_wait_last) {
+		reuse->write_wait_last->write_wait_next = w;
+		w->write_wait_prev = reuse->write_wait_last;
+	} else {
+		reuse->write_wait_first = w;
+	}
+	reuse->write_wait_last = w;
+	w->write_wait_queued = 1;
+}
+
+/** insert element in tree by id */
+static void
+reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w)
+{
+	log_assert(w->id_node.key == NULL);
+	w->id_node.key = w;
+	rbtree_insert(&reuse->tree_by_id, &w->id_node);
+}
+
+/** find reuse tcp stream to destination for query, or NULL if none */
+static struct reuse_tcp*
+reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
+	socklen_t addrlen, int use_ssl)
+{
+	struct waiting_tcp key_w;
+	struct pending_tcp key_p;
+	struct comm_point c;
+	rbnode_type* result = NULL, *prev;
+	verbose(5, "reuse_tcp_find");
+	memset(&key_w, 0, sizeof(key_w));
+	memset(&key_p, 0, sizeof(key_p));
+	memset(&c, 0, sizeof(c));
+	key_p.query = &key_w;
+	key_p.c = &c;
+	key_p.reuse.pending = &key_p;
+	key_p.reuse.node.key = &key_p.reuse;
+	if(use_ssl) /* something nonNULL for comparisons in tree */
+		key_p.c->ssl = (void*)1;
+	if(addrlen > sizeof(key_p.reuse.addr))
+		return NULL;
+	memmove(&key_p.reuse.addr, addr, addrlen);
+	key_p.reuse.addrlen = addrlen;
+
+	verbose(5, "reuse_tcp_find: num reuse streams %u",
+		(unsigned)outnet->tcp_reuse.count);
+	if(outnet->tcp_reuse.root == NULL ||
+		outnet->tcp_reuse.root == RBTREE_NULL)
+		return NULL;
+	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node,
+		&result)) {
+		/* exact match */
+		/* but the key is on stack, and ptr is compared, impossible */
+		log_assert(&key_p.reuse != (struct reuse_tcp*)result);
+		log_assert(&key_p != ((struct reuse_tcp*)result)->pending);
+	}
+	/* not found, return null */
+	if(!result || result == RBTREE_NULL)
+		return NULL;
+	verbose(5, "reuse_tcp_find check inexact match");
+	/* inexact match, find one of possibly several connections to the
+	 * same destination address, with the correct port, ssl, and
+	 * also less than max number of open queries, or else, fail to open
+	 * a new one */
+	/* rewind to start of sequence of same address,port,ssl */
+	prev = rbtree_previous(result);
+	while(prev && prev != RBTREE_NULL &&
+		reuse_cmp_addrportssl(prev->key, &key_p.reuse) == 0) {
+		result = prev;
+		prev = rbtree_previous(result);
+	}
+
+	/* loop to find first one that has correct characteristics */
+	while(result && result != RBTREE_NULL &&
+		reuse_cmp_addrportssl(result->key, &key_p.reuse) == 0) {
+		if(((struct reuse_tcp*)result)->tree_by_id.count <
+			MAX_REUSE_TCP_QUERIES) {
+			/* same address, port, ssl-yes-or-no, and has
+			 * space for another query */
+			return (struct reuse_tcp*)result;
+		}
+		result = rbtree_next(result);
+	}
+	return NULL;
+}
+
 /** use the buffer to setup writing the query */
 static void
 outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
@@ -482,6 +603,7 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
+	reuse_tree_by_id_insert(&pend->reuse, w);
 	outnet_tcp_take_query_setup(s, pend, w);
 	return 1;
 }
@@ -493,17 +615,32 @@ use_free_buffer(struct outside_network* outnet)
 	struct waiting_tcp* w;
 	while(outnet->tcp_free && outnet->tcp_wait_first 
 		&& !outnet->want_to_quit) {
+		struct reuse_tcp* reuse = NULL;
 		w = outnet->tcp_wait_first;
 		outnet->tcp_wait_first = w->next_waiting;
 		if(outnet->tcp_wait_last == w)
 			outnet->tcp_wait_last = NULL;
 		w->on_tcp_waiting_list = 0;
-		if(!outnet_tcp_take_into_use(w)) {
-			comm_point_callback_type* cb = w->cb;
-			void* cb_arg = w->cb_arg;
-			waiting_tcp_delete(w);
-			fptr_ok(fptr_whitelist_pending_tcp(cb));
-			(void)(*cb)(NULL, cb_arg, NETEVENT_CLOSED, NULL);
+		reuse = reuse_tcp_find(outnet, &w->addr, w->addrlen,
+			w->ssl_upstream);
+		if(reuse) {
+			log_reuse_tcp(5, "use free buffer for waiting tcp: "
+				"found reuse", reuse);
+			if(reuse->pending->query) {
+				/* on the write wait list */
+				comm_timer_disable(w->timer);
+				w->next_waiting = (void*)reuse->pending;
+				reuse_tree_by_id_insert(reuse, w);
+				reuse_write_wait_push_back(reuse, w);
+			}
+		} else {
+			if(!outnet_tcp_take_into_use(w)) {
+				comm_point_callback_type* cb = w->cb;
+				void* cb_arg = w->cb_arg;
+				waiting_tcp_delete(w);
+				fptr_ok(fptr_whitelist_pending_tcp(cb));
+				(void)(*cb)(NULL, cb_arg, NETEVENT_CLOSED, NULL);
+			}
 		}
 	}
 }
@@ -602,19 +739,6 @@ decommission_pending_tcp(struct outside_network* outnet,
 	reuse_del_writewait(pend);
 }
 
-/** log reuse item addr and ptr with message */
-static void
-log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
-{
-	uint16_t port;
-	char addrbuf[128];
-	if(verbosity < v) return;
-	addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf));
-	port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port);
-	verbose(v, "%s %s#%u 0x%llx fd %d", msg, addrbuf, (unsigned)port,
-		(unsigned long long)reuse, reuse->pending->c->fd);
-}
-
 /** insert into reuse tcp tree and LRU, false on failure (duplicate) */
 static int
 reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
@@ -697,22 +821,6 @@ reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
 	w->id_node.key = NULL;
 }
 
-/** pop the first element from the writewait list */
-static struct waiting_tcp* reuse_write_wait_pop(struct pending_tcp* pend)
-{
-	struct waiting_tcp* w = pend->reuse.write_wait_first;
-	if(!w)
-		return NULL;
-	if(w->write_wait_prev)
-		w->write_wait_prev->write_wait_next = w->write_wait_next;
-	else	pend->reuse.write_wait_first = w->write_wait_next;
-	if(w->write_wait_next)
-		w->write_wait_next->write_wait_prev = w->write_wait_prev;
-	else	pend->reuse.write_wait_last = w->write_wait_prev;
-	w->write_wait_queued = 0;
-	return w;
-}
-
 /** set timeout on tcp fd and setup read event to catch incoming dns msgs */
 static void
 reuse_tcp_setup_readtimeout(struct pending_tcp* pend_tcp)
@@ -756,7 +864,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		pend->query = NULL;
 		/* setup to write next packet or setup read timeout */
 		if(pend->reuse.write_wait_first) {
-			pend->query = reuse_write_wait_pop(pend);
+			pend->query = reuse_write_wait_pop(&pend->reuse);
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
 				pend->query);
 		} else {
@@ -1691,80 +1799,6 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 	decommission_pending_tcp(outnet, pend);
 }
 
-/** find reuse tcp stream to destination for query, or NULL if none */
-static struct reuse_tcp*
-reuse_tcp_find(struct outside_network* outnet, struct serviced_query* sq)
-{
-	struct waiting_tcp key_w;
-	struct pending_tcp key_p;
-	struct comm_point c;
-	rbnode_type* result = NULL, *prev;
-	verbose(5, "reuse_tcp_find");
-	memset(&key_w, 0, sizeof(key_w));
-	memset(&key_p, 0, sizeof(key_p));
-	memset(&c, 0, sizeof(c));
-	key_p.query = &key_w;
-	key_p.c = &c;
-	key_p.reuse.pending = &key_p;
-	key_p.reuse.node.key = &key_p.reuse;
-	if(sq->ssl_upstream) /* something nonNULL for comparisons in tree */
-		key_p.c->ssl = (void*)1;
-	if(sq->addrlen > sizeof(key_p.reuse.addr))
-		return NULL;
-	memmove(&key_p.reuse.addr, &sq->addr, sq->addrlen);
-	key_p.reuse.addrlen = sq->addrlen;
-
-	verbose(5, "reuse_tcp_find: num reuse streams %u",
-		(unsigned)outnet->tcp_reuse.count);
-	if(outnet->tcp_reuse.root == NULL ||
-		outnet->tcp_reuse.root == RBTREE_NULL)
-		return NULL;
-	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node,
-		&result)) {
-		/* exact match */
-		/* but the key is on stack, and ptr is compared, impossible */
-		log_assert(&key_p.reuse != (struct reuse_tcp*)result);
-		log_assert(&key_p != ((struct reuse_tcp*)result)->pending);
-	}
-	/* not found, return null */
-	if(!result || result == RBTREE_NULL)
-		return NULL;
-	verbose(5, "reuse_tcp_find check inexact match");
-	/* inexact match, find one of possibly several connections to the
-	 * same destination address, with the correct port, ssl, and
-	 * also less than max number of open queries, or else, fail to open
-	 * a new one */
-	/* rewind to start of sequence of same address,port,ssl */
-	prev = rbtree_previous(result);
-	while(prev && prev != RBTREE_NULL &&
-		reuse_cmp_addrportssl(prev->key, &key_p.reuse) == 0) {
-		result = prev;
-		prev = rbtree_previous(result);
-	}
-
-	/* loop to find first one that has correct characteristics */
-	while(result && result != RBTREE_NULL &&
-		reuse_cmp_addrportssl(result->key, &key_p.reuse) == 0) {
-		if(((struct reuse_tcp*)result)->tree_by_id.count <
-			MAX_REUSE_TCP_QUERIES) {
-			/* same address, port, ssl-yes-or-no, and has
-			 * space for another query */
-			return (struct reuse_tcp*)result;
-		}
-		result = rbtree_next(result);
-	}
-	return NULL;
-}
-
-/** insert element in tree by id */
-static void
-reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w)
-{
-	log_assert(w->id_node.key == NULL);
-	w->id_node.key = w;
-	rbtree_insert(&reuse->tree_by_id, &w->id_node);
-}
-
 /** find element in tree by id */
 static struct waiting_tcp*
 reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
@@ -1866,7 +1900,8 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	verbose(5, "pending_tcp_query");
 	/* find out if a reused stream to the target exists */
 	/* if so, take it into use */
-	reuse = reuse_tcp_find(sq->outnet, sq);
+	reuse = reuse_tcp_find(sq->outnet, &sq->addr, sq->addrlen,
+		sq->ssl_upstream);
 	if(reuse) {
 		log_reuse_tcp(5, "pending_tcp_query: found reuse", reuse);
 		log_assert(reuse->pending);
@@ -1909,25 +1944,28 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	w->ssl_upstream = sq->ssl_upstream;
 	w->tls_auth_name = sq->tls_auth_name;
 	w->timeout = timeout;
+	w->id_node.key = NULL;
+	w->write_wait_prev = NULL;
+	w->write_wait_next = NULL;
+	w->write_wait_queued = 0;
 	if(pend) {
 		/* we have a buffer available right now */
 		if(reuse) {
 			verbose(5, "pending_tcp_query: reuse, store");
-			/* if cannot write now, store query and put it
-			 * in the waiting list for this stream TODO */
-			/* and insert in tree_by_id */
-			reuse_tree_by_id_insert(&pend->reuse, w);
-			/* and also delete it from waitlst if query gone,
-			 * eg. sq is deleted TODO */
-			/* and also servfail all waiting queries if
-			 * stream closes TODO */
 			/* reuse existing fd, write query and continue */
+			/* store query in tree by id */
 			w->next_waiting = (void*)pend;
+			reuse_tree_by_id_insert(&pend->reuse, w);
+			/* can we write right now? */
 			if(pend->query == NULL) {
 				/* write straight away */
 				pend->query = w;
 				outnet_tcp_take_query_setup(pend->c->fd, pend,
 					w);
+			} else {
+				/* put it in the waiting list for
+				 * this stream */
+				reuse_write_wait_push_back(&pend->reuse, w);
 			}
 		} else {
 			verbose(5, "pending_tcp_query: new fd, connect");
@@ -1942,13 +1980,6 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 				return NULL;
 			}
 		}
-#ifdef USE_DNSTAP
-		if(sq->outnet->dtenv &&
-		   (sq->outnet->dtenv->log_resolver_query_messages ||
-		    sq->outnet->dtenv->log_forwarder_query_messages))
-		dt_msg_send_outside_query(sq->outnet->dtenv, &sq->addr,
-		comm_tcp, sq->zone, sq->zonelen, packet);
-#endif
 	} else {
 		struct timeval tv;
 		/* queue up */
@@ -1965,6 +1996,13 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 #endif
 		comm_timer_set(w->timer, &tv);
 	}
+#ifdef USE_DNSTAP
+	if(sq->outnet->dtenv &&
+	   (sq->outnet->dtenv->log_resolver_query_messages ||
+	    sq->outnet->dtenv->log_forwarder_query_messages))
+		dt_msg_send_outside_query(sq->outnet->dtenv, &sq->addr,
+			comm_tcp, sq->zone, sq->zonelen, packet);
+#endif
 	return w;
 }
 

From c32c43f9f2784526c4b54b1bf10b2ee6a1b4b814 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 16:11:46 +0200
Subject: [PATCH 028/208] for tcp use_free_buffer write straight away on reuse
 connection, if possible

---
 services/outside_network.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index f76b0ed3a..a010e3323 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -626,12 +626,18 @@ use_free_buffer(struct outside_network* outnet)
 		if(reuse) {
 			log_reuse_tcp(5, "use free buffer for waiting tcp: "
 				"found reuse", reuse);
+			comm_timer_disable(w->timer);
+			w->next_waiting = (void*)reuse->pending;
+			reuse_tree_by_id_insert(reuse, w);
 			if(reuse->pending->query) {
 				/* on the write wait list */
-				comm_timer_disable(w->timer);
-				w->next_waiting = (void*)reuse->pending;
-				reuse_tree_by_id_insert(reuse, w);
 				reuse_write_wait_push_back(reuse, w);
+			} else {
+				/* write straight away */
+				reuse->pending->query = w;
+				outnet_tcp_take_query_setup(
+					reuse->pending->c->fd, reuse->pending,
+					w);
 			}
 		} else {
 			if(!outnet_tcp_take_into_use(w)) {

From cbcbd5fa07f79abb9039d492020d03f1b8d12137 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 16:22:43 +0200
Subject: [PATCH 029/208] pending_tcp_query: cleaner comments.

---
 services/outside_network.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index a010e3323..dad448b52 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1957,9 +1957,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	if(pend) {
 		/* we have a buffer available right now */
 		if(reuse) {
-			verbose(5, "pending_tcp_query: reuse, store");
 			/* reuse existing fd, write query and continue */
 			/* store query in tree by id */
+			verbose(5, "pending_tcp_query: reuse, store");
 			w->next_waiting = (void*)pend;
 			reuse_tree_by_id_insert(&pend->reuse, w);
 			/* can we write right now? */
@@ -1974,9 +1974,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 				reuse_write_wait_push_back(&pend->reuse, w);
 			}
 		} else {
-			verbose(5, "pending_tcp_query: new fd, connect");
 			/* create new fd and connect to addr, setup to
 			 * write query */
+			verbose(5, "pending_tcp_query: new fd, connect");
 			rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
 			pend->reuse.pending = pend;
 			memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
@@ -1987,8 +1987,10 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			}
 		}
 	} else {
-		struct timeval tv;
 		/* queue up */
+		/* waiting for a buffer on the outside network buffer wait
+		 * list */
+		struct timeval tv;
 		verbose(5, "pending_tcp_query: queue to wait");
 		w->next_waiting = NULL;
 		if(sq->outnet->tcp_wait_last)

From dfb6d32189c98810b2ded91a644868deb78739f2 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 16:29:37 +0200
Subject: [PATCH 030/208] outnet_tcp_cb: add assertion and return when write
 packets done is handled.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index dad448b52..71a7adebd 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -867,6 +867,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		pend->c->tcp_write_pkt = NULL;
 		pend->c->tcp_write_pkt_len = 0;
 		/* the pend.query is already in tree_by_id */
+		log_assert(pend->query->id_node.key);
 		pend->query = NULL;
 		/* setup to write next packet or setup read timeout */
 		if(pend->reuse.write_wait_first) {
@@ -876,6 +877,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		} else {
 			reuse_tcp_setup_readtimeout(pend);
 		}
+		return 0;
 	} else if(error != NETEVENT_NOERROR) {
 		verbose(VERB_QUERY, "outnettcp got tcp error %d", error);
 		/* pass error below and exit */

From d033ce6c23afb2f5c3fb0eaf463d1e230c22f3eb Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 25 Jun 2020 17:23:46 +0200
Subject: [PATCH 031/208] tcp callback function refactor, split read and
 timeout event setup, leave unused queries that are already sent to track
 their reply on the query pipeline, when serviced query is deleted deal with
 the write wait list,

---
 services/outside_network.c | 118 +++++++++++++++++++++++--------------
 services/outside_network.h |   5 +-
 2 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 71a7adebd..ee8275c7f 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -364,6 +364,23 @@ static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse)
 	if(!w)
 		return NULL;
 	log_assert(w->write_wait_queued);
+	log_assert(!w->write_wait_prev);
+	reuse->write_wait_first = w->write_wait_next;
+	if(w->write_wait_next)
+		w->write_wait_next->write_wait_prev = NULL;
+	else	reuse->write_wait_last = NULL;
+	w->write_wait_queued = 0;
+	return w;
+}
+
+/** remove the element from the writewait list */
+static void reuse_write_wait_remove(struct reuse_tcp* reuse,
+	struct waiting_tcp* w)
+{
+	if(!w)
+		return;
+	if(!w->write_wait_queued)
+		return;
 	if(w->write_wait_prev)
 		w->write_wait_prev->write_wait_next = w->write_wait_next;
 	else	reuse->write_wait_first = w->write_wait_next;
@@ -371,7 +388,6 @@ static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse)
 		w->write_wait_next->write_wait_prev = w->write_wait_prev;
 	else	reuse->write_wait_last = w->write_wait_prev;
 	w->write_wait_queued = 0;
-	return w;
 }
 
 /** push the element after the last on the writewait list */
@@ -608,6 +624,17 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	return 1;
 }
 
+/** call callback on waiting_tcp, if not NULL */
+static void
+waiting_tcp_callback(struct waiting_tcp* w, struct comm_point* c, int error,
+	struct comm_reply* reply_info)
+{
+	if(w->cb) {
+		fptr_ok(fptr_whitelist_pending_tcp(w->cb));
+		(void)(*w->cb)(c, w->cb_arg, error, reply_info);
+	}
+}
+
 /** see if buffers can be used to service TCP queries */
 static void
 use_free_buffer(struct outside_network* outnet)
@@ -641,11 +668,9 @@ use_free_buffer(struct outside_network* outnet)
 			}
 		} else {
 			if(!outnet_tcp_take_into_use(w)) {
-				comm_point_callback_type* cb = w->cb;
-				void* cb_arg = w->cb_arg;
+				waiting_tcp_callback(w, NULL, NETEVENT_CLOSED,
+					NULL);
 				waiting_tcp_delete(w);
-				fptr_ok(fptr_whitelist_pending_tcp(cb));
-				(void)(*cb)(NULL, cb_arg, NETEVENT_CLOSED, NULL);
 			}
 		}
 	}
@@ -780,10 +805,7 @@ static void reuse_cb_writewait_for_failure(struct pending_tcp* pend, int err)
 	struct waiting_tcp* w;
 	w = pend->reuse.write_wait_first;
 	while(w) {
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, err, NULL);
+		waiting_tcp_callback(w, NULL, err, NULL);
 		w = w->write_wait_next;
 	}
 }
@@ -798,10 +820,7 @@ static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 	node = rbtree_first(&pend->reuse.tree_by_id);
 	while(node && node != RBTREE_NULL) {
 		struct waiting_tcp* w = (struct waiting_tcp*)node->key;
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, err, NULL);
+		waiting_tcp_callback(w, NULL, err, NULL);
 		node = rbtree_next(node);
 	}
 }
@@ -811,10 +830,7 @@ static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
 {
 	struct waiting_tcp* w = pend->query;
 	if(w) {
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, err, NULL);
+		waiting_tcp_callback(w, NULL, err, NULL);
 	}
 }
 
@@ -829,7 +845,15 @@ reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
 
 /** set timeout on tcp fd and setup read event to catch incoming dns msgs */
 static void
-reuse_tcp_setup_readtimeout(struct pending_tcp* pend_tcp)
+reuse_tcp_setup_timeout(struct pending_tcp* pend_tcp)
+{
+	log_reuse_tcp(5, "reuse_tcp_setup_timeout", &pend_tcp->reuse);
+	comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT);
+}
+
+/** set timeout on tcp fd and setup read event to catch incoming dns msgs */
+static void
+reuse_tcp_setup_read_and_timeout(struct pending_tcp* pend_tcp)
 {
 	log_reuse_tcp(5, "reuse_tcp_setup_readtimeout", &pend_tcp->reuse);
 	sldns_buffer_clear(pend_tcp->c->buffer);
@@ -875,7 +899,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
 				pend->query);
 		} else {
-			reuse_tcp_setup_readtimeout(pend);
+			reuse_tcp_setup_timeout(pend);
 		}
 		return 0;
 	} else if(error != NETEVENT_NOERROR) {
@@ -897,13 +921,11 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		 * query again to the same destination. */
 		if(outnet->tcp_reuse.count < outnet->tcp_reuse_max) {
 			(void)reuse_tcp_insert(outnet, pend);
-			reuse_tcp_setup_readtimeout(pend);
 		}
 	}
 	if(pend->query) {
 		reuse_tree_by_id_delete(&pend->reuse, pend->query);
-		fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb));
-		(void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info);
+		waiting_tcp_callback(pend->query, c, error, reply_info);
 		waiting_tcp_delete(pend->query);
 		pend->query = NULL;
 	}
@@ -912,6 +934,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		verbose(5, "outnet_tcp_cb reuse after cb: keep it");
 		/* it is in the reuse_tcp tree, with other queries, or
 		 * on the empty list. do not decommission it */
+		reuse_tcp_setup_read_and_timeout(pend);
 		return 0;
 	}
 	verbose(5, "outnet_tcp_cb reuse after cb: decommission it");
@@ -1742,12 +1765,9 @@ outnet_tcptimer(void* arg)
 	verbose(5, "outnet_tcptimer");
 	if(w->on_tcp_waiting_list) {
 		/* it is on the waiting list */
-		comm_point_callback_type* cb = w->cb;
-		void* cb_arg = w->cb_arg;
 		waiting_list_remove(outnet, w);
+		waiting_tcp_callback(w, NULL, NETEVENT_TIMEOUT, NULL);
 		waiting_tcp_delete(w);
-		fptr_ok(fptr_whitelist_pending_tcp(cb));
-		(void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL);
 	} else {
 		/* it was in use */
 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;
@@ -2154,6 +2174,11 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 {
 	struct pending_tcp* pend_tcp = (struct pending_tcp*)w->next_waiting;
 	verbose(5, "reuse_tcp_remove_serviced_keep");
+	/* remove the callback. let query continue to write to not cancel
+	 * the stream itself.  also keep it as an entry in the tree_by_id,
+	 * in case the answer returns (that we no longer want), but we cannot
+	 * pick the same ID number meanwhile */
+	pend_tcp->query->cb = NULL;
 	/* see if can be entered in reuse tree
 	 * for that the FD has to be non-1 */
 	if(pend_tcp->c->fd == -1) {
@@ -2163,10 +2188,8 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	/* if in tree and used by other queries */
 	if(pend_tcp->reuse.node.key) {
 		verbose(5, "reuse_tcp_remove_serviced_keep: in use by other queries");
-		/* note less use of stream */
-		/* remove id value used by this svcd. */
 		/* do not reset the keepalive timer, for that
-		 * we'd need traffic, and this is where the servicedq is
+		 * we'd need traffic, and this is where the serviced is
 		 * removed due to state machine internal reasons,
 		 * eg. iterator no longer interested in this query */
 		return 1;
@@ -2175,13 +2198,11 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	if(pend_tcp->c->fd != -1 && sq->outnet->tcp_reuse.count <
 		sq->outnet->tcp_reuse_max) {
 		verbose(5, "reuse_tcp_remove_serviced_keep: keep open");
-		/* note less use of stream */
-		/* remove id value used by this svcd. */
 		/* set a keepalive timer on it */
 		if(!reuse_tcp_insert(sq->outnet, pend_tcp)) {
 			return 0;
 		}
-		reuse_tcp_setup_readtimeout(pend_tcp);
+		reuse_tcp_setup_timeout(pend_tcp);
 		return 1;
 	}
 	return 0;
@@ -2207,31 +2228,38 @@ serviced_delete(struct serviced_query* sq)
 			 * mesh */
 			outnet_send_wait_udp(sq->outnet);
 		} else {
-			struct waiting_tcp* p = (struct waiting_tcp*)
+			struct waiting_tcp* w = (struct waiting_tcp*)
 				sq->pending;
 			verbose(5, "serviced_delete: TCP");
-			/* TODO: if on stream-write-waiting list then
+			/* if on stream-write-waiting list then
 			 * remove from waiting list and waiting_tcp_delete */
-			if(!p->on_tcp_waiting_list) {
+			if(w->write_wait_queued) {
+				struct pending_tcp* pend =
+					(struct pending_tcp*)w->next_waiting;
+				verbose(5, "serviced_delete: writewait");
+				reuse_tree_by_id_delete(&pend->reuse, w);
+				reuse_write_wait_remove(&pend->reuse, w);
+				waiting_tcp_delete(w);
+			} else if(!w->on_tcp_waiting_list) {
+				struct pending_tcp* pend =
+					(struct pending_tcp*)w->next_waiting;
 				verbose(5, "serviced_delete: tcpreusekeep");
-				if(!reuse_tcp_remove_serviced_keep(p, sq)) {
+				if(!reuse_tcp_remove_serviced_keep(w, sq)) {
 					reuse_cb_curquery_for_failure(
-						(struct pending_tcp*)p->
-						next_waiting, NETEVENT_CLOSED);
+						pend, NETEVENT_CLOSED);
 					reuse_cb_readwait_for_failure(
-						(struct pending_tcp*)p->
-						next_waiting, NETEVENT_CLOSED);
+						pend, NETEVENT_CLOSED);
 					reuse_cb_writewait_for_failure(
-						(struct pending_tcp*)p->
-						next_waiting, NETEVENT_CLOSED);
+						pend, NETEVENT_CLOSED);
 					decommission_pending_tcp(sq->outnet,
-					  (struct pending_tcp*)p->next_waiting);
+						pend);
 					use_free_buffer(sq->outnet);
 				}
+				sq->pending = NULL;
 			} else {
 				verbose(5, "serviced_delete: tcpwait");
-				waiting_list_remove(sq->outnet, p);
-				waiting_tcp_delete(p);
+				waiting_list_remove(sq->outnet, w);
+				waiting_tcp_delete(w);
 			}
 		}
 	}
diff --git a/services/outside_network.h b/services/outside_network.h
index 7c061938a..0dcf1b2e1 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -375,7 +375,10 @@ struct waiting_tcp {
 	uint8_t* pkt;
 	/** length of query packet. */
 	size_t pkt_len;
-	/** callback for the timeout, error or reply to the message */
+	/** callback for the timeout, error or reply to the message,
+	 * or NULL if no user is waiting. the entry uses an ID number.
+	 * a query that was written is no longer needed, but the ID number
+	 * and a reply will come back and can be ignored if NULL */
 	comm_point_callback_type* cb;
 	/** callback user argument */
 	void* cb_arg;

From 64c8d18814d09a66f47dcae79e2ade94f198166c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 26 Jun 2020 10:54:13 +0200
Subject: [PATCH 032/208] in tcp write callback routine dont reset read byte
 count if write and read. in tcp write callback and write and read and write
 is done perform callback. tcp connection is selected to not toggle readwrite
 and give closed callback.

---
 services/outside_network.c |  2 ++
 util/netevent.c            | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index ee8275c7f..8da5eeb64 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -516,6 +516,8 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	log_assert(w->pkt);
 	log_assert(w->pkt_len > 0);
 	log_assert(w->addrlen > 0);
+	pend->c->tcp_do_toggle_rw = 0;
+	pend->c->tcp_do_close = 0;
 	/* open socket */
 	s = outnet_get_tcp_fd(&w->addr, w->addrlen, w->outnet->tcp_mss, w->outnet->ip_dscp);
 
diff --git a/util/netevent.c b/util/netevent.c
index 2ca92b92d..bcff7a590 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -995,13 +995,23 @@ tcp_callback_writer(struct comm_point* c)
 	sldns_buffer_clear(c->buffer);
 	if(c->tcp_do_toggle_rw)
 		c->tcp_is_reading = 1;
-	c->tcp_byte_count = 0;
+	if(!c->tcp_write_and_read)
+		c->tcp_byte_count = 0;
 	/* switch from listening(write) to listening(read) */
 	if(c->tcp_req_info) {
 		tcp_req_info_handle_writedone(c->tcp_req_info);
 	} else {
 		comm_point_stop_listening(c);
-		comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+		if(c->tcp_write_and_read) {
+			fptr_ok(fptr_whitelist_comm_point(c->callback));
+			if( (*c->callback)(c, c->cb_arg, NETEVENT_PKT_WRITTEN,
+				&c->repinfo) ) {
+				comm_point_start_listening(c, -1,
+					c->tcp_timeout_msec);
+			}
+		} else {
+			comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+		}
 	}
 }
 

From cfe009a31c7b092e236da3e02517b1eb17c954ca Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 26 Jun 2020 16:05:15 +0200
Subject: [PATCH 033/208] tcp read and write handling of write events in
 netevent for tcp and ssl.

---
 util/netevent.c | 172 ++++++++++++++++++++++++++++++++++--------------
 util/netevent.h |   9 ++-
 2 files changed, 131 insertions(+), 50 deletions(-)

diff --git a/util/netevent.c b/util/netevent.c
index bcff7a590..6289df823 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -992,11 +992,12 @@ static void
 tcp_callback_writer(struct comm_point* c)
 {
 	log_assert(c->type == comm_tcp);
-	sldns_buffer_clear(c->buffer);
+	if(!c->tcp_write_and_read) {
+		sldns_buffer_clear(c->buffer);
+		c->tcp_byte_count = 0;
+	}
 	if(c->tcp_do_toggle_rw)
 		c->tcp_is_reading = 1;
-	if(!c->tcp_write_and_read)
-		c->tcp_byte_count = 0;
 	/* switch from listening(write) to listening(read) */
 	if(c->tcp_req_info) {
 		tcp_req_info_handle_writedone(c->tcp_req_info);
@@ -1302,10 +1303,28 @@ ssl_handle_write(struct comm_point* c)
 	}
 	/* ignore return, if fails we may simply block */
 	(void)SSL_set_mode(c->ssl, (long)SSL_MODE_ENABLE_PARTIAL_WRITE);
-	if(c->tcp_byte_count < sizeof(uint16_t)) {
-		uint16_t len = htons(sldns_buffer_limit(c->buffer));
+	if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) {
+		uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(c->buffer));
 		ERR_clear_error();
-		if(sizeof(uint16_t)+sldns_buffer_remaining(c->buffer) <
+		if(c->tcp_write_and_read) {
+			if(c->tcp_write_pkt_len + 2 < LDNS_RR_BUF_SIZE) {
+				/* combine the tcp length and the query for
+				 * write, this emulates writev */
+				uint8_t buf[LDNS_RR_BUF_SIZE];
+				memmove(buf, &len, sizeof(uint16_t));
+				memmove(buf+sizeof(uint16_t),
+					c->tcp_write_pkt,
+					c->tcp_write_pkt_len);
+				r = SSL_write(c->ssl,
+					(void*)(buf+c->tcp_write_byte_count),
+					c->tcp_write_pkt_len + 2 -
+					c->tcp_write_byte_count);
+			} else {
+				r = SSL_write(c->ssl,
+					(void*)(((uint8_t*)&len)+c->tcp_write_byte_count),
+					(int)(sizeof(uint16_t)-c->tcp_write_byte_count));
+			}
+		} else if(sizeof(uint16_t)+sldns_buffer_remaining(c->buffer) <
 			LDNS_RR_BUF_SIZE) {
 			/* combine the tcp length and the query for write,
 			 * this emulates writev */
@@ -1347,20 +1366,32 @@ ssl_handle_write(struct comm_point* c)
 			log_crypto_err("could not SSL_write");
 			return 0;
 		}
-		c->tcp_byte_count += r;
-		if(c->tcp_byte_count < sizeof(uint16_t))
-			return 1;
-		sldns_buffer_set_position(c->buffer, c->tcp_byte_count -
-			sizeof(uint16_t));
-		if(sldns_buffer_remaining(c->buffer) == 0) {
+		if(c->tcp_write_and_read) {
+			c->tcp_write_byte_count += r;
+			if(c->tcp_write_byte_count < sizeof(uint16_t))
+				return 1;
+		} else {
+			c->tcp_byte_count += r;
+			if(c->tcp_byte_count < sizeof(uint16_t))
+				return 1;
+			sldns_buffer_set_position(c->buffer, c->tcp_byte_count -
+				sizeof(uint16_t));
+		}
+		if((!c->tcp_write_and_read && sldns_buffer_remaining(c->buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) {
 			tcp_callback_writer(c);
 			return 1;
 		}
 	}
-	log_assert(sldns_buffer_remaining(c->buffer) > 0);
+	log_assert(c->tcp_write_and_read || sldns_buffer_remaining(c->buffer) > 0);
+	log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2);
 	ERR_clear_error();
-	r = SSL_write(c->ssl, (void*)sldns_buffer_current(c->buffer),
-		(int)sldns_buffer_remaining(c->buffer));
+	if(c->tcp_write_and_read) {
+		r = SSL_write(c->ssl, (void*)(c->tcp_write_pkt + c->tcp_write_byte_count - 2),
+			(int)(c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count));
+	} else {
+		r = SSL_write(c->ssl, (void*)sldns_buffer_current(c->buffer),
+			(int)sldns_buffer_remaining(c->buffer));
+	}
 	if(r <= 0) {
 		int want = SSL_get_error(c->ssl, r);
 		if(want == SSL_ERROR_ZERO_RETURN) {
@@ -1385,9 +1416,13 @@ ssl_handle_write(struct comm_point* c)
 		log_crypto_err("could not SSL_write");
 		return 0;
 	}
-	sldns_buffer_skip(c->buffer, (ssize_t)r);
+	if(c->tcp_write_and_read) {
+		c->tcp_write_byte_count += r;
+	} else {
+		sldns_buffer_skip(c->buffer, (ssize_t)r);
+	}
 
-	if(sldns_buffer_remaining(c->buffer) == 0) {
+	if((!c->tcp_write_and_read && sldns_buffer_remaining(c->buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) {
 		tcp_callback_writer(c);
 	}
 	return 1;
@@ -1531,7 +1566,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	if(c->tcp_is_reading && !c->ssl)
 		return 0;
 	log_assert(fd != -1);
-	if(c->tcp_byte_count == 0 && c->tcp_check_nb_connect) {
+	if(((!c->tcp_write_and_read && c->tcp_byte_count == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == 0)) && c->tcp_check_nb_connect) {
 		/* check for pending error from nonblocking connect */
 		/* from Stevens, unix network programming, vol1, 3rd ed, p450*/
 		int error = 0;
@@ -1581,15 +1616,22 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	if(c->tcp_do_fastopen == 1) {
 		/* this form of sendmsg() does both a connect() and send() so need to
 		   look for various flavours of error*/
-		uint16_t len = htons(sldns_buffer_limit(buffer));
+		uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer));
 		struct msghdr msg;
 		struct iovec iov[2];
 		c->tcp_do_fastopen = 0;
 		memset(&msg, 0, sizeof(msg));
-		iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count;
-		iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count;
-		iov[1].iov_base = sldns_buffer_begin(buffer);
-		iov[1].iov_len = sldns_buffer_limit(buffer);
+		if(c->tcp_write_and_read) {
+			iov[0].iov_base = (uint8_t*)&len + c->tcp_write_byte_count;
+			iov[0].iov_len = sizeof(uint16_t) - c->tcp_write_byte_count;
+			iov[1].iov_base = c->tcp_write_pkt;
+			iov[1].iov_len = c->tcp_write_pkt_len;
+		} else {
+			iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count;
+			iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count;
+			iov[1].iov_base = sldns_buffer_begin(buffer);
+			iov[1].iov_len = sldns_buffer_limit(buffer);
+		}
 		log_assert(iov[0].iov_len > 0);
 		msg.msg_name = &c->repinfo.addr;
 		msg.msg_namelen = c->repinfo.addrlen;
@@ -1635,12 +1677,18 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			}
 
 		} else {
-			c->tcp_byte_count += r;
-			if(c->tcp_byte_count < sizeof(uint16_t))
-				return 1;
-			sldns_buffer_set_position(buffer, c->tcp_byte_count - 
-				sizeof(uint16_t));
-			if(sldns_buffer_remaining(buffer) == 0) {
+			if(c->tcp_write_and_read) {
+				c->tcp_write_byte_count += r;
+				if(c->tcp_write_byte_count < sizeof(uint16_t))
+					return 1;
+			} else {
+				c->tcp_byte_count += r;
+				if(c->tcp_byte_count < sizeof(uint16_t))
+					return 1;
+				sldns_buffer_set_position(buffer, c->tcp_byte_count -
+					sizeof(uint16_t));
+			}
+			if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) {
 				tcp_callback_writer(c);
 				return 1;
 			}
@@ -1648,19 +1696,31 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	}
 #endif /* USE_MSG_FASTOPEN */
 
-	if(c->tcp_byte_count < sizeof(uint16_t)) {
-		uint16_t len = htons(sldns_buffer_limit(buffer));
+	if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) {
+		uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer));
 #ifdef HAVE_WRITEV
 		struct iovec iov[2];
-		iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count;
-		iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count;
-		iov[1].iov_base = sldns_buffer_begin(buffer);
-		iov[1].iov_len = sldns_buffer_limit(buffer);
+		if(c->tcp_write_and_read) {
+			iov[0].iov_base = (uint8_t*)&len + c->tcp_write_byte_count;
+			iov[0].iov_len = sizeof(uint16_t) - c->tcp_write_byte_count;
+			iov[1].iov_base = c->tcp_write_pkt;
+			iov[1].iov_len = c->tcp_write_pkt_len;
+		} else {
+			iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count;
+			iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count;
+			iov[1].iov_base = sldns_buffer_begin(buffer);
+			iov[1].iov_len = sldns_buffer_limit(buffer);
+		}
 		log_assert(iov[0].iov_len > 0);
 		r = writev(fd, iov, 2);
 #else /* HAVE_WRITEV */
-		r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_byte_count),
-			sizeof(uint16_t)-c->tcp_byte_count, 0);
+		if(c->tcp_write_and_read) {
+			r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_write_byte_count),
+				sizeof(uint16_t)-c->tcp_write_byte_count, 0);
+		} else {
+			r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_byte_count),
+				sizeof(uint16_t)-c->tcp_byte_count, 0);
+		}
 #endif /* HAVE_WRITEV */
 		if(r == -1) {
 #ifndef USE_WINSOCK
@@ -1699,19 +1759,31 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 #endif
 			return 0;
 		}
-		c->tcp_byte_count += r;
-		if(c->tcp_byte_count < sizeof(uint16_t))
-			return 1;
-		sldns_buffer_set_position(buffer, c->tcp_byte_count - 
-			sizeof(uint16_t));
-		if(sldns_buffer_remaining(buffer) == 0) {
+		if(c->tcp_write_and_read) {
+			c->tcp_write_byte_count += r;
+			if(c->tcp_write_byte_count < sizeof(uint16_t))
+				return 1;
+		} else {
+			c->tcp_byte_count += r;
+			if(c->tcp_byte_count < sizeof(uint16_t))
+				return 1;
+			sldns_buffer_set_position(buffer, c->tcp_byte_count -
+				sizeof(uint16_t));
+		}
+		if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) {
 			tcp_callback_writer(c);
 			return 1;
 		}
 	}
-	log_assert(sldns_buffer_remaining(buffer) > 0);
-	r = send(fd, (void*)sldns_buffer_current(buffer), 
-		sldns_buffer_remaining(buffer), 0);
+	log_assert(c->tcp_write_and_read || sldns_buffer_remaining(buffer) > 0);
+	log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2);
+	if(c->tcp_write_and_read) {
+		r = send(fd, (void*)c->tcp_write_pkt + c->tcp_write_byte_count - 2,
+			c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count, 0);
+	} else {
+		r = send(fd, (void*)sldns_buffer_current(buffer),
+			sldns_buffer_remaining(buffer), 0);
+	}
 	if(r == -1) {
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)
@@ -1736,9 +1808,13 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 #endif
 		return 0;
 	}
-	sldns_buffer_skip(buffer, r);
+	if(c->tcp_write_and_read) {
+		c->tcp_write_byte_count += r;
+	} else {
+		sldns_buffer_skip(buffer, r);
+	}
 
-	if(sldns_buffer_remaining(buffer) == 0) {
+	if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) {
 		tcp_callback_writer(c);
 	}
 	
diff --git a/util/netevent.h b/util/netevent.h
index c044f8938..300592e5b 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -254,11 +254,16 @@ struct comm_point {
 	int tcp_write_and_read;
 
 	/** byte count for written length over write channel, for when
-	 * tcp_write_and_read is enabled */
+	 * tcp_write_and_read is enabled.  When tcp_write_and_read is enabled,
+	 * this is the counter for writing, the one for reading is in the
+	 * commpoint.buffer sldns buffer.  The counter counts from 0 to
+	 * 2+tcp_write_pkt_len, and includes the tcp length bytes. */
 	size_t tcp_write_byte_count;
 
 	/** packet to write currently over the write channel. for when
-	 * tcp_write_and_read is enabled */
+	 * tcp_write_and_read is enabled.  When tcp_write_and_read is enabled,
+	 * this is the buffer for the written packet, the commpoint.buffer
+	 * sldns buffer is the buffer for the received packet. */
 	uint8_t* tcp_write_pkt;
 	/** length of tcp_write_pkt in bytes */
 	size_t tcp_write_pkt_len;

From d89a45d1e129a86e0fbeee0db618c57e47da09b7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 10:28:47 +0200
Subject: [PATCH 034/208] in outnet_tcptimer: pick up callbacks and clean the
 struct pending for use again in tcp_free list; then perform the callbacks in
 a cleaner state for reentry into the outside network code.  Delete callbacks
 afterwards.

---
 services/outside_network.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 8da5eeb64..9c3c6ff8a 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1773,6 +1773,7 @@ outnet_tcptimer(void* arg)
 	} else {
 		/* it was in use */
 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;
+		struct pending_tcp pickup;
 		/* see if it needs unlink from reuse tree */
 		if(pend->reuse.node.key) {
 			reuse_tcp_remove_tree_list(outnet, &pend->reuse);
@@ -1785,19 +1786,33 @@ outnet_tcptimer(void* arg)
 #endif
 		}
 		comm_point_close(pend->c);
+		/* pickup the callback items and call them after we have
+		 * removed the current pending. so that the callbacks
+		 * to the state machine happen after the query has timeouted
+		 * and been deleted and it works from that clean state,
+		 * because it may call the outside network routines to make
+		 * new queries. */
+		pickup = *pend;
+		/* unlink them from pend, delete from pickup calls later */
+		pend->query = NULL;
+		rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
+		pend->reuse.write_wait_first = NULL;
+		pend->reuse.write_wait_last = NULL;
+		/* pend is clear for reuse in the tcp_free list */
+		pend->next_free = outnet->tcp_free;
+		outnet->tcp_free = pend;
+
 		/* do failure callbacks for all the queries in the
 		 * wait for write list and in the id-tree */
 		/* callback for 'w' arg already in list of curquery,
 		 * readwait list, writewait list */
-		reuse_cb_curquery_for_failure(pend, NETEVENT_TIMEOUT);
-		reuse_cb_readwait_for_failure(pend, NETEVENT_TIMEOUT);
-		reuse_cb_writewait_for_failure(pend, NETEVENT_TIMEOUT);
-		waiting_tcp_delete(pend->query); /* del curquery */
-		reuse_del_readwait(pend);
-		reuse_del_writewait(pend);
-		pend->query = NULL;
-		pend->next_free = outnet->tcp_free;
-		outnet->tcp_free = pend;
+		reuse_cb_curquery_for_failure(&pickup, NETEVENT_TIMEOUT);
+		reuse_cb_readwait_for_failure(&pickup, NETEVENT_TIMEOUT);
+		reuse_cb_writewait_for_failure(&pickup, NETEVENT_TIMEOUT);
+		/* delete the stored callback structures */
+		waiting_tcp_delete(pickup.query);
+		reuse_del_readwait(&pickup);
+		reuse_del_writewait(&pickup);
 	}
 	use_free_buffer(outnet);
 }

From ccc9e0749c120739b44c95e735b1949cac20e825 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 13:41:03 +0200
Subject: [PATCH 035/208] stream reuse toggle write and read to only read mode
 when write is done. tcp callback from stream read without entry linked.

---
 services/outside_network.c | 13 ++++++++++---
 util/netevent.c            | 11 ++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 9c3c6ff8a..95ffff935 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -887,6 +887,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
 	} else if(error == NETEVENT_PKT_WRITTEN) {
 		/* the packet we want to write has been written. */
+		verbose(VERB_ALGO, "outnet tcp pkt was written event");
 		log_assert(c == pend->c);
 		log_assert(pend->query->pkt == pend->c->tcp_write_pkt);
 		log_assert(pend->query->pkt_len == pend->c->tcp_write_pkt_len);
@@ -897,10 +898,14 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		pend->query = NULL;
 		/* setup to write next packet or setup read timeout */
 		if(pend->reuse.write_wait_first) {
+			verbose(VERB_ALGO, "outnet tcp setup next pkt");
 			pend->query = reuse_write_wait_pop(&pend->reuse);
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
 				pend->query);
 		} else {
+			verbose(VERB_ALGO, "outnet tcp writes done, wait");
+			pend->c->tcp_write_and_read = 0;
+			pend->c->tcp_is_reading = 1;
 			reuse_tcp_setup_timeout(pend);
 		}
 		return 0;
@@ -926,10 +931,12 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		}
 	}
 	if(pend->query) {
-		reuse_tree_by_id_delete(&pend->reuse, pend->query);
-		waiting_tcp_callback(pend->query, c, error, reply_info);
-		waiting_tcp_delete(pend->query);
+		struct waiting_tcp* w = pend->query;
 		pend->query = NULL;
+		reuse_tree_by_id_delete(&pend->reuse, w);
+		verbose(5, "outnet tcp callback query err %d buflen %d", error, (int)sldns_buffer_limit(c->buffer));
+		waiting_tcp_callback(w, c, error, reply_info);
+		waiting_tcp_delete(w);
 	}
 	verbose(5, "outnet_tcp_cb reuse after cb");
 	if(pend->reuse.node.key) {
diff --git a/util/netevent.c b/util/netevent.c
index 6289df823..e749e1b68 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3307,11 +3307,16 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 	}
 	if(c->type == comm_tcp || c->type == comm_http) {
 		ub_event_del_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
-		if(c->tcp_write_and_read)
+		if(c->tcp_write_and_read) {
+			log_info("startlistening %d mode rw", (newfd==-1?c->fd:newfd));
 			ub_event_add_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
-		else if(c->tcp_is_reading)
+		} else if(c->tcp_is_reading) {
+			log_info("startlistening %d mode r", (newfd==-1?c->fd:newfd));
 			ub_event_add_bits(c->ev->ev, UB_EV_READ);
-		else	ub_event_add_bits(c->ev->ev, UB_EV_WRITE);
+		} else	{
+			log_info("startlistening %d mode w", (newfd==-1?c->fd:newfd));
+			ub_event_add_bits(c->ev->ev, UB_EV_WRITE);
+		}
 	}
 	if(newfd != -1) {
 		if(c->fd != -1 && c->fd != newfd) {

From e95edd3d362c7dec854ae05f264c14413e9a56eb Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 13:41:50 +0200
Subject: [PATCH 036/208] debug prints in verbose output.

---
 util/netevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/netevent.c b/util/netevent.c
index e749e1b68..3237907d1 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3308,13 +3308,13 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 	if(c->type == comm_tcp || c->type == comm_http) {
 		ub_event_del_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
 		if(c->tcp_write_and_read) {
-			log_info("startlistening %d mode rw", (newfd==-1?c->fd:newfd));
+			verbose(5, "startlistening %d mode rw", (newfd==-1?c->fd:newfd));
 			ub_event_add_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
 		} else if(c->tcp_is_reading) {
-			log_info("startlistening %d mode r", (newfd==-1?c->fd:newfd));
+			verbose(5, "startlistening %d mode r", (newfd==-1?c->fd:newfd));
 			ub_event_add_bits(c->ev->ev, UB_EV_READ);
 		} else	{
-			log_info("startlistening %d mode w", (newfd==-1?c->fd:newfd));
+			verbose(5, "startlistening %d mode w", (newfd==-1?c->fd:newfd));
 			ub_event_add_bits(c->ev->ev, UB_EV_WRITE);
 		}
 	}

From 734a248284341603ff2885f6e17cfd639cb2c558 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 13:49:36 +0200
Subject: [PATCH 037/208] stream reuse, check incoming messages from rbtree in
 outnet_tcp_cb when read a reply, and call that callback and remove that
 entry.

---
 services/outside_network.c | 68 ++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 95ffff935..5082f5f03 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -415,6 +415,28 @@ reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w)
 	rbtree_insert(&reuse->tree_by_id, &w->id_node);
 }
 
+/** find element in tree by id */
+static struct waiting_tcp*
+reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
+{
+	struct waiting_tcp key_w;
+	struct pending_tcp key_p;
+	memset(&key_w, 0, sizeof(key_w));
+	memset(&key_p, 0, sizeof(key_p));
+	key_w.next_waiting = (void*)&key_p;
+	key_w.id_node.key = &key_w;
+	key_p.id = id;
+	return (struct waiting_tcp*)rbtree_search(&reuse->tree_by_id, &key_w);
+}
+
+/** return ID value of rbnode in tree_by_id */
+static uint16_t
+tree_by_id_get_id(rbnode_type* node)
+{
+	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
+	return ((struct pending_tcp*)w->next_waiting)->id;
+}
+
 /** find reuse tcp stream to destination for query, or NULL if none */
 static struct reuse_tcp*
 reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
@@ -870,6 +892,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 {
 	struct pending_tcp* pend = (struct pending_tcp*)arg;
 	struct outside_network* outnet = pend->reuse.outnet;
+	struct waiting_tcp* w = NULL;
 	verbose(VERB_ALGO, "outnettcp cb");
 	if(error == NETEVENT_TIMEOUT) {
 		if(pend->c->tcp_write_and_read)
@@ -914,14 +937,24 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		/* pass error below and exit */
 	} else {
 		/* check ID */
-		if(sldns_buffer_limit(c->buffer) < sizeof(uint16_t) ||
-			LDNS_ID_WIRE(sldns_buffer_begin(c->buffer))!=pend->id) {
+		if(sldns_buffer_limit(c->buffer) < sizeof(uint16_t)) {
 			log_addr(VERB_QUERY, 
-				"outnettcp: bad ID in reply, from:",
+				"outnettcp: bad ID in reply, too short, from:",
 				&pend->reuse.addr, pend->reuse.addrlen);
 			error = NETEVENT_CLOSED;
+		} else {
+			uint16_t id = LDNS_ID_WIRE(sldns_buffer_begin(
+				c->buffer));
+			/* find the query the reply is for */
+			w = reuse_tcp_by_id_find(&pend->reuse, id);
 		}
 	}
+	if(!w) {
+		/* no struct waiting found in tree, no reply to call */
+		log_addr(VERB_QUERY, "outnettcp: bad ID in reply, from:",
+			&pend->reuse.addr, pend->reuse.addrlen);
+		error = NETEVENT_CLOSED;
+	}
 	if(error == NETEVENT_NOERROR) {
 		/* add to reuse tree so it can be reused, if not a failure.
 		 * This is possible if the state machine wants to make a tcp
@@ -930,11 +963,10 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			(void)reuse_tcp_insert(outnet, pend);
 		}
 	}
-	if(pend->query) {
-		struct waiting_tcp* w = pend->query;
-		pend->query = NULL;
+	if(w) {
 		reuse_tree_by_id_delete(&pend->reuse, w);
-		verbose(5, "outnet tcp callback query err %d buflen %d", error, (int)sldns_buffer_limit(c->buffer));
+		verbose(5, "outnet tcp callback query err %d buflen %d",
+			error, (int)sldns_buffer_limit(c->buffer));
 		waiting_tcp_callback(w, c, error, reply_info);
 		waiting_tcp_delete(w);
 	}
@@ -1851,28 +1883,6 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 	decommission_pending_tcp(outnet, pend);
 }
 
-/** find element in tree by id */
-static struct waiting_tcp*
-reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
-{
-	struct waiting_tcp key_w;
-	struct pending_tcp key_p;
-	memset(&key_w, 0, sizeof(key_w));
-	memset(&key_p, 0, sizeof(key_p));
-	key_w.next_waiting = (void*)&key_p;
-	key_w.id_node.key = &key_w;
-	key_p.id = id;
-	return (struct waiting_tcp*)rbtree_search(&reuse->tree_by_id, &key_w);
-}
-
-/** return ID value of rbnode in tree_by_id */
-static uint16_t
-tree_by_id_get_id(rbnode_type* node)
-{
-	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
-	return ((struct pending_tcp*)w->next_waiting)->id;
-}
-
 /** find spare ID value for reuse tcp stream.  That is random and also does
  * not collide with an existing query ID that is in use or waiting */
 static uint16_t

From 9b583d2331e00c88017e683c1cd2598135c03a15 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 13:58:44 +0200
Subject: [PATCH 038/208] stream reuse, the id for pending stored in
 waiting_tcp structure, because there can be multiple messages waiting for
 reply.

---
 services/outside_network.c | 15 +++++----------
 services/outside_network.h |  6 +++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 5082f5f03..07454d324 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -172,11 +172,9 @@ int reuse_id_cmp(const void* key1, const void* key2)
 {
 	struct waiting_tcp* w1 = (struct waiting_tcp*)key1;
 	struct waiting_tcp* w2 = (struct waiting_tcp*)key2;
-	struct pending_tcp* p1 = (struct pending_tcp*)w1->next_waiting;
-	struct pending_tcp* p2 = (struct pending_tcp*)w2->next_waiting;
-	if(p1->id < p2->id)
+	if(w1->id < w2->id)
 		return -1;
-	if(p1->id > p2->id)
+	if(w1->id > w2->id)
 		return 1;
 	return 0;
 }
@@ -420,12 +418,9 @@ static struct waiting_tcp*
 reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
 {
 	struct waiting_tcp key_w;
-	struct pending_tcp key_p;
 	memset(&key_w, 0, sizeof(key_w));
-	memset(&key_p, 0, sizeof(key_p));
-	key_w.next_waiting = (void*)&key_p;
 	key_w.id_node.key = &key_w;
-	key_p.id = id;
+	key_w.id = id;
 	return (struct waiting_tcp*)rbtree_search(&reuse->tree_by_id, &key_w);
 }
 
@@ -434,7 +429,7 @@ static uint16_t
 tree_by_id_get_id(rbnode_type* node)
 {
 	struct waiting_tcp* w = (struct waiting_tcp*)node->key;
-	return ((struct pending_tcp*)w->next_waiting)->id;
+	return w->id;
 }
 
 /** find reuse tcp stream to destination for query, or NULL if none */
@@ -509,7 +504,7 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
 	struct waiting_tcp* w)
 {
 	struct timeval tv;
-	pend->id = LDNS_ID_WIRE(w->pkt);
+	w->id = LDNS_ID_WIRE(w->pkt);
 	pend->c->tcp_write_pkt = w->pkt;
 	pend->c->tcp_write_pkt_len = w->pkt_len;
 	pend->c->tcp_write_and_read = 1;
diff --git a/services/outside_network.h b/services/outside_network.h
index 0dcf1b2e1..9ebbabe9c 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -324,8 +324,6 @@ struct pending {
 struct pending_tcp {
 	/** next in list of free tcp comm points, or NULL. */
 	struct pending_tcp* next_free;
-	/** the ID for the query; checked in reply */
-	uint16_t id;
 	/** tcp comm point it was sent on (and reply must come back on). */
 	struct comm_point* c;
 	/** the query being serviced, NULL if the pending_tcp is unused. */
@@ -355,8 +353,10 @@ struct waiting_tcp {
 	/** true if the waiting_tcp structure is on the write_wait queue */
 	int write_wait_queued;
 	/** entry in reuse.tree_by_id, if key is NULL, not in tree, otherwise,
-	 * this struct is key and sorted by ID from pending_tcp->id. */
+	 * this struct is key and sorted by ID (from waiting_tcp.id). */
 	rbnode_type id_node;
+	/** the ID for the query; checked in reply */
+	uint16_t id;
 	/** timeout event; timer keeps running whether the query is
 	 * waiting for a buffer or the tcp reply is pending */
 	struct comm_timer* timer;

From 4e44e8663d609c1b35f1f1cdf582b42d250f9414 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 14:06:21 +0200
Subject: [PATCH 039/208] stream reuse, fix to return key pointer from
 reuse_tcp_by_id_find.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index 07454d324..acfcb0853 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -418,10 +418,13 @@ static struct waiting_tcp*
 reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
 {
 	struct waiting_tcp key_w;
+	rbnode_type* n;
 	memset(&key_w, 0, sizeof(key_w));
 	key_w.id_node.key = &key_w;
 	key_w.id = id;
-	return (struct waiting_tcp*)rbtree_search(&reuse->tree_by_id, &key_w);
+	n = rbtree_search(&reuse->tree_by_id, &key_w);
+	if(!n) return NULL;
+	return (struct waiting_tcp*)n->key;
 }
 
 /** return ID value of rbnode in tree_by_id */

From b1ea8273f039b26fd481d8349893a156f07e7d0d Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 14:29:56 +0200
Subject: [PATCH 040/208] stream reuse, fix to not keep stream when it is in
 error and closed. stream reuse, fix to stop listening on the fd before rw
 mode change. stream reuse, fix waiting tcp id value stored before tree
 insert. stream reuse, fix to not double delete pend.query.

---
 services/outside_network.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index acfcb0853..548ce682e 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -507,7 +507,6 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
 	struct waiting_tcp* w)
 {
 	struct timeval tv;
-	w->id = LDNS_ID_WIRE(w->pkt);
 	pend->c->tcp_write_pkt = w->pkt;
 	pend->c->tcp_write_pkt_len = w->pkt_len;
 	pend->c->tcp_write_and_read = 1;
@@ -683,6 +682,8 @@ use_free_buffer(struct outside_network* outnet)
 				reuse_write_wait_push_back(reuse, w);
 			} else {
 				/* write straight away */
+				/* stop the timer on read of the fd */
+				comm_point_stop_listening(reuse->pending->c);
 				reuse->pending->query = w;
 				outnet_tcp_take_query_setup(
 					reuse->pending->c->fd, reuse->pending,
@@ -786,7 +787,8 @@ decommission_pending_tcp(struct outside_network* outnet,
 		/* needs unlink from the reuse tree to get deleted */
 		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
 	}
-	waiting_tcp_delete(pend->query);
+	if(pend->query && !rbtree_search(&pend->reuse.tree_by_id, pend->query))
+		waiting_tcp_delete(pend->query);
 	pend->query = NULL;
 	reuse_del_readwait(pend);
 	reuse_del_writewait(pend);
@@ -881,6 +883,7 @@ reuse_tcp_setup_read_and_timeout(struct pending_tcp* pend_tcp)
 	sldns_buffer_clear(pend_tcp->c->buffer);
 	pend_tcp->c->tcp_is_reading = 1;
 	pend_tcp->c->tcp_byte_count = 0;
+	comm_point_stop_listening(pend_tcp->c);
 	comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT);
 }
 
@@ -969,7 +972,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		waiting_tcp_delete(w);
 	}
 	verbose(5, "outnet_tcp_cb reuse after cb");
-	if(pend->reuse.node.key) {
+	if(error == NETEVENT_NOERROR && pend->reuse.node.key) {
 		verbose(5, "outnet_tcp_cb reuse after cb: keep it");
 		/* it is in the reuse_tcp tree, with other queries, or
 		 * on the empty list. do not decommission it */
@@ -1847,7 +1850,9 @@ outnet_tcptimer(void* arg)
 		reuse_cb_readwait_for_failure(&pickup, NETEVENT_TIMEOUT);
 		reuse_cb_writewait_for_failure(&pickup, NETEVENT_TIMEOUT);
 		/* delete the stored callback structures */
-		waiting_tcp_delete(pickup.query);
+		if(pickup.query &&
+			!rbtree_search(&pickup.reuse.tree_by_id, pickup.query))
+			waiting_tcp_delete(pickup.query);
 		reuse_del_readwait(&pickup);
 		reuse_del_writewait(&pickup);
 	}
@@ -1955,7 +1960,6 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	struct pending_tcp* pend = sq->outnet->tcp_free;
 	struct reuse_tcp* reuse = NULL;
 	struct waiting_tcp* w;
-	uint16_t id;
 
 	verbose(5, "pending_tcp_query");
 	/* find out if a reused stream to the target exists */
@@ -1991,9 +1995,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	w->pkt_len = sldns_buffer_limit(packet);
 	memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len);
 	if(reuse)
-		id = reuse_tcp_select_id(reuse, sq->outnet);
-	else	id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff;
-	LDNS_ID_SET(sldns_buffer_begin(packet), id);
+		w->id = reuse_tcp_select_id(reuse, sq->outnet);
+	else	w->id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff;
+	LDNS_ID_SET(sldns_buffer_begin(packet), w->id);
 	memcpy(&w->addr, &sq->addr, sq->addrlen);
 	w->addrlen = sq->addrlen;
 	w->outnet = sq->outnet;
@@ -2019,6 +2023,8 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 			/* can we write right now? */
 			if(pend->query == NULL) {
 				/* write straight away */
+				/* stop the timer on read of the fd */
+				comm_point_stop_listening(pend->c);
 				pend->query = w;
 				outnet_tcp_take_query_setup(pend->c->fd, pend,
 					w);

From 8201d1422b26e68d546f630659fece41ec025032 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 15:35:32 +0200
Subject: [PATCH 041/208] stream reuse, fix to put id number in waiting tcp
 packet.

---
 services/outside_network.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 548ce682e..78e6bef4f 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1962,6 +1962,11 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	struct waiting_tcp* w;
 
 	verbose(5, "pending_tcp_query");
+	if(sldns_buffer_limit(packet) < sizeof(uint16_t)) {
+		verbose(4, "pending tcp query with too short buffer < 2");
+		return NULL;
+	}
+
 	/* find out if a reused stream to the target exists */
 	/* if so, take it into use */
 	reuse = reuse_tcp_find(sq->outnet, &sq->addr, sq->addrlen,
@@ -1997,7 +2002,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	if(reuse)
 		w->id = reuse_tcp_select_id(reuse, sq->outnet);
 	else	w->id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff;
-	LDNS_ID_SET(sldns_buffer_begin(packet), w->id);
+	LDNS_ID_SET(w->pkt, w->id);
 	memcpy(&w->addr, &sq->addr, sq->addrlen);
 	w->addrlen = sq->addrlen;
 	w->outnet = sq->outnet;

From 79f315f480e07ef859c96882f8d5a3dd12b20c1b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 15:47:24 +0200
Subject: [PATCH 042/208] stream reuse, fix double callback and double delete,
 items are in the tree.

---
 services/outside_network.c | 59 ++++----------------------------------
 1 file changed, 5 insertions(+), 54 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 78e6bef4f..c9573bcde 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -753,20 +753,6 @@ static void reuse_del_readwait(struct pending_tcp* pend)
 	rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
 }
 
-/** delete writewait waiting_tcp elements, deletes the elements in the list */
-static void reuse_del_writewait(struct pending_tcp* pend)
-{
-	struct waiting_tcp* w, *n;
-	w = pend->reuse.write_wait_first;
-	while(w) {
-		n = w->write_wait_next;
-		waiting_tcp_delete(w);
-		w = n;
-	}
-	pend->reuse.write_wait_first = NULL;
-	pend->reuse.write_wait_last = NULL;
-}
-
 /** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */
 static void
 decommission_pending_tcp(struct outside_network* outnet, 
@@ -787,11 +773,12 @@ decommission_pending_tcp(struct outside_network* outnet,
 		/* needs unlink from the reuse tree to get deleted */
 		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
 	}
-	if(pend->query && !rbtree_search(&pend->reuse.tree_by_id, pend->query))
-		waiting_tcp_delete(pend->query);
+	/* unlink the query and writewait list, it is part of the tree
+	 * nodes and is deleted */
 	pend->query = NULL;
+	pend->reuse.write_wait_first = NULL;
+	pend->reuse.write_wait_last = NULL;
 	reuse_del_readwait(pend);
-	reuse_del_writewait(pend);
 }
 
 /** insert into reuse tcp tree and LRU, false on failure (duplicate) */
@@ -823,17 +810,6 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 	return 1;
 }
 
-/** perform failure callbacks for waiting queries in reuse write list */
-static void reuse_cb_writewait_for_failure(struct pending_tcp* pend, int err)
-{
-	struct waiting_tcp* w;
-	w = pend->reuse.write_wait_first;
-	while(w) {
-		waiting_tcp_callback(w, NULL, err, NULL);
-		w = w->write_wait_next;
-	}
-}
-
 /** perform failure callbacks for waiting queries in reuse read rbtree */
 static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 {
@@ -849,15 +825,6 @@ static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 	}
 }
 
-/** perform failure callbacks for current written query in reuse struct */
-static void reuse_cb_curquery_for_failure(struct pending_tcp* pend, int err)
-{
-	struct waiting_tcp* w = pend->query;
-	if(w) {
-		waiting_tcp_callback(w, NULL, err, NULL);
-	}
-}
-
 /** delete element from tree by id */
 static void
 reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
@@ -984,8 +951,6 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	 * to error.  Close it */
 	reuse_cb_readwait_for_failure(pend, (error==NETEVENT_TIMEOUT?
 		NETEVENT_TIMEOUT:NETEVENT_CLOSED));
-	reuse_cb_writewait_for_failure(pend, (error==NETEVENT_TIMEOUT?
-		NETEVENT_TIMEOUT:NETEVENT_CLOSED));
 	decommission_pending_tcp(outnet, pend);
 	use_free_buffer(outnet);
 	return 0;
@@ -1843,18 +1808,10 @@ outnet_tcptimer(void* arg)
 		outnet->tcp_free = pend;
 
 		/* do failure callbacks for all the queries in the
-		 * wait for write list and in the id-tree */
-		/* callback for 'w' arg already in list of curquery,
-		 * readwait list, writewait list */
-		reuse_cb_curquery_for_failure(&pickup, NETEVENT_TIMEOUT);
+		 * id-tree, that includes the pend.query and write list */
 		reuse_cb_readwait_for_failure(&pickup, NETEVENT_TIMEOUT);
-		reuse_cb_writewait_for_failure(&pickup, NETEVENT_TIMEOUT);
 		/* delete the stored callback structures */
-		if(pickup.query &&
-			!rbtree_search(&pickup.reuse.tree_by_id, pickup.query))
-			waiting_tcp_delete(pickup.query);
 		reuse_del_readwait(&pickup);
-		reuse_del_writewait(&pickup);
 	}
 	use_free_buffer(outnet);
 }
@@ -1880,9 +1837,7 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 	}
 
 	/* free up */
-	reuse_cb_curquery_for_failure(pend, NETEVENT_CLOSED);
 	reuse_cb_readwait_for_failure(pend, NETEVENT_CLOSED);
-	reuse_cb_writewait_for_failure(pend, NETEVENT_CLOSED);
 	decommission_pending_tcp(outnet, pend);
 }
 
@@ -2288,12 +2243,8 @@ serviced_delete(struct serviced_query* sq)
 					(struct pending_tcp*)w->next_waiting;
 				verbose(5, "serviced_delete: tcpreusekeep");
 				if(!reuse_tcp_remove_serviced_keep(w, sq)) {
-					reuse_cb_curquery_for_failure(
-						pend, NETEVENT_CLOSED);
 					reuse_cb_readwait_for_failure(
 						pend, NETEVENT_CLOSED);
-					reuse_cb_writewait_for_failure(
-						pend, NETEVENT_CLOSED);
 					decommission_pending_tcp(sq->outnet,
 						pend);
 					use_free_buffer(sq->outnet);

From d87774c3c69bfabc7bd0a58c241ba9eec8236a4e Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 16:34:48 +0200
Subject: [PATCH 043/208] stream reuse, fix decommission to first remove from
 tree and then do the callbacks and then delete the element.

---
 services/outside_network.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index c9573bcde..f899bfd43 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -825,6 +825,23 @@ static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 	}
 }
 
+/** perform callbacks for failure and also decommission pending tcp.
+ * the callbacks remove references in sq->pending to the waiting_tcp
+ * members of the tree_by_id in the pending tcp. */
+static void reuse_cb_and_decommission(struct outside_network* outnet,
+	struct pending_tcp* pend, int error)
+{
+	struct pending_tcp store;
+	store = *pend;
+	pend->query = NULL;
+	rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
+	pend->reuse.write_wait_first = NULL;
+	pend->reuse.write_wait_last = NULL;
+	decommission_pending_tcp(outnet, pend);
+	reuse_cb_readwait_for_failure(&store, error);
+	reuse_del_readwait(&store);
+}
+
 /** delete element from tree by id */
 static void
 reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
@@ -949,9 +966,8 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	verbose(5, "outnet_tcp_cb reuse after cb: decommission it");
 	/* no queries on it, no space to keep it. or timeout or closed due
 	 * to error.  Close it */
-	reuse_cb_readwait_for_failure(pend, (error==NETEVENT_TIMEOUT?
+	reuse_cb_and_decommission(outnet, pend, (error==NETEVENT_TIMEOUT?
 		NETEVENT_TIMEOUT:NETEVENT_CLOSED));
-	decommission_pending_tcp(outnet, pend);
 	use_free_buffer(outnet);
 	return 0;
 }
@@ -1837,8 +1853,7 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 	}
 
 	/* free up */
-	reuse_cb_readwait_for_failure(pend, NETEVENT_CLOSED);
-	decommission_pending_tcp(outnet, pend);
+	reuse_cb_and_decommission(outnet, pend, NETEVENT_CLOSED);
 }
 
 /** find spare ID value for reuse tcp stream.  That is random and also does
@@ -2243,10 +2258,8 @@ serviced_delete(struct serviced_query* sq)
 					(struct pending_tcp*)w->next_waiting;
 				verbose(5, "serviced_delete: tcpreusekeep");
 				if(!reuse_tcp_remove_serviced_keep(w, sq)) {
-					reuse_cb_readwait_for_failure(
+					reuse_cb_and_decommission(sq->outnet,
 						pend, NETEVENT_CLOSED);
-					decommission_pending_tcp(sq->outnet,
-						pend);
 					use_free_buffer(sq->outnet);
 				}
 				sq->pending = NULL;

From ad6fa1eb4531a97a785fd198f0b4993600926096 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 16:37:40 +0200
Subject: [PATCH 044/208] stream reuse, comment improved

---
 services/outside_network.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index f899bfd43..a33507dd0 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -827,7 +827,9 @@ static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 
 /** perform callbacks for failure and also decommission pending tcp.
  * the callbacks remove references in sq->pending to the waiting_tcp
- * members of the tree_by_id in the pending tcp. */
+ * members of the tree_by_id in the pending tcp.  The pending_tcp is
+ * removed before the callbacks, so that the callbacks do not modify
+ * the pending_tcp due to its reference in the outside_network reuse tree */
 static void reuse_cb_and_decommission(struct outside_network* outnet,
 	struct pending_tcp* pend, int error)
 {

From 46a364be8ea241c859625b22b30babba44837069 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2020 16:50:57 +0200
Subject: [PATCH 045/208] stream reuse, neater code for tree by id and use
 callback routine for timer.

---
 services/outside_network.c | 60 +++++++++-----------------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index a33507dd0..0060d7359 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -743,14 +743,13 @@ static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
 }
 
 /** delete readwait waiting_tcp elements, deletes the elements in the list */
-static void reuse_del_readwait(struct pending_tcp* pend)
+static void reuse_del_readwait(rbtree_type* tree_by_id)
 {
-	if(pend->reuse.tree_by_id.root == NULL ||
-		pend->reuse.tree_by_id.root == RBTREE_NULL)
+	if(tree_by_id->root == NULL ||
+		tree_by_id->root == RBTREE_NULL)
 		return;
-	traverse_postorder(&pend->reuse.tree_by_id, &reuse_del_readwait_elem,
-		NULL);
-	rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
+	traverse_postorder(tree_by_id, &reuse_del_readwait_elem, NULL);
+	rbtree_init(tree_by_id, reuse_id_cmp);
 }
 
 /** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */
@@ -778,7 +777,7 @@ decommission_pending_tcp(struct outside_network* outnet,
 	pend->query = NULL;
 	pend->reuse.write_wait_first = NULL;
 	pend->reuse.write_wait_last = NULL;
-	reuse_del_readwait(pend);
+	reuse_del_readwait(&pend->reuse.tree_by_id);
 }
 
 /** insert into reuse tcp tree and LRU, false on failure (duplicate) */
@@ -811,13 +810,13 @@ reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 }
 
 /** perform failure callbacks for waiting queries in reuse read rbtree */
-static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
+static void reuse_cb_readwait_for_failure(rbtree_type* tree_by_id, int err)
 {
 	rbnode_type* node;
-	if(pend->reuse.tree_by_id.root == NULL ||
-		pend->reuse.tree_by_id.root == RBTREE_NULL)
+	if(tree_by_id->root == NULL ||
+		tree_by_id->root == RBTREE_NULL)
 		return;
-	node = rbtree_first(&pend->reuse.tree_by_id);
+	node = rbtree_first(tree_by_id);
 	while(node && node != RBTREE_NULL) {
 		struct waiting_tcp* w = (struct waiting_tcp*)node->key;
 		waiting_tcp_callback(w, NULL, err, NULL);
@@ -833,8 +832,8 @@ static void reuse_cb_readwait_for_failure(struct pending_tcp* pend, int err)
 static void reuse_cb_and_decommission(struct outside_network* outnet,
 	struct pending_tcp* pend, int error)
 {
-	struct pending_tcp store;
-	store = *pend;
+	rbtree_type store;
+	store = pend->reuse.tree_by_id;
 	pend->query = NULL;
 	rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
 	pend->reuse.write_wait_first = NULL;
@@ -1796,40 +1795,7 @@ outnet_tcptimer(void* arg)
 	} else {
 		/* it was in use */
 		struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting;
-		struct pending_tcp pickup;
-		/* see if it needs unlink from reuse tree */
-		if(pend->reuse.node.key) {
-			reuse_tcp_remove_tree_list(outnet, &pend->reuse);
-		}
-		if(pend->c->ssl) {
-#ifdef HAVE_SSL
-			SSL_shutdown(pend->c->ssl);
-			SSL_free(pend->c->ssl);
-			pend->c->ssl = NULL;
-#endif
-		}
-		comm_point_close(pend->c);
-		/* pickup the callback items and call them after we have
-		 * removed the current pending. so that the callbacks
-		 * to the state machine happen after the query has timeouted
-		 * and been deleted and it works from that clean state,
-		 * because it may call the outside network routines to make
-		 * new queries. */
-		pickup = *pend;
-		/* unlink them from pend, delete from pickup calls later */
-		pend->query = NULL;
-		rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
-		pend->reuse.write_wait_first = NULL;
-		pend->reuse.write_wait_last = NULL;
-		/* pend is clear for reuse in the tcp_free list */
-		pend->next_free = outnet->tcp_free;
-		outnet->tcp_free = pend;
-
-		/* do failure callbacks for all the queries in the
-		 * id-tree, that includes the pend.query and write list */
-		reuse_cb_readwait_for_failure(&pickup, NETEVENT_TIMEOUT);
-		/* delete the stored callback structures */
-		reuse_del_readwait(&pickup);
+		reuse_cb_and_decommission(outnet, pend, NETEVENT_TIMEOUT);
 	}
 	use_free_buffer(outnet);
 }

From e4316764571647369ec1c6abc3b2e3b6cdbc1ec7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 10 Jul 2020 15:13:16 +0200
Subject: [PATCH 046/208] stream reuse, fix bad id in reply errors.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index 0060d7359..af69860b5 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -935,7 +935,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			w = reuse_tcp_by_id_find(&pend->reuse, id);
 		}
 	}
-	if(!w) {
+	if(error == NETEVENT_NOERROR && !w) {
 		/* no struct waiting found in tree, no reply to call */
 		log_addr(VERB_QUERY, "outnettcp: bad ID in reply, from:",
 			&pend->reuse.addr, pend->reuse.addrlen);

From 7a69ff41826d7835065b0a72789c5957170c6aec Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 10 Jul 2020 15:37:30 +0200
Subject: [PATCH 047/208] fix that ssl_handle_it() uses tcp_is_reading in
 tcp_write_and_read mode. fix that netevent tcp_write_and_read mode does not
 close due to error from assert that not both write and read happen at the
 same time.

---
 services/outside_network.c |  3 +++
 util/netevent.c            | 29 +++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index af69860b5..d7db120fe 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -507,6 +507,9 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
 	struct waiting_tcp* w)
 {
 	struct timeval tv;
+	verbose(5, "outnet_tcp_take_query_setup: setup packet to write "
+		"len %d timeout %d msec",
+		(int)w->pkt_len, w->timeout);
 	pend->c->tcp_write_pkt = w->pkt;
 	pend->c->tcp_write_pkt_len = w->pkt_len;
 	pend->c->tcp_write_and_read = 1;
diff --git a/util/netevent.c b/util/netevent.c
index 3237907d1..63150afb7 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1434,9 +1434,17 @@ ssl_handle_write(struct comm_point* c)
 
 /** handle ssl tcp connection with dns contents */
 static int
-ssl_handle_it(struct comm_point* c)
+ssl_handle_it(struct comm_point* c, int is_write)
 {
-	if(c->tcp_is_reading)
+	/* handle case where renegotiation wants read during write call
+	 * or write during read calls */
+	if(is_write && c->ssl_shake_state == comm_ssl_shake_hs_write)
+		return ssl_handle_read(c);
+	else if(!is_write && c->ssl_shake_state == comm_ssl_shake_hs_read)
+		return ssl_handle_write(c);
+	/* handle read events for read operation and write events for a
+	 * write operation */
+	else if(!is_write)
 		return ssl_handle_read(c);
 	return ssl_handle_write(c);
 }
@@ -1452,9 +1460,10 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 {
 	ssize_t r;
 	log_assert(c->type == comm_tcp || c->type == comm_local);
+	verbose(5, "comm point tcp handle read fd %d", fd);
 	if(c->ssl)
-		return ssl_handle_it(c);
-	if(!c->tcp_is_reading)
+		return ssl_handle_it(c, 0);
+	if(!c->tcp_is_reading && !c->tcp_write_and_read)
 		return 0;
 
 	log_assert(fd != -1);
@@ -1563,8 +1572,10 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 #else
 	buffer = c->buffer;
 #endif
-	if(c->tcp_is_reading && !c->ssl)
+	verbose(5, "comm point tcp handle write fd %d", fd);
+	if(c->tcp_is_reading && !c->ssl && !c->tcp_write_and_read)
 		return 0;
+	verbose(5, "comm point tcp handle write fd %d, part2", fd);
 	log_assert(fd != -1);
 	if(((!c->tcp_write_and_read && c->tcp_byte_count == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == 0)) && c->tcp_check_nb_connect) {
 		/* check for pending error from nonblocking connect */
@@ -1606,8 +1617,10 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			return 0;
 		}
 	}
+	verbose(5, "comm point tcp handle write fd %d, part3", fd);
 	if(c->ssl)
-		return ssl_handle_it(c);
+		return ssl_handle_it(c, 1);
+	verbose(5, "comm point tcp handle write fd %d, part4", fd);
 
 #ifdef USE_MSG_FASTOPEN
 	/* Only try this on first use of a connection that uses tfo, 
@@ -1696,6 +1709,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	}
 #endif /* USE_MSG_FASTOPEN */
 
+	verbose(5, "comm point tcp handle write fd %d: before write", fd);
 	if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) {
 		uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer));
 #ifdef HAVE_WRITEV
@@ -1722,6 +1736,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 				sizeof(uint16_t)-c->tcp_byte_count, 0);
 		}
 #endif /* HAVE_WRITEV */
+		verbose(5, "comm point tcp handle write fd %d: write res %d", fd, (int)r);
 		if(r == -1) {
 #ifndef USE_WINSOCK
 #  ifdef EPIPE
@@ -1777,6 +1792,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	}
 	log_assert(c->tcp_write_and_read || sldns_buffer_remaining(buffer) > 0);
 	log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2);
+	verbose(5, "comm point tcp handle write fd %d: before write remain", fd);
 	if(c->tcp_write_and_read) {
 		r = send(fd, (void*)c->tcp_write_pkt + c->tcp_write_byte_count - 2,
 			c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count, 0);
@@ -1784,6 +1800,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 		r = send(fd, (void*)sldns_buffer_current(buffer),
 			sldns_buffer_remaining(buffer), 0);
 	}
+	verbose(5, "comm point tcp handle write fd %d: write remain res %d", fd, (int)r);
 	if(r == -1) {
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)

From 9914b7216b361d9362f60bec68eb99f0aac6309c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 10 Jul 2020 16:06:17 +0200
Subject: [PATCH 048/208] stream reuse, remove debug output

---
 util/netevent.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/util/netevent.c b/util/netevent.c
index 63150afb7..4098dfb03 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1460,7 +1460,6 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 {
 	ssize_t r;
 	log_assert(c->type == comm_tcp || c->type == comm_local);
-	verbose(5, "comm point tcp handle read fd %d", fd);
 	if(c->ssl)
 		return ssl_handle_it(c, 0);
 	if(!c->tcp_is_reading && !c->tcp_write_and_read)
@@ -1572,10 +1571,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 #else
 	buffer = c->buffer;
 #endif
-	verbose(5, "comm point tcp handle write fd %d", fd);
 	if(c->tcp_is_reading && !c->ssl && !c->tcp_write_and_read)
 		return 0;
-	verbose(5, "comm point tcp handle write fd %d, part2", fd);
 	log_assert(fd != -1);
 	if(((!c->tcp_write_and_read && c->tcp_byte_count == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == 0)) && c->tcp_check_nb_connect) {
 		/* check for pending error from nonblocking connect */
@@ -1617,10 +1614,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			return 0;
 		}
 	}
-	verbose(5, "comm point tcp handle write fd %d, part3", fd);
 	if(c->ssl)
 		return ssl_handle_it(c, 1);
-	verbose(5, "comm point tcp handle write fd %d, part4", fd);
 
 #ifdef USE_MSG_FASTOPEN
 	/* Only try this on first use of a connection that uses tfo, 
@@ -1709,7 +1704,6 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	}
 #endif /* USE_MSG_FASTOPEN */
 
-	verbose(5, "comm point tcp handle write fd %d: before write", fd);
 	if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) {
 		uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer));
 #ifdef HAVE_WRITEV
@@ -1736,7 +1730,6 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 				sizeof(uint16_t)-c->tcp_byte_count, 0);
 		}
 #endif /* HAVE_WRITEV */
-		verbose(5, "comm point tcp handle write fd %d: write res %d", fd, (int)r);
 		if(r == -1) {
 #ifndef USE_WINSOCK
 #  ifdef EPIPE
@@ -1792,7 +1785,6 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	}
 	log_assert(c->tcp_write_and_read || sldns_buffer_remaining(buffer) > 0);
 	log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2);
-	verbose(5, "comm point tcp handle write fd %d: before write remain", fd);
 	if(c->tcp_write_and_read) {
 		r = send(fd, (void*)c->tcp_write_pkt + c->tcp_write_byte_count - 2,
 			c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count, 0);
@@ -1800,7 +1792,6 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 		r = send(fd, (void*)sldns_buffer_current(buffer),
 			sldns_buffer_remaining(buffer), 0);
 	}
-	verbose(5, "comm point tcp handle write fd %d: write remain res %d", fd, (int)r);
 	if(r == -1) {
 #ifndef USE_WINSOCK
 		if(errno == EINTR || errno == EAGAIN)

From 19a35fb83922bd89d678e241a531d9625a25ea05 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 13 Jul 2020 15:16:59 +0200
Subject: [PATCH 049/208] stream reuse, write and read again if more data can
 go over the channel, this amortizes the event loop mechanism for busy
 channels, for performance.

---
 services/outside_network.c | 13 ++++++++++
 util/netevent.c            | 52 ++++++++++++++++++++++++++++++++++++++
 util/netevent.h            | 10 ++++++++
 3 files changed, 75 insertions(+)

diff --git a/services/outside_network.c b/services/outside_network.c
index d7db120fe..b1e420da5 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -911,12 +911,19 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		/* setup to write next packet or setup read timeout */
 		if(pend->reuse.write_wait_first) {
 			verbose(VERB_ALGO, "outnet tcp setup next pkt");
+			/* we can write it straight away perhaps, set flag
+			 * because this callback called after a tcp write
+			 * succeeded and likely more buffer space is available
+			 * and we can write some more. */
+			pend->c->tcp_more_write_again = 1;
 			pend->query = reuse_write_wait_pop(&pend->reuse);
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
 				pend->query);
 		} else {
 			verbose(VERB_ALGO, "outnet tcp writes done, wait");
 			pend->c->tcp_write_and_read = 0;
+			pend->c->tcp_more_read_again = 0;
+			pend->c->tcp_more_write_again = 0;
 			pend->c->tcp_is_reading = 1;
 			reuse_tcp_setup_timeout(pend);
 		}
@@ -964,6 +971,12 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		verbose(5, "outnet_tcp_cb reuse after cb: keep it");
 		/* it is in the reuse_tcp tree, with other queries, or
 		 * on the empty list. do not decommission it */
+		/* if there are more outstanding queries, we could try to
+		 * read again, to see if it is on the input,
+		 * because this callback called after a successful read
+		 * and there could be more bytes to read on the input */
+		if(pend->reuse.tree_by_id.count != 0)
+			pend->c->tcp_more_read_again = 1;
 		reuse_tcp_setup_read_and_timeout(pend);
 		return 0;
 	}
diff --git a/util/netevent.c b/util/netevent.c
index 4098dfb03..889f9a1f3 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -985,6 +985,8 @@ reclaim_tcp_handler(struct comm_point* c)
 			comm_point_start_listening(c->tcp_parent, -1, -1);
 		}
 	}
+	c->tcp_more_read_again = 0;
+	c->tcp_more_write_again = 0;
 }
 
 /** do the callback when writing is done */
@@ -1852,6 +1854,52 @@ tcp_req_info_read_again(int fd, struct comm_point* c)
 	}
 }
 
+/** read again to drain buffers when there could be more to read */
+static void
+tcp_more_read_again(int fd, struct comm_point* c)
+{
+	/* if the packet is done, but another one could be waiting on
+	 * the connection, the callback signals this, and we try again */
+	/* this continues until the read routines get EAGAIN or so,
+	 * and thus does not call the callback, and the bool is 0 */
+	while(c->tcp_more_read_again) {
+		c->tcp_more_read_again = 0;
+		if(!comm_point_tcp_handle_read(fd, c, 0)) {
+			reclaim_tcp_handler(c);
+			if(!c->tcp_do_close) {
+				fptr_ok(fptr_whitelist_comm_point(
+					c->callback));
+				(void)(*c->callback)(c, c->cb_arg, 
+					NETEVENT_CLOSED, NULL);
+			}
+			return;
+		}
+	}
+}
+
+/** write again to fill up when there could be more to write */
+static void
+tcp_more_write_again(int fd, struct comm_point* c)
+{
+	/* if the packet is done, but another is waiting to be written,
+	 * the callback signals it and we try again. */
+	/* this continues until the write routines get EAGAIN or so,
+	 * and thus does not call the callback, and the bool is 0 */
+	while(c->tcp_more_write_again) {
+		c->tcp_more_write_again = 0;
+		if(!comm_point_tcp_handle_write(fd, c)) {
+			reclaim_tcp_handler(c);
+			if(!c->tcp_do_close) {
+				fptr_ok(fptr_whitelist_comm_point(
+					c->callback));
+				(void)(*c->callback)(c, c->cb_arg, 
+					NETEVENT_CLOSED, NULL);
+			}
+			return;
+		}
+	}
+}
+
 void 
 comm_point_tcp_handle_callback(int fd, short event, void* arg)
 {
@@ -1903,6 +1951,8 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 		}
 		if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again)
 			tcp_req_info_read_again(fd, c);
+		if(c->tcp_more_read_again)
+			tcp_more_read_again(fd, c);
 		return;
 	}
 	if(event&UB_EV_WRITE) {
@@ -1918,6 +1968,8 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 		}
 		if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again)
 			tcp_req_info_read_again(fd, c);
+		if(c->tcp_more_write_again)
+			tcp_more_write_again(fd, c);
 		return;
 	}
 	log_err("Ignored event %d for tcphdl.", event);
diff --git a/util/netevent.h b/util/netevent.h
index 300592e5b..ad24541f6 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -268,6 +268,16 @@ struct comm_point {
 	/** length of tcp_write_pkt in bytes */
 	size_t tcp_write_pkt_len;
 
+	/** if set try to read another packet again (over connection with
+	 * multiple packets), once set, tries once, then zero again,
+	 * so set it in the packet complete section. */
+	int tcp_more_read_again;
+
+	/** if set try to write another packet (over connection with
+	 * multiple packets), once set, tries once, then zero again,
+	 * so set it in the packet complete section. */
+	int tcp_more_write_again;
+
 	/** if set, read/write completes:
 		read/write state of tcp is toggled.
 		buffer reset/bytecount reset.

From 766005a356212846a8b53faff957c7b4eae10569 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 13 Jul 2020 15:45:16 +0200
Subject: [PATCH 050/208] stream reuse, in callbacks, removed whitespace.

---
 util/netevent.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/util/netevent.c b/util/netevent.c
index 889f9a1f3..8d5be2c0a 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1869,7 +1869,7 @@ tcp_more_read_again(int fd, struct comm_point* c)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 			return;
@@ -1892,7 +1892,7 @@ tcp_more_write_again(int fd, struct comm_point* c)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 			return;
@@ -1920,7 +1920,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 			return;
@@ -1945,7 +1945,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 		}
@@ -1962,7 +1962,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 		}
@@ -2600,7 +2600,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 		}
@@ -2612,7 +2612,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg)
 			if(!c->tcp_do_close) {
 				fptr_ok(fptr_whitelist_comm_point(
 					c->callback));
-				(void)(*c->callback)(c, c->cb_arg, 
+				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
 		}

From b71695e8bb2be573162a8656cd0ab428b59454c0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 13 Jul 2020 15:59:23 +0200
Subject: [PATCH 051/208] stream reuse, update lru when reuse elements are used
 with lru touch routine.

---
 services/outside_network.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/services/outside_network.c b/services/outside_network.c
index b1e420da5..5acf00b6a 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -648,6 +648,31 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	return 1;
 }
 
+/** Touch the lru of a reuse_tcp element, it is in use.
+ * This moves it to the front of the list, where it is not likely to
+ * be closed.  Items at the back of the list are closed to make space. */
+static void
+reuse_tcp_lru_touch(struct outside_network* outnet, struct reuse_tcp* reuse)
+{
+	if(!reuse->item_on_lru_list)
+		return; /* not on the list, no lru to modify */
+	if(!reuse->lru_prev)
+		return; /* already first in the list */
+	/* remove at current position */
+	/* since it is not first, there is a previous element */
+	reuse->lru_prev->lru_next = reuse->lru_next;
+	if(reuse->lru_next)
+		reuse->lru_next->lru_prev = reuse->lru_prev;
+	else	outnet->tcp_reuse_last = reuse->lru_prev;
+	/* insert at the front */
+	reuse->lru_prev = NULL;
+	reuse->lru_next = outnet->tcp_reuse_first;
+	/* since it is not first, it is not the only element and
+	 * lru_next is thus not NULL and thus reuse is now not the last in
+	 * the list, so outnet->tcp_reuse_last does not need to be modified */
+	outnet->tcp_reuse_first = reuse;
+}
+
 /** call callback on waiting_tcp, if not NULL */
 static void
 waiting_tcp_callback(struct waiting_tcp* w, struct comm_point* c, int error,
@@ -677,6 +702,7 @@ use_free_buffer(struct outside_network* outnet)
 		if(reuse) {
 			log_reuse_tcp(5, "use free buffer for waiting tcp: "
 				"found reuse", reuse);
+			reuse_tcp_lru_touch(outnet, reuse);
 			comm_timer_disable(w->timer);
 			w->next_waiting = (void*)reuse->pending;
 			reuse_tree_by_id_insert(reuse, w);
@@ -1929,6 +1955,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		log_reuse_tcp(5, "pending_tcp_query: found reuse", reuse);
 		log_assert(reuse->pending);
 		pend = reuse->pending;
+		reuse_tcp_lru_touch(sq->outnet, reuse);
 	}
 
 	/* if !pend but we have reuse streams, close a reuse stream

From a7776a15e54e3a342e775831ac74c0c6f936a1d8 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 13 Jul 2020 16:11:52 +0200
Subject: [PATCH 052/208] stream reuse, make reuse possible straight away after
 first query to address.

---
 services/outside_network.c | 60 ++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 5acf00b6a..425c0839a 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -435,6 +435,35 @@ tree_by_id_get_id(rbnode_type* node)
 	return w->id;
 }
 
+/** insert into reuse tcp tree and LRU, false on failure (duplicate) */
+static int
+reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
+{
+	log_reuse_tcp(5, "reuse_tcp_insert", &pend_tcp->reuse);
+	if(pend_tcp->reuse.item_on_lru_list)
+		return 1;
+	pend_tcp->reuse.node.key = &pend_tcp->reuse;
+	pend_tcp->reuse.pending = pend_tcp;
+	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
+		/* this is a duplicate connection, close this one */
+		verbose(5, "reuse_tcp_insert: duplicate connection");
+		pend_tcp->reuse.node.key = NULL;
+		return 0;
+	}
+	/* insert into LRU, first is newest */
+	pend_tcp->reuse.lru_prev = NULL;
+	if(outnet->tcp_reuse_first) {
+		pend_tcp->reuse.lru_next = outnet->tcp_reuse_first;
+		outnet->tcp_reuse_first->lru_prev = &pend_tcp->reuse;
+	} else {
+		pend_tcp->reuse.lru_next = NULL;
+		outnet->tcp_reuse_last = &pend_tcp->reuse;
+	}
+	outnet->tcp_reuse_first = &pend_tcp->reuse;
+	pend_tcp->reuse.item_on_lru_list = 1;
+	return 1;
+}
+
 /** find reuse tcp stream to destination for query, or NULL if none */
 static struct reuse_tcp*
 reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
@@ -643,6 +672,8 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
+	/* insert in reuse by address tree if not already inserted there */
+	(void)reuse_tcp_insert(w->outnet, pend);
 	reuse_tree_by_id_insert(&pend->reuse, w);
 	outnet_tcp_take_query_setup(s, pend, w);
 	return 1;
@@ -809,35 +840,6 @@ decommission_pending_tcp(struct outside_network* outnet,
 	reuse_del_readwait(&pend->reuse.tree_by_id);
 }
 
-/** insert into reuse tcp tree and LRU, false on failure (duplicate) */
-static int
-reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
-{
-	log_reuse_tcp(5, "reuse_tcp_insert", &pend_tcp->reuse);
-	if(pend_tcp->reuse.item_on_lru_list)
-		return 1;
-	pend_tcp->reuse.node.key = &pend_tcp->reuse;
-	pend_tcp->reuse.pending = pend_tcp;
-	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
-		/* this is a duplicate connection, close this one */
-		verbose(5, "reuse_tcp_insert: duplicate connection");
-		pend_tcp->reuse.node.key = NULL;
-		return 0;
-	}
-	/* insert into LRU, first is newest */
-	pend_tcp->reuse.lru_prev = NULL;
-	if(outnet->tcp_reuse_first) {
-		pend_tcp->reuse.lru_next = outnet->tcp_reuse_first;
-		outnet->tcp_reuse_first->lru_prev = &pend_tcp->reuse;
-	} else {
-		pend_tcp->reuse.lru_next = NULL;
-		outnet->tcp_reuse_last = &pend_tcp->reuse;
-	}
-	outnet->tcp_reuse_first = &pend_tcp->reuse;
-	pend_tcp->reuse.item_on_lru_list = 1;
-	return 1;
-}
-
 /** perform failure callbacks for waiting queries in reuse read rbtree */
 static void reuse_cb_readwait_for_failure(rbtree_type* tree_by_id, int err)
 {

From b5b79e3a36d8983a6ce37fe08a01fb005215d066 Mon Sep 17 00:00:00 2001
From: Ubuntu <rijswijk@fragtest.dnsjedi.org>
Date: Wed, 15 Jul 2020 15:15:45 +0000
Subject: [PATCH 053/208] Add feature to serve original TTLs rather than
 decrementing ones

---
 cachedb/cachedb.c        |    1 +
 doc/unbound.conf.5.in    |   12 +
 services/cache/rrset.c   |    2 +
 util/config_file.c       |    4 +
 util/config_file.h       |    2 +
 util/configlexer.c       | 4057 +++++++++++++++++++-------------------
 util/configlexer.lex     |    1 +
 util/configparser.c      | 3187 +++++++++++++++---------------
 util/configparser.h      |  305 ++-
 util/configparser.y      |   14 +-
 util/data/msgencode.c    |    8 +-
 util/data/msgparse.h     |    2 +
 util/data/msgreply.c     |    3 +
 util/data/packed_rrset.c |    8 +-
 util/data/packed_rrset.h |    3 +
 15 files changed, 3838 insertions(+), 3771 deletions(-)

diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
index eed4d5fd9..6a2b735aa 100644
--- a/cachedb/cachedb.c
+++ b/cachedb/cachedb.c
@@ -465,6 +465,7 @@ packed_rrset_ttl_subtract(struct packed_rrset_data* data, time_t subtract)
 			data->rr_ttl[i] -= subtract;
 		else	data->rr_ttl[i] = 0;
 	}
+	data->ttl_add = 0;
 }
 
 /* Adjust the TTL of a DNS message and its RRs by 'adjust'.  If 'adjust' is
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index de5a333bd..5e826bbf6 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1124,6 +1124,18 @@ responding with expired data.  A recommended value per
 draft-ietf-dnsop-serve-stale-10 is 1800.  Setting this to 0 will disable this
 behavior.  Default is 0.
 .TP
+.B serve\-original\-ttl: \fI<yes or no>
+If enabled, unbound will always return the original TTL as received from
+the upstream authoritative name server rather than the decrementing TTL as
+stored in the cache.  This feature may be useful if unbound serves as a 
+front-end to a hidden authoritative name server. Enabling this feature does 
+not impact cache expiry, it only changes the TTL unbound embeds in responses to 
+queries. Note that the returned TTL is still subject to the
+configured maximum TTL as set using \fBcache\-max\-ttl\fR (defaults to
+86400 seconds). If you wish to return higher original TTL values, you may
+need to explicitly adjust the setting for \fBcache\-max\-ttl\fR. 
+Default is "no".
+.TP
 .B val\-nsec3\-keysize\-iterations: \fI<"list of values">
 List of keysize and iteration count values, separated by spaces, surrounded
 by quotes. Default is "1024 150 2048 500 4096 2500". This determines the
diff --git a/services/cache/rrset.c b/services/cache/rrset.c
index 8c0251bcb..4e3d08bda 100644
--- a/services/cache/rrset.c
+++ b/services/cache/rrset.c
@@ -45,6 +45,7 @@
 #include "util/config_file.h"
 #include "util/data/packed_rrset.h"
 #include "util/data/msgreply.h"
+#include "util/data/msgparse.h"
 #include "util/regional.h"
 #include "util/alloc.h"
 #include "util/net_help.h"
@@ -396,6 +397,7 @@ rrset_update_sec_status(struct rrset_cache* r,
 			cachedata->ttl = updata->ttl + now;
 			for(i=0; i<cachedata->count+cachedata->rrsig_count; i++)
 				cachedata->rr_ttl[i] = updata->rr_ttl[i]+now;
+			cachedata->ttl_add = now;
 		}
 	}
 	lock_rw_unlock(&e->lock);
diff --git a/util/config_file.c b/util/config_file.c
index b1420d508..5e9e2fda2 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -250,6 +250,7 @@ config_create(void)
 	cfg->serve_expired_ttl_reset = 0;
 	cfg->serve_expired_reply_ttl = 30;
 	cfg->serve_expired_client_timeout = 0;
+	cfg->serve_original_ttl = 0;
 	cfg->add_holddown = 30*24*3600;
 	cfg->del_holddown = 30*24*3600;
 	cfg->keep_missing = 366*24*3600; /* one year plus a little leeway */
@@ -604,6 +605,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else if(strcmp(opt, "serve-expired-reply-ttl:") == 0)
 	{ IS_NUMBER_OR_ZERO; cfg->serve_expired_reply_ttl = atoi(val); SERVE_EXPIRED_REPLY_TTL=(time_t)cfg->serve_expired_reply_ttl;}
 	else S_NUMBER_OR_ZERO("serve-expired-client-timeout:", serve_expired_client_timeout)
+	else S_YNO("serve-original-ttl:", serve_original_ttl)
 	else S_STR("val-nsec3-keysize-iterations:", val_nsec3_key_iterations)
 	else S_UNSIGNED_OR_ZERO("add-holddown:", add_holddown)
 	else S_UNSIGNED_OR_ZERO("del-holddown:", del_holddown)
@@ -1008,6 +1010,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_YNO(opt, "serve-expired-ttl-reset", serve_expired_ttl_reset)
 	else O_DEC(opt, "serve-expired-reply-ttl", serve_expired_reply_ttl)
 	else O_DEC(opt, "serve-expired-client-timeout", serve_expired_client_timeout)
+	else O_YNO(opt, "serve-original-ttl", serve_original_ttl)
 	else O_STR(opt, "val-nsec3-keysize-iterations",val_nsec3_key_iterations)
 	else O_UNS(opt, "add-holddown", add_holddown)
 	else O_UNS(opt, "del-holddown", del_holddown)
@@ -2030,6 +2033,7 @@ config_apply(struct config_file* config)
 	SERVE_EXPIRED = config->serve_expired;
 	SERVE_EXPIRED_TTL = (time_t)config->serve_expired_ttl;
 	SERVE_EXPIRED_REPLY_TTL = (time_t)config->serve_expired_reply_ttl;
+	SERVE_ORIGINAL_TTL = config->serve_original_ttl;
 	MAX_NEG_TTL = (time_t)config->max_negative_ttl;
 	RTT_MIN_TIMEOUT = config->infra_cache_min_rtt;
 	EDNS_ADVERTISED_SIZE = (uint16_t)config->edns_buffer_size;
diff --git a/util/config_file.h b/util/config_file.h
index fa7e5c592..c7a028fba 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -373,6 +373,8 @@ struct config_file {
 	/** serve expired entries only after trying to update the entries and this
 	 *  timeout (in milliseconds) is reached */
 	int serve_expired_client_timeout;
+	/** serve original TTLs rather than decrementing ones */
+	int serve_original_ttl;
 	/** nsec3 maximum iterations per key size, string */
 	char* val_nsec3_key_iterations;
 	/** autotrust add holddown time, in seconds */
diff --git a/util/configlexer.c b/util/configlexer.c
index a4ac74066..b4013146d 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 314
-#define YY_END_OF_BUFFER 315
+#define YY_NUM_RULES 315
+#define YY_END_OF_BUFFER 316
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,347 +363,349 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3083] =
+static const flex_int16_t yy_accept[3096] =
     {   0,
-        1,    1,  296,  296,  300,  300,  304,  304,  308,  308,
-        1,    1,  315,  312,    1,  294,  294,  313,    2,  313,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  296,  297,  297,  298,  313,  300,  301,  301,
-      302,  313,  307,  304,  305,  305,  306,  313,  308,  309,
-      309,  310,  313,  311,  295,    2,  299,  313,  311,  312,
-        0,    1,    2,    2,    2,    2,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+        1,    1,  297,  297,  301,  301,  305,  305,  309,  309,
+        1,    1,  316,  313,    1,  295,  295,  314,    2,  314,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  297,  298,  298,  299,  314,  301,  302,  302,
+      303,  314,  308,  305,  306,  306,  307,  314,  309,  310,
+      310,  311,  314,  312,  296,    2,  300,  314,  312,  313,
+        0,    1,    2,    2,    2,    2,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  296,    0,  300,    0,  307,    0,  304,  308,    0,
-      311,    0,    2,    2,  311,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  297,    0,  301,    0,  308,    0,  305,  309,    0,
+      312,    0,    2,    2,  312,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  311,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  312,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  115,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  123,
-      312,  312,  312,  312,  312,  312,  312,  311,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  115,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  123,
+      313,  313,  313,  313,  313,  313,  313,  312,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,   99,  312,  312,  312,  312,  312,
-      312,    8,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      116,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,   99,  313,  313,  313,  313,  313,
+      313,    8,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      116,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      128,  312,  311,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  289,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      128,  313,  312,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  290,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  311,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,   57,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      227,  312,   14,   15,  312,   19,   18,  312,  312,  211,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  312,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,   57,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      228,  313,   14,   15,  313,   19,   18,  313,  313,  212,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  122,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  209,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,    3,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  122,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  210,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,    3,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  311,  312,  312,
-      312,  312,  312,  312,  312,  283,  312,  312,  282,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  303,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  312,  313,
+      313,  313,  313,  313,  313,  313,  284,  313,  313,  283,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  304,  313,  313,  313,
 
-      312,  312,  312,   56,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-       60,  312,  257,  312,  312,  312,  312,  312,  312,  312,
-      312,  290,  291,  312,  312,  312,  312,  312,   61,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  119,  312,  312,  312,  312,
-      312,  312,  312,  312,  198,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,   21,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,   56,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,   60,  313,  258,  313,  313,  313,  313,  313,  313,
+      313,  313,  291,  292,  313,  313,  313,  313,  313,   61,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  119,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  199,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,   21,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  147,  312,  312,  303,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,   97,  312,
-      312,  312,  312,  312,  312,  312,  265,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  170,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  146,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  147,  313,  313,  304,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+       97,  313,  313,  313,  313,  313,  313,  313,  266,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  171,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  146,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,   96,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,   32,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,   33,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,   58,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  121,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,   96,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,   32,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,   33,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,   58,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  114,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-       59,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  230,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  171,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,   47,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  121,  313,  313,  313,  313,  313,  114,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,   59,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  231,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  172,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,   47,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  248,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,   51,  312,   52,  312,  312,  312,  312,
-      312,  100,  312,  101,  312,  312,  312,  312,   98,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,    7,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  249,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,   51,  313,   52,
+      313,  313,  313,  313,  313,  100,  313,  101,  313,  313,
+      313,  313,   98,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,    7,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  220,  312,  312,  312,
-      312,  149,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  231,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,   48,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  190,  312,
-      189,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      221,  313,  313,  313,  313,  149,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  232,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,   48,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  191,  313,  190,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,   16,   17,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,   62,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  197,  312,  312,  312,  312,  312,
-      312,  103,  312,  102,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  181,  312,  312,  312,  312,
-      312,  312,  312,  312,  129,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,   81,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,   16,   17,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,   62,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  198,
+      313,  313,  313,  313,  313,  313,  103,  313,  102,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      182,  313,  313,  313,  313,  313,  313,  313,  313,  129,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,   81,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  210,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,   85,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,   55,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  184,
-      185,  312,  312,  312,  259,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,    6,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  211,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,   85,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,   55,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  185,  186,  313,  313,  313,  260,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,    6,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  263,
-      312,  312,  312,  312,  312,  312,  284,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,   42,  312,  312,
-      312,  312,   44,  312,  312,  312,  312,  312,  312,  312,
-      312,   45,  312,  312,  312,  312,  312,  312,  312,  312,
-      177,  312,  312,  312,  124,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  202,  312,  178,  312,  312,
-      312,  217,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  264,  313,  313,  313,  313,  313,
+      313,  285,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,   42,  313,  313,  313,  313,   44,  313,
+      313,  313,  313,  313,  313,  313,  313,   45,  313,  313,
+      313,  313,  313,  313,  313,  313,  178,  313,  313,  313,
+      124,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  203,  313,  179,  313,  313,  313,  218,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,   46,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  126,  108,  312,  109,  312,  312,  312,  107,  312,
-      312,  312,  312,  312,  312,  312,  312,  144,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  247,
-      312,  312,  312,  312,  312,  312,  312,  312,  179,  312,
-      312,  312,  312,  312,  182,  312,  188,  312,  312,  312,
-      312,  312,  216,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,   95,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  120,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  313,   46,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  126,  108,  313,
+      109,  313,  313,  313,  107,  313,  313,  313,  313,  313,
+      313,  313,  313,  144,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  248,  313,  313,  313,  313,
+      313,  313,  313,  313,  180,  313,  313,  313,  313,  313,
+      183,  313,  189,  313,  313,  313,  313,  313,  217,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,   95,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      312,  312,  312,   53,  312,  312,  312,   26,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,   20,  312,  312,
-      312,  312,  312,  312,   27,   36,  312,  154,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,   70,   72,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  267,  312,  312,  312,  228,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  110,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  143,  312,
+      313,  313,  120,  313,  313,  313,  313,  313,  313,  313,
+       53,  313,  313,  313,   26,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,   20,  313,  313,  313,  313,  313,
+      313,   27,   36,  313,  154,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,   70,   72,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  268,
+      313,  313,  313,  229,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  110,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  278,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  148,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  208,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  287,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  165,
-      312,  312,  312,  312,  312,  312,  312,  312,  104,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  160,  312,
+      313,  313,  313,  313,  313,  143,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  279,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      148,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  209,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  288,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  165,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  104,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
 
-      172,  312,  312,  312,  312,  312,  132,  312,  312,  312,
-      312,  312,   91,  312,  312,  312,  312,  200,  312,  312,
-      312,  312,  312,  312,  218,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      239,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      125,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  164,  312,  312,  312,  312,  312,   73,   74,  312,
-      312,  312,  312,  312,   54,  312,  312,  312,  312,  312,
-       80,  173,  312,  191,  312,  221,  312,  312,  183,  260,
-      312,  312,  312,  312,  312,   66,  312,  175,  312,  312,
+      313,  313,  313,  313,  313,  313,  160,  313,  173,  313,
+      313,  313,  313,  313,  132,  313,  313,  313,  313,  313,
+       91,  313,  313,  313,  313,  201,  313,  313,  313,  313,
+      313,  313,  219,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  240,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  125,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  164,
+      313,  313,  313,  313,  313,   73,   74,  313,  313,  313,
+      313,  313,   54,  313,  313,  313,  313,  313,   80,  174,
+      313,  192,  313,  222,  313,  313,  184,  261,  313,  313,
 
-      312,  312,  312,    9,  312,  312,  312,   94,  312,  312,
-      312,  312,  252,  312,  312,  312,  312,  199,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  163,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  150,  312,
-      266,  312,  312,  312,  312,  238,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  212,  312,  312,
+      313,  313,  313,   66,  313,  176,  313,  313,  313,  313,
+      313,    9,  313,  313,  313,   94,  313,  313,  313,  313,
+      253,  313,  313,  313,  313,  200,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  163,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  150,  313,  267,
+      313,  313,  313,  313,  239,  313,  313,  313,  313,  313,
 
-      312,  312,  258,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  281,  312,  174,
-      312,  312,  312,  312,  312,  312,  312,   65,   67,  312,
-      312,  312,  312,  312,  312,  312,   93,  312,  312,  312,
-      312,  250,  312,  312,  312,  312,  262,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  204,   34,
-       28,   30,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,   35,  312,   29,   31,  312,  312,  312,  312,  312,
-      312,  312,  312,   90,  312,  312,  312,  312,  312,  312,
+      313,  313,  313,  313,  313,  313,  213,  313,  313,  313,
+      313,  259,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  282,  313,  175,  313,
+      313,  313,  313,  313,  313,  313,   65,   67,  313,  313,
+      313,  313,  313,  313,  313,   93,  313,  313,  313,  313,
+      251,  313,  313,  313,  313,  263,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  205,   34,
+       28,   30,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,   35,  313,   29,   31,  313,  313,  313,  313,  313,
 
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  206,  203,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-       64,  312,  312,  127,  312,  111,  312,  312,  312,  312,
-      312,  312,  312,  312,  145,   13,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  276,  312,  279,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,   12,  312,
-      312,   22,  312,  312,  312,  256,  312,  312,  312,  312,
-      264,  312,  312,  312,   68,  312,  214,  312,  312,  312,
-      312,  205,  312,  312,   63,  312,  312,  312,  312,   23,
+      313,  313,  313,   90,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  207,  204,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+       64,  313,  313,  127,  313,  111,  313,  313,  313,  313,
+      313,  313,  313,  313,  145,   13,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  277,  313,  280,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,   12,  313,
+      313,   22,  313,  313,  313,  257,  313,  313,  313,  313,
+      265,  313,  313,  313,   68,  313,  215,  313,  313,  313,
 
-      312,   43,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  159,  158,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  207,  201,  312,  219,  312,
-      312,  268,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,   75,
-      312,  312,  312,  251,  312,  312,  312,  312,  187,  312,
-      312,  312,  312,  213,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  285,  286,  156,  312,  312,   69,  312,
-      312,  312,  312,  166,  312,  312,  105,  106,  312,  312,
+      313,  313,  206,  313,  313,   63,  313,  313,  313,  313,
+       23,  313,   43,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  159,  158,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  208,  202,  313,  220,
+      313,  313,  269,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+       75,  313,  313,  313,  252,  313,  313,  313,  313,  188,
+      313,  313,  313,  313,  214,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  286,  287,  156,  313,  313,   69,
 
-      312,  312,  151,  312,  153,  312,  192,  312,  312,  312,
-      312,  157,  312,  312,  222,  312,  312,  312,  312,  312,
-      312,  312,  134,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  229,  312,  312,  312,  312,  312,
-      312,  312,   24,  312,  261,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  193,  312,  312,  249,
-      312,  280,  312,  186,  312,  312,  312,  312,   49,  312,
-      312,  312,  312,    4,  312,  312,  312,  312,  118,  133,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  225,   37,
+      313,  313,  313,  313,  166,  313,  313,  313,  105,  106,
+      313,  313,  313,  313,  151,  313,  153,  313,  193,  313,
+      313,  313,  313,  157,  313,  313,  223,  313,  313,  313,
+      313,  313,  313,  313,  134,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  230,  313,  313,  313,
+      313,  313,  313,  313,   24,  313,  262,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  194,  313,
+      313,  250,  313,  281,  313,  187,  313,  313,  313,  313,
+       49,  313,  313,  313,  313,    4,  313,  313,  313,  313,
+      118,  133,  313,  313,  313,  170,  313,  313,  313,  313,
 
-       38,  312,  312,  312,  312,  312,  312,  312,  269,  312,
-      312,  312,  312,  312,  312,  237,  312,  312,  312,  312,
-      312,  312,  312,  196,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,   78,  312,   50,  255,  312,  226,  312,
-      312,  312,  312,   11,  312,  312,  312,  312,  312,  312,
-      117,  312,  312,  312,  312,  194,   82,  312,   40,  312,
-      312,  312,  312,  312,  312,  312,  312,  162,  312,  312,
-      312,  312,  312,  136,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  236,  312,  312,  312,  312,  130,  312,
-      312,  112,  113,  312,  312,  312,   84,   88,   83,  312,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  226,   37,   38,  313,  313,  313,  313,  313,  313,
+      313,  270,  313,  313,  313,  313,  313,  313,  238,  313,
+      313,  313,  313,  313,  313,  313,  197,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,   78,  313,   50,  256,
+      313,  227,  313,  313,  313,  313,   11,  313,  313,  313,
+      313,  313,  313,  117,  313,  313,  313,  313,  195,   82,
+      313,   40,  313,  313,  313,  313,  313,  313,  313,  313,
+      162,  313,  313,  313,  313,  313,  136,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  237,  313,  313,  313,
 
-       76,  312,  312,  312,  312,  312,   10,  312,  312,  312,
-      253,  288,  312,  312,  312,  312,  293,   39,  312,  312,
-      312,  312,  312,  161,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,   89,   87,  312,   77,
-      277,  312,  312,  312,  312,  312,  312,  312,  180,  312,
-      312,  312,  312,  312,  195,  312,  312,  312,  312,  312,
-      312,  312,  312,  152,   71,  312,  312,  312,  312,  312,
-      270,  312,  312,  312,  312,  312,  312,  312,  233,  312,
-      312,  232,  131,  312,   86,  137,  138,  141,  142,  139,
+      313,  130,  313,  313,  112,  113,  313,  313,  313,   84,
+       88,   83,  313,   76,  313,  313,  313,  313,  313,   10,
+      313,  313,  313,  254,  289,  313,  313,  313,  313,  294,
+       39,  313,  313,  313,  313,  313,  161,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,   89,
+       87,  313,   77,  278,  313,  313,  313,  313,  313,  313,
+      313,  181,  313,  313,  313,  313,  313,  196,  313,  313,
+      313,  313,  313,  313,  313,  313,  152,   71,  313,  313,
+      313,  313,  313,  271,  313,  313,  313,  313,  313,  313,
 
-      140,   79,  312,  254,  312,  312,  312,  312,  155,  312,
-      312,  312,  312,  312,  224,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  168,  167,   41,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,   92,
-      312,  223,  312,  246,  274,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,    5,  312,  312,
-      215,  312,  312,  275,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  234,   25,  312,  312,  312,  312,  312,
+      313,  234,  313,  313,  233,  131,  313,   86,  137,  138,
+      141,  142,  139,  140,   79,  313,  255,  313,  313,  313,
+      313,  155,  313,  313,  313,  313,  313,  225,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  168,  167,   41,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,   92,  313,  224,  313,  247,  275,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+        5,  313,  313,  216,  313,  313,  276,  313,  313,  313,
+
+      313,  313,  313,  313,  313,  313,  235,   25,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      236,  313,  313,  313,  135,  313,  313,  313,  313,  313,
+      313,  313,  313,  169,  313,  177,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  272,  313,  313,  313,  313,
+      313,  313,  313,  313,  313,  313,  313,  313,  313,  313,
+      313,  313,  313,  293,  313,  313,  243,  313,  313,  313,
+      313,  313,  273,  313,  313,  313,  313,  313,  313,  274,
+      313,  313,  313,  241,  313,  244,  245,  313,  313,  313,
+      313,  313,  242,  246,    0
 
-      312,  312,  312,  312,  312,  312,  312,  235,  312,  312,
-      312,  135,  312,  312,  312,  312,  312,  312,  312,  312,
-      169,  312,  176,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  271,  312,  312,  312,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  312,  312,  312,  312,
-      292,  312,  312,  242,  312,  312,  312,  312,  312,  272,
-      312,  312,  312,  312,  312,  312,  273,  312,  312,  312,
-      240,  312,  243,  244,  312,  312,  312,  312,  312,  241,
-      245,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -746,15 +748,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[3097] =
+static const flex_int16_t yy_base[3110] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112, 1616, 1559,   81, 6016, 6016, 6016,   96,   52,
+       90,  112, 1902, 1579,   81, 6033, 6033, 6033,   96,   52,
       106,   63,  107,  128,   70,  116,  123,  134,   57,   88,
        76,  145,  151,  114,  158,   97,  169,  181,  179,  188,
-      194,  129, 1447, 6016, 6016, 6016,  135, 1315, 6016, 6016,
-     6016,  146, 1142, 1110, 6016, 6016, 6016,  220, 1034, 6016,
-     6016, 6016,  171,  903, 6016,  224, 6016,  228,  157,  818,
+      194,  129, 1551, 6033, 6033, 6033,  135, 1315, 6033, 6033,
+     6033,  146, 1142, 1110, 6033, 6033, 6033,  220, 1034, 6033,
+     6033, 6033,  171,  903, 6033,  224, 6033,  228,  157,  818,
       232,  167,    0,  239,    0,    0,  165,  205,   85,  166,
       226,  190,  233,  234,  228,  240,  241,  242,   98,  130,
       250,  243,  245,  248,  258,  256,  262,  267,  273,  251,
@@ -783,9 +785,9 @@ static const flex_int16_t yy_base[3097] =
 
       701,  703,  717,  705,  710,  718,  719,  727,  712,  720,
       739,  744,  745,  733,  731,  747,  749,  752,  754,  760,
-      755,  757,  763,  764,  765,  766,  773,  768, 6016,  772,
+      755,  757,  763,  764,  765,  766,  773,  768, 6033,  772,
       774,  782,  784,  786,  790,  787,  796,  794,  777,  804,
-      806,  802,  810,  832,  788,  800,  809,  811,  814, 6016,
+      806,  802,  810,  832,  788,  800,  809,  811,  814, 6033,
       822,  816,  856,  827,  820,  840,  837,  836,  844,  845,
       838,  846,  867,  850,  849,  852,  879,  854,  862,  864,
       874,  880,  878,  887,  890,  886,  888,  894,  898,  895,
@@ -795,648 +797,650 @@ static const flex_int16_t yy_base[3097] =
       937,  943,  955,  950,  951,  959,  961,  960,  953,  966,
       962,  969,  972,  970,  978,  980,  981,  976,  982,  984,
       987,  993,  986,  988,  995,  997,  996, 1000, 1005, 1006,
-     1010,  990, 1018, 1001, 6016, 1020, 1012, 1014, 1016, 1024,
-     1026, 6016, 1027, 1028, 1029, 1036, 1031, 1041, 1032, 1039,
+     1010,  990, 1018, 1001, 6033, 1020, 1012, 1014, 1016, 1024,
+     1026, 6033, 1027, 1028, 1029, 1036, 1031, 1041, 1032, 1039,
      1046, 1049, 1042, 1050, 1061, 1051, 1059, 1064, 1060, 1063,
      1066, 1069, 1072, 1070, 1077, 1073, 1067,  935, 1080, 1094,
-     6016, 1079, 1081, 1085, 1084, 1091, 1097, 1106, 1104, 1112,
+     6033, 1079, 1081, 1085, 1084, 1091, 1097, 1106, 1104, 1112,
      1105, 1109, 1122, 1123, 1125, 1126, 1130, 1086, 1129, 1131,
      1133, 1134, 1136, 1137, 1135, 1138, 1144, 1140, 1145, 1141,
 
-     6016, 1152, 1158, 1169, 1155, 1164, 1165, 1166, 1168, 1170,
+     6033, 1152, 1158, 1169, 1155, 1164, 1165, 1166, 1168, 1170,
      1171, 1172, 1174, 1173, 1178, 1192, 1182, 1193, 1189, 1195,
      1190, 1191, 1197, 1196, 1200, 1205, 1213, 1210, 1215, 1218,
      1226, 1225, 1228, 1235, 1237, 1211, 1230, 1203, 1222, 1234,
      1240, 1239, 1238, 1245, 1246, 1253, 1248, 1249, 1251, 1254,
      1263, 1255, 1258, 1265, 1262, 1269, 1266, 1259, 1271, 1278,
-     1279, 1281, 6016, 1288, 1285, 1286, 1287, 1290, 1297, 1298,
+     1279, 1281, 6033, 1288, 1285, 1286, 1287, 1290, 1297, 1298,
      1292, 1299, 1302, 1301, 1305, 1304, 1307, 1311, 1312, 1316,
      1318, 1321, 1325, 1322, 1323, 1337, 1336, 1338, 1329, 1330,
      1346, 1345, 1348, 1349, 1351, 1359, 1341, 1355, 1357, 1366,
 
      1361, 1363, 1364, 1365, 1370, 1367, 1375, 1379, 1382, 1381,
-     1389, 1390, 1384, 1395, 1387, 1396, 1392, 1399, 1400, 1401,
-     1402, 1411, 1403, 1404, 1408, 1412, 1414, 1415, 1416, 1421,
-     1425, 1424, 1429, 1426, 1430, 1431, 1433, 1437, 1439, 1440,
-     1442, 1443, 1446, 1454, 1452, 1444, 1462, 1450, 1465, 1466,
-     1467, 1468, 1469, 1472, 1471, 1474, 1475, 1483, 1484, 1485,
-     1488, 1487, 1492, 1490, 1497, 1489, 1498, 1499, 1503, 1505,
-     1506, 1510, 1513, 1516, 1511, 6016, 1507, 1523, 1521, 1524,
-     1525, 1529, 1530, 1538, 1531, 1533, 1534, 1535, 1536, 1561,
-     6016, 1542, 6016, 6016, 1545, 6016, 6016, 1544, 1543, 6016,
+     1389, 1390, 1384, 1395, 1387, 1398, 1392, 1399, 1401, 1402,
+     1403, 1411, 1404, 1407, 1412, 1413, 1414, 1415, 1418, 1420,
+     1431, 1422, 1426, 1424, 1429, 1433, 1439, 1440, 1441, 1442,
+     1444, 1445, 1451, 1446, 1449, 1452, 1455, 1454, 1462, 1458,
+     1464, 1469, 1470, 1473, 1472, 1475, 1476, 1484, 1485, 1486,
+     1487, 1488, 1491, 1489, 1490, 1496, 1498, 1499, 1504, 1506,
+     1505, 1510, 1513, 1516, 1518, 6033, 1511, 1523, 1521, 1524,
+     1525, 1507, 1529, 1539, 1534, 1531, 1535, 1536, 1540, 1562,
+     6033, 1543, 6033, 6033, 1546, 6033, 6033, 1545, 1544, 6033,
 
-     1558, 1547, 1546, 1567, 1571, 1565, 1551, 1574, 1555, 1584,
-     1589, 1577, 1579, 1585, 1586, 1592, 1598, 1587, 1604, 1599,
-     1609, 1612, 1613, 1615, 1619, 1621, 1622, 1606, 1624, 1626,
-     1629, 1627, 1630, 1632, 1636, 1637, 1633, 1640, 1639, 1649,
-     1653, 1642, 1660, 6016, 1657, 1669, 1670, 1666, 1673, 1665,
-     1672, 1674, 1645, 1656, 1675, 1676, 1679, 1680, 1677, 1686,
-     1681, 1689, 1698, 1688, 6016, 1691, 1693, 1695, 1699, 1701,
-     1703, 1708, 1709, 1705, 1711, 1712, 1722, 1714, 1717, 1718,
-     1724, 1726, 1728, 6016, 1727, 1735, 1736, 1738, 1740, 1742,
-     1744, 1741, 1745, 1746, 1747, 1748, 1749, 1753, 1760, 1759,
+     1549, 1548, 1552, 1565, 1568, 1559, 1557, 1572, 1573, 1583,
+     1594, 1580, 1576, 1587, 1578, 1588, 1590, 1592, 1607, 1600,
+     1609, 1611, 1614, 1618, 1620, 1602, 1621, 1622, 1624, 1625,
+     1627, 1626, 1629, 1632, 1635, 1636, 1638, 1631, 1639, 1648,
+     1650, 1652, 1659, 6033, 1657, 1660, 1669, 1665, 1672, 1664,
+     1668, 1671, 1676, 1678, 1673, 1680, 1682, 1683, 1684, 1686,
+     1688, 1691, 1695, 1692, 6033, 1693, 1696, 1694, 1701, 1700,
+     1704, 1708, 1710, 1712, 1714, 1715, 1722, 1719, 1717, 1725,
+     1726, 1727, 1729, 1730, 6033, 1734, 1739, 1731, 1740, 1742,
+     1746, 1748, 1743, 1749, 1750, 1753, 1640, 1754, 1755, 1762,
 
-     1766, 1756, 1769, 1771, 1773, 1774, 1781, 1776, 1782, 1784,
-     1785, 1786, 1788, 1789, 1792, 1800, 1801, 1797, 1805, 1798,
-     1809, 1813, 1815, 1802, 1814, 1817, 1816, 1823, 1831, 1827,
-     1820, 1828, 1835, 1832, 1840, 1833, 1842, 1844, 1845, 1846,
-     1848, 1836, 1853, 1854, 1855, 6016, 1856, 1857, 6016, 1861,
-     1862, 1884, 1863, 1865, 1867, 1876, 1866, 1868, 1870, 1878,
-     1894, 1888, 1904, 1896, 1897, 1906, 1907, 1908, 1909, 1911,
-     1915, 1916, 1877, 1917, 1924, 1932, 1928, 1934, 1937, 1919,
-     1933, 1935, 1954, 1938, 1939, 1942, 1945, 1946, 1943, 1951,
-     1949, 1958, 1964, 1966, 1967, 6016, 1975, 1976, 1970, 1972,
+     1758, 1761, 1760, 1757, 1764, 1775, 1777, 1781, 1778, 1783,
+     1784, 1785, 1786, 1787, 1788, 1790, 1797, 1800, 1799, 1801,
+     1796, 1808, 1811, 1814, 1803, 1812, 1815, 1817, 1825, 1827,
+     1828, 1819, 1823, 1835, 1830, 1834, 1839, 1840, 1842, 1843,
+     1844, 1846, 1849, 1852, 1851, 1854, 6033, 1853, 1855, 6033,
+     1859, 1860, 1882, 1861, 1863, 1865, 1875, 1864, 1866, 1868,
+     1876, 1892, 1886, 1902, 1894, 1895, 1904, 1905, 1906, 1907,
+     1909, 1913, 1914, 1915, 1878, 1922, 1927, 1926, 1935, 1937,
+     1917, 1929, 1932, 1951, 1933, 1936, 1940, 1943, 1946, 1944,
+     1953, 1942, 1960, 1962, 1964, 1968, 6033, 1973, 1966, 1974,
 
-     1984, 1981, 1982, 6016, 1987, 1988, 1990, 1998, 1991, 1993,
-     1994, 1995, 2002, 2003, 2005, 2004, 2009, 2008, 2007, 2025,
-     6016, 2010, 6016, 2020, 2011, 2021, 2022, 2027, 2028, 2030,
-     2032, 6016, 6016, 2033, 2039, 2041, 2050, 2046, 6016, 2047,
-     2055, 2052, 2057, 2051, 2058, 2061, 2062, 2066, 2067, 2070,
-     2068, 2075, 2071, 2076, 2073, 6016, 2089, 1940, 2085, 2091,
-     2083, 2093, 2095, 2072, 6016, 2097, 2094, 2101, 2108, 2105,
-     2106, 2109, 2111, 2112, 2116, 2117, 2118, 2119, 2120, 2129,
-     2130, 2121, 2132, 2135, 2131, 6016, 2128, 2139, 2147, 2143,
-     2145, 2142, 2149, 2150, 2152, 2153, 2154, 1879, 2155, 2160,
+     1975, 1982, 1978, 1980, 6033, 1985, 1986, 1984, 1996, 1989,
+     1987, 1992, 1938, 1991, 2001, 2002, 2003, 2004, 2009, 2007,
+     2016, 6033, 2011, 6033, 2008, 2017, 2019, 2018, 2023, 2020,
+     2025, 2026, 6033, 6033, 2028, 2034, 2039, 2042, 2044, 6033,
+     2029, 2052, 2049, 2055, 2047, 2048, 2054, 2056, 2059, 2060,
+     2069, 2062, 2071, 2064, 2073, 2066, 6033, 2081, 2067, 2085,
+     2086, 2076, 2087, 2089, 2093, 2083, 6033, 2097, 2099, 2100,
+     2107, 2105, 2102, 2108, 2109, 2113, 2110, 2116, 2117, 2118,
+     2119, 2129, 2130, 2120, 2122, 2131, 2139, 6033, 2134, 2138,
+     2146, 2142, 2144, 2141, 2145, 2148, 2149, 2153, 2157, 2151,
 
-     2161, 2169, 2170, 2162, 2174, 2166, 2167, 2175, 2176, 2182,
-     2181, 2183, 2184, 2185, 6016, 2187, 2191,  147, 2193, 2194,
-     2196, 2195, 2202, 2198, 2201, 2218, 2219, 2215, 2214, 2217,
-     2223, 2224, 2225, 2226, 2227, 1751, 2228, 2229, 6016, 2205,
-     2231, 2232, 2234, 2233, 2235, 2242, 6016, 2251, 2254, 2263,
-     2253, 2257, 2264, 2265, 2268, 2266, 2269, 2270, 2273, 2272,
-     2276, 2278, 6016, 2280, 2283, 2290, 2281, 2291, 2236, 2293,
-     2292, 2294, 2298, 2299, 2300, 2303, 2304, 2305, 2306, 2308,
-     2312, 2313, 2314, 2319, 2320, 6016, 2331, 2321, 2322, 2323,
-     2332, 2333, 2342, 2338, 2340, 2346, 2347, 2360, 2349, 2344,
+     2155, 2159, 2161, 2169, 2170, 2167, 2172, 2175, 2165, 2176,
+     2179, 2185, 2178, 2183, 2186, 2187, 6033, 2188, 2194,  147,
+     2189, 2195, 2197, 2199, 2202, 2201, 2198, 2214, 2219, 2215,
+     2221, 2217, 2216, 2224, 2226, 2225, 2227, 2228, 2229, 2232,
+     6033, 2234, 2236, 2237, 2239, 2241, 2242, 2252, 6033, 2248,
+     2253, 2260, 2256, 2261, 2264, 2265, 2269, 2270, 2272, 2273,
+     2274, 2276, 2278, 2280, 6033, 2283, 2285, 2288, 2291, 2295,
+     2294, 2296, 2297, 2301, 2302, 2303, 2304, 2306, 2308, 2307,
+     2309, 2310, 2317, 2314, 2318, 2322, 2324, 6033, 2331, 2327,
+     2332, 2334, 2339, 2335, 2349, 2336, 2337, 2345, 2352, 2359,
 
-     2356, 2351, 2358, 2355, 2367, 2366, 2370, 2376, 2372, 2380,
-     2382, 2374, 2378, 2386, 2384, 2392, 2388, 2389, 2405, 2406,
-     2398, 2408, 2401, 2390, 2416, 2409, 6016, 2418, 2411, 2423,
-     2424, 2431, 2427, 2428, 2429, 2432, 2435, 2437, 2438, 2439,
-     2448, 2451, 2447, 2440, 2458, 2445, 2460, 2443, 2449, 2462,
-     2465, 2466, 2471, 2473, 6016, 2476, 2472, 2468, 2480, 2483,
-     2478, 2485, 2490, 2488, 2486, 2492, 2495, 2496, 2497, 2499,
-     2501, 2502, 2503, 2504, 6016, 2509, 2508, 2510, 2514, 2520,
-     2518, 2524, 2527, 2530, 2533, 2517, 2534, 2536, 2537, 6016,
-     2545, 2547, 2544, 2548, 2546, 2551, 2552, 2554, 2556, 6016,
+     2350, 2356, 2366, 2361, 2369, 2370, 2377, 2375, 2376, 2383,
+     2373, 2385, 2387, 2388, 2389, 2391, 2393, 2396, 2395, 2397,
+     2404, 2405, 2406, 2410, 2403, 2424, 2429, 2346, 6033, 2416,
+     2418, 2422, 2428, 2436, 2432, 2431, 2434, 2438, 2442, 2443,
+     2444, 2445, 2454, 2446, 2449, 2450, 2455, 2456, 2458, 2461,
+     2465, 2466, 2469, 2472, 2473, 2476, 2243, 6033, 2477, 2479,
+     2478, 2481, 2486, 2482, 2493, 2494, 2496, 2487, 2489, 2499,
+     2500, 2503, 2504, 2507, 2505, 2509, 2513, 6033, 2515, 2517,
+     2516, 2519, 2522, 2526, 2523, 2525, 2535, 2537, 2529, 2538,
+     2539, 2540, 6033, 2549, 2551, 2550, 2554, 2552, 2541, 2556,
 
-     2557, 2558, 2565, 2566, 2561, 6016, 2568, 2564, 2569, 2571,
-     2572, 2573, 2574, 2579, 2580, 2582, 2585, 2588, 2592, 2593,
-     6016, 2594, 2602, 2603, 2595, 2606, 2597, 2607, 2608, 2612,
-     2616, 2610, 6016, 2625, 2627, 2628, 2635, 2630, 2632, 2633,
-     2636, 2637, 2638, 2640, 2643, 6016, 2646, 2644, 2647, 2652,
-     2650, 2648, 2655, 2667, 2657, 2659, 2668, 2664, 2670, 2671,
-     2672, 2673, 2676, 2675, 2683, 2686, 2684, 2688, 2689, 2691,
-     2701, 2703, 2704, 2706, 6016, 2709, 2698, 2711, 2700, 2712,
-     2713, 2714, 2715, 2717, 2719, 2724, 2722, 2723, 2731, 2739,
-     2732, 2734, 2740, 2741, 2744, 2743, 2745, 2746, 2747, 2755,
+     2558, 2559, 6033, 2562, 2563, 2570, 2571, 2566, 6033, 2574,
+     2569, 2573, 2575, 2576, 2577, 2580, 2578, 2584, 2585, 2591,
+     2600, 2588, 2592, 6033, 2594, 2607, 2602, 2605, 2604, 2608,
+     2610, 2615, 2616, 2617, 2618, 6033, 2629, 2627, 2626, 2640,
+     2628, 2635, 2636, 2638, 2641, 2642, 2644, 2645, 6033, 2648,
+     2650, 2651, 2652, 2655, 2656, 2657, 2664, 2663, 2666, 2667,
+     2671, 2672, 2670, 2673, 2677, 2683, 2679, 2682, 2692, 2680,
+     2690, 2694, 2698, 2705, 2706, 2701, 2707, 6033, 2710, 2712,
+     2704, 2711, 2714, 2717, 2718, 2719, 2721, 2722, 2726, 2723,
+     2724, 2739, 2746, 2727, 2734, 2736, 2742, 2744, 2749, 2748,
 
-     2751, 2750, 2763, 2754, 2761, 2768, 2758, 2769, 2770, 2771,
-     2772, 2774, 2778, 2779, 2781, 2775, 2783, 2792, 2794, 2796,
-     2785, 2797, 2801, 2802, 6016, 2805, 2807, 2803, 2809, 2810,
-     2816, 2817, 2819, 2820, 2811, 2825, 2827, 2828, 2833, 2834,
-     2836, 2843, 2839, 6016, 2840, 6016, 2841, 2842, 2844, 2854,
-     2846, 6016, 2850, 6016, 2857, 2864, 2851, 2855, 6016, 2865,
-     2859, 2861, 2872, 2869, 2874, 2875, 2876, 2877, 2882, 2878,
-     2880, 2885, 2886, 2888, 2890, 2892, 2896, 2893, 2903, 2905,
-     2897, 2906, 2899, 2912, 2914, 2913, 2915, 6016, 2925, 2916,
-     2919, 2922, 2926, 2927, 2928, 2930, 2931, 2936, 2937, 2938,
+     2750, 2751, 2758, 2757, 2756, 2765, 2760, 2766, 2774, 2764,
+     2771, 2773, 2775, 2763, 2776, 2778, 2780, 2784, 2786, 2789,
+     2796, 2799, 2801, 2800, 2802, 2803, 2806, 6033, 2791, 2810,
+     2807, 2814, 2817, 2819, 2821, 2829, 2820, 2824, 2827, 2836,
+     2838, 2828, 2831, 2830, 2841, 2850, 2846, 6033, 2847, 6033,
+     2843, 2851, 2852, 2860, 2855, 6033, 2858, 6033, 2859, 2867,
+     2863, 2868, 6033, 2869, 2870, 2871, 2873, 2876, 2877, 2878,
+     2881, 2882, 2887, 2883, 2885, 2889, 2893, 2894, 2899, 2901,
+     2900, 2902, 2907, 2908, 2909, 2910, 2914, 2915, 2916, 2921,
+     2922, 6033, 2924, 2925, 2928, 2930, 2931, 2932, 2933, 2939,
 
-     2939, 2945, 2944, 2954, 2950, 2961, 6016, 2953, 2958, 2960,
-     2962, 6016, 2964, 2963, 2965, 2971, 2974, 2973, 2975, 2977,
-     2981, 2983, 2976, 2986, 2984, 2993, 2994, 6016, 2999, 3000,
-     2985, 3003, 3002, 3015, 3007, 3016, 3018, 3020, 3021, 3011,
-     3022, 3023, 3025, 3027, 3034, 3035, 3031, 3038, 3033, 3039,
-     3047, 3043, 3037, 3041, 3049, 3050, 3051, 3054, 3057, 3058,
-     3053, 3059, 3060, 3062, 6016, 3068, 3071, 3072, 3075, 3063,
-     3080, 3081, 3082, 3084, 3086, 3085, 3087, 3088, 6016, 3095,
-     6016, 3089, 3103, 3098, 3108, 3090, 3109, 3113, 3112, 3117,
-     3118, 3119, 3120, 3121, 3122, 3123, 3126, 3134, 3133, 3135,
+     2935, 2938, 2937, 2947, 2941, 2951, 2954, 2962, 2948, 2966,
+     6033, 2963, 2965, 2967, 2969, 6033, 2971, 2970, 2972, 2978,
+     2974, 2980, 2981, 2982, 2983, 2987, 2989, 2997, 3001, 3002,
+     3005, 6033, 3004, 3006, 2991, 2990, 3018, 3020, 3021, 3022,
+     3027, 3025, 3029, 3030, 2992, 3012, 3032, 3033, 3041, 3044,
+     3037, 3045, 3040, 3046, 3048, 3049, 3050, 3053, 3055, 3056,
+     3057, 3060, 3061, 3064, 3059, 3062, 3066, 3065, 6033, 3077,
+     3067, 3078, 3084, 3081, 3088, 3069, 3089, 3090, 3091, 3094,
+     3100, 3092, 6033, 3095, 6033, 3097, 3111, 3104, 3117, 3113,
+     3105, 3118, 3120, 3124, 3126, 3127, 3128, 3129, 3130, 3131,
 
-     3148, 3131, 3128, 3136, 3139, 3144, 3149, 6016, 6016, 3150,
-     3152, 3155, 3157, 3158, 3159, 3162, 3169, 3166, 3165, 3168,
-     3172, 3180, 6016, 3182, 3176, 3184, 3187, 3194, 3185, 3198,
-     3199, 3195, 3207, 3202, 6016, 3204, 3205, 3215, 3210, 3211,
-     3218, 6016, 3213, 6016, 3216, 3217, 3222, 3225, 3226, 3227,
-     3228, 3229, 3232, 3244, 3247, 3233, 3249, 3237, 3245, 3250,
-     3251, 3258, 3254, 3255, 3256, 6016, 3260, 3261, 3262, 3265,
-     3267, 3268, 3275, 3277, 6016, 3278, 3280, 3282, 3283, 3285,
-     3287, 3288, 3289, 3291, 3294, 3290, 3292, 3305, 3298, 3297,
-     3307, 3317, 3308, 3319, 6016, 3320, 3314, 3327, 3329, 3322,
+     3134, 3135, 3141, 3142, 3139, 3143, 3149, 3151, 3152, 3154,
+     3155, 6033, 6033, 3156, 3157, 3158, 3160, 3164, 3172, 3178,
+     3171, 3182, 3168, 3174, 3184, 3191, 6033, 3189, 3192, 3188,
+     3194, 3204, 3196, 3201, 3211, 3208, 3206, 3215, 3212, 6033,
+     3197, 3216, 3225, 3221, 3223, 3228, 6033, 3227, 6033, 3224,
+     3229, 3231, 3233, 3236, 3237, 3238, 3240, 3245, 3247, 3257,
+     3246, 3256, 3253, 3258, 3260, 3261, 3268, 3263, 3264, 3265,
+     6033, 3270, 3267, 3161, 3272, 3281, 3284, 3282, 3271, 6033,
+     3275, 3293, 3278, 3288, 3295, 3299, 3296, 3301, 3303, 3304,
+     3302, 3305, 3312, 3307, 3309, 3311, 3323, 3326, 3331, 6033,
 
-     3324, 3330, 3331, 3332, 3335, 3337, 3336, 3338, 3340, 3342,
-     3339, 3349, 3343, 3356, 3345, 3359, 3365, 3366, 3346, 6016,
-     3362, 3369, 3370, 3373, 3372, 3376, 3379, 3383, 3380, 3392,
-     3393, 3384, 3387, 3396, 3397, 3404, 3399, 6016, 3409, 3389,
-     3412, 3410, 3411, 3416, 3417, 3419, 3420, 3421, 3422, 3429,
-     3424, 6016, 3431, 3426, 3436, 3437, 3428, 3451, 3446, 3427,
-     3449, 3453, 3450, 3456, 3454, 3458, 3459, 3462, 3463, 6016,
-     6016, 3465, 3466, 3468, 6016, 3469, 3467, 3479, 3472, 3475,
-     3482, 3485, 3481, 3484, 3486, 3489, 3493, 6016, 3494, 3501,
-     3498, 3500, 3508, 3511, 3504, 3512, 3513, 3506, 3514, 3516,
+     3313, 3324, 3334, 3336, 3320, 3337, 3338, 3340, 3342, 3343,
+     3344, 3345, 3346, 3347, 3348, 3349, 3356, 3351, 3367, 3352,
+     3353, 3370, 3380, 3366, 6033, 3358, 3373, 3375, 3381, 3376,
+     3384, 3394, 3397, 3382, 3399, 3400, 3386, 3388, 3404, 3406,
+     3411, 3412, 6033, 3414, 3413, 3422, 3417, 3418, 3420, 3423,
+     3432, 3425, 3427, 3428, 3435, 3430, 6033, 3446, 3441, 3434,
+     3443, 3449, 3457, 3452, 3433, 3456, 3459, 3460, 3462, 3465,
+     3466, 3467, 3470, 3471, 6033, 6033, 3473, 3474, 3475, 6033,
+     3478, 3476, 3489, 3480, 3481, 3490, 3493, 3492, 3482, 3494,
+     3496, 3498, 6033, 3504, 3512, 3503, 3510, 3513, 3521, 3519,
 
-     3520, 3519, 3521, 3524, 3535, 3536, 3531, 3527, 3534, 6016,
-     3532, 3539, 3540, 3544, 3541, 3548, 6016, 3546, 3549, 3550,
-     3555, 3558, 3562, 3559, 3568, 3569, 3571, 3572, 3573, 3574,
-     3576, 3583, 3580, 3579, 3582, 3586, 3588, 6016, 3589, 3593,
-     3597, 3600, 6016, 3602, 3611, 3612, 3613, 3603, 3614, 3608,
-     3621, 6016, 3616, 3618, 3623, 3624, 3631, 3626, 3633, 3630,
-     6016, 3632, 3634, 3636, 6016, 3637, 3638, 3646, 3651, 3643,
-     3658, 3654, 3656, 3659, 3655, 6016, 3657, 6016, 3666, 3667,
-     3670, 6016, 3668, 3672, 3673, 3675, 3676, 3677, 3681, 3688,
-     3683, 3689, 3690, 3691, 3692, 3694, 3701, 3693, 3697, 3700,
+     3511, 3520, 3524, 3526, 3525, 3527, 3528, 3531, 3532, 3540,
+     3541, 3536, 3538, 3539, 6033, 3542, 3547, 3549, 3551, 3548,
+     3555, 6033, 3552, 3560, 3565, 3568, 3563, 3576, 3573, 3578,
+     3580, 3561, 3581, 3583, 3585, 3584, 3586, 3593, 3588, 3591,
+     3598, 3599, 3601, 6033, 3607, 3608, 3592, 3610, 6033, 3614,
+     3621, 3617, 3628, 3618, 3625, 3623, 3632, 6033, 3627, 3629,
+     3631, 3634, 3642, 3638, 3646, 3637, 6033, 3641, 3645, 3647,
+     6033, 3648, 3654, 3657, 3662, 3650, 3669, 3665, 3667, 3668,
+     3666, 6033, 3673, 6033, 3676, 3677, 3680, 6033, 3682, 3683,
+     3685, 3687, 3684, 3691, 3692, 3699, 3688, 3700, 3701, 3702,
 
-     3702, 6016, 3712, 3704, 3705, 3719, 3717, 3709, 3707, 3725,
-     3723, 6016, 6016, 3732, 6016, 3734, 3727, 3729, 6016, 3733,
-     3735, 3744, 3739, 3740, 3750, 3747, 3751, 6016, 3753, 3742,
-     3754, 3757, 3758, 3761, 3763, 3764, 3765, 3767, 3768, 6016,
-     3769, 3771, 3778, 3770, 3772, 3781, 3780, 3786, 6016, 3790,
-     3794, 3793, 3797, 3798, 6016, 3799, 6016, 3800, 3801, 3803,
-     3807, 3804, 6016, 3812, 3813, 3817, 3819, 3820, 3822, 3821,
-     3828, 3829, 3830, 3837, 3834, 3835, 3832, 6016, 3836, 3838,
-     3842, 3843, 3846, 3849, 3857, 3853, 3854, 3859, 3860, 3863,
-     3866, 3864, 3870, 3872, 3874, 3867, 6016, 3875, 3880, 3873,
+     3703, 3705, 3712, 3704, 3711, 3713, 3714, 6033, 3715, 3717,
+     3723, 3724, 3729, 3718, 3726, 3734, 3733, 6033, 6033, 3737,
+     6033, 3740, 3741, 3742, 6033, 3744, 3748, 3751, 3749, 3752,
+     3754, 3761, 3755, 6033, 3764, 3750, 3767, 3765, 3769, 3772,
+     3773, 3775, 3776, 3777, 3780, 6033, 3778, 3779, 3782, 3783,
+     3788, 3793, 3789, 3795, 6033, 3800, 3804, 3803, 3807, 3809,
+     6033, 3810, 6033, 3811, 3813, 3814, 3818, 3817, 6033, 3823,
+     3824, 3828, 3830, 3832, 3831, 3834, 3835, 3841, 3842, 3849,
+     3845, 3844, 3846, 6033, 3847, 3851, 3853, 3860, 3848, 3855,
+     3864, 3867, 3868, 3869, 3873, 3877, 3871, 3878, 3884, 3882,
 
-     3889, 3886, 3890, 6016, 3891, 3892, 3893, 6016, 3896, 3899,
-     3901, 3905, 3900, 3906, 3907, 3908, 3911, 6016, 3913, 3915,
-     3912, 3916, 3928, 3920, 6016, 6016, 3930, 6016, 3931, 3917,
-     3935, 3934, 3914, 3938, 3942, 3944, 3946, 3943, 3951, 3954,
-     3948, 3964, 3966, 3971, 3967, 3968, 3957, 6016, 6016, 3973,
-     3974, 3969, 3980, 3981, 3983, 3984, 3991, 3987, 3993, 3997,
-     3998, 4005, 6016, 3986, 3988, 4006, 6016, 4001, 4004, 4007,
-     4012, 4011, 4013, 4017, 4014, 4015, 4018, 4022, 4019, 4024,
-     4032, 4025, 4029, 4028, 4038, 4035, 4036, 4045, 6016, 4042,
-     4046, 4049, 4052, 4053, 4055, 4057, 4058, 4059, 6016, 4056,
+     3888, 3874, 6033, 3886, 3894, 3880, 3903, 3899, 3900, 3904,
+     6033, 3905, 3907, 3908, 6033, 3906, 3890, 3914, 3921, 3915,
+     3918, 3922, 3925, 3926, 6033, 3928, 3930, 3924, 3927, 3929,
+     3937, 6033, 6033, 3943, 6033, 3945, 3931, 3935, 3947, 3948,
+     3952, 3956, 3957, 3959, 3953, 3960, 3963, 3967, 3975, 3976,
+     3977, 3978, 3979, 3982, 6033, 6033, 3984, 3985, 3988, 3990,
+     3991, 3993, 3994, 4001, 3998, 4006, 4009, 3999, 4016, 6033,
+     4013, 4014, 4015, 6033, 3996, 4018, 4020, 4022, 4024, 4026,
+     4025, 4027, 4028, 4030, 4032, 4035, 4036, 4040, 4038, 4042,
+     4046, 4048, 4049, 4050, 4056, 6033, 4058, 4057, 4059, 4060,
 
-     4061, 4063, 4069, 4062, 4072, 4083, 4087, 4089, 4064, 4081,
-     4090, 4092, 4096, 4093, 6016, 4097, 4099, 4100, 4103, 4106,
-     4108, 4109, 4111, 4112, 4114, 4116, 4117, 4124, 4126, 4118,
-     4127, 4121, 4129, 6016, 4133, 4140, 4134, 4142, 4137, 4067,
-     4143, 4144, 4150, 4147, 4152, 4151, 4157, 6016, 4154, 4158,
-     4161, 4159, 4165, 4168, 4172, 4169, 4171, 6016, 4179, 4162,
-     4173, 4175, 4183, 4185, 4188, 4190, 4193, 4192, 4195, 6016,
-     4196, 4199, 4200, 4197, 4206, 4207, 4211, 4209, 6016, 4212,
-     4218, 4210, 4226, 4221, 4230, 4227, 4229, 4231, 4233, 4236,
-     4238, 4240, 4241, 4243, 4237, 4254, 4259, 4257, 6016, 4244,
+     4061, 4063, 4067, 4069, 4070, 6033, 4071, 4073, 4074, 4079,
+     4075, 4080, 4094, 4097, 4099, 4087, 4090, 4100, 4104, 4106,
+     4107, 6033, 4109, 4108, 4110, 4111, 4118, 4120, 4115, 4122,
+     4124, 4126, 4129, 4127, 4136, 4138, 4131, 4139, 4133, 4140,
+     6033, 4141, 4150, 4143, 4152, 4153, 4154, 4155, 4156, 4164,
+     4161, 4166, 4165, 4168, 6033, 4169, 4170, 4173, 4174, 4176,
+     4177, 4182, 4179, 4183, 6033, 4186, 4190, 4192, 4191, 4195,
+     4197, 4200, 4201, 4203, 4204, 4211, 6033, 4222, 4207, 4218,
+     4220, 4208, 4217, 4221, 4227, 4209, 6033, 4234, 4236, 4228,
+     4244, 4224, 4246, 4247, 4248, 4237, 4250, 4251, 4249, 4255,
 
-     6016, 4258, 4262, 4266, 4268, 4265, 6016, 4255, 4270, 4273,
-     4274, 4275, 6016, 4276, 4278, 4280, 4279, 6016, 4290, 4292,
-     4281, 4296, 4283, 4298, 6016, 4303, 4304, 4300, 4312, 4315,
-     4311, 4313, 4316, 4314, 4318, 4319, 4320, 4328, 4323, 4324,
-     6016, 4330, 4333, 4340, 4341, 4335, 4325, 4343, 4349, 4342,
-     6016, 4351, 4350, 4352, 4353, 4354, 4357, 4359, 4366, 4362,
-     4361, 6016, 4365, 4369, 4382, 4363, 4373, 6016, 6016, 4378,
-     4383, 4385, 4380, 4386, 6016, 4389, 4396, 4391, 4395, 4398,
-     6016, 6016, 4400, 6016, 4397, 6016, 4402, 4401, 6016, 6016,
-     4404, 4405, 4408, 4414, 4411, 6016, 4421, 6016, 4418, 4422,
+     4256, 4257, 4259, 4267, 4274, 4271, 6033, 4260, 6033, 4269,
+     4276, 4285, 4281, 4272, 6033, 4270, 4283, 4288, 4289, 4284,
+     6033, 4291, 4295, 4297, 4296, 6033, 4298, 4300, 4302, 4306,
+     4310, 4313, 6033, 4316, 4317, 4319, 4327, 4329, 4326, 4328,
+     4330, 4332, 4333, 4334, 4335, 4343, 4338, 4340, 6033, 4346,
+     4348, 4355, 4356, 4349, 4339, 4360, 4363, 4357, 6033, 4366,
+     4365, 4367, 4368, 4369, 4372, 4374, 4381, 4377, 4376, 6033,
+     4380, 4384, 4397, 4378, 4388, 6033, 6033, 4393, 4398, 4400,
+     4395, 4401, 6033, 4404, 4411, 4406, 4410, 4413, 6033, 6033,
+     4415, 6033, 4412, 6033, 4417, 4416, 6033, 6033, 4419, 4420,
 
-     4424, 4425, 4427, 6016, 4426, 4429, 4434, 6016, 4428, 4436,
-     4435, 4439, 6016, 4443, 4446, 4438, 4444, 6016, 4450, 4456,
-     4458, 4448, 4452, 4459, 4465, 4460, 4468, 4469, 4470, 4471,
-     4472, 4479, 4484, 4486, 4488, 4480, 4476, 4490, 4496, 4498,
-     4489, 4493, 4500, 4502, 4504, 4506, 4508, 4510, 4511, 4512,
-     4514, 4515, 4513, 4523, 4516, 4517, 4530, 4526, 4519, 4531,
-     4534, 4532, 4538, 4539, 4541, 4542, 4543, 6016, 4544, 4546,
-     4548, 4560, 4553, 4549, 4559, 4566, 4570, 4572, 6016, 4574,
-     6016, 4576, 4561, 4578, 4580, 6016, 4581, 4582, 4583, 4584,
-     4585, 4586, 4588, 4587, 4591, 4592, 4595, 6016, 4598, 4593,
+     4423, 4429, 4426, 6033, 4436, 6033, 4433, 4437, 4439, 4440,
+     4442, 6033, 4441, 4444, 4449, 6033, 4443, 4451, 4450, 4454,
+     6033, 4458, 4461, 4453, 4459, 6033, 4465, 4471, 4473, 4463,
+     4467, 4474, 4480, 4475, 4483, 4484, 4485, 4486, 4487, 4488,
+     4492, 4495, 4499, 4501, 4502, 4503, 4504, 4510, 4512, 4505,
+     4508, 4515, 4516, 4519, 4522, 4524, 4526, 4527, 4528, 4529,
+     4530, 4531, 4534, 4533, 4537, 4544, 4545, 4546, 4547, 4548,
+     4549, 4550, 4555, 4559, 4560, 4562, 6033, 4552, 4558, 4563,
+     4566, 4565, 4571, 4578, 4582, 4585, 4587, 6033, 4589, 6033,
+     4591, 4593, 4594, 4595, 6033, 4596, 4597, 4598, 4599, 4600,
 
-     4602, 4613, 6016, 4608, 4619, 4603, 4614, 4616, 4620, 4622,
-     4624, 4625, 4626, 4628, 4630, 4637, 4633, 4634, 4636, 4638,
-     4639, 4644, 4647, 4646, 4654, 4656, 4661, 6016, 4650, 6016,
-     4657, 4662, 4663, 4665, 4667, 4668, 4670, 6016, 6016, 4671,
-     4673, 4678, 4679, 4674, 4683, 4680, 6016, 4686, 4693, 4696,
-     4687, 6016, 4690, 4698, 4699, 4703, 6016, 4704, 4706, 4707,
-     4709, 4710, 4713, 4717, 4714, 4720, 4721, 4725, 6016, 6016,
-     6016, 6016, 4726, 4728, 4731, 4732, 4734, 4735, 4737, 4739,
-     4740, 6016, 4742, 6016, 6016, 4743, 4749, 4751, 4752, 4753,
-     4756, 4758, 4760, 6016, 4759, 4764, 4766, 4762, 4773, 4779,
+     4601, 4602, 4603, 4606, 4607, 4612, 6033, 4618, 4608, 4622,
+     4627, 6033, 4628, 4633, 4629, 4634, 4635, 4636, 4638, 4639,
+     4643, 4641, 4645, 4649, 4646, 4650, 4654, 4653, 4658, 4655,
+     4661, 4662, 4664, 4671, 4674, 4678, 6033, 4665, 6033, 4673,
+     4679, 4680, 4683, 4685, 4686, 4688, 6033, 6033, 4689, 4691,
+     4696, 4687, 4693, 4700, 4697, 6033, 4704, 4708, 4714, 4705,
+     6033, 4710, 4715, 4716, 4721, 6033, 4717, 4722, 4723, 4733,
+     4724, 4738, 4734, 4740, 4726, 4741, 4728, 4745, 6033, 6033,
+     6033, 6033, 4746, 4730, 4751, 4754, 4755, 4756, 4757, 4759,
+     4760, 6033, 4762, 6033, 6033, 4764, 4771, 4763, 4773, 4772,
 
-     4763, 4776, 4780, 4782, 4789, 4785, 4786, 4784, 4788, 4792,
-     4795, 6016, 6016, 4796, 4802, 4803, 4811, 4807, 4808, 4820,
-     4815, 4816, 4817, 4818, 4822, 4804, 4829, 4834, 4827, 4824,
-     6016, 4835, 4838, 6016, 4831, 6016, 4837, 4839, 4845, 4846,
-     4847, 4848, 4849, 4851, 6016, 6016, 4852, 4853, 4855, 4862,
-     4858, 4866, 4854, 4865, 4867, 6016, 4868, 6016, 4870, 4872,
-     4879, 4880, 4887, 4888, 4891, 4893, 4889, 4894, 6016, 4895,
-     4896, 6016, 4898, 4900, 4901, 6016, 4906, 4903, 4911, 4913,
-     6016, 4918, 4915, 4920, 6016, 4923, 6016, 4908, 4924, 4926,
-     4933, 6016, 4930, 4934, 6016, 4937, 4940, 4941, 4942, 6016,
+     4770, 4774, 4779, 6033, 4781, 4785, 4786, 4782, 4793, 4795,
+     4798, 4799, 4784, 4788, 4807, 4803, 4809, 4800, 4811, 4813,
+     4818, 6033, 6033, 4814, 4820, 4821, 4829, 4825, 4826, 4838,
+     4833, 4834, 4835, 4836, 4840, 4822, 4847, 4852, 4845, 4842,
+     6033, 4853, 4856, 6033, 4849, 6033, 4855, 4857, 4863, 4864,
+     4865, 4866, 4867, 4869, 6033, 6033, 4870, 4871, 4873, 4880,
+     4876, 4884, 4872, 4883, 4885, 6033, 4886, 6033, 4888, 4890,
+     4897, 4898, 4905, 4906, 4909, 4911, 4907, 4912, 6033, 4913,
+     4914, 6033, 4916, 4918, 4919, 6033, 4924, 4921, 4929, 4931,
+     6033, 4936, 4933, 4938, 6033, 4941, 6033, 4926, 4942, 4944,
 
-     4931, 6016, 4943, 4946, 4947, 4952, 4953, 4957, 4954, 4958,
-     4959, 4966, 4962, 4965, 6016, 6016, 4978, 4964, 4970, 4971,
-     4974, 4981, 4979, 4982, 4984, 6016, 6016, 4988, 6016, 4989,
-     4992, 6016, 4985, 4996, 4994, 4998, 5000, 5001, 5002, 5006,
-     5008, 5014, 5009, 5007, 5019, 5030, 5013, 5034, 5035, 5037,
-     5039, 5041, 5015, 5043, 5044, 5020, 5045, 5047, 5049, 6016,
-     5051, 5052, 5053, 6016, 5057, 5058, 5060, 5061, 6016, 5063,
-     5068, 5070, 5072, 6016, 5073, 5075, 5076, 5078, 5082, 5089,
-     5085, 5084, 5086, 6016, 6016, 6016, 5094, 5096, 6016, 5101,
-     5092, 5102, 5103, 6016, 5104, 5105, 6016, 6016, 5107, 5109,
+     4951, 4948, 6033, 4949, 4952, 6033, 4955, 4958, 4959, 4961,
+     6033, 4963, 6033, 4964, 4966, 4967, 4971, 4972, 4976, 4973,
+     4977, 4978, 4985, 4983, 4989, 6033, 6033, 4997, 4980, 4988,
+     4990, 4994, 5004, 4999, 5001, 5007, 6033, 6033, 5009, 6033,
+     5011, 5012, 6033, 5002, 5013, 5017, 5018, 5020, 5021, 5022,
+     5026, 5028, 5029, 5030, 5031, 5037, 5049, 5033, 5047, 5053,
+     5055, 5057, 5059, 5051, 5061, 5062, 5039, 5063, 5064, 5068,
+     6033, 5070, 5071, 5073, 6033, 5076, 5078, 5080, 5081, 6033,
+     5090, 5083, 5087, 5093, 6033, 5077, 5098, 5099, 5100, 5101,
+     5111, 5094, 5104, 5108, 6033, 6033, 6033, 5114, 5118, 6033,
 
-     5108, 5116, 6016, 5111, 6016, 5112, 6016, 5114, 5115, 5124,
-     5122, 6016, 5129, 5135, 6016, 5138, 5141, 5143, 5144, 5126,
-     5130, 5145, 6016, 5154, 5147, 5151, 5158, 5155, 5159, 5160,
-     5161, 5168, 5163, 5167, 6016, 5170, 5164, 5171, 5177, 5172,
-     5175, 5181, 6016, 5183, 6016, 5184, 5185, 5189, 5186, 5187,
-     5192, 5194, 5199, 5196, 5206, 5200, 6016, 5208, 5210, 6016,
-     5212, 6016, 5214, 6016, 5215, 5216, 5218, 5220, 6016, 5224,
-     5217, 5221, 5226, 6016, 5227, 5229, 5230, 5236, 6016, 6016,
-     5238, 5246, 5242, 5239, 5251, 5253, 5248, 5255, 5256, 5257,
-     5259, 5269, 5241, 5264, 5262, 5271, 5272, 5277, 6016, 6016,
+     5121, 5115, 5106, 5122, 6033, 5124, 5125, 5126, 6033, 6033,
+     5127, 5128, 5130, 5139, 6033, 5132, 6033, 5135, 6033, 5136,
+     5142, 5145, 5148, 6033, 5149, 5158, 6033, 5161, 5164, 5166,
+     5167, 5151, 5153, 5168, 6033, 5175, 5174, 5177, 5181, 5170,
+     5178, 5184, 5183, 5191, 5186, 5193, 6033, 5190, 5195, 5197,
+     5203, 5187, 5198, 5196, 6033, 5208, 6033, 5205, 5209, 5210,
+     5212, 5215, 5217, 5219, 5220, 5223, 5229, 5224, 6033, 5233,
+     5235, 6033, 5226, 6033, 5238, 6033, 5230, 5239, 5240, 5245,
+     6033, 5242, 5244, 5248, 5251, 6033, 5252, 5254, 5257, 5259,
+     6033, 6033, 5260, 5267, 5269, 6033, 5262, 5266, 5273, 5263,
 
-     6016, 5273, 5280, 5287, 5284, 5286, 5294, 5290, 6016, 5291,
-     5292, 5293, 5301, 5298, 5303, 6016, 5299, 5304, 5305, 5306,
-     5310, 5307, 5314, 6016, 5318, 5321, 5324, 5313, 5328, 5332,
-     5335, 5337, 5338, 6016, 5340, 6016, 6016, 5325, 6016, 5341,
-     5342, 5345, 5346, 6016, 5349, 5351, 5350, 5352, 5354, 5356,
-     6016, 5366, 5357, 5359, 5368, 6016, 6016, 5372, 6016, 5375,
-     5376, 5369, 5385, 5380, 5382, 5387, 5384, 6016, 5388, 5391,
-     5393, 5394, 5395, 6016, 5396, 5397, 5399, 5400, 5403, 5402,
-     5405, 5407, 5409, 6016, 5410, 5412, 5430, 5426, 6016, 5413,
-     5425, 6016, 6016, 5435, 5437, 5358, 6016, 6016, 6016, 5440,
+     5278, 5275, 5279, 5281, 5291, 5287, 5143, 5282, 5290, 5292,
+     5293, 6033, 6033, 6033, 5296, 5298, 5305, 5304, 5307, 5315,
+     5311, 6033, 5312, 5314, 5313, 5322, 5320, 5324, 6033, 5321,
+     5325, 5326, 5327, 5331, 5328, 5335, 6033, 5342, 5346, 5334,
+     5336, 5348, 5355, 5357, 5359, 5360, 6033, 5362, 6033, 6033,
+     5349, 6033, 5352, 5363, 5364, 5366, 6033, 5370, 5373, 5371,
+     5372, 5376, 5378, 6033, 5388, 5379, 5383, 5384, 6033, 6033,
+     5393, 6033, 5395, 5396, 5390, 5403, 5398, 5400, 5406, 5407,
+     6033, 5409, 5411, 5413, 5414, 5415, 6033, 5416, 5417, 5419,
+     5420, 5423, 5422, 5425, 5427, 5428, 6033, 5430, 5432, 5450,
 
-     6016, 5442, 5446, 5450, 5454, 5445, 6016, 5456, 5453, 5458,
-     6016, 6016, 5457, 5459, 5460, 5462, 6016, 6016, 5463, 5466,
-     5464, 5467, 5469, 6016, 5474, 5478, 5480, 5483, 5486, 5475,
-     5489, 5491, 5499, 5501, 5496, 5497, 5502, 5504, 5505, 5506,
-     5508, 5517, 5513, 5515, 5527, 5524, 6016, 6016, 5531, 6016,
-     6016, 5533, 5535, 5537, 5539, 5541, 5543, 5545, 6016, 5546,
-     5548, 5549, 5417, 5550, 6016, 5552, 5554, 5551, 5556, 5516,
-     5559, 5557, 5562, 6016, 6016, 5563, 5564, 5565, 5573, 5568,
-     6016, 5575, 5582, 5579, 5580, 5577, 5583, 5584, 6016, 5588,
-     5589, 6016, 6016, 5587, 6016, 6016, 6016, 6016, 6016, 6016,
+     5446, 6033, 5434, 5445, 6033, 6033, 5456, 5460, 5449, 6033,
+     6033, 6033, 5462, 6033, 5464, 5468, 5472, 5476, 5467, 6033,
+     5478, 5457, 5479, 6033, 6033, 5480, 5481, 5482, 5484, 6033,
+     6033, 5485, 5488, 5486, 5489, 5491, 6033, 5494, 5496, 5502,
+     5508, 5514, 5504, 5492, 5509, 5517, 5526, 5499, 5515, 5522,
+     5523, 5527, 5525, 5534, 5535, 5531, 5539, 5541, 5542, 6033,
+     6033, 5546, 6033, 6033, 5549, 5551, 5553, 5555, 5557, 5559,
+     5561, 6033, 5562, 5564, 5565, 5566, 5567, 6033, 5569, 5573,
+     5568, 5576, 5570, 5579, 5575, 5585, 6033, 6033, 5577, 5591,
+     5581, 5592, 5586, 6033, 5596, 5603, 5598, 5600, 5601, 5606,
 
-     6016, 6016, 5592, 6016, 5590, 5605, 5607, 5609, 6016, 5597,
-     5610, 5518, 5611, 5599, 6016, 5612, 5614, 5616, 5615, 5618,
-     5622, 5624, 5626, 5628, 5627, 5629, 5632, 5630, 5636, 5634,
-     5638, 5644, 6016, 6016, 6016, 5642, 5640, 5651, 5652, 5663,
-     5664, 5667, 5669, 5653, 5657, 5670, 5671, 5674, 5659, 5675,
-     5686, 5678, 5681, 5682, 5683, 5689, 5685, 5691, 5695, 6016,
-     5696, 6016, 5697, 6016, 6016, 5699, 5701, 5704, 5705, 5713,
-     5714, 5706, 5709, 5716, 5718, 5726, 5728, 6016, 5717, 5719,
-     6016, 5729, 5730, 6016, 5721, 5731, 5732, 5733, 5737, 5740,
-     5742, 5744, 5753, 6016, 6016, 5745, 5748, 5754, 5756, 5757,
+     5602, 6033, 5608, 5610, 6033, 6033, 5611, 6033, 6033, 6033,
+     6033, 6033, 6033, 6033, 6033, 5613, 6033, 5609, 5628, 5630,
+     5632, 6033, 5615, 5625, 5617, 5623, 5633, 6033, 5635, 5637,
+     5636, 5640, 5639, 5644, 5646, 5649, 5651, 5650, 5652, 5655,
+     5653, 5660, 5657, 5656, 5674, 6033, 6033, 6033, 5661, 5663,
+     5665, 5671, 5682, 5684, 5687, 5689, 5673, 5690, 5691, 5693,
+     5695, 5696, 5697, 5705, 5701, 5702, 5703, 5704, 5707, 5711,
+     5709, 5717, 6033, 5718, 6033, 5713, 6033, 6033, 5720, 5722,
+     5727, 5725, 5736, 5738, 5729, 5734, 5737, 5740, 5742, 5749,
+     6033, 5739, 5746, 6033, 5750, 5751, 6033, 5752, 5753, 5754,
 
-     5764, 5760, 5763, 5767, 5769, 5770, 5777, 6016, 5776, 5778,
-     5780, 6016, 5781, 5782, 5784, 5786, 5787, 5794, 5790, 5795,
-     6016, 5792, 6016, 5797, 5798, 5799, 5800, 5802, 5803, 5811,
-     5813, 5814, 6016, 5815, 5822, 5817, 5824, 5828, 5826, 5830,
-     5820, 5833, 5835, 5842, 5846, 5843, 5847, 5834, 5851, 5838,
-     6016, 5849, 5852, 6016, 5855, 5858, 5859, 5861, 5864, 6016,
-     5867, 5862, 5868, 5869, 5873, 5875, 6016, 5877, 5884, 5879,
-     6016, 5885, 6016, 6016, 5888, 5889, 5891, 5895, 5897, 6016,
-     6016, 6016, 5924, 5931, 5938, 5945, 5952,   88, 5959, 5966,
-     5973, 5980, 5987, 5994, 6001, 6008
+     5757, 5761, 5759, 5762, 5763, 5776, 6033, 6033, 5765, 5769,
+     5771, 5780, 5777, 5789, 5791, 5781, 5788, 5794, 5784, 5801,
+     6033, 5797, 5800, 5807, 6033, 5798, 5804, 5808, 5809, 5810,
+     5817, 5812, 5813, 6033, 5818, 6033, 5821, 5824, 5822, 5816,
+     5825, 5830, 5837, 5834, 5832, 6033, 5814, 5841, 5846, 5847,
+     5849, 5851, 5852, 5853, 5855, 5857, 5858, 5864, 5861, 5866,
+     5867, 5869, 5870, 6033, 5876, 5871, 6033, 5877, 5878, 5879,
+     5880, 5884, 6033, 5888, 5881, 5891, 5892, 5895, 5896, 6033,
+     5902, 5905, 5906, 6033, 5907, 6033, 6033, 5909, 5897, 5908,
+     5918, 5920, 6033, 6033, 6033, 5941, 5948, 5955, 5962, 5969,
 
+       88, 5976, 5983, 5990, 5997, 6004, 6011, 6018, 6025
     } ;
 
-static const flex_int16_t yy_def[3097] =
+static const flex_int16_t yy_def[3110] =
     {   0,
-     3082,    1, 3083, 3083, 3084, 3084, 3085, 3085, 3086, 3086,
-     3087, 3087, 3082, 3088, 3082, 3082, 3082, 3082, 3089, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3090, 3082, 3082, 3082, 3090, 3091, 3082, 3082,
-     3082, 3091, 3092, 3082, 3082, 3082, 3082, 3092, 3093, 3082,
-     3082, 3082, 3093, 3094, 3082, 3095, 3082, 3094, 3094, 3088,
-     3088, 3082, 3096, 3089, 3096, 3089, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3095,    1, 3096, 3096, 3097, 3097, 3098, 3098, 3099, 3099,
+     3100, 3100, 3095, 3101, 3095, 3095, 3095, 3095, 3102, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3103, 3095, 3095, 3095, 3103, 3104, 3095, 3095,
+     3095, 3104, 3105, 3095, 3095, 3095, 3095, 3105, 3106, 3095,
+     3095, 3095, 3106, 3107, 3095, 3108, 3095, 3107, 3107, 3101,
+     3101, 3095, 3109, 3102, 3109, 3102, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3090, 3090, 3091, 3091, 3092, 3092, 3082, 3093, 3093,
-     3094, 3094, 3095, 3095, 3094, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3103, 3103, 3104, 3104, 3105, 3105, 3095, 3106, 3106,
+     3107, 3107, 3108, 3108, 3107, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3094, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3107, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3094, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3107, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3082, 3088, 3094, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3095, 3101, 3107, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3094, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3082, 3082, 3088, 3082, 3082, 3088, 3088, 3082,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3107, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3095, 3095, 3101, 3095, 3095, 3101, 3101, 3095,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3094, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3107, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3094, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3107,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3082, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3082, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3095, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3082, 3088, 3082, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101,
+     3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3082, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3082, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3082, 3082, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3082, 3082, 3088, 3082, 3088, 3082, 3088, 3088, 3082, 3082,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3082, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3095,
+     3101, 3095, 3101, 3095, 3101, 3101, 3095, 3095, 3101, 3101,
 
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3082, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
+     3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3082,
-     3082, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095,
+     3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3082, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3082, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3082, 3088, 3082, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3082,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101,
 
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3082, 3088, 3082, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3082, 3082, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3082, 3082, 3088, 3088,
+     3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3095,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3095, 3095, 3101, 3101, 3095,
 
-     3088, 3088, 3082, 3088, 3082, 3088, 3082, 3088, 3088, 3088,
-     3088, 3082, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3082,
-     3088, 3082, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3082,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3095, 3095,
+     3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3095, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3095, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3095, 3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
 
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3082, 3082, 3088, 3082, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3088, 3082, 3082, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3082, 3082, 3088, 3088, 3088, 3082, 3082, 3082, 3088,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3095, 3095,
+     3101, 3095, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3095, 3095,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
 
-     3082, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3082, 3082, 3088, 3088, 3088, 3088, 3082, 3082, 3088, 3088,
-     3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3082, 3088, 3082,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3082, 3082, 3088, 3082, 3082, 3082, 3082, 3082, 3082,
+     3101, 3095, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3095,
+     3095, 3095, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3095,
+     3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3095, 3101, 3095, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101,
 
-     3082, 3082, 3088, 3082, 3088, 3088, 3088, 3088, 3082, 3088,
-     3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3082, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3082, 3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3082, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088,
+     3101, 3095, 3101, 3101, 3095, 3095, 3101, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3101, 3095, 3101, 3101, 3101,
+     3101, 3095, 3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3095, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3095, 3101, 3095, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101,
 
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088,
-     3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088, 3088,
-     3082, 3088, 3088, 3082, 3088, 3088, 3088, 3088, 3088, 3082,
-     3088, 3088, 3088, 3088, 3088, 3088, 3082, 3088, 3088, 3088,
-     3082, 3088, 3082, 3082, 3088, 3088, 3088, 3088, 3088, 3082,
-     3082,    0, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082
+     3101, 3101, 3101, 3101, 3101, 3101, 3095, 3095, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3095, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3095, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101, 3101,
+     3101, 3101, 3101, 3095, 3101, 3101, 3095, 3101, 3101, 3101,
+     3101, 3101, 3095, 3101, 3101, 3101, 3101, 3101, 3101, 3095,
+     3101, 3101, 3101, 3095, 3101, 3095, 3095, 3101, 3101, 3101,
+     3101, 3101, 3095, 3095,    0, 3095, 3095, 3095, 3095, 3095,
 
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095
     } ;
 
-static const flex_int16_t yy_nxt[6057] =
+static const flex_int16_t yy_nxt[6074] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   14,   18,   20,   21,   22,   23,   24,   25,   26,
@@ -1590,523 +1594,525 @@ static const flex_int16_t yy_nxt[6057] =
       757,   71,   71,  760,   71,  762,  764,  766,   71,  763,
        71,  765,   71,  771,   71,  768,   71,   71,   71,   71,
        71,  767,  774,   71,  776,  773,  780,  777,   71,  769,
-      770,  778,   71,  772,   71,   71,  783,   71,  775,  782,
+      770,  778,   71,  772,   71,   71,  784,   71,  775,  782,
 
-       71,  784,   71,   71,  785,   71,  779,  781,   71,   71,
-      787,  789,   71,   71,   71,   71,   71,   71,  795,  788,
-      796,   71,  786,  790,   71,   71,  797,   71,   71,   71,
-      791,  792,  804,  793,   71,  794,  798,   71,   71,   71,
-      799,  802,   71,   71,   71,  800,   71,  801,  809,  803,
-       71,  805,   71,   71,  806,   71,   71,   71,  807,   71,
-      143,  816,  808,   71,  810,   71,  811,   71,  818,  819,
-      812,  813,  814,  817,  815,   71,  820,  822,   71,   71,
-       71,   71,   71,  823,   71,   71,  821,   71,   71,  827,
-      828,  829,  830,  831,  826,  824,   71,   71,   71,  825,
+       71,  785,   71,   71,  786,   71,  779,  781,   71,  783,
+      788,   71,   71,  790,   71,   71,   71,   71,  796,  789,
+       71,  797,  787,  791,   71,   71,   71,   71,   71,  798,
+      792,   71,  793,   71,  794,   71,  795,   71,  805,   71,
+      799,  800,   71,  803,   71,  801,   71,  802,  804,  806,
+      810,  807,   71,   71,   71,   71,  808,   71,   71,   71,
+      819,  809,   71,  817,   71,   71,  820,   71,   71,  812,
+      811,   71,  813,  814,  815,   71,  816,   71,  818,  822,
+      824,  823,   71,   71,  821,   71,   71,  825,   71,   71,
+      828,  829,  830,  831,  832,  827,  826,   71,   71,   71,
 
-       71,   71,   71,  152,  833,   71,  840,  834,  838,  836,
-       71,   71,   71,  839,  832,  835,   71,  837,   71,   71,
-       71,  842,  846,   71,   71,  841,   71,  847,  849,   71,
-      852,  843,  844,  850,   71,  848,   71,   71,   71,  851,
-      845,  854,   71,   71,   71,  858,   71,   71,   71,   71,
-      855,   71,  859,  860,  853,   71,   71,   71,   71,   71,
-       71,  857,  873,  876,   71,  861,  872,  856,   71,  863,
-      870,   71,   71,  862,   71,  871,  875,  874,   71,  864,
-       71,  877,  880,  865,   71,  878,  866,   71,  882,  879,
-       71,  883,   71,  867,  868,  891,  869,   71,   71,   71,
+       71,   71,  152,   71,   71,  834,  840,  839,  835,   71,
+      837,   71,   71,  841,  836,  833,  838,   71,   71,   71,
+       71,  843,  847,   71,   71,  842,   71,  848,  850,   71,
+      853,   71,  844,  845,   71,  849,   71,   71,   71,  846,
+      851,  855,   71,  852,   71,  857,  859,   71,   71,   71,
+      856,  861,   71,   71,  854,  860,   71,   71,   71,   71,
+      858,   71,   71,  874,  143,   71,  862,  873,  875,  877,
+       71,  871,   71,  864,  863,   71,  872,  876,   71,  878,
+      865,   71,  879,  880,  866,   71,   71,  867,  881,   71,
+      884,   71,   71,   71,  868,  869,   71,  870,  892,  882,
 
-       71,  881,   71,  884,  885,   71,  886,  897,  895,  887,
-      896,   71,   71,  892,  888, 3082,  893,   71,  898,   71,
-      889,  890,   71,  900,  894,   71,   71,  899,   71,  902,
-      901,  904,   71,  903,   71,   71,  905,   71,  907,   71,
-       71,  908,   71,   71,  912,   71,   71,  906,  911,   71,
-       71,  915,   71,   71,  921,   71,  919,  932,   71,  909,
-      913,  910,   71,  914,  916,  917,   71,  922,  933,   71,
-       71,  920,  923,   71,  918,  924,  925,  926,   71,   71,
-      928,  929,   71,   71,  927,   71,   71,   71,   71,   71,
-       71,  930,   71,   71,   71,  931,  934,  936,  939,   71,
+       71,   71,  897,   71,  896,   71,  883,   71,  885,  886,
+      893,  887,  898,   71,  888,   71,  895,  906,  894,  889,
+       71,  899,   71,  901,   71,  890,  891,   71,  900,  902,
+      903,   71,  905,   71,   71,   71,  904,   71,   71,   71,
+       71,  909,   71,  913,   71,   71,  907,  912,   71,   71,
+      916,   71,   71,   71,  908,  920,  918,  977,  910,  911,
+      914,   71,  915,   71,  922,   71,  923,  926,  921,  917,
+       71,  924,   71,   71,  919,  925,  927,   71,   71,  929,
+      930,   71,   71,  928,   71,   71,   71,  931,  933,   71,
+      934,   71,  932,   71,  935,   71,   71,   71,  940,   71,
 
-      937,   71,   71,  940,   71,  942,   71,  935,   71,  938,
-      941,   71,   71,  944,   71,  945,   71,  947,   71,  949,
-      943,   71,   71,  948,   71,   71,  950,   71,  957,  955,
-       71,   71,  946,  953,  956,   71,  951,   71,  954,   71,
-       71,   71,  964,  952,  962,  958,  960,  965,   71,   71,
-      959,   71,  963,   71,   71,   71,  967,   71,   71,   71,
-       71,   71,   71,  961,   71,  975,   71,  978,  973,   71,
-      966, 1218,   71,   71,  968,  969,  971,  970,  972,   71,
-      976,  979,   71,  974,   71,  977,   71,   71,  981,   71,
-      983,  980,  985,  986,   71,   71,  982,   71,   71,   71,
+      937,   71,  943,  938,   71,   71,   71,   71,   71,   71,
+      941,  936,  942,   71,   71,  945,  939,   71,  946,  948,
+      950,   71,  949,   71,  944,   71,  951,   71,   71,  956,
+       71,  947,   71,  958,  957,   71,  954,  952,   71,   71,
+       71,  955,   71,   71,   71,  959,  964,   71,  961,  966,
+      953,  967,   71,   71,  965,   71,   71,  960,  969,   71,
+      963,   71,   71,   71,  962,  968,   71,   71,   71,  980,
+       71,   71,  975,   71,   71,   71,  970,   71,  973,  971,
+      981,  972,  974,  985,  984,  978,  982,  979,   71,  976,
+       71,   71,  983,  988,   71,  987,   71,   71,   71,   71,
 
-      984,   71,   71, 3082,  988,   71,  990,  995,  996,  987,
-       71,   71,  998,   71,   71,   71, 1000,  989,   71,  991,
-     1001,  993,   71,  992,  997,  994,   71,   71,   71,   71,
-       71,  999, 1002,   71, 1003, 1006,   71, 1008, 1009, 1004,
-       71,   71, 1013, 1010,   71,   71,   71, 1005,   71,   71,
-     1007, 1011, 1015,   71, 1012,   71, 1018,  152,   71,   71,
-     1017,   71, 1021, 1020, 1016, 1014,   71,   71,   71,   71,
-       71, 1022, 1024, 1019,   71,   71,   71, 1036,   71,   71,
-       71,   71, 1037,   71, 1027, 1041, 1023, 1025, 1039,   71,
-       71,   71,   71, 1026, 1028, 1038, 1029,   71, 1042, 1059,
+       71,   71,  986,   71,  997,  990,  992,  998, 1000,   71,
+       71,  989,   71,   71,   71, 1002,   71,  991, 1003,  993,
+      995,   71,  994,  996,   71,   71,  999,   71,   71, 1001,
+       71, 1004,   71, 1008, 1011, 1005,   71, 1006,   71, 1010,
+       71,   71, 1015,   71, 1012, 1007, 1017,   71,   71, 1014,
+     1013, 1009,   71,   71, 1020,  152,   71,   71, 1019,   71,
+     1023, 1022,   71, 1016,   71,   71,   71,   71,   71, 1026,
+     1018, 1021,   71,   71,   71, 1038,   71,   71,   71,   71,
+     1039,   71, 1029, 1043, 1024, 1025, 1027, 1041,   71,   71,
+     1028,   71, 1030, 1040, 1031,   71, 1044, 1062, 1032,   71,
 
-     1030,   71, 1031, 1182, 1040, 1043, 1032,   71, 1033,   71,
-       71, 1046, 1044, 1034, 1049, 1045, 1047,   71, 1035,   71,
-       71,   71,   71, 1048,   71, 1052, 1050, 1055,   71,   71,
-       71, 1061,   71, 1054, 1051, 1053, 1060,   71, 1056, 1062,
-     1063,   71, 1064, 1058, 1065,   71,   71,   71,   71, 1057,
-       71,   71,   71,   71, 1066,   71,   71, 1077,   71,   71,
-     1080, 1081,   71, 1076,   71, 1067, 1068,   71, 1069, 1078,
-     1079,   71, 1082, 1070, 1144, 1071, 1083,   71, 1086,   71,
-       71, 1072, 1088,   71, 1087,   71, 1073, 1074,   71,   71,
-     1084, 1092, 1089, 1075,   71,   71, 1085,   71, 1091, 1093,
+     1033, 3095, 1042, 1045, 1034,   71, 1035,   71,   71, 1048,
+     1046, 1036, 1051, 1047, 1049,   71, 1037,   71,   71,   71,
+       71, 1050,   71, 1054, 1052, 1057,   71,   71,   71, 1063,
+       71, 1056, 1053, 1055, 1064,   71, 1058, 1061, 1065,   71,
+       71, 1060,   71, 1066, 1067,   71,   71, 1059,   71,   71,
+       71,   71, 1068,   71, 1079,   71,   71,   71, 1078,   71,
+     1082, 1069, 1083, 1070,   71, 1071,   71, 1080, 1081, 1085,
+     1072, 1104, 1073,   71, 1084,   71, 1088,   71, 1074,   71,
+     1090,   71, 1091, 1075, 1076, 1089,   71,   71,   71, 1094,
+     1077,   71, 1086,   71, 1087,   71, 1095,   71,   71,   71,
 
-       71,   71, 1090,   71,   71, 1098,   71,   71,   71, 1095,
-     1096,   71, 1101, 1099, 1094,   71,   71,   71,   71, 1097,
-       71,   71,   71,   71,   71, 1100, 1106, 1108, 1102, 1103,
-     1105, 1107, 1110,   71,   71,   71, 1104, 1109,   71, 1111,
-       71,   71, 3082,   71, 1113,   71,   71, 1112, 1118, 1115,
-     1119, 1120,   71, 1114,   71, 1122, 1117, 1123, 1116,   71,
-       71, 1121, 1126,   71,   71,   71, 1128, 1127,   71, 1129,
-       71,   71, 1124, 1130,   71,   71, 1125, 1137, 1131,   71,
-       71,   71, 1139,   71,   71,   71,   71, 3082,   71,   71,
-     1133, 1132, 1135, 1134, 1141, 1136,   71, 1150,   71, 1140,
+       71, 1093,   71, 1100,   71,   71, 1092, 1097, 1098,   71,
+     1103, 1101, 1096, 1099,   71,   71,   71,   71, 1105, 1102,
+       71,   71,   71, 1112,   71, 1108, 1109, 1107, 1110,   71,
+       71,   71,   71,   71, 1106, 1114,   71, 1111,   71,   71,
+     1113,   71,   71, 1120, 1121, 1117, 1122,   71, 1119, 1125,
+     1115, 1116,   71, 1124, 1118,   71, 1123,   71, 1127, 1128,
+       71,   71,   71, 1130, 1129,   71, 1131,   71,   71,   71,
+     1126, 1132,   71,   71, 1133,   71, 1139,   71, 1141,   71,
+       71, 1134,   71, 1135,   71, 1137,   71, 1136, 1138,   71,
+     3095, 1143, 1142, 1144,   71, 1140,   71, 1145,   71,   71,
 
-     1142, 1138,   71, 1145,   71, 1143,   71,   71,   71, 1146,
-       71, 1148, 1147, 1149,   71, 1154, 1151, 1155,   71,   71,
-     1153,   71,   71, 1152,   71,   71, 1159, 1158, 1156,   71,
-       71,   71,   71,   71,   71, 1163, 1165, 1166, 1170, 1167,
-     1157,   71,   71,   71,   71,   71, 1164, 1160,   71, 1161,
-     1168, 1162,   71, 1169, 1173,   71,   71, 1175,   71, 1171,
-       71, 1174,   71,   71, 1176,   71,   71,   71,   71, 1180,
-     1181, 1177, 1172,   71,   71,   71, 1186, 1187, 1190,   71,
-       71, 1178,   71,   71, 1179, 1184, 1183,   71,   71,   71,
-     1188, 1194, 1189, 1185,   71,   71,   71,   71,   71, 1191,
+       71, 1146,   71, 1147, 1148, 1149,   71, 1151, 1153, 1150,
+       71, 1152,   71,   71, 1157,   71, 1154, 1158,   71, 1156,
+       71,   71,   71,   71, 1159, 1161,   71, 1162, 1155,   71,
+       71,   71,   71,   71, 1166,   71, 1168, 1169, 1170, 1160,
+     1171, 1163,   71,   71,   71, 1167, 1173,   71, 1164, 1172,
+     1165,   71,   71, 1176,   71,   71, 1178,   71,   71,   71,
+     1177,   71,   71, 1179,   71, 1174,   71, 1180,   71, 1183,
+       71, 1175,   71, 1184,   71, 1185, 1189, 1190,   71, 1181,
+       71, 1182,   71,   71, 1187,   71, 1186, 1193,   71,   71,
+     1192,   71,   71, 1188, 1197, 1191,   71, 1194,   71,   71,
 
-       71, 1193, 1192, 1200,   71, 1196,   71,   71,   71,   71,
-     1206,   71, 1195, 1204,   71,   71, 1197, 1221,   71, 1199,
-     1201, 1203, 1202, 1198, 1205, 1208, 1209,   71,   71, 1211,
-       71,   71,   71, 1210, 1207, 1212,   71,   71,   71,   71,
-       71,   71,   71, 1215,   71,   71,   71,   71,   71,   71,
-     1213, 1214, 1225, 1251, 1216,   71, 1219, 3082, 1222, 1217,
-     1227, 1220, 1224, 1223,   71, 1231,   71,   71, 1226, 1228,
-       71, 1229, 1232, 1234, 1230, 1233,   71,   71,   71,   71,
-     1236,   71,   71,   71, 1235,   71,   71, 1240, 1239,   71,
-     1243,   71, 1246,   71,   71, 3082,   71, 1237, 1242, 1238,
+       71,   71,   71, 1195, 1196, 1199, 1203,   71,   71, 1198,
+       71,   71,   71, 1209,   71,   71, 1204, 1207, 1200, 3095,
+     1202, 1211, 1206, 1205, 1208, 1201, 1212,   71,   71,   71,
+       71, 1210,   71, 1213,   71, 1215, 1214,   71,   71,   71,
+       71,   71,   71, 1216, 1218,   71, 1224,   71, 1221,   71,
+       71, 1217,   71, 1219,   71,   71,   71, 1222, 1351, 1220,
+     1228,   71, 1234, 1225, 1223,   71,   71, 1227, 1226,   71,
+     1230, 1235, 1236,   71,   71, 1229, 1237,   71,   71, 1231,
+     1239, 1232,   71,   71, 1233,   71,   71,   71, 1238,   71,
+     1243,   71, 1242,   71, 1246, 1249,   71, 1240,   71, 1245,
 
-     1244, 1247, 1241,   71,   71,   71,   71,   71, 1248, 1250,
-     1245,   71,   71,   71, 1249, 1252,   71,   71,   71,   71,
-     1253,   71, 1254, 1258, 1256,   71,   71,   71, 1257, 1259,
-     1255, 1263,   71,   71,   71,   71,   71, 1260, 1268, 1262,
-     1261, 1264, 1267, 1270,   71,   71,   71, 1265, 1269, 1274,
-     1272,   71, 1266,   71, 1275,   71, 1271,   71, 1273,   71,
-       71, 1279,   71, 1288,   71, 1289, 1287, 1277,   71,   71,
-     1276,   71, 1278,   71, 1292, 1286, 1290, 1291, 1280,   71,
-       71, 1281, 1282,   71, 1293,   71, 1283,   71, 1294,   71,
-     1295,   71, 1284,   71, 1297,   71, 1285,   71, 1298,   71,
+     1241,   71, 1247, 1250,   71, 1244, 1251,   71,   71,   71,
+       71, 1254, 1248, 1253,   71,   71,   71,   71, 1255,   71,
+       71,   71,   71,   71, 1252, 1256, 1261,   71, 1259, 1257,
+       71,   71, 1260, 1262, 1258,   71, 1266,   71, 1271, 1263,
+       71, 1265, 1267, 1264,   71,   71, 1270,   71,   71,   71,
+       71, 1268,   71, 1273, 1272, 1269, 1277, 1275,   71,   71,
+     1276, 1278,   71,   71, 1280,   71, 1282, 1274, 1279,   71,
+     1322, 1281,   71, 1291,   71, 1292, 1289, 1283, 1290,   71,
+     1284, 1285,   71,   71, 1295, 1286,   71, 1293,   71,   71,
+       71, 1287, 1294, 1296, 1297, 1288,   71, 1298,   71, 1300,
 
-     1299,   71,   71,   71, 1316,   71, 1296, 1300, 1302, 1301,
-     1304,   71, 1307, 1308,   71, 1305, 1309, 1303,   71,   71,
-     1306,   71,   71, 1311,   71, 1310, 1317, 1318, 1312,   71,
-     1313,   71, 1314, 1319, 1315, 1320,   71,   71, 1324, 1321,
-       71,   71,   71, 1325,   71,   71, 1323, 1328,   71, 1326,
-       71,   71,   71,   71, 1322, 1334,   71, 1330,   71, 1329,
-       71,   71,   71, 1327,   71, 1335, 1333, 1337, 1336, 1331,
-     1332,   71, 1339,   71, 1341,   71, 1338, 1344,   71,   71,
-     1343,   71, 1340, 1346,   71,   71,   71, 1342, 1347,   71,
-     1349,   71, 1348,   71, 1345, 1352,   71, 1354,   71,   71,
+       71,   71,   71, 1301,   71, 1302,   71, 1299,   71,   71,
+       71, 1310, 1311, 1305, 1307, 3095,   71,   71,   71,   71,
+     1304, 1303, 1308,   71, 1312, 1314, 1306, 1313, 1309,   71,
+     1315,   71, 1316, 1323, 1317,   71, 1318,   71, 1319, 1320,
+     1321,   71,   71, 1327,   71,   71, 1324,   71, 1328,   71,
+     1326,   71, 1331, 1325, 1329,   71,   71,   71,   71,   71,
+     1338, 1337,   71,   71, 1333, 1332, 1330,   71,   71,   71,
+     1339,   71, 1336, 1341,   71, 1334, 1335, 1340,   71,   71,
+     1343, 1344,   71, 1342, 1348,   71,   71, 1347, 1350,   71,
+       71,   71,   71, 1352,   71,   71, 1345, 1353, 1356,   71,
 
-     1350,   71, 1351,   71, 1355,   71, 1356, 1359,   71,   71,
-       71, 1353,   71, 1361,   71,   71,   71,   71, 1365, 1363,
-     1357,   71,   71,   71, 1364, 1367, 1358,   71, 1369, 1360,
-       71,   71, 1362,   71, 3082, 1366, 1368,   71, 1371, 1372,
-       71, 1370, 1373,   71, 1375, 1374,   71,   71, 1377,   71,
-       71, 1376, 1381, 1378, 1382, 1384, 1379,   71,   71,   71,
-       71,   71, 1383, 1380,   71,   71, 1388,   71, 1385,   71,
-       71,   71, 1392, 1393,   71, 1395, 1387,   71,   71,   71,
-     1394,   71,   71, 1386,   71,   71,   71,   71, 1402, 1389,
-     1390, 1396,   71,   71, 1391,   71, 1399, 1397,   71, 1400,
+       71, 1349,   71, 1355, 1346, 1358,   71,   71, 1359,   71,
+     1354, 1363,   71,   71, 1360, 1357,   71,   71,   71, 1365,
+       71, 1361,   71, 1362, 1369, 1367,   71, 1368,   71,   71,
+       71, 1371,   71, 1364, 1373,   71,   71, 1366,   71,   71,
+     1375, 1377,   71, 1378, 1370, 1372, 1374, 1376,   71, 1379,
+       71,   71,   71,   71,   71, 1380, 1385, 1382, 1386, 1383,
+     1381, 1388,   71,   71,   71,   71, 1384,   71, 1387,   71,
+     1392,   71,   71, 1390, 1389,   71,   71, 1396, 1397,   71,
+     1391, 1399,   71,   71,   71, 1398,   71,   71,   71,   71,
+       71,   71, 1393,   71, 1406, 1394, 1400,   71,   71, 1395,
 
-     1407,   71, 1398, 1406, 1401,   71,   71,   71,   71, 1411,
-       71, 1409, 1403, 1405, 1412,   71,   71, 1414, 1404,   71,
-       71,   71, 3082,   71, 1416,   71, 1410, 1415, 1408,   71,
-     1420, 1422, 1424, 1421, 1413, 1417, 1418, 1423,   71, 1419,
-       71,   71, 1427,   71, 1425,   71,   71, 1428,   71,   71,
-       71,   71, 1426,   71, 1432, 1433,   71,   71, 1435,   71,
-       71,   71, 1429,   71, 1431,   71, 1440, 1441,   71, 1434,
-       71, 1430,   71, 1437, 1444, 1438, 1436,   71, 1439, 1442,
-       71,   71, 1445,   71,   71,   71,   71, 1443,   71,   71,
-     1451, 1446, 1448, 1452, 1453, 1447,   71,   71, 1449,   71,
+     1403,   71, 1401, 1404,   71,   71, 1402,   71, 1405, 1410,
+     1413, 1407, 1411,   71, 1415,   71, 1409,   71,   71, 1416,
+       71,   71, 1408,   71, 1412, 1419, 1414, 1418,   71,   71,
+       71,   71, 1426, 1417, 1424, 1420, 1428, 1425, 1421,   71,
+       71,   71,   71, 1422, 1429, 1427, 1423, 1431,   71,   71,
+     1430,   71, 1432,   71,   71,   71, 1436,   71,   71, 1437,
+     1433,   71, 1439,   71,   71,   71, 1444, 1435,   71,   71,
+       71, 1448, 1445, 1438, 1434, 1441,   71,   71, 1440,   71,
+       71, 1442, 1443,   71,   71,   71,   71, 1446, 1449, 1447,
+       71, 1455,   71,   71, 1451,   71,   71, 1456, 1450, 1452,
 
-     1456,   71,   71, 1450,   71, 1455, 1454, 1458, 1461, 1460,
-     1462,   71, 1457,   71,   71, 1466,   71,   71, 1463,   71,
-     1464, 1465,   71, 1459,   71,   71,   71,   71,   71, 1472,
-       71, 1468,   71, 1467, 1471,   71,   71,   71, 1478, 1469,
-     1474, 1470, 1475, 1479,   71,   71, 1480,   71, 1483, 1476,
-     1473, 1481,   71,   71,   71, 1477,   71,   71,   71,   71,
-       71, 1487, 1491,   71,   71, 1482, 1486,   71,   71, 1492,
-     1494,   71, 1484, 1485,   71, 1497,   71, 1488, 1490, 1489,
-     1496,   71,   71,   71,   71,   71, 1495,   71,   71, 1493,
-     1498,   71,   71, 1505,   71, 1508,   71, 1506,   71, 1502,
+     1453, 1457, 1454,   71, 1459,   71, 1460,   71, 1461, 1462,
+     1458,   71, 1465, 1466,   71, 1467, 1464,   71,   71,   71,
+       71, 1468, 1469,   71,   71,   71, 1471,   71, 1463, 1470,
+       71,   71,   71, 1476,   71,   71,   71,   71, 1475,   71,
+       71, 1473, 1472, 1478, 1479, 1474, 1482,   71, 1487,   71,
+     1480, 1483,   71, 1484, 1477,   71, 1481,   71, 1485,   71,
+     1486,   71,   71,   71,   71, 1495, 1490, 1491, 1488,   71,
+       71,   71, 1498,   71, 1489, 1496,   71,   71,   71,   71,
+     1492, 1501, 1494, 1493,   71, 1500,   71,   71,   71,   71,
+     1506,   71, 1499,   71, 1509, 1497, 1502,   71, 3095,   71,
 
-     1507, 1499, 1500, 1501, 1509,   71, 1504,   71, 1503,   71,
-       71, 1512, 1510, 1511,   71,   71,   71, 1515,   71, 1513,
-       71, 1516,   71,   71,   71, 1519, 1525, 1514, 1523,   71,
-       71, 1520,   71,   71, 1517, 1524, 1518, 1527,   71, 1522,
-       71,   71, 1521, 1528, 1529, 1530,   71,   71, 1526,   71,
-     1534, 1535,   71,   71,   71,   71,   71,   71, 1539,   71,
-     1538, 1540, 1542,   71,   71, 1532, 1531,   71,   71, 1533,
-       71, 1536,   71, 1543,   71, 1537, 1544,   71,   71, 1541,
-     1545, 1547,   71, 1549, 1546,   71, 1550,   71,   71,   71,
-       71,   71, 1548,   71, 1554,   71, 1556, 1551,   71,   71,
+     1510, 1512,   71, 1503,   71, 1504, 1508, 1505, 1513,   71,
+     1507, 1511,   71,   71,   71,   71,   71, 1514, 1515,   71,
+       71, 1519, 1522,   71, 1517, 1520, 1516,   71, 1523, 1518,
+       71, 1527,   71,   71,   71, 1524, 1529,   71, 1521, 1528,
+       71,   71,   71,   71,   71, 1532, 1526, 1525, 1530,   71,
+     1531,   71, 1537, 1533,   71, 1534,   71, 1539, 1540,   71,
+       71, 1535, 1536,   71,   71,   71, 1544, 1545,   71, 1543,
+     1547,   71,   71,   71, 1538, 1548,   71, 1542, 1541, 1549,
+       71,   71,   71,   71,   71, 1552,   71, 1555, 1546,   71,
+       71,   71, 1550, 1554,   71,   71,   71, 1551,   71, 1559,
 
-     1557,   71, 1561,   71, 1555,   71,   71, 1553, 1552,   71,
-       71, 1558,   71, 1559, 1564, 1566,   71, 1562,   71,   71,
-     1569, 1565, 1567, 1563, 1560,   71,   71,   71,   71,   71,
-     1568, 1572,   71, 1574, 1570,   71, 1571, 1575,   71,   71,
-       71,   71, 1582,   71,   71, 1573, 1577, 1576, 1583,   71,
-       71,   71,   71, 1580, 1578, 1579, 1587,   71,   71, 1586,
-     1589, 1591, 1590,   71, 1584, 1581,   71,   71, 1593, 1585,
-     1595,   71, 1588,   71,   71,   71,   71,   71,   71, 1600,
-     1594, 1597, 1598, 1592,   71, 1601,   71,   71,   71,   71,
-       71, 1612, 1596, 1605,   71, 1606,   71,   71,   71,   71,
+       71, 1561,   71, 1553, 1556, 1562,   71,   71, 1566, 1560,
+     1558, 1557,   71,   71,   71,   71, 1563, 1564, 1569, 1571,
+       71,   71,   71,   71, 1574, 1572, 1567,   71,   71,   71,
+     1570, 1565, 1568, 1577,   71,   71, 1580,   71,   71, 1576,
+     1579,   71, 1573,   71,   71,   71,   71, 1587,   71, 1575,
+       71,   71,   71, 1578,   71, 1582, 1581, 1588, 1585, 1591,
+       71,   71, 1583, 1584,   71, 1592, 1594,   71, 1589, 1596,
+     1586, 1590, 1595, 1598, 1593,   71,   71, 1600,   71,   71,
+       71, 1597,   71,   71,   71,   71, 1605,   71, 1602, 1603,
+     1599,   71, 1606,   71,   71,   71,   71, 1611, 1610, 1601,
 
-     1599, 1602, 1609, 1604, 1603, 1610,   71,   71, 1607, 1608,
-     1614, 1613,   71,   71, 1620,   71,   71, 1611, 1617, 1619,
-       71, 1616, 1621, 1618,   71, 1622, 1615, 1625,   71,   71,
-     1623,   71, 1624,   71,   71,   71,   71, 1627,   71, 1626,
-       71, 1632, 1633, 1631,   71, 1635,   71,   71,   71, 1634,
-       71,   71,   71, 1628,   71, 1629,   71, 1637, 1630, 1638,
-       71, 1639,   71,   71,   71, 1647,   71,   71, 1640, 1636,
-       71,   71,   71,   71, 1641,   71,   71, 1643, 1644, 1645,
-     1652,   71, 1642, 1646,   71,   71, 1648, 1650,   71, 1655,
-     1654, 1656, 1649,   71,   71,   71, 1651,   71,   71,   71,
+       71, 1607,   71,   71,   71,   71, 1624, 1604, 1617, 1609,
+       71, 1608, 1612, 1614,   71,   71, 1615,   71,   71,   71,
+     1618, 1619, 1613, 1633, 1622,   71, 1621, 1626, 1616, 1623,
+     1625,   71, 1630,   71,   71,   71, 1628, 1620,   71, 1627,
+       71, 1629,   71,   71, 1634,   71,   71, 1631, 1637, 1636,
+       71, 1638, 1640,   71,   71, 1639, 1632,   71,   71,   71,
+     1643,   71,   71,   71, 1642, 1635,   71, 1644,   71,   71,
+       71, 1652,   71,   71,   71,   71, 1641,   71,   71,   71,
+       71, 1645,   71, 1648, 1649, 1650, 1646, 1651, 1647, 1657,
+       71,   71, 1653, 1655,   71, 1654, 1659,   71, 1660, 1656,
 
-       71,   71,   71,   71, 1653, 1662, 1660, 1657,   71, 1663,
-     1670,   71, 1664, 1659, 1661, 1672,   71, 1665, 1658, 1669,
-     1671,   71,   71, 1666, 1675,   71,   71, 1668, 1667, 1674,
-       71,   71,   71,   71,   71,   71,   71, 1678, 1679,   71,
-     1673,   71, 1687, 1676,   71, 1682,   71,   71,   71,   71,
-     1677, 1681,   71, 1680, 1690, 1686, 1684,   71, 1683, 1685,
-     1688,   71,   71,   71, 1689,   71, 1692, 1691,   71, 1697,
-       71,   71,   71, 1693, 1694,   71, 1701, 1700,   71,   71,
-     1699,   71,   71, 1696, 1705,   71, 1698, 1709, 1695,   71,
-     1702, 1703, 1710,   71, 1704,   71, 1706,   71,   71, 3082,
+     1658,   71,   71,   71,   71,   71, 1663,   71,   71, 1661,
+       71, 3095, 1665,   71, 1667, 1662, 1675,   71,   71, 1666,
+     1664, 1670, 1668, 1671,   71, 1669,   71, 1674, 1672, 1676,
+       71,   71, 1680,   71, 1679, 1673, 1678,   71, 1677,   71,
+       71,   71,   71,   71,   71, 1683, 1684,   71,   71, 1692,
+     1681, 1693,   71, 1687,   71,   71,   71, 1689, 1682, 1686,
+     1690, 1685,   71, 1691,   71,   71, 1688,   71,   71,   71,
+       71,   71, 1702,   71,   71, 1695, 1694,   71, 1760, 1697,
+     1699,   71, 1696, 1698,   71,   71, 1704,   71, 1701, 1703,
+     1705,   71, 1706, 1708, 1700,   71, 1709,   71, 1714, 1711,
 
-       71, 1715, 1707, 1708, 1712, 1714, 1718,   71,   71, 1711,
-     1717,   71,   71, 1719, 1720,   71, 1716,   71,   71, 1713,
-       71, 1721, 1724,   71,   71, 1728,   71, 1726,   71,   71,
-       71,   71, 1723, 1727, 1729,   71, 1725, 1722,   71,   71,
-       71,   71,   71, 1732, 1738,   71,   71, 1733, 1730, 1731,
-       71, 1740, 1734, 1735, 1741, 1736, 1737,   71,   71, 1742,
-       71, 1743,   71,   71,   71, 1748, 1739,   71,   71,   71,
-     1744,   71, 1752,   71,   71,   71, 1745, 1747,   71, 1754,
-       71,   71, 1746, 1755, 1750, 1756, 1757, 1751,   71, 1749,
-       71,   71, 1761,   71, 1753,   71,   71, 1758,   71, 1765,
+     1710,   71,   71, 1715,   71,   71, 1707,   71, 1712,   71,
+       71, 1720, 1719, 1722,   71, 1713, 1716,   71, 1723,   71,
+     1717,   71, 1726, 1718,   71,   71, 1724, 1721,   71,   71,
+     1728, 1727, 1730, 1725,   71, 1734,   71,   71,   71, 1732,
+       71,   71,   71, 1729,   71, 1733,   71, 1731, 1735,   71,
+       71,   71, 1738,   71, 1746, 1739, 1736, 1744,   71,   71,
+       71, 1737, 1740, 1741, 1747, 1742,   71, 1743, 1749,   71,
+       71,   71, 1748,   71,   71, 1754,   71,   71,   71, 1745,
+       71,   71, 1758,   71,   71,   71, 1750, 1753,   71, 1751,
+     1761,   71, 1752, 1756,   71,   71, 1757,   71, 1755, 1762,
 
-       71,   71,   71,   71,   71,   71, 1760,   71, 1763, 1767,
-       71,   71, 1772, 1759, 1762, 1766, 1768, 1764,   71, 1769,
-       71,   71, 1770, 1773, 1777, 1771, 1775,   71, 1774, 1776,
-       71, 1778,   71,   71, 1781,   71, 1780,   71, 1779, 1784,
-       71, 1782,   71,   71,   71,   71, 1785, 1783,   71,   71,
-       71,   71,   71,   71, 1790,   71,   71, 1794,   71,   71,
-     1791, 3082,   71, 1800, 1786, 1792, 1788, 1787, 1789,   71,
-     1793, 1795,   71, 1803, 1798,   71, 1797, 1802,   71,   71,
-     1804, 1799,   71,   71, 1796,   71,   71, 1801, 1808,   71,
-     1811, 1812,   71,   71, 1805, 1813,   71,   71, 1806, 1809,
+     1759,   71, 1763, 1766, 1764, 1767,   71, 1765,   71,   71,
+     1768, 1771,   71, 1769,   71,   71,   71,   71,   71, 1778,
+       71, 1773,   71, 1772,   71,   71,   71, 1770, 1774, 1775,
+     1781, 1785, 1779,   71, 1776, 1782,   71,   71, 1777,   71,
+     1780, 1787, 1783, 1784,   71, 1789, 1786,   71, 1788,   71,
+       71,   71, 1790,   71, 1791,   71,   71,   71,   71,   71,
+       71,   71,   71, 1796,   71,   71,   71, 1800, 1797,   71,
+     1806,   71, 1798, 1792, 1794, 1795, 1799, 1793, 1801,   71,
+       71, 1807, 1808,   71, 1803, 1804,   71, 1809,   71,   71,
+     1811, 1802, 1805,   71,   71,   71, 1814,   71, 1817,   71,
 
-       71, 1810,   71, 1807, 1815,   71,   71, 1816, 1819,   71,
-       71, 1821,   71, 1814, 1820, 1822, 1823,   71, 1817, 1825,
-     1824, 1818,   71,   71,   71,   71, 1830, 1827, 1828,   71,
-       71, 1829,   71,   71,   71,   71, 1837,   71, 1839,   71,
-       71,   71,   71, 1840,   71, 1831, 1832, 1833, 1826,   71,
-       71, 1842, 1834, 1841, 1835, 1836, 1844, 1838, 1845,   71,
-     1847, 1843,   71,   71,   71, 1849,   71,   71, 1846,   71,
-     1851,   71,   71, 1854, 1855,   71,   71, 1857,   71,   71,
-       71,   71,   71, 1848, 1863,   71, 1862, 1852,   71, 1850,
-     1859, 1860,   71, 1853,   71,   71, 1856,   71,   71,   71,
+     1810,   71, 1812, 1815, 3095, 1816, 1818,   71, 1813, 1819,
+       71, 1821,   71,   71, 1822, 1820, 1825,   71, 1827,   71,
+     1823, 1829, 1824, 1826,   71,   71,   71,   71, 1828, 1831,
+       71,   71, 1834,   71, 1833,   71,   71, 1835,   71, 1836,
+       71,   71, 1843,   71, 1830,   71,   71,   71,   71, 1848,
+     1837, 1838, 1839, 1845,   71, 1832,   71, 1840, 1846,   71,
+     1841, 1842,   71, 1844, 1851,   71, 1853, 1849, 1847,   71,
+       71, 1855,   71,   71, 1852,   71, 1857, 1850,   71,   71,
+       71, 1860, 1861,   71,   71, 1863,   71,   71,   71,   71,
+     1854,   71, 1869,   71,   71,   71, 1868, 1865, 1858, 1856,
 
-     1869, 1861,   71, 1867, 1858, 1866,   71,   71, 1873, 1864,
-     1865,   71, 1872,   71,   71, 1876, 1878,   71, 1877,   71,
-     1875,   71, 1871, 1868,   71,   71,   71,   71, 1870,   71,
-     1879, 1874,   71,   71,   71, 1880, 1884,   71, 1887, 1881,
-       71, 1883, 1888, 1889,   71,   71, 1882,   71,   71,   71,
-     1885, 1892,   71,   71,   71, 1891, 1897,   71, 1896,   71,
-     1886,   71,   71,   71, 1890, 1894, 1901, 1893,   71, 1902,
-     1904,   71,   71, 1898, 1895,   71, 1899, 1903, 1900, 1905,
-     1908,   71,   71, 1906,   71,   71,   71,   71, 1907,   71,
-     1915, 1912,   71,   71, 1918,   71,   71, 1917, 1910,   71,
+     1866, 1859,   71,   71, 1862,   71,   71,   71, 1875,   71,
+     1867,   71, 1864, 1872, 1873, 1870,   71,   71, 1871, 1879,
+     1882, 1874, 1878,   71,   71,   71,   71, 1877, 1883, 1885,
+     1881, 1884,   71,   71,   71, 1876, 1880,   71,   71,   71,
+       71,   71, 1886, 1890,   71,   71, 1893, 1894, 1895,   71,
+     1889,   71,   71,   71,   71,   71, 1898, 1887, 1888, 1891,
+       71,   71,   71, 1903,   71,   71, 1897, 1902,   71, 1896,
+     1892, 3095, 1899,   71,   71, 1900,   71, 1907,   71, 1908,
+     1904,   71, 1901, 1905, 1906, 1910,   71, 1909, 1911,   71,
+     1912,   71, 1915,   71,   71, 1916,   71,   71,   71,   71,
 
-     1919,   71,   71, 1909, 1911, 1920,   71, 1913, 1916, 1914,
-       71, 1921, 1925,   71, 1926,   71,   71, 1922, 1927, 1929,
-     1930,   71, 1923, 1928,   71,   71,   71,   71, 1934,   71,
-     1924,   71, 1932, 1933,   71, 1936,   71,   71, 1939,   71,
-     1941, 1935, 1931,   71,   71,   71,   71,   71, 1937,   71,
-       71,   71, 1947, 1946, 1945, 1942,   71, 1943, 1948,   71,
-     3082, 1940, 1938, 1949,   71, 1951, 1944,   71,   71,   71,
-       71,   71,   71, 1952, 1953, 1956, 1950, 1955, 1954,   71,
-       71,   71, 1957,   71, 1959,   71,   71, 1963,   71,   71,
-       71, 1962, 1958, 1960,   71, 1965,   71, 1961, 1964, 1966,
+     1922,   71, 1913, 1919,   71,   71,   71, 1914, 1917, 1924,
+     1925,   71,   71, 1926,   71, 1918, 1923, 1920, 1927, 1921,
+       71,   71, 1932,   71, 1936, 1931, 1933,   71, 1934, 1928,
+       71,   71, 1929, 1935,   71, 1937,   71, 1930,   71, 1941,
+       71,   71,   71, 1939,   71,   71, 1943,   71, 1940, 1946,
+       71,   71, 1942, 1948,   71,   71, 1944, 1938,   71,   71,
+       71,   71, 1949,   71, 1953, 1952, 1950,   71, 1954, 1955,
+       71, 3095, 1945, 1947, 1956,   71, 1958, 1951,   71,   71,
+       71,   71,   71, 1957, 1959, 1960,   71, 1961, 1962,   71,
+       71, 1963, 1964,   71, 1966,   71,   71,   71,   71, 1970,
 
-     1967,   71,   71,   71,   71,   71,   71,   71, 1974, 1972,
-       71, 1969, 1973,   71,   71,   71, 1968,   71,   71, 1976,
-       71, 1970,   71, 1971, 1975,   71, 1979, 1982, 3082, 1978,
-       71, 1977,   71, 1983, 1985, 1981,   71, 1980,   71, 1984,
-       71, 1986,   71, 1987, 1989,   71,   71,   71,   71, 1988,
-     1990, 1995,   71,   71, 1997,   71, 1991,   71, 1992, 1999,
-       71, 1993, 1994,   71,   71, 1998,   71,   71, 2003, 1996,
-       71,   71, 2000, 2001,   71, 2002,   71,   71,   71, 2004,
-       71,   71,   71,   71,   71,   71, 2006, 2011, 2007, 2008,
-     2015,   71, 2005,   71,   71, 2010, 2014, 2018, 2019,   71,
+       71,   71, 1965, 1969,   71,   71, 1971, 1967, 1968, 1972,
+     1973, 1974,   71,   71,   71,   71,   71,   71,   71, 1981,
+     1979, 1975, 1976, 1980,   71,   71,   71,   71,   71, 1986,
+       71,   71, 1977, 1983, 1978, 1982,   71,   71, 1990,   71,
+     1987, 1985,   71, 1992, 1984, 1989,   71,   71, 1988, 1996,
+       71, 1991, 1994,   71,   71,   71, 1997,   71, 2002, 1995,
+     1993,   71,   71,   71,   71,   71, 2004,   71,   71, 2005,
+     1998, 1999, 2000, 2006,   71, 2001, 2007,   71,   71, 2003,
+       71, 2010,   71, 2009, 2008,   71,   71, 2011,   71,   71,
+       71,   71,   71,   71, 2022,   71,   71, 2013, 2014, 2018,
 
-     2012, 2016, 2013,   71, 2009, 2017,   71,   71, 2021, 2022,
-       71,   71,   71,   71,   71, 2024,   71,   71, 2025, 2020,
-       71, 2026, 2030, 2028, 2023,   71,   71, 2032, 2029, 2034,
-       71, 2027,   71,   71,   71,   71, 2031, 2037, 2036, 2038,
-     2033,   71,   71,   71, 2042,   71, 2039,   71,   71,   71,
-       71,   71, 2043, 2045, 2048,   71,   71, 2049, 2035,   71,
-     2040, 2044,   71, 2041, 2052, 2047,   71,   71, 2046, 2054,
-       71, 2053,   71,   71, 2050, 2058,   71,   71, 2060,   71,
-       71, 2056, 2051,   71, 2061,   71,   71,   71,   71, 2057,
-     2055, 2059, 2063,   71, 2062, 2067, 2069, 2065, 2064,   71,
+     2015,   71,   71, 2012, 2021, 2017,   71, 2026,   71, 2025,
+     3095, 2020, 2019,   71, 2023, 2016,   71,   71, 2028, 2029,
+       71, 2024,   71,   71,   71, 2031,   71,   71, 2027, 2032,
+       71,   71, 2033, 2037, 2030, 2035,   71,   71, 2039, 2036,
+     2041,   71, 2034,   71,   71,   71, 2044,   71,   71, 2038,
+     2043, 2040, 2045, 2046,   71,   71, 2049,   71,   71,   71,
+       71,   71,   71, 2050,   71, 2055,   71, 2052,   71, 2042,
+     2051, 2059, 2047,   71, 2056, 2048, 2057,   71, 2054, 2053,
+       71,   71,   71, 2061,   71, 2060,   71,   71, 2058, 2065,
+       71,   71, 2067,   71, 2063,   71, 2066,   71, 2068,   71,
 
-     2066, 2070,   71,   71,   71,   71,   71, 2068, 2071,   71,
-     2074, 2075,   71,   71,   71, 2072, 2073, 2079,   71,   71,
-       71,   71, 2076, 2078,   71,   71,   71,   71,   71,   71,
-       71, 2080, 2077,   71, 2088, 2083, 2082, 2081, 2085, 2084,
-     2086,   71, 2090,   71,   71, 2087, 2089,   71,   71, 2091,
-     2093,   71, 2097, 2094, 2099,   71,   71,   71, 2101,   71,
-     2098,   71, 2092, 2095,   71, 2096, 2100,   71, 2103, 3082,
-       71, 2106, 2104, 2108, 2105, 2102, 2107,   71, 2109,   71,
-       71,   71,   71, 2110,   71, 2113,   71,   71, 2114, 2111,
-     2112, 2117, 2118,   71,   71, 2119,   71,   71, 2122,   71,
+     2062,   71, 2064,   71, 2069, 2071, 2070,   71, 2072, 2074,
+     2076, 2073,   71,   71, 2075, 2077,   71,   71,   71,   71,
+       71,   71, 2079, 2085, 2078, 2082, 2083,   71,   71, 2080,
+     2081,   71, 2084, 2087,   71,   71, 2086,   71,   71,   71,
+       71,   71,   71,   71,   71, 2096, 2088, 2097,   71, 2089,
+       71, 2090, 2091, 2093, 2092, 2094,   71, 2095,   71, 2098,
+       71,   71, 2099, 2103, 2101,   71,   71, 2102, 2107,   71,
+       71, 2109,   71,   71, 2106, 2100,   71, 2111, 2104, 2108,
+       71, 2112, 2114, 2116, 2117, 2110, 2105, 2115,   71,   71,
+       71,   71,   71, 2113, 2118,   71, 2121,   71,   71, 2122,
 
-       71,   71, 2115, 2128,   71, 2123,   71, 2124, 2120, 2125,
-       71,   71, 2127, 2116,   71, 2121, 2126,   71,   71,   71,
-       71, 2129, 2132, 2130,   71,   71,   71,   71,   71, 2135,
-       71,   71,   71, 2139, 2141,   71, 2142,   71,   71, 2131,
-     2134,   71,   71, 2133, 2136,   71, 2137, 2138,   71,   71,
-     2144,   71, 2143, 2140, 2146,   71, 2148, 2151,   71,   71,
-     2147, 2149,   71, 2152, 2145,   71,   71, 2150,   71,   71,
-       71,   71,   71, 2162,   71,   71,   71,   71, 2153, 2163,
-       71, 2154,   71, 2159, 2161,   71, 2200, 2157, 2155, 2165,
-     2156, 2158, 2170, 2160,   71, 2164,   71, 2167, 2166, 2168,
+     2119,   71, 2126,   71,   71, 2127,   71,   71, 2130,   71,
+     2125,   71,   71, 2123,   71, 2120, 2131, 2134, 2128,   71,
+     2132, 2133,   71, 2135, 2124, 2129,   71,   71,   71,   71,
+     2136,   71, 2138,   71, 2139,   71, 2140,   71,   71,   71,
+       71,   71, 2143,   71, 2149,   71, 2147, 2137,   71,   71,
+     2142,   71, 2150,   71, 2145,   71, 2141, 2144, 2152,   71,
+     2146,   71,   71,   71, 2151, 2148, 2156, 2154, 2159,   71,
+       71,   71,   71,   71,   71, 2157,   71, 2153, 2155, 2160,
+       71, 2158,   71,   71,   71, 2170,   71,   71,   71, 2161,
+     2171, 2162,   71,   71, 2167, 2165, 2163, 3095, 2164, 2169,
 
-       71, 2169,   71,   71, 2172,   71,   71, 2171, 2175,   71,
-       71, 2176,   71,   71, 2173, 2177,   71, 2174, 2181,   71,
-     2182,   71,   71, 2184,   71,   71, 2186,   71, 2180,   71,
-       71,   71, 2178, 2179,   71, 2188, 2189,   71, 2190,   71,
-       71, 2183,   71, 2185, 2187, 2191,   71,   71, 2193, 2192,
-       71, 2195, 2196,   71, 2198,   71,   71,   71, 2202, 2201,
-       71, 2194, 2204,   71,   71,   71, 2197,   71, 2199, 2208,
-       71,   71,   71, 2203,   71,   71, 2212, 2213,   71, 2205,
-     2206,   71,   71, 2207,   71,   71,   71, 2209,   71, 2211,
-     2215, 2218,   71, 2220, 2210, 2219,   71, 2216,   71, 2217,
+       71, 2166, 2173,   71, 2168, 2172, 2174,   71, 2175, 2176,
+       71, 2177,   71,   71, 2180, 2178, 2179,   71, 2183,   71,
+       71,   71,   71,   71,   71, 2184, 2181, 2185,   71, 2182,
+     2189,   71, 2190,   71, 2192,   71, 2188,   71, 2194,   71,
+       71, 2186,   71, 2187,   71, 2196,   71, 2191, 2197,   71,
+     2198,   71,   71,   71,   71, 2193,   71, 2195, 2199, 2203,
+     2201, 2200, 2204,   71, 2206,   71,   71,   71,   71,   71,
+     2210, 2209, 2202, 2208,   71, 2205, 2212,   71,   71,   71,
+     2216,   71,   71,   71, 2207, 2211,   71,   71, 2221,   71,
+       71, 2220,   71, 2213, 2214,   71,   71, 2215, 2226,   71,
 
-     2214,   71, 2221,   71, 2225,   71,   71, 2227,   71,   71,
-       71, 2228,   71,   71, 2222, 2226, 2223, 2232, 2233,   71,
-       71, 2231,   71,   71,   71,   71, 2229, 2224, 2230, 2237,
-     2239,   71, 2235, 2242,   71, 2234, 2240, 2244, 2241,   71,
-       71, 2236,   71,   71,   71, 2245,   71, 2246, 2238,   71,
-       71,   71, 2249,   71,   71, 2243,   71,   71, 3082, 2248,
-     2250, 2255, 2251, 2252, 2254, 2253, 2256,   71,   71, 2247,
-       71,   71,   71, 2261, 2257,   71, 2260, 2258,   71,   71,
-     2259,   71, 2262,   71, 2266, 2268,   71,   71,   71,   71,
-     2263,   71,   71,   71,   71, 2279,   71, 2270, 2264, 2267,
+     2223, 2219, 2217,   71,   71,   71, 2218, 2224,   71, 2222,
+       71, 2225, 2228,   71,   71, 2233,   71,   71, 2229, 2235,
+       71,   71,   71, 2227,   71, 2234, 2230, 2236, 2231, 2239,
+       71,   71, 2240,   71,   71,   71, 2241,   71, 2242, 2232,
+       71,   71, 2237, 2244, 2238, 2246, 2243,   71, 2247,   71,
+       71, 2251, 2248, 2253, 2249, 2245, 2250,   71, 2252,   71,
+       71,   71,   71,   71,   71, 2254, 2255, 2258,   71,   71,
+       71, 2259,   71,   71, 2264, 2256, 2257, 2260, 2261, 2262,
+       71, 2265,   71,   71,   71,   71, 2263,   71, 2266,   71,
+     2269, 2268, 2270, 2267,   71, 2271,   71,   71,   71, 2275,
 
-     2265, 2271, 2269,   71, 2274,   71, 2275, 2272, 2273,   71,
-     2276,   71, 2280,   71, 2277, 2281,   71,   71, 2283, 2284,
-     2282, 2278, 2285, 2286,   71,   71,   71,   71,   71,   71,
-     2288,   71,   71,   71, 2292, 2293,   71,   71,   71, 2289,
-     2287,   71, 2295,   71, 3082, 2290,   71, 2296,   71, 2297,
-     2294, 2291, 2298,   71,   71,   71,   71, 2300, 2301, 2299,
-     2302, 2303,   71,   71,   71,   71,   71,   71, 2304, 2305,
-       71, 2309,   71, 2312,   71,   71,   71, 2311,   71,   71,
-     2308, 2313,   71, 2306, 2318, 2307,   71, 2316, 2319, 2317,
-     2310,   71, 2314,   71, 2315,   71,   71, 2321,   71,   71,
+     2277,   71,   71, 2272,   71, 2273, 2279, 2274,   71,   71,
+       71,   71, 2276,   71, 2284,   71, 2280, 2278, 2285,   71,
+     3095, 2283, 2288,   71, 2281, 2282,   71, 2289, 2290,   71,
+       71, 2287,   71, 2291, 2293, 2286, 2294, 2292, 2295,   71,
+       71,   71,   71,   71, 2297,   71,   71,   71,   71, 2301,
+     2302,   71,   71,   71, 3095, 2296,   71, 2298, 2304,   71,
+     2299,   71,   71, 2305, 2306, 2303, 2300, 2307,   71,   71,
+       71, 2309, 2310,   71, 2308, 2312,   71, 2311,   71,   71,
+       71,   71,   71, 2313, 2314,   71, 2318,   71, 2321,   71,
+       71,   71, 2320,   71,   71, 2317, 2322,   71, 2315, 2327,
 
-     2324, 2322,   71, 2326,   71, 2320, 2325, 2328,   71,   71,
-       71,   71, 2330,   71,   71,   71, 2327,   71,   71, 2323,
-     2329,   71, 2334, 2338,   71, 2340, 2336,   71, 2331, 2332,
-     2333,   71, 2337, 2339,   71,   71, 2341,   71,   71,   71,
-       71,   71,   71, 2349, 2335, 2344, 2347,   71,   71,   71,
-     2348,   71,   71, 2342, 2346, 2352,   71,   71, 2345,   71,
-     2343,   71, 2353,   71, 2356,   71, 2350, 2351, 2357,   71,
-     2354,   71,   71,   71, 2360, 2355, 2358, 2361,   71, 2359,
-     2362,   71,   71,   71,   71,   71, 3082, 2363, 2366,   71,
-     2368, 2369,   71,   71, 2365, 2364, 2370,   71, 2371,   71,
+     2316,   71, 2325, 2328, 2326, 2319,   71, 2323,   71, 2324,
+       71,   71, 2330,   71,   71, 2333, 2331,   71, 2335,   71,
+     2329, 2334, 2337,   71,   71,   71,   71, 2339,   71,   71,
+       71, 2336,   71,   71, 2332, 2338,   71, 2343, 2347,   71,
+     2349, 2345,   71, 2340, 2341, 2342,   71, 2346, 2348,   71,
+       71, 2350,   71,   71,   71,   71,   71,   71, 2358, 2344,
+     2353, 2356,   71,   71,   71, 2357,   71,   71, 2351, 2355,
+     2361,   71,   71, 2354,   71, 2352,   71, 2362,   71, 2365,
+       71, 2359, 2360, 2366,   71, 2363,   71,   71,   71, 2369,
+     2364, 2367, 2370,   71, 2368, 2371,   71,   71,   71,   71,
 
-     2372,   71,   71,   71, 2367, 2373,   71, 2374, 2375,   71,
-     2376,   71, 2377,   71, 2378,   71, 2382,   71, 2379,   71,
-     2384,   71, 2385,   71,   71,   71,   71,   71,   71,   71,
-       71, 2381,   71, 2380, 2388, 2386,   71, 2387, 2383,   71,
-     2389, 2391, 2394,   71,   71,   71, 2390,   71, 2395, 2392,
-     2393,   71,   71, 2401,   71,   71,   71,   71, 2396,   71,
-     2398,   71,   71, 2402, 2397, 2400,   71, 2410, 3082, 2399,
-     2403, 2404,   71,   71,   71, 2405, 2408, 2411, 2412,   71,
-     2409, 2406, 2413,   71, 2407,   71, 2414,   71, 2415,   71,
-     2416,   71, 2417,   71,   71,   71,   71,   71,   71,   71,
+       71,   71, 2372, 2375, 2379,   71, 2378, 2380,   71, 2374,
+     2373, 2381,   71, 2382,   71,   71,   71,   71,   71, 2376,
+     2377,   71, 2385,   71, 2386,   71, 2387, 2383,   71,   71,
+     2388, 2392,   71, 2389, 2384,   71, 2394,   71, 2395,   71,
+       71,   71,   71,   71,   71, 2391,   71,   71, 2390, 2398,
+       71, 2396, 2401, 2397, 2393, 2399, 2404,   71,   71,   71,
+       71,   71,   71,   71, 2400,   71, 2402, 2405,   71, 2411,
+     2403,   71,   71,   71, 2408,   71,   71, 2410,   71,   71,
+     2407, 2412, 2418, 2415,   71, 2406, 2409, 3095, 2413, 2420,
+     2414,   71, 2419, 2416, 2422,   71, 2421, 2423,   71, 2417,
 
-       71,   71, 2418, 2426,   71,   71,   71, 2424,   71, 2430,
-     2431,   71, 2419, 2421, 2420,   71,   71, 2423, 2422, 2425,
-     2427,   71, 2428, 2429, 2433, 2434,   71,   71, 2432,   71,
-     2435, 2436,   71,   71, 2437,   71, 2439,   71,   71,   71,
-     2445,   71, 2446,   71, 2447, 2438,   71,   71, 2440,   71,
-       71,   71,   71, 2441, 2443, 2442, 2451,   71, 2444,   71,
-       71, 2455, 2449,   71, 2448, 2454, 2456,   71, 2450,   71,
-       71, 2457, 2452, 2458,   71,   71,   71, 2453,   71, 2460,
-       71,   71, 2459,   71,   71, 2464,   71,   71, 2462, 2468,
-     2469,   71,   71,   71, 2461, 2472,   71, 2473, 2463,   71,
+       71, 2424,   71, 2425,   71, 2426,   71,   71,   71,   71,
+       71,   71,   71,   71,   71,   71,   71, 2436, 2428,   71,
+       71,   71, 2434, 3095, 2427,   71, 2440, 2429, 2431, 2430,
+     2441,   71, 2433, 2432, 2435,   71, 2437, 2438, 2439, 2444,
+       71,   71,   71, 2442, 2443, 2446,   71,   71,   71,   71,
+     2445,   71,   71, 2457,   71, 2449,   71, 2455,   71,   71,
+     2447, 2456,   71,   71, 2450, 2448,   71,   71,   71, 2451,
+     2452,   71, 2453, 2454,   71,   71, 2461,   71,   71, 2465,
+     2464, 2458, 2459, 2466,   71, 2460,   71,   71, 2462, 2467,
+     2468,   71,   71,   71, 2463, 2470,   71, 2469,   71,   71,
 
-       71, 2465, 2466,   71, 2467, 2471,   71, 2470, 2476,   71,
-     2475,   71,   71, 2477, 2474, 2481,   71,   71, 2478,   71,
-       71, 2485,   71,   71, 2484, 2487,   71,   71, 2483, 2482,
-       71, 2479, 2480,   71,   71, 2488, 2489, 2492,   71,   71,
-     2493,   71, 2486, 2495,   71,   71, 2491,   71,   71, 2490,
-       71, 2500,   71,   71, 2502,   71,   71, 2498, 2496, 2499,
-     2497, 2503,   71, 2494,   71,   71,   71, 2504, 2501,   71,
-     2506,   71,   71,   71, 2507,   71,   71,   71, 2505,   71,
-     2509, 2510, 2512, 2517, 2513, 2515,   71, 2511, 2508,   71,
-     2514, 2516,   71,   71, 2518,   71, 2521,   71,   71,   71,
+       71,   71,   71, 2474,   71, 2472,   71, 2478, 2479,   71,
+       71, 2471, 2482,   71, 2483, 2480, 2473,   71,   71, 2475,
+     2476,   71, 2477,   71, 2481, 2485, 2486,   71,   71,   71,
+       71, 2487, 2484, 2491,   71,   71,   71,   71, 2488,   71,
+     2494,   71, 2492,   71, 2493, 2495,   71,   71, 2489, 2490,
+     2497,   71, 2498,   71,   71, 2500, 2496, 2503,   71,   71,
+     2504, 2502, 2499, 2506,   71, 2505, 2501,   71,   71,   71,
+       71, 2511,   71,   71, 2513,   71,   71,   71, 2509, 2510,
+     2507, 2508, 2514,   71,   71,   71,   71,   71, 2512, 2515,
+     2516, 2517,   71, 2518,   71,   71, 2520,   71,   71,   71,
 
-     2523,   71,   71, 2522, 2526,   71, 2525, 2527,   71,   71,
-     3082, 2519, 2524, 2520, 2529,   71,   71,   71, 2531, 2530,
-       71,   71, 2528, 2532,   71, 2533, 2534, 2535,   71,   71,
-       71,   71, 2536,   71, 2537,   71, 2542,   71, 2541, 2538,
-       71, 2543,   71, 2540,   71, 2544, 2539,   71,   71, 2545,
-       71,   71,   71, 2546, 2547, 2549, 2548, 2550,   71,   71,
-       71,   71,   71, 2555,   71,   71,   71,   71,   71, 2553,
-     2554,   71, 2552, 2556, 2560,   71, 2551, 2564,   71,   71,
-       71,   71, 2563,   71, 2557,   71, 2558, 2559, 2562, 2568,
-     2561, 2569,   71,   71, 2571, 2572, 2566, 3082, 2573, 2565,
+     2521,   71, 2519, 2523, 2524, 2526,   71, 2527,   71, 2522,
+     2525,   71,   71,   71, 2532, 2530,   71, 2529, 2528, 2531,
+       71, 2533,   71, 2534,   71, 2537,   71,   71, 2535, 2536,
+     2538,   71, 2540,   71,   71,   71, 2542, 2541,   71,   71,
+     2539, 2543,   71, 2544, 2545, 2546,   71,   71,   71,   71,
+     2547,   71, 2548,   71, 2553,   71, 2552, 2549,   71, 2554,
+       71, 2551,   71, 2555, 2550,   71,   71, 2556,   71,   71,
+       71, 2557, 2558, 2560, 2559, 2561,   71,   71,   71,   71,
+       71, 2566,   71,   71,   71,   71,   71, 2564, 2565,   71,
+     2563, 2567, 2571,   71, 2562, 2575,   71,   71,   71,   71,
 
-       71,   71,   71, 2567,   71, 2574,   71,   71,   71,   71,
-     2575,   71, 2576,   71,   71, 2579,   71, 2577, 2570,   71,
-     2582,   71, 2578, 2584,   71, 2585,   71, 2580,   71, 2581,
-     2586,   71, 2587,   71, 2583, 2589,   71,   71, 2588,   71,
-     2593, 2590, 2591,   71,   71, 2594,   71,   71, 2596, 2597,
-       71, 2592, 2598,   71,   71,   71,   71, 2599, 2603,   71,
-       71, 2604, 2601, 2595, 2605,   71,   71,   71, 2600, 2607,
-       71,   71,   71, 2611, 2612,   71, 2602,   71,   71,   71,
-     2608, 2606, 2613,   71,   71, 2614, 2610,   71, 2620, 2609,
-     2615,   71,   71, 2619,   71,   71, 2623,   71,   71, 2622,
+     2574,   71, 2568,   71, 2569, 2570, 2573, 2579, 2572, 2580,
+       71,   71, 2582, 2583, 2577, 3095, 2584, 2576,   71,   71,
+       71, 2578,   71, 2585,   71,   71,   71,   71, 2586,   71,
+     2587,   71,   71, 2590,   71, 2588, 2581,   71, 2593,   71,
+     2589, 2595,   71, 2596,   71, 2591,   71, 2592, 2597,   71,
+     2598,   71, 2594, 2600,   71,   71, 2599,   71, 2604, 2601,
+     2602,   71,   71, 2605,   71,   71, 2608, 2609,   71, 2603,
+     2610,   71,   71, 2606,   71, 2611,   71,   71, 2615,   71,
+       71, 2616, 2607, 2617,   71,   71,   71, 2612, 2619,   71,
+       71,   71, 2623,   71, 2613, 2624,   71, 2614,   71, 2620,
 
-     2616,   71,   71, 2617, 2618,   71, 2624,   71, 2626,   71,
-     2625,   71, 2628,   71,   71,   71, 2631, 2621, 2635,   71,
-       71,   71,   71, 2627, 2629, 2630,   71,   71,   71, 2634,
-     2637, 2632,   71,   71, 2633, 2636, 2639, 2642, 2638, 2640,
-     2641, 3082, 2643,   71, 2650, 2644, 2645,   71,   71, 2646,
-       71, 2647,   71, 2648,   71, 2649,   71,   71,   71, 2653,
-       71, 2651,   71, 2657,   71,   71,   71, 2654, 2658, 2660,
-       71,   71, 2662,   71,   71, 2664,   71, 2652, 2661, 2663,
-     2655,   71, 2656,   71, 2659,   71,   71, 2669,   71,   71,
-     2665,   71, 2666, 2670, 2667,   71, 2673,   71,   71,   71,
+     2618,   71,   71,   71, 2626, 2622, 2625,   71, 2621, 2627,
+       71, 2632,   71, 2631,   71,   71, 2628,   71, 2634, 2635,
+       71, 2629,   71, 2630,   71,   71,   71, 2636, 2638, 2640,
+       71,   71, 2637,   71,   71,   71, 2643, 2633, 2647,   71,
+     2639,   71,   71,   71,   71, 2649,   71, 2641, 2642, 2646,
+       71, 2644,   71, 2650, 2645, 2648, 2654, 2651, 2653, 2657,
+       71, 2655,   71, 2652,   71, 2656,   71, 2658,   71, 2659,
+       71, 2660,   71, 2661,   71,   71,   71,   71, 2665, 2663,
+     2662,   71, 2669,   71,   71, 2666,   71, 2670, 2672,   71,
+       71,   71, 2674,   71,   71, 2664,   71, 2667, 2673, 2675,
 
-     2671, 2674,   71, 2677, 2668,   71, 2676,   71, 2679,   71,
-     2672, 2675, 2678, 2680,   71,   71,   71,   71,   71, 2681,
-       71,   71,   71, 2689,   71,   71, 2684,   71,   71,   71,
-     2685, 2687, 2692, 2693, 2683,   71, 2690,   71, 2694,   71,
-     2682, 2688,   71,   71, 2695, 2686, 2691, 2696,   71, 2697,
-     2699,   71, 2698, 2700,   71, 2701,   71,   71,   71, 2703,
-       71, 2706, 2704, 2705,   71, 2707, 2702,   71,   71, 2708,
-     2709,   71,   71,   71,   71, 2714,   71,   71, 2712, 2716,
-       71,   71, 2718,   71,   71,   71, 2710, 2717,   71, 2719,
-       71, 2720, 2713, 2711,   71, 2724,   71,   71,   71,   71,
+       71, 2668, 2676,   71, 2671, 2677,   71,   71, 2680, 2678,
+     2681,   71,   71,   71,   71, 2679, 2682,   71, 2685,   71,
+     2687,   71, 2683, 2686,   71, 2689, 2688,   71,   71, 2684,
+     2691,   71, 2690, 2692,   71,   71, 2696,   71,   71,   71,
+       71,   71, 2693,   71, 2694,   71, 2702, 2697,   71,   71,
+     2700, 2698,   71, 2695, 2705,   71,   71, 2703,   71, 2707,
+     2706,   71,   71, 2701,   71, 2699,   71, 2709, 2779, 2704,
+     2708,   71, 2710, 2712,   71, 2711, 2713,   71, 2714,   71,
+       71,   71, 2719,   71, 2716, 2717, 2718,   71,   71, 2715,
+       71,   71, 2720, 2722,   71, 2721,   71,   71, 2727,   71,
 
-       71, 2715,   71, 2722, 2721,   71, 2727,   71, 2728,   71,
-     2725, 2726,   71,   71, 2723, 2731, 2729, 2732, 2734,   71,
-     2736,   71, 2737,   71, 2730,   71, 2739,   71,   71,   71,
-       71,   71, 2735,   71,   71, 2733, 2744,   71, 2743,   71,
-       71, 2748,   71,   71, 2740, 2741, 2738, 2742, 2751,   71,
-     2745,   71,   71, 2753,   71,   71, 2749, 2746, 2747,   71,
-     2754,   71, 2750, 2756,   71, 2757,   71, 2759,   71,   71,
-       71, 2752,   71, 2765, 2755,   71, 2764,   71, 3082, 2762,
-     2761, 2758,   71, 2768,   71,   71,   71, 2760, 2769, 2766,
-       71, 2770, 2763,   71, 2773, 2767, 2774,   71, 2771,   71,
+       71, 2723, 2725,   71,   71, 2729,   71, 2730,   71,   71,
+       71,   71, 2724, 2731, 2726, 2732,   71, 2733,   71, 2734,
+     2737,   71,   71,   71, 2728,   71, 2735, 2740,   71, 2736,
+       71, 2738,   71,   71, 2741, 2739,   71,   71, 2745,   71,
+     2744, 2747,   71,   71, 2742, 2749,   71, 2750,   71, 2743,
+     2752,   71,   71,   71, 2757,   71, 2748,   71,   71, 2753,
+     2751,   71, 2746, 2756,   71,   71, 2761,   71, 2754, 2755,
+       71, 2764,   71,   71, 2766,   71,   71, 2758, 2769,   71,
+       71, 2762,   71, 2760, 2759, 2770,   71, 2767,   71, 2763,
+     2772,   71,   71, 2765,   71,   71, 2771, 2768, 2777, 2774,
 
-       71, 2776, 2775,   71,   71,   71,   71,   71, 2781, 2778,
-     2779,   71,   71, 2772,   71, 2784,   71,   71,   71,   71,
-       71, 2777, 2789,   71, 2785, 2780,   71,   71, 2782, 2783,
-     2792,   71, 2788, 2793,   71, 2786, 2791,   71,   71, 2790,
-     2795,   71, 2794, 2787, 2797,   71, 2796, 2798,   71, 2799,
-       71,   71, 2801,   71,   71,   71, 2800, 2802,   71,   71,
-     2806, 2807,   71,   71,   71,   71, 2811,   71, 2812,   71,
-       71,   71,   71, 2813, 2810, 2849, 2803, 2804, 2808,   71,
-     2805,   71,   71, 2809, 2817,   71, 2816, 2818,   71,   71,
-     2814, 2815, 2821,   71, 2819,   71, 2820,   71,   71, 2824,
+       71, 2775, 2781,   71,   71,   71,   71, 2783, 2782,   71,
+     2773,   71, 2786, 3095, 2776, 2780, 2787,   71,   71, 2778,
+       71, 2784, 2789, 2788,   71,   71,   71,   71,   71, 2794,
+     2791, 2785, 2792,   71,   71,   71, 2797,   71,   71,   71,
+       71,   71, 2790, 2802,   71, 2793, 2798,   71,   71,   71,
+     2795, 2796, 2807, 2801, 2805,   71, 2799, 2804, 2806,   71,
+     2803,   71,   71, 2808, 2800,   71, 2809, 2810,   71, 2811,
+       71, 2812,   71,   71, 2814,   71,   71,   71, 2813,   71,
+     2819, 2815, 2820,   71,   71,   71,   71, 2816, 2824,   71,
+     2825,   71,   71, 3095, 2823, 2826,   71,   71, 2817, 2818,
 
-       71,   71, 2825, 2823,   71, 2822,   71,   71,   71,   71,
-       71, 2828,   71,   71, 2830,   71,   71, 2831,   71, 2829,
-       71, 2826,   71,   71, 2827,   71,   71, 2840, 2841, 2832,
-       71, 2836, 2833, 2834, 2835, 2837, 2838, 2843,   71,   71,
-     3082, 2839, 2906,   71, 2844, 2842, 2845, 2847,   71, 2848,
-       71, 2846, 2850,   71, 2851,   71, 2852, 2853,   71,   71,
-     2854, 2855, 2858,   71, 2856, 2857,   71,   71, 2859,   71,
-       71,   71,   71,   71, 2865,   71,   71,   71, 2864,   71,
-       71, 2868,   71, 3082, 2860, 2861, 2867,   71,   71, 2869,
-     2862,   71, 2863,   71, 2873, 2874,   71, 2870, 2875,   71,
+     2821,   71, 2829,   71, 2822, 2830,   71, 2831,   71,   71,
+     2834,   71, 2827,   71, 2832, 2828,   71, 2833, 2837,   71,
+       71, 2836,   71, 2835,   71, 2838,   71,   71,   71,   71,
+       71, 2841,   71,   71, 2843,   71,   71, 2844,   71, 2842,
+       71,   71, 2839,   71, 2840,   71, 2853,   71, 2854, 2845,
+     3095, 2849, 2846, 2847, 2848, 2850, 2851, 2856,   71,   71,
+     3095, 2852,   71,   71, 2857, 2855, 2862, 2858, 2860,   71,
+       71, 2859, 2861,   71, 2863,   71, 2864,   71, 2865, 2866,
+       71,   71, 2867, 2868, 2871,   71, 2869, 2870, 2873,   71,
+     2872,   71,   71,   71,   71,   71, 2878,   71,   71,   71,
 
-     2872, 2866,   71, 2876,   71, 2871, 2880, 2877, 2882,   71,
-       71, 2881,   71, 2878,   71,   71, 2879,   71,   71,   71,
-     2889,   71, 2886, 2887, 2890, 2884,   71, 2892,   71,   71,
-       71,   71, 2891, 3082, 2883, 2938, 2885,   71, 2888, 2893,
-       71, 2912, 2894, 2895,   71, 2896,   71, 2897,   71, 2898,
-       71, 2899,   71, 2900,   71, 2901,   71, 2902,   71,   71,
-     2904,   71,   71,   71,   71,   71, 2909,   71, 2903,   71,
-       71, 2905,   71, 2913, 2915,   71,   71,   71,   71, 2910,
-     2917,   71, 2911, 2907, 2908, 2914,   71, 2919,   71, 2922,
-       71, 2921,   71,   71, 2916,   71,   71,   71, 2924, 2920,
+     2877,   71,   71, 2881,   71,   71, 2874,   71, 2880,   71,
+     2890, 2882,   71, 2875, 2876,   71, 2886,   71, 2885, 2883,
+     2887,   71,   71, 2879, 2893, 2884, 2888,   71,   71, 2894,
+       71, 2891, 2889, 2895, 2892,   71,   71, 2896,   71,   71,
+       71, 2899, 2903, 2897,   71, 2900, 2902,   71,   71, 3095,
+     2904, 2905,   71, 2906,   71,   71, 2898, 2901, 2908,   71,
+     2907, 2909,   71, 2910,   71, 2911,   71, 2912,   71, 2913,
+       71, 2914,   71, 2915,   71,   71, 2917,   71,   71,   71,
+       71,   71,   71,   71, 2916, 2922,   71, 2918,   71,   71,
+       71, 2919,   71, 2926,   71, 2925, 2923, 2928,   71,   71,
 
-       71,   71,   71,   71, 2918,   71, 2923, 2928, 2931, 2925,
-       71, 2929,   71, 2927, 2926, 2930, 2932, 2933,   71, 2934,
-       71, 2935,   71,   71,   71,   71, 2940,   71,   71,   71,
-     2944,   71, 2937, 2936, 2943,   71, 2946,   71, 2942,   71,
-       71,   71,   71,   71, 2939,   71, 2945,   71, 2941,   71,
-     2947,   71, 2953,   71, 3082,   71, 2950,   71, 2948, 2949,
-     2952, 2954, 2957, 2960,   71,   71,   71, 2951, 2955, 2958,
-       71, 2956,   71, 2959, 2961, 2962,   71,   71, 2963, 2964,
-       71, 2965,   71,   71,   71, 2966, 2968,   71,   71, 2969,
-     2967,   71, 2970, 2973,   71,   71,   71, 2971,   71,   71,
+     2920, 2921, 2924, 2927,   71,   71, 2932, 2930, 2929,   71,
+     2935,   71, 2934,   71,   71,   71,   71, 2933, 2937,   71,
+     2931,   71,   71,   71,   71, 2936,   71, 2941,   71, 2944,
+       71, 2940, 2942, 2938, 2951, 2945,   71, 2939,   71, 2943,
+     2946,   71, 2947,   71, 2948,   71,   71, 2950,   71,   71,
+       71, 2949,   71,   71, 2956, 2957, 2952,   71, 2959,   71,
+     2953, 2955,   71,   71,   71,   71,   71, 2958,   71,   71,
+       71, 2954, 2960,   71,   71, 2966,   71, 2973,   71, 2963,
+     3095, 2961, 2962, 2965,   71, 2967,   71,   71, 2971, 2969,
+     2964, 2968, 2970, 2974, 2975,   71, 2972,   71, 2976, 2977,
 
-     2976, 2978,   71, 2972,   71, 2974, 2975, 2981,   71,   71,
-       71, 2984,   71, 2979,   71, 2985, 2977,   71,   71,   71,
-     2988, 2989,   71, 2980, 2982, 2986,   71,   71, 2983,   71,
-       71,   71,   71, 2990,   71, 2991, 2993, 2987, 2994,   71,
-     2995,   71,   71,   71,   71,   71,   71, 2999, 2992, 3001,
-       71, 2996, 2997,   71, 3000,   71, 2998,   71,   71, 3003,
-     3006,   71, 3007, 3004, 3002, 3008,   71,   71, 3012,   71,
-       71, 3014, 3005,   71, 3015, 3013,   71,   71, 3009, 3010,
-       71, 3016,   71,   71, 3020, 3017, 3011, 3018, 3021,   71,
-       71,   71, 3023,   71,   71,   71, 3022,   71, 3024,   71,
+       71, 2978,   71,   71,   71, 2979,   71, 2981,   71,   71,
+       71, 2982, 2986, 2983,   71,   71,   71,   71,   71, 2991,
+       71, 2989,   71, 2980,   71, 2985,   71, 2988, 2987, 2994,
+       71,   71, 2997,   71, 2984,   71, 2998, 2990,   71, 2992,
+       71, 2993,   71, 3001, 2996, 3002, 2995,   71, 2999,   71,
+       71,   71,   71,   71, 3007,   71, 3003, 3000, 3006,   71,
+     3004, 3008,   71,   71,   71,   71,   71,   71, 3012, 3005,
+       71, 3014,   71, 3009,   71,   71,   71, 3011,   71, 3010,
+     3019, 3020,   71, 3016,   71, 3013, 3015, 3017, 3021,   71,
+       71, 3018, 3025,   71,   71, 3026, 3027,   71, 3022, 3029,
 
-       71, 3029, 3019,   71, 3026,   71, 3032,   71,   71, 3033,
-       71,   71,   71,   71, 3025,   71,   71, 3036, 3027, 3028,
-     3034, 3031, 3030, 3035,   71, 3040,   71,   71,   71, 3039,
-       71, 3041, 3037,   71, 3038,   71, 3044,   71, 3046,   71,
-     3042,   71, 3047,   71, 3048, 3051,   71,   71,   71, 3045,
-     3049,   71, 3050, 3052, 3043,   71,   71, 3053, 3054,   71,
-       71, 3060,   71, 3055,   71,   71, 3057, 3056,   71, 3058,
-     3059,   71,   71, 3062,   71,   71, 3063,   71, 3066, 3067,
-       71,   71,   71, 3070, 3061, 3071,   71, 3082,   71, 3073,
-       71, 3064,   71, 3065, 3068, 3072, 3074,   71,   71, 3075,
+     3023,   71,   71, 3024,   71, 3028, 3030,   71, 3033, 3034,
+       71,   71, 3031,   71,   71, 3037, 3032,   71, 3035, 3036,
+       71,   71,   71,   71, 3042,   71,   71,   71, 3039,   71,
+       71,   71, 3045, 3046,   71,   71, 3038,   71,   71, 3044,
+     3049, 3040, 3041,   71, 3043,   71, 3047,   71, 3050, 3048,
+       71, 3053, 3054, 3056,   71, 3057, 3052, 3051, 3055,   71,
+       71, 3059,   71, 3060,   71,   71,   71, 3064,   71, 3061,
+       71,   71, 3062, 3066,   71, 3065, 3067,   71, 3058,   71,
+       71, 3068,   71,   71,   71, 3063, 3069, 3071, 3073,   71,
+       71,   71,   71,   71,   71, 3075, 3076,   71, 3079, 3070,
 
-     3069,   71,   71, 3076,   71, 3082, 3077, 3080,   71, 3081,
-       71, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3078, 3082, 3079,   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, 3082,   74,   74,   74,   74,  142,  142, 3082, 3082,
-     3082,  142,  142,  144,  144, 3082, 3082,  144, 3082,  144,
-      146, 3082, 3082, 3082, 3082, 3082,  146,  149,  149, 3082,
-     3082, 3082,  149,  149,  151, 3082, 3082, 3082, 3082, 3082,
+     3080,   71, 3072, 3074,   71,   71, 3083, 3084,   71,   71,
+       71, 3077, 3078, 3081, 3086,   71, 3085, 3087,   71,   71,
+       71,   71,   71, 3082, 3095, 3089, 3088, 3090, 3095, 3091,
+     3093,   71, 3094,   71, 3095, 3095, 3095, 3095, 3095, 3095,
+     3092,   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, 3095,   74,
+       74,   74,   74,  142,  142, 3095, 3095, 3095,  142,  142,
+      144,  144, 3095, 3095,  144, 3095,  144,  146, 3095, 3095,
 
-      151,  153,  153, 3082,  153,  153,  153,  153,   75,   75,
-     3082,   75,   75,   75,   75,   13, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082
+     3095, 3095, 3095,  146,  149,  149, 3095, 3095, 3095,  149,
+      149,  151, 3095, 3095, 3095, 3095, 3095,  151,  153,  153,
+     3095,  153,  153,  153,  153,   75,   75, 3095,   75,   75,
+       75,   75,   13, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095
     } ;
 
-static const flex_int16_t yy_chk[6057] =
+static const flex_int16_t yy_chk[6074] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2116,7 +2122,7 @@ static const flex_int16_t yy_chk[6057] =
         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, 3088,   31,
+       10,   10,   15,   25,    9,   29,   15,   25, 3101,   31,
        10,   11,   11,   11,   11,   11,   11,   19,   79,   19,
 
        19,   30,   19,   11,   31,   79,   30,   25,   19,   19,
@@ -2125,7 +2131,7 @@ static const flex_int16_t yy_chk[6057] =
        26,   21,   23,   89,   12,   23,   27,   27,   47,   47,
        21,   24,   42,   90,   26,   27,   24,   28,   34,   52,
        24,   28,   52,   24,   28,   24,   24,   42,   32,   32,
-     1018,   28,   90,   28,   33,   33,   24,   32,   72,   33,
+     1020,   28,   90,   28,   33,   33,   24,   32,   72,   33,
        69,   35,   72,   32,   63,   63,   35,   32,   77,   80,
        35,   77,   37,   37,   69,   33,   35,   37,  230,   35,
       230,   80,   39,   39,   38,   39,   35,   37,   37,   38,
@@ -2262,518 +2268,520 @@ static const flex_int16_t yy_chk[6057] =
       606,  598,  603,  605,  605,  602,  608,  606,  607,  599,
       599,  607,  608,  601,  610,  609,  611,  613,  604,  610,
 
-      615,  611,  611,  612,  612,  617,  607,  609,  614,  616,
-      614,  616,  618,  619,  620,  621,  623,  624,  622,  615,
-      623,  625,  613,  617,  622,  626,  624,  627,  628,  629,
-      618,  619,  631,  620,  630,  621,  625,  632,  631,  634,
-      626,  629,  633,  635,  636,  627,  637,  628,  636,  630,
-      638,  632,  639,  640,  633,  641,  642,  646,  634,  643,
-       43,  642,  635,  648,  637,  645,  638,  644,  644,  645,
-      639,  640,  640,  643,  641,  647,  646,  648,  649,  650,
-      651,  652,  653,  649,  655,  654,  647,  656,  657,  653,
-      654,  655,  656,  657,  652,  650,  658,  659,  660,  651,
+      615,  611,  611,  612,  612,  617,  607,  609,  614,  610,
+      614,  616,  618,  616,  619,  620,  621,  623,  622,  615,
+      624,  623,  613,  617,  622,  625,  626,  627,  628,  624,
+      618,  629,  619,  630,  620,  632,  621,  634,  631,  633,
+      625,  626,  635,  629,  631,  627,  636,  628,  630,  632,
+      636,  633,  637,  638,  639,  640,  634,  641,  642,  644,
+      644,  635,  645,  642,  643,  646,  645,  648,  647,  638,
+      637,  650,  639,  640,  640,  649,  641,  651,  643,  647,
+      649,  648,  652,  653,  646,  655,  654,  650,  656,  657,
+      653,  654,  655,  656,  657,  652,  651,  658,  659,  660,
 
-      662,  661,  666,  664,  659,  663,  666,  660,  664,  662,
-      665,  667,  668,  665,  658,  661,  669,  663,  670,  671,
-      677,  668,  672,  672,  675,  667,  673,  673,  674,  674,
-      678,  669,  670,  675,  679,  673,  678,  680,  681,  677,
-      671,  680,  682,  683,  685,  684,  686,  687,  688,  689,
-      681,  684,  685,  686,  679,  692,  699,  698,  695,  703,
-      702,  683,  699,  703,  707,  687,  698,  682,  709,  689,
-      692,  701,   14,  688,  690,  695,  702,  701,  706,  690,
-      704,  704,  707,  690,  705,  705,  690,  708,  709,  706,
-      712,  710,  713,  690,  690,  712,  690,  710,  714,  715,
+      661,  662,  664,  665,  663,  659,  665,  664,  660,  666,
+      662,  667,  668,  666,  661,  658,  663,  669,  671,  670,
+      682,  668,  672,  672,  677,  667,  673,  673,  674,  674,
+      678,  675,  669,  670,  679,  673,  678,  680,  681,  671,
+      675,  680,  683,  677,  686,  682,  684,  685,  687,  688,
+      681,  686,  684,  689,  679,  685,  692,  699,  698,  695,
+      683,  702,  701,  699,   43,  703,  687,  698,  701,  703,
+      707,  692,  706,  689,  688,  690,  695,  702,  704,  704,
+      690,  705,  705,  706,  690,  708,  709,  690,  707,  713,
+      710,  715,   14,  712,  690,  690,  710,  690,  712,  708,
 
-      718,  708,  711,  711,  711,  716,  711,  718,  716,  711,
-      717,  717,  720,  713,  711,   13,  714,  719,  719,  728,
-      711,  711,  721,  721,  715,  722,  723,  720,  724,  723,
-      722,  725,  725,  724,  726,  727,  726,  729,  728,  730,
-      732,  729,  731,  733,  733,  734,  737,  727,  732,  735,
-      736,  736,  739,  738,  742,  742,  740,  753,  753,  730,
-      734,  731,  740,  735,  737,  738,  741,  743,  754,  754,
-      745,  741,  743,  743,  739,  745,  746,  747,  750,  748,
-      749,  750,  746,  747,  748,  751,  749,  752,  755,  756,
-      759,  751,  757,  758,  761,  752,  755,  757,  760,  760,
+      714,  716,  717,  717,  716,  718,  709,  711,  711,  711,
+      713,  711,  718,  720,  711,  726,  715,  726,  714,  711,
+      719,  719,  721,  721,  722,  711,  711,  723,  720,  722,
+      723,  724,  725,  725,  727,  728,  724,  729,  730,  732,
+      731,  729,  733,  733,  738,  734,  727,  732,  735,  736,
+      736,  737,  739,  797,  728,  740,  738,  797,  730,  731,
+      734,  740,  735,  741,  742,  742,  743,  746,  741,  737,
+      745,  743,  743,  746,  739,  745,  747,  750,  748,  749,
+      750,  751,  747,  748,  752,  749,  755,  751,  753,  753,
+      754,  754,  752,  756,  755,  757,  758,  759,  760,  760,
 
-      758,  764,  762,  761,  766,  763,  767,  756,  768,  759,
-      762,  763,  769,  766,  770,  767,  771,  769,  774,  771,
-      764,  772,  773,  770,  775,  776,  772,  778,  778,  777,
-      779,  780,  768,  775,  777,  777,  773,  781,  776,  782,
-      785,  783,  785,  774,  783,  779,  781,  786,  786,  787,
-      780,  788,  783,  789,  792,  790,  788,  791,  793,  794,
-      795,  796,  797,  782, 1036,  796,  798,  799,  794,  802,
-      787, 1036,  800,  799,  789,  790,  792,  791,  793,  801,
-      797,  800,  803,  795,  804,  798,  805,  806,  802,  808,
-      804,  801,  806,  807,  807,  809,  803,  810,  811,  812,
+      757,  761,  763,  758,  762,  764,  766,  768,  763,  767,
+      761,  756,  762,  770,  769,  766,  759,  771,  767,  769,
+      771,  772,  770,  773,  764,  774,  772,  775,  776,  777,
+      779,  768,  778,  778,  777,  777,  775,  773,  780,  781,
+      782,  776,  783,  784,  788,  779,  784,  786,  781,  786,
+      774,  787,  787,  789,  784,  790,  793,  780,  789,  791,
+      783,  792,  794,  795,  782,  788,  796,  798,  799,  800,
+      804,  801,  795,  803,  802,  800,  790,  805,  793,  791,
+      801,  792,  794,  805,  804,  798,  802,  799,  806,  796,
+      807,  809,  803,  808,  808,  807,  810,  811,  812,  813,
 
-      805,  813,  814,    0,  809,  815,  811,  816,  817,  808,
-      818,  820,  819,  816,  817,  824,  821,  810,  819,  812,
-      822,  814,  821,  813,  818,  815,  822,  825,  823,  827,
-      826,  820,  823,  831,  824,  826,  828,  828,  829,  825,
-      830,  832,  833,  830,  829,  834,  836,  825,  833,  842,
-      827,  831,  835,  835,  832,  837,  838,  838,  839,  840,
-      837,  841,  841,  840,  836,  834,  843,  844,  845,  847,
-      848,  842,  844,  839,  850,  851,  853,  853,  854,  857,
-      855,  858,  854,  859,  848,  858,  843,  845,  856,  856,
-      873,  860,  998,  847,  850,  855,  851,  852,  859,  873,
+      814,  815,  806,  816,  817,  810,  812,  818,  820,  821,
+      817,  809,  819,  818,  820,  822,  825,  811,  823,  813,
+      815,  822,  814,  816,  823,  826,  819,  824,  827,  821,
+      828,  824,  832,  827,  830,  825,  833,  826,  829,  829,
+      830,  831,  834,  835,  831,  826,  836,  836,  834,  833,
+      832,  828,  837,  838,  839,  839,  840,  841,  838,  842,
+      842,  841,  843,  835,  845,  844,  848,  846,  849,  845,
+      837,  840,  851,  852,  854,  854,  855,  858,  856,  859,
+      855,  860,  849,  859,  843,  844,  846,  857,  857,  861,
+      848,  875,  851,  856,  852,  853,  860,  875,  853,  863,
 
-      852,  862,  852,  998,  857,  860,  852,  861,  852,  864,
-      865,  863,  861,  852,  865,  862,  863,  863,  852,  866,
-      867,  868,  869,  864,  870,  867,  865,  869,  871,  872,
-      874,  875,  880,  868,  866,  867,  874,  875,  870,  876,
-      877,  877,  878,  872,  879,  876,  881,  878,  882,  871,
-      879,  884,  885,  958,  880,  886,  889,  885,  887,  888,
-      888,  889,  891,  884,  890,  881,  882,  883,  883,  886,
-      887,  892,  890,  883,  958,  883,  891,  893,  894,  894,
-      895,  883,  897,  899,  895,  900,  883,  883,  897,  898,
-      892,  901,  898,  883,  902,  903,  893,  901,  900,  902,
+      853,   13,  858,  861,  853,  862,  853,  865,  866,  864,
+      862,  853,  866,  863,  864,  864,  853,  867,  868,  869,
+      870,  865,  871,  868,  866,  870,  872,  873,  874,  876,
+      881,  869,  867,  868,  877,  876,  871,  874,  878,  878,
+      877,  873,  882,  879,  880,  883,  885,  872,  879,  886,
+      880,  913,  881,  887,  886,  892,  888,  890,  885,  889,
+      889,  882,  890,  883,  884,  884,  891,  887,  888,  892,
+      884,  913,  884,  893,  891,  894,  895,  895,  884,  899,
+      898,  896,  899,  884,  884,  896,  898,  900,  901,  902,
+      884,  903,  893,  904,  894,  902,  903,  908,  906,  907,
 
-      905,  906,  899,  907,  909,  908,  910,  911,  912,  905,
-      906,  908,  911,  909,  903,  913,  914,  916,  915,  907,
-      919,  918,  917,  922,  925,  910,  916,  918,  912,  913,
-      915,  917,  920,  924,  926,  927,  914,  919,  920,  922,
-      928,  929,    0,  930,  925,  931,  934,  924,  930,  927,
-      931,  934,  935,  926,  936,  936,  929,  937,  928,  938,
-      940,  935,  941,  937,  944,  942,  942,  941,  941,  942,
-      943,  945,  938,  943,  946,  947,  940,  950,  944,  948,
-      949,  951,  952,  950,  953,  964,  955,    0,  952,  954,
-      946,  945,  948,  947,  954,  949,  961,  964,  959,  953,
+      911,  901,  910,  909,  914,  912,  900,  906,  907,  909,
+      912,  910,  904,  908,  915,  916,  917,  918,  914,  911,
+      920,  925,  919,  921,  923,  917,  918,  916,  919,  921,
+      926,  928,  927,  930,  915,  925,  929,  920,  931,  932,
+      923,  935,  941,  931,  932,  928,  935,  936,  930,  938,
+      926,  927,  937,  937,  929,  938,  936,  939,  941,  942,
+      945,  946,  943,  943,  942,  942,  943,  947,  944,  948,
+      939,  944,  949,  950,  945,  952,  951,  954,  953,  956,
+      959,  946,  951,  947,  953,  949,  955,  948,  950,  962,
+        0,  955,  954,  956,  958,  952,  966,  958,  960,  961,
 
-      955,  951,  957,  959,  960,  957,  962,  967,  963,  960,
-      966,  962,  961,  963,  968,  969,  966,  970,  970,  971,
-      968,  969,  972,  967,  973,  974,  974,  973,  971,  975,
-      976,  977,  978,  979,  982,  978,  980,  981,  985,  982,
-      972,  987,  980,  981,  985,  983,  979,  975,  984,  976,
-      983,  977,  988,  984,  989,  992,  990,  991,  991,  987,
-      989,  990,  993,  994,  992,  995,  996,  997,  999,  996,
-      997,  993,  988, 1000, 1001, 1004, 1002, 1003, 1006, 1006,
-     1007,  994, 1002, 1003,  995, 1000,  999, 1005, 1008, 1009,
-     1004, 1010, 1005, 1001, 1011, 1010, 1012, 1013, 1014, 1007,
+      963,  959,  964,  960,  961,  962,  965,  964,  966,  963,
+      968,  965,  969,  970,  971,  973,  968,  972,  972,  970,
+      971,  974,  975,  977,  973,  975,  976,  976,  969,  978,
+      979,  980,  981,  984,  980,  985,  982,  983,  984,  974,
+      985,  977,  982,  983,  986,  981,  987,  989,  978,  986,
+      979,  990,  987,  991,  994,  992,  993,  993,  995,  991,
+      992,  996,  997,  994, 1000,  989,  998,  995, 1001,  998,
+      999,  990, 1002,  999, 1003, 1000, 1004, 1005, 1009,  996,
+     1006,  997, 1004, 1005, 1002, 1007, 1001, 1008, 1008, 1010,
+     1007, 1013, 1011, 1003, 1012, 1006, 1014, 1009, 1012, 1015,
 
-     1016, 1009, 1008, 1017, 1017, 1012, 1019, 1020, 1022, 1021,
-     1024, 1024, 1011, 1022, 1025, 1023, 1013, 1040, 1040, 1016,
-     1019, 1021, 1020, 1014, 1023, 1026, 1027, 1029, 1028, 1029,
-     1030, 1026, 1027, 1028, 1025, 1030, 1031, 1032, 1033, 1034,
-     1035, 1037, 1038, 1033, 1041, 1042, 1044, 1043, 1045, 1069,
-     1031, 1032, 1044, 1069, 1034, 1046, 1037,    0, 1041, 1035,
-     1046, 1038, 1043, 1042, 1048, 1048, 1051, 1049, 1045, 1046,
-     1052, 1046, 1049, 1051, 1046, 1050, 1050, 1053, 1054, 1056,
-     1053, 1055, 1057, 1058, 1052, 1060, 1059, 1057, 1056, 1061,
-     1060, 1062, 1064, 1064, 1067,    0, 1065, 1054, 1059, 1055,
+     1016, 1018, 1021, 1010, 1011, 1014, 1019, 1019, 1022, 1013,
+     1023, 1027, 1024, 1026, 1026, 1025, 1021, 1024, 1015,    0,
+     1018, 1028, 1023, 1022, 1025, 1016, 1029, 1028, 1030, 1033,
+     1032, 1027, 1029, 1030, 1031, 1032, 1031, 1034, 1036, 1035,
+     1037, 1038, 1039, 1033, 1035, 1040, 1042, 1042, 1038, 1043,
+     1044, 1034, 1045, 1036, 1046, 1047, 1157, 1039, 1157, 1037,
+     1046, 1050, 1050, 1043, 1040, 1048, 1051, 1045, 1044, 1053,
+     1048, 1051, 1052, 1052, 1054, 1047, 1053, 1055, 1056, 1048,
+     1055, 1048, 1057, 1058, 1048, 1059, 1060, 1061, 1054, 1062,
+     1059, 1063, 1058, 1064, 1062, 1066, 1066, 1056, 1067, 1061,
 
-     1061, 1065, 1058, 1066, 1068, 1071, 1070, 1072, 1066, 1068,
-     1062, 1073, 1074, 1075, 1067, 1070, 1076, 1077, 1078, 1079,
-     1071, 1080, 1072, 1076, 1074, 1081, 1082, 1083, 1075, 1077,
-     1073, 1081, 1084, 1085, 1088, 1089, 1090, 1078, 1087, 1080,
-     1079, 1082, 1085, 1089, 1087, 1091, 1092, 1083, 1088, 1093,
-     1091, 1094, 1084, 1095, 1093, 1093, 1090, 1100, 1092, 1096,
-     1097, 1097, 1099, 1101, 1102, 1102, 1100, 1095, 1104, 1101,
-     1094, 1103, 1096, 1098, 1105, 1099, 1103, 1104, 1098, 1106,
-     1105, 1098, 1098, 1107, 1106, 1109, 1098, 1112, 1107, 1108,
-     1108, 1113, 1098, 1110, 1110, 1111, 1098, 1115, 1111, 1114,
+     1057, 1068, 1063, 1067, 1069, 1060, 1068, 1071, 1070, 1072,
+     1073, 1071, 1064, 1070, 1074, 1075, 1076, 1077, 1072, 1078,
+     1080, 1079, 1081, 1082, 1069, 1073, 1078, 1084, 1076, 1074,
+     1083, 1085, 1077, 1079, 1075, 1086, 1083, 1087, 1089, 1080,
+     1090, 1082, 1084, 1081, 1089, 1091, 1087, 1092, 1094, 1096,
+     1097, 1085, 1093, 1091, 1090, 1086, 1095, 1093, 1098, 1128,
+     1094, 1095, 1095, 1101, 1097, 1099, 1099, 1092, 1096, 1102,
+     1128, 1098, 1100, 1103, 1104, 1104, 1101, 1100, 1102, 1103,
+     1100, 1100, 1105, 1106, 1107, 1100, 1111, 1105, 1108, 1109,
+     1107, 1100, 1106, 1108, 1109, 1100, 1110, 1110, 1112, 1112,
 
-     1111, 1117, 1118, 1124, 1124, 1116, 1109, 1112, 1114, 1113,
-     1116, 1121, 1119, 1120, 1123, 1117, 1121, 1115, 1119, 1120,
-     1118, 1122, 1126, 1123, 1129, 1122, 1125, 1125, 1123, 1125,
-     1123, 1128, 1123, 1126, 1123, 1128, 1130, 1131, 1132, 1129,
-     1133, 1134, 1135, 1132, 1132, 1136, 1131, 1135, 1137, 1133,
-     1138, 1139, 1140, 1144, 1130, 1141, 1148, 1137, 1146, 1136,
-     1143, 1141, 1149, 1134, 1142, 1142, 1140, 1144, 1143, 1138,
-     1139, 1145, 1146, 1147, 1148, 1150, 1145, 1151, 1151, 1152,
-     1150, 1158, 1147, 1153, 1153, 1157, 1154, 1149, 1154, 1156,
-     1157, 1161, 1156, 1159, 1152, 1160, 1160, 1162, 1162, 1165,
+     1113, 1114, 1115, 1113, 1116, 1113, 1117, 1111, 1119, 1118,
+     1120, 1121, 1122, 1116, 1118,    0, 1125, 1121, 1122, 1123,
+     1115, 1114, 1119, 1124, 1123, 1125, 1117, 1124, 1120, 1130,
+     1125, 1131, 1125, 1130, 1125, 1132, 1125, 1126, 1126, 1127,
+     1127, 1133, 1127, 1134, 1136, 1135, 1131, 1137, 1134, 1134,
+     1133, 1138, 1137, 1132, 1135, 1139, 1140, 1141, 1142, 1144,
+     1144, 1143, 1145, 1146, 1139, 1138, 1136, 1143, 1147, 1148,
+     1145, 1149, 1142, 1147, 1150, 1140, 1141, 1146, 1151, 1152,
+     1149, 1150, 1153, 1148, 1154, 1154, 1155, 1153, 1156, 1156,
+     1159, 1161, 1160, 1159, 1162, 1164, 1151, 1160, 1163, 1163,
 
-     1158, 1164, 1159, 1163, 1163, 1166, 1164, 1167, 1167, 1168,
-     1169, 1161, 1170, 1169, 1171, 1172, 1173, 1174, 1173, 1171,
-     1165, 1177, 1176, 1178, 1172, 1176, 1166, 1179, 1178, 1168,
-     1186, 1181, 1170, 1180,    0, 1174, 1177, 1182, 1180, 1181,
-     1183, 1179, 1182, 1184, 1184, 1183, 1185, 1187, 1186, 1188,
-     1189, 1185, 1191, 1187, 1192, 1194, 1188, 1193, 1191, 1195,
-     1192, 1194, 1193, 1189, 1196, 1197, 1198, 1198, 1195, 1199,
-     1201, 1202, 1203, 1204, 1205, 1207, 1197, 1208, 1203, 1204,
-     1205, 1207, 1209, 1196, 1210, 1211, 1212, 1213, 1213, 1199,
-     1201, 1208, 1214, 1215, 1202, 1216, 1210, 1208, 1217, 1211,
+     1168, 1155, 1169, 1162, 1152, 1165, 1165, 1166, 1166, 1167,
+     1161, 1170, 1170, 1171, 1167, 1164, 1172, 1173, 1175, 1172,
+     1174, 1168, 1176, 1169, 1176, 1174, 1177, 1175, 1179, 1181,
+     1180, 1179, 1182, 1171, 1181, 1183, 1185, 1173, 1186, 1184,
+     1183, 1185, 1189, 1186, 1177, 1180, 1182, 1184, 1187, 1187,
+     1188, 1190, 1191, 1192, 1199, 1188, 1194, 1190, 1195, 1191,
+     1189, 1197, 1194, 1196, 1195, 1198, 1192, 1197, 1196, 1200,
+     1201, 1201, 1202, 1199, 1198, 1204, 1205, 1206, 1207, 1208,
+     1200, 1210, 1211, 1206, 1207, 1208, 1212, 1210, 1213, 1214,
+     1215, 1217, 1202, 1216, 1216, 1204, 1211, 1218, 1219, 1205,
 
-     1218, 1218, 1209, 1217, 1212, 1219, 1220, 1222, 1225, 1223,
-     1227, 1220, 1214, 1216, 1223, 1223, 1224, 1225, 1215, 1226,
-     1228, 1229,    0, 1232, 1227, 1230, 1222, 1226, 1219, 1231,
-     1230, 1231, 1234, 1230, 1224, 1228, 1229, 1232, 1234, 1229,
-     1235, 1236, 1237, 1238, 1235, 1239, 1240, 1237, 1237, 1241,
-     1242, 1243, 1236, 1244, 1241, 1242, 1245, 1248, 1244, 1247,
-     1249, 1252, 1238, 1251, 1240, 1250, 1250, 1251, 1253, 1243,
-     1255, 1239, 1256, 1247, 1254, 1248, 1245, 1258, 1249, 1252,
-     1254, 1257, 1255, 1259, 1260, 1261, 1262, 1253, 1264, 1263,
-     1261, 1256, 1258, 1262, 1263, 1257, 1265, 1267, 1259, 1266,
+     1213, 1222, 1211, 1214, 1220, 1223, 1212, 1225, 1215, 1220,
+     1223, 1217, 1221, 1221, 1226, 1227, 1219, 1229, 1228, 1226,
+     1226, 1230, 1218, 1231, 1222, 1229, 1225, 1228, 1232, 1233,
+     1234, 1235, 1234, 1227, 1233, 1230, 1237, 1233, 1231, 1239,
+     1238, 1241, 1237, 1232, 1238, 1235, 1232, 1240, 1242, 1243,
+     1239, 1244, 1240, 1240, 1245, 1246, 1244, 1247, 1248, 1245,
+     1241, 1250, 1247, 1251, 1252, 1253, 1253, 1243, 1254, 1255,
+     1256, 1257, 1254, 1246, 1242, 1250, 1258, 1257, 1248, 1259,
+     1260, 1251, 1252, 1263, 1261, 1262, 1264, 1255, 1258, 1256,
+     1265, 1264, 1267, 1270, 1260, 1268, 1266, 1265, 1259, 1261,
 
-     1266, 1268, 1269, 1260, 1270, 1265, 1264, 1268, 1271, 1270,
-     1272, 1277, 1267, 1279, 1271, 1277, 1272, 1273, 1273, 1274,
-     1274, 1276, 1276, 1269, 1278, 1280, 1281, 1282, 1283, 1283,
-     1284, 1279, 1285, 1278, 1282, 1287, 1288, 1286, 1289, 1280,
-     1285, 1281, 1286, 1289, 1289, 1291, 1290, 1292, 1292, 1287,
-     1284, 1290, 1290, 1293, 1294, 1288, 1296, 1295, 1297, 1298,
-     1299, 1296, 1300, 1302, 1301, 1291, 1295, 1304, 1300, 1301,
-     1303, 1307, 1293, 1294, 1305, 1306, 1303, 1297, 1299, 1298,
-     1305, 1306, 1308, 1309, 1310, 1311, 1304, 1312, 1316, 1302,
-     1307, 1313, 1314, 1314, 1315, 1317, 1317, 1315, 1321, 1311,
+     1262, 1266, 1263, 1271, 1268, 1269, 1269, 1272, 1270, 1271,
+     1267, 1273, 1274, 1275, 1276, 1276, 1273, 1281, 1274, 1275,
+     1277, 1277, 1279, 1279, 1282, 1280, 1281, 1283, 1272, 1280,
+     1284, 1285, 1286, 1286, 1287, 1288, 1290, 1291, 1285, 1289,
+     1294, 1283, 1282, 1288, 1289, 1284, 1292, 1295, 1295, 1296,
+     1290, 1292, 1292, 1293, 1287, 1297, 1291, 1298, 1293, 1293,
+     1294, 1300, 1299, 1301, 1302, 1303, 1298, 1299, 1296, 1305,
+     1304, 1303, 1306, 1307, 1297, 1304, 1314, 1310, 1306, 1308,
+     1300, 1309, 1302, 1301, 1311, 1308, 1312, 1309, 1313, 1315,
+     1314, 1316, 1307, 1317, 1317, 1305, 1310, 1318,    0, 1319,
 
-     1316, 1308, 1309, 1310, 1318, 1318, 1313, 1319, 1312, 1320,
-     1322, 1321, 1319, 1320, 1323, 1324, 1328, 1324, 1326, 1322,
-     1327, 1324, 1329, 1330, 1335, 1327, 1333, 1323, 1331, 1331,
-     1332, 1328, 1333, 1334, 1324, 1332, 1326, 1335, 1336, 1330,
-     1337, 1338, 1329, 1336, 1337, 1338, 1339, 1340, 1334, 1341,
-     1342, 1343, 1343, 1345, 1347, 1348, 1342, 1349, 1349, 1351,
-     1348, 1350, 1353, 1353, 1357, 1340, 1339, 1350, 1358, 1341,
-     1355, 1345, 1361, 1355, 1362, 1347, 1356, 1356, 1360, 1351,
-     1357, 1360, 1364, 1362, 1358, 1363, 1363, 1365, 1366, 1367,
-     1368, 1370, 1361, 1371, 1367, 1369, 1369, 1364, 1372, 1373,
+     1318, 1320, 1320, 1311, 1329, 1312, 1316, 1313, 1321, 1321,
+     1315, 1319, 1322, 1324, 1323, 1325, 1326, 1322, 1323, 1327,
+     1331, 1327, 1329, 1330, 1325, 1327, 1324, 1332, 1330, 1326,
+     1333, 1334, 1334, 1337, 1335, 1331, 1336, 1338, 1327, 1335,
+     1339, 1342, 1336, 1344, 1343, 1339, 1333, 1332, 1337, 1340,
+     1338, 1341, 1344, 1340, 1345, 1341, 1351, 1346, 1347, 1347,
+     1349, 1342, 1343, 1346, 1352, 1353, 1353, 1354, 1355, 1352,
+     1357, 1357, 1359, 1354, 1345, 1359, 1361, 1351, 1349, 1360,
+     1360, 1362, 1364, 1365, 1366, 1364, 1367, 1367, 1355, 1368,
+     1369, 1370, 1361, 1366, 1371, 1372, 1374, 1362, 1375, 1371,
 
-     1370, 1374, 1374, 1375, 1368, 1376, 1378, 1366, 1365, 1377,
-     1381, 1371, 1383, 1372, 1377, 1379, 1379, 1375, 1380, 1382,
-     1382, 1378, 1380, 1376, 1373, 1384, 1386, 1385, 1387, 1390,
-     1381, 1385, 1391, 1387, 1383, 1392, 1384, 1389, 1389, 1393,
-     1394, 1395, 1395, 1396, 1397, 1386, 1391, 1390, 1396, 1398,
-     1399, 1400, 1401, 1393, 1392, 1392, 1400, 1403, 1402, 1399,
-     1402, 1404, 1403, 1405, 1397, 1394, 1408, 1404, 1406, 1398,
-     1409, 1409, 1401, 1410, 1406, 1411, 1414, 1413, 1415, 1415,
-     1408, 1411, 1413, 1405, 1416, 1416, 1418, 1417, 1419, 1423,
-     1420, 1425, 1410, 1420, 1421, 1421, 1422, 1425, 1431, 1424,
+     1373, 1373, 1376, 1365, 1368, 1374, 1377, 1378, 1378, 1372,
+     1370, 1369, 1379, 1381, 1380, 1382, 1375, 1376, 1381, 1383,
+     1383, 1384, 1385, 1386, 1386, 1384, 1379, 1387, 1388, 1389,
+     1382, 1377, 1380, 1389, 1390, 1391, 1393, 1393, 1394, 1388,
+     1391, 1395, 1385, 1396, 1397, 1398, 1399, 1399, 1401, 1387,
+     1403, 1402, 1400, 1390, 1405, 1395, 1394, 1400, 1397, 1403,
+     1404, 1409, 1396, 1396, 1406, 1404, 1406, 1407, 1401, 1408,
+     1398, 1402, 1407, 1410, 1405, 1408, 1412, 1413, 1413, 1410,
+     1414, 1409, 1415, 1418, 1417, 1419, 1419, 1421, 1415, 1417,
+     1412, 1420, 1420, 1422, 1423, 1424, 1425, 1425, 1424, 1414,
 
-     1414, 1417, 1424, 1419, 1418, 1424, 1426, 1427, 1422, 1423,
-     1427, 1426, 1429, 1430, 1433, 1433, 1432, 1424, 1430, 1432,
-     1435, 1429, 1434, 1431, 1440, 1435, 1427, 1438, 1434, 1436,
-     1436, 1437, 1437, 1438, 1439, 1441, 1442, 1440, 1443, 1439,
-     1444, 1445, 1446, 1444, 1447, 1448, 1449, 1445, 1446, 1447,
-     1453, 1448, 1450, 1441, 1454, 1442, 1452, 1450, 1443, 1451,
-     1451, 1452, 1455, 1456, 1457, 1460, 1461, 1458, 1453, 1449,
-     1459, 1460, 1462, 1463, 1454, 1464, 1470, 1456, 1457, 1458,
-     1466, 1466, 1455, 1459, 1467, 1468, 1461, 1463, 1469, 1469,
-     1468, 1470, 1462, 1471, 1472, 1473, 1464, 1474, 1476, 1475,
+     1426, 1421, 1427, 1436, 1435, 1445, 1436, 1418, 1429, 1423,
+     1428, 1422, 1426, 1428, 1429, 1430, 1428, 1433, 1431, 1434,
+     1430, 1431, 1427, 1445, 1434, 1446, 1433, 1438, 1428, 1435,
+     1437, 1437, 1442, 1438, 1439, 1440, 1440, 1431, 1442, 1439,
+     1441, 1441, 1443, 1444, 1446, 1447, 1448, 1443, 1449, 1448,
+     1451, 1450, 1452, 1453, 1449, 1451, 1444, 1450, 1452, 1454,
+     1455, 1455, 1456, 1457, 1454, 1447, 1458, 1456, 1459, 1460,
+     1461, 1464, 1465, 1462, 1463, 1466, 1453, 1464, 1468, 1467,
+     1471, 1457, 1476, 1460, 1461, 1462, 1458, 1463, 1459, 1470,
+     1470, 1472, 1465, 1467, 1474, 1466, 1472, 1473, 1473, 1468,
 
-     1477, 1478, 1482, 1486, 1467, 1476, 1474, 1471, 1480, 1477,
-     1484, 1484, 1477, 1473, 1475, 1486, 1483, 1478, 1472, 1483,
-     1485, 1485, 1487, 1480, 1489, 1489, 1488, 1482, 1480, 1488,
-     1490, 1491, 1492, 1493, 1494, 1495, 1496, 1492, 1493, 1497,
-     1487, 1503, 1500, 1490, 1502, 1496, 1499, 1498, 1500, 1504,
-     1491, 1495, 1505, 1494, 1503, 1499, 1498, 1506, 1497, 1498,
-     1501, 1501, 1507, 1510, 1502, 1511, 1505, 1504, 1512, 1512,
-     1513, 1514, 1515, 1506, 1507, 1516, 1516, 1515, 1519, 1518,
-     1514, 1520, 1517, 1511, 1518, 1521, 1513, 1522, 1510, 1525,
-     1516, 1517, 1522, 1522, 1517, 1524, 1519, 1526, 1529,    0,
+     1471, 1475, 1477, 1478, 1479, 1482, 1476, 1480, 1484, 1474,
+     1486,    0, 1478, 1481, 1480, 1475, 1488, 1488, 1491, 1479,
+     1477, 1482, 1481, 1484, 1487, 1481, 1490, 1487, 1484, 1489,
+     1489, 1492, 1493, 1493, 1492, 1486, 1491, 1494, 1490, 1495,
+     1496, 1497, 1498, 1499, 1500, 1496, 1497, 1501, 1502, 1504,
+     1494, 1505, 1505, 1500, 1503, 1504, 1506, 1502, 1495, 1499,
+     1502, 1498, 1507, 1503, 1508, 1509, 1501, 1510, 1511, 1514,
+     1515, 1516, 1516, 1517, 1574, 1507, 1506, 1518, 1574, 1509,
+     1511, 1523, 1508, 1510, 1521, 1519, 1518, 1524, 1515, 1517,
+     1519, 1520, 1520, 1521, 1514, 1522, 1521, 1525, 1526, 1523,
 
-     1527, 1528, 1520, 1521, 1525, 1527, 1531, 1528, 1532, 1524,
-     1530, 1530, 1531, 1532, 1533, 1534, 1529, 1536, 1537, 1526,
-     1533, 1534, 1538, 1539, 1540, 1541, 1543, 1540, 1538, 1545,
-     1546, 1541, 1537, 1540, 1543, 1547, 1539, 1536, 1548, 1549,
-     1550, 1551, 1552, 1547, 1553, 1553, 1556, 1548, 1545, 1546,
-     1558, 1554, 1549, 1550, 1555, 1551, 1552, 1554, 1559, 1556,
-     1555, 1557, 1557, 1560, 1561, 1562, 1553, 1563, 1564, 1565,
-     1558, 1562, 1567, 1567, 1568, 1569, 1559, 1561, 1570, 1569,
-     1571, 1572, 1560, 1570, 1564, 1571, 1572, 1565, 1573, 1563,
-     1574, 1576, 1577, 1577, 1568, 1578, 1579, 1573, 1580, 1581,
+     1522, 1530, 1528, 1526, 1526, 1529, 1520, 1531, 1524, 1533,
+     1541, 1532, 1531, 1534, 1534, 1525, 1528, 1532, 1535, 1537,
+     1529, 1536, 1538, 1530, 1535, 1539, 1536, 1533, 1538, 1542,
+     1541, 1539, 1543, 1537, 1544, 1546, 1545, 1550, 1543, 1545,
+     1548, 1546, 1551, 1542, 1552, 1545, 1553, 1544, 1548, 1554,
+     1555, 1556, 1552, 1557, 1559, 1553, 1550, 1558, 1558, 1561,
+     1559, 1551, 1554, 1555, 1560, 1556, 1563, 1557, 1562, 1562,
+     1560, 1564, 1561, 1565, 1566, 1567, 1568, 1569, 1570, 1558,
+     1573, 1567, 1572, 1572, 1579, 1575, 1563, 1566, 1581, 1564,
+     1575, 1583, 1565, 1569, 1576, 1578, 1570, 1577, 1568, 1576,
 
-     1581, 1582, 1583, 1586, 1584, 1587, 1576, 1585, 1579, 1583,
-     1590, 1589, 1588, 1574, 1578, 1582, 1584, 1580, 1588, 1585,
-     1591, 1593, 1586, 1589, 1593, 1587, 1591, 1597, 1590, 1592,
-     1592, 1594, 1594, 1596, 1598, 1600, 1597, 1601, 1596, 1601,
-     1598, 1599, 1599, 1602, 1603, 1604, 1602, 1600, 1605, 1607,
-     1606, 1608, 1611, 1609, 1607, 1610, 1613, 1611, 1615, 1619,
-     1608,    0, 1612, 1615, 1603, 1609, 1605, 1604, 1606, 1614,
-     1610, 1612, 1616, 1618, 1614, 1621, 1613, 1617, 1617, 1618,
-     1619, 1614, 1622, 1623, 1612, 1625, 1624, 1616, 1624, 1626,
-     1626, 1627, 1627, 1629, 1621, 1628, 1628, 1632, 1622, 1625,
+     1573, 1584, 1577, 1581, 1578, 1582, 1582, 1579, 1585, 1587,
+     1583, 1586, 1586, 1584, 1588, 1591, 1589, 1590, 1592, 1593,
+     1594, 1588, 1595, 1587, 1596, 1593, 1601, 1585, 1589, 1590,
+     1596, 1601, 1594, 1605, 1591, 1597, 1597, 1602, 1592, 1598,
+     1595, 1603, 1598, 1599, 1599, 1605, 1602, 1603, 1604, 1604,
+     1606, 1607, 1606, 1608, 1607, 1609, 1610, 1611, 1612, 1613,
+     1614, 1615, 1616, 1612, 1618, 1620, 1621, 1616, 1613, 1617,
+     1620, 1626, 1614, 1608, 1610, 1611, 1615, 1609, 1617, 1624,
+     1619, 1621, 1622, 1622, 1618, 1619, 1627, 1623, 1628, 1630,
+     1626, 1617, 1619, 1623, 1629, 1634, 1629, 1631, 1631, 1637,
 
-     1633, 1625, 1640, 1623, 1630, 1630, 1631, 1631, 1634, 1634,
-     1635, 1636, 1637, 1629, 1635, 1637, 1639, 1636, 1632, 1641,
-     1640, 1633, 1639, 1642, 1643, 1641, 1646, 1643, 1644, 1644,
-     1645, 1645, 1646, 1647, 1648, 1649, 1650, 1651, 1653, 1654,
-     1660, 1657, 1650, 1653, 1653, 1647, 1647, 1647, 1642, 1655,
-     1656, 1655, 1647, 1654, 1648, 1649, 1657, 1651, 1658, 1659,
-     1660, 1656, 1661, 1663, 1658, 1662, 1662, 1665, 1659, 1664,
-     1664, 1666, 1667, 1667, 1668, 1668, 1669, 1672, 1672, 1673,
-     1677, 1674, 1676, 1661, 1679, 1679, 1678, 1665, 1680, 1663,
-     1674, 1676, 1678, 1666, 1683, 1681, 1669, 1684, 1682, 1685,
+     1624, 1638, 1627, 1630,    0, 1630, 1632, 1632, 1628, 1633,
+     1633, 1635, 1635, 1636, 1636, 1634, 1639, 1639, 1641, 1640,
+     1637, 1644, 1638, 1640, 1641, 1642, 1645, 1644, 1642, 1646,
+     1647, 1648, 1649, 1649, 1648, 1646, 1650, 1650, 1652, 1651,
+     1653, 1654, 1655, 1656, 1645, 1651, 1665, 1660, 1655, 1660,
+     1652, 1652, 1652, 1658, 1659, 1647, 1661, 1652, 1658, 1658,
+     1653, 1654, 1662, 1656, 1663, 1664, 1665, 1661, 1659, 1666,
+     1663, 1667, 1667, 1668, 1664, 1669, 1669, 1662, 1670, 1671,
+     1672, 1672, 1673, 1673, 1674, 1677, 1677, 1678, 1679, 1682,
+     1666, 1681, 1684, 1684, 1685, 1689, 1683, 1679, 1670, 1668,
 
-     1685, 1677, 1686, 1683, 1673, 1682, 1687, 1689, 1690, 1680,
-     1681, 1691, 1689, 1692, 1690, 1693, 1695, 1695, 1694, 1698,
-     1692, 1693, 1687, 1684, 1694, 1696, 1697, 1699, 1686, 1700,
-     1696, 1691, 1702, 1701, 1703, 1697, 1701, 1704, 1704, 1698,
-     1708, 1700, 1705, 1706, 1707, 1711, 1699, 1709, 1705, 1706,
-     1702, 1709, 1712, 1713, 1715, 1708, 1714, 1714, 1713, 1718,
-     1703, 1716, 1719, 1720, 1707, 1711, 1719, 1709, 1721, 1720,
-     1722, 1722, 1724, 1715, 1712, 1723, 1716, 1721, 1718, 1723,
-     1725, 1725, 1726, 1724, 1727, 1728, 1729, 1730, 1724, 1731,
-     1732, 1729, 1734, 1733, 1735, 1735, 1732, 1734, 1727, 1736,
+     1681, 1671, 1683, 1686, 1674, 1688, 1687, 1690, 1690, 1691,
+     1682, 1692, 1678, 1687, 1688, 1685, 1696, 1694, 1686, 1695,
+     1698, 1689, 1694, 1697, 1701, 1695, 1698, 1692, 1699, 1701,
+     1697, 1700, 1700, 1702, 1699, 1691, 1696, 1703, 1705, 1704,
+     1706, 1707, 1702, 1706, 1708, 1709, 1709, 1710, 1711, 1712,
+     1705, 1713, 1714, 1710, 1711, 1716, 1714, 1703, 1704, 1707,
+     1717, 1720, 1718, 1719, 1719, 1723, 1713, 1718, 1721, 1712,
+     1708,    0, 1714, 1724, 1732, 1716, 1727, 1724, 1725, 1725,
+     1720, 1726, 1717, 1721, 1723, 1727, 1729, 1726, 1728, 1728,
+     1729, 1730, 1731, 1731, 1733, 1732, 1734, 1736, 1735, 1737,
 
-     1736, 1737, 1739, 1726, 1728, 1737, 1740, 1730, 1733, 1731,
-     1741, 1739, 1742, 1742, 1744, 1744, 1748, 1740, 1745, 1746,
-     1747, 1750, 1740, 1745, 1745, 1746, 1747, 1749, 1751, 1753,
-     1741, 1754, 1749, 1750, 1751, 1754, 1755, 1756, 1757, 1758,
-     1759, 1753, 1748, 1760, 1757, 1762, 1759, 1763, 1755, 1764,
-     1766, 1767, 1767, 1766, 1764, 1760, 1770, 1762, 1768, 1768,
-        0, 1758, 1756, 1769, 1769, 1771, 1763, 1772, 1775, 1773,
-     1777, 1771, 1774, 1772, 1773, 1777, 1770, 1775, 1774, 1779,
-     1780, 1783, 1779, 1781, 1781, 1784, 1785, 1786, 1786, 1787,
-     1788, 1785, 1780, 1783, 1789, 1788, 1791, 1784, 1787, 1789,
+     1738, 1739, 1730, 1735, 1740, 1747, 1738, 1730, 1733, 1740,
+     1741, 1741, 1742, 1742, 1743, 1734, 1739, 1736, 1743, 1737,
+     1745, 1746, 1748, 1748, 1752, 1747, 1750, 1750, 1751, 1745,
+     1752, 1754, 1746, 1751, 1751, 1753, 1756, 1746, 1755, 1757,
+     1759, 1753, 1760, 1755, 1761, 1757, 1760, 1762, 1756, 1763,
+     1766, 1764, 1759, 1765, 1768, 1763, 1761, 1754, 1769, 1765,
+     1770, 1772, 1766, 1776, 1772, 1770, 1768, 1773, 1773, 1774,
+     1774,    0, 1762, 1764, 1775, 1775, 1777, 1769, 1778, 1781,
+     1779, 1780, 1777, 1776, 1778, 1779, 1783, 1780, 1781, 1785,
+     1786, 1783, 1785, 1787, 1787, 1789, 1790, 1793, 1791, 1792,
 
-     1790, 1790, 1792, 1793, 1794, 1795, 1798, 1796, 1797, 1795,
-     1799, 1792, 1796, 1800, 1797, 1801, 1791, 1804, 1805, 1799,
-     1809, 1793, 1808, 1794, 1798, 1803, 1803, 1805,    0, 1801,
-     1807, 1800, 1806, 1806, 1808, 1804, 1811, 1803, 1810, 1807,
-     1817, 1809, 1818, 1810, 1814, 1814, 1820, 1816, 1821, 1811,
-     1816, 1822, 1823, 1824, 1824, 1830, 1817, 1822, 1818, 1826,
-     1826, 1820, 1821, 1825, 1827, 1825, 1829, 1831, 1831, 1823,
-     1832, 1833, 1827, 1829, 1834, 1830, 1835, 1836, 1837, 1832,
-     1838, 1839, 1841, 1844, 1842, 1845, 1834, 1839, 1835, 1836,
-     1843, 1843, 1833, 1847, 1846, 1838, 1842, 1846, 1847, 1848,
+     1792, 1797, 1786, 1791, 1794, 1795, 1793, 1789, 1790, 1794,
+     1795, 1796, 1796, 1798, 1799, 1800, 1801, 1804, 1802, 1803,
+     1801, 1797, 1798, 1802, 1805, 1803, 1806, 1807, 1809, 1809,
+     1810, 1814, 1799, 1805, 1800, 1804, 1811, 1812, 1812, 1815,
+     1809, 1807, 1813, 1814, 1806, 1811, 1817, 1816, 1810, 1820,
+     1820, 1813, 1816, 1822, 1823, 1824, 1822, 1826, 1828, 1817,
+     1815, 1827, 1829, 1836, 1828, 1830, 1830, 1831, 1833, 1831,
+     1823, 1824, 1826, 1832, 1832, 1827, 1833, 1835, 1838, 1829,
+     1837, 1837, 1839, 1836, 1835, 1840, 1841, 1838, 1842, 1843,
+     1844, 1847, 1848, 1845, 1849, 1849, 1850, 1840, 1841, 1845,
 
-     1839, 1844, 1841, 1850, 1837, 1845, 1852, 1851, 1850, 1851,
-     1853, 1854, 1856, 1858, 1859, 1853, 1860, 1862, 1854, 1848,
-     1861, 1856, 1861, 1859, 1852, 1864, 1865, 1864, 1860, 1866,
-     1866, 1858, 1867, 1868, 1870, 1869, 1862, 1869, 1868, 1870,
-     1865, 1871, 1872, 1873, 1874, 1877, 1871, 1875, 1876, 1879,
-     1874, 1880, 1875, 1877, 1881, 1881, 1882, 1882, 1867, 1883,
-     1872, 1876, 1884, 1873, 1885, 1880, 1886, 1887, 1879, 1887,
-     1885, 1886, 1888, 1889, 1883, 1890, 1890, 1892, 1892, 1891,
-     1896, 1889, 1884, 1893, 1893, 1894, 1900, 1895, 1898, 1889,
-     1888, 1891, 1895, 1899, 1894, 1899, 1901, 1898, 1896, 1902,
+     1842, 1851, 1853, 1839, 1848, 1844, 1852, 1853, 1854, 1852,
+        0, 1847, 1845, 1856, 1850, 1843, 1858, 1857, 1856, 1857,
+     1859, 1851, 1860, 1862, 1864, 1859, 1865, 1866, 1854, 1860,
+     1868, 1867, 1862, 1867, 1858, 1865, 1870, 1871, 1870, 1866,
+     1872, 1872, 1864, 1873, 1875, 1874, 1875, 1876, 1877, 1868,
+     1874, 1871, 1876, 1877, 1878, 1879, 1880, 1882, 1881, 1883,
+     1885, 1889, 1880, 1881, 1886, 1887, 1887, 1883, 1890, 1873,
+     1882, 1891, 1878, 1888, 1888, 1879, 1889, 1891, 1886, 1885,
+     1892, 1893, 1894, 1893, 1897, 1892, 1895, 1902, 1890, 1896,
+     1896, 1898, 1898, 1906, 1895, 1900, 1897, 1899, 1899, 1904,
 
-     1898, 1901, 1901, 1903, 1905, 1906, 1907, 1900, 1902, 1909,
-     1906, 1907, 1910, 1913, 1911, 1903, 1905, 1912, 1912, 1914,
-     1915, 1916, 1909, 1911, 1917, 1921, 1919, 1933, 1920, 1922,
-     1930, 1913, 1910, 1924, 1922, 1916, 1915, 1914, 1919, 1917,
-     1920, 1923, 1924, 1927, 1929, 1921, 1923, 1932, 1931, 1927,
-     1929, 1934, 1933, 1930, 1935, 1935, 1938, 1936, 1937, 1937,
-     1934, 1941, 1927, 1931, 1939, 1932, 1936, 1940, 1939,    0,
-     1947, 1942, 1940, 1943, 1941, 1938, 1942, 1942, 1944, 1943,
-     1945, 1946, 1952, 1945, 1944, 1950, 1950, 1951, 1951, 1946,
-     1947, 1952, 1953, 1953, 1954, 1954, 1955, 1956, 1957, 1964,
+     1894, 1901, 1895, 1917, 1900, 1902, 1901, 1905, 1904, 1905,
+     1907, 1904, 1908, 1909, 1906, 1907, 1907, 1910, 1912, 1916,
+     1913, 1914, 1909, 1917, 1908, 1913, 1914, 1918, 1920, 1910,
+     1912, 1921, 1916, 1919, 1919, 1922, 1918, 1928, 1923, 1924,
+     1929, 1926, 1930, 1927, 1937, 1929, 1920, 1930, 1938, 1921,
+     1931, 1922, 1923, 1926, 1924, 1927, 1934, 1928, 1936, 1931,
+     1939, 1940, 1934, 1938, 1936, 1941, 1945, 1937, 1942, 1942,
+     1943, 1944, 1944, 1946, 1941, 1934, 1947, 1946, 1939, 1943,
+     1948, 1947, 1949, 1950, 1951, 1945, 1940, 1949, 1949, 1950,
+     1951, 1952, 1953, 1948, 1952, 1954, 1957, 1957, 1958, 1958,
 
-     1958, 1965, 1951, 1964, 1957, 1958, 1959, 1959, 1955, 1960,
-     1960, 1961, 1962, 1951, 1968, 1956, 1961, 1969, 1962, 1966,
-     1970, 1965, 1969, 1966, 1972, 1971, 1973, 1975, 1976, 1972,
-     1974, 1977, 1979, 1976, 1978, 1978, 1979, 1980, 1982, 1968,
-     1971, 1984, 1983, 1970, 1973, 1981, 1974, 1975, 1986, 1987,
-     1981, 1985, 1980, 1977, 1983, 1990, 1985, 1988, 1988, 1991,
-     1984, 1986, 1992, 1990, 1982, 1993, 1994, 1987, 1995, 2000,
-     1996, 1997, 1998, 2001, 2001, 2004, 2002, 2009, 1991, 2002,
-     2040, 1992, 2003, 1997, 2000, 2005, 2040, 1995, 1993, 2004,
-     1994, 1996, 2009, 1998, 2010, 2003, 2006, 2006, 2005, 2007,
+     1953, 1959, 1960, 1960, 1961, 1961, 1962, 1963, 1964, 1975,
+     1959, 1965, 1968, 1958, 1964, 1954, 1965, 1968, 1962, 1966,
+     1966, 1967, 1967, 1969, 1958, 1963, 1971, 1972, 1973, 1969,
+     1971, 1976, 1973, 1977, 1975, 1978, 1976, 1979, 1981, 1980,
+     1982, 1983, 1979, 1984, 1985, 1985, 1983, 1972, 1986, 1987,
+     1978, 1989, 1986, 1988, 1981, 1990, 1977, 1980, 1988, 1991,
+     1982, 1992, 1993, 1994, 1987, 1984, 1992, 1990, 1995, 1995,
+     1998, 1997, 1999, 2000, 2001, 1993, 2002, 1989, 1991, 1997,
+     2003, 1994, 2004, 2005, 2007, 2008, 2008, 2009, 2011, 1998,
+     2009, 1999, 2010, 2012, 2004, 2002, 2000,    0, 2001, 2007,
 
-     2007, 2008, 2008, 2011, 2011, 2012, 2014, 2010, 2013, 2013,
-     2016, 2014, 2017, 2018, 2012, 2016, 2019, 2012, 2020, 2020,
-     2021, 2021, 2022, 2023, 2023, 2024, 2025, 2025, 2019, 2026,
-     2027, 2030, 2017, 2018, 2032, 2027, 2028, 2028, 2029, 2029,
-     2031, 2022, 2033, 2024, 2026, 2030, 2035, 2037, 2032, 2031,
-     2039, 2035, 2036, 2036, 2038, 2038, 2041, 2042, 2042, 2041,
-     2044, 2033, 2043, 2043, 2046, 2045, 2037, 2049, 2039, 2047,
-     2047, 2050, 2052, 2042, 2051, 2060, 2052, 2053, 2053, 2044,
-     2045, 2054, 2056, 2046, 2057, 2055, 2061, 2049, 2062, 2051,
-     2055, 2059, 2059, 2061, 2050, 2060, 2063, 2056, 2064, 2057,
+     2016, 2003, 2011, 2017, 2005, 2010, 2012, 2013, 2013, 2014,
+     2014, 2015, 2015, 2018, 2018, 2016, 2017, 2019, 2020, 2020,
+     2021, 2024, 2023, 2025, 2026, 2021, 2019, 2023, 2029, 2019,
+     2027, 2027, 2028, 2028, 2030, 2030, 2026, 2031, 2032, 2032,
+     2034, 2024, 2033, 2025, 2037, 2034, 2039, 2029, 2035, 2035,
+     2036, 2036, 2038, 2040, 2042, 2031, 2044, 2033, 2037, 2042,
+     2039, 2038, 2043, 2043, 2045, 2045, 2046, 2047, 2048, 2049,
+     2049, 2048, 2040, 2047, 2051, 2044, 2050, 2050, 2053, 2052,
+     2054, 2054, 2056, 2057, 2046, 2049, 2058, 2059, 2060, 2060,
+     2061, 2059, 2063, 2051, 2052, 2062, 2064, 2053, 2066, 2066,
 
-     2054, 2065, 2062, 2066, 2066, 2068, 2067, 2068, 2069, 2071,
-     2074, 2069, 2072, 2073, 2063, 2067, 2064, 2072, 2073, 2075,
-     2076, 2071, 2078, 2082, 2077, 2080, 2069, 2065, 2069, 2077,
-     2080, 2081, 2075, 2083, 2084, 2074, 2081, 2085, 2082, 2083,
-     2086, 2076, 2087, 2085, 2088, 2086, 2089, 2087, 2078, 2090,
-     2095, 2091, 2090, 2092, 2093, 2084, 2094, 2100,    0, 2089,
-     2091, 2096, 2092, 2093, 2095, 2094, 2097, 2096, 2108, 2088,
-     2098, 2102, 2097, 2104, 2098, 2103, 2103, 2100, 2106, 2104,
-     2102, 2105, 2105, 2109, 2108, 2110, 2110, 2111, 2112, 2114,
-     2105, 2115, 2117, 2116, 2121, 2123, 2123, 2112, 2106, 2109,
+     2062, 2058, 2056, 2067, 2069, 2068, 2057, 2063, 2070, 2061,
+     2071, 2064, 2068, 2072, 2073, 2073, 2074, 2075, 2069, 2075,
+     2079, 2082, 2086, 2067, 2076, 2074, 2070, 2076, 2071, 2078,
+     2083, 2080, 2079, 2081, 2084, 2078, 2080, 2092, 2081, 2072,
+     2085, 2090, 2076, 2083, 2076, 2085, 2082, 2088, 2086, 2089,
+     2096, 2091, 2088, 2093, 2089, 2084, 2090, 2091, 2092, 2093,
+     2094, 2095, 2099, 2097, 2098, 2094, 2095, 2098, 2100, 2101,
+     2102, 2099, 2103, 2108, 2104, 2096, 2097, 2100, 2101, 2102,
+     2104, 2105, 2110, 2116, 2106, 2114, 2103, 2105, 2106, 2111,
+     2111, 2110, 2112, 2108, 2113, 2113, 2117, 2120, 2112, 2116,
 
-     2106, 2114, 2111, 2119, 2117, 2120, 2119, 2115, 2116, 2122,
-     2120, 2124, 2124, 2128, 2121, 2126, 2126, 2127, 2128, 2129,
-     2127, 2122, 2130, 2131, 2131, 2129, 2132, 2134, 2130, 2133,
-     2133, 2135, 2136, 2137, 2137, 2138, 2139, 2140, 2147, 2134,
-     2132, 2138, 2140, 2142,    0, 2135, 2143, 2142, 2146, 2143,
-     2139, 2136, 2144, 2144, 2145, 2150, 2148, 2146, 2147, 2145,
-     2148, 2149, 2149, 2153, 2152, 2154, 2155, 2156, 2150, 2152,
-     2157, 2156, 2158, 2159, 2161, 2160, 2166, 2158, 2163, 2159,
-     2155, 2160, 2164, 2153, 2166, 2154, 2167, 2164, 2167, 2165,
-     2157, 2170, 2161, 2173, 2163, 2165, 2171, 2171, 2172, 2174,
+     2118, 2118, 2119, 2113, 2122, 2114, 2120, 2114, 2123, 2125,
+     2124, 2127, 2117, 2128, 2127, 2129, 2122, 2119, 2128, 2130,
+        0, 2125, 2131, 2131, 2123, 2124, 2132, 2132, 2134, 2134,
+     2135, 2130, 2136, 2135, 2137, 2129, 2138, 2136, 2139, 2139,
+     2137, 2140, 2138, 2141, 2141, 2142, 2143, 2144, 2145, 2145,
+     2146, 2147, 2155, 2148,    0, 2140, 2146, 2142, 2148, 2150,
+     2143, 2151, 2154, 2150, 2151, 2147, 2144, 2152, 2152, 2153,
+     2158, 2154, 2155, 2156, 2153, 2157, 2157, 2156, 2161, 2160,
+     2162, 2163, 2164, 2158, 2160, 2165, 2164, 2166, 2167, 2169,
+     2168, 2174, 2166, 2171, 2167, 2163, 2168, 2172, 2161, 2174,
 
-     2174, 2172, 2176, 2177, 2178, 2170, 2176, 2179, 2179, 2177,
-     2185, 2180, 2183, 2183, 2188, 2187, 2178, 2191, 2192, 2173,
-     2180, 2193, 2191, 2195, 2195, 2199, 2193, 2194, 2185, 2187,
-     2188, 2199, 2194, 2197, 2197, 2200, 2200, 2201, 2202, 2205,
-     2203, 2209, 2206, 2210, 2192, 2203, 2207, 2207, 2211, 2210,
-     2209, 2216, 2212, 2201, 2206, 2214, 2214, 2217, 2205, 2215,
-     2202, 2222, 2215, 2219, 2219, 2223, 2211, 2212, 2220, 2220,
-     2216, 2221, 2224, 2226, 2223, 2217, 2221, 2224, 2225, 2222,
-     2225, 2227, 2228, 2229, 2230, 2231,    0, 2226, 2229, 2237,
-     2231, 2232, 2232, 2236, 2228, 2227, 2233, 2233, 2234, 2234,
+     2162, 2175, 2172, 2175, 2173, 2165, 2178, 2169, 2181, 2171,
+     2173, 2179, 2179, 2180, 2182, 2182, 2180, 2184, 2185, 2186,
+     2178, 2184, 2187, 2187, 2185, 2193, 2188, 2191, 2191, 2196,
+     2195, 2186, 2199, 2200, 2181, 2188, 2201, 2199, 2203, 2203,
+     2207, 2201, 2202, 2193, 2195, 2196, 2207, 2202, 2205, 2205,
+     2208, 2208, 2209, 2210, 2213, 2211, 2217, 2214, 2218, 2200,
+     2211, 2215, 2215, 2219, 2218, 2217, 2224, 2220, 2209, 2214,
+     2222, 2222, 2225, 2213, 2223, 2210, 2230, 2223, 2227, 2227,
+     2231, 2219, 2220, 2228, 2228, 2224, 2229, 2232, 2234, 2231,
+     2225, 2229, 2232, 2233, 2230, 2233, 2235, 2236, 2237, 2238,
 
-     2235, 2235, 2241, 2238, 2230, 2236, 2242, 2237, 2238, 2239,
-     2239, 2240, 2240, 2243, 2241, 2244, 2245, 2245, 2242, 2246,
-     2247, 2247, 2248, 2248, 2249, 2250, 2253, 2251, 2252, 2255,
-     2256, 2244, 2259, 2243, 2251, 2249, 2254, 2250, 2246, 2258,
-     2252, 2254, 2257, 2257, 2260, 2262, 2253, 2261, 2258, 2255,
-     2256, 2263, 2264, 2264, 2265, 2266, 2267, 2269, 2259, 2270,
-     2261, 2271, 2274, 2265, 2260, 2263, 2273, 2274,    0, 2262,
-     2266, 2267, 2275, 2272, 2283, 2269, 2272, 2275, 2276, 2276,
-     2273, 2270, 2277, 2277, 2271, 2278, 2278, 2280, 2280, 2282,
-     2282, 2284, 2283, 2285, 2287, 2288, 2289, 2290, 2291, 2292,
+     2239, 2240, 2234, 2237, 2241, 2241, 2240, 2242, 2242, 2236,
+     2235, 2243, 2243, 2244, 2244, 2245, 2246, 2247, 2250, 2238,
+     2239, 2251, 2247, 2248, 2248, 2249, 2249, 2245, 2252, 2253,
+     2250, 2254, 2254, 2251, 2246, 2255, 2256, 2256, 2257, 2257,
+     2258, 2259, 2260, 2261, 2262, 2253, 2264, 2263, 2252, 2260,
+     2265, 2258, 2263, 2259, 2255, 2261, 2266, 2266, 2267, 2268,
+     2269, 2270, 2271, 2272, 2262, 2278, 2264, 2267, 2273, 2273,
+     2265, 2279, 2274, 2275, 2270, 2276, 2280, 2272, 2282, 2281,
+     2269, 2274, 2281, 2278, 2283, 2268, 2271,    0, 2275, 2283,
+     2276, 2284, 2282, 2279, 2285, 2285, 2284, 2286, 2286, 2280,
 
-     2294, 2293, 2284, 2293, 2295, 2296, 2300, 2291, 2297, 2297,
-     2299, 2299, 2285, 2288, 2287, 2301, 2306, 2290, 2289, 2292,
-     2294, 2304, 2295, 2296, 2301, 2302, 2302, 2307, 2300, 2308,
-     2304, 2305, 2305, 2309, 2306, 2310, 2308, 2311, 2312, 2313,
-     2314, 2314, 2315, 2315, 2316, 2307, 2317, 2318, 2309, 2319,
-     2316, 2320, 2321, 2310, 2312, 2311, 2320, 2322, 2313, 2324,
-     2323, 2324, 2318, 2329, 2317, 2323, 2325, 2325, 2319, 2326,
-     2331, 2326, 2321, 2327, 2327, 2332, 2333, 2322, 2334, 2331,
-     2335, 2336, 2329, 2337, 2340, 2335, 2341, 2344, 2333, 2341,
-     2342, 2342, 2343, 2346, 2332, 2345, 2345, 2346, 2334, 2348,
+     2287, 2287, 2289, 2289, 2291, 2291, 2292, 2293, 2294, 2296,
+     2297, 2298, 2299, 2300, 2301, 2302, 2303, 2302, 2293, 2304,
+     2305, 2309, 2300,    0, 2292, 2306, 2306, 2294, 2297, 2296,
+     2308, 2308, 2299, 2298, 2301, 2310, 2303, 2304, 2305, 2311,
+     2311, 2313, 2315, 2309, 2310, 2314, 2314, 2316, 2317, 2318,
+     2313, 2319, 2320, 2325, 2322, 2317, 2321, 2323, 2323, 2325,
+     2315, 2324, 2324, 2326, 2318, 2316, 2328, 2327, 2330, 2319,
+     2320, 2329, 2321, 2322, 2331, 2332, 2329, 2333, 2338, 2333,
+     2332, 2326, 2327, 2334, 2334, 2328, 2340, 2335, 2330, 2335,
+     2336, 2336, 2341, 2342, 2331, 2340, 2343, 2338, 2344, 2345,
 
-     2351, 2336, 2337, 2353, 2340, 2344, 2349, 2343, 2350, 2350,
-     2349, 2354, 2355, 2351, 2348, 2356, 2356, 2358, 2353, 2359,
-     2360, 2361, 2361, 2362, 2360, 2363, 2363, 2365, 2359, 2358,
-     2364, 2354, 2355, 2366, 2367, 2364, 2365, 2368, 2368, 2373,
-     2373, 2374, 2362, 2375, 2375, 2376, 2367, 2377, 2378, 2366,
-     2379, 2380, 2380, 2381, 2383, 2383, 2386, 2378, 2376, 2379,
-     2377, 2386, 2387, 2374, 2388, 2389, 2390, 2387, 2381, 2391,
-     2389, 2392, 2395, 2393, 2390, 2398, 2401, 2396, 2388, 2397,
-     2392, 2393, 2396, 2401, 2397, 2399, 2399, 2395, 2391, 2402,
-     2398, 2400, 2400, 2403, 2402, 2404, 2405, 2408, 2406, 2407,
+     2352, 2346, 2349, 2344, 2350, 2342, 2353, 2350, 2351, 2351,
+     2355, 2341, 2354, 2354, 2355, 2352, 2343, 2357, 2360, 2345,
+     2346, 2358, 2349, 2362, 2353, 2358, 2359, 2359, 2363, 2364,
+     2367, 2360, 2357, 2365, 2365, 2368, 2369, 2371, 2362, 2375,
+     2369, 2377, 2367, 2384, 2368, 2370, 2370, 2373, 2363, 2364,
+     2372, 2372, 2373, 2374, 2376, 2375, 2371, 2378, 2378, 2383,
+     2383, 2377, 2374, 2385, 2385, 2384, 2376, 2386, 2387, 2388,
+     2389, 2390, 2390, 2391, 2393, 2393, 2398, 2396, 2388, 2389,
+     2386, 2387, 2396, 2401, 2397, 2400, 2399, 2402, 2391, 2397,
+     2398, 2399, 2403, 2400, 2405, 2408, 2402, 2413, 2406, 2407,
 
-     2407, 2409, 2405, 2406, 2410, 2410, 2409, 2411, 2411, 2414,
-        0, 2403, 2408, 2404, 2415, 2415, 2416, 2426, 2417, 2416,
-     2418, 2419, 2414, 2417, 2417, 2418, 2419, 2420, 2421, 2422,
-     2423, 2424, 2421, 2420, 2422, 2425, 2427, 2430, 2426, 2423,
-     2429, 2428, 2427, 2425, 2435, 2429, 2424, 2428, 2432, 2430,
-     2437, 2433, 2438, 2432, 2433, 2437, 2435, 2438, 2439, 2440,
-     2441, 2442, 2443, 2443, 2444, 2447, 2448, 2453, 2449, 2441,
-     2442, 2451, 2440, 2444, 2450, 2450, 2439, 2454, 2454, 2452,
-     2455, 2457, 2453, 2459, 2447, 2460, 2448, 2449, 2452, 2460,
-     2451, 2461, 2461, 2462, 2463, 2464, 2457,    0, 2465, 2455,
+     2403, 2414, 2401, 2406, 2407, 2409, 2409, 2410, 2410, 2405,
+     2408, 2411, 2412, 2418, 2415, 2413, 2416, 2412, 2411, 2414,
+     2415, 2416, 2417, 2417, 2419, 2420, 2420, 2424, 2418, 2419,
+     2421, 2421, 2425, 2425, 2426, 2436, 2427, 2426, 2428, 2429,
+     2424, 2427, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434,
+     2431, 2430, 2432, 2435, 2437, 2440, 2436, 2433, 2439, 2438,
+     2437, 2435, 2445, 2439, 2434, 2438, 2442, 2440, 2447, 2443,
+     2448, 2442, 2443, 2447, 2445, 2448, 2449, 2450, 2451, 2452,
+     2453, 2453, 2454, 2457, 2458, 2463, 2459, 2451, 2452, 2461,
+     2450, 2454, 2460, 2460, 2449, 2464, 2464, 2462, 2465, 2467,
 
-     2463, 2464, 2467, 2459, 2465, 2466, 2466, 2468, 2470, 2471,
-     2467, 2473, 2468, 2474, 2475, 2473, 2478, 2470, 2462, 2477,
-     2477, 2488, 2471, 2479, 2479, 2480, 2480, 2474, 2483, 2475,
-     2482, 2482, 2483, 2484, 2478, 2486, 2486, 2489, 2484, 2490,
-     2491, 2488, 2489, 2493, 2501, 2491, 2491, 2494, 2494, 2496,
-     2496, 2490, 2497, 2497, 2498, 2499, 2503, 2498, 2504, 2504,
-     2505, 2505, 2501, 2493, 2506, 2506, 2507, 2509, 2499, 2508,
-     2508, 2510, 2511, 2512, 2513, 2513, 2503, 2518, 2514, 2512,
-     2509, 2507, 2514, 2519, 2520, 2517, 2511, 2521, 2522, 2510,
-     2517, 2517, 2523, 2521, 2522, 2524, 2525, 2525, 2533, 2524,
+     2463, 2469, 2457, 2470, 2458, 2459, 2462, 2470, 2461, 2471,
+     2471, 2472, 2473, 2474, 2467,    0, 2475, 2465, 2473, 2474,
+     2477, 2469, 2475, 2476, 2476, 2478, 2480, 2481, 2477, 2483,
+     2478, 2484, 2485, 2483, 2488, 2480, 2472, 2487, 2487, 2498,
+     2481, 2489, 2489, 2490, 2490, 2484, 2493, 2485, 2492, 2492,
+     2493, 2494, 2488, 2496, 2496, 2499, 2494, 2500, 2501, 2498,
+     2499, 2502, 2504, 2501, 2501, 2505, 2505, 2507, 2507, 2500,
+     2508, 2508, 2509, 2502, 2510, 2509, 2512, 2514, 2515, 2515,
+     2516, 2516, 2504, 2517, 2517, 2518, 2520, 2510, 2519, 2519,
+     2521, 2522, 2523, 2529, 2512, 2524, 2524, 2514, 2523, 2520,
 
-     2518, 2528, 2530, 2519, 2520, 2531, 2528, 2535, 2531, 2534,
-     2530, 2536, 2534, 2537, 2538, 2539, 2536, 2523, 2540, 2540,
-     2544, 2541, 2543, 2533, 2535, 2535, 2547, 2542, 2553, 2539,
-     2542, 2537, 2545, 2556, 2538, 2541, 2543, 2546, 2542, 2544,
-     2545,    0, 2546, 2546, 2553, 2547, 2548, 2548, 2549, 2549,
-     2550, 2550, 2551, 2551, 2552, 2552, 2554, 2555, 2557, 2556,
-     2558, 2554, 2559, 2561, 2561, 2562, 2563, 2557, 2562, 2565,
-     2565, 2566, 2567, 2567, 2568, 2570, 2570, 2555, 2566, 2568,
-     2558, 2571, 2559, 2572, 2563, 2573, 2575, 2576, 2576, 2577,
-     2571, 2578, 2572, 2577, 2573, 2579, 2580, 2582, 2581, 2583,
+     2518, 2530, 2525, 2531, 2528, 2522, 2525, 2532, 2521, 2528,
+     2528, 2533, 2534, 2532, 2535, 2544, 2529, 2533, 2535, 2536,
+     2536, 2530, 2539, 2531, 2541, 2542, 2545, 2539, 2542, 2545,
+     2546, 2547, 2541, 2548, 2549, 2550, 2547, 2534, 2551, 2551,
+     2544, 2552, 2553, 2554, 2555, 2553, 2558, 2546, 2546, 2550,
+     2556, 2548, 2567, 2553, 2549, 2552, 2557, 2554, 2556, 2559,
+     2559, 2557, 2557, 2555, 2564, 2558, 2560, 2560, 2561, 2561,
+     2562, 2562, 2563, 2563, 2565, 2566, 2568, 2569, 2567, 2565,
+     2564, 2570, 2572, 2572, 2573, 2568, 2574, 2573, 2576, 2576,
+     2586, 2577, 2578, 2578, 2579, 2566, 2582, 2569, 2577, 2579,
 
-     2578, 2580, 2580, 2583, 2575, 2591, 2582, 2587, 2588, 2588,
-     2579, 2581, 2587, 2590, 2590, 2592, 2593, 2595, 2596, 2591,
-     2599, 2601, 2600, 2602, 2604, 2606, 2595, 2608, 2609, 2602,
-     2596, 2600, 2608, 2609, 2593, 2611, 2604, 2610, 2610, 2620,
-     2592, 2601, 2613, 2621, 2611, 2599, 2606, 2613, 2614, 2614,
-     2616, 2616, 2614, 2617, 2617, 2618, 2618, 2619, 2622, 2620,
-     2625, 2624, 2621, 2622, 2626, 2625, 2619, 2624, 2628, 2626,
-     2627, 2627, 2629, 2630, 2631, 2632, 2633, 2637, 2630, 2634,
-     2634, 2632, 2637, 2636, 2638, 2640, 2628, 2636, 2641, 2638,
-     2639, 2639, 2631, 2629, 2642, 2644, 2644, 2646, 2647, 2649,
+     2583, 2570, 2581, 2581, 2574, 2582, 2584, 2592, 2586, 2583,
+     2587, 2587, 2588, 2589, 2590, 2584, 2588, 2593, 2591, 2603,
+     2592, 2594, 2589, 2591, 2591, 2594, 2593, 2598, 2602, 2590,
+     2599, 2599, 2598, 2601, 2601, 2604, 2606, 2606, 2607, 2608,
+     2611, 2612, 2602, 2613, 2603, 2616, 2614, 2607, 2618, 2620,
+     2612, 2608, 2614, 2604, 2620, 2621, 2707, 2616, 2622, 2622,
+     2621, 2623, 2625, 2613, 2632, 2611, 2633, 2625, 2707, 2618,
+     2623, 2626, 2626, 2628, 2628, 2626, 2629, 2629, 2630, 2630,
+     2631, 2634, 2636, 2640, 2632, 2633, 2634, 2637, 2636, 2631,
+     2638, 2641, 2637, 2639, 2639, 2638, 2643, 2642, 2644, 2645,
 
-     2650, 2633, 2648, 2641, 2640, 2651, 2648, 2652, 2649, 2654,
-     2646, 2647, 2653, 2656, 2642, 2652, 2650, 2653, 2655, 2655,
-     2658, 2658, 2659, 2659, 2651, 2661, 2663, 2663, 2665, 2666,
-     2671, 2667, 2656, 2668, 2672, 2654, 2670, 2670, 2668, 2673,
-     2675, 2675, 2676, 2677, 2665, 2666, 2661, 2667, 2678, 2678,
-     2671, 2681, 2684, 2682, 2693, 2683, 2676, 2672, 2673, 2682,
-     2683, 2687, 2677, 2685, 2685, 2686, 2686, 2688, 2688, 2689,
-     2690, 2681, 2691, 2693, 2684, 2695, 2692, 2694,    0, 2690,
-     2689, 2687, 2692, 2696, 2696, 2697, 2702, 2688, 2697, 2694,
-     2698, 2698, 2691, 2703, 2704, 2695, 2705, 2705, 2702, 2706,
+     2652, 2640, 2642, 2648, 2644, 2646, 2646, 2648, 2649, 2654,
+     2650, 2653, 2641, 2649, 2643, 2650, 2651, 2651, 2658, 2652,
+     2656, 2656, 2659, 2660, 2645, 2661, 2653, 2660, 2662, 2654,
+     2663, 2658, 2664, 2665, 2661, 2659, 2666, 2668, 2665, 2673,
+     2664, 2667, 2667, 2677, 2662, 2670, 2670, 2671, 2671, 2663,
+     2675, 2675, 2678, 2679, 2682, 2682, 2668, 2683, 2680, 2677,
+     2673, 2684, 2666, 2680, 2685, 2687, 2687, 2688, 2678, 2679,
+     2689, 2690, 2690, 2693, 2694, 2697, 2700, 2683, 2698, 2698,
+     2694, 2688, 2695, 2685, 2684, 2699, 2699, 2695, 2702, 2689,
+     2701, 2701, 2703, 2693, 2704, 2708, 2700, 2697, 2705, 2702,
 
-     2704, 2707, 2706, 2708, 2710, 2711, 2712, 2707, 2713, 2710,
-     2711, 2714, 2717, 2703, 2713, 2715, 2715, 2718, 2719, 2720,
-     2722, 2708, 2721, 2721, 2717, 2712, 2728, 2723, 2714, 2714,
-     2725, 2725, 2720, 2726, 2726, 2718, 2723, 2727, 2738, 2722,
-     2728, 2729, 2727, 2719, 2730, 2730, 2729, 2731, 2731, 2732,
-     2732, 2733, 2735, 2735, 2740, 2741, 2733, 2738, 2742, 2743,
-     2743, 2745, 2745, 2747, 2746, 2748, 2749, 2749, 2750, 2750,
-     2753, 2796, 2754, 2752, 2748, 2796, 2740, 2741, 2746, 2752,
-     2742, 2755, 2762, 2747, 2758, 2758, 2755, 2760, 2760, 2761,
-     2753, 2754, 2763, 2764, 2761, 2765, 2762, 2767, 2763, 2766,
+     2706, 2703, 2709, 2709, 2705, 2710, 2711, 2711, 2710, 2715,
+     2701, 2716, 2717,    0, 2704, 2708, 2718, 2718, 2717, 2706,
+     2719, 2715, 2720, 2719, 2721, 2723, 2725, 2724, 2720, 2726,
+     2723, 2716, 2724, 2727, 2730, 2726, 2728, 2728, 2731, 2732,
+     2733, 2735, 2721, 2734, 2734, 2725, 2730, 2740, 2736, 2741,
+     2727, 2727, 2740, 2733, 2738, 2738, 2731, 2736, 2739, 2739,
+     2735, 2742, 2751, 2741, 2732, 2753, 2742, 2743, 2743, 2744,
+     2744, 2745, 2745, 2746, 2748, 2748, 2754, 2755, 2746, 2756,
+     2756, 2751, 2758, 2758, 2760, 2761, 2759, 2753, 2762, 2762,
+     2763, 2763, 2766,    0, 2761, 2765, 2767, 2768, 2754, 2755,
 
-     2766, 2769, 2767, 2765, 2770, 2764, 2771, 2772, 2773, 2775,
-     2776, 2771, 2777, 2778, 2773, 2780, 2779, 2775, 2781, 2772,
-     2782, 2769, 2783, 2785, 2770, 2786, 2790, 2783, 2785, 2776,
-     2863, 2780, 2777, 2778, 2779, 2781, 2781, 2787, 2791, 2788,
-        0, 2782, 2863, 2787, 2788, 2786, 2790, 2794, 2794, 2795,
-     2795, 2791, 2800, 2800, 2802, 2802, 2803, 2803, 2806, 2803,
-     2804, 2804, 2806, 2804, 2805, 2805, 2809, 2805, 2808, 2808,
-     2813, 2810, 2814, 2815, 2816, 2816, 2819, 2821, 2815, 2820,
-     2822, 2821, 2823,    0, 2809, 2810, 2820, 2825, 2830, 2822,
-     2813, 2826, 2814, 2827, 2827, 2828, 2828, 2823, 2829, 2829,
+     2759, 2765, 2768, 2775, 2760, 2771, 2771, 2773, 2773, 2774,
+     2776, 2777, 2766, 2778, 2774, 2767, 2776, 2775, 2779, 2779,
+     2780, 2778, 2782, 2777, 2783, 2780, 2784, 2785, 2786, 2788,
+     2789, 2784, 2790, 2791, 2786, 2793, 2792, 2788, 2794, 2785,
+     2795, 2796, 2782, 2798, 2783, 2799, 2796, 2803, 2798, 2789,
+        0, 2793, 2790, 2791, 2792, 2794, 2794, 2800, 2804, 2801,
+        0, 2795, 2809, 2800, 2801, 2799, 2809, 2803, 2807, 2807,
+     2822, 2804, 2808, 2808, 2813, 2813, 2815, 2815, 2816, 2816,
+     2819, 2816, 2817, 2817, 2819, 2817, 2818, 2818, 2822, 2818,
+     2821, 2821, 2823, 2826, 2827, 2828, 2829, 2829, 2832, 2834,
 
-     2826, 2819, 2831, 2830, 2832, 2825, 2833, 2831, 2834, 2835,
-     2836, 2833, 2833, 2832, 2834, 2837, 2832, 2838, 2839, 2840,
-     2841, 2841, 2838, 2839, 2842, 2836, 2843, 2844, 2844, 2870,
-     2842, 2912, 2843,    0, 2835, 2912, 2837, 2846, 2840, 2845,
-     2845, 2870, 2846, 2849, 2849, 2852, 2852, 2853, 2853, 2854,
-     2854, 2855, 2855, 2856, 2856, 2857, 2857, 2858, 2858, 2860,
-     2861, 2861, 2862, 2864, 2868, 2866, 2867, 2867, 2860, 2869,
-     2872, 2862, 2871, 2871, 2873, 2873, 2876, 2877, 2878, 2868,
-     2877, 2880, 2869, 2864, 2866, 2872, 2879, 2879, 2882, 2883,
-     2886, 2882, 2884, 2885, 2876, 2883, 2887, 2888, 2885, 2880,
+     2828, 2833, 2835, 2834, 2836, 2844, 2823, 2838, 2833, 2839,
+     2844, 2835, 2848, 2826, 2827, 2840, 2840, 2843, 2839, 2836,
+     2841, 2841, 2845, 2832, 2846, 2838, 2842, 2842, 2849, 2846,
+     2846, 2845, 2843, 2847, 2845, 2850, 2851, 2848, 2853, 2847,
+     2852, 2851, 2855, 2849, 2856, 2852, 2854, 2854, 2855,    0,
+     2856, 2857, 2857, 2858, 2858, 2859, 2850, 2853, 2862, 2862,
+     2859, 2865, 2865, 2866, 2866, 2867, 2867, 2868, 2868, 2869,
+     2869, 2870, 2870, 2871, 2871, 2873, 2874, 2874, 2875, 2876,
+     2877, 2881, 2879, 2883, 2873, 2880, 2880, 2875, 2885, 2882,
+     2889, 2876, 2884, 2884, 2891, 2883, 2881, 2886, 2886, 2893,
 
-     2894, 2890, 2891, 2905, 2878, 2903, 2884, 2890, 2903, 2886,
-     2910, 2891, 2914, 2888, 2887, 2894, 2905, 2906, 2906, 2907,
-     2907, 2908, 2908, 2911, 2913, 2916, 2914, 2917, 2919, 2918,
-     2919, 2920, 2911, 2910, 2918, 2921, 2921, 2922, 2917, 2923,
-     2925, 2924, 2926, 2928, 2913, 2927, 2920, 2930, 2916, 2929,
-     2922, 2931, 2928, 2937,    0, 2936, 2925, 2932, 2923, 2924,
-     2927, 2929, 2932, 2938, 2938, 2939, 2944, 2926, 2930, 2936,
-     2945, 2931, 2949, 2937, 2939, 2940, 2940, 2941, 2941, 2942,
-     2942, 2943, 2943, 2946, 2947, 2944, 2946, 2948, 2950, 2947,
-     2945, 2952, 2948, 2951, 2953, 2954, 2955, 2949, 2957, 2951,
+     2877, 2879, 2882, 2885, 2890, 2892, 2892, 2890, 2889, 2895,
+     2896, 2897, 2895, 2898, 2899, 2901, 2896, 2893, 2898, 2900,
+     2891, 2903, 2918, 2904, 2907, 2897, 2916, 2903, 2923, 2916,
+     2925, 2901, 2904, 2899, 2925, 2918, 2926, 2900, 2924, 2907,
+     2919, 2919, 2920, 2920, 2921, 2921, 2927, 2924, 2929, 2931,
+     2930, 2923, 2933, 2932, 2931, 2932, 2926, 2934, 2934, 2935,
+     2927, 2930, 2936, 2938, 2937, 2939, 2941, 2933, 2940, 2944,
+     2943, 2929, 2935, 2942, 2949, 2941, 2950, 2951, 2951, 2938,
+        0, 2936, 2937, 2940, 2952, 2942, 2957, 2945, 2949, 2944,
+     2939, 2943, 2945, 2952, 2953, 2953, 2950, 2954, 2954, 2955,
 
-     2954, 2956, 2956, 2950, 2958, 2952, 2953, 2959, 2959, 2961,
-     2963, 2966, 2966, 2957, 2967, 2967, 2955, 2968, 2969, 2972,
-     2970, 2971, 2973, 2958, 2961, 2968, 2970, 2971, 2963, 2974,
-     2979, 2975, 2980, 2972, 2985, 2973, 2975, 2969, 2976, 2976,
-     2977, 2977, 2982, 2983, 2986, 2987, 2988, 2983, 2974, 2986,
-     2989, 2979, 2980, 2990, 2985, 2991, 2982, 2992, 2996, 2988,
-     2991, 2997, 2992, 2989, 2987, 2993, 2993, 2998, 2999, 2999,
-     3000, 3001, 2990, 3002, 3002, 3000, 3003, 3001, 2996, 2997,
-     3004, 3003, 3005, 3006, 3007, 3004, 2998, 3005, 3009, 3009,
-     3007, 3010, 3011, 3011, 3013, 3014, 3010, 3015, 3013, 3016,
+     2955, 2956, 2956, 2958, 2959, 2957, 2960, 2959, 2961, 2962,
+     2963, 2960, 2964, 2961, 2965, 2966, 2967, 2968, 2964, 2969,
+     2969, 2967, 2971, 2958, 2970, 2963, 2976, 2966, 2965, 2972,
+     2972, 2974, 2979, 2979, 2962, 2980, 2980, 2968, 2982, 2970,
+     2981, 2971, 2985, 2983, 2976, 2984, 2974, 2986, 2981, 2983,
+     2987, 2984, 2992, 2988, 2989, 2989, 2985, 2982, 2988, 2993,
+     2986, 2990, 2990, 2995, 2996, 2998, 2999, 3000, 2996, 2987,
+     3001, 2999, 3003, 2992, 3002, 3004, 3005, 2995, 3009, 2993,
+     3004, 3005, 3010, 3001, 3011, 2998, 3000, 3002, 3006, 3006,
+     3013, 3003, 3012, 3012, 3016, 3013, 3014, 3019, 3009, 3016,
 
-     3017, 3018, 3006, 3019, 3015, 3022, 3022, 3018, 3020, 3024,
-     3024, 3025, 3026, 3027, 3014, 3028, 3029, 3026, 3016, 3017,
-     3025, 3020, 3019, 3025, 3030, 3030, 3031, 3032, 3034, 3029,
-     3036, 3031, 3027, 3041, 3028, 3035, 3035, 3037, 3037, 3039,
-     3032, 3038, 3038, 3040, 3039, 3042, 3042, 3048, 3043, 3036,
-     3040, 3050, 3041, 3043, 3034, 3044, 3046, 3044, 3045, 3045,
-     3047, 3052, 3052, 3046, 3049, 3053, 3048, 3047, 3055, 3049,
-     3050, 3056, 3057, 3055, 3058, 3062, 3056, 3059, 3059, 3061,
-     3061, 3063, 3064, 3064, 3053, 3065, 3065,    0, 3066, 3068,
-     3068, 3057, 3070, 3058, 3062, 3066, 3069, 3069, 3072, 3070,
+     3010, 3017, 3014, 3011, 3015, 3015, 3017, 3018, 3020, 3022,
+     3022, 3026, 3018, 3023, 3020, 3026, 3019, 3027, 3023, 3024,
+     3024, 3028, 3029, 3030, 3031, 3032, 3033, 3047, 3028, 3040,
+     3031, 3035, 3035, 3037, 3037, 3039, 3027, 3038, 3041, 3033,
+     3039, 3029, 3030, 3042, 3032, 3045, 3038, 3044, 3040, 3038,
+     3043, 3043, 3044, 3047, 3048, 3048, 3042, 3041, 3045, 3049,
+     3050, 3050, 3051, 3051, 3052, 3053, 3054, 3055, 3055, 3052,
+     3056, 3057, 3053, 3057, 3059, 3056, 3058, 3058, 3049, 3060,
+     3061, 3059, 3062, 3063, 3066, 3054, 3060, 3062, 3065, 3065,
+     3068, 3069, 3070, 3071, 3075, 3068, 3069, 3072, 3072, 3061,
 
-     3063, 3075, 3076, 3072, 3077,    0, 3075, 3078, 3078, 3079,
-     3079,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0, 3076,    0, 3077, 3083, 3083, 3083, 3083, 3083, 3083,
-     3083, 3084, 3084, 3084, 3084, 3084, 3084, 3084, 3085, 3085,
-     3085, 3085, 3085, 3085, 3085, 3086, 3086, 3086, 3086, 3086,
-     3086, 3086, 3087, 3087, 3087, 3087, 3087, 3087, 3087, 3089,
-     3089,    0, 3089, 3089, 3089, 3089, 3090, 3090,    0,    0,
-        0, 3090, 3090, 3091, 3091,    0,    0, 3091,    0, 3091,
-     3092,    0,    0,    0,    0,    0, 3092, 3093, 3093,    0,
-        0,    0, 3093, 3093, 3094,    0,    0,    0,    0,    0,
+     3074, 3074, 3063, 3066, 3076, 3077, 3077, 3078, 3078, 3079,
+     3089, 3070, 3071, 3075, 3081, 3081, 3079, 3082, 3082, 3083,
+     3085, 3090, 3088, 3076,    0, 3085, 3083, 3088,    0, 3089,
+     3091, 3091, 3092, 3092,    0,    0,    0,    0,    0,    0,
+     3090, 3096, 3096, 3096, 3096, 3096, 3096, 3096, 3097, 3097,
+     3097, 3097, 3097, 3097, 3097, 3098, 3098, 3098, 3098, 3098,
+     3098, 3098, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3100,
+     3100, 3100, 3100, 3100, 3100, 3100, 3102, 3102,    0, 3102,
+     3102, 3102, 3102, 3103, 3103,    0,    0,    0, 3103, 3103,
+     3104, 3104,    0,    0, 3104,    0, 3104, 3105,    0,    0,
 
-     3094, 3095, 3095,    0, 3095, 3095, 3095, 3095, 3096, 3096,
-        0, 3096, 3096, 3096, 3096, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082, 3082,
-     3082, 3082, 3082, 3082, 3082, 3082
+        0,    0,    0, 3105, 3106, 3106,    0,    0,    0, 3106,
+     3106, 3107,    0,    0,    0,    0,    0, 3107, 3108, 3108,
+        0, 3108, 3108, 3108, 3108, 3109, 3109,    0, 3109, 3109,
+     3109, 3109, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095, 3095,
+     3095, 3095, 3095
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2972,7 +2980,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 2973 "<stdout>"
+#line 2982 "<stdout>"
 #define YY_NO_INPUT 1
 #line 184 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -2981,9 +2989,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 2982 "<stdout>"
+#line 2991 "<stdout>"
 
-#line 2984 "<stdout>"
+#line 2993 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3205,7 +3213,7 @@ YY_DECL
 	{
 #line 204 "./util/configlexer.lex"
 
-#line 3206 "<stdout>"
+#line 3215 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3238,13 +3246,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 >= 3083 )
+				if ( yy_current_state >= 3096 )
 					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] != 6016 );
+		while ( yy_base[yy_current_state] != 6033 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -4119,461 +4127,461 @@ YY_RULE_SETUP
 case 170:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_ORIGINAL_TTL) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 382 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 383 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 385 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 384 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 388 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 389 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 397 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 398 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 399 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DYNLIB_FILE) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DYNLIB) }
+{ YDVAR(1, VAR_DYNLIB_FILE) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_DYNLIB) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 422 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 423 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 424 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 425 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 426 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 427 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 428 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 429 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 430 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 438 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
 #line 439 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(1, VAR_DNSTAP_IP) }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
 #line 440 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(1, VAR_DNSTAP_TLS) }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 441 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
 #line 442 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
-#line 444 "./util/configlexer.lex"
+#line 443 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
-#line 446 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 445 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
 #line 447 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
 #line 448 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
 #line 449 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
 #line 450 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
-#line 452 "./util/configlexer.lex"
+#line 451 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
-#line 454 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
-#line 456 "./util/configlexer.lex"
+#line 455 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
-#line 458 "./util/configlexer.lex"
+#line 457 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
-#line 460 "./util/configlexer.lex"
+#line 459 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
-#line 462 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 461 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
 #line 463 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
 #line 464 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
 #line 465 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
 #line 466 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
 #line 467 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
 #line 468 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
 #line 469 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
 #line 470 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
 #line 471 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
 #line 472 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 257:
 YY_RULE_SETUP
 #line 473 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 258:
 YY_RULE_SETUP
 #line 474 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(1, VAR_LOW_RTT) }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 475 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
@@ -4588,200 +4596,205 @@ YY_RULE_SETUP
 case 262:
 YY_RULE_SETUP
 #line 478 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
 #line 479 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
 #line 480 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 481 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 482 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 483 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
 #line 484 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 269:
 YY_RULE_SETUP
 #line 485 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 270:
 YY_RULE_SETUP
 #line 486 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 271:
 YY_RULE_SETUP
 #line 487 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 272:
 YY_RULE_SETUP
 #line 488 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 273:
 YY_RULE_SETUP
-#line 490 "./util/configlexer.lex"
+#line 489 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
-#line 492 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 491 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 493 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 494 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 495 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
 #line 503 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 504 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 505 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 506 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 507 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
 	YY_BREAK
 case 290:
 YY_RULE_SETUP
 #line 508 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(0, VAR_IPSET) }
 	YY_BREAK
 case 291:
 YY_RULE_SETUP
 #line 509 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
 	YY_BREAK
 case 292:
 YY_RULE_SETUP
 #line 510 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
 	YY_BREAK
 case 293:
 YY_RULE_SETUP
 #line 511 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 	YY_BREAK
 case 294:
-/* rule 294 can match eol */
 YY_RULE_SETUP
 #line 512 "./util/configlexer.lex"
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+	YY_BREAK
+case 295:
+/* rule 295 can match eol */
+YY_RULE_SETUP
+#line 513 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 295:
+case 296:
 YY_RULE_SETUP
-#line 515 "./util/configlexer.lex"
+#line 516 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 516 "./util/configlexer.lex"
+#line 517 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 296:
-YY_RULE_SETUP
-#line 521 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 297:
-/* rule 297 can match eol */
 YY_RULE_SETUP
 #line 522 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 298:
+/* rule 298 can match eol */
+YY_RULE_SETUP
+#line 523 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 298:
+case 299:
 YY_RULE_SETUP
-#line 524 "./util/configlexer.lex"
+#line 525 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4794,34 +4807,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 299:
+case 300:
 YY_RULE_SETUP
-#line 536 "./util/configlexer.lex"
+#line 537 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 537 "./util/configlexer.lex"
+#line 538 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 300:
-YY_RULE_SETUP
-#line 542 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 301:
-/* rule 301 can match eol */
 YY_RULE_SETUP
 #line 543 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 302:
+/* rule 302 can match eol */
+YY_RULE_SETUP
+#line 544 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 302:
+case 303:
 YY_RULE_SETUP
-#line 545 "./util/configlexer.lex"
+#line 546 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -4834,38 +4847,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 303:
+case 304:
 YY_RULE_SETUP
-#line 557 "./util/configlexer.lex"
+#line 558 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 559 "./util/configlexer.lex"
+#line 560 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 304:
-YY_RULE_SETUP
-#line 563 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 305:
-/* rule 305 can match eol */
 YY_RULE_SETUP
 #line 564 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 306:
+/* rule 306 can match eol */
 YY_RULE_SETUP
 #line 565 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 307:
 YY_RULE_SETUP
 #line 566 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 308:
+YY_RULE_SETUP
+#line 567 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext);
@@ -4873,27 +4886,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 571 "./util/configlexer.lex"
+#line 572 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 308:
-YY_RULE_SETUP
-#line 575 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 309:
-/* rule 309 can match eol */
 YY_RULE_SETUP
 #line 576 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 310:
+/* rule 310 can match eol */
+YY_RULE_SETUP
+#line 577 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 310:
+case 311:
 YY_RULE_SETUP
-#line 578 "./util/configlexer.lex"
+#line 579 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -4903,7 +4916,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 584 "./util/configlexer.lex"
+#line 585 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -4915,33 +4928,33 @@ case YY_STATE_EOF(val):
 	}
 }
 	YY_BREAK
-case 311:
+case 312:
 YY_RULE_SETUP
-#line 595 "./util/configlexer.lex"
+#line 596 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 312:
+case 313:
 YY_RULE_SETUP
-#line 599 "./util/configlexer.lex"
+#line 600 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 313:
+case 314:
 YY_RULE_SETUP
-#line 603 "./util/configlexer.lex"
+#line 604 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 314:
+case 315:
 YY_RULE_SETUP
-#line 607 "./util/configlexer.lex"
+#line 608 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 4942 "<stdout>"
+#line 4956 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5236,7 +5249,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 >= 3083 )
+			if ( yy_current_state >= 3096 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5264,11 +5277,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 >= 3083 )
+		if ( yy_current_state >= 3096 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3082);
+	yy_is_jam = (yy_current_state == 3095);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -5907,6 +5920,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 607 "./util/configlexer.lex"
+#line 608 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index d7c61c05b..74e5d767c 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -374,6 +374,7 @@ serve-expired-ttl{COLON}	{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
 serve-expired-ttl-reset{COLON}	{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
 serve-expired-reply-ttl{COLON}	{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
 serve-expired-client-timeout{COLON}	{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+serve-original-ttl{COLON}	{ YDVAR(1, VAR_SERVE_ORIGINAL_TTL) }
 fake-dsa{COLON}			{ YDVAR(1, VAR_FAKE_DSA) }
 fake-sha1{COLON}		{ YDVAR(1, VAR_FAKE_SHA1) }
 val-log-level{COLON}		{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
diff --git a/util/configparser.c b/util/configparser.c
index 2c9b0a5c4..3538b1937 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.  */
@@ -349,78 +341,79 @@ extern int yydebug;
     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_CACHEDB_REDISEXPIRERECORDS = 506,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 507,
-    VAR_FOR_UPSTREAM = 508,
-    VAR_AUTH_ZONE = 509,
-    VAR_ZONEFILE = 510,
-    VAR_MASTER = 511,
-    VAR_URL = 512,
-    VAR_FOR_DOWNSTREAM = 513,
-    VAR_FALLBACK_ENABLED = 514,
-    VAR_TLS_ADDITIONAL_PORT = 515,
-    VAR_LOW_RTT = 516,
-    VAR_LOW_RTT_PERMIL = 517,
-    VAR_FAST_SERVER_PERMIL = 518,
-    VAR_FAST_SERVER_NUM = 519,
-    VAR_ALLOW_NOTIFY = 520,
-    VAR_TLS_WIN_CERT = 521,
-    VAR_TCP_CONNECTION_LIMIT = 522,
-    VAR_FORWARD_NO_CACHE = 523,
-    VAR_STUB_NO_CACHE = 524,
-    VAR_LOG_SERVFAIL = 525,
-    VAR_DENY_ANY = 526,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 527,
-    VAR_LOG_TAG_QUERYREPLY = 528,
-    VAR_STREAM_WAIT_SIZE = 529,
-    VAR_TLS_CIPHERS = 530,
-    VAR_TLS_CIPHERSUITES = 531,
-    VAR_TLS_USE_SNI = 532,
-    VAR_IPSET = 533,
-    VAR_IPSET_NAME_V4 = 534,
-    VAR_IPSET_NAME_V6 = 535,
-    VAR_TLS_SESSION_TICKET_KEYS = 536,
-    VAR_RPZ = 537,
-    VAR_TAGS = 538,
-    VAR_RPZ_ACTION_OVERRIDE = 539,
-    VAR_RPZ_CNAME_OVERRIDE = 540,
-    VAR_RPZ_LOG = 541,
-    VAR_RPZ_LOG_NAME = 542,
-    VAR_DYNLIB = 543,
-    VAR_DYNLIB_FILE = 544
+    VAR_SERVE_ORIGINAL_TTL = 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_DYNLIB = 544,
+    VAR_DYNLIB_FILE = 545
   };
 #endif
 /* Tokens.  */
@@ -639,90 +632,92 @@ extern int yydebug;
 #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_CACHEDB_REDISEXPIRERECORDS 506
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 507
-#define VAR_FOR_UPSTREAM 508
-#define VAR_AUTH_ZONE 509
-#define VAR_ZONEFILE 510
-#define VAR_MASTER 511
-#define VAR_URL 512
-#define VAR_FOR_DOWNSTREAM 513
-#define VAR_FALLBACK_ENABLED 514
-#define VAR_TLS_ADDITIONAL_PORT 515
-#define VAR_LOW_RTT 516
-#define VAR_LOW_RTT_PERMIL 517
-#define VAR_FAST_SERVER_PERMIL 518
-#define VAR_FAST_SERVER_NUM 519
-#define VAR_ALLOW_NOTIFY 520
-#define VAR_TLS_WIN_CERT 521
-#define VAR_TCP_CONNECTION_LIMIT 522
-#define VAR_FORWARD_NO_CACHE 523
-#define VAR_STUB_NO_CACHE 524
-#define VAR_LOG_SERVFAIL 525
-#define VAR_DENY_ANY 526
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 527
-#define VAR_LOG_TAG_QUERYREPLY 528
-#define VAR_STREAM_WAIT_SIZE 529
-#define VAR_TLS_CIPHERS 530
-#define VAR_TLS_CIPHERSUITES 531
-#define VAR_TLS_USE_SNI 532
-#define VAR_IPSET 533
-#define VAR_IPSET_NAME_V4 534
-#define VAR_IPSET_NAME_V6 535
-#define VAR_TLS_SESSION_TICKET_KEYS 536
-#define VAR_RPZ 537
-#define VAR_TAGS 538
-#define VAR_RPZ_ACTION_OVERRIDE 539
-#define VAR_RPZ_CNAME_OVERRIDE 540
-#define VAR_RPZ_LOG 541
-#define VAR_RPZ_LOG_NAME 542
-#define VAR_DYNLIB 543
-#define VAR_DYNLIB_FILE 544
+#define VAR_SERVE_ORIGINAL_TTL 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_DYNLIB 544
+#define VAR_DYNLIB_FILE 545
 
 /* 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 724 "util/configparser.c"
-
+#line 719 "util/configparser.c" /* yacc.c:355  */
 };
+
 typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -735,7 +730,9 @@ int yyparse (void);
 
 #endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
 
+/* Copy the second part of user declarations.  */
 
+#line 736 "util/configparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -756,13 +753,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
@@ -774,7 +771,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
 
@@ -810,6 +807,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))
@@ -817,7 +823,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") \
@@ -837,8 +843,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.  */
@@ -970,27 +974,27 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   615
+#define YYLAST   617
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  290
+#define YYNTOKENS  291
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  315
+#define YYNNTS  316
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  606
+#define YYNRULES  608
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  900
+#define YYNSTATES  903
 
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   544
+#define YYMAXUTOK   545
 
-/* 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,
@@ -1047,7 +1051,7 @@ 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,   289
+     285,   286,   287,   288,   289,   290
 };
 
 #if YYDEBUG
@@ -1072,49 +1076,49 @@ static const yytype_uint16 yyrline[] =
      253,   253,   254,   255,   255,   256,   256,   257,   257,   258,
      258,   259,   259,   260,   260,   260,   261,   261,   262,   262,
      263,   263,   264,   264,   265,   265,   266,   266,   267,   267,
-     267,   268,   268,   268,   269,   269,   269,   270,   270,   271,
-     272,   272,   273,   273,   274,   274,   275,   275,   276,   276,
-     276,   277,   277,   277,   278,   278,   278,   279,   279,   280,
-     280,   281,   281,   282,   284,   296,   297,   298,   298,   298,
-     298,   298,   299,   299,   301,   313,   314,   315,   315,   315,
-     315,   316,   316,   318,   332,   333,   334,   334,   334,   334,
-     335,   335,   335,   337,   354,   355,   356,   356,   356,   356,
-     357,   357,   357,   358,   361,   380,   397,   405,   415,   423,
-     440,   441,   442,   442,   442,   442,   442,   443,   443,   443,
-     444,   444,   446,   455,   464,   475,   484,   493,   502,   513,
-     522,   534,   548,   563,   574,   591,   608,   625,   642,   657,
-     672,   685,   700,   709,   718,   727,   736,   745,   754,   763,
-     772,   781,   790,   799,   808,   817,   826,   839,   848,   861,
-     870,   879,   888,   895,   902,   911,   918,   927,   935,   942,
-     949,   957,   966,   975,   984,   998,  1007,  1016,  1025,  1034,
-    1043,  1052,  1059,  1066,  1092,  1100,  1107,  1114,  1121,  1128,
-    1136,  1144,  1152,  1159,  1170,  1181,  1188,  1197,  1206,  1215,
-    1222,  1229,  1237,  1245,  1255,  1265,  1275,  1289,  1297,  1310,
-    1321,  1329,  1342,  1351,  1360,  1369,  1379,  1389,  1397,  1410,
-    1419,  1427,  1436,  1444,  1457,  1466,  1473,  1483,  1493,  1503,
-    1513,  1523,  1533,  1543,  1553,  1560,  1567,  1574,  1583,  1592,
-    1601,  1610,  1617,  1627,  1647,  1654,  1672,  1685,  1698,  1707,
-    1716,  1725,  1734,  1744,  1754,  1765,  1774,  1783,  1792,  1801,
-    1810,  1819,  1832,  1845,  1854,  1861,  1870,  1879,  1888,  1897,
-    1905,  1918,  1926,  1967,  1974,  1989,  1999,  2009,  2016,  2023,
-    2030,  2039,  2047,  2061,  2082,  2103,  2115,  2127,  2139,  2148,
-    2169,  2179,  2188,  2196,  2204,  2217,  2230,  2245,  2260,  2269,
-    2278,  2284,  2293,  2302,  2312,  2322,  2335,  2348,  2360,  2374,
-    2386,  2400,  2410,  2417,  2424,  2433,  2442,  2452,  2462,  2472,
-    2479,  2486,  2495,  2504,  2514,  2524,  2531,  2538,  2545,  2553,
-    2563,  2573,  2583,  2593,  2632,  2642,  2650,  2658,  2673,  2682,
-    2687,  2688,  2689,  2689,  2689,  2690,  2690,  2690,  2691,  2691,
-    2693,  2703,  2712,  2719,  2726,  2733,  2740,  2747,  2754,  2759,
-    2760,  2761,  2761,  2762,  2762,  2762,  2763,  2764,  2764,  2765,
-    2765,  2766,  2766,  2767,  2768,  2769,  2770,  2771,  2772,  2774,
-    2783,  2790,  2797,  2806,  2813,  2820,  2827,  2834,  2843,  2852,
-    2859,  2866,  2876,  2886,  2896,  2906,  2916,  2926,  2931,  2932,
-    2933,  2935,  2941,  2946,  2947,  2948,  2950,  2956,  2966,  2973,
-    2982,  2990,  2995,  2996,  2998,  2998,  2998,  2999,  2999,  3000,
-    3001,  3002,  3003,  3004,  3006,  3016,  3025,  3032,  3041,  3048,
-    3057,  3065,  3078,  3086,  3099,  3104,  3105,  3106,  3106,  3107,
-    3107,  3107,  3108,  3110,  3122,  3134,  3146,  3161,  3174,  3187,
-    3198,  3203,  3204,  3205,  3205,  3207,  3222
+     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,   967,   976,   985,   999,  1008,  1017,  1026,
+    1035,  1044,  1053,  1060,  1067,  1093,  1101,  1108,  1115,  1122,
+    1129,  1137,  1145,  1153,  1160,  1171,  1182,  1189,  1198,  1207,
+    1216,  1223,  1230,  1238,  1246,  1256,  1266,  1276,  1290,  1298,
+    1311,  1322,  1330,  1343,  1352,  1361,  1370,  1380,  1390,  1398,
+    1411,  1420,  1428,  1437,  1445,  1458,  1467,  1474,  1484,  1494,
+    1504,  1514,  1524,  1534,  1544,  1554,  1561,  1568,  1575,  1584,
+    1593,  1602,  1611,  1618,  1628,  1648,  1655,  1673,  1686,  1699,
+    1708,  1717,  1726,  1735,  1745,  1755,  1766,  1775,  1784,  1793,
+    1802,  1811,  1820,  1829,  1842,  1855,  1864,  1871,  1880,  1889,
+    1898,  1907,  1915,  1928,  1936,  1977,  1984,  1999,  2009,  2019,
+    2026,  2033,  2040,  2049,  2057,  2071,  2092,  2113,  2125,  2137,
+    2149,  2158,  2179,  2189,  2198,  2206,  2214,  2227,  2240,  2255,
+    2270,  2279,  2288,  2294,  2303,  2312,  2322,  2332,  2345,  2358,
+    2370,  2384,  2396,  2410,  2420,  2427,  2434,  2443,  2452,  2462,
+    2472,  2482,  2489,  2496,  2505,  2514,  2524,  2534,  2541,  2548,
+    2555,  2563,  2573,  2583,  2593,  2603,  2642,  2652,  2660,  2668,
+    2683,  2692,  2697,  2698,  2699,  2699,  2699,  2700,  2700,  2700,
+    2701,  2701,  2703,  2713,  2722,  2729,  2736,  2743,  2750,  2757,
+    2764,  2769,  2770,  2771,  2771,  2772,  2772,  2772,  2773,  2774,
+    2774,  2775,  2775,  2776,  2776,  2777,  2778,  2779,  2780,  2781,
+    2782,  2784,  2793,  2800,  2807,  2816,  2823,  2830,  2837,  2844,
+    2853,  2862,  2869,  2876,  2886,  2896,  2906,  2916,  2926,  2936,
+    2941,  2942,  2943,  2945,  2951,  2956,  2957,  2958,  2960,  2966,
+    2976,  2983,  2992,  3000,  3005,  3006,  3008,  3008,  3008,  3009,
+    3009,  3010,  3011,  3012,  3013,  3014,  3016,  3026,  3035,  3042,
+    3051,  3058,  3067,  3075,  3088,  3096,  3109,  3114,  3115,  3116,
+    3116,  3117,  3117,  3117,  3118,  3120,  3132,  3144,  3156,  3171,
+    3184,  3197,  3208,  3213,  3214,  3215,  3215,  3217,  3232
 };
 #endif
 
@@ -1202,8 +1206,9 @@ static const char *const yytname[] =
   "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW",
   "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_SERVE_EXPIRED_TTL",
   "VAR_SERVE_EXPIRED_TTL_RESET", "VAR_SERVE_EXPIRED_REPLY_TTL",
-  "VAR_SERVE_EXPIRED_CLIENT_TIMEOUT", "VAR_FAKE_DSA", "VAR_FAKE_SHA1",
-  "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING",
+  "VAR_SERVE_EXPIRED_CLIENT_TIMEOUT", "VAR_SERVE_ORIGINAL_TTL",
+  "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY",
+  "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING",
   "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE",
   "VAR_SHM_KEY", "VAR_ROOT_KEY_SENTINEL", "VAR_DNSCRYPT",
   "VAR_DNSCRYPT_ENABLE", "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER",
@@ -1296,8 +1301,8 @@ static const char *const yytname[] =
   "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_serve_expired_client_timeout", "server_serve_original_ttl",
+  "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",
@@ -1391,14 +1396,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,   544
+     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
+     545
 };
 # endif
 
-#define YYPACT_NINF -280
+#define YYPACT_NINF -281
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-280)))
+  (!!((Yystate) == (-281)))
 
 #define YYTABLE_NINF -1
 
@@ -1409,11 +1415,11 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -280,     0,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-     277,   -42,   -37,   -41,    -7,   -43,   -30,  -136,  -106,  -279,
-    -177,  -172,  -271,     2,     3,     4,    25,    26,    28,    31,
+    -281,     0,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+     278,   -42,   -37,   -41,    -7,   -43,   -30,  -136,  -106,  -280,
+    -178,  -173,  -272,     2,     3,     4,    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,    91,    93,    94,
@@ -1427,78 +1433,79 @@ static const yytype_int16 yypact[] =
      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,
-     201,   205,   206,   207,   208,   209,   210,   211,   213,   214,
-     215,   216,   219,   220,   222,   223,   224,   225,   226,   227,
-     228,   229,   237,   243,   245,   246,   247,   249,   250,   251,
+     201,   202,   206,   207,   208,   209,   210,   211,   212,   214,
+     215,   216,   217,   220,   221,   223,   224,   225,   226,   227,
+     228,   229,   230,   238,   244,   246,   247,   248,   250,   251,
      252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   269,   270,   271,   273,
-     274,   275,   276,   311,   312,   313,   314,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,   318,   319,   320,   362,   363,   364,   365,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,   366,   367,   368,
-     369,   370,   374,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-     378,   379,   404,   405,   406,   408,   419,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,   420,   421,   422,   423,   424,
-     425,   426,   427,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,   428,   429,   430,   431,   432,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,   433,   434,
-     435,   436,   437,   477,   479,   495,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,   496,   497,   498,   499,   500,
-     501,   502,   503,   504,   505,   512,   513,   514,   515,   516,
-     517,   518,   520,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,   521,  -280,  -280,   522,  -280,  -280,   523,   524,
-     525,   526,   529,   532,   535,   536,   545,   546,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,   547,
-     549,   550,   551,   552,   553,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,   554,   555,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,   556,   557,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,   558,   559,   560,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,   561,   562,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,   563,   564,
-     565,   566,   567,   568,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,   569,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,   570,  -280,  -280,   571,   572,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,   573,
-     574,   575,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280
+     262,   263,   264,   265,   266,   267,   268,   270,   271,   272,
+     274,   275,   276,   277,   312,   313,   314,   315,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,   319,   320,   321,   363,   364,   365,
+     366,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,   367,
+     368,   369,   370,   371,   375,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,   379,   380,   405,   406,   407,   409,   420,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,   421,   422,   423,
+     424,   425,   426,   427,   428,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,   429,   430,   431,   432,   433,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+     434,   435,   436,   437,   438,   478,   480,   497,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,   498,   499,   500,
+     501,   502,   503,   504,   505,   506,   507,   514,   515,   516,
+     517,   518,   519,   520,   522,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,   523,  -281,  -281,   524,  -281,  -281,
+     525,   526,   527,   528,   531,   534,   537,   538,   547,   548,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,   549,   551,   552,   553,   554,   555,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,   556,   557,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,   558,
+     559,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,   560,   561,   562,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,   563,
+     564,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+     565,   566,   567,   568,   569,   570,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,   571,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,   572,  -281,
+    -281,   573,   574,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,   575,   576,   577,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1506,9 +1513,9 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    17,   214,   224,   489,   547,   508,   233,
-     561,   584,   243,   600,   259,   552,     3,    19,   216,   226,
-     235,   245,   261,   491,   510,   549,   554,   563,   586,   602,
+       2,     0,     1,    17,   215,   225,   491,   549,   510,   234,
+     563,   586,   244,   602,   260,   554,     3,    19,   217,   227,
+     236,   246,   262,   493,   512,   551,   556,   565,   588,   604,
        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,
@@ -1529,147 +1536,148 @@ 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,    18,    20,    21,
-      84,    87,    96,   184,   185,    22,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,    35,    75,    23,    88,
-      89,    46,    68,    83,    24,    25,    28,    29,    26,    27,
-      30,    31,    32,    33,    34,   119,   196,   120,   122,   123,
-     124,   198,   203,   199,   210,   211,   212,   213,   180,    85,
-      74,   100,   117,   118,   208,   205,   121,    36,    37,    38,
-      39,    40,    76,    90,    91,   106,    62,    72,    63,   188,
-     189,   101,    56,    57,   187,    58,    59,   110,   114,   128,
-     137,   163,   140,   209,   111,    69,    41,    42,    43,    98,
-     129,   130,   131,    44,    45,    47,    48,    50,    51,    49,
-     135,    52,    53,    54,    60,    79,   115,    93,   136,    86,
-     159,    94,    95,   112,   113,   206,    99,    55,    77,    80,
-      61,    64,   102,   103,    78,   160,   104,    65,    66,    67,
-     197,   116,   173,   174,   175,   176,   177,   178,   186,   105,
-      73,   107,   108,   109,   161,    70,    71,    92,    81,    82,
-      97,   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,   490,   492,   494,   493,
-     499,   495,   496,   497,   498,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    18,    20,
+      21,    84,    87,    96,   185,   186,    22,   149,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,    35,    75,    23,
+      88,    89,    46,    68,    83,    24,    25,    28,    29,    26,
+      27,    30,    31,    32,    33,    34,   119,   197,   120,   122,
+     123,   124,   199,   204,   200,   211,   212,   213,   214,   181,
+      85,    74,   100,   117,   118,   209,   206,   121,    36,    37,
+      38,    39,    40,    76,    90,    91,   106,    62,    72,    63,
+     189,   190,   101,    56,    57,   188,    58,    59,   110,   114,
+     128,   137,   163,   140,   210,   111,    69,    41,    42,    43,
+      98,   129,   130,   131,    44,    45,    47,    48,    50,    51,
+      49,   135,    52,    53,    54,    60,    79,   115,    93,   136,
+      86,   159,    94,    95,   112,   113,   207,    99,    55,    77,
+      80,    61,    64,   102,   103,    78,   160,   104,    65,    66,
+      67,   198,   116,   173,   174,   175,   176,   177,   178,   179,
+     187,   105,    73,   107,   108,   109,   161,    70,    71,    92,
+      81,    82,    97,   125,   126,   208,   127,   132,   133,   134,
+     164,   165,   167,   169,   170,   168,   171,   182,   138,   139,
+     143,   144,   141,   142,   145,   146,   148,   147,   201,   203,
+     202,   162,   172,   191,   193,   192,   194,   195,   196,   166,
+     180,   183,   184,   205,     0,     0,     0,     0,     0,     0,
+       0,   216,   218,   219,   220,   222,   223,   224,   221,     0,
+       0,     0,     0,     0,     0,   226,   228,   229,   230,   231,
+     232,   233,     0,     0,     0,     0,     0,     0,     0,   235,
+     237,   238,   241,   242,   239,   243,   240,     0,     0,     0,
+       0,     0,     0,     0,     0,   245,   247,   248,   249,   250,
+     254,   251,   252,   253,     0,     0,     0,     0,     0,   265,
+     269,   270,   271,   272,   261,   263,   264,   266,   267,   268,
+       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,   509,   511,   512,   513,   514,   515,   516,
+       0,     0,     0,     0,     0,   511,   513,   514,   515,   516,
      517,   518,   519,   520,   521,   522,   523,   524,   525,   526,
-     527,   528,     0,   548,   550,     0,   553,   555,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   562,   564,
-     565,   566,   568,   569,   567,   570,   571,   572,   573,     0,
-       0,     0,     0,     0,     0,   585,   587,   588,   589,   590,
-     591,   592,     0,     0,   601,   603,   604,   273,   272,   279,
-     292,   290,   302,   298,   299,   303,   300,   301,   304,   305,
-     306,   307,   308,   331,   332,   333,   334,   335,   360,   361,
-     362,   367,   368,   295,   369,   370,   373,   371,   372,   375,
-     376,   377,   391,   346,   347,   349,   350,   378,   394,   340,
-     342,   395,   401,   402,   403,   296,   359,   419,   420,   341,
-     414,   324,   291,   336,   392,   398,   379,     0,     0,   423,
-     297,   274,   323,   383,   275,   293,   294,   337,   338,   421,
-     381,   385,   386,   276,   424,   363,   390,   325,   345,   396,
-     397,   400,   413,   339,   417,   415,   416,   351,   358,   387,
-     388,   352,   353,   380,   405,   326,   327,   330,   309,   311,
-     312,   313,   314,   315,   425,   426,   428,   364,   365,   366,
-     374,   429,   430,   431,     0,     0,     0,   382,   354,   356,
-     557,   440,   444,   442,   441,   445,   443,     0,     0,   448,
-     449,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   384,   399,   418,   453,   454,   355,   432,     0,     0,
-       0,     0,     0,     0,   406,   407,   408,   409,   410,   411,
-     412,   558,   348,   343,   404,   322,   277,   278,   344,   455,
-     457,   456,   458,   459,   460,   310,   317,   450,   452,   451,
-     316,     0,   329,   389,   427,   328,   357,   318,   319,   321,
-     320,   461,   462,   463,   467,   466,   464,   465,   468,   469,
-     470,   471,   473,   472,   482,     0,   486,   487,     0,     0,
-     488,   474,   480,   475,   476,   477,   479,   481,   478,   254,
-     255,   256,   257,   258,   500,   502,   501,   504,   505,   506,
-     507,   503,   529,   530,   531,   532,   533,   534,   535,   536,
-     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-     551,   556,   574,   575,   576,   579,   577,   578,   580,   581,
-     582,   583,   593,   594,   595,   596,   597,   598,   605,   606,
-     393,   422,   439,   559,   560,   446,   447,   433,   434,     0,
-       0,     0,   438,   599,   483,   484,   485,   437,   435,   436
+     527,   528,   529,   530,     0,   550,   552,     0,   555,   557,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     564,   566,   567,   568,   570,   571,   569,   572,   573,   574,
+     575,     0,     0,     0,     0,     0,     0,   587,   589,   590,
+     591,   592,   593,   594,     0,     0,   603,   605,   606,   274,
+     273,   280,   293,   291,   303,   299,   300,   304,   301,   302,
+     305,   306,   307,   308,   309,   332,   333,   334,   335,   336,
+     361,   362,   363,   368,   369,   296,   370,   371,   374,   372,
+     373,   376,   377,   378,   392,   347,   348,   350,   351,   379,
+     395,   341,   343,   396,   402,   403,   404,   297,   360,   421,
+     422,   342,   416,   325,   292,   337,   393,   399,   380,     0,
+       0,   425,   298,   275,   324,   384,   276,   294,   295,   338,
+     339,   423,   382,   386,   387,   277,   426,   364,   391,   326,
+     346,   397,   398,   401,   415,   340,   419,   417,   418,   352,
+     359,   388,   389,   353,   354,   381,   406,   327,   328,   331,
+     310,   312,   313,   314,   315,   316,   427,   428,   430,   365,
+     366,   367,   375,   431,   432,   433,     0,     0,     0,   383,
+     355,   357,   559,   442,   446,   444,   443,   447,   445,     0,
+       0,   450,   451,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   385,   400,   420,   455,   456,   356,   434,
+       0,     0,     0,     0,     0,     0,   407,   408,   409,   410,
+     411,   412,   413,   414,   560,   349,   344,   405,   323,   278,
+     279,   345,   457,   459,   458,   460,   461,   462,   311,   318,
+     452,   454,   453,   317,     0,   330,   390,   429,   329,   358,
+     319,   320,   322,   321,   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,   255,   256,   257,   258,   259,   502,   504,   503,
+     506,   507,   508,   509,   505,   531,   532,   533,   534,   535,
+     536,   537,   538,   539,   540,   541,   542,   543,   544,   545,
+     546,   547,   548,   553,   558,   576,   577,   578,   581,   579,
+     580,   582,   583,   584,   585,   595,   596,   597,   598,   599,
+     600,   607,   608,   394,   424,   441,   561,   562,   448,   449,
+     435,   436,     0,     0,     0,   440,   601,   485,   486,   487,
+     439,   437,   438
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,   576,   577,
-     578,   579,   580,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,  -280,
-    -280,  -280,  -280,  -280,  -280
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,   578,
+     579,   580,   581,   582,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,  -281,
+    -281,  -281,  -281,  -281,  -281,  -281
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    16,    17,    30,   237,    18,    31,   439,    19,
-      32,   453,    20,    33,   467,    21,    34,   483,   497,   498,
-     499,   500,   501,    22,    35,   502,   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,   426,   440,   441,   442,   443,   444,
-     445,   446,   454,   455,   456,   457,   458,   459,   484,   485,
-     486,   487,   488,   489,   490,   491,   468,   469,   470,   471,
-     472,   473,   474,    23,    36,   516,   517,   518,   519,   520,
-     521,   522,   523,   524,    24,    37,   543,   544,   545,   546,
-     547,   548,   549,   550,   551,   552,   553,   554,   555,   556,
-     557,   558,   559,   560,   561,    25,    38,   563,   564,    26,
-      39,   566,   567,   427,   428,   429,   430,    27,    40,   578,
-     579,   580,   581,   582,   583,   584,   585,   586,   587,   588,
-      28,    41,   595,   596,   597,   598,   599,   600,   601,   431,
-      29,    42,   604,   605,   606
+      -1,     1,    16,    17,    30,   238,    18,    31,   441,    19,
+      32,   455,    20,    33,   469,    21,    34,   485,   499,   500,
+     501,   502,   503,    22,    35,   504,   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,   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,    23,    36,   518,   519,   520,   521,
+     522,   523,   524,   525,   526,    24,    37,   545,   546,   547,
+     548,   549,   550,   551,   552,   553,   554,   555,   556,   557,
+     558,   559,   560,   561,   562,   563,    25,    38,   565,   566,
+      26,    39,   568,   569,   429,   430,   431,   432,    27,    40,
+     580,   581,   582,   583,   584,   585,   586,   587,   588,   589,
+     590,    28,    41,   597,   598,   599,   600,   601,   602,   603,
+     433,    29,    42,   606,   607,   608
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1677,80 +1685,80 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   475,   432,   460,   433,   434,   562,   447,   602,   603,
-     565,     3,   607,   608,   609,   448,   449,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   537,
-     538,   539,   540,   541,   542,   610,   611,   475,   612,   461,
-     462,   613,   614,   615,   616,     4,   617,   618,   619,   620,
-     621,     5,   568,   569,   570,   571,   572,   573,   574,   575,
-     576,   577,   622,   623,   463,   435,   508,   509,   510,   511,
-     512,   513,   514,   515,   589,   590,   591,   592,   593,   594,
-     624,   625,   626,   627,   628,   629,   630,   631,   632,   633,
-     634,   635,   636,   637,   638,     6,   436,   639,   640,   437,
-     450,   641,   451,   642,   643,   644,   645,   646,   647,   648,
-     649,     7,   650,   651,   652,   653,   654,   655,   656,   657,
-     658,   659,   660,   661,   662,   663,   664,   665,   666,   667,
-     668,   464,   465,   669,   670,   671,   672,   673,   674,   675,
-     676,   677,   678,   679,   680,   681,   682,   683,   684,   685,
-     686,   687,     8,   688,   689,   690,   691,   692,   693,   694,
-     695,   696,   697,   698,   699,   700,   701,   702,   703,   704,
-     705,   466,   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,   735,   736,   737,   738,   739,   740,   741,   742,   743,
-       9,   744,   477,   478,   479,   745,   746,   747,   748,   749,
-     750,   751,   482,   752,   753,   754,   755,   438,    10,   756,
-     757,   452,   758,   759,   760,   761,   762,   763,   764,   765,
-     492,   493,   494,   495,   496,    11,   476,   766,   477,   478,
-     479,   480,   481,   767,    12,   768,   769,   770,   482,   771,
-     772,   773,   774,   775,   776,   777,   778,   779,   780,   781,
-     782,   783,   784,   785,   786,   787,   788,   789,    13,   790,
-     791,   792,    14,   793,   794,   795,   796,     0,    15,    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,    72,    73,
-      74,   797,   798,   799,   800,    75,    76,    77,   801,   802,
-     803,    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,   116,
-     117,   118,   804,   805,   806,   807,   808,   809,   810,   811,
-     812,   119,   120,   121,   813,   122,   123,   124,   814,   815,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   816,   817,   818,   149,   819,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   820,
-     821,   822,   823,   824,   825,   826,   827,   828,   829,   830,
-     831,   832,   833,   834,   835,   836,   837,   838,   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,   197,   198,   839,   199,   840,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   841,   842,   843,   844,   845,
-     846,   847,   848,   849,   850,   851,   215,   216,   217,   218,
-     219,   220,   852,   853,   854,   855,   856,   857,   858,   221,
-     859,   860,   861,   862,   863,   864,   865,   222,   223,   866,
-     224,   225,   867,   226,   227,   868,   869,   228,   229,   230,
-     231,   232,   233,   234,   235,   870,   871,   872,   236,   873,
-     874,   875,   876,   877,   878,   879,   880,   881,   882,   883,
-     884,   885,   886,   887,   888,   889,   890,   891,   892,   893,
-     894,   895,   896,   897,   898,   899,     0,     0,     0,     0,
+       2,   477,   434,   462,   435,   436,   564,   449,   604,   605,
+     567,     3,   609,   610,   611,   450,   451,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,   537,   538,   539,
+     540,   541,   542,   543,   544,   612,   613,   477,   614,   463,
+     464,   615,   616,   617,   618,     4,   619,   620,   621,   622,
+     623,     5,   570,   571,   572,   573,   574,   575,   576,   577,
+     578,   579,   624,   625,   465,   437,   510,   511,   512,   513,
+     514,   515,   516,   517,   591,   592,   593,   594,   595,   596,
+     626,   627,   628,   629,   630,   631,   632,   633,   634,   635,
+     636,   637,   638,   639,   640,     6,   438,   641,   642,   439,
+     452,   643,   453,   644,   645,   646,   647,   648,   649,   650,
+     651,     7,   652,   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,     8,   690,   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,
+       9,   746,   747,   479,   480,   481,   748,   749,   750,   751,
+     752,   753,   754,   484,   755,   756,   757,   758,   440,    10,
+     759,   760,   454,   761,   762,   763,   764,   765,   766,   767,
+     768,   494,   495,   496,   497,   498,    11,   478,   769,   479,
+     480,   481,   482,   483,   770,    12,   771,   772,   773,   484,
+     774,   775,   776,   777,   778,   779,   780,   781,   782,   783,
+     784,   785,   786,   787,   788,   789,   790,   791,   792,    13,
+     793,   794,   795,    14,   796,   797,   798,   799,     0,    15,
+      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,    72,
+      73,    74,   800,   801,   802,   803,    75,    76,    77,   804,
+     805,   806,    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,
+     116,   117,   118,   807,   808,   809,   810,   811,   812,   813,
+     814,   815,   119,   120,   121,   816,   122,   123,   124,   817,
+     818,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   819,   820,   821,   149,   822,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     823,   824,   825,   826,   827,   828,   829,   830,   831,   832,
+     833,   834,   835,   836,   837,   838,   839,   840,   841,   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,   197,   198,   842,   199,
+     843,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,   210,   211,   212,   213,   214,   215,   844,   845,   846,
+     847,   848,   849,   850,   851,   852,   853,   854,   216,   217,
+     218,   219,   220,   221,   855,   856,   857,   858,   859,   860,
+     861,   222,   862,   863,   864,   865,   866,   867,   868,   223,
+     224,   869,   225,   226,   870,   227,   228,   871,   872,   229,
+     230,   231,   232,   233,   234,   235,   236,   873,   874,   875,
+     237,   876,   877,   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,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   503,   504,   505,   506,   507
+       0,     0,     0,   505,   506,   507,   508,   509
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    44,    44,    44,    46,    47,   112,    44,   279,   280,
-     289,    11,    10,    10,    10,    52,    53,   153,   154,   155,
+       0,    44,    44,    44,    46,    47,   112,    44,   280,   281,
+     290,    11,    10,    10,    10,    52,    53,   153,   154,   155,
      156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
      166,   167,   168,   169,   170,    10,    10,    44,    10,    80,
       81,    10,    10,    10,    10,    45,    10,    10,    10,    10,
-      10,    51,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,    10,    10,   105,   107,    96,    97,    98,    99,
-     100,   101,   102,   103,   246,   247,   248,   249,   250,   251,
+      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,    10,    10,    10,    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,
@@ -1764,58 +1772,58 @@ static const yytype_int16 yycheck[] =
       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,
-     210,    10,   255,   256,   257,    10,    10,    10,    10,    10,
-      10,    10,   265,    10,    10,    10,    10,   269,   228,    10,
-      10,   268,    10,    10,    10,    10,    10,    10,    10,    10,
-     283,   284,   285,   286,   287,   245,   253,    10,   255,   256,
-     257,   258,   259,    10,   254,    10,    10,    10,   265,    10,
+     210,    10,    10,   256,   257,   258,    10,    10,    10,    10,
+      10,    10,    10,   266,    10,    10,    10,    10,   270,   229,
+      10,    10,   269,    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,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,   278,    10,
-      10,    10,   282,    10,    10,    10,    10,    -1,   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,    10,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,   279,
+      10,    10,    10,   283,    10,    10,    10,    10,    -1,   289,
+      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,
       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,   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,    10,   252,
-      10,    10,    10,    10,    10,    10,    10,   260,   261,    10,
-     263,   264,    10,   266,   267,    10,    10,   270,   271,   272,
-     273,   274,   275,   276,   277,    10,    10,    10,   281,    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,   209,    10,   211,
+      10,   213,   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,
       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,
+      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,    35,    35,    35,    35,    35
+      -1,    -1,    -1,    35,    35,    35,    35,    35
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   291,     0,    11,    45,    51,    95,   111,   152,   210,
-     228,   245,   254,   278,   282,   288,   292,   293,   296,   299,
-     302,   305,   313,   533,   544,   565,   569,   577,   590,   600,
-     294,   297,   300,   303,   306,   314,   534,   545,   566,   570,
-     578,   591,   601,    12,    13,    14,    15,    16,    17,    18,
+       0,   292,     0,    11,    45,    51,    95,   111,   152,   210,
+     229,   246,   255,   279,   283,   289,   293,   294,   297,   300,
+     303,   306,   314,   535,   546,   567,   571,   579,   592,   602,
+     295,   298,   301,   304,   307,   315,   536,   547,   568,   572,
+     580,   593,   603,    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,    48,    49,    50,    54,    55,
@@ -1832,9 +1840,9 @@ static const yytype_uint16 yystos[] =
      191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
      201,   202,   203,   204,   205,   206,   207,   208,   209,   211,
      213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
-     223,   224,   225,   226,   227,   239,   240,   241,   242,   243,
-     244,   252,   260,   261,   263,   264,   266,   267,   270,   271,
-     272,   273,   274,   275,   276,   277,   281,   295,   316,   317,
+     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,   296,   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,
@@ -1853,25 +1861,25 @@ 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,
-     498,   499,   500,   501,   502,   503,   504,   573,   574,   575,
-     576,   599,    44,    46,    47,   107,   138,   141,   269,   298,
-     505,   506,   507,   508,   509,   510,   511,    44,    52,    53,
-     137,   139,   268,   301,   512,   513,   514,   515,   516,   517,
-      44,    80,    81,   105,   172,   173,   212,   304,   526,   527,
-     528,   529,   530,   531,   532,    44,   253,   255,   256,   257,
-     258,   259,   265,   307,   518,   519,   520,   521,   522,   523,
-     524,   525,   283,   284,   285,   286,   287,   308,   309,   310,
-     311,   312,   315,   518,   519,   520,   521,   522,    96,    97,
-      98,    99,   100,   101,   102,   103,   535,   536,   537,   538,
-     539,   540,   541,   542,   543,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   546,   547,   548,   549,   550,   551,   552,
+     498,   499,   500,   501,   502,   503,   504,   505,   506,   575,
+     576,   577,   578,   601,    44,    46,    47,   107,   138,   141,
+     270,   299,   507,   508,   509,   510,   511,   512,   513,    44,
+      52,    53,   137,   139,   269,   302,   514,   515,   516,   517,
+     518,   519,    44,    80,    81,   105,   172,   173,   212,   305,
+     528,   529,   530,   531,   532,   533,   534,    44,   254,   256,
+     257,   258,   259,   260,   266,   308,   520,   521,   522,   523,
+     524,   525,   526,   527,   284,   285,   286,   287,   288,   309,
+     310,   311,   312,   313,   316,   520,   521,   522,   523,   524,
+      96,    97,    98,    99,   100,   101,   102,   103,   537,   538,
+     539,   540,   541,   542,   543,   544,   545,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   548,   549,   550,   551,   552,
      553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
-     563,   564,   112,   567,   568,   289,   571,   572,   229,   230,
-     231,   232,   233,   234,   235,   236,   237,   238,   579,   580,
-     581,   582,   583,   584,   585,   586,   587,   588,   589,   246,
-     247,   248,   249,   250,   251,   592,   593,   594,   595,   596,
-     597,   598,   279,   280,   602,   603,   604,    10,    10,    10,
+     563,   564,   565,   566,   112,   569,   570,   290,   573,   574,
+     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
+     581,   582,   583,   584,   585,   586,   587,   588,   589,   590,
+     591,   247,   248,   249,   250,   251,   252,   594,   595,   596,
+     597,   598,   599,   600,   280,   281,   604,   605,   606,    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,
@@ -1900,40 +1908,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,    10,    10,    10,
+      10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   290,   291,   291,   292,   292,   292,   292,   292,   292,
-     292,   292,   292,   292,   292,   292,   292,   293,   294,   294,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
-     295,   295,   295,   295,   296,   297,   297,   298,   298,   298,
-     298,   298,   298,   298,   299,   300,   300,   301,   301,   301,
-     301,   301,   301,   302,   303,   303,   304,   304,   304,   304,
-     304,   304,   304,   305,   306,   306,   307,   307,   307,   307,
-     307,   307,   307,   307,   308,   309,   310,   311,   312,   313,
-     314,   314,   315,   315,   315,   315,   315,   315,   315,   315,
-     315,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+       0,   291,   292,   292,   293,   293,   293,   293,   293,   293,
+     293,   293,   293,   293,   293,   293,   293,   294,   295,   295,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   296,
+     296,   296,   296,   296,   296,   296,   296,   296,   296,   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,   303,   304,   304,   305,   305,   305,
+     305,   305,   305,   305,   306,   307,   307,   308,   308,   308,
+     308,   308,   308,   308,   308,   309,   310,   311,   312,   313,
+     314,   315,   315,   316,   316,   316,   316,   316,   316,   316,
+     316,   316,   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,
@@ -1955,18 +1964,18 @@ static const yytype_uint16 yyr1[] =
      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,
+     534,   535,   536,   536,   537,   537,   537,   537,   537,   537,
+     537,   537,   538,   539,   540,   541,   542,   543,   544,   545,
+     546,   547,   547,   548,   548,   548,   548,   548,   548,   548,
+     548,   548,   548,   548,   548,   548,   548,   548,   548,   548,
      548,   549,   550,   551,   552,   553,   554,   555,   556,   557,
-     558,   559,   560,   561,   562,   563,   564,   565,   566,   566,
-     567,   568,   569,   570,   570,   571,   572,   573,   574,   575,
-     576,   577,   578,   578,   579,   579,   579,   579,   579,   579,
-     579,   579,   579,   579,   580,   581,   582,   583,   584,   585,
-     586,   587,   588,   589,   590,   591,   591,   592,   592,   592,
-     592,   592,   592,   593,   594,   595,   596,   597,   598,   599,
-     600,   601,   601,   602,   602,   603,   604
+     558,   559,   560,   561,   562,   563,   564,   565,   566,   567,
+     568,   568,   569,   570,   571,   572,   572,   573,   574,   575,
+     576,   577,   578,   579,   580,   580,   581,   581,   581,   581,
+     581,   581,   581,   581,   581,   581,   582,   583,   584,   585,
+     586,   587,   588,   589,   590,   591,   592,   593,   593,   594,
+     594,   594,   594,   594,   594,   595,   596,   597,   598,   599,
+     600,   601,   602,   603,   603,   604,   604,   605,   606
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1993,46 +2002,46 @@ 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,
-       2,     0,     1,     1,     1,     1,     1,     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,     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,     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,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     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,     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
+       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,     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
 };
 
 
@@ -2048,22 +2057,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
@@ -2103,37 +2112,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, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -2167,7 +2176,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",
@@ -2178,7 +2187,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");
     }
@@ -2282,10 +2291,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;
@@ -2303,7 +2309,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
 
@@ -2381,10 +2387,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;
                 }
               }
         }
@@ -2396,7 +2402,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"));
@@ -2408,10 +2413,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)
@@ -2537,33 +2541,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
@@ -2579,10 +2573,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;
@@ -2598,33 +2596,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.  */
 
@@ -2682,6 +2682,7 @@ yybackup:
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
+
   goto yynewstate;
 
 
@@ -2696,7 +2697,7 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- do a reduction.  |
+| yyreduce -- Do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
@@ -2716,16 +2717,16 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-  case 17:
-#line 191 "./util/configparser.y"
+        case 17:
+#line 191 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(server:)\n")); 
 	}
-#line 2725 "util/configparser.c"
+#line 2726 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 214:
-#line 285 "./util/configparser.y"
+  case 215:
+#line 286 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2736,11 +2737,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2740 "util/configparser.c"
+#line 2741 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 224:
-#line 302 "./util/configparser.y"
+  case 225:
+#line 303 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2751,11 +2752,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2755 "util/configparser.c"
+#line 2756 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 233:
-#line 319 "./util/configparser.y"
+  case 234:
+#line 320 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
@@ -2768,11 +2769,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2772 "util/configparser.c"
+#line 2773 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 338 "./util/configparser.y"
+  case 244:
+#line 339 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
@@ -2788,11 +2789,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2792 "util/configparser.c"
+#line 2793 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 362 "./util/configparser.y"
+  case 255:
+#line 363 "./util/configparser.y" /* yacc.c:1646  */
     {
 		uint8_t* bitlist;
 		size_t len = 0;
@@ -2809,11 +2810,11 @@ yyreduce:
 
 		}
 	}
-#line 2813 "util/configparser.c"
+#line 2814 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 381 "./util/configparser.y"
+  case 256:
+#line 382 "./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 &&
@@ -2828,21 +2829,21 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2832 "util/configparser.c"
+#line 2833 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 398 "./util/configparser.y"
+  case 257:
+#line 399 "./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 2842 "util/configparser.c"
+#line 2843 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 257:
-#line 406 "./util/configparser.y"
+  case 258:
+#line 407 "./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)
@@ -2850,21 +2851,21 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2854 "util/configparser.c"
+#line 2855 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 258:
-#line 416 "./util/configparser.y"
+  case 259:
+#line 417 "./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 2864 "util/configparser.c"
+#line 2865 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 259:
-#line 424 "./util/configparser.y"
+  case 260:
+#line 425 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
@@ -2880,11 +2881,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2884 "util/configparser.c"
+#line 2885 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 447 "./util/configparser.y"
+  case 273:
+#line 448 "./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)
@@ -2892,11 +2893,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2896 "util/configparser.c"
+#line 2897 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 456 "./util/configparser.y"
+  case 274:
+#line 457 "./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)
@@ -2904,11 +2905,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2908 "util/configparser.c"
+#line 2909 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 465 "./util/configparser.y"
+  case 275:
+#line 466 "./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)
@@ -2918,11 +2919,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2922 "util/configparser.c"
+#line 2923 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 476 "./util/configparser.y"
+  case 276:
+#line 477 "./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)
@@ -2930,11 +2931,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2934 "util/configparser.c"
+#line 2935 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 485 "./util/configparser.y"
+  case 277:
+#line 486 "./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)
@@ -2942,11 +2943,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2946 "util/configparser.c"
+#line 2947 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 494 "./util/configparser.y"
+  case 278:
+#line 495 "./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)
@@ -2954,11 +2955,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2958 "util/configparser.c"
+#line 2959 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 503 "./util/configparser.y"
+  case 279:
+#line 504 "./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)
@@ -2968,11 +2969,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2972 "util/configparser.c"
+#line 2973 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 279:
-#line 514 "./util/configparser.y"
+  case 280:
+#line 515 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2980,11 +2981,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2984 "util/configparser.c"
+#line 2985 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 280:
-#line 523 "./util/configparser.y"
+  case 281:
+#line 524 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -2995,11 +2996,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 2999 "util/configparser.c"
+#line 3000 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 281:
-#line 535 "./util/configparser.y"
+  case 282:
+#line 536 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -3011,11 +3012,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3015 "util/configparser.c"
+#line 3016 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 549 "./util/configparser.y"
+  case 283:
+#line 550 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -3029,11 +3030,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3033 "util/configparser.c"
+#line 3034 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 564 "./util/configparser.y"
+  case 284:
+#line 565 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -3043,11 +3044,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3047 "util/configparser.c"
+#line 3048 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 575 "./util/configparser.y"
+  case 285:
+#line 576 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3063,11 +3064,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3067 "util/configparser.c"
+#line 3068 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 592 "./util/configparser.y"
+  case 286:
+#line 593 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3083,11 +3084,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3087 "util/configparser.c"
+#line 3088 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 609 "./util/configparser.y"
+  case 287:
+#line 610 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3103,11 +3104,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3107 "util/configparser.c"
+#line 3108 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 626 "./util/configparser.y"
+  case 288:
+#line 627 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3123,11 +3124,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3127 "util/configparser.c"
+#line 3128 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 643 "./util/configparser.y"
+  case 289:
+#line 644 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3141,11 +3142,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3145 "util/configparser.c"
+#line 3146 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 658 "./util/configparser.y"
+  case 290:
+#line 659 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3159,11 +3160,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3163 "util/configparser.c"
+#line 3164 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 673 "./util/configparser.y"
+  case 291:
+#line 674 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -3175,11 +3176,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3179 "util/configparser.c"
+#line 3180 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 686 "./util/configparser.y"
+  case 292:
+#line 687 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -3193,11 +3194,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3197 "util/configparser.c"
+#line 3198 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 701 "./util/configparser.y"
+  case 293:
+#line 702 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3205,11 +3206,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3209 "util/configparser.c"
+#line 3210 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 710 "./util/configparser.y"
+  case 294:
+#line 711 "./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, 
@@ -3217,11 +3218,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3221 "util/configparser.c"
+#line 3222 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 719 "./util/configparser.y"
+  case 295:
+#line 720 "./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, 
@@ -3229,11 +3230,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3233 "util/configparser.c"
+#line 3234 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 728 "./util/configparser.y"
+  case 296:
+#line 729 "./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)
@@ -3241,11 +3242,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3245 "util/configparser.c"
+#line 3246 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 737 "./util/configparser.y"
+  case 297:
+#line 738 "./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)
@@ -3253,11 +3254,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3257 "util/configparser.c"
+#line 3258 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 746 "./util/configparser.y"
+  case 298:
+#line 747 "./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)
@@ -3265,11 +3266,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3269 "util/configparser.c"
+#line 3270 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 755 "./util/configparser.y"
+  case 299:
+#line 756 "./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)
@@ -3277,11 +3278,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3281 "util/configparser.c"
+#line 3282 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 764 "./util/configparser.y"
+  case 300:
+#line 765 "./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)
@@ -3289,11 +3290,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3293 "util/configparser.c"
+#line 3294 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 773 "./util/configparser.y"
+  case 301:
+#line 774 "./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)
@@ -3301,11 +3302,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3305 "util/configparser.c"
+#line 3306 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 782 "./util/configparser.y"
+  case 302:
+#line 783 "./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)
@@ -3313,11 +3314,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3317 "util/configparser.c"
+#line 3318 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 791 "./util/configparser.y"
+  case 303:
+#line 792 "./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)
@@ -3325,11 +3326,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3329 "util/configparser.c"
+#line 3330 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 800 "./util/configparser.y"
+  case 304:
+#line 801 "./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)
@@ -3337,11 +3338,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3341 "util/configparser.c"
+#line 3342 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 809 "./util/configparser.y"
+  case 305:
+#line 810 "./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)
@@ -3349,11 +3350,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3353 "util/configparser.c"
+#line 3354 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 818 "./util/configparser.y"
+  case 306:
+#line 819 "./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)
@@ -3361,11 +3362,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3365 "util/configparser.c"
+#line 3366 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 827 "./util/configparser.y"
+  case 307:
+#line 828 "./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)
@@ -3377,11 +3378,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3381 "util/configparser.c"
+#line 3382 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 840 "./util/configparser.y"
+  case 308:
+#line 841 "./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)
@@ -3389,11 +3390,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3393 "util/configparser.c"
+#line 3394 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 849 "./util/configparser.y"
+  case 309:
+#line 850 "./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)
@@ -3405,11 +3406,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3409 "util/configparser.c"
+#line 3410 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 862 "./util/configparser.y"
+  case 310:
+#line 863 "./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)
@@ -3417,11 +3418,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3421 "util/configparser.c"
+#line 3422 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 871 "./util/configparser.y"
+  case 311:
+#line 872 "./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)
@@ -3429,11 +3430,11 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3433 "util/configparser.c"
+#line 3434 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 880 "./util/configparser.y"
+  case 312:
+#line 881 "./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)
@@ -3441,31 +3442,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3445 "util/configparser.c"
+#line 3446 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 889 "./util/configparser.y"
+  case 313:
+#line 890 "./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 3455 "util/configparser.c"
+#line 3456 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 896 "./util/configparser.y"
+  case 314:
+#line 897 "./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 3465 "util/configparser.c"
+#line 3466 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 903 "./util/configparser.y"
+  case 315:
+#line 904 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3473,21 +3474,21 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3477 "util/configparser.c"
+#line 3478 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 912 "./util/configparser.y"
+  case 316:
+#line 913 "./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 3487 "util/configparser.c"
+#line 3488 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 919 "./util/configparser.y"
+  case 317:
+#line 920 "./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)
@@ -3495,53 +3496,53 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3499 "util/configparser.c"
+#line 3500 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 928 "./util/configparser.y"
+  case 318:
+#line 929 "./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 3510 "util/configparser.c"
+#line 3511 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 936 "./util/configparser.y"
+  case 319:
+#line 937 "./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 3520 "util/configparser.c"
+#line 3521 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 943 "./util/configparser.y"
+  case 320:
+#line 944 "./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 3530 "util/configparser.c"
+#line 3531 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 950 "./util/configparser.y"
+  case 321:
+#line 951 "./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 3541 "util/configparser.c"
+#line 3542 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 958 "./util/configparser.y"
+  case 322:
+#line 959 "./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)
@@ -3549,11 +3550,11 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3553 "util/configparser.c"
+#line 3554 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 967 "./util/configparser.y"
+  case 323:
+#line 968 "./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)
@@ -3561,11 +3562,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3565 "util/configparser.c"
+#line 3566 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 976 "./util/configparser.y"
+  case 324:
+#line 977 "./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)
@@ -3573,11 +3574,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3577 "util/configparser.c"
+#line 3578 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 985 "./util/configparser.y"
+  case 325:
+#line 986 "./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)
@@ -3590,11 +3591,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3594 "util/configparser.c"
+#line 3595 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 999 "./util/configparser.y"
+  case 326:
+#line 1000 "./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)
@@ -3602,11 +3603,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3606 "util/configparser.c"
+#line 3607 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 1008 "./util/configparser.y"
+  case 327:
+#line 1009 "./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)
@@ -3614,11 +3615,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3618 "util/configparser.c"
+#line 3619 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 1017 "./util/configparser.y"
+  case 328:
+#line 1018 "./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)
@@ -3626,11 +3627,11 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3630 "util/configparser.c"
+#line 3631 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 1026 "./util/configparser.y"
+  case 329:
+#line 1027 "./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)
@@ -3638,11 +3639,11 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3642 "util/configparser.c"
+#line 3643 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 1035 "./util/configparser.y"
+  case 330:
+#line 1036 "./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)
@@ -3650,11 +3651,11 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3654 "util/configparser.c"
+#line 3655 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 1044 "./util/configparser.y"
+  case 331:
+#line 1045 "./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)
@@ -3662,31 +3663,31 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3666 "util/configparser.c"
+#line 3667 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 1053 "./util/configparser.y"
+  case 332:
+#line 1054 "./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 3676 "util/configparser.c"
+#line 3677 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 1060 "./util/configparser.y"
+  case 333:
+#line 1061 "./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 3686 "util/configparser.c"
+#line 3687 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 1067 "./util/configparser.y"
+  case 334:
+#line 1068 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3711,105 +3712,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3715 "util/configparser.c"
+#line 3716 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 1093 "./util/configparser.y"
+  case 335:
+#line 1094 "./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 3726 "util/configparser.c"
+#line 3727 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 1101 "./util/configparser.y"
+  case 336:
+#line 1102 "./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 3736 "util/configparser.c"
+#line 3737 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 1108 "./util/configparser.y"
+  case 337:
+#line 1109 "./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 3746 "util/configparser.c"
+#line 3747 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 1115 "./util/configparser.y"
+  case 338:
+#line 1116 "./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 3756 "util/configparser.c"
+#line 3757 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 1122 "./util/configparser.y"
+  case 339:
+#line 1123 "./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 3766 "util/configparser.c"
+#line 3767 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 1129 "./util/configparser.y"
+  case 340:
+#line 1130 "./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 3777 "util/configparser.c"
+#line 3778 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 1137 "./util/configparser.y"
+  case 341:
+#line 1138 "./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 3788 "util/configparser.c"
+#line 3789 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 1145 "./util/configparser.y"
+  case 342:
+#line 1146 "./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 3799 "util/configparser.c"
+#line 3800 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 1153 "./util/configparser.y"
+  case 343:
+#line 1154 "./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 3809 "util/configparser.c"
+#line 3810 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 1160 "./util/configparser.y"
+  case 344:
+#line 1161 "./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)
@@ -3819,11 +3820,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3823 "util/configparser.c"
+#line 3824 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 344:
-#line 1171 "./util/configparser.y"
+  case 345:
+#line 1172 "./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)
@@ -3833,21 +3834,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3837 "util/configparser.c"
+#line 3838 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 1182 "./util/configparser.y"
+  case 346:
+#line 1183 "./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 3847 "util/configparser.c"
+#line 3848 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 346:
-#line 1189 "./util/configparser.y"
+  case 347:
+#line 1190 "./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)
@@ -3855,11 +3856,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3859 "util/configparser.c"
+#line 3860 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 347:
-#line 1198 "./util/configparser.y"
+  case 348:
+#line 1199 "./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)
@@ -3867,11 +3868,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3871 "util/configparser.c"
+#line 3872 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 348:
-#line 1207 "./util/configparser.y"
+  case 349:
+#line 1208 "./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)
@@ -3879,53 +3880,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3883 "util/configparser.c"
+#line 3884 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 1216 "./util/configparser.y"
+  case 350:
+#line 1217 "./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 3893 "util/configparser.c"
+#line 3894 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 1223 "./util/configparser.y"
+  case 351:
+#line 1224 "./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 3903 "util/configparser.c"
+#line 3904 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 351:
-#line 1230 "./util/configparser.y"
+  case 352:
+#line 1231 "./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 3914 "util/configparser.c"
+#line 3915 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 1238 "./util/configparser.y"
+  case 353:
+#line 1239 "./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 3925 "util/configparser.c"
+#line 3926 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 1246 "./util/configparser.y"
+  case 354:
+#line 1247 "./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)
@@ -3934,11 +3935,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3938 "util/configparser.c"
+#line 3939 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 1256 "./util/configparser.y"
+  case 355:
+#line 1257 "./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)
@@ -3947,11 +3948,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3951 "util/configparser.c"
+#line 3952 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 355:
-#line 1266 "./util/configparser.y"
+  case 356:
+#line 1267 "./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)
@@ -3960,11 +3961,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3964 "util/configparser.c"
+#line 3965 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 1276 "./util/configparser.y"
+  case 357:
+#line 1277 "./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)
@@ -3977,22 +3978,22 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3981 "util/configparser.c"
+#line 3982 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 1290 "./util/configparser.y"
+  case 358:
+#line 1291 "./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 3992 "util/configparser.c"
+#line 3993 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 1298 "./util/configparser.y"
+  case 359:
+#line 1299 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4004,11 +4005,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4008 "util/configparser.c"
+#line 4009 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 1311 "./util/configparser.y"
+  case 360:
+#line 1312 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4018,22 +4019,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4022 "util/configparser.c"
+#line 4023 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 1322 "./util/configparser.y"
+  case 361:
+#line 1323 "./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 4033 "util/configparser.c"
+#line 4034 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 1330 "./util/configparser.y"
+  case 362:
+#line 1331 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4045,11 +4046,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4049 "util/configparser.c"
+#line 4050 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 1343 "./util/configparser.y"
+  case 363:
+#line 1344 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4057,11 +4058,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4061 "util/configparser.c"
+#line 4062 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 1352 "./util/configparser.y"
+  case 364:
+#line 1353 "./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)
@@ -4069,11 +4070,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4073 "util/configparser.c"
+#line 4074 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 1361 "./util/configparser.y"
+  case 365:
+#line 1362 "./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)
@@ -4081,11 +4082,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4085 "util/configparser.c"
+#line 4086 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 1370 "./util/configparser.y"
+  case 366:
+#line 1371 "./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)
@@ -4094,11 +4095,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4098 "util/configparser.c"
+#line 4099 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 366:
-#line 1380 "./util/configparser.y"
+  case 367:
+#line 1381 "./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)
@@ -4107,22 +4108,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4111 "util/configparser.c"
+#line 4112 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 1390 "./util/configparser.y"
+  case 368:
+#line 1391 "./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 4122 "util/configparser.c"
+#line 4123 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 1398 "./util/configparser.y"
+  case 369:
+#line 1399 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4134,11 +4135,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4138 "util/configparser.c"
+#line 4139 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 1411 "./util/configparser.y"
+  case 370:
+#line 1412 "./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)
@@ -4146,22 +4147,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4150 "util/configparser.c"
+#line 4151 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 370:
-#line 1420 "./util/configparser.y"
+  case 371:
+#line 1421 "./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 4161 "util/configparser.c"
+#line 4162 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 371:
-#line 1428 "./util/configparser.y"
+  case 372:
+#line 1429 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4169,22 +4170,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4173 "util/configparser.c"
+#line 4174 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 1437 "./util/configparser.y"
+  case 373:
+#line 1438 "./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 4184 "util/configparser.c"
+#line 4185 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 1445 "./util/configparser.y"
+  case 374:
+#line 1446 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4196,11 +4197,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4200 "util/configparser.c"
+#line 4201 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 374:
-#line 1458 "./util/configparser.y"
+  case 375:
+#line 1459 "./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)
@@ -4208,21 +4209,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4212 "util/configparser.c"
+#line 4213 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 1467 "./util/configparser.y"
+  case 376:
+#line 1468 "./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 4222 "util/configparser.c"
+#line 4223 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 376:
-#line 1474 "./util/configparser.y"
+  case 377:
+#line 1475 "./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)
@@ -4231,11 +4232,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4235 "util/configparser.c"
+#line 4236 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 1484 "./util/configparser.y"
+  case 378:
+#line 1485 "./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)
@@ -4244,11 +4245,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4248 "util/configparser.c"
+#line 4249 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 1494 "./util/configparser.y"
+  case 379:
+#line 1495 "./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)
@@ -4257,11 +4258,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4261 "util/configparser.c"
+#line 4262 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 1504 "./util/configparser.y"
+  case 380:
+#line 1505 "./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)
@@ -4270,11 +4271,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4274 "util/configparser.c"
+#line 4275 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 380:
-#line 1514 "./util/configparser.y"
+  case 381:
+#line 1515 "./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)
@@ -4283,11 +4284,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4287 "util/configparser.c"
+#line 4288 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 381:
-#line 1524 "./util/configparser.y"
+  case 382:
+#line 1525 "./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)
@@ -4296,11 +4297,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4300 "util/configparser.c"
+#line 4301 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 382:
-#line 1534 "./util/configparser.y"
+  case 383:
+#line 1535 "./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)
@@ -4309,11 +4310,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4313 "util/configparser.c"
+#line 4314 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 383:
-#line 1544 "./util/configparser.y"
+  case 384:
+#line 1545 "./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)
@@ -4322,41 +4323,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4326 "util/configparser.c"
+#line 4327 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 384:
-#line 1554 "./util/configparser.y"
+  case 385:
+#line 1555 "./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 4336 "util/configparser.c"
+#line 4337 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 385:
-#line 1561 "./util/configparser.y"
+  case 386:
+#line 1562 "./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 4346 "util/configparser.c"
+#line 4347 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 386:
-#line 1568 "./util/configparser.y"
+  case 387:
+#line 1569 "./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 4356 "util/configparser.c"
+#line 4357 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 387:
-#line 1575 "./util/configparser.y"
+  case 388:
+#line 1576 "./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)
@@ -4364,11 +4365,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4368 "util/configparser.c"
+#line 4369 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 388:
-#line 1584 "./util/configparser.y"
+  case 389:
+#line 1585 "./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)
@@ -4376,11 +4377,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4380 "util/configparser.c"
+#line 4381 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 389:
-#line 1593 "./util/configparser.y"
+  case 390:
+#line 1594 "./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)
@@ -4388,11 +4389,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4392 "util/configparser.c"
+#line 4393 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 390:
-#line 1602 "./util/configparser.y"
+  case 391:
+#line 1603 "./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)
@@ -4400,21 +4401,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4404 "util/configparser.c"
+#line 4405 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 391:
-#line 1611 "./util/configparser.y"
+  case 392:
+#line 1612 "./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 4414 "util/configparser.c"
+#line 4415 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 392:
-#line 1618 "./util/configparser.y"
+  case 393:
+#line 1619 "./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)
@@ -4423,11 +4424,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4427 "util/configparser.c"
+#line 4428 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 1628 "./util/configparser.y"
+  case 394:
+#line 1629 "./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 &&
@@ -4446,21 +4447,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4450 "util/configparser.c"
+#line 4451 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 1648 "./util/configparser.y"
+  case 395:
+#line 1649 "./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 4460 "util/configparser.c"
+#line 4461 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 1655 "./util/configparser.y"
+  case 396:
+#line 1656 "./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) {
@@ -4477,11 +4478,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4481 "util/configparser.c"
+#line 4482 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 1673 "./util/configparser.y"
+  case 397:
+#line 1674 "./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) {
@@ -4493,11 +4494,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4497 "util/configparser.c"
+#line 4498 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 1686 "./util/configparser.y"
+  case 398:
+#line 1687 "./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) {
@@ -4509,11 +4510,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4513 "util/configparser.c"
+#line 4514 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 398:
-#line 1699 "./util/configparser.y"
+  case 399:
+#line 1700 "./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)
@@ -4521,11 +4522,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4525 "util/configparser.c"
+#line 4526 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 399:
-#line 1708 "./util/configparser.y"
+  case 400:
+#line 1709 "./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)
@@ -4533,11 +4534,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4537 "util/configparser.c"
+#line 4538 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 400:
-#line 1717 "./util/configparser.y"
+  case 401:
+#line 1718 "./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)
@@ -4545,11 +4546,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4549 "util/configparser.c"
+#line 4550 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 401:
-#line 1726 "./util/configparser.y"
+  case 402:
+#line 1727 "./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)
@@ -4557,11 +4558,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4561 "util/configparser.c"
+#line 4562 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 402:
-#line 1735 "./util/configparser.y"
+  case 403:
+#line 1736 "./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)
@@ -4570,11 +4571,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4574 "util/configparser.c"
+#line 4575 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 403:
-#line 1745 "./util/configparser.y"
+  case 404:
+#line 1746 "./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)
@@ -4583,11 +4584,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4587 "util/configparser.c"
+#line 4588 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 404:
-#line 1755 "./util/configparser.y"
+  case 405:
+#line 1756 "./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)
@@ -4597,11 +4598,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4601 "util/configparser.c"
+#line 4602 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 405:
-#line 1766 "./util/configparser.y"
+  case 406:
+#line 1767 "./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)
@@ -4609,11 +4610,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4613 "util/configparser.c"
+#line 4614 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 406:
-#line 1775 "./util/configparser.y"
+  case 407:
+#line 1776 "./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)
@@ -4621,11 +4622,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4625 "util/configparser.c"
+#line 4626 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 407:
-#line 1784 "./util/configparser.y"
+  case 408:
+#line 1785 "./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)
@@ -4633,11 +4634,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4637 "util/configparser.c"
+#line 4638 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 408:
-#line 1793 "./util/configparser.y"
+  case 409:
+#line 1794 "./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)
@@ -4645,11 +4646,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4649 "util/configparser.c"
+#line 4650 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 409:
-#line 1802 "./util/configparser.y"
+  case 410:
+#line 1803 "./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)
@@ -4657,11 +4658,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4661 "util/configparser.c"
+#line 4662 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 410:
-#line 1811 "./util/configparser.y"
+  case 411:
+#line 1812 "./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)
@@ -4669,11 +4670,23 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4673 "util/configparser.c"
+#line 4674 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 411:
-#line 1820 "./util/configparser.y"
+  case 412:
+#line 1821 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(server_serve_original_ttl:%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_original_ttl = (strcmp((yyvsp[0].str), "yes")==0);
+		free((yyvsp[0].str));
+	}
+#line 4686 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 413:
+#line 1830 "./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)
@@ -4685,11 +4698,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4689 "util/configparser.c"
+#line 4702 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 412:
-#line 1833 "./util/configparser.y"
+  case 414:
+#line 1843 "./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)
@@ -4701,11 +4714,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4705 "util/configparser.c"
+#line 4718 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 1846 "./util/configparser.y"
+  case 415:
+#line 1856 "./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)
@@ -4713,21 +4726,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4717 "util/configparser.c"
+#line 4730 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 414:
-#line 1855 "./util/configparser.y"
+  case 416:
+#line 1865 "./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 4727 "util/configparser.c"
+#line 4740 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 1862 "./util/configparser.y"
+  case 417:
+#line 1872 "./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)
@@ -4735,11 +4748,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4739 "util/configparser.c"
+#line 4752 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 416:
-#line 1871 "./util/configparser.y"
+  case 418:
+#line 1881 "./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)
@@ -4747,11 +4760,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4751 "util/configparser.c"
+#line 4764 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 1880 "./util/configparser.y"
+  case 419:
+#line 1890 "./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)
@@ -4759,11 +4772,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4763 "util/configparser.c"
+#line 4776 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 1889 "./util/configparser.y"
+  case 420:
+#line 1899 "./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)
@@ -4772,22 +4785,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4776 "util/configparser.c"
+#line 4789 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 1898 "./util/configparser.y"
+  case 421:
+#line 1908 "./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 4787 "util/configparser.c"
+#line 4800 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 1906 "./util/configparser.y"
+  case 422:
+#line 1916 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4799,22 +4812,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4803 "util/configparser.c"
+#line 4816 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 1919 "./util/configparser.y"
+  case 423:
+#line 1929 "./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 4814 "util/configparser.c"
+#line 4827 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 422:
-#line 1927 "./util/configparser.y"
+  case 424:
+#line 1937 "./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 &&
@@ -4854,21 +4867,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4858 "util/configparser.c"
+#line 4871 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 423:
-#line 1968 "./util/configparser.y"
+  case 425:
+#line 1978 "./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 4868 "util/configparser.c"
+#line 4881 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 424:
-#line 1975 "./util/configparser.y"
+  case 426:
+#line 1985 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -4882,11 +4895,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4886 "util/configparser.c"
+#line 4899 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 425:
-#line 1990 "./util/configparser.y"
+  case 427:
+#line 2000 "./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)
@@ -4895,11 +4908,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4899 "util/configparser.c"
+#line 4912 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 426:
-#line 2000 "./util/configparser.y"
+  case 428:
+#line 2010 "./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)
@@ -4908,41 +4921,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4912 "util/configparser.c"
+#line 4925 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 427:
-#line 2010 "./util/configparser.y"
+  case 429:
+#line 2020 "./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 4922 "util/configparser.c"
+#line 4935 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 428:
-#line 2017 "./util/configparser.y"
+  case 430:
+#line 2027 "./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 4932 "util/configparser.c"
+#line 4945 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 2024 "./util/configparser.y"
+  case 431:
+#line 2034 "./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 4942 "util/configparser.c"
+#line 4955 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 2031 "./util/configparser.y"
+  case 432:
+#line 2041 "./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)
@@ -4950,22 +4963,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4954 "util/configparser.c"
+#line 4967 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 431:
-#line 2040 "./util/configparser.y"
+  case 433:
+#line 2050 "./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 4965 "util/configparser.c"
+#line 4978 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 2048 "./util/configparser.y"
+  case 434:
+#line 2058 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -4978,11 +4991,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4982 "util/configparser.c"
+#line 4995 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 2062 "./util/configparser.y"
+  case 435:
+#line 2072 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5002,11 +5015,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5006 "util/configparser.c"
+#line 5019 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 2083 "./util/configparser.y"
+  case 436:
+#line 2093 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5026,11 +5039,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5030 "util/configparser.c"
+#line 5043 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 435:
-#line 2104 "./util/configparser.y"
+  case 437:
+#line 2114 "./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,
@@ -5041,11 +5054,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5045 "util/configparser.c"
+#line 5058 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 436:
-#line 2116 "./util/configparser.y"
+  case 438:
+#line 2126 "./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,
@@ -5056,11 +5069,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5060 "util/configparser.c"
+#line 5073 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 437:
-#line 2128 "./util/configparser.y"
+  case 439:
+#line 2138 "./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,
@@ -5071,11 +5084,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5075 "util/configparser.c"
+#line 5088 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 438:
-#line 2140 "./util/configparser.y"
+  case 440:
+#line 2150 "./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,
@@ -5083,11 +5096,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5087 "util/configparser.c"
+#line 5100 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 439:
-#line 2149 "./util/configparser.y"
+  case 441:
+#line 2159 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5107,11 +5120,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5111 "util/configparser.c"
+#line 5124 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 440:
-#line 2170 "./util/configparser.y"
+  case 442:
+#line 2180 "./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)
@@ -5119,11 +5132,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5123 "util/configparser.c"
+#line 5136 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 441:
-#line 2180 "./util/configparser.y"
+  case 443:
+#line 2190 "./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)
@@ -5131,33 +5144,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5135 "util/configparser.c"
+#line 5148 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 442:
-#line 2189 "./util/configparser.y"
+  case 444:
+#line 2199 "./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 5146 "util/configparser.c"
+#line 5159 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 443:
-#line 2197 "./util/configparser.y"
+  case 445:
+#line 2207 "./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 5157 "util/configparser.c"
+#line 5170 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 444:
-#line 2205 "./util/configparser.y"
+  case 446:
+#line 2215 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5169,11 +5182,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5173 "util/configparser.c"
+#line 5186 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 445:
-#line 2218 "./util/configparser.y"
+  case 447:
+#line 2228 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5185,11 +5198,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5189 "util/configparser.c"
+#line 5202 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 446:
-#line 2231 "./util/configparser.y"
+  case 448:
+#line 2241 "./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) {
@@ -5203,11 +5216,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5207 "util/configparser.c"
+#line 5220 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 447:
-#line 2246 "./util/configparser.y"
+  case 449:
+#line 2256 "./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) {
@@ -5221,11 +5234,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5225 "util/configparser.c"
+#line 5238 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 448:
-#line 2261 "./util/configparser.y"
+  case 450:
+#line 2271 "./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)
@@ -5233,11 +5246,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5237 "util/configparser.c"
+#line 5250 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 449:
-#line 2270 "./util/configparser.y"
+  case 451:
+#line 2280 "./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)
@@ -5245,20 +5258,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5249 "util/configparser.c"
+#line 5262 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 450:
-#line 2279 "./util/configparser.y"
+  case 452:
+#line 2289 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5258 "util/configparser.c"
+#line 5271 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 451:
-#line 2285 "./util/configparser.y"
+  case 453:
+#line 2295 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5266,11 +5279,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5270 "util/configparser.c"
+#line 5283 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 452:
-#line 2294 "./util/configparser.y"
+  case 454:
+#line 2304 "./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)
@@ -5278,11 +5291,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5282 "util/configparser.c"
+#line 5295 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 453:
-#line 2303 "./util/configparser.y"
+  case 455:
+#line 2313 "./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)
@@ -5291,11 +5304,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5295 "util/configparser.c"
+#line 5308 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 454:
-#line 2313 "./util/configparser.y"
+  case 456:
+#line 2323 "./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)
@@ -5304,11 +5317,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5308 "util/configparser.c"
+#line 5321 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 455:
-#line 2323 "./util/configparser.y"
+  case 457:
+#line 2333 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5320,11 +5333,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5324 "util/configparser.c"
+#line 5337 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 456:
-#line 2336 "./util/configparser.y"
+  case 458:
+#line 2346 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5336,11 +5349,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5340 "util/configparser.c"
+#line 5353 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 457:
-#line 2349 "./util/configparser.y"
+  case 459:
+#line 2359 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5351,11 +5364,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5355 "util/configparser.c"
+#line 5368 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 458:
-#line 2361 "./util/configparser.y"
+  case 460:
+#line 2371 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5368,11 +5381,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5372 "util/configparser.c"
+#line 5385 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 459:
-#line 2375 "./util/configparser.y"
+  case 461:
+#line 2385 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5383,11 +5396,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5387 "util/configparser.c"
+#line 5400 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 460:
-#line 2387 "./util/configparser.y"
+  case 462:
+#line 2397 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5400,11 +5413,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5404 "util/configparser.c"
+#line 5417 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 461:
-#line 2401 "./util/configparser.y"
+  case 463:
+#line 2411 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5413,31 +5426,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5417 "util/configparser.c"
+#line 5430 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 462:
-#line 2411 "./util/configparser.y"
+  case 464:
+#line 2421 "./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 5427 "util/configparser.c"
+#line 5440 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 463:
-#line 2418 "./util/configparser.y"
+  case 465:
+#line 2428 "./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 5437 "util/configparser.c"
+#line 5450 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 464:
-#line 2425 "./util/configparser.y"
+  case 466:
+#line 2435 "./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)
@@ -5445,11 +5458,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5449 "util/configparser.c"
+#line 5462 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 465:
-#line 2434 "./util/configparser.y"
+  case 467:
+#line 2444 "./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)
@@ -5457,11 +5470,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5461 "util/configparser.c"
+#line 5474 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 466:
-#line 2443 "./util/configparser.y"
+  case 468:
+#line 2453 "./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)
@@ -5470,11 +5483,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5474 "util/configparser.c"
+#line 5487 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 467:
-#line 2453 "./util/configparser.y"
+  case 469:
+#line 2463 "./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)
@@ -5483,11 +5496,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5487 "util/configparser.c"
+#line 5500 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 468:
-#line 2463 "./util/configparser.y"
+  case 470:
+#line 2473 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5496,31 +5509,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5500 "util/configparser.c"
+#line 5513 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 469:
-#line 2473 "./util/configparser.y"
+  case 471:
+#line 2483 "./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 5510 "util/configparser.c"
+#line 5523 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 470:
-#line 2480 "./util/configparser.y"
+  case 472:
+#line 2490 "./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 5520 "util/configparser.c"
+#line 5533 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 471:
-#line 2487 "./util/configparser.y"
+  case 473:
+#line 2497 "./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)
@@ -5528,11 +5541,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5532 "util/configparser.c"
+#line 5545 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 472:
-#line 2496 "./util/configparser.y"
+  case 474:
+#line 2506 "./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)
@@ -5540,11 +5553,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5544 "util/configparser.c"
+#line 5557 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 473:
-#line 2505 "./util/configparser.y"
+  case 475:
+#line 2515 "./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)
@@ -5553,11 +5566,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5557 "util/configparser.c"
+#line 5570 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 474:
-#line 2515 "./util/configparser.y"
+  case 476:
+#line 2525 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5566,52 +5579,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5570 "util/configparser.c"
+#line 5583 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 475:
-#line 2525 "./util/configparser.y"
+  case 477:
+#line 2535 "./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 5580 "util/configparser.c"
+#line 5593 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 476:
-#line 2532 "./util/configparser.y"
+  case 478:
+#line 2542 "./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 5590 "util/configparser.c"
+#line 5603 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 477:
-#line 2539 "./util/configparser.y"
+  case 479:
+#line 2549 "./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 5600 "util/configparser.c"
+#line 5613 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 478:
-#line 2546 "./util/configparser.y"
+  case 480:
+#line 2556 "./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 5611 "util/configparser.c"
+#line 5624 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 479:
-#line 2554 "./util/configparser.y"
+  case 481:
+#line 2564 "./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)
@@ -5620,11 +5633,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5624 "util/configparser.c"
+#line 5637 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 480:
-#line 2564 "./util/configparser.y"
+  case 482:
+#line 2574 "./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)
@@ -5633,11 +5646,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5637 "util/configparser.c"
+#line 5650 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 481:
-#line 2574 "./util/configparser.y"
+  case 483:
+#line 2584 "./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)
@@ -5646,11 +5659,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5650 "util/configparser.c"
+#line 5663 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 482:
-#line 2584 "./util/configparser.y"
+  case 484:
+#line 2594 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5659,11 +5672,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5663 "util/configparser.c"
+#line 5676 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 483:
-#line 2594 "./util/configparser.y"
+  case 485:
+#line 2604 "./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 &&
@@ -5701,11 +5714,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5705 "util/configparser.c"
+#line 5718 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 484:
-#line 2633 "./util/configparser.y"
+  case 486:
+#line 2643 "./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));
@@ -5714,33 +5727,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5718 "util/configparser.c"
+#line 5731 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 485:
-#line 2643 "./util/configparser.y"
+  case 487:
+#line 2653 "./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 5729 "util/configparser.c"
+#line 5742 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 486:
-#line 2651 "./util/configparser.y"
+  case 488:
+#line 2661 "./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 5740 "util/configparser.c"
+#line 5753 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 487:
-#line 2659 "./util/configparser.y"
+  case 489:
+#line 2669 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5754,11 +5767,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5758 "util/configparser.c"
+#line 5771 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 488:
-#line 2674 "./util/configparser.y"
+  case 490:
+#line 2684 "./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)
@@ -5766,19 +5779,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5770 "util/configparser.c"
+#line 5783 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 489:
-#line 2683 "./util/configparser.y"
+  case 491:
+#line 2693 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5778 "util/configparser.c"
+#line 5791 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 500:
-#line 2694 "./util/configparser.y"
+  case 502:
+#line 2704 "./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)
@@ -5787,11 +5800,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5791 "util/configparser.c"
+#line 5804 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 501:
-#line 2704 "./util/configparser.y"
+  case 503:
+#line 2714 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5799,79 +5812,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5803 "util/configparser.c"
+#line 5816 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 502:
-#line 2713 "./util/configparser.y"
+  case 504:
+#line 2723 "./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 5813 "util/configparser.c"
+#line 5826 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 503:
-#line 2720 "./util/configparser.y"
+  case 505:
+#line 2730 "./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 5823 "util/configparser.c"
+#line 5836 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 504:
-#line 2727 "./util/configparser.y"
+  case 506:
+#line 2737 "./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 5833 "util/configparser.c"
+#line 5846 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 505:
-#line 2734 "./util/configparser.y"
+  case 507:
+#line 2744 "./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 5843 "util/configparser.c"
+#line 5856 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 506:
-#line 2741 "./util/configparser.y"
+  case 508:
+#line 2751 "./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 5853 "util/configparser.c"
+#line 5866 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 507:
-#line 2748 "./util/configparser.y"
+  case 509:
+#line 2758 "./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 5863 "util/configparser.c"
+#line 5876 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 508:
-#line 2755 "./util/configparser.y"
+  case 510:
+#line 2765 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 5871 "util/configparser.c"
+#line 5884 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 529:
-#line 2775 "./util/configparser.y"
+  case 531:
+#line 2785 "./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)
@@ -5879,31 +5892,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5883 "util/configparser.c"
+#line 5896 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 530:
-#line 2784 "./util/configparser.y"
+  case 532:
+#line 2794 "./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 5893 "util/configparser.c"
+#line 5906 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 531:
-#line 2791 "./util/configparser.y"
+  case 533:
+#line 2801 "./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 5903 "util/configparser.c"
+#line 5916 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 532:
-#line 2798 "./util/configparser.y"
+  case 534:
+#line 2808 "./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)
@@ -5911,51 +5924,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5915 "util/configparser.c"
+#line 5928 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 533:
-#line 2807 "./util/configparser.y"
+  case 535:
+#line 2817 "./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 5925 "util/configparser.c"
+#line 5938 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 534:
-#line 2814 "./util/configparser.y"
+  case 536:
+#line 2824 "./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 5935 "util/configparser.c"
+#line 5948 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 535:
-#line 2821 "./util/configparser.y"
+  case 537:
+#line 2831 "./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 5945 "util/configparser.c"
+#line 5958 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 536:
-#line 2828 "./util/configparser.y"
+  case 538:
+#line 2838 "./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 5955 "util/configparser.c"
+#line 5968 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 537:
-#line 2835 "./util/configparser.y"
+  case 539:
+#line 2845 "./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)
@@ -5963,11 +5976,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5967 "util/configparser.c"
+#line 5980 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 538:
-#line 2844 "./util/configparser.y"
+  case 540:
+#line 2854 "./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)
@@ -5975,31 +5988,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5979 "util/configparser.c"
+#line 5992 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 539:
-#line 2853 "./util/configparser.y"
+  case 541:
+#line 2863 "./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 5989 "util/configparser.c"
+#line 6002 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 540:
-#line 2860 "./util/configparser.y"
+  case 542:
+#line 2870 "./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 5999 "util/configparser.c"
+#line 6012 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 541:
-#line 2867 "./util/configparser.y"
+  case 543:
+#line 2877 "./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)
@@ -6008,11 +6021,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6012 "util/configparser.c"
+#line 6025 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 542:
-#line 2877 "./util/configparser.y"
+  case 544:
+#line 2887 "./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)
@@ -6021,11 +6034,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6025 "util/configparser.c"
+#line 6038 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 543:
-#line 2887 "./util/configparser.y"
+  case 545:
+#line 2897 "./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)
@@ -6034,11 +6047,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6038 "util/configparser.c"
+#line 6051 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 544:
-#line 2897 "./util/configparser.y"
+  case 546:
+#line 2907 "./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)
@@ -6047,11 +6060,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6051 "util/configparser.c"
+#line 6064 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 545:
-#line 2907 "./util/configparser.y"
+  case 547:
+#line 2917 "./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)
@@ -6060,11 +6073,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6064 "util/configparser.c"
+#line 6077 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 546:
-#line 2917 "./util/configparser.y"
+  case 548:
+#line 2927 "./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)
@@ -6073,47 +6086,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6077 "util/configparser.c"
+#line 6090 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 547:
-#line 2927 "./util/configparser.y"
+  case 549:
+#line 2937 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6085 "util/configparser.c"
+#line 6098 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 551:
-#line 2936 "./util/configparser.y"
+  case 553:
+#line 2946 "./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 6095 "util/configparser.c"
+#line 6108 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 552:
-#line 2942 "./util/configparser.y"
+  case 554:
+#line 2952 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6103 "util/configparser.c"
+#line 6116 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 556:
-#line 2951 "./util/configparser.y"
+  case 558:
+#line 2961 "./util/configparser.y" /* yacc.c:1646  */
     {
 		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 6113 "util/configparser.c"
+#line 6126 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 557:
-#line 2957 "./util/configparser.y"
+  case 559:
+#line 2967 "./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)
@@ -6122,21 +6135,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6126 "util/configparser.c"
+#line 6139 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 558:
-#line 2967 "./util/configparser.y"
+  case 560:
+#line 2977 "./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 6136 "util/configparser.c"
+#line 6149 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 559:
-#line 2974 "./util/configparser.y"
+  case 561:
+#line 2984 "./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));
@@ -6144,30 +6157,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6148 "util/configparser.c"
+#line 6161 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 560:
-#line 2983 "./util/configparser.y"
+  case 562:
+#line 2993 "./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 6159 "util/configparser.c"
+#line 6172 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 561:
-#line 2991 "./util/configparser.y"
+  case 563:
+#line 3001 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6167 "util/configparser.c"
+#line 6180 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 574:
-#line 3007 "./util/configparser.y"
+  case 576:
+#line 3017 "./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)
@@ -6175,11 +6188,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6179 "util/configparser.c"
+#line 6192 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 575:
-#line 3017 "./util/configparser.y"
+  case 577:
+#line 3027 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6187,21 +6200,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6191 "util/configparser.c"
+#line 6204 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 576:
-#line 3026 "./util/configparser.y"
+  case 578:
+#line 3036 "./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 6201 "util/configparser.c"
+#line 6214 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 577:
-#line 3033 "./util/configparser.y"
+  case 579:
+#line 3043 "./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)))
@@ -6209,21 +6222,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 6213 "util/configparser.c"
+#line 6226 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 578:
-#line 3042 "./util/configparser.y"
+  case 580:
+#line 3052 "./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 6223 "util/configparser.c"
+#line 6236 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 579:
-#line 3049 "./util/configparser.y"
+  case 581:
+#line 3059 "./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)))
@@ -6231,22 +6244,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 6235 "util/configparser.c"
+#line 6248 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 580:
-#line 3058 "./util/configparser.y"
+  case 582:
+#line 3068 "./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 6246 "util/configparser.c"
+#line 6259 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 581:
-#line 3066 "./util/configparser.y"
+  case 583:
+#line 3076 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6258,22 +6271,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6262 "util/configparser.c"
+#line 6275 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 582:
-#line 3079 "./util/configparser.y"
+  case 584:
+#line 3089 "./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 6273 "util/configparser.c"
+#line 6286 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 583:
-#line 3087 "./util/configparser.y"
+  case 585:
+#line 3097 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6285,19 +6298,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6289 "util/configparser.c"
+#line 6302 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 584:
-#line 3100 "./util/configparser.y"
+  case 586:
+#line 3110 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6297 "util/configparser.c"
+#line 6310 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 593:
-#line 3111 "./util/configparser.y"
+  case 595:
+#line 3121 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6308,11 +6321,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6312 "util/configparser.c"
+#line 6325 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 594:
-#line 3123 "./util/configparser.y"
+  case 596:
+#line 3133 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6323,11 +6336,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6327 "util/configparser.c"
+#line 6340 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 595:
-#line 3135 "./util/configparser.y"
+  case 597:
+#line 3145 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6338,11 +6351,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6342 "util/configparser.c"
+#line 6355 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 596:
-#line 3147 "./util/configparser.y"
+  case 598:
+#line 3157 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6356,11 +6369,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6360 "util/configparser.c"
+#line 6373 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 597:
-#line 3162 "./util/configparser.y"
+  case 599:
+#line 3172 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6372,11 +6385,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6376 "util/configparser.c"
+#line 6389 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 598:
-#line 3175 "./util/configparser.y"
+  case 600:
+#line 3185 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6388,11 +6401,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6392 "util/configparser.c"
+#line 6405 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 599:
-#line 3188 "./util/configparser.y"
+  case 601:
+#line 3198 "./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)
@@ -6402,19 +6415,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6406 "util/configparser.c"
+#line 6419 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 600:
-#line 3199 "./util/configparser.y"
+  case 602:
+#line 3209 "./util/configparser.y" /* yacc.c:1646  */
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6414 "util/configparser.c"
+#line 6427 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 605:
-#line 3208 "./util/configparser.y"
+  case 607:
+#line 3218 "./util/configparser.y" /* yacc.c:1646  */
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6428,11 +6441,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6432 "util/configparser.c"
+#line 6445 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 606:
-#line 3223 "./util/configparser.y"
+  case 608:
+#line 3233 "./util/configparser.y" /* yacc.c:1646  */
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6446,12 +6459,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6450 "util/configparser.c"
+#line 6463 "util/configparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 6454 "util/configparser.c"
-
+#line 6467 "util/configparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -6476,13 +6488,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;
 
@@ -6565,10 +6578,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.  */
@@ -6630,7 +6645,6 @@ yyacceptlab:
   yyresult = 0;
   goto yyreturn;
 
-
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
@@ -6638,7 +6652,6 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-
 #if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
@@ -6649,10 +6662,6 @@ yyexhaustedlab:
   /* Fall through.  */
 #endif
 
-
-/*-----------------------------------------------------.
-| yyreturn -- parsing is finished, return the result.  |
-`-----------------------------------------------------*/
 yyreturn:
   if (yychar != YYEMPTY)
     {
@@ -6682,7 +6691,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3237 "./util/configparser.y"
+#line 3247 "./util/configparser.y" /* yacc.c:1906  */
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 66662409e..1548199c6 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.  */
@@ -264,78 +260,79 @@ extern int yydebug;
     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_CACHEDB_REDISEXPIRERECORDS = 506,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 507,
-    VAR_FOR_UPSTREAM = 508,
-    VAR_AUTH_ZONE = 509,
-    VAR_ZONEFILE = 510,
-    VAR_MASTER = 511,
-    VAR_URL = 512,
-    VAR_FOR_DOWNSTREAM = 513,
-    VAR_FALLBACK_ENABLED = 514,
-    VAR_TLS_ADDITIONAL_PORT = 515,
-    VAR_LOW_RTT = 516,
-    VAR_LOW_RTT_PERMIL = 517,
-    VAR_FAST_SERVER_PERMIL = 518,
-    VAR_FAST_SERVER_NUM = 519,
-    VAR_ALLOW_NOTIFY = 520,
-    VAR_TLS_WIN_CERT = 521,
-    VAR_TCP_CONNECTION_LIMIT = 522,
-    VAR_FORWARD_NO_CACHE = 523,
-    VAR_STUB_NO_CACHE = 524,
-    VAR_LOG_SERVFAIL = 525,
-    VAR_DENY_ANY = 526,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 527,
-    VAR_LOG_TAG_QUERYREPLY = 528,
-    VAR_STREAM_WAIT_SIZE = 529,
-    VAR_TLS_CIPHERS = 530,
-    VAR_TLS_CIPHERSUITES = 531,
-    VAR_TLS_USE_SNI = 532,
-    VAR_IPSET = 533,
-    VAR_IPSET_NAME_V4 = 534,
-    VAR_IPSET_NAME_V6 = 535,
-    VAR_TLS_SESSION_TICKET_KEYS = 536,
-    VAR_RPZ = 537,
-    VAR_TAGS = 538,
-    VAR_RPZ_ACTION_OVERRIDE = 539,
-    VAR_RPZ_CNAME_OVERRIDE = 540,
-    VAR_RPZ_LOG = 541,
-    VAR_RPZ_LOG_NAME = 542,
-    VAR_DYNLIB = 543,
-    VAR_DYNLIB_FILE = 544
+    VAR_SERVE_ORIGINAL_TTL = 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_DYNLIB = 544,
+    VAR_DYNLIB_FILE = 545
   };
 #endif
 /* Tokens.  */
@@ -554,90 +551,92 @@ extern int yydebug;
 #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_CACHEDB_REDISEXPIRERECORDS 506
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 507
-#define VAR_FOR_UPSTREAM 508
-#define VAR_AUTH_ZONE 509
-#define VAR_ZONEFILE 510
-#define VAR_MASTER 511
-#define VAR_URL 512
-#define VAR_FOR_DOWNSTREAM 513
-#define VAR_FALLBACK_ENABLED 514
-#define VAR_TLS_ADDITIONAL_PORT 515
-#define VAR_LOW_RTT 516
-#define VAR_LOW_RTT_PERMIL 517
-#define VAR_FAST_SERVER_PERMIL 518
-#define VAR_FAST_SERVER_NUM 519
-#define VAR_ALLOW_NOTIFY 520
-#define VAR_TLS_WIN_CERT 521
-#define VAR_TCP_CONNECTION_LIMIT 522
-#define VAR_FORWARD_NO_CACHE 523
-#define VAR_STUB_NO_CACHE 524
-#define VAR_LOG_SERVFAIL 525
-#define VAR_DENY_ANY 526
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 527
-#define VAR_LOG_TAG_QUERYREPLY 528
-#define VAR_STREAM_WAIT_SIZE 529
-#define VAR_TLS_CIPHERS 530
-#define VAR_TLS_CIPHERSUITES 531
-#define VAR_TLS_USE_SNI 532
-#define VAR_IPSET 533
-#define VAR_IPSET_NAME_V4 534
-#define VAR_IPSET_NAME_V6 535
-#define VAR_TLS_SESSION_TICKET_KEYS 536
-#define VAR_RPZ 537
-#define VAR_TAGS 538
-#define VAR_RPZ_ACTION_OVERRIDE 539
-#define VAR_RPZ_CNAME_OVERRIDE 540
-#define VAR_RPZ_LOG 541
-#define VAR_RPZ_LOG_NAME 542
-#define VAR_DYNLIB 543
-#define VAR_DYNLIB_FILE 544
+#define VAR_SERVE_ORIGINAL_TTL 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_DYNLIB 544
+#define VAR_DYNLIB_FILE 545
 
 /* 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 639 "util/configparser.h"
-
+#line 638 "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 eb21abeed..9b300324c 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -147,7 +147,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_ACCESS_CONTROL_TAG_DATA VAR_VIEW VAR_ACCESS_CONTROL_VIEW
 %token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_SERVE_EXPIRED_TTL
 %token VAR_SERVE_EXPIRED_TTL_RESET VAR_SERVE_EXPIRED_REPLY_TTL
-%token VAR_SERVE_EXPIRED_CLIENT_TIMEOUT VAR_FAKE_DSA
+%token VAR_SERVE_EXPIRED_CLIENT_TIMEOUT VAR_SERVE_ORIGINAL_TTL VAR_FAKE_DSA
 %token VAR_FAKE_SHA1 VAR_LOG_IDENTITY VAR_HIDE_TRUSTANCHOR
 %token VAR_TRUST_ANCHOR_SIGNALING VAR_AGGRESSIVE_NSEC VAR_USE_SYSTEMD
 %token VAR_SHM_ENABLE VAR_SHM_KEY VAR_ROOT_KEY_SENTINEL
@@ -264,7 +264,8 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_qname_minimisation_strict | 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_log_identity | server_use_systemd |
+	server_serve_original_ttl | server_fake_dsa | 
+	server_log_identity | server_use_systemd |
 	server_response_ip_tag | server_response_ip | server_response_ip_data |
 	server_shm_enable | server_shm_key | server_fake_sha1 |
 	server_hide_trustanchor | server_trust_anchor_signaling |
@@ -1816,6 +1817,15 @@ server_serve_expired_client_timeout: VAR_SERVE_EXPIRED_CLIENT_TIMEOUT STRING_ARG
 		free($2);
 	}
 	;
+server_serve_original_ttl: VAR_SERVE_ORIGINAL_TTL STRING_ARG
+	{
+		OUTYY(("P(server_serve_original_ttl:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->serve_original_ttl = (strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
 server_fake_dsa: VAR_FAKE_DSA STRING_ARG
 	{
 		OUTYY(("P(server_fake_dsa:%s)\n", $2));
diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index be69f628a..bf5c9ab43 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -483,7 +483,9 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
 			else 	sldns_buffer_write_u32(pkt, 
-					data->rr_ttl[j]-timenow);
+					data->rr_ttl[j]-(timenow == 0 ? 0 :
+						(SERVE_ORIGINAL_TTL ? 
+						data->ttl_add : timenow)));
 			if(c) {
 				if((r=compress_rdata(pkt, data->rr_data[j],
 					data->rr_len[j], region, tree, c))
@@ -521,7 +523,9 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
 			else 	sldns_buffer_write_u32(pkt, 
-					data->rr_ttl[i]-timenow);
+					data->rr_ttl[i]-(timenow == 0 ? 0 :
+					(SERVE_ORIGINAL_TTL ? 
+						data->ttl_add : timenow)));
 			/* rrsig rdata cannot be compressed, perform 100+ byte
 			 * memcopy. */
 			sldns_buffer_write(pkt, data->rr_data[i],
diff --git a/util/data/msgparse.h b/util/data/msgparse.h
index fd04f9f6f..001cc4fe5 100644
--- a/util/data/msgparse.h
+++ b/util/data/msgparse.h
@@ -87,6 +87,8 @@ extern time_t SERVE_EXPIRED_TTL;
 extern time_t SERVE_EXPIRED_REPLY_TTL;
 /** Negative cache time (for entries without any RRs.) */
 #define NORR_TTL 5 /* seconds */
+/** If we serve the original TTL or decrementing TTLs */
+extern int SERVE_ORIGINAL_TTL;
 
 /**
  * Data stored in scratch pad memory during parsing.
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 927bf09a2..5a6c1f853 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -67,6 +67,8 @@ int SERVE_EXPIRED = 0;
 time_t SERVE_EXPIRED_TTL = 0;
 /** TTL to use for expired records */
 time_t SERVE_EXPIRED_REPLY_TTL = 30;
+/** If we serve the original TTL or decrementing TTLs */
+int SERVE_ORIGINAL_TTL = 0;
 
 /** allocate qinfo, return 0 on error */
 static int
@@ -526,6 +528,7 @@ reply_info_set_ttls(struct reply_info* rep, time_t timenow)
 		for(j=0; j<data->count + data->rrsig_count; j++) {
 			data->rr_ttl[j] += timenow;
 		}
+		data->ttl_add = timenow;
 	}
 }
 
diff --git a/util/data/packed_rrset.c b/util/data/packed_rrset.c
index 4b0294f97..6147233ab 100644
--- a/util/data/packed_rrset.c
+++ b/util/data/packed_rrset.c
@@ -220,6 +220,7 @@ packed_rrset_ttl_add(struct packed_rrset_data* data, time_t add)
 {
 	size_t i;
 	size_t total = data->count + data->rrsig_count;
+	data->ttl_add = add;
 	data->ttl += add;
 	for(i=0; i<total; i++)
 		data->rr_ttl[i] += add;
@@ -286,7 +287,7 @@ int packed_rr_to_string(struct ub_packed_rrset_key* rrset, size_t i,
 	else	sldns_write_uint16(rr+rrset->rk.dname_len, LDNS_RR_TYPE_RRSIG);
 	memmove(rr+rrset->rk.dname_len+2, &rrset->rk.rrset_class, 2);
 	sldns_write_uint32(rr+rrset->rk.dname_len+4,
-		(uint32_t)(d->rr_ttl[i]-now));
+		(uint32_t)(d->rr_ttl[i]-(SERVE_ORIGINAL_TTL ? d->ttl_add : now)));
 	memmove(rr+rrset->rk.dname_len+8, d->rr_data[i], d->rr_len[i]);
 	if(sldns_wire2str_rr_buf(rr, rlen, dest, dest_len) == -1) {
 		log_info("rrbuf failure %d %s", (int)d->rr_len[i], dest);
@@ -353,11 +354,12 @@ packed_rrset_copy_region(struct ub_packed_rrset_key* key,
 	for(i=0; i<d->count + d->rrsig_count; i++) {
 		if(d->rr_ttl[i] < now)
 			d->rr_ttl[i] = SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0;
-		else	d->rr_ttl[i] -= now;
+		else	d->rr_ttl[i] -= SERVE_ORIGINAL_TTL ? data->ttl_add : now;
 	}
 	if(d->ttl < now)
 		d->ttl = SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0;
-	else	d->ttl -= now;
+	else	d->ttl -= SERVE_ORIGINAL_TTL ? data->ttl_add : now;
+	d->ttl_add = 0; /* TTLs have been made relative */
 	return ck;
 }
 
diff --git a/util/data/packed_rrset.h b/util/data/packed_rrset.h
index 729877bab..ff95c0af0 100644
--- a/util/data/packed_rrset.h
+++ b/util/data/packed_rrset.h
@@ -233,6 +233,9 @@ enum sec_status {
  *	the ttl value to send changes due to time.
  */
 struct packed_rrset_data {
+	/** Timestamp added to TTLs in the packed data.
+	 * Needed to support serving original TTLs. */
+	time_t ttl_add;
 	/** TTL (in seconds like time()) of the rrset.
 	 * Same for all RRs see rfc2181(5.2).  */
 	time_t ttl;

From ec6fde611c2ed016e22fa9435181c18e48495a7f Mon Sep 17 00:00:00 2001
From: Ubuntu <rijswijk@fragtest.dnsjedi.org>
Date: Wed, 15 Jul 2020 15:36:06 +0000
Subject: [PATCH 054/208] Cleaned up adjustment in message encoding, fixes
 spurious negative TTLs

---
 util/data/msgencode.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index bf5c9ab43..5de9379a1 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -454,6 +454,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 	size_t i, j, owner_pos;
 	int r, owner_labs;
 	uint16_t owner_ptr = 0;
+	time_t adjust = 0;
 	struct packed_rrset_data* data = (struct packed_rrset_data*)
 		key->entry.data;
 	
@@ -464,9 +465,12 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 	owner_labs = dname_count_labels(key->rk.dname);
 	owner_pos = sldns_buffer_position(pkt);
 
-	/* For an rrset with a fixed TTL, use the rrset's TTL as given */
+	/** Determine relative time adjustment for TTL values.
+	 * For an rrset with a fixed TTL, use the rrset's TTL as given. */
 	if((key->rk.flags & PACKED_RRSET_FIXEDTTL) != 0)
-		timenow = 0;
+		adjust = 0;
+	else
+		adjust = SERVE_ORIGINAL_TTL ? data->ttl_add : timenow;
 
 	if(do_data) {
 		const sldns_rr_descriptor* c = type_rdata_compressable(key);
@@ -479,13 +483,10 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 				return r;
 			sldns_buffer_write(pkt, &key->rk.type, 2);
 			sldns_buffer_write(pkt, &key->rk.rrset_class, 2);
-			if(data->rr_ttl[j] < timenow)
+			if(data->rr_ttl[j] < adjust)
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
-			else 	sldns_buffer_write_u32(pkt, 
-					data->rr_ttl[j]-(timenow == 0 ? 0 :
-						(SERVE_ORIGINAL_TTL ? 
-						data->ttl_add : timenow)));
+			else 	sldns_buffer_write_u32(pkt, data->rr_ttl[j]-adjust);
 			if(c) {
 				if((r=compress_rdata(pkt, data->rr_data[j],
 					data->rr_len[j], region, tree, c))
@@ -519,13 +520,10 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 			}
 			sldns_buffer_write_u16(pkt, LDNS_RR_TYPE_RRSIG);
 			sldns_buffer_write(pkt, &key->rk.rrset_class, 2);
-			if(data->rr_ttl[i] < timenow)
+			if(data->rr_ttl[i] < adjust)
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
-			else 	sldns_buffer_write_u32(pkt, 
-					data->rr_ttl[i]-(timenow == 0 ? 0 :
-					(SERVE_ORIGINAL_TTL ? 
-						data->ttl_add : timenow)));
+			else 	sldns_buffer_write_u32(pkt, data->rr_ttl[i]-adjust);
 			/* rrsig rdata cannot be compressed, perform 100+ byte
 			 * memcopy. */
 			sldns_buffer_write(pkt, data->rr_data[i],

From 2d20edb39f6d23c555ce1e8c2f66bb5b403f0764 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 22 Jul 2020 10:30:50 +0200
Subject: [PATCH 055/208] stream reuse, free up elements that are connected in
 outside network delete.

---
 services/outside_network.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 425c0839a..9c9ce57fa 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1509,10 +1509,18 @@ outside_network_delete(struct outside_network* outnet)
 		size_t i;
 		for(i=0; i<outnet->num_tcp; i++)
 			if(outnet->tcp_conns[i]) {
+				if(!outnet->tcp_conns[i]->query->
+					on_tcp_waiting_list) {
+					/* delete waiting_tcp elements that
+					 * the tcp conn is working on */
+					struct pending_tcp* pend =
+						(struct pending_tcp*)outnet->
+						tcp_conns[i]->query->
+						next_waiting;
+					decommission_pending_tcp(outnet, pend);
+				}
 				comm_point_delete(outnet->tcp_conns[i]->c);
 				waiting_tcp_delete(outnet->tcp_conns[i]->query);
-				/* TODO: loop over tcpwrite wait list and
-				 * delete waiting_tcp_delete them */
 				free(outnet->tcp_conns[i]);
 			}
 		free(outnet->tcp_conns);

From f1c4a4d515d27007f87ca9b065bee57c8eaee8b0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 22 Jul 2020 15:20:58 +0200
Subject: [PATCH 056/208] stream reuse, fix cleanup with streams in the
 connection table.

---
 services/outside_network.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 9c9ce57fa..c7c0743b8 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1509,7 +1509,8 @@ outside_network_delete(struct outside_network* outnet)
 		size_t i;
 		for(i=0; i<outnet->num_tcp; i++)
 			if(outnet->tcp_conns[i]) {
-				if(!outnet->tcp_conns[i]->query->
+				if(outnet->tcp_conns[i]->query &&
+					!outnet->tcp_conns[i]->query->
 					on_tcp_waiting_list) {
 					/* delete waiting_tcp elements that
 					 * the tcp conn is working on */

From 72f8871e61d0f78c48667c2b6db14415b569a933 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 22 Jul 2020 15:40:17 +0200
Subject: [PATCH 057/208] stream reuse, test timeout and simultaneous queries.

---
 testdata/tcp_reuse.tdir/tcp_reuse.conf2 |   5 +
 testdata/tcp_reuse.tdir/tcp_reuse.test  | 176 +++++++++++++++++++++++-
 2 files changed, 177 insertions(+), 4 deletions(-)

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf2 b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
index 308107094..7bd7c23e3 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.conf2
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
@@ -22,6 +22,11 @@ server:
 	local-data: "www2.example.com  A 10.20.30.42"
 	local-data: "www3.example.com  A 10.20.30.43"
 	local-data: "www4.example.com  A 10.20.30.44"
+	local-data: "www5.example.com  A 10.20.30.45"
+	local-data: "www6.example.com  A 10.20.30.46"
+
+	local-zone: "drop.net" deny
+	local-zone: "refuse.net" refuse
 
 # if queries escape, send them to localhost
 forward-zone:
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index 4b006afc4..ae8753cde 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -25,12 +25,12 @@ fi
 if grep "www1.example.com" outfile | grep "10.20.30.41"; then
 	echo "content OK"
 else
-	echo "result contents not OK"
+	echo "result contents not OK, for www1.example.com"
 	echo "> cat logfiles"
 	cat outfile
 	cat unbound2.log 
 	cat unbound.log
-	echo "result contents not OK"
+	echo "result contents not OK, for www1.example.com"
 	exit 1
 fi
 echo "OK"
@@ -52,12 +52,180 @@ fi
 if grep "www2.example.com" outfile | grep "10.20.30.42"; then
 	echo "content OK"
 else
-	echo "result contents not OK"
+	echo "result contents not OK, for www2.example.com"
 	echo "> cat logfiles"
 	cat outfile
 	cat unbound2.log 
 	cat unbound.log
-	echo "result contents not OK"
+	echo "result contents not OK, for www2.example.com"
+	exit 1
+fi
+
+echo "> query drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT 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 unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK, for drop.net"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for drop.net"
+	exit 1
+fi
+
+echo "> query refuse.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK, for refuse.net"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for refuse.net"
+	exit 1
+fi
+
+echo "> query q1.drop.net."
+echo "> query q2.drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 &
+wait
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile1
+cat outfile2
+if grep "rcode: SERVFAIL" outfile1; then
+	echo "content OK"
+else
+	echo "result contents not OK, for q1.drop.net"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for q1.drop.net"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile2; then
+	echo "content OK"
+else
+	echo "result contents not OK, for q2.drop.net"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for q2.drop.net"
+	exit 1
+fi
+
+echo "> query www3.example.com."
+echo "> query www4.example.com."
+echo "> query www5.example.com."
+echo "> query www6.example.com."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www3.example.com. A IN >outfile3 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN >outfile4 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN >outfile5 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN >outfile6 2>&1 &
+wait
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www3.example.com" outfile3 | grep "10.20.30.43"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www3.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www3.example.com"
+	exit 1
+fi
+if grep "www4.example.com" outfile4 | grep "10.20.30.44"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www4.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www4.example.com"
+	exit 1
+fi
+if grep "www5.example.com" outfile5 | grep "10.20.30.45"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www5.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www5.example.com"
+	exit 1
+fi
+if grep "www6.example.com" outfile6 | grep "10.20.30.46"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www6.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www6.example.com"
 	exit 1
 fi
 

From fc55a4b8ce2a746d743b241eb847ec47de38caf1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 23 Jul 2020 10:18:17 +0200
Subject: [PATCH 058/208] stream reuse, test with a list of outstanding queries
 to the upstream server.

---
 testdata/tcp_reuse.tdir/tcp_reuse.conf2 |   3 +
 testdata/tcp_reuse.tdir/tcp_reuse.test  | 112 +++++++++++++++---------
 2 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf2 b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
index 7bd7c23e3..6cb1e6122 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.conf2
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
@@ -28,6 +28,9 @@ server:
 	local-zone: "drop.net" deny
 	local-zone: "refuse.net" refuse
 
+	local-zone: "more.net" redirect
+	local-data: "more.net A 10.20.30.40"
+
 # if queries escape, send them to localhost
 forward-zone:
 	name: "."
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index ae8753cde..32ee7291e 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -109,48 +109,6 @@ else
 	exit 1
 fi
 
-echo "> query q1.drop.net."
-echo "> query q2.drop.net."
-$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 &
-$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 &
-wait
-if test "$?" -ne 0; then
-	echo "exit status not OK"
-	echo "> cat logfiles"
-	cat outfile1
-	cat outfile2
-	cat unbound2.log
-	cat unbound.log
-	echo "Not OK"
-	exit 1
-fi
-cat outfile1
-cat outfile2
-if grep "rcode: SERVFAIL" outfile1; then
-	echo "content OK"
-else
-	echo "result contents not OK, for q1.drop.net"
-	echo "> cat logfiles"
-	cat outfile1
-	cat outfile2
-	cat unbound2.log
-	cat unbound.log
-	echo "result contents not OK, for q1.drop.net"
-	exit 1
-fi
-if grep "rcode: SERVFAIL" outfile2; then
-	echo "content OK"
-else
-	echo "result contents not OK, for q2.drop.net"
-	echo "> cat logfiles"
-	cat outfile1
-	cat outfile2
-	cat unbound2.log
-	cat unbound.log
-	echo "result contents not OK, for q2.drop.net"
-	exit 1
-fi
-
 echo "> query www3.example.com."
 echo "> query www4.example.com."
 echo "> query www5.example.com."
@@ -229,5 +187,75 @@ else
 	exit 1
 fi
 
+echo "> query a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net"
+$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a1.more.net A IN a2.more.net A IN a3.more.net A IN a4.more.net A IN a5.more.net A IN >outfile 2>&1
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile
+for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
+	if grep "$x" outfile | grep "10.20.30.40"; then
+		echo "content OK for $x"
+	else
+		echo "result contents not OK, for $x"
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound2.log
+		cat unbound.log
+		echo "result contents not OK, for $x"
+		exit 1
+	fi
+done
+
+# timeouts at the end. (so that the server is not marked as failed for
+# the other tests).
+echo "> query q1.drop.net."
+echo "> query q2.drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 &
+wait
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile1
+cat outfile2
+if grep "rcode: SERVFAIL" outfile1; then
+	echo "content OK"
+else
+	echo "result contents not OK, for q1.drop.net"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for q1.drop.net"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile2; then
+	echo "content OK"
+else
+	echo "result contents not OK, for q2.drop.net"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for q2.drop.net"
+	exit 1
+fi
+
 echo "OK"
 exit 0

From 0d77f9af6c3909395a7dc20d6b8b8eebb9cc452f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 23 Jul 2020 10:29:36 +0200
Subject: [PATCH 059/208] stream reuse, test with connection drops.

---
 testdata/tcp_reuse.tdir/tcp_reuse.test | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index 32ee7291e..5541ed7f9 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -213,6 +213,24 @@ for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
 	fi
 done
 
+# dropconn.drop.net make the server drop the connection.
+echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net"
+$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile
+# cannot really check outfile, because it may or may not have answers depending
+# on how fast the other server responds or the drop happens, but there are
+# a bunch of connection drops, whilst resolving the other queries.
+
+
 # timeouts at the end. (so that the server is not marked as failed for
 # the other tests).
 echo "> query q1.drop.net."

From 2932d530c10b7519af03c43e8f00beb23fa38c8c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 27 Jul 2020 16:59:46 +0200
Subject: [PATCH 060/208] stream reuse, send queries one by one when upstream
 refuses multiple queries, by closing the connection.

---
 services/outside_network.c | 93 +++++++++++++++++++++++++++++---------
 services/outside_network.h |  2 +
 2 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index c7c0743b8..0ef1dcb4c 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -759,6 +759,75 @@ use_free_buffer(struct outside_network* outnet)
 	}
 }
 
+/** add waiting_tcp element to the outnet tcp waiting list */
+static void
+outnet_add_tcp_waiting(struct outside_network* outnet, struct waiting_tcp* w)
+{
+	struct timeval tv;
+	w->next_waiting = NULL;
+	if(outnet->tcp_wait_last)
+		outnet->tcp_wait_last->next_waiting = w;
+	else	outnet->tcp_wait_first = w;
+	outnet->tcp_wait_last = w;
+	w->on_tcp_waiting_list = 1;
+#ifndef S_SPLINT_S
+	tv.tv_sec = w->timeout/1000;
+	tv.tv_usec = (w->timeout%1000)*1000;
+#endif
+	comm_timer_set(w->timer, &tv);
+}
+
+/** delete element from tree by id */
+static void
+reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
+{
+	log_assert(w->id_node.key != NULL);
+	rbtree_delete(&reuse->tree_by_id, w);
+	w->id_node.key = NULL;
+}
+
+/** more writewait list to go for another connection. */
+static void
+reuse_move_writewait_away(struct outside_network* outnet,
+	struct pending_tcp* pend)
+{
+	/* the writewait list has not been written yet, so if the
+	 * stream was closed, they have not actually been failed, only
+	 * the queries written.  Other queries can get written to another
+	 * stream.  For upstreams that do not support multiple queries
+	 * and answers, the stream can get closed, and then the queries
+	 * can get written on a new socket */
+	struct waiting_tcp* w;
+	if(pend->query && pend->query->error_count == 0 &&
+		pend->c->tcp_write_pkt == pend->query->pkt &&
+		pend->c->tcp_write_pkt_len == pend->query->pkt_len) {
+		/* since the current query is not written, it can also
+		 * move to a free buffer */
+		verbose(5, "reuse_move_writewait_away current %d done",
+			(int)pend->c->tcp_write_byte_count);
+		pend->c->tcp_write_pkt = NULL;
+		pend->c->tcp_write_pkt_len = 0;
+		pend->c->tcp_write_and_read = 0;
+		pend->c->tcp_more_read_again = 0;
+		pend->c->tcp_more_write_again = 0;
+		pend->c->tcp_is_reading = 1;
+		w = pend->query;
+		pend->query = NULL;
+		/* increase error count, so that if the next socket fails too
+		 * the server selection is run again with this query failed
+		 * and it can select a different server (if possible), or
+		 * fail the query */
+		w->error_count ++;
+		reuse_tree_by_id_delete(&pend->reuse, w);
+		outnet_add_tcp_waiting(outnet, w);
+	}
+	while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) {
+		verbose(5, "reuse_move_writewait_away item");
+		reuse_tree_by_id_delete(&pend->reuse, w);
+		outnet_add_tcp_waiting(outnet, w);
+	}
+}
+
 /** remove reused element from tree and lru list */
 static void
 reuse_tcp_remove_tree_list(struct outside_network* outnet,
@@ -874,15 +943,6 @@ static void reuse_cb_and_decommission(struct outside_network* outnet,
 	reuse_del_readwait(&store);
 }
 
-/** delete element from tree by id */
-static void
-reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
-{
-	log_assert(w->id_node.key != NULL);
-	rbtree_delete(&reuse->tree_by_id, w);
-	w->id_node.key = NULL;
-}
-
 /** set timeout on tcp fd and setup read event to catch incoming dns msgs */
 static void
 reuse_tcp_setup_timeout(struct pending_tcp* pend_tcp)
@@ -958,6 +1018,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		return 0;
 	} else if(error != NETEVENT_NOERROR) {
 		verbose(VERB_QUERY, "outnettcp got tcp error %d", error);
+		reuse_move_writewait_away(outnet, pend);
 		/* pass error below and exit */
 	} else {
 		/* check ID */
@@ -2009,6 +2070,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	w->write_wait_prev = NULL;
 	w->write_wait_next = NULL;
 	w->write_wait_queued = 0;
+	w->error_count = 0;
 	if(pend) {
 		/* we have a buffer available right now */
 		if(reuse) {
@@ -2047,19 +2109,8 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		/* queue up */
 		/* waiting for a buffer on the outside network buffer wait
 		 * list */
-		struct timeval tv;
 		verbose(5, "pending_tcp_query: queue to wait");
-		w->next_waiting = NULL;
-		if(sq->outnet->tcp_wait_last)
-			sq->outnet->tcp_wait_last->next_waiting = w;
-		else	sq->outnet->tcp_wait_first = w;
-		sq->outnet->tcp_wait_last = w;
-		w->on_tcp_waiting_list = 1;
-#ifndef S_SPLINT_S
-		tv.tv_sec = timeout/1000;
-		tv.tv_usec = (timeout%1000)*1000;
-#endif
-		comm_timer_set(w->timer, &tv);
+		outnet_add_tcp_waiting(sq->outnet, w);
 	}
 #ifdef USE_DNSTAP
 	if(sq->outnet->dtenv &&
diff --git a/services/outside_network.h b/services/outside_network.h
index 9ebbabe9c..26705c56d 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -386,6 +386,8 @@ struct waiting_tcp {
 	int ssl_upstream;
 	/** ref to the tls_auth_name from the serviced_query */
 	char* tls_auth_name;
+	/** the packet was involved in an error, to stop looping errors */
+	int error_count;
 };
 
 /**

From 444681af9d881700da24ed1fd30b265912d56f5e Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 27 Jul 2020 17:12:23 +0200
Subject: [PATCH 061/208] stream reuse, defensible wait add and debug log with
 details for requeue.

---
 services/outside_network.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 0ef1dcb4c..acbc28eaf 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -764,6 +764,8 @@ static void
 outnet_add_tcp_waiting(struct outside_network* outnet, struct waiting_tcp* w)
 {
 	struct timeval tv;
+	if(w->on_tcp_waiting_list)
+		return;
 	w->next_waiting = NULL;
 	if(outnet->tcp_wait_last)
 		outnet->tcp_wait_last->next_waiting = w;
@@ -786,7 +788,7 @@ reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w)
 	w->id_node.key = NULL;
 }
 
-/** more writewait list to go for another connection. */
+/** move writewait list to go for another connection. */
 static void
 reuse_move_writewait_away(struct outside_network* outnet,
 	struct pending_tcp* pend)
@@ -803,8 +805,13 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		pend->c->tcp_write_pkt_len == pend->query->pkt_len) {
 		/* since the current query is not written, it can also
 		 * move to a free buffer */
-		verbose(5, "reuse_move_writewait_away current %d done",
-			(int)pend->c->tcp_write_byte_count);
+		if(verbosity >= 5 && pend->query->pkt_len > 12+2+2 &&
+			dname_valid(pend->query->pkt+12, pend->query->pkt_len-12)) {
+			char buf[LDNS_MAX_DOMAINLEN+1];
+			dname_str(pend->query->pkt+12, buf);
+			verbose(5, "reuse_move_writewait_away current %s %d bytes were written",
+				buf, (int)pend->c->tcp_write_byte_count);
+		}
 		pend->c->tcp_write_pkt = NULL;
 		pend->c->tcp_write_pkt_len = 0;
 		pend->c->tcp_write_and_read = 0;
@@ -822,7 +829,12 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		outnet_add_tcp_waiting(outnet, w);
 	}
 	while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) {
-		verbose(5, "reuse_move_writewait_away item");
+		if(verbosity >= 5 && w->pkt_len > 12+2+2 &&
+			dname_valid(w->pkt+12, w->pkt_len-12)) {
+			char buf[LDNS_MAX_DOMAINLEN+1];
+			dname_str(w->pkt+12, buf);
+			verbose(5, "reuse_move_writewait_away item %s", buf);
+		}
 		reuse_tree_by_id_delete(&pend->reuse, w);
 		outnet_add_tcp_waiting(outnet, w);
 	}

From 506dad946b7388786f11435ebcbd667388d1da9f Mon Sep 17 00:00:00 2001
From: Ubuntu <rijswijk@fragtest.dnsjedi.org>
Date: Wed, 29 Jul 2020 15:26:42 +0000
Subject: [PATCH 062/208] Ensure packet_rrset_data is always initialised to
 zero upon allocation

---
 dns64/dns64.c         | 2 +-
 respip/respip.c       | 2 +-
 util/data/msgencode.c | 4 ++--
 util/data/msgreply.c  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dns64/dns64.c b/dns64/dns64.c
index 5c70119a5..39fd8778c 100644
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -722,7 +722,7 @@ dns64_synth_aaaa_data(const struct ub_packed_rrset_key* fk,
 		*dd_out = NULL;
 		return; /* integer overflow protection in alloc */
 	}
-	if (!(dd = *dd_out = regional_alloc(region,
+	if (!(dd = *dd_out = regional_alloc_zero(region,
 		  sizeof(struct packed_rrset_data)
 		  + fd->count * (sizeof(size_t) + sizeof(time_t) +
 			     sizeof(uint8_t*) + 2 + 16)))) {
diff --git a/respip/respip.c b/respip/respip.c
index 6fa4f1885..dd0bed8be 100644
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -523,7 +523,7 @@ copy_rrset(const struct ub_packed_rrset_key* key, struct regional* region)
 			return NULL; /* guard against integer overflow */
 		dsize += data->rr_len[i];
 	}
-	d = regional_alloc(region, dsize);
+	d = regional_alloc_zero(region, dsize);
 	if(!d)
 		return NULL;
 	*d = *data;
diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index 5de9379a1..6798b1799 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -486,7 +486,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 			if(data->rr_ttl[j] < adjust)
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
-			else 	sldns_buffer_write_u32(pkt, data->rr_ttl[j]-adjust);
+			else	sldns_buffer_write_u32(pkt, data->rr_ttl[j]-adjust);
 			if(c) {
 				if((r=compress_rdata(pkt, data->rr_data[j],
 					data->rr_len[j], region, tree, c))
@@ -523,7 +523,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt,
 			if(data->rr_ttl[i] < adjust)
 				sldns_buffer_write_u32(pkt,
 					SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0);
-			else 	sldns_buffer_write_u32(pkt, data->rr_ttl[i]-adjust);
+			else	sldns_buffer_write_u32(pkt, data->rr_ttl[i]-adjust);
 			/* rrsig rdata cannot be compressed, perform 100+ byte
 			 * memcopy. */
 			sldns_buffer_write(pkt, data->rr_data[i],
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 5a6c1f853..6fce9a732 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -323,8 +323,8 @@ parse_create_rrset(sldns_buffer* pkt, struct rrset_parse* pset,
 		(sizeof(size_t)+sizeof(uint8_t*)+sizeof(time_t)) + 
 		pset->size;
 	if(region)
-		*data = regional_alloc(region, s);
-	else	*data = malloc(s);
+		*data = regional_alloc_zero(region, s);
+	else	*data = calloc(1, s);
 	if(!*data)
 		return 0;
 	/* copy & decompress */

From 21f175b1acc8e8766060e71e84a0c1913fc38c23 Mon Sep 17 00:00:00 2001
From: Ubuntu <rijswijk@fragtest.dnsjedi.org>
Date: Wed, 29 Jul 2020 15:27:15 +0000
Subject: [PATCH 063/208] Adjust semantics of TTL adjustment after feedback
 from @wcawijngaards

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

diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
index 6a2b735aa..e948a6b0d 100644
--- a/cachedb/cachedb.c
+++ b/cachedb/cachedb.c
@@ -465,7 +465,7 @@ packed_rrset_ttl_subtract(struct packed_rrset_data* data, time_t subtract)
 			data->rr_ttl[i] -= subtract;
 		else	data->rr_ttl[i] = 0;
 	}
-	data->ttl_add = 0;
+	data->ttl_add = (subtract < data->ttl_add) ? (data->ttl_add - subtract) : 0;
 }
 
 /* Adjust the TTL of a DNS message and its RRs by 'adjust'.  If 'adjust' is

From 027884aad26796d810299c1d3c32ba3814f0ff65 Mon Sep 17 00:00:00 2001
From: Ubuntu <rijswijk@fragtest.dnsjedi.org>
Date: Wed, 29 Jul 2020 15:52:58 +0000
Subject: [PATCH 064/208] Disable enforcing of min/max TTL when serving
 original TTL

---
 doc/unbound.conf.5.in | 11 ++++++-----
 util/data/msgreply.c  |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 5e826bbf6..8c029411a 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1126,14 +1126,15 @@ behavior.  Default is 0.
 .TP
 .B serve\-original\-ttl: \fI<yes or no>
 If enabled, unbound will always return the original TTL as received from
-the upstream authoritative name server rather than the decrementing TTL as
+the upstream name server rather than the decrementing TTL as
 stored in the cache.  This feature may be useful if unbound serves as a 
 front-end to a hidden authoritative name server. Enabling this feature does 
 not impact cache expiry, it only changes the TTL unbound embeds in responses to 
-queries. Note that the returned TTL is still subject to the
-configured maximum TTL as set using \fBcache\-max\-ttl\fR (defaults to
-86400 seconds). If you wish to return higher original TTL values, you may
-need to explicitly adjust the setting for \fBcache\-max\-ttl\fR. 
+queries. Note that enabling this feature implicitly disables enforcement of
+the configured minimum and maximum TTL, as it is assumed users who enable this 
+feature do not want unbound to change the TTL obtained from an upstream server. 
+Thus, the values set using \fBcache\-min\-ttl\fR and \fBcache\-max\-ttl\fR are
+ignored.
 Default is "no".
 .TP
 .B val\-nsec3\-keysize\-iterations: \fI<"list of values">
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 6fce9a732..072a69b33 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -199,9 +199,9 @@ rdata_copy(sldns_buffer* pkt, struct packed_rrset_data* data, uint8_t* to,
 		if(*rr_ttl > MAX_NEG_TTL)
 			*rr_ttl = MAX_NEG_TTL;
 	}
-	if(*rr_ttl < MIN_TTL)
+	if(!SERVE_ORIGINAL_TTL && (*rr_ttl < MIN_TTL))
 		*rr_ttl = MIN_TTL;
-	if(*rr_ttl > MAX_TTL)
+	if(!SERVE_ORIGINAL_TTL && (*rr_ttl > MAX_TTL))
 		*rr_ttl = MAX_TTL;
 	if(*rr_ttl < data->ttl)
 		data->ttl = *rr_ttl;

From 12d880ad47c90aa22b2c6a6becedad0a78e10efc Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 30 Jul 2020 16:41:28 +0200
Subject: [PATCH 065/208] stream reuse, add a test for close by upstream server
 after timeout.

---
 testdata/tcp_reuse.tdir/tcp_reuse.conf2 |  2 ++
 testdata/tcp_reuse.tdir/tcp_reuse.pre   |  2 +-
 testdata/tcp_reuse.tdir/tcp_reuse.test  | 30 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf2 b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
index 6cb1e6122..55985c83f 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.conf2
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf2
@@ -10,6 +10,7 @@ server:
 	chroot: ""
 	username: ""
 	do-not-query-localhost: no
+	tcp-idle-timeout: 10000
 
 	log-queries: yes
 	log-replies: yes
@@ -24,6 +25,7 @@ server:
 	local-data: "www4.example.com  A 10.20.30.44"
 	local-data: "www5.example.com  A 10.20.30.45"
 	local-data: "www6.example.com  A 10.20.30.46"
+	local-data: "www7.example.com  A 10.20.30.47"
 
 	local-zone: "drop.net" deny
 	local-zone: "refuse.net" refuse
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre
index 30dbdc96f..ada38271a 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.pre
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre
@@ -25,7 +25,7 @@ wait_unbound_up unbound.log
 sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf2 > ub2.conf
 # start upstream unbound in the background
 #$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
-$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
+valgrind $PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
 UPSTREAM_PID=$!
 echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test
 wait_unbound_up unbound2.log
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index 5541ed7f9..5f0844890 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -213,6 +213,36 @@ for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
 	fi
 done
 
+# make the server timeout to drop the upstream connection
+echo "> sleep 20"
+sleep 15
+# see if we are still up.
+echo "> query a7.more.net"
+$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a7.more.net A IN >outfile 2>&1
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile
+for x in a7.more.net; do
+	if grep "$x" outfile | grep "10.20.30.40"; then
+		echo "content OK for $x"
+	else
+		echo "result contents not OK, for $x"
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound2.log
+		cat unbound.log
+		echo "result contents not OK, for $x"
+		exit 1
+	fi
+done
+
 # dropconn.drop.net make the server drop the connection.
 echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net"
 $PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1

From 7a211e5a07365e2ecb52312ab88c4dbf8036f15b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 30 Jul 2020 17:51:13 +0200
Subject: [PATCH 066/208] stream reuse, fix tls close by upstream after timeout
 write event handling.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index acbc28eaf..0b0b928b0 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -543,6 +543,7 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
 	pend->c->tcp_write_pkt_len = w->pkt_len;
 	pend->c->tcp_write_and_read = 1;
 	pend->c->tcp_write_byte_count = 0;
+	pend->c->tcp_is_reading = 0;
 	comm_point_start_listening(pend->c, s, -1);
 	/* set timer on the waiting_tcp entry, this is the write timeout
 	 * for the written packet.  The timer on pend->c is the timer

From 1116bf640098645894dc437f4b559e04e7904407 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 30 Jul 2020 17:51:49 +0200
Subject: [PATCH 067/208] stream reuse, add tls test for stream reuse.

---
 testdata/ssl_reuse.tdir/ssl_reuse.conf      |  18 ++
 testdata/ssl_reuse.tdir/ssl_reuse.conf2     |  43 +++
 testdata/ssl_reuse.tdir/ssl_reuse.dsc       |  16 +
 testdata/ssl_reuse.tdir/ssl_reuse.post      |  19 ++
 testdata/ssl_reuse.tdir/ssl_reuse.pre       |  34 +++
 testdata/ssl_reuse.tdir/ssl_reuse.test      | 308 ++++++++++++++++++++
 testdata/ssl_reuse.tdir/unbound_control.key |  39 +++
 testdata/ssl_reuse.tdir/unbound_control.pem |  22 ++
 testdata/ssl_reuse.tdir/unbound_server.key  |  39 +++
 testdata/ssl_reuse.tdir/unbound_server.pem  |  22 ++
 10 files changed, 560 insertions(+)
 create mode 100644 testdata/ssl_reuse.tdir/ssl_reuse.conf
 create mode 100644 testdata/ssl_reuse.tdir/ssl_reuse.conf2
 create mode 100644 testdata/ssl_reuse.tdir/ssl_reuse.dsc
 create mode 100644 testdata/ssl_reuse.tdir/ssl_reuse.post
 create mode 100644 testdata/ssl_reuse.tdir/ssl_reuse.pre
 create mode 100644 testdata/ssl_reuse.tdir/ssl_reuse.test
 create mode 100644 testdata/ssl_reuse.tdir/unbound_control.key
 create mode 100644 testdata/ssl_reuse.tdir/unbound_control.pem
 create mode 100644 testdata/ssl_reuse.tdir/unbound_server.key
 create mode 100644 testdata/ssl_reuse.tdir/unbound_server.pem

diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.conf b/testdata/ssl_reuse.tdir/ssl_reuse.conf
new file mode 100644
index 000000000..52857ca37
--- /dev/null
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.conf
@@ -0,0 +1,18 @@
+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
+
+	tls-cert-bundle: "unbound_server.pem"
+	ssl-upstream: yes
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@#unbound"
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.conf2 b/testdata/ssl_reuse.tdir/ssl_reuse.conf2
new file mode 100644
index 000000000..0b452558d
--- /dev/null
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.conf2
@@ -0,0 +1,43 @@
+# this is the upstream server that has pipelining and responds to queries.
+server:
+	verbosity: 1
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	port: @PORT@
+	use-syslog: no
+	directory: .
+	pidfile: "unbound2.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	tls-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	tcp-idle-timeout: 10000
+
+	log-queries: yes
+	log-replies: yes
+	log-identity: "upstream"
+
+	local-zone: "." refuse
+	local-zone: "example.com" static
+	local-data: "www.example.com  A 10.20.30.40"
+	local-data: "www1.example.com  A 10.20.30.41"
+	local-data: "www2.example.com  A 10.20.30.42"
+	local-data: "www3.example.com  A 10.20.30.43"
+	local-data: "www4.example.com  A 10.20.30.44"
+	local-data: "www5.example.com  A 10.20.30.45"
+	local-data: "www6.example.com  A 10.20.30.46"
+	local-data: "www7.example.com  A 10.20.30.47"
+
+	local-zone: "drop.net" deny
+	local-zone: "refuse.net" refuse
+
+	local-zone: "more.net" redirect
+	local-data: "more.net A 10.20.30.40"
+
+# if queries escape, send them to localhost
+forward-zone:
+	name: "."
+	forward-tls-upstream: yes
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.dsc b/testdata/ssl_reuse.tdir/ssl_reuse.dsc
new file mode 100644
index 000000000..ab2b67f66
--- /dev/null
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.dsc
@@ -0,0 +1,16 @@
+BaseName: ssl_reuse
+Version: 1.0
+Description: Test ssl stream reuse.
+CreationDate: Wed Jun 30 16:37:00 CET 2020
+Maintainer: Wouter Wijngaards
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: ssl_reuse.pre
+Post: ssl_reuse.post
+Test: ssl_reuse.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.post b/testdata/ssl_reuse.tdir/ssl_reuse.post
new file mode 100644
index 000000000..4337af204
--- /dev/null
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.post
@@ -0,0 +1,19 @@
+# #-- ssl_reuse.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 `cat unbound2.pid`
+if test -f unbound2.log; then
+	echo ">>> upstream log"
+	cat unbound2.log
+fi
+#kill_pid $UNBOUND_PID
+kill_pid `cat unbound.pid`
+if test -f unbound.log; then
+	echo ">>> unbound log"
+	cat unbound.log
+fi
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.pre b/testdata/ssl_reuse.tdir/ssl_reuse.pre
new file mode 100644
index 000000000..cc2248608
--- /dev/null
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.pre
@@ -0,0 +1,34 @@
+# #-- ssl_reuse.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
+get_random_port 2
+UNBOUND_PORT=$RND_PORT
+UPSTREAM_PORT=$(($RND_PORT + 1))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf > ub.conf
+# start unbound in the background
+#$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+wait_unbound_up unbound.log
+
+# make upstream config file
+sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf2 > ub2.conf
+# start upstream unbound in the background
+#$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
+valgrind $PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
+UPSTREAM_PID=$!
+echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test
+wait_unbound_up unbound2.log
+
+cat .tpkg.var.test
+
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.test b/testdata/ssl_reuse.tdir/ssl_reuse.test
new file mode 100644
index 000000000..d0106c17e
--- /dev/null
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.test
@@ -0,0 +1,308 @@
+# #-- ssl_reuse.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 streamtcp)
+
+echo "> query www1.example.com."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www1.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 unbound2.log 
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www1.example.com" outfile | grep "10.20.30.41"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www1.example.com"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log 
+	cat unbound.log
+	echo "result contents not OK, for www1.example.com"
+	exit 1
+fi
+echo "OK"
+echo ""
+
+# this should be reused on the same tcp stream:
+echo "> query www2.example.com."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www2.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 unbound2.log 
+	cat unbound.log
+	echo "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, for www2.example.com"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log 
+	cat unbound.log
+	echo "result contents not OK, for www2.example.com"
+	exit 1
+fi
+
+echo "> query refuse.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK, for refuse.net"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for refuse.net"
+	exit 1
+fi
+
+echo "> query www3.example.com."
+echo "> query www4.example.com."
+echo "> query www5.example.com."
+echo "> query www6.example.com."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www3.example.com. A IN >outfile3 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN >outfile4 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN >outfile5 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN >outfile6 2>&1 &
+wait
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "www3.example.com" outfile3 | grep "10.20.30.43"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www3.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www3.example.com"
+	exit 1
+fi
+if grep "www4.example.com" outfile4 | grep "10.20.30.44"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www4.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www4.example.com"
+	exit 1
+fi
+if grep "www5.example.com" outfile5 | grep "10.20.30.45"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www5.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www5.example.com"
+	exit 1
+fi
+if grep "www6.example.com" outfile6 | grep "10.20.30.46"; then
+	echo "content OK"
+else
+	echo "result contents not OK, for www6.example.com"
+	echo "> cat logfiles"
+	cat outfile3
+	cat outfile4
+	cat outfile5
+	cat outfile6
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for www6.example.com"
+	exit 1
+fi
+
+echo "> query a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net"
+$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a1.more.net A IN a2.more.net A IN a3.more.net A IN a4.more.net A IN a5.more.net A IN >outfile 2>&1
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile
+for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
+	if grep "$x" outfile | grep "10.20.30.40"; then
+		echo "content OK for $x"
+	else
+		echo "result contents not OK, for $x"
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound2.log
+		cat unbound.log
+		echo "result contents not OK, for $x"
+		exit 1
+	fi
+done
+
+# make the server timeout to drop the upstream connection
+echo "> sleep 20"
+sleep 15
+# see if we are still up.
+echo "> query a7.more.net"
+$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a7.more.net A IN >outfile 2>&1
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile
+for x in a7.more.net; do
+	if grep "$x" outfile | grep "10.20.30.40"; then
+		echo "content OK for $x"
+	else
+		echo "result contents not OK, for $x"
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound2.log
+		cat unbound.log
+		echo "result contents not OK, for $x"
+		exit 1
+	fi
+done
+
+# dropconn.drop.net make the server drop the connection.
+echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net"
+$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile
+# cannot really check outfile, because it may or may not have answers depending
+# on how fast the other server responds or the drop happens, but there are
+# a bunch of connection drops, whilst resolving the other queries.
+
+echo "> query drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT 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 unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK, for drop.net"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for drop.net"
+	exit 1
+fi
+
+# timeouts at the end. (so that the server is not marked as failed for
+# the other tests).
+echo "> query q1.drop.net."
+echo "> query q2.drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 &
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 &
+wait
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+cat outfile1
+cat outfile2
+if grep "rcode: SERVFAIL" outfile1; then
+	echo "content OK"
+else
+	echo "result contents not OK, for q1.drop.net"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for q1.drop.net"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile2; then
+	echo "content OK"
+else
+	echo "result contents not OK, for q2.drop.net"
+	echo "> cat logfiles"
+	cat outfile1
+	cat outfile2
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for q2.drop.net"
+	exit 1
+fi
+
+echo "OK"
+exit 0
diff --git a/testdata/ssl_reuse.tdir/unbound_control.key b/testdata/ssl_reuse.tdir/unbound_control.key
new file mode 100644
index 000000000..753a4ef61
--- /dev/null
+++ b/testdata/ssl_reuse.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/ssl_reuse.tdir/unbound_control.pem b/testdata/ssl_reuse.tdir/unbound_control.pem
new file mode 100644
index 000000000..a1edf7017
--- /dev/null
+++ b/testdata/ssl_reuse.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/ssl_reuse.tdir/unbound_server.key b/testdata/ssl_reuse.tdir/unbound_server.key
new file mode 100644
index 000000000..370a7bbb2
--- /dev/null
+++ b/testdata/ssl_reuse.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/ssl_reuse.tdir/unbound_server.pem b/testdata/ssl_reuse.tdir/unbound_server.pem
new file mode 100644
index 000000000..986807310
--- /dev/null
+++ b/testdata/ssl_reuse.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 d973b756a0fcedcfafbd1354b43c3ece8c4d9e73 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 30 Jul 2020 17:52:57 +0200
Subject: [PATCH 068/208] stream reuse, disable debug in test

---
 testdata/ssl_reuse.tdir/ssl_reuse.pre | 2 +-
 testdata/tcp_reuse.tdir/tcp_reuse.pre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.pre b/testdata/ssl_reuse.tdir/ssl_reuse.pre
index cc2248608..048ca6813 100644
--- a/testdata/ssl_reuse.tdir/ssl_reuse.pre
+++ b/testdata/ssl_reuse.tdir/ssl_reuse.pre
@@ -25,7 +25,7 @@ wait_unbound_up unbound.log
 sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf2 > ub2.conf
 # start upstream unbound in the background
 #$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
-valgrind $PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
+$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
 UPSTREAM_PID=$!
 echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test
 wait_unbound_up unbound2.log
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre
index ada38271a..30dbdc96f 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.pre
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre
@@ -25,7 +25,7 @@ wait_unbound_up unbound.log
 sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf2 > ub2.conf
 # start upstream unbound in the background
 #$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
-valgrind $PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
+$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
 UPSTREAM_PID=$!
 echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test
 wait_unbound_up unbound2.log

From d684bee4b0a84cd0ec9070a7dcbfa0d21c9f87a4 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 31 Jul 2020 09:32:19 +0200
Subject: [PATCH 069/208] stream reuse, move drop in tcp_reuse test to timeout
 section of test.

---
 testdata/tcp_reuse.tdir/tcp_reuse.test | 48 +++++++++++++-------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index 5f0844890..e98afe0e6 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -61,30 +61,6 @@ else
 	exit 1
 fi
 
-echo "> query drop.net."
-$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT 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 unbound2.log
-	cat unbound.log
-	echo "Not OK"
-	exit 1
-fi
-if grep "rcode: SERVFAIL" outfile; then
-	echo "content OK"
-else
-	echo "result contents not OK, for drop.net"
-	echo "> cat logfiles"
-	cat outfile
-	cat unbound2.log
-	cat unbound.log
-	echo "result contents not OK, for drop.net"
-	exit 1
-fi
-
 echo "> query refuse.net."
 $PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1
 cat outfile
@@ -260,6 +236,30 @@ cat outfile
 # on how fast the other server responds or the drop happens, but there are
 # a bunch of connection drops, whilst resolving the other queries.
 
+echo "> query drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT 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 unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK, for drop.net"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for drop.net"
+	exit 1
+fi
+
 
 # timeouts at the end. (so that the server is not marked as failed for
 # the other tests).

From a83fc176cc0de6fc10ca16f2b54a3680eb1def44 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 25 Aug 2020 13:16:46 +0200
Subject: [PATCH 070/208] Review fix: remove unused variables.

---
 services/outside_network.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 0b0b928b0..6f5ebd2f1 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -155,16 +155,14 @@ reuse_cmp_addrportssl(const void* key1, const void* key2)
 int
 reuse_cmp(const void* key1, const void* key2)
 {
-	struct reuse_tcp* r1 = (struct reuse_tcp*)key1;
-	struct reuse_tcp* r2 = (struct reuse_tcp*)key2;
 	int r;
 	r = reuse_cmp_addrportssl(key1, key2);
 	if(r != 0)
 		return r;
 
 	/* compare ptr value */
-	if(r1 < r2) return -1;
-	if(r1 > r2) return 1;
+	if(key1 < key2) return -1;
+	if(key1 > key2) return 1;
 	return 0;
 }
 

From 49019ba3a92eb96127004efb1b79c712b741cc1a Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 25 Aug 2020 16:07:25 +0200
Subject: [PATCH 071/208] Review fix: defense check of qdcount in debug output.

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

diff --git a/services/outside_network.c b/services/outside_network.c
index 6f5ebd2f1..5f60b847c 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -805,6 +805,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		/* since the current query is not written, it can also
 		 * move to a free buffer */
 		if(verbosity >= 5 && pend->query->pkt_len > 12+2+2 &&
+			LDNS_QDCOUNT(pend->query->pkt) > 0 &&
 			dname_valid(pend->query->pkt+12, pend->query->pkt_len-12)) {
 			char buf[LDNS_MAX_DOMAINLEN+1];
 			dname_str(pend->query->pkt+12, buf);
@@ -829,6 +830,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 	}
 	while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) {
 		if(verbosity >= 5 && w->pkt_len > 12+2+2 &&
+			LDNS_QDCOUNT(w->pkt) > 0 &&
 			dname_valid(w->pkt+12, w->pkt_len-12)) {
 			char buf[LDNS_MAX_DOMAINLEN+1];
 			dname_str(w->pkt+12, buf);

From eb799026ff15fa4ae2cfaf6949fbcf74b6736fbf Mon Sep 17 00:00:00 2001
From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 30 Sep 2020 23:17:53 +0200
Subject: [PATCH 072/208] Replace edns-client-tag with edns-client-string
 option

---
 daemon/daemon.c                               |   10 +-
 doc/unbound.conf.5.in                         |   15 +-
 libunbound/context.c                          |    2 +-
 libunbound/libunbound.c                       |   10 +-
 services/outside_network.c                    |   12 +-
 testcode/fake_event.c                         |   12 +-
 ..._client_tag.rpl => edns_client_string.rpl} |   47 +-
 testdata/edns_client_string_opcode.rpl        |  153 ++
 util/config_file.c                            |    8 +-
 util/config_file.h                            |    8 +-
 util/configlexer.c                            | 2366 +++++++++--------
 util/configlexer.lex                          |    4 +-
 util/configparser.c                           | 1393 +++++-----
 util/configparser.h                           |    8 +-
 util/configparser.y                           |   27 +-
 util/edns.c                                   |   73 +-
 util/edns.h                                   |   52 +-
 util/module.h                                 |    4 +-
 18 files changed, 2177 insertions(+), 2027 deletions(-)
 rename testdata/{edns_client_tag.rpl => edns_client_string.rpl} (72%)
 create mode 100644 testdata/edns_client_string_opcode.rpl

diff --git a/daemon/daemon.c b/daemon/daemon.c
index f480c94e6..a11d50a9b 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -291,7 +291,7 @@ daemon_init(void)
 		free(daemon);
 		return NULL;
 	}
-	if(!(daemon->env->edns_tags = edns_tags_create())) {
+	if(!(daemon->env->edns_strings = edns_strings_create())) {
 		auth_zones_delete(daemon->env->auth_zones);
 		acl_list_delete(daemon->acl);
 		tcl_list_delete(daemon->tcl);
@@ -638,9 +638,9 @@ 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");
+	/* Set-up EDNS strings */
+	if(!edns_strings_apply_cfg(daemon->env->edns_strings, daemon->cfg))
+		fatal_exit("Could not set up EDNS strings");
 
 	/* setup modules */
 	daemon_setup_modules(daemon);
@@ -773,7 +773,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);
+		edns_strings_delete(daemon->env->edns_strings);
 		auth_zones_delete(daemon->env->auth_zones);
 	}
 	ub_randfree(daemon->rand);
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 95c4aaa99..8a4f5349a 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1535,15 +1535,14 @@ 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.
+.B edns\-client\-string: \fI<IP netblock> <string>
+Include an EDNS0 option containing configured ascii string 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.
 .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.
+.B edns\-client\-string\-opcode: \fI<opcode>
+EDNS0 option code for the edns-client-string option, from 0 to 65535. Default is
+65001.
 .SS "Remote Control Options"
 In the
 .B remote\-control:
diff --git a/libunbound/context.c b/libunbound/context.c
index 713259c71..cff2831a7 100644
--- a/libunbound/context.c
+++ b/libunbound/context.c
@@ -80,7 +80,7 @@ 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))
+	if(!edns_strings_apply_cfg(ctx->env->edns_strings, cfg))
 		return UB_INITFAIL;
 	if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size,
 		cfg->msg_cache_slabs)) {
diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index 3922eb041..c9e24ba8d 100644
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -154,8 +154,8 @@ 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) {
+	ctx->env->edns_strings = edns_strings_create();
+	if(!ctx->env->edns_strings) {
 		auth_zones_delete(ctx->env->auth_zones);
 		edns_known_options_delete(ctx->env);
 		config_delete(ctx->env->cfg);
@@ -186,7 +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);
+		edns_strings_delete(ctx->env->edns_strings);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -199,7 +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);
+		edns_strings_delete(ctx->env->edns_strings);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -338,7 +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);
+		edns_strings_delete(ctx->env->edns_strings);
 		auth_zones_delete(ctx->env->auth_zones);
 		free(ctx->env);
 	}
diff --git a/services/outside_network.c b/services/outside_network.c
index 41a1d83f1..a682739cb 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -2097,18 +2097,18 @@ outnet_serviced_query(struct outside_network* outnet,
 {
 	struct serviced_query* sq;
 	struct service_callback* cb;
-	struct edns_tag_addr* client_tag_addr;
+	struct edns_string_addr* client_string_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);
+	if((client_string_addr = edns_string_addr_lookup(
+		&env->edns_strings->client_strings, addr, addrlen))) {
 		edns_opt_list_append(&qstate->edns_opts_back_out,
-			env->edns_tags->client_tag_opcode, 2,
-			(uint8_t*)&client_tag, qstate->region);
+			env->edns_strings->client_string_opcode,
+			client_string_addr->string_len,
+			client_string_addr->string, qstate->region);
 	}
 
 	serviced_gen_query(buff, qinfo->qname, qinfo->qname_len, qinfo->qtype,
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index d8df76492..558c592a7 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1213,7 +1213,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;
+		struct edns_string_addr* client_string_addr;
 		if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen,
 			zone, zonelen, qstate, qstate->region)) {
 			free(pend);
@@ -1227,13 +1227,13 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 		edns.bits = 0;
 		if(dnssec)
 			edns.bits = EDNS_DO;
-		if((client_tag_addr = edns_tag_addr_lookup(
-			&env->edns_tags->client_tags,
+		if((client_string_addr = edns_string_addr_lookup(
+			&env->edns_strings->client_strings,
 			addr, addrlen))) {
-			uint16_t client_tag = htons(client_tag_addr->tag_data);
 			edns_opt_list_append(&qstate->edns_opts_back_out,
-				env->edns_tags->client_tag_opcode, 2,
-				(uint8_t*)&client_tag, qstate->region);
+				env->edns_strings->client_string_opcode,
+				client_string_addr->string_len,
+				client_string_addr->string, qstate->region);
 		}
 		edns.opt_list = qstate->edns_opts_back_out;
 		attach_edns_record(pend->buffer, &edns);
diff --git a/testdata/edns_client_tag.rpl b/testdata/edns_client_string.rpl
similarity index 72%
rename from testdata/edns_client_tag.rpl
rename to testdata/edns_client_string.rpl
index 767652c26..1822f7898 100644
--- a/testdata/edns_client_tag.rpl
+++ b/testdata/edns_client_string.rpl
@@ -1,14 +1,14 @@
 ; config options
 server:
-	edns-client-tag: 10.0.0.0/24 1234
-	edns-client-tag: 10.0.0.10/32 5678
+	edns-client-string: 10.0.0.0/24 "abc d"
+	edns-client-string: 10.0.0.10/32 "123AbC!"
 
 stub-zone:
-	name: "tag1234."
+	name: "edns-string-abc."
 	stub-addr: 10.0.0.1
 
 stub-zone:
-	name: "tag5678."
+	name: "edns-string-123."
 	stub-addr: 10.0.0.10
 
 stub-zone:
@@ -17,7 +17,7 @@ stub-zone:
 
 CONFIG_END
 
-SCENARIO_BEGIN Test EDNS client tag option
+SCENARIO_BEGIN Test EDNS string tag option
 
 RANGE_BEGIN 0 1000
 	ADDRESS 10.0.0.1
@@ -26,9 +26,9 @@ MATCH opcode qtype qname
 ADJUST copy_id
 REPLY QR NOERROR
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 SECTION ANSWER
-tag1234. IN A 10.20.30.40
+edns-string-abc. IN A 10.20.30.40
 SECTION ADDITIONAL
 ENTRY_END
 RANGE_END
@@ -40,9 +40,9 @@ MATCH opcode qtype qname
 ADJUST copy_id
 REPLY QR NOERROR
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 SECTION ANSWER
-tag5678. IN A 10.20.30.40
+edns-string-123. IN A 10.20.30.40
 SECTION ADDITIONAL
 ENTRY_END
 RANGE_END
@@ -65,19 +65,19 @@ STEP 10 QUERY
 ENTRY_BEGIN
 REPLY RD
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 ENTRY_END
 
 STEP 20 CHECK_OUT_QUERY
 ENTRY_BEGIN
 MATCH qname qtype opcode ednsdata
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 SECTION ADDITIONAL
 	HEX_EDNSDATA_BEGIN
-		00 10           ; Opcode 16
-		00 02           ; Length 2
-		04 d2           ; 1234
+		fd e9           ; Opcode 65001
+		00 05           ; Length 5
+		61 62 63 20 64  ; "abc d"
 	HEX_EDNSDATA_END
 ENTRY_END
 
@@ -86,28 +86,29 @@ ENTRY_BEGIN
 MATCH all
 REPLY QR RD RA NOERROR
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 SECTION ANSWER
-tag1234. IN A 10.20.30.40
+edns-string-abc. IN A 10.20.30.40
 ENTRY_END
 
 STEP 110 QUERY
 ENTRY_BEGIN
 REPLY RD
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 ENTRY_END
 
 STEP 120 CHECK_OUT_QUERY
 ENTRY_BEGIN
 MATCH qname qtype opcode ednsdata
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 SECTION ADDITIONAL
 	HEX_EDNSDATA_BEGIN
-		00 10           ; Opcode 16
-		00 02           ; Length 2
-		16 2e           ; 5678
+		fd e9           ; Opcode 65001
+		00 07           ; Length 7
+		31 32 33 41 62  ; "123Ab"
+		43 21		; "C!"
 	HEX_EDNSDATA_END
 ENTRY_END
 
@@ -116,9 +117,9 @@ ENTRY_BEGIN
 MATCH all
 REPLY QR RD RA NOERROR
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 SECTION ANSWER
-tag5678. IN A 10.20.30.40
+edns-string-123. IN A 10.20.30.40
 ENTRY_END
 
 STEP 210 QUERY
diff --git a/testdata/edns_client_string_opcode.rpl b/testdata/edns_client_string_opcode.rpl
new file mode 100644
index 000000000..3bd6dda4e
--- /dev/null
+++ b/testdata/edns_client_string_opcode.rpl
@@ -0,0 +1,153 @@
+; config options
+server:
+	edns-client-string: 10.0.0.0/24 "abc d"
+	edns-client-string: 10.0.0.10/32 "123AbC!"
+	edns-client-string-opcode: 65432
+
+stub-zone:
+	name: "edns-string-abc."
+	stub-addr: 10.0.0.1
+
+stub-zone:
+	name: "edns-string-123."
+	stub-addr: 10.0.0.10
+
+stub-zone:
+	name: "notag."
+	stub-addr: 10.10.0.1
+
+CONFIG_END
+
+SCENARIO_BEGIN Test EDNS string 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
+edns-string-abc. IN A
+SECTION ANSWER
+edns-string-abc. 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
+edns-string-123. IN A
+SECTION ANSWER
+edns-string-123. 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
+edns-string-abc. IN A
+ENTRY_END
+
+STEP 20 CHECK_OUT_QUERY
+ENTRY_BEGIN
+MATCH qname qtype opcode ednsdata
+SECTION QUESTION
+edns-string-abc. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		ff 98           ; Opcode 65432
+		00 05           ; Length 5
+		61 62 63 20 64  ; "abc d"
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 30 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+edns-string-abc. IN A
+SECTION ANSWER
+edns-string-abc. IN A 10.20.30.40
+ENTRY_END
+
+STEP 110 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+edns-string-123. IN A
+ENTRY_END
+
+STEP 120 CHECK_OUT_QUERY
+ENTRY_BEGIN
+MATCH qname qtype opcode ednsdata
+SECTION QUESTION
+edns-string-123. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		ff 98           ; Opcode 65432
+		00 07           ; Length 7
+		31 32 33 41 62  ; "123Ab"
+		43 21		; "C!"
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 130 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+edns-string-123. IN A
+SECTION ANSWER
+edns-string-123. 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
diff --git a/util/config_file.c b/util/config_file.c
index b789c3359..ca8a7060f 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -321,8 +321,8 @@ config_create(void)
 	cfg->qname_minimisation_strict = 0;
 	cfg->shm_enable = 0;
 	cfg->shm_key = 11777;
-	cfg->edns_client_tags = NULL;
-	cfg->edns_client_tag_opcode = LDNS_EDNS_CLIENT_TAG;
+	cfg->edns_client_strings = NULL;
+	cfg->edns_client_string_opcode = 65001;
 	cfg->dnscrypt = 0;
 	cfg->dnscrypt_port = 0;
 	cfg->dnscrypt_provider = NULL;
@@ -1150,7 +1150,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-strings", edns_client_strings)
 #ifdef USE_IPSECMOD
 	else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled)
 	else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus)
@@ -1519,7 +1519,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);
+	config_deldblstrlist(cfg->edns_client_strings);
 #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 7750eaa0e..401d9d70f 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -562,10 +562,10 @@ 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;
-	/** EDNS opcode to use for EDNS client tags */
-	uint16_t edns_client_tag_opcode;
+	/** list of EDNS client string entries, linked list */
+	struct config_str2list* edns_client_strings;
+	/** EDNS opcode to use for EDNS client strings */
+	uint16_t edns_client_string_opcode;
 
 	/** DNSCrypt */
 	/** true to enable dnscrypt */
diff --git a/util/configlexer.c b/util/configlexer.c
index a00f50b74..8db2f8b20 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -363,7 +363,7 @@ 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[3256] =
     {   0,
         1,    1,  308,  308,  312,  312,  316,  316,  320,  320,
         1,    1,  324,  324,  328,  328,  335,  332,    1,  306,
@@ -632,46 +632,46 @@ static const flex_int16_t yy_accept[3253] =
       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,  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,  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,  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,
 
-      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,
+      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,  332,
 
-      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,
+      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,  332,
 
-      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,
+      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,  304,  332,   24,  332,  270,  332,  332,  332,  332,
 
       332,  332,  332,  332,  332,  332,  332,  332,  332,  201,
       332,  332,  258,  332,  289,  332,  194,  332,  332,  332,
@@ -700,29 +700,29 @@ static const flex_int16_t yy_accept[3253] =
       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,
+      332,  332,  242,  332,  332,  241,  139,  332,  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,
 
-      176,  175,   41,  332,  332,  332,  332,  332,  332,  332,
+      332,  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,   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,
+      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,  305,  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,  280,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  280,  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
+      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] =
@@ -765,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[3271] =
+static const flex_int16_t yy_base[3274] =
     {   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, 3165, 3121,   81, 6361,
+     6361, 6361,  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, 3093, 6361, 6361, 6361,
+      107, 2724, 6361, 6361, 6361,  154, 2535, 2515, 6361, 6361,
+     6361,  226, 2454, 6361, 6361, 6361,  163, 2353, 6361,  238,
+     6361,  242,  148, 2067, 1986, 6361, 6361, 6361,  246, 1743,
+     6361, 6361, 6361,  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 +805,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, 6361,  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, 6361,  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 +817,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,
+     6361, 1068, 1070, 1072, 1073, 1074, 1075, 6361, 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, 6361, 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, 6361, 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, 6361, 1361, 1357,
 
      1362, 1360, 1367, 1368, 1370, 1358, 1373, 1376, 1377, 1379,
      1378, 1381, 1385, 1382, 1387, 1388, 1392, 1395, 1393, 1402,
@@ -845,653 +845,655 @@ 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, 6361, 1585, 1601, 1583, 1596, 1597, 1599, 1605,
+     1612, 1607, 1610, 1608, 1611, 1613, 1637, 6361, 1614, 6361,
+     6361,  315, 6361, 6361, 1616, 1621, 6361, 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,
+     1720, 1727, 1726, 1736, 1732, 1741, 1750, 6361, 1742, 1751,
      1752, 1753, 1760, 1728, 1755, 1756, 1763, 1766, 1759, 1757,
 
-     1768, 1769, 1770, 1772, 1774, 1777, 1779, 1786, 1781, 6365,
+     1768, 1769, 1770, 1772, 1774, 1777, 1779, 1786, 1781, 6361,
      1782, 1784, 1787, 1790, 1788, 1796, 1798, 1792, 1794, 1801,
-     1802, 1813, 1804, 1808, 1809, 1816, 1814, 1818, 6365, 1820,
+     1802, 1813, 1804, 1808, 1809, 1816, 1814, 1818, 6361, 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,
+     6361, 1946, 1947, 6361, 1949, 1948, 1950, 1972, 1951, 1955,
 
      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,
+     6361, 2086, 2082, 2081, 2083, 2093, 2089, 2088, 6361, 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,
+     2114, 2115, 2110, 2113, 2127, 6361, 2118, 6361, 2125, 2128,
+     2131, 2129, 2133, 2132, 2135, 2136, 6361, 6361, 2137, 2144,
+     2145, 2155, 2152, 6361, 2138, 2162, 6361, 2159, 2164, 2157,
 
      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,
+     2177, 6361, 2185, 2187, 2189, 2193, 2195, 2196, 2197, 2200,
+     6361, 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,
+     2241, 6361, 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,
+     6361, 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,
+     2334, 2335, 2336, 2337, 2341, 2340, 6361, 2343, 2346, 2348,
 
-     2349, 2351, 2352, 2362, 6365, 2354, 2368, 2365, 2374, 2375,
+     2349, 2351, 2352, 2362, 6361, 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,
+     2392, 2395, 6361, 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,
+     2448, 6361, 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,
+     2545, 2558, 2549, 6361, 2547, 2553, 2541, 2557, 2570, 2562,
 
      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,
+     2606, 6361, 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,
+     2641, 6361, 2649, 2642, 2643, 2644, 2650, 2654, 2656, 2660,
+     2663, 2666, 2667, 2668, 2669, 2670, 6361, 2678, 2679, 2675,
+     2687, 2677, 2682, 2684, 2689, 2690, 6361, 2691, 2692, 2693,
+     2700, 2702, 2697, 6361, 2704, 2699, 2705, 2707, 2708, 2709,
+     2711, 2714, 2717, 2718, 2721, 2726, 2733, 2722, 2730, 6361,
      2728, 2742, 2734, 2740, 2738, 2744, 2748, 2750, 2751, 2753,
 
-     2755, 2760, 6365, 2767, 2766, 2764, 2777, 2754, 2769, 2772,
-     2778, 2779, 2780, 2781, 2782, 2785, 6365, 2786, 2788, 2789,
+     2755, 2760, 6361, 2767, 2766, 2764, 2777, 2754, 2769, 2772,
+     2778, 2779, 2780, 2781, 2782, 2785, 6361, 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,
+     2858, 2860, 6361, 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,
 
-     2956, 2957, 2958, 6365, 2961, 2962, 2963, 2966, 2969, 2972,
+     2956, 2957, 2958, 6361, 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,
+     2999, 2997, 6361, 2998, 6361, 3000, 3002, 3004, 3012, 3008,
+     6361, 3014, 6361, 3015, 3020, 3009, 3011, 6361, 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,
+     3064, 3057, 3062, 3070, 3072, 3076, 6361, 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,
+     3108, 3095, 3114, 3117, 3124, 3105, 3126, 6361, 3109, 3128,
+     3119, 3129, 6361, 3131, 3106, 3132, 3139, 3134, 3137, 3141,
 
-     3142, 3143, 3146, 3147, 3149, 3154, 3158, 3161, 3162, 6365,
+     3142, 3143, 3146, 3147, 3149, 3154, 3158, 3161, 3162, 6361,
      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,
+     3225, 3222, 3223, 3226, 3227, 6361, 3229, 3230, 3231, 3249,
+     3233, 3234, 3245, 3235, 6361, 3251, 3247, 3252, 3258, 3260,
+     3262, 3255, 3263, 3264, 3265, 3266, 3268, 3271, 3272, 6361,
+     3276, 6361, 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,
+     3318, 3327, 3317, 3319, 3323, 3328, 3329, 3331, 6361, 6361,
 
      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,
+     3355, 3357, 3366, 6361, 3363, 3364, 3367, 3368, 3378, 3369,
+     3381, 3388, 3385, 3392, 3391, 6361, 3374, 3370, 3399, 3383,
+     3395, 3406, 6361, 3401, 6361, 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,
+     3432, 3434, 3443, 3436, 3440, 3441, 6361, 3445, 3446, 3448,
+     3449, 3450, 3457, 3460, 3453, 6361, 3461, 3463, 3465, 3467,
+     3468, 3470, 3472, 3474, 3475, 3479, 3481, 6361, 3477, 3483,
+     3490, 3485, 3487, 3492, 3495, 3499, 3501, 6361, 3504, 3506,
      3513, 3511, 3508, 3512, 3516, 3517, 3518, 3521, 3523, 3522,
 
      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,
+     3553, 3554, 3536, 6361, 3546, 3558, 3559, 3560, 3561, 3562,
+     3566, 3569, 3571, 3564, 3573, 3581, 3574, 3579, 3586, 3583,
+     3594, 3589, 6361, 3596, 3591, 3599, 3597, 3598, 3603, 3604,
+     3605, 3607, 3608, 3611, 3612, 3614, 3621, 3618, 3620, 3623,
+     3633, 3625, 6361, 3642, 3634, 3635, 3626, 3638, 3639, 3652,
+     3644, 3647, 3651, 3656, 3657, 3658, 3660, 3662, 3663, 3666,
+     3661, 6361, 6361, 3669, 3670, 3673, 6361, 3676, 3671, 3693,
+     3675, 3677, 3679, 3689, 3688, 3678, 3690, 3686, 3699, 6361,
+     3700, 3707, 3702, 3703, 3714, 3717, 3719, 3716, 3720, 3706,
 
-     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,
+     3709, 3713, 3724, 3723, 3730, 3731, 3739, 3740, 3735, 3736,
+     3738, 6361, 3737, 3743, 3744, 3746, 3747, 3748, 6361, 3750,
+     3760, 3753, 3752, 3768, 3770, 3762, 3772, 3754, 3776, 3777,
+     3779, 3780, 3781, 3788, 3783, 3786, 3793, 3794, 3785, 6361,
+     3797, 3799, 3787, 3803, 6361, 3805, 3814, 3817, 3818, 3809,
+     3816, 3819, 3826, 6361, 3822, 3823, 3824, 3825, 3838, 3829,
+     3839, 3837, 3828, 6361, 3841, 3830, 3843, 6361, 3844, 3845,
+     3855, 3857, 3852, 3864, 3859, 3861, 3862, 3860, 6361, 3870,
+     6361, 3871, 3867, 3876, 6361, 3873, 3878, 3881, 3883, 3880,
+     3887, 3888, 3891, 3896, 3884, 3897, 3898, 3899, 3901, 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,
+     3909, 3908, 3910, 3911, 3900, 6361, 3912, 3915, 3921, 3917,
+     3922, 3925, 3920, 3927, 3931, 3928, 6361, 6361, 3939, 6361,
+     3940, 3935, 3942, 6361, 3944, 3946, 3953, 3945, 3949, 3952,
+     3956, 3957, 6361, 3964, 3966, 6361, 3968, 3975, 3970, 3961,
+     3971, 3972, 3976, 3978, 3980, 3981, 3982, 3979, 3986, 3984,
+     6361, 3987, 3988, 3996, 3998, 3995, 3989, 4012, 4014, 4000,
+     6361, 4016, 4002, 4006, 4017, 4018, 6361, 4023, 6361, 4010,
+     4026, 4027, 4029, 4030, 6361, 4034, 4033, 4038, 4040, 4041,
+     4042, 4043, 4045, 4051, 4052, 4059, 4055, 4054, 4056, 6361,
+     4057, 4061, 4063, 4070, 4058, 4065, 4074, 4077, 4078, 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,
+     4083, 4087, 4081, 4088, 4094, 4092, 4098, 4084, 6361, 4096,
+     4104, 4090, 4113, 4100, 4110, 6361, 4114, 4115, 4116, 6361,
+     4117, 4118, 4119, 4124, 4125, 4127, 4131, 4132, 4129, 6361,
+     4136, 4137, 4133, 4134, 4135, 4141, 6361, 6361, 4151, 6361,
+     4152, 4142, 4154, 4155, 4156, 4159, 4161, 4162, 4164, 4166,
+     4172, 4174, 4167, 4175, 4183, 4184, 4192, 4187, 4188, 4189,
+     6361, 6361, 4194, 4198, 4191, 4202, 4203, 4195, 4205, 4212,
+     4210, 4216, 4219, 4220, 4214, 6361, 4222, 4211, 4228, 4221,
+     6361, 4227, 4229, 4230, 4233, 4235, 4236, 4239, 4237, 4238,
+     4242, 4245, 4246, 4247, 4251, 4249, 4258, 4259, 4260, 4261,
 
-     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,
+     4265, 4263, 4268, 6361, 4269, 4270, 4272, 4273, 4274, 4280,
+     4282, 4283, 4284, 6361, 4285, 6361, 4288, 4286, 4302, 4294,
+     4306, 4287, 4297, 4307, 4309, 4312, 4315, 4317, 4308, 4318,
+     4319, 4324, 4326, 4328, 4329, 6361, 4330, 4332, 4337, 4338,
+     4340, 4342, 4343, 4345, 4346, 4348, 4351, 4349, 4356, 4359,
+     4353, 4360, 4361, 4363, 6361, 4365, 4372, 4368, 4374, 4376,
+     4377, 4378, 4379, 4385, 4386, 4388, 4389, 4391, 6361, 4392,
+     4393, 4396, 4397, 4399, 4400, 4402, 4406, 4409, 6361, 4414,
+     4410, 4415, 4404, 4417, 4420, 4423, 4425, 4427, 4429, 4434,
+     6361, 4428, 4439, 4441, 4432, 4442, 4443, 4445, 4433, 6361,
 
-     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,
+     4448, 4451, 4447, 4466, 4458, 4467, 4463, 4465, 4469, 4471,
+     4472, 4473, 4474, 4476, 4477, 4478, 4487, 4495, 4493, 6361,
+     4480, 6361, 4490, 4501, 4504, 4505, 4491, 4488, 6361, 4503,
+     4507, 4512, 4509, 4513, 6361, 4515, 4516, 4518, 4517, 6361,
+     4525, 4521, 4520, 4530, 4535, 4536, 6361, 4539, 4541, 4543,
+     4551, 4552, 4547, 4550, 4553, 4554, 4557, 4558, 4559, 4560,
+     4568, 4563, 4565, 6361, 4571, 4573, 4580, 4581, 4574, 4582,
+     4564, 4585, 4588, 4590, 6361, 4592, 4593, 4594, 4595, 4596,
+     4598, 4599, 4607, 4602, 4605, 4606, 4610, 4611, 6361, 4612,
+     4617, 4616, 4626, 4619, 4628, 6361, 6361, 4622, 4634, 4637,
 
-     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,
+     4629, 4638, 6361, 6361, 4641, 4648, 4631, 4647, 4644, 6361,
+     6361, 4650, 6361, 4651, 6361, 4652, 4654, 6361, 6361, 4656,
+     4657, 4658, 4659, 4668, 6361, 4672, 6361, 4679, 4674, 4660,
+     4662, 4677, 6361, 4678, 4680, 4686, 6361, 4681, 4693, 4688,
+     4689, 6361, 4695, 4696, 4691, 4698, 6361, 4700, 4703, 4707,
+     4705, 4708, 4709, 4711, 4715, 4718, 4719, 4720, 4721, 4722,
+     4734, 4736, 4738, 4740, 4730, 4726, 4743, 4745, 4749, 4747,
+     4751, 4752, 4753, 4755, 4756, 4758, 4761, 4762, 4764, 4767,
+     4765, 4766, 4778, 4768, 4770, 4780, 4782, 4771, 4781, 4785,
+     4784, 4789, 4787, 4792, 4795, 4794, 4796, 6361, 4800, 4802,
 
-     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,
+     4805, 4807, 4806, 4812, 4814, 4816, 4822, 4825, 6361, 4829,
+     6361, 4831, 4823, 4827, 4833, 4834, 6361, 4835, 4836, 4837,
+     4840, 4839, 4842, 4843, 4844, 4847, 4850, 4856, 6361, 4867,
+     4858, 4851, 4861, 4875, 6361, 4869, 4877, 4853, 4863, 4879,
+     4880, 4882, 4883, 4887, 4885, 4889, 4891, 4884, 4892, 4894,
+     4897, 4905, 4906, 4907, 4908, 4909, 4910, 4911, 4912, 4913,
+     4919, 4921, 4926, 6361, 4916, 6361, 4920, 4928, 4932, 4933,
+     4934, 4936, 4938, 6361, 6361, 4940, 4942, 4949, 4937, 4941,
+     4951, 4724, 6361, 4943, 4961, 4955, 4962, 6361, 4963, 4946,
+     4964, 4968, 6361, 4969, 4970, 4972, 4974, 4971, 4983, 4980,
 
-     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,
+     4977, 4987, 4988, 4992, 6361, 6361, 6361, 6361, 4993, 4989,
+     4996, 4997, 4999, 4998, 5004, 5002, 5005, 6361, 5009, 6361,
+     6361, 5014, 5016, 5015, 5017, 5018, 5006, 5023, 5027, 6361,
+     5024, 5028, 5031, 5030, 5038, 5041, 5043, 5044, 5047, 5046,
+     5048, 5055, 5053, 5056, 5050, 5054, 5061, 5063, 6361, 6361,
+     5067, 5069, 5070, 5077, 5074, 5078, 5072, 5081, 5084, 5082,
+     5085, 5089, 5090, 5091, 5099, 5101, 5092, 5096, 6361, 5100,
+     5105, 5103, 6361, 5102, 6361, 5111, 5113, 5109, 5115, 5117,
+     5120, 5121, 5123, 6361, 6361, 5125, 5124, 6361, 6361, 5131,
+     5133, 5135, 5137, 5138, 5134, 5140, 5142, 5139, 6361, 5144,
 
-     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,
+     6361, 5145, 5147, 5149, 5146, 5162, 5166, 5167, 5164, 5168,
+     5169, 6361, 5170, 5172, 6361, 5173, 5175, 5178, 6361, 5180,
+     5182, 5184, 5187, 6361, 5191, 5188, 5194, 6361, 5196, 6361,
+     5197, 5198, 5201, 5208, 6361, 5204, 5205, 6361, 5210, 5212,
+     5215, 5214, 6361, 5216, 6361, 5219, 5221, 5222, 5226, 5228,
+     5230, 5231, 5232, 5233, 5241, 5237, 5238, 6361, 6361,  135,
+     5246, 5248, 5249, 5252, 5251, 5259, 5254, 5256, 5262, 6361,
+     6361, 5258, 6361, 5265, 5264, 6361, 5255, 5274, 5275, 5266,
+     5281, 5270, 5278, 5268, 5290, 5285, 5291, 5287, 5292, 5295,
+     5306, 5310, 5293, 5297, 5307, 5313, 5315, 5317, 5319, 5320,
 
-     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,
+     5321, 5322, 5323, 5324, 5327, 5326, 5330, 6361, 5332, 5334,
+     5333, 6361, 5339, 5340, 5344, 5349, 6361, 5353, 5355, 5356,
+     5357, 6361, 5345, 5359, 5367, 5360, 5361, 5374, 5362, 5370,
+     5377, 6361, 6361, 6361, 5378, 5385, 6361, 5387, 5380, 5372,
+     5382, 6361, 5389, 5390, 6361, 6361, 5388, 5392, 5391, 5399,
+     6361, 5395, 6361, 5396, 6361, 5403, 5404, 5405, 5410, 6361,
+     5415, 5421, 6361, 5424, 5427, 5429, 5430, 5412, 5414, 5431,
+     6361, 5440, 5437, 5438, 5445, 5435, 5446, 5441, 5447, 5448,
+     5455, 5450, 5457, 6361, 5459, 5460, 5464, 5467, 5451, 5461,
+     5471, 6361, 5454, 6361, 5473, 6361, 5477, 5478, 5479, 5480,
 
-     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,
+     5481, 5482, 5484, 5488, 5485, 5487, 5495, 5499, 5496, 6361,
+     5503, 5507, 6361, 5504, 6361, 5509, 6361, 5500, 5510, 5511,
+     5512, 6361, 5514, 5518, 5519, 5520, 6361, 5522, 5529, 5528,
+     5531, 6361, 6361, 5524, 5540, 5532, 5533, 5536, 5546, 5541,
+     5549, 5551, 5550, 5552, 5560, 5556, 5553, 5557, 5564, 5566,
+     5570, 6361, 6361, 6361, 5567, 5558, 5580, 5582, 5573, 5589,
+     5584, 6361, 5585, 5587, 5588, 5591, 5598, 5594, 5596, 6361,
+     5597, 5599, 5600, 5601, 5604, 5605, 5606, 5607, 6361, 5619,
+     5621, 5608, 5615, 5623, 5627, 5631, 5633, 5634, 5641, 5637,
+     6361, 5639, 6361, 6361, 5636, 6361, 5640, 5643, 5644, 5645,
 
-     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,
+     6361, 5648, 5649, 5650, 5652, 5654, 5657, 6361, 5664, 5651,
+     5659, 5667, 6361, 6361, 5669, 6361, 5674, 5675, 5676, 5683,
+     5679, 5681, 5685, 5682, 6361, 5686, 5688, 5692, 5693, 5694,
+     6361, 5695, 5696, 5698, 5699, 6361, 5702, 5701, 5704, 5707,
+     5709, 6361, 5711, 5710, 5729, 5726, 6361, 5712, 5724, 5725,
+     6361, 6361, 5734, 5736, 5737, 6361, 6361, 6361, 5739, 5740,
+     5743, 6361, 5746, 5750, 5754, 5758, 5749, 6361, 5761, 5757,
+     5762, 6361, 6361, 5763, 5764, 5765, 5767, 6361, 6361, 5768,
+     5771, 5769, 5772, 5774, 6361, 5777, 5779, 5785, 5791, 5797,
+     5787, 5794, 5792, 5806, 5809, 5782, 5798, 5808, 5810, 5811,
 
-     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, 5818, 5820, 5819, 5822, 5824, 5826, 5827, 6361, 6361,
+     5834, 5836, 5828, 6361, 6361, 5839, 5843, 5845, 5847, 5849,
+     5851, 5853, 6361, 5854, 5856, 5857, 5858, 5840, 6361, 5859,
+     5862, 5864, 5867, 5865, 5868, 5871, 5873, 6361, 6361, 5874,
+     5881, 5875, 5882, 5876, 6361, 5885, 5893, 5889, 5890, 5891,
+     5896, 5897, 6361, 5898, 5899, 6361, 6361, 5902, 5900, 6361,
+     6361, 5905, 6361, 6361, 6361, 6361, 6361, 6361, 6361, 5909,
+     6361, 5907, 5917, 5919, 5922, 6361, 5911, 5923, 5924, 5925,
+     5926, 6361, 5927, 5930, 5933, 5416, 5929, 5935, 5939, 5937,
+     5942, 5943, 5946, 5947, 5948, 5949, 5953, 5951, 5963, 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,
+     5964, 6361, 6361, 6361, 5965, 5955, 5967, 5973, 5977, 5980,
+     5984, 5986, 5970, 5978, 5987, 5988, 5991, 5992, 5994, 6001,
+     5997, 6000, 5999, 6003, 6005, 6007, 6014, 6008, 6010, 6016,
+     6361, 6018, 6361, 6019, 6361, 6361, 6021, 6026, 6022, 6024,
+     6034, 6038, 6031, 6035, 6036, 6039, 6041, 6361, 6047, 6361,
+     6361, 6042, 6049, 6361, 6050, 6052, 6361, 6051, 6053, 6054,
+     6057, 6059, 6060, 6061, 6062, 6075, 6361, 6361, 6065, 6068,
+     6076, 6078, 6082, 6089, 6080, 6088, 6091, 6092, 6084, 6100,
+     6361, 6099, 6101, 6105, 6361, 6107, 6090, 6108, 6102, 6110,
+     6118, 6113, 6114, 6361, 6116, 6361, 6120, 6122, 6123, 6124,
 
-     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
+     6125, 6126, 6135, 6133, 6137, 6361, 6130, 6140, 6142, 6145,
+     6147, 6149, 6151, 6152, 6160, 6157, 6153, 6164, 6165, 6166,
+     6167, 6169, 6168, 6361, 6176, 6170, 6361, 6177, 6178, 6179,
+     6180, 6184, 6361, 6191, 6181, 6188, 6192, 6195, 6196, 6361,
+     6202, 6205, 6206, 6361, 6209, 6361, 6361, 6210, 6197, 6208,
+     6212, 6218, 6361, 6361, 6361, 6241, 6248, 6255, 6262, 6269,
+     6276, 6283,   88, 6290, 6297, 6304, 6311, 6318, 6325, 6332,
+     6339, 6346, 6353
     } ;
 
-static const flex_int16_t yy_def[3271] =
+static const flex_int16_t yy_def[3274] =
     {   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,
+     3255,    1, 3256, 3256, 3257, 3257, 3258, 3258, 3259, 3259,
+     3260, 3260, 3261, 3261, 3262, 3262, 3255, 3263, 3255, 3255,
+     3255, 3255, 3264, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3265, 3255, 3255, 3255,
+     3265, 3266, 3255, 3255, 3255, 3266, 3267, 3255, 3255, 3255,
+     3255, 3267, 3268, 3255, 3255, 3255, 3268, 3269, 3255, 3270,
+     3255, 3269, 3269, 3271, 3255, 3255, 3255, 3255, 3271, 3272,
+     3255, 3255, 3255, 3272, 3263, 3263, 3255, 3273, 3264, 3273,
+     3264, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3265, 3265, 3266,
+     3266, 3267, 3267, 3255, 3268, 3268, 3269, 3269, 3270, 3270,
+     3269, 3271, 3271, 3255, 3272, 3272, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3269, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3269, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
 
-     3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3269,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3269,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255,
+     3255, 3263, 3255, 3255, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3269, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260,
-     3260, 3260, 3260, 3260, 3260, 3260, 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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3269, 3269, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3269, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3269, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3269, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3269, 3263, 3255, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3255,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3269, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3255, 3263, 3263, 3263, 3263, 3269, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3255,
+     3255, 3263, 3255, 3263, 3255, 3263, 3263, 3255, 3255, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3269, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3255, 3255, 3255, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3269, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3255, 3263, 3263, 3255, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
 
-     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,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3255, 3263, 3255,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3269,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3255, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3255, 3255, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263,
+     3255, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3255, 3263, 3255, 3263, 3255, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3255, 3255, 3263, 3255, 3263, 3263, 3263, 3263,
 
-     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,
+     3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3263, 3255, 3255, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263,
+     3255, 3255, 3263, 3263, 3263, 3255, 3255, 3255, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263,
+     3263, 3255, 3255, 3263, 3263, 3263, 3263, 3255, 3255, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255,
+     3263, 3263, 3263, 3255, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3255, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263,
+     3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3255, 3255, 3263, 3263, 3255,
+     3255, 3263, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3263,
+     3255, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
 
-     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,
+     3263, 3255, 3255, 3255, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3255, 3263, 3255, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3255, 3263, 3255,
+     3255, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3255, 3255, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3255, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3255, 3263, 3263, 3263, 3263,
 
-     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
+     3263, 3263, 3263, 3263, 3263, 3255, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263, 3263,
+     3263, 3263, 3263, 3255, 3263, 3263, 3255, 3263, 3263, 3263,
+     3263, 3263, 3255, 3263, 3263, 3263, 3263, 3263, 3263, 3255,
+     3263, 3263, 3263, 3255, 3263, 3255, 3255, 3263, 3263, 3263,
+     3263, 3263, 3255, 3255,    0, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255
     } ;
 
-static const flex_int16_t yy_nxt[6406] =
+static const flex_int16_t yy_nxt[6402] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1840,7 +1842,7 @@ static const flex_int16_t yy_nxt[6406] =
        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,
+       86, 1695,   86,   86, 3255, 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,
@@ -1861,7 +1863,7 @@ static const flex_int16_t yy_nxt[6406] =
        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,
+     1791,   86,   86, 3255, 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,
@@ -1869,7 +1871,7 @@ static const flex_int16_t yy_nxt[6406] =
 
      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,
+       86, 3255, 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,
@@ -1885,322 +1887,322 @@ static const flex_int16_t yy_nxt[6406] =
      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,
+     1908,   86,   86,   86,   86,   86, 1913,   86, 1909,   86,
+     1916, 1917,   86, 1918,   86, 1920,   86,   86, 1911, 1914,
+     1910, 1915,   86, 1912,   86, 1921,   86, 1919, 1924,   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,
+     1925, 1926,   86, 1928,   86, 1927, 1930,   86, 1922,   86,
+       86,   86,   86, 1923, 1932, 1933,   86,   86,   86, 1936,
+       86,   86, 1929, 1935,   86,   86, 1939,   86, 1941, 1938,
+     3255,   86, 1940,   86,   86, 1931,   86, 1934,   86,   86,
+     1948, 1954, 1937, 1942, 1943, 1944,   86,   86,   86, 1950,
+     1945,   86,   86, 1946, 1951,   86, 1947,   86, 1949, 1957,
+       86, 1952, 1955, 1953,   86,   86, 1958, 1956, 1961,   86,
+       86,   86, 1963,   86,   86,   86,   86, 1966, 1967,   86,
+     1959, 1969,   86,   86,   86, 1960,   86, 1975,   86,   86,
+       86,   86,   86, 1964, 1968, 1971, 1962, 1965, 1972,   86,
 
-       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,
+     1974,   86,   86,   86, 1981, 1973,   86, 1977, 1970, 1978,
+     1979, 1976,   86,   86, 1985,   86,   86, 1980, 1984,   86,
+       86, 1988,   86, 1987, 1989, 1982,   86,   86, 1983,   86,
+       86, 1990,   86,   86, 1991, 1986,   86,   86, 1995, 1993,
+     1996, 1994, 1992,   86,   86, 1999, 2000, 2001,   86,   86,
+       86,   86,   86,   86, 1997, 2004,   86,   86, 2009,   86,
+       86,   86, 2008,   86, 2003,   86,   86,   86, 2002, 1998,
+     2006, 2005, 2014,   86, 2015,   86, 2011, 2013, 2007, 2010,
+     2016,   86, 2012,   86, 2020,   86, 2018, 2017, 2021,   86,
+       86, 2019,   86,   86,   86, 2027,   86, 2024,   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,
+       86,   86, 2032, 2022, 2029, 2030,   86,   86, 2031, 2023,
+       86, 2028,   86, 2025, 2026, 2037,   86, 2038,   86, 2033,
+     2036, 2039,   86, 2034, 2041, 2042, 2040,   86, 2035,   86,
+       86,   86,   86, 2046, 2044,   86,   86,   86,   86,   86,
+     2048,   86,   86,   86, 2045, 2051, 2053, 2047, 2043, 2049,
+      168,   86,   86, 2055,   86, 2054,   86,   86,   86, 2060,
+     2059, 2058, 2057, 2050, 2052,   86, 2056, 2061,   86, 2062,
+       86, 2064,   86,   86,   86,   86, 3255,   86, 2065, 2066,
+       86, 2067, 2068,   86,   86, 2063,   86, 2070, 2069,   86,
+     2072,   86, 2071,   86,   86, 2076,   86,   86, 2073, 2075,
 
-       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,
+       86,   86, 2077, 2074,   86, 2078, 2079, 2080, 2081,   86,
+       86,   86,   86,   86,   86,   86, 2088, 2082, 2086, 2083,
+     2087,   86,   86,   86,   86,   86, 2093, 2092,   86, 2084,
+       86, 2085, 2090,   86,   86,   86, 2098, 2094,   86, 2089,
+       86,   86, 2091, 2096,   86, 2100, 2095, 2099,   86, 2102,
+     2097, 2104,   86,   86, 2103,   86, 2105,   86,   86,   86,
+     2110, 2101,   86, 2112, 2106,   86,   86, 2113, 2114,   86,
+       86, 2107, 2108, 2109,   86, 2111, 2116,   86, 2115,   86,
+     2117,   86, 2119,   86,   86,   86, 2123, 2118,   86,   86,
+     2120,   86,   86,   86,   86,   86, 2121,   86, 2124,   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,   86,   86, 2131, 2122, 2126, 2127, 2128,   86,   86,
+     2136,   86, 2125,   86, 2130,   86, 2132, 2143, 2129,   86,
+     2133, 2135, 2138,   86, 2134,   86, 2137,   86, 2139,   86,
+       86,   86, 2140, 2141, 2142, 2145,   86, 2144, 2146,   86,
+       86, 2148,   86,   86, 2151, 2147,   86,   86, 2149, 2153,
+     2155,   86, 2150,   86,   86,   86,   86, 2158,   86, 2157,
+     2154, 2159, 2152, 2160,   86,   86, 2163,   86,   86,   86,
+       86,   86,   86, 2164,   86, 2169,   86, 2166,   86, 2156,
+     2165, 2173, 2161,   86, 2170, 2162, 2171,   86, 2168, 2167,
+       86,   86,   86, 2175,   86, 2174,   86,   86, 2172, 2179,
 
-       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,   86, 2181,   86, 2177,   86, 2180,   86, 2182,   86,
+     2176,   86, 2178,   86, 2183, 2185, 2184,   86, 2186, 2188,
+     2190, 2187, 2192,   86, 2189, 2191,   86,   86,   86,   86,
+       86,   86,   86, 2195, 2196, 2193, 2200,   86,   86, 2194,
+       86, 2199,   86, 2197,   86,   86,   86,   86,   86,   86,
+       86, 2198, 2209, 2210,   86,   86, 2201, 2205, 2202, 2204,
+     2203, 2206, 2207, 2211,   86,   86, 2208,   86,   86,   86,
+     2212, 2214,   86, 2220,   86,   86, 2222,   86, 2215,   86,
+       86, 2219, 2216, 2213, 2221,   86, 2217,   86,  168, 2224,
+     2228, 2230, 2225, 2226, 2218, 2229,   86,   86, 2223, 2231,
 
-     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,
+       86,   86,   86, 2232,   86,   86, 2235,   86,   86, 2233,
+     2227,   86, 2236, 2239, 2240,   86,   86, 2241,   86, 2244,
+     2242, 2249, 2234,   86,   86,   86, 2237,   86, 2245,   86,
+     2246, 2247,   86,   86,   86,   86, 2243, 2238, 2248, 2250,
+       86,   86,   86,   86, 2251, 2252,   86, 2255,   86,   86,
+       86,   86,   86, 2258, 2253,   86, 2262, 2264,   86,   86,
+       86, 2257,   86, 2265,   86, 2254, 2256, 2259, 2260, 2267,
+     2261,   86,   86,   86,   86, 2266,   86, 2263,   86, 2272,
+     2275,   86,   86,   86, 2270,   86,   86,   86, 2268, 2269,
+     2276, 2273, 2271,   86, 2274,   86,   86,   86,   86,   86,
 
-       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,   86, 2277, 2291, 2278, 2287, 2289,   86, 2283, 2279,
+       86, 2280, 2281, 2285, 2286,   86, 2282, 2288, 2284,   86,
+       86,   86,   86, 2292, 2290,   86, 2295, 2296,   86, 2297,
+       86,   86,   86, 2300, 2293, 2294, 2298,   86, 2303,   86,
+     2304,   86,   86,   86, 2299,   86, 2301, 2305, 2306, 2302,
+       86,   86, 2310,   86, 2311,   86,   86, 2313,   86,   86,
+     2315,   86,   86, 2309,   86, 2307,   86, 2317, 2318,   86,
+     2308, 2319,   86,   86,   86, 2312,   86, 2314,   86, 2316,
+     2320,   86, 2321, 2324, 2325,   86, 2327,   86, 2322,   86,
+       86,   86,   86, 2331, 2330, 2323, 2329, 2333,   86,   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,
+     2326,   86,   86, 2337,   86,   86,   86, 2328, 2332,   86,
+       86, 2342,   86,   86, 2341,   86, 2335,   86, 2334,   86,
+     2344, 2336,   86,   86, 2340, 2338, 2347,   86,   86, 2339,
+       86, 2350, 2343,   86, 2345, 2349,   86, 2346,   86, 2354,
+       86,   86,   86, 2348, 2356,   86,   86,   86, 2351, 2355,
+     2357, 2352,   86, 2360,   86,   86,   86, 2361,   86, 2362,
+       86,   86, 2353, 2366,   86, 2358, 2368, 2359, 2364, 2369,
+     2363,   86, 2367, 2371, 2373, 2370,   86, 2365,   86,   86,
+       86, 2374,   86, 2375,   86,   86,   86,   86, 2378,   86,
+       86,   86, 2372,   86, 2384, 2379, 2380, 2377, 2381, 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,
+       86,   86, 2385,   86,  168, 2383,   86, 2376,   86, 2393,
+     2386, 2390, 2388, 2387,   86, 2389,   86,   86,   86, 2391,
+       86, 2394,   86, 2395, 2398,   86,   86, 2392,   86,   86,
+       86,   86, 2396,   86,   86, 2400, 2397, 2399,   86, 2406,
+     2401, 2405, 2404,   86, 3255, 2402, 2403, 2409,   86,   86,
+     2410, 2411,   86, 2407,   86, 2408,   86, 2412, 2414, 2415,
+       86, 2413, 2417,   86,   86,   86,   86,   86, 2419, 2416,
+       86,   86,   86,   86, 2423, 2424,   86,   86,   86, 3255,
+     2418,   86, 2420, 2426,   86, 2421,   86,   86, 2427, 2428,
+     2425, 2422, 2429,   86,   86,   86, 2431, 2433,   86, 2430,
 
-       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,
+     2435,   86, 2434,   86, 2432,   86,   86,   86,   86,   86,
+     2437,   86,   86, 2441, 2444,   86, 2436, 2443,   86,   86,
+       86, 2445, 2440,   86,   86,   86, 2438, 2439, 2448,   86,
+       86, 2442,   86, 2453, 2452,   86, 2446, 2450, 2447,   86,
+     2454,   86,   86, 2455,   86, 2449, 2451,   86, 2457, 2456,
+       86,   86, 2460, 2458,   86, 2462, 2463,   86, 2461, 2464,
+       86,   86, 2466,   86,   86,   86, 2465,   86, 2459,   86,
+       86,   86,   86,   86, 2470,   86, 2472, 2473, 3255, 2468,
+     2474,   86, 2467, 2469, 2475,   86, 2476,   86, 2477, 2478,
+       86,   86,   86,   86,   86, 2480, 2471, 2479, 2483,   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,
+     2485,   86,   86, 2484,   86, 2482,   86, 2488,   86,   86,
+     2481,   86, 2489,   86, 2492, 2493,   86, 2487,   86, 2486,
+       86,   86,   86, 2490,   86, 2494, 2498, 2497,   86, 2491,
+     2496,   86,   86,   86,   86,   86, 2495,   86, 2502,   86,
+     2504, 2616, 2499,   86, 2501, 2500, 2505,   86, 2506,   86,
+     2507,   86, 2508,   86, 2503, 2509,   86, 2510,   86, 2512,
+       86, 2511,   86, 2513,   86,   86,   86, 2518,   86,   86,
+     2520,   86, 2514, 2521,   86,   86, 2515,   86,   86,   86,
+       86,   86, 2517,   86,   86, 2516, 2522, 2524, 2519, 2523,
+     2525,   86, 2530,   86,   86,   86, 2527,   86,   86, 2526,
 
-     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,
+      168, 2528,   86, 2529, 2531,   86, 2538,   86,   86,   86,
+     2532, 2534, 2537,   86, 2533,   86, 2536, 2539,   86,   86,
+       86, 2535, 2540, 2545, 2541,   86, 3255,   86, 2549,   86,
+     2547, 2542, 2548, 2546, 2550,   86,   86, 2543,   86, 2551,
+       86, 2544,   86, 2552,   86, 2553,   86,   86,   86,   86,
+       86, 2555,   86,   86, 2554,   86,   86,   86, 2564, 3255,
+       86, 2562, 2557,   86,   86, 2556,   86, 2559, 2558,   86,
+     2568,   86, 2560, 2561,   86, 2563,   86, 2565, 2566, 2569,
+       86, 2567,   86, 2572, 2576, 2570, 2571, 2573,   86, 2575,
+       86, 2574,   86,   86, 2577,   86,   86,   86,   86, 2578,
 
-       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, 2584,   86, 2585,   86,   86, 2588,   86, 2579, 2589,
+       86, 2587, 2590, 2580, 2581, 2586, 2582, 2583,   86,   86,
+       86,   86,   86,   86,   86,   86,   86, 2594, 2598,   86,
+     2597, 2599,   86,   86,   86, 2592, 2600, 2591, 2601,   86,
+     2593,   86, 2603, 2595, 2596,   86,   86,   86, 2602,   86,
+       86,   86, 2607,   86,   86,   86,   86, 2605, 2611,   86,
+     2604, 2612,   86, 2615,   86, 2613, 2606, 2619,   86, 2608,
+     2609, 2617, 2614, 2610,   86,   86,   86,   86, 2618, 2622,
+     2624,   86,   86,   86,   86,   86, 2628,   86, 2620, 2627,
+       86, 2621, 2626,   86, 2625, 2630,   86, 2623, 2631, 2632,
 
-     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, 2629, 2635,   86,   86, 2636, 2638,   86,
+       86,   86,   86, 2634, 2643,   86, 2633,   86,   86,   86,
+     2641, 2645,   86, 2639, 2637, 2640, 2642,   86,   86,   86,
+       86,   86, 2646, 2644, 2647, 2649,   86,   86, 2651, 2650,
+       86,   86, 2648,   86,   86, 2652, 2655, 3255, 2653, 2656,
+     2658,   86, 2654, 2659,   86, 2660,  168,   86, 2657,   86,
+       86,   86, 2665,   86, 2661, 2662,   86,   86,   86,   86,
+     2667, 2666, 2669, 2670,   86, 2671,   86, 2663, 2668, 2664,
+       86, 2673,   86,   86, 2675,   86, 2674,   86, 2680, 2676,
+       86,   86, 2677, 2672,   86,   86, 2678,   86,   86, 2679,
 
-       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,
+     2682, 2681,   86,   86,   86,   86, 2687, 2683, 2688,   86,
+     2689, 2685,   86,   86,   86,   86,   86, 2684,   86, 2693,
+     2691, 2690,   86, 2692,   86, 2686,   86, 2694,   86, 2695,
+       86, 2696, 2703,   86,   86, 2701,   86,   86,   86, 2699,
+     2697, 2698, 2700, 2704,   86, 2702,   86,   86,   86, 2708,
+       86,   86,   86,   86, 2712,   86, 2710,   86,   86,   86,
+       86, 2717,   86, 2705, 2716, 3255, 2706, 2707, 2711, 2719,
+     2709, 2713, 2714, 2720, 2721,   86, 2722,   86, 2715,   86,
+       86,   86,   86,   86, 2718,   86,   86, 2724,   86, 2723,
+     2727,   86, 2725,   86, 2730,   86, 2732,   86, 2726, 2733,
 
-     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, 2728, 2734,   86, 2735, 2729,   86, 2737,   86,
+       86,   86, 2736, 2731,   86, 2741, 2739,   86,   86, 2744,
+     2742,   86, 2745,   86, 2746,   86, 2740,   86,   86,   86,
+     2738, 2747,   86, 2751,   86,   86, 2752, 2743, 2753,   86,
+     2748,   86, 2755,   86,   86,   86,   86, 2749, 2759, 2760,
+       86,   86, 2750, 2762,   86, 2761, 2754, 2756, 2763,   86,
+     2758,   86,   86, 2757,   86,   86, 2768,   86,   86,   86,
+     2767,   86,   86, 2770, 2771,   86, 2772,   86,   86,   86,
+     2774,   86, 2765,   86, 2764, 2766, 2773,   86,   86, 2777,
+     2776,   86, 2769, 2775,   86, 2783, 2778, 2779,   86, 2780,
 
-     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, 2781, 2784,   86,   86,   86,   86, 2786,   86, 2796,
+       86, 2782, 2785, 2791, 2788, 2787, 2790, 2793, 2792,   86,
+       86, 2797, 2794,   86, 2789, 2795,   86, 2798,   86, 2799,
+       86, 2800,   86,   86,   86,   86,   86,   86, 2802,   86,
+       86, 3255, 2806,   86, 2810,   86,   86,   86, 2801, 2807,
+     2811, 2813,   86,   86, 2803, 2805, 2815,   86,   86, 2808,
+     2814, 2804,   86, 2809, 2812, 2817,   86, 2816,   86,   86,
+       86, 2822,   86,   86,   86,   86, 2821, 2818, 2819, 2820,
+       86, 2826, 2824,   86, 2823,   86, 2827,   86, 2828, 2825,
+       86,   86, 2829,   86, 2830,   86, 2831, 2832,   86, 2833,
 
-     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,
+       86,   86,   86,   86,   86,   86, 2842, 2834,   86,   86,
+     2835, 2837,   86, 2836, 2840, 2838,   86,   86,   86, 2847,
+     2843, 2845, 2846,   86, 2841,   86, 2839,   86,   86,   86,
+     2844, 3113, 2848, 2849,   86, 2850, 2852,   86, 2851, 2853,
+       86, 2854,   86,   86,   86, 2856, 2857, 2859,   86, 2858,
+       86,   86, 2855,   86,   86, 2860, 2861, 2862,   86,   86,
+       86,   86, 2868,   86,   86, 2866, 2863,   86,   86, 2870,
+       86, 2864,   86,   86,   86, 2865, 2871,   86, 2872, 2867,
+       86, 2874, 2873, 2875,   86, 2879,   86, 2878, 2869, 2876,
+       86,   86,   86,   86,   86,   86, 2882,   86,   86, 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,
+       86,   86, 2883, 2880, 2881, 2886, 2887, 2888,   86,   86,
+     2884, 2891,   86,   86, 2885, 2893,   86,   86, 2889, 2894,
+       86, 2896,   86,   86,   86,   86, 2901,   86, 2892, 2897,
+     2900,   86,   86,   86, 2890,   86, 2905,   86, 2895, 2898,
+     2899,   86,   86, 2908,   86,   86,   86, 2910, 2913,   86,
+     2911, 2902, 2904,   86,   86, 2903, 2906, 2909, 2914,   86,
+     2907, 2916,   86,   86,   86,   86,   86, 2921, 2912,   86,
+       86,   86, 2919,   86, 2915, 2918, 2925,   86, 2923,   86,
+       86, 2917, 2926,   86, 2927, 2920,   86, 2930, 2922, 2932,
+     2924, 2929, 2928,   86, 2931,   86, 2933,   86,   86, 2936,
 
-       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,   86,   86, 2935,   86, 2939, 2937,   86, 2942,   86,
+       86,   86,   86,   86,   86, 2934, 2947,   86,   86,   86,
+       86,   86, 2943, 2938, 2940, 2941, 2953, 2946,   86, 2950,
+     2944, 2951,   86, 2952,   86, 2949,   86, 2948, 2945, 2956,
+       86, 2955, 2954, 2957,   86, 2958,   86,   86, 2960,   86,
+       86, 2962,   86,   86,   86, 2961,   86,   86,   86, 2967,
+     2968,   86,   86,   86,   86,   86, 2972,   86, 2963, 2973,
+       86, 2974,   86, 2959, 2971, 2964, 2969,   86, 2965, 2966,
+       86, 2978,   86, 2970, 2975, 2977, 2979,   86,   86,   86,
+     2982, 2976,   86, 2980,   86,   86,   86, 2985,   86,   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,
+     2986,   86, 2984, 2981, 2983,   86,   86,   86,   86,   86,
+     2989,   86,   86, 2991,   86,   86, 2992,   86, 2990, 2987,
+       86, 2988,   86,   86,   86,   86, 3255, 3001, 2993, 3002,
+     2997, 2994, 2995, 2996, 2998, 2999, 3004,   86,   86,   86,
+     3007, 3000,   86, 3003, 3005, 3006, 3009,   86, 3010,   86,
+       86, 3008,   86,   86, 3011, 3014,   86, 3012, 3015,   86,
+     3016, 3017,   86,   86, 3018, 3019, 3022,   86, 3020, 3021,
+       86,   86, 3013, 3023,   86,   86,   86,   86,   86, 3029,
+       86,   86,   86, 3028,   86,   86, 3032,   86, 3024, 3025,
+       86, 3031,   86, 3255, 3033,   86, 3026, 3027,   86, 3037,
 
-     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, 3036, 3034, 3038,   86,   86, 3030,   86, 3035, 3039,
+       86,   86, 3041, 3044, 3042, 3040, 3046, 3043, 3045,   86,
+     3047,   86,   86,   86,   86,   86, 3048, 3054, 3050, 3051,
+     3053,   86,   86,   86, 3056,   86, 3057,   86, 3055,   86,
+       86,   86, 3049, 3255, 3052, 3059, 3060,   86, 3061,   86,
+     3062, 3063,   86,   86, 3058, 3064,   86, 3065,   86, 3066,
+       86, 3067,   86, 3068,   86, 3069,   86,   86, 3071,   86,
+       86,   86,   86, 3074, 3076,   86, 3070,   86,   86, 3072,
+       86,   86, 3080, 3073,   86, 3082,   86,   86,   86,   86,
+     3079, 3075, 3077, 3078,   86,   86, 3086, 3084,   86, 3081,
 
-     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,
+     3089, 3088,   86,   86,   86, 3083,   86, 3087, 3091,   86,
+       86,   86,   86,   86, 3085,   86, 3090, 3095,   86, 3097,
+       86, 3096,   86, 3092,   86, 3100, 3094, 3093, 3098, 3102,
+       86, 3103,   86, 3101, 3104,   86,   86,   86,   86,   86,
+       86, 3107,   86,   86, 3099, 3106,   86, 3105,   86, 3115,
+       86, 3112,   86, 3109, 3111,   86,   86, 3114, 3108,   86,
+       86,   86,   86, 3110,   86, 3116,   86,   86,   86, 3117,
+     3122, 3124, 3119, 3118, 3123, 3121,   86,   86,   86, 3131,
+       86, 3126, 3128,   86, 3120, 3125,   86, 3127, 3130, 3133,
+       86,   86, 3129,   86, 3134, 3132, 3135,   86, 3136,   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,
+       86,   86, 3137, 3139,   86,   86, 3140,   86, 3144, 3141,
+       86, 3138,   86,   86,   86, 3148,   86, 3147,   86, 3150,
+       86,   86, 3143,   86, 3145, 3146, 3151,   86, 3154,   86,
+     3142,   86,   86, 3157,   86,   86, 3152,   86, 3149,   86,
+     3158, 3161, 3153, 3159,   86, 3162, 3155,   86,   86,   86,
+     3156,   86,   86, 3167,   86,   86, 3160, 3166, 3163, 3168,
+       86, 3164,   86,   86,   86,   86,   86,   86, 3165, 3172,
+       86, 3174,   86,   86,   86,   86, 3169, 3171,   86, 3179,
+     3180,   86, 3170, 3176, 3173, 3177, 3175, 3181,   86,   86,
+     3185,   86, 3178,   86, 3188,   86, 3187,   86, 3182, 3183,
 
-       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,
+     3186,   86,   86,   86,   86,   86, 3189, 3193, 3184, 3190,
+     3191, 3194,   86,   86,   86,   86, 3192, 3196,   86, 3195,
+       86,   86, 3198,   86, 3197, 3202,   86,   86, 3199,   86,
+     3205,   86, 3206,   86, 3200,   86,   86,   86,   86,   86,
+     3204, 3209, 3201,   86, 3207, 3203,   86, 3208,   86, 3213,
+       86, 3214, 3212,   86, 3217,   86, 3210, 3211,   86, 3219,
+       86, 3220,   86, 3215,   86,   86,   86, 3221, 3226, 3216,
+       86, 3222, 3224,   86, 3218, 3225, 3227,   86,   86,   86,
+       86,   86,   86,   86, 3223, 3228, 3229, 3231, 3233,   86,
+       86,   86,   86,   86,   86, 3235, 3236,   86, 3239, 3230,
 
-     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,
+     3232,   86, 3234, 3240,   86,   86, 3243, 3244,   86,   86,
+       86, 3237, 3238, 3241, 3246,   86, 3245, 3247,   86,   86,
+     3242,   86,   86,   86, 3253,   86, 3248, 3249, 3250, 3251,
+     3254,   86, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3252,   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, 3255,   89,   89,   89,   89,  158,  158, 3255,
 
-       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,
+     3255, 3255,  158,  158,  160,  160, 3255, 3255,  160, 3255,
+      160,  162, 3255, 3255, 3255, 3255, 3255,  162,  165,  165,
+     3255, 3255, 3255,  165,  165,  167, 3255, 3255, 3255, 3255,
+     3255,  167,  169,  169, 3255,  169,  169,  169,  169,  172,
+     3255, 3255, 3255, 3255, 3255,  172,  175,  175, 3255, 3255,
+     3255,  175,  175,   90,   90, 3255,   90,   90,   90,   90,
+       17, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
 
-     3252, 3252, 3252, 3252, 3252
+     3255
     } ;
 
-static const flex_int16_t yy_chk[6406] =
+static const flex_int16_t yy_chk[6402] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2210,14 +2212,14 @@ 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, 3263,   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, 2660,   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,
@@ -2594,319 +2596,319 @@ static const flex_int16_t yy_chk[6406] =
      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,
+     1713, 1716, 1717, 1718, 1719, 1720, 1719, 1724, 1715, 1721,
+     1721, 1722, 1722, 1723, 1723, 1725, 1725, 1727, 1717, 1720,
+     1716, 1720, 1728, 1718, 1726, 1726, 1730, 1724, 1729, 1729,
 
-     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,
+     1730, 1731, 1732, 1734, 1735, 1732, 1736, 1731, 1727, 1734,
+     1737, 1738, 1736, 1728, 1738, 1739, 1739, 1740, 1741, 1742,
+     1742, 1743, 1735, 1741, 1744, 1745, 1745, 1746, 1747, 1744,
+        0, 1748, 1746, 1749, 1747, 1737, 1750, 1740, 1752, 1757,
+     1751, 1757, 1743, 1748, 1748, 1748, 1751, 1755, 1756, 1754,
+     1748, 1758, 1759, 1749, 1754, 1754, 1750, 1761, 1752, 1760,
+     1762, 1755, 1758, 1756, 1763, 1760, 1761, 1759, 1764, 1764,
+     1765, 1766, 1766, 1767, 1771, 1768, 1769, 1769, 1770, 1770,
+     1762, 1774, 1774, 1775, 1779, 1763, 1776, 1781, 1781, 1778,
+     1782, 1786, 1783, 1767, 1771, 1776, 1765, 1768, 1778, 1788,
 
-     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,
+     1780, 1785, 1784, 1787, 1787, 1779, 1780, 1783, 1775, 1784,
+     1785, 1782, 1789, 1791, 1792, 1793, 1794, 1786, 1791, 1800,
+     1792, 1795, 1801, 1794, 1796, 1788, 1802, 1795, 1789, 1798,
+     1796, 1797, 1797, 1799, 1798, 1793, 1804, 1803, 1802, 1800,
+     1803, 1801, 1799, 1805, 1806, 1806, 1807, 1808, 1809, 1810,
+     1813, 1811, 1807, 1808, 1804, 1811, 1814, 1815, 1816, 1816,
+     1817, 1818, 1815, 1820, 1810, 1823, 1822, 1828, 1809, 1805,
+     1813, 1811, 1822, 1821, 1823, 1826, 1818, 1821, 1814, 1817,
+     1824, 1824, 1820, 1825, 1827, 1827, 1826, 1825, 1828, 1829,
+     1830, 1826, 1831, 1832, 1833, 1834, 1835, 1831, 1839, 1836,
 
-     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,
+     1843, 1834, 1839, 1829, 1836, 1837, 1837, 1838, 1838, 1830,
+     1841, 1835, 1842, 1832, 1833, 1844, 1844, 1846, 1846, 1841,
+     1843, 1847, 1850, 1842, 1848, 1849, 1847, 1847, 1842, 1851,
+     1848, 1849, 1852, 1853, 1851, 1855, 1856, 1857, 1858, 1853,
+     1856, 1863, 1860, 1866, 1852, 1859, 1861, 1855, 1850, 1857,
+     1862, 1859, 1861, 1863, 1865, 1862, 1867, 1869, 1870, 1870,
+     1869, 1867, 1866, 1858, 1860, 1873, 1865, 1871, 1871, 1872,
+     1872, 1874, 1875, 1878, 1876, 1877,    0, 1874, 1875, 1876,
+     1883, 1877, 1878, 1880, 1882, 1873, 1886, 1882, 1880, 1884,
+     1884, 1887, 1883, 1890, 1888, 1889, 1889, 1895, 1886, 1888,
 
-     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,
+     1891, 1892, 1890, 1887, 1893, 1891, 1892, 1893, 1894, 1894,
+     1896, 1897, 1898, 1905, 1899, 1900, 1901, 1895, 1899, 1896,
+     1900, 1902, 1901, 1903, 1904, 1907, 1907, 1905, 1908, 1897,
+     1910, 1898, 1903, 1913, 1909, 1911, 1911, 1907, 1912, 1902,
+     1914, 1916, 1904, 1909, 1915, 1913, 1908, 1912, 1922, 1915,
+     1910, 1919, 1919, 1921, 1916, 1923, 1921, 1925, 1928, 1926,
+     1927, 1914, 1929, 1929, 1922, 1930, 1927, 1930, 1931, 1931,
+     1932, 1923, 1925, 1926, 1940, 1928, 1934, 1934, 1932, 1935,
+     1935, 1937, 1938, 1939, 1941, 1942, 1942, 1937, 1938, 1943,
+     1939, 1944, 1948, 1945, 1946, 1947, 1940, 1950, 1943, 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,
+     1952, 1953, 1957, 1950, 1941, 1945, 1946, 1947, 1956, 1954,
+     1955, 1955, 1944, 1960, 1949, 1963, 1950, 1963, 1948, 1964,
+     1952, 1954, 1957, 1970, 1953, 1958, 1956, 1959, 1958, 1962,
+     1965, 1966, 1959, 1960, 1962, 1965, 1968, 1964, 1966, 1971,
+     1972, 1970, 1973, 1974, 1973, 1968, 1977, 1976, 1971, 1976,
+     1978, 1978, 1972, 1979, 1980, 1981, 1982, 1981, 1983, 1980,
+     1977, 1982, 1974, 1983, 1984, 1985, 1986, 1988, 1987, 1989,
+     1991, 1995, 1986, 1987, 1992, 1993, 1993, 1989, 1996, 1979,
+     1988, 1997, 1984, 1994, 1994, 1985, 1995, 1997, 1992, 1991,
+     1998, 1999, 2000, 1999, 2003, 1998, 2001, 2008, 1996, 2002,
 
-     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,
+     2002, 2004, 2004, 2012, 2001, 2006, 2003, 2005, 2005, 2010,
+     2000, 2007, 2001, 2014, 2006, 2008, 2007, 2011, 2010, 2011,
+     2013, 2010, 2014, 2015, 2012, 2013, 2013, 2017, 2018, 2019,
+     2021, 2022, 2023, 2018, 2019, 2015, 2024, 2024, 2025, 2017,
+     2026, 2023, 2029, 2021, 2027, 2028, 2033, 2034, 2035, 2031,
+     2032, 2022, 2034, 2035, 2036, 2042, 2025, 2029, 2026, 2028,
+     2027, 2031, 2032, 2036, 2039, 2041, 2033, 2043, 2044, 2045,
+     2039, 2041, 2046, 2047, 2047, 2048, 2049, 2049, 2042, 2050,
+     2053, 2046, 2043, 2039, 2048, 2051, 2044, 2052, 2054, 2051,
+     2055, 2056, 2052, 2053, 2045, 2055, 2055, 2056, 2050, 2057,
 
-     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,
+     2058, 2059, 2060, 2058, 2065, 2057, 2063, 2063, 2068, 2059,
+     2054, 2064, 2064, 2065, 2066, 2066, 2067, 2067, 2069, 2070,
+     2068, 2075, 2060, 2071, 2078, 2070, 2064, 2075, 2071, 2072,
+     2072, 2073, 2073, 2074, 2080, 2077, 2069, 2064, 2074, 2077,
+     2082, 2079, 2083, 2084, 2078, 2079, 2085, 2083, 2086, 2087,
+     2089, 2090, 2088, 2086, 2080, 2091, 2090, 2092, 2092, 2093,
+     2094, 2085, 2096, 2093, 2095, 2082, 2084, 2087, 2088, 2095,
+     2089, 2097, 2098, 2099, 2100, 2094, 2102, 2091, 2101, 2100,
+     2103, 2103, 2105, 2106, 2098, 2107, 2108, 2109, 2096, 2097,
+     2105, 2101, 2099, 2110, 2102, 2111, 2112, 2113, 2115, 2118,
 
-     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,
+     2122, 2117, 2106, 2122, 2107, 2118, 2120, 2120, 2112, 2108,
+     2123, 2109, 2110, 2115, 2117, 2119, 2111, 2119, 2113, 2121,
+     2124, 2129, 2125, 2123, 2121, 2126, 2126, 2127, 2127, 2128,
+     2128, 2130, 2131, 2131, 2124, 2125, 2129, 2132, 2133, 2133,
+     2134, 2134, 2135, 2137, 2130, 2138, 2132, 2135, 2137, 2132,
+     2139, 2140, 2141, 2141, 2142, 2142, 2143, 2144, 2144, 2145,
+     2146, 2146, 2148, 2140, 2147, 2138, 2151, 2148, 2149, 2149,
+     2139, 2150, 2150, 2152, 2153, 2143, 2154, 2145, 2156, 2147,
+     2151, 2158, 2152, 2156, 2157, 2157, 2159, 2159, 2153, 2160,
+     2161, 2162, 2163, 2163, 2162, 2154, 2161, 2164, 2164, 2165,
 
-     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,
+     2158, 2166, 2167, 2168, 2168, 2170, 2171, 2160, 2163, 2172,
+     2173, 2174, 2174, 2175, 2173, 2176, 2166, 2183, 2165, 2177,
+     2176, 2167, 2178, 2181, 2172, 2170, 2180, 2180, 2182, 2171,
+     2184, 2183, 2175, 2185, 2177, 2182, 2186, 2178, 2187, 2187,
+     2188, 2192, 2189, 2181, 2189, 2195, 2199, 2190, 2184, 2188,
+     2190, 2185, 2193, 2192, 2194, 2196, 2197, 2193, 2198, 2194,
+     2203, 2201, 2186, 2198, 2202, 2190, 2201, 2190, 2196, 2202,
+     2195, 2205, 2199, 2204, 2206, 2203, 2207, 2197, 2208, 2204,
+     2206, 2207, 2209, 2208, 2210, 2211, 2212, 2213, 2211, 2214,
+     2215, 2216, 2205, 2221, 2217, 2212, 2213, 2210, 2214, 2215,
 
-     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,
+     2217, 2228, 2218, 2223, 2227, 2216, 2219, 2209, 2218, 2227,
+     2219, 2225, 2223, 2221, 2224, 2224, 2230, 2225, 2226, 2226,
+     2231, 2228, 2233, 2228, 2232, 2232, 2234, 2226, 2236, 2237,
+     2239, 2238, 2230, 2243, 2242, 2234, 2231, 2233, 2241, 2242,
+     2236, 2241, 2239, 2244,    0, 2237, 2238, 2245, 2245, 2246,
+     2246, 2248, 2248, 2243, 2249, 2244, 2250, 2249, 2251, 2252,
+     2253, 2250, 2254, 2254, 2251, 2252, 2255, 2256, 2256, 2253,
+     2257, 2258, 2259, 2260, 2260, 2261, 2262, 2271, 2263,    0,
+     2255, 2261, 2257, 2263, 2265, 2258, 2266, 2269, 2265, 2266,
+     2262, 2259, 2267, 2267, 2268, 2270, 2269, 2271, 2272, 2268,
 
-     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,
+     2273, 2273, 2272, 2274, 2270, 2276, 2277, 2278, 2279, 2280,
+     2276, 2281, 2282, 2280, 2283, 2284, 2274, 2282, 2285, 2286,
+     2283, 2284, 2279, 2287, 2288, 2290, 2277, 2278, 2287, 2292,
+     2291, 2281, 2294, 2293, 2292, 2298, 2285, 2290, 2286, 2293,
+     2294, 2295, 2301, 2295, 2307, 2288, 2291, 2299, 2299, 2298,
+     2300, 2302, 2302, 2300, 2305, 2306, 2307, 2309, 2305, 2308,
+     2308, 2306, 2312, 2312, 2314, 2316, 2309, 2317, 2301, 2320,
+     2321, 2322, 2323, 2330, 2320, 2331, 2322, 2323,    0, 2316,
+     2324, 2324, 2314, 2317, 2326, 2326, 2328, 2329, 2329, 2330,
+     2332, 2334, 2328, 2335, 2338, 2332, 2321, 2331, 2336, 2336,
 
-     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,
+     2339, 2340, 2341, 2338, 2345, 2335, 2339, 2343, 2343, 2344,
+     2334, 2346, 2344, 2348, 2348, 2349, 2349, 2341, 2351, 2340,
+     2350, 2352, 2353, 2345, 2354, 2350, 2354, 2353, 2355, 2346,
+     2352, 2356, 2357, 2358, 2359, 2360, 2351, 2482, 2358, 2366,
+     2360, 2482, 2355, 2365, 2357, 2356, 2361, 2361, 2362, 2362,
+     2363, 2363, 2364, 2364, 2359, 2365, 2367, 2366, 2368, 2368,
+     2370, 2367, 2369, 2369, 2371, 2372, 2373, 2374, 2374, 2375,
+     2376, 2376, 2370, 2377, 2377, 2378, 2371, 2379, 2381, 2382,
+     2380, 2384, 2373, 2385, 2388, 2372, 2378, 2380, 2375, 2379,
+     2381, 2383, 2386, 2386, 2389, 2387, 2383, 2391, 2390, 2382,
 
-     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,
+     2393, 2384, 2392, 2385, 2387, 2394, 2394, 2396, 2395, 2397,
+     2388, 2390, 2393, 2399, 2389, 2400, 2392, 2395, 2401, 2403,
+     2402, 2391, 2396, 2402, 2397, 2404,    0, 2405, 2406, 2406,
+     2404, 2399, 2405, 2403, 2407, 2407, 2413, 2400, 2408, 2408,
+     2414, 2401, 2410, 2410, 2412, 2412, 2415, 2416, 2418, 2419,
+     2420, 2414, 2422, 2421, 2413, 2423, 2424, 2425, 2424,    0,
+     2426, 2422, 2416, 2427, 2432, 2415, 2438, 2419, 2418, 2428,
+     2428, 2431, 2420, 2421, 2433, 2423, 2439, 2425, 2426, 2430,
+     2430, 2427, 2436, 2433, 2438, 2431, 2432, 2434, 2434, 2437,
+     2437, 2436, 2440, 2441, 2439, 2442, 2443, 2448, 2445, 2440,
 
-     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,
+     2444, 2446, 2446, 2447, 2447, 2449, 2450, 2450, 2441, 2451,
+     2451, 2449, 2452, 2442, 2443, 2448, 2444, 2445, 2452, 2453,
+     2454, 2455, 2456, 2457, 2458, 2459, 2460, 2456, 2460, 2465,
+     2459, 2461, 2461, 2467, 2462, 2454, 2462, 2453, 2463, 2463,
+     2455, 2468, 2467, 2457, 2458, 2469, 2470, 2471, 2465, 2472,
+     2479, 2473, 2471, 2476, 2480, 2477, 2484, 2469, 2477, 2490,
+     2468, 2478, 2478, 2481, 2481, 2479, 2470, 2486, 2486, 2472,
+     2473, 2484, 2480, 2476, 2485, 2487, 2489, 2491, 2485, 2490,
+     2492, 2492, 2494, 2495, 2498, 2496, 2497, 2497, 2487, 2496,
+     2501, 2489, 2495, 2500, 2494, 2499, 2499, 2491, 2500, 2501,
 
-     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, 2503, 2510, 2498, 2504, 2504, 2509, 2509, 2511, 2511,
+     2512, 2514, 2513, 2503, 2516, 2516, 2502, 2515, 2517, 2527,
+     2514, 2519, 2519, 2512, 2510, 2513, 2515, 2522, 2524, 2523,
+     2525, 2526, 2522, 2517, 2523, 2525, 2528, 2531, 2527, 2526,
+     2529, 2532, 2524, 2534, 2533, 2528, 2532,    0, 2529, 2533,
+     2535, 2535, 2531, 2536, 2536, 2537, 2537, 2538, 2534, 2540,
+     2539, 2541, 2542, 2545, 2538, 2539, 2543, 2546, 2542, 2544,
+     2544, 2543, 2546, 2547, 2547, 2548, 2548, 2540, 2545, 2541,
+     2551, 2552, 2552, 2553, 2554, 2557, 2553, 2555, 2558, 2554,
+     2554, 2556, 2555, 2551, 2558, 2560, 2556, 2559, 2561, 2557,
 
-     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,
+     2560, 2559, 2562, 2563, 2564, 2567, 2565, 2561, 2566, 2568,
+     2567, 2563, 2565, 2570, 2566, 2574, 2572, 2562, 2571, 2572,
+     2570, 2568, 2578, 2571, 2576, 2564, 2577, 2574, 2579, 2576,
+     2580, 2577, 2586, 2581, 2582, 2582, 2583, 2587, 2586, 2580,
+     2578, 2579, 2581, 2587, 2590, 2583, 2591, 2595, 2592, 2593,
+     2593, 2594, 2598, 2596, 2597, 2597, 2595, 2600, 2602, 2605,
+     2603, 2604, 2604, 2590, 2603,    0, 2591, 2592, 2596, 2606,
+     2594, 2598, 2600, 2607, 2608, 2606, 2609, 2609, 2602, 2607,
+     2608, 2610, 2611, 2613, 2605, 2614, 2616, 2611, 2617, 2610,
+     2616, 2618, 2613, 2620, 2620, 2621, 2622, 2622, 2614, 2623,
 
-     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,
+     2623, 2626, 2617, 2625, 2625, 2626, 2618, 2627, 2629, 2629,
+     2631, 2632, 2627, 2621, 2633, 2634, 2632, 2636, 2637, 2637,
+     2634, 2634, 2639, 2639, 2640, 2640, 2633, 2642, 2641, 2644,
+     2631, 2641, 2646, 2647, 2647, 2648, 2648, 2636, 2649, 2649,
+     2642, 2650, 2651, 2651, 2652, 2653, 2654, 2644, 2655, 2656,
+     2656, 2657, 2646, 2661, 2655, 2657, 2650, 2652, 2661, 2661,
+     2654, 2662, 2663, 2653, 2665, 2664, 2666, 2667, 2677, 2668,
+     2665, 2672, 2666, 2668, 2669, 2669, 2672, 2675, 2674, 2680,
+     2675, 2684, 2663, 2682, 2662, 2664, 2674, 2678, 2679, 2679,
+     2678, 2683, 2667, 2677, 2681, 2684, 2680, 2680, 2686, 2681,
 
-     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,
+     2688, 2682, 2685, 2685, 2687, 2689, 2693, 2687, 2690, 2694,
+     2694, 2683, 2686, 2691, 2688, 2687, 2690, 2692, 2691, 2691,
+     2695, 2695, 2692, 2692, 2689, 2693, 2696, 2696, 2697, 2697,
+     2698, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2700, 2706,
+     2705,    0, 2704, 2707, 2709, 2709, 2711, 2710, 2699, 2705,
+     2710, 2713, 2713, 2714, 2701, 2703, 2715, 2715, 2723, 2706,
+     2714, 2702, 2716, 2707, 2711, 2718, 2718, 2716, 2719, 2720,
+     2721, 2724, 2724, 2726, 2727, 2729, 2723, 2719, 2720, 2721,
+     2725, 2728, 2726, 2730, 2725, 2740, 2728, 2728, 2729, 2727,
+     2731, 2735, 2730, 2739, 2731, 2741, 2735, 2736, 2736, 2738,
 
-     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,
+     2738, 2747, 2743, 2744, 2749, 2748, 2750, 2739, 2752, 2754,
+     2740, 2743, 2750, 2741, 2748, 2744, 2756, 2757, 2758, 2758,
+     2752, 2756, 2757, 2759, 2749, 2768, 2747, 2769, 2761, 3086,
+     2754, 3086, 2759, 2761, 2762, 2762, 2764, 2764, 2762, 2765,
+     2765, 2766, 2766, 2767, 2770, 2768, 2769, 2772, 2776, 2770,
+     2773, 2774, 2767, 2772, 2778, 2773, 2774, 2775, 2775, 2777,
+     2779, 2780, 2781, 2782, 2789, 2779, 2776, 2793, 2781, 2783,
+     2783, 2777, 2785, 2786, 2790, 2778, 2785, 2787, 2786, 2780,
+     2788, 2788, 2787, 2789, 2791, 2795, 2795, 2793, 2782, 2790,
+     2797, 2798, 2799, 2800, 2801, 2802, 2799, 2803, 2805, 2791,
 
-     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,
+     2806, 2804, 2800, 2797, 2798, 2803, 2804, 2805, 2807, 2809,
+     2801, 2808, 2808, 2818, 2802, 2811, 2811, 2814, 2806, 2812,
+     2812, 2816, 2816, 2819, 2820, 2821, 2823, 2823, 2809, 2818,
+     2821, 2824, 2825, 2826, 2807, 2828, 2828, 2834, 2814, 2819,
+     2820, 2830, 2829, 2831, 2831, 2836, 2837, 2835, 2838, 2838,
+     2836, 2824, 2826, 2835, 2840, 2825, 2829, 2834, 2839, 2839,
+     2830, 2841, 2841, 2843, 2842, 2844, 2847, 2845, 2837, 2846,
+     2848, 2856, 2843, 2845, 2840, 2842, 2849, 2849, 2847, 2850,
+     2855, 2841, 2850, 2851, 2851, 2844, 2859, 2857, 2846, 2859,
+     2848, 2856, 2855, 2857, 2858, 2858, 2860, 2861, 2863, 2864,
 
-     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,
+     2864, 2865, 2860, 2863, 2866, 2867, 2865, 2868, 2869, 2869,
+     2871, 2867, 2872, 2873, 2874, 2861, 2875, 2875, 2876, 2877,
+     2878, 2882, 2871, 2866, 2868, 2868, 2882, 2874, 2883, 2878,
+     2872, 2880, 2880, 2881, 2881, 2877, 2884, 2876, 2873, 2885,
+     2885, 2884, 2883, 2886, 2886, 2887, 2887, 2888, 2889, 2895,
+     2890, 2892, 2892, 2897, 2889, 2890, 2898, 2899, 2900, 2900,
+     2902, 2902, 2903, 2904, 2910, 2905, 2906, 2906, 2895, 2907,
+     2907, 2909, 2911, 2888, 2905, 2897, 2903, 2909, 2898, 2899,
+     2912, 2915, 2915, 2904, 2910, 2912, 2917, 2917, 2918, 2919,
+     2920, 2911, 2921, 2918, 2922, 2924, 2920, 2923, 2923, 2926,
 
-     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,
+     2924, 2927, 2922, 2919, 2921, 2928, 2929, 2930, 2932, 2933,
+     2928, 2934, 2935, 2930, 2938, 2937, 2932, 2939, 2929, 2926,
+     2940, 2927, 2941, 2944, 2943, 2948,    0, 2941, 2933, 2943,
+     2938, 2934, 2935, 2937, 2939, 2939, 2945, 2949, 2950, 2946,
+     2949, 2940, 2945, 2944, 2946, 2948, 2953, 2953, 2954, 2954,
+     2955, 2950, 2959, 2960, 2955, 2961, 2961, 2959, 2963, 2963,
+     2964, 2964, 2967, 2964, 2965, 2965, 2967, 2965, 2966, 2966,
+     2970, 2966, 2960, 2969, 2969, 2971, 2974, 2975, 2976, 2977,
+     2977, 2980, 2982, 2976, 2981, 2983, 2982, 2984, 2970, 2971,
+     2986, 2981, 2987,    0, 2983, 2996, 2974, 2975, 2988, 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,
+     2991, 2987, 2984, 2989, 2989, 2993, 2980, 2992, 2986, 2990,
+     2990, 2997, 2992, 2994, 2993, 2991, 2995, 2993, 2994, 2994,
+     2996, 2998, 2995, 2999, 3000, 3001, 2997, 3003, 2999, 3000,
+     3002, 3002, 3004, 3003, 3005, 3005, 3006, 3006, 3004, 3007,
+     3008, 3013, 2998,    0, 3001, 3008, 3011, 3011, 3012, 3012,
+     3013, 3016, 3016, 3028, 3007, 3017, 3017, 3018, 3018, 3019,
+     3019, 3020, 3020, 3021, 3021, 3022, 3022, 3024, 3025, 3025,
+     3026, 3027, 3030, 3028, 3031, 3031, 3024, 3032, 3034, 3026,
+     3033, 3035, 3035, 3027, 3036, 3037, 3037, 3040, 3042, 3044,
+     3034, 3030, 3032, 3033, 3041, 3043, 3043, 3041, 3046, 3036,
 
-     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,
+     3047, 3046, 3048, 3049, 3050, 3040, 3047, 3044, 3049, 3051,
+     3052, 3054, 3055, 3059, 3042, 3058, 3048, 3054, 3062, 3058,
+     3072, 3055, 3070, 3050, 3077, 3070, 3052, 3051, 3059, 3073,
+     3073, 3074, 3074, 3072, 3075, 3075, 3078, 3079, 3080, 3081,
+     3083, 3079, 3087, 3084, 3062, 3078, 3085, 3077, 3088, 3088,
+     3090, 3085, 3089, 3081, 3084, 3091, 3092, 3087, 3080, 3093,
+     3094, 3095, 3096, 3083, 3098, 3089, 3097, 3100, 3106, 3090,
+     3095, 3097, 3092, 3091, 3096, 3094, 3099, 3101, 3105, 3107,
+     3107, 3099, 3101, 3113, 3093, 3098, 3108, 3100, 3106, 3109,
+     3109, 3114, 3105, 3110, 3110, 3108, 3111, 3111, 3112, 3112,
 
-     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, 3116, 3113, 3115, 3117, 3118, 3116, 3119, 3120, 3117,
+     3121, 3114, 3123, 3122, 3120, 3124, 3124, 3123, 3125, 3126,
+     3126, 3128, 3119, 3129, 3121, 3122, 3127, 3127, 3130, 3130,
+     3118, 3132, 3134, 3137, 3137, 3139, 3128, 3140, 3125, 3138,
+     3138, 3141, 3129, 3139, 3143, 3142, 3132, 3141, 3144, 3145,
+     3134, 3142, 3146, 3147, 3147, 3152, 3140, 3146, 3143, 3149,
+     3149, 3144, 3153, 3155, 3158, 3156, 3159, 3160, 3145, 3156,
+     3161, 3159, 3162, 3163, 3164, 3165, 3152, 3155, 3169, 3164,
+     3165, 3170, 3153, 3161, 3158, 3162, 3160, 3166, 3166, 3171,
+     3172, 3172, 3163, 3175, 3175, 3173, 3174, 3179, 3169, 3170,
 
-     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,
+     3173, 3176, 3174, 3187, 3177, 3178, 3176, 3180, 3171, 3177,
+     3178, 3182, 3182, 3180, 3183, 3189, 3179, 3184, 3184, 3183,
+     3186, 3188, 3187, 3190, 3186, 3191, 3192, 3193, 3188, 3195,
+     3195, 3191, 3197, 3197, 3189, 3198, 3199, 3200, 3201, 3202,
+     3193, 3199, 3190, 3207, 3198, 3192, 3204, 3198, 3203, 3203,
+     3205, 3204, 3202, 3208, 3208, 3209, 3200, 3201, 3210, 3210,
+     3211, 3211, 3212, 3205, 3213, 3214, 3217, 3212, 3217, 3207,
+     3216, 3213, 3215, 3215, 3209, 3216, 3218, 3218, 3219, 3220,
+     3221, 3223, 3222, 3226, 3214, 3219, 3220, 3222, 3225, 3225,
+     3228, 3229, 3230, 3231, 3235, 3228, 3229, 3232, 3232, 3221,
 
-        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,
+     3223, 3236, 3226, 3234, 3234, 3237, 3237, 3238, 3238, 3239,
+     3249, 3230, 3231, 3235, 3241, 3241, 3239, 3242, 3242, 3243,
+     3236, 3250, 3245, 3248, 3251, 3251, 3243, 3245, 3248, 3249,
+     3252, 3252,    0,    0,    0,    0,    0,    0,    0,    0,
+     3250, 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, 3260,
+     3260, 3260, 3260, 3260, 3260, 3260, 3261, 3261, 3261, 3261,
+     3261, 3261, 3261, 3262, 3262, 3262, 3262, 3262, 3262, 3262,
+     3264, 3264,    0, 3264, 3264, 3264, 3264, 3265, 3265,    0,
 
-     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,
+        0,    0, 3265, 3265, 3266, 3266,    0,    0, 3266,    0,
+     3266, 3267,    0,    0,    0,    0,    0, 3267, 3268, 3268,
+        0,    0,    0, 3268, 3268, 3269,    0,    0,    0,    0,
+        0, 3269, 3270, 3270,    0, 3270, 3270, 3270, 3270, 3271,
+        0,    0,    0,    0,    0, 3271, 3272, 3272,    0,    0,
+        0, 3272, 3272, 3273, 3273,    0, 3273, 3273, 3273, 3273,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
+     3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255, 3255,
 
-     3252, 3252, 3252, 3252, 3252
+     3255
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3112,7 +3114,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3114 "<stdout>"
+#line 3116 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3121,10 +3123,10 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3123 "<stdout>"
-
 #line 3125 "<stdout>"
 
+#line 3127 "<stdout>"
+
 #define INITIAL 0
 #define quotedstring 1
 #define singlequotedstr 2
@@ -3347,7 +3349,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3349 "<stdout>"
+#line 3351 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3380,13 +3382,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 >= 3256 )
 					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] != 6361 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -4942,12 +4944,12 @@ YY_RULE_SETUP
 case 304:
 YY_RULE_SETUP
 #line 529 "./util/configlexer.lex"
-{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+{ YDVAR(2, VAR_EDNS_CLIENT_STRING) }
 	YY_BREAK
 case 305:
 YY_RULE_SETUP
 #line 530 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) }
 	YY_BREAK
 case 306:
 /* rule 306 can match eol */
@@ -5218,7 +5220,7 @@ YY_RULE_SETUP
 #line 662 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5220 "<stdout>"
+#line 5222 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5513,7 +5515,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 >= 3256 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5541,11 +5543,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 >= 3256 )
 			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 == 3255);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
diff --git a/util/configlexer.lex b/util/configlexer.lex
index ea7c1cf72..a825d8156 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -526,8 +526,8 @@ 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) }
-edns-client-tag-opcode{COLON}	{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+edns-client-string{COLON}	{ YDVAR(2, VAR_EDNS_CLIENT_STRING) }
+edns-client-string-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_STRING_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 ba5054eb4..adb3e53be 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -438,8 +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_OPCODE = 554
+    VAR_EDNS_CLIENT_STRING = 553,
+    VAR_EDNS_CLIENT_STRING_OPCODE = 554
   };
 #endif
 /* Tokens.  */
@@ -738,8 +738,8 @@ extern int yydebug;
 #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_EDNS_CLIENT_STRING 553
+#define VAR_EDNS_CLIENT_STRING_OPCODE 554
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -1154,69 +1154,69 @@ static const yytype_int16 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   184,   184,   184,   185,   185,   186,   186,   187,   187,
-     187,   188,   188,   189,   189,   190,   190,   191,   193,   199,
-     204,   205,   206,   206,   206,   207,   207,   208,   208,   208,
-     209,   209,   210,   210,   210,   211,   211,   212,   212,   212,
-     213,   213,   213,   214,   214,   215,   215,   216,   216,   217,
-     217,   218,   218,   219,   219,   220,   220,   221,   221,   222,
-     222,   222,   223,   223,   223,   224,   224,   224,   225,   225,
-     226,   226,   227,   227,   228,   228,   229,   229,   229,   230,
-     230,   231,   231,   232,   232,   232,   233,   233,   234,   234,
-     235,   235,   236,   236,   236,   237,   237,   238,   238,   239,
-     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,   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
+       0,   185,   185,   185,   186,   186,   187,   187,   188,   188,
+     188,   189,   189,   190,   190,   191,   191,   192,   194,   200,
+     205,   206,   207,   207,   207,   208,   208,   209,   209,   209,
+     210,   210,   211,   211,   211,   212,   212,   213,   213,   213,
+     214,   214,   214,   215,   215,   216,   216,   217,   217,   218,
+     218,   219,   219,   220,   220,   221,   221,   222,   222,   223,
+     223,   223,   224,   224,   224,   225,   225,   225,   226,   226,
+     227,   227,   228,   228,   229,   229,   230,   230,   230,   231,
+     231,   232,   232,   233,   233,   233,   234,   234,   235,   235,
+     236,   236,   237,   237,   237,   238,   238,   239,   239,   240,
+     240,   241,   241,   242,   242,   243,   243,   243,   244,   244,
+     245,   245,   245,   246,   246,   246,   247,   247,   247,   248,
+     248,   248,   248,   249,   250,   250,   250,   251,   251,   251,
+     252,   252,   253,   254,   254,   254,   255,   255,   256,   256,
+     257,   257,   257,   258,   258,   259,   259,   259,   260,   261,
+     261,   262,   262,   263,   264,   264,   265,   265,   266,   266,
+     267,   268,   268,   269,   269,   270,   270,   271,   271,   272,
+     272,   273,   273,   273,   274,   274,   275,   275,   276,   276,
+     277,   277,   278,   278,   279,   279,   280,   280,   280,   281,
+     281,   281,   282,   282,   282,   283,   283,   284,   285,   285,
+     286,   286,   287,   287,   288,   288,   289,   289,   289,   290,
+     290,   290,   291,   291,   291,   292,   292,   293,   293,   294,
+     294,   295,   295,   296,   298,   310,   311,   312,   312,   312,
+     312,   312,   313,   313,   315,   327,   328,   329,   329,   329,
+     329,   330,   330,   332,   346,   347,   348,   348,   348,   348,
+     349,   349,   349,   351,   368,   369,   370,   370,   370,   370,
+     371,   371,   371,   372,   375,   394,   411,   419,   429,   437,
+     454,   455,   456,   456,   456,   456,   456,   457,   457,   457,
+     458,   458,   460,   469,   478,   489,   498,   507,   516,   527,
+     536,   548,   562,   577,   588,   605,   622,   639,   656,   671,
+     686,   699,   714,   723,   732,   741,   750,   759,   768,   777,
+     786,   795,   804,   813,   822,   831,   840,   853,   862,   875,
+     884,   893,   902,   909,   916,   925,   932,   941,   949,   956,
+     963,   971,   980,   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,  2478,  2489,
+    2499,  2506,  2513,  2522,  2531,  2541,  2551,  2561,  2568,  2575,
+    2584,  2593,  2603,  2613,  2620,  2627,  2634,  2642,  2652,  2662,
+    2672,  2682,  2721,  2731,  2739,  2747,  2762,  2771,  2776,  2777,
+    2778,  2778,  2778,  2779,  2779,  2779,  2780,  2780,  2782,  2792,
+    2801,  2808,  2815,  2822,  2829,  2836,  2843,  2848,  2849,  2850,
+    2850,  2850,  2851,  2851,  2851,  2852,  2853,  2853,  2854,  2854,
+    2855,  2855,  2856,  2857,  2858,  2859,  2860,  2861,  2863,  2872,
+    2882,  2889,  2896,  2905,  2912,  2919,  2926,  2933,  2942,  2951,
+    2958,  2965,  2975,  2985,  2995,  3005,  3015,  3025,  3030,  3031,
+    3032,  3034,  3040,  3045,  3046,  3047,  3049,  3055,  3065,  3072,
+    3081,  3089,  3094,  3095,  3097,  3097,  3097,  3098,  3098,  3099,
+    3100,  3101,  3102,  3103,  3105,  3115,  3124,  3131,  3140,  3147,
+    3156,  3164,  3177,  3185,  3198,  3203,  3204,  3205,  3205,  3206,
+    3206,  3206,  3207,  3209,  3221,  3233,  3245,  3260,  3273,  3286,
+    3297,  3302,  3303,  3304,  3304,  3306,  3321
 };
 #endif
 
@@ -1335,15 +1335,15 @@ 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",
-  "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",
+  "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_STRING",
+  "VAR_EDNS_CLIENT_STRING_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",
@@ -1428,24 +1428,25 @@ 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",
-  "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",
-  "contents_rc", "content_rc", "rc_control_enable", "rc_control_port",
-  "rc_control_interface", "rc_control_use_cert", "rc_server_key_file",
-  "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file",
-  "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable",
-  "dt_dnstap_bidirectional", "dt_dnstap_socket_path", "dt_dnstap_ip",
-  "dt_dnstap_tls", "dt_dnstap_tls_server_name",
-  "dt_dnstap_tls_cert_bundle", "dt_dnstap_tls_client_key_file",
-  "dt_dnstap_tls_client_cert_file", "dt_dnstap_send_identity",
-  "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version",
+  "server_ipsecmod_strict", "server_edns_client_string",
+  "server_edns_client_string_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", "contents_rc", "content_rc",
+  "rc_control_enable", "rc_control_port", "rc_control_interface",
+  "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file",
+  "rc_control_key_file", "rc_control_cert_file", "dtstart", "contents_dt",
+  "content_dt", "dt_dnstap_enable", "dt_dnstap_bidirectional",
+  "dt_dnstap_socket_path", "dt_dnstap_ip", "dt_dnstap_tls",
+  "dt_dnstap_tls_server_name", "dt_dnstap_tls_cert_bundle",
+  "dt_dnstap_tls_client_key_file", "dt_dnstap_tls_client_cert_file",
+  "dt_dnstap_send_identity", "dt_dnstap_send_version",
+  "dt_dnstap_identity", "dt_dnstap_version",
   "dt_dnstap_log_resolver_query_messages",
   "dt_dnstap_log_resolver_response_messages",
   "dt_dnstap_log_client_query_messages",
@@ -2859,23 +2860,23 @@ yyreduce:
   switch (yyn)
     {
   case 18:
-#line 194 "./util/configparser.y"
+#line 195 "./util/configparser.y"
         {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2867 "util/configparser.c"
+#line 2868 "util/configparser.c"
     break;
 
   case 19:
-#line 200 "./util/configparser.y"
+#line 201 "./util/configparser.y"
         { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2875 "util/configparser.c"
+#line 2876 "util/configparser.c"
     break;
 
   case 224:
-#line 298 "./util/configparser.y"
+#line 299 "./util/configparser.y"
         {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2886,11 +2887,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2890 "util/configparser.c"
+#line 2891 "util/configparser.c"
     break;
 
   case 234:
-#line 315 "./util/configparser.y"
+#line 316 "./util/configparser.y"
         {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2901,11 +2902,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2905 "util/configparser.c"
+#line 2906 "util/configparser.c"
     break;
 
   case 243:
-#line 332 "./util/configparser.y"
+#line 333 "./util/configparser.y"
         {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
@@ -2918,11 +2919,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2922 "util/configparser.c"
+#line 2923 "util/configparser.c"
     break;
 
   case 253:
-#line 351 "./util/configparser.y"
+#line 352 "./util/configparser.y"
         {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
@@ -2938,11 +2939,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2942 "util/configparser.c"
+#line 2943 "util/configparser.c"
     break;
 
   case 264:
-#line 375 "./util/configparser.y"
+#line 376 "./util/configparser.y"
         {
 		uint8_t* bitlist;
 		size_t len = 0;
@@ -2959,11 +2960,11 @@ yyreduce:
 
 		}
 	}
-#line 2963 "util/configparser.c"
+#line 2964 "util/configparser.c"
     break;
 
   case 265:
-#line 394 "./util/configparser.y"
+#line 395 "./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 &&
@@ -2978,21 +2979,21 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2982 "util/configparser.c"
+#line 2983 "util/configparser.c"
     break;
 
   case 266:
-#line 411 "./util/configparser.y"
+#line 412 "./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 2993 "util/configparser.c"
     break;
 
   case 267:
-#line 419 "./util/configparser.y"
+#line 420 "./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)
@@ -3000,21 +3001,21 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3004 "util/configparser.c"
+#line 3005 "util/configparser.c"
     break;
 
   case 268:
-#line 429 "./util/configparser.y"
+#line 430 "./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 3015 "util/configparser.c"
     break;
 
   case 269:
-#line 437 "./util/configparser.y"
+#line 438 "./util/configparser.y"
         {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
@@ -3030,11 +3031,11 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3034 "util/configparser.c"
+#line 3035 "util/configparser.c"
     break;
 
   case 282:
-#line 460 "./util/configparser.y"
+#line 461 "./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)
@@ -3042,11 +3043,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3046 "util/configparser.c"
+#line 3047 "util/configparser.c"
     break;
 
   case 283:
-#line 469 "./util/configparser.y"
+#line 470 "./util/configparser.y"
         { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3054,11 +3055,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3058 "util/configparser.c"
+#line 3059 "util/configparser.c"
     break;
 
   case 284:
-#line 478 "./util/configparser.y"
+#line 479 "./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)
@@ -3068,11 +3069,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3072 "util/configparser.c"
+#line 3073 "util/configparser.c"
     break;
 
   case 285:
-#line 489 "./util/configparser.y"
+#line 490 "./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)
@@ -3080,11 +3081,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3084 "util/configparser.c"
+#line 3085 "util/configparser.c"
     break;
 
   case 286:
-#line 498 "./util/configparser.y"
+#line 499 "./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)
@@ -3092,11 +3093,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3096 "util/configparser.c"
+#line 3097 "util/configparser.c"
     break;
 
   case 287:
-#line 507 "./util/configparser.y"
+#line 508 "./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)
@@ -3104,11 +3105,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3108 "util/configparser.c"
+#line 3109 "util/configparser.c"
     break;
 
   case 288:
-#line 516 "./util/configparser.y"
+#line 517 "./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)
@@ -3118,11 +3119,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3122 "util/configparser.c"
+#line 3123 "util/configparser.c"
     break;
 
   case 289:
-#line 527 "./util/configparser.y"
+#line 528 "./util/configparser.y"
         {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3130,11 +3131,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3134 "util/configparser.c"
+#line 3135 "util/configparser.c"
     break;
 
   case 290:
-#line 536 "./util/configparser.y"
+#line 537 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -3145,11 +3146,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3149 "util/configparser.c"
+#line 3150 "util/configparser.c"
     break;
 
   case 291:
-#line 548 "./util/configparser.y"
+#line 549 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -3161,11 +3162,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3165 "util/configparser.c"
+#line 3166 "util/configparser.c"
     break;
 
   case 292:
-#line 562 "./util/configparser.y"
+#line 563 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -3179,11 +3180,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3183 "util/configparser.c"
+#line 3184 "util/configparser.c"
     break;
 
   case 293:
-#line 577 "./util/configparser.y"
+#line 578 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -3193,11 +3194,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3197 "util/configparser.c"
+#line 3198 "util/configparser.c"
     break;
 
   case 294:
-#line 588 "./util/configparser.y"
+#line 589 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3213,11 +3214,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3217 "util/configparser.c"
+#line 3218 "util/configparser.c"
     break;
 
   case 295:
-#line 605 "./util/configparser.y"
+#line 606 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3233,11 +3234,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3237 "util/configparser.c"
+#line 3238 "util/configparser.c"
     break;
 
   case 296:
-#line 622 "./util/configparser.y"
+#line 623 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3253,11 +3254,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3257 "util/configparser.c"
+#line 3258 "util/configparser.c"
     break;
 
   case 297:
-#line 639 "./util/configparser.y"
+#line 640 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3273,11 +3274,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3277 "util/configparser.c"
+#line 3278 "util/configparser.c"
     break;
 
   case 298:
-#line 656 "./util/configparser.y"
+#line 657 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3291,11 +3292,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3295 "util/configparser.c"
+#line 3296 "util/configparser.c"
     break;
 
   case 299:
-#line 671 "./util/configparser.y"
+#line 672 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3309,11 +3310,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3313 "util/configparser.c"
+#line 3314 "util/configparser.c"
     break;
 
   case 300:
-#line 686 "./util/configparser.y"
+#line 687 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -3325,11 +3326,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3329 "util/configparser.c"
+#line 3330 "util/configparser.c"
     break;
 
   case 301:
-#line 699 "./util/configparser.y"
+#line 700 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -3343,11 +3344,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3347 "util/configparser.c"
+#line 3348 "util/configparser.c"
     break;
 
   case 302:
-#line 714 "./util/configparser.y"
+#line 715 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3355,11 +3356,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3359 "util/configparser.c"
+#line 3360 "util/configparser.c"
     break;
 
   case 303:
-#line 723 "./util/configparser.y"
+#line 724 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
@@ -3367,11 +3368,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3371 "util/configparser.c"
+#line 3372 "util/configparser.c"
     break;
 
   case 304:
-#line 732 "./util/configparser.y"
+#line 733 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
@@ -3379,11 +3380,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3383 "util/configparser.c"
+#line 3384 "util/configparser.c"
     break;
 
   case 305:
-#line 741 "./util/configparser.y"
+#line 742 "./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)
@@ -3391,11 +3392,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3395 "util/configparser.c"
+#line 3396 "util/configparser.c"
     break;
 
   case 306:
-#line 750 "./util/configparser.y"
+#line 751 "./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)
@@ -3403,11 +3404,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3407 "util/configparser.c"
+#line 3408 "util/configparser.c"
     break;
 
   case 307:
-#line 759 "./util/configparser.y"
+#line 760 "./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)
@@ -3415,11 +3416,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3419 "util/configparser.c"
+#line 3420 "util/configparser.c"
     break;
 
   case 308:
-#line 768 "./util/configparser.y"
+#line 769 "./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)
@@ -3427,11 +3428,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3431 "util/configparser.c"
+#line 3432 "util/configparser.c"
     break;
 
   case 309:
-#line 777 "./util/configparser.y"
+#line 778 "./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)
@@ -3439,11 +3440,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3443 "util/configparser.c"
+#line 3444 "util/configparser.c"
     break;
 
   case 310:
-#line 786 "./util/configparser.y"
+#line 787 "./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)
@@ -3451,11 +3452,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3455 "util/configparser.c"
+#line 3456 "util/configparser.c"
     break;
 
   case 311:
-#line 795 "./util/configparser.y"
+#line 796 "./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)
@@ -3463,11 +3464,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3467 "util/configparser.c"
+#line 3468 "util/configparser.c"
     break;
 
   case 312:
-#line 804 "./util/configparser.y"
+#line 805 "./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)
@@ -3475,11 +3476,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3479 "util/configparser.c"
+#line 3480 "util/configparser.c"
     break;
 
   case 313:
-#line 813 "./util/configparser.y"
+#line 814 "./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)
@@ -3487,11 +3488,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3491 "util/configparser.c"
+#line 3492 "util/configparser.c"
     break;
 
   case 314:
-#line 822 "./util/configparser.y"
+#line 823 "./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)
@@ -3499,11 +3500,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3503 "util/configparser.c"
+#line 3504 "util/configparser.c"
     break;
 
   case 315:
-#line 831 "./util/configparser.y"
+#line 832 "./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)
@@ -3511,11 +3512,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3515 "util/configparser.c"
+#line 3516 "util/configparser.c"
     break;
 
   case 316:
-#line 840 "./util/configparser.y"
+#line 841 "./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)
@@ -3527,11 +3528,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3531 "util/configparser.c"
+#line 3532 "util/configparser.c"
     break;
 
   case 317:
-#line 853 "./util/configparser.y"
+#line 854 "./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)
@@ -3539,11 +3540,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3543 "util/configparser.c"
+#line 3544 "util/configparser.c"
     break;
 
   case 318:
-#line 862 "./util/configparser.y"
+#line 863 "./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)
@@ -3555,11 +3556,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3559 "util/configparser.c"
+#line 3560 "util/configparser.c"
     break;
 
   case 319:
-#line 875 "./util/configparser.y"
+#line 876 "./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)
@@ -3567,11 +3568,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3571 "util/configparser.c"
+#line 3572 "util/configparser.c"
     break;
 
   case 320:
-#line 884 "./util/configparser.y"
+#line 885 "./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)
@@ -3579,11 +3580,11 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3583 "util/configparser.c"
+#line 3584 "util/configparser.c"
     break;
 
   case 321:
-#line 893 "./util/configparser.y"
+#line 894 "./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)
@@ -3591,31 +3592,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3595 "util/configparser.c"
+#line 3596 "util/configparser.c"
     break;
 
   case 322:
-#line 902 "./util/configparser.y"
+#line 903 "./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 3606 "util/configparser.c"
     break;
 
   case 323:
-#line 909 "./util/configparser.y"
+#line 910 "./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 3616 "util/configparser.c"
     break;
 
   case 324:
-#line 916 "./util/configparser.y"
+#line 917 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3623,21 +3624,21 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3627 "util/configparser.c"
+#line 3628 "util/configparser.c"
     break;
 
   case 325:
-#line 925 "./util/configparser.y"
+#line 926 "./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 3638 "util/configparser.c"
     break;
 
   case 326:
-#line 932 "./util/configparser.y"
+#line 933 "./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)
@@ -3645,53 +3646,53 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3649 "util/configparser.c"
+#line 3650 "util/configparser.c"
     break;
 
   case 327:
-#line 941 "./util/configparser.y"
+#line 942 "./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 3661 "util/configparser.c"
     break;
 
   case 328:
-#line 949 "./util/configparser.y"
+#line 950 "./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 3671 "util/configparser.c"
     break;
 
   case 329:
-#line 956 "./util/configparser.y"
+#line 957 "./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 3681 "util/configparser.c"
     break;
 
   case 330:
-#line 963 "./util/configparser.y"
+#line 964 "./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 3692 "util/configparser.c"
     break;
 
   case 331:
-#line 971 "./util/configparser.y"
+#line 972 "./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)
@@ -3699,22 +3700,22 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3703 "util/configparser.c"
+#line 3704 "util/configparser.c"
     break;
 
   case 332:
-#line 980 "./util/configparser.y"
+#line 981 "./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 3714 "util/configparser.c"
+#line 3715 "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);
@@ -3730,11 +3731,11 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3734 "util/configparser.c"
+#line 3735 "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)
@@ -3742,11 +3743,11 @@ yyreduce:
 		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3746 "util/configparser.c"
+#line 3747 "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),
@@ -3754,11 +3755,11 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3758 "util/configparser.c"
+#line 3759 "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),
@@ -3766,11 +3767,11 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3770 "util/configparser.c"
+#line 3771 "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)
@@ -3778,11 +3779,11 @@ yyreduce:
 		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3782 "util/configparser.c"
+#line 3783 "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)
@@ -3790,11 +3791,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3794 "util/configparser.c"
+#line 3795 "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)
@@ -3802,11 +3803,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3806 "util/configparser.c"
+#line 3807 "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)
@@ -3819,11 +3820,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3823 "util/configparser.c"
+#line 3824 "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)
@@ -3831,11 +3832,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3835 "util/configparser.c"
+#line 3836 "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)
@@ -3843,11 +3844,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3847 "util/configparser.c"
+#line 3848 "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)
@@ -3855,11 +3856,11 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3859 "util/configparser.c"
+#line 3860 "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)
@@ -3867,11 +3868,11 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3871 "util/configparser.c"
+#line 3872 "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)
@@ -3879,11 +3880,11 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3883 "util/configparser.c"
+#line 3884 "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)
@@ -3891,31 +3892,31 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3895 "util/configparser.c"
+#line 3896 "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 3906 "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 3916 "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);
@@ -3940,105 +3941,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3944 "util/configparser.c"
+#line 3945 "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 3956 "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 3966 "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 3976 "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 3986 "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 3996 "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 4007 "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 4018 "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 4029 "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 4039 "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)
@@ -4048,11 +4049,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4052 "util/configparser.c"
+#line 4053 "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)
@@ -4062,21 +4063,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4066 "util/configparser.c"
+#line 4067 "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 4077 "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)
@@ -4084,11 +4085,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4088 "util/configparser.c"
+#line 4089 "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)
@@ -4096,11 +4097,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4100 "util/configparser.c"
+#line 4101 "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)
@@ -4108,53 +4109,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4112 "util/configparser.c"
+#line 4113 "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 4123 "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 4133 "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 4144 "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 4155 "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 +4164,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4167 "util/configparser.c"
+#line 4168 "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 +4177,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4180 "util/configparser.c"
+#line 4181 "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,11 +4190,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4193 "util/configparser.c"
+#line 4194 "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)
@@ -4206,22 +4207,22 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4210 "util/configparser.c"
+#line 4211 "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 4222 "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)
@@ -4233,11 +4234,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4237 "util/configparser.c"
+#line 4238 "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)
@@ -4247,22 +4248,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4251 "util/configparser.c"
+#line 4252 "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 4263 "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)
@@ -4274,11 +4275,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4278 "util/configparser.c"
+#line 4279 "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)
@@ -4286,11 +4287,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4290 "util/configparser.c"
+#line 4291 "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)
@@ -4298,11 +4299,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4302 "util/configparser.c"
+#line 4303 "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)
@@ -4310,11 +4311,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4314 "util/configparser.c"
+#line 4315 "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)
@@ -4323,11 +4324,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4327 "util/configparser.c"
+#line 4328 "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)
@@ -4336,22 +4337,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4340 "util/configparser.c"
+#line 4341 "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 4352 "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)
@@ -4363,11 +4364,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4367 "util/configparser.c"
+#line 4368 "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)
@@ -4375,22 +4376,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4379 "util/configparser.c"
+#line 4380 "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 4391 "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)
@@ -4398,22 +4399,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4402 "util/configparser.c"
+#line 4403 "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 4414 "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)
@@ -4425,11 +4426,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4429 "util/configparser.c"
+#line 4430 "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)
@@ -4437,21 +4438,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4441 "util/configparser.c"
+#line 4442 "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 4452 "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)
@@ -4460,11 +4461,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4464 "util/configparser.c"
+#line 4465 "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)
@@ -4473,11 +4474,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4477 "util/configparser.c"
+#line 4478 "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)
@@ -4486,11 +4487,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4490 "util/configparser.c"
+#line 4491 "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)
@@ -4499,11 +4500,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4503 "util/configparser.c"
+#line 4504 "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)
@@ -4512,11 +4513,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4516 "util/configparser.c"
+#line 4517 "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)
@@ -4525,11 +4526,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4529 "util/configparser.c"
+#line 4530 "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)
@@ -4538,11 +4539,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4542 "util/configparser.c"
+#line 4543 "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)
@@ -4551,41 +4552,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4555 "util/configparser.c"
+#line 4556 "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 4566 "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 4576 "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 4586 "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)
@@ -4593,11 +4594,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4597 "util/configparser.c"
+#line 4598 "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)
@@ -4605,11 +4606,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4609 "util/configparser.c"
+#line 4610 "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)
@@ -4617,11 +4618,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4621 "util/configparser.c"
+#line 4622 "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)
@@ -4629,21 +4630,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4633 "util/configparser.c"
+#line 4634 "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 4644 "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)
@@ -4652,11 +4653,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4656 "util/configparser.c"
+#line 4657 "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 &&
@@ -4675,21 +4676,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4679 "util/configparser.c"
+#line 4680 "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 4690 "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) {
@@ -4706,11 +4707,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4710 "util/configparser.c"
+#line 4711 "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) {
@@ -4722,11 +4723,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4726 "util/configparser.c"
+#line 4727 "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) {
@@ -4738,11 +4739,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4742 "util/configparser.c"
+#line 4743 "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)
@@ -4750,11 +4751,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4754 "util/configparser.c"
+#line 4755 "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)
@@ -4762,11 +4763,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4766 "util/configparser.c"
+#line 4767 "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)
@@ -4774,11 +4775,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4778 "util/configparser.c"
+#line 4779 "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)
@@ -4786,11 +4787,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4790 "util/configparser.c"
+#line 4791 "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)
@@ -4799,11 +4800,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4803 "util/configparser.c"
+#line 4804 "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)
@@ -4812,11 +4813,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4816 "util/configparser.c"
+#line 4817 "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)
@@ -4826,11 +4827,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4830 "util/configparser.c"
+#line 4831 "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)
@@ -4838,11 +4839,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4842 "util/configparser.c"
+#line 4843 "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)
@@ -4850,11 +4851,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4854 "util/configparser.c"
+#line 4855 "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)
@@ -4862,11 +4863,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4866 "util/configparser.c"
+#line 4867 "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)
@@ -4874,11 +4875,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4878 "util/configparser.c"
+#line 4879 "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)
@@ -4886,11 +4887,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4890 "util/configparser.c"
+#line 4891 "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)
@@ -4898,11 +4899,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4902 "util/configparser.c"
+#line 4903 "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)
@@ -4914,11 +4915,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4918 "util/configparser.c"
+#line 4919 "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)
@@ -4930,11 +4931,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4934 "util/configparser.c"
+#line 4935 "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)
@@ -4942,21 +4943,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4946 "util/configparser.c"
+#line 4947 "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 4957 "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)
@@ -4964,11 +4965,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4968 "util/configparser.c"
+#line 4969 "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)
@@ -4976,11 +4977,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4980 "util/configparser.c"
+#line 4981 "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)
@@ -4988,11 +4989,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4992 "util/configparser.c"
+#line 4993 "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)
@@ -5001,22 +5002,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5005 "util/configparser.c"
+#line 5006 "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 5017 "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)
@@ -5028,22 +5029,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5032 "util/configparser.c"
+#line 5033 "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 5044 "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 &&
@@ -5083,21 +5084,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5087 "util/configparser.c"
+#line 5088 "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 5098 "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)));
@@ -5111,11 +5112,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5115 "util/configparser.c"
+#line 5116 "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)
@@ -5124,11 +5125,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5128 "util/configparser.c"
+#line 5129 "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)
@@ -5137,41 +5138,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5141 "util/configparser.c"
+#line 5142 "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 5152 "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 5162 "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 5172 "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)
@@ -5179,22 +5180,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5183 "util/configparser.c"
+#line 5184 "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 5195 "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)));
@@ -5207,11 +5208,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5211 "util/configparser.c"
+#line 5212 "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),
@@ -5231,11 +5232,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5235 "util/configparser.c"
+#line 5236 "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),
@@ -5255,11 +5256,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5259 "util/configparser.c"
+#line 5260 "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,
@@ -5270,11 +5271,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5274 "util/configparser.c"
+#line 5275 "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,
@@ -5285,11 +5286,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5289 "util/configparser.c"
+#line 5290 "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,
@@ -5300,11 +5301,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5304 "util/configparser.c"
+#line 5305 "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,
@@ -5312,11 +5313,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5316 "util/configparser.c"
+#line 5317 "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),
@@ -5336,11 +5337,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5340 "util/configparser.c"
+#line 5341 "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)
@@ -5348,11 +5349,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5352 "util/configparser.c"
+#line 5353 "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)
@@ -5360,33 +5361,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5364 "util/configparser.c"
+#line 5365 "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 5376 "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 5387 "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)
@@ -5398,11 +5399,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5402 "util/configparser.c"
+#line 5403 "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)
@@ -5414,11 +5415,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5418 "util/configparser.c"
+#line 5419 "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) {
@@ -5432,11 +5433,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5436 "util/configparser.c"
+#line 5437 "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) {
@@ -5450,11 +5451,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5454 "util/configparser.c"
+#line 5455 "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)
@@ -5462,11 +5463,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5466 "util/configparser.c"
+#line 5467 "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)
@@ -5474,20 +5475,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5478 "util/configparser.c"
+#line 5479 "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 5488 "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)
@@ -5495,11 +5496,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5499 "util/configparser.c"
+#line 5500 "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)
@@ -5507,11 +5508,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5511 "util/configparser.c"
+#line 5512 "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)
@@ -5520,11 +5521,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5524 "util/configparser.c"
+#line 5525 "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)
@@ -5533,11 +5534,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5537 "util/configparser.c"
+#line 5538 "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)));
@@ -5549,11 +5550,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5553 "util/configparser.c"
+#line 5554 "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)));
@@ -5565,11 +5566,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5569 "util/configparser.c"
+#line 5570 "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)));
@@ -5580,11 +5581,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5584 "util/configparser.c"
+#line 5585 "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)));
@@ -5597,11 +5598,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5601 "util/configparser.c"
+#line 5602 "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)));
@@ -5612,11 +5613,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5616 "util/configparser.c"
+#line 5617 "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)));
@@ -5629,43 +5630,37 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5633 "util/configparser.c"
+#line 5634 "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));
-		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");
+		OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(
-			&cfg_parser->cfg->edns_client_tags, (yyvsp[-1].str), (yyvsp[0].str)))
+			&cfg_parser->cfg->edns_client_strings, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding "
-				"edns-client-tag");
+				"edns-client-string");
 	}
-#line 5651 "util/configparser.c"
+#line 5646 "util/configparser.c"
     break;
 
   case 478:
-#line 2484 "./util/configparser.y"
+#line 2479 "./util/configparser.y"
         {
-		OUTYY(("P(edns_client_tag_opcode:%s)\n", (yyvsp[0].str)));
+		OUTYY(("P(edns_client_string_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));
+		else cfg_parser->cfg->edns_client_string_opcode = atoi((yyvsp[0].str));
 
 	}
-#line 5665 "util/configparser.c"
+#line 5660 "util/configparser.c"
     break;
 
   case 479:
-#line 2495 "./util/configparser.y"
+#line 2490 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5674,31 +5669,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5678 "util/configparser.c"
+#line 5673 "util/configparser.c"
     break;
 
   case 480:
-#line 2505 "./util/configparser.y"
+#line 2500 "./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 5683 "util/configparser.c"
     break;
 
   case 481:
-#line 2512 "./util/configparser.y"
+#line 2507 "./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 5693 "util/configparser.c"
     break;
 
   case 482:
-#line 2519 "./util/configparser.y"
+#line 2514 "./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)
@@ -5706,11 +5701,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5710 "util/configparser.c"
+#line 5705 "util/configparser.c"
     break;
 
   case 483:
-#line 2528 "./util/configparser.y"
+#line 2523 "./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)
@@ -5718,11 +5713,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5722 "util/configparser.c"
+#line 5717 "util/configparser.c"
     break;
 
   case 484:
-#line 2537 "./util/configparser.y"
+#line 2532 "./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)
@@ -5731,11 +5726,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5735 "util/configparser.c"
+#line 5730 "util/configparser.c"
     break;
 
   case 485:
-#line 2547 "./util/configparser.y"
+#line 2542 "./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)
@@ -5744,11 +5739,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5748 "util/configparser.c"
+#line 5743 "util/configparser.c"
     break;
 
   case 486:
-#line 2557 "./util/configparser.y"
+#line 2552 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5757,31 +5752,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5761 "util/configparser.c"
+#line 5756 "util/configparser.c"
     break;
 
   case 487:
-#line 2567 "./util/configparser.y"
+#line 2562 "./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 5766 "util/configparser.c"
     break;
 
   case 488:
-#line 2574 "./util/configparser.y"
+#line 2569 "./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 5776 "util/configparser.c"
     break;
 
   case 489:
-#line 2581 "./util/configparser.y"
+#line 2576 "./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)
@@ -5789,11 +5784,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5793 "util/configparser.c"
+#line 5788 "util/configparser.c"
     break;
 
   case 490:
-#line 2590 "./util/configparser.y"
+#line 2585 "./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)
@@ -5801,11 +5796,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5805 "util/configparser.c"
+#line 5800 "util/configparser.c"
     break;
 
   case 491:
-#line 2599 "./util/configparser.y"
+#line 2594 "./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)
@@ -5814,11 +5809,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5818 "util/configparser.c"
+#line 5813 "util/configparser.c"
     break;
 
   case 492:
-#line 2609 "./util/configparser.y"
+#line 2604 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5827,52 +5822,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5831 "util/configparser.c"
+#line 5826 "util/configparser.c"
     break;
 
   case 493:
-#line 2619 "./util/configparser.y"
+#line 2614 "./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 5836 "util/configparser.c"
     break;
 
   case 494:
-#line 2626 "./util/configparser.y"
+#line 2621 "./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 5846 "util/configparser.c"
     break;
 
   case 495:
-#line 2633 "./util/configparser.y"
+#line 2628 "./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 5856 "util/configparser.c"
     break;
 
   case 496:
-#line 2640 "./util/configparser.y"
+#line 2635 "./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 5867 "util/configparser.c"
     break;
 
   case 497:
-#line 2648 "./util/configparser.y"
+#line 2643 "./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)
@@ -5881,11 +5876,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5885 "util/configparser.c"
+#line 5880 "util/configparser.c"
     break;
 
   case 498:
-#line 2658 "./util/configparser.y"
+#line 2653 "./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)
@@ -5894,11 +5889,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5898 "util/configparser.c"
+#line 5893 "util/configparser.c"
     break;
 
   case 499:
-#line 2668 "./util/configparser.y"
+#line 2663 "./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)
@@ -5907,11 +5902,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5911 "util/configparser.c"
+#line 5906 "util/configparser.c"
     break;
 
   case 500:
-#line 2678 "./util/configparser.y"
+#line 2673 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5920,11 +5915,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5924 "util/configparser.c"
+#line 5919 "util/configparser.c"
     break;
 
   case 501:
-#line 2688 "./util/configparser.y"
+#line 2683 "./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 &&
@@ -5962,11 +5957,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5966 "util/configparser.c"
+#line 5961 "util/configparser.c"
     break;
 
   case 502:
-#line 2727 "./util/configparser.y"
+#line 2722 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5975,33 +5970,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5979 "util/configparser.c"
+#line 5974 "util/configparser.c"
     break;
 
   case 503:
-#line 2737 "./util/configparser.y"
+#line 2732 "./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 5985 "util/configparser.c"
     break;
 
   case 504:
-#line 2745 "./util/configparser.y"
+#line 2740 "./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 5996 "util/configparser.c"
     break;
 
   case 505:
-#line 2753 "./util/configparser.y"
+#line 2748 "./util/configparser.y"
         {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -6015,11 +6010,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 6019 "util/configparser.c"
+#line 6014 "util/configparser.c"
     break;
 
   case 506:
-#line 2768 "./util/configparser.y"
+#line 2763 "./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)
@@ -6027,19 +6022,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6031 "util/configparser.c"
+#line 6026 "util/configparser.c"
     break;
 
   case 507:
-#line 2777 "./util/configparser.y"
+#line 2772 "./util/configparser.y"
         { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6039 "util/configparser.c"
+#line 6034 "util/configparser.c"
     break;
 
   case 518:
-#line 2788 "./util/configparser.y"
+#line 2783 "./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)
@@ -6048,11 +6043,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6052 "util/configparser.c"
+#line 6047 "util/configparser.c"
     break;
 
   case 519:
-#line 2798 "./util/configparser.y"
+#line 2793 "./util/configparser.y"
         {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6060,79 +6055,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6064 "util/configparser.c"
+#line 6059 "util/configparser.c"
     break;
 
   case 520:
-#line 2807 "./util/configparser.y"
+#line 2802 "./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 6069 "util/configparser.c"
     break;
 
   case 521:
-#line 2814 "./util/configparser.y"
+#line 2809 "./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 6079 "util/configparser.c"
     break;
 
   case 522:
-#line 2821 "./util/configparser.y"
+#line 2816 "./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 6089 "util/configparser.c"
     break;
 
   case 523:
-#line 2828 "./util/configparser.y"
+#line 2823 "./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 6099 "util/configparser.c"
     break;
 
   case 524:
-#line 2835 "./util/configparser.y"
+#line 2830 "./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 6109 "util/configparser.c"
     break;
 
   case 525:
-#line 2842 "./util/configparser.y"
+#line 2837 "./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 6119 "util/configparser.c"
     break;
 
   case 526:
-#line 2849 "./util/configparser.y"
+#line 2844 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6132 "util/configparser.c"
+#line 6127 "util/configparser.c"
     break;
 
   case 548:
-#line 2869 "./util/configparser.y"
+#line 2864 "./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)
@@ -6140,11 +6135,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6144 "util/configparser.c"
+#line 6139 "util/configparser.c"
     break;
 
   case 549:
-#line 2878 "./util/configparser.y"
+#line 2873 "./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)
@@ -6153,31 +6148,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6157 "util/configparser.c"
+#line 6152 "util/configparser.c"
     break;
 
   case 550:
-#line 2888 "./util/configparser.y"
+#line 2883 "./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 6162 "util/configparser.c"
     break;
 
   case 551:
-#line 2895 "./util/configparser.y"
+#line 2890 "./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 6172 "util/configparser.c"
     break;
 
   case 552:
-#line 2902 "./util/configparser.y"
+#line 2897 "./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)
@@ -6185,51 +6180,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6189 "util/configparser.c"
+#line 6184 "util/configparser.c"
     break;
 
   case 553:
-#line 2911 "./util/configparser.y"
+#line 2906 "./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 6194 "util/configparser.c"
     break;
 
   case 554:
-#line 2918 "./util/configparser.y"
+#line 2913 "./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 6204 "util/configparser.c"
     break;
 
   case 555:
-#line 2925 "./util/configparser.y"
+#line 2920 "./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 6214 "util/configparser.c"
     break;
 
   case 556:
-#line 2932 "./util/configparser.y"
+#line 2927 "./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 6224 "util/configparser.c"
     break;
 
   case 557:
-#line 2939 "./util/configparser.y"
+#line 2934 "./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)
@@ -6237,11 +6232,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6241 "util/configparser.c"
+#line 6236 "util/configparser.c"
     break;
 
   case 558:
-#line 2948 "./util/configparser.y"
+#line 2943 "./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)
@@ -6249,31 +6244,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6253 "util/configparser.c"
+#line 6248 "util/configparser.c"
     break;
 
   case 559:
-#line 2957 "./util/configparser.y"
+#line 2952 "./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 6258 "util/configparser.c"
     break;
 
   case 560:
-#line 2964 "./util/configparser.y"
+#line 2959 "./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 6268 "util/configparser.c"
     break;
 
   case 561:
-#line 2971 "./util/configparser.y"
+#line 2966 "./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)
@@ -6282,11 +6277,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6286 "util/configparser.c"
+#line 6281 "util/configparser.c"
     break;
 
   case 562:
-#line 2981 "./util/configparser.y"
+#line 2976 "./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)
@@ -6295,11 +6290,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6299 "util/configparser.c"
+#line 6294 "util/configparser.c"
     break;
 
   case 563:
-#line 2991 "./util/configparser.y"
+#line 2986 "./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)
@@ -6308,11 +6303,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6312 "util/configparser.c"
+#line 6307 "util/configparser.c"
     break;
 
   case 564:
-#line 3001 "./util/configparser.y"
+#line 2996 "./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)
@@ -6321,11 +6316,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6325 "util/configparser.c"
+#line 6320 "util/configparser.c"
     break;
 
   case 565:
-#line 3011 "./util/configparser.y"
+#line 3006 "./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)
@@ -6334,11 +6329,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6338 "util/configparser.c"
+#line 6333 "util/configparser.c"
     break;
 
   case 566:
-#line 3021 "./util/configparser.y"
+#line 3016 "./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)
@@ -6347,47 +6342,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6351 "util/configparser.c"
+#line 6346 "util/configparser.c"
     break;
 
   case 567:
-#line 3031 "./util/configparser.y"
+#line 3026 "./util/configparser.y"
         { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6359 "util/configparser.c"
+#line 6354 "util/configparser.c"
     break;
 
   case 571:
-#line 3040 "./util/configparser.y"
+#line 3035 "./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 6364 "util/configparser.c"
     break;
 
   case 572:
-#line 3046 "./util/configparser.y"
+#line 3041 "./util/configparser.y"
         { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6377 "util/configparser.c"
+#line 6372 "util/configparser.c"
     break;
 
   case 576:
-#line 3055 "./util/configparser.y"
+#line 3050 "./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 6382 "util/configparser.c"
     break;
 
   case 577:
-#line 3061 "./util/configparser.y"
+#line 3056 "./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)
@@ -6396,21 +6391,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6400 "util/configparser.c"
+#line 6395 "util/configparser.c"
     break;
 
   case 578:
-#line 3071 "./util/configparser.y"
+#line 3066 "./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 6405 "util/configparser.c"
     break;
 
   case 579:
-#line 3078 "./util/configparser.y"
+#line 3073 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6418,30 +6413,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6422 "util/configparser.c"
+#line 6417 "util/configparser.c"
     break;
 
   case 580:
-#line 3087 "./util/configparser.y"
+#line 3082 "./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 6428 "util/configparser.c"
     break;
 
   case 581:
-#line 3095 "./util/configparser.y"
+#line 3090 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6441 "util/configparser.c"
+#line 6436 "util/configparser.c"
     break;
 
   case 594:
-#line 3111 "./util/configparser.y"
+#line 3106 "./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)
@@ -6449,11 +6444,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6453 "util/configparser.c"
+#line 6448 "util/configparser.c"
     break;
 
   case 595:
-#line 3121 "./util/configparser.y"
+#line 3116 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6461,21 +6456,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6465 "util/configparser.c"
+#line 6460 "util/configparser.c"
     break;
 
   case 596:
-#line 3130 "./util/configparser.y"
+#line 3125 "./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 6470 "util/configparser.c"
     break;
 
   case 597:
-#line 3137 "./util/configparser.y"
+#line 3132 "./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)))
@@ -6483,21 +6478,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 6487 "util/configparser.c"
+#line 6482 "util/configparser.c"
     break;
 
   case 598:
-#line 3146 "./util/configparser.y"
+#line 3141 "./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 6492 "util/configparser.c"
     break;
 
   case 599:
-#line 3153 "./util/configparser.y"
+#line 3148 "./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)))
@@ -6505,22 +6500,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 6509 "util/configparser.c"
+#line 6504 "util/configparser.c"
     break;
 
   case 600:
-#line 3162 "./util/configparser.y"
+#line 3157 "./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 6515 "util/configparser.c"
     break;
 
   case 601:
-#line 3170 "./util/configparser.y"
+#line 3165 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6532,22 +6527,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6536 "util/configparser.c"
+#line 6531 "util/configparser.c"
     break;
 
   case 602:
-#line 3183 "./util/configparser.y"
+#line 3178 "./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 6542 "util/configparser.c"
     break;
 
   case 603:
-#line 3191 "./util/configparser.y"
+#line 3186 "./util/configparser.y"
   {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6559,19 +6554,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6563 "util/configparser.c"
+#line 6558 "util/configparser.c"
     break;
 
   case 604:
-#line 3204 "./util/configparser.y"
+#line 3199 "./util/configparser.y"
         {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6571 "util/configparser.c"
+#line 6566 "util/configparser.c"
     break;
 
   case 613:
-#line 3215 "./util/configparser.y"
+#line 3210 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6582,11 +6577,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6586 "util/configparser.c"
+#line 6581 "util/configparser.c"
     break;
 
   case 614:
-#line 3227 "./util/configparser.y"
+#line 3222 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6597,11 +6592,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6601 "util/configparser.c"
+#line 6596 "util/configparser.c"
     break;
 
   case 615:
-#line 3239 "./util/configparser.y"
+#line 3234 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6612,11 +6607,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6616 "util/configparser.c"
+#line 6611 "util/configparser.c"
     break;
 
   case 616:
-#line 3251 "./util/configparser.y"
+#line 3246 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6630,11 +6625,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6634 "util/configparser.c"
+#line 6629 "util/configparser.c"
     break;
 
   case 617:
-#line 3266 "./util/configparser.y"
+#line 3261 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6646,11 +6641,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6650 "util/configparser.c"
+#line 6645 "util/configparser.c"
     break;
 
   case 618:
-#line 3279 "./util/configparser.y"
+#line 3274 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6662,11 +6657,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6666 "util/configparser.c"
+#line 6661 "util/configparser.c"
     break;
 
   case 619:
-#line 3292 "./util/configparser.y"
+#line 3287 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6676,19 +6671,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6680 "util/configparser.c"
+#line 6675 "util/configparser.c"
     break;
 
   case 620:
-#line 3303 "./util/configparser.y"
+#line 3298 "./util/configparser.y"
                 {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6688 "util/configparser.c"
+#line 6683 "util/configparser.c"
     break;
 
   case 625:
-#line 3312 "./util/configparser.y"
+#line 3307 "./util/configparser.y"
                 {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6702,11 +6697,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6706 "util/configparser.c"
+#line 6701 "util/configparser.c"
     break;
 
   case 626:
-#line 3327 "./util/configparser.y"
+#line 3322 "./util/configparser.y"
         {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6720,11 +6715,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6724 "util/configparser.c"
+#line 6719 "util/configparser.c"
     break;
 
 
-#line 6728 "util/configparser.c"
+#line 6723 "util/configparser.c"
 
       default: break;
     }
@@ -6956,7 +6951,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3341 "./util/configparser.y"
+#line 3336 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 3a5ea579d..d9a78e107 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -344,8 +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_OPCODE = 554
+    VAR_EDNS_CLIENT_STRING = 553,
+    VAR_EDNS_CLIENT_STRING_OPCODE = 554
   };
 #endif
 /* Tokens.  */
@@ -644,8 +644,8 @@ extern int yydebug;
 #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_EDNS_CLIENT_STRING 553
+#define VAR_EDNS_CLIENT_STRING_OPCODE 554
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
diff --git a/util/configparser.y b/util/configparser.y
index 43a886f24..ebc71a8bb 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -178,7 +178,8 @@ 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 VAR_EDNS_CLIENT_TAG_OPCODE
+%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_STRING
+%token VAR_EDNS_CLIENT_STRING_OPCODE
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -291,8 +292,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_edns_client_tag_opcode
+	server_tls_use_sni | server_edns_client_string |
+	server_edns_client_string_opcode
 	;
 stubstart: VAR_STUB_ZONE
 	{
@@ -2465,29 +2466,23 @@ server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG
 	#endif
 	}
 	;
-server_edns_client_tag: VAR_EDNS_CLIENT_TAG STRING_ARG STRING_ARG
+server_edns_client_string: VAR_EDNS_CLIENT_STRING 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");
+		OUTYY(("P(server_edns_client_string:%s %s)\n", $2, $3));
 		if(!cfg_str2list_insert(
-			&cfg_parser->cfg->edns_client_tags, $2, $3))
+			&cfg_parser->cfg->edns_client_strings, $2, $3))
 			fatal_exit("out of memory adding "
-				"edns-client-tag");
+				"edns-client-string");
 	}
 	;
-server_edns_client_tag_opcode: VAR_EDNS_CLIENT_TAG_OPCODE STRING_ARG
+server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG
 	{
-		OUTYY(("P(edns_client_tag_opcode:%s)\n", $2));
+		OUTYY(("P(edns_client_string_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);
+		else cfg_parser->cfg->edns_client_string_opcode = atoi($2);
 
 	}
 	;
diff --git a/util/edns.c b/util/edns.c
index c83a4a545..ddbb46e89 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -48,81 +48,84 @@
 #include "util/data/msgparse.h"
 #include "util/data/msgreply.h"
 
-struct edns_tags* edns_tags_create(void)
+struct edns_strings* edns_strings_create(void)
 {
-	struct edns_tags* edns_tags = calloc(1, sizeof(struct edns_tags));
-	if(!edns_tags)
+	struct edns_strings* edns_strings = calloc(1,
+		sizeof(struct edns_strings));
+	if(!edns_strings)
 		return NULL;
-	if(!(edns_tags->region = regional_create())) {
-		edns_tags_delete(edns_tags);
+	if(!(edns_strings->region = regional_create())) {
+		edns_strings_delete(edns_strings);
 		return NULL;
 	}
-	return edns_tags;
+	return edns_strings;
 }
 
-void edns_tags_delete(struct edns_tags* edns_tags)
+void edns_strings_delete(struct edns_strings* edns_strings)
 {
-	if(!edns_tags)
+	if(!edns_strings)
 		return;
-	regional_destroy(edns_tags->region);
-	free(edns_tags);
+	regional_destroy(edns_strings->region);
+	free(edns_strings);
 }
 
 static int
-edns_tags_client_insert(struct edns_tags* edns_tags,
+edns_strings_client_insert(struct edns_strings* edns_strings,
 	struct sockaddr_storage* addr, socklen_t addrlen, int net,
-	uint16_t tag_data)
+	const char* string)
 {
-	struct edns_tag_addr* eta = regional_alloc_zero(edns_tags->region,
-		sizeof(struct edns_tag_addr));
-	if(!eta)
+	struct edns_string_addr* esa = regional_alloc_zero(edns_strings->region,
+		sizeof(struct edns_string_addr));
+	if(!esa)
 		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.");
+	esa->string_len = strlen(string);
+	esa->string = regional_alloc_init(edns_strings->region, string,
+		esa->string_len);
+	if(!esa->string)
+		return 0;
+	if(!addr_tree_insert(&edns_strings->client_strings, &esa->node, addr,
+		addrlen, net)) {
+		verbose(VERB_QUERY, "duplicate EDNS client string ignored.");
 	}
 	return 1;
 }
 
-int edns_tags_apply_cfg(struct edns_tags* edns_tags,
+int edns_strings_apply_cfg(struct edns_strings* edns_strings,
 	struct config_file* config)
 {
 	struct config_str2list* c;
-	regional_free_all(edns_tags->region);
-	addr_tree_init(&edns_tags->client_tags);
+	regional_free_all(edns_strings->region);
+	addr_tree_init(&edns_strings->client_strings);
 
-	for(c=config->edns_client_tags; c; c=c->next) {
+	for(c=config->edns_client_strings; 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);
+			log_err("cannot parse EDNS client string 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");
+		if(!edns_strings_client_insert(edns_strings, &addr, addrlen,
+			net, c->str2)) {
+			log_err("out of memory while adding EDNS strings");
 			return 0;
 		}
 	}
-	edns_tags->client_tag_opcode = config->edns_client_tag_opcode;
+	edns_strings->client_string_opcode = config->edns_client_string_opcode;
 
-	addr_tree_init_parents(&edns_tags->client_tags);
+	addr_tree_init_parents(&edns_strings->client_strings);
 	return 1;
 }
 
-struct edns_tag_addr*
-edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr,
+struct edns_string_addr*
+edns_string_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_string_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 cf9f8707e..11742eb5b 100644
--- a/util/edns.h
+++ b/util/edns.h
@@ -50,58 +50,60 @@ struct comm_point;
 struct regional;
 
 /**
- * Structure containing all EDNS tags.
+ * Structure containing all EDNS strings.
  */
-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;
+struct edns_strings {
+	/** Tree of EDNS client strings to use in upstream queries, per address
+	 * prefix. Contains nodes of type edns_string_addr. */
+	rbtree_type client_strings;
+	/** EDNS opcode to use for client strings */
+	uint16_t client_string_opcode;
 	/** region to allocate tree nodes in */
 	struct regional* region;
 };
 
 /**
- * EDNS tag. Node of rbtree, containing tag and prefix.
+ * EDNS string. Node of rbtree, containing string and prefix.
  */
-struct edns_tag_addr {
+struct edns_string_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;
+	/** string, ascii format */
+	uint8_t* string;
+	/** length of string */
+	size_t string_len;
 };
 
 /**
- * Create structure to hold EDNS tags
- * @return: newly created edns_tags, NULL on alloc failure.
+ * Create structure to hold EDNS strings
+ * @return: newly created edns_strings, NULL on alloc failure.
  */
-struct edns_tags* edns_tags_create(void);
+struct edns_strings* edns_strings_create(void);
 
-/** Delete EDNS tags structure
- * @param edns_tags: struct to delete
+/** Delete EDNS strings structure
+ * @param edns_strings: struct to delete
  */
-void edns_tags_delete(struct edns_tags* edns_tags);
+void edns_strings_delete(struct edns_strings* edns_strings);
 
 /**
- * Add configured EDNS tags
- * @param edns_tags: edns tags to apply config to
- * @param config: struct containing EDNS tags configuration
+ * Add configured EDNS strings
+ * @param edns_strings: edns strings to apply config to
+ * @param config: struct containing EDNS strings configuration
  * @return 0 on error
  */
-int edns_tags_apply_cfg(struct edns_tags* edns_tags,
+int edns_strings_apply_cfg(struct edns_strings* edns_strings,
 	struct config_file* config);
 
 /**
- * Find tag for address.
- * @param tree: tree containing EDNS tags per address prefix.
+ * Find string for address.
+ * @param tree: tree containing EDNS strings 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,
+struct edns_string_addr*
+edns_string_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr,
 	socklen_t addrlen);
 
 /**
diff --git a/util/module.h b/util/module.h
index 1eed21300..7b833f8ad 100644
--- a/util/module.h
+++ b/util/module.h
@@ -520,8 +520,8 @@ 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;
+	/** EDNS client string information */
+	struct edns_strings* edns_strings;
 
 	/* Make every mesh state unique, do not aggregate mesh states. */
 	int unique_mesh;

From 2eb39abbaf28d491893743c0a473e86378fdc4f8 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 21 Oct 2020 09:49:55 +0200
Subject: [PATCH 073/208] - Fix that reuse_tcp_close_oldest sets
 item_on_lru_list to 0. - Fix to add assertions to reuse_tcp_select_id and
 unit test. - Fix that if no tcp buffers then pending tcp query stops.

---
 services/outside_network.c | 16 +++++++++----
 services/outside_network.h | 13 +++++++++++
 testcode/unitmain.c        | 47 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 5f60b847c..355f48ecb 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -403,7 +403,7 @@ static void reuse_write_wait_push_back(struct reuse_tcp* reuse,
 }
 
 /** insert element in tree by id */
-static void
+void
 reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w)
 {
 	log_assert(w->id_node.key == NULL);
@@ -412,7 +412,7 @@ reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w)
 }
 
 /** find element in tree by id */
-static struct waiting_tcp*
+struct waiting_tcp*
 reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id)
 {
 	struct waiting_tcp key_w;
@@ -885,7 +885,7 @@ static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg))
 }
 
 /** delete readwait waiting_tcp elements, deletes the elements in the list */
-static void reuse_del_readwait(rbtree_type* tree_by_id)
+void reuse_del_readwait(rbtree_type* tree_by_id)
 {
 	if(tree_by_id->root == NULL ||
 		tree_by_id->root == RBTREE_NULL)
@@ -1946,6 +1946,7 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 		outnet->tcp_reuse_last = NULL;
 		outnet->tcp_reuse_first = NULL;
 	}
+	pend->reuse.item_on_lru_list = 0;
 
 	/* free up */
 	reuse_cb_and_decommission(outnet, pend, NETEVENT_CLOSED);
@@ -1953,7 +1954,7 @@ reuse_tcp_close_oldest(struct outside_network* outnet)
 
 /** find spare ID value for reuse tcp stream.  That is random and also does
  * not collide with an existing query ID that is in use or waiting */
-static uint16_t
+uint16_t
 reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 {
 	uint16_t id = 0, curid, nextid;
@@ -1996,9 +1997,11 @@ reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 		if(next && next != RBTREE_NULL) {
 			curid = tree_by_id_get_id(node);
 			nextid = tree_by_id_get_id(next);
+			log_assert(curid < nextid);
 			if(curid != 0xffff && curid + 1 < nextid) {
 				/* space between nodes */
 				space = nextid - curid - 1;
+				log_assert(select >= count);
 				if(select < count + space) {
 					/* here it is */
 					return curid + 1 + (select - count);
@@ -2015,6 +2018,7 @@ reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet)
 	node = rbtree_last(&reuse->tree_by_id);
 	log_assert(node && node != RBTREE_NULL); /* tree not empty */
 	curid = tree_by_id_get_id(node);
+	log_assert(count + (0xffff-curid) + reuse->tree_by_id.count == 0xffff);
 	return curid + 1 + (select - count);
 }
 
@@ -2277,7 +2281,9 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	 * the stream itself.  also keep it as an entry in the tree_by_id,
 	 * in case the answer returns (that we no longer want), but we cannot
 	 * pick the same ID number meanwhile */
-	pend_tcp->query->cb = NULL;
+	if(pend_tcp->query) {
+		pend_tcp->query->cb = NULL;
+	}
 	/* see if can be entered in reuse tree
 	 * for that the FD has to be non-1 */
 	if(pend_tcp->c->fd == -1) {
diff --git a/services/outside_network.h b/services/outside_network.h
index 26705c56d..5ca074183 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -636,6 +636,19 @@ size_t outnet_get_mem(struct outside_network* outnet);
  */
 size_t serviced_get_mem(struct serviced_query* sq);
 
+/** Pick random ID value for a tcp stream, avoids existing IDs. */
+uint16_t reuse_tcp_select_id(struct reuse_tcp* reuse,
+	struct outside_network* outnet);
+
+/** find element in tree by id */
+struct waiting_tcp* reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id);
+
+/** insert element in tree by id */
+void reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w);
+
+/** delete readwait waiting_tcp elements, deletes the elements in the list */
+void reuse_del_readwait(rbtree_type* tree_by_id);
+
 /** get TCP file descriptor for address, returns -1 on failure,
  * tcp_mss is 0 or maxseg size to set for TCP packets. */
 int outnet_get_tcp_fd(struct sockaddr_storage* addr, socklen_t addrlen, int tcp_mss, int dscp);
diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index a42be424e..c61026f26 100644
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -839,6 +839,52 @@ static void respip_test(void)
 	respip_conf_actions_test();
 }
 
+#include "services/outside_network.h"
+/** add number of new IDs to the reuse tree, randomly chosen */
+static void tcpid_addmore(struct reuse_tcp* reuse,
+	struct outside_network* outnet, unsigned int addnum)
+{
+	unsigned int i;
+	struct waiting_tcp* w;
+	for(i=0; i<addnum; i++) {
+		uint16_t id = reuse_tcp_select_id(reuse, outnet);
+		unit_assert(!reuse_tcp_by_id_find(reuse, id));
+		w = calloc(1, sizeof(*w));
+		unit_assert(w);
+		w->id = id;
+		w->outnet = outnet;
+		w->next_waiting = (void*)reuse->pending;
+		reuse_tree_by_id_insert(reuse, w);
+	}
+}
+
+/** fill up the reuse ID tree and test assertions */
+static void tcpid_fillup(struct reuse_tcp* reuse,
+	struct outside_network* outnet)
+{
+	int t, numtest=3;
+	for(t=0; t<numtest; t++) {
+		rbtree_init(&reuse->tree_by_id, reuse_id_cmp);
+		tcpid_addmore(reuse, outnet, 65535);
+		reuse_del_readwait(&reuse->tree_by_id);
+	}
+}
+
+/** test TCP ID selection */
+static void tcpid_test(void)
+{
+	struct pending_tcp pend;
+	struct outside_network outnet;
+	unit_show_func("services/outside_network.c", "reuse_tcp_select_id");
+	memset(&pend, 0, sizeof(pend));
+	pend.reuse.pending = &pend;
+	memset(&outnet, 0, sizeof(outnet));
+	outnet.rnd = ub_initstate(NULL);
+	rbtree_init(&pend.reuse.tree_by_id, reuse_id_cmp);
+	tcpid_fillup(&pend.reuse, &outnet);
+	ub_randfree(outnet.rnd);
+}
+
 void unit_show_func(const char* file, const char* func)
 {
 	printf("test %s:%s\n", file, func);
@@ -907,6 +953,7 @@ main(int argc, char* argv[])
 	infra_test();
 	ldns_test();
 	msgparse_test();
+	tcpid_test();
 #ifdef CLIENT_SUBNET
 	ecs_test();
 #endif /* CLIENT_SUBNET */

From 9fb65e2b9edbcf6c739686710a3347de3cd890b1 Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@narrans.de>
Date: Wed, 28 Oct 2020 14:15:23 +0100
Subject: [PATCH 074/208] Sprinkle in some static to prevent missing prototype
 warnings.

---
 util/netevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/netevent.c b/util/netevent.c
index 2428417fa..974c59996 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2248,7 +2248,7 @@ http_chunked_segment(struct comm_point* c)
 
 #ifdef HAVE_NGHTTP2
 /** Create new http2 session. Called when creating handling comm point. */
-struct http2_session* http2_session_create(struct comm_point* c)
+static struct http2_session* http2_session_create(struct comm_point* c)
 {
 	struct http2_session* session = calloc(1, sizeof(*session));
 	if(!session) {
@@ -2262,7 +2262,7 @@ struct http2_session* http2_session_create(struct comm_point* c)
 #endif
 
 /** Delete http2 session. After closing connection or on error */
-void http2_session_delete(struct http2_session* h2_session)
+static void http2_session_delete(struct http2_session* h2_session)
 {
 #ifdef HAVE_NGHTTP2
 	if(h2_session->callbacks)
@@ -2338,7 +2338,7 @@ void http2_session_add_stream(struct http2_session* h2_session,
 
 /** remove stream from session linked list. After stream close callback or
  * closing connection */
-void http2_session_remove_stream(struct http2_session* h2_session,
+static void http2_session_remove_stream(struct http2_session* h2_session,
 	struct http2_stream* h2_stream)
 {
 	if(h2_stream->prev)

From 7977e1c4cb78c99e5a7aa449275b7a8e8998221c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 10 Nov 2020 13:51:56 +0100
Subject: [PATCH 075/208] - Fix memory leak after fix for possible memory leak
 failure.

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

diff --git a/doc/Changelog b/doc/Changelog
index e8314747e..c9e871011 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 10 November 2020: Wouter
 	- Fix #341: fixing a possible memory leak.
+	- Fix memory leak after fix for possible memory leak failure.
 
 27 October 2020: Wouter
 	- In man page note that tls-cert-bundle is read before permission
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 71c8eb159..15ee6a389 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1471,7 +1471,6 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres
 
 		tmpbuf = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1));
 		if(!tmpbuf) {
-			free(*ip_addresses);
 			log_err("realloc failed: out of memory");
 			return 0;
 		} else {
@@ -1488,7 +1487,6 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres
 	if (*ip_addresses_size == last_ip_addresses_size) {
 		tmpbuf = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1));
 		if(!tmpbuf) {
-			free(*ip_addresses);
 			log_err("realloc failed: out of memory");
 			return 0;
 		} else {

From 5385e2e09444d60df1bcbd3a173846ba933b03df Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 10 Nov 2020 15:31:20 +0100
Subject: [PATCH 076/208] - Fix #343: Fail to build --with-libnghttp2 with
 error: 'SSIZE_MAX'   undeclared.

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

diff --git a/doc/Changelog b/doc/Changelog
index c9e871011..47fcd9178 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 10 November 2020: Wouter
 	- Fix #341: fixing a possible memory leak.
 	- Fix memory leak after fix for possible memory leak failure.
+	- Fix #343: Fail to build --with-libnghttp2 with error: 'SSIZE_MAX'
+	  undeclared.
 
 27 October 2020: Wouter
 	- In man page note that tls-cert-bundle is read before permission
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 15ee6a389..10a7aec60 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -43,6 +43,7 @@
 #  include <sys/types.h>
 #endif
 #include <sys/time.h>
+#include <limits.h>
 #ifdef USE_TCP_FASTOPEN
 #include <netinet/tcp.h>
 #endif

From 26aa550bd246079b26366627fecbbe7d6e30dabd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 12 Nov 2020 12:27:41 +0100
Subject: [PATCH 077/208] - Fix to connect() to UDP destinations, default
 turned on,   this lowers vulnerability to ICMP side channels.

---
 services/outside_network.c | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 41a1d83f1..cef76053c 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1115,13 +1115,23 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 		my_if = ub_random_max(outnet->rnd, num_if);
 		pif = &ifs[my_if];
 #ifndef DISABLE_EXPLICIT_PORT_RANDOMISATION
-		my_port = ub_random_max(outnet->rnd, pif->avail_total);
-		if(my_port < pif->inuse) {
-			/* port already open */
-			pend->pc = pif->out[my_port];
-			verbose(VERB_ALGO, "using UDP if=%d port=%d", 
-				my_if, pend->pc->number);
-			break;
+		if(1) {
+			/* if we connect() we cannot reuse fds for a port */
+			if(pif->inuse >= pif->avail_total) {
+				log_err("failed to find an open port, drop msg");
+				return 0;
+			}
+			my_port = pif->inuse + ub_random_max(outnet->rnd,
+				pif->avail_total - pif->inuse);
+		} else  {
+			my_port = ub_random_max(outnet->rnd, pif->avail_total);
+			if(my_port < pif->inuse) {
+				/* port already open */
+				pend->pc = pif->out[my_port];
+				verbose(VERB_ALGO, "using UDP if=%d port=%d",
+					my_if, pend->pc->number);
+				break;
+			}
 		}
 		/* try to open new port, if fails, loop to try again */
 		log_assert(pif->inuse < pif->maxout);
@@ -1138,6 +1148,17 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 		if(fd != -1) {
 			verbose(VERB_ALGO, "opened UDP if=%d port=%d", 
 				my_if, portno);
+			if(1) {
+				/* connect() to the destination */
+				if(connect(fd, (struct sockaddr*)&pend->addr,
+					pend->addrlen) < 0) {
+					log_err_addr("udp connect failed",
+						strerror(errno), &pend->addr,
+						pend->addrlen);
+					sock_close(fd);
+					return 0;
+				}
+			}
 			/* grab fd */
 			pend->pc = outnet->unused_fds;
 			outnet->unused_fds = pend->pc->next;

From 48b40b305a946c590a005a1923070b95b5b61c3c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 12 Nov 2020 12:28:10 +0100
Subject: [PATCH 078/208] Changelog note.

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

diff --git a/doc/Changelog b/doc/Changelog
index 47fcd9178..e9b8649fd 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+12 November 2020: Wouter
+	- Fix to connect() to UDP destinations, default turned on,
+	  this lowers vulnerability to ICMP side channels.
+
 10 November 2020: Wouter
 	- Fix #341: fixing a possible memory leak.
 	- Fix memory leak after fix for possible memory leak failure.

From b891fe113ca9d9a2a19552531d8e91b8dcf02164 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 12 Nov 2020 13:36:37 +0100
Subject: [PATCH 079/208] - Retry for interfaces with unused ports if possible.

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

diff --git a/doc/Changelog b/doc/Changelog
index e9b8649fd..613d14cb7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 12 November 2020: Wouter
 	- Fix to connect() to UDP destinations, default turned on,
 	  this lowers vulnerability to ICMP side channels.
+	- Retry for interfaces with unused ports if possible.
 
 10 November 2020: Wouter
 	- Fix #341: fixing a possible memory leak.
diff --git a/services/outside_network.c b/services/outside_network.c
index cef76053c..d184da545 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1118,6 +1118,9 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 		if(1) {
 			/* if we connect() we cannot reuse fds for a port */
 			if(pif->inuse >= pif->avail_total) {
+				tries++;
+				if(tries < MAX_PORT_RETRY)
+					continue;
 				log_err("failed to find an open port, drop msg");
 				return 0;
 			}

From c48f01445e22686a0cb83451ab055cb405940b58 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Sat, 21 Nov 2020 14:10:39 +0100
Subject: [PATCH 080/208] Add AF_NETLINK to set of allowed socket address
 families

contrib/unbound{,_portable}.service.in:
With the changes introduced in f6a527c25ad2e60e2dc129fff3605e6ec48c30f2
it is now necessary to also allow access to the AF_NETLINK socket
address family to be able to get information from interfaces.

Without the AF_NETLINK address family the systemd service errors with:

```
error: failed to list interfaces: getifaddrs: Address family not
supported by protocol
```

Fixes #350
---
 contrib/unbound.service.in          | 2 +-
 contrib/unbound_portable.service.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in
index c95ab94b3..a4596978d 100644
--- a/contrib/unbound.service.in
+++ b/contrib/unbound.service.in
@@ -66,7 +66,7 @@ ProtectSystem=strict
 RuntimeDirectory=unbound
 ConfigurationDirectory=unbound
 StateDirectory=unbound
-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX
 RestrictRealtime=true
 SystemCallArchitectures=native
 SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources
diff --git a/contrib/unbound_portable.service.in b/contrib/unbound_portable.service.in
index 998b66dec..e763763f0 100644
--- a/contrib/unbound_portable.service.in
+++ b/contrib/unbound_portable.service.in
@@ -38,7 +38,7 @@ ProtectSystem=strict
 RuntimeDirectory=unbound
 ConfigurationDirectory=unbound
 StateDirectory=unbound
-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX
 RestrictRealtime=true
 SystemCallArchitectures=native
 SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources

From 097e530c49ef418fdfe423a6557a374cae2cc95e Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 08:58:41 +0100
Subject: [PATCH 081/208] Changelog notes for #350 and #351 - Merge #351 from
 dvzrv: Add AF_NETLINK to set of allowed socket   address families. - Fix
 #350: with the AF_NETLINK permission, to fix 1.12.0 error:   failed to list
 interfaces: getifaddrs: Address family not   supported by protocol.

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

diff --git a/doc/Changelog b/doc/Changelog
index 613d14cb7..a4c4792ff 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,10 @@
+23 November 2020: Wouter
+	- Merge #351 from dvzrv: Add AF_NETLINK to set of allowed socket
+	  address families.
+	- Fix #350: with the AF_NETLINK permission, to fix 1.12.0 error:
+	  failed to list interfaces: getifaddrs: Address family not
+	  supported by protocol.
+
 12 November 2020: Wouter
 	- Fix to connect() to UDP destinations, default turned on,
 	  this lowers vulnerability to ICMP side channels.

From d83b1979c49ba24ea97afca25a2551c993f671e4 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:29:26 +0100
Subject: [PATCH 082/208] stream reuse, debug output with verbose level instead
 of number.

---
 services/outside_network.c | 70 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 201489f62..a949846a2 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -423,14 +423,14 @@ tree_by_id_get_id(rbnode_type* node)
 static int
 reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 {
-	log_reuse_tcp(5, "reuse_tcp_insert", &pend_tcp->reuse);
+	log_reuse_tcp(VERB_CLIENT, "reuse_tcp_insert", &pend_tcp->reuse);
 	if(pend_tcp->reuse.item_on_lru_list)
 		return 1;
 	pend_tcp->reuse.node.key = &pend_tcp->reuse;
 	pend_tcp->reuse.pending = pend_tcp;
 	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
 		/* this is a duplicate connection, close this one */
-		verbose(5, "reuse_tcp_insert: duplicate connection");
+		verbose(VERB_CLIENT, "reuse_tcp_insert: duplicate connection");
 		pend_tcp->reuse.node.key = NULL;
 		return 0;
 	}
@@ -457,7 +457,7 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
 	struct pending_tcp key_p;
 	struct comm_point c;
 	rbnode_type* result = NULL, *prev;
-	verbose(5, "reuse_tcp_find");
+	verbose(VERB_CLIENT, "reuse_tcp_find");
 	memset(&key_w, 0, sizeof(key_w));
 	memset(&key_p, 0, sizeof(key_p));
 	memset(&c, 0, sizeof(c));
@@ -472,7 +472,7 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
 	memmove(&key_p.reuse.addr, addr, addrlen);
 	key_p.reuse.addrlen = addrlen;
 
-	verbose(5, "reuse_tcp_find: num reuse streams %u",
+	verbose(VERB_CLIENT, "reuse_tcp_find: num reuse streams %u",
 		(unsigned)outnet->tcp_reuse.count);
 	if(outnet->tcp_reuse.root == NULL ||
 		outnet->tcp_reuse.root == RBTREE_NULL)
@@ -487,7 +487,7 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
 	/* not found, return null */
 	if(!result || result == RBTREE_NULL)
 		return NULL;
-	verbose(5, "reuse_tcp_find check inexact match");
+	verbose(VERB_CLIENT, "reuse_tcp_find check inexact match");
 	/* inexact match, find one of possibly several connections to the
 	 * same destination address, with the correct port, ssl, and
 	 * also less than max number of open queries, or else, fail to open
@@ -520,7 +520,7 @@ outnet_tcp_take_query_setup(int s, struct pending_tcp* pend,
 	struct waiting_tcp* w)
 {
 	struct timeval tv;
-	verbose(5, "outnet_tcp_take_query_setup: setup packet to write "
+	verbose(VERB_CLIENT, "outnet_tcp_take_query_setup: setup packet to write "
 		"len %d timeout %d msec",
 		(int)w->pkt_len, w->timeout);
 	pend->c->tcp_write_pkt = w->pkt;
@@ -716,7 +716,7 @@ use_free_buffer(struct outside_network* outnet)
 		reuse = reuse_tcp_find(outnet, &w->addr, w->addrlen,
 			w->ssl_upstream);
 		if(reuse) {
-			log_reuse_tcp(5, "use free buffer for waiting tcp: "
+			log_reuse_tcp(VERB_CLIENT, "use free buffer for waiting tcp: "
 				"found reuse", reuse);
 			reuse_tcp_lru_touch(outnet, reuse);
 			comm_timer_disable(w->timer);
@@ -795,7 +795,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 			dname_valid(pend->query->pkt+12, pend->query->pkt_len-12)) {
 			char buf[LDNS_MAX_DOMAINLEN+1];
 			dname_str(pend->query->pkt+12, buf);
-			verbose(5, "reuse_move_writewait_away current %s %d bytes were written",
+			verbose(VERB_CLIENT, "reuse_move_writewait_away current %s %d bytes were written",
 				buf, (int)pend->c->tcp_write_byte_count);
 		}
 		pend->c->tcp_write_pkt = NULL;
@@ -820,7 +820,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 			dname_valid(w->pkt+12, w->pkt_len-12)) {
 			char buf[LDNS_MAX_DOMAINLEN+1];
 			dname_str(w->pkt+12, buf);
-			verbose(5, "reuse_move_writewait_away item %s", buf);
+			verbose(VERB_CLIENT, "reuse_move_writewait_away item %s", buf);
 		}
 		reuse_tree_by_id_delete(&pend->reuse, w);
 		outnet_add_tcp_waiting(outnet, w);
@@ -832,7 +832,7 @@ static void
 reuse_tcp_remove_tree_list(struct outside_network* outnet,
 	struct reuse_tcp* reuse)
 {
-	verbose(5, "reuse_tcp_remove_tree_list");
+	verbose(VERB_CLIENT, "reuse_tcp_remove_tree_list");
 	if(reuse->node.key) {
 		/* delete it from reuse tree */
 		(void)rbtree_delete(&outnet->tcp_reuse, &reuse->node);
@@ -885,7 +885,7 @@ static void
 decommission_pending_tcp(struct outside_network* outnet, 
 	struct pending_tcp* pend)
 {
-	verbose(5, "decommission_pending_tcp");
+	verbose(VERB_CLIENT, "decommission_pending_tcp");
 	if(pend->c->ssl) {
 #ifdef HAVE_SSL
 		SSL_shutdown(pend->c->ssl);
@@ -946,7 +946,7 @@ static void reuse_cb_and_decommission(struct outside_network* outnet,
 static void
 reuse_tcp_setup_timeout(struct pending_tcp* pend_tcp)
 {
-	log_reuse_tcp(5, "reuse_tcp_setup_timeout", &pend_tcp->reuse);
+	log_reuse_tcp(VERB_CLIENT, "reuse_tcp_setup_timeout", &pend_tcp->reuse);
 	comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT);
 }
 
@@ -954,7 +954,7 @@ reuse_tcp_setup_timeout(struct pending_tcp* pend_tcp)
 static void
 reuse_tcp_setup_read_and_timeout(struct pending_tcp* pend_tcp)
 {
-	log_reuse_tcp(5, "reuse_tcp_setup_readtimeout", &pend_tcp->reuse);
+	log_reuse_tcp(VERB_CLIENT, "reuse_tcp_setup_readtimeout", &pend_tcp->reuse);
 	sldns_buffer_clear(pend_tcp->c->buffer);
 	pend_tcp->c->tcp_is_reading = 1;
 	pend_tcp->c->tcp_byte_count = 0;
@@ -1049,14 +1049,14 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	}
 	if(w) {
 		reuse_tree_by_id_delete(&pend->reuse, w);
-		verbose(5, "outnet tcp callback query err %d buflen %d",
+		verbose(VERB_CLIENT, "outnet tcp callback query err %d buflen %d",
 			error, (int)sldns_buffer_limit(c->buffer));
 		waiting_tcp_callback(w, c, error, reply_info);
 		waiting_tcp_delete(w);
 	}
-	verbose(5, "outnet_tcp_cb reuse after cb");
+	verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb");
 	if(error == NETEVENT_NOERROR && pend->reuse.node.key) {
-		verbose(5, "outnet_tcp_cb reuse after cb: keep it");
+		verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb: keep it");
 		/* it is in the reuse_tcp tree, with other queries, or
 		 * on the empty list. do not decommission it */
 		/* if there are more outstanding queries, we could try to
@@ -1068,7 +1068,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		reuse_tcp_setup_read_and_timeout(pend);
 		return 0;
 	}
-	verbose(5, "outnet_tcp_cb reuse after cb: decommission it");
+	verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb: decommission it");
 	/* no queries on it, no space to keep it. or timeout or closed due
 	 * to error.  Close it */
 	reuse_cb_and_decommission(outnet, pend, (error==NETEVENT_TIMEOUT?
@@ -1899,7 +1899,7 @@ outnet_tcptimer(void* arg)
 {
 	struct waiting_tcp* w = (struct waiting_tcp*)arg;
 	struct outside_network* outnet = w->outnet;
-	verbose(5, "outnet_tcptimer");
+	verbose(VERB_CLIENT, "outnet_tcptimer");
 	if(w->on_tcp_waiting_list) {
 		/* it is on the waiting list */
 		waiting_list_remove(outnet, w);
@@ -1919,7 +1919,7 @@ static void
 reuse_tcp_close_oldest(struct outside_network* outnet)
 {
 	struct pending_tcp* pend;
-	verbose(5, "reuse_tcp_close_oldest");
+	verbose(VERB_CLIENT, "reuse_tcp_close_oldest");
 	if(!outnet->tcp_reuse_last) return;
 	pend = outnet->tcp_reuse_last->pending;
 
@@ -2016,9 +2016,9 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	struct reuse_tcp* reuse = NULL;
 	struct waiting_tcp* w;
 
-	verbose(5, "pending_tcp_query");
+	verbose(VERB_CLIENT, "pending_tcp_query");
 	if(sldns_buffer_limit(packet) < sizeof(uint16_t)) {
-		verbose(4, "pending tcp query with too short buffer < 2");
+		verbose(VERB_ALGO, "pending tcp query with too short buffer < 2");
 		return NULL;
 	}
 
@@ -2027,7 +2027,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 	reuse = reuse_tcp_find(sq->outnet, &sq->addr, sq->addrlen,
 		sq->ssl_upstream);
 	if(reuse) {
-		log_reuse_tcp(5, "pending_tcp_query: found reuse", reuse);
+		log_reuse_tcp(VERB_CLIENT, "pending_tcp_query: found reuse", reuse);
 		log_assert(reuse->pending);
 		pend = reuse->pending;
 		reuse_tcp_lru_touch(sq->outnet, reuse);
@@ -2079,7 +2079,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		if(reuse) {
 			/* reuse existing fd, write query and continue */
 			/* store query in tree by id */
-			verbose(5, "pending_tcp_query: reuse, store");
+			verbose(VERB_CLIENT, "pending_tcp_query: reuse, store");
 			w->next_waiting = (void*)pend;
 			reuse_tree_by_id_insert(&pend->reuse, w);
 			/* can we write right now? */
@@ -2098,7 +2098,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		} else {
 			/* create new fd and connect to addr, setup to
 			 * write query */
-			verbose(5, "pending_tcp_query: new fd, connect");
+			verbose(VERB_CLIENT, "pending_tcp_query: new fd, connect");
 			rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
 			pend->reuse.pending = pend;
 			memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen);
@@ -2112,7 +2112,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 		/* queue up */
 		/* waiting for a buffer on the outside network buffer wait
 		 * list */
-		verbose(5, "pending_tcp_query: queue to wait");
+		verbose(VERB_CLIENT, "pending_tcp_query: queue to wait");
 		outnet_add_tcp_waiting(sq->outnet, w);
 	}
 #ifdef USE_DNSTAP
@@ -2262,7 +2262,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	struct serviced_query* sq)
 {
 	struct pending_tcp* pend_tcp = (struct pending_tcp*)w->next_waiting;
-	verbose(5, "reuse_tcp_remove_serviced_keep");
+	verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep");
 	/* remove the callback. let query continue to write to not cancel
 	 * the stream itself.  also keep it as an entry in the tree_by_id,
 	 * in case the answer returns (that we no longer want), but we cannot
@@ -2273,12 +2273,12 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	/* see if can be entered in reuse tree
 	 * for that the FD has to be non-1 */
 	if(pend_tcp->c->fd == -1) {
-		verbose(5, "reuse_tcp_remove_serviced_keep: -1 fd");
+		verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: -1 fd");
 		return 0;
 	}
 	/* if in tree and used by other queries */
 	if(pend_tcp->reuse.node.key) {
-		verbose(5, "reuse_tcp_remove_serviced_keep: in use by other queries");
+		verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: in use by other queries");
 		/* do not reset the keepalive timer, for that
 		 * we'd need traffic, and this is where the serviced is
 		 * removed due to state machine internal reasons,
@@ -2288,7 +2288,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	/* if still open and want to keep it open */
 	if(pend_tcp->c->fd != -1 && sq->outnet->tcp_reuse.count <
 		sq->outnet->tcp_reuse_max) {
-		verbose(5, "reuse_tcp_remove_serviced_keep: keep open");
+		verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: keep open");
 		/* set a keepalive timer on it */
 		if(!reuse_tcp_insert(sq->outnet, pend_tcp)) {
 			return 0;
@@ -2303,7 +2303,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 static void
 serviced_delete(struct serviced_query* sq)
 {
-	verbose(5, "serviced_delete");
+	verbose(VERB_CLIENT, "serviced_delete");
 	if(sq->pending) {
 		/* clear up the pending query */
 		if(sq->status == serviced_query_UDP_EDNS ||
@@ -2311,7 +2311,7 @@ serviced_delete(struct serviced_query* sq)
 			sq->status == serviced_query_UDP_EDNS_FRAG ||
 			sq->status == serviced_query_UDP_EDNS_fallback) {
 			struct pending* p = (struct pending*)sq->pending;
-			verbose(5, "serviced_delete: UDP");
+			verbose(VERB_CLIENT, "serviced_delete: UDP");
 			if(p->pc)
 				portcomm_loweruse(sq->outnet, p->pc);
 			pending_delete(sq->outnet, p);
@@ -2321,20 +2321,20 @@ serviced_delete(struct serviced_query* sq)
 		} else {
 			struct waiting_tcp* w = (struct waiting_tcp*)
 				sq->pending;
-			verbose(5, "serviced_delete: TCP");
+			verbose(VERB_CLIENT, "serviced_delete: TCP");
 			/* if on stream-write-waiting list then
 			 * remove from waiting list and waiting_tcp_delete */
 			if(w->write_wait_queued) {
 				struct pending_tcp* pend =
 					(struct pending_tcp*)w->next_waiting;
-				verbose(5, "serviced_delete: writewait");
+				verbose(VERB_CLIENT, "serviced_delete: writewait");
 				reuse_tree_by_id_delete(&pend->reuse, w);
 				reuse_write_wait_remove(&pend->reuse, w);
 				waiting_tcp_delete(w);
 			} else if(!w->on_tcp_waiting_list) {
 				struct pending_tcp* pend =
 					(struct pending_tcp*)w->next_waiting;
-				verbose(5, "serviced_delete: tcpreusekeep");
+				verbose(VERB_CLIENT, "serviced_delete: tcpreusekeep");
 				if(!reuse_tcp_remove_serviced_keep(w, sq)) {
 					reuse_cb_and_decommission(sq->outnet,
 						pend, NETEVENT_CLOSED);
@@ -2342,7 +2342,7 @@ serviced_delete(struct serviced_query* sq)
 				}
 				sq->pending = NULL;
 			} else {
-				verbose(5, "serviced_delete: tcpwait");
+				verbose(VERB_CLIENT, "serviced_delete: tcpwait");
 				waiting_list_remove(sq->outnet, w);
 				waiting_tcp_delete(w);
 			}

From 6ded710013c6a10b76c200b51080f57a220e922c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:33:28 +0100
Subject: [PATCH 083/208] stream reuse, renamed ssl_reuse.tdir to
 tls_reuse.tdir.

---
 .../ssl_reuse.conf => tls_reuse.tdir/tls_reuse.conf}              | 0
 .../ssl_reuse.conf2 => tls_reuse.tdir/tls_reuse.conf2}            | 0
 .../ssl_reuse.dsc => tls_reuse.tdir/tls_reuse.dsc}                | 0
 .../ssl_reuse.post => tls_reuse.tdir/tls_reuse.post}              | 0
 .../ssl_reuse.pre => tls_reuse.tdir/tls_reuse.pre}                | 0
 .../ssl_reuse.test => tls_reuse.tdir/tls_reuse.test}              | 0
 testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_control.key   | 0
 testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_control.pem   | 0
 testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_server.key    | 0
 testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_server.pem    | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename testdata/{ssl_reuse.tdir/ssl_reuse.conf => tls_reuse.tdir/tls_reuse.conf} (100%)
 rename testdata/{ssl_reuse.tdir/ssl_reuse.conf2 => tls_reuse.tdir/tls_reuse.conf2} (100%)
 rename testdata/{ssl_reuse.tdir/ssl_reuse.dsc => tls_reuse.tdir/tls_reuse.dsc} (100%)
 rename testdata/{ssl_reuse.tdir/ssl_reuse.post => tls_reuse.tdir/tls_reuse.post} (100%)
 rename testdata/{ssl_reuse.tdir/ssl_reuse.pre => tls_reuse.tdir/tls_reuse.pre} (100%)
 rename testdata/{ssl_reuse.tdir/ssl_reuse.test => tls_reuse.tdir/tls_reuse.test} (100%)
 rename testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_control.key (100%)
 rename testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_control.pem (100%)
 rename testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_server.key (100%)
 rename testdata/{ssl_reuse.tdir => tls_reuse.tdir}/unbound_server.pem (100%)

diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.conf b/testdata/tls_reuse.tdir/tls_reuse.conf
similarity index 100%
rename from testdata/ssl_reuse.tdir/ssl_reuse.conf
rename to testdata/tls_reuse.tdir/tls_reuse.conf
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.conf2 b/testdata/tls_reuse.tdir/tls_reuse.conf2
similarity index 100%
rename from testdata/ssl_reuse.tdir/ssl_reuse.conf2
rename to testdata/tls_reuse.tdir/tls_reuse.conf2
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.dsc b/testdata/tls_reuse.tdir/tls_reuse.dsc
similarity index 100%
rename from testdata/ssl_reuse.tdir/ssl_reuse.dsc
rename to testdata/tls_reuse.tdir/tls_reuse.dsc
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.post b/testdata/tls_reuse.tdir/tls_reuse.post
similarity index 100%
rename from testdata/ssl_reuse.tdir/ssl_reuse.post
rename to testdata/tls_reuse.tdir/tls_reuse.post
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre
similarity index 100%
rename from testdata/ssl_reuse.tdir/ssl_reuse.pre
rename to testdata/tls_reuse.tdir/tls_reuse.pre
diff --git a/testdata/ssl_reuse.tdir/ssl_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test
similarity index 100%
rename from testdata/ssl_reuse.tdir/ssl_reuse.test
rename to testdata/tls_reuse.tdir/tls_reuse.test
diff --git a/testdata/ssl_reuse.tdir/unbound_control.key b/testdata/tls_reuse.tdir/unbound_control.key
similarity index 100%
rename from testdata/ssl_reuse.tdir/unbound_control.key
rename to testdata/tls_reuse.tdir/unbound_control.key
diff --git a/testdata/ssl_reuse.tdir/unbound_control.pem b/testdata/tls_reuse.tdir/unbound_control.pem
similarity index 100%
rename from testdata/ssl_reuse.tdir/unbound_control.pem
rename to testdata/tls_reuse.tdir/unbound_control.pem
diff --git a/testdata/ssl_reuse.tdir/unbound_server.key b/testdata/tls_reuse.tdir/unbound_server.key
similarity index 100%
rename from testdata/ssl_reuse.tdir/unbound_server.key
rename to testdata/tls_reuse.tdir/unbound_server.key
diff --git a/testdata/ssl_reuse.tdir/unbound_server.pem b/testdata/tls_reuse.tdir/unbound_server.pem
similarity index 100%
rename from testdata/ssl_reuse.tdir/unbound_server.pem
rename to testdata/tls_reuse.tdir/unbound_server.pem

From fd94b0bc9befe5db80cc041a42cf66fe98724cf9 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:35:58 +0100
Subject: [PATCH 084/208] stream reuse, rename ssl_reuse test to tls_reuse
 test.

---
 testdata/tls_reuse.tdir/tls_reuse.dsc  | 10 +++++-----
 testdata/tls_reuse.tdir/tls_reuse.post |  2 +-
 testdata/tls_reuse.tdir/tls_reuse.pre  |  6 +++---
 testdata/tls_reuse.tdir/tls_reuse.test |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testdata/tls_reuse.tdir/tls_reuse.dsc b/testdata/tls_reuse.tdir/tls_reuse.dsc
index ab2b67f66..76a80cdad 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.dsc
+++ b/testdata/tls_reuse.tdir/tls_reuse.dsc
@@ -1,6 +1,6 @@
-BaseName: ssl_reuse
+BaseName: tls_reuse
 Version: 1.0
-Description: Test ssl stream reuse.
+Description: Test tls stream reuse.
 CreationDate: Wed Jun 30 16:37:00 CET 2020
 Maintainer: Wouter Wijngaards
 Category: 
@@ -8,9 +8,9 @@ Component:
 CmdDepends: 
 Depends: 
 Help:
-Pre: ssl_reuse.pre
-Post: ssl_reuse.post
-Test: ssl_reuse.test
+Pre: tls_reuse.pre
+Post: tls_reuse.post
+Test: tls_reuse.test
 AuxFiles: 
 Passed:
 Failure:
diff --git a/testdata/tls_reuse.tdir/tls_reuse.post b/testdata/tls_reuse.tdir/tls_reuse.post
index 4337af204..2eef0da96 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.post
+++ b/testdata/tls_reuse.tdir/tls_reuse.post
@@ -1,4 +1,4 @@
-# #-- ssl_reuse.post --#
+# #-- tls_reuse.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
diff --git a/testdata/tls_reuse.tdir/tls_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre
index 048ca6813..ddd6ff4d3 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.pre
+++ b/testdata/tls_reuse.tdir/tls_reuse.pre
@@ -1,4 +1,4 @@
-# #-- ssl_reuse.pre--#
+# #-- tls_reuse.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
@@ -13,7 +13,7 @@ echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 
 # make config file
-sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf > ub.conf
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf > ub.conf
 # start unbound in the background
 #$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
 valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
@@ -22,7 +22,7 @@ echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log
 
 # make upstream config file
-sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < ssl_reuse.conf2 > ub2.conf
+sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf2 > ub2.conf
 # start upstream unbound in the background
 #$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
 $PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
diff --git a/testdata/tls_reuse.tdir/tls_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test
index d0106c17e..fe488cbb2 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.test
+++ b/testdata/tls_reuse.tdir/tls_reuse.test
@@ -1,4 +1,4 @@
-# #-- ssl_reuse.test --#
+# #-- tls_reuse.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

From 6f4c79ab95a0f9cd7683b316a114507988e46066 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:37:26 +0100
Subject: [PATCH 085/208] stream reuse, fix review comments.

---
 services/outside_network.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index a949846a2..a6d787e6d 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -790,7 +790,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		pend->c->tcp_write_pkt_len == pend->query->pkt_len) {
 		/* since the current query is not written, it can also
 		 * move to a free buffer */
-		if(verbosity >= 5 && pend->query->pkt_len > 12+2+2 &&
+		if(verbosity >= VERB_CLIENT && pend->query->pkt_len > 12+2+2 &&
 			LDNS_QDCOUNT(pend->query->pkt) > 0 &&
 			dname_valid(pend->query->pkt+12, pend->query->pkt_len-12)) {
 			char buf[LDNS_MAX_DOMAINLEN+1];
@@ -815,7 +815,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		outnet_add_tcp_waiting(outnet, w);
 	}
 	while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) {
-		if(verbosity >= 5 && w->pkt_len > 12+2+2 &&
+		if(verbosity >= VERB_CLIENT && w->pkt_len > 12+2+2 &&
 			LDNS_QDCOUNT(w->pkt) > 0 &&
 			dname_valid(w->pkt+12, w->pkt_len-12)) {
 			char buf[LDNS_MAX_DOMAINLEN+1];

From 8143ce6967f640f3b538c180ca92b41e1b7c9b06 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:40:15 +0100
Subject: [PATCH 086/208] stream reuse, review comments.

---
 services/outside_network.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index a6d787e6d..d0dac9087 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -971,16 +971,17 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 	struct waiting_tcp* w = NULL;
 	verbose(VERB_ALGO, "outnettcp cb");
 	if(error == NETEVENT_TIMEOUT) {
-		if(pend->c->tcp_write_and_read)
+		if(pend->c->tcp_write_and_read) {
 			verbose(VERB_QUERY, "outnettcp got tcp timeout "
 				"for read, ignored because write underway");
-		else verbose(VERB_QUERY, "outnettcp got tcp timeout %s",
-			(pend->reuse.tree_by_id.count?"for reading pkt":
-			"for keepalive for reuse"));
-		/* if we are writing, ignore readtimer, wait for write timer
-		 * or write is done */
-		if(pend->c->tcp_write_and_read)
+			/* if we are writing, ignore readtimer, wait for write timer
+			 * or write is done */
 			return 0;
+		} else {
+			verbose(VERB_QUERY, "outnettcp got tcp timeout %s",
+				(pend->reuse.tree_by_id.count?"for reading pkt":
+				"for keepalive for reuse"));
+		}
 		/* must be timeout for reading or keepalive reuse,
 		 * close it. */
 		reuse_tcp_remove_tree_list(outnet, &pend->reuse);

From 4445d9c5aa0d0b5d53355e8e371ecb91f3c6f60f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:44:56 +0100
Subject: [PATCH 087/208] stream reuse, fix review comments.

---
 services/outside_network.h             | 7 +++++--
 testdata/tls_reuse.tdir/tls_reuse.conf | 2 +-
 testdata/tls_reuse.tdir/tls_reuse.test | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/outside_network.h b/services/outside_network.h
index 5ca074183..15b33094f 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -233,8 +233,11 @@ struct port_comm {
 struct reuse_tcp {
 	/** rbtree node with links in tcp_reuse tree. key is NULL when not
 	 * in tree. Both active and empty connections are in the tree.
-	 * key is this structure, the sockaddr and and then is-ssl bool,
-	 * and then ptr value for several times same address in tree */
+	 * key is a pointer to this structure, the members used to compare
+	 * are the sockaddr and and then is-ssl bool, and then ptr value is
+	 * used in case the same address exists several times in the tree
+	 * when there are multiple connections to the same destination to
+	 * make the rbtree items unique. */
 	rbnode_type node;
 	/** the key for the tcp_reuse tree. address of peer, ip4 or ip6,
 	 * and port number of peer */
diff --git a/testdata/tls_reuse.tdir/tls_reuse.conf b/testdata/tls_reuse.tdir/tls_reuse.conf
index 52857ca37..e8200b28b 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.conf
+++ b/testdata/tls_reuse.tdir/tls_reuse.conf
@@ -11,7 +11,7 @@ server:
 	do-not-query-localhost: no
 
 	tls-cert-bundle: "unbound_server.pem"
-	ssl-upstream: yes
+	tls-upstream: yes
 
 forward-zone:
 	name: "."
diff --git a/testdata/tls_reuse.tdir/tls_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test
index fe488cbb2..0f392fba8 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.test
+++ b/testdata/tls_reuse.tdir/tls_reuse.test
@@ -190,7 +190,7 @@ for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
 done
 
 # make the server timeout to drop the upstream connection
-echo "> sleep 20"
+echo "> sleep 15"
 sleep 15
 # see if we are still up.
 echo "> query a7.more.net"

From dde9fade2630afa353573379b193cc665efdab66 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:46:26 +0100
Subject: [PATCH 088/208] stream reuse, fix review comments.

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

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index e98afe0e6..b62ec0d19 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -190,7 +190,7 @@ for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do
 done
 
 # make the server timeout to drop the upstream connection
-echo "> sleep 20"
+echo "> sleep 15"
 sleep 15
 # see if we are still up.
 echo "> query a7.more.net"

From cca128b871d7e74fec1496149fefebeb4fa6a8ce Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 09:56:01 +0100
Subject: [PATCH 089/208] +       - Fix #347: IP_DONTFRAG broken on Apple xcode
 12.2.

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

diff --git a/doc/Changelog b/doc/Changelog
index a4c4792ff..8ac0d50e4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix #350: with the AF_NETLINK permission, to fix 1.12.0 error:
 	  failed to list interfaces: getifaddrs: Address family not
 	  supported by protocol.
+	- Fix #347: IP_DONTFRAG broken on Apple xcode 12.2.
 
 12 November 2020: Wouter
 	- Fix to connect() to UDP destinations, default turned on,
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 10a7aec60..bd87aac56 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -531,7 +531,9 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
 				return -1;
 			}
 		}
-#  elif defined(IP_DONTFRAG)
+#  elif defined(IP_DONTFRAG) && !defined(__APPLE__)
+		/* the IP_DONTFRAG option if defined in the 11.0 OSX headers,
+		 * but does not work on that version, so we exclude it */
 		int off = 0;
 		if (setsockopt(s, IPPROTO_IP, IP_DONTFRAG, 
 			&off, (socklen_t)sizeof(off)) < 0) {

From 6b97cb1dd127125f99ac44df62bfcfc07b5fe1c3 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 10:36:22 +0100
Subject: [PATCH 090/208] stream reuse, up connection reuse time to 60 seconds.

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

diff --git a/services/outside_network.h b/services/outside_network.h
index 15b33094f..c90f9d02d 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -281,7 +281,7 @@ struct reuse_tcp {
 /** max number of queries on a reuse connection */
 #define MAX_REUSE_TCP_QUERIES 200
 /** timeout for REUSE entries in milliseconds. */
-#define REUSE_TIMEOUT 30000
+#define REUSE_TIMEOUT 60000
 
 /**
  * A query that has an answer pending for it.

From 9cc8aa1ddfc42ec9e8dc0607f1f051c89de55c65 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 11:06:53 +0100
Subject: [PATCH 091/208] - Option to toggle udp-connect, default is enabled.

---
 daemon/worker.c            |    2 +-
 doc/Changelog              |    1 +
 doc/example.conf.in        |    3 +
 doc/unbound.conf.5.in      |    4 +
 libunbound/libworker.c     |    2 +-
 services/outside_network.c |   10 +-
 services/outside_network.h |    7 +-
 testcode/fake_event.c      |    2 +-
 util/config_file.c         |    3 +
 util/config_file.h         |    2 +
 util/configlexer.c         | 4874 ++++++++++++++++++------------------
 util/configlexer.lex       |    1 +
 util/configparser.c        | 3182 +++++++++++------------
 util/configparser.h        |  596 ++---
 util/configparser.y        |   13 +-
 15 files changed, 4382 insertions(+), 4320 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 458afa04e..427ab4a92 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1807,7 +1807,7 @@ worker_init(struct worker* worker, struct config_file *cfg,
 		&worker_alloc_cleanup, worker,
 		cfg->do_udp || cfg->udp_upstream_without_downstream,
 		worker->daemon->connect_sslctx, cfg->delay_close,
-		cfg->tls_use_sni, dtenv);
+		cfg->tls_use_sni, dtenv, cfg->udp_connect);
 	if(!worker->back) {
 		log_err("could not create outgoing sockets");
 		worker_delete(worker);
diff --git a/doc/Changelog b/doc/Changelog
index 8ac0d50e4..cfaa3d098 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	  failed to list interfaces: getifaddrs: Address family not
 	  supported by protocol.
 	- Fix #347: IP_DONTFRAG broken on Apple xcode 12.2.
+	- Option to toggle udp-connect, default is enabled.
 
 12 November 2020: Wouter
 	- Fix to connect() to UDP destinations, default turned on,
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 85d475ea3..9269461cf 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -161,6 +161,9 @@ server:
 	# msec to wait before close of port on timeout UDP. 0 disables.
 	# delay-close: 0
 
+	# perform connect for UDP sockets to mitigate ICMP side channel.
+	# udp-connect: yes
+
 	# msec for waiting for an unknown server to reply.  Increase if you
 	# are behind a slow satellite link, to eg. 1128.
 	# unknown-server-time-limit: 376
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 84805f90f..8b15fbaea 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -274,6 +274,10 @@ eg. 1500 msec.  When timeouts happen you need extra sockets, it checks
 the ID and remote IP of packets, and unwanted packets are added to the
 unwanted packet counter.
 .TP
+.B udp\-connect: \fI<yes or no>
+Perform connect for UDP sockets that mitigates ICMP side channel leakage.
+Default is yes.
+.TP
 .B unknown\-server\-time\-limit: \fI<msec>
 The wait time in msec for waiting for an unknown server to reply.
 Increase this if you are behind a slow satellite link, to eg. 1128.
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index bd42462e1..06cbb8869 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -238,7 +238,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 		ports, numports, cfg->unwanted_threshold,
 		cfg->outgoing_tcp_mss, &libworker_alloc_cleanup, w,
 		cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx,
-		cfg->delay_close, cfg->tls_use_sni, NULL);
+		cfg->delay_close, cfg->tls_use_sni, NULL, cfg->udp_connect);
 	w->env->outnet = w->back;
 	if(!w->is_bg || w->is_bg_thread) {
 		lock_basic_unlock(&ctx->cfglock);
diff --git a/services/outside_network.c b/services/outside_network.c
index d184da545..e06e4fcd3 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -723,7 +723,8 @@ outside_network_create(struct comm_base *base, size_t bufsize,
 	struct ub_randstate* rnd, int use_caps_for_id, int* availports, 
 	int numavailports, size_t unwanted_threshold, int tcp_mss,
 	void (*unwanted_action)(void*), void* unwanted_param, int do_udp,
-	void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv)
+	void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv,
+	int udp_connect)
 {
 	struct outside_network* outnet = (struct outside_network*)
 		calloc(1, sizeof(struct outside_network));
@@ -761,6 +762,9 @@ outside_network_create(struct comm_base *base, size_t bufsize,
 		outnet->delay_tv.tv_usec = (delayclose%1000)*1000;
 	}
 #endif
+	if(udp_connect) {
+		outnet->udp_connect = 1;
+	}
 	if(numavailports == 0 || num_ports == 0) {
 		log_err("no outgoing ports available");
 		outside_network_delete(outnet);
@@ -1115,7 +1119,7 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 		my_if = ub_random_max(outnet->rnd, num_if);
 		pif = &ifs[my_if];
 #ifndef DISABLE_EXPLICIT_PORT_RANDOMISATION
-		if(1) {
+		if(outnet->udp_connect) {
 			/* if we connect() we cannot reuse fds for a port */
 			if(pif->inuse >= pif->avail_total) {
 				tries++;
@@ -1151,7 +1155,7 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 		if(fd != -1) {
 			verbose(VERB_ALGO, "opened UDP if=%d port=%d", 
 				my_if, portno);
-			if(1) {
+			if(outnet->udp_connect) {
 				/* connect() to the destination */
 				if(connect(fd, (struct sockaddr*)&pend->addr,
 					pend->addrlen) < 0) {
diff --git a/services/outside_network.h b/services/outside_network.h
index c8f6d5724..76da03588 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -106,6 +106,9 @@ struct outside_network {
 	int delayclose;
 	/** timeout for delayclose */
 	struct timeval delay_tv;
+	/** if we perform udp-connect, connect() for UDP socket to mitigate
+	 * ICMP side channel leakage */
+	int udp_connect;
 
 	/** array of outgoing IP4 interfaces */
 	struct port_if* ip4_ifs;
@@ -421,6 +424,7 @@ struct serviced_query {
  * 	msec to wait on timeouted udp sockets.
  * @param tls_use_sni: if SNI is used for TLS connections.
  * @param dtenv: environment to send dnstap events with (if enabled).
+ * @param udp_connect: if the udp_connect option is enabled.
  * @return: the new structure (with no pending answers) or NULL on error.
  */
 struct outside_network* outside_network_create(struct comm_base* base,
@@ -429,7 +433,8 @@ struct outside_network* outside_network_create(struct comm_base* base,
 	struct ub_randstate* rnd, int use_caps_for_id, int* availports, 
 	int numavailports, size_t unwanted_threshold, int tcp_mss,
 	void (*unwanted_action)(void*), void* unwanted_param, int do_udp,
-	void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv);
+	void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv,
+	int udp_connect);
 
 /**
  * Delete outside_network structure.
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index e8fc84746..e6cc07f0c 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1045,7 +1045,7 @@ outside_network_create(struct comm_base* base, size_t bufsize,
 	void (*unwanted_action)(void*), void* ATTR_UNUSED(unwanted_param),
 	int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx),
 	int ATTR_UNUSED(delayclose), int ATTR_UNUSED(tls_use_sni),
-	struct dt_env* ATTR_UNUSED(dtenv))
+	struct dt_env* ATTR_UNUSED(dtenv), int ATTR_UNUSED(udp_connect))
 {
 	struct replay_runtime* runtime = (struct replay_runtime*)base;
 	struct outside_network* outnet =  calloc(1, 
diff --git a/util/config_file.c b/util/config_file.c
index 406911ecc..911b5716f 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -172,6 +172,7 @@ config_create(void)
 	cfg->infra_cache_min_rtt = 50;
 	cfg->infra_keep_probing = 0;
 	cfg->delay_close = 0;
+	cfg->udp_connect = 1;
 	if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int))))
 		goto error_exit;
 	init_outgoing_availports(cfg->outgoing_avail_ports, 65536);
@@ -569,6 +570,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_POW2("infra-cache-slabs:", infra_cache_slabs)
 	else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts)
 	else S_NUMBER_OR_ZERO("delay-close:", delay_close)
+	else S_YNO("udp-connect:", udp_connect)
 	else S_STR("chroot:", chrootdir)
 	else S_STR("username:", username)
 	else S_STR("directory:", directory)
@@ -964,6 +966,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_YNO(opt, "infra-keep-probing", infra_keep_probing)
 	else O_MEM(opt, "infra-cache-numhosts", infra_cache_numhosts)
 	else O_UNS(opt, "delay-close", delay_close)
+	else O_YNO(opt, "udp-connect", udp_connect)
 	else O_YNO(opt, "do-ip4", do_ip4)
 	else O_YNO(opt, "do-ip6", do_ip6)
 	else O_YNO(opt, "do-udp", do_udp)
diff --git a/util/config_file.h b/util/config_file.h
index a12a078f7..20fad68e8 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -185,6 +185,8 @@ struct config_file {
 	int infra_keep_probing;
 	/** delay close of udp-timeouted ports, if 0 no delayclose. in msec */
 	int delay_close;
+	/** udp_connect enable uses UDP connect to mitigate ICMP side channel */
+	int udp_connect;
 
 	/** the target fetch policy for the iterator */
 	char* target_fetch_policy;
diff --git a/util/configlexer.c b/util/configlexer.c
index 9fc565e0c..aac33c0b2 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 336
-#define YY_END_OF_BUFFER 337
+#define YY_NUM_RULES 337
+#define YY_END_OF_BUFFER 338
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,368 +363,369 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3281] =
+static const flex_int16_t yy_accept[3289] =
     {   0,
-        1,    1,  310,  310,  314,  314,  318,  318,  322,  322,
-        1,    1,  326,  326,  330,  330,  337,  334,    1,  308,
-      308,  335,    2,  335,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  310,  311,  311,  312,
-      335,  314,  315,  315,  316,  335,  321,  318,  319,  319,
-      320,  335,  322,  323,  323,  324,  335,  333,  309,    2,
-      313,  335,  333,  329,  326,  327,  327,  328,  335,  330,
-      331,  331,  332,  335,  334,    0,    1,    2,    2,    2,
-        2,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+        1,    1,  311,  311,  315,  315,  319,  319,  323,  323,
+        1,    1,  327,  327,  331,  331,  338,  335,    1,  309,
+      309,  336,    2,  336,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  311,  312,  312,  313,
+      336,  315,  316,  316,  317,  336,  322,  319,  320,  320,
+      321,  336,  323,  324,  324,  325,  336,  334,  310,    2,
+      314,  336,  334,  330,  327,  328,  328,  329,  336,  331,
+      332,  332,  333,  336,  335,    0,    1,    2,    2,    2,
+        2,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  310,    0,  314,
-        0,  321,    0,  318,  322,    0,  333,    0,    2,    2,
-      333,  329,    0,  326,  330,    0,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  311,    0,  315,
+        0,  322,    0,  319,  323,    0,  334,    0,    2,    2,
+      334,  330,    0,  327,  331,    0,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  333,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  334,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  124,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  133,  334,  334,  334,  334,  334,  334,
-      334,  333,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  125,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  134,  335,  335,  335,  335,  335,  335,
+      335,  334,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      108,  334,  334,  334,  334,  334,  334,    8,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  125,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      109,  335,  335,  335,  335,  335,  335,    8,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  126,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  138,  334,  333,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  301,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  139,  335,
+      334,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  302,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  333,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,   64,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  237,  334,   14,
-       15,  334,   19,   18,  334,  334,  221,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  131,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  334,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,   64,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  238,
+      335,   14,   15,  335,   19,   18,  335,  335,  222,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      132,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      219,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,    3,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  333,  334,  334,  334,  334,  334,  334,
-      334,  295,  334,  334,  294,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  220,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,    3,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  334,  335,  335,  335,
+      335,  335,  335,  335,  296,  335,  335,  295,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  317,  334,  334,  334,  334,  334,  334,  334,
-      334,   63,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,   67,  334,
-      268,  334,  334,  334,  334,  334,  334,  334,  334,  302,
-      303,  334,  334,  334,  334,  334,   68,  334,  334,  132,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  318,  335,  335,  335,  335,
+      335,  335,  335,  335,   63,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,   67,  335,  269,  335,  335,  335,  335,  335,  335,
+      335,  335,  303,  304,  335,  335,  335,  335,  335,   68,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  128,  334,  334,  334,  334,  334,
-      334,  334,  334,  208,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,   21,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  157,  334,  334,  333,  317,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  106,
+      335,  335,  133,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  129,  335,  335,
+      335,  335,  335,  335,  335,  335,  209,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,   21,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  158,  335,  335,
+      334,  318,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  276,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  180,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  156,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  105,  334,
+      335,  335,  335,  107,  335,  335,  335,  335,  335,  335,
+      335,  277,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  181,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  157,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,   32,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,   33,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,   65,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  130,  333,  334,  334,  334,  334,  334,  123,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,   66,  334,  334,  334,  334,  334,
+      335,  335,  106,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+       32,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+       33,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,   65,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  131,  334,  335,  335,
+      335,  335,  335,  124,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,   66,
 
-      334,  334,  334,  334,  334,  334,  334,  241,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  181,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,   54,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  242,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  182,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,   54,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      259,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,   58,
-      334,   59,  334,  334,  334,  334,  334,  109,  334,  110,
-      334,  334,  334,  334,  107,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,    7,  334,  333,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  230,  334,  334,  334,  334,  159,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  260,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,   58,  335,   59,  335,  335,  335,
+      335,  335,  110,  335,  111,  335,  335,  335,  335,  108,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,    7,
+      335,  334,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  242,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,   45,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,   55,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  200,  334,
-      199,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      231,  335,  335,  335,  335,  160,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  243,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,   45,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,   55,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  201,  335,  200,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,   16,   17,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,   69,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  207,  334,  334,  334,  334,  334,
-      334,  112,  334,  111,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  191,  334,  334,  334,  334,
-      334,  334,  334,  334,  139,  333,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  100,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,   89,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,   16,   17,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,   69,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      208,  335,  335,  335,  335,  335,  335,  113,  335,  112,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  192,  335,  335,  335,  335,  335,  335,  335,
+      335,  140,  334,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  101,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  220,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,   93,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,   62,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  194,  195,  334,  334,  334,  270,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,   89,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  221,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,   94,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+       62,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  195,
+      196,  335,  335,  335,  271,  335,  335,  335,  335,  335,
 
-        6,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  274,  334,  334,  334,  334,  334,  334,  296,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-       42,  334,  334,  334,  334,   44,  334,  334,  334,  334,
-      334,  334,  334,  334,   52,  334,  334,  334,  334,  334,
-      334,  334,  333,  334,  187,  334,  334,  334,  134,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  212,
-      334,  188,  334,  334,  334,  227,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,    6,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  275,
+      335,  335,  335,  335,  335,  335,  297,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,   42,  335,  335,
+      335,  335,   44,  335,  335,  335,   90,  335,  335,  335,
+      335,  335,   52,  335,  335,  335,  335,  335,  335,  335,
+      334,  335,  188,  335,  335,  335,  135,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  213,  335,  189,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,   53,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  136,  117,  334,
-      118,  334,  334,  334,  116,  334,  334,  334,  334,  334,
-      334,  334,  334,  154,  334,  334,   50,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  258,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  189,  334,  334,  334,  334,  334,  192,
-      334,  198,  334,  334,  334,  334,  334,  226,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  228,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,   53,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  137,  118,  335,  119,  335,
+      335,  335,  117,  335,  335,  335,  335,  335,  335,  335,
+      335,  155,  335,  335,   50,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  259,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  190,  335,  335,  335,  335,  335,  193,  335,  199,
+      335,  335,  335,  335,  335,  227,  335,  335,  335,  335,
 
-      334,  334,  104,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  129,  334,  334,  334,  334,  334,  334,   60,  334,
-      334,  334,   26,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,   20,  334,  334,  334,  334,  334,  334,   27,
-       36,  334,  164,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  333,  334,  334,  334,
-      334,  334,  334,   77,   79,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  278,  334,
-      334,  334,  334,  238,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      105,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  130,
+      335,  335,  335,  335,  335,  335,   60,  335,  335,  335,
+       26,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+       20,  335,  335,  335,  335,  335,  335,   27,   36,  335,
+      165,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  334,  335,  335,  335,  335,  335,
+      335,   77,   79,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  279,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  119,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  153,  334,   46,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      289,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  158,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  218,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  299,  334,  334,  334,  334,  334,  334,
+      335,  239,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  120,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  154,  335,   46,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  290,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  159,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  219,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  175,  334,  334,  334,  334,
-      334,  334,  334,  334,  113,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  170,  334,  182,  334,  334,  334,
-      334,  333,  334,  142,  334,  334,  334,  334,  334,   99,
-      334,  334,  334,  334,  210,  334,  334,  334,  334,  334,
-      334,  228,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  250,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  135,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  300,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  176,  335,  335,  335,  335,  335,  335,
+      335,  335,  114,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  171,  335,  183,  335,  335,  335,  335,  334,
+      335,  143,  335,  335,  335,  335,  335,  100,  335,  335,
+      335,  335,  211,  335,  335,  335,  335,  335,  335,  229,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  251,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  136,  335,  335,
 
-      334,  334,  334,  334,  174,  334,  334,  334,  334,  334,
-      334,   80,  334,   81,  334,  334,  334,  334,  334,   61,
-      292,  334,  334,  334,  334,  334,   88,  183,  334,  201,
-      334,  231,  334,  334,  193,  271,  334,  334,  334,  334,
-      334,   73,  334,  185,  334,  334,  334,  334,  334,    9,
-      334,  334,  334,  103,  334,  334,  334,  334,  263,  334,
-      334,  334,  334,  209,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  175,  335,  335,  335,  335,  335,  335,   80,
+      335,   81,  335,  335,  335,  335,  335,   61,  293,  335,
+      335,  335,  335,  335,   88,  184,  335,  202,  335,  232,
+      335,  335,  194,  272,  335,  335,  335,  335,  335,   73,
+      335,  186,  335,  335,  335,  335,  335,    9,  335,  335,
+      335,  104,  335,  335,  335,  335,  264,  335,  335,  335,
+      335,  210,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  333,
-      334,  334,  334,  334,  173,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  160,  334,  277,  334,  334,
-      334,  334,  334,  249,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  222,  334,  334,  306,  334,
-      334,  334,  269,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  293,  334,  184,  334,  334,  334,  334,
-      334,  334,  334,   72,   74,  334,  334,  334,  334,  334,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  334,  335,  335,
+      335,  335,  174,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  161,  335,  278,  335,  335,  335,  335,
+      335,  250,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  223,  335,  335,  307,  335,  335,  335,
+      270,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  294,  335,  185,  335,  335,  335,  335,  335,  335,
 
-      334,  334,  102,  334,  334,  334,  334,  261,  334,  334,
-      334,  334,  273,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  214,   34,   28,   30,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,   35,  334,   29,
-       31,  334,  334,  334,  334,  334,  334,  334,  334,   98,
-      334,  334,  334,  334,  334,  334,  333,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  216,  213,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,   71,  334,
-      334,  334,  137,  334,  120,  334,  334,  334,  334,  334,
+      335,   72,   74,  335,  335,  335,  335,  335,  335,  335,
+      103,  335,  335,  335,  335,  262,  335,  335,  335,  335,
+      274,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  215,   34,   28,   30,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,   35,  335,   29,   31,  335,
+      335,  335,  335,  335,  335,  335,  335,   99,  335,  335,
+      335,  335,  335,  335,  334,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  217,  214,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,   71,  335,  335,  335,
 
-      334,  334,  334,  155,   47,  334,  334,  334,  325,   13,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      287,  334,  290,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,   12,  334,  334,   22,  334,  334,  334,
-      267,  334,  334,  334,  334,  275,  334,  334,  334,   75,
-      334,  224,  334,  334,  334,  334,  215,  334,  334,   70,
-      334,  334,  334,  334,   23,  334,   43,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  169,
-      168,  325,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  217,  211,  334,  229,  334,  334,  279,  334,  334,
+      138,  335,  121,  335,  335,  335,  335,  335,  335,  335,
+      335,  156,   47,  335,  335,  335,  326,   13,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  288,  335,
+      291,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,   12,  335,  335,   22,  335,  335,  335,  268,  335,
+      335,  335,  335,  276,  335,  335,  335,   75,  335,  225,
+      335,  335,  335,  335,  216,  335,  335,   70,  335,  335,
+      335,  335,   23,  335,   43,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  170,  169,  326,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  218,
 
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-       82,  334,  334,  334,  334,  262,  334,  334,  334,  334,
-      197,  334,  334,  334,  334,  223,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  297,  298,  166,  334,  334,
-       76,  334,  334,  334,  334,  176,  334,  334,  114,  115,
-      334,  334,  334,  334,  161,  334,  163,  334,  202,  334,
-      334,  334,  334,  167,  334,  334,  232,  334,  334,  334,
-      334,  334,  334,  334,  144,  334,  334,  334,  334,  334,
+      212,  335,  230,  335,  335,  280,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,   82,  335,
+      335,  335,  335,  263,  335,  335,  335,  335,  198,  335,
+      335,  335,  335,  224,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  298,  299,  167,  335,  335,   76,  335,
+      335,  335,  335,  177,  335,  335,  115,  116,  335,  335,
+      335,  335,  162,  335,  164,  335,  203,  335,  335,  335,
+      335,  168,  335,  335,  233,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  334,  334,  334,  334,  240,  334,  334,
-      334,  334,  334,  334,  334,  334,   24,  334,  272,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,   86,  203,  334,  334,  260,  334,  291,
-      334,  196,  334,  334,  334,  334,   56,  334,  334,  334,
-      334,    4,  334,  334,  334,  334,  127,  143,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  235,   37,   38,  334,
-      334,  334,  334,  334,  334,  334,  280,  334,  334,  334,
-      334,  334,  334,  334,  248,  334,  334,  334,  334,  334,
+      335,  335,  145,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  241,  335,  335,  335,  335,
+      335,  335,  335,  335,   24,  335,  273,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,   86,  204,  335,  335,  261,  335,  292,  335,  197,
+      335,  335,  335,  335,   56,  335,  335,  335,  335,    4,
+      335,  335,  335,  335,  128,  144,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  236,   37,   38,  335,  335,  335,
+      335,  335,  335,  335,  281,  335,  335,  335,  335,  335,
 
-      334,  334,  334,  206,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,   85,  334,   57,  266,
-      334,  236,  334,  334,  334,  334,   11,  334,  334,  334,
-      334,  334,  334,  126,  334,  334,  334,  334,  204,   90,
-      334,   40,  334,  334,  334,  334,  334,  334,  334,  334,
-      172,  334,  334,  334,  334,  334,  146,  334,  334,  334,
-      334,  239,  334,  334,  334,  334,  334,  247,  334,  334,
-      334,  334,  140,  334,  334,  334,  121,  122,  334,  334,
-      334,   92,   96,   91,  334,  334,  334,  334,   83,  334,
-      334,  334,  334,  334,   10,  334,  334,  334,  264,  300,
+      335,  335,  249,  335,  335,  335,  335,  335,  335,  335,
+      335,  207,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,   85,  335,   57,  267,  335,  237,
+      335,  335,  335,  335,   11,  335,  335,  335,  335,  335,
+      335,  127,  335,  335,  335,  335,  205,   91,  335,   40,
+      335,  335,  335,  335,  335,  335,  335,  335,  173,  335,
+      335,  335,  335,  335,  147,  335,  335,  335,  335,  240,
+      335,  335,  335,  335,  335,  248,  335,  335,  335,  335,
+      141,  335,  335,  335,  122,  123,  335,  335,  335,   93,
+       97,   92,  335,  335,  335,  335,   83,  335,  335,  335,
 
-      334,  334,  334,  334,  305,   39,  334,  334,  334,  334,
-      334,  171,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,   97,   95,  334,   51,  334,
-      334,   84,  288,  334,  334,  334,  334,  334,  334,  334,
-      190,  334,  334,  334,  334,  334,  205,  334,  334,  334,
-      334,  334,  334,  334,  334,  162,   78,  334,  334,  334,
-      334,  334,  281,  334,  334,  334,  334,  334,  334,  334,
-      244,  334,  334,  243,  141,  307,  334,   94,   48,  334,
-      147,  148,  151,  152,  149,  150,   87,  334,  265,  334,
+      335,  335,   10,  335,  335,  335,  265,  301,  335,  335,
+      335,  335,  306,   39,  335,  335,  335,  335,  335,  172,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,   98,   96,  335,   51,  335,  335,   84,
+      289,  335,  335,  335,  335,  335,  335,  335,  191,  335,
+      335,  335,  335,  335,  206,  335,  335,  335,  335,  335,
+      335,  335,  335,  163,   78,  335,  335,  335,  335,  335,
+      282,  335,  335,  335,  335,  335,  335,  335,  245,  335,
+      335,  244,  142,  308,  335,   95,   48,  335,  148,  149,
 
-      334,  334,  334,  165,  334,  334,  334,  334,  334,  234,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  178,  177,
-       41,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  101,  334,  233,  334,
-      257,  285,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,   49,    5,  334,  334,  225,  334,
-      334,  286,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  245,   25,  334,  334,  334,  334,  334,  334,  334,
+      152,  153,  150,  151,   87,  335,  266,  335,  335,  335,
+      335,  166,  335,  335,  335,  335,  335,  235,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  179,  178,   41,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  102,  335,  234,  335,  258,  286,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,   49,    5,  335,  335,  226,  335,  335,  287,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  246,
 
-      334,  334,  334,  334,  334,  246,  334,  334,  334,  145,
-      334,  334,  334,  334,  334,  334,  334,  334,  179,  334,
-      186,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      282,  334,  334,  334,  334,  334,  334,  334,  334,  334,
-      334,  334,  334,  334,  334,  334,  334,  334,  304,  334,
-      334,  253,  334,  334,  334,  334,  334,  283,  334,  334,
-      334,  334,  334,  334,  284,  334,  334,  334,  251,  334,
-      254,  255,  334,  334,  334,  334,  334,  252,  256,    0
+       25,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  247,  335,  335,  335,  146,  335,  335,
+      335,  335,  335,  335,  335,  335,  180,  335,  187,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  283,  335,
+      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      335,  335,  335,  335,  335,  335,  305,  335,  335,  254,
+      335,  335,  335,  335,  335,  284,  335,  335,  335,  335,
+      335,  335,  285,  335,  335,  335,  252,  335,  255,  256,
+      335,  335,  335,  335,  335,  253,  257,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -767,17 +768,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[3299] =
+static const flex_int16_t yy_base[3307] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 3790, 3594,   81, 6407,
-     6407, 6407,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 3493, 3402,   81, 6428,
+     6428, 6428,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  184,  145,
-      185,  205,  194,  204,  178,  123, 2749, 6407, 6407, 6407,
-      107, 2656, 6407, 6407, 6407,  154, 2610, 2162, 6407, 6407,
-     6407,  226, 2040, 6407, 6407, 6407,  163, 1972, 6407,  238,
-     6407,  242,  148, 1845, 1693, 6407, 6407, 6407,  246, 1651,
-     6407, 6407, 6407,  250, 1521,  254,  219,    0,  258,    0,
+      185,  205,  194,  204,  178,  123, 3176, 6428, 6428, 6428,
+      107, 2960, 6428, 6428, 6428,  154, 2373, 2342, 6428, 6428,
+     6428,  226, 2208, 6428, 6428, 6428,  163, 2071, 6428,  238,
+     6428,  242,  148, 1858, 1710, 6428, 6428, 6428,  246, 1553,
+     6428, 6428, 6428,  250, 1440,  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,
@@ -785,8 +786,8 @@ static const flex_int16_t yy_base[3299] =
       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, 1437,  411, 1203,
-      415, 1088,  422, 1027,  689,  426,  406,  430,  434,    0,
+      384,  385,  387,  388,  391,  399,  389, 1400,  411, 1086,
+      415,  984,  422,  871,  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,
@@ -807,701 +808,703 @@ static const flex_int16_t yy_base[3299] =
       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, 6407,  817,  820,  833,  826,  834,  835,  836,
-      841,  842,  823,  849,  847,  848,  852,  874,  856,  858,
-      854,  863,  866, 6407,  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,
+      822,  818, 6428,  817,  820,  833,  826,  834,  835,  836,
+      841,  842,  823,  849,  847,  848,  852,  874,  856,  863,
+      854,  864,  858, 6428,  867,  868,  898,  881,  871,  889,
+      885,  878,  887,  892,  894,  902,  911,  904,  908,  909,
+      922,  915,  919,  924,  918,  927,  925,  935,  936,  931,
 
-      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,
-     6407, 1068, 1070, 1072, 1073, 1074, 1075, 6407, 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, 6407, 1136, 1139,
+      934,  941,  948,  943,  945,  947,  956,  949,  950,  957,
+      958,  769,  960,  967,  970,  964,  959,  975,  976,  977,
+      979,  982,  983,  987,  985,  998, 1005,  999, 1012,  986,
+     1010, 1011, 1014, 1013, 1019, 1020, 1022, 1024, 1025, 1027,
+     1028, 1032, 1033, 1031, 1034, 1036, 1038, 1044, 1042, 1047,
+     1048, 1049, 1056, 1058, 1051, 1064, 1052, 1050, 1068, 1060,
+     6428, 1072, 1070, 1075, 1076, 1074, 1077, 6428, 1078, 1079,
+     1080, 1081, 1090, 1092, 1093, 1099, 1088, 1103, 1105, 1106,
+     1107, 1115, 1110, 1113, 1118, 1117, 1119, 1121, 1123, 1125,
+     1127, 1126, 1128, 1134, 1135, 1138, 1155, 6428, 1137, 1145,
 
-     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, 6407, 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, 1348, 1349, 1355, 1345, 6407, 1363, 1358,
+     1142, 1139, 1148, 1149, 1167, 1147, 1165, 1166, 1159, 1179,
+     1177, 1178, 1180, 1186, 1187, 1188, 1190, 1195, 1191, 1140,
+     1193, 1197, 1198, 1199, 1201, 1200, 1202, 1205, 6428, 1203,
+     1214, 1227, 1213, 1222, 1223, 1224, 1226, 1228, 1229, 1230,
+     1232, 1231, 1236, 1240, 1251, 1235, 1254, 1249, 1250, 1252,
+     1256, 1257, 1260, 1258, 1259, 1270, 1265, 1273, 1280, 1282,
+     1284, 1286, 1287, 1294, 1268, 1290, 1292, 1291, 1297, 1298,
+     1300, 1299, 1301, 1307, 1305, 1314, 1311, 1310, 1312, 1313,
+     1318, 1320, 1321, 1325, 1322, 1323, 1337, 1329, 1332, 1333,
+     1339, 1347, 1340, 1349, 1350, 1351, 1352, 1353, 6428, 1360,
 
-     1361, 1362, 1365, 1368, 1372, 1373, 1374, 1375, 1378, 1376,
-     1379, 1384, 1385, 1386, 1380, 1393, 1395, 1403, 1398, 1387,
-     1411, 1410, 1401, 1400, 1412, 1420, 1416, 1423, 1419, 1415,
-     1424, 1431, 1428, 1432, 1433, 1442, 1427, 1434, 1439, 1435,
-     1447, 1449, 1451, 1463, 1450, 1459, 1466, 1467, 1458, 1232,
-     1461, 1470, 1471, 1473, 1474, 1475, 1476, 1484, 1477, 1479,
-     1482, 1485, 1486, 1487, 1490, 1493, 1501, 1498, 1499, 1503,
-     1505, 1509, 1507, 1510, 1514, 1515, 1516, 1518, 1517, 1519,
-     1536, 1527, 1528, 1529, 1537, 1538, 1530, 1544, 1541, 1545,
-     1551, 1547, 1555, 1553, 1556, 1559, 1561, 1564, 1562, 1565,
+     1361, 1359, 1363, 1364, 1371, 1372, 1375, 1376, 1373, 1379,
+     1378, 1381, 1385, 1386, 1387, 1382, 1388, 1390, 1399, 1403,
+     1404, 1413, 1405, 1412, 1396, 1415, 1422, 1418, 1425, 1421,
+     1420, 1426, 1433, 1428, 1430, 1434, 1442, 1437, 1435, 1446,
+     1438, 1447, 1450, 1449, 1461, 1459, 1460, 1469, 1472, 1462,
+     1464, 1470, 1474, 1475, 1477, 1478, 1479, 1480, 1488, 1481,
+     1483, 1484, 1486, 1490, 1491, 1494, 1497, 1509, 1502, 1505,
+     1504, 1507, 1511, 1513, 1514, 1518, 1519, 1520, 1522, 1521,
+     1524, 1528, 1529, 1533, 1534, 1540, 1541, 1542, 1544, 1547,
+     1548, 1551, 1550, 1559, 1561, 1549, 1562, 1565, 1568, 1570,
 
-     1566, 1572, 1567, 1577, 1578, 1580, 1579, 1583, 1587, 1585,
-     1590, 1589, 6407, 1591, 1603, 1592, 1601, 1599, 1602, 1604,
-     1613, 1606, 1608, 1616, 1617, 1609, 1643, 6407, 1618, 6407,
-     6407,  315, 6407, 6407, 1619, 1620, 6407, 1624, 1623, 1621,
-     1631, 1638, 1640, 1625, 1646, 1644, 1647, 1656, 1668, 1649,
-     1653, 1659, 1657, 1660, 1678, 1666, 1673, 1676, 1679, 1685,
-     1695, 1683, 1696, 1693, 1700, 1701, 1706, 1707, 1709, 1713,
-     1715, 1716, 1699, 1719, 1720, 1703, 1721, 1724, 1726, 1730,
-     1731, 1727, 1734, 1733, 1742, 1738, 1748, 1757, 6407, 1749,
-     1758, 1759, 1760, 1767, 1763, 1762, 1764, 1770, 1774, 1771,
+     1571, 1572, 1573, 1580, 1575, 1578, 1581, 1585, 1586, 1591,
+     1592, 1595, 1597, 1600, 6428, 1598, 1610, 1588, 1611, 1606,
+     1603, 1605, 1619, 1612, 1614, 1616, 1622, 1624, 1648, 6428,
+     1625, 6428, 6428,  315, 6428, 6428, 1626, 1627, 6428, 1630,
+     1629, 1639, 1637, 1631, 1642, 1645, 1646, 1649, 1651, 1658,
+     1672, 1654, 1661, 1662, 1665, 1675, 1677, 1678, 1666, 1686,
+     1687, 1689, 1694, 1695, 1703, 1696, 1700, 1706, 1708, 1714,
+     1710, 1719, 1720, 1709, 1716, 1723, 1724, 1726, 1725, 1728,
+     1731, 1734, 1736, 1732, 1730, 1738, 1747, 1749, 1740, 1757,
+     6428, 1753, 1761, 1765, 1762, 1769, 1768, 1764, 1766, 1773,
 
-     1775, 1776, 1777, 1778, 1783, 1780, 1786, 1788, 1791, 1790,
-     6407, 1792, 1795, 1796, 1798, 1799, 1802, 1806, 1800, 1807,
-     1810, 1737, 1818, 1815, 1813, 1821, 1822, 1823, 1824, 6407,
-     1834, 1826, 1829, 1833, 1830, 1837, 1839, 1841, 1842, 1843,
-     1844, 1735, 1846, 1849, 1854, 1856, 1858, 1853, 1855, 1860,
-     1861, 1871, 1874, 1877, 1878, 1879, 1880, 1881, 1882, 1883,
-     1885, 1890, 1892, 1889, 1900, 1891, 1912, 1913, 1910, 1896,
-     1908, 1893, 1895, 1917, 1925, 1921, 1909, 1922, 1929, 1926,
-     1931, 1932, 1933, 1940, 1936, 1937, 1942, 1944, 1945, 1947,
-     1948, 6407, 1949, 1954, 6407, 1956, 1955, 1953, 1976, 1957,
+     1776, 1777, 1778, 1779, 1780, 1781, 1783, 1743, 1786, 1789,
+     1797, 1790, 6428, 1792, 1793, 1795, 1798, 1799, 1804, 1805,
+     1806, 1811, 1812, 1813, 1823, 1814, 1816, 1818, 1824, 1825,
+     1827, 6428, 1832, 1829, 1835, 1839, 1840, 1842, 1843, 1845,
+     1846, 1841, 1847, 1848, 1851, 1853, 1860, 1855, 1859, 1857,
+     1865, 1868, 1873, 1875, 1878, 1881, 1882, 1883, 1884, 1885,
+     1886, 1888, 1889, 1896, 1899, 1897, 1900, 1898, 1895, 1910,
+     1919, 1902, 1914, 1916, 1917, 1918, 1920, 1929, 1924, 1925,
+     1931, 1932, 1930, 1935, 1937, 1940, 1947, 1938, 1948, 1956,
+     1942, 1949, 1954, 1951, 6428, 1958, 1960, 6428, 1962, 1961,
 
-     1959, 1962, 1961, 1964, 1978, 1971, 1970, 1983, 1980, 1996,
-     1991, 1993, 1998, 2001, 2003, 1999, 2004, 2005, 2006, 2010,
-     2012, 2017, 2015, 2028, 2031, 2030, 2037, 2039, 2013, 2026,
-     2034, 2053, 2036, 2038, 2041, 2044, 2046, 2057, 2042, 2049,
-     2051, 2058, 2060, 2071, 2064, 2066, 2068, 2074, 2075, 2081,
-     2083, 2082, 6407, 2091, 2089, 2084, 2094, 2088, 2104, 2095,
-     2096, 6407, 2097, 2105, 2107, 2116, 2108, 2109, 2113, 2111,
-     2112, 2119, 2120, 2121, 2124, 2129, 2125, 2140, 6407, 2122,
-     6407, 2127, 2136, 2143, 2137, 2145, 2144, 2147, 2148, 6407,
-     6407, 2149, 2146, 2157, 2166, 2161, 6407, 2164, 2171, 6407,
+     1963, 1985, 1965, 1967, 1968, 1973, 1977, 1976, 1978, 1986,
+     1987, 1989, 2005, 1998, 1995, 2008, 2010, 2011, 1979, 2013,
+     2014, 2015, 2017, 2020, 2021, 2030, 2038, 2039, 2023, 2042,
+     2040, 1997, 2041, 2043, 2062, 2044, 2045, 2051, 2046, 2047,
+     2049, 2059, 2052, 2053, 2055, 2057, 2075, 2078, 2077, 2079,
+     2064, 2084, 2086, 2087, 2090, 6428, 2098, 2093, 2094, 2095,
+     2099, 2107, 2103, 2104, 6428, 2105, 2106, 2109, 2117, 2118,
+     2116, 2119, 2120, 2122, 2121, 2126, 2128, 2130, 2142, 2129,
+     2149, 6428, 2131, 6428, 2144, 2132, 2134, 2145, 2133, 2150,
+     2155, 2156, 6428, 6428, 2157, 2154, 2166, 2170, 2168, 6428,
 
-     2168, 2173, 2167, 2175, 2177, 2178, 2179, 2182, 2189, 2184,
-     2191, 2186, 2194, 2188, 6407, 2187, 2198, 2200, 2203, 2206,
-     2207, 2209, 2211, 6407, 2210, 2213, 2215, 2224, 2226, 2227,
-     2217, 2228, 2232, 2220, 2230, 2234, 2237, 2239, 2247, 2248,
-     2245, 2246, 2253, 2261, 6407, 2244, 2243, 2265, 2264, 2257,
-     2266, 2267, 2260, 2268, 2270, 2271, 2272, 2277, 2279, 2280,
-     2288, 2290, 2281, 2289, 2286, 2292, 2293, 2297, 2302, 2300,
-     2301, 2303, 2304, 6407, 2305, 2313, 2306,  171, 2314, 2308,
-     2315, 2316, 2325, 2320, 2317, 2336, 2338, 2331, 2335, 2339,
-     2343, 2342, 2344, 2345, 2346, 2333, 2353, 2349, 2351, 6407,
+     2169, 2177, 6428, 2174, 2179, 2172, 2173, 2180, 2183, 2184,
+     2187, 2194, 2189, 2198, 2190, 2195, 2199, 6428, 2203, 2191,
+     2210, 2211, 2204, 2214, 2217, 2218, 6428, 2221, 2207, 2225,
+     2232, 2229, 2224, 2234, 2235, 2236, 2239, 2240, 2241, 2242,
+     2243, 2250, 2253, 2246, 2249, 2255, 2264, 6428, 2248, 2262,
+     2269, 2265, 2268, 2271, 2272, 2273, 2274, 2275, 2276, 2277,
+     2284, 2283, 2285, 2286, 2296, 2298, 2287, 2294, 2304, 2295,
+     2306, 2300, 2311, 2308, 2309, 2310, 2313, 6428, 2315, 2317,
+     2319,  171, 2321, 2322, 2324, 2323, 2331, 2333, 2325, 2347,
+     2348, 2327, 2344, 2350, 2346, 2353, 2354, 2355, 2356, 2357,
 
-     2355, 2357, 2359, 2363, 2362, 2365, 2367, 6407, 2369, 2374,
-     2379, 2388, 2382, 2366, 2390, 2376, 2391, 2392, 2394, 2396,
-     2398, 2397, 2400, 2405, 2403, 6407, 2407, 2408, 2412, 2404,
-     2418, 2421, 2411, 2419, 2426, 2427, 2428, 2429, 2430, 2431,
-     2432, 2433, 2435, 2436, 2445, 2438, 2439, 2447, 2448, 2449,
-     2450, 2452, 2455, 2457, 2461, 6407, 2470, 2467, 2465, 2466,
-     2469, 2475, 2473, 2476, 2493, 2477, 2483, 2485, 2494, 2499,
-     2490, 2501, 2511, 2513, 2515, 2516, 2523, 2519, 2521, 2527,
-     2509, 2531, 2533, 2486, 2484, 2534, 2529, 2535, 2537, 2539,
-     2547, 2548, 2545, 2552, 2544, 2554, 2568, 2559, 6407, 2563,
+     2358, 2359, 2361, 6428, 2363, 2364, 2366, 2370, 2369, 2372,
+     2377, 6428, 2379, 2386, 2389, 2398, 2381, 2390, 2399, 2395,
+     2400, 2401, 2403, 2405, 2407, 2406, 2409, 2415, 2412, 6428,
+     2417, 2420, 2422, 2413, 2429, 2428, 2421, 2435, 2436, 2437,
+     2440, 2438, 2439, 2442, 2441, 2443, 2444, 2449, 2448, 2445,
+     2447, 2457, 2458, 2459, 2468, 2469, 2461, 2470, 2471, 6428,
+     2481, 2472, 2476, 2474, 2477, 2479, 2484, 2492, 2499, 2483,
+     2494, 2496, 2500, 2510, 2503, 2505, 2512, 2520, 2517, 2525,
+     2513, 2526, 2527, 2535, 2524, 2537, 2539, 2528, 2540, 2541,
+     2543, 2546, 2547, 2549, 2559, 2560, 2552, 2562, 2555, 2576,
 
-     2546, 2569, 2571, 2578, 2573, 2574, 2576, 2575, 2579, 2583,
-     2584, 2585, 2592, 2590, 2593, 2594, 2595, 2597, 2598, 2604,
-     2605, 2609, 2613, 2606, 2616, 2617, 6407, 2620, 2624, 2618,
-     2625, 2627, 2628, 2632, 2635, 2633, 2639, 2640, 2642, 2643,
-     2644, 2645, 2646, 2649, 2650, 2653, 6407, 2654, 2655, 2659,
-     2662, 2667, 2666, 2668, 2675, 2677, 2679, 2669, 2682, 2683,
-     2681, 6407, 2691, 2692, 2693, 2695, 2696, 2697, 2699, 2701,
-     2702, 6407, 2703, 2704, 2706, 2713, 2714, 2709, 6407, 2717,
-     2712, 2719, 2720, 2721, 2723, 2725, 2727, 2730, 2731, 2734,
-     2736, 2745, 2735, 2742, 6407, 2738, 2754, 2746, 2751, 2755,
+     2581, 2572, 6428, 2570, 2565, 2568, 2582, 2590, 2585, 2587,
+     2588, 2592, 2595, 2596, 2597, 2598, 2605, 2600, 2602, 2603,
+     2608, 2607, 2611, 2614, 2618, 2619, 2623, 2625, 2627, 2628,
+     6428, 2631, 2633, 2629, 2635, 2637, 2639, 2642, 2645, 2647,
+     2649, 2650, 2654, 2655, 2657, 2656, 2658, 2664, 2665, 2651,
+     6428, 2674, 2666, 2678, 2668, 2679, 2672, 2685, 2686, 2687,
+     2661, 2688, 2691, 2694, 2695, 2697, 6428, 2704, 2705, 2696,
+     2712, 2707, 2703, 2708, 2714, 2711, 6428, 2715, 2717, 2718,
+     2726, 2727, 2723, 6428, 2734, 2724, 2725, 2732, 2735, 2736,
+     2733, 2739, 2742, 2743, 2746, 2748, 2755, 2749, 2756, 6428,
 
-     2759, 2761, 2762, 2766, 2769, 2765, 2768, 6407, 2781, 2779,
-     2784, 2791, 2770, 2772, 2786, 2787, 2788, 2794, 2796, 2797,
-     2799, 6407, 2800, 2803, 2805, 2806, 2809, 2808, 2801, 2817,
-     2810, 2815, 2818, 2824, 2825, 2827, 2828, 2829, 2830, 2831,
-     2838, 2841, 2837, 2844, 2843, 2850, 2854, 2861, 2845, 2857,
-     2858, 2860, 2862, 2865, 2872, 2873, 2874, 2877, 2879, 6407,
-     2882, 2871, 2884, 2869, 2885, 2886, 2888, 2889, 2890, 2892,
-     2894, 2899, 2895, 2898, 2907, 2911, 2908, 2913, 2915, 2916,
-     2918, 2919, 2920, 2921, 2922, 2929, 2925, 2926, 2937, 2932,
-     2936, 2944, 2943, 2945, 2946, 2947, 2949, 2933, 2953, 2955,
+     2757, 2766, 2759, 2758, 2763, 2769, 2770, 2773, 2774, 2775,
+     2778, 2781, 6428, 2792, 2789, 2787, 2800, 2790, 2530, 2796,
+     2797, 2801, 2803, 2804, 2805, 2807, 6428, 2808, 2811, 2812,
+     2815, 2813, 2818, 2819, 2826, 2823, 2825, 2828, 2831, 2832,
+     2833, 2834, 2841, 2840, 2837, 2849, 2850, 2853, 2854, 2856,
+     2859, 2867, 2870, 2843, 2866, 2869, 2862, 2871, 2872, 2879,
+     2880, 2887, 2882, 2884, 6428, 2889, 2886, 2891, 2893, 2894,
+     2895, 2897, 2896, 2898, 2901, 2902, 2908, 2904, 2905, 2920,
+     2923, 2907, 2915, 2925, 2926, 2928, 2929, 2930, 2931, 2932,
+     2939, 2935, 2936, 2947, 2938, 2942, 2952, 2953, 2954, 2955,
 
-     2957, 2958, 2972, 2974, 2975, 2977, 2948, 2950, 2969, 2983,
-     6407, 2976, 2979, 2978, 2967, 2988, 2991, 2992, 3001, 2996,
-     2986, 2998, 3005, 3006, 3000, 3007, 3008, 3018, 3014, 6407,
-     3015, 6407, 3016, 3017, 3023, 3027, 3019, 6407, 3030, 6407,
-     3031, 3036, 3026, 3032, 6407, 3038, 3040, 3043, 3044, 3046,
-     3047, 3050, 3049, 3051, 3055, 3053, 3057, 3058, 3059, 3063,
-     3066, 3067, 3071, 3072, 3078, 3070, 3079, 3081, 3083, 3086,
-     3088, 3089, 3090, 6407, 3094, 3091, 3096, 3098, 3100, 3101,
-     3102, 3103, 3106, 3109, 3110, 3117, 3113, 3118, 3121, 3124,
-     3128, 3131, 3132, 3140, 6407, 3135, 3137, 3138, 3139, 6407,
+     2956, 2963, 2943, 2961, 2958, 2965, 2966, 2970, 2980, 2981,
+     2967, 2982, 2983, 2984, 2985, 6428, 2988, 2989, 2990, 2993,
+     2996, 2999, 3002, 3009, 3000, 3001, 3011, 3017, 3018, 3008,
+     3019, 3010, 3026, 3024, 6428, 3025, 6428, 3027, 3029, 3031,
+     3039, 3035, 6428, 3041, 6428, 3042, 3047, 3036, 3038, 6428,
+     3050, 3044, 3049, 3056, 3051, 3059, 3060, 3062, 3061, 3068,
+     3063, 3065, 3070, 3071, 3073, 3076, 3074, 3081, 3082, 3086,
+     3090, 3091, 3078, 3102, 3084, 3094, 3100, 3092, 3107, 6428,
+     3109, 3097, 3110, 3115, 3114, 3116, 3117, 3118, 3120, 3121,
+     3123, 3127, 3122, 3132, 3124, 3136, 3135, 3145, 3146, 3153,
 
-     3142, 3143, 3150, 3153, 3144, 3146, 3148, 3156, 3160, 3155,
-     3162, 3165, 3166, 3176, 3175, 3168, 6407, 3177, 3178, 3179,
-     3188, 3182, 3195, 3196, 3192, 3193, 3198, 3206, 3202, 3201,
-     3203, 3205, 3208, 3209, 3216, 3217, 3213, 3225, 3215, 3222,
-     3230, 3226, 3223, 3220, 3232, 3233, 3234, 3235, 3236, 3237,
-     3239, 3242, 3245, 6407, 3246, 3251, 3253, 3256, 3255, 3257,
-     3259, 3260, 3261, 6407, 3268, 3265, 3271, 3269, 3277, 3272,
-     3270, 3280, 3283, 3286, 3288, 3289, 3290, 3291, 6407, 3293,
-     6407, 3292, 3294, 3306, 3310, 3300, 3298, 3311, 3319, 3315,
-     3320, 3321, 3322, 3323, 3324, 3325, 3329, 3332, 3336, 3337,
+     6428, 3148, 3150, 3151, 3152, 6428, 3154, 3155, 3156, 3160,
+     3163, 3164, 3165, 3168, 3172, 3167, 3169, 3174, 3183, 3184,
+     3187, 3188, 6428, 3190, 3193, 3175, 3202, 3196, 3203, 3210,
+     3206, 3208, 3212, 3220, 3216, 3215, 3217, 3218, 3219, 3222,
+     3229, 3230, 3226, 3233, 3232, 3236, 3243, 3240, 3234, 3238,
+     3244, 3246, 3247, 3248, 3249, 3250, 3253, 3254, 3251, 6428,
+     3259, 3265, 3263, 3272, 3268, 3269, 3273, 3278, 3274, 6428,
+     3280, 3281, 3282, 3284, 3289, 3283, 3286, 3291, 3294, 3297,
+     3299, 3302, 3304, 3303, 6428, 3305, 6428, 3307, 3308, 3318,
+     3322, 3323, 3310, 3324, 3330, 3326, 3331, 3333, 3336, 3334,
 
-     3347, 3330, 3338, 3335, 3343, 3333, 3352, 6407, 6407, 3354,
-     3355, 3358, 3356, 3360, 3361, 3362, 3371, 3365, 3367, 3368,
-     3374, 3382, 6407, 3384, 3375, 3378, 3386, 3393, 3388, 3395,
-     3402, 3399, 3403, 3401, 6407, 3405, 3408, 3415, 3410, 3411,
-     3418, 6407, 3413, 6407, 3416, 3417, 3419, 3424, 3426, 3428,
-     3429, 3430, 3432, 3440, 3448, 3437, 3446, 3438, 3447, 3449,
-     3451, 3460, 3452, 3455, 3457, 6407, 3462, 3456, 3459, 3467,
-     3473, 3477, 3470, 3466, 6407, 3469, 3480, 3484, 3485, 3486,
-     3487, 3491, 3488, 3492, 3493, 3496, 6407, 3494, 3497, 3507,
-     3500, 3503, 3509, 3511, 3516, 3523, 6407, 3520, 3518, 3530,
+     3340, 3337, 3342, 3343, 3345, 3357, 3348, 3344, 3349, 3358,
+     3359, 3363, 3360, 6428, 6428, 3365, 3366, 3367, 3369, 3371,
+     3370, 3377, 3374, 3382, 3381, 3388, 3389, 3397, 6428, 3394,
+     3395, 3393, 3398, 3406, 3401, 3405, 3417, 3413, 3420, 3416,
+     6428, 3412, 3421, 3429, 3424, 3425, 3433, 6428, 3430, 6428,
+     3426, 3431, 3436, 3439, 3440, 3441, 3442, 3443, 3447, 3455,
+     3458, 3451, 3460, 3461, 3462, 3463, 3466, 3470, 3473, 3469,
+     3471, 3472, 6428, 3475, 3476, 3484, 3489, 3492, 3493, 3477,
+     3478, 6428, 3495, 3485, 3503, 3499, 3504, 3505, 3509, 3506,
+     3510, 3511, 3513, 6428, 3512, 3514, 3521, 3526, 3519, 3522,
 
-     3529, 3514, 3531, 3532, 3534, 3536, 3537, 3538, 3539, 3540,
-     3541, 3547, 3542, 3543, 3551, 3546, 3562, 3563, 3549, 3553,
-     3571, 3561, 6407, 3569, 3570, 3575, 3572, 3576, 3579, 3580,
-     3584, 3586, 3577, 3599, 3600, 3587, 3589, 3603, 3605, 3612,
-     3604, 6407, 3617, 3596, 3619, 3615, 3618, 3623, 3616, 3620,
-     3627, 3624, 3628, 3629, 3630, 3632, 3641, 3633, 3638, 3642,
-     3643, 3650, 3648, 6407, 3657, 3653, 3654, 3659, 3655, 3662,
-     3670, 3665, 3671, 3672, 3676, 3673, 3678, 3680, 3681, 3682,
-     3685, 3686, 6407, 6407, 3688, 3689, 3692, 6407, 3695, 3690,
-     3702, 3698, 3694, 3705, 3709, 3708, 3707, 3712, 3710, 3718,
+     3530, 3532, 3540, 6428, 3536, 3533, 3549, 3545, 3546, 3548,
+     3551, 3527, 3552, 3553, 3555, 3556, 3557, 3559, 3560, 3563,
+     3564, 3566, 3565, 3577, 3576, 3579, 3584, 3586, 3570, 6428,
+     3587, 3590, 3592, 3593, 3595, 3598, 3599, 3602, 3604, 3596,
+     3618, 3619, 3605, 3607, 3622, 3611, 3629, 3624, 6428, 3631,
+     3630, 3638, 3609, 3633, 3640, 3635, 3637, 3644, 3641, 3645,
+     3646, 3649, 3647, 3659, 3657, 3654, 3660, 3661, 3664, 3662,
+     6428, 3673, 3663, 3665, 3683, 3668, 3675, 3692, 3684, 3687,
+     3688, 3695, 3689, 3696, 3691, 3698, 3699, 3702, 3703, 6428,
+     6428, 3705, 3706, 3708, 6428, 3710, 3712, 3722, 3714, 3718,
 
-     6407, 3719, 3727, 3722, 3723, 3731, 3732, 3729, 3735, 3737,
-     3738, 3741, 3739, 3744, 3743, 3745, 3748, 3756, 3759, 3752,
-     3754, 3762, 6407, 3755, 3757, 3763, 3765, 3767, 3770, 6407,
-     3773, 3774, 3777, 3780, 3788, 3790, 3784, 3797, 3781, 3791,
-     3793, 3798, 3799, 3801, 3810, 3807, 3806, 3809, 3813, 3816,
-     6407, 3815, 3817, 3818, 3826, 6407, 3830, 3837, 3840, 3841,
-     3823, 3827, 3839, 3848, 6407, 3843, 3846, 3844, 3845, 3853,
-     3852, 3860, 3857, 3859, 6407, 3861, 3858, 3863, 6407, 3864,
-     3865, 3876, 3879, 3869, 3886, 3881, 3883, 3884, 3882, 6407,
-     3892, 6407, 3893, 3894, 3898, 6407, 3895, 3900, 3903, 3902,
+     3721, 3725, 3726, 3724, 3727, 3729, 3730, 6428, 3737, 3740,
+     3738, 3741, 3749, 3751, 3753, 3754, 3747, 3744, 3757, 3760,
+     3762, 3761, 3763, 3766, 3774, 3775, 3770, 3771, 3773, 6428,
+     3778, 3780, 3782, 3784, 3781, 3788, 6428, 3785, 3791, 3799,
+     3792, 3797, 3806, 3807, 3809, 3794, 3811, 3812, 3814, 3813,
+     3816, 3826, 3817, 3822, 3829, 3834, 3837, 6428, 3821, 3838,
+     3824, 3840, 6428, 3843, 3851, 3852, 6428, 3853, 3848, 3855,
+     3856, 3863, 6428, 3858, 3861, 3859, 3862, 3872, 3864, 3873,
+     3875, 3869, 6428, 3876, 3877, 3878, 6428, 3879, 3884, 3890,
+     3892, 3893, 3900, 3895, 3897, 3898, 3899, 6428, 3905, 6428,
 
-     3904, 3905, 3909, 3915, 3917, 3911, 3919, 3920, 3921, 3922,
-     3924, 3933, 3923, 3925, 3930, 3932, 6407, 3935, 3937, 3942,
-     3943, 3949, 3945, 3952, 3939, 3953, 3872, 6407, 6407, 3957,
-     6407, 3959, 3961, 3963, 6407, 3965, 3967, 3972, 3968, 3969,
-     3971, 3975, 3976, 6407, 3983, 3986, 6407, 3978, 3988, 3995,
-     3990, 3991, 3992, 3998, 3993, 3996, 4003, 4004, 4005, 4006,
-     4000, 4007, 4008, 6407, 4009, 4010, 4011, 4025, 4019, 4021,
-     4028, 4030, 4032, 6407, 4034, 4036, 4040, 4042, 4043, 6407,
-     4044, 6407, 4045, 4046, 4048, 4049, 4054, 6407, 4057, 4056,
-     4062, 4064, 4066, 4065, 4069, 4072, 4068, 4075, 4082, 4078,
+     3903, 3907, 3911, 6428, 3909, 3914, 3915, 3917, 3918, 3923,
+     3924, 3922, 3931, 3932, 3933, 3935, 3936, 3934, 3939, 3943,
+     3940, 3941, 3945, 3946, 6428, 3947, 3949, 3956, 3961, 3968,
+     3957, 3964, 3951, 3970, 3971, 6428, 6428, 3974, 6428, 3977,
+     3978, 3979, 6428, 3981, 3983, 3988, 3985, 3986, 3989, 3993,
+     3990, 6428, 4000, 4003, 6428, 4001, 4005, 4012, 4007, 4008,
+     4009, 4015, 4010, 4013, 4020, 4021, 4022, 4023, 4017, 4025,
+     4036, 6428, 4018, 4026, 4027, 4045, 4028, 4031, 4047, 4048,
+     4041, 6428, 4052, 4054, 4058, 4059, 4060, 6428, 4062, 6428,
+     4063, 4065, 4066, 4068, 4069, 6428, 4073, 4072, 4080, 4077,
 
-     4079, 4080, 6407, 4081, 4084, 4094, 4096, 4087, 4085, 4107,
-     4099, 4089, 4103, 4106, 4109, 4111, 4112, 4115, 4110, 4120,
-     4117, 6407, 4118, 4124, 4128, 4137, 4129, 4132, 6407, 4133,
-     4134, 4141, 6407, 4140, 4142, 4143, 4148, 4150, 4151, 4154,
-     4157, 4158, 6407, 4155, 4160, 4156, 4159, 4161, 4165, 6407,
-     6407, 4175, 6407, 4177, 4163, 4178, 4179, 4180, 4182, 4185,
-     4187, 4189, 4190, 4195, 4198, 4200, 4192, 4207, 4208, 4210,
-     4212, 4211, 4216, 6407, 6407, 4218, 4220, 4222, 4224, 4225,
-     4227, 4229, 4234, 4232, 4240, 4243, 4233, 4250, 6407, 4245,
-     4248, 4251, 4252, 6407, 4253, 4254, 4256, 4258, 4257, 4263,
+     4082, 4083, 4084, 4090, 4091, 4092, 4099, 4096, 4094, 4097,
+     6428, 4098, 4100, 4111, 4115, 4104, 4102, 4124, 4108, 4121,
+     4120, 4125, 4127, 4128, 4129, 4131, 4134, 4137, 4135, 6428,
+     4136, 4144, 4139, 4155, 4147, 4150, 6428, 4151, 4152, 4159,
+     6428, 4158, 4161, 4165, 4167, 4168, 4169, 4172, 4170, 4175,
+     6428, 4173, 4177, 4176, 4178, 4192, 4182, 6428, 6428, 4193,
+     6428, 4194, 4179, 4180, 4198, 4201, 4204, 4206, 4208, 4210,
+     4203, 4207, 4214, 4215, 4218, 4230, 4227, 4231, 4220, 4233,
+     4232, 6428, 6428, 4235, 4236, 4238, 4243, 4244, 4246, 4239,
+     4254, 4250, 4259, 4264, 4256, 4271, 6428, 4249, 4266, 4268,
 
-     4260, 4264, 4261, 4265, 4270, 4267, 4274, 4275, 4277, 4283,
-     4282, 4285, 4286, 4288, 4292, 4296, 6407, 4297, 4293, 4298,
-     4299, 4300, 4302, 4306, 4307, 4308, 6407, 4311, 6407, 4315,
-     4309, 4314, 4316, 4331, 4332, 4333, 4325, 4334, 4339, 4340,
-     4343, 4344, 4350, 4345, 4351, 4353, 4347, 4358, 4362, 4363,
-     6407, 4365, 4335, 4366, 4367, 4372, 4374, 4369, 4376, 4377,
-     4381, 4378, 4382, 4384, 4390, 4385, 4391, 4392, 4394, 6407,
-     4396, 4398, 4402, 4404, 4405, 4408, 4407, 4411, 4416, 4409,
-     4417, 4418, 4420, 6407, 4422, 4424, 4425, 4426, 4434, 4429,
-     4431, 4435, 4438, 6407, 4444, 4439, 4445, 4441, 4446, 4449,
+     4267, 6428, 4269, 4270, 4273, 4274, 4276, 4277, 4282, 4279,
+     4278, 4280, 4285, 4288, 4290, 4301, 4291, 4293, 4297, 4303,
+     4307, 4308, 4310, 4314, 6428, 4311, 4304, 4315, 4316, 4318,
+     4324, 4320, 4325, 4326, 6428, 4329, 6428, 4327, 4331, 4330,
+     4333, 4349, 4346, 4350, 4352, 4354, 4356, 4357, 4360, 4361,
+     4367, 4355, 4362, 4371, 4364, 4378, 4380, 4381, 6428, 4382,
+     4374, 4383, 4384, 4389, 4391, 4385, 4393, 4395, 4398, 4399,
+     4400, 4402, 4407, 4408, 4409, 4410, 4411, 6428, 4412, 4416,
+     4419, 4421, 4423, 4332, 4425, 4426, 4432, 4429, 4434, 4433,
+     4436, 6428, 4437, 4439, 4440, 4443, 4445, 4446, 4451, 4453,
 
-     4451, 4456, 4454, 4458, 4462, 6407, 4461, 4466, 4469, 4468,
-     4470, 4475, 4476, 4472, 6407, 4479, 4485, 4486, 4494, 4478,
-     4495, 4487, 4497, 4491, 4500, 4503, 4505, 4508, 4509, 4510,
-     4507, 4526, 4528, 4511, 6407, 4504, 6407, 4523, 4529, 4531,
-     4533, 4535, 4527, 6407, 4536, 4537, 4539, 4541, 4545, 6407,
-     4543, 4544, 4546, 4550, 6407, 4548, 4558, 4557, 4559, 4565,
-     4566, 6407, 4569, 4570, 4574, 4578, 4581, 4576, 4583, 4580,
-     4586, 4584, 4588, 4589, 4590, 4598, 4593, 4595, 6407, 4597,
-     4603, 4605, 4609, 4616, 4611, 4599, 4613, 4622, 4612, 6407,
-     4618, 4624, 4626, 4627, 4628, 4629, 4630, 4637, 4633, 4634,
+     4454, 6428, 4459, 4450, 4460, 4461, 4463, 4464, 4466, 4471,
+     4474, 4476, 4477, 6428, 4473, 4479, 4486, 4487, 4488, 4489,
+     4493, 4490, 6428, 4494, 4500, 4496, 4508, 4503, 4513, 4504,
+     4514, 4506, 4515, 4517, 4518, 4521, 4523, 4525, 4522, 4535,
+     4539, 4537, 6428, 4526, 6428, 4538, 4542, 4550, 4548, 4540,
+     4551, 6428, 4552, 4553, 4555, 4559, 4556, 6428, 4558, 4560,
+     4562, 4563, 6428, 4561, 4567, 4566, 4578, 4580, 4581, 6428,
+     4584, 4585, 4587, 4595, 4597, 4593, 4599, 4594, 4600, 4603,
+     4596, 4604, 4605, 4613, 4611, 4609, 6428, 4612, 4617, 4619,
+     4621, 4628, 4624, 4629, 4630, 4632, 4635, 6428, 4636, 4637,
 
-     4636, 4638, 4640, 4642, 6407, 4647, 4648, 4651, 4660, 4650,
-     4665, 6407, 4653, 6407, 4661, 4668, 4670, 4666, 4671, 6407,
-     6407, 4674, 4682, 4677, 4680, 4681, 6407, 6407, 4684, 6407,
-     4685, 6407, 4686, 4688, 6407, 6407, 4691, 4687, 4693, 4694,
-     4702, 6407, 4706, 6407, 4714, 4709, 4695, 4697, 4707, 6407,
-     4715, 4716, 4718, 6407, 4720, 4727, 4722, 4723, 6407, 4725,
-     4730, 4726, 4731, 6407, 4735, 4742, 4732, 4739, 4743, 4746,
-     4748, 4744, 4747, 4753, 4754, 4755, 4762, 4764, 4769, 4771,
-     4773, 4766, 4756, 4776, 4779, 4782, 4777, 4784, 4785, 4786,
-     4788, 4790, 4792, 4794, 4795, 4798, 4797, 4799, 4800, 4803,
+     4638, 4639, 4640, 4642, 4645, 4652, 4654, 4643, 4647, 4651,
+     4659, 4655, 6428, 4656, 4663, 4667, 4671, 4669, 4673, 6428,
+     4674, 6428, 4678, 4680, 4682, 4684, 4686, 6428, 6428, 4689,
+     4694, 4690, 4696, 4691, 6428, 6428, 4698, 6428, 4699, 6428,
+     4701, 4703, 6428, 6428, 4704, 4705, 4706, 4707, 4714, 6428,
+     4721, 6428, 4722, 4723, 4718, 4708, 4727, 6428, 4725, 4726,
+     4729, 6428, 4733, 4741, 4736, 4737, 6428, 4740, 4743, 4745,
+     4747, 6428, 4748, 4751, 4753, 4755, 4757, 4756, 4760, 4763,
+     4767, 4759, 4769, 4768, 4770, 4779, 4783, 4785, 4787, 4780,
+     4772, 4789, 4795, 4797, 4791, 4793, 4799, 4800, 4802, 4804,
 
-     4801, 4807, 4813, 4814, 4815, 4816, 4817, 4818, 4819, 4822,
-     4824, 4826, 4828, 4829, 6407, 4831, 4832, 4837, 4845, 4838,
-     4846, 4850, 4840, 4857, 4858, 6407, 4861, 6407, 4863, 4847,
-     4866, 4853, 4867, 6407, 4868, 4869, 4870, 4871, 4874, 4873,
-     4876, 4875, 4879, 4880, 4884, 6407, 4890, 4881, 6407, 4886,
-     4894, 4900, 6407, 4901, 4905, 4902, 4906, 4907, 4911, 4909,
-     4912, 4913, 4915, 4917, 4919, 4921, 4922, 4925, 4933, 4936,
-     4943, 4928, 4923, 4939, 4942, 4944, 4945, 4947, 4948, 4950,
-     4955, 4957, 4961, 6407, 4951, 6407, 4962, 4963, 4964, 4966,
-     4968, 4969, 4972, 6407, 6407, 4974, 4975, 4980, 4977, 4981,
+     4807, 4809, 4810, 4812, 4811, 4813, 4814, 4815, 4817, 4822,
+     4827, 4829, 4828, 4830, 4831, 4832, 4833, 4836, 4839, 4843,
+     4845, 4846, 6428, 4835, 4841, 4849, 4855, 4851, 4857, 4859,
+     4867, 4869, 4870, 6428, 4873, 6428, 4875, 4877, 4878, 4879,
+     4881, 6428, 4880, 4883, 4882, 4885, 4884, 4886, 4888, 4887,
+     4891, 4892, 4902, 6428, 4912, 4899, 6428, 4894, 4908, 4919,
+     6428, 4913, 4921, 4897, 4923, 4924, 4925, 4926, 4927, 4930,
+     4928, 4933, 4935, 4929, 4936, 4937, 4939, 4951, 4948, 4952,
+     4953, 4955, 4957, 4956, 4958, 4959, 4960, 4962, 4967, 4973,
+     4977, 6428, 4963, 6428, 4972, 4969, 4980, 4983, 4984, 4985,
 
-     4984, 4993, 6407, 4985, 4998, 4988, 4990, 6407, 4995, 4996,
-     5001, 5005, 6407, 5006, 5008, 5007, 5013, 5009, 5015, 5019,
-     5020, 5022, 5023, 5026, 6407, 6407, 6407, 6407, 5030, 5027,
-     5033, 5034, 5037, 5036, 5039, 5041, 5042, 6407, 5044, 6407,
-     6407, 5046, 5053, 5052, 5054, 5055, 5056, 5060, 5062, 6407,
-     5061, 5067, 5068, 5064, 5078, 5081, 5083, 5084, 5085, 5071,
-     5074, 5093, 5094, 5095, 5086, 5097, 5104, 5106, 6407, 6407,
-     5098, 5108, 5109, 5116, 5113, 5114, 5117, 5126, 5121, 5122,
-     5123, 5124, 5128, 5129, 5140, 5141, 5133, 5088, 6407, 5130,
-     5137, 5144, 6407, 5143, 6407, 5148, 5149, 5145, 5151, 5152,
+     4987, 6428, 6428, 4990, 4991, 4996, 4986, 4993, 4998, 5000,
+     6428, 4999, 5008, 5016, 5007, 6428, 5002, 5009, 5013, 5019,
+     6428, 5022, 5021, 5023, 5025, 5026, 5032, 5035, 5028, 5036,
+     5038, 5042, 6428, 6428, 6428, 6428, 5043, 5039, 5047, 5049,
+     5051, 5048, 5054, 5056, 5053, 6428, 5059, 6428, 6428, 5060,
+     5066, 5067, 5069, 5070, 5072, 5073, 5075, 6428, 5077, 5079,
+     5080, 5086, 5088, 5090, 5094, 5095, 5098, 5096, 5097, 5105,
+     5104, 5106, 5108, 5111, 5113, 5118, 6428, 6428, 5119, 5121,
+     5122, 5130, 5126, 5128, 5127, 5140, 5135, 5137, 5136, 5138,
+     5143, 5144, 5152, 5154, 5150, 5147, 6428, 5156, 5157, 5158,
 
-     5156, 5157, 5159, 6407, 6407, 5160, 5172, 5167, 6407, 6407,
-     5162, 5169, 5171, 5175, 5170, 5176, 5179, 5182, 5184, 5180,
-     6407, 5185, 6407, 5186, 5187, 5193, 5194, 5202, 5204, 5207,
-     5209, 5203, 5205, 6407, 5212, 5213, 6407, 5214, 5215, 5216,
-     6407, 5222, 5217, 5225, 5228, 6407, 5233, 5230, 5236, 6407,
-     5238, 6407, 5220, 5239, 5242, 5249, 6407, 5245, 5246, 6407,
-     5251, 5253, 5255, 5256, 6407, 5257, 6407, 5259, 5261, 5262,
-     5267, 5268, 5271, 5264, 5272, 5273, 5280, 5282, 5284, 6407,
-     6407,  135, 5292, 5276, 5278, 5285, 5289, 5300, 5293, 5297,
-     5303, 6407, 6407, 5304, 6407, 5306, 5307, 6407, 5296, 5308,
+     6428, 5163, 6428, 5164, 5166, 5149, 5160, 5168, 5170, 5180,
+     5174, 6428, 6428, 5176, 5184, 5182, 6428, 6428, 5185, 5186,
+     5189, 5191, 5192, 5193, 5187, 5195, 5198, 5200, 6428, 5201,
+     6428, 5202, 5203, 5214, 5205, 5215, 5217, 5224, 5221, 5223,
+     5227, 6428, 5225, 5226, 6428, 5229, 5228, 5235, 6428, 5236,
+     5238, 5241, 5244, 6428, 5246, 5247, 5248, 6428, 5255, 6428,
+     5249, 5252, 5258, 5265, 6428, 5260, 5261, 6428, 5267, 5272,
+     5273, 5268, 6428, 5274, 6428, 5263, 5278, 5284, 5287, 5275,
+     5289, 5282, 5279, 5291, 5299, 5301, 5294, 6428, 6428,  135,
+     5308, 5296, 5303, 5304, 5306, 5315, 5310, 5313, 5321, 6428,
 
-     5312, 5315, 5317, 5316, 5319, 5323, 5325, 5326, 5327, 5328,
-     5329, 5335, 5341, 5351, 5336, 5347, 5352, 5356, 5358, 5360,
-     5349, 5362, 5354, 5363, 5364, 5366, 5368, 5370, 5371, 5372,
-     6407, 5376, 5378, 5380, 5381, 6407, 5387, 5388, 5394, 5396,
-     6407, 5398, 5400, 5402, 5403, 6407, 5390, 5405, 5406, 5407,
-     5413, 5420, 5417, 5415, 5418, 6407, 6407, 6407, 5421, 5432,
-     6407, 5434, 5423, 5425, 5427, 6407, 5429, 5435, 6407, 6407,
-     5436, 5439, 5440, 5449, 6407, 5441, 6407, 5442, 6407, 5446,
-     5452, 5454, 5456, 6407, 5459, 5466, 6407, 5469, 5472, 5474,
-     5475, 5458, 5462, 5477, 6407, 5485, 5483, 5486, 5490, 5476,
+     6428, 5311, 6428, 5314, 5325, 6428, 5318, 5326, 5330, 5327,
+     5332, 5333, 5334, 5336, 5339, 5341, 5346, 5342, 5340, 5352,
+     5358, 5368, 5347, 5364, 5369, 5371, 5373, 5375, 5365, 5348,
+     5377, 5378, 5379, 5380, 5382, 5383, 5385, 5386, 6428, 5389,
+     5391, 5393, 5394, 6428, 5401, 5395, 5408, 5398, 6428, 5410,
+     5411, 5413, 5414, 6428, 5415, 5417, 5421, 5418, 5419, 5430,
+     5426, 5428, 5431, 6428, 6428, 6428, 5436, 5443, 6428, 5445,
+     5432, 5438, 5440, 6428, 5447, 5448, 6428, 6428, 5449, 5450,
+     5451, 5461, 6428, 5452, 6428, 5454, 6428, 5457, 5465, 5466,
+     5468, 6428, 5473, 5479, 6428, 5482, 5485, 5487, 5488, 5469,
 
-     5480, 5487, 5493, 5495, 5502, 5497, 5500, 6407, 5501, 5504,
-     5506, 5514, 5507, 5503, 5510, 5512, 6407, 5517, 6407, 5520,
-     5521, 5519, 5527, 5524, 5528, 5529, 5530, 5538, 5541, 5531,
-     5542, 5544, 5545, 6407, 6407, 5552, 5554, 6407, 5546, 6407,
-     5556, 6407, 5557, 5558, 5559, 5560, 6407, 5562, 5563, 5548,
-     5566, 6407, 5569, 5572, 5576, 5578, 6407, 6407, 5579, 5587,
-     5584, 5580, 5591, 5593, 5588, 5597, 5320, 5594, 5598, 5606,
-     5582, 5605, 5604, 5610, 5611, 5612, 6407, 6407, 6407, 5607,
-     5615, 5626, 5622, 5625, 5629, 5627, 6407, 5631, 5633, 5634,
-     5630, 5643, 5638, 5641, 6407, 5642, 5644, 5646, 5647, 5651,
+     5453, 5490, 6428, 5498, 5491, 5494, 5501, 5493, 5502, 5503,
+     5504, 5505, 5512, 5507, 5516, 6428, 5513, 5520, 5521, 5518,
+     5508, 5522, 5528, 5510, 6428, 5534, 6428, 5529, 5531, 5535,
+     5536, 5538, 5540, 5541, 5546, 5547, 5552, 5550, 5553, 5556,
+     5557, 6428, 6428, 5563, 5565, 6428, 5560, 6428, 5567, 6428,
+     5558, 5569, 5570, 5572, 6428, 5583, 5571, 5573, 5575, 6428,
+     5587, 5578, 5580, 5590, 6428, 6428, 5584, 5601, 5593, 5597,
+     5603, 5606, 5600, 5608, 5610, 5609, 5611, 5622, 5613, 5612,
+     5614, 5626, 5630, 5628, 6428, 6428, 6428, 5623, 5617, 5642,
+     5639, 5640, 5647, 5644, 6428, 5645, 5649, 5646, 5652, 5659,
 
-     5648, 5653, 5652, 6407, 5659, 5664, 5665, 5666, 5668, 5675,
-     5677, 5679, 5669, 5672, 5687, 5683, 6407, 5685, 6407, 6407,
-     5686, 6407, 5689, 5690, 5691, 5692, 6407, 5695, 5696, 5697,
-     5699, 5701, 5703, 6407, 5715, 5704, 5706, 5714, 6407, 6407,
-     5721, 6407, 5723, 5726, 5716, 5733, 5728, 5729, 5735, 5736,
-     6407, 5718, 5732, 5739, 5742, 5743, 6407, 5745, 5746, 5747,
-     5748, 6407, 5751, 5750, 5755, 5756, 5757, 6407, 5758, 5759,
-     5770, 5771, 6407, 5760, 5778, 5761, 6407, 6407, 5782, 5785,
-     5786, 6407, 6407, 6407, 5788, 5789, 5791, 5793, 6407, 5796,
-     5800, 5804, 5808, 5799, 6407, 5812, 5807, 5809, 6407, 6407,
+     5655, 5657, 6428, 5654, 5658, 5660, 5661, 5664, 5665, 5675,
+     5668, 6428, 5670, 5681, 5678, 5682, 5686, 5688, 5690, 5693,
+     5694, 5695, 5703, 5699, 6428, 5701, 6428, 6428, 5698, 6428,
+     5702, 5705, 5706, 5708, 6428, 5711, 5712, 5713, 5714, 5716,
+     5719, 6428, 5731, 5720, 5722, 5729, 6428, 6428, 5736, 6428,
+     5738, 5739, 5732, 5748, 5743, 5745, 5750, 5747, 6428, 5751,
+     5754, 5756, 5757, 5758, 6428, 5759, 5760, 5762, 5763, 6428,
+     5766, 5765, 5768, 5770, 5772, 6428, 5773, 5775, 5793, 5789,
+     6428, 5776, 5792, 5788, 6428, 6428, 5799, 5803, 5800, 6428,
+     6428, 6428, 5806, 5807, 5790, 5811, 6428, 5814, 5818, 5822,
 
-     5813, 5814, 5815, 5817, 6407, 6407, 5818, 5819, 5824, 5821,
-     5822, 6407, 5827, 5829, 5831, 5836, 5840, 5841, 5842, 5846,
-     5850, 5854, 5851, 5852, 5853, 5857, 5859, 5860, 5866, 5869,
-     5871, 5873, 5881, 5883, 5870, 6407, 6407, 5885, 6407, 5887,
-     5888, 6407, 6407, 5890, 5892, 5894, 5896, 5899, 5901, 5903,
-     6407, 5904, 5906, 5907, 5908, 5909, 6407, 5911, 5915, 5910,
-     5918, 5912, 5921, 5917, 5927, 6407, 6407, 5919, 5933, 5923,
-     5934, 5928, 6407, 5938, 5945, 5940, 5942, 5943, 5948, 5944,
-     6407, 5950, 5952, 6407, 6407, 6407, 5953, 6407, 6407, 5951,
-     6407, 6407, 6407, 6407, 6407, 6407, 6407, 5955, 6407, 5957,
+     5826, 5817, 6428, 5828, 5825, 5830, 6428, 6428, 5829, 5831,
+     5832, 5834, 6428, 6428, 5835, 5838, 5836, 5839, 5841, 6428,
+     5846, 5850, 5852, 5855, 5858, 5847, 5861, 5863, 5871, 5873,
+     5868, 5869, 5874, 5876, 5877, 5878, 5880, 5889, 5885, 5887,
+     5899, 5901, 5902, 6428, 6428, 5904, 6428, 5906, 5908, 6428,
+     6428, 5910, 5912, 5914, 5916, 5919, 5921, 5923, 6428, 5924,
+     5926, 5927, 5928, 5929, 6428, 5931, 5935, 5930, 5938, 5932,
+     5941, 5937, 5947, 6428, 6428, 5939, 5953, 5943, 5954, 5948,
+     6428, 5958, 5894, 5959, 5960, 5962, 5964, 5963, 6428, 5890,
+     5967, 6428, 6428, 6428, 5968, 6428, 6428, 5970, 6428, 6428,
 
-     5964, 5972, 5974, 6407, 5959, 5967, 5965, 5975, 5978, 6407,
-     5979, 5980, 5981, 5382, 5983, 5984, 5987, 5988, 5990, 5989,
-     5993, 5994, 5997, 5999, 5996, 6010, 6001, 6014, 6407, 6407,
-     6407, 6012, 6003, 6025, 6004, 6028, 6029, 6032, 6034, 6016,
-     6020, 6036, 6037, 6038, 6022, 6041, 6050, 6045, 6046, 6048,
-     6049, 6052, 6055, 6057, 6060, 6062, 6407, 6063, 6407, 6064,
-     6407, 6407, 6066, 6067, 6073, 6070, 6077, 6080, 6076, 6075,
-     6083, 6086, 6085, 6093, 6407, 6407, 6087, 6094, 6407, 6095,
-     6096, 6407, 6097, 6098, 6099, 6106, 6107, 6104, 6105, 6111,
-     6113, 6407, 6407, 6101, 6115, 6122, 6125, 6126, 6134, 6129,
+     6428, 6428, 6428, 6428, 6428, 5971, 6428, 5972, 5978, 5987,
+     5989, 6428, 5975, 5984, 5990, 5980, 5991, 6428, 5992, 5995,
+     5997, 5999, 6003, 6007, 6004, 6009, 6011, 6010, 6012, 6016,
+     6013, 6020, 6014, 6019, 6021, 6025, 6428, 6428, 6428, 6033,
+     6023, 6039, 6027, 6045, 6048, 6051, 6053, 6040, 6034, 6055,
+     6056, 6057, 6042, 6060, 6069, 6064, 6065, 6066, 6068, 6073,
+     6080, 6070, 6074, 6082, 6428, 6076, 6428, 6083, 6428, 6428,
+     6087, 6089, 6084, 6094, 6102, 6103, 6095, 6098, 6099, 6100,
+     6107, 6115, 6428, 6428, 6104, 6108, 6428, 6110, 6112, 6428,
+     6117, 6121, 6119, 6120, 6122, 6123, 6127, 6129, 6131, 6428,
 
-     6127, 6135, 6137, 6136, 6144, 6407, 6146, 6143, 6150, 6407,
-     6147, 6139, 5861, 6152, 6153, 6160, 6156, 6157, 6407, 6161,
-     6407, 6164, 6165, 6168, 6159, 6166, 6167, 6181, 6179, 6176,
-     6407, 6169, 6186, 6183, 6190, 6192, 6194, 6196, 6188, 6198,
-     6200, 6204, 6209, 6210, 6211, 6201, 6214, 6212, 6407, 6216,
-     6213, 6407, 6221, 6222, 6223, 6224, 6228, 6407, 6234, 6225,
-     6230, 6235, 6238, 6239, 6407, 6241, 6248, 6245, 6407, 6250,
-     6407, 6407, 6251, 6253, 6254, 6258, 6260, 6407, 6407, 6407,
-     6287, 6294, 6301, 6308, 6315, 6322, 6329,   88, 6336, 6343,
-     6350, 6357, 6364, 6371, 6378, 6385, 6392, 6399
+     6428, 6136, 6139, 6140, 6144, 6141, 6151, 6147, 6149, 6150,
+     6153, 6152, 6166, 6428, 6162, 6163, 6165, 6428, 6169, 6167,
+     6170, 6172, 6174, 6181, 6176, 6179, 6428, 6182, 6428, 6185,
+     6178, 6189, 6180, 6188, 6196, 6197, 6200, 6201, 6428, 6202,
+     6203, 6206, 6210, 6212, 6215, 6216, 6208, 6218, 6219, 6229,
+     6222, 6226, 6230, 6232, 6234, 6235, 6428, 6241, 6236, 6428,
+     6238, 6242, 6244, 6245, 6248, 6428, 6253, 6246, 6250, 6256,
+     6259, 6260, 6428, 6262, 6271, 6266, 6428, 6272, 6428, 6428,
+     6274, 6268, 6275, 6281, 6283, 6428, 6428, 6428, 6308, 6315,
+     6322, 6329, 6336, 6343, 6350,   88, 6357, 6364, 6371, 6378,
 
+     6385, 6392, 6399, 6406, 6413, 6420
     } ;
 
-static const flex_int16_t yy_def[3299] =
+static const flex_int16_t yy_def[3307] =
     {   0,
-     3280,    1, 3281, 3281, 3282, 3282, 3283, 3283, 3284, 3284,
-     3285, 3285, 3286, 3286, 3287, 3287, 3280, 3288, 3280, 3280,
-     3280, 3280, 3289, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3290, 3280, 3280, 3280,
-     3290, 3291, 3280, 3280, 3280, 3291, 3292, 3280, 3280, 3280,
-     3280, 3292, 3293, 3280, 3280, 3280, 3293, 3294, 3280, 3295,
-     3280, 3294, 3294, 3296, 3280, 3280, 3280, 3280, 3296, 3297,
-     3280, 3280, 3280, 3297, 3288, 3288, 3280, 3298, 3289, 3298,
-     3289, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288,    1, 3289, 3289, 3290, 3290, 3291, 3291, 3292, 3292,
+     3293, 3293, 3294, 3294, 3295, 3295, 3288, 3296, 3288, 3288,
+     3288, 3288, 3297, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3298, 3288, 3288, 3288,
+     3298, 3299, 3288, 3288, 3288, 3299, 3300, 3288, 3288, 3288,
+     3288, 3300, 3301, 3288, 3288, 3288, 3301, 3302, 3288, 3303,
+     3288, 3302, 3302, 3304, 3288, 3288, 3288, 3288, 3304, 3305,
+     3288, 3288, 3288, 3305, 3296, 3296, 3288, 3306, 3297, 3306,
+     3297, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
 
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3290, 3290, 3291,
-     3291, 3292, 3292, 3280, 3293, 3293, 3294, 3294, 3295, 3295,
-     3294, 3296, 3296, 3280, 3297, 3297, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3298, 3298, 3299,
+     3299, 3300, 3300, 3288, 3301, 3301, 3302, 3302, 3303, 3303,
+     3302, 3304, 3304, 3288, 3305, 3305, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3302, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3302, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3302, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3302, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3288, 3288, 3296, 3288, 3288, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3302, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3288, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296, 3288,
+
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3302, 3302, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3302, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3302, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3288, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3302, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3288, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3302, 3296, 3288, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3288,
+
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3288, 3288, 3296, 3288, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3288, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3302, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296, 3296, 3302,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3288, 3288, 3296,
+     3296, 3296, 3296, 3296, 3288, 3288, 3296, 3288, 3296, 3288,
+     3296, 3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3302, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3288, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3288, 3288, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3288, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3302, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+
+     3288, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3288, 3296, 3296, 3296, 3288, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3288, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3288, 3296, 3288,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3288, 3302,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+
+     3288, 3296, 3288, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3288, 3288, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3288, 3288, 3296, 3296,
+     3296, 3296, 3288, 3296, 3288, 3296, 3288, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3288, 3296, 3296, 3288, 3296, 3288, 3296, 3288,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3288, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3288, 3288, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+
+     3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3288, 3288, 3296, 3288,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3288, 3288, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3288, 3288, 3296, 3296, 3296, 3288,
+     3288, 3288, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296,
+
+     3296, 3296, 3288, 3296, 3296, 3296, 3288, 3288, 3296, 3296,
+     3296, 3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3288, 3296, 3288, 3296, 3296, 3288,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3288, 3296, 3296, 3296, 3296, 3296,
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3288, 3288, 3288, 3296, 3288, 3288, 3296, 3288, 3288,
+
+     3288, 3288, 3288, 3288, 3288, 3296, 3288, 3296, 3296, 3296,
+     3296, 3288, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3288, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3288, 3296, 3288, 3296, 3288, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3288, 3296, 3296, 3288, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288,
+
+     3288, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3288, 3296, 3296, 3296, 3288, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3288,
+     3296, 3296, 3296, 3296, 3296, 3288, 3296, 3296, 3296, 3296,
+     3296, 3296, 3288, 3296, 3296, 3296, 3288, 3296, 3288, 3288,
+     3296, 3296, 3296, 3296, 3296, 3288, 3288,    0, 3288, 3288,
      3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
 
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3294, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3294, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3294,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3294,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280,
-     3280, 3288, 3280, 3280, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3294, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3294, 3294, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3294, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3294, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3294, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3280, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3294, 3288, 3280, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3280, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288,
-     3280, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3294, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288,
-     3288, 3294, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280,
-     3280, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3280,
-     3288, 3280, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3294,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3280, 3280, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3294, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3280, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280,
-     3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280,
-     3280, 3294, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3280, 3288, 3280, 3288, 3288, 3280, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3280, 3280, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3280, 3280,
-     3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288, 3280, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3280, 3288, 3288, 3280, 3288, 3280,
-     3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280, 3280, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3280,
-     3288, 3280, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3280, 3280,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3280, 3280, 3288, 3288,
-     3288, 3280, 3280, 3280, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280, 3280,
-
-     3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3280, 3288,
-     3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3288,
-     3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3280, 3280, 3280, 3288, 3280, 3280, 3288,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3288, 3280, 3288,
-
-     3288, 3288, 3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3280,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3280, 3288,
-     3280, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3280, 3288, 3288, 3280, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3280, 3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-
-     3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3280, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
-     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3280, 3288,
-     3288, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3288, 3288,
-     3288, 3288, 3288, 3288, 3280, 3288, 3288, 3288, 3280, 3288,
-     3280, 3280, 3288, 3288, 3288, 3288, 3288, 3280, 3280,    0,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280
-
+     3288, 3288, 3288, 3288, 3288, 3288
     } ;
 
-static const flex_int16_t yy_nxt[6448] =
+static const flex_int16_t yy_nxt[6469] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1540,7 +1543,7 @@ static const flex_int16_t yy_nxt[6448] =
       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,  919,  221,   86,  227,  220,
+      224,   86,  214,   86,  217,  922,  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,
@@ -1588,7 +1591,7 @@ static const flex_int16_t yy_nxt[6448] =
       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,
+       86,   86,   86,  452,  564,  453,  456,   86,  443,  458,
       459,  444,   86,  457,   86,  462,  445,  446,  447,  448,
 
       460,  454,   86,   86,   86,  461,   86,  468,   86,   86,
@@ -1598,623 +1601,625 @@ static const flex_int16_t yy_nxt[6448] =
       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,
+      492,   86,  164,  493,  501,  494,   86,   86,  502,  511,
+       86,   86,  513,  516,   86,  515,  503,   86,  504,  510,
+      505,  168,  514,  527,   86,  518,  528,  512,   86,  517,
 
-       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,
+       86,  529,   86,  506,  530,   86,  507,   86,  508,  526,
+      509,   86,  531,  519,  520,   86,  534,   86,  536,  532,
+      533,   86,   86,  521,   86,  522,  523,  524,   86,  540,
+      525,   86,   86,  542,  535,   86,  539,   86,   86,  541,
+       86,  538,  549,  537,   86,  547,  546,   86,   86,   86,
+      550,  543,  544,  548,   86,  554,   86,  545,   86,  552,
+       86,   86,   86,   86,  551,  557,  558,  559,  553,   86,
+       86,   86,   86,   86,  556,  565,  566,   86,  571,  561,
+       86,  555,  560,   86,  568,  563,  562,  569,   86,   86,
+       86,  572,   86,  567,  585,   86,   86,  163,   86,   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,  580,  570,  573,  577,  574,  576,  586,  575,  581,
+      582,   86,   86,  583,  584,  578,  587,  579,   86,  590,
+      591,  589,  588,   86,   86,   86,   86,   86,  593,  592,
+      594,  595,   86,   86,  597,   86,  599,   86,   86,  603,
+       86,   86,  602,  600,   86,   86,   86,   86,  598,   86,
+      604,   86,  596,  601,  607,   86,  608,   86,  609,  605,
+       86,   86,   86,   86,   86,   86,  610,  611,  606,   86,
+      619,   86,  615,   86,  614,  616,  617,   86,  618,  613,
+      612,   86,  621,   86,  620,   86,  623,   86,   86,   86,
+       86,   86,   86,   86,   86,  622,  625,  634,  626,  161,
 
-      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,
+      636,   86,  628,   86,  624,   86,   86,  627,  633,  629,
+      631,  630,   86,  632,  635,  638,   86,  637,   86,   86,
+       86,  641,  644,   86,  639,  647,   86,  640,   86,  646,
+       86,   86,   86,  642,   86,  643,   86,  650,   86,   86,
+       86,   86,  653,  645,  649,  654,  656,   86,   86,  648,
+       86,   86,   86,   86,  655,   86,  651,  652,   86,  670,
+       86,   86,   86,  657,  659,  692,  673,  658,   86,  660,
+      668,  671,   86,  669,  661,  676,  662,  672,   86,   86,
+       86,  680,  663,  677,  664,  674,  681,  665,  666,  675,
+       86,   86,   86,   86,  667,  678,  685,  682,  679,   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,  833,   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,
+       86,   86,  688,   86,   86,  683,   86,  684,   86,  690,
+       86,   86,   86,   86,   86,   86,   86,  696,   86,  691,
+      687,  693,  686,  697,  700,  701,   86,  168,  689,  694,
+      699,  702,  698,  695,  703,   86,   86,   86,  704,   86,
+       86,   86,   86,   86,   86,   86,  710,  712,   86,   86,
+      705,  707,  715,   86,  708,  706,  711,  714,  716,  709,
+      717,  718,   86,   86,   86,   86,  720,   86,  713,   86,
+       86,   86,   86,   86,  719,  723,  724,  729,   86,  721,
+      725,   86,  730,   86,  722,  732,   86,  726,  728,  734,
+      727,  731,  733,   86,  737,   86,  735,   86,  736,   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,  768,  763,   86,  759,   86,  762,
-      764,   86,   86,  765,  766,  767,  771,  772,   86,  769,
-      775,   86,  770,  774,   86,   86,   86,  777,   86,  778,
-      776,   86,  773,  780,  781,   86,   86,   86,   86,   86,
-      782,   86,   86,   86,  787,  785,  789,   86,   86,   86,
+       86,  738,  740,   86,   86,   86,  739,   86,  742,  743,
+       86,   86,   86,   86,   86,  741,  746,  747,   86,  745,
+       86,  751,  750,   86,   86,   86,   86,   86,  752,  744,
+      754,   86,  756,   86,   86,   86,   86,  748,   86,  749,
+      755,  753,   86,  759,  762,   86,   86,  763,  757,  765,
+       86,  760,   86,   86,  766,  758,  761,  767,  768,  764,
+       86,  770,   86,   86,   86,   86,   86,  777,  773,  774,
+      769,  771,   86,   86,   86,  779,   86,   86,  772,  775,
+      780,  776,  782,  778,   86,   86,   86,  783,   86,   86,
+      784,   86,   86,  787,   86,   86,  789,  791,   86,   86,
 
-       86,  779,  783,  797,  786,  784,   86,  790,   86,  792,
-      795,   86,  788,   86,   86,  793,   86,  796,  791,  801,
-      794,  798,  799,   86,   86,   86,  800,  804,   86,   86,
-      806,  802,   86,   86,  805,  807,   86,   86,  810,  803,
-       86,   86,  809,  811,   86,   86,   86,   86,   86,  817,
-      159,  814,   86,  808,  812,   86,  819,  820,  813,  818,
-       86,  822,   86,   86,   86,  815,  816,  824,  821,  823,
-      826,   86,   86,  829,   86,  827,   86,  828,  830,   86,
-       86,  831,  825,   86,   86,  835,   86,   86,   86,   86,
-       86,  841,   86,  834,  842,   86,  832,   86,   86,   86,
+       86,   86,  781,   86,  785,  788,  797,  786,  792,   86,
+      795,  794,   86,  159,  790,  796,   86,   86,   86,  793,
+      799,  802,  798,  800,  801,   86,   86,  804,   86,  806,
+      803,   86,  808,   86,   86,   86,  807,  809,   86,   86,
+      812,   86,  805,   86,  811,  813,   86,   86,   86,  819,
+       86,   86,  816,   86,  814,   86,  815,  821,  810,   86,
+       86,  824,   86,   86,  822,  826,  817,  818,  828,  820,
+      825,  823,   86,   86,   86,   86,  831,   86,  830,  835,
+      827,  832,   86,   86,  829,   86,  833,   86,   86,  837,
+       86,   86,   86,   86,   86,  843,   86,   86,  844,   86,
 
-       86,  843,  836,   86,  837,  838,   86,  839,  850,  840,
-      844,   86,   86,  845,   86,  848,   86,  846,   86,  847,
-       86,  849,   86,   86,  852,  851,  855,   86,   86,   86,
-       86,   86,   86,  864,   86,  853,  862,  854,  856,  857,
-       86,   86,   86,   86,  863,  858,  859,  860,  861,   86,
-       86,   86,  867,  865,   86,  869,  868,   86,   86,  866,
-       86,  873,  871,  874,   86,  876,   86,  870,   86,   86,
-      872,  875,   86,  877,   86,   86,  879,   86,  168,   86,
-       86,  880,  885,  884,  878,   86,  882,  883,  881,  886,
-       86,   86,   86,   86,  887,  892,   86,  895,   86,  888,
+      834,   86,  836,   86,   86,  845,  838,   86,  839,  840,
+       86,  841,  846,  842,  847,   86,  852,   86,   86,  850,
+       86,  848,   86,  849,   86,  851,   86,   86,  857,  853,
+      854,   86,   86,   86,   86,   86,  855,   86,  866,  856,
+      864,   86,   86,  859,  858,  867,   86,   86,  865,  860,
+      861,  862,  863,   86,   86,   86,  868,   86,  870,  872,
+       86,   86,   86,   86,   86,  869,  176,  871,  876,  877,
+      878,  873,   86,  875,   86,   86,  874,  879,   86,  880,
+      881,   86,  882,   86,   86,  168,   86,  883,   86,  888,
+      887,   86,  885,   86,   86,  884,  886,  889,   86,   86,
 
-       86,  893,   86,   86,   86,   86,  889,  890,  896,  894,
-      899,  897,   86,  891,   86,   86,   86,   86,  901,   86,
-      905,   86,   86,  898,  902,  900,   86,  906,  907,   86,
-       86,   86,   86,   86,   86,  904,   86,   86,   86,  921,
-      903,  920,  910,  922,   86,  923,  918,  908,  925,  928,
-      924,   86,  926,   86,  927,  909,   86,   86,  911,   86,
-       86,  912,   86,  932,  176,  913,   86,  940,  914,   86,
-       86,  930,   86,   86,  943,  915,  916,  929,  917,   86,
-      931,   86,  933,  934,  947,  935,   86,  941,  936,   86,
-      942,   86,   86,  937,  174,  945,   86,  944,   86,  938,
+      891,   86,  890,  895,   86,   86,  896,  898,   86,  892,
+       86,   86,  893,   86,  897,  899,   86,  902,   86,   86,
+      894,  903,  900,   86,   86,   86,  908,   86,  904,   86,
+      901,  905,   86,  909,  910,   86,  907,   86,   86,   86,
+       86,  906,   86,   86,   86,  929,  924,  911,  923,  925,
+       86,  926,   86,  921,  928,   86,  930,  913,   86,   86,
+      912,   86,   86,  914,   86,  935,  915,   86,  927,  931,
+      916,   86,  943,  917,   86,   86,  933,  932,   86,   86,
+      918,  919,  946,  920,  934,   86,  936,  937,   86,  938,
+       86,   86,  939,  945,  948,  944,  950,  940,  951,   86,
 
-      939,  951,  952,  954,  949,  948,   86,  953,   86,   86,
-      955,  946,   86,   86,   86,  958,   86,  950,  957,   86,
-       86,  956,   86,  960,  959,  962,   86,  961,   86,   86,
-      963,  965,   86,   86,   86,  968,  966,   86,  970,   86,
-       86,  964,  969,   86,   86,  973,   86,   86,   86,  977,
-       86,   86, 1034,  967,  971,   86,  978,  972,  974,  975,
-      979,   86,   86, 1013,  980,  983,  984,  982,  976,  981,
-       86,   86,   86,   86,  986,   86,   86,   86,  985,  987,
-       86,  988,  990,   86,   86,  989,  991,   86,   86,   86,
-       86,   86,  992,   86,  994,  997,   86,  995, 1001,   86,
+       86,  955,   86,  941,  942,  954,  956,   86,   86,   86,
+      949,  174,  947,   86,  952,  957,   86,  958,  960,   86,
+      961,   86,   86,   86,  959,  953,  962,   86,  964,   86,
+      963,  965,   86,   86,  967,  966,   86,   86,   86,   86,
+      969,   86,  973,   86,   86,   86,  972,   86,  968,   86,
+      976,   86,  982,   86,  980,  978,   86,  970,  971,  974,
+       86,  975,   86,  977,  983, 1001,   86,  981,  986,  984,
+       86,  985,  987,  979,   86,   86,  989,   86,   86,   86,
+      988,   86,   86,  991,  990,  993,   86,  992,  994,   86,
+       86,   86,   86,   86,   86, 1000,   86,  997,  995,   86,
 
-     1000,   86,  998,   86,   86,   86,  993,  999,   86,   86,
-      996,   86,   86,   86, 1003,   86, 1006, 1004, 1008,   86,
-       86, 1007, 1002,   86, 1009, 1014,   86, 1010,   86, 1016,
-     1015,   86, 1012, 1005,   86,   86,   86,   86, 1024,   86,
-     1021, 1017,   86,   86, 1019, 1011,   86,   86, 1022, 1023,
-       86, 1026,   86, 1018,   86,   86,   86,   86,  173,   86,
-     1020, 1037,   86, 1025, 1027, 1032,   86,   86,   86,   86,
-     1028,   86, 1029,   86,   86, 1031, 1030, 1035, 1038, 1042,
-     1033, 1036, 1041, 1039,   86, 1040, 1045,   86, 1043, 1044,
-       86,   86,   86,   86,   86,   86,   86, 1054,   86, 1055,
+      998, 1003,   86,   86, 1004,   86,   86, 1002,   86,  996,
+       86,   86,   86,  999, 1006, 1007, 1009,   86,   86,   86,
+     1011, 1010, 1005, 1012,   86,   86,   86,   86, 1019,   86,
+     1017,   86, 1008, 1013, 1015, 1018,   86,   86,   86, 1016,
+       86, 1027,   86, 1024, 1020,   86, 1022, 1026,   86, 1014,
+     1021, 1025,   86,   86,   86,   86,   86, 1029,   86,   86,
+       86,   86, 1023, 1035,   86, 1037,   86, 1040,   86, 1028,
+       86,  173,   86,   86, 1030, 1031, 1032, 1041,   86, 1034,
+     1033,   86, 1038, 1036, 1042, 1039,   86, 1045,   86, 1043,
+     1048,   86, 1044, 1047,   86,   86,   86,   86,   86,   86,
 
-     1047, 1049,   86,   86,   86,   86,   86, 1057,   86,   86,
-     1046, 1065, 1048,   86, 1050, 1052, 1056, 1051, 1053, 1059,
-     1060,   86,   86,   86, 1058,   86,   86, 1061, 1062, 1066,
-       86, 1067, 1068, 1063,   86,   86, 1072, 1069,   86,   86,
-     1070, 1064,   86, 1074,   86,   86,   86, 1077, 1071,   86,
-       86, 1076, 1078,  168, 1080,   86, 1081,   86,   86, 1073,
-       86,   86,   86, 1075, 1079, 1084,   86,   86,   86,   86,
-       86, 1097,   86, 1100,   86,   86, 1098,   86, 1083, 1082,
-     1085, 1087, 1088,   86,   86,  168, 1086, 1090, 1089,   86,
-     1099,   86, 1091,   86, 1092, 1102,   86, 1104, 1093, 1103,
+     1046,   86,   86, 1057, 1050, 1052, 1058, 1060,   86,   86,
+       86,   86,   86,   86, 1049,   86, 1051, 1063, 1053, 1065,
+     1055, 1054, 1056,   86, 1059, 1061, 1064,   86, 1062,   86,
+       86,   86,   86,   86, 1071, 1069, 1072,   86,   86, 1076,
+     1073, 1067,   86,   86,   86,   86, 1066, 1078,   86, 1068,
+       86,   86, 1070,   86, 1081,   86, 1074, 1075, 1080, 1082,
+      168,   86,   86, 1077,   86, 1084, 1083,   86, 1079,   86,
+     1085,   86, 1088,   86,   86,   86,   86, 1086,   86, 1101,
+       86,   86, 1087, 1089, 1102, 1104,   86, 1091, 1092,   86,
+       86,   86,   86, 1106, 1093, 1090, 1103, 1094,   86,   86,
 
-     1094, 1105, 1101, 1107,   86, 1095,   86, 1106, 1108,   86,
-     1096,   86,   86, 1109,   86, 1111,   86,   86,   86,   86,
-     1110, 1114, 1117,   86, 1116,   86,   86, 1112,   86, 1113,
-       86, 1115, 1118, 1123, 1121, 1124, 1122, 1120, 1125,   86,
-     1119,   86, 1126,   86,   86, 1127, 1128,   86, 1129,   86,
-       86,   86,   86,  166,   86,   86, 1140,   86, 1130,   86,
-     1143, 1139,   86, 1145,   86, 1131,   86, 1132, 1141, 1142,
-       86,   86, 1133,   86, 1134, 1144, 1146,   86, 1150,   86,
-     1135,   86, 1151, 1147,   86, 1136, 1137,   86,   86, 1149,
-     1148, 1152, 1138, 1156,   86,   86,   86,   86, 1159, 1153,
+       86, 1095,   86, 1096, 1120, 1109, 1107, 1097,   86, 1098,
+       86,   86, 1111, 1108, 1099, 1105, 1110, 1112,   86, 1100,
+     1113,   86, 1114,   86,   86, 1115,   86,   86,   86, 1118,
+       86, 1121, 1133,   86,   86, 1130,   86, 1116, 1117, 1119,
+     1126, 1122, 1125,   86, 1124, 1128, 1129, 1132, 1127, 1123,
+     1131,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86, 1147,   86, 1144,   86,   86,   86, 1148,   86, 1143,
+       86, 1146,   86, 1134, 1135,   86, 1136,   86, 1145, 1150,
+     1149, 1137, 1154, 1138,  168, 1151, 1153, 1152,   86, 1139,
+       86,   86,   86, 1158, 1140, 1141, 1155,   86, 1160,   86,
 
-     1157,   86,   86, 1154,   86, 1160, 1155,   86,   86,   86,
-       86, 1164, 1162, 1165, 1163, 1158, 1161,   86,   86, 1167,
-       86,   86,   86, 1170,   86,   86,   86, 1168, 1166,   86,
-     1171, 1173,   86,   86,   86,   86, 1169,   86,   86, 1175,
-       86, 1172,   86, 1178, 1174, 1177, 1179, 1182, 1180,   86,
-       86, 1183, 1176,   86, 1184, 1181,   86,   86,   86,   86,
-       86,   86,   86,  164, 1187, 1190, 1191, 1192, 1193, 1185,
-       86, 1194, 1189, 1195,   86, 1186, 1188,   86, 1198,   86,
-       86,   86, 1200, 1199,   86, 1201,   86, 1196,   86, 1202,
-       86,   86,   86, 1197, 1203,   86, 1209,   86, 1211,   86,
+       86, 1142, 1156,   86, 1161, 1163,   86,   86,   86, 1164,
+     1157,   86,   86, 1166, 1168, 1159,   86,   86,   86,   86,
+       86, 1169,   86, 1162, 1174, 1167, 1165, 1171, 1172,   86,
+       86,   86,   86,   86,   86,   86, 1170, 1177, 1173,   86,
+     1175,   86,   86,   86,   86,   86,   86,   86, 1176, 1179,
+     1182, 1181, 1183, 1178, 1180,   86, 1186,   86,   86, 1185,
+     1187, 1184,   86,   86, 1192, 1189, 1190,   86,   86,   86,
+       86, 1188, 1191, 1194, 1195, 1196, 1197, 1199, 1193,   86,
+     1198,   86,   86,   86, 1202,   86,   86,   86, 1204, 1203,
+       86, 1205,   86,   86, 1200, 1206,   86,   86, 1201, 1207,
 
-       86,   86,   86, 1215,   86, 1207, 1205,   86, 1204, 1206,
-     1208,   86, 1213,   86, 1212, 1214,   86, 1210, 1217,   86,
-       86, 1218,   86,   86,   86, 1220,   86, 1221,   86, 1223,
-       86, 1226, 1216,   86, 1225, 1219, 1222,   86, 1227,   86,
-       86,   86, 1224,   86, 1230,   86, 1231,   86, 1229, 1228,
-       86, 1232,   86, 1235, 1237, 1238,   86,   86,   86,   86,
-       86,   86, 1233, 1239, 1240, 1236,   86, 1234, 1242, 1247,
-       86, 1241, 1245,   86,   86, 1243, 1244,   86,   86,   86,
-       86,   86, 1246,   86,   86,   86, 1252, 1253, 1248, 1249,
-       86, 1250,   86,   86,   86, 1258, 1254, 1259, 1262,   86,
+       86, 1213,   86,   86,   86, 1215, 1208,   86,   86, 1209,
+     1211,   86,   86, 1217, 1210, 1212,   86,   86, 1216, 1219,
+       86,  166, 1214,   86,   86, 1220, 1218,   86, 1221, 1222,
+       86,   86, 1224, 1223,   86, 1225, 1228,   86,   86, 1230,
+     1227, 1231,   86, 1226, 1229,   86, 1232,   86,   86,   86,
+     1235, 1234,   86,   86,   86,   86,   86, 1241, 1239,   86,
+     1242,   86,   86,   86, 1243, 1233,   86, 1244,   86, 1240,
+     1236, 1246, 1237, 1245, 1238,   86, 1249,   86,   86, 1247,
+     1251,   86,   86, 1250,   86,   86,   86,   86,   86,   86,
+       86, 1256, 1257, 1252, 1253, 1248,   86,   86,   86,   86,
 
-     1251,   86,   86,   86, 1256,   86,   86, 1261, 1255, 1260,
-       86, 1266, 1257,   86,   86,   86,   86,   86,   86,  168,
-     1264,   86, 1265, 1268, 1263, 1272,   86,   86,   86,   86,
-       86, 1267, 1279,   86, 1277, 1269, 1275, 1271,   86, 1273,
-     1276, 1274, 1270, 1281,   86, 1282,   86, 1278,   86,   86,
-     1280,   86,   86, 1284, 1285,   86,   86,   86,   86,   86,
-     1283, 1286,   86, 1289,   86, 1291,   86, 1295,   86, 1287,
-       86, 1288,   86, 1292, 1290,   86,   86, 1293,   86,   86,
-       86, 1299,   86, 1294, 1296, 1301, 1305,   86, 1306,   86,
-     1297, 1298,   86, 1310, 1302,   86, 1303, 1307, 1300, 1304,
+       86, 1258, 1259, 1263, 1254, 1264, 1255,   86,   86,   86,
+     1261,   86, 1266,   86, 1260, 1265, 1267,   86, 1262,   86,
+     1271,   86,   86,   86,   86, 1270,   86, 1268,   86, 1277,
+       86, 1273,  168, 1269,   86,   86,   86,   86,   86, 1272,
+       86, 1282, 1274,  164,   86, 1284,   86, 1276, 1279, 1281,
+     1280, 1275, 1278, 1283, 1286, 1287, 1288,   86, 1285,   86,
+       86,   86, 1289,   86, 1291, 1290,   86,   86,   86,   86,
+       86,   86,   86, 1294,   86, 1300,   86,   86, 1297,   86,
+     1292, 1293,   86,   86, 1295,   86,  163, 1298, 1304, 1296,
+       86, 1301,   86, 1299,   86, 1306, 1310, 1302, 1303,   86,
 
-     1308,   86, 1309,   86,   86,   86, 1311,   86, 1312,   86,
-       86,   86, 1315,   86, 1314, 1318,   86,   86,   86, 1322,
-       86,   86, 1313, 1317,   86,   86, 1323, 1319, 1316, 1320,
-     1324,   86,   86, 1328,   86, 1321, 1326, 1325, 1327,   86,
-       86,   86,   86,   86,   86,   86,   86, 1329,   86,   86,
-     1334,   86,   86, 1332, 1330, 1339, 1335, 1333,   86, 1331,
-       86,   86,   86,   86, 1336,   86, 1338, 1337,   86, 1343,
-       86, 1341, 1342, 1340,   86, 1346, 1344, 1351,   86,   86,
-       86, 1345,   86,   86, 1347, 1349,   86, 1354,   86,   86,
-       86, 1357, 1353, 1348, 1350, 1352,   86,   86,   86,   86,
+     1311, 1314,   86,   86, 1307, 1305, 1308, 1312,   86, 1309,
+     1313,   86,   86,   86,   86, 1316,   86, 1315,   86,   86,
+       86, 1320,   86, 1319, 1323,   86,   86, 1317,   86, 1327,
+       86, 1318, 1322,   86,   86,   86, 1324, 1321, 1328, 1325,
+     1329,   86,   86, 1333, 1326, 1332, 1330, 1331,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   86, 1339,
+       86,   86,   86, 1334, 1335, 1337, 1338, 1340, 1344, 1336,
+       86,   86,   86, 1341,   86, 1343, 1345, 1342, 1346, 1348,
+     1347,   86,   86,   86,   86,   86, 1349,   86, 1356,   86,
+       86, 1350,   86, 1351,   86, 1359,   86,   86, 1354, 1353,
 
-     1359, 1358, 1355,   86, 1356, 1360,   86,   86, 1364, 1361,
-     1362, 1363,   86, 1365,   86, 1387, 1372, 1366, 1374, 1386,
-     1367, 1368,   86, 1373,   86, 1369,   86, 1375,   86,   86,
-     1378, 1370,   86, 1376,   86, 1371,   86, 1379, 1377, 1380,
-       86, 1381,   86, 1382,   86, 1383,   86,   86,   86, 1384,
-       86, 1385,   86, 1390, 1393, 1394, 1388,   86,   86,   86,
-       86,   86, 1389, 1395, 1391,   86, 1397,   86, 1402, 1396,
-     1392, 1398,   86, 1399, 1407, 1400,   86, 1401, 1403, 1404,
-     1406,   86,   86, 1405,   86, 1410,   86,   86,   86,   86,
-     1411,   86,   86, 1409, 1414, 1412,   86,   86,   86, 1420,
+     1357, 1352, 1362, 1358, 1355,   86, 1364,   86, 1361,   86,
+     1360, 1365,   86,   86, 1369, 1366,   86, 1363,   86, 1379,
+     1383, 1367, 1368,   86, 1370,   86,   86, 1378, 1371, 1377,
+       86, 1372, 1373,   86, 1380, 1381, 1374,   86,   86,   86,
+       86,   86, 1375,   86, 1384, 1385, 1376, 1382,   86, 1386,
+       86, 1388,   86,   86,   86, 1389,   86, 1390, 1387,   86,
+       86, 1391,   86, 1393, 1395,   86, 1398, 1399,   86, 1525,
+     1400, 1392,   86,   86, 1396,   86, 1394, 1402,   86, 1401,
+     1397,   86, 1403,   86, 1404,   86, 1405, 1411, 1406,   86,
+     1407, 1408, 1409, 1412,   86,   86, 1410, 1415,   86, 1413,
 
-     1408, 1416, 1415,   86, 1421,   86,   86,   86,   86, 1413,
-       86,   86, 1419, 1424, 1422, 1417, 1418,   86,   86,   86,
-     1426, 1423,   86,  163, 1425, 1430,   86, 1429, 1432,   86,
-       86,   86, 1433,   86, 1431, 1427, 1434,   86,   86, 1438,
-       86,   86, 1435, 1428, 1440,   86,   86, 1437,   86, 1441,
-     1436, 1442,   86,   86, 1445,   86,   86,   86,   86,   86,
-     1447, 1439,   86,   86, 1449, 1451,   86,   86,   86,  161,
-     1453, 1450,   86, 1443, 1444,   86, 1446, 1455, 1448,   86,
-       86,   86,   86, 1454, 1452, 1457, 1459, 1458,   86, 1456,
-       86, 1461,   86, 1460,   86,   86,   86, 1462, 1467, 1468,
+       86,   86, 1416,   86, 1414,   86, 1419, 1417,   86,   86,
+       86,   86, 1425,   86, 1426,   86,   86, 1421,   86, 1420,
+       86,   86, 1418, 1427,   86, 1424, 1429,   86, 1422, 1423,
+     1428,   86,   86, 1431, 1430, 1435,   86, 1434,   86, 1437,
+       86,   86,   86, 1438,   86, 1432,   86, 1439,   86, 1443,
+       86, 1440,   86, 1436, 1445,   86, 1433, 1442,   86, 1446,
+       86, 1441,   86,   86,   86, 1447, 1450,   86,   86,   86,
+       86,   86, 1444, 1452,   86, 1467, 1454,   86,   86,   86,
+     1456,   86, 1457, 1448, 1449,   86, 1455,   86, 1451, 1453,
+     1458,   86,   86, 1463, 1459, 1461, 1460, 1462,   86,   86,
 
-     1463, 1464, 1470, 1465,   86,   86,   86, 1466,   86,   86,
-       86, 1469,   86, 1474,   86,   86,  168,   86, 1471,   86,
-     1479, 1480,   86, 1473, 1482,   86,   86,   86, 1481, 1472,
-       86, 1476,   86,   86,   86, 1475,   86, 1477,   86, 1483,
-       86, 1490, 1478,   86,   86, 1484, 1487,   86,   86,   86,
-     1488,   86, 1485, 1486, 1494,   86, 1489, 1495,   86,   86,
-     1497, 1499,  159, 1491,   86, 1493, 1500,   86,   86, 1492,
-     1498, 1496,   86, 1502,   86,   86, 1503, 1501,   86,   86,
-     1511,   86,   86,   86, 1508,   86, 1504, 1509, 1513, 1505,
-     1506, 1510,   86, 1507,   86, 1512, 1514,   86, 1516,   86,
+       86,   86, 1465, 1464,   86, 1466, 1468,   86,   86,   86,
+       86, 1473, 1474, 1470, 1475, 1471,   86,   86,   86, 1476,
+       86,   86, 1469, 1472,   86,   86, 1480,   86,  168, 1477,
+       86,   86, 1479, 1485, 1486, 1478,   86,   86,   86,   86,
+       86, 1488, 1487, 1482, 1481,   86,   86,   86,   86,   86,
+     1483, 1489,   86, 1496, 1484,   86,   86, 1490, 1491,   86,
+     1493,   86,   86, 1494, 1495, 1492, 1500, 1501,   86,   86,
+       86,   86,   86, 1505, 1503, 1497,   86, 1499, 1506,   86,
+     1508, 1498,   86,   86, 1509, 1502,   86,   86,   86, 1504,
+     1507,   86, 1514, 1517,   86, 1515, 1510, 1516, 1511, 1519,
 
-       86,   86, 1518, 1517,   86, 1521, 1522,   86, 1515,   86,
-       86, 1519,   86,   86,   86, 1525,   86, 1520,   86,   86,
-     1530,   86,   86,   86, 1534, 1523, 1531, 1527,   86, 1524,
-       86,   86, 1526, 1533, 1528, 1535, 1529,   86,   86, 1532,
-       86,   86,   86,   86,   86, 1537, 1541, 1536, 1543, 1542,
-       86,   86, 1538, 1539,   86, 1546,   86,   86,   86, 1540,
-     1545, 1551, 1544,   86, 1550, 1547, 1548,   86, 1552, 1554,
-       86,   86, 1553,   86,   86,   86, 1549, 1555,   86, 1559,
-     1560, 1561,   86, 1558,   86,   86,   86,   86, 1565, 1556,
-       86, 1562,   86, 1563, 1564,   86, 1557,   86,   86,   86,
+       86, 1512,   86,   86, 1513,   86, 1520, 1522, 1518,   86,
+       86, 1521, 1523,   86,   86, 1527,   86,   86,   86, 1528,
+       86,   86, 1524, 1531,   86,   86,   86, 1526,   86, 1536,
+     1537,   86,   86, 1540, 1529, 1533,   86, 1530,   86,   86,
+     1532,   86, 1534, 1535,   86,   86,   86,   86, 1541, 1538,
+       86, 1539, 1547,   86,   86, 1543,   86, 1542, 1549, 1544,
+     1545, 1548,   86,   86, 1552, 1546,   86,   86, 1550,   86,
+     1559, 1551,   86, 1556, 1557,   86, 1554, 1558, 1560,   86,
+       86, 1553,   86,   86,   86,   86, 1565, 1566, 1561, 1555,
+     1564, 1562,   86,   86, 1567,   86, 1568,   86, 1569,   86,
 
-     1567,   86,   86,   86, 1572,   86, 1566,   86,   86, 1571,
-     1568,   86,   86, 1569, 1578, 1574, 1570, 1575, 1580, 1579,
-       86,   86, 1576, 1581,   86, 1573,   86, 1583,   86,   86,
-     1577,   86,   86,   86,   86,   86, 1591, 1587,   86,   86,
-     1586, 1582,   86, 1592, 1594,   86,   86, 1584, 1585,   86,
-       86, 1597, 1588, 1590, 1589, 1596,   86,   86,   86,   86,
-       86,   86,   86,   86, 1595, 1593,   86, 1603,   86, 1605,
-       86,   86, 1613, 1606, 1612, 1598, 1602, 1599, 1600, 1601,
-       86, 1604,   86, 1607, 1608,   86, 1609,   86,   86,   86,
-       86,   86,   86, 1610, 1611, 1614,   86, 1619, 1615,   86,
+       86, 1570,   86, 1571,   86, 1563,   86,   86,   86,   86,
+       86,   86, 1578, 1572,   86,   86, 1577,   86,   86, 1574,
+       86,   86, 1575, 1580, 1573, 1576, 1581, 1584,   86, 1589,
+     1586, 1582, 1585,   86, 1579, 1587,   86, 1583,   86,   86,
+     1588,   86,   86,   86,   86,   86, 1597, 1593,   86,   86,
+     1592,   86,   86, 1598, 1600,   86,   86, 1590, 1591, 1603,
+       86, 1602, 1594, 1596, 1595,   86,   86,   86,   86,   86,
+     1601,   86, 1611,  161,   86, 1599,   86, 1609,   86,   86,
+       86, 1612, 1614,   86, 1617, 1604, 1605, 1606, 1607, 1610,
+     1608, 1613, 1615,   86,   86,   86,   86,   86,   86, 1616,
 
-     1621,   86, 1616, 1623,   86,   86, 1620, 1618, 1625,   86,
-     1624,   86, 1627,   86,   86, 1617, 1628, 1622,   86,   86,
-       86,   86, 1629, 1630, 1626, 1634, 1635,   86,   86,   86,
-       86,   86,   86, 1631, 1640, 1638,   86, 1639, 1632,   86,
-       86, 1633, 1642,   86,   86,   86, 1636, 1643, 1644,   86,
-     1637,   86, 1641,   86, 1647, 1645,   86,   86, 1650,   86,
-       86, 1646,   86,   86,   86, 1649,   86, 1654,   86, 1656,
-       86,   86,   86, 1648, 1651, 1657,   86, 1661, 1655,   86,
-       86, 1652, 1653,   86,   86,   86, 1659, 1667, 1658, 1664,
-     1666,   86,   86, 1662,   86, 1669,   86, 1660, 1663,   86,
+     1621,   86,   86,   86, 1622, 1619,   86, 1625, 1618,   86,
+     1620, 1629,   86,   86,   86,   86, 1631, 1623, 1626, 1624,
+     1630,   86,   86,   86,   86, 1628, 1627, 1633, 1632, 1634,
+       86,   86,   86, 1640, 1635, 1636, 1641,   86,   86,   86,
+       86, 1637,   86, 1639,   86, 1645, 1646, 1644,   86,   86,
+     1638,   86,   86, 1648,   86,   86, 1642,   86, 1649, 1650,
+       86, 1643,   86,   86,   86, 1651, 1653, 1652, 1647,   86,
+     1656, 1655,   86,   86,   86,   86,   86, 1654,   86, 1657,
+     1660,   86, 1662,   86,   86, 1663,   86,   86, 1661,   86,
+     1668,   86, 1659, 1658,   86,   86, 1664,   86, 1665,   86,
 
-     1665,   86,   86,   86,  168, 1672, 1675,   86, 1674,   86,
-     1671,   86, 1668,   86,   86,   86,   86, 1683, 1670,   86,
-     1676, 1673,   86,   86, 1684, 1678,   86, 1677, 1681, 1687,
-       86,   86, 1679, 1680,   86, 1688, 1689,   86, 1693, 1691,
-     1682,   86, 1685, 1686,   86,   86, 1692, 1695,   86, 1697,
-       86,   86,   86,   86, 1690,   86,   86,   86, 1699,   86,
-     1700,   86, 1696,   86, 1702, 1694,   86, 1703,   86,   86,
-     1698, 1704, 1707,   86, 1708,   86, 1706, 1705,   86,   86,
-     1701,   86, 1712, 1715, 1717, 1713, 1709, 1710,   86,   86,
-       86,   86,   86, 1716, 1723,   86, 1720, 1714, 1711, 1719,
+     1671, 1669, 1673,   86,   86,   86, 1667,   86, 1674, 1666,
+      168, 1675, 1670,   86, 1672,   86, 1676, 1679, 1678, 1677,
+       86, 1682,   86,   86, 1680, 1681, 1683,   86,   86,   86,
+       86,   86, 1690,   86,   86,   86,   86,   86, 1691, 1694,
+       86, 1684, 1685, 1688, 1695,   86, 1686, 1687,   86,   86,
+     1696, 1698, 1700, 1699, 1692, 1689, 1693, 1697,   86,   86,
+     1702,   86, 1704,   86,   86,   86,   86,   86,   86,   86,
+     1709, 1706, 1707,   86, 1710, 1703,   86,   86,   86, 1701,
+       86,   86,   86, 1705, 1714,   86, 1715,   86,   86,  159,
+     1711, 1722, 1708, 1713, 1717, 1712,   86,   86, 1716, 1719,
 
-     1718,   86, 1724, 1725, 1722,   86,   86, 1727,   86,   86,
-     1726,   86, 1728, 1729,   86,   86,   86, 1721,   86,   86,
-     1730,   86,   86, 1736, 1737, 1735,   86, 1731,   86,   86,
-       86, 1738, 1739,   86, 1732,   86,   86, 1733,   86,   86,
-     1741, 1734, 1742,   86, 1743,   86,   86,   86,   86,   86,
-       86, 1740,   86, 1745, 1744,   86, 1752, 1753,   86,   86,
-     1747, 1748, 1749, 1758,   86, 1746,   86, 1750,   86,   86,
-       86, 1755,   86,   86,   86, 1751, 1756, 1754,   86, 1757,
-     1764,   86,   86,   86,   86,   86, 1760, 1762, 1759, 1766,
-       86, 1768, 1761,   86, 1767, 1763,   86, 1770, 1765,   86,
+       86,   86, 1720,   86, 1724, 1723,   86, 1718, 1730,   86,
+     1731, 1727, 1726, 1728, 1721,   86,   86, 1732, 1729,   86,
+     1725,   86, 1734,   86, 1733,   86, 1735, 1736,   86,   86,
+       86,   86,   86,   86, 1737,   86, 1743, 1744, 1742,   86,
+     1746, 1738,   86,   86, 1745,   86,   86,   86, 1739,   86,
+     1740,   86, 1741,   86, 1748, 1749,   86,   86, 1750,   86,
+       86,   86,   86,   86,   86, 1751,   86,   86, 1747, 1760,
+     1759, 1752,   86, 1754, 1755, 1756,   86, 1753,   86, 1765,
+     1757,   86,   86, 1761, 1762,   86,   86,   86, 1758, 1764,
+     1763,   86, 1771,   86,   86,   86,   86,   86, 1767,   86,
 
-     1769,   86,   86,   86,   86,   86,   86,   86, 1773, 1775,
-     1782,   86, 1776,   86, 1772, 1777, 1774, 1771, 1783,   86,
-     1778, 1779, 1784,   86,   86, 1785, 1780, 1787,   86, 1786,
-     1781, 1788,   86,   86,   86,   86,   86,   86,   86, 1791,
-     1792, 1789,   86,   86, 1800,   86,   86, 1795,   86,   86,
-       86,   86, 1790, 1794, 1797, 1793,   86, 1798, 1799, 1801,
-       86, 1796, 1806, 1802, 1803,   86, 1804,   86,   86,   86,
-     1805,   86, 1810,   86,   86,   86, 1814, 1807,   86, 1813,
-       86,   86, 1812, 1818,   86, 1811, 1809,   86,   86, 1822,
-     1815,   86, 1808, 1816, 1823,   86, 1817,   86, 1819,   86,
+     1773, 1766,   86, 1775,   86, 1769, 1768,   86, 1770, 1774,
+       86, 1776,   86, 1777, 1772,   86,   86,   86,   86, 1780,
+       86,   86, 1782,   86, 1789, 1779, 1783, 1781, 1778, 1784,
+     1790,   86, 1785, 1786, 1791,   86,   86,   86, 1787,   86,
+     1794, 1793, 1795,   86,   86, 1788,   86,   86, 1792,   86,
+       86, 1798, 1796,   86, 1799,   86,   86,   86,   86, 1802,
+     1808,   86,   86, 1797, 1807, 1804, 1800, 1806, 1805, 1801,
+       86,   86,   86,   86, 1803, 1810,   86, 1809,   86,   86,
+       86, 1817,   86,   86,   86, 1814, 1812,   86, 1820, 1811,
+       86, 1821, 1813, 1819,   86,   86, 1823, 1816, 1818, 1824,
 
-     1828,   86, 1820, 1825, 1827, 1821,   86, 1830,   86, 1831,
-     1833, 1824,   86, 1826,   86,   86,   86, 1832,   86, 1829,
-     1834,   86, 1837,   86,   86, 1841,   86, 1839,   86,   86,
-       86,   86,   86, 1840, 1842, 1836, 1838,   86, 1835,   86,
-     1845,   86,   86,   86, 1851,   86, 1846, 1853, 1843, 1844,
-       86,   86, 1847,   86, 1848, 1854, 1849, 1850, 1856,   86,
-       86,   86,   86, 1855,   86,   86, 1852, 1861,   86,   86,
-       86, 1857,   86,   86, 1865,   86, 1867, 1860, 1858,   86,
-       86, 1859,  168,   86, 1863, 1868,   86, 1862, 1864, 1866,
-       86, 1869, 1871,   86, 1873, 1870, 1875,   86,   86,   86,
+     1825,   86,   86, 1815, 1829, 1822,   86,   86,   86, 1830,
+       86,   86, 1826, 1835,   86,   86, 1834, 1837,   86,   86,
+     1828, 1831, 1827, 1832, 1838,   86,   86, 1840, 1833,   86,
+       86, 1839, 1836,   86,   86, 1841, 1844,   86,   86,   86,
+     1848, 1846,   86,   86,   86, 1842,   86, 1847, 1843,   86,
+     1845, 1849,   86,   86,   86,   86,   86, 1852, 1850, 1858,
+       86, 1853, 1860, 1851,   86, 1861, 1854, 1855,   86, 1856,
+     1857,   86, 1863,   86,   86,   86,   86, 1862, 1867,   86,
+     1869, 1859,   86,   86,   86,   86,   86, 1873,   86,   86,
+       86,   86, 3288, 1865, 1864, 1866, 1868,   86,   86, 1879,
 
-       86,   86, 1872, 1879,   86,   86,   86,   86, 1874,   86,
-       86, 1877, 1881,   86, 1886, 1880,   86, 1876, 1882, 1878,
-       86, 1883,   86, 1890,   86, 1887, 1884,   86, 1889,   86,
-     1885,   86, 1891,   86, 1888, 1892,   86, 1895, 1893, 1897,
-     1894, 1896,   86,   86,   86,   86, 1898,   86, 1899,   86,
-       86,   86,   86,   86,   86,   86,   86, 1904, 1905,   86,
-       86, 1909,   86, 1906,   86, 1917,   86, 1900, 1902, 1903,
-     1908, 1901, 1907, 1910,   86,   86,   86, 1916, 1918, 1912,
-     1913, 1915,   86,   86,   86,   86, 1911, 1914,   86,   86,
-       86, 1924,   86,   86, 1927, 1919, 1928,   86, 1929,   86,
+     1871, 1875,   86, 1872, 1870,   86,   86, 1876,  168, 1874,
+     1877, 1878,   86, 1882, 1880, 1883,   86,   86,   86,   86,
+     1881, 1887,   86,   86,   86,   86,   86,   86, 1894, 1885,
+     1889, 1884,   86, 1888,   86,   86, 1890, 1886, 1891,   86,
+       86, 1897, 1898,   86, 1892,   86,   86, 1893, 1899,   86,
+     1896, 1895, 1900,   86, 1901, 1902, 1903, 1904,   86,   86,
+     1908,   86,   86, 1906,   86,   86,   86, 1907,   86,   86,
+       86, 1905,   86,   86, 1912, 1913,   86,   86,   86,   86,
+     3288, 1914, 1917,   86, 1910, 1915, 1911, 1909, 1918,   86,
+       86, 1916,   86, 1926, 1923, 1921, 1925,   86, 1920,   86,
 
-       86, 1920,   86, 1921, 1922, 1923, 1925,   86, 1926,   86,
-     1930, 1931,   86,   86, 1932, 1935,   86,   86,   86, 1937,
-     1938, 1933, 1936, 1934, 1939,   86, 1941, 1940,   86,   86,
-       86,   86,   86,   86, 1943, 1944,   86,   86, 1946, 1947,
-       86,   86,   86,   86, 1951,   86,   86, 1950, 1953, 1945,
-     1952,   86, 1948, 1942,   86,   86,   86, 1961, 1954, 1955,
-     1956,   86, 1949,   86, 1963, 1957,   86,   86,   86, 1964,
-       86, 1958,   86, 1959, 1967,   86, 1960, 1970,   86, 1968,
-     1965, 1962, 1966,   86,   86,   86,   86, 1971, 1974,   86,
-     1969,   86, 1976,   86,   86,   86, 1979, 1980,   86,   86,
+       86, 1919, 1922,   86, 1927,   86,   86, 1924,   86,   86,
+     1932,   86,   86, 1935, 1936,   86, 1937,   86,   86, 1928,
+       86, 1930,   86, 1929,   86, 1933, 1931, 1934, 1944, 1938,
+     1939,   86,   86, 1940, 1943,   86, 1945,   86, 1947, 1941,
+     1946, 1942,   86,   86,   86, 1949,   86, 1950,   86, 1951,
+       86,   86, 1952,   86,   86, 1954, 1955,   86,   86,   86,
+       86, 1948,   86, 1959, 1958, 1960, 1961,   86, 1953, 1956,
+       86, 1969,   86,   86,   86,   86,   86,   86,   86, 1957,
+     1971,   86, 1962, 1963, 1964, 1972,   86, 1966,   86, 1965,
+     1973, 1967, 1976, 1974, 1968, 1970,   86,   86, 1975, 1978,
 
-     1982,   86,   86,   86, 1972,   86, 1973,   86,   86, 1987,
-     1988,   86, 1975, 1977, 1984,   86, 1978, 1985,   86, 1981,
-       86,   86,   86,   86, 1986,   86, 1994, 1983, 1989, 1991,
-     1992,   86,   86, 1990, 1998,   86,   86, 1997, 2001, 2002,
-       86, 2003,   86, 2000,   86,   86, 1993, 1996,   86, 1995,
-       86,   86,   86, 2004,   86, 1999,   86,   86,   86, 2005,
-     2009,   86, 2012, 2013, 2008,   86, 2014,   86,   86,   86,
-       86, 2006,   86, 2007, 2010,   86,   86, 2022,   86, 2017,
-       86, 2021, 2016,   86, 2011, 2015,   86,   86, 2019, 3280,
-       86, 2026, 2020,   86,   86, 2018, 2027,   86, 2024, 2023,
+       86,   86,   86, 1977,   86,   86, 1979, 1982,   86,   86,
+     1984,   86,   86, 1987, 1988,   86,   86, 1990,   86,   86,
+     1980,   86, 1981,   86, 1985,   86, 1996,   86, 1983, 1995,
+     1992,   86, 1993, 1986,   86,   86, 1989,   86,   86,   86,
+       86, 2002,   86,   86, 1991, 1999, 1994, 2006, 2000, 1998,
+       86,   86, 1997,   86,   86, 2005, 2009,   86, 2010, 2004,
+       86, 2008,   86, 2001,   86, 2011,   86,   86, 2003, 2013,
+       86, 2007, 2012,   86,   86,   86,   86, 2014, 2017,   86,
+     2020, 2021, 2022,   86,   86, 2016,   86,   86,   86, 2015,
+     2025,   86, 2018,   86,   86,   86, 2030,   86,   86, 2024,
 
-     2029,   86, 2028,   86,   86, 2025,   86, 2030, 2031, 2033,
-       86,   86,   86, 2032,   86, 2034, 2037, 2040, 2035,   86,
-       86, 2043,   86,   86, 2042, 2036,   86, 2044,   86,   86,
-       86,   86, 2038, 2045, 2039, 2041,   86, 2046, 2050,   86,
-       86, 2047, 2051,   86, 2052, 2057, 2048, 2054, 2055, 2053,
-       86, 2049,   86,   86,   86, 2059,   86,   86,   86,   86,
-     2064,   86, 2056, 2061, 2058,   86,   86, 2066, 2060, 2062,
-      168,   86,   86,   86,   86, 2067,   86,   86,   86, 2073,
-     2072, 2071,   86, 2063, 2068,   86, 2069, 2065, 2074,   86,
-     2070, 2075,   86, 2077,   86,   86,   86,   86, 2116,   86,
+     2029,   86, 2019, 2023,   86,   86, 2026,   86, 2034, 2037,
+       86, 2027,   86, 2031, 2036, 2028, 2032, 2033, 2035,   86,
+       86, 2041,   86, 2038,   86,   86,   86,   86, 2042,   86,
+       86, 2039, 2045, 2048,   86,   86, 2040,   86, 2043,   86,
+     2050, 2051,   86, 2054, 2044, 2049, 2046,   86, 2052, 2047,
+       86,   86, 2058,   86, 2053, 2059,   86, 2057, 2060, 2062,
+     2063,   86, 2055, 2061,   86,   86,   86, 2056,   86,   86,
+     2067,   86,   86, 2065,   86,   86,   86,   86, 2069, 2072,
+     2074, 2066,   86, 2068, 2070,   86,   86, 2064,  168,   86,
+       86,   86,   86, 2075, 2076, 2080, 2079,   86, 2081, 2073,
 
-     2078, 2079, 2076, 2080, 2081,   86,   86,   86,   86, 2083,
-     2082,   86, 2085,   86, 2089,   86,   86,   86,   86, 2084,
-     2086, 2088,   86, 2091,   86, 2087, 2090, 2092,   86, 2094,
-       86, 2093,   86,   86,   86,   86,   86,   86,   86, 2099,
-     2101, 2096, 2100,   86, 2095,   86,   86, 2103,   86, 2106,
-       86, 2097,   86, 2098, 2102,   86,   86, 2110,   86, 2105,
-     2107, 2104,   86, 2111, 2109,   86,   86, 2112, 2108, 2117,
-       86, 2115,   86, 2114,   86, 2118,   86, 2113,   86, 2123,
-       86,   86,   86, 2125,   86,   86, 2126, 2127,   86,   86,
-     2119,   86, 2120, 2121, 2122, 2129,   86, 2128, 2124,   86,
+     2071, 2077, 2082,   86, 2083,   86,   86, 2085,   86, 2078,
+       86,   86,   86,   86, 2086, 2087,   86, 2088,   86, 2091,
+       86, 2089,   86, 2090,   86, 2093, 2084,   86,   86, 2097,
+       86,   86, 2092, 2096, 2094,   86,   86,   86, 2101, 2095,
+     2098, 2099, 2100, 2102,   86,   86,   86,   86,   86,   86,
+     2109, 2107,   86,   86,   86, 2104,   86, 2108,   86,   86,
+       86, 2114,   86, 2111,   86, 2103, 2105, 3288, 2106,   86,
+       86, 2110, 2115, 2113,   86, 2118, 2112,   86, 2117, 2120,
+     2116,   86, 2119,   86,   86, 2122, 2125,   86, 2123, 2121,
+       86,   86,   86, 2126,   86, 2131,   86, 2124,   86,   86,
 
-     2130,   86, 2133,   86,   86,   86,   86, 2132,   86,   86,
-     2134,   86, 2137,   86, 2131, 2138,   86,   86,   86,   86,
-       86,   86,   86,   86,   86, 2136, 2135, 2146, 2140, 2141,
-     2139, 2143,   86, 2142,   86, 2145, 2150, 2151,   86, 2144,
-     2147,   86, 2148,   86, 2154,   86, 2149,   86, 2155,   86,
-     2152, 2158, 2157,   86, 2153,   86,   86,   86,   86,   86,
-     2160,   86,   86, 2161, 2166, 2156, 2162,   86, 2164,   86,
-       86, 2159, 2168, 2165, 2170,   86, 2163,   86,   86,   86,
-     2173,   86,   86, 2169, 2172,   86, 2167, 2174,   86, 2178,
-     2175,   86,   86,   86,   86,   86, 2179,   86,   86, 2176,
+     2133,   86,   86,   86, 2134, 2135,   86, 2127, 2128, 2129,
+     2130, 2136, 2137,   86,   86, 2132,   86, 2138,   86, 2141,
+       86,   86,   86,   86, 2140,   86,   86, 2142,   86, 2145,
+       86,   86, 2146,   86,   86,   86,   86, 2139,   86,   86,
+       86,   86, 2144, 2143,   86, 2148, 2149, 2147, 2151,   86,
+     2150, 2156, 2158, 2153,   86, 2154, 2152, 2159,   86, 2160,
+       86,   86, 2157, 2162, 2161,   86, 2163,   86, 2155, 2166,
+     2165,   86,   86,   86, 2164,   86,   86, 2168,   86,   86,
+     2169,   86,   86, 2174, 2170,   86,   86, 2172, 2176, 2167,
+       86, 2173, 2178,   86, 2171,   86,   86,   86, 2181, 2177,
 
-       86, 2181,   86, 2171, 2190, 2180, 2184,   86, 2177,   86,
-     2185, 2183,   86, 2182, 2188, 2186,   86, 2189, 2187,   86,
-       86, 2194,   86,   86,   86,   86, 2196, 2192,   86, 2197,
-       86,   86, 2198,   86, 2191, 2193, 2195,   86, 2199, 2203,
-     2201,   86,   86, 2202, 2205,   86,   86,   86, 2200, 2206,
-       86, 2207, 2210,   86,   86,   86,   86, 2208, 2209, 2211,
-     2215,   86, 2204,   86,   86, 2214, 2212,   86,   86,   86,
-       86,   86,   86,   86,   86, 2213,   86, 2224,   86, 2225,
-     2221, 2216, 2217, 2218, 2219, 2222, 2220, 2226,   86, 2223,
-       86,   86,   86,   86, 2227,   86, 2229, 2235,   86, 2230,
+     2180, 2175, 2182,   86,   86,   86, 2186,   86, 2183,   86,
+       86,   86,   86,   86, 2187,   86, 2179,   86, 2189, 3288,
+     2188,   86, 2184, 2192,   86, 2185, 2197, 2191,   86, 2193,
+     2190, 2196, 2194,   86,   86, 2195, 2198,   86,   86, 2202,
+       86,   86,   86, 2204,   86, 2205, 2200,   86,   86,   86,
+       86, 2199,   86, 2203, 2201, 2207, 2206,   86, 2209, 2211,
+       86, 2210, 2213,   86,   86,   86, 2208, 2214,   86, 2215,
+     2218,   86,   86, 2212,   86, 2216, 2217, 2219,   86, 2223,
+       86,   86,   86,   86, 2220,   86,   86, 2222,   86,   86,
+       86,   86,   86,   86, 2221,   86, 2232, 2227, 2229, 2224,
 
-       86, 2237,   86,   86, 2234,  168, 2231, 2228,   86, 2236,
-     2232,   86, 2239,   86, 2243, 2245, 2240, 2246, 2233, 2244,
-       86,   86, 2238,   86,   86,   86, 2241, 2242, 2247,   86,
-     2250,   86, 2248,   86, 2251,   86, 2255,   86,   86, 2256,
-       86, 2259,   86, 3280, 2254,   86,   86,   86, 2252, 2249,
-     2260, 2263, 2257,   86, 2261, 2262,   86, 2264,   86, 2253,
-     2258,   86, 2265,   86,   86,   86,   86,   86, 2267,   86,
-       86,   86, 2270,   86,   86, 2273,   86,   86,   86, 2277,
-       86, 2266, 2279,   86, 2280, 2268, 2272,   86,   86, 2275,
-       86, 2269, 2271, 2282, 2274,   86,   86, 2276,   86,   86,
+     2225, 2226, 2230, 2228, 2234,   86,   86,   86, 2239, 2231,
+     2233,   86, 2235, 2237,   86, 2238,   86,   86, 2243,   86,
+       86,   86, 2245,   86, 2247, 2236, 2242,   86,   86, 2240,
+     2244,  168, 2248,   86, 2253, 2246, 2255, 2251, 2254, 2241,
+       86, 2249, 2252,   86,   86,   86,   86, 2258,   86,   86,
+     2259,   86,   86, 2250, 2256, 2263,   86,   86, 2264,   86,
+     2262, 2267,   86,   86, 2260, 2257, 2273,   86, 2268,   86,
+     2266, 2265,   86, 2269, 2271, 2261, 2270,   86, 2272,   86,
+       86,   86,   86,   86,   86, 2275,   86,   86, 2278,   86,
+       86,   86,   86,   86, 2281,   86, 2285, 2287,   86, 2274,
 
-     2278,   86, 2281, 2284, 2287,   86,   86, 2285, 2290,   86,
-       86,   86,   86,   86, 2288,   86, 2283, 2286, 2291,   86,
-       86,   86,   86, 2289,   86, 2292, 3280,   86,   86,   86,
-     2293, 2304, 2298, 2303, 2296, 2294, 2302, 2295,   86, 2300,
-     2297, 2301, 2299, 2305,   86,   86,   86,   86,   86, 2307,
-     2306, 2308,   86,   86, 2311, 2312,   86,   86,   86, 2313,
-       86, 2309, 2314,   86,   86, 2310,   86, 2317, 2324, 2318,
-     2320,   86, 2319, 2315, 2321,   86,   86, 2316,   86,   86,
-       86, 2322,   86, 2323, 2327,   86, 2328,   86, 2330,   86,
-       86,   86, 2326, 2332,   86,   86, 2335,   86,   86, 2325,
+     2276,   86, 2280,   86,   86, 2288,   86, 2277, 2282, 2279,
+       86, 2283, 2284, 2292,   86, 2286,   86,   86, 2289, 2290,
+       86,   86, 2293,   86,   86, 2295, 2298,   86,   86,   86,
+     2291,   86, 2299,   86, 2296, 2294, 2300,   86,   86,   86,
+       86, 2297,   86,   86,   86,   86,   86, 2301, 2312, 2311,
+     2306, 2354, 2302, 2309, 2305, 2303, 2304, 2308, 2310,   86,
+     2307, 2313,   86,   86, 2314,   86, 2315,   86,   86,   86,
+       86, 2319, 2320,   86,   86,   86, 2321,   86, 2316, 2322,
+       86, 2317, 2318, 2323,   86, 2325, 2326,   86, 2324, 2327,
+     2328,   86, 2329,   86,   86,   86,   86,   86,   86, 2330,
 
-     2334, 2329, 2336,   86,   86,   86, 2333,   86, 2331,   86,
-     2342,   86, 2337, 2338, 2341,   86, 2344,   86,   86, 2339,
-       86,   86,   86, 2347,   86, 2348, 2340, 2346, 2350,   86,
-       86,   86, 2354,   86, 2343,   86, 2345,   86,   86,   86,
-     2349, 2351,   86, 2358,   86, 2352, 2359,   86,   86, 2361,
-     2353,   86,   86, 2357,   86, 2355, 2364,   86,   86,   86,
-     2356, 2360,   86, 2362,   86, 2366, 2363,   86, 2367,   86,
-     2371,   86, 2365, 2373,   86,   86, 2372, 2368, 2374,   86,
-     2369,   86,   86,   86, 2378,   86, 2377, 2379,   86,   86,
-     2370,   86,   86, 2375, 2383, 2376, 2381, 2385,   86,   86,
+     2331, 2335,   86, 2336,   86, 2338,   86, 2332,   86, 2334,
+     2340,   86,   86,   86, 2343,   86, 2333, 2337, 2342, 2344,
+       86,   86,   86,   86,   86,   86, 2339, 2341, 2350,   86,
+     2349, 2346,   86, 2352,   86, 2345,   86, 2347,   86,   86,
+     2356, 2355,   86, 2348, 2358,   86,   86,   86, 2362,   86,
+       86, 2351,   86,   86, 2353, 2357,   86, 2367,   86,   86,
+     2366, 2359, 2360,   86,   86, 2361,   86,   86, 2365, 2369,
+     2363, 2372,   86,   86,   86, 2364,   86,   86, 2368,   86,
+     2374, 2370, 2371, 2373,   86, 2379,   86,   86, 2375,   86,
+       86, 2381,   86, 2382, 2376, 2377, 2380, 2386, 2385,   86,
 
-       86, 2388, 2390, 2386,   86, 2391, 2380,   86,   86, 2382,
-       86, 2384, 2389,   86, 2387, 2392,   86,   86,   86, 2395,
-       86,   86,   86,   86,   86, 3280, 2394, 2396, 2403, 2393,
-     2397, 2398, 2399, 2401, 2400, 2402,   86, 2404, 2407,   86,
-       86,   86,   86, 2406,   86, 2405,   86, 2408,  168,   86,
-       86, 2415,   86, 2410,   86, 2409,   86,   86,   86,   86,
-     2411,   86, 2412,   86, 2422, 2413, 2414, 2417, 2418, 2416,
-       86,   86,   86, 2419, 2420, 2421, 2423, 2426,   86,   86,
-     2427, 2428,   86,   86, 2425, 2431, 2429,   86, 2432,   86,
-     2424,   86, 2430,   86,   86, 2434,   86,   86, 2433,   86,
+       86,   86,   86,   86, 2387, 2378,   86,   86, 2383,   86,
+     2384, 2391, 2393,   86, 2389, 2396,   86,   86, 2394,   86,
+     2398,   86, 2399, 2390, 2395, 2388,   86,   86,   86, 2392,
+       86,   86, 2400, 2403,   86,   86,   86, 2397,   86,   86,
+     2404, 2402, 2409, 2405, 2401, 2406, 2410, 2407,   86, 2408,
+       86,   86,   86,  168, 2411,   86, 2414, 2415, 2418, 2412,
+     2413,   86, 2416,   86,   86,   86,   86, 2423,   86,   86,
+     2417,   86,   86,   86,   86,   86,   86, 2430, 2425,   86,
+       86, 2421, 2422, 2426, 2419, 2431, 2420, 2424, 2429, 2427,
+     2428,   86, 2434,   86,   86, 2435, 2436,   86,   86, 2432,
 
-     2436,   86,   86,   86, 2440, 2441,   86, 2435,   86, 2437,
-       86,   86,   86, 2443, 2444, 2438,   86, 2446,   86, 2445,
-     2442, 2439,   86, 2448,   86,   86,   86, 2447, 2449,   86,
-     2452,   86, 2451, 2450, 2453,   86, 2455,   86, 2454,   86,
-       86,   86,   86,   86, 2462, 2459,   86,   86, 2461,   86,
-       86,   86, 2463,   86, 2458,   86, 3280, 2456, 2467, 2457,
-       86,   86, 2460,   86,   86, 2464,   86, 2472, 2465, 2471,
-     2466, 2473, 2469,   86,   86, 2475, 2468, 2470,   86,   86,
-     2474,   86, 2477,   86,   86, 2480, 2478,   86, 2476, 2482,
-       86, 2481, 2484,   86,   86,   86, 2486,   86,   86,   86,
+       86, 2437, 2439, 2433, 2440, 2438,   86,   86,   86,   86,
+       86, 2442,   86,   86, 2444, 2441,   86,   86,   86, 2448,
+     2449, 2443,   86, 2446,   86,   86,   86, 2451, 2445, 2452,
+       86, 2454,   86, 2453,   86, 2456, 2447,   86, 2450, 2455,
+     2457,   86,   86,   86, 2461,   86, 2458, 2460,   86,   86,
+       86,   86,   86,   86, 2463,   86,   86, 2467,   86, 2470,
+       86, 2462, 2459, 2469,   86,   86, 2466,   86,   86,   86,
+     2464, 2465,   86, 2471, 2472, 2468,   86, 2475, 2480, 2473,
+       86, 2477,   86, 2474,   86, 2479,   86,   86, 2482, 2476,
+     2481,   86, 2478,   86, 2485,   86, 2483,   86, 2486,   86,
 
-       86,   86, 2483, 2485,   86, 2479,   86,   86,   86, 2490,
-       86, 2492, 2493, 2488, 2494,   86, 2487, 2489, 2495,   86,
-       86, 2496,   86, 2497, 2498, 2500, 2491,   86,   86,   86,
-     2503,   86, 2499,   86, 2505,   86,   86, 2508,   86,   86,
-       86, 2502, 2504,   86,   86,   86, 2509, 2501,   86, 2512,
-     2514, 2507,   86, 2506, 2513,   86,   86,   86, 2510,   86,
-       86,   86, 2511, 2518, 2517, 2516,   86,   86,   86,   86,
-     2515, 2519, 2522, 3280, 2520,   86, 2525,   86, 2521,   86,
-     2524, 2526,   86, 2527,   86, 2528,   86, 2530, 2523,   86,
-       86, 2529,   86, 2532, 2531,   86, 2533,   86,   86,   86,
+     2488, 2490,   86,   86,   86, 2484, 2489,   86, 2492,   86,
+     2494,   86,   86, 2493,   86, 2491,   86,   86,   86,   86,
+       86,   86, 2498, 2487, 2500, 2501, 2502,   86, 2496, 2504,
+     2495,   86, 2497, 2503,   86,   86,   86, 2505,   86,   86,
+       86, 2511,   86, 2507, 2499, 2508,   86, 2506, 2513,   86,
+       86, 2510, 2516,   86,   86, 2512,   86, 2509,   86, 2517,
+       86,   86, 2520, 2521,   86, 2515,   86, 2514,   86,   86,
+       86, 2522,   86,   86, 2525, 2526,   86, 2518, 2519, 2524,
+       86,   86,   86,   86, 2529,   86, 2523, 2530, 2532, 3288,
+     2527, 2533,   86,   86, 2528, 2534,   86, 2535,   86, 2536,
 
-     2538,   86, 2534,   86, 2540,   86, 2541,   86,   86, 2535,
-       86,   86,   86,   86,   86, 2537,   86, 2544, 2536, 2542,
-       86, 2547, 2539, 2543, 2545, 2550,   86,   86,   86,   86,
-       86,   86,   86, 2546, 2548,  168, 2551,   86, 2558,   86,
-     2549,   86,   86, 2554,   86,   86, 2556, 2557, 2559, 2553,
-       86,   86, 2569,   86, 2552, 2555, 2560, 2561,   86,   86,
-       86, 2565, 2562,   86, 2567, 2566,   86, 2563, 2568, 2570,
-       86,   86, 2571, 2564,   86, 2572,   86, 2573, 2574,   86,
-       86,   86,   86,   86,   86, 2576,   86,   86,   86,   86,
-     2575, 2584,   86,   86,   86, 2577, 2582,   86, 2588,   86,
+       86, 2531,   86, 2538,   86, 2537,   86, 2539,   86, 2540,
+       86, 2541,   86,   86, 2546,   86, 2542,   86, 2543, 2548,
+       86, 2549,   86,   86,   86,   86,   86,   86,   86, 2545,
+       86, 2552, 2544, 2555, 2550,   86, 2547, 2551, 2553, 2558,
+       86,   86,   86,   86,   86,   86,   86, 2554,   86,  168,
+     2556, 2559,   86, 2566,   86, 2557,   86, 2562,   86,   86,
+     2564, 2565,   86, 2561,   86, 2567, 2570, 2560,   86, 2563,
+       86, 2573,   86, 2568, 2569, 2575, 2571, 2576, 2574, 2577,
+       86, 2578,   86,   86, 2579, 2572,   86, 2580,   86, 2581,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
 
-     2579, 2578, 2589,   86, 2581, 2580, 2583,   86, 2585, 2590,
-     2586, 2587, 2593,   86,   86,   86, 2592, 2595,   86,   86,
-       86, 2591,   86, 2594,   86,   86,   86, 2598,   86, 2604,
-       86, 2605,   86, 2596,   86,   86,   86, 2597,   86, 2599,
-     2600,   86, 2602, 2601, 2608, 2609,   86, 2603, 2610,   86,
-     2611, 2613,   86, 2607, 2606,   86,   86,   86,   86, 2612,
-       86,   86, 2616,   86,   86, 2620, 2619, 2621,   86, 2615,
-       86, 2614, 2622, 2623,   86,   86,   86,   86, 2617,   86,
-     2618,   86,   86, 2624, 2625,   86, 2629,   86,   86, 2627,
-       86, 2633, 2634,   86,   86, 2626, 2637,   86,   86, 2628,
+       86,   86, 2583, 2592,   86,   86, 2590,   86, 2582, 2585,
+       86, 2584,   86, 2586, 2587,   86, 2596, 2588, 2589, 2591,
+     2593,   86, 2594, 2595, 2597,   86,   86, 2598, 2604, 2599,
+     2600, 2601,   86, 2603,   86, 2602,   86,   86,   86,   86,
+       86,   86,   86,   86, 2606, 2612,   86, 2613,   86,   86,
+       86, 2617,   86, 2607, 2605, 2619, 2616, 2608, 2609, 2610,
+     2611,   86, 2614, 2618,   86,   86,   86, 2615,   86,   86,
+       86,   86,   86,   86, 2624,   86,   86, 2628, 2627, 2629,
+       86, 2621,   86, 2620, 2623,   86,   86, 2622, 2630, 2631,
+       86, 2625, 2626,   86, 2633, 2632,   86,   86,   86,   86,
 
-     2641,   86, 2630,   86, 2631, 2635,   86, 2632,   86,   86,
-     2638,   86, 2636, 2639,   86, 2640, 2642, 2646,   86,   86,
-       86,   86,   86, 2643, 2649, 2650,   86, 2652,   86, 2644,
-     2648, 2647,   86,   86, 2645,   86,   86, 2653, 2657,   86,
-       86, 2651, 2654,   86, 2658, 2660,   86,   86, 2656,   86,
-       86, 2655,   86, 2665,   86,   86, 2667,   86, 2663,   86,
-     2661, 2664, 2659, 2662, 2668,   86,   86,   86,   86,   86,
-     2666, 2669, 2671,   86,   86,   86, 2672,   86, 3280, 2670,
-       86,   86, 2674, 2675,   86, 2677, 2678,   86, 2673, 2676,
-     2680,   86, 2679, 2681,   86, 2682,  168,   86,   86,   86,
+       86, 2634, 2637,   86,   86, 2635,   86, 2641, 2642,   86,
+     2645,   86,   86,   86, 2643,   86, 2636, 2646, 2638, 2639,
+       86,   86,   86, 2640, 2644, 2648,   86, 2647, 2649,   86,
+     2651, 2654,   86, 2650,   86,   86,   86, 2658,   86,   86,
+     2657,   86, 2652, 2656, 2660,   86, 2653, 2655,   86,   86,
+     2662,   86,   86, 2661, 2665,   86,   86, 2666, 2659, 2668,
+       86,   86,   86, 2664,   86, 2663,   86,   86, 2673,   86,
+     2671, 2675,   86,   86, 2667, 2669, 2672, 2670, 2676,   86,
+       86, 2674,   86,   86, 2677,   86,   86, 2679,   86, 3288,
+       86, 2680,   86,   86, 2678, 2682, 2683, 2685, 2686,   86,
 
-     2687,   86, 2685, 2684, 2683, 2686,   86,   86,   86, 2689,
-       86,   86, 2688, 2712, 2690, 2691, 2692,   86, 2693,   86,
-     2695,   86,   86, 2697, 2694, 2696,   86,   86, 2698,   86,
-       86, 2699, 2700, 2702,   86,   86,   86,   86, 2703,   86,
-     2704,   86,   86,   86, 2701, 2705,   86, 2709, 2710, 2707,
-       86, 2711, 2706,   86,   86, 2714,   86,   86,   86, 2713,
-     2715,   86,   86, 2708,   86,   86, 2717, 2718, 2716,   86,
-       86, 2723,   86,   86, 2721,   86, 2719, 2720, 2722, 2726,
-       86, 2724,   86,   86,   86,   86, 2727, 2731,   86,   86,
-     2732, 2725,   86,   86, 2728,   86, 2736,   86,   86,   86,
+     2688,   86, 2689,   86, 2681, 2684, 2690,  168,   86,   86,
+       86,   86, 2695, 3288, 2687, 2691, 2692,   86,   86,   86,
+     2697,   86, 2696, 3288,   86, 2700,   86, 2693, 2694, 2699,
+     2701,   86,   86, 2703,   86,   86, 2698, 2705, 2704,   86,
+       86,   86, 2706,   86, 2707, 2702, 2708, 2710,   86,   86,
+       86,   86, 2711,   86, 2709, 2712,   86,   86, 2713, 2717,
+       86, 2718,   86,   86, 2715,   86, 2714,   86, 2719,   86,
+       86,   86, 2720,   86, 2723, 2722,   86,   86, 2716,   86,
+     2727,   86, 2725,   86, 2726, 2721, 2728,   86, 2724,   86,
+     2729, 2734, 2730,   86, 2731,   86, 2732,   86,   86,   86,
 
-       86, 2734, 2729, 2730, 2740, 2741,   86,   86, 2733, 2743,
-     2735, 2744, 2737, 2738, 2745,   86,   86,   86,   86, 2739,
-       86, 2746,   86, 2748, 2747,   86,   86,   86,   86,   86,
-       86, 2751, 2742,   86, 2749,   86, 2754, 2756,   86, 2750,
-     2757,   86, 2752,   86, 2753, 2758,   86, 2759, 2755,   86,
-     2761,   86,   86, 2762, 2760,   86, 2765, 2763,   86,   86,
-     2768, 2766,   86, 2769,   86, 2770,   86, 2764,   86,   86,
-       86, 2771,   86, 2775,   86,   86, 2776,   86, 2767, 2777,
-       86,   86, 2772, 2779,   86,   86,   86, 2783, 2773,   86,
-     2780,   86, 2774,   86, 2784,   86, 2778,   86,   86, 2786,
+       86, 2735,   86, 2739,   86,   86,   86, 2733,   86, 2742,
+     2744,   86, 2740,   86,   86,   86,   86, 2736,   86, 2737,
+     2748, 2738, 2751, 2743, 2752, 2741, 2749,   86,   86, 2746,
+       86, 2753, 2745, 2754,   86, 2747,   86,   86,   86,   86,
+       86,   86,   86, 2750, 2755, 2756, 2759, 2757,   86,   86,
+     2762,   86, 2758, 2764,   86, 2760, 2765,   86, 2766,   86,
+       86,   86,   86, 2761, 2767,   86, 2768, 2769,   86, 2763,
+     2771,   86, 2773,   86,   86, 2776,   86, 2774,   86, 2777,
+       86,   86, 2770, 2772, 2778,   86,   86,   86,   86, 2779,
+     2783,   86,   86, 2775, 2780,   86, 2782,   86, 2784, 2785,
 
-     2782, 2785,   86, 2781, 2787,   86,   86, 2792, 2791,   86,
-       86, 2789, 2788,   86, 2794, 2795,   86,   86, 2790,   86,
-       86,   86, 2796, 2798, 2800,   86, 2801, 2797,   86,   86,
-       86, 2793,   86,   86, 2799, 2804,   86, 2808,   86,   86,
-       86,   86,   86, 2810, 2944, 2802, 2803, 2805,   86,   86,
-     2807, 2811, 2806, 2809,   86, 2812, 2814, 2815, 2816, 2819,
-       86, 2813,   86, 2817,   86,   86, 2820,   86, 2818,   86,
-     2821,   86, 2822,   86, 2823,   86,   86,   86, 2824,   86,
-     2825,   86, 2828,   86,   86,   86, 2830, 2826, 2834,   86,
-     2835,   86, 2831,   86,   86,   86, 2836, 3140, 2829, 2838,
+       86, 2787,   86, 2786,   86, 2781, 2791,   86, 2788,   86,
+     2789, 2793,   86, 2792,   86, 2794,   86,   86, 2790,   86,
+     2795,   86, 2800,   86,   86, 2799,   86,   86,   86, 2804,
+     2802,   86, 2796, 2803,   86, 2805, 2797, 2798,   86,   86,
+       86, 2806, 2808,   86, 2809,   86,   86,   86, 2801,   86,
+     2812, 2816,   86,   86,   86,   86, 2807, 2810, 2811,   86,
+       86,   86, 2818, 2815, 2813,   86, 2833, 2814, 2817, 2820,
+     2819,   86, 2821, 2822, 2823, 2824, 2827,   86,   86, 2826,
+     2825,   86,   86, 2828,   86, 2829,   86, 2830,   86, 2831,
+       86,   86,   86,   86, 2832,   86,   86, 2836,   86,   86,
 
-       86,   86, 2827,   86, 2832, 2833, 2840,   86, 2839,   86,
-     2842,   86, 2837,   86, 2841,   86,   86, 2847,   86,   86,
-       86, 2846, 2843, 2848, 2844, 2845,   86, 2851,   86, 2849,
-       86,   86, 2852,   86,   86, 2855,   86, 2854,   86, 2856,
-       86, 2850,   86, 2853, 2857,   86, 2858,   86,   86,   86,
-     2859, 2862,   86,   86,   86,   86, 2867, 3280, 2861,   86,
-     2863, 2865,   86, 2860, 2870,   86, 2868,   86, 2872,   86,
-     2871,   86,   86, 2866, 2864,   86, 2869, 2874, 2873,   86,
-     2875, 2877,   86, 2876, 2878,   86, 2879,   86,   86,   86,
-       86, 2881, 2884,   86, 2882, 2883,   86, 2880,   86,   86,
+     2838, 2842,   86, 2843,   86, 2839,   86,   86,   86, 2844,
+     2834,   86, 2837, 2846,   86, 2847, 2849, 2835, 2840, 2841,
+     2848,   86, 2850,   86,   86, 2845,   86,   86,   86, 2855,
+       86,   86,   86, 2851,   86, 2852, 2853, 2859, 2856,   86,
+     2857,   86, 2860,   86,   86,   86, 2854, 2858, 2863,   86,
+     2862,   86, 2861,   86, 2864, 2865,   86, 2866,   86, 2867,
+       86,   86,   86,   86,   86,   86,   86,   86, 2875, 2870,
+       86, 2869, 2873, 2871,   86, 2878, 2868, 2876,   86,   86,
+     2880,   86,   86, 2879, 2874, 2890,   86, 2872, 2877, 3288,
+     2881, 2882,   86, 2883, 2885,   86, 2884, 2886,   86, 2887,
 
-       86, 2885, 2887,   86, 2886, 2889,   86, 2888,   86, 2893,
-       86, 2891, 2895,   86,   86,   86,   86,   86, 2896,   86,
-       86, 2890, 2897,   86, 2898,   86, 2892,   86, 2899, 2904,
-       86, 2901,   86,   86,   86, 2894, 2907,   86, 2902, 2900,
-       86,   86,   86,   86,   86, 2903, 2905, 2906, 2912, 2908,
-     2911,   86, 2913, 2909,   86,   86, 2917,   86,   86,   86,
-     2910,   86, 2915, 2914, 2919,   86, 2920,   86, 2922,   86,
-       86,   86,   86,   86, 2927,   86,   86, 2918, 2926,   86,
-     2921, 2916,   86, 2931, 2929,   86, 2923, 2924, 2925,   86,
-     2934,   86,   86,   86, 2936,   86, 2928,   86, 2930, 2932,
+       86,   86, 2889,   86,   86, 2892,   86,   86, 2891, 2893,
+     2888,   86, 2894, 2895,   86,   86,   86,   86,   86, 2901,
+       86,   86, 2899,   86, 2896,   86,   86, 2897, 2903,   86,
+     2904,   86, 2907,   86,   86,   86, 2900, 2898, 2905, 2906,
+     2908,   86,   86, 2911,   86, 2902, 2912,   86,   86,   86,
+     2909,   86, 2915,   86,   86, 2913, 2910, 2914, 2916,   86,
+       86, 2921, 2919,   86, 2920,   86,   86, 2917, 2925,   86,
+       86,   86, 2918,   86, 2922, 2927,   86, 2928,   86, 2930,
+       86, 2923,   86,   86,   86,   86,   86, 2931,   86, 2926,
+     2934,   86, 2924,   86, 2929, 2935,   86,   86, 2932, 2933,
 
-       86,   86, 2937, 2939,   86, 2940,   86,   86, 2933, 2942,
-       86,   86, 2935, 2947, 2948, 2938, 2945,   86,   86,   86,
-       86, 2941, 2951,   86,   86,   86, 2953, 2952,   86, 2943,
-     2949, 2946, 2954, 2956, 2957,   86, 2959, 2950,   86,   86,
-       86, 2958,   86,   86,   86, 2962,   86,   86, 2955, 2961,
-     2965,   86, 2963, 2968,   86,   86,   86,   86, 2960,   86,
-       86,   86, 2964, 2973,   86,   86,   86, 2969, 2966, 2967,
-     2975, 2977,   86, 2972, 2976, 2970, 2978,   86,   86,   86,
-     2974,   86,   86, 2979, 2971,   86, 2981, 2982,   86, 2983,
-       86, 2984,   86, 2980, 2987, 2985,   86, 2989,   86,   86,
+       86, 2939, 2942,   86, 2936, 2940,   86, 2938, 2944, 2937,
+       86, 2945, 2941,   86,   86, 2947,   86, 2943, 2948,   86,
+     2950,   86,   86,   86,   86,   86,   86,   86, 3288, 2955,
+       86, 2953, 2946, 2949, 2952,   86,   86, 2957, 2959,   86,
+     2951,   86, 2961,   86, 2954, 2956, 2960, 2958, 2962, 2964,
+     2963, 2965,   86,   86, 2967,   86, 2966,   86,   86,   86,
+       86, 2970,   86, 2969, 2971,   86, 2973,   86,   86, 2976,
+       86,   86,   86,   86,   86, 2968, 2981,   86,   86, 2977,
+     3288,   86, 2985,   86, 2972, 2974, 2975, 2980,   86, 2978,
+     2984,   86, 2983, 2986,   86,   86, 2987, 2982, 2979,   86,
 
-       86, 2988,   86,   86,   86,   86, 2994, 2995,   86,   86,
-       86, 2986,   86, 2999,   86, 3000,   86,   86, 2990,   86,
-     3280, 2998, 3001, 2996, 2991, 2992, 2993,   86,   86,   86,
-     2997,   86, 3004, 3005,   86, 3006,   86, 3002, 3003,   86,
-     3009,   86,   86, 3008, 3007,   86,   86, 3012,   86,   86,
-     3011, 3014,   86, 3010, 3013,   86,   86, 3016,   86,   86,
-       86,   86, 3018,   86,   86, 3015, 3019, 3017,   86,   86,
-       86,   86,   86,   86,   86, 3028, 3029, 3031, 3020, 3024,
-     3021, 3022, 3023,   86,   86, 3025, 3026, 3035, 3280, 3032,
-     3027,   86, 3030, 3033, 3036,   86, 3034, 3037,   86,   86,
+     2990,   86, 2991,   86, 2989, 2992,   86,   86,   86, 2988,
+     2995,   86,   86, 2997,   86,   86,   86, 2996,   86,   86,
+     2993,   86, 3002, 3003,   86,   86,   86,   86, 3007,   86,
+     2998, 3008,   86,   86, 2994,   86, 3006, 2999, 3009, 3004,
+     3000, 3001,   86, 3288,   86,   86, 3005, 3012, 3013,   86,
+     3014,   86,   86, 3010, 3011, 3017,   86, 3015,   86, 3016,
+       86,   86, 3020,   86,   86, 3021, 3019,   86, 3018,   86,
+       86,   86,   86,   86, 3024,   86,   86, 3026,   86,   86,
+     3027,   86, 3025,   86, 3022,   86,   86, 3023,   86,   86,
+     3036, 3037, 3028, 3288, 3032, 3029, 3030, 3031, 3033, 3034,
 
-     3039,   86,   86, 3038,   86, 3042,   86, 3040, 3043,   86,
-     3044, 3045,   86,   86, 3046, 3047, 3050,   86, 3048, 3049,
-       86,   86,   86, 3041, 3051,   86,   86,   86,   86, 3057,
-       86,   86,   86, 3056,   86,   86, 3053,   86, 3052, 3059,
-       86, 3060,   86, 3061,   86, 3065, 3054, 3055, 3066,   86,
-     3062, 3064, 3067,   86,   86,   86, 3058, 3072, 3063,   86,
-     3069, 3074, 3073,   86,   86,   86,   86,   86, 3070, 3068,
-       86, 3071,   86,   86,   86, 3078, 3082, 3079, 3081,   86,
-     3076, 3224,   86,   86,   86, 3084,   86, 3077, 3087, 3075,
-     3083, 3280, 3080, 3085,   86, 3086,   86, 3088,   86, 3089,
+     3039,   86,   86,   86, 3035,   86,   86, 3040, 3038, 3041,
+     3042, 3044,   86,   86, 3043, 3045,   86, 3046, 3047,   86,
+       86, 3288, 3049, 3050,   86, 3048, 3051,   86, 3052, 3053,
+       86,   86, 3054, 3055, 3058,   86, 3056, 3057,   86,   86,
+     3059,   86,   86,   86,   86,   86, 3065,   86,   86,   86,
+     3064,   86,   86, 3068,   86, 3288, 3060, 3061, 3067,   86,
+       86, 3069, 3062,   86, 3063,   86, 3073, 3074,   86, 3070,
+     3075,   86, 3072, 3066,   86, 3076,   86, 3071, 3080, 3077,
+     3082,   86,   86, 3081,   86, 3078,   86,   86, 3079,   86,
+       86,   86, 3089,   86, 3086, 3087, 3090, 3084,   86, 3092,
 
-       86,   86, 3091,   86, 3092,   86, 3093,   86, 3094,   86,
-     3090, 3095,   86, 3096,   86, 3097,   86,   86, 3099,   86,
-       86,   86,   86,   86,   86,   86, 3098, 3104,   86, 3100,
-       86,   86,   86, 3101,   86, 3108,   86, 3107, 3105, 3110,
-       86,   86, 3102, 3103, 3106, 3109,   86,   86, 3114, 3112,
-     3111,   86, 3117,   86, 3116,   86,   86,   86,   86, 3115,
-     3119,   86, 3113,   86,   86,   86,   86, 3118,   86, 3123,
-       86, 3127,   86, 3122, 3124, 3120, 3129,   86,   86, 3121,
-       86, 3125, 3134, 3128, 3130,   86, 3131,   86,   86, 3133,
-     3126,   86,   86,   86,   86, 3132,   86,   86, 3142, 3139,
+       86, 3125,   86,   86, 3091, 3288, 3083,   86, 3085, 3131,
+     3088, 3093,   86, 3094,   86,   86, 3096,   86, 3097,   86,
+     3095,   86, 3099,   86, 3100,   86, 3101,   86, 3102,   86,
+     3098, 3103,   86, 3104,   86, 3105,   86,   86, 3107,   86,
+       86,   86,   86,   86,   86,   86, 3106, 3112,   86, 3108,
+       86,   86,   86, 3109,   86, 3116,   86, 3115, 3113, 3118,
+       86,   86, 3110, 3111, 3114, 3117,   86,   86, 3122, 3120,
+     3119,   86,   86,   86, 3124,   86,   86,   86, 3127, 3123,
+       86,   86, 3121,   86,   86,   86, 3126, 3135,   86, 3132,
+     3137,   86, 3130,   86, 3128, 3129, 3133,   86, 3136, 3138,
 
-       86,   86,   86,   86, 3138, 3136,   86,   86, 3135,   86,
-       86, 3141,   86, 3143,   86, 3137,   86,   86, 3146, 3149,
-     3144, 3145, 3148,   86, 3150,   86, 3158,   86, 3152,   86,
-     3151, 3147, 3154,   86, 3153,   86, 3156, 3157,   86, 3155,
-     3159,   86,   86, 3160, 3161,   86, 3162,   86, 3163,   86,
-       86,   86, 3165, 3164,   86, 3166, 3167, 3170,   86,   86,
-     3168,   86,   86,   86, 3175,   86, 3173, 3176,   86, 3169,
-       86, 3172, 3171,   86, 3179,   86,   86,   86, 3182,   86,
-       86, 3183, 3174,   86, 3186, 3177,   86, 3187,   86,   86,
-       86, 3180, 3178,   86, 3184, 3181,   86, 3192,   86,   86,
+       86, 3139,   86,   86,   86,   86, 3141, 3142,   86, 3134,
+       86, 3140,   86, 3143, 3148, 3147,   86,   86, 3144, 3146,
+       86, 3150,   86,   86,   86,   86,   86,   86, 3145,   86,
+     3151, 3149,   86,   86,   86, 3157,   86, 3160,   86, 3154,
+       86, 3152, 3153, 3162, 3156, 3158,   86,   86, 3159, 3166,
+     3155, 3165,   86,   86, 3161,   86, 3164, 3167,   86, 3288,
+     3163,   86, 3168, 3169,   86, 3170,   86, 3172,   86,   86,
+       86, 3173, 3171,   86, 3174, 3175, 3178,   86,   86,   86,
+     3176,   86,   86,   86, 3181, 3183,   86,   86, 3177,   86,
+     3180, 3179, 3184,   86, 3187,   86,   86,   86, 3185, 3190,
 
-       86, 3189, 3185, 3188, 3191, 3193,   86,   86,   86,   86,
-       86,   86,   86, 3197,   86, 3190, 3199,   86,   86,   86,
-       86, 3194, 3196, 3204,   86, 3206,   86, 3195,   86, 3205,
-     3198, 3200, 3201, 3202, 3207,   86, 3203, 3210,   86,   86,
-       86, 3212,   86, 3213, 3211, 3214, 3208,   86,   86,   86,
-       86, 3218,   86, 3215, 3209, 3216,   86,   86, 3219,   86,
-       86, 3220, 3221,   86, 3222,   86,   86, 3227, 3217,   86,
-       86, 3223,   86,   86,   86, 3230, 3231,   86,   86,   86,
-       86,   86,   86, 3229, 3225, 3226, 3234, 3232, 3228,   86,
-     3233, 3235,   86, 3237,   86, 3238,   86, 3239, 3236,   86,
+       86, 3182,   86, 3191, 3188, 3192, 3186,   86,   86, 3194,
+     3195,   86,   86,   86, 3189,   86,   86,   86, 3199, 3200,
+       86,   86, 3196,   86, 3197,   86, 3193, 3201,   86, 3205,
+       86, 3198,   86,   86,   86,   86,   86, 3204, 3202, 3207,
+       86, 3203,   86, 3214,   86, 3212, 3209, 3213, 3210,   86,
+     3206, 3208,   86,   86,   86, 3211, 3218,   86, 3220, 3219,
+       86, 3221,   86,   86,   86,   86,   86, 3222, 3223, 3215,
+     3216, 3224, 3217, 3226, 3227,   86,   86, 3229,   86,   86,
+       86, 3228,   86,   86, 3225,   86, 3230,   86, 3235,   86,
+     3232,   86,   86,   86,   86,   86, 3238, 3239,   86, 3231,
 
-     3242,   86, 3240,   86, 3244,   86, 3245,   86, 3241,   86,
-     3249,   86, 3246,   86,   86, 3243, 3247,   86, 3250, 3251,
-     3248, 3252,   86,   86,   86,   86,   86,   86, 3258,   86,
-     3253, 3254, 3256, 3255,   86,   86,   86,   86,   86, 3260,
-     3261,   86, 3264,   86, 3257, 3259, 3265,   86,   86, 3268,
-     3269,   86,   86, 3271,   86, 3262, 3263, 3266,   86, 3270,
-     3272,   86, 3267,   86,   86, 3273,   86,   86, 3274, 3275,
-     3278,   86, 3279,   86, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3276, 3277,   47,   47,   47,
-       47,   47,   47,   47,   52,   52,   52,   52,   52,   52,
+     3240,   86,   86, 3241, 3233, 3237, 3234, 3242, 3236,   86,
+       86, 3246, 3243,   86,   86,   86,   86, 3250, 3247,   86,
+     3244,   86, 3245,   86, 3252,   86, 3253, 3248,   86,   86,
+     3257,   86,   86, 3254, 3260,   86, 3255, 3258, 3251,   86,
+     3256, 3249,   86,   86, 3259,   86, 3261,   86,   86,   86,
+     3262,   86, 3264, 3266,   86,   86, 3268,   86,   86,   86,
+     3269,   86, 3272,   86, 3263, 3273,   86, 3265, 3267,   86,
+     3276, 3277,   86,   86, 3279,   86, 3270, 3271, 3274,   86,
+     3278,   86, 3275, 3280,   86,   86, 3281,   86,   86, 3288,
+     3282, 3288, 3283, 3286,   86, 3287,   86, 3288, 3288, 3288,
 
-       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, 3280,   89,
-       89,   89,   89,  158,  158, 3280, 3280, 3280,  158,  158,
-      160,  160, 3280, 3280,  160, 3280,  160,  162, 3280, 3280,
-     3280, 3280, 3280,  162,  165,  165, 3280, 3280, 3280,  165,
-      165,  167, 3280, 3280, 3280, 3280, 3280,  167,  169,  169,
-     3280,  169,  169,  169,  169,  172, 3280, 3280, 3280, 3280,
-     3280,  172,  175,  175, 3280, 3280, 3280,  175,  175,   90,
+     3284, 3288, 3288, 3288, 3288, 3288, 3288, 3285,   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, 3288,
+       89,   89,   89,   89,  158,  158, 3288, 3288, 3288,  158,
+      158,  160,  160, 3288, 3288,  160, 3288,  160,  162, 3288,
+     3288, 3288, 3288, 3288,  162,  165,  165, 3288, 3288, 3288,
+      165,  165,  167, 3288, 3288, 3288, 3288, 3288,  167,  169,
 
-       90, 3280,   90,   90,   90,   90,   17, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280
+      169, 3288,  169,  169,  169,  169,  172, 3288, 3288, 3288,
+     3288, 3288,  172,  175,  175, 3288, 3288, 3288,  175,  175,
+       90,   90, 3288,   90,   90,   90,   90,   17, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288
     } ;
 
-static const flex_int16_t yy_chk[6448] =
+static const flex_int16_t yy_chk[6469] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2224,18 +2229,18 @@ static const flex_int16_t yy_chk[6448] =
         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, 3288,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3296,   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, 2682,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2690,   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, 1078,   32,   36,   36,   37,   37,
+       28,   92,   31,   32, 1082,   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,
@@ -2251,9 +2256,9 @@ static const flex_int16_t yy_chk[6448] =
 
       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,  732,  121,
+      123,  114,  116,  118,  120,  126,  121,  122,  734,  121,
       125,  117,  117,  121,  123,  119,  124,  125,  126,  128,
-      124,  127,  118,  129,  120,  732,  122,  130,  127,  121,
+      124,  127,  118,  129,  120,  734,  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,
@@ -2311,620 +2316,622 @@ static const flex_int16_t yy_chk[6448] =
       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,
+      361,  373,  164,  361,  367,  361,  370,  372,  367,  370,
+      375,  376,  371,  375,  379,  373,  367,  368,  368,  369,
+      368,  382,  372,  379,  378,  376,  380,  370,  381,  375,
 
-      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,
+      383,  380,  380,  368,  381,  384,  368,  385,  368,  378,
+      368,  377,  382,  377,  377,  386,  385,  388,  387,  383,
+      384,  389,  390,  377,  387,  377,  377,  377,  392,  391,
+      377,  395,  393,  392,  386,  391,  390,  394,  397,  391,
+      396,  389,  398,  388,  400,  396,  395,  401,  398,  399,
+      399,  392,  393,  397,  402,  403,  404,  394,  405,  401,
+      406,  403,  408,  409,  400,  406,  407,  407,  402,  407,
+      410,  411,  417,  413,  405,  413,  413,  416,  416,  409,
+      414,  404,  408,  415,  414,  411,  410,  415,  418,  419,
+      420,  417,  421,  413,  424,  422,  423,  162,  425,  430,
 
-      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,
+      424,  423,  415,  418,  422,  419,  421,  425,  420,  423,
+      423,  426,  428,  423,  423,  422,  426,  422,  427,  429,
+      430,  428,  427,  431,  432,  429,  434,  433,  432,  431,
+      433,  434,  435,  436,  436,  437,  438,  438,  439,  442,
+      440,  441,  441,  439,  444,  442,  443,  445,  437,  446,
+      443,  447,  435,  440,  446,  449,  447,  448,  448,  444,
+      450,  451,  452,  458,  455,  457,  448,  449,  445,  453,
+      457,  454,  453,  460,  452,  454,  455,  456,  456,  451,
+      450,  459,  459,  463,  458,  462,  462,  466,  464,  465,
+      467,  469,  470,  471,  472,  460,  464,  473,  465,  160,
 
-      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,
+      475,  477,  467,  473,  463,  474,  475,  466,  472,  469,
+      470,  469,  476,  471,  474,  477,  478,  476,  479,  480,
+      481,  479,  482,  483,  478,  485,  484,  478,  482,  484,
+      486,  485,  487,  480,  488,  481,  489,  487,  490,  492,
+      491,  493,  490,  483,  486,  491,  493,  494,  495,  485,
+      499,  496,  502,  520,  492,  501,  488,  489,  500,  501,
+      506,  503,  504,  494,  496,  520,  504,  495,  497,  497,
+      499,  502,  509,  500,  497,  506,  497,  503,  507,  508,
+      505,  509,  497,  507,  497,  505,  510,  497,  497,  505,
+      511,  512,  510,  513,  497,  508,  513,  510,  508,  514,
 
-      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,
+      515,  516,  516,  517,  519,  511,  521,  512,  518,  518,
+      522,  523,  524,  526,  525,  527,  530,  524,  528,  519,
+      515,  521,  514,  525,  528,  530,  533,  531,  517,  522,
+      527,  531,  526,  523,  532,  534,  535,  536,  533,  537,
+      532,  538,  539,  540,  542,  541,  539,  541,  546,  543,
+      534,  536,  544,  544,  537,  535,  540,  543,  545,  538,
+      546,  547,  548,  549,  545,  550,  549,  547,  542,  551,
+      552,  554,  555,  553,  548,  552,  553,  556,  557,  550,
+      554,  565,  556,  556,  551,  558,  558,  554,  555,  560,
+      554,  557,  559,  559,  563,  560,  561,  561,  562,  562,
 
-      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,  597,  588,
-      589,  594,  595,  589,  589,  590,  594,  595,  596,  592,
-      599,  600,  593,  597,  601,  602,  599,  601,  603,  602,
-      600,  604,  596,  603,  604,  605,  606,  607,  608,  610,
-      605,  609,  611,  615,  610,  608,  612,  612,  613,  614,
+      563,  564,  565,  566,  568,  567,  564,  564,  567,  568,
+      569,  570,  572,  571,  573,  566,  571,  572,  575,  570,
+      574,  576,  575,  578,  577,  579,  580,  576,  577,  569,
+      579,  581,  581,  582,  583,  585,  586,  573,  584,  574,
+      580,  578,  588,  584,  587,  589,  590,  588,  582,  590,
+      587,  585,  591,  593,  590,  583,  586,  590,  590,  589,
+      592,  592,  594,  595,  596,  597,  598,  600,  595,  596,
+      591,  593,  602,  600,  601,  602,  603,  604,  594,  597,
+      603,  598,  604,  601,  605,  606,  609,  605,  607,  608,
+      606,  611,  610,  609,  612,  616,  611,  613,  613,  614,
 
-      620,  602,  606,  620,  609,  607,  616,  613,  617,  615,
-      618,  619,  611,  624,  623,  616,  618,  619,  614,  623,
-      617,  621,  621,  622,  621,  625,  622,  626,  630,  627,
-      628,  624,  629,  626,  627,  629,  628,  631,  632,  625,
-      637,  633,  631,  632,  632,  634,  635,  638,  640,  636,
-      158,  635,  639,  630,  633,  636,  638,  639,  634,  637,
-      641,  641,  642,  645,  643,  635,  635,  643,  640,  642,
-      644,  649,  646,  647,  651,  645,  644,  646,  647,  647,
-      648,  648,  643,  652,  653,  652,  654,  655,  656,  657,
-      659,  658,  660,  651,  659,  661,  649,  658,  662,  663,
+      615,  617,  603,  618,  607,  610,  619,  608,  614,  625,
+      617,  616,  619,  158,  612,  618,  620,  621,  623,  615,
+      621,  623,  620,  622,  622,  624,  622,  625,  626,  627,
+      624,  628,  629,  631,  630,  627,  628,  630,  629,  632,
+      633,  634,  626,  635,  632,  633,  633,  636,  639,  637,
+      638,  641,  636,   85,  634,  637,  635,  639,  631,  640,
+      642,  642,  644,  643,  640,  644,  636,  636,  645,  638,
+      643,  641,  646,  647,  645,  650,  648,  651,  647,  651,
+      644,  648,  648,  652,  646,  649,  649,  653,  654,  653,
+      655,  656,  657,  658,  660,  659,  661,  662,  660,  663,
 
-      664,  660,  653,  665,  654,  655,  666,  656,  667,  657,
-      661,  668,  669,  662,  667,  665,  670,  663,  671,  664,
-      673,  666,  672,  674,  669,  668,  672,  675,  676,  677,
-      679,  678,  680,  680,   85,  670,  678,  671,  673,  674,
-      682,  683,  684,  687,  679,  675,  676,  676,  677,  681,
-      685,  686,  683,  681,  689,  685,  684,  688,  690,  682,
-      692,  689,  687,  690,  691,  692,  694,  686,  693,  695,
-      688,  691,  696,  693,  697,  699,  695,  698,  700,  701,
-      703,  696,  701,  700,  694,  702,  698,  699,  697,  702,
-      704,  705,  707,  706,  703,  708,  708,  710,  710,  704,
+      650,  659,  652,  664,  665,  661,  654,  666,  655,  656,
+      667,  657,  662,  658,  663,  669,  668,  671,  670,  666,
+      672,  664,  668,  665,  673,  667,  674,  675,  673,  669,
+      670,  676,  677,  678,  680,  679,  671,  681,  681,  672,
+      679,  682,  683,  675,  674,  682,  684,  685,  680,  676,
+      677,  677,  678,  686,  687,  688,  683,  689,  685,  687,
+      690,  691,  696,  693,  692,  684,   80,  686,  691,  692,
+      693,  688,  694,  690,  695,  697,  689,  694,  698,  695,
+      696,  699,  697,  700,  701,  702,  703,  698,  705,  703,
+      702,  706,  700,  704,  707,  699,  701,  704,  708,  709,
 
-      709,  709,  712,  711,  714,  716,  705,  706,  711,  709,
-      715,  712,  718,  707,  717,  719,  715,  720,  717,  722,
-      721,  723,  726,  714,  718,  716,  721,  722,  723,  724,
-      725,  729,  735,  736,  740,  720,  739,  738,  744,  736,
-      719,  735,  726,  738,  741,  739,  729,  724,  741,  744,
-      740,  742,  742,  743,  743,  725,  727,  746,  727,  745,
-      747,  727,  750,  748,   80,  727,  751,  750,  727,  748,
-      753,  746,  752,  754,  753,  727,  727,  745,  727,  756,
-      747,  749,  749,  749,  756,  749,  757,  751,  749,  758,
-      752,  755,  759,  749,   75,  755,  762,  754,  760,  749,
+      706,  718,  705,  710,  710,  711,  711,  712,  712,  707,
+      713,  716,  708,  714,  711,  713,  721,  717,  722,  720,
+      709,  718,  714,  717,  719,  724,  723,  725,  719,  726,
+      716,  720,  723,  724,  725,  727,  722,  728,  731,  737,
+      738,  721,  741,  740,  744,  744,  738,  726,  737,  740,
+      743,  741,  742,  731,  743,  745,  745,  728,  746,  747,
+      727,  729,  748,  729,  749,  750,  729,  752,  742,  746,
+      729,  750,  752,  729,  753,  754,  748,  747,  755,  759,
+      729,  729,  755,  729,  749,  751,  751,  751,  756,  751,
+      757,  758,  751,  754,  757,  753,  758,  751,  759,  760,
 
-      749,  760,  761,  762,  758,  757,  764,  761,  761,  763,
-      763,  755,  773,  765,  766,  766,  776,  759,  765,  767,
-      768,  764,  769,  768,  767,  770,  770,  769,  771,  772,
-      771,  773,  774,  775,  777,  776,  774,  778,  778,  779,
-      782,  772,  777,  780,  781,  781,  784,  783,  842,  785,
-      822,  786,  842,  775,  779,  785,  786,  780,  782,  783,
-      787,  787,  790,  822,  788,  791,  792,  790,  784,  788,
-      788,  791,  792,  793,  794,  796,  795,  797,  793,  795,
-      794,  796,  798,  798,  800,  797,  799,  799,  801,  802,
-      803,  804,  800,  806,  802,  805,  805,  803,  809,  807,
+      761,  763,  762,  751,  751,  762,  763,  763,  764,  766,
+      757,   75,  756,  767,  760,  764,  765,  765,  767,  768,
+      768,  769,  774,  771,  766,  761,  769,  770,  771,  775,
+      770,  772,  772,  773,  774,  773,  776,  777,  779,  778,
+      776,  780,  780,  785,  781,  784,  779,  782,  775,  783,
+      783,  786,  789,  789,  787,  785,  808,  777,  778,  781,
+      787,  782,  788,  784,  790,  808,  792,  788,  793,  790,
+      790,  792,  794,  786,  793,  795,  796,  798,  794,  799,
+      795,  797,  796,  798,  797,  800,  800,  799,  801,  801,
+      802,  803,  804,  805,  806,  807,  807,  804,  802,  809,
 
-      808,  808,  806,  810,  809,  812,  801,  807,  813,  814,
-      804,  815,  816,  819,  812,  817,  815,  813,  817,  818,
-      820,  816,  810,  821,  818,  823,  825,  819,  824,  824,
-      823,  823,  821,  814,  826,  827,  828,  829,  832,  832,
-      829,  825,  833,  835,  827,  820,  834,  831,  829,  831,
-      836,  834,  837,  826,  838,  839,  840,  841,   74,  843,
-      828,  845,  844,  833,  835,  840,  848,  845,  849,  846,
-      836,  847,  837,  850,  851,  839,  838,  843,  846,  850,
-      841,  844,  849,  847,  852,  848,  853,  853,  851,  852,
-      854,  855,  856,  857,  858,  859,  860,  862,  861,  863,
+      805,  810,  810,  812,  811,  814,  815,  809,  816,  803,
+      811,  817,  818,  806,  814,  815,  817,  819,  820,  821,
+      819,  818,  812,  820,  822,  823,  824,  826,  826,  827,
+      825,  828,  816,  821,  823,  825,  825,  829,  830,  824,
+      831,  834,  834,  831,  827,  833,  829,  833,  835,  822,
+      828,  831,  836,  837,  842,  838,  839,  836,  840,  841,
+      843,  844,  830,  842,  845,  844,  846,  847,  848,  835,
+      850,   74,  849,  847,  837,  838,  839,  848,  851,  841,
+      840,  852,  845,  843,  849,  846,  853,  852,  854,  850,
+      855,  855,  851,  854,  856,  857,  858,  859,  860,  861,
 
-      855,  857,  864,  862,  866,  863,  872,  865,  873,  870,
-      854,  872,  856,  865,  858,  860,  864,  859,  861,  867,
-      868,  871,  877,  869,  866,  867,  868,  869,  870,  873,
-      874,  874,  875,  871,  876,  878,  879,  876,  875,  880,
-      877,  871,  879,  881,  881,  882,  883,  884,  878,  885,
-      886,  883,  884,  884,  886,  887,  887,  888,  889,  880,
-      890,  891,  893,  882,  885,  890,  898,  894,  897,  896,
-      900,  900,  901,  903,  903,  902,  901,  904,  889,  888,
-      891,  894,  896,  907,  906,   68,  893,  898,  897,  899,
-      902,  905,  899,  909,  899,  905,  908,  907,  899,  906,
+      853,  862,  863,  864,  857,  859,  865,  867,  869,  864,
+      866,  868,  865,  867,  856,  872,  858,  870,  860,  872,
+      862,  861,  863,  870,  866,  868,  871,  873,  869,  874,
+      875,  876,  871,  877,  877,  875,  878,  879,  880,  882,
+      879,  874,  878,  883,  881,  882,  873,  884,  884,  874,
+      885,  888,  876,  886,  887,  891,  880,  881,  886,  887,
+      887,  889,  892,  883,  894,  889,  888,  893,  885,  890,
+      890,  896,  893,  897,  900,  899,  901,  891,  903,  903,
+      904,  905,  892,  894,  904,  906,  906,  897,  899,  908,
+      907,  909,  919,  908,  900,  896,  905,  901,  902,  910,
 
-      899,  908,  904,  910,  911,  899,  912,  909,  910,  910,
-      899,  913,  916,  911,  914,  913,  915,  917,  918,  919,
-      912,  915,  917,  920,  916,  921,  929,  913,  923,  914,
-      922,  915,  918,  923,  921,  924,  922,  920,  925,  930,
-      919,  924,  926,  926,  925,  927,  928,  931,  929,  933,
-      927,  934,  928,   63,  935,  939,  934,  936,  930,  937,
-      937,  933,  940,  939,  941,  931,  932,  932,  935,  936,
-      938,  942,  932,  943,  932,  938,  940,  945,  944,  946,
-      932,  947,  945,  941,  944,  932,  932,  948,  949,  943,
-      942,  946,  932,  950,  950,  952,  951,  956,  954,  947,
+      911,  902,  912,  902,  919,  911,  909,  902,  915,  902,
+      932,  914,  913,  910,  902,  907,  912,  913,  913,  902,
+      914,  916,  915,  917,  918,  916,  920,  921,  922,  918,
+      923,  920,  932,  924,  925,  929,  929,  916,  917,  918,
+      925,  921,  924,  926,  923,  927,  928,  931,  926,  922,
+      930,  927,  928,  931,  933,  930,  934,  936,  937,  939,
+      940,  940,  941,  937,  938,  943,  944,  941,  945,  936,
+      946,  939,  942,  933,  934,  935,  935,  951,  938,  943,
+      942,  935,  947,  935,   68,  944,  946,  945,  947,  935,
+      949,  948,  950,  951,  935,  935,  948,  952,  953,  953,
 
-      951,  958,  955,  948,  954,  955,  949,  957,  960,  961,
-      963,  959,  957,  960,  958,  952,  956,  959,  964,  963,
-      965,  967,  968,  966,  970,  971,  969,  964,  961,  966,
-      967,  969,  972,  973,  974,  980,  965,  975,  977,  971,
-      982,  968,  976,  974,  970,  973,  975,  978,  976,  983,
-      985,  980,  972,  978,  982,  977,  984,  987,  986,  993,
-      988,  989,  992,   58,  985,  988,  989,  992,  993,  983,
-      994,  994,  987,  995,  996,  984,  986,  998,  999,  995,
-     1003, 1001, 1001,  999,  999, 1001, 1002,  996, 1004, 1002,
-     1005, 1006, 1007,  998, 1003, 1008, 1009, 1010, 1011, 1012,
+      954,  935,  949,  955,  954,  957,  958,  959,  960,  958,
+      950,  957,  961,  960,  962,  952,  963,  964,  966,  967,
+      962,  963,  968,  955,  969,  961,  959,  966,  967,  971,
+      969,  970,  972,  973,  975,  974,  964,  972,  968,  976,
+      970,  977,  980,  978,  983,  986,  989,  987,  971,  974,
+      977,  976,  978,  973,  975,  979,  981,  985,  988,  980,
+      983,  979,  981,  990,  989,  986,  987,  996,  991,  992,
+      995,  985,  988,  991,  992,  995,  996,  998,  990,  997,
+      997,  999, 1001,  998, 1002, 1006, 1007, 1004, 1004, 1002,
+     1002, 1004, 1005, 1008,  999, 1005, 1009, 1010, 1001, 1006,
 
-     1016, 1014, 1009, 1016, 1011, 1007, 1005, 1013, 1004, 1006,
-     1008, 1017, 1013, 1018, 1012, 1014, 1019, 1010, 1018, 1020,
-     1021, 1019, 1022, 1025, 1023, 1021, 1026, 1022, 1027, 1025,
-     1031, 1028, 1017, 1034, 1027, 1020, 1023, 1028, 1029, 1029,
-     1030, 1032, 1026, 1035, 1032, 1033, 1033, 1036, 1031, 1030,
-     1037, 1034, 1038, 1037, 1039, 1040, 1047, 1046, 1041, 1042,
-     1039, 1040, 1035, 1041, 1042, 1038, 1043, 1036, 1044, 1050,
-     1050, 1043, 1048, 1053, 1044, 1046, 1047, 1049, 1048, 1051,
-     1052, 1054, 1049, 1055, 1056, 1057, 1055, 1056, 1051, 1052,
-     1058, 1053, 1059, 1060, 1063, 1061, 1057, 1062, 1065, 1065,
+     1011, 1012, 1013, 1015, 1020, 1014, 1007, 1012, 1016, 1008,
+     1010, 1014, 1017, 1016, 1009, 1011, 1019, 1023, 1015, 1019,
+     1029,   63, 1013, 1021, 1022, 1020, 1017, 1024, 1021, 1022,
+     1025, 1026, 1024, 1023, 1028, 1025, 1029, 1033, 1030, 1031,
+     1028, 1032, 1032, 1026, 1030, 1031, 1033, 1034, 1035, 1036,
+     1036, 1035, 1037, 1038, 1039, 1040, 1041, 1042, 1040, 1044,
+     1043, 1049, 1045, 1042, 1044, 1034, 1043, 1045, 1046, 1041,
+     1037, 1047, 1038, 1046, 1039, 1050, 1051, 1047, 1052, 1049,
+     1053, 1053, 1051, 1052, 1054, 1055, 1056, 1057, 1058, 1059,
+     1060, 1058, 1059, 1054, 1055, 1050, 1062, 1061, 1063, 1064,
 
-     1054, 1061, 1064, 1062, 1059, 1066, 1067, 1064, 1058, 1063,
-     1068, 1069, 1060, 1070, 1071, 1069, 1072, 1073, 1075, 1077,
-     1067, 1080, 1068, 1071, 1066, 1076, 1076, 1079, 1081, 1082,
-     1085, 1070, 1084, 1084, 1082, 1072, 1080, 1075, 1083, 1077,
-     1081, 1079, 1073, 1086, 1088, 1087, 1096, 1083, 1089, 1086,
-     1085, 1087, 1090, 1089, 1090, 1092, 1091, 1093, 1094, 1095,
-     1088, 1091, 1098, 1094, 1099, 1096, 1097, 1101, 1101, 1092,
-     1102, 1093, 1103, 1097, 1095, 1105, 1104, 1098, 1106, 1114,
-     1107, 1105, 1109, 1099, 1102, 1107, 1109, 1110, 1110, 1116,
-     1103, 1104, 1111, 1114, 1107, 1113, 1107, 1111, 1106, 1107,
+     1067, 1060, 1061, 1065, 1056, 1066, 1057, 1068, 1070, 1065,
+     1063, 1066, 1068, 1072, 1062, 1067, 1069, 1069, 1064, 1071,
+     1073, 1074, 1075, 1076, 1073, 1072, 1077, 1070, 1079, 1080,
+     1080, 1075, 1081, 1071, 1083, 1084, 1086, 1085, 1089, 1074,
+     1092, 1086, 1076,   58, 1087, 1088, 1088, 1079, 1083, 1085,
+     1084, 1077, 1081, 1087, 1090, 1091, 1092, 1093, 1089, 1095,
+     1090, 1091, 1093, 1094, 1095, 1094, 1096, 1097, 1098, 1099,
+     1100, 1101, 1102, 1098, 1103, 1105, 1105, 1106, 1101, 1107,
+     1096, 1097, 1109, 1108, 1099, 1110,   57, 1102, 1109, 1100,
+     1111, 1106, 1113, 1103, 1117, 1111, 1113, 1107, 1108, 1114,
 
-     1112, 1112, 1113, 1115, 1117, 1118, 1115, 1119, 1116, 1120,
-     1122, 1121, 1119, 1123, 1118, 1122, 1125, 1130, 1124, 1127,
-     1127, 1128, 1117, 1121, 1133, 1129, 1128, 1123, 1120, 1124,
-     1129, 1131, 1134, 1133, 1132, 1125, 1131, 1130, 1132, 1135,
-     1136, 1137, 1138, 1139, 1140, 1141, 1142, 1134, 1143, 1144,
-     1139, 1146, 1147, 1137, 1135, 1144, 1140, 1138, 1145, 1136,
-     1148, 1149, 1150, 1151, 1141, 1152, 1143, 1142, 1153, 1148,
-     1154, 1146, 1147, 1145, 1155, 1151, 1149, 1157, 1159, 1160,
-     1158, 1150, 1161, 1157, 1152, 1154, 1163, 1160, 1162, 1164,
-     1166, 1163, 1159, 1153, 1155, 1158, 1167, 1185, 1168, 1184,
+     1114, 1117, 1115, 1118, 1111, 1110, 1111, 1115, 1120, 1111,
+     1116, 1116, 1119, 1121, 1122, 1119, 1123, 1118, 1124, 1126,
+     1125, 1123, 1127, 1122, 1126, 1129, 1134, 1120, 1128, 1131,
+     1131, 1121, 1125, 1132, 1137, 1133, 1127, 1124, 1132, 1128,
+     1133, 1136, 1135, 1137, 1129, 1136, 1134, 1135, 1138, 1139,
+     1140, 1142, 1143, 1141, 1145, 1144, 1146, 1147, 1150, 1143,
+     1151, 1149, 1148, 1138, 1139, 1141, 1142, 1144, 1148, 1140,
+     1152, 1153, 1154, 1145, 1157, 1147, 1149, 1146, 1150, 1152,
+     1151, 1155, 1156, 1158, 1159, 1162, 1153, 1164, 1161, 1163,
+     1165, 1154, 1166, 1155, 1161, 1164, 1170, 1167, 1158, 1157,
 
-     1165, 1164, 1161, 1171, 1162, 1165, 1165, 1169, 1169, 1166,
-     1167, 1168, 1170, 1170, 1172, 1185, 1171, 1170, 1173, 1184,
-     1170, 1170, 1181, 1172, 1173, 1170, 1174, 1174, 1175, 1176,
-     1177, 1170, 1178, 1175, 1179, 1170, 1177, 1178, 1176, 1179,
-     1180, 1180, 1187, 1181, 1182, 1182, 1183, 1186, 1188, 1183,
-     1189, 1183, 1190, 1188, 1191, 1192, 1186, 1195, 1193, 1201,
-     1191, 1192, 1187, 1193, 1189, 1194, 1195, 1196, 1196, 1194,
-     1190, 1195, 1198, 1195, 1201, 1195, 1200, 1195, 1197, 1197,
-     1200, 1197, 1202, 1198, 1203, 1204, 1205, 1206, 1208, 1207,
-     1204, 1204, 1209, 1203, 1207, 1205, 1210, 1211, 1212, 1213,
+     1162, 1156, 1167, 1163, 1159, 1168, 1169, 1171, 1166, 1172,
+     1165, 1169, 1169, 1173, 1173, 1170, 1175, 1168, 1176, 1177,
+     1181, 1171, 1172, 1174, 1174, 1177, 1181, 1176, 1174, 1175,
+     1179, 1174, 1174, 1178, 1178, 1179, 1174, 1185, 1180, 1182,
+     1183, 1188, 1174, 1319, 1182, 1183, 1174, 1180, 1184, 1184,
+     1186, 1186, 1187, 1189, 1190, 1187, 1191, 1187, 1185, 1192,
+     1193, 1188, 1194, 1190, 1192, 1197, 1195, 1196, 1199, 1319,
+     1197, 1189, 1195, 1196, 1193, 1198, 1191, 1199, 1205, 1198,
+     1194, 1206, 1199, 1204, 1199, 1202, 1199, 1204, 1199, 1200,
+     1200, 1201, 1201, 1205, 1201, 1207, 1202, 1208, 1209, 1206,
 
-     1202, 1209, 1208, 1214, 1214, 1213, 1215, 1216, 1217, 1206,
-     1218, 1219, 1212, 1217, 1215, 1210, 1211, 1220, 1221, 1224,
-     1219, 1216, 1222,   57, 1218, 1223, 1223, 1222, 1225, 1225,
-     1226, 1230, 1226, 1228, 1224, 1220, 1228, 1229, 1231, 1232,
-     1232, 1233, 1229, 1221, 1234, 1234, 1236, 1231, 1235, 1235,
-     1230, 1236, 1237, 1238, 1239, 1239, 1240, 1241, 1242, 1243,
-     1241, 1233, 1244, 1245, 1243, 1245, 1246, 1248, 1249,   52,
-     1248, 1244, 1250, 1237, 1238, 1251, 1240, 1250, 1242, 1253,
-     1252, 1254, 1258, 1249, 1246, 1252, 1254, 1253, 1255, 1251,
-     1256, 1256, 1257, 1255, 1261, 1259, 1260, 1257, 1263, 1264,
+     1210, 1211, 1208, 1208, 1207, 1212, 1211, 1209, 1213, 1214,
+     1215, 1216, 1217, 1218, 1218, 1219, 1220, 1213, 1217, 1212,
+     1222, 1221, 1210, 1219, 1223, 1216, 1221, 1224, 1214, 1215,
+     1220, 1225, 1226, 1223, 1222, 1227, 1227, 1226, 1228, 1229,
+     1229, 1230, 1234, 1230, 1232, 1224, 1233, 1232, 1235, 1236,
+     1236, 1233, 1237, 1228, 1238, 1238, 1225, 1235, 1239, 1239,
+     1240, 1234, 1241, 1242, 1250, 1240, 1243, 1243, 1244, 1246,
+     1245, 1247, 1237, 1245, 1261, 1261, 1247, 1248, 1249, 1253,
+     1249, 1255, 1250, 1241, 1242, 1257, 1248, 1252, 1244, 1246,
+     1252, 1254, 1256, 1257, 1253, 1255, 1254, 1256, 1258, 1259,
 
-     1258, 1259, 1266, 1260, 1263, 1264, 1265, 1261, 1266, 1267,
-     1268, 1265, 1269, 1270, 1270, 1271, 1273, 1274, 1267, 1275,
-     1276, 1277, 1278, 1269, 1280, 1281, 1276, 1277, 1278, 1268,
-     1280, 1273, 1282, 1283, 1284, 1271, 1285, 1274, 1286, 1281,
-     1287, 1287, 1275, 1288, 1289, 1281, 1284, 1290, 1293, 1291,
-     1285, 1296, 1282, 1283, 1291, 1294, 1286, 1292, 1292, 1298,
-     1294, 1297,   47, 1288, 1299, 1290, 1297, 1297, 1300, 1289,
-     1296, 1293, 1301, 1299, 1302, 1303, 1300, 1298, 1306, 1304,
-     1306, 1307, 1305, 1313, 1304, 1314, 1301, 1304, 1309, 1302,
-     1303, 1305, 1310, 1303, 1309, 1307, 1310, 1311, 1312, 1315,
+     1260, 1262, 1259, 1258, 1263, 1260, 1262, 1264, 1265, 1270,
+     1266, 1268, 1269, 1264, 1270, 1265, 1273, 1268, 1269, 1271,
+     1272, 1274, 1263, 1266, 1276, 1271, 1275, 1275, 1278, 1272,
+     1279, 1280, 1274, 1281, 1282, 1273, 1283, 1286, 1287, 1281,
+     1282, 1285, 1283, 1278, 1276, 1288, 1291, 1285, 1289, 1290,
+     1279, 1286, 1292, 1292, 1280, 1293, 1294, 1286, 1287, 1295,
+     1289, 1296, 1298, 1290, 1291, 1288, 1296, 1297, 1297, 1299,
+     1301, 1304, 1303, 1302, 1299, 1293, 1305, 1295, 1302, 1302,
+     1304, 1294, 1306, 1307, 1305, 1298, 1308, 1309, 1310, 1301,
+     1303, 1311, 1309, 1311, 1312, 1309, 1306, 1310, 1307, 1314,
 
-     1316, 1317, 1313, 1312, 1312, 1316, 1317, 1318, 1311, 1319,
-     1320, 1314, 1321, 1323, 1329, 1320, 1324, 1315, 1325, 1326,
-     1326, 1328, 1327, 1331, 1330, 1318, 1327, 1323, 1332, 1319,
-     1330, 1333, 1321, 1329, 1324, 1331, 1325, 1334, 1335, 1328,
-     1336, 1337, 1338, 1339, 1340, 1333, 1337, 1332, 1339, 1338,
-     1343, 1341, 1334, 1335, 1342, 1342, 1345, 1344, 1349, 1336,
-     1341, 1347, 1340, 1346, 1346, 1343, 1344, 1347, 1348, 1350,
-     1350, 1351, 1349, 1352, 1348, 1353, 1345, 1351, 1354, 1355,
-     1356, 1357, 1364, 1354, 1362, 1355, 1356, 1357, 1362, 1352,
-     1358, 1358, 1359, 1359, 1361, 1361, 1353, 1363, 1365, 1366,
+     1316, 1308, 1315, 1318, 1308, 1314, 1315, 1317, 1312, 1320,
+     1321, 1316, 1317, 1317, 1322, 1321, 1323, 1324, 1325, 1322,
+     1326, 1328, 1318, 1325, 1329, 1330, 1332, 1320, 1331, 1331,
+     1332, 1333, 1334, 1335, 1323, 1328, 1336, 1324, 1337, 1335,
+     1326, 1338, 1329, 1330, 1339, 1340, 1341, 1342, 1336, 1333,
+     1345, 1334, 1342, 1344, 1343, 1338, 1354, 1337, 1344, 1339,
+     1340, 1343, 1346, 1347, 1347, 1341, 1348, 1349, 1345, 1350,
+     1354, 1346, 1351, 1351, 1352, 1357, 1349, 1353, 1355, 1355,
+     1352, 1348, 1356, 1353, 1358, 1359, 1360, 1361, 1356, 1350,
+     1359, 1357, 1360, 1361, 1362, 1363, 1363, 1364, 1364, 1367,
 
-     1364, 1367, 1368, 1369, 1369, 1370, 1363, 1371, 1373, 1368,
-     1365, 1374, 1372, 1366, 1375, 1371, 1367, 1372, 1376, 1375,
-     1375, 1377, 1373, 1376, 1376, 1370, 1378, 1378, 1379, 1380,
-     1374, 1381, 1382, 1383, 1384, 1385, 1386, 1382, 1387, 1388,
-     1381, 1377, 1386, 1387, 1389, 1390, 1398, 1379, 1380, 1391,
-     1389, 1392, 1383, 1385, 1384, 1391, 1393, 1392, 1394, 1395,
-     1396, 1407, 1397, 1408, 1390, 1388, 1399, 1398, 1400, 1400,
-     1401, 1402, 1408, 1401, 1407, 1393, 1397, 1394, 1395, 1396,
-     1415, 1399, 1409, 1402, 1403, 1403, 1404, 1404, 1405, 1412,
-     1406, 1414, 1413, 1405, 1406, 1409, 1410, 1413, 1410, 1421,
+     1362, 1366, 1366, 1367, 1368, 1358, 1369, 1370, 1371, 1373,
+     1372, 1374, 1374, 1368, 1375, 1376, 1373, 1378, 1379, 1370,
+     1382, 1377, 1371, 1376, 1369, 1372, 1377, 1380, 1383, 1383,
+     1381, 1378, 1380, 1380, 1375, 1381, 1381, 1379, 1384, 1385,
+     1382, 1386, 1387, 1388, 1389, 1390, 1391, 1387, 1392, 1393,
+     1386, 1395, 1391, 1392, 1394, 1396, 1403, 1384, 1385, 1397,
+     1394, 1396, 1388, 1390, 1389, 1397, 1398, 1399, 1400, 1401,
+     1395, 1405, 1405,   52, 1404, 1393, 1402, 1403, 1406, 1407,
+     1411, 1406, 1408, 1408, 1411, 1398, 1399, 1400, 1401, 1404,
+     1402, 1407, 1409, 1409, 1410, 1412, 1413, 1414, 1415, 1410,
 
-     1415, 1416, 1410, 1417, 1417, 1418, 1414, 1412, 1419, 1420,
-     1418, 1422, 1421, 1425, 1419, 1410, 1422, 1416, 1423, 1424,
-     1426, 1427, 1423, 1424, 1420, 1428, 1429, 1429, 1431, 1433,
-     1434, 1428, 1437, 1425, 1436, 1434, 1435, 1435, 1426, 1443,
-     1436, 1427, 1439, 1439, 1441, 1444, 1431, 1441, 1442, 1442,
-     1433, 1446, 1437, 1447, 1446, 1443, 1448, 1449, 1449, 1450,
-     1451, 1444, 1453, 1452, 1454, 1448, 1456, 1453, 1455, 1455,
-     1457, 1458, 1459, 1447, 1450, 1456, 1460, 1460, 1454, 1461,
-     1462, 1451, 1452, 1466, 1463, 1464, 1458, 1466, 1457, 1463,
-     1465, 1465, 1467, 1461, 1468, 1468, 1469, 1459, 1462, 1470,
+     1415, 1417, 1418, 1419, 1415, 1413, 1420, 1418, 1412, 1421,
+     1414, 1422, 1422, 1425, 1426, 1423, 1424, 1415, 1419, 1417,
+     1423, 1430, 1424, 1432, 1427, 1421, 1420, 1426, 1425, 1427,
+     1428, 1429, 1431, 1433, 1428, 1429, 1434, 1434, 1436, 1433,
+     1438, 1430, 1439, 1432, 1440, 1440, 1441, 1439, 1442, 1448,
+     1431, 1449, 1441, 1444, 1444, 1446, 1436, 1452, 1446, 1447,
+     1447, 1438, 1453, 1451, 1455, 1448, 1451, 1449, 1442, 1454,
+     1454, 1453, 1456, 1457, 1459, 1458, 1461, 1452, 1462, 1455,
+     1458, 1460, 1460, 1463, 1464, 1461, 1465, 1467, 1459, 1466,
+     1466, 1473, 1457, 1456, 1468, 1469, 1462, 1475, 1463, 1470,
 
-     1464, 1471, 1472, 1473, 1476, 1471, 1475, 1475, 1473, 1477,
-     1470, 1478, 1467, 1479, 1480, 1481, 1482, 1482, 1469, 1483,
-     1476, 1472, 1484, 1485, 1483, 1478, 1487, 1477, 1480, 1486,
-     1486, 1488, 1479, 1479, 1489, 1487, 1488, 1490, 1492, 1490,
-     1481, 1491, 1484, 1485, 1492, 1493, 1491, 1494, 1496, 1497,
-     1497, 1498, 1499, 1494, 1489, 1501, 1502, 1505, 1499, 1506,
-     1501, 1507, 1496, 1503, 1503, 1493, 1504, 1504, 1510, 1508,
-     1498, 1505, 1508, 1509, 1509, 1511, 1507, 1506, 1512, 1513,
-     1502, 1516, 1513, 1514, 1516, 1513, 1510, 1511, 1515, 1514,
-     1518, 1519, 1520, 1515, 1522, 1522, 1519, 1513, 1512, 1518,
+     1469, 1467, 1471, 1471, 1472, 1478, 1465, 1476, 1472, 1464,
+     1482, 1473, 1468, 1477, 1470, 1474, 1474, 1477, 1476, 1475,
+     1479, 1481, 1481, 1483, 1478, 1479, 1482, 1485, 1484, 1486,
+     1487, 1488, 1488, 1489, 1490, 1493, 1491, 1495, 1489, 1492,
+     1492, 1483, 1484, 1486, 1493, 1494, 1485, 1485, 1497, 1496,
+     1494, 1496, 1498, 1497, 1490, 1487, 1491, 1495, 1498, 1499,
+     1500, 1502, 1503, 1503, 1504, 1505, 1500, 1507, 1508, 1509,
+     1509, 1505, 1507, 1510, 1510, 1502, 1511, 1512, 1513, 1499,
+     1516, 1514, 1517, 1504, 1514, 1515, 1515, 1518, 1526,   47,
+     1511, 1520, 1508, 1513, 1517, 1512, 1519, 1520, 1516, 1519,
 
-     1516, 1521, 1523, 1524, 1521, 1525, 1526, 1526, 1523, 1524,
-     1525, 1527, 1527, 1528, 1530, 1529, 1531, 1520, 1532, 1528,
-     1529, 1533, 1534, 1535, 1536, 1534, 1537, 1530, 1539, 1535,
-     1536, 1537, 1538, 1544, 1531, 1540, 1543, 1532, 1538, 1542,
-     1540, 1533, 1541, 1541, 1542, 1545, 1546, 1547, 1548, 1549,
-     1550, 1539, 1551, 1544, 1543, 1552, 1551, 1552, 1553, 1555,
-     1546, 1547, 1548, 1558, 1556, 1545, 1557, 1549, 1559, 1558,
-     1560, 1555, 1561, 1562, 1563, 1550, 1556, 1553, 1566, 1557,
-     1565, 1565, 1568, 1571, 1567, 1570, 1560, 1562, 1559, 1567,
-     1569, 1569, 1561, 1572, 1568, 1563, 1573, 1571, 1566, 1574,
+     1521, 1522, 1519, 1524, 1522, 1521, 1525, 1518, 1528, 1528,
+     1529, 1525, 1524, 1526, 1519, 1527, 1529, 1530, 1527, 1531,
+     1522, 1532, 1532, 1530, 1531, 1533, 1533, 1534, 1536, 1535,
+     1537, 1538, 1539, 1534, 1535, 1540, 1541, 1542, 1540, 1543,
+     1544, 1536, 1541, 1542, 1543, 1545, 1544, 1549, 1537, 1546,
+     1538, 1550, 1539, 1548, 1546, 1547, 1547, 1551, 1548, 1552,
+     1553, 1554, 1555, 1556, 1559, 1549, 1557, 1558, 1545, 1558,
+     1557, 1550, 1561, 1552, 1553, 1554, 1563, 1551, 1562, 1564,
+     1555, 1565, 1566, 1559, 1561, 1564, 1567, 1569, 1556, 1563,
+     1562, 1568, 1571, 1571, 1572, 1573, 1576, 1574, 1566, 1577,
 
-     1570, 1575, 1576, 1577, 1578, 1582, 1580, 1583, 1574, 1576,
-     1583, 1587, 1577, 1586, 1573, 1577, 1575, 1572, 1584, 1584,
-     1578, 1580, 1585, 1585, 1588, 1586, 1580, 1588, 1590, 1587,
-     1582, 1589, 1589, 1591, 1592, 1593, 1594, 1595, 1596, 1592,
-     1593, 1590, 1597, 1602, 1600, 1598, 1606, 1596, 1604, 1599,
-     1600, 1603, 1591, 1595, 1598, 1594, 1605, 1598, 1599, 1601,
-     1601, 1597, 1606, 1602, 1603, 1607, 1604, 1610, 1611, 1613,
-     1605, 1612, 1612, 1614, 1615, 1616, 1616, 1607, 1618, 1615,
-     1619, 1620, 1614, 1618, 1617, 1613, 1611, 1621, 1625, 1622,
-     1616, 1626, 1610, 1617, 1622, 1622, 1617, 1624, 1619, 1627,
+     1573, 1565, 1575, 1575, 1578, 1568, 1567, 1579, 1569, 1574,
+     1580, 1576, 1581, 1577, 1572, 1582, 1584, 1583, 1586, 1580,
+     1588, 1589, 1582, 1593, 1589, 1579, 1583, 1581, 1578, 1583,
+     1590, 1590, 1584, 1586, 1591, 1591, 1592, 1594, 1586, 1596,
+     1594, 1593, 1595, 1595, 1597, 1588, 1598, 1600, 1592, 1599,
+     1602, 1598, 1596, 1601, 1599, 1603, 1604, 1608, 1605, 1602,
+     1607, 1607, 1609, 1597, 1606, 1604, 1600, 1605, 1604, 1601,
+     1606, 1610, 1611, 1613, 1603, 1609, 1612, 1608, 1616, 1617,
+     1618, 1618, 1619, 1621, 1620, 1613, 1611, 1623, 1621, 1610,
+     1622, 1622, 1612, 1620, 1625, 1624, 1623, 1617, 1619, 1623,
 
-     1628, 1629, 1620, 1625, 1627, 1621, 1628, 1630, 1630, 1631,
-     1633, 1624, 1632, 1626, 1634, 1631, 1633, 1632, 1636, 1629,
-     1634, 1637, 1638, 1639, 1640, 1641, 1643, 1640, 1638, 1645,
-     1646, 1641, 1647, 1640, 1643, 1637, 1639, 1648, 1636, 1649,
-     1647, 1650, 1651, 1652, 1653, 1653, 1648, 1654, 1645, 1646,
-     1656, 1658, 1649, 1654, 1650, 1655, 1651, 1652, 1657, 1657,
-     1659, 1655, 1660, 1656, 1661, 1663, 1653, 1662, 1664, 1668,
-     1665, 1658, 1669, 1662, 1667, 1667, 1669, 1661, 1659, 1674,
-     1670, 1660, 1676, 1673, 1664, 1670, 1671, 1663, 1665, 1668,
-     1672, 1671, 1673, 1677, 1676, 1672, 1678, 1678, 1679, 1680,
+     1624, 1626, 1627, 1616, 1628, 1622, 1632, 1630, 1631, 1628,
+     1628, 1633, 1625, 1634, 1635,   18, 1633, 1636, 1636, 1634,
+     1627, 1630, 1626, 1631, 1637, 1642, 1638, 1639, 1632, 1640,
+     1637, 1638, 1635, 1639, 1643, 1640, 1644, 1645, 1646, 1651,
+     1647, 1646, 1644, 1649, 1652, 1642, 1647, 1646, 1643, 1653,
+     1645, 1649, 1654, 1655, 1656, 1657, 1658, 1653, 1651, 1659,
+     1659, 1654, 1660, 1652, 1662, 1661, 1655, 1656, 1660, 1657,
+     1658, 1661, 1663, 1663, 1664, 1665, 1666, 1662, 1667, 1667,
+     1669, 1659, 1670, 1668, 1671, 1672, 1669, 1674, 1674, 1675,
+     1680, 1681,   17, 1665, 1664, 1666, 1668, 1676, 1684, 1680,
 
-     1681, 1683, 1674, 1682, 1682, 1684, 1685, 1688, 1677, 1686,
-     1689, 1680, 1684, 1691, 1690, 1683, 1692, 1679, 1685, 1681,
-     1690, 1686, 1693, 1694, 1694, 1691, 1688, 1702, 1693, 1695,
-     1689, 1699, 1695, 1698, 1692, 1696, 1696, 1700, 1698, 1702,
-     1699, 1701, 1701, 1700, 1703, 1704, 1703, 1705, 1704, 1706,
-     1707, 1708, 1709, 1710, 1711, 1713, 1714, 1709, 1710, 1716,
-     1712, 1714, 1719, 1711, 1715, 1720, 1720, 1705, 1707, 1708,
-     1713, 1706, 1712, 1715, 1722, 1717, 1718, 1719, 1721, 1716,
-     1717, 1718, 1724, 1725, 1721, 1727, 1715, 1717, 1726, 1728,
-     1733, 1728, 1729, 1730, 1730, 1722, 1731, 1731, 1732, 1732,
+     1671, 1676, 1677, 1672, 1670, 1678, 1679, 1677, 1683, 1675,
+     1678, 1679, 1686, 1684, 1681, 1685, 1685, 1687, 1688, 1690,
+     1683, 1689, 1689, 1691, 1692, 1695, 1693, 1696, 1697, 1687,
+     1691, 1686, 1699, 1690, 1697, 1700, 1692, 1688, 1693, 1698,
+     1712, 1700, 1701, 1701, 1695, 1702, 1706, 1696, 1702, 1705,
+     1699, 1698, 1703, 1703, 1705, 1706, 1707, 1708, 1708, 1709,
+     1712, 1710, 1707, 1710, 1711, 1713, 1714, 1711, 1715, 1716,
+     1717, 1709, 1718, 1719, 1716, 1717, 1720, 1721, 1723, 1722,
+        0, 1718, 1721, 1729, 1714, 1719, 1715, 1713, 1722, 1725,
+     1724, 1720, 1726, 1728, 1725, 1724, 1727, 1727, 1723, 1728,
 
-     1736, 1724, 1737, 1725, 1726, 1727, 1729,   18, 1729, 1744,
-     1733, 1734, 1734, 1735, 1735, 1738, 1738, 1741, 1739, 1740,
-     1741, 1736, 1739, 1737, 1743, 1740, 1745, 1744, 1746, 1749,
-     1743, 1747, 1745, 1750, 1747, 1748, 1748, 1752, 1750, 1751,
-     1751, 1753, 1754, 1755, 1755, 1756, 1758, 1754, 1757, 1749,
-     1756, 1759, 1752, 1746, 1757, 1760, 1761, 1762, 1758, 1758,
-     1758, 1763, 1753, 1762, 1765, 1758, 1766, 1767, 1769, 1765,
-     1765, 1759, 1768, 1760, 1768, 1770, 1761, 1771, 1772, 1769,
-     1766, 1763, 1767, 1771, 1773, 1774, 1776, 1772, 1775, 1775,
-     1770, 1777, 1777, 1778, 1779, 1780, 1780, 1781, 1781, 1782,
+     1731, 1722, 1724, 1732, 1729, 1733, 1734, 1726, 1735, 1740,
+     1735, 1736, 1737, 1737, 1738, 1738, 1739, 1739, 1743, 1731,
+     1744, 1733, 1753, 1732, 1746, 1736, 1734, 1736, 1746, 1740,
+     1741, 1741, 1742, 1742, 1745, 1745, 1747, 1748, 1750, 1743,
+     1748, 1744, 1747, 1751, 1750, 1752, 1754, 1753, 1756, 1754,
+     1757, 1752, 1755, 1755, 1759, 1757, 1758, 1758, 1760, 1761,
+     1763, 1751, 1762, 1762, 1761, 1763, 1764, 1766, 1756, 1759,
+     1765, 1769, 1764, 1767, 1768, 1770, 1773, 1769, 1774, 1760,
+     1772, 1776, 1765, 1765, 1765, 1772, 1772, 1766, 1777, 1765,
+     1773, 1767, 1776, 1774, 1768, 1770, 1775, 1779, 1775, 1778,
 
-     1785, 1785, 1786, 1790, 1773, 1787, 1774, 1793, 1789, 1791,
-     1792, 1792, 1776, 1778, 1787, 1791, 1779, 1789, 1794, 1782,
-     1797, 1796, 1795, 1799, 1790, 1798, 1798, 1786, 1793, 1795,
-     1796, 1800, 1802, 1794, 1803, 1804, 1805, 1802, 1806, 1807,
-     1803, 1808, 1808, 1805, 1806, 1807, 1797, 1800, 1809, 1799,
-     1810, 1811, 1813, 1809, 1812, 1804, 1815, 1814, 1816, 1810,
-     1814, 1817, 1817, 1818, 1813, 1820, 1819, 1821, 1824, 1818,
-     1825, 1811, 1819, 1812, 1815, 1822, 1826, 1827, 1827, 1822,
-     1828, 1826, 1821, 1829, 1816, 1820, 1831, 1832, 1824,   17,
-     1833, 1832, 1825, 1834, 1839, 1822, 1833, 1837, 1829, 1828,
+     1780, 1781, 1783, 1777, 1785, 1778, 1779, 1782, 1782, 1784,
+     1784, 1786, 1787, 1787, 1788, 1788, 1789, 1792, 1792, 1793,
+     1780, 1794, 1781, 1796, 1785, 1797, 1799, 1799, 1783, 1798,
+     1794, 1800, 1796, 1786, 1801, 1798, 1789, 1804, 1802, 1803,
+     1805, 1805, 1806, 1807, 1793, 1802, 1797, 1810, 1803, 1801,
+     1809, 1811, 1800, 1810, 1812, 1809, 1813, 1818, 1814, 1807,
+     1817, 1812, 1813, 1804, 1814, 1815, 1815, 1816, 1806, 1817,
+     1819, 1811, 1816, 1820, 1822, 1821, 1823, 1818, 1821, 1824,
+     1824, 1825, 1826, 1827, 1828, 1820, 1829, 1825, 1826, 1819,
+     1829, 1831, 1822, 1832, 1835, 1833, 1834, 1834, 1838, 1828,
 
-     1835, 1835, 1834, 1836, 1840, 1831, 1841, 1836, 1837, 1838,
-     1838, 1842, 1843, 1837, 1844, 1839, 1842, 1845, 1840, 1847,
-     1846, 1848, 1848, 1845, 1847, 1841, 1849, 1849, 1852, 1850,
-     1853, 1854, 1843, 1850, 1844, 1846, 1861, 1852, 1855, 1855,
-     1862, 1853, 1857, 1857, 1858, 1862, 1853, 1859, 1860, 1858,
-     1858, 1854, 1863, 1859, 1860, 1864, 1866, 1868, 1869, 1867,
-     1870, 1864, 1861, 1867, 1863, 1871, 1870, 1872, 1866, 1868,
-     1873, 1877, 1874, 1872, 1876, 1873, 1878, 1880, 1881, 1881,
-     1880, 1878, 1884, 1869, 1874, 1927, 1876, 1871, 1882, 1882,
-     1877, 1883, 1883, 1885, 1886, 1889, 1887, 1888, 1927, 1885,
+     1833, 1836, 1823, 1827, 1839, 1841, 1829, 1846, 1839, 1842,
+     1842, 1831, 1840, 1835, 1841, 1832, 1836, 1838, 1840, 1843,
+     1844, 1845, 1845, 1843, 1847, 1848, 1850, 1849, 1846, 1851,
+     1853, 1844, 1849, 1852, 1859, 1854, 1844, 1861, 1847, 1852,
+     1854, 1855, 1855, 1859, 1848, 1853, 1850, 1856, 1856, 1851,
+     1857, 1860, 1862, 1862, 1857, 1864, 1864, 1861, 1865, 1866,
+     1868, 1869, 1860, 1865, 1865, 1866, 1868, 1860, 1870, 1871,
+     1872, 1874, 1876, 1870, 1875, 1877, 1872, 1879, 1875, 1878,
+     1880, 1871, 1882, 1874, 1876, 1878, 1880, 1869, 1881, 1884,
+     1885, 1886, 1888, 1881, 1882, 1888, 1886, 1889, 1889, 1879,
 
-     1886, 1887, 1884, 1888, 1889, 1891, 1893, 1894, 1897, 1893,
-     1891, 1895, 1895, 1898, 1900, 1900, 1899, 1901, 1902, 1894,
-     1897, 1899, 1903, 1902, 1906, 1898, 1901, 1903, 1904, 1905,
-     1905, 1904, 1907, 1908, 1909, 1910, 1913, 1911, 1914, 1910,
-     1912, 1907, 1911, 1915, 1906, 1916, 1912, 1914, 1918, 1918,
-     1919, 1908, 1925, 1909, 1913, 1920, 1921, 1921, 1923, 1916,
-     1918, 1915, 1922, 1922, 1920, 1924, 1926, 1923, 1919, 1930,
-     1930, 1926, 1932, 1925, 1933, 1932, 1934, 1924, 1936, 1938,
-     1937, 1939, 1940, 1940, 1941, 1938, 1941, 1942, 1942, 1943,
-     1933, 1948, 1934, 1936, 1937, 1945, 1945, 1943, 1939, 1946,
+     1877, 1884, 1890, 1890, 1891, 1891, 1892, 1893, 1894, 1885,
+     1895, 1896, 1897, 1893, 1894, 1895, 1901, 1896, 1899, 1901,
+     1902, 1897, 1905, 1899, 1903, 1903, 1892, 1906, 1907, 1908,
+     1908, 1909, 1902, 1907, 1905, 1912, 1910, 1911, 1912, 1906,
+     1909, 1910, 1911, 1913, 1913, 1914, 1915, 1918, 1916, 1917,
+     1920, 1918, 1919, 1921, 1922, 1915, 1920, 1919, 1923, 1924,
+     1926, 1926, 1927, 1922, 1933, 1914, 1916,    0, 1917, 1928,
+     1931, 1921, 1926, 1924, 1929, 1929, 1923, 1932, 1928, 1931,
+     1927, 1930, 1930, 1934, 1935, 1933, 1938, 1938, 1934, 1932,
+     1940, 1941, 1942, 1940, 1944, 1946, 1945, 1935, 1947, 1948,
 
-     1946, 1949, 1950, 1951, 1952, 1953, 1955, 1949, 1950, 1956,
-     1951, 1954, 1954, 1961, 1948, 1955, 1957, 1958, 1959, 1960,
-     1962, 1963, 1965, 1966, 1967, 1953, 1952, 1963, 1957, 1958,
-     1956, 1960, 1969, 1959, 1970, 1962, 1967, 1968, 1968, 1961,
-     1963, 1971, 1965, 1972, 1971, 1973, 1966, 1975, 1972, 1976,
-     1969, 1976, 1975, 1977, 1970, 1978, 1979, 1981, 1983, 1984,
-     1978, 1985, 1986, 1979, 1986, 1973, 1981, 1987, 1984, 1990,
-     1989, 1977, 1989, 1985, 1991, 1991, 1983, 1992, 1994, 1993,
-     1994, 1997, 1995, 1990, 1993, 1996, 1987, 1995, 1998, 1999,
-     1996, 2000, 2001, 2002, 2004, 1999, 2000, 2005, 2009, 1997,
+     1948, 1946, 1949, 1951, 1949, 1950, 1950, 1941, 1942, 1944,
+     1945, 1951, 1953, 1953, 1956, 1947, 1954, 1954, 1957, 1958,
+     1959, 1960, 1961, 1963, 1957, 1958, 1964, 1959, 1962, 1962,
+     1969, 1973, 1963, 1965, 1966, 1967, 1968, 1956, 1970, 1974,
+     1975, 1977, 1961, 1960, 1978, 1965, 1966, 1964, 1968, 1971,
+     1967, 1973, 1975, 1970, 1981, 1971, 1969, 1976, 1976, 1977,
+     1979, 1980, 1974, 1979, 1978, 1983, 1980, 1984, 1971, 1984,
+     1983, 1985, 1986, 1987, 1981, 1989, 1991, 1986, 1992, 1993,
+     1987, 1994, 1995, 1994, 1989, 1998, 1997, 1992, 1997, 1985,
+     2000, 1993, 1999, 1999, 1991, 2001, 2002, 2003, 2002, 1998,
 
-     2008, 2002, 2012, 1992, 2012, 2001, 2006, 2006, 1998, 2007,
-     2007, 2005, 2011, 2004, 2010, 2008, 2013, 2011, 2009, 2014,
-     2010, 2015, 2015, 2019, 2016, 2017, 2017, 2014, 2018, 2018,
-     2021, 2023, 2019, 2020, 2013, 2014, 2016, 2024, 2020, 2024,
-     2023, 2025, 2027, 2023, 2026, 2028, 2030, 2031, 2021, 2026,
-     2026, 2027, 2031, 2034, 2032, 2035, 2036, 2028, 2030, 2032,
-     2037, 2037, 2025, 2038, 2039, 2036, 2034, 2040, 2044, 2046,
-     2041, 2042, 2047, 2045, 2048, 2035, 2055, 2047, 2049, 2048,
-     2044, 2038, 2039, 2040, 2041, 2045, 2042, 2049, 2052, 2046,
-     2054, 2056, 2057, 2058, 2052, 2059, 2054, 2060, 2060, 2055,
+     2001, 1995, 2003, 2004, 2005, 2006, 2007, 2009, 2004, 2008,
+     2010, 2012, 2007, 2013, 2008, 2017, 2000, 2016, 2010,    0,
+     2009, 2019, 2005, 2014, 2014, 2006, 2019, 2013, 2015, 2015,
+     2012, 2018, 2016, 2021, 2020, 2017, 2020, 2018, 2022, 2023,
+     2023, 2024, 2025, 2025, 2026, 2026, 2022, 2027, 2029, 2031,
+     2028, 2021, 2033, 2024, 2022, 2028, 2027, 2032, 2031, 2032,
+     2035, 2031, 2034, 2036, 2038, 2039, 2029, 2034, 2034, 2035,
+     2039, 2042, 2040, 2033, 2043, 2036, 2038, 2040, 2044, 2045,
+     2045, 2046, 2047, 2049, 2042, 2048, 2052, 2044, 2050, 2054,
+     2053, 2055, 2063, 2064, 2043, 2057, 2055, 2049, 2052, 2046,
 
-     2061, 2062, 2062, 2063, 2059, 2067, 2056, 2052, 2064, 2061,
-     2057, 2065, 2064, 2066, 2068, 2069, 2065, 2070, 2058, 2068,
-     2068, 2069, 2063, 2070, 2072, 2071, 2066, 2067, 2071, 2073,
-     2076, 2076, 2072, 2077, 2077, 2078, 2079, 2079, 2080, 2080,
-     2081, 2083, 2082,    0, 2078, 2084, 2087, 2083, 2077, 2073,
-     2084, 2087, 2081, 2085, 2085, 2086, 2086, 2088, 2090, 2077,
-     2082, 2091, 2090, 2088, 2092, 2093, 2095, 2096, 2092, 2097,
-     2099, 2098, 2096, 2101, 2103, 2099, 2100, 2102, 2104, 2103,
-     2106, 2091, 2105, 2105, 2106, 2093, 2098, 2107, 2108, 2101,
-     2109, 2095, 2097, 2108, 2100, 2111, 2110, 2102, 2112, 2113,
+     2047, 2048, 2053, 2050, 2057, 2056, 2060, 2062, 2064, 2054,
+     2056, 2065, 2060, 2062, 2066, 2063, 2071, 2067, 2068, 2068,
+     2072, 2069, 2070, 2070, 2072, 2060, 2067, 2073, 2074, 2065,
+     2069, 2075, 2073, 2079, 2077, 2071, 2079, 2076, 2078, 2066,
+     2077, 2074, 2076, 2076, 2078, 2081, 2080, 2084, 2084, 2085,
+     2085, 2086, 2090, 2075, 2080, 2087, 2087, 2088, 2088, 2089,
+     2086, 2091, 2098, 2092, 2085, 2081, 2098, 2091, 2092, 2095,
+     2090, 2089, 2093, 2093, 2095, 2085, 2094, 2094, 2096, 2099,
+     2101, 2100, 2103, 2104, 2096, 2100, 2105, 2106, 2104, 2107,
+     2108, 2111, 2110, 2112, 2107, 2109, 2111, 2113, 2113, 2099,
 
-     2104, 2114, 2107, 2110, 2113, 2115, 2119, 2111, 2116, 2116,
-     2118, 2120, 2121, 2122, 2114, 2123, 2109, 2112, 2118, 2124,
-     2125, 2126, 2131, 2115, 2128, 2119,    0, 2132, 2130, 2133,
-     2120, 2133, 2125, 2132, 2123, 2121, 2131, 2122, 2137, 2128,
-     2124, 2130, 2126, 2134, 2134, 2135, 2136, 2138, 2153, 2136,
-     2135, 2137, 2139, 2140, 2140, 2141, 2141, 2142, 2144, 2142,
-     2147, 2138, 2143, 2143, 2145, 2139, 2146, 2146, 2153, 2147,
-     2148, 2148, 2147, 2144, 2149, 2149, 2150, 2145, 2152, 2154,
-     2155, 2150, 2158, 2152, 2156, 2156, 2157, 2157, 2159, 2159,
-     2160, 2162, 2155, 2161, 2161, 2163, 2164, 2164, 2166, 2154,
+     2101, 2114, 2106, 2115, 2117, 2114, 2118, 2103, 2108, 2105,
+     2119, 2109, 2110, 2118, 2116, 2112, 2120, 2127, 2115, 2116,
+     2121, 2122, 2119, 2123, 2126, 2121, 2124, 2124, 2128, 2129,
+     2117, 2130, 2126, 2132, 2122, 2120, 2127, 2131, 2133, 2134,
+     2138, 2123, 2136, 2140, 2139, 2184, 2141, 2128, 2141, 2140,
+     2133, 2184, 2129, 2138, 2132, 2130, 2131, 2136, 2139, 2143,
+     2134, 2142, 2142, 2144, 2143, 2145, 2144, 2146, 2152, 2147,
+     2148, 2148, 2149, 2149, 2150, 2153, 2150, 2155, 2145, 2151,
+     2151, 2146, 2147, 2152, 2154, 2154, 2155, 2161, 2153, 2155,
+     2156, 2156, 2157, 2157, 2158, 2160, 2162, 2163, 2166, 2158,
 
-     2163, 2158, 2165, 2165, 2167, 2168, 2162, 2169, 2160, 2171,
-     2172, 2172, 2166, 2167, 2171, 2173, 2174, 2174, 2175, 2168,
-     2177, 2176, 2180, 2177, 2178, 2178, 2169, 2176, 2179, 2179,
-     2181, 2182, 2183, 2183, 2173, 2185, 2175, 2186, 2187, 2188,
-     2178, 2180, 2190, 2188, 2191, 2181, 2189, 2189, 2192, 2191,
-     2182, 2193, 2196, 2187, 2198, 2185, 2195, 2195, 2197, 2199,
-     2186, 2190, 2200, 2192, 2201, 2197, 2193, 2203, 2198, 2202,
-     2202, 2204, 2196, 2204, 2207, 2205, 2203, 2199, 2205, 2208,
-     2200, 2210, 2209, 2211, 2208, 2214, 2207, 2209, 2212, 2213,
-     2201, 2220, 2216, 2205, 2213, 2205, 2211, 2216, 2217, 2218,
+     2160, 2164, 2164, 2165, 2165, 2167, 2167, 2161, 2168, 2163,
+     2169, 2169, 2170, 2171, 2172, 2172, 2162, 2166, 2171, 2173,
+     2173, 2174, 2175, 2176, 2177, 2179, 2168, 2170, 2180, 2180,
+     2179, 2175, 2181, 2182, 2182, 2174, 2183, 2176, 2185, 2186,
+     2186, 2185, 2188, 2177, 2187, 2187, 2190, 2189, 2191, 2191,
+     2193, 2181, 2194, 2195, 2183, 2186, 2196, 2197, 2197, 2198,
+     2196, 2188, 2189, 2204, 2199, 2190, 2200, 2201, 2195, 2199,
+     2193, 2203, 2203, 2205, 2206, 2194, 2207, 2208, 2198, 2209,
+     2205, 2200, 2201, 2204, 2210, 2210, 2215, 2211, 2206, 2212,
+     2213, 2212, 2216, 2213, 2207, 2208, 2211, 2216, 2215, 2217,
 
-     2222, 2219, 2221, 2217, 2224, 2222, 2210, 2219, 2221, 2212,
-     2223, 2214, 2220, 2225, 2218, 2223, 2226, 2236, 2227, 2226,
-     2231, 2228, 2229, 2230, 2234,    0, 2225, 2227, 2234, 2224,
-     2228, 2229, 2230, 2232, 2231, 2233, 2238, 2236, 2240, 2232,
-     2243, 2233, 2239, 2239, 2240, 2238, 2241, 2241, 2242, 2245,
-     2246, 2247, 2247, 2242, 2248, 2241, 2251, 2252, 2249, 2253,
-     2243, 2256, 2243, 2254, 2256, 2245, 2246, 2249, 2251, 2248,
-     2258, 2257, 2259, 2252, 2253, 2254, 2257, 2260, 2260, 2261,
-     2261, 2263, 2263, 2264, 2259, 2266, 2264, 2265, 2267, 2268,
-     2258, 2266, 2265, 2270, 2267, 2269, 2269, 2272, 2268, 2271,
+     2218, 2219, 2220, 2222, 2217, 2209, 2221, 2224, 2213, 2226,
+     2213, 2221, 2224, 2225, 2219, 2227, 2228, 2230, 2225, 2232,
+     2229, 2227, 2230, 2220, 2226, 2218, 2229, 2231, 2233, 2222,
+     2234, 2235, 2231, 2234, 2236, 2239, 2237, 2228, 2238, 2244,
+     2235, 2233, 2240, 2236, 2232, 2237, 2241, 2238, 2240, 2239,
+     2242, 2246, 2241, 2250, 2242, 2247, 2247, 2248, 2250, 2244,
+     2246, 2249, 2249, 2248, 2251, 2253, 2254, 2255, 2255, 2257,
+     2249, 2259, 2256, 2260, 2264, 2261, 2262, 2264, 2257, 2266,
+     2265, 2253, 2254, 2259, 2251, 2265, 2251, 2256, 2262, 2260,
+     2261, 2267, 2268, 2268, 2269, 2269, 2271, 2271, 2272, 2266,
 
-     2271, 2273, 2274, 2275, 2275, 2276, 2277, 2270, 2278, 2272,
-     2280, 2276, 2286, 2278, 2280, 2273, 2281, 2282, 2282, 2281,
-     2277, 2274, 2283, 2284, 2285, 2289, 2287, 2283, 2284, 2284,
-     2287, 2291, 2286, 2285, 2288, 2288, 2291, 2292, 2289, 2293,
-     2294, 2295, 2296, 2297, 2298, 2295, 2299, 2300, 2297, 2301,
-     2298, 2302, 2299, 2303, 2294, 2304,    0, 2292, 2303, 2293,
-     2306, 2307, 2296, 2310, 2308, 2300, 2313, 2309, 2301, 2308,
-     2302, 2310, 2306, 2309, 2315, 2313, 2304, 2307, 2311, 2318,
-     2311, 2316, 2316, 2317, 2319, 2319, 2317, 2322, 2315, 2323,
-     2324, 2322, 2325, 2325, 2326, 2323, 2329, 2329, 2331, 2333,
+     2273, 2272, 2274, 2267, 2275, 2273, 2276, 2278, 2274, 2281,
+     2275, 2277, 2277, 2279, 2279, 2276, 2280, 2282, 2283, 2283,
+     2284, 2278, 2286, 2281, 2285, 2288, 2284, 2286, 2280, 2288,
+     2289, 2290, 2290, 2289, 2291, 2292, 2282, 2293, 2285, 2291,
+     2292, 2292, 2294, 2295, 2296, 2296, 2293, 2295, 2297, 2299,
+     2300, 2301, 2302, 2303, 2299, 2304, 2308, 2303, 2305, 2306,
+     2309, 2297, 2294, 2305, 2310, 2306, 2302, 2307, 2312, 2314,
+     2300, 2301, 2311, 2307, 2308, 2304, 2315, 2311, 2317, 2309,
+     2316, 2314, 2318, 2310, 2317, 2316, 2319, 2321, 2319, 2312,
+     2318, 2323, 2315, 2324, 2324, 2325, 2321, 2326, 2325, 2327,
 
-     2338, 2334, 2324, 2326, 2337, 2318, 2339, 2340, 2347, 2337,
-     2348, 2339, 2340, 2333, 2341, 2341, 2331, 2334, 2343, 2343,
-     2349, 2345, 2346, 2346, 2347, 2349, 2338, 2345, 2351, 2352,
-     2353, 2353, 2348, 2355, 2356, 2357, 2358, 2360, 2360, 2362,
-     2356, 2352, 2355, 2361, 2363, 2367, 2361, 2351, 2365, 2365,
-     2367, 2358, 2368, 2357, 2366, 2366, 2369, 2372, 2362, 2370,
-     2373, 2371, 2363, 2371, 2370, 2369, 2374, 2375, 2376, 2383,
-     2368, 2372, 2375,    0, 2373, 2377, 2378, 2378, 2374, 2382,
-     2377, 2379, 2379, 2380, 2380, 2381, 2381, 2383, 2376, 2384,
-     2387, 2382, 2385, 2385, 2384, 2386, 2386, 2388, 2389, 2390,
+     2327, 2331, 2330, 2332, 2334, 2323, 2330, 2331, 2333, 2333,
+     2337, 2337, 2339, 2334, 2341, 2332, 2342, 2345, 2346, 2347,
+     2348, 2356, 2345, 2326, 2347, 2348, 2349, 2349, 2341, 2353,
+     2339, 2355, 2342, 2351, 2351, 2353, 2354, 2354, 2359, 2360,
+     2357, 2361, 2361, 2356, 2346, 2357, 2363, 2355, 2364, 2365,
+     2366, 2360, 2368, 2368, 2364, 2363, 2369, 2359, 2370, 2369,
+     2371, 2373, 2373, 2374, 2374, 2366, 2375, 2365, 2376, 2378,
+     2377, 2375, 2382, 2379, 2378, 2379, 2380, 2370, 2371, 2377,
+     2381, 2384, 2383, 2385, 2382, 2391, 2376, 2383, 2385,    0,
+     2380, 2386, 2386, 2390, 2381, 2387, 2387, 2388, 2388, 2389,
 
-     2391, 2391, 2387, 2392, 2393, 2393, 2394, 2394, 2395, 2388,
-     2397, 2396, 2398, 2399, 2401, 2390, 2400, 2397, 2389, 2395,
-     2402, 2400, 2392, 2396, 2398, 2403, 2403, 2404, 2405, 2406,
-     2407, 2408, 2409, 2399, 2401, 2410, 2404, 2411, 2411, 2412,
-     2402, 2413, 2414, 2407, 2416, 2417, 2409, 2410, 2412, 2406,
-     2418, 2420, 2423, 2423, 2405, 2408, 2413, 2414, 2419, 2421,
-     2430, 2419, 2416, 2422, 2421, 2420, 2432, 2417, 2422, 2424,
-     2424, 2425, 2425, 2418, 2427, 2427, 2429, 2429, 2430, 2431,
-     2433, 2435, 2436, 2437, 2438, 2432, 2440, 2439, 2442, 2441,
-     2431, 2441, 2443, 2444, 2448, 2433, 2439, 2445, 2445, 2450,
+     2389, 2384, 2392, 2391, 2395, 2390, 2396, 2392, 2393, 2393,
+     2394, 2394, 2397, 2398, 2399, 2399, 2395, 2400, 2396, 2401,
+     2401, 2402, 2402, 2403, 2405, 2404, 2406, 2407, 2408, 2398,
+     2409, 2405, 2397, 2408, 2403, 2410, 2400, 2404, 2406, 2411,
+     2411, 2413, 2412, 2414, 2415, 2416, 2417, 2407, 2424, 2418,
+     2409, 2412, 2419, 2419, 2425, 2410, 2420, 2415, 2421, 2422,
+     2417, 2418, 2426, 2414, 2428, 2420, 2424, 2413, 2427, 2416,
+     2429, 2427, 2430, 2421, 2422, 2429, 2425, 2430, 2428, 2431,
+     2431, 2432, 2432, 2433, 2433, 2426, 2435, 2435, 2437, 2437,
+     2438, 2439, 2440, 2443, 2441, 2445, 2444, 2447, 2446, 2448,
 
-     2436, 2435, 2447, 2447, 2438, 2437, 2440, 2451, 2442, 2448,
-     2443, 2444, 2452, 2452, 2454, 2456, 2451, 2455, 2455, 2457,
-     2458, 2450, 2460, 2454, 2459, 2461, 2462, 2458, 2463, 2464,
-     2464, 2465, 2465, 2456, 2466, 2467, 2473, 2457, 2468, 2459,
-     2460, 2472, 2462, 2461, 2468, 2469, 2469, 2463, 2470, 2470,
-     2471, 2473, 2474, 2467, 2466, 2475, 2471, 2476, 2477, 2472,
-     2478, 2479, 2476, 2480, 2485, 2480, 2479, 2481, 2481, 2475,
-     2482, 2474, 2482, 2483, 2483, 2487, 2488, 2489, 2477, 2490,
-     2478, 2491, 2492, 2485, 2487, 2493, 2491, 2496, 2497, 2489,
-     2499, 2497, 2498, 2498, 2500, 2488, 2501, 2501, 2504, 2490,
+     2450, 2449, 2439, 2449, 2451, 2452, 2447, 2458, 2438, 2441,
+     2464, 2440, 2456, 2443, 2444, 2453, 2453, 2445, 2446, 2448,
+     2450, 2459, 2451, 2452, 2455, 2455, 2462, 2456, 2464, 2458,
+     2459, 2460, 2460, 2463, 2463, 2462, 2465, 2466, 2467, 2468,
+     2469, 2471, 2474, 2470, 2466, 2472, 2472, 2473, 2473, 2475,
+     2476, 2477, 2477, 2467, 2465, 2479, 2476, 2468, 2469, 2470,
+     2471, 2479, 2474, 2478, 2478, 2480, 2481, 2475, 2482, 2484,
+     2483, 2485, 2486, 2487, 2484, 2488, 2493, 2488, 2487, 2489,
+     2489, 2481, 2496, 2480, 2483, 2495, 2490, 2482, 2490, 2491,
+     2491, 2485, 2486, 2497, 2495, 2493, 2498, 2499, 2500, 2507,
 
-     2506, 2506, 2492, 2507, 2493, 2499, 2502, 2496, 2509, 2510,
-     2502, 2505, 2500, 2504, 2511, 2505, 2507, 2512, 2512, 2514,
-     2516, 2515, 2518, 2509, 2516, 2517, 2517, 2519, 2519, 2510,
-     2515, 2514, 2520, 2521, 2511, 2522, 2523, 2520, 2524, 2524,
-     2530, 2518, 2521, 2529, 2529, 2531, 2531, 2532, 2523, 2534,
-     2533, 2522, 2535, 2536, 2536, 2537, 2539, 2539, 2534, 2542,
-     2532, 2535, 2530, 2533, 2542, 2544, 2543, 2545, 2546, 2547,
-     2537, 2543, 2545, 2548, 2551, 2549, 2546, 2554,    0, 2544,
-     2552, 2553, 2548, 2549, 2560, 2552, 2553, 2561, 2547, 2551,
-     2555, 2555, 2554, 2556, 2556, 2557, 2557, 2558, 2559, 2565,
+     2501, 2496, 2499, 2504, 2505, 2497, 2508, 2505, 2506, 2506,
+     2509, 2509, 2512, 2510, 2507, 2517, 2498, 2510, 2500, 2501,
+     2515, 2513, 2518, 2504, 2508, 2513, 2519, 2512, 2514, 2514,
+     2517, 2520, 2520, 2515, 2523, 2522, 2524, 2525, 2525, 2526,
+     2524, 2529, 2518, 2523, 2527, 2527, 2519, 2522, 2528, 2530,
+     2529, 2531, 2538, 2528, 2532, 2532, 2537, 2537, 2526, 2539,
+     2539, 2542, 2540, 2531, 2541, 2530, 2545, 2543, 2544, 2544,
+     2542, 2547, 2547, 2550, 2538, 2540, 2543, 2541, 2550, 2551,
+     2552, 2545, 2553, 2554, 2551, 2555, 2556, 2553, 2557,    0,
+     2559, 2554, 2560, 2561, 2552, 2556, 2557, 2560, 2561, 2562,
 
-     2562, 2588, 2560, 2559, 2558, 2561, 2562, 2563, 2564, 2564,
-     2566, 2571, 2563, 2588, 2565, 2566, 2567, 2567, 2568, 2568,
-     2572, 2572, 2573, 2574, 2571, 2573, 2575, 2576, 2574, 2574,
-     2577, 2575, 2576, 2578, 2579, 2580, 2581, 2582, 2579, 2578,
-     2580, 2583, 2584, 2590, 2577, 2581, 2587, 2585, 2586, 2583,
-     2591, 2587, 2582, 2585, 2586, 2591, 2594, 2592, 2598, 2590,
-     2592, 2596, 2597, 2584, 2599, 2600, 2596, 2597, 2594, 2601,
-     2602, 2602, 2603, 2606, 2600, 2611, 2598, 2599, 2601, 2607,
-     2608, 2603, 2612, 2615, 2613, 2607, 2608, 2614, 2614, 2616,
-     2615, 2606, 2617, 2620, 2611, 2618, 2619, 2619, 2622, 2624,
+     2563, 2563, 2564, 2564, 2555, 2559, 2565, 2565, 2566, 2568,
+     2569, 2567, 2570,    0, 2562, 2566, 2567, 2571, 2570, 2572,
+     2572, 2573, 2571,    0, 2574, 2575, 2575, 2568, 2569, 2574,
+     2576, 2576, 2579, 2580, 2580, 2581, 2573, 2582, 2581, 2583,
+     2585, 2584, 2582, 2582, 2583, 2579, 2584, 2586, 2587, 2589,
+     2588, 2590, 2587, 2586, 2585, 2588, 2591, 2592, 2589, 2593,
+     2596, 2594, 2606, 2595, 2591, 2593, 2590, 2594, 2595, 2598,
+     2599, 2600, 2596, 2607, 2600, 2599, 2602, 2604, 2592, 2605,
+     2606, 2608, 2604, 2609, 2605, 2598, 2607, 2611, 2602, 2614,
+     2608, 2615, 2609, 2610, 2610, 2616, 2611, 2615, 2619, 2620,
 
-     2625, 2617, 2612, 2613, 2625, 2626, 2626, 2627, 2616, 2628,
-     2618, 2629, 2620, 2622, 2630, 2628, 2632, 2629, 2633, 2624,
-     2630, 2631, 2631, 2633, 2632, 2635, 2636, 2638, 2639, 2640,
-     2643, 2638, 2627, 2653, 2635, 2642, 2642, 2644, 2644, 2636,
-     2645, 2645, 2639, 2648, 2640, 2647, 2647, 2648, 2643, 2649,
-     2651, 2651, 2654, 2653, 2649, 2655, 2656, 2654, 2658, 2659,
-     2659, 2656, 2656, 2661, 2661, 2662, 2662, 2655, 2663, 2664,
-     2666, 2663, 2668, 2669, 2669, 2670, 2670, 2674, 2658, 2671,
-     2671, 2672, 2664, 2673, 2673, 2675, 2676, 2677, 2666, 2684,
-     2674, 2685, 2668, 2677, 2678, 2678, 2672, 2679, 2686, 2683,
+     2625, 2616, 2621, 2622, 2622, 2623, 2624, 2614, 2626, 2625,
+     2627, 2627, 2623, 2628, 2630, 2632, 2633, 2619, 2635, 2620,
+     2633, 2621, 2636, 2626, 2637, 2624, 2634, 2634, 2636, 2630,
+     2637, 2638, 2628, 2639, 2639, 2632, 2640, 2638, 2643, 2644,
+     2641, 2647, 2646, 2635, 2640, 2641, 2646, 2643, 2648, 2650,
+     2650, 2651, 2644, 2652, 2652, 2647, 2653, 2653, 2655, 2655,
+     2656, 2657, 2661, 2648, 2656, 2662, 2657, 2659, 2659, 2651,
+     2662, 2663, 2664, 2666, 2667, 2667, 2676, 2664, 2664, 2669,
+     2669, 2672, 2661, 2663, 2670, 2670, 2671, 2674, 2680, 2671,
+     2677, 2677, 2683, 2666, 2672, 2682, 2676, 2678, 2678, 2679,
 
-     2676, 2679, 2687, 2675, 2683, 2683, 2689, 2688, 2687, 2699,
-     2690, 2685, 2684, 2688, 2690, 2691, 2691, 2694, 2686, 2696,
-     2697, 2700, 2694, 2697, 2700, 2701, 2701, 2696, 2702, 2704,
-     2703, 2689, 2705, 2867, 2699, 2703, 2706, 2707, 2707, 2708,
-     2709, 2710, 2711, 2709, 2867, 2702, 2702, 2704, 2712, 2715,
-     2706, 2709, 2705, 2708, 2713, 2710, 2712, 2713, 2714, 2716,
-     2716, 2711, 2721, 2714, 2714, 2717, 2717, 2723, 2715, 2718,
-     2718, 2719, 2719, 2720, 2720, 2722, 2724, 2725, 2721, 2726,
-     2722, 2727, 2725, 2728, 2729, 2730, 2727, 2723, 2732, 2732,
-     2733, 2733, 2728, 2734, 2735, 3114, 2734, 3114, 2726, 2737,
+     2679, 2681, 2681, 2680, 2684, 2674, 2685, 2687, 2682, 2692,
+     2683, 2687, 2685, 2686, 2686, 2691, 2693, 2694, 2684, 2695,
+     2691, 2691, 2696, 2697, 2702, 2695, 2698, 2704, 2696, 2702,
+     2698, 2707, 2692, 2699, 2699, 2704, 2693, 2694, 2705, 2708,
+     2710, 2705, 2708, 2709, 2709, 2711, 2712, 2713, 2697, 2714,
+     2711, 2715, 2715, 2719, 2716, 2718, 2707, 2710, 2710, 2717,
+     2723, 2730, 2717, 2714, 2712, 2720, 2730, 2713, 2716, 2718,
+     2717, 2721, 2719, 2720, 2721, 2722, 2724, 2724, 2729, 2723,
+     2722, 2722, 2725, 2725, 2726, 2726, 2727, 2727, 2728, 2728,
+     2731, 2732, 2733, 2734, 2729, 2735, 2736, 2733, 2737, 2738,
 
-     2737, 2738, 2724, 2747, 2729, 2730, 2739, 2739, 2738, 2740,
-     2742, 2742, 2735, 2743, 2740, 2744, 2745, 2748, 2748, 2749,
-     2750, 2747, 2743, 2749, 2744, 2745, 2751, 2752, 2754, 2750,
-     2753, 2755, 2752, 2752, 2759, 2755, 2763, 2754, 2764, 2759,
-     2765, 2751, 2767, 2753, 2760, 2760, 2762, 2762, 2768, 2771,
-     2763, 2767, 2772, 2773, 2776, 2778, 2774,    0, 2765, 2780,
-     2768, 2772, 2774, 2764, 2780, 2781, 2776, 2782, 2782, 2783,
-     2781, 2792, 2785, 2773, 2771, 2793, 2778, 2785, 2783, 2786,
-     2786, 2788, 2788, 2786, 2789, 2789, 2790, 2790, 2791, 2800,
-     2794, 2792, 2796, 2801, 2793, 2794, 2797, 2791, 2796, 2798,
+     2735, 2740, 2740, 2741, 2741, 2736, 2742, 2743, 2746, 2742,
+     2731, 2748, 2734, 2745, 2745, 2746, 2748, 2732, 2737, 2738,
+     2747, 2747, 2750, 2750, 2751, 2743, 2752, 2753, 2755, 2756,
+     2756, 2758, 2759, 2751, 2757, 2752, 2753, 2760, 2757, 2761,
+     2758, 2762, 2760, 2760, 2763, 2771, 2755, 2759, 2763, 2767,
+     2762, 2772, 2761, 2773, 2767, 2768, 2768, 2770, 2770, 2771,
+     2775, 2776, 2779, 2780, 2781, 2784, 2801, 2786, 2782, 2775,
+     2788, 2773, 2780, 2776, 2782, 2788, 2772, 2784, 2789, 2790,
+     2790, 2791, 2800, 2789, 2781, 2801, 2793, 2779, 2786,    0,
+     2791, 2793, 2794, 2794, 2796, 2796, 2794, 2797, 2797, 2798,
 
-     2802, 2797, 2799, 2799, 2798, 2801, 2803, 2800, 2804, 2805,
-     2806, 2803, 2807, 2807, 2809, 2805, 2814, 2810, 2809, 2811,
-     2813, 2802, 2810, 2815, 2811, 2816, 2804, 2812, 2812, 2818,
-     2818, 2814, 2822, 2820, 2821, 2806, 2822, 2824, 2815, 2813,
-     2823, 2825, 2826, 2827, 2830, 2816, 2820, 2821, 2827, 2823,
-     2826, 2828, 2828, 2824, 2829, 2831, 2832, 2832, 2833, 2839,
-     2825, 2850, 2830, 2829, 2836, 2836, 2837, 2837, 2841, 2841,
-     2843, 2844, 2845, 2846, 2848, 2848, 2849, 2833, 2846, 2851,
-     2839, 2831, 2853, 2853, 2850, 2854, 2843, 2844, 2845, 2855,
-     2856, 2856, 2859, 2862, 2860, 2871, 2849, 2861, 2851, 2854,
+     2798, 2799, 2800, 2802, 2805, 2804, 2808, 2806, 2802, 2805,
+     2799, 2804, 2806, 2807, 2807, 2809, 2810, 2811, 2812, 2813,
+     2814, 2821, 2811, 2824, 2808, 2813, 2817, 2809, 2815, 2815,
+     2817, 2820, 2820, 2818, 2819, 2822, 2812, 2810, 2818, 2819,
+     2821, 2823, 2828, 2824, 2829, 2814, 2826, 2826, 2830, 2831,
+     2822, 2832, 2830, 2833, 2834, 2828, 2823, 2829, 2831, 2835,
+     2836, 2836, 2834, 2838, 2835, 2837, 2839, 2832, 2840, 2840,
+     2841, 2851, 2833, 2847, 2837, 2844, 2844, 2845, 2845, 2849,
+     2849, 2838, 2852, 2853, 2857, 2854, 2858, 2851, 2859, 2841,
+     2854, 2862, 2839, 2863, 2847, 2856, 2856, 2867, 2852, 2853,
 
-     2860, 2865, 2861, 2863, 2863, 2864, 2864, 2868, 2855, 2866,
-     2866, 2869, 2859, 2870, 2871, 2862, 2868, 2873, 2872, 2870,
-     2880, 2865, 2874, 2874, 2875, 2876, 2876, 2875, 2881, 2866,
-     2872, 2869, 2880, 2882, 2883, 2883, 2885, 2873, 2884, 2882,
-     2886, 2884, 2885, 2891, 2888, 2889, 2889, 2890, 2881, 2888,
-     2892, 2893, 2890, 2894, 2894, 2896, 2892, 2897, 2886, 2898,
-     2899, 2901, 2891, 2900, 2900, 2903, 2902, 2896, 2893, 2893,
-     2902, 2905, 2905, 2899, 2903, 2897, 2906, 2906, 2907, 2908,
-     2901, 2909, 2913, 2907, 2898, 2914, 2909, 2910, 2910, 2911,
-     2911, 2912, 2912, 2908, 2915, 2913, 2916, 2918, 2918, 2921,
+     2861, 2861, 2864, 2864, 2857, 2862, 2869, 2859, 2868, 2858,
+     2870, 2869, 2863, 2873, 2868, 2871, 2871, 2867, 2872, 2872,
+     2874, 2874, 2876, 2875, 2877, 2880, 2879, 2881,    0, 2878,
+     2889, 2876, 2870, 2873, 2875, 2878, 2888, 2880, 2882, 2882,
+     2874, 2884, 2884, 2883, 2877, 2879, 2883, 2881, 2888, 2890,
+     2889, 2891, 2891, 2892, 2893, 2890, 2892, 2894, 2896, 2898,
+     2893, 2897, 2897, 2896, 2898, 2899, 2900, 2904, 2901, 2902,
+     2902, 2905, 2900, 2906, 2907, 2894, 2908, 2908, 2909, 2904,
+        0, 2911, 2913, 2913, 2899, 2901, 2901, 2907, 2910, 2905,
+     2911, 2915, 2910, 2914, 2914, 2916, 2915, 2909, 2906, 2917,
 
-     2915, 2916, 2923, 2924, 2925, 2926, 2926, 2928, 2928, 2929,
-     2930, 2914, 2931, 2932, 2932, 2933, 2933, 2936, 2921, 2937,
-        0, 2931, 2935, 2929, 2923, 2924, 2925, 2938, 2935, 2945,
-     2930, 2952, 2938, 2941, 2941, 2943, 2943, 2936, 2937, 2944,
-     2946, 2947, 2948, 2945, 2944, 2953, 2946, 2949, 2949, 2950,
-     2948, 2952, 2954, 2947, 2950, 2955, 2956, 2954, 2958, 2959,
-     2960, 2961, 2956, 2964, 2963, 2953, 2958, 2955, 2965, 2966,
-     2967, 2969, 2970, 2974, 2976, 2967, 2969, 2971, 2959, 2964,
-     2960, 2961, 2963, 2971, 2972, 2965, 2965, 2976,    0, 2972,
-     2966, 2975, 2970, 2974, 2979, 2979, 2975, 2980, 2980, 2981,
+     2918, 2918, 2919, 2919, 2917, 2920, 2920, 2921, 2922, 2916,
+     2923, 2929, 2924, 2926, 2926, 2931, 2923, 2924, 2932, 2933,
+     2921, 2934, 2934, 2936, 2936, 2937, 2938, 2939, 2940, 2940,
+     2929, 2941, 2941, 2944, 2922, 2945, 2939, 2931, 2943, 2937,
+     2932, 2933, 2946,    0, 2943, 2953, 2938, 2946, 2949, 2949,
+     2951, 2951, 2952, 2944, 2945, 2954, 2955, 2952, 2956, 2953,
+     2958, 2954, 2957, 2957, 2960, 2958, 2956, 2961, 2955, 2962,
+     2963, 2964, 2966, 2967, 2962, 2968, 2969, 2964, 2972, 2971,
+     2966, 2973, 2963, 2974, 2960, 2975, 2977, 2961, 2978, 2982,
+     2975, 2977, 2967,    0, 2972, 2968, 2969, 2971, 2973, 2973,
 
-     2985, 2985, 2986, 2981, 2987, 2988, 2988, 2986, 2990, 2990,
-     2991, 2991, 2994, 2991, 2992, 2992, 2994, 2992, 2993, 2993,
-     2997, 2993, 2998, 2987, 2996, 2996, 3001, 3002, 3003, 3004,
-     3004, 3007, 3008, 3003, 3010, 3011, 2998, 3009, 2997, 3008,
-     3013, 3009, 3014, 3010, 3015, 3015, 3001, 3002, 3016, 3016,
-     3011, 3014, 3017, 3017, 3018, 3019, 3007, 3021, 3013, 3020,
-     3019, 3022, 3021, 3021, 3023, 3024, 3025, 3022, 3020, 3018,
-     3026, 3020, 3027, 3028, 3213, 3026, 3030, 3027, 3029, 3029,
-     3024, 3213, 3030, 3035, 3031, 3032, 3032, 3025, 3035, 3023,
-     3031,    0, 3028, 3033, 3033, 3034, 3034, 3038, 3038, 3040,
+     2979, 2984, 2980, 2995, 2974, 2983, 2979, 2980, 2978, 2982,
+     2983, 2987, 2987, 2989, 2984, 2988, 2988, 2989, 2993, 2993,
+     2994,    0, 2995, 2996, 2996, 2994, 2998, 2998, 2999, 2999,
+     3002, 2999, 3000, 3000, 3002, 3000, 3001, 3001, 3005, 3001,
+     3004, 3004, 3009, 3006, 3010, 3011, 3012, 3012, 3015, 3017,
+     3011, 3016, 3018, 3017, 3019,    0, 3005, 3006, 3016, 3021,
+     3026, 3018, 3009, 3022, 3010, 3023, 3023, 3024, 3024, 3019,
+     3025, 3025, 3022, 3015, 3027, 3026, 3028, 3021, 3029, 3027,
+     3030, 3031, 3032, 3029, 3029, 3028, 3030, 3033, 3028, 3034,
+     3035, 3036, 3037, 3037, 3034, 3035, 3038, 3032, 3039, 3040,
 
-     3040, 3041, 3044, 3044, 3045, 3045, 3046, 3046, 3047, 3047,
-     3041, 3048, 3048, 3049, 3049, 3050, 3050, 3052, 3053, 3053,
-     3054, 3055, 3056, 3060, 3058, 3062, 3052, 3059, 3059, 3054,
-     3064, 3061, 3068, 3055, 3063, 3063, 3070, 3062, 3060, 3065,
-     3065, 3072, 3056, 3058, 3061, 3064, 3069, 3071, 3071, 3069,
-     3068, 3074, 3075, 3076, 3074, 3077, 3078, 3080, 3075, 3072,
-     3077, 3079, 3070, 3082, 3090, 3083, 3087, 3076, 3098, 3082,
-     3100, 3098, 3105, 3080, 3083, 3078, 3101, 3101, 3107, 3079,
-     3106, 3087, 3107, 3100, 3102, 3102, 3103, 3103, 3108, 3106,
-     3090, 3109, 3111, 3112, 3113, 3105, 3115, 3116, 3116, 3113,
+     3040, 3083, 3038, 3090, 3039,    0, 3031, 3083, 3033, 3090,
+     3036, 3041, 3041, 3042, 3042, 3043, 3046, 3046, 3048, 3048,
+     3043, 3049, 3052, 3052, 3053, 3053, 3054, 3054, 3055, 3055,
+     3049, 3056, 3056, 3057, 3057, 3058, 3058, 3060, 3061, 3061,
+     3062, 3063, 3064, 3068, 3066, 3070, 3060, 3067, 3067, 3062,
+     3072, 3069, 3076, 3063, 3071, 3071, 3078, 3070, 3068, 3073,
+     3073, 3080, 3064, 3066, 3069, 3072, 3077, 3079, 3079, 3077,
+     3076, 3082, 3084, 3085, 3082, 3086, 3088, 3087, 3085, 3080,
+     3091, 3095, 3078, 3098, 3106, 3108, 3084, 3106, 3113, 3091,
+     3109, 3109, 3088, 3116, 3086, 3087, 3095, 3114, 3108, 3110,
 
-     3117, 3118, 3120, 3119, 3112, 3109, 3121, 3122, 3108, 3125,
-     3123, 3115, 3124, 3117, 3127, 3111, 3133, 3135, 3120, 3123,
-     3118, 3119, 3122, 3126, 3124, 3132, 3135, 3128, 3126, 3140,
-     3125, 3121, 3128, 3141, 3127, 3145, 3133, 3134, 3134, 3132,
-     3136, 3136, 3137, 3137, 3138, 3138, 3139, 3139, 3140, 3142,
-     3143, 3144, 3142, 3141, 3146, 3143, 3144, 3147, 3148, 3149,
-     3145, 3150, 3151, 3147, 3152, 3152, 3150, 3153, 3153, 3146,
-     3154, 3149, 3148, 3155, 3156, 3156, 3158, 3160, 3163, 3163,
-     3164, 3164, 3151, 3166, 3167, 3154, 3165, 3168, 3170, 3169,
-     3167, 3158, 3155, 3168, 3165, 3160, 3171, 3173, 3173, 3172,
+     3110, 3111, 3111, 3115, 3117, 3119, 3114, 3115, 3120, 3098,
+     3121, 3113, 3122, 3116, 3122, 3121, 3123, 3125, 3117, 3120,
+     3124, 3124, 3126, 3128, 3127, 3129, 3131, 3133, 3119, 3130,
+     3125, 3123, 3134, 3132, 3135, 3131, 3141, 3134, 3136, 3128,
+     3143, 3126, 3127, 3136, 3130, 3132, 3140, 3149, 3133, 3143,
+     3129, 3142, 3142, 3148, 3135, 3153, 3141, 3144, 3144,    0,
+     3140, 3145, 3145, 3146, 3146, 3147, 3147, 3149, 3150, 3151,
+     3152, 3150, 3148, 3154, 3151, 3152, 3155, 3156, 3157, 3158,
+     3153, 3159, 3155, 3162, 3158, 3160, 3160, 3163, 3154, 3166,
+     3157, 3156, 3161, 3161, 3164, 3164, 3168, 3173, 3162, 3171,
 
-     3177, 3170, 3166, 3169, 3172, 3174, 3174, 3178, 3180, 3181,
-     3183, 3184, 3185, 3181, 3194, 3171, 3184, 3188, 3189, 3186,
-     3187, 3177, 3180, 3189, 3190, 3191, 3191, 3178, 3195, 3190,
-     3183, 3185, 3186, 3187, 3194, 3196, 3188, 3197, 3197, 3198,
-     3201, 3199, 3200, 3200, 3198, 3201, 3195, 3199, 3202, 3204,
-     3203, 3205, 3212, 3202, 3196, 3203, 3208, 3205, 3207, 3207,
-     3211, 3208, 3209, 3209, 3211, 3214, 3215, 3216, 3204, 3217,
-     3218, 3212, 3225, 3216, 3220, 3220, 3222, 3222, 3223, 3226,
-     3227, 3224, 3232, 3218, 3214, 3215, 3224, 3223, 3217, 3230,
-     3223, 3225, 3229, 3227, 3228, 3228, 3234, 3229, 3226, 3233,
+     3171, 3159, 3172, 3172, 3166, 3173, 3163, 3174, 3177, 3175,
+     3176, 3178, 3179, 3180, 3168, 3175, 3176, 3185, 3180, 3181,
+     3181, 3186, 3177, 3188, 3178, 3189, 3174, 3182, 3182, 3189,
+     3191, 3179, 3193, 3194, 3192, 3195, 3196, 3188, 3185, 3192,
+     3197, 3186, 3198, 3199, 3199, 3197, 3194, 3198, 3195, 3202,
+     3191, 3193, 3203, 3204, 3206, 3196, 3205, 3205, 3207, 3206,
+     3208, 3208, 3209, 3210, 3207, 3212, 3211, 3209, 3210, 3202,
+     3203, 3211, 3204, 3213, 3215, 3215, 3216, 3217, 3217, 3213,
+     3220, 3216, 3219, 3221, 3212, 3222, 3219, 3223, 3224, 3225,
+     3221, 3231, 3226, 3233, 3224, 3228, 3228, 3230, 3230, 3220,
 
-     3233, 3239, 3230, 3235, 3235, 3236, 3236, 3237, 3232, 3238,
-     3240, 3240, 3237, 3241, 3246, 3234, 3238, 3242, 3241, 3242,
-     3239, 3243, 3243, 3244, 3245, 3248, 3251, 3247, 3250, 3250,
-     3244, 3245, 3247, 3246, 3253, 3254, 3255, 3256, 3260, 3253,
-     3254, 3257, 3257, 3261, 3248, 3251, 3259, 3259, 3262, 3262,
-     3263, 3263, 3264, 3266, 3266, 3255, 3256, 3260, 3268, 3264,
-     3267, 3267, 3261, 3270, 3273, 3268, 3274, 3275, 3270, 3273,
-     3276, 3276, 3277, 3277,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0, 3274, 3275, 3281, 3281, 3281,
-     3281, 3281, 3281, 3281, 3282, 3282, 3282, 3282, 3282, 3282,
+     3231, 3234, 3232, 3231, 3222, 3226, 3223, 3232, 3225, 3235,
+     3236, 3236, 3233, 3237, 3238, 3240, 3241, 3241, 3237, 3242,
+     3234, 3247, 3235, 3243, 3243, 3244, 3244, 3238, 3245, 3246,
+     3248, 3248, 3249, 3245, 3251, 3251, 3246, 3249, 3242, 3252,
+     3247, 3240, 3250, 3253, 3250, 3254, 3252, 3255, 3256, 3259,
+     3253, 3261, 3255, 3258, 3258, 3262, 3261, 3263, 3264, 3268,
+     3262, 3265, 3265, 3269, 3254, 3267, 3267, 3256, 3259, 3270,
+     3270, 3271, 3271, 3272, 3274, 3274, 3263, 3264, 3268, 3276,
+     3272, 3282, 3269, 3275, 3275, 3278, 3276, 3281, 3283,    0,
+     3278,    0, 3281, 3284, 3284, 3285, 3285,    0,    0,    0,
 
-     3282, 3283, 3283, 3283, 3283, 3283, 3283, 3283, 3284, 3284,
-     3284, 3284, 3284, 3284, 3284, 3285, 3285, 3285, 3285, 3285,
-     3285, 3285, 3286, 3286, 3286, 3286, 3286, 3286, 3286, 3287,
-     3287, 3287, 3287, 3287, 3287, 3287, 3289, 3289,    0, 3289,
-     3289, 3289, 3289, 3290, 3290,    0,    0,    0, 3290, 3290,
-     3291, 3291,    0,    0, 3291,    0, 3291, 3292,    0,    0,
-        0,    0,    0, 3292, 3293, 3293,    0,    0,    0, 3293,
-     3293, 3294,    0,    0,    0,    0,    0, 3294, 3295, 3295,
-        0, 3295, 3295, 3295, 3295, 3296,    0,    0,    0,    0,
-        0, 3296, 3297, 3297,    0,    0,    0, 3297, 3297, 3298,
+     3282,    0,    0,    0,    0,    0,    0, 3283, 3289, 3289,
+     3289, 3289, 3289, 3289, 3289, 3290, 3290, 3290, 3290, 3290,
+     3290, 3290, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3292,
+     3292, 3292, 3292, 3292, 3292, 3292, 3293, 3293, 3293, 3293,
+     3293, 3293, 3293, 3294, 3294, 3294, 3294, 3294, 3294, 3294,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3297, 3297,    0,
+     3297, 3297, 3297, 3297, 3298, 3298,    0,    0,    0, 3298,
+     3298, 3299, 3299,    0,    0, 3299,    0, 3299, 3300,    0,
+        0,    0,    0,    0, 3300, 3301, 3301,    0,    0,    0,
+     3301, 3301, 3302,    0,    0,    0,    0,    0, 3302, 3303,
 
-     3298,    0, 3298, 3298, 3298, 3298, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280, 3280,
-     3280, 3280, 3280, 3280, 3280, 3280, 3280
+     3303,    0, 3303, 3303, 3303, 3303, 3304,    0,    0,    0,
+        0,    0, 3304, 3305, 3305,    0,    0,    0, 3305, 3305,
+     3306, 3306,    0, 3306, 3306, 3306, 3306, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288,
+     3288, 3288, 3288, 3288, 3288, 3288, 3288, 3288
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3130,7 +3137,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3131 "<stdout>"
+#line 3138 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3139,9 +3146,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3140 "<stdout>"
+#line 3147 "<stdout>"
 
-#line 3142 "<stdout>"
+#line 3149 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3365,7 +3372,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3366 "<stdout>"
+#line 3373 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3398,13 +3405,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 >= 3281 )
+				if ( yy_current_state >= 3289 )
 					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] != 6407 );
+		while ( yy_base[yy_current_state] != 6428 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3879,52 +3886,52 @@ YY_RULE_SETUP
 case 90:
 YY_RULE_SETUP
 #line 304 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
+{ YDVAR(1, VAR_UDP_CONNECT) }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 305 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
+{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 306 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
+{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 307 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_GLUE) }
+{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 308 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
+{ YDVAR(1, VAR_HARDEN_GLUE) }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 309 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
+{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 310 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
+{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 311 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
+{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 312 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
+{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 313 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CAPS_WHITELIST) }
+{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
@@ -3934,72 +3941,72 @@ YY_RULE_SETUP
 case 101:
 YY_RULE_SETUP
 #line 315 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
+{ YDVAR(1, VAR_CAPS_WHITELIST) }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 316 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
+{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 317 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
+{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 318 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH_KEY) }
+{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 319 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PREFETCH) }
+{ YDVAR(1, VAR_PREFETCH_KEY) }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 320 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DENY_ANY) }
+{ YDVAR(1, VAR_PREFETCH) }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 321 "./util/configlexer.lex"
-{ YDVAR(0, VAR_STUB_ZONE) }
+{ YDVAR(1, VAR_DENY_ANY) }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 322 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NAME) }
+{ YDVAR(0, VAR_STUB_ZONE) }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_ADDR) }
+{ YDVAR(1, VAR_NAME) }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_HOST) }
+{ YDVAR(1, VAR_STUB_ADDR) }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_PRIME) }
+{ YDVAR(1, VAR_STUB_HOST) }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 326 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_FIRST) }
+{ YDVAR(1, VAR_STUB_PRIME) }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 327 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_NO_CACHE) }
+{ YDVAR(1, VAR_STUB_FIRST) }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 328 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_STUB_NO_CACHE) }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
@@ -4009,32 +4016,32 @@ YY_RULE_SETUP
 case 116:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 333 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_FIRST) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 334 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+{ YDVAR(1, VAR_FORWARD_NO_CACHE) }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
@@ -4044,47 +4051,47 @@ YY_RULE_SETUP
 case 123:
 YY_RULE_SETUP
 #line 337 "./util/configlexer.lex"
-{ YDVAR(0, VAR_AUTH_ZONE) }
+{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 338 "./util/configlexer.lex"
-{ YDVAR(0, VAR_RPZ) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TAGS) }
+{ YDVAR(0, VAR_RPZ) }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 340 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
+{ YDVAR(1, VAR_TAGS) }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
+{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG) }
+{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RPZ_LOG_NAME) }
+{ YDVAR(1, VAR_RPZ_LOG) }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 344 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ZONEFILE) }
+{ YDVAR(1, VAR_RPZ_LOG_NAME) }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MASTER) }
+{ YDVAR(1, VAR_ZONEFILE) }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
@@ -4094,701 +4101,701 @@ YY_RULE_SETUP
 case 133:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(1, VAR_URL) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ALLOW_NOTIFY) }
+{ YDVAR(1, VAR_URL) }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+{ YDVAR(1, VAR_ALLOW_NOTIFY) }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FOR_UPSTREAM) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FALLBACK_ENABLED) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(1, VAR_FALLBACK_ENABLED) }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(0, VAR_VIEW) }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
+{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_IDENTITY) }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_VERSION) }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_MODULE_CONF) }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 382 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 383 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 384 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 385 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 388 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_AGGRESSIVE_NSEC) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 389 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 390 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 397 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 398 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 399 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 400 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 401 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
+{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_SERVFAIL) }
+{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_SERVFAIL) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
 #line 422 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
 #line 423 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
 #line 424 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
 #line 425 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
 #line 426 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 427 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 428 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 429 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 430 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 219:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 220:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DYNLIB_FILE) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DYNLIB) }
+{ YDVAR(1, VAR_DYNLIB_FILE) }
 	YY_BREAK
 case 222:
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_DYNLIB) }
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
 #line 438 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 224:
 YY_RULE_SETUP
 #line 439 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 225:
 YY_RULE_SETUP
 #line 440 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 226:
 YY_RULE_SETUP
 #line 441 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) }
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
 #line 442 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
 #line 443 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
 #line 444 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
 #line 445 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) }
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
 #line 446 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
 #line 447 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 233:
 YY_RULE_SETUP
 #line 448 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
 #line 449 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 235:
 YY_RULE_SETUP
 #line 450 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
 #line 451 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 237:
 YY_RULE_SETUP
 #line 452 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
 #line 453 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 239:
 YY_RULE_SETUP
 #line 454 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 240:
 YY_RULE_SETUP
 #line 455 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) }
 	YY_BREAK
 case 241:
 YY_RULE_SETUP
 #line 456 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IP) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
 #line 457 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS) }
+{ YDVAR(1, VAR_DNSTAP_IP) }
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
 #line 458 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
+{ YDVAR(1, VAR_DNSTAP_TLS) }
 	YY_BREAK
 case 244:
 YY_RULE_SETUP
 #line 459 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) }
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
 #line 460 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
+{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) }
 	YY_BREAK
 case 246:
 YY_RULE_SETUP
-#line 462 "./util/configlexer.lex"
+#line 461 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) }
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
-#line 464 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+#line 463 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) }
 	YY_BREAK
 case 248:
 YY_RULE_SETUP
 #line 465 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
 #line 466 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 250:
 YY_RULE_SETUP
 #line 467 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
 #line 468 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 252:
 YY_RULE_SETUP
-#line 470 "./util/configlexer.lex"
+#line 469 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
-#line 472 "./util/configlexer.lex"
+#line 471 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 254:
 YY_RULE_SETUP
-#line 474 "./util/configlexer.lex"
+#line 473 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 255:
 YY_RULE_SETUP
-#line 476 "./util/configlexer.lex"
+#line 475 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 256:
 YY_RULE_SETUP
-#line 478 "./util/configlexer.lex"
+#line 477 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 257:
 YY_RULE_SETUP
-#line 480 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 479 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 258:
 YY_RULE_SETUP
 #line 481 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 259:
 YY_RULE_SETUP
 #line 482 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 260:
 YY_RULE_SETUP
 #line 483 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 261:
 YY_RULE_SETUP
 #line 484 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 262:
 YY_RULE_SETUP
 #line 485 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 263:
 YY_RULE_SETUP
 #line 486 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 264:
 YY_RULE_SETUP
 #line 487 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 265:
 YY_RULE_SETUP
 #line 488 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 266:
 YY_RULE_SETUP
 #line 489 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 267:
 YY_RULE_SETUP
 #line 490 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 268:
 YY_RULE_SETUP
 #line 491 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOW_RTT) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 269:
 YY_RULE_SETUP
 #line 492 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_NUM) }
+{ YDVAR(1, VAR_LOW_RTT) }
 	YY_BREAK
 case 270:
 YY_RULE_SETUP
 #line 493 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
+{ YDVAR(1, VAR_FAST_SERVER_NUM) }
 	YY_BREAK
 case 271:
 YY_RULE_SETUP
@@ -4803,99 +4810,99 @@ YY_RULE_SETUP
 case 273:
 YY_RULE_SETUP
 #line 496 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_FAST_SERVER_PERMIL) }
 	YY_BREAK
 case 274:
 YY_RULE_SETUP
 #line 497 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 275:
 YY_RULE_SETUP
 #line 498 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 276:
 YY_RULE_SETUP
 #line 499 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 277:
 YY_RULE_SETUP
 #line 500 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 278:
 YY_RULE_SETUP
 #line 501 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 279:
 YY_RULE_SETUP
 #line 502 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 280:
 YY_RULE_SETUP
 #line 503 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 281:
 YY_RULE_SETUP
 #line 504 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 282:
 YY_RULE_SETUP
 #line 505 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 283:
 YY_RULE_SETUP
 #line 506 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 284:
 YY_RULE_SETUP
-#line 508 "./util/configlexer.lex"
+#line 507 "./util/configlexer.lex"
 {
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 285:
 YY_RULE_SETUP
-#line 510 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 509 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 286:
 YY_RULE_SETUP
 #line 511 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 287:
 YY_RULE_SETUP
 #line 512 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 288:
 YY_RULE_SETUP
 #line 513 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 289:
 YY_RULE_SETUP
 #line 514 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 290:
 YY_RULE_SETUP
 #line 515 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 291:
 YY_RULE_SETUP
 #line 516 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 292:
 YY_RULE_SETUP
@@ -4905,113 +4912,118 @@ YY_RULE_SETUP
 case 293:
 YY_RULE_SETUP
 #line 518 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
 	YY_BREAK
 case 294:
 YY_RULE_SETUP
 #line 519 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
 	YY_BREAK
 case 295:
 YY_RULE_SETUP
 #line 520 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(0, VAR_CACHEDB) }
 	YY_BREAK
 case 296:
 YY_RULE_SETUP
 #line 521 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
 	YY_BREAK
 case 297:
 YY_RULE_SETUP
 #line 522 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
 	YY_BREAK
 case 298:
 YY_RULE_SETUP
 #line 523 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
+{ YDVAR(1, VAR_CACHEDB_REDISHOST) }
 	YY_BREAK
 case 299:
 YY_RULE_SETUP
 #line 524 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
+{ YDVAR(1, VAR_CACHEDB_REDISPORT) }
 	YY_BREAK
 case 300:
 YY_RULE_SETUP
 #line 525 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
+{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) }
 	YY_BREAK
 case 301:
 YY_RULE_SETUP
 #line 526 "./util/configlexer.lex"
-{ YDVAR(0, VAR_IPSET) }
+{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) }
 	YY_BREAK
 case 302:
 YY_RULE_SETUP
 #line 527 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V4) }
+{ YDVAR(0, VAR_IPSET) }
 	YY_BREAK
 case 303:
 YY_RULE_SETUP
 #line 528 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSET_NAME_V6) }
+{ YDVAR(1, VAR_IPSET_NAME_V4) }
 	YY_BREAK
 case 304:
 YY_RULE_SETUP
 #line 529 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_IPSET_NAME_V6) }
 	YY_BREAK
 case 305:
 YY_RULE_SETUP
 #line 530 "./util/configlexer.lex"
-{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
 	YY_BREAK
 case 306:
 YY_RULE_SETUP
 #line 531 "./util/configlexer.lex"
-{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
+{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
 	YY_BREAK
 case 307:
 YY_RULE_SETUP
 #line 532 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+{ YDVAR(2, VAR_EDNS_CLIENT_TAG) }
 	YY_BREAK
 case 308:
-/* rule 308 can match eol */
 YY_RULE_SETUP
 #line 533 "./util/configlexer.lex"
+{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) }
+	YY_BREAK
+case 309:
+/* rule 309 can match eol */
+YY_RULE_SETUP
+#line 534 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 309:
+case 310:
 YY_RULE_SETUP
-#line 536 "./util/configlexer.lex"
+#line 537 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 537 "./util/configlexer.lex"
+#line 538 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 310:
-YY_RULE_SETUP
-#line 542 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 311:
-/* rule 311 can match eol */
 YY_RULE_SETUP
 #line 543 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 312:
+/* rule 312 can match eol */
+YY_RULE_SETUP
+#line 544 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 312:
+case 313:
 YY_RULE_SETUP
-#line 545 "./util/configlexer.lex"
+#line 546 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5024,34 +5036,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 313:
+case 314:
 YY_RULE_SETUP
-#line 557 "./util/configlexer.lex"
+#line 558 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 558 "./util/configlexer.lex"
+#line 559 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 314:
-YY_RULE_SETUP
-#line 563 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 315:
-/* rule 315 can match eol */
 YY_RULE_SETUP
 #line 564 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 316:
+/* rule 316 can match eol */
+YY_RULE_SETUP
+#line 565 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 316:
+case 317:
 YY_RULE_SETUP
-#line 566 "./util/configlexer.lex"
+#line 567 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5064,38 +5076,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 317:
+case 318:
 YY_RULE_SETUP
-#line 578 "./util/configlexer.lex"
+#line 579 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 580 "./util/configlexer.lex"
+#line 581 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 318:
-YY_RULE_SETUP
-#line 584 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 319:
-/* rule 319 can match eol */
 YY_RULE_SETUP
 #line 585 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 320:
+/* rule 320 can match eol */
 YY_RULE_SETUP
 #line 586 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 321:
 YY_RULE_SETUP
 #line 587 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 322:
+YY_RULE_SETUP
+#line 588 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -5103,27 +5115,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 592 "./util/configlexer.lex"
+#line 593 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 322:
-YY_RULE_SETUP
-#line 596 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 323:
-/* rule 323 can match eol */
 YY_RULE_SETUP
 #line 597 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 324:
+/* rule 324 can match eol */
+YY_RULE_SETUP
+#line 598 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 324:
+case 325:
 YY_RULE_SETUP
-#line 599 "./util/configlexer.lex"
+#line 600 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5133,7 +5145,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 605 "./util/configlexer.lex"
+#line 606 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5148,39 +5160,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 325:
+case 326:
 YY_RULE_SETUP
-#line 619 "./util/configlexer.lex"
+#line 620 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 622 "./util/configlexer.lex"
+#line 623 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 326:
-YY_RULE_SETUP
-#line 626 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
 case 327:
-/* rule 327 can match eol */
 YY_RULE_SETUP
 #line 627 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
 	YY_BREAK
 case 328:
+/* rule 328 can match eol */
 YY_RULE_SETUP
 #line 628 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 case 329:
 YY_RULE_SETUP
 #line 629 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 330:
+YY_RULE_SETUP
+#line 630 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5189,29 +5201,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 635 "./util/configlexer.lex"
+#line 636 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 330:
-YY_RULE_SETUP
-#line 639 "./util/configlexer.lex"
-{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 331:
-/* rule 331 can match eol */
 YY_RULE_SETUP
 #line 640 "./util/configlexer.lex"
+{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 332:
+/* rule 332 can match eol */
+YY_RULE_SETUP
+#line 641 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 332:
+case 333:
 YY_RULE_SETUP
-#line 644 "./util/configlexer.lex"
+#line 645 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5220,33 +5232,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 333:
+case 334:
 YY_RULE_SETUP
-#line 652 "./util/configlexer.lex"
+#line 653 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 334:
+case 335:
 YY_RULE_SETUP
-#line 656 "./util/configlexer.lex"
+#line 657 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 335:
+case 336:
 YY_RULE_SETUP
-#line 660 "./util/configlexer.lex"
+#line 661 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 336:
+case 337:
 YY_RULE_SETUP
-#line 664 "./util/configlexer.lex"
+#line 665 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5247 "<stdout>"
+#line 5259 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5541,7 +5553,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 >= 3281 )
+			if ( yy_current_state >= 3289 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5569,11 +5581,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 >= 3281 )
+		if ( yy_current_state >= 3289 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3280);
+	yy_is_jam = (yy_current_state == 3288);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6212,6 +6224,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 664 "./util/configlexer.lex"
+#line 665 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 4e0bf240f..b83801ab0 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -301,6 +301,7 @@ infra-keep-probing{COLON}	{ YDVAR(1, VAR_INFRA_KEEP_PROBING) }
 num-queries-per-thread{COLON}	{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
 jostle-timeout{COLON}		{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
 delay-close{COLON}		{ YDVAR(1, VAR_DELAY_CLOSE) }
+udp-connect{COLON}		{ YDVAR(1, VAR_UDP_CONNECT) }
 target-fetch-policy{COLON}	{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
 harden-short-bufsize{COLON}	{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
 harden-large-queries{COLON}	{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
diff --git a/util/configparser.c b/util/configparser.c
index 0ce58427e..f22204e54 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -285,154 +285,155 @@ extern int yydebug;
     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_INFRA_KEEP_PROBING = 412,
-    VAR_DNS64_PREFIX = 413,
-    VAR_DNS64_SYNTHALL = 414,
-    VAR_DNS64_IGNORE_AAAA = 415,
-    VAR_DNSTAP = 416,
-    VAR_DNSTAP_ENABLE = 417,
-    VAR_DNSTAP_SOCKET_PATH = 418,
-    VAR_DNSTAP_IP = 419,
-    VAR_DNSTAP_TLS = 420,
-    VAR_DNSTAP_TLS_SERVER_NAME = 421,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 422,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 423,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 424,
-    VAR_DNSTAP_SEND_IDENTITY = 425,
-    VAR_DNSTAP_SEND_VERSION = 426,
-    VAR_DNSTAP_BIDIRECTIONAL = 427,
-    VAR_DNSTAP_IDENTITY = 428,
-    VAR_DNSTAP_VERSION = 429,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 430,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 431,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 432,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 433,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 434,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 435,
-    VAR_RESPONSE_IP_TAG = 436,
-    VAR_RESPONSE_IP = 437,
-    VAR_RESPONSE_IP_DATA = 438,
-    VAR_HARDEN_ALGO_DOWNGRADE = 439,
-    VAR_IP_TRANSPARENT = 440,
-    VAR_IP_DSCP = 441,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 442,
-    VAR_IP_RATELIMIT = 443,
-    VAR_IP_RATELIMIT_SLABS = 444,
-    VAR_IP_RATELIMIT_SIZE = 445,
-    VAR_RATELIMIT = 446,
-    VAR_RATELIMIT_SLABS = 447,
-    VAR_RATELIMIT_SIZE = 448,
-    VAR_RATELIMIT_FOR_DOMAIN = 449,
-    VAR_RATELIMIT_BELOW_DOMAIN = 450,
-    VAR_IP_RATELIMIT_FACTOR = 451,
-    VAR_RATELIMIT_FACTOR = 452,
-    VAR_SEND_CLIENT_SUBNET = 453,
-    VAR_CLIENT_SUBNET_ZONE = 454,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 455,
-    VAR_CLIENT_SUBNET_OPCODE = 456,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 457,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 458,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 459,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 460,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 461,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 462,
-    VAR_CAPS_WHITELIST = 463,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 464,
-    VAR_PERMIT_SMALL_HOLDDOWN = 465,
-    VAR_QNAME_MINIMISATION = 466,
-    VAR_QNAME_MINIMISATION_STRICT = 467,
-    VAR_IP_FREEBIND = 468,
-    VAR_DEFINE_TAG = 469,
-    VAR_LOCAL_ZONE_TAG = 470,
-    VAR_ACCESS_CONTROL_TAG = 471,
-    VAR_LOCAL_ZONE_OVERRIDE = 472,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 473,
-    VAR_ACCESS_CONTROL_TAG_DATA = 474,
-    VAR_VIEW = 475,
-    VAR_ACCESS_CONTROL_VIEW = 476,
-    VAR_VIEW_FIRST = 477,
-    VAR_SERVE_EXPIRED = 478,
-    VAR_SERVE_EXPIRED_TTL = 479,
-    VAR_SERVE_EXPIRED_TTL_RESET = 480,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 481,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 482,
-    VAR_FAKE_DSA = 483,
-    VAR_FAKE_SHA1 = 484,
-    VAR_LOG_IDENTITY = 485,
-    VAR_HIDE_TRUSTANCHOR = 486,
-    VAR_TRUST_ANCHOR_SIGNALING = 487,
-    VAR_AGGRESSIVE_NSEC = 488,
-    VAR_USE_SYSTEMD = 489,
-    VAR_SHM_ENABLE = 490,
-    VAR_SHM_KEY = 491,
-    VAR_ROOT_KEY_SENTINEL = 492,
-    VAR_DNSCRYPT = 493,
-    VAR_DNSCRYPT_ENABLE = 494,
-    VAR_DNSCRYPT_PORT = 495,
-    VAR_DNSCRYPT_PROVIDER = 496,
-    VAR_DNSCRYPT_SECRET_KEY = 497,
-    VAR_DNSCRYPT_PROVIDER_CERT = 498,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 499,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 500,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 501,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 502,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 503,
-    VAR_IPSECMOD_ENABLED = 504,
-    VAR_IPSECMOD_HOOK = 505,
-    VAR_IPSECMOD_IGNORE_BOGUS = 506,
-    VAR_IPSECMOD_MAX_TTL = 507,
-    VAR_IPSECMOD_WHITELIST = 508,
-    VAR_IPSECMOD_STRICT = 509,
-    VAR_CACHEDB = 510,
-    VAR_CACHEDB_BACKEND = 511,
-    VAR_CACHEDB_SECRETSEED = 512,
-    VAR_CACHEDB_REDISHOST = 513,
-    VAR_CACHEDB_REDISPORT = 514,
-    VAR_CACHEDB_REDISTIMEOUT = 515,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 516,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 517,
-    VAR_FOR_UPSTREAM = 518,
-    VAR_AUTH_ZONE = 519,
-    VAR_ZONEFILE = 520,
-    VAR_MASTER = 521,
-    VAR_URL = 522,
-    VAR_FOR_DOWNSTREAM = 523,
-    VAR_FALLBACK_ENABLED = 524,
-    VAR_TLS_ADDITIONAL_PORT = 525,
-    VAR_LOW_RTT = 526,
-    VAR_LOW_RTT_PERMIL = 527,
-    VAR_FAST_SERVER_PERMIL = 528,
-    VAR_FAST_SERVER_NUM = 529,
-    VAR_ALLOW_NOTIFY = 530,
-    VAR_TLS_WIN_CERT = 531,
-    VAR_TCP_CONNECTION_LIMIT = 532,
-    VAR_FORWARD_NO_CACHE = 533,
-    VAR_STUB_NO_CACHE = 534,
-    VAR_LOG_SERVFAIL = 535,
-    VAR_DENY_ANY = 536,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 537,
-    VAR_LOG_TAG_QUERYREPLY = 538,
-    VAR_STREAM_WAIT_SIZE = 539,
-    VAR_TLS_CIPHERS = 540,
-    VAR_TLS_CIPHERSUITES = 541,
-    VAR_TLS_USE_SNI = 542,
-    VAR_IPSET = 543,
-    VAR_IPSET_NAME_V4 = 544,
-    VAR_IPSET_NAME_V6 = 545,
-    VAR_TLS_SESSION_TICKET_KEYS = 546,
-    VAR_RPZ = 547,
-    VAR_TAGS = 548,
-    VAR_RPZ_ACTION_OVERRIDE = 549,
-    VAR_RPZ_CNAME_OVERRIDE = 550,
-    VAR_RPZ_LOG = 551,
-    VAR_RPZ_LOG_NAME = 552,
-    VAR_DYNLIB = 553,
-    VAR_DYNLIB_FILE = 554,
-    VAR_EDNS_CLIENT_TAG = 555,
-    VAR_EDNS_CLIENT_TAG_OPCODE = 556
+    VAR_UDP_CONNECT = 409,
+    VAR_UNBLOCK_LAN_ZONES = 410,
+    VAR_INSECURE_LAN_ZONES = 411,
+    VAR_INFRA_CACHE_MIN_RTT = 412,
+    VAR_INFRA_KEEP_PROBING = 413,
+    VAR_DNS64_PREFIX = 414,
+    VAR_DNS64_SYNTHALL = 415,
+    VAR_DNS64_IGNORE_AAAA = 416,
+    VAR_DNSTAP = 417,
+    VAR_DNSTAP_ENABLE = 418,
+    VAR_DNSTAP_SOCKET_PATH = 419,
+    VAR_DNSTAP_IP = 420,
+    VAR_DNSTAP_TLS = 421,
+    VAR_DNSTAP_TLS_SERVER_NAME = 422,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 423,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425,
+    VAR_DNSTAP_SEND_IDENTITY = 426,
+    VAR_DNSTAP_SEND_VERSION = 427,
+    VAR_DNSTAP_BIDIRECTIONAL = 428,
+    VAR_DNSTAP_IDENTITY = 429,
+    VAR_DNSTAP_VERSION = 430,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436,
+    VAR_RESPONSE_IP_TAG = 437,
+    VAR_RESPONSE_IP = 438,
+    VAR_RESPONSE_IP_DATA = 439,
+    VAR_HARDEN_ALGO_DOWNGRADE = 440,
+    VAR_IP_TRANSPARENT = 441,
+    VAR_IP_DSCP = 442,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 443,
+    VAR_IP_RATELIMIT = 444,
+    VAR_IP_RATELIMIT_SLABS = 445,
+    VAR_IP_RATELIMIT_SIZE = 446,
+    VAR_RATELIMIT = 447,
+    VAR_RATELIMIT_SLABS = 448,
+    VAR_RATELIMIT_SIZE = 449,
+    VAR_RATELIMIT_FOR_DOMAIN = 450,
+    VAR_RATELIMIT_BELOW_DOMAIN = 451,
+    VAR_IP_RATELIMIT_FACTOR = 452,
+    VAR_RATELIMIT_FACTOR = 453,
+    VAR_SEND_CLIENT_SUBNET = 454,
+    VAR_CLIENT_SUBNET_ZONE = 455,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456,
+    VAR_CLIENT_SUBNET_OPCODE = 457,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 458,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 459,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 460,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 461,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463,
+    VAR_CAPS_WHITELIST = 464,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 465,
+    VAR_PERMIT_SMALL_HOLDDOWN = 466,
+    VAR_QNAME_MINIMISATION = 467,
+    VAR_QNAME_MINIMISATION_STRICT = 468,
+    VAR_IP_FREEBIND = 469,
+    VAR_DEFINE_TAG = 470,
+    VAR_LOCAL_ZONE_TAG = 471,
+    VAR_ACCESS_CONTROL_TAG = 472,
+    VAR_LOCAL_ZONE_OVERRIDE = 473,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 474,
+    VAR_ACCESS_CONTROL_TAG_DATA = 475,
+    VAR_VIEW = 476,
+    VAR_ACCESS_CONTROL_VIEW = 477,
+    VAR_VIEW_FIRST = 478,
+    VAR_SERVE_EXPIRED = 479,
+    VAR_SERVE_EXPIRED_TTL = 480,
+    VAR_SERVE_EXPIRED_TTL_RESET = 481,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 482,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483,
+    VAR_FAKE_DSA = 484,
+    VAR_FAKE_SHA1 = 485,
+    VAR_LOG_IDENTITY = 486,
+    VAR_HIDE_TRUSTANCHOR = 487,
+    VAR_TRUST_ANCHOR_SIGNALING = 488,
+    VAR_AGGRESSIVE_NSEC = 489,
+    VAR_USE_SYSTEMD = 490,
+    VAR_SHM_ENABLE = 491,
+    VAR_SHM_KEY = 492,
+    VAR_ROOT_KEY_SENTINEL = 493,
+    VAR_DNSCRYPT = 494,
+    VAR_DNSCRYPT_ENABLE = 495,
+    VAR_DNSCRYPT_PORT = 496,
+    VAR_DNSCRYPT_PROVIDER = 497,
+    VAR_DNSCRYPT_SECRET_KEY = 498,
+    VAR_DNSCRYPT_PROVIDER_CERT = 499,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504,
+    VAR_IPSECMOD_ENABLED = 505,
+    VAR_IPSECMOD_HOOK = 506,
+    VAR_IPSECMOD_IGNORE_BOGUS = 507,
+    VAR_IPSECMOD_MAX_TTL = 508,
+    VAR_IPSECMOD_WHITELIST = 509,
+    VAR_IPSECMOD_STRICT = 510,
+    VAR_CACHEDB = 511,
+    VAR_CACHEDB_BACKEND = 512,
+    VAR_CACHEDB_SECRETSEED = 513,
+    VAR_CACHEDB_REDISHOST = 514,
+    VAR_CACHEDB_REDISPORT = 515,
+    VAR_CACHEDB_REDISTIMEOUT = 516,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 517,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518,
+    VAR_FOR_UPSTREAM = 519,
+    VAR_AUTH_ZONE = 520,
+    VAR_ZONEFILE = 521,
+    VAR_MASTER = 522,
+    VAR_URL = 523,
+    VAR_FOR_DOWNSTREAM = 524,
+    VAR_FALLBACK_ENABLED = 525,
+    VAR_TLS_ADDITIONAL_PORT = 526,
+    VAR_LOW_RTT = 527,
+    VAR_LOW_RTT_PERMIL = 528,
+    VAR_FAST_SERVER_PERMIL = 529,
+    VAR_FAST_SERVER_NUM = 530,
+    VAR_ALLOW_NOTIFY = 531,
+    VAR_TLS_WIN_CERT = 532,
+    VAR_TCP_CONNECTION_LIMIT = 533,
+    VAR_FORWARD_NO_CACHE = 534,
+    VAR_STUB_NO_CACHE = 535,
+    VAR_LOG_SERVFAIL = 536,
+    VAR_DENY_ANY = 537,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538,
+    VAR_LOG_TAG_QUERYREPLY = 539,
+    VAR_STREAM_WAIT_SIZE = 540,
+    VAR_TLS_CIPHERS = 541,
+    VAR_TLS_CIPHERSUITES = 542,
+    VAR_TLS_USE_SNI = 543,
+    VAR_IPSET = 544,
+    VAR_IPSET_NAME_V4 = 545,
+    VAR_IPSET_NAME_V6 = 546,
+    VAR_TLS_SESSION_TICKET_KEYS = 547,
+    VAR_RPZ = 548,
+    VAR_TAGS = 549,
+    VAR_RPZ_ACTION_OVERRIDE = 550,
+    VAR_RPZ_CNAME_OVERRIDE = 551,
+    VAR_RPZ_LOG = 552,
+    VAR_RPZ_LOG_NAME = 553,
+    VAR_DYNLIB = 554,
+    VAR_DYNLIB_FILE = 555,
+    VAR_EDNS_CLIENT_TAG = 556,
+    VAR_EDNS_CLIENT_TAG_OPCODE = 557
   };
 #endif
 /* Tokens.  */
@@ -587,154 +588,155 @@ extern int yydebug;
 #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_INFRA_KEEP_PROBING 412
-#define VAR_DNS64_PREFIX 413
-#define VAR_DNS64_SYNTHALL 414
-#define VAR_DNS64_IGNORE_AAAA 415
-#define VAR_DNSTAP 416
-#define VAR_DNSTAP_ENABLE 417
-#define VAR_DNSTAP_SOCKET_PATH 418
-#define VAR_DNSTAP_IP 419
-#define VAR_DNSTAP_TLS 420
-#define VAR_DNSTAP_TLS_SERVER_NAME 421
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 422
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 423
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 424
-#define VAR_DNSTAP_SEND_IDENTITY 425
-#define VAR_DNSTAP_SEND_VERSION 426
-#define VAR_DNSTAP_BIDIRECTIONAL 427
-#define VAR_DNSTAP_IDENTITY 428
-#define VAR_DNSTAP_VERSION 429
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 430
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 431
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 432
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 433
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 434
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 435
-#define VAR_RESPONSE_IP_TAG 436
-#define VAR_RESPONSE_IP 437
-#define VAR_RESPONSE_IP_DATA 438
-#define VAR_HARDEN_ALGO_DOWNGRADE 439
-#define VAR_IP_TRANSPARENT 440
-#define VAR_IP_DSCP 441
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 442
-#define VAR_IP_RATELIMIT 443
-#define VAR_IP_RATELIMIT_SLABS 444
-#define VAR_IP_RATELIMIT_SIZE 445
-#define VAR_RATELIMIT 446
-#define VAR_RATELIMIT_SLABS 447
-#define VAR_RATELIMIT_SIZE 448
-#define VAR_RATELIMIT_FOR_DOMAIN 449
-#define VAR_RATELIMIT_BELOW_DOMAIN 450
-#define VAR_IP_RATELIMIT_FACTOR 451
-#define VAR_RATELIMIT_FACTOR 452
-#define VAR_SEND_CLIENT_SUBNET 453
-#define VAR_CLIENT_SUBNET_ZONE 454
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 455
-#define VAR_CLIENT_SUBNET_OPCODE 456
-#define VAR_MAX_CLIENT_SUBNET_IPV4 457
-#define VAR_MAX_CLIENT_SUBNET_IPV6 458
-#define VAR_MIN_CLIENT_SUBNET_IPV4 459
-#define VAR_MIN_CLIENT_SUBNET_IPV6 460
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 461
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 462
-#define VAR_CAPS_WHITELIST 463
-#define VAR_CACHE_MAX_NEGATIVE_TTL 464
-#define VAR_PERMIT_SMALL_HOLDDOWN 465
-#define VAR_QNAME_MINIMISATION 466
-#define VAR_QNAME_MINIMISATION_STRICT 467
-#define VAR_IP_FREEBIND 468
-#define VAR_DEFINE_TAG 469
-#define VAR_LOCAL_ZONE_TAG 470
-#define VAR_ACCESS_CONTROL_TAG 471
-#define VAR_LOCAL_ZONE_OVERRIDE 472
-#define VAR_ACCESS_CONTROL_TAG_ACTION 473
-#define VAR_ACCESS_CONTROL_TAG_DATA 474
-#define VAR_VIEW 475
-#define VAR_ACCESS_CONTROL_VIEW 476
-#define VAR_VIEW_FIRST 477
-#define VAR_SERVE_EXPIRED 478
-#define VAR_SERVE_EXPIRED_TTL 479
-#define VAR_SERVE_EXPIRED_TTL_RESET 480
-#define VAR_SERVE_EXPIRED_REPLY_TTL 481
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 482
-#define VAR_FAKE_DSA 483
-#define VAR_FAKE_SHA1 484
-#define VAR_LOG_IDENTITY 485
-#define VAR_HIDE_TRUSTANCHOR 486
-#define VAR_TRUST_ANCHOR_SIGNALING 487
-#define VAR_AGGRESSIVE_NSEC 488
-#define VAR_USE_SYSTEMD 489
-#define VAR_SHM_ENABLE 490
-#define VAR_SHM_KEY 491
-#define VAR_ROOT_KEY_SENTINEL 492
-#define VAR_DNSCRYPT 493
-#define VAR_DNSCRYPT_ENABLE 494
-#define VAR_DNSCRYPT_PORT 495
-#define VAR_DNSCRYPT_PROVIDER 496
-#define VAR_DNSCRYPT_SECRET_KEY 497
-#define VAR_DNSCRYPT_PROVIDER_CERT 498
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 499
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 500
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 501
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 502
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 503
-#define VAR_IPSECMOD_ENABLED 504
-#define VAR_IPSECMOD_HOOK 505
-#define VAR_IPSECMOD_IGNORE_BOGUS 506
-#define VAR_IPSECMOD_MAX_TTL 507
-#define VAR_IPSECMOD_WHITELIST 508
-#define VAR_IPSECMOD_STRICT 509
-#define VAR_CACHEDB 510
-#define VAR_CACHEDB_BACKEND 511
-#define VAR_CACHEDB_SECRETSEED 512
-#define VAR_CACHEDB_REDISHOST 513
-#define VAR_CACHEDB_REDISPORT 514
-#define VAR_CACHEDB_REDISTIMEOUT 515
-#define VAR_CACHEDB_REDISEXPIRERECORDS 516
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 517
-#define VAR_FOR_UPSTREAM 518
-#define VAR_AUTH_ZONE 519
-#define VAR_ZONEFILE 520
-#define VAR_MASTER 521
-#define VAR_URL 522
-#define VAR_FOR_DOWNSTREAM 523
-#define VAR_FALLBACK_ENABLED 524
-#define VAR_TLS_ADDITIONAL_PORT 525
-#define VAR_LOW_RTT 526
-#define VAR_LOW_RTT_PERMIL 527
-#define VAR_FAST_SERVER_PERMIL 528
-#define VAR_FAST_SERVER_NUM 529
-#define VAR_ALLOW_NOTIFY 530
-#define VAR_TLS_WIN_CERT 531
-#define VAR_TCP_CONNECTION_LIMIT 532
-#define VAR_FORWARD_NO_CACHE 533
-#define VAR_STUB_NO_CACHE 534
-#define VAR_LOG_SERVFAIL 535
-#define VAR_DENY_ANY 536
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 537
-#define VAR_LOG_TAG_QUERYREPLY 538
-#define VAR_STREAM_WAIT_SIZE 539
-#define VAR_TLS_CIPHERS 540
-#define VAR_TLS_CIPHERSUITES 541
-#define VAR_TLS_USE_SNI 542
-#define VAR_IPSET 543
-#define VAR_IPSET_NAME_V4 544
-#define VAR_IPSET_NAME_V6 545
-#define VAR_TLS_SESSION_TICKET_KEYS 546
-#define VAR_RPZ 547
-#define VAR_TAGS 548
-#define VAR_RPZ_ACTION_OVERRIDE 549
-#define VAR_RPZ_CNAME_OVERRIDE 550
-#define VAR_RPZ_LOG 551
-#define VAR_RPZ_LOG_NAME 552
-#define VAR_DYNLIB 553
-#define VAR_DYNLIB_FILE 554
-#define VAR_EDNS_CLIENT_TAG 555
-#define VAR_EDNS_CLIENT_TAG_OPCODE 556
+#define VAR_UDP_CONNECT 409
+#define VAR_UNBLOCK_LAN_ZONES 410
+#define VAR_INSECURE_LAN_ZONES 411
+#define VAR_INFRA_CACHE_MIN_RTT 412
+#define VAR_INFRA_KEEP_PROBING 413
+#define VAR_DNS64_PREFIX 414
+#define VAR_DNS64_SYNTHALL 415
+#define VAR_DNS64_IGNORE_AAAA 416
+#define VAR_DNSTAP 417
+#define VAR_DNSTAP_ENABLE 418
+#define VAR_DNSTAP_SOCKET_PATH 419
+#define VAR_DNSTAP_IP 420
+#define VAR_DNSTAP_TLS 421
+#define VAR_DNSTAP_TLS_SERVER_NAME 422
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 423
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425
+#define VAR_DNSTAP_SEND_IDENTITY 426
+#define VAR_DNSTAP_SEND_VERSION 427
+#define VAR_DNSTAP_BIDIRECTIONAL 428
+#define VAR_DNSTAP_IDENTITY 429
+#define VAR_DNSTAP_VERSION 430
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436
+#define VAR_RESPONSE_IP_TAG 437
+#define VAR_RESPONSE_IP 438
+#define VAR_RESPONSE_IP_DATA 439
+#define VAR_HARDEN_ALGO_DOWNGRADE 440
+#define VAR_IP_TRANSPARENT 441
+#define VAR_IP_DSCP 442
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 443
+#define VAR_IP_RATELIMIT 444
+#define VAR_IP_RATELIMIT_SLABS 445
+#define VAR_IP_RATELIMIT_SIZE 446
+#define VAR_RATELIMIT 447
+#define VAR_RATELIMIT_SLABS 448
+#define VAR_RATELIMIT_SIZE 449
+#define VAR_RATELIMIT_FOR_DOMAIN 450
+#define VAR_RATELIMIT_BELOW_DOMAIN 451
+#define VAR_IP_RATELIMIT_FACTOR 452
+#define VAR_RATELIMIT_FACTOR 453
+#define VAR_SEND_CLIENT_SUBNET 454
+#define VAR_CLIENT_SUBNET_ZONE 455
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456
+#define VAR_CLIENT_SUBNET_OPCODE 457
+#define VAR_MAX_CLIENT_SUBNET_IPV4 458
+#define VAR_MAX_CLIENT_SUBNET_IPV6 459
+#define VAR_MIN_CLIENT_SUBNET_IPV4 460
+#define VAR_MIN_CLIENT_SUBNET_IPV6 461
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 462
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 463
+#define VAR_CAPS_WHITELIST 464
+#define VAR_CACHE_MAX_NEGATIVE_TTL 465
+#define VAR_PERMIT_SMALL_HOLDDOWN 466
+#define VAR_QNAME_MINIMISATION 467
+#define VAR_QNAME_MINIMISATION_STRICT 468
+#define VAR_IP_FREEBIND 469
+#define VAR_DEFINE_TAG 470
+#define VAR_LOCAL_ZONE_TAG 471
+#define VAR_ACCESS_CONTROL_TAG 472
+#define VAR_LOCAL_ZONE_OVERRIDE 473
+#define VAR_ACCESS_CONTROL_TAG_ACTION 474
+#define VAR_ACCESS_CONTROL_TAG_DATA 475
+#define VAR_VIEW 476
+#define VAR_ACCESS_CONTROL_VIEW 477
+#define VAR_VIEW_FIRST 478
+#define VAR_SERVE_EXPIRED 479
+#define VAR_SERVE_EXPIRED_TTL 480
+#define VAR_SERVE_EXPIRED_TTL_RESET 481
+#define VAR_SERVE_EXPIRED_REPLY_TTL 482
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483
+#define VAR_FAKE_DSA 484
+#define VAR_FAKE_SHA1 485
+#define VAR_LOG_IDENTITY 486
+#define VAR_HIDE_TRUSTANCHOR 487
+#define VAR_TRUST_ANCHOR_SIGNALING 488
+#define VAR_AGGRESSIVE_NSEC 489
+#define VAR_USE_SYSTEMD 490
+#define VAR_SHM_ENABLE 491
+#define VAR_SHM_KEY 492
+#define VAR_ROOT_KEY_SENTINEL 493
+#define VAR_DNSCRYPT 494
+#define VAR_DNSCRYPT_ENABLE 495
+#define VAR_DNSCRYPT_PORT 496
+#define VAR_DNSCRYPT_PROVIDER 497
+#define VAR_DNSCRYPT_SECRET_KEY 498
+#define VAR_DNSCRYPT_PROVIDER_CERT 499
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504
+#define VAR_IPSECMOD_ENABLED 505
+#define VAR_IPSECMOD_HOOK 506
+#define VAR_IPSECMOD_IGNORE_BOGUS 507
+#define VAR_IPSECMOD_MAX_TTL 508
+#define VAR_IPSECMOD_WHITELIST 509
+#define VAR_IPSECMOD_STRICT 510
+#define VAR_CACHEDB 511
+#define VAR_CACHEDB_BACKEND 512
+#define VAR_CACHEDB_SECRETSEED 513
+#define VAR_CACHEDB_REDISHOST 514
+#define VAR_CACHEDB_REDISPORT 515
+#define VAR_CACHEDB_REDISTIMEOUT 516
+#define VAR_CACHEDB_REDISEXPIRERECORDS 517
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518
+#define VAR_FOR_UPSTREAM 519
+#define VAR_AUTH_ZONE 520
+#define VAR_ZONEFILE 521
+#define VAR_MASTER 522
+#define VAR_URL 523
+#define VAR_FOR_DOWNSTREAM 524
+#define VAR_FALLBACK_ENABLED 525
+#define VAR_TLS_ADDITIONAL_PORT 526
+#define VAR_LOW_RTT 527
+#define VAR_LOW_RTT_PERMIL 528
+#define VAR_FAST_SERVER_PERMIL 529
+#define VAR_FAST_SERVER_NUM 530
+#define VAR_ALLOW_NOTIFY 531
+#define VAR_TLS_WIN_CERT 532
+#define VAR_TCP_CONNECTION_LIMIT 533
+#define VAR_FORWARD_NO_CACHE 534
+#define VAR_STUB_NO_CACHE 535
+#define VAR_LOG_SERVFAIL 536
+#define VAR_DENY_ANY 537
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538
+#define VAR_LOG_TAG_QUERYREPLY 539
+#define VAR_STREAM_WAIT_SIZE 540
+#define VAR_TLS_CIPHERS 541
+#define VAR_TLS_CIPHERSUITES 542
+#define VAR_TLS_USE_SNI 543
+#define VAR_IPSET 544
+#define VAR_IPSET_NAME_V4 545
+#define VAR_IPSET_NAME_V6 546
+#define VAR_TLS_SESSION_TICKET_KEYS 547
+#define VAR_RPZ 548
+#define VAR_TAGS 549
+#define VAR_RPZ_ACTION_OVERRIDE 550
+#define VAR_RPZ_CNAME_OVERRIDE 551
+#define VAR_RPZ_LOG 552
+#define VAR_RPZ_LOG_NAME 553
+#define VAR_DYNLIB 554
+#define VAR_DYNLIB_FILE 555
+#define VAR_EDNS_CLIENT_TAG 556
+#define VAR_EDNS_CLIENT_TAG_OPCODE 557
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -744,7 +746,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 748 "util/configparser.c"
+#line 750 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -994,19 +996,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   639
+#define YYLAST   641
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  302
+#define YYNTOKENS  303
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  327
+#define YYNNTS  328
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  630
+#define YYNRULES  632
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  936
+#define YYNSTATES  939
 
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   556
+#define YYMAXUTOK   557
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
@@ -1072,7 +1074,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,   300,   301
+     295,   296,   297,   298,   299,   300,   301,   302
 };
 
 #if YYDEBUG
@@ -1092,57 +1094,57 @@ 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,   252,   253,   253,   253,   254,   254,   255,
-     255,   256,   256,   256,   257,   257,   258,   258,   258,   259,
-     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,  1553,  1560,  1570,  1580,  1590,
-    1600,  1610,  1620,  1630,  1640,  1647,  1654,  1661,  1670,  1679,
-    1688,  1697,  1704,  1714,  1734,  1741,  1759,  1772,  1785,  1794,
-    1803,  1812,  1821,  1831,  1841,  1852,  1861,  1870,  1879,  1888,
-    1897,  1906,  1919,  1932,  1941,  1948,  1957,  1966,  1975,  1984,
-    1992,  2005,  2013,  2054,  2061,  2076,  2086,  2096,  2103,  2110,
-    2117,  2126,  2134,  2148,  2169,  2190,  2202,  2214,  2226,  2235,
-    2256,  2266,  2275,  2283,  2291,  2304,  2317,  2332,  2347,  2356,
-    2365,  2371,  2380,  2389,  2399,  2409,  2422,  2435,  2447,  2461,
-    2473,  2487,  2502,  2513,  2523,  2530,  2537,  2546,  2555,  2565,
-    2575,  2585,  2592,  2599,  2608,  2617,  2627,  2637,  2644,  2651,
-    2658,  2666,  2676,  2686,  2696,  2706,  2745,  2755,  2763,  2771,
-    2786,  2795,  2800,  2801,  2802,  2802,  2802,  2803,  2803,  2803,
-    2804,  2804,  2806,  2816,  2825,  2832,  2839,  2846,  2853,  2860,
-    2867,  2872,  2873,  2874,  2874,  2874,  2875,  2875,  2875,  2876,
-    2877,  2877,  2878,  2878,  2879,  2879,  2880,  2881,  2882,  2883,
-    2884,  2885,  2887,  2896,  2906,  2913,  2920,  2929,  2936,  2943,
-    2950,  2957,  2966,  2975,  2982,  2989,  2999,  3009,  3019,  3029,
-    3039,  3049,  3054,  3055,  3056,  3058,  3064,  3069,  3070,  3071,
-    3073,  3079,  3089,  3096,  3105,  3113,  3118,  3119,  3121,  3121,
-    3121,  3122,  3122,  3123,  3124,  3125,  3126,  3127,  3129,  3139,
-    3148,  3155,  3164,  3171,  3180,  3188,  3201,  3209,  3222,  3227,
-    3228,  3229,  3229,  3230,  3230,  3230,  3231,  3233,  3245,  3257,
-    3269,  3284,  3297,  3310,  3321,  3326,  3327,  3328,  3328,  3330,
-    3345
+     251,   251,   252,   252,   253,   253,   253,   254,   254,   254,
+     255,   255,   256,   256,   256,   257,   257,   258,   258,   258,
+     259,   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,  1455,  1465,  1475,  1483,
+    1496,  1505,  1513,  1522,  1530,  1543,  1552,  1562,  1569,  1579,
+    1589,  1599,  1609,  1619,  1629,  1639,  1649,  1656,  1663,  1670,
+    1679,  1688,  1697,  1706,  1713,  1723,  1743,  1750,  1768,  1781,
+    1794,  1803,  1812,  1821,  1830,  1840,  1850,  1861,  1870,  1879,
+    1888,  1897,  1906,  1915,  1928,  1941,  1950,  1957,  1966,  1975,
+    1984,  1993,  2001,  2014,  2022,  2063,  2070,  2085,  2095,  2105,
+    2112,  2119,  2126,  2135,  2143,  2157,  2178,  2199,  2211,  2223,
+    2235,  2244,  2265,  2275,  2284,  2292,  2300,  2313,  2326,  2341,
+    2356,  2365,  2374,  2380,  2389,  2398,  2408,  2418,  2431,  2444,
+    2456,  2470,  2482,  2496,  2511,  2522,  2532,  2539,  2546,  2555,
+    2564,  2574,  2584,  2594,  2601,  2608,  2617,  2626,  2636,  2646,
+    2653,  2660,  2667,  2675,  2685,  2695,  2705,  2715,  2754,  2764,
+    2772,  2780,  2795,  2804,  2809,  2810,  2811,  2811,  2811,  2812,
+    2812,  2812,  2813,  2813,  2815,  2825,  2834,  2841,  2848,  2855,
+    2862,  2869,  2876,  2881,  2882,  2883,  2883,  2883,  2884,  2884,
+    2884,  2885,  2886,  2886,  2887,  2887,  2888,  2888,  2889,  2890,
+    2891,  2892,  2893,  2894,  2896,  2905,  2915,  2922,  2929,  2938,
+    2945,  2952,  2959,  2966,  2975,  2984,  2991,  2998,  3008,  3018,
+    3028,  3038,  3048,  3058,  3063,  3064,  3065,  3067,  3073,  3078,
+    3079,  3080,  3082,  3088,  3098,  3105,  3114,  3122,  3127,  3128,
+    3130,  3130,  3130,  3131,  3131,  3132,  3133,  3134,  3135,  3136,
+    3138,  3148,  3157,  3164,  3173,  3180,  3189,  3197,  3210,  3218,
+    3231,  3236,  3237,  3238,  3238,  3239,  3239,  3239,  3240,  3242,
+    3254,  3266,  3278,  3293,  3306,  3319,  3330,  3335,  3336,  3337,
+    3337,  3339,  3354
 };
 #endif
 
@@ -1201,15 +1203,15 @@ static const char *const yytname[] =
   "VAR_HTTP_QUERY_BUFFER_SIZE", "VAR_HTTP_RESPONSE_BUFFER_SIZE",
   "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_INFRA_KEEP_PROBING", "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_BIDIRECTIONAL",
-  "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION",
+  "VAR_DELAY_CLOSE", "VAR_UDP_CONNECT", "VAR_UNBLOCK_LAN_ZONES",
+  "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT",
+  "VAR_INFRA_KEEP_PROBING", "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_BIDIRECTIONAL", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION",
   "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES",
   "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES",
   "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES",
@@ -1311,7 +1313,7 @@ static const char *const yytname[] =
   "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_delay_close", "server_udp_connect", "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",
@@ -1432,14 +1434,14 @@ static const yytype_uint16 yytoknum[] =
      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,
-     555,   556
+     555,   556,   557
 };
 # endif
 
-#define YYPACT_NINF -290
+#define YYPACT_NINF -291
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-290)))
+  (!!((Yystate) == (-291)))
 
 #define YYTABLE_NINF -1
 
@@ -1450,100 +1452,100 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -290,     0,  -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,   286,   -42,   -38,   -43,   -21,   -44,   -11,   -95,
-    -109,  -289,  -214,  -239,  -281,     3,     4,    13,    25,    26,
+    -291,     0,  -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,   287,   -42,   -38,   -43,   -21,   -44,   -11,   -96,
+    -109,  -290,  -215,  -240,  -282,     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,    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,   127,   128,   131,   132,   133,   134,   135,   136,   137,
+     126,   127,   128,   129,   132,   133,   134,   135,   136,   137,
      138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   152,   153,   154,   155,   156,   157,   158,
+     148,   149,   150,   151,   153,   154,   155,   156,   157,   158,
      159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     169,   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,   209,
-     214,   215,   216,   217,   218,   219,   220,   222,   223,   224,
-     225,   226,   229,   231,   233,   246,   247,   248,   249,   250,
-     251,   252,   253,   255,   256,   257,   258,   259,   260,   261,
+     210,   215,   216,   217,   218,   219,   220,   221,   223,   224,
+     225,   226,   227,   230,   232,   234,   247,   248,   249,   250,
+     251,   252,   253,   254,   256,   257,   258,   259,   260,   261,
      262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,   276,   277,   279,   280,   281,   283,
-     284,   285,   287,   321,   322,   323,   324,   328,   329,  -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,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,   330,   372,   373,   374,   375,   376,
-     377,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,   378,
-     379,   380,   384,   388,   389,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,   414,   415,   416,   425,   437,   438,   439,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,   440,   441,   442,
-     443,   444,   445,   446,   447,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,   448,   449,   450,   451,   452,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,
-     453,   454,   455,   456,   496,   498,   514,   515,  -290,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,   516,   517,   518,
-     519,   520,   521,   522,   523,   524,   531,   532,   533,   534,
-     535,   536,   537,   539,   540,   541,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,   542,  -290,  -290,   543,
-    -290,  -290,   544,   545,   548,   551,   554,   555,   564,   565,
-     566,   568,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,   569,   570,   571,   572,   573,   574,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,   575,   578,  -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,   579,   580,  -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,   581,   582,   583,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,   584,
-     585,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,
-     586,   587,   588,   589,   590,   591,  -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,   592,  -290,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,   593,  -290,  -290,  -290,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,  -290,   594,
-    -290,  -290,   595,   596,  -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,   597,   598,   599,  -290,  -290,  -290,
-    -290,  -290,  -290,  -290,  -290,  -290
+     272,   273,   274,   275,   276,   277,   278,   280,   281,   282,
+     284,   285,   286,   288,   322,   323,   324,   325,   329,   330,
+    -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,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,   331,   373,   374,   375,
+     376,   377,   378,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,   379,   380,   381,   385,   389,   390,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,   415,   416,   417,   426,   439,   440,
+     441,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   442,
+     443,   444,   445,   446,   447,   448,   449,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,   450,   451,   452,   453,
+     454,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,   455,   456,   457,   458,   498,   500,   516,   517,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   518,
+     519,   520,   521,   522,   523,   524,   525,   526,   533,   534,
+     535,   536,   537,   538,   539,   541,   542,   543,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   544,  -291,
+    -291,   545,  -291,  -291,   546,   547,   550,   553,   556,   557,
+     566,   567,   568,   570,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,   571,   572,   573,   574,   575,
+     576,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   577,   580,
+    -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,   581,   582,  -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,   583,
+     584,   585,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,   586,   587,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,   588,   589,   590,   591,   592,   593,  -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,   594,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,   595,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,   596,  -291,  -291,   597,   598,  -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,   599,   600,   601,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1551,10 +1553,10 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    18,    19,   226,   236,   511,   571,   530,
-     245,   585,   608,   255,   624,   271,   576,     3,    17,    21,
-     228,   238,   247,   257,   273,   513,   532,   573,   578,   587,
-     610,   626,     4,     5,     6,    10,    14,    15,     8,     9,
+       2,     0,     1,    18,    19,   227,   237,   513,   573,   532,
+     246,   587,   610,   256,   626,   272,   578,     3,    17,    21,
+     229,   239,   248,   258,   274,   515,   534,   575,   580,   589,
+     612,   628,     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,
@@ -1575,152 +1577,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,     0,     0,    20,
-      22,    23,    86,    89,    98,   194,   195,    24,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,    37,    77,
-      25,    90,    91,    48,    70,    85,    26,    27,    30,    31,
-      28,    29,    32,    33,    34,    35,    36,   121,   206,   122,
-     124,   125,   126,   208,   213,   209,   220,   221,   222,   223,
-     127,   128,   129,   130,   131,   132,   133,   190,    87,    76,
-     102,   119,   120,   218,   215,   123,    38,    39,    40,    41,
-      42,    78,    92,    93,   108,    64,    74,    65,   198,   199,
-     103,    58,    59,   197,    60,    61,   112,   116,   137,   146,
-     173,   149,   219,   113,    71,    43,    44,    45,   100,   138,
-     139,   140,    46,    47,    49,    50,    52,    53,    51,   144,
-     150,    54,    55,    56,    62,    81,   117,    95,   145,    88,
-     169,    96,    97,   114,   115,   216,   101,    57,    79,    82,
-      63,    66,   104,   105,    80,   170,   106,    67,    68,    69,
-     207,   118,   183,   184,   185,   186,   187,   188,   196,   107,
-      75,   109,   110,   111,   171,    72,    73,    94,    83,    84,
-      99,   134,   135,   217,   136,   141,   142,   143,   174,   175,
-     177,   179,   180,   178,   181,   191,   147,   148,   153,   154,
-     151,   152,   155,   156,   158,   157,   210,   212,   211,   172,
-     182,   200,   202,   201,   203,   204,   205,   224,   225,   176,
-     189,   192,   193,   214,     0,     0,     0,     0,     0,     0,
-       0,   227,   229,   230,   231,   233,   234,   235,   232,     0,
-       0,     0,     0,     0,     0,   237,   239,   240,   241,   242,
-     243,   244,     0,     0,     0,     0,     0,     0,     0,   246,
-     248,   249,   252,   253,   250,   254,   251,     0,     0,     0,
-       0,     0,     0,     0,     0,   256,   258,   259,   260,   261,
-     265,   262,   263,   264,     0,     0,     0,     0,     0,   276,
-     280,   281,   282,   283,   272,   274,   275,   277,   278,   279,
-       0,     0,     0,     0,     0,     0,     0,     0,   512,   514,
-     516,   515,   521,   517,   518,   519,   520,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   531,   533,   535,   534,
-     536,   537,   538,   539,   540,   541,   542,   543,   544,   545,
-     546,   547,   548,   549,   550,   551,     0,   572,   574,     0,
-     577,   579,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   586,   588,   589,   590,   592,   593,   591,   594,
-     595,   596,   597,     0,     0,     0,     0,     0,     0,   609,
-     611,   612,   613,   614,   615,   616,     0,     0,   625,   627,
-     628,   285,   284,   291,   304,   302,   314,   310,   311,   315,
-     312,   313,   316,   317,   318,   319,   320,   350,   351,   352,
-     353,   354,   379,   380,   381,   386,   387,   307,   388,   389,
-     392,   390,   391,   395,   396,   397,   411,   365,   366,   368,
-     369,   398,   414,   359,   361,   415,   421,   422,   423,   308,
-     378,   439,   440,   360,   434,   343,   303,   355,   412,   418,
-     399,     0,     0,   443,   309,   286,   342,   403,   287,   305,
-     306,   356,   357,   441,   401,   405,   406,   288,   444,   382,
-     410,   344,   364,   416,   417,   420,   433,   358,   437,   435,
-     436,   370,   377,   407,   408,   371,   372,   400,   425,   345,
-     346,   349,   321,   323,   324,   325,   326,   327,   334,   335,
-     336,   337,   338,   339,   340,   445,   446,   448,   383,   384,
-     385,   393,   394,   449,   450,   451,     0,     0,     0,   402,
-     373,   375,   581,   460,   464,   462,   461,   465,   463,     0,
-       0,   468,   469,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   404,   419,   438,   473,   474,   374,   452,
-       0,     0,     0,     0,     0,     0,   426,   427,   428,   429,
-     430,   431,   432,   582,   367,   362,   424,   341,   289,   290,
-     363,   475,   477,   476,   478,   479,   480,   322,   329,   470,
-     472,   471,   328,     0,   348,   409,   447,   347,   376,   330,
-     331,   333,   332,     0,   482,   483,   484,   485,   489,   488,
-     486,   487,   490,   491,   492,   493,   495,   494,   504,     0,
-     508,   509,     0,     0,   510,   496,   502,   497,   498,   499,
-     501,   503,   500,   266,   267,   268,   269,   270,   522,   524,
-     523,   526,   527,   528,   529,   525,   552,   554,   555,   556,
-     557,   558,   559,   560,   561,   562,   553,   563,   564,   565,
-     566,   567,   568,   569,   570,   575,   580,   598,   599,   600,
-     603,   601,   602,   604,   605,   606,   607,   617,   618,   619,
-     620,   621,   622,   629,   630,   413,   442,   459,   583,   584,
-     466,   467,   453,   454,     0,     0,     0,   458,   623,   481,
-     505,   506,   507,   457,   455,   456
+      20,    22,    23,    86,    89,    98,   195,   196,    24,   160,
+     161,   162,   163,   164,   165,   166,   167,   168,   169,    37,
+      77,    25,    90,    91,    48,    70,    85,    26,    27,    30,
+      31,    28,    29,    32,    33,    34,    35,    36,   121,   207,
+     122,   124,   125,   126,   209,   214,   210,   221,   222,   223,
+     224,   127,   128,   129,   130,   131,   132,   133,   191,    87,
+      76,   102,   119,   120,   219,   216,   123,    38,    39,    40,
+      41,    42,    78,    92,    93,   108,    64,    74,    65,   199,
+     200,   103,    58,    59,   198,    60,    61,   112,   116,   137,
+     147,   174,   150,   220,   113,    71,    43,    44,    45,   100,
+     138,   139,   140,   141,    46,    47,    49,    50,    52,    53,
+      51,   145,   151,    54,    55,    56,    62,    81,   117,    95,
+     146,    88,   170,    96,    97,   114,   115,   217,   101,    57,
+      79,    82,    63,    66,   104,   105,    80,   171,   106,    67,
+      68,    69,   208,   118,   184,   185,   186,   187,   188,   189,
+     197,   107,    75,   109,   110,   111,   172,    72,    73,    94,
+      83,    84,    99,   134,   135,   218,   136,   142,   143,   144,
+     175,   176,   178,   180,   181,   179,   182,   192,   148,   149,
+     154,   155,   152,   153,   156,   157,   159,   158,   211,   213,
+     212,   173,   183,   201,   203,   202,   204,   205,   206,   225,
+     226,   177,   190,   193,   194,   215,     0,     0,     0,     0,
+       0,     0,     0,   228,   230,   231,   232,   234,   235,   236,
+     233,     0,     0,     0,     0,     0,     0,   238,   240,   241,
+     242,   243,   244,   245,     0,     0,     0,     0,     0,     0,
+       0,   247,   249,   250,   253,   254,   251,   255,   252,     0,
+       0,     0,     0,     0,     0,     0,     0,   257,   259,   260,
+     261,   262,   266,   263,   264,   265,     0,     0,     0,     0,
+       0,   277,   281,   282,   283,   284,   273,   275,   276,   278,
+     279,   280,     0,     0,     0,     0,     0,     0,     0,     0,
+     514,   516,   518,   517,   523,   519,   520,   521,   522,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   533,   535,
+     537,   536,   538,   539,   540,   541,   542,   543,   544,   545,
+     546,   547,   548,   549,   550,   551,   552,   553,     0,   574,
+     576,     0,   579,   581,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   588,   590,   591,   592,   594,   595,
+     593,   596,   597,   598,   599,     0,     0,     0,     0,     0,
+       0,   611,   613,   614,   615,   616,   617,   618,     0,     0,
+     627,   629,   630,   286,   285,   292,   305,   303,   315,   311,
+     312,   316,   313,   314,   317,   318,   319,   320,   321,   351,
+     352,   353,   354,   355,   380,   381,   382,   388,   389,   308,
+     390,   391,   394,   392,   393,   397,   398,   399,   413,   366,
+     367,   369,   370,   400,   416,   360,   362,   417,   423,   424,
+     425,   309,   379,   441,   442,   361,   436,   344,   304,   356,
+     414,   420,   401,     0,     0,   445,   310,   287,   343,   405,
+     288,   306,   307,   357,   358,   443,   403,   407,   408,   289,
+     446,   383,   412,   345,   365,   418,   419,   422,   435,   359,
+     439,   437,   438,   371,   378,   409,   410,   372,   373,   402,
+     427,   346,   347,   350,   322,   324,   325,   326,   327,   328,
+     335,   336,   337,   338,   339,   340,   341,   447,   448,   450,
+     384,   385,   386,   387,   395,   396,   451,   452,   453,     0,
+       0,     0,   404,   374,   376,   583,   462,   466,   464,   463,
+     467,   465,     0,     0,   470,   471,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   406,   421,   440,   475,
+     476,   375,   454,     0,     0,     0,     0,     0,     0,   428,
+     429,   430,   431,   432,   433,   434,   584,   368,   363,   426,
+     342,   290,   291,   364,   477,   479,   478,   480,   481,   482,
+     323,   330,   472,   474,   473,   329,     0,   349,   411,   449,
+     348,   377,   331,   332,   334,   333,     0,   484,   485,   486,
+     487,   491,   490,   488,   489,   492,   493,   494,   495,   497,
+     496,   506,     0,   510,   511,     0,     0,   512,   498,   504,
+     499,   500,   501,   503,   505,   502,   267,   268,   269,   270,
+     271,   524,   526,   525,   528,   529,   530,   531,   527,   554,
+     556,   557,   558,   559,   560,   561,   562,   563,   564,   555,
+     565,   566,   567,   568,   569,   570,   571,   572,   577,   582,
+     600,   601,   602,   605,   603,   604,   606,   607,   608,   609,
+     619,   620,   621,   622,   623,   624,   631,   632,   415,   444,
+     461,   585,   586,   468,   469,   455,   456,     0,     0,     0,
+     460,   625,   483,   507,   508,   509,   459,   457,   458
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -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,  -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,   576,
-     577,   600,   601,   602,  -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,  -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,  -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,
+     578,   579,   602,   603,   604,  -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
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    17,    18,    19,    32,   249,    20,    33,   461,
-      21,    34,   475,    22,    35,   489,    23,    36,   505,   519,
-     520,   521,   522,   523,    24,    37,   524,   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,   447,   448,   462,   463,   464,   465,
-     466,   467,   468,   476,   477,   478,   479,   480,   481,   506,
-     507,   508,   509,   510,   511,   512,   513,   490,   491,   492,
-     493,   494,   495,   496,    25,    38,   538,   539,   540,   541,
-     542,   543,   544,   545,   546,    26,    39,   566,   567,   568,
-     569,   570,   571,   572,   573,   574,   575,   576,   577,   578,
-     579,   580,   581,   582,   583,   584,   585,    27,    40,   587,
-     588,    28,    41,   590,   591,   449,   450,   451,   452,    29,
-      42,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-     611,   612,    30,    43,   619,   620,   621,   622,   623,   624,
-     625,   453,    31,    44,   628,   629,   630
+      -1,     1,    17,    18,    19,    32,   250,    20,    33,   463,
+      21,    34,   477,    22,    35,   491,    23,    36,   507,   521,
+     522,   523,   524,   525,    24,    37,   526,   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,   447,   448,   449,   450,   464,   465,   466,
+     467,   468,   469,   470,   478,   479,   480,   481,   482,   483,
+     508,   509,   510,   511,   512,   513,   514,   515,   492,   493,
+     494,   495,   496,   497,   498,    25,    38,   540,   541,   542,
+     543,   544,   545,   546,   547,   548,    26,    39,   568,   569,
+     570,   571,   572,   573,   574,   575,   576,   577,   578,   579,
+     580,   581,   582,   583,   584,   585,   586,   587,    27,    40,
+     589,   590,    28,    41,   592,   593,   451,   452,   453,   454,
+      29,    42,   604,   605,   606,   607,   608,   609,   610,   611,
+     612,   613,   614,    30,    43,   621,   622,   623,   624,   625,
+     626,   627,   455,    31,    44,   630,   631,   632
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1728,149 +1730,151 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   497,   482,   454,   586,   455,   456,   469,   626,   627,
-     589,     3,     4,   631,   632,   470,   471,   613,   614,   615,
-     616,   617,   618,   633,   497,   592,   593,   594,   595,   596,
-     597,   598,   599,   600,   601,   634,   635,   636,   483,   484,
-     637,   638,   639,   640,   641,   642,     5,   643,   644,   645,
-     646,   647,     6,   648,   649,   650,   651,   652,   653,   654,
-     655,   656,   657,   485,   658,   659,   457,   547,   548,   549,
-     550,   551,   552,   553,   554,   555,   556,   557,   558,   559,
-     560,   561,   562,   563,   564,   565,   530,   531,   532,   533,
-     534,   535,   536,   537,   660,   661,     7,   458,   662,   663,
-     472,   664,   473,   665,   666,   667,   668,   459,   669,   670,
-     671,   672,     8,   673,   674,   675,   676,   677,   678,   679,
-     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
-     690,   691,   692,   693,   694,   695,   696,   697,   698,   486,
-     487,   699,   700,   701,   702,   703,   704,   705,   706,   707,
-     708,   709,   710,   711,   712,   713,   714,   715,   716,   717,
-     718,     9,   719,   720,   721,   722,   723,   724,   725,   726,
-     727,   728,   729,   730,   731,   732,   733,   734,   735,   488,
-     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,   773,   774,   775,
-      10,   499,   500,   501,   776,   777,   778,   779,   780,   781,
-     782,   504,   783,   784,   785,   786,   787,   460,    11,   788,
-     474,   789,   498,   790,   499,   500,   501,   502,   503,   514,
-     515,   516,   517,   518,   504,    12,   791,   792,   793,   794,
-     795,   796,   797,   798,    13,   799,   800,   801,   802,   803,
-     804,   805,   806,   807,   808,   809,   810,   811,   812,   813,
-     814,   815,   816,   817,   818,   819,   820,   821,    14,   822,
-     823,   824,    15,   825,   826,   827,     0,   828,    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,   829,   830,   831,   832,    77,    78,    79,   833,   834,
-     835,    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,   836,   837,   838,   839,   840,   841,   842,   843,
-     844,   121,   122,   123,   845,   124,   125,   126,   846,   847,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   848,   849,   850,   151,   152,   153,
-     154,   155,   156,   157,   158,   851,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   852,   853,   854,
-     855,   856,   857,   858,   859,   860,   861,   862,   863,   864,
-     865,   866,   867,   868,   869,   870,   871,   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,   208,   872,   209,   873,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   224,   874,   875,   876,   877,   878,   879,
-     880,   881,   882,   883,   884,   225,   226,   227,   228,   229,
-     230,   885,   886,   887,   888,   889,   890,   891,   231,   892,
-     893,   894,   895,   896,   897,   898,   232,   233,   899,   234,
-     235,   900,   236,   237,   901,   902,   238,   239,   240,   241,
-     242,   243,   244,   245,   903,   904,   905,   246,   906,   907,
-     908,   909,   910,   911,   912,   913,   247,   248,   914,   915,
-     916,   917,   918,   919,   920,   921,   922,   923,   924,   925,
-     926,   927,   928,   929,   930,   931,   932,   933,   934,   935,
-       0,     0,     0,   525,   526,     0,     0,     0,     0,     0,
+       2,   499,   484,   456,   588,   457,   458,   471,   628,   629,
+     591,     3,     4,   633,   634,   472,   473,   615,   616,   617,
+     618,   619,   620,   635,   499,   594,   595,   596,   597,   598,
+     599,   600,   601,   602,   603,   636,   637,   638,   485,   486,
+     639,   640,   641,   642,   643,   644,     5,   645,   646,   647,
+     648,   649,     6,   650,   651,   652,   653,   654,   655,   656,
+     657,   658,   659,   487,   660,   661,   459,   549,   550,   551,
+     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
+     562,   563,   564,   565,   566,   567,   532,   533,   534,   535,
+     536,   537,   538,   539,   662,   663,     7,   460,   664,   665,
+     474,   666,   475,   667,   668,   669,   670,   461,   671,   672,
+     673,   674,     8,   675,   676,   677,   678,   679,   680,   681,
+     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
+     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
+     488,   489,   702,   703,   704,   705,   706,   707,   708,   709,
+     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
+     720,   721,     9,   722,   723,   724,   725,   726,   727,   728,
+     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
+     490,   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,   773,   774,   775,   776,   777,
+     778,    10,   501,   502,   503,   779,   780,   781,   782,   783,
+     784,   785,   506,   786,   787,   788,   789,   790,   462,    11,
+     791,   476,   792,   500,   793,   501,   502,   503,   504,   505,
+     516,   517,   518,   519,   520,   506,    12,   794,   795,   796,
+     797,   798,   799,   800,   801,    13,   802,   803,   804,   805,
+     806,   807,   808,   809,   810,   811,   812,   813,   814,   815,
+     816,   817,   818,   819,   820,   821,   822,   823,   824,    14,
+     825,   826,   827,    15,   828,   829,   830,     0,   831,    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,   832,   833,   834,   835,    77,    78,    79,   836,
+     837,   838,    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,   839,   840,   841,   842,   843,   844,   845,
+     846,   847,   121,   122,   123,   848,   124,   125,   126,   849,
+     850,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   851,   852,   853,   151,   152,
+     153,   154,   155,   156,   157,   158,   854,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   855,
+     856,   857,   858,   859,   860,   861,   862,   863,   864,   865,
+     866,   867,   868,   869,   870,   871,   872,   873,   874,   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,   209,   875,   210,
+     876,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   877,   878,   879,   880,
+     881,   882,   883,   884,   885,   886,   887,   226,   227,   228,
+     229,   230,   231,   888,   889,   890,   891,   892,   893,   894,
+     232,   895,   896,   897,   898,   899,   900,   901,   233,   234,
+     902,   235,   236,   903,   237,   238,   904,   905,   239,   240,
+     241,   242,   243,   244,   245,   246,   906,   907,   908,   247,
+     909,   910,   911,   912,   913,   914,   915,   916,   248,   249,
+     917,   918,   919,   920,   921,   922,   923,   924,   925,   926,
+     927,   928,   929,   930,   931,   932,   933,   934,   935,   936,
+     937,   938,     0,     0,     0,   527,   528,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   527,   528,   529
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   529,
+     530,   531
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    45,    45,    45,   113,    47,    48,    45,   289,   290,
-     299,    11,    12,    10,    10,    53,    54,   256,   257,   258,
-     259,   260,   261,    10,    45,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   248,    10,    10,    10,    81,    82,
+       0,    45,    45,    45,   113,    47,    48,    45,   290,   291,
+     300,    11,    12,    10,    10,    53,    54,   257,   258,   259,
+     260,   261,   262,    10,    45,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,    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,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,    97,    98,    99,   100,
+      10,    10,    10,   106,    10,    10,   108,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,    97,    98,    99,   100,
      101,   102,   103,   104,    10,    10,    96,   139,    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,    10,    10,    10,
+     183,   184,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,   162,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+     223,    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,   221,   266,   267,   268,    10,    10,    10,    10,    10,
+      10,    10,   276,    10,    10,    10,    10,    10,   280,   239,
+      10,   279,    10,   264,    10,   266,   267,   268,   269,   270,
+     294,   295,   296,   297,   298,   276,   256,    10,    10,    10,
+      10,    10,    10,    10,    10,   265,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,   289,
+      10,    10,    10,   293,    10,    10,    10,    -1,    10,   299,
+      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,   160,   161,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,   182,
-     183,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,   161,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   222,
+     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,   219,   220,    10,   222,
+      10,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,   250,   251,   252,
+     253,   254,   255,    10,    10,    10,    10,    10,    10,    10,
+     263,    10,    10,    10,    10,    10,    10,    10,   271,   272,
+      10,   274,   275,    10,   277,   278,    10,    10,   281,   282,
+     283,   284,   285,   286,   287,   288,    10,    10,    10,   292,
+      10,    10,    10,    10,    10,    10,    10,    10,   301,   302,
       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,
-     220,   265,   266,   267,    10,    10,    10,    10,    10,    10,
-      10,   275,    10,    10,    10,    10,    10,   279,   238,    10,
-     278,    10,   263,    10,   265,   266,   267,   268,   269,   293,
-     294,   295,   296,   297,   275,   255,    10,    10,    10,    10,
-      10,    10,    10,    10,   264,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,   288,    10,
-      10,    10,   292,    10,    10,    10,    -1,    10,   298,    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,   160,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,   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,   219,    10,   221,    10,   223,
-     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,   249,   250,   251,   252,   253,
-     254,    10,    10,    10,    10,    10,    10,    10,   262,    10,
-      10,    10,    10,    10,    10,    10,   270,   271,    10,   273,
-     274,    10,   276,   277,    10,    10,   280,   281,   282,   283,
-     284,   285,   286,   287,    10,    10,    10,   291,    10,    10,
-      10,    10,    10,    10,    10,    10,   300,   301,    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,
+      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,    -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,   303,     0,    11,    12,    46,    52,    96,   112,   161,
-     220,   238,   255,   264,   288,   292,   298,   304,   305,   306,
-     309,   312,   315,   318,   326,   556,   567,   589,   593,   601,
-     614,   624,   307,   310,   313,   316,   319,   327,   557,   568,
-     590,   594,   602,   615,   625,    13,    14,    15,    16,    17,
+       0,   304,     0,    11,    12,    46,    52,    96,   112,   162,
+     221,   239,   256,   265,   289,   293,   299,   305,   306,   307,
+     310,   313,   316,   319,   327,   558,   569,   591,   595,   603,
+     616,   626,   308,   311,   314,   317,   320,   328,   559,   570,
+     592,   596,   604,   617,   627,    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,
@@ -1883,15 +1887,15 @@ static const yytype_uint16 yystos[] =
      127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
      137,   141,   142,   143,   144,   145,   146,   147,   148,   150,
      151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+     161,   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,   219,   221,
-     223,   224,   225,   226,   227,   228,   229,   230,   231,   232,
-     233,   234,   235,   236,   237,   249,   250,   251,   252,   253,
-     254,   262,   270,   271,   273,   274,   276,   277,   280,   281,
-     282,   283,   284,   285,   286,   287,   291,   300,   301,   308,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     211,   212,   213,   214,   215,   216,   217,   218,   219,   220,
+     222,   224,   225,   226,   227,   228,   229,   230,   231,   232,
+     233,   234,   235,   236,   237,   238,   250,   251,   252,   253,
+     254,   255,   263,   271,   272,   274,   275,   277,   278,   281,
+     282,   283,   284,   285,   286,   287,   288,   292,   301,   302,
+     309,   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,
@@ -1910,26 +1914,26 @@ 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,   524,   525,   526,   527,   597,
-     598,   599,   600,   623,    45,    47,    48,   108,   139,   149,
-     279,   311,   528,   529,   530,   531,   532,   533,   534,    45,
-      53,    54,   138,   140,   278,   314,   535,   536,   537,   538,
-     539,   540,    45,    81,    82,   106,   182,   183,   222,   317,
-     549,   550,   551,   552,   553,   554,   555,    45,   263,   265,
-     266,   267,   268,   269,   275,   320,   541,   542,   543,   544,
-     545,   546,   547,   548,   293,   294,   295,   296,   297,   321,
-     322,   323,   324,   325,   328,   541,   542,   543,   544,   545,
-      97,    98,    99,   100,   101,   102,   103,   104,   558,   559,
-     560,   561,   562,   563,   564,   565,   566,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   569,   570,   571,   572,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
+     529,   599,   600,   601,   602,   625,    45,    47,    48,   108,
+     139,   149,   280,   312,   530,   531,   532,   533,   534,   535,
+     536,    45,    53,    54,   138,   140,   279,   315,   537,   538,
+     539,   540,   541,   542,    45,    81,    82,   106,   183,   184,
+     223,   318,   551,   552,   553,   554,   555,   556,   557,    45,
+     264,   266,   267,   268,   269,   270,   276,   321,   543,   544,
+     545,   546,   547,   548,   549,   550,   294,   295,   296,   297,
+     298,   322,   323,   324,   325,   326,   329,   543,   544,   545,
+     546,   547,    97,    98,    99,   100,   101,   102,   103,   104,
+     560,   561,   562,   563,   564,   565,   566,   567,   568,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   571,   572,
      573,   574,   575,   576,   577,   578,   579,   580,   581,   582,
-     583,   584,   585,   586,   587,   588,   113,   591,   592,   299,
-     595,   596,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   603,   604,   605,   606,   607,   608,   609,   610,
-     611,   612,   613,   256,   257,   258,   259,   260,   261,   616,
-     617,   618,   619,   620,   621,   622,   289,   290,   626,   627,
-     628,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+     583,   584,   585,   586,   587,   588,   589,   590,   113,   593,
+     594,   300,   597,   598,   240,   241,   242,   243,   244,   245,
+     246,   247,   248,   249,   605,   606,   607,   608,   609,   610,
+     611,   612,   613,   614,   615,   257,   258,   259,   260,   261,
+     262,   618,   619,   620,   621,   622,   623,   624,   290,   291,
+     628,   629,   630,    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,
@@ -1959,41 +1963,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
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   302,   303,   303,   304,   304,   304,   304,   304,   304,
-     304,   304,   304,   304,   304,   304,   304,   304,   305,   306,
-     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,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-     308,   308,   308,   308,   308,   308,   309,   310,   310,   311,
-     311,   311,   311,   311,   311,   311,   312,   313,   313,   314,
-     314,   314,   314,   314,   314,   315,   316,   316,   317,   317,
-     317,   317,   317,   317,   317,   318,   319,   319,   320,   320,
-     320,   320,   320,   320,   320,   320,   321,   322,   323,   324,
-     325,   326,   327,   327,   328,   328,   328,   328,   328,   328,
-     328,   328,   328,   328,   329,   330,   331,   332,   333,   334,
+       0,   303,   304,   304,   305,   305,   305,   305,   305,   305,
+     305,   305,   305,   305,   305,   305,   305,   305,   306,   307,
+     308,   308,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+     309,   309,   309,   309,   309,   309,   309,   310,   311,   311,
+     312,   312,   312,   312,   312,   312,   312,   313,   314,   314,
+     315,   315,   315,   315,   315,   315,   316,   317,   317,   318,
+     318,   318,   318,   318,   318,   318,   319,   320,   320,   321,
+     321,   321,   321,   321,   321,   321,   321,   322,   323,   324,
+     325,   326,   327,   328,   328,   329,   329,   329,   329,   329,
+     329,   329,   329,   329,   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,
@@ -2016,19 +2020,19 @@ static const yytype_uint16 yyr1[] =
      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,
-     555,   556,   557,   557,   558,   558,   558,   558,   558,   558,
-     558,   558,   559,   560,   561,   562,   563,   564,   565,   566,
-     567,   568,   568,   569,   569,   569,   569,   569,   569,   569,
-     569,   569,   569,   569,   569,   569,   569,   569,   569,   569,
-     569,   569,   570,   571,   572,   573,   574,   575,   576,   577,
+     555,   556,   557,   558,   559,   559,   560,   560,   560,   560,
+     560,   560,   560,   560,   561,   562,   563,   564,   565,   566,
+     567,   568,   569,   570,   570,   571,   571,   571,   571,   571,
+     571,   571,   571,   571,   571,   571,   571,   571,   571,   571,
+     571,   571,   571,   571,   572,   573,   574,   575,   576,   577,
      578,   579,   580,   581,   582,   583,   584,   585,   586,   587,
-     588,   589,   590,   590,   591,   592,   593,   594,   594,   595,
-     596,   597,   598,   599,   600,   601,   602,   602,   603,   603,
-     603,   603,   603,   603,   603,   603,   603,   603,   604,   605,
+     588,   589,   590,   591,   592,   592,   593,   594,   595,   596,
+     596,   597,   598,   599,   600,   601,   602,   603,   604,   604,
+     605,   605,   605,   605,   605,   605,   605,   605,   605,   605,
      606,   607,   608,   609,   610,   611,   612,   613,   614,   615,
-     615,   616,   616,   616,   616,   616,   616,   617,   618,   619,
-     620,   621,   622,   623,   624,   625,   625,   626,   626,   627,
-     628
+     616,   617,   617,   618,   618,   618,   618,   618,   618,   619,
+     620,   621,   622,   623,   624,   625,   626,   627,   627,   628,
+     628,   629,   630
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -2056,13 +2060,13 @@ 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,     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,
@@ -2075,29 +2079,29 @@ static const yytype_uint8 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,     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,     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,     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
 };
 
 
@@ -2786,7 +2790,7 @@ yyreduce:
     {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2790 "util/configparser.c"
+#line 2794 "util/configparser.c"
     break;
 
   case 19:
@@ -2794,10 +2798,10 @@ yyreduce:
     { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2798 "util/configparser.c"
+#line 2802 "util/configparser.c"
     break;
 
-  case 226:
+  case 227:
 #line 298 "./util/configparser.y"
     {
 		struct config_stub* s;
@@ -2809,10 +2813,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2813 "util/configparser.c"
+#line 2817 "util/configparser.c"
     break;
 
-  case 236:
+  case 237:
 #line 315 "./util/configparser.y"
     {
 		struct config_stub* s;
@@ -2824,10 +2828,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2828 "util/configparser.c"
+#line 2832 "util/configparser.c"
     break;
 
-  case 245:
+  case 246:
 #line 332 "./util/configparser.y"
     {
 		struct config_view* s;
@@ -2841,10 +2845,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2845 "util/configparser.c"
+#line 2849 "util/configparser.c"
     break;
 
-  case 255:
+  case 256:
 #line 351 "./util/configparser.y"
     {
 		struct config_auth* s;
@@ -2861,10 +2865,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2865 "util/configparser.c"
+#line 2869 "util/configparser.c"
     break;
 
-  case 266:
+  case 267:
 #line 375 "./util/configparser.y"
     {
 		uint8_t* bitlist;
@@ -2882,10 +2886,10 @@ yyreduce:
 
 		}
 	}
-#line 2886 "util/configparser.c"
+#line 2890 "util/configparser.c"
     break;
 
-  case 267:
+  case 268:
 #line 394 "./util/configparser.y"
     {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
@@ -2901,20 +2905,20 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2905 "util/configparser.c"
+#line 2909 "util/configparser.c"
     break;
 
-  case 268:
+  case 269:
 #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 2915 "util/configparser.c"
+#line 2919 "util/configparser.c"
     break;
 
-  case 269:
+  case 270:
 #line 419 "./util/configparser.y"
     {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
@@ -2923,20 +2927,20 @@ yyreduce:
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2927 "util/configparser.c"
+#line 2931 "util/configparser.c"
     break;
 
-  case 270:
+  case 271:
 #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 2937 "util/configparser.c"
+#line 2941 "util/configparser.c"
     break;
 
-  case 271:
+  case 272:
 #line 437 "./util/configparser.y"
     {
 		struct config_auth* s;
@@ -2953,10 +2957,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2957 "util/configparser.c"
+#line 2961 "util/configparser.c"
     break;
 
-  case 284:
+  case 285:
 #line 460 "./util/configparser.y"
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
@@ -2965,10 +2969,10 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2969 "util/configparser.c"
+#line 2973 "util/configparser.c"
     break;
 
-  case 285:
+  case 286:
 #line 469 "./util/configparser.y"
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
@@ -2977,10 +2981,10 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2981 "util/configparser.c"
+#line 2985 "util/configparser.c"
     break;
 
-  case 286:
+  case 287:
 #line 478 "./util/configparser.y"
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
@@ -2991,10 +2995,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2995 "util/configparser.c"
+#line 2999 "util/configparser.c"
     break;
 
-  case 287:
+  case 288:
 #line 489 "./util/configparser.y"
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
@@ -3003,10 +3007,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3007 "util/configparser.c"
+#line 3011 "util/configparser.c"
     break;
 
-  case 288:
+  case 289:
 #line 498 "./util/configparser.y"
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
@@ -3015,10 +3019,10 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3019 "util/configparser.c"
+#line 3023 "util/configparser.c"
     break;
 
-  case 289:
+  case 290:
 #line 507 "./util/configparser.y"
     {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
@@ -3027,10 +3031,10 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3031 "util/configparser.c"
+#line 3035 "util/configparser.c"
     break;
 
-  case 290:
+  case 291:
 #line 516 "./util/configparser.y"
     { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
@@ -3041,10 +3045,10 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3045 "util/configparser.c"
+#line 3049 "util/configparser.c"
     break;
 
-  case 291:
+  case 292:
 #line 527 "./util/configparser.y"
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
@@ -3053,10 +3057,10 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3057 "util/configparser.c"
+#line 3061 "util/configparser.c"
     break;
 
-  case 292:
+  case 293:
 #line 536 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3068,10 +3072,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3072 "util/configparser.c"
+#line 3076 "util/configparser.c"
     break;
 
-  case 293:
+  case 294:
 #line 548 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3084,10 +3088,10 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3088 "util/configparser.c"
+#line 3092 "util/configparser.c"
     break;
 
-  case 294:
+  case 295:
 #line 562 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3102,10 +3106,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3106 "util/configparser.c"
+#line 3110 "util/configparser.c"
     break;
 
-  case 295:
+  case 296:
 #line 577 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3116,10 +3120,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3120 "util/configparser.c"
+#line 3124 "util/configparser.c"
     break;
 
-  case 296:
+  case 297:
 #line 588 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3136,10 +3140,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3140 "util/configparser.c"
+#line 3144 "util/configparser.c"
     break;
 
-  case 297:
+  case 298:
 #line 605 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3156,10 +3160,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3160 "util/configparser.c"
+#line 3164 "util/configparser.c"
     break;
 
-  case 298:
+  case 299:
 #line 622 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3176,10 +3180,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3180 "util/configparser.c"
+#line 3184 "util/configparser.c"
     break;
 
-  case 299:
+  case 300:
 #line 639 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3196,10 +3200,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3200 "util/configparser.c"
+#line 3204 "util/configparser.c"
     break;
 
-  case 300:
+  case 301:
 #line 656 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3214,10 +3218,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3218 "util/configparser.c"
+#line 3222 "util/configparser.c"
     break;
 
-  case 301:
+  case 302:
 #line 671 "./util/configparser.y"
     {
 	#ifdef CLIENT_SUBNET
@@ -3232,10 +3236,10 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3236 "util/configparser.c"
+#line 3240 "util/configparser.c"
     break;
 
-  case 302:
+  case 303:
 #line 686 "./util/configparser.y"
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
@@ -3248,10 +3252,10 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3252 "util/configparser.c"
+#line 3256 "util/configparser.c"
     break;
 
-  case 303:
+  case 304:
 #line 699 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
@@ -3266,10 +3270,10 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3270 "util/configparser.c"
+#line 3274 "util/configparser.c"
     break;
 
-  case 304:
+  case 305:
 #line 714 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
@@ -3278,10 +3282,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3282 "util/configparser.c"
+#line 3286 "util/configparser.c"
     break;
 
-  case 305:
+  case 306:
 #line 723 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
@@ -3290,10 +3294,10 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3294 "util/configparser.c"
+#line 3298 "util/configparser.c"
     break;
 
-  case 306:
+  case 307:
 #line 732 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
@@ -3302,10 +3306,10 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3306 "util/configparser.c"
+#line 3310 "util/configparser.c"
     break;
 
-  case 307:
+  case 308:
 #line 741 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -3314,10 +3318,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3318 "util/configparser.c"
+#line 3322 "util/configparser.c"
     break;
 
-  case 308:
+  case 309:
 #line 750 "./util/configparser.y"
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -3326,10 +3330,10 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3330 "util/configparser.c"
+#line 3334 "util/configparser.c"
     break;
 
-  case 309:
+  case 310:
 #line 759 "./util/configparser.y"
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
@@ -3338,10 +3342,10 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3342 "util/configparser.c"
+#line 3346 "util/configparser.c"
     break;
 
-  case 310:
+  case 311:
 #line 768 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
@@ -3350,10 +3354,10 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3354 "util/configparser.c"
+#line 3358 "util/configparser.c"
     break;
 
-  case 311:
+  case 312:
 #line 777 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
@@ -3362,10 +3366,10 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3366 "util/configparser.c"
+#line 3370 "util/configparser.c"
     break;
 
-  case 312:
+  case 313:
 #line 786 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
@@ -3374,10 +3378,10 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3378 "util/configparser.c"
+#line 3382 "util/configparser.c"
     break;
 
-  case 313:
+  case 314:
 #line 795 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
@@ -3386,10 +3390,10 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3390 "util/configparser.c"
+#line 3394 "util/configparser.c"
     break;
 
-  case 314:
+  case 315:
 #line 804 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
@@ -3398,10 +3402,10 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3402 "util/configparser.c"
+#line 3406 "util/configparser.c"
     break;
 
-  case 315:
+  case 316:
 #line 813 "./util/configparser.y"
     {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
@@ -3410,10 +3414,10 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3414 "util/configparser.c"
+#line 3418 "util/configparser.c"
     break;
 
-  case 316:
+  case 317:
 #line 822 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -3422,10 +3426,10 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 3426 "util/configparser.c"
+#line 3430 "util/configparser.c"
     break;
 
-  case 317:
+  case 318:
 #line 831 "./util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -3434,10 +3438,10 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3438 "util/configparser.c"
+#line 3442 "util/configparser.c"
     break;
 
-  case 318:
+  case 319:
 #line 840 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
@@ -3450,10 +3454,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3454 "util/configparser.c"
+#line 3458 "util/configparser.c"
     break;
 
-  case 319:
+  case 320:
 #line 853 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
@@ -3462,10 +3466,10 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3466 "util/configparser.c"
+#line 3470 "util/configparser.c"
     break;
 
-  case 320:
+  case 321:
 #line 862 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
@@ -3478,10 +3482,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3482 "util/configparser.c"
+#line 3486 "util/configparser.c"
     break;
 
-  case 321:
+  case 322:
 #line 875 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
@@ -3490,10 +3494,10 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3494 "util/configparser.c"
+#line 3498 "util/configparser.c"
     break;
 
-  case 322:
+  case 323:
 #line 884 "./util/configparser.y"
     {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
@@ -3502,10 +3506,10 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3506 "util/configparser.c"
+#line 3510 "util/configparser.c"
     break;
 
-  case 323:
+  case 324:
 #line 893 "./util/configparser.y"
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
@@ -3514,30 +3518,30 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3518 "util/configparser.c"
+#line 3522 "util/configparser.c"
     break;
 
-  case 324:
+  case 325:
 #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 3528 "util/configparser.c"
+#line 3532 "util/configparser.c"
     break;
 
-  case 325:
+  case 326:
 #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 3538 "util/configparser.c"
+#line 3542 "util/configparser.c"
     break;
 
-  case 326:
+  case 327:
 #line 916 "./util/configparser.y"
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
@@ -3546,20 +3550,20 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3550 "util/configparser.c"
+#line 3554 "util/configparser.c"
     break;
 
-  case 327:
+  case 328:
 #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 3560 "util/configparser.c"
+#line 3564 "util/configparser.c"
     break;
 
-  case 328:
+  case 329:
 #line 932 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
@@ -3568,10 +3572,10 @@ yyreduce:
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3572 "util/configparser.c"
+#line 3576 "util/configparser.c"
     break;
 
-  case 329:
+  case 330:
 #line 941 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
@@ -3579,30 +3583,30 @@ yyreduce:
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3583 "util/configparser.c"
+#line 3587 "util/configparser.c"
     break;
 
-  case 330:
+  case 331:
 #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 3593 "util/configparser.c"
+#line 3597 "util/configparser.c"
     break;
 
-  case 331:
+  case 332:
 #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 3603 "util/configparser.c"
+#line 3607 "util/configparser.c"
     break;
 
-  case 332:
+  case 333:
 #line 963 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
@@ -3610,10 +3614,10 @@ yyreduce:
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3614 "util/configparser.c"
+#line 3618 "util/configparser.c"
     break;
 
-  case 333:
+  case 334:
 #line 971 "./util/configparser.y"
     {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
@@ -3622,10 +3626,10 @@ yyreduce:
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3626 "util/configparser.c"
+#line 3630 "util/configparser.c"
     break;
 
-  case 334:
+  case 335:
 #line 980 "./util/configparser.y"
     {
 		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
@@ -3634,10 +3638,10 @@ yyreduce:
 		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3638 "util/configparser.c"
+#line 3642 "util/configparser.c"
     break;
 
-  case 335:
+  case 336:
 #line 988 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str)));
@@ -3654,10 +3658,10 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3658 "util/configparser.c"
+#line 3662 "util/configparser.c"
     break;
 
-  case 336:
+  case 337:
 #line 1004 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str)));
@@ -3666,10 +3670,10 @@ yyreduce:
 		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3670 "util/configparser.c"
+#line 3674 "util/configparser.c"
     break;
 
-  case 337:
+  case 338:
 #line 1012 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -3678,10 +3682,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3682 "util/configparser.c"
+#line 3686 "util/configparser.c"
     break;
 
-  case 338:
+  case 339:
 #line 1020 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -3690,10 +3694,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3694 "util/configparser.c"
+#line 3698 "util/configparser.c"
     break;
 
-  case 339:
+  case 340:
 #line 1028 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str)));
@@ -3702,10 +3706,10 @@ yyreduce:
 		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3706 "util/configparser.c"
+#line 3710 "util/configparser.c"
     break;
 
-  case 340:
+  case 341:
 #line 1036 "./util/configparser.y"
     {
 		OUTYY(("P(server_http_notls_downstream:%s)\n", (yyvsp[0].str)));
@@ -3714,10 +3718,10 @@ yyreduce:
 		else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3718 "util/configparser.c"
+#line 3722 "util/configparser.c"
     break;
 
-  case 341:
+  case 342:
 #line 1044 "./util/configparser.y"
     {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
@@ -3726,10 +3730,10 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3730 "util/configparser.c"
+#line 3734 "util/configparser.c"
     break;
 
-  case 342:
+  case 343:
 #line 1053 "./util/configparser.y"
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
@@ -3738,10 +3742,10 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3742 "util/configparser.c"
+#line 3746 "util/configparser.c"
     break;
 
-  case 343:
+  case 344:
 #line 1062 "./util/configparser.y"
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
@@ -3755,10 +3759,10 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3759 "util/configparser.c"
+#line 3763 "util/configparser.c"
     break;
 
-  case 344:
+  case 345:
 #line 1076 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
@@ -3767,10 +3771,10 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3771 "util/configparser.c"
+#line 3775 "util/configparser.c"
     break;
 
-  case 345:
+  case 346:
 #line 1085 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
@@ -3779,10 +3783,10 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3783 "util/configparser.c"
+#line 3787 "util/configparser.c"
     break;
 
-  case 346:
+  case 347:
 #line 1094 "./util/configparser.y"
     {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
@@ -3791,10 +3795,10 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3795 "util/configparser.c"
+#line 3799 "util/configparser.c"
     break;
 
-  case 347:
+  case 348:
 #line 1103 "./util/configparser.y"
     {
   	OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
@@ -3803,10 +3807,10 @@ yyreduce:
   	else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3807 "util/configparser.c"
+#line 3811 "util/configparser.c"
     break;
 
-  case 348:
+  case 349:
 #line 1112 "./util/configparser.y"
     {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
@@ -3815,10 +3819,10 @@ yyreduce:
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3819 "util/configparser.c"
+#line 3823 "util/configparser.c"
     break;
 
-  case 349:
+  case 350:
 #line 1121 "./util/configparser.y"
     {
   	OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
@@ -3827,30 +3831,30 @@ yyreduce:
   	else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 3831 "util/configparser.c"
+#line 3835 "util/configparser.c"
     break;
 
-  case 350:
+  case 351:
 #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 3841 "util/configparser.c"
+#line 3845 "util/configparser.c"
     break;
 
-  case 351:
+  case 352:
 #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 3851 "util/configparser.c"
+#line 3855 "util/configparser.c"
     break;
 
-  case 352:
+  case 353:
 #line 1144 "./util/configparser.y"
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
@@ -3876,10 +3880,10 @@ yyreduce:
 			}
 		}
 	}
-#line 3880 "util/configparser.c"
+#line 3884 "util/configparser.c"
     break;
 
-  case 353:
+  case 354:
 #line 1170 "./util/configparser.y"
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
@@ -3887,50 +3891,50 @@ yyreduce:
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3891 "util/configparser.c"
+#line 3895 "util/configparser.c"
     break;
 
-  case 354:
+  case 355:
 #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 3901 "util/configparser.c"
+#line 3905 "util/configparser.c"
     break;
 
-  case 355:
+  case 356:
 #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 3911 "util/configparser.c"
+#line 3915 "util/configparser.c"
     break;
 
-  case 356:
+  case 357:
 #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 3921 "util/configparser.c"
+#line 3925 "util/configparser.c"
     break;
 
-  case 357:
+  case 358:
 #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 3931 "util/configparser.c"
+#line 3935 "util/configparser.c"
     break;
 
-  case 358:
+  case 359:
 #line 1206 "./util/configparser.y"
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
@@ -3938,10 +3942,10 @@ yyreduce:
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3942 "util/configparser.c"
+#line 3946 "util/configparser.c"
     break;
 
-  case 359:
+  case 360:
 #line 1214 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
@@ -3949,10 +3953,10 @@ yyreduce:
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3953 "util/configparser.c"
+#line 3957 "util/configparser.c"
     break;
 
-  case 360:
+  case 361:
 #line 1222 "./util/configparser.y"
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
@@ -3960,20 +3964,20 @@ yyreduce:
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3964 "util/configparser.c"
+#line 3968 "util/configparser.c"
     break;
 
-  case 361:
+  case 362:
 #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 3974 "util/configparser.c"
+#line 3978 "util/configparser.c"
     break;
 
-  case 362:
+  case 363:
 #line 1237 "./util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
@@ -3984,10 +3988,10 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3988 "util/configparser.c"
+#line 3992 "util/configparser.c"
     break;
 
-  case 363:
+  case 364:
 #line 1248 "./util/configparser.y"
     {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
@@ -3998,20 +4002,20 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4002 "util/configparser.c"
+#line 4006 "util/configparser.c"
     break;
 
-  case 364:
+  case 365:
 #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 4012 "util/configparser.c"
+#line 4016 "util/configparser.c"
     break;
 
-  case 365:
+  case 366:
 #line 1266 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
@@ -4020,10 +4024,10 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4024 "util/configparser.c"
+#line 4028 "util/configparser.c"
     break;
 
-  case 366:
+  case 367:
 #line 1275 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
@@ -4032,10 +4036,10 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4036 "util/configparser.c"
+#line 4040 "util/configparser.c"
     break;
 
-  case 367:
+  case 368:
 #line 1284 "./util/configparser.y"
     {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
@@ -4044,30 +4048,30 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4048 "util/configparser.c"
+#line 4052 "util/configparser.c"
     break;
 
-  case 368:
+  case 369:
 #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 4058 "util/configparser.c"
+#line 4062 "util/configparser.c"
     break;
 
-  case 369:
+  case 370:
 #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 4068 "util/configparser.c"
+#line 4072 "util/configparser.c"
     break;
 
-  case 370:
+  case 371:
 #line 1307 "./util/configparser.y"
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
@@ -4075,10 +4079,10 @@ yyreduce:
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4079 "util/configparser.c"
+#line 4083 "util/configparser.c"
     break;
 
-  case 371:
+  case 372:
 #line 1315 "./util/configparser.y"
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
@@ -4086,10 +4090,10 @@ yyreduce:
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4090 "util/configparser.c"
+#line 4094 "util/configparser.c"
     break;
 
-  case 372:
+  case 373:
 #line 1323 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
@@ -4099,10 +4103,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4103 "util/configparser.c"
+#line 4107 "util/configparser.c"
     break;
 
-  case 373:
+  case 374:
 #line 1333 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
@@ -4112,10 +4116,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4116 "util/configparser.c"
+#line 4120 "util/configparser.c"
     break;
 
-  case 374:
+  case 375:
 #line 1343 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
@@ -4125,10 +4129,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4129 "util/configparser.c"
+#line 4133 "util/configparser.c"
     break;
 
-  case 375:
+  case 376:
 #line 1353 "./util/configparser.y"
     {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
@@ -4142,10 +4146,10 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4146 "util/configparser.c"
+#line 4150 "util/configparser.c"
     break;
 
-  case 376:
+  case 377:
 #line 1367 "./util/configparser.y"
     {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
@@ -4153,10 +4157,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4157 "util/configparser.c"
+#line 4161 "util/configparser.c"
     break;
 
-  case 377:
+  case 378:
 #line 1375 "./util/configparser.y"
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -4169,10 +4173,10 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4173 "util/configparser.c"
+#line 4177 "util/configparser.c"
     break;
 
-  case 378:
+  case 379:
 #line 1388 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -4183,10 +4187,10 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4187 "util/configparser.c"
+#line 4191 "util/configparser.c"
     break;
 
-  case 379:
+  case 380:
 #line 1399 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
@@ -4194,10 +4198,10 @@ yyreduce:
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4198 "util/configparser.c"
+#line 4202 "util/configparser.c"
     break;
 
-  case 380:
+  case 381:
 #line 1407 "./util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -4210,10 +4214,10 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4214 "util/configparser.c"
+#line 4218 "util/configparser.c"
     break;
 
-  case 381:
+  case 382:
 #line 1420 "./util/configparser.y"
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
@@ -4222,10 +4226,10 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4226 "util/configparser.c"
+#line 4230 "util/configparser.c"
     break;
 
-  case 382:
+  case 383:
 #line 1429 "./util/configparser.y"
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
@@ -4234,10 +4238,10 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4238 "util/configparser.c"
+#line 4242 "util/configparser.c"
     break;
 
-  case 383:
+  case 384:
 #line 1438 "./util/configparser.y"
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
@@ -4246,11 +4250,23 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4250 "util/configparser.c"
+#line 4254 "util/configparser.c"
     break;
 
-  case 384:
+  case 385:
 #line 1447 "./util/configparser.y"
+    {
+		OUTYY(("P(server_udp_connect:%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_connect = (strcmp((yyvsp[0].str), "yes")==0);
+		free((yyvsp[0].str));
+	}
+#line 4266 "util/configparser.c"
+    break;
+
+  case 386:
+#line 1456 "./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)
@@ -4259,11 +4275,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4263 "util/configparser.c"
+#line 4279 "util/configparser.c"
     break;
 
-  case 385:
-#line 1457 "./util/configparser.y"
+  case 387:
+#line 1466 "./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)
@@ -4272,22 +4288,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4276 "util/configparser.c"
+#line 4292 "util/configparser.c"
     break;
 
-  case 386:
-#line 1467 "./util/configparser.y"
+  case 388:
+#line 1476 "./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 4287 "util/configparser.c"
+#line 4303 "util/configparser.c"
     break;
 
-  case 387:
-#line 1475 "./util/configparser.y"
+  case 389:
+#line 1484 "./util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4299,11 +4315,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4303 "util/configparser.c"
+#line 4319 "util/configparser.c"
     break;
 
-  case 388:
-#line 1488 "./util/configparser.y"
+  case 390:
+#line 1497 "./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)
@@ -4311,22 +4327,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4315 "util/configparser.c"
+#line 4331 "util/configparser.c"
     break;
 
-  case 389:
-#line 1497 "./util/configparser.y"
+  case 391:
+#line 1506 "./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 4326 "util/configparser.c"
+#line 4342 "util/configparser.c"
     break;
 
-  case 390:
-#line 1505 "./util/configparser.y"
+  case 392:
+#line 1514 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4334,22 +4350,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4338 "util/configparser.c"
+#line 4354 "util/configparser.c"
     break;
 
-  case 391:
-#line 1514 "./util/configparser.y"
+  case 393:
+#line 1523 "./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 4349 "util/configparser.c"
+#line 4365 "util/configparser.c"
     break;
 
-  case 392:
-#line 1522 "./util/configparser.y"
+  case 394:
+#line 1531 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4361,11 +4377,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4365 "util/configparser.c"
+#line 4381 "util/configparser.c"
     break;
 
-  case 393:
-#line 1535 "./util/configparser.y"
+  case 395:
+#line 1544 "./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)
@@ -4373,11 +4389,11 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4377 "util/configparser.c"
+#line 4393 "util/configparser.c"
     break;
 
-  case 394:
-#line 1544 "./util/configparser.y"
+  case 396:
+#line 1553 "./util/configparser.y"
     {
 		OUTYY(("P(server_infra_keep_probing:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4386,21 +4402,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4390 "util/configparser.c"
+#line 4406 "util/configparser.c"
     break;
 
-  case 395:
-#line 1554 "./util/configparser.y"
+  case 397:
+#line 1563 "./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 4400 "util/configparser.c"
+#line 4416 "util/configparser.c"
     break;
 
-  case 396:
-#line 1561 "./util/configparser.y"
+  case 398:
+#line 1570 "./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)
@@ -4409,11 +4425,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4413 "util/configparser.c"
+#line 4429 "util/configparser.c"
     break;
 
-  case 397:
-#line 1571 "./util/configparser.y"
+  case 399:
+#line 1580 "./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)
@@ -4422,11 +4438,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4426 "util/configparser.c"
+#line 4442 "util/configparser.c"
     break;
 
-  case 398:
-#line 1581 "./util/configparser.y"
+  case 400:
+#line 1590 "./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)
@@ -4435,11 +4451,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4439 "util/configparser.c"
+#line 4455 "util/configparser.c"
     break;
 
-  case 399:
-#line 1591 "./util/configparser.y"
+  case 401:
+#line 1600 "./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)
@@ -4448,11 +4464,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4452 "util/configparser.c"
+#line 4468 "util/configparser.c"
     break;
 
-  case 400:
-#line 1601 "./util/configparser.y"
+  case 402:
+#line 1610 "./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)
@@ -4461,11 +4477,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4465 "util/configparser.c"
+#line 4481 "util/configparser.c"
     break;
 
-  case 401:
-#line 1611 "./util/configparser.y"
+  case 403:
+#line 1620 "./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)
@@ -4474,11 +4490,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4478 "util/configparser.c"
+#line 4494 "util/configparser.c"
     break;
 
-  case 402:
-#line 1621 "./util/configparser.y"
+  case 404:
+#line 1630 "./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)
@@ -4487,11 +4503,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4491 "util/configparser.c"
+#line 4507 "util/configparser.c"
     break;
 
-  case 403:
-#line 1631 "./util/configparser.y"
+  case 405:
+#line 1640 "./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)
@@ -4500,41 +4516,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4504 "util/configparser.c"
+#line 4520 "util/configparser.c"
     break;
 
-  case 404:
-#line 1641 "./util/configparser.y"
+  case 406:
+#line 1650 "./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 4514 "util/configparser.c"
+#line 4530 "util/configparser.c"
     break;
 
-  case 405:
-#line 1648 "./util/configparser.y"
+  case 407:
+#line 1657 "./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 4524 "util/configparser.c"
+#line 4540 "util/configparser.c"
     break;
 
-  case 406:
-#line 1655 "./util/configparser.y"
+  case 408:
+#line 1664 "./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 4534 "util/configparser.c"
+#line 4550 "util/configparser.c"
     break;
 
-  case 407:
-#line 1662 "./util/configparser.y"
+  case 409:
+#line 1671 "./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)
@@ -4542,11 +4558,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4546 "util/configparser.c"
+#line 4562 "util/configparser.c"
     break;
 
-  case 408:
-#line 1671 "./util/configparser.y"
+  case 410:
+#line 1680 "./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)
@@ -4554,11 +4570,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4558 "util/configparser.c"
+#line 4574 "util/configparser.c"
     break;
 
-  case 409:
-#line 1680 "./util/configparser.y"
+  case 411:
+#line 1689 "./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)
@@ -4566,11 +4582,11 @@ yyreduce:
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4570 "util/configparser.c"
+#line 4586 "util/configparser.c"
     break;
 
-  case 410:
-#line 1689 "./util/configparser.y"
+  case 412:
+#line 1698 "./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)
@@ -4578,21 +4594,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4582 "util/configparser.c"
+#line 4598 "util/configparser.c"
     break;
 
-  case 411:
-#line 1698 "./util/configparser.y"
+  case 413:
+#line 1707 "./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 4592 "util/configparser.c"
+#line 4608 "util/configparser.c"
     break;
 
-  case 412:
-#line 1705 "./util/configparser.y"
+  case 414:
+#line 1714 "./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)
@@ -4601,11 +4617,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4605 "util/configparser.c"
+#line 4621 "util/configparser.c"
     break;
 
-  case 413:
-#line 1715 "./util/configparser.y"
+  case 415:
+#line 1724 "./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 &&
@@ -4624,21 +4640,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4628 "util/configparser.c"
+#line 4644 "util/configparser.c"
     break;
 
-  case 414:
-#line 1735 "./util/configparser.y"
+  case 416:
+#line 1744 "./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 4638 "util/configparser.c"
+#line 4654 "util/configparser.c"
     break;
 
-  case 415:
-#line 1742 "./util/configparser.y"
+  case 417:
+#line 1751 "./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) {
@@ -4655,11 +4671,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4659 "util/configparser.c"
+#line 4675 "util/configparser.c"
     break;
 
-  case 416:
-#line 1760 "./util/configparser.y"
+  case 418:
+#line 1769 "./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) {
@@ -4671,11 +4687,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4675 "util/configparser.c"
+#line 4691 "util/configparser.c"
     break;
 
-  case 417:
-#line 1773 "./util/configparser.y"
+  case 419:
+#line 1782 "./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) {
@@ -4687,11 +4703,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4691 "util/configparser.c"
+#line 4707 "util/configparser.c"
     break;
 
-  case 418:
-#line 1786 "./util/configparser.y"
+  case 420:
+#line 1795 "./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)
@@ -4699,11 +4715,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4703 "util/configparser.c"
+#line 4719 "util/configparser.c"
     break;
 
-  case 419:
-#line 1795 "./util/configparser.y"
+  case 421:
+#line 1804 "./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)
@@ -4711,11 +4727,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4715 "util/configparser.c"
+#line 4731 "util/configparser.c"
     break;
 
-  case 420:
-#line 1804 "./util/configparser.y"
+  case 422:
+#line 1813 "./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)
@@ -4723,11 +4739,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4727 "util/configparser.c"
+#line 4743 "util/configparser.c"
     break;
 
-  case 421:
-#line 1813 "./util/configparser.y"
+  case 423:
+#line 1822 "./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)
@@ -4735,11 +4751,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4739 "util/configparser.c"
+#line 4755 "util/configparser.c"
     break;
 
-  case 422:
-#line 1822 "./util/configparser.y"
+  case 424:
+#line 1831 "./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)
@@ -4748,11 +4764,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4752 "util/configparser.c"
+#line 4768 "util/configparser.c"
     break;
 
-  case 423:
-#line 1832 "./util/configparser.y"
+  case 425:
+#line 1841 "./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)
@@ -4761,11 +4777,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4765 "util/configparser.c"
+#line 4781 "util/configparser.c"
     break;
 
-  case 424:
-#line 1842 "./util/configparser.y"
+  case 426:
+#line 1851 "./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)
@@ -4775,11 +4791,11 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4779 "util/configparser.c"
+#line 4795 "util/configparser.c"
     break;
 
-  case 425:
-#line 1853 "./util/configparser.y"
+  case 427:
+#line 1862 "./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)
@@ -4787,11 +4803,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4791 "util/configparser.c"
+#line 4807 "util/configparser.c"
     break;
 
-  case 426:
-#line 1862 "./util/configparser.y"
+  case 428:
+#line 1871 "./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)
@@ -4799,11 +4815,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4803 "util/configparser.c"
+#line 4819 "util/configparser.c"
     break;
 
-  case 427:
-#line 1871 "./util/configparser.y"
+  case 429:
+#line 1880 "./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)
@@ -4811,11 +4827,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4815 "util/configparser.c"
+#line 4831 "util/configparser.c"
     break;
 
-  case 428:
-#line 1880 "./util/configparser.y"
+  case 430:
+#line 1889 "./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)
@@ -4823,11 +4839,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4827 "util/configparser.c"
+#line 4843 "util/configparser.c"
     break;
 
-  case 429:
-#line 1889 "./util/configparser.y"
+  case 431:
+#line 1898 "./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)
@@ -4835,11 +4851,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4839 "util/configparser.c"
+#line 4855 "util/configparser.c"
     break;
 
-  case 430:
-#line 1898 "./util/configparser.y"
+  case 432:
+#line 1907 "./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)
@@ -4847,11 +4863,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4851 "util/configparser.c"
+#line 4867 "util/configparser.c"
     break;
 
-  case 431:
-#line 1907 "./util/configparser.y"
+  case 433:
+#line 1916 "./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)
@@ -4863,11 +4879,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4867 "util/configparser.c"
+#line 4883 "util/configparser.c"
     break;
 
-  case 432:
-#line 1920 "./util/configparser.y"
+  case 434:
+#line 1929 "./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)
@@ -4879,11 +4895,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4883 "util/configparser.c"
+#line 4899 "util/configparser.c"
     break;
 
-  case 433:
-#line 1933 "./util/configparser.y"
+  case 435:
+#line 1942 "./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)
@@ -4891,21 +4907,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4895 "util/configparser.c"
+#line 4911 "util/configparser.c"
     break;
 
-  case 434:
-#line 1942 "./util/configparser.y"
+  case 436:
+#line 1951 "./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 4905 "util/configparser.c"
+#line 4921 "util/configparser.c"
     break;
 
-  case 435:
-#line 1949 "./util/configparser.y"
+  case 437:
+#line 1958 "./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)
@@ -4913,11 +4929,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4917 "util/configparser.c"
+#line 4933 "util/configparser.c"
     break;
 
-  case 436:
-#line 1958 "./util/configparser.y"
+  case 438:
+#line 1967 "./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)
@@ -4925,11 +4941,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4929 "util/configparser.c"
+#line 4945 "util/configparser.c"
     break;
 
-  case 437:
-#line 1967 "./util/configparser.y"
+  case 439:
+#line 1976 "./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)
@@ -4937,11 +4953,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4941 "util/configparser.c"
+#line 4957 "util/configparser.c"
     break;
 
-  case 438:
-#line 1976 "./util/configparser.y"
+  case 440:
+#line 1985 "./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)
@@ -4950,22 +4966,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4954 "util/configparser.c"
+#line 4970 "util/configparser.c"
     break;
 
-  case 439:
-#line 1985 "./util/configparser.y"
+  case 441:
+#line 1994 "./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 4965 "util/configparser.c"
+#line 4981 "util/configparser.c"
     break;
 
-  case 440:
-#line 1993 "./util/configparser.y"
+  case 442:
+#line 2002 "./util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4977,22 +4993,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4981 "util/configparser.c"
+#line 4997 "util/configparser.c"
     break;
 
-  case 441:
-#line 2006 "./util/configparser.y"
+  case 443:
+#line 2015 "./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 4992 "util/configparser.c"
+#line 5008 "util/configparser.c"
     break;
 
-  case 442:
-#line 2014 "./util/configparser.y"
+  case 444:
+#line 2023 "./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 &&
@@ -5032,21 +5048,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5036 "util/configparser.c"
+#line 5052 "util/configparser.c"
     break;
 
-  case 443:
-#line 2055 "./util/configparser.y"
+  case 445:
+#line 2064 "./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 5046 "util/configparser.c"
+#line 5062 "util/configparser.c"
     break;
 
-  case 444:
-#line 2062 "./util/configparser.y"
+  case 446:
+#line 2071 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5060,11 +5076,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5064 "util/configparser.c"
+#line 5080 "util/configparser.c"
     break;
 
-  case 445:
-#line 2077 "./util/configparser.y"
+  case 447:
+#line 2086 "./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)
@@ -5073,11 +5089,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5077 "util/configparser.c"
+#line 5093 "util/configparser.c"
     break;
 
-  case 446:
-#line 2087 "./util/configparser.y"
+  case 448:
+#line 2096 "./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)
@@ -5086,41 +5102,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5090 "util/configparser.c"
+#line 5106 "util/configparser.c"
     break;
 
-  case 447:
-#line 2097 "./util/configparser.y"
+  case 449:
+#line 2106 "./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 5100 "util/configparser.c"
+#line 5116 "util/configparser.c"
     break;
 
-  case 448:
-#line 2104 "./util/configparser.y"
+  case 450:
+#line 2113 "./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 5110 "util/configparser.c"
+#line 5126 "util/configparser.c"
     break;
 
-  case 449:
-#line 2111 "./util/configparser.y"
+  case 451:
+#line 2120 "./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 5120 "util/configparser.c"
+#line 5136 "util/configparser.c"
     break;
 
-  case 450:
-#line 2118 "./util/configparser.y"
+  case 452:
+#line 2127 "./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)
@@ -5128,22 +5144,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5132 "util/configparser.c"
+#line 5148 "util/configparser.c"
     break;
 
-  case 451:
-#line 2127 "./util/configparser.y"
+  case 453:
+#line 2136 "./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 5143 "util/configparser.c"
+#line 5159 "util/configparser.c"
     break;
 
-  case 452:
-#line 2135 "./util/configparser.y"
+  case 454:
+#line 2144 "./util/configparser.y"
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -5156,11 +5172,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5160 "util/configparser.c"
+#line 5176 "util/configparser.c"
     break;
 
-  case 453:
-#line 2149 "./util/configparser.y"
+  case 455:
+#line 2158 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5180,11 +5196,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5184 "util/configparser.c"
+#line 5200 "util/configparser.c"
     break;
 
-  case 454:
-#line 2170 "./util/configparser.y"
+  case 456:
+#line 2179 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5204,11 +5220,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5208 "util/configparser.c"
+#line 5224 "util/configparser.c"
     break;
 
-  case 455:
-#line 2191 "./util/configparser.y"
+  case 457:
+#line 2200 "./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,
@@ -5219,11 +5235,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5223 "util/configparser.c"
+#line 5239 "util/configparser.c"
     break;
 
-  case 456:
-#line 2203 "./util/configparser.y"
+  case 458:
+#line 2212 "./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,
@@ -5234,11 +5250,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5238 "util/configparser.c"
+#line 5254 "util/configparser.c"
     break;
 
-  case 457:
-#line 2215 "./util/configparser.y"
+  case 459:
+#line 2224 "./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,
@@ -5249,11 +5265,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5253 "util/configparser.c"
+#line 5269 "util/configparser.c"
     break;
 
-  case 458:
-#line 2227 "./util/configparser.y"
+  case 460:
+#line 2236 "./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,
@@ -5261,11 +5277,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5265 "util/configparser.c"
+#line 5281 "util/configparser.c"
     break;
 
-  case 459:
-#line 2236 "./util/configparser.y"
+  case 461:
+#line 2245 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5285,11 +5301,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5289 "util/configparser.c"
+#line 5305 "util/configparser.c"
     break;
 
-  case 460:
-#line 2257 "./util/configparser.y"
+  case 462:
+#line 2266 "./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)
@@ -5297,11 +5313,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5301 "util/configparser.c"
+#line 5317 "util/configparser.c"
     break;
 
-  case 461:
-#line 2267 "./util/configparser.y"
+  case 463:
+#line 2276 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5309,33 +5325,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5313 "util/configparser.c"
+#line 5329 "util/configparser.c"
     break;
 
-  case 462:
-#line 2276 "./util/configparser.y"
+  case 464:
+#line 2285 "./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 5324 "util/configparser.c"
+#line 5340 "util/configparser.c"
     break;
 
-  case 463:
-#line 2284 "./util/configparser.y"
+  case 465:
+#line 2293 "./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 5335 "util/configparser.c"
+#line 5351 "util/configparser.c"
     break;
 
-  case 464:
-#line 2292 "./util/configparser.y"
+  case 466:
+#line 2301 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5347,11 +5363,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5351 "util/configparser.c"
+#line 5367 "util/configparser.c"
     break;
 
-  case 465:
-#line 2305 "./util/configparser.y"
+  case 467:
+#line 2314 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5363,11 +5379,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5367 "util/configparser.c"
+#line 5383 "util/configparser.c"
     break;
 
-  case 466:
-#line 2318 "./util/configparser.y"
+  case 468:
+#line 2327 "./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) {
@@ -5381,11 +5397,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5385 "util/configparser.c"
+#line 5401 "util/configparser.c"
     break;
 
-  case 467:
-#line 2333 "./util/configparser.y"
+  case 469:
+#line 2342 "./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) {
@@ -5399,11 +5415,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5403 "util/configparser.c"
+#line 5419 "util/configparser.c"
     break;
 
-  case 468:
-#line 2348 "./util/configparser.y"
+  case 470:
+#line 2357 "./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)
@@ -5411,11 +5427,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5415 "util/configparser.c"
+#line 5431 "util/configparser.c"
     break;
 
-  case 469:
-#line 2357 "./util/configparser.y"
+  case 471:
+#line 2366 "./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)
@@ -5423,20 +5439,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5427 "util/configparser.c"
+#line 5443 "util/configparser.c"
     break;
 
-  case 470:
-#line 2366 "./util/configparser.y"
+  case 472:
+#line 2375 "./util/configparser.y"
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5436 "util/configparser.c"
+#line 5452 "util/configparser.c"
     break;
 
-  case 471:
-#line 2372 "./util/configparser.y"
+  case 473:
+#line 2381 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5444,11 +5460,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5448 "util/configparser.c"
+#line 5464 "util/configparser.c"
     break;
 
-  case 472:
-#line 2381 "./util/configparser.y"
+  case 474:
+#line 2390 "./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)
@@ -5456,11 +5472,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5460 "util/configparser.c"
+#line 5476 "util/configparser.c"
     break;
 
-  case 473:
-#line 2390 "./util/configparser.y"
+  case 475:
+#line 2399 "./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)
@@ -5469,11 +5485,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5473 "util/configparser.c"
+#line 5489 "util/configparser.c"
     break;
 
-  case 474:
-#line 2400 "./util/configparser.y"
+  case 476:
+#line 2409 "./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)
@@ -5482,11 +5498,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5486 "util/configparser.c"
+#line 5502 "util/configparser.c"
     break;
 
-  case 475:
-#line 2410 "./util/configparser.y"
+  case 477:
+#line 2419 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5498,11 +5514,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5502 "util/configparser.c"
+#line 5518 "util/configparser.c"
     break;
 
-  case 476:
-#line 2423 "./util/configparser.y"
+  case 478:
+#line 2432 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5514,11 +5530,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5518 "util/configparser.c"
+#line 5534 "util/configparser.c"
     break;
 
-  case 477:
-#line 2436 "./util/configparser.y"
+  case 479:
+#line 2445 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5529,11 +5545,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5533 "util/configparser.c"
+#line 5549 "util/configparser.c"
     break;
 
-  case 478:
-#line 2448 "./util/configparser.y"
+  case 480:
+#line 2457 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5546,11 +5562,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5550 "util/configparser.c"
+#line 5566 "util/configparser.c"
     break;
 
-  case 479:
-#line 2462 "./util/configparser.y"
+  case 481:
+#line 2471 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5561,11 +5577,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5565 "util/configparser.c"
+#line 5581 "util/configparser.c"
     break;
 
-  case 480:
-#line 2474 "./util/configparser.y"
+  case 482:
+#line 2483 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5578,11 +5594,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5582 "util/configparser.c"
+#line 5598 "util/configparser.c"
     break;
 
-  case 481:
-#line 2488 "./util/configparser.y"
+  case 483:
+#line 2497 "./util/configparser.y"
     {
 		int tag_data;
 		OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -5596,11 +5612,11 @@ yyreduce:
 			fatal_exit("out of memory adding "
 				"edns-client-tag");
 	}
-#line 5600 "util/configparser.c"
+#line 5616 "util/configparser.c"
     break;
 
-  case 482:
-#line 2503 "./util/configparser.y"
+  case 484:
+#line 2512 "./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)
@@ -5610,11 +5626,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_client_tag_opcode = atoi((yyvsp[0].str));
 
 	}
-#line 5614 "util/configparser.c"
+#line 5630 "util/configparser.c"
     break;
 
-  case 483:
-#line 2514 "./util/configparser.y"
+  case 485:
+#line 2523 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5623,31 +5639,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5627 "util/configparser.c"
+#line 5643 "util/configparser.c"
     break;
 
-  case 484:
-#line 2524 "./util/configparser.y"
+  case 486:
+#line 2533 "./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 5637 "util/configparser.c"
+#line 5653 "util/configparser.c"
     break;
 
-  case 485:
-#line 2531 "./util/configparser.y"
+  case 487:
+#line 2540 "./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 5647 "util/configparser.c"
+#line 5663 "util/configparser.c"
     break;
 
-  case 486:
-#line 2538 "./util/configparser.y"
+  case 488:
+#line 2547 "./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)
@@ -5655,11 +5671,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5659 "util/configparser.c"
+#line 5675 "util/configparser.c"
     break;
 
-  case 487:
-#line 2547 "./util/configparser.y"
+  case 489:
+#line 2556 "./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)
@@ -5667,11 +5683,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5671 "util/configparser.c"
+#line 5687 "util/configparser.c"
     break;
 
-  case 488:
-#line 2556 "./util/configparser.y"
+  case 490:
+#line 2565 "./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)
@@ -5680,11 +5696,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5684 "util/configparser.c"
+#line 5700 "util/configparser.c"
     break;
 
-  case 489:
-#line 2566 "./util/configparser.y"
+  case 491:
+#line 2575 "./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)
@@ -5693,11 +5709,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5697 "util/configparser.c"
+#line 5713 "util/configparser.c"
     break;
 
-  case 490:
-#line 2576 "./util/configparser.y"
+  case 492:
+#line 2585 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5706,31 +5722,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5710 "util/configparser.c"
+#line 5726 "util/configparser.c"
     break;
 
-  case 491:
-#line 2586 "./util/configparser.y"
+  case 493:
+#line 2595 "./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 5720 "util/configparser.c"
+#line 5736 "util/configparser.c"
     break;
 
-  case 492:
-#line 2593 "./util/configparser.y"
+  case 494:
+#line 2602 "./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 5730 "util/configparser.c"
+#line 5746 "util/configparser.c"
     break;
 
-  case 493:
-#line 2600 "./util/configparser.y"
+  case 495:
+#line 2609 "./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)
@@ -5738,11 +5754,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5742 "util/configparser.c"
+#line 5758 "util/configparser.c"
     break;
 
-  case 494:
-#line 2609 "./util/configparser.y"
+  case 496:
+#line 2618 "./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)
@@ -5750,11 +5766,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5754 "util/configparser.c"
+#line 5770 "util/configparser.c"
     break;
 
-  case 495:
-#line 2618 "./util/configparser.y"
+  case 497:
+#line 2627 "./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)
@@ -5763,11 +5779,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5767 "util/configparser.c"
+#line 5783 "util/configparser.c"
     break;
 
-  case 496:
-#line 2628 "./util/configparser.y"
+  case 498:
+#line 2637 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5776,52 +5792,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5780 "util/configparser.c"
+#line 5796 "util/configparser.c"
     break;
 
-  case 497:
-#line 2638 "./util/configparser.y"
+  case 499:
+#line 2647 "./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 5790 "util/configparser.c"
+#line 5806 "util/configparser.c"
     break;
 
-  case 498:
-#line 2645 "./util/configparser.y"
+  case 500:
+#line 2654 "./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 5800 "util/configparser.c"
+#line 5816 "util/configparser.c"
     break;
 
-  case 499:
-#line 2652 "./util/configparser.y"
+  case 501:
+#line 2661 "./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 5810 "util/configparser.c"
+#line 5826 "util/configparser.c"
     break;
 
-  case 500:
-#line 2659 "./util/configparser.y"
+  case 502:
+#line 2668 "./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 5821 "util/configparser.c"
+#line 5837 "util/configparser.c"
     break;
 
-  case 501:
-#line 2667 "./util/configparser.y"
+  case 503:
+#line 2676 "./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)
@@ -5830,11 +5846,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5834 "util/configparser.c"
+#line 5850 "util/configparser.c"
     break;
 
-  case 502:
-#line 2677 "./util/configparser.y"
+  case 504:
+#line 2686 "./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)
@@ -5843,11 +5859,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5847 "util/configparser.c"
+#line 5863 "util/configparser.c"
     break;
 
-  case 503:
-#line 2687 "./util/configparser.y"
+  case 505:
+#line 2696 "./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)
@@ -5856,11 +5872,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5860 "util/configparser.c"
+#line 5876 "util/configparser.c"
     break;
 
-  case 504:
-#line 2697 "./util/configparser.y"
+  case 506:
+#line 2706 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5869,11 +5885,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5873 "util/configparser.c"
+#line 5889 "util/configparser.c"
     break;
 
-  case 505:
-#line 2707 "./util/configparser.y"
+  case 507:
+#line 2716 "./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 &&
@@ -5911,11 +5927,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5915 "util/configparser.c"
+#line 5931 "util/configparser.c"
     break;
 
-  case 506:
-#line 2746 "./util/configparser.y"
+  case 508:
+#line 2755 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5924,33 +5940,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5928 "util/configparser.c"
+#line 5944 "util/configparser.c"
     break;
 
-  case 507:
-#line 2756 "./util/configparser.y"
+  case 509:
+#line 2765 "./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 5939 "util/configparser.c"
+#line 5955 "util/configparser.c"
     break;
 
-  case 508:
-#line 2764 "./util/configparser.y"
+  case 510:
+#line 2773 "./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 5950 "util/configparser.c"
+#line 5966 "util/configparser.c"
     break;
 
-  case 509:
-#line 2772 "./util/configparser.y"
+  case 511:
+#line 2781 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5964,11 +5980,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5968 "util/configparser.c"
+#line 5984 "util/configparser.c"
     break;
 
-  case 510:
-#line 2787 "./util/configparser.y"
+  case 512:
+#line 2796 "./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)
@@ -5976,19 +5992,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5980 "util/configparser.c"
+#line 5996 "util/configparser.c"
     break;
 
-  case 511:
-#line 2796 "./util/configparser.y"
+  case 513:
+#line 2805 "./util/configparser.y"
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 5988 "util/configparser.c"
+#line 6004 "util/configparser.c"
     break;
 
-  case 522:
-#line 2807 "./util/configparser.y"
+  case 524:
+#line 2816 "./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)
@@ -5997,11 +6013,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6001 "util/configparser.c"
+#line 6017 "util/configparser.c"
     break;
 
-  case 523:
-#line 2817 "./util/configparser.y"
+  case 525:
+#line 2826 "./util/configparser.y"
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6009,79 +6025,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6013 "util/configparser.c"
+#line 6029 "util/configparser.c"
     break;
 
-  case 524:
-#line 2826 "./util/configparser.y"
+  case 526:
+#line 2835 "./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 6023 "util/configparser.c"
+#line 6039 "util/configparser.c"
     break;
 
-  case 525:
-#line 2833 "./util/configparser.y"
+  case 527:
+#line 2842 "./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 6033 "util/configparser.c"
+#line 6049 "util/configparser.c"
     break;
 
-  case 526:
-#line 2840 "./util/configparser.y"
+  case 528:
+#line 2849 "./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 6043 "util/configparser.c"
+#line 6059 "util/configparser.c"
     break;
 
-  case 527:
-#line 2847 "./util/configparser.y"
+  case 529:
+#line 2856 "./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 6053 "util/configparser.c"
+#line 6069 "util/configparser.c"
     break;
 
-  case 528:
-#line 2854 "./util/configparser.y"
+  case 530:
+#line 2863 "./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 6063 "util/configparser.c"
+#line 6079 "util/configparser.c"
     break;
 
-  case 529:
-#line 2861 "./util/configparser.y"
+  case 531:
+#line 2870 "./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 6073 "util/configparser.c"
+#line 6089 "util/configparser.c"
     break;
 
-  case 530:
-#line 2868 "./util/configparser.y"
+  case 532:
+#line 2877 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6081 "util/configparser.c"
+#line 6097 "util/configparser.c"
     break;
 
-  case 552:
-#line 2888 "./util/configparser.y"
+  case 554:
+#line 2897 "./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)
@@ -6089,11 +6105,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6093 "util/configparser.c"
+#line 6109 "util/configparser.c"
     break;
 
-  case 553:
-#line 2897 "./util/configparser.y"
+  case 555:
+#line 2906 "./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)
@@ -6102,31 +6118,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6106 "util/configparser.c"
+#line 6122 "util/configparser.c"
     break;
 
-  case 554:
-#line 2907 "./util/configparser.y"
+  case 556:
+#line 2916 "./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 6116 "util/configparser.c"
+#line 6132 "util/configparser.c"
     break;
 
-  case 555:
-#line 2914 "./util/configparser.y"
+  case 557:
+#line 2923 "./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 6126 "util/configparser.c"
+#line 6142 "util/configparser.c"
     break;
 
-  case 556:
-#line 2921 "./util/configparser.y"
+  case 558:
+#line 2930 "./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)
@@ -6134,51 +6150,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6138 "util/configparser.c"
+#line 6154 "util/configparser.c"
     break;
 
-  case 557:
-#line 2930 "./util/configparser.y"
+  case 559:
+#line 2939 "./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 6148 "util/configparser.c"
+#line 6164 "util/configparser.c"
     break;
 
-  case 558:
-#line 2937 "./util/configparser.y"
+  case 560:
+#line 2946 "./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 6158 "util/configparser.c"
+#line 6174 "util/configparser.c"
     break;
 
-  case 559:
-#line 2944 "./util/configparser.y"
+  case 561:
+#line 2953 "./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 6168 "util/configparser.c"
+#line 6184 "util/configparser.c"
     break;
 
-  case 560:
-#line 2951 "./util/configparser.y"
+  case 562:
+#line 2960 "./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 6178 "util/configparser.c"
+#line 6194 "util/configparser.c"
     break;
 
-  case 561:
-#line 2958 "./util/configparser.y"
+  case 563:
+#line 2967 "./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)
@@ -6186,11 +6202,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6190 "util/configparser.c"
+#line 6206 "util/configparser.c"
     break;
 
-  case 562:
-#line 2967 "./util/configparser.y"
+  case 564:
+#line 2976 "./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)
@@ -6198,31 +6214,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6202 "util/configparser.c"
+#line 6218 "util/configparser.c"
     break;
 
-  case 563:
-#line 2976 "./util/configparser.y"
+  case 565:
+#line 2985 "./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 6212 "util/configparser.c"
+#line 6228 "util/configparser.c"
     break;
 
-  case 564:
-#line 2983 "./util/configparser.y"
+  case 566:
+#line 2992 "./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 6222 "util/configparser.c"
+#line 6238 "util/configparser.c"
     break;
 
-  case 565:
-#line 2990 "./util/configparser.y"
+  case 567:
+#line 2999 "./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)
@@ -6231,11 +6247,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6235 "util/configparser.c"
+#line 6251 "util/configparser.c"
     break;
 
-  case 566:
-#line 3000 "./util/configparser.y"
+  case 568:
+#line 3009 "./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)
@@ -6244,11 +6260,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6248 "util/configparser.c"
+#line 6264 "util/configparser.c"
     break;
 
-  case 567:
-#line 3010 "./util/configparser.y"
+  case 569:
+#line 3019 "./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)
@@ -6257,11 +6273,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6261 "util/configparser.c"
+#line 6277 "util/configparser.c"
     break;
 
-  case 568:
-#line 3020 "./util/configparser.y"
+  case 570:
+#line 3029 "./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)
@@ -6270,11 +6286,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6274 "util/configparser.c"
+#line 6290 "util/configparser.c"
     break;
 
-  case 569:
-#line 3030 "./util/configparser.y"
+  case 571:
+#line 3039 "./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)
@@ -6283,11 +6299,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6287 "util/configparser.c"
+#line 6303 "util/configparser.c"
     break;
 
-  case 570:
-#line 3040 "./util/configparser.y"
+  case 572:
+#line 3049 "./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)
@@ -6296,47 +6312,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6300 "util/configparser.c"
+#line 6316 "util/configparser.c"
     break;
 
-  case 571:
-#line 3050 "./util/configparser.y"
+  case 573:
+#line 3059 "./util/configparser.y"
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6308 "util/configparser.c"
+#line 6324 "util/configparser.c"
     break;
 
-  case 575:
-#line 3059 "./util/configparser.y"
+  case 577:
+#line 3068 "./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 6318 "util/configparser.c"
+#line 6334 "util/configparser.c"
     break;
 
-  case 576:
-#line 3065 "./util/configparser.y"
+  case 578:
+#line 3074 "./util/configparser.y"
     { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6326 "util/configparser.c"
+#line 6342 "util/configparser.c"
     break;
 
-  case 580:
-#line 3074 "./util/configparser.y"
+  case 582:
+#line 3083 "./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 6336 "util/configparser.c"
+#line 6352 "util/configparser.c"
     break;
 
-  case 581:
-#line 3080 "./util/configparser.y"
+  case 583:
+#line 3089 "./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)
@@ -6345,21 +6361,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6349 "util/configparser.c"
+#line 6365 "util/configparser.c"
     break;
 
-  case 582:
-#line 3090 "./util/configparser.y"
+  case 584:
+#line 3099 "./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 6359 "util/configparser.c"
+#line 6375 "util/configparser.c"
     break;
 
-  case 583:
-#line 3097 "./util/configparser.y"
+  case 585:
+#line 3106 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6367,30 +6383,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6371 "util/configparser.c"
+#line 6387 "util/configparser.c"
     break;
 
-  case 584:
-#line 3106 "./util/configparser.y"
+  case 586:
+#line 3115 "./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 6382 "util/configparser.c"
+#line 6398 "util/configparser.c"
     break;
 
-  case 585:
-#line 3114 "./util/configparser.y"
+  case 587:
+#line 3123 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6390 "util/configparser.c"
+#line 6406 "util/configparser.c"
     break;
 
-  case 598:
-#line 3130 "./util/configparser.y"
+  case 600:
+#line 3139 "./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)
@@ -6398,11 +6414,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6402 "util/configparser.c"
+#line 6418 "util/configparser.c"
     break;
 
-  case 599:
-#line 3140 "./util/configparser.y"
+  case 601:
+#line 3149 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6410,21 +6426,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6414 "util/configparser.c"
+#line 6430 "util/configparser.c"
     break;
 
-  case 600:
-#line 3149 "./util/configparser.y"
+  case 602:
+#line 3158 "./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 6424 "util/configparser.c"
+#line 6440 "util/configparser.c"
     break;
 
-  case 601:
-#line 3156 "./util/configparser.y"
+  case 603:
+#line 3165 "./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)))
@@ -6432,21 +6448,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 6436 "util/configparser.c"
+#line 6452 "util/configparser.c"
     break;
 
-  case 602:
-#line 3165 "./util/configparser.y"
+  case 604:
+#line 3174 "./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 6446 "util/configparser.c"
+#line 6462 "util/configparser.c"
     break;
 
-  case 603:
-#line 3172 "./util/configparser.y"
+  case 605:
+#line 3181 "./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)))
@@ -6454,22 +6470,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 6458 "util/configparser.c"
+#line 6474 "util/configparser.c"
     break;
 
-  case 604:
-#line 3181 "./util/configparser.y"
+  case 606:
+#line 3190 "./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 6469 "util/configparser.c"
+#line 6485 "util/configparser.c"
     break;
 
-  case 605:
-#line 3189 "./util/configparser.y"
+  case 607:
+#line 3198 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6481,22 +6497,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6485 "util/configparser.c"
+#line 6501 "util/configparser.c"
     break;
 
-  case 606:
-#line 3202 "./util/configparser.y"
+  case 608:
+#line 3211 "./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 6496 "util/configparser.c"
+#line 6512 "util/configparser.c"
     break;
 
-  case 607:
-#line 3210 "./util/configparser.y"
+  case 609:
+#line 3219 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6508,19 +6524,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6512 "util/configparser.c"
+#line 6528 "util/configparser.c"
     break;
 
-  case 608:
-#line 3223 "./util/configparser.y"
+  case 610:
+#line 3232 "./util/configparser.y"
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6520 "util/configparser.c"
+#line 6536 "util/configparser.c"
     break;
 
-  case 617:
-#line 3234 "./util/configparser.y"
+  case 619:
+#line 3243 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6531,11 +6547,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6535 "util/configparser.c"
+#line 6551 "util/configparser.c"
     break;
 
-  case 618:
-#line 3246 "./util/configparser.y"
+  case 620:
+#line 3255 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6546,11 +6562,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6550 "util/configparser.c"
+#line 6566 "util/configparser.c"
     break;
 
-  case 619:
-#line 3258 "./util/configparser.y"
+  case 621:
+#line 3267 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6561,11 +6577,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6565 "util/configparser.c"
+#line 6581 "util/configparser.c"
     break;
 
-  case 620:
-#line 3270 "./util/configparser.y"
+  case 622:
+#line 3279 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6579,11 +6595,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6583 "util/configparser.c"
+#line 6599 "util/configparser.c"
     break;
 
-  case 621:
-#line 3285 "./util/configparser.y"
+  case 623:
+#line 3294 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6595,11 +6611,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6599 "util/configparser.c"
+#line 6615 "util/configparser.c"
     break;
 
-  case 622:
-#line 3298 "./util/configparser.y"
+  case 624:
+#line 3307 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6611,11 +6627,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6615 "util/configparser.c"
+#line 6631 "util/configparser.c"
     break;
 
-  case 623:
-#line 3311 "./util/configparser.y"
+  case 625:
+#line 3320 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6625,19 +6641,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6629 "util/configparser.c"
+#line 6645 "util/configparser.c"
     break;
 
-  case 624:
-#line 3322 "./util/configparser.y"
+  case 626:
+#line 3331 "./util/configparser.y"
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6637 "util/configparser.c"
+#line 6653 "util/configparser.c"
     break;
 
-  case 629:
-#line 3331 "./util/configparser.y"
+  case 631:
+#line 3340 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6651,11 +6667,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6655 "util/configparser.c"
+#line 6671 "util/configparser.c"
     break;
 
-  case 630:
-#line 3346 "./util/configparser.y"
+  case 632:
+#line 3355 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6669,11 +6685,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6673 "util/configparser.c"
+#line 6689 "util/configparser.c"
     break;
 
 
-#line 6677 "util/configparser.c"
+#line 6693 "util/configparser.c"
 
       default: break;
     }
@@ -6905,7 +6921,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3360 "./util/configparser.y"
+#line 3369 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 79ed369c4..1bce8028b 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -200,154 +200,155 @@ extern int yydebug;
     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_INFRA_KEEP_PROBING = 412,
-    VAR_DNS64_PREFIX = 413,
-    VAR_DNS64_SYNTHALL = 414,
-    VAR_DNS64_IGNORE_AAAA = 415,
-    VAR_DNSTAP = 416,
-    VAR_DNSTAP_ENABLE = 417,
-    VAR_DNSTAP_SOCKET_PATH = 418,
-    VAR_DNSTAP_IP = 419,
-    VAR_DNSTAP_TLS = 420,
-    VAR_DNSTAP_TLS_SERVER_NAME = 421,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 422,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 423,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 424,
-    VAR_DNSTAP_SEND_IDENTITY = 425,
-    VAR_DNSTAP_SEND_VERSION = 426,
-    VAR_DNSTAP_BIDIRECTIONAL = 427,
-    VAR_DNSTAP_IDENTITY = 428,
-    VAR_DNSTAP_VERSION = 429,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 430,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 431,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 432,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 433,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 434,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 435,
-    VAR_RESPONSE_IP_TAG = 436,
-    VAR_RESPONSE_IP = 437,
-    VAR_RESPONSE_IP_DATA = 438,
-    VAR_HARDEN_ALGO_DOWNGRADE = 439,
-    VAR_IP_TRANSPARENT = 440,
-    VAR_IP_DSCP = 441,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 442,
-    VAR_IP_RATELIMIT = 443,
-    VAR_IP_RATELIMIT_SLABS = 444,
-    VAR_IP_RATELIMIT_SIZE = 445,
-    VAR_RATELIMIT = 446,
-    VAR_RATELIMIT_SLABS = 447,
-    VAR_RATELIMIT_SIZE = 448,
-    VAR_RATELIMIT_FOR_DOMAIN = 449,
-    VAR_RATELIMIT_BELOW_DOMAIN = 450,
-    VAR_IP_RATELIMIT_FACTOR = 451,
-    VAR_RATELIMIT_FACTOR = 452,
-    VAR_SEND_CLIENT_SUBNET = 453,
-    VAR_CLIENT_SUBNET_ZONE = 454,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 455,
-    VAR_CLIENT_SUBNET_OPCODE = 456,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 457,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 458,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 459,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 460,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 461,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 462,
-    VAR_CAPS_WHITELIST = 463,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 464,
-    VAR_PERMIT_SMALL_HOLDDOWN = 465,
-    VAR_QNAME_MINIMISATION = 466,
-    VAR_QNAME_MINIMISATION_STRICT = 467,
-    VAR_IP_FREEBIND = 468,
-    VAR_DEFINE_TAG = 469,
-    VAR_LOCAL_ZONE_TAG = 470,
-    VAR_ACCESS_CONTROL_TAG = 471,
-    VAR_LOCAL_ZONE_OVERRIDE = 472,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 473,
-    VAR_ACCESS_CONTROL_TAG_DATA = 474,
-    VAR_VIEW = 475,
-    VAR_ACCESS_CONTROL_VIEW = 476,
-    VAR_VIEW_FIRST = 477,
-    VAR_SERVE_EXPIRED = 478,
-    VAR_SERVE_EXPIRED_TTL = 479,
-    VAR_SERVE_EXPIRED_TTL_RESET = 480,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 481,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 482,
-    VAR_FAKE_DSA = 483,
-    VAR_FAKE_SHA1 = 484,
-    VAR_LOG_IDENTITY = 485,
-    VAR_HIDE_TRUSTANCHOR = 486,
-    VAR_TRUST_ANCHOR_SIGNALING = 487,
-    VAR_AGGRESSIVE_NSEC = 488,
-    VAR_USE_SYSTEMD = 489,
-    VAR_SHM_ENABLE = 490,
-    VAR_SHM_KEY = 491,
-    VAR_ROOT_KEY_SENTINEL = 492,
-    VAR_DNSCRYPT = 493,
-    VAR_DNSCRYPT_ENABLE = 494,
-    VAR_DNSCRYPT_PORT = 495,
-    VAR_DNSCRYPT_PROVIDER = 496,
-    VAR_DNSCRYPT_SECRET_KEY = 497,
-    VAR_DNSCRYPT_PROVIDER_CERT = 498,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 499,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 500,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 501,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 502,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 503,
-    VAR_IPSECMOD_ENABLED = 504,
-    VAR_IPSECMOD_HOOK = 505,
-    VAR_IPSECMOD_IGNORE_BOGUS = 506,
-    VAR_IPSECMOD_MAX_TTL = 507,
-    VAR_IPSECMOD_WHITELIST = 508,
-    VAR_IPSECMOD_STRICT = 509,
-    VAR_CACHEDB = 510,
-    VAR_CACHEDB_BACKEND = 511,
-    VAR_CACHEDB_SECRETSEED = 512,
-    VAR_CACHEDB_REDISHOST = 513,
-    VAR_CACHEDB_REDISPORT = 514,
-    VAR_CACHEDB_REDISTIMEOUT = 515,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 516,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 517,
-    VAR_FOR_UPSTREAM = 518,
-    VAR_AUTH_ZONE = 519,
-    VAR_ZONEFILE = 520,
-    VAR_MASTER = 521,
-    VAR_URL = 522,
-    VAR_FOR_DOWNSTREAM = 523,
-    VAR_FALLBACK_ENABLED = 524,
-    VAR_TLS_ADDITIONAL_PORT = 525,
-    VAR_LOW_RTT = 526,
-    VAR_LOW_RTT_PERMIL = 527,
-    VAR_FAST_SERVER_PERMIL = 528,
-    VAR_FAST_SERVER_NUM = 529,
-    VAR_ALLOW_NOTIFY = 530,
-    VAR_TLS_WIN_CERT = 531,
-    VAR_TCP_CONNECTION_LIMIT = 532,
-    VAR_FORWARD_NO_CACHE = 533,
-    VAR_STUB_NO_CACHE = 534,
-    VAR_LOG_SERVFAIL = 535,
-    VAR_DENY_ANY = 536,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 537,
-    VAR_LOG_TAG_QUERYREPLY = 538,
-    VAR_STREAM_WAIT_SIZE = 539,
-    VAR_TLS_CIPHERS = 540,
-    VAR_TLS_CIPHERSUITES = 541,
-    VAR_TLS_USE_SNI = 542,
-    VAR_IPSET = 543,
-    VAR_IPSET_NAME_V4 = 544,
-    VAR_IPSET_NAME_V6 = 545,
-    VAR_TLS_SESSION_TICKET_KEYS = 546,
-    VAR_RPZ = 547,
-    VAR_TAGS = 548,
-    VAR_RPZ_ACTION_OVERRIDE = 549,
-    VAR_RPZ_CNAME_OVERRIDE = 550,
-    VAR_RPZ_LOG = 551,
-    VAR_RPZ_LOG_NAME = 552,
-    VAR_DYNLIB = 553,
-    VAR_DYNLIB_FILE = 554,
-    VAR_EDNS_CLIENT_TAG = 555,
-    VAR_EDNS_CLIENT_TAG_OPCODE = 556
+    VAR_UDP_CONNECT = 409,
+    VAR_UNBLOCK_LAN_ZONES = 410,
+    VAR_INSECURE_LAN_ZONES = 411,
+    VAR_INFRA_CACHE_MIN_RTT = 412,
+    VAR_INFRA_KEEP_PROBING = 413,
+    VAR_DNS64_PREFIX = 414,
+    VAR_DNS64_SYNTHALL = 415,
+    VAR_DNS64_IGNORE_AAAA = 416,
+    VAR_DNSTAP = 417,
+    VAR_DNSTAP_ENABLE = 418,
+    VAR_DNSTAP_SOCKET_PATH = 419,
+    VAR_DNSTAP_IP = 420,
+    VAR_DNSTAP_TLS = 421,
+    VAR_DNSTAP_TLS_SERVER_NAME = 422,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 423,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425,
+    VAR_DNSTAP_SEND_IDENTITY = 426,
+    VAR_DNSTAP_SEND_VERSION = 427,
+    VAR_DNSTAP_BIDIRECTIONAL = 428,
+    VAR_DNSTAP_IDENTITY = 429,
+    VAR_DNSTAP_VERSION = 430,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436,
+    VAR_RESPONSE_IP_TAG = 437,
+    VAR_RESPONSE_IP = 438,
+    VAR_RESPONSE_IP_DATA = 439,
+    VAR_HARDEN_ALGO_DOWNGRADE = 440,
+    VAR_IP_TRANSPARENT = 441,
+    VAR_IP_DSCP = 442,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 443,
+    VAR_IP_RATELIMIT = 444,
+    VAR_IP_RATELIMIT_SLABS = 445,
+    VAR_IP_RATELIMIT_SIZE = 446,
+    VAR_RATELIMIT = 447,
+    VAR_RATELIMIT_SLABS = 448,
+    VAR_RATELIMIT_SIZE = 449,
+    VAR_RATELIMIT_FOR_DOMAIN = 450,
+    VAR_RATELIMIT_BELOW_DOMAIN = 451,
+    VAR_IP_RATELIMIT_FACTOR = 452,
+    VAR_RATELIMIT_FACTOR = 453,
+    VAR_SEND_CLIENT_SUBNET = 454,
+    VAR_CLIENT_SUBNET_ZONE = 455,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456,
+    VAR_CLIENT_SUBNET_OPCODE = 457,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 458,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 459,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 460,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 461,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463,
+    VAR_CAPS_WHITELIST = 464,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 465,
+    VAR_PERMIT_SMALL_HOLDDOWN = 466,
+    VAR_QNAME_MINIMISATION = 467,
+    VAR_QNAME_MINIMISATION_STRICT = 468,
+    VAR_IP_FREEBIND = 469,
+    VAR_DEFINE_TAG = 470,
+    VAR_LOCAL_ZONE_TAG = 471,
+    VAR_ACCESS_CONTROL_TAG = 472,
+    VAR_LOCAL_ZONE_OVERRIDE = 473,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 474,
+    VAR_ACCESS_CONTROL_TAG_DATA = 475,
+    VAR_VIEW = 476,
+    VAR_ACCESS_CONTROL_VIEW = 477,
+    VAR_VIEW_FIRST = 478,
+    VAR_SERVE_EXPIRED = 479,
+    VAR_SERVE_EXPIRED_TTL = 480,
+    VAR_SERVE_EXPIRED_TTL_RESET = 481,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 482,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483,
+    VAR_FAKE_DSA = 484,
+    VAR_FAKE_SHA1 = 485,
+    VAR_LOG_IDENTITY = 486,
+    VAR_HIDE_TRUSTANCHOR = 487,
+    VAR_TRUST_ANCHOR_SIGNALING = 488,
+    VAR_AGGRESSIVE_NSEC = 489,
+    VAR_USE_SYSTEMD = 490,
+    VAR_SHM_ENABLE = 491,
+    VAR_SHM_KEY = 492,
+    VAR_ROOT_KEY_SENTINEL = 493,
+    VAR_DNSCRYPT = 494,
+    VAR_DNSCRYPT_ENABLE = 495,
+    VAR_DNSCRYPT_PORT = 496,
+    VAR_DNSCRYPT_PROVIDER = 497,
+    VAR_DNSCRYPT_SECRET_KEY = 498,
+    VAR_DNSCRYPT_PROVIDER_CERT = 499,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504,
+    VAR_IPSECMOD_ENABLED = 505,
+    VAR_IPSECMOD_HOOK = 506,
+    VAR_IPSECMOD_IGNORE_BOGUS = 507,
+    VAR_IPSECMOD_MAX_TTL = 508,
+    VAR_IPSECMOD_WHITELIST = 509,
+    VAR_IPSECMOD_STRICT = 510,
+    VAR_CACHEDB = 511,
+    VAR_CACHEDB_BACKEND = 512,
+    VAR_CACHEDB_SECRETSEED = 513,
+    VAR_CACHEDB_REDISHOST = 514,
+    VAR_CACHEDB_REDISPORT = 515,
+    VAR_CACHEDB_REDISTIMEOUT = 516,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 517,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518,
+    VAR_FOR_UPSTREAM = 519,
+    VAR_AUTH_ZONE = 520,
+    VAR_ZONEFILE = 521,
+    VAR_MASTER = 522,
+    VAR_URL = 523,
+    VAR_FOR_DOWNSTREAM = 524,
+    VAR_FALLBACK_ENABLED = 525,
+    VAR_TLS_ADDITIONAL_PORT = 526,
+    VAR_LOW_RTT = 527,
+    VAR_LOW_RTT_PERMIL = 528,
+    VAR_FAST_SERVER_PERMIL = 529,
+    VAR_FAST_SERVER_NUM = 530,
+    VAR_ALLOW_NOTIFY = 531,
+    VAR_TLS_WIN_CERT = 532,
+    VAR_TCP_CONNECTION_LIMIT = 533,
+    VAR_FORWARD_NO_CACHE = 534,
+    VAR_STUB_NO_CACHE = 535,
+    VAR_LOG_SERVFAIL = 536,
+    VAR_DENY_ANY = 537,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538,
+    VAR_LOG_TAG_QUERYREPLY = 539,
+    VAR_STREAM_WAIT_SIZE = 540,
+    VAR_TLS_CIPHERS = 541,
+    VAR_TLS_CIPHERSUITES = 542,
+    VAR_TLS_USE_SNI = 543,
+    VAR_IPSET = 544,
+    VAR_IPSET_NAME_V4 = 545,
+    VAR_IPSET_NAME_V6 = 546,
+    VAR_TLS_SESSION_TICKET_KEYS = 547,
+    VAR_RPZ = 548,
+    VAR_TAGS = 549,
+    VAR_RPZ_ACTION_OVERRIDE = 550,
+    VAR_RPZ_CNAME_OVERRIDE = 551,
+    VAR_RPZ_LOG = 552,
+    VAR_RPZ_LOG_NAME = 553,
+    VAR_DYNLIB = 554,
+    VAR_DYNLIB_FILE = 555,
+    VAR_EDNS_CLIENT_TAG = 556,
+    VAR_EDNS_CLIENT_TAG_OPCODE = 557
   };
 #endif
 /* Tokens.  */
@@ -502,154 +503,155 @@ extern int yydebug;
 #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_INFRA_KEEP_PROBING 412
-#define VAR_DNS64_PREFIX 413
-#define VAR_DNS64_SYNTHALL 414
-#define VAR_DNS64_IGNORE_AAAA 415
-#define VAR_DNSTAP 416
-#define VAR_DNSTAP_ENABLE 417
-#define VAR_DNSTAP_SOCKET_PATH 418
-#define VAR_DNSTAP_IP 419
-#define VAR_DNSTAP_TLS 420
-#define VAR_DNSTAP_TLS_SERVER_NAME 421
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 422
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 423
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 424
-#define VAR_DNSTAP_SEND_IDENTITY 425
-#define VAR_DNSTAP_SEND_VERSION 426
-#define VAR_DNSTAP_BIDIRECTIONAL 427
-#define VAR_DNSTAP_IDENTITY 428
-#define VAR_DNSTAP_VERSION 429
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 430
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 431
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 432
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 433
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 434
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 435
-#define VAR_RESPONSE_IP_TAG 436
-#define VAR_RESPONSE_IP 437
-#define VAR_RESPONSE_IP_DATA 438
-#define VAR_HARDEN_ALGO_DOWNGRADE 439
-#define VAR_IP_TRANSPARENT 440
-#define VAR_IP_DSCP 441
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 442
-#define VAR_IP_RATELIMIT 443
-#define VAR_IP_RATELIMIT_SLABS 444
-#define VAR_IP_RATELIMIT_SIZE 445
-#define VAR_RATELIMIT 446
-#define VAR_RATELIMIT_SLABS 447
-#define VAR_RATELIMIT_SIZE 448
-#define VAR_RATELIMIT_FOR_DOMAIN 449
-#define VAR_RATELIMIT_BELOW_DOMAIN 450
-#define VAR_IP_RATELIMIT_FACTOR 451
-#define VAR_RATELIMIT_FACTOR 452
-#define VAR_SEND_CLIENT_SUBNET 453
-#define VAR_CLIENT_SUBNET_ZONE 454
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 455
-#define VAR_CLIENT_SUBNET_OPCODE 456
-#define VAR_MAX_CLIENT_SUBNET_IPV4 457
-#define VAR_MAX_CLIENT_SUBNET_IPV6 458
-#define VAR_MIN_CLIENT_SUBNET_IPV4 459
-#define VAR_MIN_CLIENT_SUBNET_IPV6 460
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 461
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 462
-#define VAR_CAPS_WHITELIST 463
-#define VAR_CACHE_MAX_NEGATIVE_TTL 464
-#define VAR_PERMIT_SMALL_HOLDDOWN 465
-#define VAR_QNAME_MINIMISATION 466
-#define VAR_QNAME_MINIMISATION_STRICT 467
-#define VAR_IP_FREEBIND 468
-#define VAR_DEFINE_TAG 469
-#define VAR_LOCAL_ZONE_TAG 470
-#define VAR_ACCESS_CONTROL_TAG 471
-#define VAR_LOCAL_ZONE_OVERRIDE 472
-#define VAR_ACCESS_CONTROL_TAG_ACTION 473
-#define VAR_ACCESS_CONTROL_TAG_DATA 474
-#define VAR_VIEW 475
-#define VAR_ACCESS_CONTROL_VIEW 476
-#define VAR_VIEW_FIRST 477
-#define VAR_SERVE_EXPIRED 478
-#define VAR_SERVE_EXPIRED_TTL 479
-#define VAR_SERVE_EXPIRED_TTL_RESET 480
-#define VAR_SERVE_EXPIRED_REPLY_TTL 481
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 482
-#define VAR_FAKE_DSA 483
-#define VAR_FAKE_SHA1 484
-#define VAR_LOG_IDENTITY 485
-#define VAR_HIDE_TRUSTANCHOR 486
-#define VAR_TRUST_ANCHOR_SIGNALING 487
-#define VAR_AGGRESSIVE_NSEC 488
-#define VAR_USE_SYSTEMD 489
-#define VAR_SHM_ENABLE 490
-#define VAR_SHM_KEY 491
-#define VAR_ROOT_KEY_SENTINEL 492
-#define VAR_DNSCRYPT 493
-#define VAR_DNSCRYPT_ENABLE 494
-#define VAR_DNSCRYPT_PORT 495
-#define VAR_DNSCRYPT_PROVIDER 496
-#define VAR_DNSCRYPT_SECRET_KEY 497
-#define VAR_DNSCRYPT_PROVIDER_CERT 498
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 499
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 500
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 501
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 502
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 503
-#define VAR_IPSECMOD_ENABLED 504
-#define VAR_IPSECMOD_HOOK 505
-#define VAR_IPSECMOD_IGNORE_BOGUS 506
-#define VAR_IPSECMOD_MAX_TTL 507
-#define VAR_IPSECMOD_WHITELIST 508
-#define VAR_IPSECMOD_STRICT 509
-#define VAR_CACHEDB 510
-#define VAR_CACHEDB_BACKEND 511
-#define VAR_CACHEDB_SECRETSEED 512
-#define VAR_CACHEDB_REDISHOST 513
-#define VAR_CACHEDB_REDISPORT 514
-#define VAR_CACHEDB_REDISTIMEOUT 515
-#define VAR_CACHEDB_REDISEXPIRERECORDS 516
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 517
-#define VAR_FOR_UPSTREAM 518
-#define VAR_AUTH_ZONE 519
-#define VAR_ZONEFILE 520
-#define VAR_MASTER 521
-#define VAR_URL 522
-#define VAR_FOR_DOWNSTREAM 523
-#define VAR_FALLBACK_ENABLED 524
-#define VAR_TLS_ADDITIONAL_PORT 525
-#define VAR_LOW_RTT 526
-#define VAR_LOW_RTT_PERMIL 527
-#define VAR_FAST_SERVER_PERMIL 528
-#define VAR_FAST_SERVER_NUM 529
-#define VAR_ALLOW_NOTIFY 530
-#define VAR_TLS_WIN_CERT 531
-#define VAR_TCP_CONNECTION_LIMIT 532
-#define VAR_FORWARD_NO_CACHE 533
-#define VAR_STUB_NO_CACHE 534
-#define VAR_LOG_SERVFAIL 535
-#define VAR_DENY_ANY 536
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 537
-#define VAR_LOG_TAG_QUERYREPLY 538
-#define VAR_STREAM_WAIT_SIZE 539
-#define VAR_TLS_CIPHERS 540
-#define VAR_TLS_CIPHERSUITES 541
-#define VAR_TLS_USE_SNI 542
-#define VAR_IPSET 543
-#define VAR_IPSET_NAME_V4 544
-#define VAR_IPSET_NAME_V6 545
-#define VAR_TLS_SESSION_TICKET_KEYS 546
-#define VAR_RPZ 547
-#define VAR_TAGS 548
-#define VAR_RPZ_ACTION_OVERRIDE 549
-#define VAR_RPZ_CNAME_OVERRIDE 550
-#define VAR_RPZ_LOG 551
-#define VAR_RPZ_LOG_NAME 552
-#define VAR_DYNLIB 553
-#define VAR_DYNLIB_FILE 554
-#define VAR_EDNS_CLIENT_TAG 555
-#define VAR_EDNS_CLIENT_TAG_OPCODE 556
+#define VAR_UDP_CONNECT 409
+#define VAR_UNBLOCK_LAN_ZONES 410
+#define VAR_INSECURE_LAN_ZONES 411
+#define VAR_INFRA_CACHE_MIN_RTT 412
+#define VAR_INFRA_KEEP_PROBING 413
+#define VAR_DNS64_PREFIX 414
+#define VAR_DNS64_SYNTHALL 415
+#define VAR_DNS64_IGNORE_AAAA 416
+#define VAR_DNSTAP 417
+#define VAR_DNSTAP_ENABLE 418
+#define VAR_DNSTAP_SOCKET_PATH 419
+#define VAR_DNSTAP_IP 420
+#define VAR_DNSTAP_TLS 421
+#define VAR_DNSTAP_TLS_SERVER_NAME 422
+#define VAR_DNSTAP_TLS_CERT_BUNDLE 423
+#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424
+#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425
+#define VAR_DNSTAP_SEND_IDENTITY 426
+#define VAR_DNSTAP_SEND_VERSION 427
+#define VAR_DNSTAP_BIDIRECTIONAL 428
+#define VAR_DNSTAP_IDENTITY 429
+#define VAR_DNSTAP_VERSION 430
+#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431
+#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432
+#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433
+#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434
+#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435
+#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436
+#define VAR_RESPONSE_IP_TAG 437
+#define VAR_RESPONSE_IP 438
+#define VAR_RESPONSE_IP_DATA 439
+#define VAR_HARDEN_ALGO_DOWNGRADE 440
+#define VAR_IP_TRANSPARENT 441
+#define VAR_IP_DSCP 442
+#define VAR_DISABLE_DNSSEC_LAME_CHECK 443
+#define VAR_IP_RATELIMIT 444
+#define VAR_IP_RATELIMIT_SLABS 445
+#define VAR_IP_RATELIMIT_SIZE 446
+#define VAR_RATELIMIT 447
+#define VAR_RATELIMIT_SLABS 448
+#define VAR_RATELIMIT_SIZE 449
+#define VAR_RATELIMIT_FOR_DOMAIN 450
+#define VAR_RATELIMIT_BELOW_DOMAIN 451
+#define VAR_IP_RATELIMIT_FACTOR 452
+#define VAR_RATELIMIT_FACTOR 453
+#define VAR_SEND_CLIENT_SUBNET 454
+#define VAR_CLIENT_SUBNET_ZONE 455
+#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456
+#define VAR_CLIENT_SUBNET_OPCODE 457
+#define VAR_MAX_CLIENT_SUBNET_IPV4 458
+#define VAR_MAX_CLIENT_SUBNET_IPV6 459
+#define VAR_MIN_CLIENT_SUBNET_IPV4 460
+#define VAR_MIN_CLIENT_SUBNET_IPV6 461
+#define VAR_MAX_ECS_TREE_SIZE_IPV4 462
+#define VAR_MAX_ECS_TREE_SIZE_IPV6 463
+#define VAR_CAPS_WHITELIST 464
+#define VAR_CACHE_MAX_NEGATIVE_TTL 465
+#define VAR_PERMIT_SMALL_HOLDDOWN 466
+#define VAR_QNAME_MINIMISATION 467
+#define VAR_QNAME_MINIMISATION_STRICT 468
+#define VAR_IP_FREEBIND 469
+#define VAR_DEFINE_TAG 470
+#define VAR_LOCAL_ZONE_TAG 471
+#define VAR_ACCESS_CONTROL_TAG 472
+#define VAR_LOCAL_ZONE_OVERRIDE 473
+#define VAR_ACCESS_CONTROL_TAG_ACTION 474
+#define VAR_ACCESS_CONTROL_TAG_DATA 475
+#define VAR_VIEW 476
+#define VAR_ACCESS_CONTROL_VIEW 477
+#define VAR_VIEW_FIRST 478
+#define VAR_SERVE_EXPIRED 479
+#define VAR_SERVE_EXPIRED_TTL 480
+#define VAR_SERVE_EXPIRED_TTL_RESET 481
+#define VAR_SERVE_EXPIRED_REPLY_TTL 482
+#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483
+#define VAR_FAKE_DSA 484
+#define VAR_FAKE_SHA1 485
+#define VAR_LOG_IDENTITY 486
+#define VAR_HIDE_TRUSTANCHOR 487
+#define VAR_TRUST_ANCHOR_SIGNALING 488
+#define VAR_AGGRESSIVE_NSEC 489
+#define VAR_USE_SYSTEMD 490
+#define VAR_SHM_ENABLE 491
+#define VAR_SHM_KEY 492
+#define VAR_ROOT_KEY_SENTINEL 493
+#define VAR_DNSCRYPT 494
+#define VAR_DNSCRYPT_ENABLE 495
+#define VAR_DNSCRYPT_PORT 496
+#define VAR_DNSCRYPT_PROVIDER 497
+#define VAR_DNSCRYPT_SECRET_KEY 498
+#define VAR_DNSCRYPT_PROVIDER_CERT 499
+#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501
+#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502
+#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503
+#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504
+#define VAR_IPSECMOD_ENABLED 505
+#define VAR_IPSECMOD_HOOK 506
+#define VAR_IPSECMOD_IGNORE_BOGUS 507
+#define VAR_IPSECMOD_MAX_TTL 508
+#define VAR_IPSECMOD_WHITELIST 509
+#define VAR_IPSECMOD_STRICT 510
+#define VAR_CACHEDB 511
+#define VAR_CACHEDB_BACKEND 512
+#define VAR_CACHEDB_SECRETSEED 513
+#define VAR_CACHEDB_REDISHOST 514
+#define VAR_CACHEDB_REDISPORT 515
+#define VAR_CACHEDB_REDISTIMEOUT 516
+#define VAR_CACHEDB_REDISEXPIRERECORDS 517
+#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518
+#define VAR_FOR_UPSTREAM 519
+#define VAR_AUTH_ZONE 520
+#define VAR_ZONEFILE 521
+#define VAR_MASTER 522
+#define VAR_URL 523
+#define VAR_FOR_DOWNSTREAM 524
+#define VAR_FALLBACK_ENABLED 525
+#define VAR_TLS_ADDITIONAL_PORT 526
+#define VAR_LOW_RTT 527
+#define VAR_LOW_RTT_PERMIL 528
+#define VAR_FAST_SERVER_PERMIL 529
+#define VAR_FAST_SERVER_NUM 530
+#define VAR_ALLOW_NOTIFY 531
+#define VAR_TLS_WIN_CERT 532
+#define VAR_TCP_CONNECTION_LIMIT 533
+#define VAR_FORWARD_NO_CACHE 534
+#define VAR_STUB_NO_CACHE 535
+#define VAR_LOG_SERVFAIL 536
+#define VAR_DENY_ANY 537
+#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538
+#define VAR_LOG_TAG_QUERYREPLY 539
+#define VAR_STREAM_WAIT_SIZE 540
+#define VAR_TLS_CIPHERS 541
+#define VAR_TLS_CIPHERSUITES 542
+#define VAR_TLS_USE_SNI 543
+#define VAR_IPSET 544
+#define VAR_IPSET_NAME_V4 545
+#define VAR_IPSET_NAME_V6 546
+#define VAR_TLS_SESSION_TICKET_KEYS 547
+#define VAR_RPZ 548
+#define VAR_TAGS 549
+#define VAR_RPZ_ACTION_OVERRIDE 550
+#define VAR_RPZ_CNAME_OVERRIDE 551
+#define VAR_RPZ_LOG 552
+#define VAR_RPZ_LOG_NAME 553
+#define VAR_DYNLIB 554
+#define VAR_DYNLIB_FILE 555
+#define VAR_EDNS_CLIENT_TAG 556
+#define VAR_EDNS_CLIENT_TAG_OPCODE 557
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -659,7 +661,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 663 "util/configparser.h"
+#line 665 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 340fc0f5d..d92a83cc5 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -116,7 +116,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_HTTP_QUERY_BUFFER_SIZE VAR_HTTP_RESPONSE_BUFFER_SIZE
 %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_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UDP_CONNECT
 %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES
 %token VAR_INFRA_CACHE_MIN_RTT VAR_INFRA_KEEP_PROBING
 %token VAR_DNS64_PREFIX VAR_DNS64_SYNTHALL VAR_DNS64_IGNORE_AAAA
@@ -251,7 +251,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_http_query_buffer_size | server_http_response_buffer_size |
 	server_http_nodelay | server_http_notls_downstream |
 	server_minimal_responses | server_rrset_roundrobin | server_max_udp_size |
-	server_so_reuseport | server_delay_close |
+	server_so_reuseport | server_delay_close | server_udp_connect |
 	server_unblock_lan_zones | server_insecure_lan_zones |
 	server_dns64_prefix | server_dns64_synthall | server_dns64_ignore_aaaa |
 	server_infra_cache_min_rtt | server_harden_algo_downgrade |
@@ -1443,6 +1443,15 @@ server_delay_close: VAR_DELAY_CLOSE STRING_ARG
 		free($2);
 	}
 	;
+server_udp_connect: VAR_UDP_CONNECT STRING_ARG
+	{
+		OUTYY(("P(server_udp_connect:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->udp_connect = (strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
 server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG
 	{
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", $2));

From ad387832979b6ce4c93f64fe706301cd7d034e87 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 13:42:11 +0100
Subject: [PATCH 092/208] - Fix for #303 CVE-2020-28935 : Fix that symlink does
 not interfere   with chown of pidfile.

---
 daemon/unbound.c | 26 ++++++++++++++++++++------
 doc/Changelog    |  2 ++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/daemon/unbound.c b/daemon/unbound.c
index cd0fd69f2..45537d5c9 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -341,18 +341,32 @@ readpid (const char* file)
 static void
 writepid (const char* pidfile, pid_t pid)
 {
-	FILE* f;
+	int fd;
+	char pidbuf[32];
+	size_t count = 0;
+	snprintf(pidbuf, sizeof(pidbuf), "%lu\n", (unsigned long)pid);
 
-	if ((f = fopen(pidfile, "w")) ==  NULL ) {
+	if((fd = open(pidfile, O_WRONLY | O_CREAT | O_TRUNC
+#ifdef O_NOFOLLOW
+		| O_NOFOLLOW
+#endif
+		, 0644)) == -1) {
 		log_err("cannot open pidfile %s: %s", 
 			pidfile, strerror(errno));
 		return;
 	}
-	if(fprintf(f, "%lu\n", (unsigned long)pid) < 0) {
-		log_err("cannot write to pidfile %s: %s", 
-			pidfile, strerror(errno));
+	while(count < strlen(pidbuf)) {
+		ssize_t r = write(fd, pidbuf+count, strlen(pidbuf)-count);
+		if(r == -1) {
+			if(errno == EAGAIN || errno == EINTR)
+				continue;
+			log_err("cannot write to pidfile %s: %s",
+				pidfile, strerror(errno));
+			break;
+		}
+		count += r;
 	}
-	fclose(f);
+	close(fd);
 }
 
 /**
diff --git a/doc/Changelog b/doc/Changelog
index cfaa3d098..5bb0f05f3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,8 @@
 	  supported by protocol.
 	- Fix #347: IP_DONTFRAG broken on Apple xcode 12.2.
 	- Option to toggle udp-connect, default is enabled.
+	- Fix for #303 CVE-2020-28935 : Fix that symlink does not interfere
+	  with chown of pidfile.
 
 12 November 2020: Wouter
 	- Fix to connect() to UDP destinations, default turned on,

From 19f8f4d9f99a44906ab9dcc46d44da299fde3506 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 13:48:04 +0100
Subject: [PATCH 093/208] Further fix for CVE-2020-28935, so the chown is
 omitted when the pidfile fails due to a symlink.

---
 daemon/unbound.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 45537d5c9..0efa353da 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -337,8 +337,9 @@ readpid (const char* file)
 /** write pid to file. 
  * @param pidfile: file name of pid file.
  * @param pid: pid to write to file.
+ * @return false on failure
  */
-static void
+static int
 writepid (const char* pidfile, pid_t pid)
 {
 	int fd;
@@ -353,7 +354,7 @@ writepid (const char* pidfile, pid_t pid)
 		, 0644)) == -1) {
 		log_err("cannot open pidfile %s: %s", 
 			pidfile, strerror(errno));
-		return;
+		return 0;
 	}
 	while(count < strlen(pidbuf)) {
 		ssize_t r = write(fd, pidbuf+count, strlen(pidbuf)-count);
@@ -362,11 +363,13 @@ writepid (const char* pidfile, pid_t pid)
 				continue;
 			log_err("cannot write to pidfile %s: %s",
 				pidfile, strerror(errno));
-			break;
+			close(fd);
+			return 0;
 		}
 		count += r;
 	}
 	close(fd);
+	return 1;
 }
 
 /**
@@ -520,16 +523,17 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 	/* write new pidfile (while still root, so can be outside chroot) */
 #ifdef HAVE_KILL
 	if(cfg->pidfile && cfg->pidfile[0] && need_pidfile) {
-		writepid(daemon->pidfile, getpid());
-		if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 &&
-			pidinchroot) {
+		if(writepid(daemon->pidfile, getpid())) {
+			if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 &&
+				pidinchroot) {
 #  ifdef HAVE_CHOWN
-			if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) {
-				verbose(VERB_QUERY, "cannot chown %u.%u %s: %s",
-					(unsigned)cfg_uid, (unsigned)cfg_gid,
-					daemon->pidfile, strerror(errno));
-			}
+				if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) {
+					verbose(VERB_QUERY, "cannot chown %u.%u %s: %s",
+						(unsigned)cfg_uid, (unsigned)cfg_gid,
+						daemon->pidfile, strerror(errno));
+				}
 #  endif /* HAVE_CHOWN */
+			}
 		}
 	}
 #else

From 62152e0493a16a0d6caad8c62ecd723b2b5308bc Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 14:17:58 +0100
Subject: [PATCH 094/208] Fix writepid for retvalue 0.

---
 daemon/unbound.c | 5 +++++
 doc/Changelog    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 0efa353da..bc6d2bc9e 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -365,6 +365,11 @@ writepid (const char* pidfile, pid_t pid)
 				pidfile, strerror(errno));
 			close(fd);
 			return 0;
+		} else if(r == 0) {
+			log_err("cannot write any bytes to pidfile %s: "
+				"write returns 0 bytes written", pidfile);
+			close(fd);
+			return 0;
 		}
 		count += r;
 	}
diff --git a/doc/Changelog b/doc/Changelog
index 5bb0f05f3..5d158ef5d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -8,6 +8,7 @@
 	- Option to toggle udp-connect, default is enabled.
 	- Fix for #303 CVE-2020-28935 : Fix that symlink does not interfere
 	  with chown of pidfile.
+	- Further fix for it and retvalue 0 fix for it.
 
 12 November 2020: Wouter
 	- Fix to connect() to UDP destinations, default turned on,

From 2d184f750522d3f50b037ecda2c722e91a9218fa Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 16:32:00 +0100
Subject: [PATCH 095/208] - Update manpage.

---
 doc/unbound.conf.5.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 84cba76d4..817048f67 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1548,12 +1548,13 @@ option, that turns this on or off. The default is to use the fastest 3 servers.
 .TP 5
 .B edns\-client\-string: \fI<IP netblock> <string>
 Include an EDNS0 option containing configured ascii string in queries with
-destination address matching the configured IP netblock. This configuration
+destination address matching the configured IP netblock.  This configuration
 option can be used multiple times. The most specific match will be used.
 .TP 5
 .B edns\-client\-string\-opcode: \fI<opcode>
-EDNS0 option code for the edns-client-string option, from 0 to 65535. Default is
-65001.
+EDNS0 option code for the \fIedns\-client\-string\fR option, from 0 to 65535.
+A value from the `Reserved for Local/Experimental` range (65001-65534) should
+be used.  Default is 65001.
 .SS "Remote Control Options"
 In the
 .B remote\-control:

From f04f7fdf174352597eb198f6153b5f7cda92b597 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 23 Nov 2020 17:37:46 +0100
Subject: [PATCH 096/208] Changelog note for #313: - Merge PR #313 from Ralph
 Dolmans: Replace edns-client-tag with   edns-client-string option.

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

diff --git a/doc/Changelog b/doc/Changelog
index 5d158ef5d..80602b457 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+23 November 2020: George
+	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with
+	  edns-client-string option.
+
 23 November 2020: Wouter
 	- Merge #351 from dvzrv: Add AF_NETLINK to set of allowed socket
 	  address families.

From de4e6ad99db833a57fe8831622fdfb568daea571 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 08:23:24 +0100
Subject: [PATCH 097/208] Changelog note for #283. - Merge PR #283 : Stream
 reuse.  This implements upstream stream   reuse for performing several
 queries over the same TCP or TLS   channel.

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

diff --git a/doc/Changelog b/doc/Changelog
index 80602b457..26e7db51d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+24 November 2020: Wouter
+	- Merge PR #283 : Stream reuse.  This implements upstream stream
+	  reuse for performing several queries over the same TCP or TLS
+	  channel.
+
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with
 	  edns-client-string option.

From 090a4e417d8c4f02029b9442a14adaf59f7c316e Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 08:28:08 +0100
Subject: [PATCH 098/208] - set version of main branch to 1.13.0 for upcoming
 release.

---
 configure     | 26 +++++++++++++-------------
 configure.ac  |  6 +++---
 doc/Changelog |  1 +
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 3e5e562ae..7fa20f987 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.1.
+# Generated by GNU Autoconf 2.69 for unbound 1.13.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.12.1'
-PACKAGE_STRING='unbound 1.12.1'
+PACKAGE_VERSION='1.13.0'
+PACKAGE_STRING='unbound 1.13.0'
 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.1 to adapt to many kinds of systems.
+\`configure' configures unbound 1.13.0 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.1:";;
+     short | recursive ) echo "Configuration of unbound 1.13.0:";;
    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.1
+unbound configure 1.13.0
 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.1, which was
+It was created by unbound $as_me 1.13.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2811,9 +2811,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 UNBOUND_VERSION_MAJOR=1
 
-UNBOUND_VERSION_MINOR=12
+UNBOUND_VERSION_MINOR=13
 
-UNBOUND_VERSION_MICRO=1
+UNBOUND_VERSION_MICRO=0
 
 
 LIBUNBOUND_CURRENT=9
@@ -2895,7 +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
+# 1.13.0 had 9:11:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -21731,7 +21731,7 @@ _ACEOF
 
 
 
-version=1.12.1
+version=1.13.0
 
 date=`date +'%b %e, %Y'`
 
@@ -22250,7 +22250,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.1, which was
+This file was extended by unbound $as_me 1.13.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22316,7 +22316,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.1
+unbound config.status 1.13.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b4caa37dd..5385f7747 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],[12])
-m4_define([VERSION_MICRO],[1])
+m4_define([VERSION_MINOR],[13])
+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])
@@ -96,7 +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
+# 1.13.0 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 26e7db51d..88047e4b2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
 	  reuse for performing several queries over the same TCP or TLS
 	  channel.
+	- set version of main branch to 1.13.0 for upcoming release.
 
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with

From a69304011a608e480062ee96ff272f800b852d0f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 13:17:15 +0100
Subject: [PATCH 099/208] - 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 88047e4b2..039964ed7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	  reuse for performing several queries over the same TCP or TLS
 	  channel.
 	- set version of main branch to 1.13.0 for upcoming release.
+	- iana portlist updated.
 
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index fa25869d3..d9978f92e 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -5290,6 +5290,7 @@
 22005,
 22273,
 22305,
+22333,
 22335,
 22343,
 22347,

From e78957706ca0b5de66eced7054e41da2f78c8965 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 14:16:06 +0100
Subject: [PATCH 100/208] - Fix one port unit test for udp-connect.

---
 doc/Changelog                              | 1 +
 testdata/fwd_oneport.tdir/fwd_oneport.conf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 039964ed7..6d1870f17 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	  channel.
 	- set version of main branch to 1.13.0 for upcoming release.
 	- iana portlist updated.
+	- Fix one port unit test for udp-connect.
 
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with
diff --git a/testdata/fwd_oneport.tdir/fwd_oneport.conf b/testdata/fwd_oneport.tdir/fwd_oneport.conf
index f3427fece..21ebc9fed 100644
--- a/testdata/fwd_oneport.tdir/fwd_oneport.conf
+++ b/testdata/fwd_oneport.tdir/fwd_oneport.conf
@@ -13,6 +13,7 @@ server:
 	num-queries-per-thread: 1024
 	use-syslog: no
 	do-not-query-localhost: no
+	udp-connect: no
 forward-zone:
 	name: "."
 	forward-addr: "127.0.0.1@@TOPORT@"

From 6a324a37ca0c56ef5b39177ea4c84b3dd2aa5b37 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 15:01:44 +0100
Subject: [PATCH 101/208] - tag for the 1.13.0rc1 release.

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

diff --git a/doc/Changelog b/doc/Changelog
index 6d1870f17..9c609408e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	- set version of main branch to 1.13.0 for upcoming release.
 	- iana portlist updated.
 	- Fix one port unit test for udp-connect.
+	- tag for the 1.13.0rc1 release.
 
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with

From 978d3840dc6a28d634b1a184a62645663b679175 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 16:58:51 +0100
Subject: [PATCH 102/208] - Fix crash when TLS connection is closed
 prematurely, when   reuse tree comparison is not properly identical to
 insertion.

---
 doc/Changelog              |  2 ++
 services/outside_network.c | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 9c609408e..a07b4a373 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,8 @@
 	- iana portlist updated.
 	- Fix one port unit test for udp-connect.
 	- tag for the 1.13.0rc1 release.
+	- Fix crash when TLS connection is closed prematurely, when
+	  reuse tree comparison is not properly identical to insertion.
 
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with
diff --git a/services/outside_network.c b/services/outside_network.c
index 9391b05e2..a55cc1cd3 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -886,6 +886,14 @@ decommission_pending_tcp(struct outside_network* outnet,
 	struct pending_tcp* pend)
 {
 	verbose(VERB_CLIENT, "decommission_pending_tcp");
+	pend->next_free = outnet->tcp_free;
+	outnet->tcp_free = pend;
+	if(pend->reuse.node.key) {
+		/* needs unlink from the reuse tree to get deleted */
+		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
+	}
+	/* free SSL structure after remove from outnet tcp reuse tree,
+	 * because the c->ssl null or not is used for sorting in the tree */
 	if(pend->c->ssl) {
 #ifdef HAVE_SSL
 		SSL_shutdown(pend->c->ssl);
@@ -894,12 +902,6 @@ decommission_pending_tcp(struct outside_network* outnet,
 #endif
 	}
 	comm_point_close(pend->c);
-	pend->next_free = outnet->tcp_free;
-	outnet->tcp_free = pend;
-	if(pend->reuse.node.key) {
-		/* needs unlink from the reuse tree to get deleted */
-		reuse_tcp_remove_tree_list(outnet, &pend->reuse);
-	}
 	/* unlink the query and writewait list, it is part of the tree
 	 * nodes and is deleted */
 	pend->query = NULL;

From 4e8a1ede3b41e9b4a93cb664fbc3f48b1521f62b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 24 Nov 2020 17:06:54 +0100
Subject: [PATCH 103/208] - Fix padding of struct regional for 32bit systems.

---
 doc/Changelog   | 1 +
 util/regional.h | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index a07b4a373..a635698c8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -8,6 +8,7 @@
 	- tag for the 1.13.0rc1 release.
 	- Fix crash when TLS connection is closed prematurely, when
 	  reuse tree comparison is not properly identical to insertion.
+	- Fix padding of struct regional for 32bit systems.
 
 23 November 2020: George
 	- Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with
diff --git a/util/regional.h b/util/regional.h
index eeb7de7b5..b439897d5 100644
--- a/util/regional.h
+++ b/util/regional.h
@@ -76,6 +76,9 @@ struct regional
 	char* data;
 	/** threshold for outside of chunk allocations */
 	size_t large_object_size;
+	/** padding for sizeof8 alignment of sizeof(struct regional)
+	 * for 32bit systems */
+	size_t padding;
 };
 
 /**

From f44118408bb5a1bb4decd68d5faffa7e4487aac7 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 24 Nov 2020 19:23:08 -0500
Subject: [PATCH 104/208] Make ICANN Update CA and DS Trust Key static data

---
 smallapp/unbound-anchor.c | 61 ++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index a30523c76..9d0d46d9e 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -155,6 +155,36 @@
 char* wsa_strerror(int err);
 #endif
 
+static const char ICANN_UPDATE_CA[] =
+	/* The ICANN CA fetched at 24 Sep 2010.  Valid to 2028 */
+	"-----BEGIN CERTIFICATE-----\n"
+	"MIIDdzCCAl+gAwIBAgIBATANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO\n"
+	"TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV\n"
+	"BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA0MTkxMloX\n"
+	"DTI5MTIxODA0MTkxMlowXTEOMAwGA1UEChMFSUNBTk4xJjAkBgNVBAsTHUlDQU5O\n"
+	"IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1JQ0FOTiBSb290IENB\n"
+	"MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKDb\n"
+	"cLhPNNqc1NB+u+oVvOnJESofYS9qub0/PXagmgr37pNublVThIzyLPGCJ8gPms9S\n"
+	"G1TaKNIsMI7d+5IgMy3WyPEOECGIcfqEIktdR1YWfJufXcMReZwU4v/AdKzdOdfg\n"
+	"ONiwc6r70duEr1IiqPbVm5T05l1e6D+HkAvHGnf1LtOPGs4CHQdpIUcy2kauAEy2\n"
+	"paKcOcHASvbTHK7TbbvHGPB+7faAztABLoneErruEcumetcNfPMIjXKdv1V1E3C7\n"
+	"MSJKy+jAqqQJqjZoQGB0necZgUMiUv7JK1IPQRM2CXJllcyJrm9WFxY0c1KjBO29\n"
+	"iIKK69fcglKcBuFShUECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B\n"
+	"Af8EBAMCAf4wHQYDVR0OBBYEFLpS6UmDJIZSL8eZzfyNa2kITcBQMA0GCSqGSIb3\n"
+	"DQEBCwUAA4IBAQAP8emCogqHny2UYFqywEuhLys7R9UKmYY4suzGO4nkbgfPFMfH\n"
+	"6M+Zj6owwxlwueZt1j/IaCayoKU3QsrYYoDRolpILh+FPwx7wseUEV8ZKpWsoDoD\n"
+	"2JFbLg2cfB8u/OlE4RYmcxxFSmXBg0yQ8/IoQt/bxOcEEhhiQ168H2yE5rxJMt9h\n"
+	"15nu5JBSewrCkYqYYmaxyOC3WrVGfHZxVI7MpIFcGdvSb2a1uyuua8l0BKgk3ujF\n"
+	"0/wsHNeP22qNyVO+XVBzrM8fk8BSUFuiT/6tZTYXRtEt5aKQZgXbKU5dUF3jT9qg\n"
+	"j/Br5BZw3X/zd325TvnswzMC1+ljLzHnQGGk\n"
+	"-----END CERTIFICATE-----\n";
+
+static const char DS_TRUST_ANCHOR[] =
+	/* The anchors must start on a new line with ". IN DS and end with \n"[;]
+	 * because the makedist script greps on the source here */
+	/* anchor 20326 is from 2017 */
+	". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D\n";
+
 /** verbosity for this application */
 static int verb = 0;
 
@@ -213,41 +243,14 @@ usage(void)
 static const char*
 get_builtin_cert(void)
 {
-	return
-/* The ICANN CA fetched at 24 Sep 2010.  Valid to 2028 */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIDdzCCAl+gAwIBAgIBATANBgkqhkiG9w0BAQsFADBdMQ4wDAYDVQQKEwVJQ0FO\n"
-"TjEmMCQGA1UECxMdSUNBTk4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFjAUBgNV\n"
-"BAMTDUlDQU5OIFJvb3QgQ0ExCzAJBgNVBAYTAlVTMB4XDTA5MTIyMzA0MTkxMloX\n"
-"DTI5MTIxODA0MTkxMlowXTEOMAwGA1UEChMFSUNBTk4xJjAkBgNVBAsTHUlDQU5O\n"
-"IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1JQ0FOTiBSb290IENB\n"
-"MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKDb\n"
-"cLhPNNqc1NB+u+oVvOnJESofYS9qub0/PXagmgr37pNublVThIzyLPGCJ8gPms9S\n"
-"G1TaKNIsMI7d+5IgMy3WyPEOECGIcfqEIktdR1YWfJufXcMReZwU4v/AdKzdOdfg\n"
-"ONiwc6r70duEr1IiqPbVm5T05l1e6D+HkAvHGnf1LtOPGs4CHQdpIUcy2kauAEy2\n"
-"paKcOcHASvbTHK7TbbvHGPB+7faAztABLoneErruEcumetcNfPMIjXKdv1V1E3C7\n"
-"MSJKy+jAqqQJqjZoQGB0necZgUMiUv7JK1IPQRM2CXJllcyJrm9WFxY0c1KjBO29\n"
-"iIKK69fcglKcBuFShUECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B\n"
-"Af8EBAMCAf4wHQYDVR0OBBYEFLpS6UmDJIZSL8eZzfyNa2kITcBQMA0GCSqGSIb3\n"
-"DQEBCwUAA4IBAQAP8emCogqHny2UYFqywEuhLys7R9UKmYY4suzGO4nkbgfPFMfH\n"
-"6M+Zj6owwxlwueZt1j/IaCayoKU3QsrYYoDRolpILh+FPwx7wseUEV8ZKpWsoDoD\n"
-"2JFbLg2cfB8u/OlE4RYmcxxFSmXBg0yQ8/IoQt/bxOcEEhhiQ168H2yE5rxJMt9h\n"
-"15nu5JBSewrCkYqYYmaxyOC3WrVGfHZxVI7MpIFcGdvSb2a1uyuua8l0BKgk3ujF\n"
-"0/wsHNeP22qNyVO+XVBzrM8fk8BSUFuiT/6tZTYXRtEt5aKQZgXbKU5dUF3jT9qg\n"
-"j/Br5BZw3X/zd325TvnswzMC1+ljLzHnQGGk\n"
-"-----END CERTIFICATE-----\n"
-		;
+	return ICANN_UPDATE_CA;
 }
 
 /** return the built in root DS trust anchor */
 static const char*
 get_builtin_ds(void)
 {
-	return
-/* The anchors must start on a new line with ". IN DS and end with \n"[;]
- * because the makedist script greps on the source here */
-/* anchor 20326 is from 2017 */
-". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D\n";
+	return DS_TRUST_ANCHOR;
 }
 
 /** print hex data */

From 328e8d22948f1641994d3b14a269b8321b26f29c Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 24 Nov 2020 19:24:48 -0500
Subject: [PATCH 105/208] Use size_t in place of int for length

---
 smallapp/unbound-anchor.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 9d0d46d9e..c4e9b3bfd 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -255,9 +255,9 @@ get_builtin_ds(void)
 
 /** print hex data */
 static void
-print_data(const char* msg, const char* data, int len)
+print_data(const char* msg, const char* data, size_t len)
 {
-	int i;
+	size_t i;
 	printf("%s: ", msg);
 	for(i=0; i<len; i++) {
 		printf(" %2.2x", (unsigned char)data[i]);
@@ -1113,7 +1113,7 @@ read_http_result(SSL* ssl)
 		data = read_data_chunk(ssl, len);
 	}
 	if(!data) return NULL;
-	if(verb >= 4) print_data("read data", data, (int)len);
+	if(verb >= 4) print_data("read data", data, len);
 	m = BIO_new(BIO_s_mem());
 	if(!m) {
 		if(verb) printf("out of memory\n");

From 5924a591be1491a65714413f83de5798a3c42aad Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 09:41:06 +0100
Subject: [PATCH 106/208] - with udp-connect ignore connection refused with UDP
 timeouts.

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

diff --git a/doc/Changelog b/doc/Changelog
index a635698c8..0f46a3694 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 November 2020: Wouter
+	- with udp-connect ignore connection refused with UDP timeouts.
+
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
 	  reuse for performing several queries over the same TCP or TLS
diff --git a/util/netevent.c b/util/netevent.c
index b73c6459a..7999e2c3f 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -697,7 +697,8 @@ comm_point_udp_callback(int fd, short event, void* arg)
 			(struct sockaddr*)&rep.addr, &rep.addrlen);
 		if(rcv == -1) {
 #ifndef USE_WINSOCK
-			if(errno != EAGAIN && errno != EINTR)
+			if(errno != EAGAIN && errno != EINTR
+				&& errno != ECONNREFUSED)
 				log_err("recvfrom %d failed: %s", 
 					fd, strerror(errno));
 #else

From 15e8f5c6d4f85c3858c7ad8927ee50f2da8a8a54 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 09:55:01 +0100
Subject: [PATCH 107/208] - Fix udp-connect on FreeBSD, do send calls on
 connected UDP socket.

---
 doc/Changelog              |  1 +
 services/outside_network.c | 15 +++++++++++----
 util/netevent.c            | 13 +++++++++----
 util/netevent.h            |  3 ++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 0f46a3694..0ceba16b4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 25 November 2020: Wouter
 	- with udp-connect ignore connection refused with UDP timeouts.
+	- Fix udp-connect on FreeBSD, do send calls on connected UDP socket.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
diff --git a/services/outside_network.c b/services/outside_network.c
index a55cc1cd3..724550632 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1854,10 +1854,17 @@ randomize_and_send_udp(struct pending* pend, sldns_buffer* packet, int timeout)
 	log_assert(pend->pc && pend->pc->cp);
 
 	/* send it over the commlink */
-	if(!comm_point_send_udp_msg(pend->pc->cp, packet, 
-		(struct sockaddr*)&pend->addr, pend->addrlen)) {
-		portcomm_loweruse(outnet, pend->pc);
-		return 0;
+	if(outnet->udp_connect) {
+		if(!comm_point_send_udp_msg(pend->pc->cp, packet, NULL, 0)) {
+			portcomm_loweruse(outnet, pend->pc);
+			return 0;
+		}
+	} else {
+		if(!comm_point_send_udp_msg(pend->pc->cp, packet,
+			(struct sockaddr*)&pend->addr, pend->addrlen)) {
+			portcomm_loweruse(outnet, pend->pc);
+			return 0;
+		}
 	}
 
 	/* system calls to set timeout after sending UDP to make roundtrip
diff --git a/util/netevent.c b/util/netevent.c
index 7999e2c3f..814ab6f0a 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -341,10 +341,15 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 	if(sldns_buffer_remaining(packet) == 0)
 		log_err("error: send empty UDP packet");
 #endif
-	log_assert(addr && addrlen > 0);
-	sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), 
-		sldns_buffer_remaining(packet), 0,
-		addr, addrlen);
+	if(addr) {
+		log_assert(addr && addrlen > 0);
+		sent = sendto(c->fd, (void*)sldns_buffer_begin(packet),
+			sldns_buffer_remaining(packet), 0,
+			addr, addrlen);
+	} else {
+		sent = send(c->fd, (void*)sldns_buffer_begin(packet),
+			sldns_buffer_remaining(packet), 0);
+	}
 	if(sent == -1) {
 		/* try again and block, waiting for IO to complete,
 		 * we want to send the answer, and we will wait for
diff --git a/util/netevent.h b/util/netevent.h
index ce07b7500..75baf2177 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -620,7 +620,8 @@ void comm_point_drop_reply(struct comm_reply* repinfo);
  * Send an udp message over a commpoint.
  * @param c: commpoint to send it from.
  * @param packet: what to send.
- * @param addr: where to send it to.
+ * @param addr: where to send it to.   If NULL, send is performed,
+ * 	for connected sockets, to the connected address.
  * @param addrlen: length of addr.
  * @return: false on a failure.
  */

From 4b644b7965e2e63f88cdee49ab1a88eba4fbded5 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 10:22:11 +0100
Subject: [PATCH 108/208] - Better fix for reuse tree comparison for is-tls
 sockets.  Where   the tree key identity is preserved after cleanup of the TLS
 state.

---
 doc/Changelog              |  2 ++
 services/outside_network.c | 11 +++++++----
 services/outside_network.h |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 0ceba16b4..646c7f6fe 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 25 November 2020: Wouter
 	- with udp-connect ignore connection refused with UDP timeouts.
 	- Fix udp-connect on FreeBSD, do send calls on connected UDP socket.
+	- Better fix for reuse tree comparison for is-tls sockets.  Where
+	  the tree key identity is preserved after cleanup of the TLS state.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
diff --git a/services/outside_network.c b/services/outside_network.c
index 724550632..0a940aaf2 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -146,9 +146,9 @@ reuse_cmp_addrportssl(const void* key1, const void* key2)
 		return r;
 
 	/* compare if SSL-enabled */
-	if(r1->pending->c->ssl && !r2->pending->c->ssl)
+	if(r1->is_ssl && !r2->is_ssl)
 		return 1;
-	if(!r1->pending->c->ssl && r2->pending->c->ssl)
+	if(!r1->is_ssl && r2->is_ssl)
 		return -1;
 	return 0;
 }
@@ -465,8 +465,8 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
 	key_p.c = &c;
 	key_p.reuse.pending = &key_p;
 	key_p.reuse.node.key = &key_p.reuse;
-	if(use_ssl) /* something nonNULL for comparisons in tree */
-		key_p.c->ssl = (void*)1;
+	if(use_ssl)
+		key_p.reuse.is_ssl = 1;
 	if(addrlen > sizeof(key_p.reuse.addr))
 		return NULL;
 	memmove(&key_p.reuse.addr, addr, addrlen);
@@ -657,6 +657,9 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->c->repinfo.addrlen = w->addrlen;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
+	if(pend->c->ssl)
+		pend->reuse.is_ssl = 1;
+	else	pend->reuse.is_ssl = 0;
 	/* insert in reuse by address tree if not already inserted there */
 	(void)reuse_tcp_insert(w->outnet, pend);
 	reuse_tree_by_id_insert(&pend->reuse, w);
diff --git a/services/outside_network.h b/services/outside_network.h
index 7dade240b..48f9d3f03 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -247,6 +247,8 @@ struct reuse_tcp {
 	struct sockaddr_storage addr;
 	/** length of addr */
 	socklen_t addrlen;
+	/** also key for tcp_reuse tree, if ssl is used */
+	int is_ssl;
 	/** lru chain, so that the oldest can be removed to get a new
 	 * connection when all are in (re)use. oldest is last in list.
 	 * The lru only contains empty connections waiting for reuse,

From 3c2b1fa801990def492ab941c85cc5f16f0f589e Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 12:02:51 +0100
Subject: [PATCH 109/208] - Remove debug commands from reuse tests.

---
 doc/Changelog                         | 1 +
 testdata/tcp_reuse.tdir/tcp_reuse.pre | 2 +-
 testdata/tls_reuse.tdir/tls_reuse.pre | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 646c7f6fe..4d8c52d66 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- Fix udp-connect on FreeBSD, do send calls on connected UDP socket.
 	- Better fix for reuse tree comparison for is-tls sockets.  Where
 	  the tree key identity is preserved after cleanup of the TLS state.
+	- Remove debug commands from reuse tests.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre
index 30dbdc96f..511dbc6f7 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.pre
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre
@@ -16,7 +16,7 @@ echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf > ub.conf
 # start unbound in the background
 #$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
-valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log
diff --git a/testdata/tls_reuse.tdir/tls_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre
index ddd6ff4d3..f4ba26372 100644
--- a/testdata/tls_reuse.tdir/tls_reuse.pre
+++ b/testdata/tls_reuse.tdir/tls_reuse.pre
@@ -16,7 +16,7 @@ echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf > ub.conf
 # start unbound in the background
 #$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
-valgrind $PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 wait_unbound_up unbound.log

From a5167e495fef3c69476048010c3cf712bde2aff4 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 12:04:38 +0100
Subject: [PATCH 110/208] - Fix memory leak for edns client tag opcode config
 element.

---
 doc/Changelog       |    1 +
 util/configparser.c | 3338 ++++++++++++++++++-------------------------
 util/configparser.h |  623 ++++----
 util/configparser.y |    1 +
 4 files changed, 1733 insertions(+), 2230 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 4d8c52d66..ef9c8a5a7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Better fix for reuse tree comparison for is-tls sockets.  Where
 	  the tree key identity is preserved after cleanup of the TLS state.
 	- Remove debug commands from reuse tests.
+	- Fix memory leak for edns client tag opcode config element.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
diff --git a/util/configparser.c b/util/configparser.c
index f688310b9..4e5bf5a41 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.6.4.  */
+/* 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
@@ -34,10 +34,6 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
-/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
-   especially those whose name start with YY_ or yy_.  They are
-   private implementation details that can be changed or removed.  */
-
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
@@ -45,11 +41,14 @@
    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.6.4"
+#define YYBISON_VERSION "3.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -96,17 +95,8 @@ extern struct config_parser_state* cfg_parser;
 #endif
 
 
-#line 100 "util/configparser.c"
+#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
@@ -119,6 +109,14 @@ extern struct config_parser_state* cfg_parser;
 #  endif
 # endif
 
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
 /* Use api.header.include to #include this header
    instead of duplicating it here.  */
 #ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
@@ -131,322 +129,314 @@ extern struct config_parser_state* cfg_parser;
 extern int yydebug;
 #endif
 
-/* Token kinds.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    YYEMPTY = -2,
-    YYEOF = 0,                     /* "end of file"  */
-    YYerror = 256,                 /* error  */
-    YYUNDEF = 257,                 /* "invalid token"  */
-    SPACE = 258,                   /* SPACE  */
-    LETTER = 259,                  /* LETTER  */
-    NEWLINE = 260,                 /* NEWLINE  */
-    COMMENT = 261,                 /* COMMENT  */
-    COLON = 262,                   /* COLON  */
-    ANY = 263,                     /* ANY  */
-    ZONESTR = 264,                 /* ZONESTR  */
-    STRING_ARG = 265,              /* STRING_ARG  */
-    VAR_FORCE_TOPLEVEL = 266,      /* VAR_FORCE_TOPLEVEL  */
-    VAR_SERVER = 267,              /* VAR_SERVER  */
-    VAR_VERBOSITY = 268,           /* VAR_VERBOSITY  */
-    VAR_NUM_THREADS = 269,         /* VAR_NUM_THREADS  */
-    VAR_PORT = 270,                /* VAR_PORT  */
-    VAR_OUTGOING_RANGE = 271,      /* VAR_OUTGOING_RANGE  */
-    VAR_INTERFACE = 272,           /* VAR_INTERFACE  */
-    VAR_PREFER_IP4 = 273,          /* VAR_PREFER_IP4  */
-    VAR_DO_IP4 = 274,              /* VAR_DO_IP4  */
-    VAR_DO_IP6 = 275,              /* VAR_DO_IP6  */
-    VAR_PREFER_IP6 = 276,          /* VAR_PREFER_IP6  */
-    VAR_DO_UDP = 277,              /* VAR_DO_UDP  */
-    VAR_DO_TCP = 278,              /* VAR_DO_TCP  */
-    VAR_TCP_MSS = 279,             /* VAR_TCP_MSS  */
-    VAR_OUTGOING_TCP_MSS = 280,    /* VAR_OUTGOING_TCP_MSS  */
-    VAR_TCP_IDLE_TIMEOUT = 281,    /* VAR_TCP_IDLE_TIMEOUT  */
-    VAR_EDNS_TCP_KEEPALIVE = 282,  /* VAR_EDNS_TCP_KEEPALIVE  */
-    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283, /* VAR_EDNS_TCP_KEEPALIVE_TIMEOUT  */
-    VAR_CHROOT = 284,              /* VAR_CHROOT  */
-    VAR_USERNAME = 285,            /* VAR_USERNAME  */
-    VAR_DIRECTORY = 286,           /* VAR_DIRECTORY  */
-    VAR_LOGFILE = 287,             /* VAR_LOGFILE  */
-    VAR_PIDFILE = 288,             /* VAR_PIDFILE  */
-    VAR_MSG_CACHE_SIZE = 289,      /* VAR_MSG_CACHE_SIZE  */
-    VAR_MSG_CACHE_SLABS = 290,     /* VAR_MSG_CACHE_SLABS  */
-    VAR_NUM_QUERIES_PER_THREAD = 291, /* VAR_NUM_QUERIES_PER_THREAD  */
-    VAR_RRSET_CACHE_SIZE = 292,    /* VAR_RRSET_CACHE_SIZE  */
-    VAR_RRSET_CACHE_SLABS = 293,   /* VAR_RRSET_CACHE_SLABS  */
-    VAR_OUTGOING_NUM_TCP = 294,    /* VAR_OUTGOING_NUM_TCP  */
-    VAR_INFRA_HOST_TTL = 295,      /* VAR_INFRA_HOST_TTL  */
-    VAR_INFRA_LAME_TTL = 296,      /* VAR_INFRA_LAME_TTL  */
-    VAR_INFRA_CACHE_SLABS = 297,   /* VAR_INFRA_CACHE_SLABS  */
-    VAR_INFRA_CACHE_NUMHOSTS = 298, /* VAR_INFRA_CACHE_NUMHOSTS  */
-    VAR_INFRA_CACHE_LAME_SIZE = 299, /* VAR_INFRA_CACHE_LAME_SIZE  */
-    VAR_NAME = 300,                /* VAR_NAME  */
-    VAR_STUB_ZONE = 301,           /* VAR_STUB_ZONE  */
-    VAR_STUB_HOST = 302,           /* VAR_STUB_HOST  */
-    VAR_STUB_ADDR = 303,           /* VAR_STUB_ADDR  */
-    VAR_TARGET_FETCH_POLICY = 304, /* VAR_TARGET_FETCH_POLICY  */
-    VAR_HARDEN_SHORT_BUFSIZE = 305, /* VAR_HARDEN_SHORT_BUFSIZE  */
-    VAR_HARDEN_LARGE_QUERIES = 306, /* VAR_HARDEN_LARGE_QUERIES  */
-    VAR_FORWARD_ZONE = 307,        /* VAR_FORWARD_ZONE  */
-    VAR_FORWARD_HOST = 308,        /* VAR_FORWARD_HOST  */
-    VAR_FORWARD_ADDR = 309,        /* VAR_FORWARD_ADDR  */
-    VAR_DO_NOT_QUERY_ADDRESS = 310, /* VAR_DO_NOT_QUERY_ADDRESS  */
-    VAR_HIDE_IDENTITY = 311,       /* VAR_HIDE_IDENTITY  */
-    VAR_HIDE_VERSION = 312,        /* VAR_HIDE_VERSION  */
-    VAR_IDENTITY = 313,            /* VAR_IDENTITY  */
-    VAR_VERSION = 314,             /* VAR_VERSION  */
-    VAR_HARDEN_GLUE = 315,         /* VAR_HARDEN_GLUE  */
-    VAR_MODULE_CONF = 316,         /* VAR_MODULE_CONF  */
-    VAR_TRUST_ANCHOR_FILE = 317,   /* VAR_TRUST_ANCHOR_FILE  */
-    VAR_TRUST_ANCHOR = 318,        /* VAR_TRUST_ANCHOR  */
-    VAR_VAL_OVERRIDE_DATE = 319,   /* VAR_VAL_OVERRIDE_DATE  */
-    VAR_BOGUS_TTL = 320,           /* VAR_BOGUS_TTL  */
-    VAR_VAL_CLEAN_ADDITIONAL = 321, /* VAR_VAL_CLEAN_ADDITIONAL  */
-    VAR_VAL_PERMISSIVE_MODE = 322, /* VAR_VAL_PERMISSIVE_MODE  */
-    VAR_INCOMING_NUM_TCP = 323,    /* VAR_INCOMING_NUM_TCP  */
-    VAR_MSG_BUFFER_SIZE = 324,     /* VAR_MSG_BUFFER_SIZE  */
-    VAR_KEY_CACHE_SIZE = 325,      /* VAR_KEY_CACHE_SIZE  */
-    VAR_KEY_CACHE_SLABS = 326,     /* VAR_KEY_CACHE_SLABS  */
-    VAR_TRUSTED_KEYS_FILE = 327,   /* VAR_TRUSTED_KEYS_FILE  */
-    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328, /* VAR_VAL_NSEC3_KEYSIZE_ITERATIONS  */
-    VAR_USE_SYSLOG = 329,          /* VAR_USE_SYSLOG  */
-    VAR_OUTGOING_INTERFACE = 330,  /* VAR_OUTGOING_INTERFACE  */
-    VAR_ROOT_HINTS = 331,          /* VAR_ROOT_HINTS  */
-    VAR_DO_NOT_QUERY_LOCALHOST = 332, /* VAR_DO_NOT_QUERY_LOCALHOST  */
-    VAR_CACHE_MAX_TTL = 333,       /* VAR_CACHE_MAX_TTL  */
-    VAR_HARDEN_DNSSEC_STRIPPED = 334, /* VAR_HARDEN_DNSSEC_STRIPPED  */
-    VAR_ACCESS_CONTROL = 335,      /* VAR_ACCESS_CONTROL  */
-    VAR_LOCAL_ZONE = 336,          /* VAR_LOCAL_ZONE  */
-    VAR_LOCAL_DATA = 337,          /* VAR_LOCAL_DATA  */
-    VAR_INTERFACE_AUTOMATIC = 338, /* VAR_INTERFACE_AUTOMATIC  */
-    VAR_STATISTICS_INTERVAL = 339, /* VAR_STATISTICS_INTERVAL  */
-    VAR_DO_DAEMONIZE = 340,        /* VAR_DO_DAEMONIZE  */
-    VAR_USE_CAPS_FOR_ID = 341,     /* VAR_USE_CAPS_FOR_ID  */
-    VAR_STATISTICS_CUMULATIVE = 342, /* VAR_STATISTICS_CUMULATIVE  */
-    VAR_OUTGOING_PORT_PERMIT = 343, /* VAR_OUTGOING_PORT_PERMIT  */
-    VAR_OUTGOING_PORT_AVOID = 344, /* VAR_OUTGOING_PORT_AVOID  */
-    VAR_DLV_ANCHOR_FILE = 345,     /* VAR_DLV_ANCHOR_FILE  */
-    VAR_DLV_ANCHOR = 346,          /* VAR_DLV_ANCHOR  */
-    VAR_NEG_CACHE_SIZE = 347,      /* VAR_NEG_CACHE_SIZE  */
-    VAR_HARDEN_REFERRAL_PATH = 348, /* VAR_HARDEN_REFERRAL_PATH  */
-    VAR_PRIVATE_ADDRESS = 349,     /* VAR_PRIVATE_ADDRESS  */
-    VAR_PRIVATE_DOMAIN = 350,      /* VAR_PRIVATE_DOMAIN  */
-    VAR_REMOTE_CONTROL = 351,      /* VAR_REMOTE_CONTROL  */
-    VAR_CONTROL_ENABLE = 352,      /* VAR_CONTROL_ENABLE  */
-    VAR_CONTROL_INTERFACE = 353,   /* VAR_CONTROL_INTERFACE  */
-    VAR_CONTROL_PORT = 354,        /* VAR_CONTROL_PORT  */
-    VAR_SERVER_KEY_FILE = 355,     /* VAR_SERVER_KEY_FILE  */
-    VAR_SERVER_CERT_FILE = 356,    /* VAR_SERVER_CERT_FILE  */
-    VAR_CONTROL_KEY_FILE = 357,    /* VAR_CONTROL_KEY_FILE  */
-    VAR_CONTROL_CERT_FILE = 358,   /* VAR_CONTROL_CERT_FILE  */
-    VAR_CONTROL_USE_CERT = 359,    /* VAR_CONTROL_USE_CERT  */
-    VAR_EXTENDED_STATISTICS = 360, /* VAR_EXTENDED_STATISTICS  */
-    VAR_LOCAL_DATA_PTR = 361,      /* VAR_LOCAL_DATA_PTR  */
-    VAR_JOSTLE_TIMEOUT = 362,      /* VAR_JOSTLE_TIMEOUT  */
-    VAR_STUB_PRIME = 363,          /* VAR_STUB_PRIME  */
-    VAR_UNWANTED_REPLY_THRESHOLD = 364, /* VAR_UNWANTED_REPLY_THRESHOLD  */
-    VAR_LOG_TIME_ASCII = 365,      /* VAR_LOG_TIME_ASCII  */
-    VAR_DOMAIN_INSECURE = 366,     /* VAR_DOMAIN_INSECURE  */
-    VAR_PYTHON = 367,              /* VAR_PYTHON  */
-    VAR_PYTHON_SCRIPT = 368,       /* VAR_PYTHON_SCRIPT  */
-    VAR_VAL_SIG_SKEW_MIN = 369,    /* VAR_VAL_SIG_SKEW_MIN  */
-    VAR_VAL_SIG_SKEW_MAX = 370,    /* VAR_VAL_SIG_SKEW_MAX  */
-    VAR_CACHE_MIN_TTL = 371,       /* VAR_CACHE_MIN_TTL  */
-    VAR_VAL_LOG_LEVEL = 372,       /* VAR_VAL_LOG_LEVEL  */
-    VAR_AUTO_TRUST_ANCHOR_FILE = 373, /* VAR_AUTO_TRUST_ANCHOR_FILE  */
-    VAR_KEEP_MISSING = 374,        /* VAR_KEEP_MISSING  */
-    VAR_ADD_HOLDDOWN = 375,        /* VAR_ADD_HOLDDOWN  */
-    VAR_DEL_HOLDDOWN = 376,        /* VAR_DEL_HOLDDOWN  */
-    VAR_SO_RCVBUF = 377,           /* VAR_SO_RCVBUF  */
-    VAR_EDNS_BUFFER_SIZE = 378,    /* VAR_EDNS_BUFFER_SIZE  */
-    VAR_PREFETCH = 379,            /* VAR_PREFETCH  */
-    VAR_PREFETCH_KEY = 380,        /* VAR_PREFETCH_KEY  */
-    VAR_SO_SNDBUF = 381,           /* VAR_SO_SNDBUF  */
-    VAR_SO_REUSEPORT = 382,        /* VAR_SO_REUSEPORT  */
-    VAR_HARDEN_BELOW_NXDOMAIN = 383, /* VAR_HARDEN_BELOW_NXDOMAIN  */
-    VAR_IGNORE_CD_FLAG = 384,      /* VAR_IGNORE_CD_FLAG  */
-    VAR_LOG_QUERIES = 385,         /* VAR_LOG_QUERIES  */
-    VAR_LOG_REPLIES = 386,         /* VAR_LOG_REPLIES  */
-    VAR_LOG_LOCAL_ACTIONS = 387,   /* VAR_LOG_LOCAL_ACTIONS  */
-    VAR_TCP_UPSTREAM = 388,        /* VAR_TCP_UPSTREAM  */
-    VAR_SSL_UPSTREAM = 389,        /* VAR_SSL_UPSTREAM  */
-    VAR_SSL_SERVICE_KEY = 390,     /* VAR_SSL_SERVICE_KEY  */
-    VAR_SSL_SERVICE_PEM = 391,     /* VAR_SSL_SERVICE_PEM  */
-    VAR_SSL_PORT = 392,            /* VAR_SSL_PORT  */
-    VAR_FORWARD_FIRST = 393,       /* VAR_FORWARD_FIRST  */
-    VAR_STUB_SSL_UPSTREAM = 394,   /* VAR_STUB_SSL_UPSTREAM  */
-    VAR_FORWARD_SSL_UPSTREAM = 395, /* VAR_FORWARD_SSL_UPSTREAM  */
-    VAR_TLS_CERT_BUNDLE = 396,     /* VAR_TLS_CERT_BUNDLE  */
-    VAR_HTTPS_PORT = 397,          /* VAR_HTTPS_PORT  */
-    VAR_HTTP_ENDPOINT = 398,       /* VAR_HTTP_ENDPOINT  */
-    VAR_HTTP_MAX_STREAMS = 399,    /* VAR_HTTP_MAX_STREAMS  */
-    VAR_HTTP_QUERY_BUFFER_SIZE = 400, /* VAR_HTTP_QUERY_BUFFER_SIZE  */
-    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, /* VAR_HTTP_RESPONSE_BUFFER_SIZE  */
-    VAR_HTTP_NODELAY = 402,        /* VAR_HTTP_NODELAY  */
-    VAR_HTTP_NOTLS_DOWNSTREAM = 403, /* VAR_HTTP_NOTLS_DOWNSTREAM  */
-    VAR_STUB_FIRST = 404,          /* VAR_STUB_FIRST  */
-    VAR_MINIMAL_RESPONSES = 405,   /* VAR_MINIMAL_RESPONSES  */
-    VAR_RRSET_ROUNDROBIN = 406,    /* VAR_RRSET_ROUNDROBIN  */
-    VAR_MAX_UDP_SIZE = 407,        /* VAR_MAX_UDP_SIZE  */
-    VAR_DELAY_CLOSE = 408,         /* VAR_DELAY_CLOSE  */
-    VAR_UDP_CONNECT = 409,         /* VAR_UDP_CONNECT  */
-    VAR_UNBLOCK_LAN_ZONES = 410,   /* VAR_UNBLOCK_LAN_ZONES  */
-    VAR_INSECURE_LAN_ZONES = 411,  /* VAR_INSECURE_LAN_ZONES  */
-    VAR_INFRA_CACHE_MIN_RTT = 412, /* VAR_INFRA_CACHE_MIN_RTT  */
-    VAR_INFRA_KEEP_PROBING = 413,  /* VAR_INFRA_KEEP_PROBING  */
-    VAR_DNS64_PREFIX = 414,        /* VAR_DNS64_PREFIX  */
-    VAR_DNS64_SYNTHALL = 415,      /* VAR_DNS64_SYNTHALL  */
-    VAR_DNS64_IGNORE_AAAA = 416,   /* VAR_DNS64_IGNORE_AAAA  */
-    VAR_DNSTAP = 417,              /* VAR_DNSTAP  */
-    VAR_DNSTAP_ENABLE = 418,       /* VAR_DNSTAP_ENABLE  */
-    VAR_DNSTAP_SOCKET_PATH = 419,  /* VAR_DNSTAP_SOCKET_PATH  */
-    VAR_DNSTAP_IP = 420,           /* VAR_DNSTAP_IP  */
-    VAR_DNSTAP_TLS = 421,          /* VAR_DNSTAP_TLS  */
-    VAR_DNSTAP_TLS_SERVER_NAME = 422, /* VAR_DNSTAP_TLS_SERVER_NAME  */
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 423, /* VAR_DNSTAP_TLS_CERT_BUNDLE  */
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, /* VAR_DNSTAP_TLS_CLIENT_KEY_FILE  */
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, /* VAR_DNSTAP_TLS_CLIENT_CERT_FILE  */
-    VAR_DNSTAP_SEND_IDENTITY = 426, /* VAR_DNSTAP_SEND_IDENTITY  */
-    VAR_DNSTAP_SEND_VERSION = 427, /* VAR_DNSTAP_SEND_VERSION  */
-    VAR_DNSTAP_BIDIRECTIONAL = 428, /* VAR_DNSTAP_BIDIRECTIONAL  */
-    VAR_DNSTAP_IDENTITY = 429,     /* VAR_DNSTAP_IDENTITY  */
-    VAR_DNSTAP_VERSION = 430,      /* VAR_DNSTAP_VERSION  */
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, /* VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES  */
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, /* VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES  */
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, /* VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES  */
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, /* VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES  */
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, /* VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES  */
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, /* VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES  */
-    VAR_RESPONSE_IP_TAG = 437,     /* VAR_RESPONSE_IP_TAG  */
-    VAR_RESPONSE_IP = 438,         /* VAR_RESPONSE_IP  */
-    VAR_RESPONSE_IP_DATA = 439,    /* VAR_RESPONSE_IP_DATA  */
-    VAR_HARDEN_ALGO_DOWNGRADE = 440, /* VAR_HARDEN_ALGO_DOWNGRADE  */
-    VAR_IP_TRANSPARENT = 441,      /* VAR_IP_TRANSPARENT  */
-    VAR_IP_DSCP = 442,             /* VAR_IP_DSCP  */
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 443, /* VAR_DISABLE_DNSSEC_LAME_CHECK  */
-    VAR_IP_RATELIMIT = 444,        /* VAR_IP_RATELIMIT  */
-    VAR_IP_RATELIMIT_SLABS = 445,  /* VAR_IP_RATELIMIT_SLABS  */
-    VAR_IP_RATELIMIT_SIZE = 446,   /* VAR_IP_RATELIMIT_SIZE  */
-    VAR_RATELIMIT = 447,           /* VAR_RATELIMIT  */
-    VAR_RATELIMIT_SLABS = 448,     /* VAR_RATELIMIT_SLABS  */
-    VAR_RATELIMIT_SIZE = 449,      /* VAR_RATELIMIT_SIZE  */
-    VAR_RATELIMIT_FOR_DOMAIN = 450, /* VAR_RATELIMIT_FOR_DOMAIN  */
-    VAR_RATELIMIT_BELOW_DOMAIN = 451, /* VAR_RATELIMIT_BELOW_DOMAIN  */
-    VAR_IP_RATELIMIT_FACTOR = 452, /* VAR_IP_RATELIMIT_FACTOR  */
-    VAR_RATELIMIT_FACTOR = 453,    /* VAR_RATELIMIT_FACTOR  */
-    VAR_SEND_CLIENT_SUBNET = 454,  /* VAR_SEND_CLIENT_SUBNET  */
-    VAR_CLIENT_SUBNET_ZONE = 455,  /* VAR_CLIENT_SUBNET_ZONE  */
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, /* VAR_CLIENT_SUBNET_ALWAYS_FORWARD  */
-    VAR_CLIENT_SUBNET_OPCODE = 457, /* VAR_CLIENT_SUBNET_OPCODE  */
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 458, /* VAR_MAX_CLIENT_SUBNET_IPV4  */
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 459, /* VAR_MAX_CLIENT_SUBNET_IPV6  */
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 460, /* VAR_MIN_CLIENT_SUBNET_IPV4  */
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 461, /* VAR_MIN_CLIENT_SUBNET_IPV6  */
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, /* VAR_MAX_ECS_TREE_SIZE_IPV4  */
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, /* VAR_MAX_ECS_TREE_SIZE_IPV6  */
-    VAR_CAPS_WHITELIST = 464,      /* VAR_CAPS_WHITELIST  */
-    VAR_CACHE_MAX_NEGATIVE_TTL = 465, /* VAR_CACHE_MAX_NEGATIVE_TTL  */
-    VAR_PERMIT_SMALL_HOLDDOWN = 466, /* VAR_PERMIT_SMALL_HOLDDOWN  */
-    VAR_QNAME_MINIMISATION = 467,  /* VAR_QNAME_MINIMISATION  */
-    VAR_QNAME_MINIMISATION_STRICT = 468, /* VAR_QNAME_MINIMISATION_STRICT  */
-    VAR_IP_FREEBIND = 469,         /* VAR_IP_FREEBIND  */
-    VAR_DEFINE_TAG = 470,          /* VAR_DEFINE_TAG  */
-    VAR_LOCAL_ZONE_TAG = 471,      /* VAR_LOCAL_ZONE_TAG  */
-    VAR_ACCESS_CONTROL_TAG = 472,  /* VAR_ACCESS_CONTROL_TAG  */
-    VAR_LOCAL_ZONE_OVERRIDE = 473, /* VAR_LOCAL_ZONE_OVERRIDE  */
-    VAR_ACCESS_CONTROL_TAG_ACTION = 474, /* VAR_ACCESS_CONTROL_TAG_ACTION  */
-    VAR_ACCESS_CONTROL_TAG_DATA = 475, /* VAR_ACCESS_CONTROL_TAG_DATA  */
-    VAR_VIEW = 476,                /* VAR_VIEW  */
-    VAR_ACCESS_CONTROL_VIEW = 477, /* VAR_ACCESS_CONTROL_VIEW  */
-    VAR_VIEW_FIRST = 478,          /* VAR_VIEW_FIRST  */
-    VAR_SERVE_EXPIRED = 479,       /* VAR_SERVE_EXPIRED  */
-    VAR_SERVE_EXPIRED_TTL = 480,   /* VAR_SERVE_EXPIRED_TTL  */
-    VAR_SERVE_EXPIRED_TTL_RESET = 481, /* VAR_SERVE_EXPIRED_TTL_RESET  */
-    VAR_SERVE_EXPIRED_REPLY_TTL = 482, /* VAR_SERVE_EXPIRED_REPLY_TTL  */
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, /* VAR_SERVE_EXPIRED_CLIENT_TIMEOUT  */
-    VAR_FAKE_DSA = 484,            /* VAR_FAKE_DSA  */
-    VAR_FAKE_SHA1 = 485,           /* VAR_FAKE_SHA1  */
-    VAR_LOG_IDENTITY = 486,        /* VAR_LOG_IDENTITY  */
-    VAR_HIDE_TRUSTANCHOR = 487,    /* VAR_HIDE_TRUSTANCHOR  */
-    VAR_TRUST_ANCHOR_SIGNALING = 488, /* VAR_TRUST_ANCHOR_SIGNALING  */
-    VAR_AGGRESSIVE_NSEC = 489,     /* VAR_AGGRESSIVE_NSEC  */
-    VAR_USE_SYSTEMD = 490,         /* VAR_USE_SYSTEMD  */
-    VAR_SHM_ENABLE = 491,          /* VAR_SHM_ENABLE  */
-    VAR_SHM_KEY = 492,             /* VAR_SHM_KEY  */
-    VAR_ROOT_KEY_SENTINEL = 493,   /* VAR_ROOT_KEY_SENTINEL  */
-    VAR_DNSCRYPT = 494,            /* VAR_DNSCRYPT  */
-    VAR_DNSCRYPT_ENABLE = 495,     /* VAR_DNSCRYPT_ENABLE  */
-    VAR_DNSCRYPT_PORT = 496,       /* VAR_DNSCRYPT_PORT  */
-    VAR_DNSCRYPT_PROVIDER = 497,   /* VAR_DNSCRYPT_PROVIDER  */
-    VAR_DNSCRYPT_SECRET_KEY = 498, /* VAR_DNSCRYPT_SECRET_KEY  */
-    VAR_DNSCRYPT_PROVIDER_CERT = 499, /* VAR_DNSCRYPT_PROVIDER_CERT  */
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, /* VAR_DNSCRYPT_PROVIDER_CERT_ROTATED  */
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE  */
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS  */
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, /* VAR_DNSCRYPT_NONCE_CACHE_SIZE  */
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, /* VAR_DNSCRYPT_NONCE_CACHE_SLABS  */
-    VAR_IPSECMOD_ENABLED = 505,    /* VAR_IPSECMOD_ENABLED  */
-    VAR_IPSECMOD_HOOK = 506,       /* VAR_IPSECMOD_HOOK  */
-    VAR_IPSECMOD_IGNORE_BOGUS = 507, /* VAR_IPSECMOD_IGNORE_BOGUS  */
-    VAR_IPSECMOD_MAX_TTL = 508,    /* VAR_IPSECMOD_MAX_TTL  */
-    VAR_IPSECMOD_WHITELIST = 509,  /* VAR_IPSECMOD_WHITELIST  */
-    VAR_IPSECMOD_STRICT = 510,     /* VAR_IPSECMOD_STRICT  */
-    VAR_CACHEDB = 511,             /* VAR_CACHEDB  */
-    VAR_CACHEDB_BACKEND = 512,     /* VAR_CACHEDB_BACKEND  */
-    VAR_CACHEDB_SECRETSEED = 513,  /* VAR_CACHEDB_SECRETSEED  */
-    VAR_CACHEDB_REDISHOST = 514,   /* VAR_CACHEDB_REDISHOST  */
-    VAR_CACHEDB_REDISPORT = 515,   /* VAR_CACHEDB_REDISPORT  */
-    VAR_CACHEDB_REDISTIMEOUT = 516, /* VAR_CACHEDB_REDISTIMEOUT  */
-    VAR_CACHEDB_REDISEXPIRERECORDS = 517, /* VAR_CACHEDB_REDISEXPIRERECORDS  */
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, /* VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM  */
-    VAR_FOR_UPSTREAM = 519,        /* VAR_FOR_UPSTREAM  */
-    VAR_AUTH_ZONE = 520,           /* VAR_AUTH_ZONE  */
-    VAR_ZONEFILE = 521,            /* VAR_ZONEFILE  */
-    VAR_MASTER = 522,              /* VAR_MASTER  */
-    VAR_URL = 523,                 /* VAR_URL  */
-    VAR_FOR_DOWNSTREAM = 524,      /* VAR_FOR_DOWNSTREAM  */
-    VAR_FALLBACK_ENABLED = 525,    /* VAR_FALLBACK_ENABLED  */
-    VAR_TLS_ADDITIONAL_PORT = 526, /* VAR_TLS_ADDITIONAL_PORT  */
-    VAR_LOW_RTT = 527,             /* VAR_LOW_RTT  */
-    VAR_LOW_RTT_PERMIL = 528,      /* VAR_LOW_RTT_PERMIL  */
-    VAR_FAST_SERVER_PERMIL = 529,  /* VAR_FAST_SERVER_PERMIL  */
-    VAR_FAST_SERVER_NUM = 530,     /* VAR_FAST_SERVER_NUM  */
-    VAR_ALLOW_NOTIFY = 531,        /* VAR_ALLOW_NOTIFY  */
-    VAR_TLS_WIN_CERT = 532,        /* VAR_TLS_WIN_CERT  */
-    VAR_TCP_CONNECTION_LIMIT = 533, /* VAR_TCP_CONNECTION_LIMIT  */
-    VAR_FORWARD_NO_CACHE = 534,    /* VAR_FORWARD_NO_CACHE  */
-    VAR_STUB_NO_CACHE = 535,       /* VAR_STUB_NO_CACHE  */
-    VAR_LOG_SERVFAIL = 536,        /* VAR_LOG_SERVFAIL  */
-    VAR_DENY_ANY = 537,            /* VAR_DENY_ANY  */
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, /* VAR_UNKNOWN_SERVER_TIME_LIMIT  */
-    VAR_LOG_TAG_QUERYREPLY = 539,  /* VAR_LOG_TAG_QUERYREPLY  */
-    VAR_STREAM_WAIT_SIZE = 540,    /* VAR_STREAM_WAIT_SIZE  */
-    VAR_TLS_CIPHERS = 541,         /* VAR_TLS_CIPHERS  */
-    VAR_TLS_CIPHERSUITES = 542,    /* VAR_TLS_CIPHERSUITES  */
-    VAR_TLS_USE_SNI = 543,         /* VAR_TLS_USE_SNI  */
-    VAR_IPSET = 544,               /* VAR_IPSET  */
-    VAR_IPSET_NAME_V4 = 545,       /* VAR_IPSET_NAME_V4  */
-    VAR_IPSET_NAME_V6 = 546,       /* VAR_IPSET_NAME_V6  */
-    VAR_TLS_SESSION_TICKET_KEYS = 547, /* VAR_TLS_SESSION_TICKET_KEYS  */
-    VAR_RPZ = 548,                 /* VAR_RPZ  */
-    VAR_TAGS = 549,                /* VAR_TAGS  */
-    VAR_RPZ_ACTION_OVERRIDE = 550, /* VAR_RPZ_ACTION_OVERRIDE  */
-    VAR_RPZ_CNAME_OVERRIDE = 551,  /* VAR_RPZ_CNAME_OVERRIDE  */
-    VAR_RPZ_LOG = 552,             /* VAR_RPZ_LOG  */
-    VAR_RPZ_LOG_NAME = 553,        /* VAR_RPZ_LOG_NAME  */
-    VAR_DYNLIB = 554,              /* VAR_DYNLIB  */
-    VAR_DYNLIB_FILE = 555,         /* VAR_DYNLIB_FILE  */
-    VAR_EDNS_CLIENT_STRING = 556,  /* VAR_EDNS_CLIENT_STRING  */
-    VAR_EDNS_CLIENT_STRING_OPCODE = 557 /* VAR_EDNS_CLIENT_STRING_OPCODE  */
+    SPACE = 258,
+    LETTER = 259,
+    NEWLINE = 260,
+    COMMENT = 261,
+    COLON = 262,
+    ANY = 263,
+    ZONESTR = 264,
+    STRING_ARG = 265,
+    VAR_FORCE_TOPLEVEL = 266,
+    VAR_SERVER = 267,
+    VAR_VERBOSITY = 268,
+    VAR_NUM_THREADS = 269,
+    VAR_PORT = 270,
+    VAR_OUTGOING_RANGE = 271,
+    VAR_INTERFACE = 272,
+    VAR_PREFER_IP4 = 273,
+    VAR_DO_IP4 = 274,
+    VAR_DO_IP6 = 275,
+    VAR_PREFER_IP6 = 276,
+    VAR_DO_UDP = 277,
+    VAR_DO_TCP = 278,
+    VAR_TCP_MSS = 279,
+    VAR_OUTGOING_TCP_MSS = 280,
+    VAR_TCP_IDLE_TIMEOUT = 281,
+    VAR_EDNS_TCP_KEEPALIVE = 282,
+    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283,
+    VAR_CHROOT = 284,
+    VAR_USERNAME = 285,
+    VAR_DIRECTORY = 286,
+    VAR_LOGFILE = 287,
+    VAR_PIDFILE = 288,
+    VAR_MSG_CACHE_SIZE = 289,
+    VAR_MSG_CACHE_SLABS = 290,
+    VAR_NUM_QUERIES_PER_THREAD = 291,
+    VAR_RRSET_CACHE_SIZE = 292,
+    VAR_RRSET_CACHE_SLABS = 293,
+    VAR_OUTGOING_NUM_TCP = 294,
+    VAR_INFRA_HOST_TTL = 295,
+    VAR_INFRA_LAME_TTL = 296,
+    VAR_INFRA_CACHE_SLABS = 297,
+    VAR_INFRA_CACHE_NUMHOSTS = 298,
+    VAR_INFRA_CACHE_LAME_SIZE = 299,
+    VAR_NAME = 300,
+    VAR_STUB_ZONE = 301,
+    VAR_STUB_HOST = 302,
+    VAR_STUB_ADDR = 303,
+    VAR_TARGET_FETCH_POLICY = 304,
+    VAR_HARDEN_SHORT_BUFSIZE = 305,
+    VAR_HARDEN_LARGE_QUERIES = 306,
+    VAR_FORWARD_ZONE = 307,
+    VAR_FORWARD_HOST = 308,
+    VAR_FORWARD_ADDR = 309,
+    VAR_DO_NOT_QUERY_ADDRESS = 310,
+    VAR_HIDE_IDENTITY = 311,
+    VAR_HIDE_VERSION = 312,
+    VAR_IDENTITY = 313,
+    VAR_VERSION = 314,
+    VAR_HARDEN_GLUE = 315,
+    VAR_MODULE_CONF = 316,
+    VAR_TRUST_ANCHOR_FILE = 317,
+    VAR_TRUST_ANCHOR = 318,
+    VAR_VAL_OVERRIDE_DATE = 319,
+    VAR_BOGUS_TTL = 320,
+    VAR_VAL_CLEAN_ADDITIONAL = 321,
+    VAR_VAL_PERMISSIVE_MODE = 322,
+    VAR_INCOMING_NUM_TCP = 323,
+    VAR_MSG_BUFFER_SIZE = 324,
+    VAR_KEY_CACHE_SIZE = 325,
+    VAR_KEY_CACHE_SLABS = 326,
+    VAR_TRUSTED_KEYS_FILE = 327,
+    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328,
+    VAR_USE_SYSLOG = 329,
+    VAR_OUTGOING_INTERFACE = 330,
+    VAR_ROOT_HINTS = 331,
+    VAR_DO_NOT_QUERY_LOCALHOST = 332,
+    VAR_CACHE_MAX_TTL = 333,
+    VAR_HARDEN_DNSSEC_STRIPPED = 334,
+    VAR_ACCESS_CONTROL = 335,
+    VAR_LOCAL_ZONE = 336,
+    VAR_LOCAL_DATA = 337,
+    VAR_INTERFACE_AUTOMATIC = 338,
+    VAR_STATISTICS_INTERVAL = 339,
+    VAR_DO_DAEMONIZE = 340,
+    VAR_USE_CAPS_FOR_ID = 341,
+    VAR_STATISTICS_CUMULATIVE = 342,
+    VAR_OUTGOING_PORT_PERMIT = 343,
+    VAR_OUTGOING_PORT_AVOID = 344,
+    VAR_DLV_ANCHOR_FILE = 345,
+    VAR_DLV_ANCHOR = 346,
+    VAR_NEG_CACHE_SIZE = 347,
+    VAR_HARDEN_REFERRAL_PATH = 348,
+    VAR_PRIVATE_ADDRESS = 349,
+    VAR_PRIVATE_DOMAIN = 350,
+    VAR_REMOTE_CONTROL = 351,
+    VAR_CONTROL_ENABLE = 352,
+    VAR_CONTROL_INTERFACE = 353,
+    VAR_CONTROL_PORT = 354,
+    VAR_SERVER_KEY_FILE = 355,
+    VAR_SERVER_CERT_FILE = 356,
+    VAR_CONTROL_KEY_FILE = 357,
+    VAR_CONTROL_CERT_FILE = 358,
+    VAR_CONTROL_USE_CERT = 359,
+    VAR_EXTENDED_STATISTICS = 360,
+    VAR_LOCAL_DATA_PTR = 361,
+    VAR_JOSTLE_TIMEOUT = 362,
+    VAR_STUB_PRIME = 363,
+    VAR_UNWANTED_REPLY_THRESHOLD = 364,
+    VAR_LOG_TIME_ASCII = 365,
+    VAR_DOMAIN_INSECURE = 366,
+    VAR_PYTHON = 367,
+    VAR_PYTHON_SCRIPT = 368,
+    VAR_VAL_SIG_SKEW_MIN = 369,
+    VAR_VAL_SIG_SKEW_MAX = 370,
+    VAR_CACHE_MIN_TTL = 371,
+    VAR_VAL_LOG_LEVEL = 372,
+    VAR_AUTO_TRUST_ANCHOR_FILE = 373,
+    VAR_KEEP_MISSING = 374,
+    VAR_ADD_HOLDDOWN = 375,
+    VAR_DEL_HOLDDOWN = 376,
+    VAR_SO_RCVBUF = 377,
+    VAR_EDNS_BUFFER_SIZE = 378,
+    VAR_PREFETCH = 379,
+    VAR_PREFETCH_KEY = 380,
+    VAR_SO_SNDBUF = 381,
+    VAR_SO_REUSEPORT = 382,
+    VAR_HARDEN_BELOW_NXDOMAIN = 383,
+    VAR_IGNORE_CD_FLAG = 384,
+    VAR_LOG_QUERIES = 385,
+    VAR_LOG_REPLIES = 386,
+    VAR_LOG_LOCAL_ACTIONS = 387,
+    VAR_TCP_UPSTREAM = 388,
+    VAR_SSL_UPSTREAM = 389,
+    VAR_SSL_SERVICE_KEY = 390,
+    VAR_SSL_SERVICE_PEM = 391,
+    VAR_SSL_PORT = 392,
+    VAR_FORWARD_FIRST = 393,
+    VAR_STUB_SSL_UPSTREAM = 394,
+    VAR_FORWARD_SSL_UPSTREAM = 395,
+    VAR_TLS_CERT_BUNDLE = 396,
+    VAR_HTTPS_PORT = 397,
+    VAR_HTTP_ENDPOINT = 398,
+    VAR_HTTP_MAX_STREAMS = 399,
+    VAR_HTTP_QUERY_BUFFER_SIZE = 400,
+    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401,
+    VAR_HTTP_NODELAY = 402,
+    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_UDP_CONNECT = 409,
+    VAR_UNBLOCK_LAN_ZONES = 410,
+    VAR_INSECURE_LAN_ZONES = 411,
+    VAR_INFRA_CACHE_MIN_RTT = 412,
+    VAR_INFRA_KEEP_PROBING = 413,
+    VAR_DNS64_PREFIX = 414,
+    VAR_DNS64_SYNTHALL = 415,
+    VAR_DNS64_IGNORE_AAAA = 416,
+    VAR_DNSTAP = 417,
+    VAR_DNSTAP_ENABLE = 418,
+    VAR_DNSTAP_SOCKET_PATH = 419,
+    VAR_DNSTAP_IP = 420,
+    VAR_DNSTAP_TLS = 421,
+    VAR_DNSTAP_TLS_SERVER_NAME = 422,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 423,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425,
+    VAR_DNSTAP_SEND_IDENTITY = 426,
+    VAR_DNSTAP_SEND_VERSION = 427,
+    VAR_DNSTAP_BIDIRECTIONAL = 428,
+    VAR_DNSTAP_IDENTITY = 429,
+    VAR_DNSTAP_VERSION = 430,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436,
+    VAR_RESPONSE_IP_TAG = 437,
+    VAR_RESPONSE_IP = 438,
+    VAR_RESPONSE_IP_DATA = 439,
+    VAR_HARDEN_ALGO_DOWNGRADE = 440,
+    VAR_IP_TRANSPARENT = 441,
+    VAR_IP_DSCP = 442,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 443,
+    VAR_IP_RATELIMIT = 444,
+    VAR_IP_RATELIMIT_SLABS = 445,
+    VAR_IP_RATELIMIT_SIZE = 446,
+    VAR_RATELIMIT = 447,
+    VAR_RATELIMIT_SLABS = 448,
+    VAR_RATELIMIT_SIZE = 449,
+    VAR_RATELIMIT_FOR_DOMAIN = 450,
+    VAR_RATELIMIT_BELOW_DOMAIN = 451,
+    VAR_IP_RATELIMIT_FACTOR = 452,
+    VAR_RATELIMIT_FACTOR = 453,
+    VAR_SEND_CLIENT_SUBNET = 454,
+    VAR_CLIENT_SUBNET_ZONE = 455,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456,
+    VAR_CLIENT_SUBNET_OPCODE = 457,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 458,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 459,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 460,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 461,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463,
+    VAR_CAPS_WHITELIST = 464,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 465,
+    VAR_PERMIT_SMALL_HOLDDOWN = 466,
+    VAR_QNAME_MINIMISATION = 467,
+    VAR_QNAME_MINIMISATION_STRICT = 468,
+    VAR_IP_FREEBIND = 469,
+    VAR_DEFINE_TAG = 470,
+    VAR_LOCAL_ZONE_TAG = 471,
+    VAR_ACCESS_CONTROL_TAG = 472,
+    VAR_LOCAL_ZONE_OVERRIDE = 473,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 474,
+    VAR_ACCESS_CONTROL_TAG_DATA = 475,
+    VAR_VIEW = 476,
+    VAR_ACCESS_CONTROL_VIEW = 477,
+    VAR_VIEW_FIRST = 478,
+    VAR_SERVE_EXPIRED = 479,
+    VAR_SERVE_EXPIRED_TTL = 480,
+    VAR_SERVE_EXPIRED_TTL_RESET = 481,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 482,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483,
+    VAR_FAKE_DSA = 484,
+    VAR_FAKE_SHA1 = 485,
+    VAR_LOG_IDENTITY = 486,
+    VAR_HIDE_TRUSTANCHOR = 487,
+    VAR_TRUST_ANCHOR_SIGNALING = 488,
+    VAR_AGGRESSIVE_NSEC = 489,
+    VAR_USE_SYSTEMD = 490,
+    VAR_SHM_ENABLE = 491,
+    VAR_SHM_KEY = 492,
+    VAR_ROOT_KEY_SENTINEL = 493,
+    VAR_DNSCRYPT = 494,
+    VAR_DNSCRYPT_ENABLE = 495,
+    VAR_DNSCRYPT_PORT = 496,
+    VAR_DNSCRYPT_PROVIDER = 497,
+    VAR_DNSCRYPT_SECRET_KEY = 498,
+    VAR_DNSCRYPT_PROVIDER_CERT = 499,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504,
+    VAR_IPSECMOD_ENABLED = 505,
+    VAR_IPSECMOD_HOOK = 506,
+    VAR_IPSECMOD_IGNORE_BOGUS = 507,
+    VAR_IPSECMOD_MAX_TTL = 508,
+    VAR_IPSECMOD_WHITELIST = 509,
+    VAR_IPSECMOD_STRICT = 510,
+    VAR_CACHEDB = 511,
+    VAR_CACHEDB_BACKEND = 512,
+    VAR_CACHEDB_SECRETSEED = 513,
+    VAR_CACHEDB_REDISHOST = 514,
+    VAR_CACHEDB_REDISPORT = 515,
+    VAR_CACHEDB_REDISTIMEOUT = 516,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 517,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518,
+    VAR_FOR_UPSTREAM = 519,
+    VAR_AUTH_ZONE = 520,
+    VAR_ZONEFILE = 521,
+    VAR_MASTER = 522,
+    VAR_URL = 523,
+    VAR_FOR_DOWNSTREAM = 524,
+    VAR_FALLBACK_ENABLED = 525,
+    VAR_TLS_ADDITIONAL_PORT = 526,
+    VAR_LOW_RTT = 527,
+    VAR_LOW_RTT_PERMIL = 528,
+    VAR_FAST_SERVER_PERMIL = 529,
+    VAR_FAST_SERVER_NUM = 530,
+    VAR_ALLOW_NOTIFY = 531,
+    VAR_TLS_WIN_CERT = 532,
+    VAR_TCP_CONNECTION_LIMIT = 533,
+    VAR_FORWARD_NO_CACHE = 534,
+    VAR_STUB_NO_CACHE = 535,
+    VAR_LOG_SERVFAIL = 536,
+    VAR_DENY_ANY = 537,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538,
+    VAR_LOG_TAG_QUERYREPLY = 539,
+    VAR_STREAM_WAIT_SIZE = 540,
+    VAR_TLS_CIPHERS = 541,
+    VAR_TLS_CIPHERSUITES = 542,
+    VAR_TLS_USE_SNI = 543,
+    VAR_IPSET = 544,
+    VAR_IPSET_NAME_V4 = 545,
+    VAR_IPSET_NAME_V6 = 546,
+    VAR_TLS_SESSION_TICKET_KEYS = 547,
+    VAR_RPZ = 548,
+    VAR_TAGS = 549,
+    VAR_RPZ_ACTION_OVERRIDE = 550,
+    VAR_RPZ_CNAME_OVERRIDE = 551,
+    VAR_RPZ_LOG = 552,
+    VAR_RPZ_LOG_NAME = 553,
+    VAR_DYNLIB = 554,
+    VAR_DYNLIB_FILE = 555,
+    VAR_EDNS_CLIENT_STRING = 556,
+    VAR_EDNS_CLIENT_STRING_OPCODE = 557
   };
-  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Token kinds.  */
-#define YYEOF 0
-#define YYerror 256
-#define YYUNDEF 257
+/* Tokens.  */
 #define SPACE 258
 #define LETTER 259
 #define NEWLINE 260
@@ -756,7 +746,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 760 "util/configparser.c"
+#line 750 "util/configparser.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -770,644 +760,6 @@ extern YYSTYPE yylval;
 int yyparse (void);
 
 #endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
-/* Symbol kind.  */
-enum yysymbol_kind_t
-{
-  YYSYMBOL_YYEMPTY = -2,
-  YYSYMBOL_YYEOF = 0,                      /* "end of file"  */
-  YYSYMBOL_YYerror = 1,                    /* error  */
-  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
-  YYSYMBOL_SPACE = 3,                      /* SPACE  */
-  YYSYMBOL_LETTER = 4,                     /* LETTER  */
-  YYSYMBOL_NEWLINE = 5,                    /* NEWLINE  */
-  YYSYMBOL_COMMENT = 6,                    /* COMMENT  */
-  YYSYMBOL_COLON = 7,                      /* COLON  */
-  YYSYMBOL_ANY = 8,                        /* ANY  */
-  YYSYMBOL_ZONESTR = 9,                    /* ZONESTR  */
-  YYSYMBOL_STRING_ARG = 10,                /* STRING_ARG  */
-  YYSYMBOL_VAR_FORCE_TOPLEVEL = 11,        /* VAR_FORCE_TOPLEVEL  */
-  YYSYMBOL_VAR_SERVER = 12,                /* VAR_SERVER  */
-  YYSYMBOL_VAR_VERBOSITY = 13,             /* VAR_VERBOSITY  */
-  YYSYMBOL_VAR_NUM_THREADS = 14,           /* VAR_NUM_THREADS  */
-  YYSYMBOL_VAR_PORT = 15,                  /* VAR_PORT  */
-  YYSYMBOL_VAR_OUTGOING_RANGE = 16,        /* VAR_OUTGOING_RANGE  */
-  YYSYMBOL_VAR_INTERFACE = 17,             /* VAR_INTERFACE  */
-  YYSYMBOL_VAR_PREFER_IP4 = 18,            /* VAR_PREFER_IP4  */
-  YYSYMBOL_VAR_DO_IP4 = 19,                /* VAR_DO_IP4  */
-  YYSYMBOL_VAR_DO_IP6 = 20,                /* VAR_DO_IP6  */
-  YYSYMBOL_VAR_PREFER_IP6 = 21,            /* VAR_PREFER_IP6  */
-  YYSYMBOL_VAR_DO_UDP = 22,                /* VAR_DO_UDP  */
-  YYSYMBOL_VAR_DO_TCP = 23,                /* VAR_DO_TCP  */
-  YYSYMBOL_VAR_TCP_MSS = 24,               /* VAR_TCP_MSS  */
-  YYSYMBOL_VAR_OUTGOING_TCP_MSS = 25,      /* VAR_OUTGOING_TCP_MSS  */
-  YYSYMBOL_VAR_TCP_IDLE_TIMEOUT = 26,      /* VAR_TCP_IDLE_TIMEOUT  */
-  YYSYMBOL_VAR_EDNS_TCP_KEEPALIVE = 27,    /* VAR_EDNS_TCP_KEEPALIVE  */
-  YYSYMBOL_VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 28, /* VAR_EDNS_TCP_KEEPALIVE_TIMEOUT  */
-  YYSYMBOL_VAR_CHROOT = 29,                /* VAR_CHROOT  */
-  YYSYMBOL_VAR_USERNAME = 30,              /* VAR_USERNAME  */
-  YYSYMBOL_VAR_DIRECTORY = 31,             /* VAR_DIRECTORY  */
-  YYSYMBOL_VAR_LOGFILE = 32,               /* VAR_LOGFILE  */
-  YYSYMBOL_VAR_PIDFILE = 33,               /* VAR_PIDFILE  */
-  YYSYMBOL_VAR_MSG_CACHE_SIZE = 34,        /* VAR_MSG_CACHE_SIZE  */
-  YYSYMBOL_VAR_MSG_CACHE_SLABS = 35,       /* VAR_MSG_CACHE_SLABS  */
-  YYSYMBOL_VAR_NUM_QUERIES_PER_THREAD = 36, /* VAR_NUM_QUERIES_PER_THREAD  */
-  YYSYMBOL_VAR_RRSET_CACHE_SIZE = 37,      /* VAR_RRSET_CACHE_SIZE  */
-  YYSYMBOL_VAR_RRSET_CACHE_SLABS = 38,     /* VAR_RRSET_CACHE_SLABS  */
-  YYSYMBOL_VAR_OUTGOING_NUM_TCP = 39,      /* VAR_OUTGOING_NUM_TCP  */
-  YYSYMBOL_VAR_INFRA_HOST_TTL = 40,        /* VAR_INFRA_HOST_TTL  */
-  YYSYMBOL_VAR_INFRA_LAME_TTL = 41,        /* VAR_INFRA_LAME_TTL  */
-  YYSYMBOL_VAR_INFRA_CACHE_SLABS = 42,     /* VAR_INFRA_CACHE_SLABS  */
-  YYSYMBOL_VAR_INFRA_CACHE_NUMHOSTS = 43,  /* VAR_INFRA_CACHE_NUMHOSTS  */
-  YYSYMBOL_VAR_INFRA_CACHE_LAME_SIZE = 44, /* VAR_INFRA_CACHE_LAME_SIZE  */
-  YYSYMBOL_VAR_NAME = 45,                  /* VAR_NAME  */
-  YYSYMBOL_VAR_STUB_ZONE = 46,             /* VAR_STUB_ZONE  */
-  YYSYMBOL_VAR_STUB_HOST = 47,             /* VAR_STUB_HOST  */
-  YYSYMBOL_VAR_STUB_ADDR = 48,             /* VAR_STUB_ADDR  */
-  YYSYMBOL_VAR_TARGET_FETCH_POLICY = 49,   /* VAR_TARGET_FETCH_POLICY  */
-  YYSYMBOL_VAR_HARDEN_SHORT_BUFSIZE = 50,  /* VAR_HARDEN_SHORT_BUFSIZE  */
-  YYSYMBOL_VAR_HARDEN_LARGE_QUERIES = 51,  /* VAR_HARDEN_LARGE_QUERIES  */
-  YYSYMBOL_VAR_FORWARD_ZONE = 52,          /* VAR_FORWARD_ZONE  */
-  YYSYMBOL_VAR_FORWARD_HOST = 53,          /* VAR_FORWARD_HOST  */
-  YYSYMBOL_VAR_FORWARD_ADDR = 54,          /* VAR_FORWARD_ADDR  */
-  YYSYMBOL_VAR_DO_NOT_QUERY_ADDRESS = 55,  /* VAR_DO_NOT_QUERY_ADDRESS  */
-  YYSYMBOL_VAR_HIDE_IDENTITY = 56,         /* VAR_HIDE_IDENTITY  */
-  YYSYMBOL_VAR_HIDE_VERSION = 57,          /* VAR_HIDE_VERSION  */
-  YYSYMBOL_VAR_IDENTITY = 58,              /* VAR_IDENTITY  */
-  YYSYMBOL_VAR_VERSION = 59,               /* VAR_VERSION  */
-  YYSYMBOL_VAR_HARDEN_GLUE = 60,           /* VAR_HARDEN_GLUE  */
-  YYSYMBOL_VAR_MODULE_CONF = 61,           /* VAR_MODULE_CONF  */
-  YYSYMBOL_VAR_TRUST_ANCHOR_FILE = 62,     /* VAR_TRUST_ANCHOR_FILE  */
-  YYSYMBOL_VAR_TRUST_ANCHOR = 63,          /* VAR_TRUST_ANCHOR  */
-  YYSYMBOL_VAR_VAL_OVERRIDE_DATE = 64,     /* VAR_VAL_OVERRIDE_DATE  */
-  YYSYMBOL_VAR_BOGUS_TTL = 65,             /* VAR_BOGUS_TTL  */
-  YYSYMBOL_VAR_VAL_CLEAN_ADDITIONAL = 66,  /* VAR_VAL_CLEAN_ADDITIONAL  */
-  YYSYMBOL_VAR_VAL_PERMISSIVE_MODE = 67,   /* VAR_VAL_PERMISSIVE_MODE  */
-  YYSYMBOL_VAR_INCOMING_NUM_TCP = 68,      /* VAR_INCOMING_NUM_TCP  */
-  YYSYMBOL_VAR_MSG_BUFFER_SIZE = 69,       /* VAR_MSG_BUFFER_SIZE  */
-  YYSYMBOL_VAR_KEY_CACHE_SIZE = 70,        /* VAR_KEY_CACHE_SIZE  */
-  YYSYMBOL_VAR_KEY_CACHE_SLABS = 71,       /* VAR_KEY_CACHE_SLABS  */
-  YYSYMBOL_VAR_TRUSTED_KEYS_FILE = 72,     /* VAR_TRUSTED_KEYS_FILE  */
-  YYSYMBOL_VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 73, /* VAR_VAL_NSEC3_KEYSIZE_ITERATIONS  */
-  YYSYMBOL_VAR_USE_SYSLOG = 74,            /* VAR_USE_SYSLOG  */
-  YYSYMBOL_VAR_OUTGOING_INTERFACE = 75,    /* VAR_OUTGOING_INTERFACE  */
-  YYSYMBOL_VAR_ROOT_HINTS = 76,            /* VAR_ROOT_HINTS  */
-  YYSYMBOL_VAR_DO_NOT_QUERY_LOCALHOST = 77, /* VAR_DO_NOT_QUERY_LOCALHOST  */
-  YYSYMBOL_VAR_CACHE_MAX_TTL = 78,         /* VAR_CACHE_MAX_TTL  */
-  YYSYMBOL_VAR_HARDEN_DNSSEC_STRIPPED = 79, /* VAR_HARDEN_DNSSEC_STRIPPED  */
-  YYSYMBOL_VAR_ACCESS_CONTROL = 80,        /* VAR_ACCESS_CONTROL  */
-  YYSYMBOL_VAR_LOCAL_ZONE = 81,            /* VAR_LOCAL_ZONE  */
-  YYSYMBOL_VAR_LOCAL_DATA = 82,            /* VAR_LOCAL_DATA  */
-  YYSYMBOL_VAR_INTERFACE_AUTOMATIC = 83,   /* VAR_INTERFACE_AUTOMATIC  */
-  YYSYMBOL_VAR_STATISTICS_INTERVAL = 84,   /* VAR_STATISTICS_INTERVAL  */
-  YYSYMBOL_VAR_DO_DAEMONIZE = 85,          /* VAR_DO_DAEMONIZE  */
-  YYSYMBOL_VAR_USE_CAPS_FOR_ID = 86,       /* VAR_USE_CAPS_FOR_ID  */
-  YYSYMBOL_VAR_STATISTICS_CUMULATIVE = 87, /* VAR_STATISTICS_CUMULATIVE  */
-  YYSYMBOL_VAR_OUTGOING_PORT_PERMIT = 88,  /* VAR_OUTGOING_PORT_PERMIT  */
-  YYSYMBOL_VAR_OUTGOING_PORT_AVOID = 89,   /* VAR_OUTGOING_PORT_AVOID  */
-  YYSYMBOL_VAR_DLV_ANCHOR_FILE = 90,       /* VAR_DLV_ANCHOR_FILE  */
-  YYSYMBOL_VAR_DLV_ANCHOR = 91,            /* VAR_DLV_ANCHOR  */
-  YYSYMBOL_VAR_NEG_CACHE_SIZE = 92,        /* VAR_NEG_CACHE_SIZE  */
-  YYSYMBOL_VAR_HARDEN_REFERRAL_PATH = 93,  /* VAR_HARDEN_REFERRAL_PATH  */
-  YYSYMBOL_VAR_PRIVATE_ADDRESS = 94,       /* VAR_PRIVATE_ADDRESS  */
-  YYSYMBOL_VAR_PRIVATE_DOMAIN = 95,        /* VAR_PRIVATE_DOMAIN  */
-  YYSYMBOL_VAR_REMOTE_CONTROL = 96,        /* VAR_REMOTE_CONTROL  */
-  YYSYMBOL_VAR_CONTROL_ENABLE = 97,        /* VAR_CONTROL_ENABLE  */
-  YYSYMBOL_VAR_CONTROL_INTERFACE = 98,     /* VAR_CONTROL_INTERFACE  */
-  YYSYMBOL_VAR_CONTROL_PORT = 99,          /* VAR_CONTROL_PORT  */
-  YYSYMBOL_VAR_SERVER_KEY_FILE = 100,      /* VAR_SERVER_KEY_FILE  */
-  YYSYMBOL_VAR_SERVER_CERT_FILE = 101,     /* VAR_SERVER_CERT_FILE  */
-  YYSYMBOL_VAR_CONTROL_KEY_FILE = 102,     /* VAR_CONTROL_KEY_FILE  */
-  YYSYMBOL_VAR_CONTROL_CERT_FILE = 103,    /* VAR_CONTROL_CERT_FILE  */
-  YYSYMBOL_VAR_CONTROL_USE_CERT = 104,     /* VAR_CONTROL_USE_CERT  */
-  YYSYMBOL_VAR_EXTENDED_STATISTICS = 105,  /* VAR_EXTENDED_STATISTICS  */
-  YYSYMBOL_VAR_LOCAL_DATA_PTR = 106,       /* VAR_LOCAL_DATA_PTR  */
-  YYSYMBOL_VAR_JOSTLE_TIMEOUT = 107,       /* VAR_JOSTLE_TIMEOUT  */
-  YYSYMBOL_VAR_STUB_PRIME = 108,           /* VAR_STUB_PRIME  */
-  YYSYMBOL_VAR_UNWANTED_REPLY_THRESHOLD = 109, /* VAR_UNWANTED_REPLY_THRESHOLD  */
-  YYSYMBOL_VAR_LOG_TIME_ASCII = 110,       /* VAR_LOG_TIME_ASCII  */
-  YYSYMBOL_VAR_DOMAIN_INSECURE = 111,      /* VAR_DOMAIN_INSECURE  */
-  YYSYMBOL_VAR_PYTHON = 112,               /* VAR_PYTHON  */
-  YYSYMBOL_VAR_PYTHON_SCRIPT = 113,        /* VAR_PYTHON_SCRIPT  */
-  YYSYMBOL_VAR_VAL_SIG_SKEW_MIN = 114,     /* VAR_VAL_SIG_SKEW_MIN  */
-  YYSYMBOL_VAR_VAL_SIG_SKEW_MAX = 115,     /* VAR_VAL_SIG_SKEW_MAX  */
-  YYSYMBOL_VAR_CACHE_MIN_TTL = 116,        /* VAR_CACHE_MIN_TTL  */
-  YYSYMBOL_VAR_VAL_LOG_LEVEL = 117,        /* VAR_VAL_LOG_LEVEL  */
-  YYSYMBOL_VAR_AUTO_TRUST_ANCHOR_FILE = 118, /* VAR_AUTO_TRUST_ANCHOR_FILE  */
-  YYSYMBOL_VAR_KEEP_MISSING = 119,         /* VAR_KEEP_MISSING  */
-  YYSYMBOL_VAR_ADD_HOLDDOWN = 120,         /* VAR_ADD_HOLDDOWN  */
-  YYSYMBOL_VAR_DEL_HOLDDOWN = 121,         /* VAR_DEL_HOLDDOWN  */
-  YYSYMBOL_VAR_SO_RCVBUF = 122,            /* VAR_SO_RCVBUF  */
-  YYSYMBOL_VAR_EDNS_BUFFER_SIZE = 123,     /* VAR_EDNS_BUFFER_SIZE  */
-  YYSYMBOL_VAR_PREFETCH = 124,             /* VAR_PREFETCH  */
-  YYSYMBOL_VAR_PREFETCH_KEY = 125,         /* VAR_PREFETCH_KEY  */
-  YYSYMBOL_VAR_SO_SNDBUF = 126,            /* VAR_SO_SNDBUF  */
-  YYSYMBOL_VAR_SO_REUSEPORT = 127,         /* VAR_SO_REUSEPORT  */
-  YYSYMBOL_VAR_HARDEN_BELOW_NXDOMAIN = 128, /* VAR_HARDEN_BELOW_NXDOMAIN  */
-  YYSYMBOL_VAR_IGNORE_CD_FLAG = 129,       /* VAR_IGNORE_CD_FLAG  */
-  YYSYMBOL_VAR_LOG_QUERIES = 130,          /* VAR_LOG_QUERIES  */
-  YYSYMBOL_VAR_LOG_REPLIES = 131,          /* VAR_LOG_REPLIES  */
-  YYSYMBOL_VAR_LOG_LOCAL_ACTIONS = 132,    /* VAR_LOG_LOCAL_ACTIONS  */
-  YYSYMBOL_VAR_TCP_UPSTREAM = 133,         /* VAR_TCP_UPSTREAM  */
-  YYSYMBOL_VAR_SSL_UPSTREAM = 134,         /* VAR_SSL_UPSTREAM  */
-  YYSYMBOL_VAR_SSL_SERVICE_KEY = 135,      /* VAR_SSL_SERVICE_KEY  */
-  YYSYMBOL_VAR_SSL_SERVICE_PEM = 136,      /* VAR_SSL_SERVICE_PEM  */
-  YYSYMBOL_VAR_SSL_PORT = 137,             /* VAR_SSL_PORT  */
-  YYSYMBOL_VAR_FORWARD_FIRST = 138,        /* VAR_FORWARD_FIRST  */
-  YYSYMBOL_VAR_STUB_SSL_UPSTREAM = 139,    /* VAR_STUB_SSL_UPSTREAM  */
-  YYSYMBOL_VAR_FORWARD_SSL_UPSTREAM = 140, /* VAR_FORWARD_SSL_UPSTREAM  */
-  YYSYMBOL_VAR_TLS_CERT_BUNDLE = 141,      /* VAR_TLS_CERT_BUNDLE  */
-  YYSYMBOL_VAR_HTTPS_PORT = 142,           /* VAR_HTTPS_PORT  */
-  YYSYMBOL_VAR_HTTP_ENDPOINT = 143,        /* VAR_HTTP_ENDPOINT  */
-  YYSYMBOL_VAR_HTTP_MAX_STREAMS = 144,     /* VAR_HTTP_MAX_STREAMS  */
-  YYSYMBOL_VAR_HTTP_QUERY_BUFFER_SIZE = 145, /* VAR_HTTP_QUERY_BUFFER_SIZE  */
-  YYSYMBOL_VAR_HTTP_RESPONSE_BUFFER_SIZE = 146, /* VAR_HTTP_RESPONSE_BUFFER_SIZE  */
-  YYSYMBOL_VAR_HTTP_NODELAY = 147,         /* VAR_HTTP_NODELAY  */
-  YYSYMBOL_VAR_HTTP_NOTLS_DOWNSTREAM = 148, /* VAR_HTTP_NOTLS_DOWNSTREAM  */
-  YYSYMBOL_VAR_STUB_FIRST = 149,           /* VAR_STUB_FIRST  */
-  YYSYMBOL_VAR_MINIMAL_RESPONSES = 150,    /* VAR_MINIMAL_RESPONSES  */
-  YYSYMBOL_VAR_RRSET_ROUNDROBIN = 151,     /* VAR_RRSET_ROUNDROBIN  */
-  YYSYMBOL_VAR_MAX_UDP_SIZE = 152,         /* VAR_MAX_UDP_SIZE  */
-  YYSYMBOL_VAR_DELAY_CLOSE = 153,          /* VAR_DELAY_CLOSE  */
-  YYSYMBOL_VAR_UDP_CONNECT = 154,          /* VAR_UDP_CONNECT  */
-  YYSYMBOL_VAR_UNBLOCK_LAN_ZONES = 155,    /* VAR_UNBLOCK_LAN_ZONES  */
-  YYSYMBOL_VAR_INSECURE_LAN_ZONES = 156,   /* VAR_INSECURE_LAN_ZONES  */
-  YYSYMBOL_VAR_INFRA_CACHE_MIN_RTT = 157,  /* VAR_INFRA_CACHE_MIN_RTT  */
-  YYSYMBOL_VAR_INFRA_KEEP_PROBING = 158,   /* VAR_INFRA_KEEP_PROBING  */
-  YYSYMBOL_VAR_DNS64_PREFIX = 159,         /* VAR_DNS64_PREFIX  */
-  YYSYMBOL_VAR_DNS64_SYNTHALL = 160,       /* VAR_DNS64_SYNTHALL  */
-  YYSYMBOL_VAR_DNS64_IGNORE_AAAA = 161,    /* VAR_DNS64_IGNORE_AAAA  */
-  YYSYMBOL_VAR_DNSTAP = 162,               /* VAR_DNSTAP  */
-  YYSYMBOL_VAR_DNSTAP_ENABLE = 163,        /* VAR_DNSTAP_ENABLE  */
-  YYSYMBOL_VAR_DNSTAP_SOCKET_PATH = 164,   /* VAR_DNSTAP_SOCKET_PATH  */
-  YYSYMBOL_VAR_DNSTAP_IP = 165,            /* VAR_DNSTAP_IP  */
-  YYSYMBOL_VAR_DNSTAP_TLS = 166,           /* VAR_DNSTAP_TLS  */
-  YYSYMBOL_VAR_DNSTAP_TLS_SERVER_NAME = 167, /* VAR_DNSTAP_TLS_SERVER_NAME  */
-  YYSYMBOL_VAR_DNSTAP_TLS_CERT_BUNDLE = 168, /* VAR_DNSTAP_TLS_CERT_BUNDLE  */
-  YYSYMBOL_VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 169, /* VAR_DNSTAP_TLS_CLIENT_KEY_FILE  */
-  YYSYMBOL_VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 170, /* VAR_DNSTAP_TLS_CLIENT_CERT_FILE  */
-  YYSYMBOL_VAR_DNSTAP_SEND_IDENTITY = 171, /* VAR_DNSTAP_SEND_IDENTITY  */
-  YYSYMBOL_VAR_DNSTAP_SEND_VERSION = 172,  /* VAR_DNSTAP_SEND_VERSION  */
-  YYSYMBOL_VAR_DNSTAP_BIDIRECTIONAL = 173, /* VAR_DNSTAP_BIDIRECTIONAL  */
-  YYSYMBOL_VAR_DNSTAP_IDENTITY = 174,      /* VAR_DNSTAP_IDENTITY  */
-  YYSYMBOL_VAR_DNSTAP_VERSION = 175,       /* VAR_DNSTAP_VERSION  */
-  YYSYMBOL_VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 176, /* VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES  */
-  YYSYMBOL_VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 177, /* VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES  */
-  YYSYMBOL_VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 178, /* VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES  */
-  YYSYMBOL_VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 179, /* VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES  */
-  YYSYMBOL_VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 180, /* VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES  */
-  YYSYMBOL_VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 181, /* VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES  */
-  YYSYMBOL_VAR_RESPONSE_IP_TAG = 182,      /* VAR_RESPONSE_IP_TAG  */
-  YYSYMBOL_VAR_RESPONSE_IP = 183,          /* VAR_RESPONSE_IP  */
-  YYSYMBOL_VAR_RESPONSE_IP_DATA = 184,     /* VAR_RESPONSE_IP_DATA  */
-  YYSYMBOL_VAR_HARDEN_ALGO_DOWNGRADE = 185, /* VAR_HARDEN_ALGO_DOWNGRADE  */
-  YYSYMBOL_VAR_IP_TRANSPARENT = 186,       /* VAR_IP_TRANSPARENT  */
-  YYSYMBOL_VAR_IP_DSCP = 187,              /* VAR_IP_DSCP  */
-  YYSYMBOL_VAR_DISABLE_DNSSEC_LAME_CHECK = 188, /* VAR_DISABLE_DNSSEC_LAME_CHECK  */
-  YYSYMBOL_VAR_IP_RATELIMIT = 189,         /* VAR_IP_RATELIMIT  */
-  YYSYMBOL_VAR_IP_RATELIMIT_SLABS = 190,   /* VAR_IP_RATELIMIT_SLABS  */
-  YYSYMBOL_VAR_IP_RATELIMIT_SIZE = 191,    /* VAR_IP_RATELIMIT_SIZE  */
-  YYSYMBOL_VAR_RATELIMIT = 192,            /* VAR_RATELIMIT  */
-  YYSYMBOL_VAR_RATELIMIT_SLABS = 193,      /* VAR_RATELIMIT_SLABS  */
-  YYSYMBOL_VAR_RATELIMIT_SIZE = 194,       /* VAR_RATELIMIT_SIZE  */
-  YYSYMBOL_VAR_RATELIMIT_FOR_DOMAIN = 195, /* VAR_RATELIMIT_FOR_DOMAIN  */
-  YYSYMBOL_VAR_RATELIMIT_BELOW_DOMAIN = 196, /* VAR_RATELIMIT_BELOW_DOMAIN  */
-  YYSYMBOL_VAR_IP_RATELIMIT_FACTOR = 197,  /* VAR_IP_RATELIMIT_FACTOR  */
-  YYSYMBOL_VAR_RATELIMIT_FACTOR = 198,     /* VAR_RATELIMIT_FACTOR  */
-  YYSYMBOL_VAR_SEND_CLIENT_SUBNET = 199,   /* VAR_SEND_CLIENT_SUBNET  */
-  YYSYMBOL_VAR_CLIENT_SUBNET_ZONE = 200,   /* VAR_CLIENT_SUBNET_ZONE  */
-  YYSYMBOL_VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 201, /* VAR_CLIENT_SUBNET_ALWAYS_FORWARD  */
-  YYSYMBOL_VAR_CLIENT_SUBNET_OPCODE = 202, /* VAR_CLIENT_SUBNET_OPCODE  */
-  YYSYMBOL_VAR_MAX_CLIENT_SUBNET_IPV4 = 203, /* VAR_MAX_CLIENT_SUBNET_IPV4  */
-  YYSYMBOL_VAR_MAX_CLIENT_SUBNET_IPV6 = 204, /* VAR_MAX_CLIENT_SUBNET_IPV6  */
-  YYSYMBOL_VAR_MIN_CLIENT_SUBNET_IPV4 = 205, /* VAR_MIN_CLIENT_SUBNET_IPV4  */
-  YYSYMBOL_VAR_MIN_CLIENT_SUBNET_IPV6 = 206, /* VAR_MIN_CLIENT_SUBNET_IPV6  */
-  YYSYMBOL_VAR_MAX_ECS_TREE_SIZE_IPV4 = 207, /* VAR_MAX_ECS_TREE_SIZE_IPV4  */
-  YYSYMBOL_VAR_MAX_ECS_TREE_SIZE_IPV6 = 208, /* VAR_MAX_ECS_TREE_SIZE_IPV6  */
-  YYSYMBOL_VAR_CAPS_WHITELIST = 209,       /* VAR_CAPS_WHITELIST  */
-  YYSYMBOL_VAR_CACHE_MAX_NEGATIVE_TTL = 210, /* VAR_CACHE_MAX_NEGATIVE_TTL  */
-  YYSYMBOL_VAR_PERMIT_SMALL_HOLDDOWN = 211, /* VAR_PERMIT_SMALL_HOLDDOWN  */
-  YYSYMBOL_VAR_QNAME_MINIMISATION = 212,   /* VAR_QNAME_MINIMISATION  */
-  YYSYMBOL_VAR_QNAME_MINIMISATION_STRICT = 213, /* VAR_QNAME_MINIMISATION_STRICT  */
-  YYSYMBOL_VAR_IP_FREEBIND = 214,          /* VAR_IP_FREEBIND  */
-  YYSYMBOL_VAR_DEFINE_TAG = 215,           /* VAR_DEFINE_TAG  */
-  YYSYMBOL_VAR_LOCAL_ZONE_TAG = 216,       /* VAR_LOCAL_ZONE_TAG  */
-  YYSYMBOL_VAR_ACCESS_CONTROL_TAG = 217,   /* VAR_ACCESS_CONTROL_TAG  */
-  YYSYMBOL_VAR_LOCAL_ZONE_OVERRIDE = 218,  /* VAR_LOCAL_ZONE_OVERRIDE  */
-  YYSYMBOL_VAR_ACCESS_CONTROL_TAG_ACTION = 219, /* VAR_ACCESS_CONTROL_TAG_ACTION  */
-  YYSYMBOL_VAR_ACCESS_CONTROL_TAG_DATA = 220, /* VAR_ACCESS_CONTROL_TAG_DATA  */
-  YYSYMBOL_VAR_VIEW = 221,                 /* VAR_VIEW  */
-  YYSYMBOL_VAR_ACCESS_CONTROL_VIEW = 222,  /* VAR_ACCESS_CONTROL_VIEW  */
-  YYSYMBOL_VAR_VIEW_FIRST = 223,           /* VAR_VIEW_FIRST  */
-  YYSYMBOL_VAR_SERVE_EXPIRED = 224,        /* VAR_SERVE_EXPIRED  */
-  YYSYMBOL_VAR_SERVE_EXPIRED_TTL = 225,    /* VAR_SERVE_EXPIRED_TTL  */
-  YYSYMBOL_VAR_SERVE_EXPIRED_TTL_RESET = 226, /* VAR_SERVE_EXPIRED_TTL_RESET  */
-  YYSYMBOL_VAR_SERVE_EXPIRED_REPLY_TTL = 227, /* VAR_SERVE_EXPIRED_REPLY_TTL  */
-  YYSYMBOL_VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 228, /* VAR_SERVE_EXPIRED_CLIENT_TIMEOUT  */
-  YYSYMBOL_VAR_FAKE_DSA = 229,             /* VAR_FAKE_DSA  */
-  YYSYMBOL_VAR_FAKE_SHA1 = 230,            /* VAR_FAKE_SHA1  */
-  YYSYMBOL_VAR_LOG_IDENTITY = 231,         /* VAR_LOG_IDENTITY  */
-  YYSYMBOL_VAR_HIDE_TRUSTANCHOR = 232,     /* VAR_HIDE_TRUSTANCHOR  */
-  YYSYMBOL_VAR_TRUST_ANCHOR_SIGNALING = 233, /* VAR_TRUST_ANCHOR_SIGNALING  */
-  YYSYMBOL_VAR_AGGRESSIVE_NSEC = 234,      /* VAR_AGGRESSIVE_NSEC  */
-  YYSYMBOL_VAR_USE_SYSTEMD = 235,          /* VAR_USE_SYSTEMD  */
-  YYSYMBOL_VAR_SHM_ENABLE = 236,           /* VAR_SHM_ENABLE  */
-  YYSYMBOL_VAR_SHM_KEY = 237,              /* VAR_SHM_KEY  */
-  YYSYMBOL_VAR_ROOT_KEY_SENTINEL = 238,    /* VAR_ROOT_KEY_SENTINEL  */
-  YYSYMBOL_VAR_DNSCRYPT = 239,             /* VAR_DNSCRYPT  */
-  YYSYMBOL_VAR_DNSCRYPT_ENABLE = 240,      /* VAR_DNSCRYPT_ENABLE  */
-  YYSYMBOL_VAR_DNSCRYPT_PORT = 241,        /* VAR_DNSCRYPT_PORT  */
-  YYSYMBOL_VAR_DNSCRYPT_PROVIDER = 242,    /* VAR_DNSCRYPT_PROVIDER  */
-  YYSYMBOL_VAR_DNSCRYPT_SECRET_KEY = 243,  /* VAR_DNSCRYPT_SECRET_KEY  */
-  YYSYMBOL_VAR_DNSCRYPT_PROVIDER_CERT = 244, /* VAR_DNSCRYPT_PROVIDER_CERT  */
-  YYSYMBOL_VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 245, /* VAR_DNSCRYPT_PROVIDER_CERT_ROTATED  */
-  YYSYMBOL_VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 246, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE  */
-  YYSYMBOL_VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 247, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS  */
-  YYSYMBOL_VAR_DNSCRYPT_NONCE_CACHE_SIZE = 248, /* VAR_DNSCRYPT_NONCE_CACHE_SIZE  */
-  YYSYMBOL_VAR_DNSCRYPT_NONCE_CACHE_SLABS = 249, /* VAR_DNSCRYPT_NONCE_CACHE_SLABS  */
-  YYSYMBOL_VAR_IPSECMOD_ENABLED = 250,     /* VAR_IPSECMOD_ENABLED  */
-  YYSYMBOL_VAR_IPSECMOD_HOOK = 251,        /* VAR_IPSECMOD_HOOK  */
-  YYSYMBOL_VAR_IPSECMOD_IGNORE_BOGUS = 252, /* VAR_IPSECMOD_IGNORE_BOGUS  */
-  YYSYMBOL_VAR_IPSECMOD_MAX_TTL = 253,     /* VAR_IPSECMOD_MAX_TTL  */
-  YYSYMBOL_VAR_IPSECMOD_WHITELIST = 254,   /* VAR_IPSECMOD_WHITELIST  */
-  YYSYMBOL_VAR_IPSECMOD_STRICT = 255,      /* VAR_IPSECMOD_STRICT  */
-  YYSYMBOL_VAR_CACHEDB = 256,              /* VAR_CACHEDB  */
-  YYSYMBOL_VAR_CACHEDB_BACKEND = 257,      /* VAR_CACHEDB_BACKEND  */
-  YYSYMBOL_VAR_CACHEDB_SECRETSEED = 258,   /* VAR_CACHEDB_SECRETSEED  */
-  YYSYMBOL_VAR_CACHEDB_REDISHOST = 259,    /* VAR_CACHEDB_REDISHOST  */
-  YYSYMBOL_VAR_CACHEDB_REDISPORT = 260,    /* VAR_CACHEDB_REDISPORT  */
-  YYSYMBOL_VAR_CACHEDB_REDISTIMEOUT = 261, /* VAR_CACHEDB_REDISTIMEOUT  */
-  YYSYMBOL_VAR_CACHEDB_REDISEXPIRERECORDS = 262, /* VAR_CACHEDB_REDISEXPIRERECORDS  */
-  YYSYMBOL_VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 263, /* VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM  */
-  YYSYMBOL_VAR_FOR_UPSTREAM = 264,         /* VAR_FOR_UPSTREAM  */
-  YYSYMBOL_VAR_AUTH_ZONE = 265,            /* VAR_AUTH_ZONE  */
-  YYSYMBOL_VAR_ZONEFILE = 266,             /* VAR_ZONEFILE  */
-  YYSYMBOL_VAR_MASTER = 267,               /* VAR_MASTER  */
-  YYSYMBOL_VAR_URL = 268,                  /* VAR_URL  */
-  YYSYMBOL_VAR_FOR_DOWNSTREAM = 269,       /* VAR_FOR_DOWNSTREAM  */
-  YYSYMBOL_VAR_FALLBACK_ENABLED = 270,     /* VAR_FALLBACK_ENABLED  */
-  YYSYMBOL_VAR_TLS_ADDITIONAL_PORT = 271,  /* VAR_TLS_ADDITIONAL_PORT  */
-  YYSYMBOL_VAR_LOW_RTT = 272,              /* VAR_LOW_RTT  */
-  YYSYMBOL_VAR_LOW_RTT_PERMIL = 273,       /* VAR_LOW_RTT_PERMIL  */
-  YYSYMBOL_VAR_FAST_SERVER_PERMIL = 274,   /* VAR_FAST_SERVER_PERMIL  */
-  YYSYMBOL_VAR_FAST_SERVER_NUM = 275,      /* VAR_FAST_SERVER_NUM  */
-  YYSYMBOL_VAR_ALLOW_NOTIFY = 276,         /* VAR_ALLOW_NOTIFY  */
-  YYSYMBOL_VAR_TLS_WIN_CERT = 277,         /* VAR_TLS_WIN_CERT  */
-  YYSYMBOL_VAR_TCP_CONNECTION_LIMIT = 278, /* VAR_TCP_CONNECTION_LIMIT  */
-  YYSYMBOL_VAR_FORWARD_NO_CACHE = 279,     /* VAR_FORWARD_NO_CACHE  */
-  YYSYMBOL_VAR_STUB_NO_CACHE = 280,        /* VAR_STUB_NO_CACHE  */
-  YYSYMBOL_VAR_LOG_SERVFAIL = 281,         /* VAR_LOG_SERVFAIL  */
-  YYSYMBOL_VAR_DENY_ANY = 282,             /* VAR_DENY_ANY  */
-  YYSYMBOL_VAR_UNKNOWN_SERVER_TIME_LIMIT = 283, /* VAR_UNKNOWN_SERVER_TIME_LIMIT  */
-  YYSYMBOL_VAR_LOG_TAG_QUERYREPLY = 284,   /* VAR_LOG_TAG_QUERYREPLY  */
-  YYSYMBOL_VAR_STREAM_WAIT_SIZE = 285,     /* VAR_STREAM_WAIT_SIZE  */
-  YYSYMBOL_VAR_TLS_CIPHERS = 286,          /* VAR_TLS_CIPHERS  */
-  YYSYMBOL_VAR_TLS_CIPHERSUITES = 287,     /* VAR_TLS_CIPHERSUITES  */
-  YYSYMBOL_VAR_TLS_USE_SNI = 288,          /* VAR_TLS_USE_SNI  */
-  YYSYMBOL_VAR_IPSET = 289,                /* VAR_IPSET  */
-  YYSYMBOL_VAR_IPSET_NAME_V4 = 290,        /* VAR_IPSET_NAME_V4  */
-  YYSYMBOL_VAR_IPSET_NAME_V6 = 291,        /* VAR_IPSET_NAME_V6  */
-  YYSYMBOL_VAR_TLS_SESSION_TICKET_KEYS = 292, /* VAR_TLS_SESSION_TICKET_KEYS  */
-  YYSYMBOL_VAR_RPZ = 293,                  /* VAR_RPZ  */
-  YYSYMBOL_VAR_TAGS = 294,                 /* VAR_TAGS  */
-  YYSYMBOL_VAR_RPZ_ACTION_OVERRIDE = 295,  /* VAR_RPZ_ACTION_OVERRIDE  */
-  YYSYMBOL_VAR_RPZ_CNAME_OVERRIDE = 296,   /* VAR_RPZ_CNAME_OVERRIDE  */
-  YYSYMBOL_VAR_RPZ_LOG = 297,              /* VAR_RPZ_LOG  */
-  YYSYMBOL_VAR_RPZ_LOG_NAME = 298,         /* VAR_RPZ_LOG_NAME  */
-  YYSYMBOL_VAR_DYNLIB = 299,               /* VAR_DYNLIB  */
-  YYSYMBOL_VAR_DYNLIB_FILE = 300,          /* VAR_DYNLIB_FILE  */
-  YYSYMBOL_VAR_EDNS_CLIENT_STRING = 301,   /* VAR_EDNS_CLIENT_STRING  */
-  YYSYMBOL_VAR_EDNS_CLIENT_STRING_OPCODE = 302, /* VAR_EDNS_CLIENT_STRING_OPCODE  */
-  YYSYMBOL_YYACCEPT = 303,                 /* $accept  */
-  YYSYMBOL_toplevelvars = 304,             /* toplevelvars  */
-  YYSYMBOL_toplevelvar = 305,              /* toplevelvar  */
-  YYSYMBOL_force_toplevel = 306,           /* force_toplevel  */
-  YYSYMBOL_serverstart = 307,              /* serverstart  */
-  YYSYMBOL_contents_server = 308,          /* contents_server  */
-  YYSYMBOL_content_server = 309,           /* content_server  */
-  YYSYMBOL_stubstart = 310,                /* stubstart  */
-  YYSYMBOL_contents_stub = 311,            /* contents_stub  */
-  YYSYMBOL_content_stub = 312,             /* content_stub  */
-  YYSYMBOL_forwardstart = 313,             /* forwardstart  */
-  YYSYMBOL_contents_forward = 314,         /* contents_forward  */
-  YYSYMBOL_content_forward = 315,          /* content_forward  */
-  YYSYMBOL_viewstart = 316,                /* viewstart  */
-  YYSYMBOL_contents_view = 317,            /* contents_view  */
-  YYSYMBOL_content_view = 318,             /* content_view  */
-  YYSYMBOL_authstart = 319,                /* authstart  */
-  YYSYMBOL_contents_auth = 320,            /* contents_auth  */
-  YYSYMBOL_content_auth = 321,             /* content_auth  */
-  YYSYMBOL_rpz_tag = 322,                  /* rpz_tag  */
-  YYSYMBOL_rpz_action_override = 323,      /* rpz_action_override  */
-  YYSYMBOL_rpz_cname_override = 324,       /* rpz_cname_override  */
-  YYSYMBOL_rpz_log = 325,                  /* rpz_log  */
-  YYSYMBOL_rpz_log_name = 326,             /* rpz_log_name  */
-  YYSYMBOL_rpzstart = 327,                 /* rpzstart  */
-  YYSYMBOL_contents_rpz = 328,             /* contents_rpz  */
-  YYSYMBOL_content_rpz = 329,              /* content_rpz  */
-  YYSYMBOL_server_num_threads = 330,       /* server_num_threads  */
-  YYSYMBOL_server_verbosity = 331,         /* server_verbosity  */
-  YYSYMBOL_server_statistics_interval = 332, /* server_statistics_interval  */
-  YYSYMBOL_server_statistics_cumulative = 333, /* server_statistics_cumulative  */
-  YYSYMBOL_server_extended_statistics = 334, /* server_extended_statistics  */
-  YYSYMBOL_server_shm_enable = 335,        /* server_shm_enable  */
-  YYSYMBOL_server_shm_key = 336,           /* server_shm_key  */
-  YYSYMBOL_server_port = 337,              /* server_port  */
-  YYSYMBOL_server_send_client_subnet = 338, /* server_send_client_subnet  */
-  YYSYMBOL_server_client_subnet_zone = 339, /* server_client_subnet_zone  */
-  YYSYMBOL_server_client_subnet_always_forward = 340, /* server_client_subnet_always_forward  */
-  YYSYMBOL_server_client_subnet_opcode = 341, /* server_client_subnet_opcode  */
-  YYSYMBOL_server_max_client_subnet_ipv4 = 342, /* server_max_client_subnet_ipv4  */
-  YYSYMBOL_server_max_client_subnet_ipv6 = 343, /* server_max_client_subnet_ipv6  */
-  YYSYMBOL_server_min_client_subnet_ipv4 = 344, /* server_min_client_subnet_ipv4  */
-  YYSYMBOL_server_min_client_subnet_ipv6 = 345, /* server_min_client_subnet_ipv6  */
-  YYSYMBOL_server_max_ecs_tree_size_ipv4 = 346, /* server_max_ecs_tree_size_ipv4  */
-  YYSYMBOL_server_max_ecs_tree_size_ipv6 = 347, /* server_max_ecs_tree_size_ipv6  */
-  YYSYMBOL_server_interface = 348,         /* server_interface  */
-  YYSYMBOL_server_outgoing_interface = 349, /* server_outgoing_interface  */
-  YYSYMBOL_server_outgoing_range = 350,    /* server_outgoing_range  */
-  YYSYMBOL_server_outgoing_port_permit = 351, /* server_outgoing_port_permit  */
-  YYSYMBOL_server_outgoing_port_avoid = 352, /* server_outgoing_port_avoid  */
-  YYSYMBOL_server_outgoing_num_tcp = 353,  /* server_outgoing_num_tcp  */
-  YYSYMBOL_server_incoming_num_tcp = 354,  /* server_incoming_num_tcp  */
-  YYSYMBOL_server_interface_automatic = 355, /* server_interface_automatic  */
-  YYSYMBOL_server_do_ip4 = 356,            /* server_do_ip4  */
-  YYSYMBOL_server_do_ip6 = 357,            /* server_do_ip6  */
-  YYSYMBOL_server_do_udp = 358,            /* server_do_udp  */
-  YYSYMBOL_server_do_tcp = 359,            /* server_do_tcp  */
-  YYSYMBOL_server_prefer_ip4 = 360,        /* server_prefer_ip4  */
-  YYSYMBOL_server_prefer_ip6 = 361,        /* server_prefer_ip6  */
-  YYSYMBOL_server_tcp_mss = 362,           /* server_tcp_mss  */
-  YYSYMBOL_server_outgoing_tcp_mss = 363,  /* server_outgoing_tcp_mss  */
-  YYSYMBOL_server_tcp_idle_timeout = 364,  /* server_tcp_idle_timeout  */
-  YYSYMBOL_server_tcp_keepalive = 365,     /* server_tcp_keepalive  */
-  YYSYMBOL_server_tcp_keepalive_timeout = 366, /* server_tcp_keepalive_timeout  */
-  YYSYMBOL_server_tcp_upstream = 367,      /* server_tcp_upstream  */
-  YYSYMBOL_server_udp_upstream_without_downstream = 368, /* server_udp_upstream_without_downstream  */
-  YYSYMBOL_server_ssl_upstream = 369,      /* server_ssl_upstream  */
-  YYSYMBOL_server_ssl_service_key = 370,   /* server_ssl_service_key  */
-  YYSYMBOL_server_ssl_service_pem = 371,   /* server_ssl_service_pem  */
-  YYSYMBOL_server_ssl_port = 372,          /* server_ssl_port  */
-  YYSYMBOL_server_tls_cert_bundle = 373,   /* server_tls_cert_bundle  */
-  YYSYMBOL_server_tls_win_cert = 374,      /* server_tls_win_cert  */
-  YYSYMBOL_server_tls_additional_port = 375, /* server_tls_additional_port  */
-  YYSYMBOL_server_tls_ciphers = 376,       /* server_tls_ciphers  */
-  YYSYMBOL_server_tls_ciphersuites = 377,  /* server_tls_ciphersuites  */
-  YYSYMBOL_server_tls_session_ticket_keys = 378, /* server_tls_session_ticket_keys  */
-  YYSYMBOL_server_tls_use_sni = 379,       /* server_tls_use_sni  */
-  YYSYMBOL_server_https_port = 380,        /* server_https_port  */
-  YYSYMBOL_server_http_endpoint = 381,     /* server_http_endpoint  */
-  YYSYMBOL_server_http_max_streams = 382,  /* server_http_max_streams  */
-  YYSYMBOL_server_http_query_buffer_size = 383, /* server_http_query_buffer_size  */
-  YYSYMBOL_server_http_response_buffer_size = 384, /* server_http_response_buffer_size  */
-  YYSYMBOL_server_http_nodelay = 385,      /* server_http_nodelay  */
-  YYSYMBOL_server_http_notls_downstream = 386, /* server_http_notls_downstream  */
-  YYSYMBOL_server_use_systemd = 387,       /* server_use_systemd  */
-  YYSYMBOL_server_do_daemonize = 388,      /* server_do_daemonize  */
-  YYSYMBOL_server_use_syslog = 389,        /* server_use_syslog  */
-  YYSYMBOL_server_log_time_ascii = 390,    /* server_log_time_ascii  */
-  YYSYMBOL_server_log_queries = 391,       /* server_log_queries  */
-  YYSYMBOL_server_log_replies = 392,       /* server_log_replies  */
-  YYSYMBOL_server_log_tag_queryreply = 393, /* server_log_tag_queryreply  */
-  YYSYMBOL_server_log_servfail = 394,      /* server_log_servfail  */
-  YYSYMBOL_server_log_local_actions = 395, /* server_log_local_actions  */
-  YYSYMBOL_server_chroot = 396,            /* server_chroot  */
-  YYSYMBOL_server_username = 397,          /* server_username  */
-  YYSYMBOL_server_directory = 398,         /* server_directory  */
-  YYSYMBOL_server_logfile = 399,           /* server_logfile  */
-  YYSYMBOL_server_pidfile = 400,           /* server_pidfile  */
-  YYSYMBOL_server_root_hints = 401,        /* server_root_hints  */
-  YYSYMBOL_server_dlv_anchor_file = 402,   /* server_dlv_anchor_file  */
-  YYSYMBOL_server_dlv_anchor = 403,        /* server_dlv_anchor  */
-  YYSYMBOL_server_auto_trust_anchor_file = 404, /* server_auto_trust_anchor_file  */
-  YYSYMBOL_server_trust_anchor_file = 405, /* server_trust_anchor_file  */
-  YYSYMBOL_server_trusted_keys_file = 406, /* server_trusted_keys_file  */
-  YYSYMBOL_server_trust_anchor = 407,      /* server_trust_anchor  */
-  YYSYMBOL_server_trust_anchor_signaling = 408, /* server_trust_anchor_signaling  */
-  YYSYMBOL_server_root_key_sentinel = 409, /* server_root_key_sentinel  */
-  YYSYMBOL_server_domain_insecure = 410,   /* server_domain_insecure  */
-  YYSYMBOL_server_hide_identity = 411,     /* server_hide_identity  */
-  YYSYMBOL_server_hide_version = 412,      /* server_hide_version  */
-  YYSYMBOL_server_hide_trustanchor = 413,  /* server_hide_trustanchor  */
-  YYSYMBOL_server_identity = 414,          /* server_identity  */
-  YYSYMBOL_server_version = 415,           /* server_version  */
-  YYSYMBOL_server_so_rcvbuf = 416,         /* server_so_rcvbuf  */
-  YYSYMBOL_server_so_sndbuf = 417,         /* server_so_sndbuf  */
-  YYSYMBOL_server_so_reuseport = 418,      /* server_so_reuseport  */
-  YYSYMBOL_server_ip_transparent = 419,    /* server_ip_transparent  */
-  YYSYMBOL_server_ip_freebind = 420,       /* server_ip_freebind  */
-  YYSYMBOL_server_ip_dscp = 421,           /* server_ip_dscp  */
-  YYSYMBOL_server_stream_wait_size = 422,  /* server_stream_wait_size  */
-  YYSYMBOL_server_edns_buffer_size = 423,  /* server_edns_buffer_size  */
-  YYSYMBOL_server_msg_buffer_size = 424,   /* server_msg_buffer_size  */
-  YYSYMBOL_server_msg_cache_size = 425,    /* server_msg_cache_size  */
-  YYSYMBOL_server_msg_cache_slabs = 426,   /* server_msg_cache_slabs  */
-  YYSYMBOL_server_num_queries_per_thread = 427, /* server_num_queries_per_thread  */
-  YYSYMBOL_server_jostle_timeout = 428,    /* server_jostle_timeout  */
-  YYSYMBOL_server_delay_close = 429,       /* server_delay_close  */
-  YYSYMBOL_server_udp_connect = 430,       /* server_udp_connect  */
-  YYSYMBOL_server_unblock_lan_zones = 431, /* server_unblock_lan_zones  */
-  YYSYMBOL_server_insecure_lan_zones = 432, /* server_insecure_lan_zones  */
-  YYSYMBOL_server_rrset_cache_size = 433,  /* server_rrset_cache_size  */
-  YYSYMBOL_server_rrset_cache_slabs = 434, /* server_rrset_cache_slabs  */
-  YYSYMBOL_server_infra_host_ttl = 435,    /* server_infra_host_ttl  */
-  YYSYMBOL_server_infra_lame_ttl = 436,    /* server_infra_lame_ttl  */
-  YYSYMBOL_server_infra_cache_numhosts = 437, /* server_infra_cache_numhosts  */
-  YYSYMBOL_server_infra_cache_lame_size = 438, /* server_infra_cache_lame_size  */
-  YYSYMBOL_server_infra_cache_slabs = 439, /* server_infra_cache_slabs  */
-  YYSYMBOL_server_infra_cache_min_rtt = 440, /* server_infra_cache_min_rtt  */
-  YYSYMBOL_server_infra_keep_probing = 441, /* server_infra_keep_probing  */
-  YYSYMBOL_server_target_fetch_policy = 442, /* server_target_fetch_policy  */
-  YYSYMBOL_server_harden_short_bufsize = 443, /* server_harden_short_bufsize  */
-  YYSYMBOL_server_harden_large_queries = 444, /* server_harden_large_queries  */
-  YYSYMBOL_server_harden_glue = 445,       /* server_harden_glue  */
-  YYSYMBOL_server_harden_dnssec_stripped = 446, /* server_harden_dnssec_stripped  */
-  YYSYMBOL_server_harden_below_nxdomain = 447, /* server_harden_below_nxdomain  */
-  YYSYMBOL_server_harden_referral_path = 448, /* server_harden_referral_path  */
-  YYSYMBOL_server_harden_algo_downgrade = 449, /* server_harden_algo_downgrade  */
-  YYSYMBOL_server_use_caps_for_id = 450,   /* server_use_caps_for_id  */
-  YYSYMBOL_server_caps_whitelist = 451,    /* server_caps_whitelist  */
-  YYSYMBOL_server_private_address = 452,   /* server_private_address  */
-  YYSYMBOL_server_private_domain = 453,    /* server_private_domain  */
-  YYSYMBOL_server_prefetch = 454,          /* server_prefetch  */
-  YYSYMBOL_server_prefetch_key = 455,      /* server_prefetch_key  */
-  YYSYMBOL_server_deny_any = 456,          /* server_deny_any  */
-  YYSYMBOL_server_unwanted_reply_threshold = 457, /* server_unwanted_reply_threshold  */
-  YYSYMBOL_server_do_not_query_address = 458, /* server_do_not_query_address  */
-  YYSYMBOL_server_do_not_query_localhost = 459, /* server_do_not_query_localhost  */
-  YYSYMBOL_server_access_control = 460,    /* server_access_control  */
-  YYSYMBOL_server_module_conf = 461,       /* server_module_conf  */
-  YYSYMBOL_server_val_override_date = 462, /* server_val_override_date  */
-  YYSYMBOL_server_val_sig_skew_min = 463,  /* server_val_sig_skew_min  */
-  YYSYMBOL_server_val_sig_skew_max = 464,  /* server_val_sig_skew_max  */
-  YYSYMBOL_server_cache_max_ttl = 465,     /* server_cache_max_ttl  */
-  YYSYMBOL_server_cache_max_negative_ttl = 466, /* server_cache_max_negative_ttl  */
-  YYSYMBOL_server_cache_min_ttl = 467,     /* server_cache_min_ttl  */
-  YYSYMBOL_server_bogus_ttl = 468,         /* server_bogus_ttl  */
-  YYSYMBOL_server_val_clean_additional = 469, /* server_val_clean_additional  */
-  YYSYMBOL_server_val_permissive_mode = 470, /* server_val_permissive_mode  */
-  YYSYMBOL_server_aggressive_nsec = 471,   /* server_aggressive_nsec  */
-  YYSYMBOL_server_ignore_cd_flag = 472,    /* server_ignore_cd_flag  */
-  YYSYMBOL_server_serve_expired = 473,     /* server_serve_expired  */
-  YYSYMBOL_server_serve_expired_ttl = 474, /* server_serve_expired_ttl  */
-  YYSYMBOL_server_serve_expired_ttl_reset = 475, /* server_serve_expired_ttl_reset  */
-  YYSYMBOL_server_serve_expired_reply_ttl = 476, /* server_serve_expired_reply_ttl  */
-  YYSYMBOL_server_serve_expired_client_timeout = 477, /* server_serve_expired_client_timeout  */
-  YYSYMBOL_server_fake_dsa = 478,          /* server_fake_dsa  */
-  YYSYMBOL_server_fake_sha1 = 479,         /* server_fake_sha1  */
-  YYSYMBOL_server_val_log_level = 480,     /* server_val_log_level  */
-  YYSYMBOL_server_val_nsec3_keysize_iterations = 481, /* server_val_nsec3_keysize_iterations  */
-  YYSYMBOL_server_add_holddown = 482,      /* server_add_holddown  */
-  YYSYMBOL_server_del_holddown = 483,      /* server_del_holddown  */
-  YYSYMBOL_server_keep_missing = 484,      /* server_keep_missing  */
-  YYSYMBOL_server_permit_small_holddown = 485, /* server_permit_small_holddown  */
-  YYSYMBOL_server_key_cache_size = 486,    /* server_key_cache_size  */
-  YYSYMBOL_server_key_cache_slabs = 487,   /* server_key_cache_slabs  */
-  YYSYMBOL_server_neg_cache_size = 488,    /* server_neg_cache_size  */
-  YYSYMBOL_server_local_zone = 489,        /* server_local_zone  */
-  YYSYMBOL_server_local_data = 490,        /* server_local_data  */
-  YYSYMBOL_server_local_data_ptr = 491,    /* server_local_data_ptr  */
-  YYSYMBOL_server_minimal_responses = 492, /* server_minimal_responses  */
-  YYSYMBOL_server_rrset_roundrobin = 493,  /* server_rrset_roundrobin  */
-  YYSYMBOL_server_unknown_server_time_limit = 494, /* server_unknown_server_time_limit  */
-  YYSYMBOL_server_max_udp_size = 495,      /* server_max_udp_size  */
-  YYSYMBOL_server_dns64_prefix = 496,      /* server_dns64_prefix  */
-  YYSYMBOL_server_dns64_synthall = 497,    /* server_dns64_synthall  */
-  YYSYMBOL_server_dns64_ignore_aaaa = 498, /* server_dns64_ignore_aaaa  */
-  YYSYMBOL_server_define_tag = 499,        /* server_define_tag  */
-  YYSYMBOL_server_local_zone_tag = 500,    /* server_local_zone_tag  */
-  YYSYMBOL_server_access_control_tag = 501, /* server_access_control_tag  */
-  YYSYMBOL_server_access_control_tag_action = 502, /* server_access_control_tag_action  */
-  YYSYMBOL_server_access_control_tag_data = 503, /* server_access_control_tag_data  */
-  YYSYMBOL_server_local_zone_override = 504, /* server_local_zone_override  */
-  YYSYMBOL_server_access_control_view = 505, /* server_access_control_view  */
-  YYSYMBOL_server_response_ip_tag = 506,   /* server_response_ip_tag  */
-  YYSYMBOL_server_ip_ratelimit = 507,      /* server_ip_ratelimit  */
-  YYSYMBOL_server_ratelimit = 508,         /* server_ratelimit  */
-  YYSYMBOL_server_ip_ratelimit_size = 509, /* server_ip_ratelimit_size  */
-  YYSYMBOL_server_ratelimit_size = 510,    /* server_ratelimit_size  */
-  YYSYMBOL_server_ip_ratelimit_slabs = 511, /* server_ip_ratelimit_slabs  */
-  YYSYMBOL_server_ratelimit_slabs = 512,   /* server_ratelimit_slabs  */
-  YYSYMBOL_server_ratelimit_for_domain = 513, /* server_ratelimit_for_domain  */
-  YYSYMBOL_server_ratelimit_below_domain = 514, /* server_ratelimit_below_domain  */
-  YYSYMBOL_server_ip_ratelimit_factor = 515, /* server_ip_ratelimit_factor  */
-  YYSYMBOL_server_ratelimit_factor = 516,  /* server_ratelimit_factor  */
-  YYSYMBOL_server_low_rtt = 517,           /* server_low_rtt  */
-  YYSYMBOL_server_fast_server_num = 518,   /* server_fast_server_num  */
-  YYSYMBOL_server_fast_server_permil = 519, /* server_fast_server_permil  */
-  YYSYMBOL_server_qname_minimisation = 520, /* server_qname_minimisation  */
-  YYSYMBOL_server_qname_minimisation_strict = 521, /* server_qname_minimisation_strict  */
-  YYSYMBOL_server_ipsecmod_enabled = 522,  /* server_ipsecmod_enabled  */
-  YYSYMBOL_server_ipsecmod_ignore_bogus = 523, /* server_ipsecmod_ignore_bogus  */
-  YYSYMBOL_server_ipsecmod_hook = 524,     /* server_ipsecmod_hook  */
-  YYSYMBOL_server_ipsecmod_max_ttl = 525,  /* server_ipsecmod_max_ttl  */
-  YYSYMBOL_server_ipsecmod_whitelist = 526, /* server_ipsecmod_whitelist  */
-  YYSYMBOL_server_ipsecmod_strict = 527,   /* server_ipsecmod_strict  */
-  YYSYMBOL_server_edns_client_string = 528, /* server_edns_client_string  */
-  YYSYMBOL_server_edns_client_string_opcode = 529, /* server_edns_client_string_opcode  */
-  YYSYMBOL_stub_name = 530,                /* stub_name  */
-  YYSYMBOL_stub_host = 531,                /* stub_host  */
-  YYSYMBOL_stub_addr = 532,                /* stub_addr  */
-  YYSYMBOL_stub_first = 533,               /* stub_first  */
-  YYSYMBOL_stub_no_cache = 534,            /* stub_no_cache  */
-  YYSYMBOL_stub_ssl_upstream = 535,        /* stub_ssl_upstream  */
-  YYSYMBOL_stub_prime = 536,               /* stub_prime  */
-  YYSYMBOL_forward_name = 537,             /* forward_name  */
-  YYSYMBOL_forward_host = 538,             /* forward_host  */
-  YYSYMBOL_forward_addr = 539,             /* forward_addr  */
-  YYSYMBOL_forward_first = 540,            /* forward_first  */
-  YYSYMBOL_forward_no_cache = 541,         /* forward_no_cache  */
-  YYSYMBOL_forward_ssl_upstream = 542,     /* forward_ssl_upstream  */
-  YYSYMBOL_auth_name = 543,                /* auth_name  */
-  YYSYMBOL_auth_zonefile = 544,            /* auth_zonefile  */
-  YYSYMBOL_auth_master = 545,              /* auth_master  */
-  YYSYMBOL_auth_url = 546,                 /* auth_url  */
-  YYSYMBOL_auth_allow_notify = 547,        /* auth_allow_notify  */
-  YYSYMBOL_auth_for_downstream = 548,      /* auth_for_downstream  */
-  YYSYMBOL_auth_for_upstream = 549,        /* auth_for_upstream  */
-  YYSYMBOL_auth_fallback_enabled = 550,    /* auth_fallback_enabled  */
-  YYSYMBOL_view_name = 551,                /* view_name  */
-  YYSYMBOL_view_local_zone = 552,          /* view_local_zone  */
-  YYSYMBOL_view_response_ip = 553,         /* view_response_ip  */
-  YYSYMBOL_view_response_ip_data = 554,    /* view_response_ip_data  */
-  YYSYMBOL_view_local_data = 555,          /* view_local_data  */
-  YYSYMBOL_view_local_data_ptr = 556,      /* view_local_data_ptr  */
-  YYSYMBOL_view_first = 557,               /* view_first  */
-  YYSYMBOL_rcstart = 558,                  /* rcstart  */
-  YYSYMBOL_contents_rc = 559,              /* contents_rc  */
-  YYSYMBOL_content_rc = 560,               /* content_rc  */
-  YYSYMBOL_rc_control_enable = 561,        /* rc_control_enable  */
-  YYSYMBOL_rc_control_port = 562,          /* rc_control_port  */
-  YYSYMBOL_rc_control_interface = 563,     /* rc_control_interface  */
-  YYSYMBOL_rc_control_use_cert = 564,      /* rc_control_use_cert  */
-  YYSYMBOL_rc_server_key_file = 565,       /* rc_server_key_file  */
-  YYSYMBOL_rc_server_cert_file = 566,      /* rc_server_cert_file  */
-  YYSYMBOL_rc_control_key_file = 567,      /* rc_control_key_file  */
-  YYSYMBOL_rc_control_cert_file = 568,     /* rc_control_cert_file  */
-  YYSYMBOL_dtstart = 569,                  /* dtstart  */
-  YYSYMBOL_contents_dt = 570,              /* contents_dt  */
-  YYSYMBOL_content_dt = 571,               /* content_dt  */
-  YYSYMBOL_dt_dnstap_enable = 572,         /* dt_dnstap_enable  */
-  YYSYMBOL_dt_dnstap_bidirectional = 573,  /* dt_dnstap_bidirectional  */
-  YYSYMBOL_dt_dnstap_socket_path = 574,    /* dt_dnstap_socket_path  */
-  YYSYMBOL_dt_dnstap_ip = 575,             /* dt_dnstap_ip  */
-  YYSYMBOL_dt_dnstap_tls = 576,            /* dt_dnstap_tls  */
-  YYSYMBOL_dt_dnstap_tls_server_name = 577, /* dt_dnstap_tls_server_name  */
-  YYSYMBOL_dt_dnstap_tls_cert_bundle = 578, /* dt_dnstap_tls_cert_bundle  */
-  YYSYMBOL_dt_dnstap_tls_client_key_file = 579, /* dt_dnstap_tls_client_key_file  */
-  YYSYMBOL_dt_dnstap_tls_client_cert_file = 580, /* dt_dnstap_tls_client_cert_file  */
-  YYSYMBOL_dt_dnstap_send_identity = 581,  /* dt_dnstap_send_identity  */
-  YYSYMBOL_dt_dnstap_send_version = 582,   /* dt_dnstap_send_version  */
-  YYSYMBOL_dt_dnstap_identity = 583,       /* dt_dnstap_identity  */
-  YYSYMBOL_dt_dnstap_version = 584,        /* dt_dnstap_version  */
-  YYSYMBOL_dt_dnstap_log_resolver_query_messages = 585, /* dt_dnstap_log_resolver_query_messages  */
-  YYSYMBOL_dt_dnstap_log_resolver_response_messages = 586, /* dt_dnstap_log_resolver_response_messages  */
-  YYSYMBOL_dt_dnstap_log_client_query_messages = 587, /* dt_dnstap_log_client_query_messages  */
-  YYSYMBOL_dt_dnstap_log_client_response_messages = 588, /* dt_dnstap_log_client_response_messages  */
-  YYSYMBOL_dt_dnstap_log_forwarder_query_messages = 589, /* dt_dnstap_log_forwarder_query_messages  */
-  YYSYMBOL_dt_dnstap_log_forwarder_response_messages = 590, /* dt_dnstap_log_forwarder_response_messages  */
-  YYSYMBOL_pythonstart = 591,              /* pythonstart  */
-  YYSYMBOL_contents_py = 592,              /* contents_py  */
-  YYSYMBOL_content_py = 593,               /* content_py  */
-  YYSYMBOL_py_script = 594,                /* py_script  */
-  YYSYMBOL_dynlibstart = 595,              /* dynlibstart  */
-  YYSYMBOL_contents_dl = 596,              /* contents_dl  */
-  YYSYMBOL_content_dl = 597,               /* content_dl  */
-  YYSYMBOL_dl_file = 598,                  /* dl_file  */
-  YYSYMBOL_server_disable_dnssec_lame_check = 599, /* server_disable_dnssec_lame_check  */
-  YYSYMBOL_server_log_identity = 600,      /* server_log_identity  */
-  YYSYMBOL_server_response_ip = 601,       /* server_response_ip  */
-  YYSYMBOL_server_response_ip_data = 602,  /* server_response_ip_data  */
-  YYSYMBOL_dnscstart = 603,                /* dnscstart  */
-  YYSYMBOL_contents_dnsc = 604,            /* contents_dnsc  */
-  YYSYMBOL_content_dnsc = 605,             /* content_dnsc  */
-  YYSYMBOL_dnsc_dnscrypt_enable = 606,     /* dnsc_dnscrypt_enable  */
-  YYSYMBOL_dnsc_dnscrypt_port = 607,       /* dnsc_dnscrypt_port  */
-  YYSYMBOL_dnsc_dnscrypt_provider = 608,   /* dnsc_dnscrypt_provider  */
-  YYSYMBOL_dnsc_dnscrypt_provider_cert = 609, /* dnsc_dnscrypt_provider_cert  */
-  YYSYMBOL_dnsc_dnscrypt_provider_cert_rotated = 610, /* dnsc_dnscrypt_provider_cert_rotated  */
-  YYSYMBOL_dnsc_dnscrypt_secret_key = 611, /* dnsc_dnscrypt_secret_key  */
-  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_size = 612, /* dnsc_dnscrypt_shared_secret_cache_size  */
-  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_slabs = 613, /* dnsc_dnscrypt_shared_secret_cache_slabs  */
-  YYSYMBOL_dnsc_dnscrypt_nonce_cache_size = 614, /* dnsc_dnscrypt_nonce_cache_size  */
-  YYSYMBOL_dnsc_dnscrypt_nonce_cache_slabs = 615, /* dnsc_dnscrypt_nonce_cache_slabs  */
-  YYSYMBOL_cachedbstart = 616,             /* cachedbstart  */
-  YYSYMBOL_contents_cachedb = 617,         /* contents_cachedb  */
-  YYSYMBOL_content_cachedb = 618,          /* content_cachedb  */
-  YYSYMBOL_cachedb_backend_name = 619,     /* cachedb_backend_name  */
-  YYSYMBOL_cachedb_secret_seed = 620,      /* cachedb_secret_seed  */
-  YYSYMBOL_redis_server_host = 621,        /* redis_server_host  */
-  YYSYMBOL_redis_server_port = 622,        /* redis_server_port  */
-  YYSYMBOL_redis_timeout = 623,            /* redis_timeout  */
-  YYSYMBOL_redis_expire_records = 624,     /* redis_expire_records  */
-  YYSYMBOL_server_tcp_connection_limit = 625, /* server_tcp_connection_limit  */
-  YYSYMBOL_ipsetstart = 626,               /* ipsetstart  */
-  YYSYMBOL_contents_ipset = 627,           /* contents_ipset  */
-  YYSYMBOL_content_ipset = 628,            /* content_ipset  */
-  YYSYMBOL_ipset_name_v4 = 629,            /* ipset_name_v4  */
-  YYSYMBOL_ipset_name_v6 = 630             /* ipset_name_v6  */
-};
-typedef enum yysymbol_kind_t yysymbol_kind_t;
-
 
 
 
@@ -1415,83 +767,36 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
 # 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
@@ -1499,20 +804,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
@@ -1526,21 +818,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.  */
@@ -1552,11 +845,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
@@ -1569,22 +862,10 @@ 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)))
 
-#if !defined yyoverflow
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -1649,7 +930,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 # endif
-#endif /* !defined yyoverflow */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
@@ -1658,17 +940,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
@@ -1681,11 +963,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)
 
@@ -1697,12 +979,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];            \
         }                                       \
@@ -1725,19 +1007,17 @@ union yyalloc
 /* YYNSTATES -- Number of states.  */
 #define YYNSTATES  939
 
+#define YYUNDEFTOK  2
 #define YYMAXUTOK   557
 
-
 /* 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                     \
-   ? YY_CAST (yysymbol_kind_t, yytranslate[YYX])        \
-   : YYSYMBOL_YYUNDEF)
+#define YYTRANSLATE(YYX)                                                \
+  ((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,
@@ -1799,7 +1079,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,   185,   185,   185,   186,   186,   187,   187,   188,   188,
      188,   189,   189,   190,   190,   191,   191,   192,   194,   200,
@@ -1849,42 +1129,35 @@ static const yytype_int16 yyrline[] =
     2113,  2120,  2127,  2136,  2144,  2158,  2179,  2200,  2212,  2224,
     2236,  2245,  2266,  2276,  2285,  2293,  2301,  2314,  2327,  2342,
     2357,  2366,  2375,  2381,  2390,  2399,  2409,  2419,  2432,  2445,
-    2457,  2471,  2483,  2497,  2506,  2517,  2527,  2534,  2541,  2550,
-    2559,  2569,  2579,  2589,  2596,  2603,  2612,  2621,  2631,  2641,
-    2648,  2655,  2662,  2670,  2680,  2690,  2700,  2710,  2749,  2759,
-    2767,  2775,  2790,  2799,  2804,  2805,  2806,  2806,  2806,  2807,
-    2807,  2807,  2808,  2808,  2810,  2820,  2829,  2836,  2843,  2850,
-    2857,  2864,  2871,  2876,  2877,  2878,  2878,  2878,  2879,  2879,
-    2879,  2880,  2881,  2881,  2882,  2882,  2883,  2883,  2884,  2885,
-    2886,  2887,  2888,  2889,  2891,  2900,  2910,  2917,  2924,  2933,
-    2940,  2947,  2954,  2961,  2970,  2979,  2986,  2993,  3003,  3013,
-    3023,  3033,  3043,  3053,  3058,  3059,  3060,  3062,  3068,  3073,
-    3074,  3075,  3077,  3083,  3093,  3100,  3109,  3117,  3122,  3123,
-    3125,  3125,  3125,  3126,  3126,  3127,  3128,  3129,  3130,  3131,
-    3133,  3143,  3152,  3159,  3168,  3175,  3184,  3192,  3205,  3213,
-    3226,  3231,  3232,  3233,  3233,  3234,  3234,  3234,  3235,  3237,
-    3249,  3261,  3273,  3288,  3301,  3314,  3325,  3330,  3331,  3332,
-    3332,  3334,  3349
+    2457,  2471,  2483,  2497,  2506,  2518,  2528,  2535,  2542,  2551,
+    2560,  2570,  2580,  2590,  2597,  2604,  2613,  2622,  2632,  2642,
+    2649,  2656,  2663,  2671,  2681,  2691,  2701,  2711,  2750,  2760,
+    2768,  2776,  2791,  2800,  2805,  2806,  2807,  2807,  2807,  2808,
+    2808,  2808,  2809,  2809,  2811,  2821,  2830,  2837,  2844,  2851,
+    2858,  2865,  2872,  2877,  2878,  2879,  2879,  2879,  2880,  2880,
+    2880,  2881,  2882,  2882,  2883,  2883,  2884,  2884,  2885,  2886,
+    2887,  2888,  2889,  2890,  2892,  2901,  2911,  2918,  2925,  2934,
+    2941,  2948,  2955,  2962,  2971,  2980,  2987,  2994,  3004,  3014,
+    3024,  3034,  3044,  3054,  3059,  3060,  3061,  3063,  3069,  3074,
+    3075,  3076,  3078,  3084,  3094,  3101,  3110,  3118,  3123,  3124,
+    3126,  3126,  3126,  3127,  3127,  3128,  3129,  3130,  3131,  3132,
+    3134,  3144,  3153,  3160,  3169,  3176,  3185,  3193,  3206,  3214,
+    3227,  3232,  3233,  3234,  3234,  3235,  3235,  3235,  3236,  3238,
+    3250,  3262,  3274,  3289,  3302,  3315,  3326,  3331,  3332,  3333,
+    3333,  3335,  3350
 };
 #endif
 
-/** Accessing symbol of state STATE.  */
-#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State])
-
-#if YYDEBUG || 0
-/* The user-facing name of the symbol whose (internal) number is
-   YYSYMBOL.  No bounds checking.  */
-static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED;
-
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "\"end of file\"", "error", "\"invalid token\"", "SPACE", "LETTER",
-  "NEWLINE", "COMMENT", "COLON", "ANY", "ZONESTR", "STRING_ARG",
-  "VAR_FORCE_TOPLEVEL", "VAR_SERVER", "VAR_VERBOSITY", "VAR_NUM_THREADS",
-  "VAR_PORT", "VAR_OUTGOING_RANGE", "VAR_INTERFACE", "VAR_PREFER_IP4",
-  "VAR_DO_IP4", "VAR_DO_IP6", "VAR_PREFER_IP6", "VAR_DO_UDP", "VAR_DO_TCP",
+  "$end", "error", "$undefined", "SPACE", "LETTER", "NEWLINE", "COMMENT",
+  "COLON", "ANY", "ZONESTR", "STRING_ARG", "VAR_FORCE_TOPLEVEL",
+  "VAR_SERVER", "VAR_VERBOSITY", "VAR_NUM_THREADS", "VAR_PORT",
+  "VAR_OUTGOING_RANGE", "VAR_INTERFACE", "VAR_PREFER_IP4", "VAR_DO_IP4",
+  "VAR_DO_IP6", "VAR_PREFER_IP6", "VAR_DO_UDP", "VAR_DO_TCP",
   "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS", "VAR_TCP_IDLE_TIMEOUT",
   "VAR_EDNS_TCP_KEEPALIVE", "VAR_EDNS_TCP_KEEPALIVE_TIMEOUT", "VAR_CHROOT",
   "VAR_USERNAME", "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE",
@@ -2125,18 +1398,12 @@ static const char *const yytname[] =
   "server_tcp_connection_limit", "ipsetstart", "contents_ipset",
   "content_ipset", "ipset_name_v4", "ipset_name_v6", YY_NULLPTR
 };
-
-static const char *
-yysymbol_name (yysymbol_kind_t yysymbol)
-{
-  return yytname[yysymbol];
-}
 #endif
 
-#ifdef YYPRINT
+# 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,
@@ -2170,16 +1437,16 @@ static const yytype_int16 yytoknum[] =
      545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
      555,   556,   557
 };
-#endif
+# endif
 
-#define YYPACT_NINF (-291)
+#define YYPACT_NINF -291
 
-#define yypact_value_is_default(Yyn) \
-  ((Yyn) == YYPACT_NINF)
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-291)))
 
-#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
@@ -2285,7 +1552,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,   227,   237,   513,   573,   532,
      246,   587,   610,   256,   626,   272,   578,     3,    17,    21,
@@ -2462,7 +1729,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,   499,   484,   456,   588,   457,   458,   471,   628,   629,
      591,     3,     4,   633,   634,   472,   473,   615,   616,   617,
@@ -2602,7 +1869,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,   304,     0,    11,    12,    46,    52,    96,   112,   162,
      221,   239,   256,   265,   289,   293,   299,   305,   306,   307,
@@ -2701,7 +1968,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,   303,   304,   304,   305,   305,   305,   305,   305,   305,
      305,   305,   305,   305,   305,   305,   305,   305,   306,   307,
@@ -2770,7 +2037,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,
@@ -2839,10 +2106,10 @@ static const yytype_int8 yyr2[] =
 };
 
 
-enum { YYENOMEM = -2 };
-
 #define yyerrok         (yyerrstatus = 0)
 #define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
@@ -2868,9 +2135,10 @@ enum { YYENOMEM = -2 };
       }                                                           \
   while (0)
 
-/* Backward compatibility with an undocumented macro.
-   Use YYerror or YYUNDEF. */
-#define YYERRCODE YYUNDEF
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
 
 
 /* Enable debugging if requested.  */
@@ -2888,18 +2156,18 @@ do {                                            \
 } while (0)
 
 /* This macro is provided for backward compatibility. */
-# ifndef YY_LOCATION_PRINT
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Kind, Value); \
+                  Type, Value); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
@@ -2910,20 +2178,17 @@ do {                                                                      \
 `-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyo,
-                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
   FILE *yyoutput = yyo;
   YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
-  if (yykind < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yykind);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+  YYUSE (yytype);
 }
 
 
@@ -2932,13 +2197,12 @@ yy_symbol_value_print (FILE *yyo,
 `---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyo,
-                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
   YYFPRINTF (yyo, "%s %s (",
-             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyo, yykind, yyvaluep);
+  yy_symbol_value_print (yyo, yytype, yyvaluep);
   YYFPRINTF (yyo, ")");
 }
 
@@ -2948,7 +2212,7 @@ yy_symbol_print (FILE *yyo,
 `------------------------------------------------------------------*/
 
 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++)
@@ -2971,21 +2235,21 @@ 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,
-                       YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
-                       &yyvsp[(yyi + 1) - (yynrhs)]);
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &yyvsp[(yyi + 1) - (yynrhs)]
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -3000,8 +2264,8 @@ do {                                    \
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-# define YYDPRINTF(Args) ((void) 0)
-# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -3024,29 +2288,253 @@ int yydebug;
 #endif
 
 
+#if YYERROR_VERBOSE
 
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
 
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   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 YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            else
+              goto append;
+
+          append:
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *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 (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. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+                    yysize = yysize1;
+                  else
+                    return 2;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      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"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+      yysize = yysize1;
+    else
+      return 2;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg,
-            yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 {
   YYUSE (yyvaluep);
   if (!yymsg)
     yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yykind);
+  YYUSE (yytype);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
+
+
 /* The lookahead symbol.  */
 int yychar;
 
@@ -3056,8 +2544,6 @@ YYSTYPE yylval;
 int yynerrs;
 
 
-
-
 /*----------.
 | yyparse.  |
 `----------*/
@@ -3065,7 +2551,7 @@ int yynerrs;
 int
 yyparse (void)
 {
-    yy_state_fast_t yystate;
+    int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
@@ -3076,29 +2562,32 @@ yyparse (void)
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
-    /* Their size.  */
-    YYPTRDIFF_T yystacksize;
-
     /* 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;
 
+    YYSIZE_T yystacksize;
+
   int yyn;
-  /* The return value of yyparse.  */
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
-
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
@@ -3106,17 +2595,15 @@ yyparse (void)
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yynerrs = 0;
-  yystate = 0;
-  yyerrstatus = 0;
-
-  yystacksize = YYINITDEPTH;
   yyssp = yyss = yyssa;
   yyvsp = yyvs = yyvsa;
-
+  yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
@@ -3131,15 +2618,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
-  YY_STACK_PRINT (yyss, yyssp);
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -3147,23 +2631,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;
@@ -3177,15 +2661,14 @@ 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);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
@@ -3194,10 +2677,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;
@@ -3224,29 +2705,18 @@ yybackup:
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token\n"));
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
     {
-      yychar = YYEOF;
-      yytoken = YYSYMBOL_YYEOF;
+      yychar = yytoken = YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
-  else if (yychar == YYerror)
-    {
-      /* The scanner already issued an error message, process directly
-         to error recovery.  But do not keep the error token as
-         lookahead, it is too special and may lead us to an endless
-         loop in error recovery. */
-      yychar = YYUNDEF;
-      yytoken = YYSYMBOL_YYerror;
-      goto yyerrlab1;
-    }
   else
     {
       yytoken = YYTRANSLATE (yychar);
@@ -3274,13 +2744,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;
 
 
@@ -3317,23 +2788,23 @@ yyreduce:
     {
   case 18:
 #line 195 "./util/configparser.y"
-        {
+    {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 3324 "util/configparser.c"
+#line 2795 "util/configparser.c"
     break;
 
   case 19:
 #line 201 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 3332 "util/configparser.c"
+#line 2803 "util/configparser.c"
     break;
 
   case 227:
 #line 299 "./util/configparser.y"
-        {
+    {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -3343,12 +2814,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3347 "util/configparser.c"
+#line 2818 "util/configparser.c"
     break;
 
   case 237:
 #line 316 "./util/configparser.y"
-        {
+    {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -3358,12 +2829,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3362 "util/configparser.c"
+#line 2833 "util/configparser.c"
     break;
 
   case 246:
 #line 333 "./util/configparser.y"
-        {
+    {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
 		s = (struct config_view*)calloc(1, sizeof(struct config_view));
@@ -3375,12 +2846,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3379 "util/configparser.c"
+#line 2850 "util/configparser.c"
     break;
 
   case 256:
 #line 352 "./util/configparser.y"
-        {
+    {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -3395,12 +2866,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3399 "util/configparser.c"
+#line 2870 "util/configparser.c"
     break;
 
   case 267:
 #line 376 "./util/configparser.y"
-        {
+    {
 		uint8_t* bitlist;
 		size_t len = 0;
 		OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str)));
@@ -3416,12 +2887,12 @@ yyreduce:
 
 		}
 	}
-#line 3420 "util/configparser.c"
+#line 2891 "util/configparser.c"
     break;
 
   case 268:
 #line 395 "./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 &&
@@ -3435,44 +2906,44 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 3439 "util/configparser.c"
+#line 2910 "util/configparser.c"
     break;
 
   case 269:
 #line 412 "./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 3449 "util/configparser.c"
+#line 2920 "util/configparser.c"
     break;
 
   case 270:
 #line 420 "./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 3461 "util/configparser.c"
+#line 2932 "util/configparser.c"
     break;
 
   case 271:
 #line 430 "./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 3471 "util/configparser.c"
+#line 2942 "util/configparser.c"
     break;
 
   case 272:
 #line 438 "./util/configparser.y"
-        {
+    {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -3487,36 +2958,36 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 3491 "util/configparser.c"
+#line 2962 "util/configparser.c"
     break;
 
   case 285:
 #line 461 "./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 3503 "util/configparser.c"
+#line 2974 "util/configparser.c"
     break;
 
   case 286:
 #line 470 "./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 3515 "util/configparser.c"
+#line 2986 "util/configparser.c"
     break;
 
   case 287:
 #line 479 "./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;
@@ -3525,48 +2996,48 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3529 "util/configparser.c"
+#line 3000 "util/configparser.c"
     break;
 
   case 288:
 #line 490 "./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 3541 "util/configparser.c"
+#line 3012 "util/configparser.c"
     break;
 
   case 289:
 #line 499 "./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 3553 "util/configparser.c"
+#line 3024 "util/configparser.c"
     break;
 
   case 290:
 #line 508 "./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 3565 "util/configparser.c"
+#line 3036 "util/configparser.c"
     break;
 
   case 291:
 #line 517 "./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;
@@ -3575,24 +3046,24 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3579 "util/configparser.c"
+#line 3050 "util/configparser.c"
     break;
 
   case 292:
 #line 528 "./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 3591 "util/configparser.c"
+#line 3062 "util/configparser.c"
     break;
 
   case 293:
 #line 537 "./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)))
@@ -3602,12 +3073,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3606 "util/configparser.c"
+#line 3077 "util/configparser.c"
     break;
 
   case 294:
 #line 549 "./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,
@@ -3618,12 +3089,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3622 "util/configparser.c"
+#line 3093 "util/configparser.c"
     break;
 
   case 295:
 #line 563 "./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)
@@ -3636,12 +3107,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3640 "util/configparser.c"
+#line 3111 "util/configparser.c"
     break;
 
   case 296:
 #line 578 "./util/configparser.y"
-        {
+    {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
 		OUTYY(("P(Deprecated option, ignoring)\n"));
@@ -3650,12 +3121,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3654 "util/configparser.c"
+#line 3125 "util/configparser.c"
     break;
 
   case 297:
 #line 589 "./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)
@@ -3670,12 +3141,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3674 "util/configparser.c"
+#line 3145 "util/configparser.c"
     break;
 
   case 298:
 #line 606 "./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)
@@ -3690,12 +3161,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3694 "util/configparser.c"
+#line 3165 "util/configparser.c"
     break;
 
   case 299:
 #line 623 "./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)
@@ -3710,12 +3181,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3714 "util/configparser.c"
+#line 3185 "util/configparser.c"
     break;
 
   case 300:
 #line 640 "./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)
@@ -3730,12 +3201,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3734 "util/configparser.c"
+#line 3205 "util/configparser.c"
     break;
 
   case 301:
 #line 657 "./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)
@@ -3748,12 +3219,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3752 "util/configparser.c"
+#line 3223 "util/configparser.c"
     break;
 
   case 302:
 #line 672 "./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)
@@ -3766,12 +3237,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3770 "util/configparser.c"
+#line 3241 "util/configparser.c"
     break;
 
   case 303:
 #line 687 "./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*));
@@ -3782,12 +3253,12 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3786 "util/configparser.c"
+#line 3257 "util/configparser.c"
     break;
 
   case 304:
 #line 700 "./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*));
@@ -3800,180 +3271,180 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3804 "util/configparser.c"
+#line 3275 "util/configparser.c"
     break;
 
   case 305:
 #line 715 "./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 3816 "util/configparser.c"
+#line 3287 "util/configparser.c"
     break;
 
   case 306:
 #line 724 "./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 3828 "util/configparser.c"
+#line 3299 "util/configparser.c"
     break;
 
   case 307:
 #line 733 "./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 3840 "util/configparser.c"
+#line 3311 "util/configparser.c"
     break;
 
   case 308:
 #line 742 "./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 3852 "util/configparser.c"
+#line 3323 "util/configparser.c"
     break;
 
   case 309:
 #line 751 "./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 3864 "util/configparser.c"
+#line 3335 "util/configparser.c"
     break;
 
   case 310:
 #line 760 "./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 3876 "util/configparser.c"
+#line 3347 "util/configparser.c"
     break;
 
   case 311:
 #line 769 "./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 3888 "util/configparser.c"
+#line 3359 "util/configparser.c"
     break;
 
   case 312:
 #line 778 "./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 3900 "util/configparser.c"
+#line 3371 "util/configparser.c"
     break;
 
   case 313:
 #line 787 "./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 3912 "util/configparser.c"
+#line 3383 "util/configparser.c"
     break;
 
   case 314:
 #line 796 "./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 3924 "util/configparser.c"
+#line 3395 "util/configparser.c"
     break;
 
   case 315:
 #line 805 "./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 3936 "util/configparser.c"
+#line 3407 "util/configparser.c"
     break;
 
   case 316:
 #line 814 "./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 3948 "util/configparser.c"
+#line 3419 "util/configparser.c"
     break;
 
   case 317:
 #line 823 "./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 3960 "util/configparser.c"
+#line 3431 "util/configparser.c"
     break;
 
   case 318:
 #line 832 "./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 3972 "util/configparser.c"
+#line 3443 "util/configparser.c"
     break;
 
   case 319:
 #line 841 "./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");
@@ -3984,24 +3455,24 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3988 "util/configparser.c"
+#line 3459 "util/configparser.c"
     break;
 
   case 320:
 #line 854 "./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 4000 "util/configparser.c"
+#line 3471 "util/configparser.c"
     break;
 
   case 321:
 #line 863 "./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");
@@ -4012,168 +3483,168 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4016 "util/configparser.c"
+#line 3487 "util/configparser.c"
     break;
 
   case 322:
 #line 876 "./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 4028 "util/configparser.c"
+#line 3499 "util/configparser.c"
     break;
 
   case 323:
 #line 885 "./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 4040 "util/configparser.c"
+#line 3511 "util/configparser.c"
     break;
 
   case 324:
 #line 894 "./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 4052 "util/configparser.c"
+#line 3523 "util/configparser.c"
     break;
 
   case 325:
 #line 903 "./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 4062 "util/configparser.c"
+#line 3533 "util/configparser.c"
     break;
 
   case 326:
 #line 910 "./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 4072 "util/configparser.c"
+#line 3543 "util/configparser.c"
     break;
 
   case 327:
 #line 917 "./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 4084 "util/configparser.c"
+#line 3555 "util/configparser.c"
     break;
 
   case 328:
 #line 926 "./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 4094 "util/configparser.c"
+#line 3565 "util/configparser.c"
     break;
 
   case 329:
 #line 933 "./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 4106 "util/configparser.c"
+#line 3577 "util/configparser.c"
     break;
 
   case 330:
 #line 942 "./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 4117 "util/configparser.c"
+#line 3588 "util/configparser.c"
     break;
 
   case 331:
 #line 950 "./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 4127 "util/configparser.c"
+#line 3598 "util/configparser.c"
     break;
 
   case 332:
 #line 957 "./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 4137 "util/configparser.c"
+#line 3608 "util/configparser.c"
     break;
 
   case 333:
 #line 964 "./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 4148 "util/configparser.c"
+#line 3619 "util/configparser.c"
     break;
 
   case 334:
 #line 972 "./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 4160 "util/configparser.c"
+#line 3631 "util/configparser.c"
     break;
 
   case 335:
 #line 981 "./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 4172 "util/configparser.c"
+#line 3643 "util/configparser.c"
     break;
 
   case 336:
 #line 989 "./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] != '/') {
@@ -4188,96 +3659,96 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 4192 "util/configparser.c"
+#line 3663 "util/configparser.c"
     break;
 
   case 337:
 #line 1005 "./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 4204 "util/configparser.c"
+#line 3675 "util/configparser.c"
     break;
 
   case 338:
 #line 1013 "./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 4216 "util/configparser.c"
+#line 3687 "util/configparser.c"
     break;
 
   case 339:
 #line 1021 "./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 4228 "util/configparser.c"
+#line 3699 "util/configparser.c"
     break;
 
   case 340:
 #line 1029 "./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 4240 "util/configparser.c"
+#line 3711 "util/configparser.c"
     break;
 
   case 341:
 #line 1037 "./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 4252 "util/configparser.c"
+#line 3723 "util/configparser.c"
     break;
 
   case 342:
 #line 1045 "./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 4264 "util/configparser.c"
+#line 3735 "util/configparser.c"
     break;
 
   case 343:
 #line 1054 "./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 4276 "util/configparser.c"
+#line 3747 "util/configparser.c"
     break;
 
   case 344:
 #line 1063 "./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.");
@@ -4289,104 +3760,104 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4293 "util/configparser.c"
+#line 3764 "util/configparser.c"
     break;
 
   case 345:
 #line 1077 "./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 4305 "util/configparser.c"
+#line 3776 "util/configparser.c"
     break;
 
   case 346:
 #line 1086 "./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 4317 "util/configparser.c"
+#line 3788 "util/configparser.c"
     break;
 
   case 347:
 #line 1095 "./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 4329 "util/configparser.c"
+#line 3800 "util/configparser.c"
     break;
 
   case 348:
 #line 1104 "./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 4341 "util/configparser.c"
+#line 3812 "util/configparser.c"
     break;
 
   case 349:
 #line 1113 "./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 4353 "util/configparser.c"
+#line 3824 "util/configparser.c"
     break;
 
   case 350:
 #line 1122 "./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 4365 "util/configparser.c"
+#line 3836 "util/configparser.c"
     break;
 
   case 351:
 #line 1131 "./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 4375 "util/configparser.c"
+#line 3846 "util/configparser.c"
     break;
 
   case 352:
 #line 1138 "./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 4385 "util/configparser.c"
+#line 3856 "util/configparser.c"
     break;
 
   case 353:
 #line 1145 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
 		cfg_parser->cfg->directory = (yyvsp[0].str);
@@ -4410,106 +3881,106 @@ yyreduce:
 			}
 		}
 	}
-#line 4414 "util/configparser.c"
+#line 3885 "util/configparser.c"
     break;
 
   case 354:
 #line 1171 "./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 4425 "util/configparser.c"
+#line 3896 "util/configparser.c"
     break;
 
   case 355:
 #line 1179 "./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 4435 "util/configparser.c"
+#line 3906 "util/configparser.c"
     break;
 
   case 356:
 #line 1186 "./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 4445 "util/configparser.c"
+#line 3916 "util/configparser.c"
     break;
 
   case 357:
 #line 1193 "./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 4455 "util/configparser.c"
+#line 3926 "util/configparser.c"
     break;
 
   case 358:
 #line 1200 "./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 4465 "util/configparser.c"
+#line 3936 "util/configparser.c"
     break;
 
   case 359:
 #line 1207 "./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 4476 "util/configparser.c"
+#line 3947 "util/configparser.c"
     break;
 
   case 360:
 #line 1215 "./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 4487 "util/configparser.c"
+#line 3958 "util/configparser.c"
     break;
 
   case 361:
 #line 1223 "./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 4498 "util/configparser.c"
+#line 3969 "util/configparser.c"
     break;
 
   case 362:
 #line 1231 "./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 4508 "util/configparser.c"
+#line 3979 "util/configparser.c"
     break;
 
   case 363:
 #line 1238 "./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.");
@@ -4518,12 +3989,12 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4522 "util/configparser.c"
+#line 3993 "util/configparser.c"
     break;
 
   case 364:
 #line 1249 "./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.");
@@ -4532,95 +4003,95 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4536 "util/configparser.c"
+#line 4007 "util/configparser.c"
     break;
 
   case 365:
 #line 1260 "./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 4546 "util/configparser.c"
+#line 4017 "util/configparser.c"
     break;
 
   case 366:
 #line 1267 "./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 4558 "util/configparser.c"
+#line 4029 "util/configparser.c"
     break;
 
   case 367:
 #line 1276 "./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 4570 "util/configparser.c"
+#line 4041 "util/configparser.c"
     break;
 
   case 368:
 #line 1285 "./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 4582 "util/configparser.c"
+#line 4053 "util/configparser.c"
     break;
 
   case 369:
 #line 1294 "./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 4592 "util/configparser.c"
+#line 4063 "util/configparser.c"
     break;
 
   case 370:
 #line 1301 "./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 4602 "util/configparser.c"
+#line 4073 "util/configparser.c"
     break;
 
   case 371:
 #line 1308 "./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 4613 "util/configparser.c"
+#line 4084 "util/configparser.c"
     break;
 
   case 372:
 #line 1316 "./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 4624 "util/configparser.c"
+#line 4095 "util/configparser.c"
     break;
 
   case 373:
@@ -4633,7 +4104,7 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4637 "util/configparser.c"
+#line 4108 "util/configparser.c"
     break;
 
   case 374:
@@ -4646,7 +4117,7 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4650 "util/configparser.c"
+#line 4121 "util/configparser.c"
     break;
 
   case 375:
@@ -4659,12 +4130,12 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4663 "util/configparser.c"
+#line 4134 "util/configparser.c"
     break;
 
   case 376:
 #line 1354 "./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");
@@ -4676,23 +4147,23 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4680 "util/configparser.c"
+#line 4151 "util/configparser.c"
     break;
 
   case 377:
 #line 1368 "./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 4691 "util/configparser.c"
+#line 4162 "util/configparser.c"
     break;
 
   case 378:
 #line 1376 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4703,12 +4174,12 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4707 "util/configparser.c"
+#line 4178 "util/configparser.c"
     break;
 
   case 379:
 #line 1389 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4717,23 +4188,23 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4721 "util/configparser.c"
+#line 4192 "util/configparser.c"
     break;
 
   case 380:
 #line 1400 "./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 4732 "util/configparser.c"
+#line 4203 "util/configparser.c"
     break;
 
   case 381:
 #line 1408 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4744,60 +4215,60 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4748 "util/configparser.c"
+#line 4219 "util/configparser.c"
     break;
 
   case 382:
 #line 1421 "./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 4760 "util/configparser.c"
+#line 4231 "util/configparser.c"
     break;
 
   case 383:
 #line 1430 "./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 4772 "util/configparser.c"
+#line 4243 "util/configparser.c"
     break;
 
   case 384:
 #line 1439 "./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 4784 "util/configparser.c"
+#line 4255 "util/configparser.c"
     break;
 
   case 385:
 #line 1448 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_udp_connect:%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_connect = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4796 "util/configparser.c"
+#line 4267 "util/configparser.c"
     break;
 
   case 386:
 #line 1457 "./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.");
@@ -4805,12 +4276,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4809 "util/configparser.c"
+#line 4280 "util/configparser.c"
     break;
 
   case 387:
 #line 1467 "./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.");
@@ -4818,23 +4289,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4822 "util/configparser.c"
+#line 4293 "util/configparser.c"
     break;
 
   case 388:
 #line 1477 "./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 4833 "util/configparser.c"
+#line 4304 "util/configparser.c"
     break;
 
   case 389:
 #line 1485 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4845,58 +4316,58 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4849 "util/configparser.c"
+#line 4320 "util/configparser.c"
     break;
 
   case 390:
 #line 1498 "./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 4861 "util/configparser.c"
+#line 4332 "util/configparser.c"
     break;
 
   case 391:
 #line 1507 "./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 4872 "util/configparser.c"
+#line 4343 "util/configparser.c"
     break;
 
   case 392:
 #line 1515 "./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 4884 "util/configparser.c"
+#line 4355 "util/configparser.c"
     break;
 
   case 393:
 #line 1524 "./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 4895 "util/configparser.c"
+#line 4366 "util/configparser.c"
     break;
 
   case 394:
 #line 1532 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4907,24 +4378,24 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4911 "util/configparser.c"
+#line 4382 "util/configparser.c"
     break;
 
   case 395:
 #line 1545 "./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 4923 "util/configparser.c"
+#line 4394 "util/configparser.c"
     break;
 
   case 396:
 #line 1554 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_infra_keep_probing:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4932,22 +4403,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4936 "util/configparser.c"
+#line 4407 "util/configparser.c"
     break;
 
   case 397:
 #line 1564 "./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 4946 "util/configparser.c"
+#line 4417 "util/configparser.c"
     break;
 
   case 398:
 #line 1571 "./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.");
@@ -4955,12 +4426,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4959 "util/configparser.c"
+#line 4430 "util/configparser.c"
     break;
 
   case 399:
 #line 1581 "./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.");
@@ -4968,12 +4439,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4972 "util/configparser.c"
+#line 4443 "util/configparser.c"
     break;
 
   case 400:
 #line 1591 "./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.");
@@ -4981,12 +4452,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4985 "util/configparser.c"
+#line 4456 "util/configparser.c"
     break;
 
   case 401:
 #line 1601 "./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.");
@@ -4994,12 +4465,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4998 "util/configparser.c"
+#line 4469 "util/configparser.c"
     break;
 
   case 402:
 #line 1611 "./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.");
@@ -5007,12 +4478,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5011 "util/configparser.c"
+#line 4482 "util/configparser.c"
     break;
 
   case 403:
 #line 1621 "./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.");
@@ -5020,12 +4491,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5024 "util/configparser.c"
+#line 4495 "util/configparser.c"
     break;
 
   case 404:
 #line 1631 "./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.");
@@ -5033,12 +4504,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5037 "util/configparser.c"
+#line 4508 "util/configparser.c"
     break;
 
   case 405:
 #line 1641 "./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.");
@@ -5046,100 +4517,100 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5050 "util/configparser.c"
+#line 4521 "util/configparser.c"
     break;
 
   case 406:
 #line 1651 "./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 5060 "util/configparser.c"
+#line 4531 "util/configparser.c"
     break;
 
   case 407:
 #line 1658 "./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 5070 "util/configparser.c"
+#line 4541 "util/configparser.c"
     break;
 
   case 408:
 #line 1665 "./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 5080 "util/configparser.c"
+#line 4551 "util/configparser.c"
     break;
 
   case 409:
 #line 1672 "./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 5092 "util/configparser.c"
+#line 4563 "util/configparser.c"
     break;
 
   case 410:
 #line 1681 "./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 5104 "util/configparser.c"
+#line 4575 "util/configparser.c"
     break;
 
   case 411:
 #line 1690 "./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 5116 "util/configparser.c"
+#line 4587 "util/configparser.c"
     break;
 
   case 412:
 #line 1699 "./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 5128 "util/configparser.c"
+#line 4599 "util/configparser.c"
     break;
 
   case 413:
 #line 1708 "./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 5138 "util/configparser.c"
+#line 4609 "util/configparser.c"
     break;
 
   case 414:
 #line 1715 "./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.");
@@ -5147,12 +4618,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5151 "util/configparser.c"
+#line 4622 "util/configparser.c"
     break;
 
   case 415:
 #line 1725 "./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 &&
@@ -5170,22 +4641,22 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 5174 "util/configparser.c"
+#line 4645 "util/configparser.c"
     break;
 
   case 416:
 #line 1745 "./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 5184 "util/configparser.c"
+#line 4655 "util/configparser.c"
     break;
 
   case 417:
 #line 1752 "./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;
@@ -5201,12 +4672,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5205 "util/configparser.c"
+#line 4676 "util/configparser.c"
     break;
 
   case 418:
 #line 1770 "./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;
@@ -5217,12 +4688,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5221 "util/configparser.c"
+#line 4692 "util/configparser.c"
     break;
 
   case 419:
 #line 1783 "./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;
@@ -5233,60 +4704,60 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5237 "util/configparser.c"
+#line 4708 "util/configparser.c"
     break;
 
   case 420:
 #line 1796 "./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 5249 "util/configparser.c"
+#line 4720 "util/configparser.c"
     break;
 
   case 421:
 #line 1805 "./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 5261 "util/configparser.c"
+#line 4732 "util/configparser.c"
     break;
 
   case 422:
 #line 1814 "./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 5273 "util/configparser.c"
+#line 4744 "util/configparser.c"
     break;
 
   case 423:
 #line 1823 "./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 5285 "util/configparser.c"
+#line 4756 "util/configparser.c"
     break;
 
   case 424:
 #line 1832 "./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.");
@@ -5294,12 +4765,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5298 "util/configparser.c"
+#line 4769 "util/configparser.c"
     break;
 
   case 425:
 #line 1842 "./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.");
@@ -5307,12 +4778,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5311 "util/configparser.c"
+#line 4782 "util/configparser.c"
     break;
 
   case 426:
 #line 1852 "./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.");
@@ -5321,84 +4792,84 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5325 "util/configparser.c"
+#line 4796 "util/configparser.c"
     break;
 
   case 427:
 #line 1863 "./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 5337 "util/configparser.c"
+#line 4808 "util/configparser.c"
     break;
 
   case 428:
 #line 1872 "./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 5349 "util/configparser.c"
+#line 4820 "util/configparser.c"
     break;
 
   case 429:
 #line 1881 "./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 5361 "util/configparser.c"
+#line 4832 "util/configparser.c"
     break;
 
   case 430:
 #line 1890 "./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 5373 "util/configparser.c"
+#line 4844 "util/configparser.c"
     break;
 
   case 431:
 #line 1899 "./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 5385 "util/configparser.c"
+#line 4856 "util/configparser.c"
     break;
 
   case 432:
 #line 1908 "./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 5397 "util/configparser.c"
+#line 4868 "util/configparser.c"
     break;
 
   case 433:
 #line 1917 "./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.");
@@ -5409,12 +4880,12 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 5413 "util/configparser.c"
+#line 4884 "util/configparser.c"
     break;
 
   case 434:
 #line 1930 "./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.");
@@ -5425,70 +4896,70 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 5429 "util/configparser.c"
+#line 4900 "util/configparser.c"
     break;
 
   case 435:
 #line 1943 "./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 5441 "util/configparser.c"
+#line 4912 "util/configparser.c"
     break;
 
   case 436:
 #line 1952 "./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 5451 "util/configparser.c"
+#line 4922 "util/configparser.c"
     break;
 
   case 437:
 #line 1959 "./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 5463 "util/configparser.c"
+#line 4934 "util/configparser.c"
     break;
 
   case 438:
 #line 1968 "./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 5475 "util/configparser.c"
+#line 4946 "util/configparser.c"
     break;
 
   case 439:
 #line 1977 "./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 5487 "util/configparser.c"
+#line 4958 "util/configparser.c"
     break;
 
   case 440:
 #line 1986 "./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.");
@@ -5496,23 +4967,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5500 "util/configparser.c"
+#line 4971 "util/configparser.c"
     break;
 
   case 441:
 #line 1995 "./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 5511 "util/configparser.c"
+#line 4982 "util/configparser.c"
     break;
 
   case 442:
 #line 2003 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -5523,23 +4994,23 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5527 "util/configparser.c"
+#line 4998 "util/configparser.c"
     break;
 
   case 443:
 #line 2016 "./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 5538 "util/configparser.c"
+#line 5009 "util/configparser.c"
     break;
 
   case 444:
 #line 2024 "./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 &&
@@ -5578,22 +5049,22 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5582 "util/configparser.c"
+#line 5053 "util/configparser.c"
     break;
 
   case 445:
 #line 2065 "./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 5592 "util/configparser.c"
+#line 5063 "util/configparser.c"
     break;
 
   case 446:
 #line 2072 "./util/configparser.y"
-        {
+    {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -5606,12 +5077,12 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5610 "util/configparser.c"
+#line 5081 "util/configparser.c"
     break;
 
   case 447:
 #line 2087 "./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.");
@@ -5619,12 +5090,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5623 "util/configparser.c"
+#line 5094 "util/configparser.c"
     break;
 
   case 448:
 #line 2097 "./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.");
@@ -5632,65 +5103,65 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5636 "util/configparser.c"
+#line 5107 "util/configparser.c"
     break;
 
   case 449:
 #line 2107 "./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 5646 "util/configparser.c"
+#line 5117 "util/configparser.c"
     break;
 
   case 450:
 #line 2114 "./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 5656 "util/configparser.c"
+#line 5127 "util/configparser.c"
     break;
 
   case 451:
 #line 2121 "./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 5666 "util/configparser.c"
+#line 5137 "util/configparser.c"
     break;
 
   case 452:
 #line 2128 "./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 5678 "util/configparser.c"
+#line 5149 "util/configparser.c"
     break;
 
   case 453:
 #line 2137 "./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 5689 "util/configparser.c"
+#line 5160 "util/configparser.c"
     break;
 
   case 454:
 #line 2145 "./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) {
@@ -5702,12 +5173,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5706 "util/configparser.c"
+#line 5177 "util/configparser.c"
     break;
 
   case 455:
 #line 2159 "./util/configparser.y"
-        {
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5726,12 +5197,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5730 "util/configparser.c"
+#line 5201 "util/configparser.c"
     break;
 
   case 456:
 #line 2180 "./util/configparser.y"
-        {
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5750,12 +5221,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5754 "util/configparser.c"
+#line 5225 "util/configparser.c"
     break;
 
   case 457:
 #line 2201 "./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))) {
@@ -5765,12 +5236,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5769 "util/configparser.c"
+#line 5240 "util/configparser.c"
     break;
 
   case 458:
 #line 2213 "./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))) {
@@ -5780,12 +5251,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5784 "util/configparser.c"
+#line 5255 "util/configparser.c"
     break;
 
   case 459:
 #line 2225 "./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))) {
@@ -5795,24 +5266,24 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5799 "util/configparser.c"
+#line 5270 "util/configparser.c"
     break;
 
   case 460:
 #line 2237 "./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 5811 "util/configparser.c"
+#line 5282 "util/configparser.c"
     break;
 
   case 461:
 #line 2246 "./util/configparser.y"
-        {
+    {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5831,58 +5302,58 @@ yyreduce:
 			}
 		}
 	}
-#line 5835 "util/configparser.c"
+#line 5306 "util/configparser.c"
     break;
 
   case 462:
 #line 2267 "./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 5847 "util/configparser.c"
+#line 5318 "util/configparser.c"
     break;
 
   case 463:
 #line 2277 "./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 5859 "util/configparser.c"
+#line 5330 "util/configparser.c"
     break;
 
   case 464:
 #line 2286 "./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 5870 "util/configparser.c"
+#line 5341 "util/configparser.c"
     break;
 
   case 465:
 #line 2294 "./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 5881 "util/configparser.c"
+#line 5352 "util/configparser.c"
     break;
 
   case 466:
 #line 2302 "./util/configparser.y"
-  {
+    {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -5893,12 +5364,12 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5897 "util/configparser.c"
+#line 5368 "util/configparser.c"
     break;
 
   case 467:
 #line 2315 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -5909,12 +5380,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5913 "util/configparser.c"
+#line 5384 "util/configparser.c"
     break;
 
   case 468:
 #line 2328 "./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");
@@ -5927,12 +5398,12 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5931 "util/configparser.c"
+#line 5402 "util/configparser.c"
     break;
 
   case 469:
 #line 2343 "./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");
@@ -5945,69 +5416,69 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5949 "util/configparser.c"
+#line 5420 "util/configparser.c"
     break;
 
   case 470:
 #line 2358 "./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 5961 "util/configparser.c"
+#line 5432 "util/configparser.c"
     break;
 
   case 471:
 #line 2367 "./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 5973 "util/configparser.c"
+#line 5444 "util/configparser.c"
     break;
 
   case 472:
 #line 2376 "./util/configparser.y"
-        { 
+    { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5982 "util/configparser.c"
+#line 5453 "util/configparser.c"
     break;
 
   case 473:
 #line 2382 "./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 5994 "util/configparser.c"
+#line 5465 "util/configparser.c"
     break;
 
   case 474:
 #line 2391 "./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 6006 "util/configparser.c"
+#line 5477 "util/configparser.c"
     break;
 
   case 475:
 #line 2400 "./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.");
@@ -6015,12 +5486,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6019 "util/configparser.c"
+#line 5490 "util/configparser.c"
     break;
 
   case 476:
 #line 2410 "./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.");
@@ -6028,12 +5499,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6032 "util/configparser.c"
+#line 5503 "util/configparser.c"
     break;
 
   case 477:
 #line 2420 "./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)
@@ -6044,12 +5515,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6048 "util/configparser.c"
+#line 5519 "util/configparser.c"
     break;
 
   case 478:
 #line 2433 "./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)
@@ -6060,12 +5531,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6064 "util/configparser.c"
+#line 5535 "util/configparser.c"
     break;
 
   case 479:
 #line 2446 "./util/configparser.y"
-        {
+    {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ipsecmod_hook);
@@ -6075,12 +5546,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6079 "util/configparser.c"
+#line 5550 "util/configparser.c"
     break;
 
   case 480:
 #line 2458 "./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)
@@ -6092,12 +5563,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6096 "util/configparser.c"
+#line 5567 "util/configparser.c"
     break;
 
   case 481:
 #line 2472 "./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)))
@@ -6107,12 +5578,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6111 "util/configparser.c"
+#line 5582 "util/configparser.c"
     break;
 
   case 482:
 #line 2484 "./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)
@@ -6124,38 +5595,39 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6128 "util/configparser.c"
+#line 5599 "util/configparser.c"
     break;
 
   case 483:
 #line 2498 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->edns_client_strings, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding "
 				"edns-client-string");
 	}
-#line 6140 "util/configparser.c"
+#line 5611 "util/configparser.c"
     break;
 
   case 484:
 #line 2507 "./util/configparser.y"
-        {
+    {
 		OUTYY(("P(edns_client_string_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_string_opcode = atoi((yyvsp[0].str));
+		free((yyvsp[0].str));
 
 	}
-#line 6154 "util/configparser.c"
+#line 5626 "util/configparser.c"
     break;
 
   case 485:
-#line 2518 "./util/configparser.y"
-        {
+#line 2519 "./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 "
@@ -6163,56 +5635,56 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 6167 "util/configparser.c"
+#line 5639 "util/configparser.c"
     break;
 
   case 486:
-#line 2528 "./util/configparser.y"
-        {
+#line 2529 "./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 6177 "util/configparser.c"
+#line 5649 "util/configparser.c"
     break;
 
   case 487:
-#line 2535 "./util/configparser.y"
-        {
+#line 2536 "./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 6187 "util/configparser.c"
+#line 5659 "util/configparser.c"
     break;
 
   case 488:
-#line 2542 "./util/configparser.y"
-        {
+#line 2543 "./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 6199 "util/configparser.c"
+#line 5671 "util/configparser.c"
     break;
 
   case 489:
-#line 2551 "./util/configparser.y"
-        {
+#line 2552 "./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 6211 "util/configparser.c"
+#line 5683 "util/configparser.c"
     break;
 
   case 490:
-#line 2560 "./util/configparser.y"
-        {
+#line 2561 "./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.");
@@ -6220,12 +5692,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6224 "util/configparser.c"
+#line 5696 "util/configparser.c"
     break;
 
   case 491:
-#line 2570 "./util/configparser.y"
-        {
+#line 2571 "./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.");
@@ -6233,12 +5705,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6237 "util/configparser.c"
+#line 5709 "util/configparser.c"
     break;
 
   case 492:
-#line 2580 "./util/configparser.y"
-        {
+#line 2581 "./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 "
@@ -6246,56 +5718,56 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 6250 "util/configparser.c"
+#line 5722 "util/configparser.c"
     break;
 
   case 493:
-#line 2590 "./util/configparser.y"
-        {
+#line 2591 "./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 6260 "util/configparser.c"
+#line 5732 "util/configparser.c"
     break;
 
   case 494:
-#line 2597 "./util/configparser.y"
-        {
+#line 2598 "./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 6270 "util/configparser.c"
+#line 5742 "util/configparser.c"
     break;
 
   case 495:
-#line 2604 "./util/configparser.y"
-        {
+#line 2605 "./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 6282 "util/configparser.c"
+#line 5754 "util/configparser.c"
     break;
 
   case 496:
-#line 2613 "./util/configparser.y"
-        {
+#line 2614 "./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 6294 "util/configparser.c"
+#line 5766 "util/configparser.c"
     break;
 
   case 497:
-#line 2622 "./util/configparser.y"
-        {
+#line 2623 "./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.");
@@ -6303,12 +5775,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6307 "util/configparser.c"
+#line 5779 "util/configparser.c"
     break;
 
   case 498:
-#line 2632 "./util/configparser.y"
-        {
+#line 2633 "./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 "
@@ -6316,53 +5788,53 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 6320 "util/configparser.c"
+#line 5792 "util/configparser.c"
     break;
 
   case 499:
-#line 2642 "./util/configparser.y"
-        {
+#line 2643 "./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 6330 "util/configparser.c"
+#line 5802 "util/configparser.c"
     break;
 
   case 500:
-#line 2649 "./util/configparser.y"
-        {
+#line 2650 "./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 6340 "util/configparser.c"
+#line 5812 "util/configparser.c"
     break;
 
   case 501:
-#line 2656 "./util/configparser.y"
-        {
+#line 2657 "./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 6350 "util/configparser.c"
+#line 5822 "util/configparser.c"
     break;
 
   case 502:
-#line 2663 "./util/configparser.y"
-        {
+#line 2664 "./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 6361 "util/configparser.c"
+#line 5833 "util/configparser.c"
     break;
 
   case 503:
-#line 2671 "./util/configparser.y"
-        {
+#line 2672 "./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.");
@@ -6370,12 +5842,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6374 "util/configparser.c"
+#line 5846 "util/configparser.c"
     break;
 
   case 504:
-#line 2681 "./util/configparser.y"
-        {
+#line 2682 "./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.");
@@ -6383,12 +5855,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6387 "util/configparser.c"
+#line 5859 "util/configparser.c"
     break;
 
   case 505:
-#line 2691 "./util/configparser.y"
-        {
+#line 2692 "./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.");
@@ -6396,12 +5868,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6400 "util/configparser.c"
+#line 5872 "util/configparser.c"
     break;
 
   case 506:
-#line 2701 "./util/configparser.y"
-        {
+#line 2702 "./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 "
@@ -6409,12 +5881,12 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 6413 "util/configparser.c"
+#line 5885 "util/configparser.c"
     break;
 
   case 507:
-#line 2711 "./util/configparser.y"
-        {
+#line 2712 "./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 &&
@@ -6451,12 +5923,12 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 6455 "util/configparser.c"
+#line 5927 "util/configparser.c"
     break;
 
   case 508:
-#line 2750 "./util/configparser.y"
-        {
+#line 2751 "./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(
@@ -6464,34 +5936,34 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 6468 "util/configparser.c"
+#line 5940 "util/configparser.c"
     break;
 
   case 509:
-#line 2760 "./util/configparser.y"
-        {
+#line 2761 "./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 6479 "util/configparser.c"
+#line 5951 "util/configparser.c"
     break;
 
   case 510:
-#line 2768 "./util/configparser.y"
-        {
+#line 2769 "./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 6490 "util/configparser.c"
+#line 5962 "util/configparser.c"
     break;
 
   case 511:
-#line 2776 "./util/configparser.y"
-        {
+#line 2777 "./util/configparser.y"
+    {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -6504,32 +5976,32 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 6508 "util/configparser.c"
+#line 5980 "util/configparser.c"
     break;
 
   case 512:
-#line 2791 "./util/configparser.y"
-        {
+#line 2792 "./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 6520 "util/configparser.c"
+#line 5992 "util/configparser.c"
     break;
 
   case 513:
-#line 2800 "./util/configparser.y"
-        { 
+#line 2801 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6528 "util/configparser.c"
+#line 6000 "util/configparser.c"
     break;
 
   case 524:
-#line 2811 "./util/configparser.y"
-        {
+#line 2812 "./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.");
@@ -6537,104 +6009,104 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6541 "util/configparser.c"
+#line 6013 "util/configparser.c"
     break;
 
   case 525:
-#line 2821 "./util/configparser.y"
-        {
+#line 2822 "./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 6553 "util/configparser.c"
+#line 6025 "util/configparser.c"
     break;
 
   case 526:
-#line 2830 "./util/configparser.y"
-        {
+#line 2831 "./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 6563 "util/configparser.c"
+#line 6035 "util/configparser.c"
     break;
 
   case 527:
-#line 2837 "./util/configparser.y"
-        {
+#line 2838 "./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 6573 "util/configparser.c"
+#line 6045 "util/configparser.c"
     break;
 
   case 528:
-#line 2844 "./util/configparser.y"
-        {
+#line 2845 "./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 6583 "util/configparser.c"
+#line 6055 "util/configparser.c"
     break;
 
   case 529:
-#line 2851 "./util/configparser.y"
-        {
+#line 2852 "./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 6593 "util/configparser.c"
+#line 6065 "util/configparser.c"
     break;
 
   case 530:
-#line 2858 "./util/configparser.y"
-        {
+#line 2859 "./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 6603 "util/configparser.c"
+#line 6075 "util/configparser.c"
     break;
 
   case 531:
-#line 2865 "./util/configparser.y"
-        {
+#line 2866 "./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 6613 "util/configparser.c"
+#line 6085 "util/configparser.c"
     break;
 
   case 532:
-#line 2872 "./util/configparser.y"
-        {
+#line 2873 "./util/configparser.y"
+    {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6621 "util/configparser.c"
+#line 6093 "util/configparser.c"
     break;
 
   case 554:
-#line 2892 "./util/configparser.y"
-        {
+#line 2893 "./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 6633 "util/configparser.c"
+#line 6105 "util/configparser.c"
     break;
 
   case 555:
-#line 2901 "./util/configparser.y"
-        {
+#line 2902 "./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.");
@@ -6642,128 +6114,128 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6646 "util/configparser.c"
+#line 6118 "util/configparser.c"
     break;
 
   case 556:
-#line 2911 "./util/configparser.y"
-        {
+#line 2912 "./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 6656 "util/configparser.c"
+#line 6128 "util/configparser.c"
     break;
 
   case 557:
-#line 2918 "./util/configparser.y"
-        {
+#line 2919 "./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 6666 "util/configparser.c"
+#line 6138 "util/configparser.c"
     break;
 
   case 558:
-#line 2925 "./util/configparser.y"
-        {
+#line 2926 "./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 6678 "util/configparser.c"
+#line 6150 "util/configparser.c"
     break;
 
   case 559:
-#line 2934 "./util/configparser.y"
-        {
+#line 2935 "./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 6688 "util/configparser.c"
+#line 6160 "util/configparser.c"
     break;
 
   case 560:
-#line 2941 "./util/configparser.y"
-        {
+#line 2942 "./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 6698 "util/configparser.c"
+#line 6170 "util/configparser.c"
     break;
 
   case 561:
-#line 2948 "./util/configparser.y"
-        {
+#line 2949 "./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 6708 "util/configparser.c"
+#line 6180 "util/configparser.c"
     break;
 
   case 562:
-#line 2955 "./util/configparser.y"
-        {
+#line 2956 "./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 6718 "util/configparser.c"
+#line 6190 "util/configparser.c"
     break;
 
   case 563:
-#line 2962 "./util/configparser.y"
-        {
+#line 2963 "./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 6730 "util/configparser.c"
+#line 6202 "util/configparser.c"
     break;
 
   case 564:
-#line 2971 "./util/configparser.y"
-        {
+#line 2972 "./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 6742 "util/configparser.c"
+#line 6214 "util/configparser.c"
     break;
 
   case 565:
-#line 2980 "./util/configparser.y"
-        {
+#line 2981 "./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 6752 "util/configparser.c"
+#line 6224 "util/configparser.c"
     break;
 
   case 566:
-#line 2987 "./util/configparser.y"
-        {
+#line 2988 "./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 6762 "util/configparser.c"
+#line 6234 "util/configparser.c"
     break;
 
   case 567:
-#line 2994 "./util/configparser.y"
-        {
+#line 2995 "./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.");
@@ -6771,12 +6243,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6775 "util/configparser.c"
+#line 6247 "util/configparser.c"
     break;
 
   case 568:
-#line 3004 "./util/configparser.y"
-        {
+#line 3005 "./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.");
@@ -6784,12 +6256,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6788 "util/configparser.c"
+#line 6260 "util/configparser.c"
     break;
 
   case 569:
-#line 3014 "./util/configparser.y"
-        {
+#line 3015 "./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.");
@@ -6797,12 +6269,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6801 "util/configparser.c"
+#line 6273 "util/configparser.c"
     break;
 
   case 570:
-#line 3024 "./util/configparser.y"
-        {
+#line 3025 "./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.");
@@ -6810,12 +6282,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6814 "util/configparser.c"
+#line 6286 "util/configparser.c"
     break;
 
   case 571:
-#line 3034 "./util/configparser.y"
-        {
+#line 3035 "./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.");
@@ -6823,12 +6295,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6827 "util/configparser.c"
+#line 6299 "util/configparser.c"
     break;
 
   case 572:
-#line 3044 "./util/configparser.y"
-        {
+#line 3045 "./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.");
@@ -6836,48 +6308,48 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6840 "util/configparser.c"
+#line 6312 "util/configparser.c"
     break;
 
   case 573:
-#line 3054 "./util/configparser.y"
-        { 
+#line 3055 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6848 "util/configparser.c"
+#line 6320 "util/configparser.c"
     break;
 
   case 577:
-#line 3063 "./util/configparser.y"
-        {
+#line 3064 "./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 6858 "util/configparser.c"
+#line 6330 "util/configparser.c"
     break;
 
   case 578:
-#line 3069 "./util/configparser.y"
-        { 
+#line 3070 "./util/configparser.y"
+    { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6866 "util/configparser.c"
+#line 6338 "util/configparser.c"
     break;
 
   case 582:
-#line 3078 "./util/configparser.y"
-        {
+#line 3079 "./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 6876 "util/configparser.c"
+#line 6348 "util/configparser.c"
     break;
 
   case 583:
-#line 3084 "./util/configparser.y"
-        {
+#line 3085 "./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.");
@@ -6885,132 +6357,132 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6889 "util/configparser.c"
+#line 6361 "util/configparser.c"
     break;
 
   case 584:
-#line 3094 "./util/configparser.y"
-        {
+#line 3095 "./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 6899 "util/configparser.c"
+#line 6371 "util/configparser.c"
     break;
 
   case 585:
-#line 3101 "./util/configparser.y"
-        {
+#line 3102 "./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 6911 "util/configparser.c"
+#line 6383 "util/configparser.c"
     break;
 
   case 586:
-#line 3110 "./util/configparser.y"
-        {
+#line 3111 "./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 6922 "util/configparser.c"
+#line 6394 "util/configparser.c"
     break;
 
   case 587:
-#line 3118 "./util/configparser.y"
-        {
+#line 3119 "./util/configparser.y"
+    {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6930 "util/configparser.c"
+#line 6402 "util/configparser.c"
     break;
 
   case 600:
-#line 3134 "./util/configparser.y"
-        {
+#line 3135 "./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 6942 "util/configparser.c"
+#line 6414 "util/configparser.c"
     break;
 
   case 601:
-#line 3144 "./util/configparser.y"
-        {
+#line 3145 "./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 6954 "util/configparser.c"
+#line 6426 "util/configparser.c"
     break;
 
   case 602:
-#line 3153 "./util/configparser.y"
-        {
+#line 3154 "./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 6964 "util/configparser.c"
+#line 6436 "util/configparser.c"
     break;
 
   case 603:
-#line 3160 "./util/configparser.y"
-        {
+#line 3161 "./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 6976 "util/configparser.c"
+#line 6448 "util/configparser.c"
     break;
 
   case 604:
-#line 3169 "./util/configparser.y"
-        {
+#line 3170 "./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 6986 "util/configparser.c"
+#line 6458 "util/configparser.c"
     break;
 
   case 605:
-#line 3176 "./util/configparser.y"
-        {
+#line 3177 "./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 6998 "util/configparser.c"
+#line 6470 "util/configparser.c"
     break;
 
   case 606:
-#line 3185 "./util/configparser.y"
-  {
+#line 3186 "./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 7009 "util/configparser.c"
+#line 6481 "util/configparser.c"
     break;
 
   case 607:
-#line 3193 "./util/configparser.y"
-  {
+#line 3194 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -7021,23 +6493,23 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 7025 "util/configparser.c"
+#line 6497 "util/configparser.c"
     break;
 
   case 608:
-#line 3206 "./util/configparser.y"
-  {
+#line 3207 "./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 7036 "util/configparser.c"
+#line 6508 "util/configparser.c"
     break;
 
   case 609:
-#line 3214 "./util/configparser.y"
-  {
+#line 3215 "./util/configparser.y"
+    {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -7048,20 +6520,20 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 7052 "util/configparser.c"
+#line 6524 "util/configparser.c"
     break;
 
   case 610:
-#line 3227 "./util/configparser.y"
-        {
+#line 3228 "./util/configparser.y"
+    {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 7060 "util/configparser.c"
+#line 6532 "util/configparser.c"
     break;
 
   case 619:
-#line 3238 "./util/configparser.y"
-        {
+#line 3239 "./util/configparser.y"
+    {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_backend);
@@ -7071,12 +6543,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 7075 "util/configparser.c"
+#line 6547 "util/configparser.c"
     break;
 
   case 620:
-#line 3250 "./util/configparser.y"
-        {
+#line 3251 "./util/configparser.y"
+    {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_secret);
@@ -7086,12 +6558,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 7090 "util/configparser.c"
+#line 6562 "util/configparser.c"
     break;
 
   case 621:
-#line 3262 "./util/configparser.y"
-        {
+#line 3263 "./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);
@@ -7101,12 +6573,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 7105 "util/configparser.c"
+#line 6577 "util/configparser.c"
     break;
 
   case 622:
-#line 3274 "./util/configparser.y"
-        {
+#line 3275 "./util/configparser.y"
+    {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
 		OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str)));
@@ -7119,12 +6591,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 7123 "util/configparser.c"
+#line 6595 "util/configparser.c"
     break;
 
   case 623:
-#line 3289 "./util/configparser.y"
-        {
+#line 3290 "./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)
@@ -7135,12 +6607,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 7139 "util/configparser.c"
+#line 6611 "util/configparser.c"
     break;
 
   case 624:
-#line 3302 "./util/configparser.y"
-        {
+#line 3303 "./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)
@@ -7151,12 +6623,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 7155 "util/configparser.c"
+#line 6627 "util/configparser.c"
     break;
 
   case 625:
-#line 3315 "./util/configparser.y"
-        {
+#line 3316 "./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");
@@ -7165,20 +6637,20 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 7169 "util/configparser.c"
+#line 6641 "util/configparser.c"
     break;
 
   case 626:
-#line 3326 "./util/configparser.y"
-                {
+#line 3327 "./util/configparser.y"
+    {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 7177 "util/configparser.c"
+#line 6649 "util/configparser.c"
     break;
 
   case 631:
-#line 3335 "./util/configparser.y"
-                {
+#line 3336 "./util/configparser.y"
+    {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v4)
@@ -7191,12 +6663,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 7195 "util/configparser.c"
+#line 6667 "util/configparser.c"
     break;
 
   case 632:
-#line 3350 "./util/configparser.y"
-        {
+#line 3351 "./util/configparser.y"
+    {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v6)
@@ -7209,11 +6681,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 7213 "util/configparser.c"
+#line 6685 "util/configparser.c"
     break;
 
 
-#line 7217 "util/configparser.c"
+#line 6689 "util/configparser.c"
 
       default: break;
     }
@@ -7228,10 +6700,11 @@ yyreduce:
      case of YYERROR or YYBACKUP, subsequent parser actions might lead
      to an incorrect destructor call or verbose syntax error message
      before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc);
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
   yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
@@ -7255,14 +6728,50 @@ yyreduce:
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
+#if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
     }
 
+
+
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
@@ -7311,14 +6820,13 @@ yyerrorlab:
 yyerrlab1:
   yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
-  /* Pop stack until we find a state that shifts the error token.  */
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
         {
-          yyn += YYSYMBOL_YYerror;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
             {
               yyn = yytable[yyn];
               if (0 < yyn)
@@ -7332,7 +6840,7 @@ yyerrlab1:
 
 
       yydestruct ("Error: popping",
-                  YY_ACCESSING_SYMBOL (yystate), yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -7344,7 +6852,7 @@ yyerrlab1:
 
 
   /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -7366,7 +6874,7 @@ yyabortlab:
   goto yyreturn;
 
 
-#if !defined yyoverflow
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -7396,18 +6904,20 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
   return yyresult;
 }
-
-#line 3364 "./util/configparser.y"
+#line 3365 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index bc8401330..323d587dd 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.6.4.  */
+/* 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
@@ -31,9 +31,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
-   especially those whose name start with YY_ or yy_.  They are
-   private implementation details that can be changed or removed.  */
+/* 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
@@ -45,322 +44,314 @@
 extern int yydebug;
 #endif
 
-/* Token kinds.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    YYEMPTY = -2,
-    YYEOF = 0,                     /* "end of file"  */
-    YYerror = 256,                 /* error  */
-    YYUNDEF = 257,                 /* "invalid token"  */
-    SPACE = 258,                   /* SPACE  */
-    LETTER = 259,                  /* LETTER  */
-    NEWLINE = 260,                 /* NEWLINE  */
-    COMMENT = 261,                 /* COMMENT  */
-    COLON = 262,                   /* COLON  */
-    ANY = 263,                     /* ANY  */
-    ZONESTR = 264,                 /* ZONESTR  */
-    STRING_ARG = 265,              /* STRING_ARG  */
-    VAR_FORCE_TOPLEVEL = 266,      /* VAR_FORCE_TOPLEVEL  */
-    VAR_SERVER = 267,              /* VAR_SERVER  */
-    VAR_VERBOSITY = 268,           /* VAR_VERBOSITY  */
-    VAR_NUM_THREADS = 269,         /* VAR_NUM_THREADS  */
-    VAR_PORT = 270,                /* VAR_PORT  */
-    VAR_OUTGOING_RANGE = 271,      /* VAR_OUTGOING_RANGE  */
-    VAR_INTERFACE = 272,           /* VAR_INTERFACE  */
-    VAR_PREFER_IP4 = 273,          /* VAR_PREFER_IP4  */
-    VAR_DO_IP4 = 274,              /* VAR_DO_IP4  */
-    VAR_DO_IP6 = 275,              /* VAR_DO_IP6  */
-    VAR_PREFER_IP6 = 276,          /* VAR_PREFER_IP6  */
-    VAR_DO_UDP = 277,              /* VAR_DO_UDP  */
-    VAR_DO_TCP = 278,              /* VAR_DO_TCP  */
-    VAR_TCP_MSS = 279,             /* VAR_TCP_MSS  */
-    VAR_OUTGOING_TCP_MSS = 280,    /* VAR_OUTGOING_TCP_MSS  */
-    VAR_TCP_IDLE_TIMEOUT = 281,    /* VAR_TCP_IDLE_TIMEOUT  */
-    VAR_EDNS_TCP_KEEPALIVE = 282,  /* VAR_EDNS_TCP_KEEPALIVE  */
-    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283, /* VAR_EDNS_TCP_KEEPALIVE_TIMEOUT  */
-    VAR_CHROOT = 284,              /* VAR_CHROOT  */
-    VAR_USERNAME = 285,            /* VAR_USERNAME  */
-    VAR_DIRECTORY = 286,           /* VAR_DIRECTORY  */
-    VAR_LOGFILE = 287,             /* VAR_LOGFILE  */
-    VAR_PIDFILE = 288,             /* VAR_PIDFILE  */
-    VAR_MSG_CACHE_SIZE = 289,      /* VAR_MSG_CACHE_SIZE  */
-    VAR_MSG_CACHE_SLABS = 290,     /* VAR_MSG_CACHE_SLABS  */
-    VAR_NUM_QUERIES_PER_THREAD = 291, /* VAR_NUM_QUERIES_PER_THREAD  */
-    VAR_RRSET_CACHE_SIZE = 292,    /* VAR_RRSET_CACHE_SIZE  */
-    VAR_RRSET_CACHE_SLABS = 293,   /* VAR_RRSET_CACHE_SLABS  */
-    VAR_OUTGOING_NUM_TCP = 294,    /* VAR_OUTGOING_NUM_TCP  */
-    VAR_INFRA_HOST_TTL = 295,      /* VAR_INFRA_HOST_TTL  */
-    VAR_INFRA_LAME_TTL = 296,      /* VAR_INFRA_LAME_TTL  */
-    VAR_INFRA_CACHE_SLABS = 297,   /* VAR_INFRA_CACHE_SLABS  */
-    VAR_INFRA_CACHE_NUMHOSTS = 298, /* VAR_INFRA_CACHE_NUMHOSTS  */
-    VAR_INFRA_CACHE_LAME_SIZE = 299, /* VAR_INFRA_CACHE_LAME_SIZE  */
-    VAR_NAME = 300,                /* VAR_NAME  */
-    VAR_STUB_ZONE = 301,           /* VAR_STUB_ZONE  */
-    VAR_STUB_HOST = 302,           /* VAR_STUB_HOST  */
-    VAR_STUB_ADDR = 303,           /* VAR_STUB_ADDR  */
-    VAR_TARGET_FETCH_POLICY = 304, /* VAR_TARGET_FETCH_POLICY  */
-    VAR_HARDEN_SHORT_BUFSIZE = 305, /* VAR_HARDEN_SHORT_BUFSIZE  */
-    VAR_HARDEN_LARGE_QUERIES = 306, /* VAR_HARDEN_LARGE_QUERIES  */
-    VAR_FORWARD_ZONE = 307,        /* VAR_FORWARD_ZONE  */
-    VAR_FORWARD_HOST = 308,        /* VAR_FORWARD_HOST  */
-    VAR_FORWARD_ADDR = 309,        /* VAR_FORWARD_ADDR  */
-    VAR_DO_NOT_QUERY_ADDRESS = 310, /* VAR_DO_NOT_QUERY_ADDRESS  */
-    VAR_HIDE_IDENTITY = 311,       /* VAR_HIDE_IDENTITY  */
-    VAR_HIDE_VERSION = 312,        /* VAR_HIDE_VERSION  */
-    VAR_IDENTITY = 313,            /* VAR_IDENTITY  */
-    VAR_VERSION = 314,             /* VAR_VERSION  */
-    VAR_HARDEN_GLUE = 315,         /* VAR_HARDEN_GLUE  */
-    VAR_MODULE_CONF = 316,         /* VAR_MODULE_CONF  */
-    VAR_TRUST_ANCHOR_FILE = 317,   /* VAR_TRUST_ANCHOR_FILE  */
-    VAR_TRUST_ANCHOR = 318,        /* VAR_TRUST_ANCHOR  */
-    VAR_VAL_OVERRIDE_DATE = 319,   /* VAR_VAL_OVERRIDE_DATE  */
-    VAR_BOGUS_TTL = 320,           /* VAR_BOGUS_TTL  */
-    VAR_VAL_CLEAN_ADDITIONAL = 321, /* VAR_VAL_CLEAN_ADDITIONAL  */
-    VAR_VAL_PERMISSIVE_MODE = 322, /* VAR_VAL_PERMISSIVE_MODE  */
-    VAR_INCOMING_NUM_TCP = 323,    /* VAR_INCOMING_NUM_TCP  */
-    VAR_MSG_BUFFER_SIZE = 324,     /* VAR_MSG_BUFFER_SIZE  */
-    VAR_KEY_CACHE_SIZE = 325,      /* VAR_KEY_CACHE_SIZE  */
-    VAR_KEY_CACHE_SLABS = 326,     /* VAR_KEY_CACHE_SLABS  */
-    VAR_TRUSTED_KEYS_FILE = 327,   /* VAR_TRUSTED_KEYS_FILE  */
-    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328, /* VAR_VAL_NSEC3_KEYSIZE_ITERATIONS  */
-    VAR_USE_SYSLOG = 329,          /* VAR_USE_SYSLOG  */
-    VAR_OUTGOING_INTERFACE = 330,  /* VAR_OUTGOING_INTERFACE  */
-    VAR_ROOT_HINTS = 331,          /* VAR_ROOT_HINTS  */
-    VAR_DO_NOT_QUERY_LOCALHOST = 332, /* VAR_DO_NOT_QUERY_LOCALHOST  */
-    VAR_CACHE_MAX_TTL = 333,       /* VAR_CACHE_MAX_TTL  */
-    VAR_HARDEN_DNSSEC_STRIPPED = 334, /* VAR_HARDEN_DNSSEC_STRIPPED  */
-    VAR_ACCESS_CONTROL = 335,      /* VAR_ACCESS_CONTROL  */
-    VAR_LOCAL_ZONE = 336,          /* VAR_LOCAL_ZONE  */
-    VAR_LOCAL_DATA = 337,          /* VAR_LOCAL_DATA  */
-    VAR_INTERFACE_AUTOMATIC = 338, /* VAR_INTERFACE_AUTOMATIC  */
-    VAR_STATISTICS_INTERVAL = 339, /* VAR_STATISTICS_INTERVAL  */
-    VAR_DO_DAEMONIZE = 340,        /* VAR_DO_DAEMONIZE  */
-    VAR_USE_CAPS_FOR_ID = 341,     /* VAR_USE_CAPS_FOR_ID  */
-    VAR_STATISTICS_CUMULATIVE = 342, /* VAR_STATISTICS_CUMULATIVE  */
-    VAR_OUTGOING_PORT_PERMIT = 343, /* VAR_OUTGOING_PORT_PERMIT  */
-    VAR_OUTGOING_PORT_AVOID = 344, /* VAR_OUTGOING_PORT_AVOID  */
-    VAR_DLV_ANCHOR_FILE = 345,     /* VAR_DLV_ANCHOR_FILE  */
-    VAR_DLV_ANCHOR = 346,          /* VAR_DLV_ANCHOR  */
-    VAR_NEG_CACHE_SIZE = 347,      /* VAR_NEG_CACHE_SIZE  */
-    VAR_HARDEN_REFERRAL_PATH = 348, /* VAR_HARDEN_REFERRAL_PATH  */
-    VAR_PRIVATE_ADDRESS = 349,     /* VAR_PRIVATE_ADDRESS  */
-    VAR_PRIVATE_DOMAIN = 350,      /* VAR_PRIVATE_DOMAIN  */
-    VAR_REMOTE_CONTROL = 351,      /* VAR_REMOTE_CONTROL  */
-    VAR_CONTROL_ENABLE = 352,      /* VAR_CONTROL_ENABLE  */
-    VAR_CONTROL_INTERFACE = 353,   /* VAR_CONTROL_INTERFACE  */
-    VAR_CONTROL_PORT = 354,        /* VAR_CONTROL_PORT  */
-    VAR_SERVER_KEY_FILE = 355,     /* VAR_SERVER_KEY_FILE  */
-    VAR_SERVER_CERT_FILE = 356,    /* VAR_SERVER_CERT_FILE  */
-    VAR_CONTROL_KEY_FILE = 357,    /* VAR_CONTROL_KEY_FILE  */
-    VAR_CONTROL_CERT_FILE = 358,   /* VAR_CONTROL_CERT_FILE  */
-    VAR_CONTROL_USE_CERT = 359,    /* VAR_CONTROL_USE_CERT  */
-    VAR_EXTENDED_STATISTICS = 360, /* VAR_EXTENDED_STATISTICS  */
-    VAR_LOCAL_DATA_PTR = 361,      /* VAR_LOCAL_DATA_PTR  */
-    VAR_JOSTLE_TIMEOUT = 362,      /* VAR_JOSTLE_TIMEOUT  */
-    VAR_STUB_PRIME = 363,          /* VAR_STUB_PRIME  */
-    VAR_UNWANTED_REPLY_THRESHOLD = 364, /* VAR_UNWANTED_REPLY_THRESHOLD  */
-    VAR_LOG_TIME_ASCII = 365,      /* VAR_LOG_TIME_ASCII  */
-    VAR_DOMAIN_INSECURE = 366,     /* VAR_DOMAIN_INSECURE  */
-    VAR_PYTHON = 367,              /* VAR_PYTHON  */
-    VAR_PYTHON_SCRIPT = 368,       /* VAR_PYTHON_SCRIPT  */
-    VAR_VAL_SIG_SKEW_MIN = 369,    /* VAR_VAL_SIG_SKEW_MIN  */
-    VAR_VAL_SIG_SKEW_MAX = 370,    /* VAR_VAL_SIG_SKEW_MAX  */
-    VAR_CACHE_MIN_TTL = 371,       /* VAR_CACHE_MIN_TTL  */
-    VAR_VAL_LOG_LEVEL = 372,       /* VAR_VAL_LOG_LEVEL  */
-    VAR_AUTO_TRUST_ANCHOR_FILE = 373, /* VAR_AUTO_TRUST_ANCHOR_FILE  */
-    VAR_KEEP_MISSING = 374,        /* VAR_KEEP_MISSING  */
-    VAR_ADD_HOLDDOWN = 375,        /* VAR_ADD_HOLDDOWN  */
-    VAR_DEL_HOLDDOWN = 376,        /* VAR_DEL_HOLDDOWN  */
-    VAR_SO_RCVBUF = 377,           /* VAR_SO_RCVBUF  */
-    VAR_EDNS_BUFFER_SIZE = 378,    /* VAR_EDNS_BUFFER_SIZE  */
-    VAR_PREFETCH = 379,            /* VAR_PREFETCH  */
-    VAR_PREFETCH_KEY = 380,        /* VAR_PREFETCH_KEY  */
-    VAR_SO_SNDBUF = 381,           /* VAR_SO_SNDBUF  */
-    VAR_SO_REUSEPORT = 382,        /* VAR_SO_REUSEPORT  */
-    VAR_HARDEN_BELOW_NXDOMAIN = 383, /* VAR_HARDEN_BELOW_NXDOMAIN  */
-    VAR_IGNORE_CD_FLAG = 384,      /* VAR_IGNORE_CD_FLAG  */
-    VAR_LOG_QUERIES = 385,         /* VAR_LOG_QUERIES  */
-    VAR_LOG_REPLIES = 386,         /* VAR_LOG_REPLIES  */
-    VAR_LOG_LOCAL_ACTIONS = 387,   /* VAR_LOG_LOCAL_ACTIONS  */
-    VAR_TCP_UPSTREAM = 388,        /* VAR_TCP_UPSTREAM  */
-    VAR_SSL_UPSTREAM = 389,        /* VAR_SSL_UPSTREAM  */
-    VAR_SSL_SERVICE_KEY = 390,     /* VAR_SSL_SERVICE_KEY  */
-    VAR_SSL_SERVICE_PEM = 391,     /* VAR_SSL_SERVICE_PEM  */
-    VAR_SSL_PORT = 392,            /* VAR_SSL_PORT  */
-    VAR_FORWARD_FIRST = 393,       /* VAR_FORWARD_FIRST  */
-    VAR_STUB_SSL_UPSTREAM = 394,   /* VAR_STUB_SSL_UPSTREAM  */
-    VAR_FORWARD_SSL_UPSTREAM = 395, /* VAR_FORWARD_SSL_UPSTREAM  */
-    VAR_TLS_CERT_BUNDLE = 396,     /* VAR_TLS_CERT_BUNDLE  */
-    VAR_HTTPS_PORT = 397,          /* VAR_HTTPS_PORT  */
-    VAR_HTTP_ENDPOINT = 398,       /* VAR_HTTP_ENDPOINT  */
-    VAR_HTTP_MAX_STREAMS = 399,    /* VAR_HTTP_MAX_STREAMS  */
-    VAR_HTTP_QUERY_BUFFER_SIZE = 400, /* VAR_HTTP_QUERY_BUFFER_SIZE  */
-    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, /* VAR_HTTP_RESPONSE_BUFFER_SIZE  */
-    VAR_HTTP_NODELAY = 402,        /* VAR_HTTP_NODELAY  */
-    VAR_HTTP_NOTLS_DOWNSTREAM = 403, /* VAR_HTTP_NOTLS_DOWNSTREAM  */
-    VAR_STUB_FIRST = 404,          /* VAR_STUB_FIRST  */
-    VAR_MINIMAL_RESPONSES = 405,   /* VAR_MINIMAL_RESPONSES  */
-    VAR_RRSET_ROUNDROBIN = 406,    /* VAR_RRSET_ROUNDROBIN  */
-    VAR_MAX_UDP_SIZE = 407,        /* VAR_MAX_UDP_SIZE  */
-    VAR_DELAY_CLOSE = 408,         /* VAR_DELAY_CLOSE  */
-    VAR_UDP_CONNECT = 409,         /* VAR_UDP_CONNECT  */
-    VAR_UNBLOCK_LAN_ZONES = 410,   /* VAR_UNBLOCK_LAN_ZONES  */
-    VAR_INSECURE_LAN_ZONES = 411,  /* VAR_INSECURE_LAN_ZONES  */
-    VAR_INFRA_CACHE_MIN_RTT = 412, /* VAR_INFRA_CACHE_MIN_RTT  */
-    VAR_INFRA_KEEP_PROBING = 413,  /* VAR_INFRA_KEEP_PROBING  */
-    VAR_DNS64_PREFIX = 414,        /* VAR_DNS64_PREFIX  */
-    VAR_DNS64_SYNTHALL = 415,      /* VAR_DNS64_SYNTHALL  */
-    VAR_DNS64_IGNORE_AAAA = 416,   /* VAR_DNS64_IGNORE_AAAA  */
-    VAR_DNSTAP = 417,              /* VAR_DNSTAP  */
-    VAR_DNSTAP_ENABLE = 418,       /* VAR_DNSTAP_ENABLE  */
-    VAR_DNSTAP_SOCKET_PATH = 419,  /* VAR_DNSTAP_SOCKET_PATH  */
-    VAR_DNSTAP_IP = 420,           /* VAR_DNSTAP_IP  */
-    VAR_DNSTAP_TLS = 421,          /* VAR_DNSTAP_TLS  */
-    VAR_DNSTAP_TLS_SERVER_NAME = 422, /* VAR_DNSTAP_TLS_SERVER_NAME  */
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 423, /* VAR_DNSTAP_TLS_CERT_BUNDLE  */
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, /* VAR_DNSTAP_TLS_CLIENT_KEY_FILE  */
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, /* VAR_DNSTAP_TLS_CLIENT_CERT_FILE  */
-    VAR_DNSTAP_SEND_IDENTITY = 426, /* VAR_DNSTAP_SEND_IDENTITY  */
-    VAR_DNSTAP_SEND_VERSION = 427, /* VAR_DNSTAP_SEND_VERSION  */
-    VAR_DNSTAP_BIDIRECTIONAL = 428, /* VAR_DNSTAP_BIDIRECTIONAL  */
-    VAR_DNSTAP_IDENTITY = 429,     /* VAR_DNSTAP_IDENTITY  */
-    VAR_DNSTAP_VERSION = 430,      /* VAR_DNSTAP_VERSION  */
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, /* VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES  */
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, /* VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES  */
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, /* VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES  */
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, /* VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES  */
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, /* VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES  */
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, /* VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES  */
-    VAR_RESPONSE_IP_TAG = 437,     /* VAR_RESPONSE_IP_TAG  */
-    VAR_RESPONSE_IP = 438,         /* VAR_RESPONSE_IP  */
-    VAR_RESPONSE_IP_DATA = 439,    /* VAR_RESPONSE_IP_DATA  */
-    VAR_HARDEN_ALGO_DOWNGRADE = 440, /* VAR_HARDEN_ALGO_DOWNGRADE  */
-    VAR_IP_TRANSPARENT = 441,      /* VAR_IP_TRANSPARENT  */
-    VAR_IP_DSCP = 442,             /* VAR_IP_DSCP  */
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 443, /* VAR_DISABLE_DNSSEC_LAME_CHECK  */
-    VAR_IP_RATELIMIT = 444,        /* VAR_IP_RATELIMIT  */
-    VAR_IP_RATELIMIT_SLABS = 445,  /* VAR_IP_RATELIMIT_SLABS  */
-    VAR_IP_RATELIMIT_SIZE = 446,   /* VAR_IP_RATELIMIT_SIZE  */
-    VAR_RATELIMIT = 447,           /* VAR_RATELIMIT  */
-    VAR_RATELIMIT_SLABS = 448,     /* VAR_RATELIMIT_SLABS  */
-    VAR_RATELIMIT_SIZE = 449,      /* VAR_RATELIMIT_SIZE  */
-    VAR_RATELIMIT_FOR_DOMAIN = 450, /* VAR_RATELIMIT_FOR_DOMAIN  */
-    VAR_RATELIMIT_BELOW_DOMAIN = 451, /* VAR_RATELIMIT_BELOW_DOMAIN  */
-    VAR_IP_RATELIMIT_FACTOR = 452, /* VAR_IP_RATELIMIT_FACTOR  */
-    VAR_RATELIMIT_FACTOR = 453,    /* VAR_RATELIMIT_FACTOR  */
-    VAR_SEND_CLIENT_SUBNET = 454,  /* VAR_SEND_CLIENT_SUBNET  */
-    VAR_CLIENT_SUBNET_ZONE = 455,  /* VAR_CLIENT_SUBNET_ZONE  */
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, /* VAR_CLIENT_SUBNET_ALWAYS_FORWARD  */
-    VAR_CLIENT_SUBNET_OPCODE = 457, /* VAR_CLIENT_SUBNET_OPCODE  */
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 458, /* VAR_MAX_CLIENT_SUBNET_IPV4  */
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 459, /* VAR_MAX_CLIENT_SUBNET_IPV6  */
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 460, /* VAR_MIN_CLIENT_SUBNET_IPV4  */
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 461, /* VAR_MIN_CLIENT_SUBNET_IPV6  */
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, /* VAR_MAX_ECS_TREE_SIZE_IPV4  */
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, /* VAR_MAX_ECS_TREE_SIZE_IPV6  */
-    VAR_CAPS_WHITELIST = 464,      /* VAR_CAPS_WHITELIST  */
-    VAR_CACHE_MAX_NEGATIVE_TTL = 465, /* VAR_CACHE_MAX_NEGATIVE_TTL  */
-    VAR_PERMIT_SMALL_HOLDDOWN = 466, /* VAR_PERMIT_SMALL_HOLDDOWN  */
-    VAR_QNAME_MINIMISATION = 467,  /* VAR_QNAME_MINIMISATION  */
-    VAR_QNAME_MINIMISATION_STRICT = 468, /* VAR_QNAME_MINIMISATION_STRICT  */
-    VAR_IP_FREEBIND = 469,         /* VAR_IP_FREEBIND  */
-    VAR_DEFINE_TAG = 470,          /* VAR_DEFINE_TAG  */
-    VAR_LOCAL_ZONE_TAG = 471,      /* VAR_LOCAL_ZONE_TAG  */
-    VAR_ACCESS_CONTROL_TAG = 472,  /* VAR_ACCESS_CONTROL_TAG  */
-    VAR_LOCAL_ZONE_OVERRIDE = 473, /* VAR_LOCAL_ZONE_OVERRIDE  */
-    VAR_ACCESS_CONTROL_TAG_ACTION = 474, /* VAR_ACCESS_CONTROL_TAG_ACTION  */
-    VAR_ACCESS_CONTROL_TAG_DATA = 475, /* VAR_ACCESS_CONTROL_TAG_DATA  */
-    VAR_VIEW = 476,                /* VAR_VIEW  */
-    VAR_ACCESS_CONTROL_VIEW = 477, /* VAR_ACCESS_CONTROL_VIEW  */
-    VAR_VIEW_FIRST = 478,          /* VAR_VIEW_FIRST  */
-    VAR_SERVE_EXPIRED = 479,       /* VAR_SERVE_EXPIRED  */
-    VAR_SERVE_EXPIRED_TTL = 480,   /* VAR_SERVE_EXPIRED_TTL  */
-    VAR_SERVE_EXPIRED_TTL_RESET = 481, /* VAR_SERVE_EXPIRED_TTL_RESET  */
-    VAR_SERVE_EXPIRED_REPLY_TTL = 482, /* VAR_SERVE_EXPIRED_REPLY_TTL  */
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, /* VAR_SERVE_EXPIRED_CLIENT_TIMEOUT  */
-    VAR_FAKE_DSA = 484,            /* VAR_FAKE_DSA  */
-    VAR_FAKE_SHA1 = 485,           /* VAR_FAKE_SHA1  */
-    VAR_LOG_IDENTITY = 486,        /* VAR_LOG_IDENTITY  */
-    VAR_HIDE_TRUSTANCHOR = 487,    /* VAR_HIDE_TRUSTANCHOR  */
-    VAR_TRUST_ANCHOR_SIGNALING = 488, /* VAR_TRUST_ANCHOR_SIGNALING  */
-    VAR_AGGRESSIVE_NSEC = 489,     /* VAR_AGGRESSIVE_NSEC  */
-    VAR_USE_SYSTEMD = 490,         /* VAR_USE_SYSTEMD  */
-    VAR_SHM_ENABLE = 491,          /* VAR_SHM_ENABLE  */
-    VAR_SHM_KEY = 492,             /* VAR_SHM_KEY  */
-    VAR_ROOT_KEY_SENTINEL = 493,   /* VAR_ROOT_KEY_SENTINEL  */
-    VAR_DNSCRYPT = 494,            /* VAR_DNSCRYPT  */
-    VAR_DNSCRYPT_ENABLE = 495,     /* VAR_DNSCRYPT_ENABLE  */
-    VAR_DNSCRYPT_PORT = 496,       /* VAR_DNSCRYPT_PORT  */
-    VAR_DNSCRYPT_PROVIDER = 497,   /* VAR_DNSCRYPT_PROVIDER  */
-    VAR_DNSCRYPT_SECRET_KEY = 498, /* VAR_DNSCRYPT_SECRET_KEY  */
-    VAR_DNSCRYPT_PROVIDER_CERT = 499, /* VAR_DNSCRYPT_PROVIDER_CERT  */
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, /* VAR_DNSCRYPT_PROVIDER_CERT_ROTATED  */
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE  */
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS  */
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, /* VAR_DNSCRYPT_NONCE_CACHE_SIZE  */
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, /* VAR_DNSCRYPT_NONCE_CACHE_SLABS  */
-    VAR_IPSECMOD_ENABLED = 505,    /* VAR_IPSECMOD_ENABLED  */
-    VAR_IPSECMOD_HOOK = 506,       /* VAR_IPSECMOD_HOOK  */
-    VAR_IPSECMOD_IGNORE_BOGUS = 507, /* VAR_IPSECMOD_IGNORE_BOGUS  */
-    VAR_IPSECMOD_MAX_TTL = 508,    /* VAR_IPSECMOD_MAX_TTL  */
-    VAR_IPSECMOD_WHITELIST = 509,  /* VAR_IPSECMOD_WHITELIST  */
-    VAR_IPSECMOD_STRICT = 510,     /* VAR_IPSECMOD_STRICT  */
-    VAR_CACHEDB = 511,             /* VAR_CACHEDB  */
-    VAR_CACHEDB_BACKEND = 512,     /* VAR_CACHEDB_BACKEND  */
-    VAR_CACHEDB_SECRETSEED = 513,  /* VAR_CACHEDB_SECRETSEED  */
-    VAR_CACHEDB_REDISHOST = 514,   /* VAR_CACHEDB_REDISHOST  */
-    VAR_CACHEDB_REDISPORT = 515,   /* VAR_CACHEDB_REDISPORT  */
-    VAR_CACHEDB_REDISTIMEOUT = 516, /* VAR_CACHEDB_REDISTIMEOUT  */
-    VAR_CACHEDB_REDISEXPIRERECORDS = 517, /* VAR_CACHEDB_REDISEXPIRERECORDS  */
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, /* VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM  */
-    VAR_FOR_UPSTREAM = 519,        /* VAR_FOR_UPSTREAM  */
-    VAR_AUTH_ZONE = 520,           /* VAR_AUTH_ZONE  */
-    VAR_ZONEFILE = 521,            /* VAR_ZONEFILE  */
-    VAR_MASTER = 522,              /* VAR_MASTER  */
-    VAR_URL = 523,                 /* VAR_URL  */
-    VAR_FOR_DOWNSTREAM = 524,      /* VAR_FOR_DOWNSTREAM  */
-    VAR_FALLBACK_ENABLED = 525,    /* VAR_FALLBACK_ENABLED  */
-    VAR_TLS_ADDITIONAL_PORT = 526, /* VAR_TLS_ADDITIONAL_PORT  */
-    VAR_LOW_RTT = 527,             /* VAR_LOW_RTT  */
-    VAR_LOW_RTT_PERMIL = 528,      /* VAR_LOW_RTT_PERMIL  */
-    VAR_FAST_SERVER_PERMIL = 529,  /* VAR_FAST_SERVER_PERMIL  */
-    VAR_FAST_SERVER_NUM = 530,     /* VAR_FAST_SERVER_NUM  */
-    VAR_ALLOW_NOTIFY = 531,        /* VAR_ALLOW_NOTIFY  */
-    VAR_TLS_WIN_CERT = 532,        /* VAR_TLS_WIN_CERT  */
-    VAR_TCP_CONNECTION_LIMIT = 533, /* VAR_TCP_CONNECTION_LIMIT  */
-    VAR_FORWARD_NO_CACHE = 534,    /* VAR_FORWARD_NO_CACHE  */
-    VAR_STUB_NO_CACHE = 535,       /* VAR_STUB_NO_CACHE  */
-    VAR_LOG_SERVFAIL = 536,        /* VAR_LOG_SERVFAIL  */
-    VAR_DENY_ANY = 537,            /* VAR_DENY_ANY  */
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, /* VAR_UNKNOWN_SERVER_TIME_LIMIT  */
-    VAR_LOG_TAG_QUERYREPLY = 539,  /* VAR_LOG_TAG_QUERYREPLY  */
-    VAR_STREAM_WAIT_SIZE = 540,    /* VAR_STREAM_WAIT_SIZE  */
-    VAR_TLS_CIPHERS = 541,         /* VAR_TLS_CIPHERS  */
-    VAR_TLS_CIPHERSUITES = 542,    /* VAR_TLS_CIPHERSUITES  */
-    VAR_TLS_USE_SNI = 543,         /* VAR_TLS_USE_SNI  */
-    VAR_IPSET = 544,               /* VAR_IPSET  */
-    VAR_IPSET_NAME_V4 = 545,       /* VAR_IPSET_NAME_V4  */
-    VAR_IPSET_NAME_V6 = 546,       /* VAR_IPSET_NAME_V6  */
-    VAR_TLS_SESSION_TICKET_KEYS = 547, /* VAR_TLS_SESSION_TICKET_KEYS  */
-    VAR_RPZ = 548,                 /* VAR_RPZ  */
-    VAR_TAGS = 549,                /* VAR_TAGS  */
-    VAR_RPZ_ACTION_OVERRIDE = 550, /* VAR_RPZ_ACTION_OVERRIDE  */
-    VAR_RPZ_CNAME_OVERRIDE = 551,  /* VAR_RPZ_CNAME_OVERRIDE  */
-    VAR_RPZ_LOG = 552,             /* VAR_RPZ_LOG  */
-    VAR_RPZ_LOG_NAME = 553,        /* VAR_RPZ_LOG_NAME  */
-    VAR_DYNLIB = 554,              /* VAR_DYNLIB  */
-    VAR_DYNLIB_FILE = 555,         /* VAR_DYNLIB_FILE  */
-    VAR_EDNS_CLIENT_STRING = 556,  /* VAR_EDNS_CLIENT_STRING  */
-    VAR_EDNS_CLIENT_STRING_OPCODE = 557 /* VAR_EDNS_CLIENT_STRING_OPCODE  */
+    SPACE = 258,
+    LETTER = 259,
+    NEWLINE = 260,
+    COMMENT = 261,
+    COLON = 262,
+    ANY = 263,
+    ZONESTR = 264,
+    STRING_ARG = 265,
+    VAR_FORCE_TOPLEVEL = 266,
+    VAR_SERVER = 267,
+    VAR_VERBOSITY = 268,
+    VAR_NUM_THREADS = 269,
+    VAR_PORT = 270,
+    VAR_OUTGOING_RANGE = 271,
+    VAR_INTERFACE = 272,
+    VAR_PREFER_IP4 = 273,
+    VAR_DO_IP4 = 274,
+    VAR_DO_IP6 = 275,
+    VAR_PREFER_IP6 = 276,
+    VAR_DO_UDP = 277,
+    VAR_DO_TCP = 278,
+    VAR_TCP_MSS = 279,
+    VAR_OUTGOING_TCP_MSS = 280,
+    VAR_TCP_IDLE_TIMEOUT = 281,
+    VAR_EDNS_TCP_KEEPALIVE = 282,
+    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283,
+    VAR_CHROOT = 284,
+    VAR_USERNAME = 285,
+    VAR_DIRECTORY = 286,
+    VAR_LOGFILE = 287,
+    VAR_PIDFILE = 288,
+    VAR_MSG_CACHE_SIZE = 289,
+    VAR_MSG_CACHE_SLABS = 290,
+    VAR_NUM_QUERIES_PER_THREAD = 291,
+    VAR_RRSET_CACHE_SIZE = 292,
+    VAR_RRSET_CACHE_SLABS = 293,
+    VAR_OUTGOING_NUM_TCP = 294,
+    VAR_INFRA_HOST_TTL = 295,
+    VAR_INFRA_LAME_TTL = 296,
+    VAR_INFRA_CACHE_SLABS = 297,
+    VAR_INFRA_CACHE_NUMHOSTS = 298,
+    VAR_INFRA_CACHE_LAME_SIZE = 299,
+    VAR_NAME = 300,
+    VAR_STUB_ZONE = 301,
+    VAR_STUB_HOST = 302,
+    VAR_STUB_ADDR = 303,
+    VAR_TARGET_FETCH_POLICY = 304,
+    VAR_HARDEN_SHORT_BUFSIZE = 305,
+    VAR_HARDEN_LARGE_QUERIES = 306,
+    VAR_FORWARD_ZONE = 307,
+    VAR_FORWARD_HOST = 308,
+    VAR_FORWARD_ADDR = 309,
+    VAR_DO_NOT_QUERY_ADDRESS = 310,
+    VAR_HIDE_IDENTITY = 311,
+    VAR_HIDE_VERSION = 312,
+    VAR_IDENTITY = 313,
+    VAR_VERSION = 314,
+    VAR_HARDEN_GLUE = 315,
+    VAR_MODULE_CONF = 316,
+    VAR_TRUST_ANCHOR_FILE = 317,
+    VAR_TRUST_ANCHOR = 318,
+    VAR_VAL_OVERRIDE_DATE = 319,
+    VAR_BOGUS_TTL = 320,
+    VAR_VAL_CLEAN_ADDITIONAL = 321,
+    VAR_VAL_PERMISSIVE_MODE = 322,
+    VAR_INCOMING_NUM_TCP = 323,
+    VAR_MSG_BUFFER_SIZE = 324,
+    VAR_KEY_CACHE_SIZE = 325,
+    VAR_KEY_CACHE_SLABS = 326,
+    VAR_TRUSTED_KEYS_FILE = 327,
+    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328,
+    VAR_USE_SYSLOG = 329,
+    VAR_OUTGOING_INTERFACE = 330,
+    VAR_ROOT_HINTS = 331,
+    VAR_DO_NOT_QUERY_LOCALHOST = 332,
+    VAR_CACHE_MAX_TTL = 333,
+    VAR_HARDEN_DNSSEC_STRIPPED = 334,
+    VAR_ACCESS_CONTROL = 335,
+    VAR_LOCAL_ZONE = 336,
+    VAR_LOCAL_DATA = 337,
+    VAR_INTERFACE_AUTOMATIC = 338,
+    VAR_STATISTICS_INTERVAL = 339,
+    VAR_DO_DAEMONIZE = 340,
+    VAR_USE_CAPS_FOR_ID = 341,
+    VAR_STATISTICS_CUMULATIVE = 342,
+    VAR_OUTGOING_PORT_PERMIT = 343,
+    VAR_OUTGOING_PORT_AVOID = 344,
+    VAR_DLV_ANCHOR_FILE = 345,
+    VAR_DLV_ANCHOR = 346,
+    VAR_NEG_CACHE_SIZE = 347,
+    VAR_HARDEN_REFERRAL_PATH = 348,
+    VAR_PRIVATE_ADDRESS = 349,
+    VAR_PRIVATE_DOMAIN = 350,
+    VAR_REMOTE_CONTROL = 351,
+    VAR_CONTROL_ENABLE = 352,
+    VAR_CONTROL_INTERFACE = 353,
+    VAR_CONTROL_PORT = 354,
+    VAR_SERVER_KEY_FILE = 355,
+    VAR_SERVER_CERT_FILE = 356,
+    VAR_CONTROL_KEY_FILE = 357,
+    VAR_CONTROL_CERT_FILE = 358,
+    VAR_CONTROL_USE_CERT = 359,
+    VAR_EXTENDED_STATISTICS = 360,
+    VAR_LOCAL_DATA_PTR = 361,
+    VAR_JOSTLE_TIMEOUT = 362,
+    VAR_STUB_PRIME = 363,
+    VAR_UNWANTED_REPLY_THRESHOLD = 364,
+    VAR_LOG_TIME_ASCII = 365,
+    VAR_DOMAIN_INSECURE = 366,
+    VAR_PYTHON = 367,
+    VAR_PYTHON_SCRIPT = 368,
+    VAR_VAL_SIG_SKEW_MIN = 369,
+    VAR_VAL_SIG_SKEW_MAX = 370,
+    VAR_CACHE_MIN_TTL = 371,
+    VAR_VAL_LOG_LEVEL = 372,
+    VAR_AUTO_TRUST_ANCHOR_FILE = 373,
+    VAR_KEEP_MISSING = 374,
+    VAR_ADD_HOLDDOWN = 375,
+    VAR_DEL_HOLDDOWN = 376,
+    VAR_SO_RCVBUF = 377,
+    VAR_EDNS_BUFFER_SIZE = 378,
+    VAR_PREFETCH = 379,
+    VAR_PREFETCH_KEY = 380,
+    VAR_SO_SNDBUF = 381,
+    VAR_SO_REUSEPORT = 382,
+    VAR_HARDEN_BELOW_NXDOMAIN = 383,
+    VAR_IGNORE_CD_FLAG = 384,
+    VAR_LOG_QUERIES = 385,
+    VAR_LOG_REPLIES = 386,
+    VAR_LOG_LOCAL_ACTIONS = 387,
+    VAR_TCP_UPSTREAM = 388,
+    VAR_SSL_UPSTREAM = 389,
+    VAR_SSL_SERVICE_KEY = 390,
+    VAR_SSL_SERVICE_PEM = 391,
+    VAR_SSL_PORT = 392,
+    VAR_FORWARD_FIRST = 393,
+    VAR_STUB_SSL_UPSTREAM = 394,
+    VAR_FORWARD_SSL_UPSTREAM = 395,
+    VAR_TLS_CERT_BUNDLE = 396,
+    VAR_HTTPS_PORT = 397,
+    VAR_HTTP_ENDPOINT = 398,
+    VAR_HTTP_MAX_STREAMS = 399,
+    VAR_HTTP_QUERY_BUFFER_SIZE = 400,
+    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401,
+    VAR_HTTP_NODELAY = 402,
+    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_UDP_CONNECT = 409,
+    VAR_UNBLOCK_LAN_ZONES = 410,
+    VAR_INSECURE_LAN_ZONES = 411,
+    VAR_INFRA_CACHE_MIN_RTT = 412,
+    VAR_INFRA_KEEP_PROBING = 413,
+    VAR_DNS64_PREFIX = 414,
+    VAR_DNS64_SYNTHALL = 415,
+    VAR_DNS64_IGNORE_AAAA = 416,
+    VAR_DNSTAP = 417,
+    VAR_DNSTAP_ENABLE = 418,
+    VAR_DNSTAP_SOCKET_PATH = 419,
+    VAR_DNSTAP_IP = 420,
+    VAR_DNSTAP_TLS = 421,
+    VAR_DNSTAP_TLS_SERVER_NAME = 422,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 423,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425,
+    VAR_DNSTAP_SEND_IDENTITY = 426,
+    VAR_DNSTAP_SEND_VERSION = 427,
+    VAR_DNSTAP_BIDIRECTIONAL = 428,
+    VAR_DNSTAP_IDENTITY = 429,
+    VAR_DNSTAP_VERSION = 430,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436,
+    VAR_RESPONSE_IP_TAG = 437,
+    VAR_RESPONSE_IP = 438,
+    VAR_RESPONSE_IP_DATA = 439,
+    VAR_HARDEN_ALGO_DOWNGRADE = 440,
+    VAR_IP_TRANSPARENT = 441,
+    VAR_IP_DSCP = 442,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 443,
+    VAR_IP_RATELIMIT = 444,
+    VAR_IP_RATELIMIT_SLABS = 445,
+    VAR_IP_RATELIMIT_SIZE = 446,
+    VAR_RATELIMIT = 447,
+    VAR_RATELIMIT_SLABS = 448,
+    VAR_RATELIMIT_SIZE = 449,
+    VAR_RATELIMIT_FOR_DOMAIN = 450,
+    VAR_RATELIMIT_BELOW_DOMAIN = 451,
+    VAR_IP_RATELIMIT_FACTOR = 452,
+    VAR_RATELIMIT_FACTOR = 453,
+    VAR_SEND_CLIENT_SUBNET = 454,
+    VAR_CLIENT_SUBNET_ZONE = 455,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456,
+    VAR_CLIENT_SUBNET_OPCODE = 457,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 458,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 459,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 460,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 461,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463,
+    VAR_CAPS_WHITELIST = 464,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 465,
+    VAR_PERMIT_SMALL_HOLDDOWN = 466,
+    VAR_QNAME_MINIMISATION = 467,
+    VAR_QNAME_MINIMISATION_STRICT = 468,
+    VAR_IP_FREEBIND = 469,
+    VAR_DEFINE_TAG = 470,
+    VAR_LOCAL_ZONE_TAG = 471,
+    VAR_ACCESS_CONTROL_TAG = 472,
+    VAR_LOCAL_ZONE_OVERRIDE = 473,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 474,
+    VAR_ACCESS_CONTROL_TAG_DATA = 475,
+    VAR_VIEW = 476,
+    VAR_ACCESS_CONTROL_VIEW = 477,
+    VAR_VIEW_FIRST = 478,
+    VAR_SERVE_EXPIRED = 479,
+    VAR_SERVE_EXPIRED_TTL = 480,
+    VAR_SERVE_EXPIRED_TTL_RESET = 481,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 482,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483,
+    VAR_FAKE_DSA = 484,
+    VAR_FAKE_SHA1 = 485,
+    VAR_LOG_IDENTITY = 486,
+    VAR_HIDE_TRUSTANCHOR = 487,
+    VAR_TRUST_ANCHOR_SIGNALING = 488,
+    VAR_AGGRESSIVE_NSEC = 489,
+    VAR_USE_SYSTEMD = 490,
+    VAR_SHM_ENABLE = 491,
+    VAR_SHM_KEY = 492,
+    VAR_ROOT_KEY_SENTINEL = 493,
+    VAR_DNSCRYPT = 494,
+    VAR_DNSCRYPT_ENABLE = 495,
+    VAR_DNSCRYPT_PORT = 496,
+    VAR_DNSCRYPT_PROVIDER = 497,
+    VAR_DNSCRYPT_SECRET_KEY = 498,
+    VAR_DNSCRYPT_PROVIDER_CERT = 499,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504,
+    VAR_IPSECMOD_ENABLED = 505,
+    VAR_IPSECMOD_HOOK = 506,
+    VAR_IPSECMOD_IGNORE_BOGUS = 507,
+    VAR_IPSECMOD_MAX_TTL = 508,
+    VAR_IPSECMOD_WHITELIST = 509,
+    VAR_IPSECMOD_STRICT = 510,
+    VAR_CACHEDB = 511,
+    VAR_CACHEDB_BACKEND = 512,
+    VAR_CACHEDB_SECRETSEED = 513,
+    VAR_CACHEDB_REDISHOST = 514,
+    VAR_CACHEDB_REDISPORT = 515,
+    VAR_CACHEDB_REDISTIMEOUT = 516,
+    VAR_CACHEDB_REDISEXPIRERECORDS = 517,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518,
+    VAR_FOR_UPSTREAM = 519,
+    VAR_AUTH_ZONE = 520,
+    VAR_ZONEFILE = 521,
+    VAR_MASTER = 522,
+    VAR_URL = 523,
+    VAR_FOR_DOWNSTREAM = 524,
+    VAR_FALLBACK_ENABLED = 525,
+    VAR_TLS_ADDITIONAL_PORT = 526,
+    VAR_LOW_RTT = 527,
+    VAR_LOW_RTT_PERMIL = 528,
+    VAR_FAST_SERVER_PERMIL = 529,
+    VAR_FAST_SERVER_NUM = 530,
+    VAR_ALLOW_NOTIFY = 531,
+    VAR_TLS_WIN_CERT = 532,
+    VAR_TCP_CONNECTION_LIMIT = 533,
+    VAR_FORWARD_NO_CACHE = 534,
+    VAR_STUB_NO_CACHE = 535,
+    VAR_LOG_SERVFAIL = 536,
+    VAR_DENY_ANY = 537,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538,
+    VAR_LOG_TAG_QUERYREPLY = 539,
+    VAR_STREAM_WAIT_SIZE = 540,
+    VAR_TLS_CIPHERS = 541,
+    VAR_TLS_CIPHERSUITES = 542,
+    VAR_TLS_USE_SNI = 543,
+    VAR_IPSET = 544,
+    VAR_IPSET_NAME_V4 = 545,
+    VAR_IPSET_NAME_V6 = 546,
+    VAR_TLS_SESSION_TICKET_KEYS = 547,
+    VAR_RPZ = 548,
+    VAR_TAGS = 549,
+    VAR_RPZ_ACTION_OVERRIDE = 550,
+    VAR_RPZ_CNAME_OVERRIDE = 551,
+    VAR_RPZ_LOG = 552,
+    VAR_RPZ_LOG_NAME = 553,
+    VAR_DYNLIB = 554,
+    VAR_DYNLIB_FILE = 555,
+    VAR_EDNS_CLIENT_STRING = 556,
+    VAR_EDNS_CLIENT_STRING_OPCODE = 557
   };
-  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Token kinds.  */
-#define YYEOF 0
-#define YYerror 256
-#define YYUNDEF 257
+/* Tokens.  */
 #define SPACE 258
 #define LETTER 259
 #define NEWLINE 260
@@ -670,7 +661,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 674 "util/configparser.h"
+#line 665 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index baaec7a3a..4d6b5e3fb 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -2511,6 +2511,7 @@ server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG
 		else if(atoi($2) > 65535 || atoi($2) < 0)
 			yyerror("option code must be in interval [0, 65535]");
 		else cfg_parser->cfg->edns_client_string_opcode = atoi($2);
+		free($2);
 
 	}
 	;

From d05c259458364ac7705d030d1106c4041956d908 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 12:12:35 +0100
Subject: [PATCH 111/208] - Attempt fix for libevent state in tcp reuse cases
 after a packet   is written.

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

diff --git a/doc/Changelog b/doc/Changelog
index ef9c8a5a7..c7b2a1b9a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,8 @@
 	  the tree key identity is preserved after cleanup of the TLS state.
 	- Remove debug commands from reuse tests.
 	- Fix memory leak for edns client tag opcode config element.
+	- Attempt fix for libevent state in tcp reuse cases after a packet
+	  is written.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
diff --git a/services/outside_network.c b/services/outside_network.c
index 0a940aaf2..7b5dc8459 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1010,6 +1010,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			 * and we can write some more. */
 			pend->c->tcp_more_write_again = 1;
 			pend->query = reuse_write_wait_pop(&pend->reuse);
+			comm_point_stop_listening(pend->c);
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
 				pend->query);
 		} else {
@@ -1018,6 +1019,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			pend->c->tcp_more_read_again = 0;
 			pend->c->tcp_more_write_again = 0;
 			pend->c->tcp_is_reading = 1;
+			comm_point_stop_listening(pend->c);
 			reuse_tcp_setup_timeout(pend);
 		}
 		return 0;

From e50152aa1f23f83a981479f7f31039f8bf2f28fc Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 13:46:28 +0100
Subject: [PATCH 112/208] - Fix readagain and writeagain callback functions for
 comm point   cleanup.

---
 doc/Changelog              |  2 ++
 services/outside_network.c | 16 ++++++++++------
 services/outside_network.h | 12 ++++++++++++
 util/netevent.c            | 20 ++++++++++++--------
 util/netevent.h            | 18 ++++++++++++++----
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index c7b2a1b9a..0e2c254dd 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,8 @@
 	- Fix memory leak for edns client tag opcode config element.
 	- Attempt fix for libevent state in tcp reuse cases after a packet
 	  is written.
+	- Fix readagain and writeagain callback functions for comm point
+	  cleanup.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream
diff --git a/services/outside_network.c b/services/outside_network.c
index 7b5dc8459..84876ff3f 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -655,6 +655,10 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->query = w;
 	pend->reuse.outnet = w->outnet;
 	pend->c->repinfo.addrlen = w->addrlen;
+	pend->c->tcp_more_read_again = &pend->reuse.cp_more_read_again;
+	pend->c->tcp_more_write_again = &pend->reuse.cp_more_write_again;
+	pend->reuse.cp_more_read_again = 0;
+	pend->reuse.cp_more_write_again = 0;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
 	if(pend->c->ssl)
@@ -804,8 +808,8 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		pend->c->tcp_write_pkt = NULL;
 		pend->c->tcp_write_pkt_len = 0;
 		pend->c->tcp_write_and_read = 0;
-		pend->c->tcp_more_read_again = 0;
-		pend->c->tcp_more_write_again = 0;
+		pend->reuse.cp_more_read_again = 0;
+		pend->reuse.cp_more_write_again = 0;
 		pend->c->tcp_is_reading = 1;
 		w = pend->query;
 		pend->query = NULL;
@@ -1008,7 +1012,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 			 * because this callback called after a tcp write
 			 * succeeded and likely more buffer space is available
 			 * and we can write some more. */
-			pend->c->tcp_more_write_again = 1;
+			pend->reuse.cp_more_write_again = 1;
 			pend->query = reuse_write_wait_pop(&pend->reuse);
 			comm_point_stop_listening(pend->c);
 			outnet_tcp_take_query_setup(pend->c->fd, pend,
@@ -1016,8 +1020,8 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		} else {
 			verbose(VERB_ALGO, "outnet tcp writes done, wait");
 			pend->c->tcp_write_and_read = 0;
-			pend->c->tcp_more_read_again = 0;
-			pend->c->tcp_more_write_again = 0;
+			pend->reuse.cp_more_read_again = 0;
+			pend->reuse.cp_more_write_again = 0;
 			pend->c->tcp_is_reading = 1;
 			comm_point_stop_listening(pend->c);
 			reuse_tcp_setup_timeout(pend);
@@ -1072,7 +1076,7 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error,
 		 * because this callback called after a successful read
 		 * and there could be more bytes to read on the input */
 		if(pend->reuse.tree_by_id.count != 0)
-			pend->c->tcp_more_read_again = 1;
+			pend->reuse.cp_more_read_again = 1;
 		reuse_tcp_setup_read_and_timeout(pend);
 		return 0;
 	}
diff --git a/services/outside_network.h b/services/outside_network.h
index 48f9d3f03..2fe97fa6c 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -266,6 +266,18 @@ struct reuse_tcp {
 	 * or not is also part of the key to the rbtree.
 	 * There is a timeout and read event on the fd, to close it. */
 	struct pending_tcp* pending;
+	/**
+	 * The more read again value pointed to by the commpoint
+	 * tcp_more_read_again pointer, so that it exists after commpoint
+	 * delete
+	 */
+	int cp_more_read_again;
+	/**
+	 * The more write again value pointed to by the commpoint
+	 * tcp_more_write_again pointer, so that it exists after commpoint
+	 * delete
+	 */
+	int cp_more_write_again;
 	/** rbtree with other queries waiting on the connection, by ID number,
 	 * of type struct waiting_tcp. It is for looking up received
 	 * answers to the structure for callback.  And also to see if ID
diff --git a/util/netevent.c b/util/netevent.c
index 814ab6f0a..6bb51cc07 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1056,8 +1056,8 @@ reclaim_tcp_handler(struct comm_point* c)
 			comm_point_start_listening(c->tcp_parent, -1, -1);
 		}
 	}
-	c->tcp_more_read_again = 0;
-	c->tcp_more_write_again = 0;
+	c->tcp_more_read_again = NULL;
+	c->tcp_more_write_again = NULL;
 }
 
 /** do the callback when writing is done */
@@ -1937,8 +1937,9 @@ tcp_more_read_again(int fd, struct comm_point* c)
 	 * the connection, the callback signals this, and we try again */
 	/* this continues until the read routines get EAGAIN or so,
 	 * and thus does not call the callback, and the bool is 0 */
-	while(c->tcp_more_read_again) {
-		c->tcp_more_read_again = 0;
+	int* moreread = c->tcp_more_read_again;
+	while(moreread && *moreread) {
+		*moreread = 0;
 		if(!comm_point_tcp_handle_read(fd, c, 0)) {
 			reclaim_tcp_handler(c);
 			if(!c->tcp_do_close) {
@@ -1960,8 +1961,9 @@ tcp_more_write_again(int fd, struct comm_point* c)
 	 * the callback signals it and we try again. */
 	/* this continues until the write routines get EAGAIN or so,
 	 * and thus does not call the callback, and the bool is 0 */
-	while(c->tcp_more_write_again) {
-		c->tcp_more_write_again = 0;
+	int* morewrite = c->tcp_more_write_again;
+	while(morewrite && *morewrite) {
+		*morewrite = 0;
 		if(!comm_point_tcp_handle_write(fd, c)) {
 			reclaim_tcp_handler(c);
 			if(!c->tcp_do_close) {
@@ -2015,6 +2017,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 	}
 	if(event&UB_EV_READ) {
 		int has_tcpq = (c->tcp_req_info != NULL);
+		int* moreread = c->tcp_more_read_again;
 		if(!comm_point_tcp_handle_read(fd, c, 0)) {
 			reclaim_tcp_handler(c);
 			if(!c->tcp_do_close) {
@@ -2026,12 +2029,13 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 		}
 		if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again)
 			tcp_req_info_read_again(fd, c);
-		if(c->tcp_more_read_again)
+		if(moreread && *moreread)
 			tcp_more_read_again(fd, c);
 		return;
 	}
 	if(event&UB_EV_WRITE) {
 		int has_tcpq = (c->tcp_req_info != NULL);
+		int* morewrite = c->tcp_more_write_again;
 		if(!comm_point_tcp_handle_write(fd, c)) {
 			reclaim_tcp_handler(c);
 			if(!c->tcp_do_close) {
@@ -2043,7 +2047,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 		}
 		if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again)
 			tcp_req_info_read_again(fd, c);
-		if(c->tcp_more_write_again)
+		if(morewrite && *morewrite)
 			tcp_more_write_again(fd, c);
 		return;
 	}
diff --git a/util/netevent.h b/util/netevent.h
index 75baf2177..daa954b64 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -299,13 +299,23 @@ struct comm_point {
 
 	/** if set try to read another packet again (over connection with
 	 * multiple packets), once set, tries once, then zero again,
-	 * so set it in the packet complete section. */
-	int tcp_more_read_again;
+	 * so set it in the packet complete section.
+	 * The pointer itself has to be set before the callback is invoked,
+	 * when you set things up, and continue to exist also after the
+	 * commpoint is closed and deleted in your callback.  So that after
+	 * the callback cleans up netevent can see what it has to do.
+	 * Or leave NULL if it is not used at all. */
+	int* tcp_more_read_again;
 
 	/** if set try to write another packet (over connection with
 	 * multiple packets), once set, tries once, then zero again,
-	 * so set it in the packet complete section. */
-	int tcp_more_write_again;
+	 * so set it in the packet complete section.
+	 * The pointer itself has to be set before the callback is invoked,
+	 * when you set things up, and continue to exist also after the
+	 * commpoint is closed and deleted in your callback.  So that after
+	 * the callback cleans up netevent can see what it has to do.
+	 * Or leave NULL if it is not used at all. */
+	int* tcp_more_write_again;
 
 	/** if set, read/write completes:
 		read/write state of tcp is toggled.

From f6bf015f90a5e2e1e13b90f87d7f939ecdb37015 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 25 Nov 2020 14:03:32 +0100
Subject: [PATCH 113/208] - tag for the 1.13.0rc2 release.

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

diff --git a/doc/Changelog b/doc/Changelog
index 0e2c254dd..506aed34b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -9,6 +9,7 @@
 	  is written.
 	- Fix readagain and writeagain callback functions for comm point
 	  cleanup.
+	- tag for the 1.13.0rc2 release.
 
 24 November 2020: Wouter
 	- Merge PR #283 : Stream reuse.  This implements upstream stream

From 4a8669612a6761e05d2776edc198dbd71c3b673b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 26 Nov 2020 09:39:54 +0100
Subject: [PATCH 114/208] - Fix to omit UDP receive errors from log, if
 verbosity low.   These happen because of udp-connect.

---
 doc/Changelog   |  4 ++++
 util/netevent.c | 31 +++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 506aed34b..9e6928963 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+26 November 2020: Wouter
+	- Fix to omit UDP receive errors from log, if verbosity low.
+	  These happen because of udp-connect.
+
 25 November 2020: Wouter
 	- with udp-connect ignore connection refused with UDP timeouts.
 	- Fix udp-connect on FreeBSD, do send calls on connected UDP socket.
diff --git a/util/netevent.c b/util/netevent.c
index 6bb51cc07..714767324 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -579,6 +579,32 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet,
 #endif /* AF_INET6 && IPV6_PKTINFO && HAVE_SENDMSG */
 }
 
+/** return true is UDP receive error needs to be logged */
+static int udp_recv_needs_log(int err)
+{
+	switch(err) {
+	case ECONNREFUSED:
+#  ifdef ENETUNREACH
+	case ENETUNREACH:
+#  endif
+#  ifdef EHOSTDOWN
+	case EHOSTDOWN:
+#  endif
+#  ifdef EHOSTUNREACH
+	case EHOSTUNREACH:
+#  endif
+#  ifdef ENETDOWN
+	case ENETDOWN:
+#  endif
+		if(verbosity >= VERB_ALGO)
+			return 1;
+		return 0;
+	default:
+		break;
+	}
+	return 1;
+}
+
 void 
 comm_point_udp_ancil_callback(int fd, short event, void* arg)
 {
@@ -621,7 +647,8 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
 		msg.msg_flags = 0;
 		rcv = recvmsg(fd, &msg, 0);
 		if(rcv == -1) {
-			if(errno != EAGAIN && errno != EINTR) {
+			if(errno != EAGAIN && errno != EINTR
+				&& udp_recv_needs_log(errno)) {
 				log_err("recvmsg failed: %s", strerror(errno));
 			}
 			return;
@@ -703,7 +730,7 @@ comm_point_udp_callback(int fd, short event, void* arg)
 		if(rcv == -1) {
 #ifndef USE_WINSOCK
 			if(errno != EAGAIN && errno != EINTR
-				&& errno != ECONNREFUSED)
+				&& udp_recv_needs_log(errno))
 				log_err("recvfrom %d failed: %s", 
 					fd, strerror(errno));
 #else

From e9810e1154277dc5174c6051b6bba33560809bed Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 26 Nov 2020 11:00:48 +0100
Subject: [PATCH 115/208] - For #352: contrib/metrics.awk for Prometheus style
 metrics output.

---
 contrib/README      |   2 +
 contrib/metrics.awk | 188 ++++++++++++++++++++++++++++++++++++++++++++
 doc/Changelog       |   1 +
 3 files changed, 191 insertions(+)
 create mode 100644 contrib/metrics.awk

diff --git a/contrib/README b/contrib/README
index 9db078e56..ef2a0ab88 100644
--- a/contrib/README
+++ b/contrib/README
@@ -53,3 +53,5 @@ distribution but may be helpful.
   lookups for downstream clients.
 * drop2rpz: perl script that converts the Spamhaus DROP-List in RPZ-Format,
   contributed by Andreas Schulze.
+* metrics.awk: awk script that can convert unbound-control stats to
+  Prometheus metrics format output.
diff --git a/contrib/metrics.awk b/contrib/metrics.awk
new file mode 100644
index 000000000..4c5a57585
--- /dev/null
+++ b/contrib/metrics.awk
@@ -0,0 +1,188 @@
+# read output of unbound-control stats
+# and output prometheus metrics style output.
+# use these options:
+#	server:		extended-statistics: yes
+#			statistics-cumulative: no
+#			statistics-interval: 0
+#	remote-control: control-enable: yes
+# Can use it like unbound-control stats | awk -f "metrics.awk"
+
+BEGINFILE {
+	FS="=";
+}
+# everything like total.num.queries=value is put in val["total.num.queries"]
+/^.*\..*=/ {
+	val[$1]=$2;
+}
+# print the output metrics
+ENDFILE {
+	# sort array by index
+	asorti(val, sorted); 
+
+	print "# HELP unbound_hits_queries Unbound DNS traffic and cache hits"
+	print "# TYPE unbound_hits_queries gauge"
+	print "unbound_hits_queries{type=\"total.num.queries\"} " val["total.num.queries"];
+	for (x=0; x<99; x++) {
+		if(val["thread" $x ".num.queries"] != "") {
+			print "unbound_hits_queries{type=\"thread" $x ".num.queries\"} " val["thread" $x ".num.queries"];
+		}
+	}
+	print "unbound_hits_queries{type=\"total.num.cachehits\"} " val["total.num.cachehits"];
+	print "unbound_hits_queries{type=\"total.num.prefetch\"} " val["total.num.prefetch"];
+	print "unbound_hits_queries{type=\"num.query.tcp\"} " val["num.query.tcp"];
+	print "unbound_hits_queries{type=\"num.query.tcpout\"} " val["num.query.tcpout"];
+	print "unbound_hits_queries{type=\"num.query.tls\"} " val["num.query.tls"];
+	print "unbound_hits_queries{type=\"num.query.tls.resume\"} " val["num.query.tls.resume"];
+	print "unbound_hits_queries{type=\"num.query.ipv6\"} " val["num.query.ipv6"];
+	print "unbound_hits_queries{type=\"unwanted.queries\"} " val["unwanted.queries"];
+	print ""
+
+	print "# HELP unbound_queue_queries Unbound requestlist size"
+	print "# TYPE unbound_queue_queries gauge"
+	print "unbound_queue_queries{type=\"total.requestlist.avg\"} " val["total.requestlist.avg"];
+	print "unbound_queue_queries{type=\"total.requestlist.max\"} " val["total.requestlist.max"];
+	print "unbound_queue_queries{type=\"total.requestlist.overwritten\"} " val["total.requestlist.overwritten"];
+	print "unbound_queue_queries{type=\"total.requestlist.exceeded\"} " val["total.requestlist.exceeded"];
+	print ""
+
+	print "# HELP unbound_memory_bytes Unbound memory usage"
+	print "# TYPE unbound_memory_bytes gauge"
+	print "unbound_memory_bytes{type=\"mem.cache.rrset\"} " val["mem.cache.rrset"];
+	print "unbound_memory_bytes{type=\"mem.cache.message\"} " val["mem.cache.message"];
+	print "unbound_memory_bytes{type=\"mem.mod.iterator\"} " val["mem.mod.iterator"];
+	if(val["mem.mod.validator"] != "") {
+		print "unbound_memory_bytes{type=\"mem.mod.validator\"} " val["mem.mod.validator"];
+	}
+	if(val["mem.mod.respip"] != "") {
+		print "unbound_memory_bytes{type=\"mem.mod.respip\"} " val["mem.mod.respip"];
+	}
+	if(val["mem.mod.subnet"] != "") {
+		print "unbound_memory_bytes{type=\"mem.mod.subnet\"} " val["mem.mod.subnet"];
+	}
+	if(val["mem.mod.ipsecmod"] != "") {
+		print "unbound_memory_bytes{type=\"mem.mod.ipsecmod\"} " val["mem.mod.ipsecmod"];
+	}
+	if(val["mem.mod.dynlibmod"] != "") {
+		print "unbound_memory_bytes{type=\"mem.mod.dynlibmod\"} " val["mem.mod.dynlibmod"];
+	}
+	print "unbound_memory_bytes{type=\"msg.cache.count\"} " val["msg.cache.count"];
+	print "unbound_memory_bytes{type=\"rrset.cache.count\"} " val["rrset.cache.count"];
+	print "unbound_memory_bytes{type=\"infra.cache.count\"} " val["infra.cache.count"];
+	print "unbound_memory_bytes{type=\"key.cache.count\"} " val["key.cache.count"];
+	print ""
+
+	print "# HELP unbound_by_type_queries Unbound DNS queries by type"
+	print "# TYPE unbound_by_type_queries gauge"
+	for(s in sorted) {
+		x = sorted[s];
+		if(x ~ /^num.query.type./) {
+			if(val[x] != "") {
+				split(x, a, ".");
+				print "unbound_by_type_queries{type=\"" a[4] "\"} " val[x];
+			}
+		}
+	}
+	print ""
+
+	print "# HELP unbound_by_class_queries Unbound DNS queries by class"
+	print "# TYPE unbound_by_class_queries gauge"
+	for(s in sorted) {
+		x = sorted[s];
+		if(x ~ /^num.query.class./) {
+			if(val[x] != "") {
+				split(x, a, ".");
+				print "unbound_by_class_queries{class=\"" a[4] "\"} " val[x];
+			}
+		}
+	}
+	print ""
+
+	print "# HELP unbound_by_opcode_queries Unbound DNS queries by opcode"
+	print "# TYPE unbound_by_opcode_queries gauge"
+	for(s in sorted) {
+		x = sorted[s];
+		if(x ~ /^num.query.opcode./) {
+			if(val[x] != "") {
+				split(x, a, ".");
+				print "unbound_by_opcode_queries{opcode=\"" a[4] "\"} " val[x];
+			}
+		}
+	}
+	print ""
+
+	print "# HELP unbound_by_rcode_queries Unbound DNS answers by rcode"
+	print "# TYPE unbound_by_rcode_queries gauge"
+	for(s in sorted) {
+		x = sorted[s];
+		if(x ~ /^num.answer.rcode./) {
+			if(val[x] != "") {
+				split(x, a, ".");
+				print "unbound_by_rcode_queries{rcode=\"" a[4] "\"} " val[x];
+			}
+		}
+	}
+	print ""
+
+	print "# HELP unbound_by_flags_queries Unbound DNS queries by flags"
+	print "# TYPE unbound_by_flags_queries gauge"
+	for(s in sorted) {
+		x = sorted[s];
+		if(x ~ /^num.query.flags./) {
+			if(val[x] != "") {
+				split(x, a, ".");
+				print "unbound_by_flags_queries{flag=\"" a[4] "\"} " val[x];
+			}
+		}
+	}
+	if(val["num.query.edns.present"] != "") {
+		print "unbound_by_flags_queries{flag=\"num.query.edns.present\"} " val["num.query.edns.present"];
+	}
+	if(val["num.query.edns.DO"] != "") {
+		print "unbound_by_flags_queries{flag=\"num.query.edns.DO\"} " val["num.query.edns.DO"];
+	}
+	print ""
+
+	print "# HELP unbound_histogram_seconds Unbound DNS histogram of reply time"
+	print "# TYPE unbound_histogram_seconds gauge"
+	print "unbound_histogram_seconds{bucket=\"000000.000000.to.000000.000001\"} " val["histogram.000000.000000.to.000000.000001"];
+	print "unbound_histogram_seconds{bucket=\"000000.000001.to.000000.000002\"} " val["histogram.000000.000001.to.000000.000002"];
+	print "unbound_histogram_seconds{bucket=\"000000.000002.to.000000.000004\"} " val["histogram.000000.000002.to.000000.000004"];
+	print "unbound_histogram_seconds{bucket=\"000000.000004.to.000000.000008\"} " val["histogram.000000.000004.to.000000.000008"];
+	print "unbound_histogram_seconds{bucket=\"000000.000008.to.000000.000016\"} " val["histogram.000000.000008.to.000000.000016"];
+	print "unbound_histogram_seconds{bucket=\"000000.000016.to.000000.000032\"} " val["histogram.000000.000016.to.000000.000032"];
+	print "unbound_histogram_seconds{bucket=\"000000.000032.to.000000.000064\"} " val["histogram.000000.000032.to.000000.000064"];
+	print "unbound_histogram_seconds{bucket=\"000000.000064.to.000000.000128\"} " val["histogram.000000.000064.to.000000.000128"];
+	print "unbound_histogram_seconds{bucket=\"000000.000128.to.000000.000256\"} " val["histogram.000000.000128.to.000000.000256"];
+	print "unbound_histogram_seconds{bucket=\"000000.000256.to.000000.000512\"} " val["histogram.000000.000256.to.000000.000512"];
+	print "unbound_histogram_seconds{bucket=\"000000.000512.to.000000.001024\"} " val["histogram.000000.000512.to.000000.001024"];
+	print "unbound_histogram_seconds{bucket=\"000000.001024.to.000000.002048\"} " val["histogram.000000.001024.to.000000.002048"];
+	print "unbound_histogram_seconds{bucket=\"000000.002048.to.000000.004096\"} " val["histogram.000000.002048.to.000000.004096"];
+	print "unbound_histogram_seconds{bucket=\"000000.004096.to.000000.008192\"} " val["histogram.000000.004096.to.000000.008192"];
+	print "unbound_histogram_seconds{bucket=\"000000.008192.to.000000.016384\"} " val["histogram.000000.008192.to.000000.016384"];
+	print "unbound_histogram_seconds{bucket=\"000000.016384.to.000000.032768\"} " val["histogram.000000.016384.to.000000.032768"];
+	print "unbound_histogram_seconds{bucket=\"000000.032768.to.000000.065536\"} " val["histogram.000000.032768.to.000000.065536"];
+	print "unbound_histogram_seconds{bucket=\"000000.065536.to.000000.131072\"} " val["histogram.000000.065536.to.000000.131072"];
+	print "unbound_histogram_seconds{bucket=\"000000.131072.to.000000.262144\"} " val["histogram.000000.131072.to.000000.262144"];
+	print "unbound_histogram_seconds{bucket=\"000000.262144.to.000000.524288\"} " val["histogram.000000.262144.to.000000.524288"];
+	print "unbound_histogram_seconds{bucket=\"000000.524288.to.000001.000000\"} " val["histogram.000000.524288.to.000001.000000"];
+	print "unbound_histogram_seconds{bucket=\"000001.000000.to.000002.000000\"} " val["histogram.000001.000000.to.000002.000000"];
+	print "unbound_histogram_seconds{bucket=\"000002.000000.to.000004.000000\"} " val["histogram.000002.000000.to.000004.000000"];
+	print "unbound_histogram_seconds{bucket=\"000004.000000.to.000008.000000\"} " val["histogram.000004.000000.to.000008.000000"];
+	print "unbound_histogram_seconds{bucket=\"000008.000000.to.000016.000000\"} " val["histogram.000008.000000.to.000016.000000"];
+	print "unbound_histogram_seconds{bucket=\"000016.000000.to.000032.000000\"} " val["histogram.000016.000000.to.000032.000000"];
+	print "unbound_histogram_seconds{bucket=\"000032.000000.to.000064.000000\"} " val["histogram.000032.000000.to.000064.000000"];
+	print "unbound_histogram_seconds{bucket=\"000064.000000.to.000128.000000\"} " val["histogram.000064.000000.to.000128.000000"];
+	print "unbound_histogram_seconds{bucket=\"000128.000000.to.000256.000000\"} " val["histogram.000128.000000.to.000256.000000"];
+	print "unbound_histogram_seconds{bucket=\"000256.000000.to.000512.000000\"} " val["histogram.000256.000000.to.000512.000000"];
+	print "unbound_histogram_seconds{bucket=\"000512.000000.to.001024.000000\"} " val["histogram.000512.000000.to.001024.000000"];
+	print "unbound_histogram_seconds{bucket=\"001024.000000.to.002048.000000\"} " val["histogram.001024.000000.to.002048.000000"];
+	print "unbound_histogram_seconds{bucket=\"002048.000000.to.004096.000000\"} " val["histogram.002048.000000.to.004096.000000"];
+	print "unbound_histogram_seconds{bucket=\"004096.000000.to.008192.000000\"} " val["histogram.004096.000000.to.008192.000000"];
+	print "unbound_histogram_seconds{bucket=\"008192.000000.to.016384.000000\"} " val["histogram.008192.000000.to.016384.000000"];
+	print "unbound_histogram_seconds{bucket=\"016384.000000.to.032768.000000\"} " val["histogram.016384.000000.to.032768.000000"];
+	print "unbound_histogram_seconds{bucket=\"032768.000000.to.065536.000000\"} " val["histogram.032768.000000.to.065536.000000"];
+	print "unbound_histogram_seconds{bucket=\"065536.000000.to.131072.000000\"} " val["histogram.065536.000000.to.131072.000000"];
+	print "unbound_histogram_seconds{bucket=\"131072.000000.to.262144.000000\"} " val["histogram.131072.000000.to.262144.000000"];
+	print "unbound_histogram_seconds{bucket=\"262144.000000.to.524288.000000\"} " val["histogram.262144.000000.to.524288.000000"];
+	print ""
+}
diff --git a/doc/Changelog b/doc/Changelog
index 9e6928963..a51da5106 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.
 	  These happen because of udp-connect.
+	- For #352: contrib/metrics.awk for Prometheus style metrics output.
 
 25 November 2020: Wouter
 	- with udp-connect ignore connection refused with UDP timeouts.

From 67a0614db700aa6ed596a3563aff6767c69170fe Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 26 Nov 2020 12:12:52 +0100
Subject: [PATCH 116/208] - Fix that after failed read, the readagain cannot
 activate.

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

diff --git a/doc/Changelog b/doc/Changelog
index a51da5106..91d34a61e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix to omit UDP receive errors from log, if verbosity low.
 	  These happen because of udp-connect.
 	- For #352: contrib/metrics.awk for Prometheus style metrics output.
+	- Fix that after failed read, the readagain cannot activate.
 
 25 November 2020: Wouter
 	- with udp-connect ignore connection refused with UDP timeouts.
diff --git a/util/netevent.c b/util/netevent.c
index 714767324..311a114ee 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2053,6 +2053,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
+			return;
 		}
 		if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again)
 			tcp_req_info_read_again(fd, c);
@@ -2071,6 +2072,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 				(void)(*c->callback)(c, c->cb_arg,
 					NETEVENT_CLOSED, NULL);
 			}
+			return;
 		}
 		if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again)
 			tcp_req_info_read_again(fd, c);

From 3fb0493d3f16010b5193b969e89998a005743d97 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 26 Nov 2020 12:23:18 +0100
Subject: [PATCH 117/208] - Clear readagain upon decommission of pending tcp
 structure.

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

diff --git a/doc/Changelog b/doc/Changelog
index 91d34a61e..d0b9f223c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	  These happen because of udp-connect.
 	- For #352: contrib/metrics.awk for Prometheus style metrics output.
 	- Fix that after failed read, the readagain cannot activate.
+	- Clear readagain upon decommission of pending tcp structure.
 
 25 November 2020: Wouter
 	- with udp-connect ignore connection refused with UDP timeouts.
diff --git a/services/outside_network.c b/services/outside_network.c
index 84876ff3f..72469323e 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -909,6 +909,8 @@ decommission_pending_tcp(struct outside_network* outnet,
 #endif
 	}
 	comm_point_close(pend->c);
+	pend->reuse.cp_more_read_again = 0;
+	pend->reuse.cp_more_write_again = 0;
 	/* unlink the query and writewait list, it is part of the tree
 	 * nodes and is deleted */
 	pend->query = NULL;

From 11139c1b4e32f6c629e9be430e9c9ec4304efcd5 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 27 Nov 2020 09:08:48 +0100
Subject: [PATCH 118/208] - Fix compile warning for type cast in
 http2_submit_dns_response.

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

diff --git a/doc/Changelog b/doc/Changelog
index d0b9f223c..4664c3423 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+27 November 2020: Wouter
+	- Fix compile warning for type cast in http2_submit_dns_response.
+
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.
 	  These happen because of udp-connect.
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index bd87aac56..d63c0e0aa 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -2208,7 +2208,7 @@ int http2_submit_dns_response(struct http2_session* h2_session)
 	}
 
 	rlen = sldns_buffer_remaining(h2_session->c->buffer);
-	snprintf(rlen_str, sizeof(rlen_str), "%u", rlen);
+	snprintf(rlen_str, sizeof(rlen_str), "%u", (unsigned)rlen);
 
 	lock_basic_lock(&http2_response_buffer_count_lock);
 	if(http2_response_buffer_count + rlen > http2_response_buffer_max) {

From 8ffdbc2714fdf616e5d7c21c1ea9d14278b33791 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 27 Nov 2020 09:57:08 +0100
Subject: [PATCH 119/208] - Fix when use free buffer to initialize rbtree for
 stream reuse.

---
 doc/Changelog              | 1 +
 services/outside_network.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 4664c3423..9de0334de 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 27 November 2020: Wouter
 	- Fix compile warning for type cast in http2_submit_dns_response.
+	- Fix when use free buffer to initialize rbtree for stream reuse.
 
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.
diff --git a/services/outside_network.c b/services/outside_network.c
index 72469323e..c26b83cc3 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -742,6 +742,11 @@ use_free_buffer(struct outside_network* outnet)
 					w);
 			}
 		} else {
+			struct pending_tcp* pend = w->outnet->tcp_free;
+			rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp);
+			pend->reuse.pending = pend;
+			memcpy(&pend->reuse.addr, &w->addr, w->addrlen);
+			pend->reuse.addrlen = w->addrlen;
 			if(!outnet_tcp_take_into_use(w)) {
 				waiting_tcp_callback(w, NULL, NETEVENT_CLOSED,
 					NULL);

From 67d541d6909149a2de5e671292617bc5517bf867 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 27 Nov 2020 10:01:55 +0100
Subject: [PATCH 120/208] - Fix compile warnings for windows.

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

diff --git a/doc/Changelog b/doc/Changelog
index 9de0334de..c4fbe4544 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 27 November 2020: Wouter
 	- Fix compile warning for type cast in http2_submit_dns_response.
 	- Fix when use free buffer to initialize rbtree for stream reuse.
+	- Fix compile warnings for windows.
 
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.
diff --git a/services/outside_network.c b/services/outside_network.c
index c26b83cc3..2ced272b7 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -335,8 +335,8 @@ log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
 	if(verbosity < v) return;
 	addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf));
 	port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port);
-	verbose(v, "%s %s#%u 0x%llx fd %d", msg, addrbuf, (unsigned)port,
-		(unsigned long long)reuse, reuse->pending->c->fd);
+	verbose(v, "%s %s#%u fd %d", msg, addrbuf, (unsigned)port,
+		reuse->pending->c->fd);
 }
 
 /** pop the first element from the writewait list */
@@ -467,7 +467,7 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
 	key_p.reuse.node.key = &key_p.reuse;
 	if(use_ssl)
 		key_p.reuse.is_ssl = 1;
-	if(addrlen > sizeof(key_p.reuse.addr))
+	if(addrlen > (socklen_t)sizeof(key_p.reuse.addr))
 		return NULL;
 	memmove(&key_p.reuse.addr, addr, addrlen);
 	key_p.reuse.addrlen = addrlen;

From b2894e23a9fa68b98b5f4c3d48c8af5a8c8ad6b5 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 27 Nov 2020 10:11:14 +0100
Subject: [PATCH 121/208] - Fix compile warnings in rpz initialization.

---
 daemon/worker.c | 2 +-
 doc/Changelog   | 1 +
 respip/respip.c | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 427ab4a92..76c4bb5b1 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -576,7 +576,7 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo,
 	struct comm_reply* repinfo, struct ub_packed_rrset_key** alias_rrset,
 	struct reply_info** encode_repp, struct auth_zones* az)
 {
-	struct respip_action_info actinfo = {0};
+	struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
 	actinfo.action = respip_none;
 
 	if(qinfo->qtype != LDNS_RR_TYPE_A &&
diff --git a/doc/Changelog b/doc/Changelog
index c4fbe4544..355222bf4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix compile warning for type cast in http2_submit_dns_response.
 	- Fix when use free buffer to initialize rbtree for stream reuse.
 	- Fix compile warnings for windows.
+	- Fix compile warnings in rpz initialization.
 
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.
diff --git a/respip/respip.c b/respip/respip.c
index 6fa4f1885..9ee098def 100644
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -914,7 +914,7 @@ respip_rewrite_reply(const struct query_info* qinfo,
 	int ret = 1;
 	struct ub_packed_rrset_key* redirect_rrset = NULL;
 	struct rpz* r;
-	struct auth_zone* a;
+	struct auth_zone* a = NULL;
 	struct ub_packed_rrset_key* data = NULL;
 	int rpz_used = 0;
 	int rpz_log = 0;
@@ -1109,7 +1109,7 @@ respip_operate(struct module_qstate* qstate, enum module_ev event, int id,
 			qstate->return_msg && qstate->return_msg->rep) {
 			struct reply_info* new_rep = qstate->return_msg->rep;
 			struct ub_packed_rrset_key* alias_rrset = NULL;
-			struct respip_action_info actinfo = {0};
+			struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
 			actinfo.action = respip_none;
 
 			if(!respip_rewrite_reply(&qstate->qinfo,
@@ -1170,7 +1170,7 @@ respip_merge_cname(struct reply_info* base_rep,
 	struct ub_packed_rrset_key* alias_rrset = NULL; /* ditto */
 	uint16_t tgt_rcode;
 	size_t i, j;
-	struct respip_action_info actinfo = {0};
+	struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
 	actinfo.action = respip_none;
 
 	/* If the query for the CNAME target would result in an unusual rcode,

From 56a80fbbf448df7c80ab54467b73bbf5608f129b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 27 Nov 2020 15:08:31 +0100
Subject: [PATCH 122/208] - Fix contrib/metrics.awk for FreeBSD awk
 compatibility.

---
 contrib/metrics.awk | 22 +++++++---------------
 doc/Changelog       |  1 +
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/contrib/metrics.awk b/contrib/metrics.awk
index 4c5a57585..5a7a2569c 100644
--- a/contrib/metrics.awk
+++ b/contrib/metrics.awk
@@ -7,7 +7,7 @@
 #	remote-control: control-enable: yes
 # Can use it like unbound-control stats | awk -f "metrics.awk"
 
-BEGINFILE {
+BEGIN {
 	FS="=";
 }
 # everything like total.num.queries=value is put in val["total.num.queries"]
@@ -15,10 +15,7 @@ BEGINFILE {
 	val[$1]=$2;
 }
 # print the output metrics
-ENDFILE {
-	# sort array by index
-	asorti(val, sorted); 
-
+END {
 	print "# HELP unbound_hits_queries Unbound DNS traffic and cache hits"
 	print "# TYPE unbound_hits_queries gauge"
 	print "unbound_hits_queries{type=\"total.num.queries\"} " val["total.num.queries"];
@@ -73,8 +70,7 @@ ENDFILE {
 
 	print "# HELP unbound_by_type_queries Unbound DNS queries by type"
 	print "# TYPE unbound_by_type_queries gauge"
-	for(s in sorted) {
-		x = sorted[s];
+	for(x in val) {
 		if(x ~ /^num.query.type./) {
 			if(val[x] != "") {
 				split(x, a, ".");
@@ -86,8 +82,7 @@ ENDFILE {
 
 	print "# HELP unbound_by_class_queries Unbound DNS queries by class"
 	print "# TYPE unbound_by_class_queries gauge"
-	for(s in sorted) {
-		x = sorted[s];
+	for(x in val) {
 		if(x ~ /^num.query.class./) {
 			if(val[x] != "") {
 				split(x, a, ".");
@@ -99,8 +94,7 @@ ENDFILE {
 
 	print "# HELP unbound_by_opcode_queries Unbound DNS queries by opcode"
 	print "# TYPE unbound_by_opcode_queries gauge"
-	for(s in sorted) {
-		x = sorted[s];
+	for(x in val) {
 		if(x ~ /^num.query.opcode./) {
 			if(val[x] != "") {
 				split(x, a, ".");
@@ -112,8 +106,7 @@ ENDFILE {
 
 	print "# HELP unbound_by_rcode_queries Unbound DNS answers by rcode"
 	print "# TYPE unbound_by_rcode_queries gauge"
-	for(s in sorted) {
-		x = sorted[s];
+	for(x in val) {
 		if(x ~ /^num.answer.rcode./) {
 			if(val[x] != "") {
 				split(x, a, ".");
@@ -125,8 +118,7 @@ ENDFILE {
 
 	print "# HELP unbound_by_flags_queries Unbound DNS queries by flags"
 	print "# TYPE unbound_by_flags_queries gauge"
-	for(s in sorted) {
-		x = sorted[s];
+	for(x in val) {
 		if(x ~ /^num.query.flags./) {
 			if(val[x] != "") {
 				split(x, a, ".");
diff --git a/doc/Changelog b/doc/Changelog
index 355222bf4..1019e32ae 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- Fix when use free buffer to initialize rbtree for stream reuse.
 	- Fix compile warnings for windows.
 	- Fix compile warnings in rpz initialization.
+	- Fix contrib/metrics.awk for FreeBSD awk compatibility.
 
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.

From e4bdc527baab8ed7aea6af3b9851ce4da241a1b7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 30 Nov 2020 09:41:33 +0100
Subject: [PATCH 123/208] - Fix assertion failure on double callback when
 iterator loses   interest in query at head of line that then has the tcp
 stream   not kept for reuse.

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

diff --git a/doc/Changelog b/doc/Changelog
index 1019e32ae..b1146761f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+30 November 2020: Wouter
+	- Fix assertion failure on double callback when iterator loses
+	  interest in query at head of line that then has the tcp stream
+	  not kept for reuse.
+
 27 November 2020: Wouter
 	- Fix compile warning for type cast in http2_submit_dns_response.
 	- Fix when use free buffer to initialize rbtree for stream reuse.
diff --git a/services/outside_network.c b/services/outside_network.c
index 2ced272b7..11951adea 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -2321,9 +2321,7 @@ reuse_tcp_remove_serviced_keep(struct waiting_tcp* w,
 	 * the stream itself.  also keep it as an entry in the tree_by_id,
 	 * in case the answer returns (that we no longer want), but we cannot
 	 * pick the same ID number meanwhile */
-	if(pend_tcp->query) {
-		pend_tcp->query->cb = NULL;
-	}
+	w->cb = NULL;
 	/* see if can be entered in reuse tree
 	 * for that the FD has to be non-1 */
 	if(pend_tcp->c->fd == -1) {

From 174bb48ae899712d7b7f0a37f3291ba47822fefd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 30 Nov 2020 12:52:04 +0100
Subject: [PATCH 124/208] Changelog entry for rc tags 1.13.0rc3 and rc4.

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

diff --git a/doc/Changelog b/doc/Changelog
index b1146761f..1622dd2b5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix assertion failure on double callback when iterator loses
 	  interest in query at head of line that then has the tcp stream
 	  not kept for reuse.
+	- tag for the 1.13.0rc4 release.
 
 27 November 2020: Wouter
 	- Fix compile warning for type cast in http2_submit_dns_response.
@@ -9,6 +10,7 @@
 	- Fix compile warnings for windows.
 	- Fix compile warnings in rpz initialization.
 	- Fix contrib/metrics.awk for FreeBSD awk compatibility.
+	- tag for the 1.13.0rc3 release.
 
 26 November 2020: Wouter
 	- Fix to omit UDP receive errors from log, if verbosity low.

From 5906811ff19f005110b2edbda5aa144ad5fa05b1 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 1 Dec 2020 09:09:13 +0100
Subject: [PATCH 125/208] - Fix #358: Squelch udp connect 'no route to host'
 errors on low   verbosity.

---
 doc/Changelog              |  4 ++++
 services/outside_network.c | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 1622dd2b5..30b8d34a1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+1 December 2020: Wouter
+	- Fix #358: Squelch udp connect 'no route to host' errors on low
+	  verbosity.
+
 30 November 2020: Wouter
 	- Fix assertion failure on double callback when iterator loses
 	  interest in query at head of line that then has the tcp stream
diff --git a/services/outside_network.c b/services/outside_network.c
index 11951adea..0886907f7 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1745,6 +1745,33 @@ select_id(struct outside_network* outnet, struct pending* pend,
 	return 1;
 }
 
+/** return true is UDP connect error needs to be logged */
+static int udp_connect_needs_log(int err)
+{
+	switch(err) {
+	case ECONNREFUSED:
+#  ifdef ENETUNREACH
+	case ENETUNREACH:
+#  endif
+#  ifdef EHOSTDOWN
+	case EHOSTDOWN:
+#  endif
+#  ifdef EHOSTUNREACH
+	case EHOSTUNREACH:
+#  endif
+#  ifdef ENETDOWN
+	case ENETDOWN:
+#  endif
+		if(verbosity >= VERB_ALGO)
+			return 1;
+		return 0;
+	default:
+		break;
+	}
+	return 1;
+}
+
+
 /** Select random interface and port */
 static int
 select_ifport(struct outside_network* outnet, struct pending* pend,
@@ -1804,9 +1831,11 @@ select_ifport(struct outside_network* outnet, struct pending* pend,
 				/* connect() to the destination */
 				if(connect(fd, (struct sockaddr*)&pend->addr,
 					pend->addrlen) < 0) {
-					log_err_addr("udp connect failed",
-						strerror(errno), &pend->addr,
-						pend->addrlen);
+					if(udp_connect_needs_log(errno)) {
+						log_err_addr("udp connect failed",
+							strerror(errno), &pend->addr,
+							pend->addrlen);
+					}
 					sock_close(fd);
 					return 0;
 				}

From ddb751751cc2a1799c3b55d9af162e5b5950e178 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 1 Dec 2020 15:19:17 +0100
Subject: [PATCH 126/208] NSID for Unbound

---
 util/config_file.c   |   51 +
 util/config_file.h   |   14 +
 util/configlexer.c   | 4703 ++++++++++++++++++++--------------------
 util/configlexer.lex |    1 +
 util/configparser.c  | 4885 ++++++++++++++++++++----------------------
 util/configparser.h  |  625 +++---
 util/configparser.y  |   20 +-
 util/edns.c          |    5 +
 8 files changed, 5132 insertions(+), 5172 deletions(-)

diff --git a/util/config_file.c b/util/config_file.c
index 4c827b74e..6f662b6d9 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -237,6 +237,9 @@ config_create(void)
 	cfg->hide_trustanchor = 0;
 	cfg->identity = NULL;
 	cfg->version = NULL;
+	cfg->nsid_cfg_str = NULL;
+	cfg->nsid = NULL;
+	cfg->nsid_len = 0;
 	cfg->auto_trust_anchor_file_list = NULL;
 	cfg->trust_anchor_file_list = NULL;
 	cfg->trust_anchor_list = NULL;
@@ -580,6 +583,20 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_YNO("hide-trustanchor:", hide_trustanchor)
 	else S_STR("identity:", identity)
 	else S_STR("version:", version)
+	else if(strcmp(opt, "nsid:") == 0) {
+		free(cfg->nsid_cfg_str);
+		if (!(cfg->nsid_cfg_str = strdup(val)))
+			return 0;
+		/* Empty string is just validly unsetting nsid */
+		if (*val == 0) {
+			free(cfg->nsid);
+			cfg->nsid = NULL;
+			cfg->nsid_len = 0;
+			return 1;
+		}
+		cfg->nsid = cfg_parse_nsid(val, &cfg->nsid_len);
+		return cfg->nsid != NULL;
+	}
 	else S_STRLIST("root-hints:", root_hints)
 	else S_STR("target-fetch-policy:", target_fetch_policy)
 	else S_YNO("harden-glue:", harden_glue)
@@ -1015,6 +1032,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_YNO(opt, "hide-trustanchor", hide_trustanchor)
 	else O_STR(opt, "identity", identity)
 	else O_STR(opt, "version", version)
+	else O_STR(opt, "nsid", nsid_cfg_str)
 	else O_STR(opt, "target-fetch-policy", target_fetch_policy)
 	else O_YNO(opt, "harden-short-bufsize", harden_short_bufsize)
 	else O_YNO(opt, "harden-large-queries", harden_large_queries)
@@ -1482,6 +1500,8 @@ config_delete(struct config_file* cfg)
 #endif
 	free(cfg->identity);
 	free(cfg->version);
+	free(cfg->nsid_cfg_str);
+	free(cfg->nsid);
 	free(cfg->module_conf);
 	free(cfg->outgoing_avail_ports);
 	config_delstrlist(cfg->caps_whitelist);
@@ -2020,6 +2040,37 @@ uint8_t* config_parse_taglist(struct config_file* cfg, char* str,
 	return taglist;
 }
 
+uint8_t* cfg_parse_nsid(const char* str, uint16_t* nsid_len)
+{
+	uint8_t* nsid = NULL;
+
+	if (strncasecmp(str, "ascii_", 6) == 0) {
+		if ((nsid = (uint8_t *)strdup(str + 6)))
+			*nsid_len = strlen(str + 6);
+
+	} else if (strlen(str) % 2) 
+		; /* hex string has even number of characters */
+
+	else if (*str && (nsid = calloc(1, strlen(str) / 2))) {
+		const char *ch;
+		uint8_t *dp;
+
+		for ( ch = str, dp = nsid
+		    ; isxdigit(ch[0]) && isxdigit(ch[1])
+		    ; ch += 2, dp++) {
+			*dp  = (uint8_t)sldns_hexdigit_to_int(ch[0]) * 16;
+			*dp += (uint8_t)sldns_hexdigit_to_int(ch[1]);
+		}
+		if (*ch) {
+			free(nsid);
+			nsid = NULL;
+		} else
+			*nsid_len = strlen(str) / 2;
+	}
+	return nsid;
+}
+
+
 char* config_taglist2str(struct config_file* cfg, uint8_t* taglist,
         size_t taglen)
 {
diff --git a/util/config_file.h b/util/config_file.h
index 556544021..05b12fbaa 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -338,6 +338,10 @@ struct config_file {
 	char* identity;
 	/** version, package version returned if "". */
 	char* version;
+	/** nsid */
+	char *nsid_cfg_str;
+	uint8_t *nsid;
+	uint16_t nsid_len;
 
 	/** the module configuration string */
 	char* module_conf;
@@ -1070,6 +1074,16 @@ int cfg_count_numbers(const char* str);
  */
 int cfg_parse_memsize(const char* str, size_t* res);
 
+/**
+ * Parse nsid from string into binary nsid. nsid is either a hexidecimal
+ * string or an ascii string prepended with ascii_ in which case the
+ * characters after ascii_ are simply copied.
+ * @param str: the string to parse.
+ * @param nsid_len: returns length of nsid in bytes.
+ * @return malloced bytes or NULL on parse error or malloc failure.
+ */
+uint8_t* cfg_parse_nsid(const char* str, uint16_t* nsid_len);
+
 /**
  * Add a tag name to the config.  It is added at the end with a new ID value.
  * @param cfg: the config structure.
diff --git a/util/configlexer.c b/util/configlexer.c
index f845e2057..4235cd04a 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 337
-#define YY_END_OF_BUFFER 338
+#define YY_NUM_RULES 338
+#define YY_END_OF_BUFFER 339
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,370 +363,370 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3292] =
+static const flex_int16_t yy_accept[3296] =
     {   0,
-        1,    1,  311,  311,  315,  315,  319,  319,  323,  323,
-        1,    1,  327,  327,  331,  331,  338,  335,    1,  309,
-      309,  336,    2,  336,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  311,  312,  312,  313,
-      336,  315,  316,  316,  317,  336,  322,  319,  320,  320,
-      321,  336,  323,  324,  324,  325,  336,  334,  310,    2,
-      314,  336,  334,  330,  327,  328,  328,  329,  336,  331,
-      332,  332,  333,  336,  335,    0,    1,    2,    2,    2,
-        2,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+        1,    1,  312,  312,  316,  316,  320,  320,  324,  324,
+        1,    1,  328,  328,  332,  332,  339,  336,    1,  310,
+      310,  337,    2,  337,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  312,  313,  313,  314,
+      337,  316,  317,  317,  318,  337,  323,  320,  321,  321,
+      322,  337,  324,  325,  325,  326,  337,  335,  311,    2,
+      315,  337,  335,  331,  328,  329,  329,  330,  337,  332,
+      333,  333,  334,  337,  336,    0,    1,    2,    2,    2,
+        2,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  311,    0,  315,
-        0,  322,    0,  319,  323,    0,  334,    0,    2,    2,
-      334,  330,    0,  327,  331,    0,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  312,    0,
+      316,    0,  323,    0,  320,  324,    0,  335,    0,    2,
+        2,  335,  331,    0,  328,  332,    0,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  334,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  125,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  134,  335,  335,  335,  335,  335,  335,
-      335,  334,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  125,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  134,  336,  336,  336,
+      336,  336,  336,  336,  335,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      109,  335,  335,  335,  335,  335,  335,    8,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  126,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  109,  336,  309,  336,  336,  336,  336,
+      336,    8,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  139,  335,
-      334,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  302,  335,
+      336,  126,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  139,  336,  335,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  302,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  334,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,   64,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  238,
-      335,   14,   15,  335,   19,   18,  335,  335,  222,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      132,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  335,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,   64,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  238,  336,   14,   15,  336,   19,   18,
+      336,  336,  222,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  132,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  220,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,    3,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  334,  335,  335,  335,
-      335,  335,  335,  335,  296,  335,  335,  295,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  220,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,    3,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      335,  336,  336,  336,  336,  336,  336,  336,  296,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  318,  335,  335,  335,  335,
-      335,  335,  335,  335,   63,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,   67,  335,  269,  335,  335,  335,  335,  335,  335,
-      335,  335,  303,  304,  335,  335,  335,  335,  335,   68,
+      336,  295,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  319,
+      336,  336,  336,  336,  336,  336,  336,  336,   63,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,   67,  336,  269,  336,  336,
+      336,  336,  336,  336,  336,  336,  303,  304,  336,  336,
 
-      335,  335,  133,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  129,  335,  335,
-      335,  335,  335,  335,  335,  335,  209,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,   21,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  158,  335,  335,
-      334,  318,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,   68,  336,  336,  133,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  129,  336,  336,  336,  336,  336,  336,  336,  336,
+      209,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,   21,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  158,  336,  336,  335,  319,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  107,  335,  335,  335,  335,  335,  335,
-      335,  277,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  181,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  157,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  107,  336,  336,
+      336,  336,  336,  336,  336,  277,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  181,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  157,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  106,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-       32,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-       33,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,   65,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  131,  334,  335,  335,
-      335,  335,  335,  124,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,   66,
+      336,  336,  336,  336,  336,  336,  106,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,   32,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,   33,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+       65,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      131,  335,  336,  336,  336,  336,  336,  124,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  242,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  182,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,   54,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,   66,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  242,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      182,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,   54,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  260,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,   58,  335,   59,  335,  335,  335,
-      335,  335,  110,  335,  111,  335,  335,  335,  335,  108,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,    7,
-      335,  334,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  260,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,   58,  336,
+       59,  336,  336,  336,  336,  336,  110,  336,  111,  336,
+      336,  336,  336,  108,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,    7,  336,  335,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      231,  335,  335,  335,  335,  160,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  243,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,   45,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,   55,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  201,  335,  200,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  231,  336,  336,  336,  336,  160,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  243,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,   45,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,   55,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  201,  336,
+      200,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,   16,   17,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,   69,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      208,  335,  335,  335,  335,  335,  335,  113,  335,  112,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  192,  335,  335,  335,  335,  335,  335,  335,
-      335,  140,  334,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  101,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,   16,   17,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,   69,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  208,  336,  336,  336,  336,  336,
+      336,  113,  336,  112,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  192,  336,  336,  336,
+      336,  336,  336,  336,  336,  140,  335,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  101,  336,  336,
 
-      335,  335,  335,   89,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  221,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,   94,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-       62,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  195,
-      196,  335,  335,  335,  271,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,   89,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  221,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,   94,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,   62,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  195,  196,  336,  336,  336,  271,  336,
 
-      335,  335,  335,  335,  335,  335,  335,    6,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  275,
-      335,  335,  335,  335,  335,  335,  297,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,   42,  335,  335,
-      335,  335,   44,  335,  335,  335,   90,  335,  335,  335,
-      335,  335,   52,  335,  335,  335,  335,  335,  335,  335,
-      334,  335,  188,  335,  335,  335,  135,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  213,  335,  189,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,    6,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  275,  336,  336,  336,  336,  336,  336,
+      297,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,   42,  336,  336,  336,  336,   44,  336,  336,  336,
+       90,  336,  336,  336,  336,  336,   52,  336,  336,  336,
+      336,  336,  336,  336,  335,  336,  188,  336,  336,  336,
+      135,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  228,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,   53,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  137,  118,  335,  119,  335,
-      335,  335,  117,  335,  335,  335,  335,  335,  335,  335,
-      335,  155,  335,  335,   50,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  259,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  190,  335,  335,  335,  335,  335,  193,  335,  199,
-      335,  335,  335,  335,  335,  227,  335,  335,  335,  335,
+      336,  213,  336,  189,  336,  336,  336,  228,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,   53,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  137,
+      118,  336,  119,  336,  336,  336,  117,  336,  336,  336,
+      336,  336,  336,  336,  336,  155,  336,  336,   50,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  259,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  190,  336,  336,  336,  336,
+      336,  193,  336,  199,  336,  336,  336,  336,  336,  227,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      105,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  130,
-      335,  335,  335,  335,  335,  335,   60,  335,  335,  335,
-       26,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-       20,  335,  335,  335,  335,  335,  335,   27,   36,  335,
-      165,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  334,  335,  335,  335,  335,  335,
-      335,   77,   79,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  279,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  105,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  130,  336,  336,  336,  336,  336,  336,
+       60,  336,  336,  336,   26,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,   20,  336,  336,  336,  336,  336,
+      336,   27,   36,  336,  165,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  335,  336,
+      336,  336,  336,  336,  336,   77,   79,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  239,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  120,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  154,  335,   46,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  290,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  159,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  219,  335,  335,  335,  335,  335,  335,  335,  335,
+      279,  336,  336,  336,  336,  239,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  120,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  154,  336,
+       46,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  290,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  159,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  219,  336,  336,  336,  336,
 
-      335,  300,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  176,  335,  335,  335,  335,  335,  335,
-      335,  335,  114,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  171,  335,  183,  335,  335,  335,  335,  334,
-      335,  143,  335,  335,  335,  335,  335,  100,  335,  335,
-      335,  335,  211,  335,  335,  335,  335,  335,  335,  229,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  251,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  136,  335,  335,
+      336,  336,  336,  336,  336,  300,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  176,  336,  336,
+      336,  336,  336,  336,  336,  336,  114,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  171,  336,  183,  336,
+      336,  336,  336,  335,  336,  143,  336,  336,  336,  336,
+      336,  100,  336,  336,  336,  336,  211,  336,  336,  336,
+      336,  336,  336,  229,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      251,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  175,  335,  335,  335,  335,  335,  335,   80,
-      335,   81,  335,  335,  335,  335,  335,   61,  293,  335,
-      335,  335,  335,  335,   88,  184,  335,  202,  335,  232,
-      335,  335,  194,  272,  335,  335,  335,  335,  335,   73,
-      335,  186,  335,  335,  335,  335,  335,    9,  335,  335,
-      335,  104,  335,  335,  335,  335,  264,  335,  335,  335,
-      335,  210,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
+      336,  136,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  175,  336,  336,  336,
+      336,  336,  336,   80,  336,   81,  336,  336,  336,  336,
+      336,   61,  293,  336,  336,  336,  336,  336,   88,  184,
+      336,  202,  336,  232,  336,  336,  194,  272,  336,  336,
+      336,  336,  336,   73,  336,  186,  336,  336,  336,  336,
+      336,    9,  336,  336,  336,  104,  336,  336,  336,  336,
+      264,  336,  336,  336,  336,  210,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  334,  335,  335,
-      335,  335,  174,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  161,  335,  278,  335,  335,  335,  335,
-      335,  250,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  223,  335,  335,  335,  335,  335,  270,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      294,  335,  185,  335,  335,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  335,  336,  336,  336,  336,  174,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  161,  336,  278,
+      336,  336,  336,  336,  336,  250,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  223,  336,  336,
+      336,  336,  336,  270,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  294,  336,  185,  336,  336,  336,
 
-       72,   74,  335,  335,  335,  335,  335,  335,  335,  103,
-      335,  335,  335,  335,  262,  335,  335,  335,  335,  274,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  215,   34,   28,   30,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,   35,  335,   29,   31,  335,  335,
-      335,  335,  335,  335,  335,  335,   99,  335,  335,  335,
-      335,  335,  335,  334,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  217,  214,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,   71,  335,  335,  335,  138,
+      336,  336,  336,  336,   72,   74,  336,  336,  336,  336,
+      336,  336,  336,  103,  336,  336,  336,  336,  262,  336,
+      336,  336,  336,  274,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  215,   34,   28,   30,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,   35,  336,
+       29,   31,  336,  336,  336,  336,  336,  336,  336,  336,
+       99,  336,  336,  336,  336,  336,  336,  335,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  217,
+      214,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,   71,
 
-      335,  121,  335,  335,  335,  335,  335,  335,  335,  335,
-      156,   47,  335,  335,  335,  326,   13,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  288,  335,  291,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-       12,  335,  335,   22,  335,  335,  335,  268,  335,  335,
-      335,  335,  276,  335,  335,  335,   75,  335,  225,  335,
-      335,  335,  335,  216,  335,  335,   70,  335,  335,  335,
-      335,   23,  335,   43,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  170,  169,  326,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  218,  212,
+      336,  336,  336,  138,  336,  121,  336,  336,  336,  336,
+      336,  336,  336,  336,  156,   47,  336,  336,  336,  327,
+       13,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  288,  336,  291,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,   12,  336,  336,   22,  336,  336,
+      336,  268,  336,  336,  336,  336,  276,  336,  336,  336,
+       75,  336,  225,  336,  336,  336,  336,  216,  336,  336,
+       70,  336,  336,  336,  336,   23,  336,   43,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      170,  169,  327,  336,  336,  336,  336,  336,  336,  336,
 
-      335,  230,  335,  335,  280,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,   82,  335,  335,
-      335,  335,  263,  335,  335,  335,  335,  198,  335,  335,
-      335,  335,  224,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  298,  299,  167,  335,  335,   76,  335,  335,
-      335,  335,  177,  335,  335,  115,  116,  335,  335,  335,
-      335,  162,  335,  164,  335,  203,  335,  335,  335,  335,
-      168,  335,  335,  233,  335,  335,  335,  335,  335,  335,
+      336,  336,  218,  212,  336,  230,  336,  336,  280,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,   82,  336,  336,  336,  336,  263,  336,  336,  336,
+      336,  198,  336,  336,  336,  336,  224,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  298,  299,  167,  336,
+      336,   76,  336,  336,  336,  336,  177,  336,  336,  115,
+      116,  336,  336,  336,  336,  162,  336,  164,  336,  203,
+      336,  336,  336,  336,  168,  336,  336,  233,  336,  336,
 
-      335,  145,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  241,  335,  335,  335,  335,  335,
-      335,  335,  307,  335,   24,  335,  273,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,   86,  204,  335,  335,  261,  335,  292,  335,  197,
-      335,  335,  335,  335,   56,  335,  335,  335,  335,    4,
-      335,  335,  335,  335,  128,  144,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  236,   37,   38,  335,  335,  335,
-      335,  335,  335,  335,  281,  335,  335,  335,  335,  335,
+      336,  336,  336,  336,  336,  145,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  241,  336,
+      336,  336,  336,  336,  336,  336,  307,  336,   24,  336,
+      273,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,   86,  204,  336,  336,  261,
+      336,  292,  336,  197,  336,  336,  336,  336,   56,  336,
+      336,  336,  336,    4,  336,  336,  336,  336,  128,  144,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  236,   37,
+       38,  336,  336,  336,  336,  336,  336,  336,  281,  336,
 
-      335,  335,  249,  335,  335,  335,  335,  335,  335,  335,
-      335,  207,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,   85,  335,   57,  267,  335,  237,
-      335,  335,  335,  335,   11,  335,  335,  335,  335,  335,
-      335,  127,  335,  335,  335,  335,  205,   91,  335,   40,
-      335,  335,  335,  335,  335,  335,  335,  335,  173,  335,
-      335,  335,  335,  335,  147,  335,  335,  335,  335,  240,
-      335,  335,  335,  335,  335,  248,  335,  335,  335,  335,
-      141,  335,  335,  335,  122,  123,  335,  335,  335,   93,
-       97,   92,  335,  335,  335,  335,   83,  335,  335,  335,
+      336,  336,  336,  336,  336,  336,  249,  336,  336,  336,
+      336,  336,  336,  336,  336,  207,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,   85,  336,
+       57,  267,  336,  237,  336,  336,  336,  336,   11,  336,
+      336,  336,  336,  336,  336,  127,  336,  336,  336,  336,
+      205,   91,  336,   40,  336,  336,  336,  336,  336,  336,
+      336,  336,  173,  336,  336,  336,  336,  336,  147,  336,
+      336,  336,  336,  240,  336,  336,  336,  336,  336,  248,
+      336,  336,  336,  336,  141,  336,  336,  336,  122,  123,
+      336,  336,  336,   93,   97,   92,  336,  336,  336,  336,
 
-      335,  335,   10,  335,  335,  335,  265,  301,  335,  335,
-      335,  335,  306,   39,  335,  335,  335,  335,  335,  172,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,   98,   96,  335,   51,  335,  335,   84,
-      289,  335,  335,  335,  335,  335,  335,  335,  191,  335,
-      335,  335,  335,  335,  206,  335,  335,  335,  335,  335,
-      335,  335,  335,  163,   78,  335,  335,  335,  335,  335,
-      282,  335,  335,  335,  335,  335,  335,  335,  245,  335,
-      335,  244,  142,  335,  335,   95,   48,  335,  148,  149,
+       83,  336,  336,  336,  336,  336,   10,  336,  336,  336,
+      265,  301,  336,  336,  336,  336,  306,   39,  336,  336,
+      336,  336,  336,  172,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,   98,   96,  336,
+       51,  336,  336,   84,  289,  336,  336,  336,  336,  336,
+      336,  336,  191,  336,  336,  336,  336,  336,  206,  336,
+      336,  336,  336,  336,  336,  336,  336,  163,   78,  336,
+      336,  336,  336,  336,  282,  336,  336,  336,  336,  336,
+      336,  336,  245,  336,  336,  244,  142,  336,  336,   95,
 
-      152,  153,  150,  151,   87,  335,  266,  335,  335,  335,
-      335,  166,  335,  335,  335,  335,  335,  235,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  179,  178,   41,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  102,  335,  234,  335,
-      258,  286,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  308,  335,   49,    5,  335,  335,  226,
-      335,  335,  287,  335,  335,  335,  335,  335,  335,  335,
+       48,  336,  148,  149,  152,  153,  150,  151,   87,  336,
+      266,  336,  336,  336,  336,  166,  336,  336,  336,  336,
+      336,  235,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  179,  178,   41,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      102,  336,  234,  336,  258,  286,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  308,  336,   49,
+        5,  336,  336,  226,  336,  336,  287,  336,  336,  336,
 
-      335,  335,  246,   25,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  247,  335,  335,  335,
-      146,  335,  335,  335,  335,  335,  335,  335,  335,  180,
-      335,  187,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  283,  335,  335,  335,  335,  335,  335,  335,  335,
-      335,  335,  335,  335,  335,  335,  335,  335,  335,  305,
-      335,  335,  254,  335,  335,  335,  335,  335,  284,  335,
-      335,  335,  335,  335,  335,  285,  335,  335,  335,  252,
-      335,  255,  256,  335,  335,  335,  335,  335,  253,  257,
-        0
+      336,  336,  336,  336,  336,  336,  246,   25,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      247,  336,  336,  336,  146,  336,  336,  336,  336,  336,
+      336,  336,  336,  180,  336,  187,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  283,  336,  336,  336,  336,
+      336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+      336,  336,  336,  305,  336,  336,  254,  336,  336,  336,
+      336,  336,  284,  336,  336,  336,  336,  336,  336,  285,
+      336,  336,  336,  252,  336,  255,  256,  336,  336,  336,
+      336,  336,  253,  257,    0
 
     } ;
 
@@ -770,743 +770,745 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3310] =
+static const flex_int16_t yy_base[3314] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 3493, 3402,   81, 6426,
-     6426, 6426,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 2992, 2881,   81, 6437,
+     6437, 6437,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  184,  145,
-      185,  205,  194,  204,  178,  123, 3176, 6426, 6426, 6426,
-      107, 2960, 6426, 6426, 6426,  154, 2373, 2342, 6426, 6426,
-     6426,  226, 2208, 6426, 6426, 6426,  163, 2071, 6426,  238,
-     6426,  242,  148, 1858, 1710, 6426, 6426, 6426,  246, 1553,
-     6426, 6426, 6426,  250, 1440,  254,  219,    0,  258,    0,
-        0,  165,  250,  191,  215,  243,  252,  256,   92,  260,
+      185,  205,  211,  217,  178,  123, 2560, 6437, 6437, 6437,
+      107, 2496, 6437, 6437, 6437,  154, 2163, 1764, 6437, 6437,
+     6437,  249, 1649, 6437, 6437, 6437,  163, 1451, 6437,  253,
+     6437,  257,  148, 1354, 1226, 6437, 6437, 6437,  261, 1170,
+     6437, 6437, 6437,  207, 1091,  267,  203,    0,  271,    0,
+        0,  165,  204,  215,  206,  207,  216,  265,   92,  263,
 
-      261,  262,  264,  265,  266,  273,  270,  277,  278,  281,
-      271,  279,  290,  288,  296,  295,  299,  310,  303,  306,
-      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, 1400,  411, 1086,
-      415,  984,  422,  871,  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,
+      269,  273,  256,  267,  276,  284,  277,  280,  282,  288,
+      286,  290,  226,  292,  228,  296,  303,  311,  298,  313,
+      321,  301,  315,  234,  319,  314,  332,  331,  333,  316,
+      334,  337,  335,  342,  343,  348,  345,  354,  355,  350,
+      356,  366,  359,  368,  371,  360,  379,  374,  377,  364,
+      382,  389,  387,  388,  392,  395,  401,  394,  962,  412,
+      919,  417,  872,  426,  749,  518,  430,  357,  434,  438,
+        0,  415,  293,  442,  244,  181,  446,  434,  446,  405,
+      441,  442,  443,  444,  445,  447,  448,  449,  451,  465,
+      458,  463,  470,  467,  474,  475,  480,  473,  478,  482,
 
-      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,  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,
+      486,  476,  490,  498,  499,  500,  493,  501,  502,  504,
+      506,  507,  508,  522,  520,  511,  514,  533,  534,  538,
+      543,  529,  545,  547,  536,  552,  548,  560,  551,  564,
+      559,  550,  561,  562,  565,  568,  569,  570,  573,  575,
+      572,  576,  574,  586,  588,  579,  591,  589,  602,  598,
+      605,  600,  601,  409,  603,  607,  610,  615,  608,  618,
+      613,  619,  623,  629,  632,  636,  635,  621,  634,  631,
+      638,  640,  641,  642,  645,  652,  655,  651,  653,  665,
+      660,  662,  663,  664,  666,  667,  677,  669,  680,  683,
+      673,  679,  685,  687,  689,  691,  690,  694,  695,  699,
 
-      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, 6426,  817,  820,  833,  826,  834,  835,  836,
-      841,  842,  823,  849,  847,  848,  852,  874,  856,  863,
-      854,  864,  858, 6426,  867,  868,  898,  881,  871,  889,
-      885,  878,  887,  892,  894,  902,  911,  904,  908,  909,
-      922,  915,  919,  924,  918,  927,  925,  935,  936,  931,
+      702,  700,  707,  709,  716,  713,  718,  715,  727,  728,
+      703,  712,  724,  725,  731,  726,  733,  735,  736,  740,
+      741,  743,  746,  744,  754,  750,  752,  767,  759,  757,
+      760,  769,  770,  778,  771,  792,  799,  777,  763,  788,
+      781,  797,  800,  802,  807,  803,  810,  813,  814,  815,
+      816,  817,  818,  826,  822, 6437,  821,  824,  836,  838,
+      839,  842,  832,  848,  831,  852,  855,  857,  854,  862,
+      884,  858,  860,  861,  873,  866, 6437,  874,  868,  908,
+      879,  886,  897,  892,  904,  870,  899,  906,  890,  918,
+      902,  901,  916,  932,  929,  913,  917,  931,  935,  938,
 
-      934,  941,  948,  943,  945,  947,  956,  949,  950,  957,
-      958,  769,  960,  967,  970,  964,  959,  975,  976,  977,
-      979,  982,  983,  987,  985,  998, 1005,  999, 1012,  986,
-     1010, 1011, 1014, 1013, 1019, 1020, 1022, 1024, 1025, 1027,
-     1028, 1032, 1033, 1031, 1034, 1036, 1038, 1044, 1042, 1047,
-     1048, 1049, 1056, 1058, 1051, 1064, 1052, 1050, 1068, 1060,
-     6426, 1072, 1070, 1075, 1076, 1074, 1077, 6426, 1078, 1079,
-     1080, 1081, 1090, 1092, 1093, 1099, 1088, 1103, 1105, 1106,
-     1107, 1115, 1110, 1113, 1118, 1117, 1119, 1121, 1123, 1125,
-     1127, 1126, 1128, 1134, 1135, 1138, 1155, 6426, 1137, 1145,
+      945,  941,  943,  944,  947,  954,  949,  950,  955,  967,
+      951,  957,  959,  958,  968,  976,  977,  980,  982,  969,
+      985,  986,  987,  989,  992,  993,  997,  995, 1008,  990,
+     1009, 1021, 1016, 1017, 1020, 1019, 1025, 1026, 1027, 1029,
+     1032, 1033, 1034, 1035, 1045, 1040, 1041, 1043, 1048, 1049,
+     1050, 1055, 1052, 1057, 1058, 1060, 1061, 1062, 1068, 1066,
+     1073, 1076, 1078, 6437, 1079, 6437, 1081, 1082, 1083, 1084,
+     1085, 6437, 1087, 1088, 1089, 1096, 1099, 1086, 1114, 1098,
+     1101, 1111, 1113, 1112, 1117, 1124, 1120, 1125, 1127, 1123,
+     1129, 1130, 1133, 1131, 1136, 1138, 1139, 1142, 1143, 1146,
 
-     1142, 1139, 1148, 1149, 1167, 1147, 1165, 1166, 1159, 1179,
-     1177, 1178, 1180, 1186, 1187, 1188, 1190, 1195, 1191, 1140,
-     1193, 1197, 1198, 1199, 1201, 1200, 1202, 1205, 6426, 1203,
-     1214, 1227, 1213, 1222, 1223, 1224, 1226, 1228, 1229, 1230,
-     1232, 1231, 1236, 1240, 1251, 1235, 1254, 1249, 1250, 1252,
-     1256, 1257, 1260, 1258, 1259, 1270, 1265, 1273, 1280, 1282,
-     1284, 1286, 1287, 1294, 1268, 1290, 1292, 1291, 1297, 1298,
-     1300, 1299, 1301, 1307, 1305, 1314, 1311, 1310, 1312, 1313,
-     1318, 1320, 1321, 1325, 1322, 1323, 1337, 1329, 1332, 1333,
-     1339, 1347, 1340, 1349, 1350, 1351, 1352, 1353, 6426, 1360,
+     1163, 6437, 1147, 1150, 1151, 1149, 1156, 1157, 1175, 1166,
+     1173, 1174, 1176, 1192, 1187, 1188, 1191, 1195, 1196, 1198,
+     1200, 1205, 1207, 1148, 1208, 1201, 1209, 1210, 1203, 1211,
+     1213, 1221, 6437, 1217, 1229, 1238, 1224, 1219, 1235, 1237,
+     1240, 1239, 1241, 1243, 1242, 1246, 1250, 1248, 1259, 1249,
+     1266, 1252, 1262, 1263, 1267, 1268, 1269, 1271, 1275, 1284,
+     1276, 1286, 1293, 1294, 1296, 1298, 1305, 1307, 1279, 1302,
+     1308, 1304, 1303, 1310, 1312, 1316, 1313, 1319, 1320, 1323,
+     1325, 1326, 1327, 1328, 1330, 1333, 1334, 1335, 1337, 1339,
+     1347, 1345, 1343, 1358, 1346, 1351, 1349, 1356, 1360, 1363,
 
-     1361, 1359, 1363, 1364, 1371, 1372, 1375, 1376, 1373, 1379,
-     1378, 1381, 1385, 1386, 1387, 1382, 1388, 1390, 1399, 1403,
-     1404, 1413, 1405, 1412, 1396, 1415, 1422, 1418, 1425, 1421,
-     1420, 1426, 1433, 1428, 1430, 1434, 1442, 1437, 1435, 1446,
-     1438, 1447, 1450, 1449, 1461, 1459, 1460, 1469, 1472, 1462,
-     1464, 1470, 1474, 1475, 1477, 1478, 1479, 1480, 1488, 1481,
-     1483, 1484, 1486, 1490, 1491, 1494, 1497, 1509, 1502, 1505,
-     1504, 1507, 1511, 1513, 1514, 1518, 1519, 1520, 1522, 1521,
-     1524, 1528, 1529, 1533, 1534, 1540, 1541, 1542, 1544, 1547,
-     1548, 1551, 1550, 1559, 1561, 1549, 1562, 1565, 1568, 1570,
+     1362, 1371, 6437, 1379, 1374, 1375, 1377, 1380, 1384, 1388,
+     1382, 1389,  782, 1391, 1390, 1392, 1397, 1399, 1394, 1400,
+     1401, 1402, 1411, 1409, 1417, 1421, 1422, 1423, 1406, 1426,
+     1433, 1429, 1436, 1432, 1431, 1437, 1444, 1439, 1441, 1445,
+     1453, 1448, 1446, 1457, 1449, 1458, 1274, 1460, 1472, 1461,
+     1470, 1477, 1479, 1468, 1481, 1482, 1484, 1474, 1485, 1487,
+     1488, 1489, 1496, 1491, 1497, 1498, 1499, 1494, 1500, 1504,
+     1502, 1521, 1508, 1511, 1510, 1518, 1520, 1525, 1526, 1527,
+     1528, 1530, 1531, 1534, 1532, 1535, 1538, 1540, 1544, 1550,
+     1551, 1541, 1553, 1554, 1558, 1561, 1562, 1563, 1570, 1560,
 
-     1571, 1572, 1573, 1580, 1575, 1578, 1581, 1585, 1586, 1591,
-     1592, 1595, 1597, 1600, 6426, 1598, 1610, 1588, 1611, 1606,
-     1603, 1605, 1619, 1612, 1614, 1616, 1622, 1624, 1648, 6426,
-     1625, 6426, 6426,  315, 6426, 6426, 1626, 1627, 6426, 1630,
-     1629, 1639, 1637, 1631, 1642, 1645, 1646, 1649, 1651, 1658,
-     1672, 1654, 1661, 1662, 1665, 1675, 1677, 1678, 1666, 1686,
-     1687, 1689, 1694, 1695, 1703, 1696, 1700, 1706, 1708, 1714,
-     1710, 1719, 1720, 1709, 1716, 1723, 1724, 1726, 1725, 1728,
-     1731, 1734, 1736, 1732, 1730, 1738, 1747, 1749, 1740, 1757,
-     6426, 1753, 1761, 1765, 1762, 1769, 1768, 1764, 1766, 1773,
+     1573, 1574, 1571, 1577, 1576, 1579, 1587, 1589, 1581, 1582,
+     1592, 1594, 1596, 1598, 1600, 1603, 1599, 1605, 6437, 1606,
+     1616, 1611, 1615, 1612, 1613, 1618, 1626, 1621, 1623, 1622,
+     1627, 1628, 1653, 6437, 1632, 6437, 6437, 1633, 6437, 6437,
+     1634, 1635, 6437, 1639, 1637, 1644, 1657, 1663, 1666, 1659,
+     1651, 1642, 1654, 1677, 1678, 1676, 1668, 1683, 1684, 1686,
+     1687, 1693, 1692, 1694, 1695, 1699, 1706, 1708, 1703, 1712,
+     1713, 1716, 1714, 1721, 1723, 1726, 1729, 1722, 1730, 1732,
+     1733, 1735, 1737, 1738, 1740, 1742, 1743, 1741, 1746, 1747,
+     1757, 1760, 1762, 1772, 6437, 1763, 1770, 1773, 1774, 1781,
 
-     1776, 1777, 1778, 1779, 1780, 1781, 1783, 1743, 1786, 1789,
-     1797, 1790, 6426, 1792, 1793, 1795, 1798, 1799, 1804, 1805,
-     1806, 1811, 1812, 1813, 1823, 1814, 1816, 1818, 1824, 1825,
-     1827, 6426, 1832, 1829, 1835, 1839, 1840, 1842, 1843, 1845,
-     1846, 1841, 1847, 1848, 1851, 1853, 1860, 1855, 1859, 1857,
-     1865, 1868, 1873, 1875, 1878, 1881, 1882, 1883, 1884, 1885,
-     1886, 1888, 1889, 1896, 1899, 1897, 1900, 1898, 1895, 1910,
-     1919, 1902, 1914, 1916, 1917, 1918, 1920, 1929, 1924, 1925,
-     1931, 1932, 1930, 1935, 1937, 1940, 1947, 1938, 1948, 1956,
-     1942, 1949, 1954, 1951, 6426, 1958, 1960, 6426, 1962, 1961,
+     1777, 1776, 1778, 1784, 1788, 1785, 1789, 1790, 1791, 1792,
+     1797, 1794, 1800, 1802, 1805, 1804, 6437, 1806, 1809, 1810,
+     1812, 1813, 1816, 1820, 1814, 1821, 1824, 1826, 1836, 1831,
+     1827, 1829, 1838, 1837, 1840, 6437, 1748, 1845, 1841, 1849,
+     1850, 1852, 1853, 1855, 1856, 1857, 1858, 1859, 1860, 1864,
+     1874, 1870, 1875, 1865, 1880, 1882, 1885, 1886, 1890, 1892,
+     1893, 1895, 1896, 1897, 1898, 1900, 1901, 1909, 1911, 1908,
+     1913, 1910, 1906, 1929, 1931, 1914, 1916, 1927, 1928, 1930,
+     1936, 1938, 1940, 1934, 1941, 1948, 1944, 1946, 1949, 1950,
+     1959, 1956, 1957, 1962, 1960, 1965, 1968, 1969, 6437, 1966,
 
-     1963, 1985, 1965, 1967, 1968, 1973, 1977, 1976, 1978, 1986,
-     1987, 1989, 2005, 1998, 1995, 2008, 2010, 2011, 1979, 2013,
-     2014, 2015, 2017, 2020, 2021, 2030, 2038, 2039, 2023, 2042,
-     2040, 1997, 2041, 2043, 2062, 2044, 2045, 2051, 2046, 2047,
-     2049, 2059, 2052, 2053, 2055, 2057, 2075, 2078, 2077, 2079,
-     2064, 2084, 2086, 2087, 2090, 6426, 2098, 2093, 2094, 2095,
-     2099, 2107, 2103, 2104, 6426, 2105, 2106, 2109, 2117, 2118,
-     2116, 2119, 2120, 2122, 2121, 2126, 2128, 2130, 2142, 2129,
-     2149, 6426, 2131, 6426, 2144, 2132, 2134, 2145, 2133, 2150,
-     2155, 2156, 6426, 6426, 2157, 2154, 2166, 2170, 2168, 6426,
+     1970, 6437, 1974, 1972, 1975, 1997, 1976, 1979, 1978, 1981,
+     1986, 1991, 1989, 1998, 1994, 2001, 2020, 2007, 2003, 2005,
+     2010, 2022, 2023, 2024, 2026, 2028, 2030, 2032, 2033, 2031,
+     2048, 2051, 2047, 2043, 2056, 2052, 2034, 2054, 2075, 2055,
+     2057, 2059, 2058, 2060, 2063, 2069, 2064, 2065, 2066, 2071,
+     2086, 2088, 2079, 2082, 2090, 2092, 2097, 2098, 2099, 6437,
+     2109, 2104, 2105, 2108, 2112, 2117, 2115, 2114, 6437, 2118,
+     2121, 2116, 2128, 2126, 2123, 2129, 2131, 2136, 2137, 2140,
+     2138, 2139, 2143, 2141, 2159, 6437, 2144, 6437, 2154, 2145,
+     2155, 2156, 2146, 2161, 2162, 2166, 6437, 6437, 2172, 2169,
 
-     2169, 2177, 6426, 2174, 2179, 2172, 2173, 2180, 2183, 2184,
-     2187, 2194, 2189, 2198, 2190, 2195, 2199, 6426, 2203, 2191,
-     2210, 2211, 2204, 2214, 2217, 2218, 6426, 2221, 2207, 2225,
-     2232, 2229, 2224, 2234, 2235, 2236, 2239, 2240, 2241, 2242,
-     2243, 2250, 2253, 2246, 2249, 2255, 2264, 6426, 2248, 2262,
-     2269, 2265, 2268, 2271, 2272, 2273, 2274, 2275, 2276, 2277,
-     2284, 2283, 2285, 2286, 2296, 2298, 2287, 2294, 2304, 2295,
-     2306, 2300, 2311, 2308, 2309, 2310, 2313, 6426, 2315, 2317,
-     2319,  171, 2321, 2322, 2324, 2323, 2331, 2333, 2325, 2347,
-     2348, 2327, 2344, 2350, 2346, 2353, 2354, 2355, 2356, 2357,
+     2179, 2181, 2173, 6437, 2182, 2189, 6437, 2190, 2184, 2185,
+     2192, 2193, 2195, 2197, 2196, 2206, 2201, 2208, 2203, 2214,
+     2215, 6437, 2204, 2205, 2217, 2220, 2216, 2223, 2230, 2224,
+     6437, 2227, 2231, 2234, 2243, 2239, 2241, 2242, 2245, 2251,
+     2244, 2246, 2249, 2253, 2254, 2261, 2263, 2259, 2266, 2268,
+     2276, 6437, 2272, 2258, 2280, 2277, 2284, 2279, 2285, 2275,
+     2281, 2286, 2292, 2287, 2291, 2297, 2299, 2301, 2308, 2309,
+     2304, 2305, 2307, 2312, 2313, 2314, 2321, 2316, 2323, 2318,
+     2322, 6437, 2324, 2329, 2325,  171, 2330, 2333, 2338, 2335,
+     2342, 2353, 2336, 2355, 2360, 2341, 2358, 1867, 2359, 2361,
 
-     2358, 2359, 2361, 6426, 2363, 2364, 2366, 2370, 2369, 2372,
-     2377, 6426, 2379, 2386, 2389, 2398, 2381, 2390, 2399, 2395,
-     2400, 2401, 2403, 2405, 2407, 2406, 2409, 2415, 2412, 6426,
-     2417, 2420, 2422, 2413, 2429, 2428, 2421, 2435, 2436, 2437,
-     2440, 2438, 2439, 2442, 2441, 2443, 2444, 2449, 2448, 2445,
-     2447, 2457, 2458, 2459, 2468, 2469, 2461, 2470, 2471, 6426,
-     2481, 2472, 2476, 2474, 2477, 2479, 2484, 2492, 2499, 2483,
-     2494, 2496, 2500, 2510, 2503, 2505, 2512, 2520, 2517, 2525,
-     2513, 2526, 2527, 2535, 2524, 2537, 2539, 2528, 2540, 2541,
-     2543, 2546, 2547, 2549, 2559, 2560, 2552, 2562, 2555, 2576,
+     2362, 2365, 2366, 2367, 2339, 2368, 2369, 6437, 2372, 2373,
+     2374, 2378, 2379, 2377, 2384, 6437, 2390, 2395, 2399, 2402,
+     2405, 2406, 2407, 2408, 2391, 2413, 2411, 2414, 2417, 2418,
+     2421, 2415, 2419, 6437, 2425, 2431, 2432, 2428, 2434, 2440,
+     2441, 2430, 2442, 2443, 2446, 2449, 2447, 2451, 2452, 2453,
+     2455, 2459, 2460, 2456, 2461, 2468, 2467, 2466, 2472, 2469,
+     2470, 2478, 2479, 6437, 2486, 2483, 2487, 2489, 2490, 2491,
+     2500, 2492, 2509, 2494, 2502, 2506, 2511, 2520, 2514, 2515,
+     2523, 2530, 2532, 2526, 2540, 2536, 2542, 2544, 2538, 2548,
+     2550, 2546, 2551, 2552, 2554, 2557, 2556, 2558, 2571, 2573,
 
-     2581, 2572, 6426, 2570, 2565, 2568, 2582, 2590, 2585, 2587,
-     2588, 2592, 2595, 2596, 2597, 2598, 2605, 2600, 2602, 2603,
-     2608, 2607, 2611, 2614, 2618, 2619, 2623, 2625, 2627, 2628,
-     6426, 2631, 2633, 2629, 2635, 2637, 2639, 2642, 2645, 2647,
-     2649, 2650, 2654, 2655, 2657, 2656, 2658, 2664, 2665, 2651,
-     6426, 2674, 2666, 2678, 2668, 2679, 2672, 2685, 2686, 2687,
-     2661, 2688, 2691, 2694, 2695, 2697, 6426, 2704, 2705, 2696,
-     2712, 2707, 2703, 2708, 2714, 2711, 6426, 2715, 2717, 2718,
-     2726, 2727, 2723, 6426, 2734, 2724, 2725, 2732, 2735, 2736,
-     2733, 2739, 2742, 2743, 2746, 2748, 2755, 2749, 2756, 6426,
+     2563, 2518, 2572, 2577, 2582, 2564, 6437, 2583, 2584, 2585,
+     2589, 2597, 2593, 2594, 2595, 2601, 2604, 2605, 2606, 2607,
+     2614, 2609, 2611, 2612, 2617, 2618, 2620, 2623, 2627, 2628,
+     2631, 2634, 2636, 2380, 6437, 2637, 2638, 2639, 2642, 2645,
+     2646, 2648, 2653, 2650, 2656, 2657, 2660, 2661, 2662, 2663,
+     2664, 2667, 2668, 2671, 6437, 2672, 2673, 2674, 2680, 2682,
+     2684, 2685, 2693, 2686, 2697, 2695, 2699, 2701, 2702, 2703,
+     6437, 2710, 2711, 2708, 2712, 2714, 2715, 2718, 2720, 2721,
+     6437, 2722, 2724, 2725, 2732, 2733, 2730, 6437, 2745, 2735,
+     2731, 2738, 2728, 2742, 2743, 2746, 2750, 2752, 2753, 2754,
 
-     2757, 2766, 2759, 2758, 2763, 2769, 2770, 2773, 2774, 2775,
-     2778, 2781, 6426, 2792, 2789, 2787, 2800, 2790, 2530, 2796,
-     2797, 2801, 2803, 2804, 2805, 2807, 6426, 2808, 2811, 2812,
-     2815, 2813, 2818, 2819, 2826, 2823, 2825, 2828, 2831, 2832,
-     2833, 2834, 2841, 2840, 2837, 2849, 2850, 2853, 2854, 2856,
-     2859, 2867, 2870, 2843, 2866, 2869, 2862, 2871, 2872, 2879,
-     2880, 2887, 2882, 2884, 6426, 2889, 2886, 2891, 2893, 2894,
-     2895, 2897, 2896, 2898, 2901, 2902, 2908, 2904, 2905, 2920,
-     2923, 2907, 2915, 2925, 2926, 2928, 2929, 2930, 2931, 2932,
-     2939, 2935, 2936, 2947, 2938, 2942, 2952, 2953, 2954, 2955,
+     2763, 2757, 2760, 6437, 2764, 2773, 2766, 2769, 2768, 2774,
+     2775, 2779, 2781, 2782, 2785, 2792, 6437, 2799, 2796, 2798,
+     2808, 2795, 2801, 2803, 2805, 2811, 2804, 2812, 2813, 2815,
+     6437, 2817, 2819, 2820, 2823, 2825, 2826, 2828, 2836, 2833,
+     2834, 2840, 2841, 2842, 2839, 2843, 2852, 2846, 2849, 2855,
+     2860, 2850, 2862, 2863, 2868, 2872, 2876, 2873, 2875, 2878,
+     2877, 2879, 2880, 2888, 2892, 2895, 2890, 2896, 6437, 2899,
+     2901, 2894, 2902, 2904, 2907, 2908, 2906, 2909, 2911, 2914,
+     2912, 2915, 2918, 2925, 2933, 2926, 2934, 2928, 2930, 2936,
+     2938, 2939, 2940, 2941, 2948, 2950, 2944, 2957, 2952, 2956,
 
-     2956, 2963, 2943, 2961, 2958, 2965, 2966, 2970, 2980, 2981,
-     2967, 2982, 2983, 2984, 2985, 6426, 2988, 2989, 2990, 2993,
-     2996, 2999, 3002, 3009, 3000, 3001, 3011, 3017, 3018, 3008,
-     3019, 3010, 3026, 3024, 6426, 3025, 6426, 3027, 3029, 3031,
-     3039, 3035, 6426, 3041, 6426, 3042, 3047, 3036, 3038, 6426,
-     3050, 3044, 3049, 3056, 3051, 3059, 3060, 3062, 3061, 3068,
-     3063, 3065, 3070, 3071, 3073, 3076, 3074, 3081, 3082, 3086,
-     3090, 3091, 3078, 3102, 3084, 3094, 3100, 3092, 3107, 6426,
-     3109, 3097, 3110, 3115, 3114, 3116, 3117, 3118, 3120, 3121,
-     3123, 3127, 3122, 3132, 3124, 3136, 3135, 3145, 3146, 3153,
+     2967, 2953, 2954, 2963, 2964, 2965, 2966, 2969, 2974, 2977,
+     2976, 2986, 2990, 2991, 2993, 2968, 2992, 2994, 2998, 6437,
+     2995, 3003, 2999, 3002, 3005, 3010, 3006, 3018, 3015, 3016,
+     3019, 3023, 3028, 3020, 3025, 3026, 3037, 3034, 6437, 3035,
+     6437, 3036, 3039, 3041, 3051, 3038, 6437, 3048, 6437, 3049,
+     3055, 3050, 3056, 6437, 3059, 3060, 3061, 3063, 3067, 3065,
+     3068, 3069, 3071, 3075, 3079, 3073, 3077, 3078, 3081, 3083,
+     3090, 3089, 3093, 3094, 3096, 3102, 3097, 3099, 3105, 3108,
+     3110, 3111, 3113, 6437, 3116, 3112, 3120, 3121, 3122, 3123,
+     3124, 3125, 3129, 3131, 3132, 3140, 3136, 3143, 3133, 3144,
 
-     6426, 3148, 3150, 3151, 3152, 6426, 3154, 3155, 3156, 3160,
-     3163, 3164, 3165, 3168, 3172, 3167, 3169, 3174, 3183, 3184,
-     3187, 3188, 6426, 3190, 3193, 3175, 3202, 3196, 3203, 3210,
-     3206, 3208, 3212, 3220, 3216, 3215, 3217, 3218, 3219, 3222,
-     3229, 3230, 3226, 3233, 3232, 3236, 3243, 3240, 3234, 3238,
-     3244, 3246, 3247, 3248, 3249, 3250, 3253, 3254, 3251, 6426,
-     3259, 3265, 3263, 3272, 3268, 3269, 3273, 3278, 3274, 6426,
-     3280, 3281, 3282, 3284, 3289, 3283, 3286, 3291, 3294, 3297,
-     3299, 3302, 3304, 3303, 6426, 3305, 6426, 3307, 3308, 3318,
-     3322, 3323, 3310, 3324, 3330, 3326, 3331, 3333, 3336, 3334,
+     3150, 3160, 3147, 3162, 6437, 3157, 3159, 3161, 3163, 6437,
+     3165, 3164, 3172, 3174, 3168, 3166, 3176, 3178, 3185, 3177,
+     3187, 3183, 3190, 3198, 3189, 3197, 6437, 3201, 3202, 3179,
+     3206, 3212, 3219, 3220, 3217, 3223, 3225, 3221, 3227, 3205,
+     3228, 3229, 3230, 3231, 3239, 3241, 3237, 3244, 3236, 3240,
+     3252, 3249, 3243, 3247, 3253, 3255, 3256, 3257, 3258, 3260,
+     3262, 3263, 3264, 6437, 3268, 3272, 3274, 3281, 3277, 3278,
+     3279, 3282, 3286, 6437, 3289, 3290, 3293, 3291, 3300, 3302,
+     3292, 3295, 3304, 3305, 3308, 3309, 3312, 3311, 6437, 3313,
+     6437, 3315, 3326, 3331, 3335, 3320, 3318, 3338, 3343, 3337,
 
-     3340, 3337, 3342, 3343, 3345, 3357, 3348, 3344, 3349, 3358,
-     3359, 3363, 3360, 6426, 6426, 3365, 3366, 3367, 3369, 3371,
-     3370, 3377, 3374, 3382, 3381, 3388, 3389, 3397, 6426, 3394,
-     3395, 3393, 3398, 3406, 3401, 3405, 3417, 3413, 3420, 3416,
-     6426, 3412, 3421, 3429, 3424, 3425, 3433, 6426, 3430, 6426,
-     3426, 3431, 3436, 3439, 3440, 3441, 3442, 3443, 3447, 3455,
-     3458, 3451, 3460, 3461, 3462, 3463, 3466, 3470, 3473, 3469,
-     3471, 3472, 6426, 3475, 3476, 3484, 3489, 3492, 3493, 3477,
-     3478, 6426, 3495, 3485, 3503, 3499, 3504, 3505, 3509, 3506,
-     3510, 3511, 3513, 6426, 3512, 3514, 3521, 3526, 3519, 3522,
+     3325, 3346, 3347, 3339, 3345, 3348, 3349, 3353, 3354, 3366,
+     3356, 3359, 3364, 3367, 3369, 3370, 3372, 6437, 6437, 3371,
+     3373, 3374, 3376, 3378, 3388, 3380, 3389, 3394, 3382, 3390,
+     3397, 3408, 6437, 3403, 3404, 3405, 3409, 3412, 3410, 3421,
+     3422, 3413, 3429, 3424, 6437, 3425, 3426, 3437, 3433, 3432,
+     3442, 6437, 3439, 6437, 3434, 3438, 3443, 3449, 3448, 3450,
+     3452, 3454, 3456, 3465, 3470, 3460, 3472, 3462, 3467, 3469,
+     3475, 3476, 3484, 3479, 3480, 3481, 6437, 3487, 3483, 3490,
+     3492, 3493, 3495, 3502, 3491, 6437, 3504, 3505, 3507, 3508,
+     3509, 3510, 3513, 3517, 3515, 3518, 3523, 6437, 3519, 3524,
 
-     3530, 3532, 3540, 6426, 3536, 3533, 3549, 3545, 3546, 3548,
-     3551, 3527, 3552, 3553, 3555, 3556, 3557, 3559, 3560, 3563,
-     3564, 3566, 3565, 3577, 3576, 3579, 3584, 3586, 3570, 6426,
-     3587, 3590, 3592, 3593, 3595, 3596, 3598, 3601, 3603, 3604,
-     3615, 3616, 3605, 3607, 3619, 3621, 3629, 3627, 6426, 3637,
-     3620, 3639, 3611, 3632, 3641, 3622, 3643, 3645, 3634, 3646,
-     3647, 3650, 3653, 3660, 3656, 3657, 3655, 3659, 3671, 3661,
-     6426, 3684, 3662, 3672, 3664, 3663, 3680, 3688, 3685, 3686,
-     3689, 3691, 3692, 3696, 3693, 3698, 3699, 3702, 3703, 6426,
-     6426, 3705, 3707, 3708, 6426, 3712, 3709, 3722, 3715, 3719,
+     3532, 3525, 3528, 3533, 3541, 3542, 3548, 6437, 3549, 3534,
+     3556, 3552, 3553, 3555, 3558, 3559, 3560, 3562, 3563, 3564,
+     3566, 3567, 3572, 3568, 3570, 3577, 3573, 3585, 3587, 3574,
+     3595, 3602, 3588, 6437, 3591, 3598, 3600, 3601, 3603, 3604,
+     3606, 3612, 3614, 3608, 3623, 3624, 3615, 3619, 3627, 3629,
+     3637, 3632, 6437, 3644, 3630, 3645, 3634, 3643, 3642, 3647,
+     3649, 3651, 3653, 3652, 3655, 3656, 3658, 3670, 3662, 3665,
+     3661, 3666, 3677, 3669, 6437, 3684, 3680, 3672, 3688, 3682,
+     3691, 3698, 3695, 3696, 3697, 3700, 3701, 3702, 3705, 3707,
+     3708, 3711, 3712, 6437, 6437, 3714, 3715, 3717, 6437, 3719,
 
-     3711, 3724, 3725, 3727, 3728, 3733, 3735, 6426, 3736, 3743,
-     3738, 3739, 3748, 3750, 3755, 3747, 3756, 3749, 3745, 3760,
-     3763, 3757, 3761, 3767, 3776, 3777, 3762, 3773, 3774, 6426,
-     3779, 3780, 3781, 3784, 3785, 3790, 6426, 3789, 3791, 3792,
-     3797, 3801, 3803, 3809, 3811, 3793, 3812, 3796, 3813, 3816,
-     3817, 3827, 3819, 3823, 3830, 3831, 3835, 6426, 3824, 3838,
-     3822, 3841, 6426, 3844, 3851, 3852, 6426, 3853, 3848, 3855,
-     3856, 3863, 6426, 3858, 3861, 3859, 3862, 3872, 3864, 3873,
-     3875, 3869, 6426, 3876, 3877, 3878, 6426, 3879, 3884, 3890,
-     3892, 3893, 3900, 3895, 3897, 3898, 3899, 6426, 3905, 6426,
+     3720, 3730, 3722, 3723, 3731, 3735, 3734, 3733, 3736, 3738,
+     3739, 6437, 3745, 3753, 3748, 3749, 3757, 3758, 3761, 3762,
+     3754, 3765, 3769, 3766, 3770, 3771, 3772, 3774, 3782, 3783,
+     3779, 3780, 3786, 6437, 3781, 3787, 3791, 3793, 3784, 3797,
+     6437, 3794, 3800, 3802, 3805, 3811, 3815, 3807, 3817, 3820,
+     3821, 3824, 3822, 3825, 3826, 3834, 3829, 3831, 3833, 3837,
+     3847, 6437, 3830, 3842, 3840, 3849, 6437, 3855, 3862, 3863,
+     6437, 3865, 3850, 3864, 3866, 3873, 6437, 3868, 3870, 3871,
+     3852, 3881, 3872, 3885, 3882, 3884, 6437, 3886, 3888, 3890,
+     6437, 3889, 3899, 3902, 3904, 3891, 3912, 3908, 3905, 3909,
 
-     3903, 3907, 3911, 6426, 3909, 3914, 3915, 3917, 3918, 3923,
-     3924, 3922, 3931, 3932, 3933, 3935, 3936, 3934, 3939, 3943,
-     3940, 3941, 3945, 3946, 6426, 3947, 3949, 3956, 3951, 3961,
-     3957, 3964, 3954, 3968, 3969, 6426, 6426, 3978, 6426, 3980,
-     3970, 3972, 6426, 3974, 3979, 3987, 3984, 3990, 3992, 3996,
-     3997, 6426, 3999, 4002, 6426, 3985, 4000, 4010, 4007, 4009,
-     4012, 4015, 4011, 4013, 4017, 4018, 4021, 4023, 4019, 4022,
-     4027, 6426, 4024, 4025, 4026, 4040, 4041, 4042, 4047, 4049,
-     4043, 6426, 4051, 4053, 4052, 4060, 4057, 6426, 4058, 6426,
-     4061, 4066, 4068, 4069, 4072, 6426, 4074, 4073, 4078, 4081,
+     3913, 6437, 3916, 6437, 3917, 3918, 3923, 6437, 3919, 3925,
+     3927, 3929, 3926, 3933, 3934, 3940, 3942, 3936, 3944, 3945,
+     3946, 3893, 3947, 3954, 3949, 3950, 3951, 3957, 6437, 3960,
+     3955, 3966, 3958, 3976, 3970, 3962, 3964, 3981, 3980, 6437,
+     6437, 3983, 6437, 3984, 3988, 3989, 6437, 3991, 3994, 3996,
+     3992, 3997, 3999, 4003, 4007, 6437, 4011, 4012, 6437, 3995,
+     4014, 4022, 4017, 4019, 4023, 4025, 4021, 4027, 4028, 4032,
+     4031, 4033, 4029, 4034, 4047, 6437, 4036, 4035, 4038, 4052,
+     4039, 4042, 4060, 4054, 4061, 6437, 4064, 4065, 4068, 4070,
+     4071, 6437, 4073, 6437, 4072, 4074, 4076, 4077, 4080, 6437,
 
-     4083, 4082, 4085, 4089, 4086, 4092, 4099, 4095, 4096, 4097,
-     6426, 4098, 4101, 4103, 4110, 4106, 4108, 4119, 4118, 4114,
-     4120, 4124, 4126, 4122, 4129, 4135, 4133, 4139, 4127, 6426,
-     4137, 4141, 4131, 4154, 4147, 4150, 6426, 4151, 4155, 4159,
-     6426, 4157, 4158, 4165, 4167, 4161, 4168, 4169, 4173, 4175,
-     6426, 4171, 4172, 4176, 4177, 4188, 4180, 6426, 6426, 4191,
-     6426, 4192, 4181, 4194, 4195, 4199, 4202, 4201, 4203, 4206,
-     4207, 4214, 4215, 4208, 4216, 4223, 4225, 4233, 4228, 4229,
-     4230, 6426, 6426, 4235, 4239, 4232, 4243, 4244, 4236, 4246,
-     4253, 4251, 4257, 4260, 4261, 4255, 6426, 4263, 4252, 4269,
+     4085, 4084, 4092, 4089, 4095, 4094, 4097, 4101, 4093, 4103,
+     4110, 4107, 4105, 4108, 6437, 4109, 4113, 4120, 4121, 4114,
+     4117, 4130, 4126, 4132, 4125, 4133, 4136, 4138, 4139, 4144,
+     4142, 4147, 4146, 6437, 4148, 4153, 4154, 4162, 4158, 4159,
+     6437, 4165, 4163, 4169, 6437, 4166, 4170, 4172, 4183, 4173,
+     4176, 4180, 4178, 4184, 6437, 4185, 4186, 4187, 4188, 4195,
+     4201, 6437, 6437, 4202, 6437, 4203, 4189, 4204, 4205, 4206,
+     4211, 4214, 4215, 4217, 4218, 4222, 4225, 4227, 4228, 4235,
+     4238, 4239, 4241, 4243, 4236, 6437, 6437, 4246, 4247, 4249,
+     4253, 4254, 4257, 4242, 4265, 4261, 4263, 4268, 4270, 4277,
 
-     4262, 6426, 4268, 4270, 4271, 4274, 4276, 4277, 4280, 4278,
-     4279, 4283, 4286, 4287, 4288, 4292, 4290, 4299, 4300, 4301,
-     4302, 4306, 4304, 4309, 6426, 4310, 4311, 4313, 4314, 4315,
-     4321, 4323, 4324, 4325, 6426, 4326, 6426, 4329, 4331, 4327,
-     4347, 4335, 4338, 4348, 4350, 4352, 4354, 4355, 4358, 4359,
-     4365, 4353, 4360, 4369, 4362, 4376, 4378, 4379, 6426, 4380,
-     4372, 4381, 4382, 4387, 4389, 4383, 4391, 4393, 4396, 4397,
-     4398, 4400, 4405, 4406, 4407, 4408, 4409, 6426, 4410, 4414,
-     4417, 4419, 4421, 4423, 4424, 4425, 4431, 4432, 4433, 4434,
-     4438, 6426, 4435, 4440, 4442, 4443, 4445, 4446, 4449, 4452,
+     6437, 4272, 4274, 4278, 4279, 6437, 4280, 4281, 4283, 4285,
+     4284, 4290, 4287, 4291, 4288, 4292, 4296, 4297, 4298, 4302,
+     4304, 4309, 4310, 4312, 4315, 4316, 4317, 4319, 6437, 4324,
+     4321, 4323, 4325, 4326, 4328, 4333, 4334, 4336, 6437, 4337,
+     6437, 4338, 4339, 4343, 4356, 4345, 4355, 4359, 4361, 4363,
+     4365, 4366, 4369, 4370, 4376, 4364, 4371, 4380, 4373, 4387,
+     4389, 4390, 6437, 4391, 4383, 4392, 4393, 4398, 4400, 4394,
+     4402, 4404, 4407, 4408, 4409, 4411, 4416, 4417, 4418, 4419,
+     4420, 6437, 4421, 4425, 4428, 4430, 4432, 4434, 4435, 4436,
+     4442, 4443, 4444, 4445, 4449, 6437, 4446, 4451, 4453, 4454,
 
-     4456, 6426, 4459, 4450, 4461, 4460, 4462, 4464, 4466, 4472,
-     4469, 4475, 4476, 6426, 4481, 4483, 4484, 4485, 4486, 4487,
-     4490, 4491, 6426, 4497, 4498, 4500, 4507, 4504, 4511, 4509,
-     4513, 4506, 4516, 4519, 4512, 4523, 4524, 4526, 4520, 4536,
-     4543, 4538, 6426, 4527, 6426, 4539, 4540, 4550, 4545, 4551,
-     4549, 6426, 4552, 4557, 4559, 4555, 4553, 6426, 4560, 4561,
-     4563, 4564, 6426, 4579, 4575, 4565, 4574, 4567, 4583, 6426,
-     4588, 4589, 4590, 4597, 4599, 4594, 4601, 4596, 4604, 4602,
-     4598, 4606, 4607, 4615, 4613, 4611, 6426, 4617, 4619, 4624,
-     4626, 4620, 4628, 4618, 4630, 4633, 4635, 6426, 4636, 4639,
+     4456, 4457, 4460, 4463, 4467, 6437, 4470, 4461, 4472, 4471,
+     4473, 4475, 4477, 4483, 4480, 4486, 4487, 6437, 4492, 4494,
+     4495, 4496, 4497, 4498, 4501, 4502, 6437, 4508, 4509, 4511,
+     4518, 4515, 4522, 4520, 4524, 4517, 4527, 4530, 4523, 4534,
+     4535, 4537, 4531, 4547, 4554, 4549, 6437, 4538, 6437, 4550,
+     4551, 4561, 4556, 4562, 4560, 6437, 4563, 4568, 4570, 4566,
+     4564, 6437, 4571, 4572, 4574, 4575, 6437, 4590, 4586, 4576,
+     4585, 4578, 4594, 6437, 4599, 4600, 4601, 4608, 4610, 4605,
+     4612, 4607, 4615, 4613, 4609, 4617, 4618, 4626, 4624, 4622,
+     6437, 4628, 4630, 4635, 4637, 4631, 4639, 4629, 4641, 4644,
 
-     4640, 4642, 4643, 4644, 4645, 4652, 4649, 4651, 4653, 4654,
-     4657, 4658, 6426, 4663, 4661, 4665, 4674, 4676, 4678, 6426,
-     4681, 6426, 4671, 4666, 4683, 4682, 4687, 6426, 6426, 4689,
-     4697, 4692, 4695, 4696, 6426, 6426, 4699, 6426, 4700, 6426,
-     4701, 4703, 6426, 6426, 4702, 4706, 4709, 4711, 4713, 6426,
-     4721, 6426, 4723, 4724, 4710, 4722, 4728, 6426, 4727, 4729,
-     4731, 6426, 4734, 4742, 4735, 4737, 6426, 4739, 4745, 4740,
-     4747, 6426, 4749, 4755, 4751, 4757, 4758, 4761, 4760, 4763,
-     4764, 4768, 4769, 4770, 4771, 4773, 4782, 4784, 4786, 4779,
-     4787, 4788, 4794, 4796, 4789, 4792, 4798, 4799, 4803, 4800,
+     4646, 6437, 4647, 4650, 4651, 4653, 4654, 4655, 4656, 4663,
+     4660, 4662, 4664, 4665, 4668, 4669, 6437, 4674, 4672, 4676,
+     4685, 4687, 4689, 6437, 4692, 6437, 4682, 4677, 4694, 4693,
+     4698, 6437, 6437, 4700, 4708, 4703, 4706, 4707, 6437, 6437,
+     4710, 6437, 4711, 6437, 4712, 4714, 6437, 6437, 4713, 4717,
+     4720, 4722, 4724, 6437, 4732, 6437, 4734, 4735, 4721, 4733,
+     4739, 6437, 4738, 4740, 4742, 6437, 4745, 4753, 4746, 4748,
+     6437, 4750, 4756, 4751, 4758, 6437, 4760, 4766, 4762, 4768,
+     4769, 4772, 4771, 4774, 4775, 4779, 4780, 4781, 4782, 4784,
+     4793, 4795, 4797, 4790, 4798, 4799, 4805, 4807, 4800, 4803,
 
-     4807, 4809, 4810, 4811, 4813, 4812, 4814, 4817, 4816, 4825,
-     4827, 4828, 4829, 4830, 4831, 4832, 4833, 4839, 4840, 4843,
-     4838, 4842, 6426, 4846, 4848, 4835, 4859, 4849, 4860, 4861,
-     4868, 4872, 4873, 6426, 4875, 6426, 4877, 4869, 4879, 4880,
-     4881, 6426, 4882, 4883, 4884, 4885, 4886, 4888, 4889, 4892,
-     4893, 4897, 4903, 6426, 4910, 4900, 4894, 4898, 4918, 6426,
-     4913, 4920, 4921, 4923, 4924, 4925, 4926, 4927, 4930, 4928,
-     4933, 4935, 4929, 4936, 4937, 4951, 4953, 4948, 4938, 4955,
-     4957, 4958, 4959, 4960, 4961, 4962, 4963, 4969, 4971, 4975,
-     6426, 4966, 6426, 4977, 4978, 4979, 4982, 4983, 4984, 4987,
+     4809, 4810, 4814, 4811, 4818, 4820, 4821, 4822, 4824, 4823,
+     4825, 4828, 4827, 4836, 4838, 4839, 4840, 4841, 4842, 4843,
+     4844, 4850, 4851, 4854, 4849, 4853, 6437, 4857, 4859, 4846,
+     4870, 4860, 4871, 4872, 4879, 4883, 4884, 6437, 4886, 6437,
+     4888, 4880, 4890, 4891, 4892, 6437, 4893, 4894, 4895, 4896,
+     4897, 4899, 4900, 4903, 4904, 4908, 4914, 6437, 4921, 4911,
+     4905, 4909, 4929, 6437, 4924, 4931, 4932, 4934, 4935, 4936,
+     4937, 4938, 4941, 4939, 4944, 4946, 4940, 4947, 4948, 4962,
+     4964, 4959, 4949, 4966, 4968, 4969, 4970, 4971, 4972, 4973,
+     4974, 4980, 4982, 4986, 6437, 4977, 6437, 4988, 4989, 4990,
 
-     6426, 6426, 4989, 4990, 4995, 4992, 4996, 4999, 5001, 6426,
-     5000, 5008, 5011, 5003, 6426, 5013, 5017, 5018, 5020, 6426,
-     5021, 5022, 5023, 5025, 5026, 5030, 5034, 5032, 5035, 5036,
-     5043, 6426, 6426, 6426, 6426, 5046, 5040, 5050, 5044, 5052,
-     5054, 5055, 5059, 5053, 6426, 5061, 6426, 6426, 5066, 5067,
-     5056, 5069, 5073, 5075, 5076, 5078, 6426, 5077, 5079, 5082,
-     5080, 5089, 5091, 5097, 5093, 5098, 5083, 5099, 5108, 5104,
-     5105, 5107, 5110, 5112, 5114, 6426, 6426, 5116, 5119, 5120,
-     5127, 5125, 5128, 5124, 5137, 5132, 5134, 5135, 5140, 5141,
-     5142, 5151, 5152, 5143, 5147, 6426, 5150, 5153, 5161, 6426,
+     4993, 4994, 4995, 4998, 6437, 6437, 5000, 5001, 5006, 5003,
+     5007, 5010, 5012, 6437, 5011, 5019, 5022, 5014, 6437, 5024,
+     5028, 5029, 5031, 6437, 5032, 5033, 5034, 5036, 5037, 5041,
+     5045, 5043, 5046, 5047, 5054, 6437, 6437, 6437, 6437, 5057,
+     5051, 5061, 5055, 5063, 5065, 5066, 5070, 5064, 6437, 5072,
+     6437, 6437, 5077, 5078, 5067, 5080, 5084, 5086, 5087, 5089,
+     6437, 5088, 5090, 5093, 5091, 5100, 5102, 5108, 5104, 5109,
+     5094, 5110, 5119, 5115, 5116, 5118, 5121, 5123, 5125, 6437,
+     6437, 5127, 5130, 5131, 5138, 5136, 5139, 5135, 5148, 5143,
+     5145, 5146, 5151, 5152, 5153, 5162, 5163, 5154, 5158, 6437,
 
-     5154, 6426, 5160, 5162, 5156, 5168, 5169, 5170, 5171, 5173,
-     6426, 6426, 5175, 5183, 5180, 6426, 6426, 5176, 5184, 5187,
-     5189, 5185, 5190, 5191, 5196, 5198, 5194, 6426, 5199, 6426,
-     5201, 5203, 5216, 5202, 5218, 5223, 5225, 5229, 5222, 5205,
-     6426, 5224, 5226, 6426, 5231, 5220, 5232, 6426, 5236, 5238,
-     5241, 5243, 6426, 5245, 5246, 5248, 6426, 5252, 6426, 5249,
-     5254, 5255, 5263, 6426, 5258, 5260, 6426, 5265, 5271, 5272,
-     5266, 6426, 5268, 6426, 5273, 5277, 5280, 5283, 5274, 5285,
-     5287, 5288, 5290, 5297, 5295, 5292, 6426, 6426,  135, 5308,
-     5298, 5299, 5303, 5305, 5315, 5301, 5310, 5313, 6426, 6426,
+     5161, 5164, 5172, 6437, 5165, 6437, 5171, 5173, 5167, 5179,
+     5180, 5181, 5182, 5184, 6437, 6437, 5186, 5194, 5191, 6437,
+     6437, 5187, 5195, 5198, 5200, 5196, 5201, 5202, 5207, 5209,
+     5205, 6437, 5210, 6437, 5212, 5214, 5227, 5213, 5229, 5234,
+     5236, 5240, 5233, 5216, 6437, 5235, 5237, 6437, 5242, 5231,
+     5243, 6437, 5247, 5249, 5252, 5254, 6437, 5256, 5257, 5259,
+     6437, 5263, 6437, 5260, 5265, 5266, 5274, 6437, 5269, 5271,
+     6437, 5276, 5282, 5283, 5277, 6437, 5279, 6437, 5284, 5288,
+     5291, 5294, 5285, 5296, 5298, 5299, 5301, 5308, 5306, 5303,
+     6437, 6437,  135, 5319, 5309, 5310, 5314, 5316, 5326, 5312,
 
-     5317, 6426, 5316, 5325, 6426, 5318, 5327, 5331, 5320, 5329,
-     5333, 5335, 5336, 5340, 5342, 5341, 5345, 5346, 5349, 5354,
-     5364, 5347, 5361, 5367, 5369, 5371, 5373, 5362, 5375, 5376,
-     5377, 5379, 5381, 5382, 5383, 5385, 5386, 6426, 5389, 5391,
-     5394, 5393, 6426, 5399, 5395, 5408, 5404, 6426, 5413, 5401,
-     5414, 5415, 6426, 5416, 5418, 5421, 5419, 5420, 5432, 5427,
-     5429, 5433, 6426, 6426, 6426, 5436, 5443, 6426, 5445, 5439,
-     5422, 5430, 6426, 5446, 5449, 6426, 6426, 5450, 5451, 5452,
-     5462, 6426, 5454, 6426, 5457, 6426, 5458, 5459, 5467, 5465,
-     6426, 5471, 5469, 6426, 5480, 5482, 5484, 5477, 5485, 5487,
+     5321, 5324, 6437, 6437, 5328, 6437, 5327, 5336, 6437, 5329,
+     5338, 5342, 5331, 5340, 5344, 5346, 5347, 5351, 5353, 5352,
+     5356, 5357, 5360, 5365, 5375, 5358, 5372, 5378, 5380, 5382,
+     5384, 5373, 5386, 5387, 5388, 5390, 5392, 5393, 5394, 5396,
+     5397, 6437, 5400, 5402, 5405, 5404, 6437, 5410, 5406, 5419,
+     5415, 6437, 5424, 5412, 5425, 5426, 6437, 5427, 5429, 5432,
+     5430, 5431, 5443, 5438, 5440, 5444, 6437, 6437, 6437, 5447,
+     5454, 6437, 5456, 5450, 5433, 5441, 6437, 5457, 5460, 6437,
+     6437, 5461, 5462, 5463, 5473, 6437, 5465, 6437, 5468, 6437,
+     5469, 5470, 5478, 5476, 6437, 5482, 5480, 6437, 5491, 5493,
 
-     5488, 6426, 5495, 5491, 5492, 5499, 5490, 5500, 5494, 5502,
-     5501, 5509, 5504, 5511, 6426, 5513, 5516, 5518, 5524, 5514,
-     5520, 5522, 6426, 5526, 6426, 5528, 6426, 5530, 5531, 5532,
-     5538, 5534, 5539, 5540, 5549, 5541, 5551, 5545, 5552, 5556,
-     5553, 6426, 6426, 5562, 5565, 6426, 5559, 6426, 5567, 6426,
-     5557, 5568, 5569, 5570, 6426, 5577, 5571, 5574, 5579, 6426,
-     5581, 5586, 5583, 5588, 6426, 6426, 5589, 5596, 5594, 5592,
-     5604, 5606, 5593, 5608, 5601, 5610, 5595, 5617, 5616, 5618,
-     5620, 5622, 5623, 5624, 6426, 6426, 6426, 5629, 5628, 5637,
-     5633, 5636, 5644, 5634, 6426, 5642, 5646, 5649, 5643, 5656,
+     5495, 5488, 5496, 5498, 5499, 6437, 5506, 5502, 5503, 5510,
+     5501, 5511, 5505, 5513, 5512, 5520, 5515, 5522, 6437, 5524,
+     5527, 5529, 5535, 5525, 5531, 5533, 6437, 5537, 6437, 5539,
+     6437, 5541, 5542, 5543, 5549, 5545, 5550, 5551, 5560, 5552,
+     5562, 5556, 5563, 5567, 5564, 6437, 6437, 5573, 5576, 6437,
+     5570, 6437, 5578, 6437, 5568, 5579, 5580, 5581, 6437, 5588,
+     5582, 5585, 5590, 6437, 5592, 5597, 5594, 5599, 6437, 6437,
+     5600, 5607, 5605, 5603, 5615, 5617, 5604, 5619, 5612, 5621,
+     5606, 5628, 5627, 5629, 5631, 5633, 5634, 5635, 6437, 6437,
+     6437, 5640, 5639, 5648, 5644, 5647, 5655, 5645, 6437, 5653,
 
-     5651, 5658, 6426, 5653, 5655, 5659, 5661, 5664, 5660, 5666,
-     5667, 6426, 5671, 5678, 5675, 5672, 5683, 5690, 5692, 5694,
-     5685, 5681, 5701, 5697, 6426, 5700, 6426, 6426, 5687, 6426,
-     5696, 5703, 5704, 5708, 6426, 5711, 5705, 5712, 5713, 5715,
-     5717, 6426, 5727, 5720, 5723, 5724, 6426, 6426, 5731, 6426,
-     5734, 5736, 5735, 5743, 5738, 5739, 5745, 5746, 6426, 5728,
-     5752, 5753, 5754, 5755, 6426, 5756, 5757, 5759, 5760, 6426,
-     5763, 5762, 5765, 5767, 5768, 6426, 5769, 5770, 5777, 5784,
-     6426, 5775, 5791, 5785, 6426, 6426, 5787, 5793, 5796, 6426,
-     6426, 6426, 5802, 5799, 5797, 5806, 6426, 5808, 5812, 5817,
+     5657, 5660, 5654, 5667, 5662, 5669, 6437, 5664, 5666, 5670,
+     5672, 5675, 5671, 5677, 5678, 6437, 5682, 5689, 5686, 5683,
+     5694, 5701, 5703, 5705, 5696, 5692, 5712, 5708, 6437, 5711,
+     6437, 6437, 5698, 6437, 5707, 5714, 5715, 5719, 6437, 5722,
+     5716, 5723, 5724, 5726, 5728, 6437, 5738, 5731, 5734, 5735,
+     6437, 6437, 5742, 6437, 5745, 5747, 5746, 5754, 5749, 5750,
+     5756, 5757, 6437, 5739, 5763, 5764, 5765, 5766, 6437, 5767,
+     5768, 5770, 5771, 6437, 5774, 5773, 5776, 5778, 5779, 6437,
+     5780, 5781, 5788, 5795, 6437, 5786, 5802, 5796, 6437, 6437,
+     5798, 5804, 5807, 6437, 6437, 6437, 5813, 5810, 5808, 5817,
 
-     5821, 5820, 6426, 5823, 5811, 5813, 6426, 6426, 5825, 5826,
-     5828, 5831, 6426, 6426, 5832, 5834, 5835, 5838, 5836, 6426,
-     5837, 5840, 5842, 5853, 5859, 5848, 5856, 5860, 5868, 5850,
-     5854, 5865, 5864, 5866, 5870, 5873, 5877, 5884, 5881, 5883,
-     5889, 5886, 5890, 6426, 6426, 5894, 6426, 5897, 5891, 6426,
-     6426, 5899, 5903, 5905, 5907, 5909, 5911, 5913, 6426, 5914,
-     5916, 5917, 5918, 5919, 6426, 5921, 5925, 5920, 5928, 5922,
-     5931, 5927, 5937, 6426, 6426, 5929, 5943, 5933, 5944, 5938,
-     6426, 5948, 5955, 5950, 5952, 5953, 5958, 5954, 6426, 5960,
-     5962, 6426, 6426, 5961, 5963, 6426, 6426, 5967, 6426, 6426,
+     6437, 5819, 5823, 5828, 5832, 5831, 6437, 5834, 5822, 5824,
+     6437, 6437, 5836, 5837, 5839, 5842, 6437, 6437, 5843, 5845,
+     5846, 5849, 5847, 6437, 5848, 5851, 5853, 5864, 5870, 5859,
+     5867, 5871, 5879, 5861, 5865, 5876, 5875, 5877, 5881, 5884,
+     5888, 5895, 5892, 5894, 5900, 5897, 5901, 6437, 6437, 5905,
+     6437, 5908, 5902, 6437, 6437, 5910, 5914, 5916, 5918, 5920,
+     5922, 5924, 6437, 5925, 5927, 5928, 5929, 5930, 6437, 5932,
+     5936, 5931, 5939, 5933, 5942, 5938, 5948, 6437, 6437, 5940,
+     5954, 5944, 5955, 5949, 6437, 5959, 5966, 5961, 5963, 5964,
+     5969, 5965, 6437, 5971, 5973, 6437, 6437, 5972, 5974, 6437,
 
-     6426, 6426, 6426, 6426, 6426, 5974, 6426, 5968, 5980, 5983,
-     5985, 6426, 5969, 5986, 5987, 5988, 5975, 6426, 5973, 5990,
-     5994, 5998, 5997, 6002, 6004, 6005, 6007, 6006, 6009, 6011,
-     6010, 6015, 6013, 6014, 6016, 6020, 6023, 6426, 6426, 6426,
-     6029, 6030, 6032, 6033, 6037, 6038, 6045, 6047, 6041, 6048,
-     6049, 6051, 6053, 6054, 6055, 6063, 6059, 6062, 6061, 6065,
-     6067, 6072, 6076, 6069, 6077, 6081, 6426, 6078, 6426, 6082,
-     6426, 6426, 6086, 6088, 6083, 6090, 6098, 6101, 6094, 6097,
-     6099, 6102, 6104, 6426, 6106, 6426, 6426, 6111, 6113, 6426,
-     6112, 6115, 6426, 6114, 6116, 6117, 6122, 6124, 6120, 6123,
+     6437, 5978, 6437, 6437, 6437, 6437, 6437, 6437, 6437, 5985,
+     6437, 5979, 5991, 5994, 5996, 6437, 5980, 5997, 5998, 5999,
+     5986, 6437, 5984, 6001, 6005, 6009, 6008, 6013, 6015, 6016,
+     6018, 6017, 6020, 6022, 6021, 6026, 6024, 6025, 6027, 6031,
+     6034, 6437, 6437, 6437, 6040, 6041, 6043, 6044, 6048, 6049,
+     6056, 6058, 6052, 6059, 6060, 6062, 6064, 6065, 6066, 6074,
+     6070, 6073, 6072, 6076, 6078, 6083, 6087, 6080, 6088, 6092,
+     6437, 6089, 6437, 6093, 6437, 6437, 6097, 6099, 6094, 6101,
+     6109, 6112, 6105, 6108, 6110, 6113, 6115, 6437, 6117, 6437,
+     6437, 6122, 6124, 6437, 6123, 6126, 6437, 6125, 6127, 6128,
 
-     6125, 6141, 6426, 6426, 6127, 6131, 6129, 6143, 6145, 6144,
-     6151, 6153, 6154, 6155, 6146, 6162, 6426, 6164, 6161, 6168,
-     6426, 6169, 6157, 6170, 6171, 6172, 6180, 6175, 6179, 6426,
-     6181, 6426, 6184, 6186, 6188, 6178, 6185, 6187, 6201, 6203,
-     6196, 6426, 6189, 6205, 6199, 6210, 6212, 6214, 6216, 6207,
-     6221, 6217, 6225, 6229, 6224, 6230, 6232, 6233, 6234, 6426,
-     6236, 6239, 6426, 6240, 6241, 6242, 6243, 6247, 6426, 6250,
-     6244, 6252, 6254, 6257, 6259, 6426, 6265, 6268, 6269, 6426,
-     6270, 6426, 6426, 6272, 6260, 6273, 6281, 6283, 6426, 6426,
-     6426, 6306, 6313, 6320, 6327, 6334, 6341, 6348,   88, 6355,
+     6133, 6135, 6131, 6134, 6136, 6152, 6437, 6437, 6138, 6142,
+     6140, 6154, 6156, 6155, 6162, 6164, 6165, 6166, 6157, 6173,
+     6437, 6175, 6172, 6179, 6437, 6180, 6168, 6181, 6182, 6183,
+     6191, 6186, 6190, 6437, 6192, 6437, 6195, 6197, 6199, 6189,
+     6196, 6198, 6212, 6214, 6207, 6437, 6200, 6216, 6210, 6221,
+     6223, 6225, 6227, 6218, 6232, 6228, 6236, 6240, 6235, 6241,
+     6243, 6244, 6245, 6437, 6247, 6250, 6437, 6251, 6252, 6253,
+     6254, 6258, 6437, 6261, 6255, 6263, 6265, 6268, 6270, 6437,
+     6276, 6279, 6280, 6437, 6281, 6437, 6437, 6283, 6271, 6284,
+     6292, 6294, 6437, 6437, 6437, 6317, 6324, 6331, 6338, 6345,
 
-     6362, 6369, 6376, 6383, 6390, 6397, 6404, 6411, 6418
+     6352, 6359,   88, 6366, 6373, 6380, 6387, 6394, 6401, 6408,
+     6415, 6422, 6429
     } ;
 
-static const flex_int16_t yy_def[3310] =
+static const flex_int16_t yy_def[3314] =
     {   0,
-     3291,    1, 3292, 3292, 3293, 3293, 3294, 3294, 3295, 3295,
-     3296, 3296, 3297, 3297, 3298, 3298, 3291, 3299, 3291, 3291,
-     3291, 3291, 3300, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3301, 3291, 3291, 3291,
-     3301, 3302, 3291, 3291, 3291, 3302, 3303, 3291, 3291, 3291,
-     3291, 3303, 3304, 3291, 3291, 3291, 3304, 3305, 3291, 3306,
-     3291, 3305, 3305, 3307, 3291, 3291, 3291, 3291, 3307, 3308,
-     3291, 3291, 3291, 3308, 3299, 3299, 3291, 3309, 3300, 3309,
-     3300, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3295,    1, 3296, 3296, 3297, 3297, 3298, 3298, 3299, 3299,
+     3300, 3300, 3301, 3301, 3302, 3302, 3295, 3303, 3295, 3295,
+     3295, 3295, 3304, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3305, 3295, 3295, 3295,
+     3305, 3306, 3295, 3295, 3295, 3306, 3307, 3295, 3295, 3295,
+     3295, 3307, 3308, 3295, 3295, 3295, 3308, 3309, 3295, 3310,
+     3295, 3309, 3309, 3311, 3295, 3295, 3295, 3295, 3311, 3312,
+     3295, 3295, 3295, 3312, 3303, 3303, 3295, 3313, 3304, 3313,
+     3304, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3301, 3301, 3302,
-     3302, 3303, 3303, 3291, 3304, 3304, 3305, 3305, 3306, 3306,
-     3305, 3307, 3307, 3291, 3308, 3308, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3305, 3305,
+     3306, 3306, 3307, 3307, 3295, 3308, 3308, 3309, 3309, 3310,
+     3310, 3309, 3311, 3311, 3295, 3312, 3312, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3309,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3309, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3309, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3291, 3291, 3299, 3291, 3291, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3309, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3295, 3295, 3303, 3295, 3295,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3291, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3309, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303,
 
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3305, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3295, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3309, 3309, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3305, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3309, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3309, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3295,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3309, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
 
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3295, 3303, 3303, 3303, 3295, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3305, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3309, 3303, 3295, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299,
+     3303, 3295, 3303, 3295, 3303, 3303, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295,
+     3295, 3303, 3295, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3295,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3305, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3309, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
 
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3305,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303,
+     3303, 3303, 3303, 3309, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299,
-     3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, 3291,
-     3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3295, 3295, 3303, 3303, 3303, 3303, 3303, 3295, 3295,
+     3303, 3295, 3303, 3295, 3303, 3303, 3295, 3295, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3309, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3295,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303, 3303,
 
-     3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3291, 3291, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3291,
+     3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3295, 3295, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3295, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3309, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295,
 
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3291, 3299,
-     3299, 3299, 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299,
-     3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3305, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291,
+     3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303, 3303, 3295,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3295, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3295, 3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303,
+     3295, 3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3295, 3309, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
 
-     3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3291, 3291, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3291, 3299, 3299, 3291, 3291, 3299, 3299, 3299,
-     3299, 3291, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3295, 3295, 3303, 3295, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295, 3295, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3295,
+     3295, 3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303, 3295,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3295, 3303, 3303,
 
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3291, 3299, 3291, 3299, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3291, 3299, 3299, 3291, 3299, 3291, 3299, 3291,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3291, 3291, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3295, 3303,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303, 3295,
+     3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3295, 3295,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295,
+     3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
 
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3291,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3291,
-     3291, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3295, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3295, 3295, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3295,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3295, 3295,
+     3303, 3303, 3303, 3295, 3295, 3295, 3303, 3303, 3303, 3303,
 
-     3299, 3299, 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299,
-     3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, 3299, 3291,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3291, 3291, 3299, 3299, 3291, 3291, 3299, 3291, 3291,
+     3295, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303,
+     3295, 3295, 3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303,
+     3295, 3303, 3303, 3295, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3295, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303,
+     3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3295, 3295, 3303, 3303, 3295,
 
-     3291, 3291, 3291, 3291, 3291, 3299, 3291, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3291,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299,
-     3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3299, 3291,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
+     3295, 3303, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3303,
+     3295, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3295, 3295, 3295, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3295, 3303, 3295, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3295, 3303, 3295,
+     3295, 3303, 3303, 3295, 3303, 3303, 3295, 3303, 3303, 3303,
 
-     3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299,
-     3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299,
-     3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291,
-     3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299,
-     3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3291,
-     3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3291,
-        0, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
+     3303, 3303, 3303, 3303, 3303, 3303, 3295, 3295, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3295, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3295, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303, 3303,
+     3303, 3303, 3303, 3295, 3303, 3303, 3295, 3303, 3303, 3303,
+     3303, 3303, 3295, 3303, 3303, 3303, 3303, 3303, 3303, 3295,
+     3303, 3303, 3303, 3295, 3303, 3295, 3295, 3303, 3303, 3303,
+     3303, 3303, 3295, 3295,    0, 3295, 3295, 3295, 3295, 3295,
 
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295
     } ;
 
-static const flex_int16_t yy_nxt[6467] =
+static const flex_int16_t yy_nxt[6478] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1520,708 +1522,709 @@ static const flex_int16_t yy_nxt[6467] =
        67,   19,   20,   21,   69,   70,   71,   75,   76,   77,
 
        78,   86,   22,   72,  121,   86,  120,  109,   86,   79,
-      158,  158,   73,   19,   20,   21,   69,   70,   71,   75,
-       76,   77,   78,  185,   22,   72,   81,   82,   83,  129,
+      159,  159,   73,   19,   20,   21,   69,   70,   71,   75,
+       76,   77,   78,  186,   22,   72,   81,   82,   83,  130,
        90,   79,   90,   90,   73,   90,   86,   84,   81,   82,
-       83,   90,   91,   86,   86,   98,   92,   93,  168,   84,
-       94,  157,   99,   86,  110,   95,  100,  160,   86,  101,
-      160,  168,   86,  112,   96,   86,  165,  165,  111,   86,
-      102,  113,  135,  115,  103,  171,  116,  104,   86,  105,
-      106,  177,  114,  117,  168,  118,   86,  122,   86,  126,
-      107,   86,  154,  127,  176,  123,  155,   86,   86,  136,
+       83,   90,   91,   86,   86,   98,   92,   93,  169,   84,
+       94,  158,   99,   86,  110,   95,  100,  161,   86,  101,
+      161,  169,   86,  112,   96,   86,  166,  166,  111,   86,
+      102,  113,  136,  115,  103,  172,  116,  104,   86,  105,
+      106,  178,  114,  117,  169,  118,   86,  122,   86,  126,
+      107,   86,  155,  127,  177,  123,  156,   86,   86,  137,
 
-      156,  124,  130,  137,   86,  125,  131,   86,  146,  128,
-      147,  179,  132,  138,  139,  133,  140,   86,   86,  148,
-       87,  150,  134,  141,   88,  149,  142,  162,   86,  162,
-      162,  151,  162,  143,  174,  152,  153,  144,  145,   90,
-      180,   90,   90,  167,   90,  167,  167,  172,  167,  172,
-      172,  170,  172,  175,  175,   85,   86,   85,   85,   90,
-       85,   90,   90,   86,   90,   86,   85,  178,  182,   86,
-       90,   91,  183,   86,   86,   86,  181,   86,   86,   86,
-      195,  188,  186,   86,   86,  184,   86,  189,  187,  190,
-       86,   86,   86,  173,   86,  191,  192,  197,  194,  196,
+      157,  124,  131,  138,   87,  125,  132,  128,   88,  129,
+      176,  176,  133,  139,  140,  134,  141,   86,   86,   86,
+       86,  179,  135,  142,   86,  147,  143,  148,   86,   86,
+       86,  181,  183,  144,  151,  180,  149,  145,  146,   86,
+      182,   86,  150,  206,  152,  175,  208,   86,  153,  154,
+      163,  225,  163,  163,   90,  163,   90,   90,  168,   90,
+      168,  168,  173,  168,  173,  173,  171,  173,   85,   86,
+       85,   85,   90,   85,   90,   90,   86,   90,   86,   85,
+       86,  184,   86,   90,   91,  187,   86,  192,  193,   86,
+       86,  196,  189,   86,  185,   86,  188,   86,  190,   86,
 
-      193,   86,  203,   86,  198,  200,  201,  205,   86,   86,
-      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,  922,  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,
-      244,  240,  241,  247,  249,   86,  250,  242,  243,   86,
-       86,  245,  256,   86,  255,  246,  253,   86,   86,  259,
+      191,   86,  194,   86,  198,   86,  174,  199,  195,   86,
+      197,   86,  201,  202,   86,  200,   86,  204,  214,  210,
+      203,  205,  211,  209,   86,  207,   86,   86,   86,   86,
+      216,  217,   86,  222,   86,  212,  213,  219,  223,  226,
+      227,  220,  224,  215,   86,   86,   86,   86,   86,  231,
+       86,  218,  228,  229,  233,   86,   86,  221,   86,  230,
+      235,   86,  238,   86,  236,  232,  234,   86,   86,   86,
+      169,  240,   86,   86,  252,  250,  237,   86,  239,   86,
+      241,   86,  246,  243,   86,  249,  242,   86,  245,  244,
+       86,  253,   86,  247,  254,   86,  251,  248,  259,  255,
 
-       86,   86,   86,  251,   86,  263,  252,  254,  260,  258,
-      262,  257,   86,  264,  158,  158,  267,  266,  160,  168,
-      261,  160,  265,  162,  168,  162,  162,  268,  162,  165,
-      165,  167,   86,  167,  167,   90,  167,   90,   90,  172,
-       90,  172,  172,   86,  172,  175,  175,  170,  269,  270,
-      272,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-      274,  277,   86,  280,  271,  276,  273,  275,   86,   86,
-      283,  282,  279,   86,  286,  278,   86,  284,  288,  281,
-       86,  287,   86,  289,   86,   86,  292,   86,  290,   86,
-      297,  293,  299,  285,   86,   86,  294,   86,  304,  298,
+       86,   86,   86,  257,  261,   86,  265,   86,   86,  258,
+      256,  260,  264,  262,   86,  159,  159,  266,   86,  268,
+      161,  269,   86,  161,  367,  263,  267,  163,  169,  163,
+      163,  270,  163,  166,  166,  168,  274,  168,  168,   90,
+      168,   90,   90,  173,   90,  173,  173,   86,  173,  176,
+      176,  171,  271,  272,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,  276,   86,  279,  282,  278,  273,  275,
+      277,   86,  285,  284,  290,  281,   86,  280,   86,  286,
+       86,  288,  283,   86,  289,  291,   86,   86,   86,   86,
+      292,   86,  294,   86,  299,   86,  287,  295,  300,   86,
 
-      300,   86,  295,  296,   86,  291,  301,   86,   86,  302,
-       86,  306,   86,  307,  303,   86,   86,   86,   86,   86,
-       86,   86,   86,   86,  314,  315,  308,  305,  321,  309,
-      311,  310,  322,  312,  339,  313,   86,  316,  323,  324,
-      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,  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,
+      302,  304,  296,   86,  303,  306,   86,  293,  297,  298,
+      301,   86,   86,   86,   86,   86,  308,   86,  309,   86,
+       86,   86,  310,  305,   86,  316,  317,   86,  311,  313,
+      312,  167,  314,   86,  307,   86,  318,  315,  323,  319,
+      326,  320,   86,  325,  324,  328,   86,   86,  327,   86,
+      330,   86,  332,  321,  333,  322,   86,  329,   86,  336,
+       86,   86,  331,   86,   86,   86,  337,  338,  339,  334,
+      335,  340,   86,   86,   86,   86,  342,   86,   86,  341,
+      343,   86,   86,   86,  345,   86,   86,   86,   86,   86,
+      348,  350,   86,  355,  346,  344,  349,  351,  356,   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,
+      352,   86,   86,  347,   86,  353,  357,  354,  359,  361,
+      358,   86,  364,   86,   86,   86,   86,  370,   86,  366,
+       86,   86,  371,   86,  360,  373,   86,  369,   86,  362,
+      363,   86,   86,  365,   86,  368,   86,  376,  374,  378,
+      372,  377,   86,  380,  169,   86,  375,   86,   86,   86,
+      381,   86,  384,   86,   86,   86,  385,  383,   86,  391,
+      389,  387,  392,  379,   86,   86,   86,  382,   86,  393,
+      386,  394,  395,   86,  388,   86,   86,   86,   86,   86,
+       86,  390,   86,  406,  402,  403,   86,  400,  396,  397,
+       86,  399,   86,   86,  398,  404,   86,  405,   86,  408,
 
-       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,  564,  453,  456,   86,  443,  458,
-      459,  444,   86,  457,   86,  462,  445,  446,  447,  448,
+       86,  409,   86,   86,   86,  401,  412,   86,   86,  416,
+      407,  413,   86,   86,  418,   86,   86,  414,  410,  411,
+       86,  415,   86,  420,  419,   86,   86,  417,   86,   86,
+      421,   86,  423,  424,  425,  426,  428,   86,   86,   86,
+       86,   86,  433,  429,   86,  432,   86,  422,   86,   86,
+      165,  431,  435,   86,   86,  438,   86,   86,  430,   86,
+      427,  443,  440,   86,  434,   86,  444,   86,  436,  442,
+       86,  437,   86,   86,  439,  466,   86,  445,  454,  441,
+       86,  452,   86,   86,   86,  455,  458,  456,  453,  446,
+       86,   86,  447,  465,   86,   86,  460,  448,  449,  450,
 
-      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,  164,  493,  501,  494,   86,   86,  502,  511,
-       86,   86,  513,  516,   86,  515,  503,   86,  504,  510,
-      505,  168,  514,  527,   86,  518,  528,  512,   86,  517,
+      451,   86,  791,  457,  459,   86,  463,  461,  462,  469,
+       86,  464,   86,   86,  472,   86,   86,  474,  467,  470,
+       86,  468,  471,   86,  475,  473,   86,   86,   86,   86,
+       86,   86,  477,  482,   86,   86,  483,   86,  484,   86,
+      478,  476,  487,  488,   86,   86,  481,  485,  479,   86,
+      480,   86,   86,  499,  486,   86,  489,  490,  492,  494,
+      493,   86,  501,  491,  495,   86,  500,   86,   86,  502,
+       86,   86,  503,   86,   86,   86,  515,  496,  504,   86,
+      497,   86,  498,   86,  505,  164,   86,   86,  506,  517,
+      520,  514,   86,  519,  516,  522,  507,   86,  508,   86,
 
-       86,  529,   86,  506,  530,   86,  507,   86,  508,  526,
-      509,   86,  531,  519,  520,   86,  534,   86,  536,  532,
-      533,   86,   86,  521,   86,  522,  523,  524,   86,  540,
-      525,   86,   86,  542,  535,   86,  539,   86,   86,  541,
-       86,  538,  549,  537,   86,  547,  546,   86,   86,   86,
-      550,  543,  544,  548,   86,  554,   86,  545,   86,  552,
-       86,   86,   86,   86,  551,  557,  558,  559,  553,   86,
-       86,   86,   86,   86,  556,  565,  566,   86,  571,  561,
-       86,  555,  560,   86,  568,  563,  562,  569,   86,   86,
-       86,  572,   86,  567,  585,   86,   86,  163,   86,   86,
+      509,  518,  536,   86,  532,   86,  521,  530,  531,  533,
+       86,  534,   86,  510,   86,   86,  511,  169,  512,   86,
+      513,   86,  539,  523,  524,  540,   86,  537,  538,   86,
+       86,   86,  162,  525,  542,  526,  527,  528,  535,  544,
+      529,  541,   86,  543,   86,   86,  548,  546,   86,  545,
+      549,   86,  553,  551,   86,  554,   86,   86,   86,  550,
+       86,  558,   86,   86,   86,  547,  552,   86,   86,  556,
+       86,   86,   86,  561,  557,  160,  555,  562,  563,  560,
+       86,   86,   86,  568,  564,  567,  565,  559,  566,   86,
+       86,  569,  570,   86,  572,   86,  575,  573,   86,   86,
 
-       86,  580,  570,  573,  577,  574,  576,  586,  575,  581,
-      582,   86,   86,  583,  584,  578,  587,  579,   86,  590,
-      591,  589,  588,   86,   86,   86,   86,   86,  593,  592,
-      594,  595,   86,   86,  597,   86,  599,   86,   86,  603,
-       86,   86,  602,  600,   86,   86,   86,   86,  598,   86,
-      604,   86,  596,  601,  607,   86,  608,   86,  609,  605,
-       86,   86,   86,   86,   86,   86,  610,  611,  606,   86,
-      619,   86,  615,   86,  614,  616,  617,   86,  618,  613,
-      612,   86,  621,   86,  620,   86,  623,   86,   86,   86,
-       86,   86,   86,   86,   86,  622,  625,  634,  626,  161,
+       86,  576,   86,   86,  589,   86,   86,  592,   86,  571,
+       86,  584,  574,  577,  581,  578,  580,  590,  579,  585,
+      586,   86,   86,  587,  588,  582,  591,  583,  594,   86,
+       86,  593,   86,   86,   86,  598,  596,  597,   86,   86,
+       86,  601,   86,  599,  603,   86,   86,   86,   86,  606,
+      595,  604,  607,   86,   86,  602,   86,  608,   86,  600,
+      605,   86,   86,   86,  613,   86,  611,  612,   86,  609,
+       86,   86,  614,   86,   86,   86,  619,  610,  620,   86,
+      615,   86,  622,  618,  623,  616,   86,  621,  617,   86,
+      625,   86,   86,  627,   86,   86,   86,   86,   86,   86,
 
-      636,   86,  628,   86,  624,   86,   86,  627,  633,  629,
-      631,  630,   86,  632,  635,  638,   86,  637,   86,   86,
-       86,  641,  644,   86,  639,  647,   86,  640,   86,  646,
-       86,   86,   86,  642,   86,  643,   86,  650,   86,   86,
-       86,   86,  653,  645,  649,  654,  656,   86,   86,  648,
-       86,   86,   86,   86,  655,   86,  651,  652,   86,  670,
-       86,   86,   86,  657,  659,  692,  673,  658,   86,  660,
-      668,  671,   86,  669,  661,  676,  662,  672,   86,   86,
-       86,  680,  663,  677,  664,  674,  681,  665,  666,  675,
-       86,   86,   86,   86,  667,  678,  685,  682,  679,   86,
+       86,   86,   86,  629,   86,  630,  638,  624,  639,   86,
+      632,   86,   86,  626,   86,  628,  641,  631,  633,  635,
+      634,  640,  636,  637,   86,   86,   86,   86,  642,  645,
+       86,  648,  643,   86,  651,  644,   86,   86,   86,  646,
+       86,  650,   86,   86,   86,  647,   86,  654,  657,   86,
+      653,   86,   86,  649,  658,   86,   86,  660,  652,   86,
+       86,   86,   86,   86,   86,  655,  659,  656,  674,   86,
+       86,  661,  663,  696,  677,  662,   86,  664,  673,   86,
+      672,  675,  665,  177,  666,  676,   86,   86,   86,   86,
+      667,  681,  668,  678,  680,  669,  670,  679,  684,  685,
 
-       86,   86,  688,   86,   86,  683,   86,  684,   86,  690,
-       86,   86,   86,   86,   86,   86,   86,  696,   86,  691,
-      687,  693,  686,  697,  700,  701,   86,  168,  689,  694,
-      699,  702,  698,  695,  703,   86,   86,   86,  704,   86,
-       86,   86,   86,   86,   86,   86,  710,  712,   86,   86,
-      705,  707,  715,   86,  708,  706,  711,  714,  716,  709,
-      717,  718,   86,   86,   86,   86,  720,   86,  713,   86,
-       86,   86,   86,   86,  719,  723,  724,  729,   86,  721,
-      725,   86,  730,   86,  722,  732,   86,  726,  728,  734,
-      727,  731,  733,   86,  737,   86,  735,   86,  736,   86,
+       86,   86,  671,  682,   86,   86,  683,  689,   86,   86,
+      686,   86,  692,   86,   86,  687,   86,  688,   86,  694,
+       86,   86,   86,   86,   86,  701,   86,  175,  700,  691,
+       86,  690,   86,  698,   86,  695,  697,   86,  693,  705,
+      704,  703,  169,  702,  699,  707,  706,  709,   86,  708,
+       86,   86,   86,   86,   86,   86,   86,  716,  714,   86,
+      719,   86,   86,   86,  711,   86,  720,  710,  712,  715,
+      713,  718,   86,  722,  721,   86,   86,  723,  724,   86,
+       86,   86,   86,  717,   86,  728,  727,   86,   86,   86,
+      725,  733,   86,  729,  829,  726,  734,   86,  736,   86,
 
-       86,  738,  740,   86,   86,   86,  739,   86,  742,  743,
-       86,   86,   86,   86,   86,  741,  746,  747,   86,  745,
-       86,  751,  750,   86,   86,   86,   86,   86,  752,  744,
-      754,   86,  756,   86,   86,   86,   86,  748,   86,  749,
-      755,  753,   86,  759,  762,   86,   86,  763,  757,  765,
-       86,  760,   86,   86,  766,  758,  761,  767,  768,  764,
-       86,  770,   86,   86,   86,   86,   86,  777,  773,  774,
-      769,  771,   86,   86,   86,  779,   86,   86,  772,  775,
-      780,  776,  782,  778,   86,   86,   86,  783,   86,   86,
-      784,   86,   86,  787,   86,   86,  789,  791,   86,   86,
+      730,  738,  735,  731,  732,  737,   86,   86,  739,   86,
+      740,   86,  741,  744,  742,   86,   86,   86,   86,  743,
+       86,   86,  747,   86,  746,   86,   86,  745,  750,   86,
+      755,  749,   86,   86,  751,  748,   86,  754,   86,   86,
+       86,   86,  756,   86,  760,  758,   86,   86,   86,  752,
+       86,  753,   86,  763,  766,  759,   86,  757,   86,   86,
+       86,  761,   86,  767,   86,  774,  764,  174,  762,   86,
+      768,   86,  765,   86,  769,   86,   86,  773,  777,  770,
+      775,  778,  771,  772,   86,  776,  781,   86,   86,  779,
+       86,  783,   86,   86,  784,   86,  782,   86,  786,  780,
 
-       86,   86,  781,   86,  785,  788,  797,  786,  792,   86,
-      795,  794,   86,  159,  790,  796,   86,   86,   86,  793,
-      799,  802,  798,  800,  801,   86,   86,  804,   86,  806,
-      803,   86,  808,   86,   86,   86,  807,  809,   86,   86,
-      812,   86,  805,   86,  811,  813,   86,   86,   86,  819,
-       86,   86,  816,   86,  814,   86,  815,  821,  810,   86,
-       86,  824,   86,   86,  822,  826,  817,  818,  828,  820,
-      825,  823,   86,   86,   86,   86,  831,   86,  830,  835,
-      827,  832,   86,   86,  829,   86,  833,   86,   86,  837,
-       86,   86,   86,   86,   86,  843,   86,   86,  844,   86,
+      787,   86,   86,   86,   86,   86,  788,   86,  793,  795,
+       86,  789,   86,   86,   86,   86,  785,  792,  801,   86,
+      790,  796,   86,  799,   86,  794,  797,  800,  802,  798,
+       86,  804,  805,  803,   86,   86,   86,  808,  806,   86,
+      810,  807,   86,  812,   86,   86,   86,  811,  813,   86,
+       86,  816,   86,  809,   86,  815,  817,   86,   86,   86,
+      823,   86,   86,  820,  169,  818,   86,  819,  825,  814,
+       86,   86,  828,   86,   86,  826,  830,  821,  822,  832,
+      824,   86,  827,   86,  835,   86,  833,   86,  834,  836,
+       86,  831,   86,  837,   86,   86,  839,   86,   86,  841,
 
-      834,   86,  836,   86,   86,  845,  838,   86,  839,  840,
-       86,  841,  846,  842,  847,   86,  852,   86,   86,  850,
-       86,  848,   86,  849,   86,  851,   86,   86,  857,  853,
-      854,   86,   86,   86,   86,   86,  855,   86,  866,  856,
-      864,   86,   86,  859,  858,  867,   86,   86,  865,  860,
-      861,  862,  863,   86,   86,   86,  868,   86,  870,  872,
-       86,   86,   86,   86,   86,  869,  176,  871,  876,  877,
-      878,  873,   86,  875,   86,   86,  874,  879,   86,  880,
-      881,   86,  882,   86,   86,  168,   86,  883,   86,  888,
-      887,   86,  885,   86,   86,  884,  886,  889,   86,   86,
+       86,   86,   86,  847,   86,  842,  838,   86,  848,   86,
+       86,   86,   86,   86,  840,   86,  843,   86,  844,  849,
+      845,   86,  846,   86,   86,  852,  850,  851,  856,  854,
+      855,   86,  853,   86,   86,  857,  858,  861,   86,   86,
+       86,   86,  859,   86,   86,   86,  870,   86,   86,  868,
+      860,   86,  871,   86,   86,  863,  862,   86,  864,  865,
+      866,  869,  867,   86,   86,  872,   86,   86,  874,  876,
+      877,   86,  873,   86,   86,   86,   86,  875,  880,  881,
+      879,  883,  882,   86,   86,  878,   86,   86,  884,   86,
+       86,  885,  169,  886,   86,   86,  887,  891,  888,  889,
 
-      891,   86,  890,  895,   86,   86,  896,  898,   86,  892,
-       86,   86,  893,   86,  897,  899,   86,  902,   86,   86,
-      894,  903,  900,   86,   86,   86,  908,   86,  904,   86,
-      901,  905,   86,  909,  910,   86,  907,   86,   86,   86,
-       86,  906,   86,   86,   86,  929,  924,  911,  923,  925,
-       86,  926,   86,  921,  928,   86,  930,  913,   86,   86,
-      912,   86,   86,  914,   86,  935,  915,   86,  927,  931,
-      916,   86,  943,  917,   86,   86,  933,  932,   86,   86,
-      918,  919,  946,  920,  934,   86,  936,  937,   86,  938,
-       86,   86,  939,  945,  948,  944,  950,  940,  951,   86,
+       86,  890,   86,  892,  895,   86,  893,   86,  894,   86,
+      899,   86,   86,   86,  900,  902,   86,  903,   86,   86,
+      896,  897,  901,  906,   86,   86,   86,  904,   86,   86,
+      898,   86,  908,  912,   86,   86,   86,  909,  905,   86,
+       86,   86,  913,  914,  907,   86,   86,   86,   86,  911,
+       86,  910,   86,  915,  928,   86,  927,   86,  929,  930,
+      925,  917,  167,  926,   86,  916,   86,   86,  918,  937,
+       86,  919,   86,  931,  932,  920,   86,  933,  921,   86,
+      934,   86,  936,  935,  939,  922,  923,  938,  924,   86,
+       86,   86,  940,  941,  947,  942,   86,   86,  943,   86,
 
-       86,  955,   86,  941,  942,  954,  956,   86,   86,   86,
-      949,  174,  947,   86,  952,  957,   86,  958,  960,   86,
-      961,   86,   86,   86,  959,  953,  962,   86,  964,   86,
-      963,  965,   86,   86,  967,  966,   86,   86,   86,   86,
-      969,   86,  973,   86,   86,   86,  972,   86,  968,   86,
-      976,   86,  982,   86,  980,  978,   86,  970,  971,  974,
-       86,  975,   86,  977,  983, 1001,   86,  981,  986,  984,
-       86,  985,  987,  979,   86,   86,  989,   86,   86,   86,
-      988,   86,   86,  991,  990,  993,   86,  992,  994,   86,
-       86,   86,   86,   86,   86, 1000,   86,  997,  995,   86,
+       86,  950,  948,  944,  952,   86,   86,   86,   86,  945,
+      946,  954,   86,  959,  949,  958,   86,  962,  960,   86,
+      953,   86,  956,  951,  955,   86,   86,   86,  961,   86,
+      965,  964,  966,  957,   86,   86,   86,  967,  969,   86,
+      963,  968,   86,   86,  970,   86,   86,  971,   86,  973,
+       86,   86,  977,   86,   86,   86,   86,  980,  976,   86,
+       86,   86,  972, 1030,  984,  165,  974,  975,  978,  979,
+       86,  982,  981,   86,  986,   86,   86,  990,  985,  987,
+      991,  989,  983,   86,  988,   86,   86,   86,  993,   86,
+       86,   86,  992,  994,   86,  995,  997,   86,   86,  996,
 
-      998, 1003,   86,   86, 1004,   86,   86, 1002,   86,  996,
-       86,   86,   86,  999, 1006, 1007, 1009,   86,   86,   86,
-     1011, 1010, 1005, 1012,   86,   86,   86,   86, 1019,   86,
-     1017,   86, 1008, 1013, 1015, 1018,   86,   86,   86, 1016,
-       86, 1027,   86, 1024, 1020,   86, 1022, 1026,   86, 1014,
-     1021, 1025,   86,   86,   86,   86,   86, 1029,   86,   86,
-       86,   86, 1023, 1035,   86, 1037,   86, 1040,   86, 1028,
-       86,  173,   86,   86, 1030, 1031, 1032, 1041,   86, 1034,
-     1033,   86, 1038, 1036, 1042, 1039,   86, 1045,   86, 1043,
-     1048,   86, 1044, 1047,   86,   86,   86,   86,   86,   86,
+      998,   86,   86,   86,   86,   86,  999,   86, 1001, 1004,
+       86, 1002, 1008,   86, 1007,   86, 1005,   86,   86,   86,
+     1000, 1006,   86,   86, 1003,   86,   86,   86, 1010,   86,
+     1013, 1011, 1015,   86,   86, 1014, 1009,   86, 1016,   86,
+       86, 1017,   86, 1021,   86, 1023, 1019, 1012, 1022,   86,
+       86,   86, 1020,   86,   86, 1024, 1028, 1031,   86, 1018,
+     1026, 1025,   86,   86, 1029,   86,   86, 1033,   86,   86,
+       86,   86,   86,   86, 1027, 1032, 1041,   86,   86, 1039,
+       86, 1044, 1294,   86, 1034, 1035, 1036,   86,   86, 1038,
+     1037, 1042, 1045,   86, 1040,   86, 1043, 1047,   86,   86,
 
-     1046,   86,   86, 1057, 1050, 1052, 1058, 1060,   86,   86,
-       86,   86,   86,   86, 1049,   86, 1051, 1063, 1053, 1065,
-     1055, 1054, 1056,   86, 1059, 1061, 1064,   86, 1062,   86,
-       86,   86,   86,   86, 1071, 1069, 1072,   86,   86, 1076,
-     1073, 1067,   86,   86,   86,   86, 1066, 1078,   86, 1068,
-       86,   86, 1070,   86, 1081,   86, 1074, 1075, 1080, 1082,
-      168,   86,   86, 1077,   86, 1084, 1083,   86, 1079,   86,
-     1085,   86, 1088,   86,   86,   86,   86, 1086,   86, 1101,
-       86,   86, 1087, 1089, 1102, 1104,   86, 1091, 1092,   86,
-       86,   86,   86, 1106, 1093, 1090, 1103, 1094,   86,   86,
+     1046, 1049, 1052,   86, 1051,   86,   86, 1048,   86,   86,
+       86,   86, 1050,   86,   86, 1054, 1061, 1056, 1062,   86,
+     1064,   86,   86,   86,   86, 1053,   86,   86, 1055,   86,
+     1057, 1069, 1059, 1058, 1060, 1063, 1067, 1065, 1068, 1066,
+       86,   86,   86,   86,   86, 1076, 1073,   86, 1070,   86,
+     1075,   86, 1071,   86,   86, 1080, 1077,   86, 1082,   86,
+     1072,   86,   86,   86, 1074, 1078, 1085, 1079, 1084,   86,
+       86, 1086,  169,   86, 1088,   86, 1089, 1081,   86,   86,
+     1083,   86,   86,   86, 1087,   86, 1092,   86,   86,   86,
+     1105,   86,   86, 1108,   86, 1090, 1106, 1095, 1091,   86,
 
-       86, 1095,   86, 1096, 1120, 1109, 1107, 1097,   86, 1098,
-       86,   86, 1111, 1108, 1099, 1105, 1110, 1112,   86, 1100,
-     1113,   86, 1114,   86,   86, 1115,   86,   86,   86, 1118,
-       86, 1121, 1133,   86,   86, 1130,   86, 1116, 1117, 1119,
-     1126, 1122, 1125,   86, 1124, 1128, 1129, 1132, 1127, 1123,
-     1131,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86, 1147,   86, 1144,   86,   86,   86, 1148,   86, 1143,
-       86, 1146,   86, 1134, 1135,   86, 1136,   86, 1145, 1150,
-     1149, 1137, 1154, 1138,  168, 1151, 1153, 1152,   86, 1139,
-       86,   86,   86, 1158, 1140, 1141, 1155,   86, 1160,   86,
+     1096, 1093,   86, 1094,   86, 1097, 1107,   86, 1110, 1098,
+       86,   86, 1113, 1099,   86, 1100,   86, 1111,   86, 1101,
+       86, 1102, 1119,   86, 1109, 1112, 1103, 1115, 1114, 1117,
+     1118, 1104, 1116,   86, 1120,   86,   86,   86, 1121,   86,
+     1122,   86, 1125,   86,   86,   86,   86,   86, 1124, 1131,
+     1123, 1135, 1130, 1126, 1129, 1132,   86, 1128, 1133, 1134,
+       86,   86, 1127, 1136,   86,   86, 1138,   86,   86,   86,
+       86,   86,   86,   86, 1151, 1148,   86,   86,   86,   86,
+     1147, 1152,   86, 1150,   86, 1139, 1149, 1137,   86, 1140,
+     1153, 1154,   86, 1158, 1141,   86, 1142, 1155, 1156,   86,
 
-       86, 1142, 1156,   86, 1161, 1163,   86,   86,   86, 1164,
-     1157,   86,   86, 1166, 1168, 1159,   86,   86,   86,   86,
-       86, 1169,   86, 1162, 1174, 1167, 1165, 1171, 1172,   86,
-       86,   86,   86,   86,   86,   86, 1170, 1177, 1173,   86,
-     1175,   86,   86,   86,   86,   86,   86,   86, 1176, 1179,
-     1182, 1181, 1183, 1178, 1180,   86, 1186,   86,   86, 1185,
-     1187, 1184,   86,   86, 1192, 1189, 1190,   86,   86,   86,
-       86, 1188, 1191, 1194, 1195, 1196, 1197, 1199, 1193,   86,
-     1198,   86,   86,   86, 1202,   86,   86,   86, 1204, 1203,
-       86, 1205,   86,   86, 1200, 1206,   86,   86, 1201, 1207,
+     1157,   86, 1143,   86, 1160,   86, 1159, 1144, 1145, 1164,
+       86,   86,   86, 1161, 1146, 1165, 1167,   86,   86, 1162,
+     1168,   86,   86, 1163, 1172,   86, 1170,   86,   86,   86,
+       86,   86, 1166, 1173,   86, 1178,   86, 1169, 1171,   86,
+     1175,   86,   86, 1176,   86, 1177, 1174, 1181, 1179,   86,
+       86,   86,   86,   86,   86, 1180,   86,   86,   86,   86,
+     1186, 1187, 1188, 1183, 1182, 1185, 1190,   86,   86,   86,
+     1184, 1189,   86, 1191,   86,   86,  164, 1196, 1193,   86,
+     1198, 1192,   86, 1195, 1199,   86,   86, 1194, 1203, 1197,
+     1200, 1201,   86, 1202,   86,   86, 1206,   86,   86, 1204,
 
-       86, 1213,   86,   86,   86, 1215, 1208,   86,   86, 1209,
-     1211,   86,   86, 1217, 1210, 1212,   86,   86, 1216, 1219,
-       86,  166, 1214,   86,   86, 1220, 1218,   86, 1221, 1222,
-       86,   86, 1224, 1223,   86, 1225, 1228,   86,   86, 1230,
-     1227, 1231,   86, 1226, 1229,   86, 1232,   86,   86,   86,
-     1235, 1234,   86,   86,   86,   86,   86, 1241, 1239,   86,
-     1242,   86,   86,   86, 1243, 1233,   86, 1244,   86, 1240,
-     1236, 1246, 1237, 1245, 1238,   86, 1249,   86,   86, 1247,
-     1251,   86,   86, 1250,   86,   86,   86,   86,   86,   86,
-       86, 1256, 1257, 1252, 1253, 1248,   86,   86,   86,   86,
+     1210, 1207,   86,   86, 1208,   86,   86, 1209,   86,   86,
+       86, 1205, 1211, 1217,   86, 1219,   86,   86,   86,   86,
+     1223,   86, 1213, 1215, 1216, 1212, 1214,   86,   86,   86,
+       86, 1220, 1221,   86, 1218, 1225,   86,   86, 1226, 1224,
+       86, 1228, 1222,   86,   86, 1227, 1231,   86, 1229, 1230,
+     1234, 1235,   86, 1233,   86,   86,   86,   86,   86,   86,
+     1232, 1238,   86, 1236,   86, 1239,   86,   86, 1245, 1243,
+     1246,   86,   86, 1237,   86, 1240,   86, 1247, 1241,   86,
+     1244,   86, 1242, 1250, 1248,   86, 1249, 1253,   86,   86,
+       86, 1252,   86,   86,   86, 1254, 1255,   86,   86,   86,
 
-       86, 1258, 1259, 1263, 1254, 1264, 1255,   86,   86,   86,
-     1261,   86, 1266,   86, 1260, 1265, 1267,   86, 1262,   86,
-     1271,   86,   86,   86,   86, 1270,   86, 1268,   86, 1277,
-       86, 1273,  168, 1269,   86,   86,   86,   86,   86, 1272,
-       86, 1282, 1274,  164,   86, 1284,   86, 1276, 1279, 1281,
-     1280, 1275, 1278, 1283, 1286, 1287, 1288,   86, 1285,   86,
-       86,   86, 1289,   86, 1291, 1290,   86,   86,   86,   86,
-       86,   86,   86, 1294,   86, 1300,   86,   86, 1297,   86,
-     1292, 1293,   86,   86, 1295,   86,  163, 1298, 1304, 1296,
-       86, 1301,   86, 1299,   86, 1306, 1310, 1302, 1303,   86,
+       86, 1256, 1260, 1251,   86,   86, 1258, 1257, 1261, 1263,
+       86, 1262,   86, 1259,   86, 1267, 1268,   86,   86, 1271,
+       86,   86,   86, 1270, 1265,   86,   86,   86, 1264,   86,
+     1275,   86, 1269, 1266,   86,   86,   86,   86,  169, 1274,
+     1273, 1281,   86,   86, 1272, 1277,   86, 1276,   86,   86,
+     1278,   86,   86, 1286,   86,   86, 1280, 1283, 1282, 1301,
+     1279, 1284, 1290, 1285, 1287, 1288,   86, 1291,   86, 1289,
+     1292,   86,   86,   86,   86,   86, 1293, 1295,   86,   86,
+       86,   86,   86, 1298, 1304,   86,   86,   86, 1296, 1297,
+       86,   86,   86,   86, 1299, 1442, 1302,   86, 1308, 1300,
 
-     1311, 1314,   86,   86, 1307, 1305, 1308, 1312,   86, 1309,
-     1313,   86,   86,   86,   86, 1316,   86, 1315,   86,   86,
-       86, 1320,   86, 1319, 1323,   86,   86, 1317,   86, 1327,
-       86, 1318, 1322,   86,   86,   86, 1324, 1321, 1328, 1325,
-     1329,   86,   86, 1333, 1326, 1332, 1330, 1331,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86, 1339,
-       86,   86,   86, 1334, 1335, 1337, 1338, 1340, 1344, 1336,
-       86,   86,   86, 1341,   86, 1343, 1345, 1342, 1346, 1348,
-     1347,   86,   86,   86,   86,   86, 1349,   86, 1356,   86,
-       86, 1350,   86, 1351,   86, 1359,   86,   86, 1354, 1353,
+     1305, 1303, 1310,   86,   86, 1306, 1307, 1314,   86, 1315,
+     1309, 1311,   86, 1312, 1317,   86, 1313, 1316,   86,   86,
+       86,   86, 1322, 1320,   86, 1318,   86,   86,   86, 1324,
+       86,   86,   86, 1319,   86, 1323, 1327, 1331,   86, 1329,
+     1321,   86, 1326,   86,   86,   86, 1325,   86, 1328, 1332,
+     1333, 1330, 1335,   86,   86,   86,   86, 1336, 1338,   86,
+       86, 1334,   86, 1337,   86,   86,   86, 1343,   86,   86,
+     1339, 1341,   86,   86,   86, 1340, 1344, 1342, 1348,   86,
+       86,   86,   86,   86, 1345,   86, 1347, 1346, 1349, 1350,
+     1352,   86,   86, 1360, 1351, 1353,   86, 1355, 1354,   86,
 
-     1357, 1352, 1362, 1358, 1355,   86, 1364,   86, 1361,   86,
-     1360, 1365,   86,   86, 1369, 1366,   86, 1363,   86, 1379,
-     1383, 1367, 1368,   86, 1370,   86,   86, 1378, 1371, 1377,
-       86, 1372, 1373,   86, 1380, 1381, 1374,   86,   86,   86,
-       86,   86, 1375,   86, 1384, 1385, 1376, 1382,   86, 1386,
-       86, 1388,   86,   86,   86, 1389,   86, 1390, 1387,   86,
-       86, 1391,   86, 1393, 1395,   86, 1398, 1399,   86, 1525,
-     1400, 1392,   86,   86, 1396,   86, 1394, 1402,   86, 1401,
-     1397,   86, 1403,   86, 1404,   86, 1405, 1411, 1406,   86,
-     1407, 1408, 1409, 1412,   86,   86, 1410, 1415,   86, 1413,
+       86, 1356,   86,   86,   86,   86, 1358,   86, 1357,  162,
+     1363, 1361, 1359,   86, 1362,   86, 1368, 1367, 1366,   86,
+     1365, 1369,   86, 1364,   86, 1373, 1370,   86,   86, 1371,
+     1383,   86, 1372,   86, 1374, 1405,   86, 1382, 1375,   86,
+     1381, 1376, 1377,   86, 1384,   86, 1378, 1387, 1386,   86,
+     1385,   86, 1379,   86, 1388,   86, 1380,   86, 1390,   86,
+     1389,   86, 1392,   86,   86,   86, 1393,   86, 1394,   86,
+       86,   86, 1391,  160, 1397, 1399,   86,   86, 1402, 1395,
+     1403, 1404, 1396, 1400,   86,   86,   86, 1398, 1414, 1401,
+       86, 1411, 1412, 1413, 1406,   86,   86,   86,   86, 1407,
 
-       86,   86, 1416,   86, 1414,   86, 1419, 1417,   86,   86,
-       86,   86, 1425,   86, 1426,   86,   86, 1421,   86, 1420,
-       86,   86, 1418, 1427,   86, 1424, 1429,   86, 1422, 1423,
-     1428,   86,   86, 1431, 1430, 1435,   86, 1434,   86, 1437,
-       86,   86,   86, 1438,   86, 1432,   86, 1439,   86, 1443,
-       86, 1440,   86, 1436, 1445,   86, 1433, 1442,   86, 1446,
-       86, 1441,   86,   86,   86, 1447, 1450,   86,   86,   86,
-       86,   86, 1444, 1452,   86, 1467, 1454,   86,   86,   86,
-     1456,   86, 1457, 1448, 1449,   86, 1455,   86, 1451, 1453,
-     1458,   86,   86, 1463, 1459, 1461, 1460, 1462,   86,   86,
+     1415, 1408,   86, 1409, 1419, 1410,   86,   86,   86, 1420,
+       86, 1418, 1416, 1423,   86, 1421, 1417,   86,   86,   86,
+       86, 1429,   86, 1430,   86,   86, 1425,   86, 1424, 1422,
+       86,   86, 1431,   86, 1428, 1433,   86, 1426, 1427, 1432,
+       86,   86, 1435, 1439,   86, 1434, 1438,   86, 1441,   86,
+       86,   86,   86, 1443, 1436,   86, 1444, 1447,   86,   86,
+     1449,   86, 1440,   86, 1446, 1437,   86, 1450, 1451,   86,
+       86, 1445, 1454,   86,   86,   86,   86,   86, 1456, 1448,
+       86,   86, 1458, 1460,   86,   86,   86,   86, 1462, 1459,
+     1452, 1453, 1464,   86, 1455,   86, 1457,   86,   86,   86,
 
-       86,   86, 1465, 1464,   86, 1466, 1468,   86,   86,   86,
-       86, 1473, 1474, 1470, 1475, 1471,   86,   86,   86, 1476,
-       86,   86, 1469, 1472,   86,   86, 1480,   86,  168, 1477,
-       86,   86, 1479, 1485, 1486, 1478,   86,   86,   86,   86,
-       86, 1488, 1487, 1482, 1481,   86,   86,   86,   86,   86,
-     1483, 1489,   86, 1496, 1484,   86,   86, 1490, 1491,   86,
-     1493,   86,   86, 1494, 1495, 1492, 1500, 1501,   86,   86,
-       86,   86,   86, 1505, 1503, 1497,   86, 1499, 1506,   86,
-     1508, 1498,   86,   86, 1509, 1502,   86,   86,   86, 1504,
-     1507,   86, 1514, 1517,   86, 1515, 1510, 1516, 1511, 1519,
+     1466, 1463, 1461, 1468, 1470, 1467,   86, 1465,   86, 1469,
+       86, 1471,   86, 1472,   86,   86,   86, 1477, 1478, 1480,
+     1474,   86, 1475,   86,   86,   86, 1479,   86,   86, 1476,
+     1473,   86, 1484,   86,   86,  169, 1481,   86,   86, 1489,
+     1490,   86, 1483,   86,   86,   86,   86, 1482,   86, 1491,
+     1486,   86, 1492, 1497, 1485,   86,   86, 1487,   86,   86,
+     1500, 1488, 1493,   86, 1495,   86,   86,   86, 1494, 1498,
+       86, 1496, 1504,   86, 1499, 1505,   86,   86, 1507,   86,
+     1509,   86,   86, 1501, 1503, 1510,   86,   86,   86, 1513,
+     1502, 1512,   86, 1506,   86,   86, 1508, 1511,   86, 1518,
 
-       86, 1512,   86,   86, 1513,   86, 1520, 1522, 1518,   86,
-       86, 1521, 1523,   86,   86, 1527,   86,   86,   86, 1528,
-       86,   86, 1524, 1531,   86,   86,   86, 1526,   86, 1536,
-     1537,   86,   86, 1540, 1529, 1533,   86, 1530,   86,   86,
-     1532,   86, 1534, 1535,   86,   86,   86,   86, 1541, 1538,
-       86, 1539, 1547,   86,   86, 1543,   86, 1542, 1549, 1544,
-     1545, 1548,   86,   86, 1552, 1546,   86,   86, 1550,   86,
-     1559, 1551,   86, 1556, 1557,   86, 1554, 1558, 1560,   86,
-       86, 1553,   86,   86,   86,   86, 1565, 1566, 1561, 1555,
-     1564, 1562,   86,   86, 1567,   86, 1568,   86, 1569,   86,
+     1521, 1514, 1519, 1515, 1520,   86, 1523, 1516,   86,   86,
+     1517,   86,   86, 1524,   86, 1526,   86,   86,   86, 1522,
+     1527,   86, 1525, 1531,   86,   86,   86, 1528,   86, 1532,
+       86, 1535,   86,   86, 1530, 1533,   86, 1540,   86,   86,
+     1529,   86, 1541, 1544, 1537, 1534,   86,   86, 1536,   86,
+     1538, 1539,   86,   86,   86,   86,   86, 1542, 1545,   86,
+     1543, 1551,   86,   86, 1553,   86, 1546, 1547,   86, 1548,
+     1549, 1550, 1552,   86, 1556,   86,   86, 1555, 1557, 1561,
+     1554,   86, 1560, 1562, 1558,   86,   86, 1564,   86,   86,
+       86,   86,   86,   86,   86, 1569, 1559, 1565, 1568, 1570,
 
-       86, 1570,   86, 1571,   86, 1563,   86,   86,   86,   86,
-       86,   86, 1578, 1572,   86,   86, 1577,   86,   86, 1574,
-       86,   86, 1575, 1580, 1573, 1576, 1581, 1584,   86, 1589,
-     1586, 1582, 1585,   86, 1579, 1587,   86, 1583,   86,   86,
-     1588,   86,   86,   86,   86,   86, 1597, 1593,   86,   86,
-     1592,   86,   86, 1598, 1600,   86,   86, 1590, 1591, 1603,
-       86, 1602, 1594, 1596, 1595,   86,   86,   86,   86,   86,
-     1601,   86, 1611,  161,   86, 1599,   86, 1609,   86,   86,
-       86, 1612, 1614,   86, 1617, 1604, 1605, 1606, 1607, 1610,
-     1608, 1613, 1615,   86,   86,   86,   86,   86,   86, 1616,
+     1563,   86, 1571,   86, 1572,   86, 1566,   86,   86,   86,
+     1573, 1574,   86, 1567,   86,   86, 1576,   86, 1575,   86,
+       86,   86,   86, 1582,   86,   86, 1581,   86,   86, 1578,
+     1585,   86, 1588, 1577, 1579, 1584, 1580, 1589,   86,   86,
+     1590,   86, 1586,   86, 1583, 1591,   86,   86, 1593,   86,
+     1587,   86,   86,   86,   86, 1601, 1597,   86, 1596, 1592,
+     1594,   86, 1595,   86, 1604,   86,   86,   86, 1602,   86,
+       86, 1598, 1600, 1599, 1607, 1606,   86,   86,   86,   86,
+       86,   86,   86, 1603, 1605, 1608, 1609,   86, 1615,   86,
+       86, 3295, 1612, 1616, 1622, 1610, 1611, 1614, 1618,   86,
 
-     1621,   86,   86,   86, 1622, 1619,   86, 1625, 1618,   86,
-     1620, 1629,   86,   86,   86,   86, 1631, 1623, 1626, 1624,
-     1630,   86,   86,   86,   86, 1628, 1627, 1633, 1632, 1634,
-       86,   86,   86, 1640, 1635, 1636, 1641,   86,   86,   86,
-       86, 1637,   86, 1639,   86, 1645, 1646, 1644,   86,   86,
-     1638,   86,   86, 1648,   86,   86, 1642,   86, 1649, 1650,
-       86, 1643,   86,   86,   86, 1651, 1653, 1652, 1647,   86,
-     1656, 1655,   86,   86,   86,   86,   86, 1654,   86, 1657,
-     1660,   86, 1662,   86,   86, 1663,   86,   86, 1661,   86,
-     1668,   86, 1659, 1658,   86,   86, 1664,   86, 1665,   86,
+     1613, 1617, 1619,   86,   86,   86,   86,   86,   86, 1620,
+     1621,   86,   86, 1625, 1623,   86,   86, 1626,   86,   86,
+     1624, 1629, 1633,   86, 1634, 1635, 1628, 1630,   86,   86,
+     1627,   86,   86,   86, 1632, 1631,   86, 1638,   86,   86,
+     1639,   86, 1637, 1636, 1644, 1640, 1645,   86,   86,   86,
+       86,   86,   86, 1641,   86, 1649, 1642, 1648, 1650, 1643,
+     1652,   86,   86,   86,   86, 1653, 1646, 1654,   86,   86,
+     1647, 1651,   86,   86,   86, 1657,   86, 1660,   86, 1655,
+       86,   86,   86, 1659,   86, 1656,   86, 1664,   86, 1666,
+       86,   86,   86, 1658,   86, 1661,   86, 1672, 1665, 1662,
 
-     1671, 1669, 1673,   86,   86,   86, 1667,   86, 1674, 1666,
-      168, 1675, 1670,   86, 1672,   86, 1676, 1679, 1678, 1677,
-       86, 1682,   86,   86, 1680, 1681, 1683,   86,   86,   86,
-       86,   86, 1690,   86,   86,   86,   86,   86, 1691, 1694,
-       86, 1684, 1685, 1688, 1695,   86, 1686, 1687,   86,   86,
-     1696, 1698, 1700, 1699, 1692, 1689, 1693, 1697,   86,   86,
-     1702,   86, 1704,   86,   86,   86,   86,   86,   86,   86,
-     1709, 1706, 1707,   86, 1710, 1703,   86,   86,   86, 1701,
-       86,   86,   86, 1705, 1714,   86, 1715,   86,   86,  159,
-     1711, 1722, 1708, 1713, 1717, 1712,   86,   86, 1716, 1719,
+     1663, 1667,   86,   86, 1668, 1669,   86,   86, 1677,   86,
+       86, 1675,   86, 1680, 1671,   86, 1670, 1673,   86, 1678,
+     1674,   86, 1676,   86,   86,  169,   86, 1683, 1686,   86,
+     1679, 1685, 1682,   86,   86,   86,   86,   86,   86, 1694,
+     1681, 1687,   86, 1684,   86,   86,   86, 1695, 1689,   86,
+     1692, 1688, 1698,   86, 1690, 1691,   86,   86, 1699, 1702,
+       86, 1700, 1693,   86, 1696, 1697, 1701, 1704, 1703, 1706,
+       86, 1708,   86,   86,   86,   86,   86,   86,   86,   86,
+     1705,   86, 1710, 1711, 1707,   86, 1713,   86, 1714,   86,
+       86,   86,   86, 1709, 1718, 1715,   86, 1716,   86, 1719,
 
-       86,   86, 1720,   86, 1724, 1723,   86, 1718, 1730,   86,
-     1731, 1727, 1726, 1728, 1721,   86,   86, 1732, 1729,   86,
-     1725,   86, 1734,   86, 1733,   86, 1735, 1736,   86,   86,
-       86,   86,   86,   86, 1737,   86, 1743, 1744, 1742,   86,
-     1746, 1738,   86,   86, 1745,   86,   86,   86, 1739,   86,
-     1740,   86, 1741,   86, 1748, 1749,   86,   86, 1750,   86,
-       86,   86,   86,   86,   86, 1751,   86,   86, 1747, 1760,
-     1759, 1752,   86, 1754, 1755, 1756,   86, 1753,   86, 1765,
-     1757,   86,   86, 1761, 1762,   86,   86,   86, 1758, 1764,
-     1763,   86, 1771,   86,   86,   86,   86,   86, 1767,   86,
+       86, 1712,   86,   86, 1717, 1726, 1723, 1727, 1720, 1724,
+       86,   86, 1721, 1728,   86,   86, 1722, 1732,   86,   86,
+     1731, 1725, 1733, 1730, 1734,   86, 1735, 1736, 1740, 1729,
+       86, 1742,   86,   86,   86, 1737,   86, 1738,   86, 1739,
+       86,   86,   86,   86,   86, 1741, 1747, 1746, 1748,   86,
+       86, 1750,   86,   86,   86, 1749,   86,   86, 1752, 1743,
+       86, 1744,   86, 1745, 1753,   86,   86, 1754,   86,   86,
+       86,   86, 1751,   86, 1755,   86,   86,   86, 1764, 1763,
+     1756,   86, 1758, 1759, 1760,   86, 1757,   86, 1769, 1761,
+       86,   86,   86, 1766,   86,   86, 1765, 1767, 1762,   86,
 
-     1773, 1766,   86, 1775,   86, 1769, 1768,   86, 1770, 1774,
-       86, 1776,   86, 1777, 1772,   86,   86,   86,   86, 1780,
-       86,   86, 1782,   86, 1789, 1779, 1783, 1781, 1778, 1784,
-     1790,   86, 1785, 1786, 1791,   86,   86,   86, 1787,   86,
-     1794, 1793, 1795,   86,   86, 1788,   86,   86, 1792,   86,
-       86, 1798, 1796,   86, 1799,   86,   86,   86,   86, 1802,
-     1808,   86,   86, 1797, 1807, 1804, 1800, 1806, 1805, 1801,
-       86,   86,   86,   86, 1803, 1810,   86, 1809,   86,   86,
-       86, 1817,   86,   86,   86, 1814, 1812,   86, 1820, 1811,
-       86, 1821, 1813, 1819,   86,   86, 1823, 1816, 1818, 1824,
+     1768, 1775,   86,   86,   86,   86,   86, 1771,   86, 1773,
+     1770, 1777, 1772,   86, 1779,   86, 1778,   86,   86, 1781,
+     1774,   86,   86, 1776,   86,   86,   86, 1784,   86, 1786,
+     1780,   86, 1782,   86, 1787, 1783, 1785, 1788,   86,   86,
+     1789, 1790, 1793, 1794,   86, 1796, 1791, 1795,   86, 1797,
+       86,   86,   86, 1792, 1798, 1799,   86, 1801,   86,   86,
+       86,   86,   86, 1800, 1802, 1803,   86,   86, 1812,   86,
+     1806, 1804,   86, 1811, 1805, 1808, 1810,   86, 1809,   86,
+       86, 1807,   86,   86,   86,   86,   86,   86, 1821,   86,
+     1814,   86, 1813,   86, 1825,   86, 1816, 1818, 1815, 1817,
 
-     1825,   86,   86, 1815, 1829, 1822,   86,   86,   86, 1830,
-       86,   86, 1826, 1835,   86,   86, 1834, 1837,   86,   86,
-     1828, 1831, 1827, 1832, 1838,   86,   86, 1840, 1833,   86,
-       86, 1839, 1836,   86,   86, 1841, 1844,   86,   86,   86,
-     1848, 1846,   86,   86,   86, 1842,   86, 1847, 1843,   86,
-     1845, 1849,   86,   86,   86,   86,   86, 1852, 1850, 1858,
-       86, 1853, 1860, 1851,   86, 1861, 1854, 1855,   86, 1856,
-     1857,   86, 1863,   86,   86,   86,   86, 1862, 1867,   86,
-     1869, 1859,   86,   86,   86,   86,   86, 1873,   86,   86,
-       86,   86, 3291, 1865, 1864, 1866, 1868,   86,   86, 1879,
+     1823,   86,   86,   86, 1820, 1822, 1824,   86, 1826, 1819,
+       86, 1827, 1829, 1830, 1828, 1833,   86,   86,   86, 1839,
+     1834,   86,   86,   86, 1831,   86,   86, 1838, 1832, 1842,
+     1835, 1843, 1836, 1841,   86,   86, 1844,   86,   86,   86,
+     1837, 1840,   86, 1845, 1848,   86,   86,   86, 1850, 1852,
+       86,   86,   86, 1847, 1851,   86,   86, 3295, 1846, 1849,
+     1853,   86,   86,   86, 1856,   86, 1854,   86, 1862,   86,
+     1855, 1857, 1864,   86, 1858,   86, 1859, 1865,   86, 1860,
+       86, 1861,   86,   86, 1867,   86, 1866, 1871,   86,   86,
+     1863, 1873,   86,   86,   86, 1868,   86,   86, 1869, 1877,
 
-     1871, 1875,   86, 1872, 1870,   86,   86, 1876,  168, 1874,
-     1877, 1878,   86, 1882, 1880, 1883,   86,   86,   86,   86,
-     1881, 1887,   86,   86,   86,   86,   86,   86, 1894, 1885,
-     1889, 1884,   86, 1888,   86,   86, 1890, 1886, 1891,   86,
-       86, 1897, 1898,   86, 1892,   86,   86, 1893, 1899,   86,
-     1896, 1895, 1900,   86, 1901, 1902, 1903, 1904,   86,   86,
-     1908,   86,   86, 1906,   86,   86,   86, 1907,   86,   86,
-       86, 1905,   86,   86, 1912, 1913,   86,   86,   86,   86,
-     3291, 1914, 1917,   86, 1910, 1915, 1911, 1909, 1918,   86,
-       86, 1916,   86, 1926, 1923, 1921, 1925,   86, 1920,   86,
+       86, 1870, 1872,   86,   86,   86,   86, 1879,   86, 1875,
+     1880, 1881, 1876, 1882, 1874,   86, 1878,  169,   86, 1887,
+       86,   86,   86,   86, 1883, 1891,   86, 1884,   86, 1885,
+       86,   86,   86, 1886, 1889, 1893,   86,   86,   86, 1898,
+     1888,   86, 1890, 1894, 1892,   86,   86,   86, 1895, 3295,
+     1899, 1896, 1901, 1902,   86,   86, 1906, 1897, 1903, 1900,
+     1904,   86,   86, 1907, 1908,   86,   86, 1905,   86,   86,
+     1910,   86,   86,   86, 1911,   86,   86,   86, 1909,   86,
+       86,   86, 1916,   86, 1917,   86,   86,   86, 1921, 1918,
+       86, 3295, 1912, 1914, 1915, 1913, 1920, 1919,   86, 1922,
 
-       86, 1919, 1922,   86, 1927,   86,   86, 1924,   86,   86,
-     1932,   86, 1935, 1936,   86, 1937,   86,   86,   86, 1928,
-       86, 1930, 1929, 1933,   86, 1934, 1931, 1939,   86,   86,
-     1940, 1943,   86,   86,   86,   86, 1945, 1938, 1944, 1941,
-       86, 1942,   86, 1946, 1947,   86, 1949,   86, 1951, 1950,
-       86, 1948,   86, 1952,   86, 1953,   86, 1955,   86,   86,
-       86, 1954, 1956,   86, 1959, 1958,   86, 1961,   86,   86,
-       86, 1960,   86,   86,   86,   86,   86,   86, 1969, 1975,
-     1957, 1962, 1963, 1964,   86,   86, 1967, 1976, 1965, 1973,
-     1966, 1971, 1968,   86, 1970, 1978, 1972,   86,   86,   86,
+       86,   86, 1928, 1925,   86, 1927, 1924, 1929,   86, 1930,
+     1926,   86, 1923,   86,   86,   86,   86,   86, 1936,   86,
+     1939,   86, 1931, 1932, 1940,   86, 1941,   86,   86, 1934,
+     1933, 1937,   86, 1938, 1935, 1943,   86,   86, 1944, 1947,
+       86, 1942,   86,   86, 1949,   86, 1948,   86, 1950, 1945,
+       86, 1951, 1953, 1946, 1956,   86,   86,   86,   86, 1955,
+       86, 1952,   86, 1959,   86,   86,   86, 1958,   86,   86,
+     1963,   86, 1954, 1962,   86,   86, 1964, 1965,   86,   86,
+     1957, 1960,   86,   86, 1973,   86, 1961, 1966, 1967, 1968,
+       86, 1975, 1971,   86, 1969,   86, 1976,   86, 1970, 1972,
 
-     1974,   86,   86, 1982,   86,   86,   86, 1979, 1977,   86,
-     1984,   86,   86, 1987, 1988,   86,   86, 1990,   86, 1980,
-       86,   86,   86, 1981,   86,   86, 1985, 1996,   86, 1995,
-     1992, 1983,   86, 1986, 1993,   86, 1989,   86,   86, 1998,
-       86,   86, 2002, 1994, 1999, 1991,   86, 2000,   86,   86,
-     2006,   86,   86, 1997, 2005, 2009,   86, 2010,   86, 2008,
-       86,   86,   86,   86, 2004, 2012, 2001, 2011,   86,   86,
-       86, 2007, 2003,   86,   86,   86,   86, 2015, 2013, 2017,
-       86, 2020, 2014, 2021, 2022, 2016,   86,   86, 2018,   86,
-       86, 2025,   86,   86,   86, 2023, 2030,   86,   86, 2029,
+     1978,   86, 1974, 1979,   86, 1982, 1980, 1977,   86,   86,
+       86,   86, 1986,   86,   86,   86, 1988, 1983,   86, 1981,
+       86,   86, 1991, 1992,   86,   86, 1994,   86,   86, 1984,
+       86, 1985,   86,   86, 2000,   86,   86, 1999, 1989, 1996,
+     1987, 1997, 1990,   86,   86, 1993,   86,   86,   86,   86,
+     2006,   86,   86, 1995, 1998, 2003, 2004, 2001,   86, 2002,
+     2010,   86,   86, 2009, 2013, 2014,   86,   86, 2008, 2012,
+       86,   86, 2005, 2015,   86,   86, 2017, 2007,   86,   86,
+     2016, 2011,   86,   86,   86,   86, 2021,   86, 2024, 2025,
+     2026, 2020,   86,   86,   86,   86,   86,   86, 2018,   86,
 
-     2019, 2024,   86,   86,   86,   86,   86, 2026, 2034,   86,
-       86, 2035, 2027, 2037,   86, 2028,   86, 2031, 2032, 2036,
-     2038, 2033,   86, 2041,   86,   86,   86, 2042, 2044,   86,
-       86, 2045,   86, 2039, 2048,   86,   86,   86, 2040, 2043,
-       86, 2050, 2051,   86,   86, 2052, 2054, 2049,   86, 2046,
-     2047,   86, 2053, 2058,   86, 2057, 2059,   86, 2060, 2062,
-     2063,   86, 2055, 2061,   86,   86,   86, 2056,   86,   86,
-     2067,   86,   86, 2065,   86,   86,   86,   86, 2069, 2072,
-     2074, 2066,   86, 2068, 2070,   86,   86, 2064,  168,   86,
-       86,   86,   86, 2075, 2076, 2080, 2079,   86, 2081, 2073,
+       86, 2019, 2022, 2029,   86, 2034,   86,   86, 2028, 2033,
+       86, 2023, 2027,   86, 2031,   86, 2035, 2038,   86, 2030,
+       86, 2039, 2032, 2041,   86, 2036, 2037, 2040,   86, 2045,
+       86, 2043, 2042,   86,   86,   86, 2044,   86,   86,   86,
+     2049, 2052,   86,   86,   86, 2055,   86,   86, 2047, 2054,
+       86, 2056, 2058,   86, 2046,   86, 2048, 2053, 2050, 2051,
+       86, 2062,   86,   86, 2057,   86, 2059, 2063,   86, 2064,
+     2066, 2060, 2067, 2061, 2065,   86,   86,   86,   86,   86,
+     2071,   86, 2069,   86,   86,   86,   86, 2073, 2076, 2068,
+     2075, 2070, 2078, 2072,   86,  169, 2074,   86,   86,   86,
 
-     2071, 2077, 2082,   86, 2083,   86,   86, 2085,   86, 2078,
-       86,   86,   86,   86, 2086, 2087,   86, 2088,   86, 2091,
-       86, 2089,   86, 2090,   86, 2093, 2084,   86,   86, 2097,
-       86,   86, 2092, 2096, 2094,   86,   86,   86, 2101, 2095,
-     2098, 2099, 2100, 2102,   86,   86,   86,   86,   86,   86,
-     2109, 2107,   86,   86,   86, 2104,   86, 2108,   86,   86,
-       86, 2114,   86, 2111,   86, 2103, 2105,   86, 2106,   86,
-       86, 2110, 2115, 2113,   86, 2119, 2112,   86, 2117, 2120,
-     2116,   86,   86,   86, 2118,   86, 2123,   86, 2122, 2121,
-     2125,   86,   86,   86, 2131, 2124, 2126,   86,   86, 2127,
+     2079,   86,   86,   86,   86, 2084,   86, 2077, 2083, 2080,
+     2111, 2081,   86, 2085, 2086,   86, 2087,   86,   86, 2089,
+     2082,   86,   86, 2091, 2088,   86,   86, 2090, 2092,   86,
+       86,   86,   86, 2095, 2094, 2093,   86, 2097,   86,   86,
+       86, 2101,   86, 2096, 2098, 2100,   86,   86, 2102,   86,
+     2099, 2103, 2104,   86, 2106,   86, 2105,   86,   86,   86,
+       86, 2113,   86,   86,   86, 2112, 2108,   86,   86, 2107,
+       86,   86, 2115,   86, 2118,   86, 2109,   86, 2110,   86,
+     2114, 3295, 2116,   86, 2117, 2119, 2120, 2125, 2121,   86,
+     2123, 2122, 2124,   86,   86, 2129,   86,   86, 2126, 2127,
 
-       86, 2128, 2129,   86, 2133,   86, 2130, 2134, 2135,   86,
-       86, 2137,   86,   86, 2132,   86, 2138, 2141, 2136, 2140,
-       86, 2139,   86,   86,   86,   86,   86, 2142,   86, 2145,
-       86,   86,   86, 2146,   86,   86,   86,   86,   86,   86,
-       86, 3291, 2148, 2149, 2143, 2144, 2154, 2147, 2151, 2150,
-     2153, 2158, 2159,   86,   86,   86,   86, 2156, 2152, 2155,
-       86, 2157,   86, 2162,   86,   86,   86, 2163, 2166, 2165,
-       86,   86, 2160,   86,   86, 2161, 2164, 2169, 2168,   86,
-     2170,   86,   86, 2167, 2174,   86,   86,   86, 2172, 2176,
-     2178,   86, 2171, 2173,   86,   86,   86, 2181,   86,   86,
+     2130,   86,   86, 2135,   86,   86, 2128,   86,   86,   86,
+       86, 2137,   86, 3295, 2138, 2139,   86, 2131, 2132, 2133,
+       86, 2134, 2136, 2141,   86,   86, 2142,   86, 2140, 2145,
+       86, 2143,   86, 2144,   86,   86,   86, 2146,   86, 2149,
+       86,   86,   86, 2150,   86,   86,   86,   86,   86,   86,
+     3295,   86,   86, 2152, 2147,   86, 2148, 2153, 2155, 2154,
+       86, 2151, 2157, 2162, 2163,   86, 2158,   86, 2156, 2160,
+     2164, 2161, 2167,   86,   86, 2165, 2166,   86,   86, 2159,
+     2170,   86, 2169,   86,   86,   86,   86,   86, 2172,   86,
+       86, 2173, 2178,   86, 2168, 2174, 2176,   86,   86, 2171,
 
-     2177, 2180,   86, 2182, 2175,   86, 2186, 2183,   86,   86,
-       86,   86,   86, 2187,   86, 2192,   86, 2184, 2189,   86,
-     2179,   86, 2188,   86, 2193, 2185, 2196,   86, 2191, 2198,
-     2190,   86,   86,   86, 2194,   86, 2197,   86, 2202,   86,
-       86, 2195,   86, 2204,   86, 2200,   86, 2203,   86, 2205,
-       86, 2199,   86, 2201,   86, 2206, 2211, 2207, 2208, 2209,
-       86, 2213, 2210,   86,   86, 2212, 2214,   86,   86, 2215,
-       86,   86,   86, 2218,   86, 2216, 2217, 2219,   86, 2223,
-       86,   86,   86, 2220,   86,   86,   86, 2222,   86,   86,
-       86, 2221, 2224,   86,   86, 2232, 2229, 2230, 2226, 2225,
+     2180, 2177,   86, 2175, 2182,   86,   86,   86,   86, 2185,
+       86, 2181, 2179, 2184,   86, 2186,   86, 2190,   86, 2187,
+       86,   86,   86,   86, 2188, 2191,   86,   86, 2183, 2193,
+       86, 2192, 2196,   86,   86, 2197, 2189, 2200,   86,   86,
+     2195, 2194, 2198,   86, 2201,   86,   86, 2202, 2206,   86,
+     2199,   86,   86, 2208, 2204,   86, 2203,   86, 2209,   86,
+       86,   86, 2205, 2207, 2210, 2211,   86,   86, 2215, 2217,
+     2213,   86,   86, 2214, 2218,   86,   86, 2212,   86,   86,
+     2219, 2222,   86,   86, 2220,   86,   86, 2223, 2216,   86,
+     2221,   86, 2224,   86, 2226, 2227,   86,   86,   86,   86,
 
-     2227,   86, 2234, 2228,   86,   86, 2233,   86,   86, 2231,
-     2235, 2237,   86, 2243,   86,   86,   86, 2238, 2245,   86,
-       86,   86, 2239, 2236, 2242, 2244, 2240,   86,   86,  168,
-     2251, 2247, 2253, 2248, 2249, 2252,   86, 2241,   86, 2246,
-     2254,   86,   86,   86, 2255,   86,   86, 2258,   86,   86,
-     2256, 2250,   86, 2259, 2262, 2263,   86,   86, 2264,   86,
-     2267, 2265, 2272, 2257,   86,   86,   86, 2260,   86, 2268,
-       86, 2269, 2270,   86,   86,   86,   86, 2266, 2261, 2271,
-     2273,   86,   86,   86,   86, 2274, 2275,   86, 2278,   86,
-       86,   86,   86,   86, 2281, 2276,   86, 2285, 2287,   86,
+       86,   86,   86, 2225, 2228, 2231, 2236, 2229,   86, 2230,
+     2233, 2234, 2232, 2237,   86,   86,   86,   86,   86,   86,
+     2235, 2239, 2241, 2238,   86, 2242, 2247,   86,   86, 2249,
+       86,   86, 2243, 2246, 2240,   86, 2244, 2248,   86, 2251,
+       86,  169, 2255, 2252, 2245, 2257, 2258, 2256,   86,   86,
+     2250,   86,   86, 2253,   86,   86,   86, 2259, 2262,   86,
+       86, 2263,   86, 2254, 2260, 2267,   86,   86, 2268, 2261,
+       86, 2266, 2271, 2270,   86, 2264,   86, 2273,   86, 2272,
+     2274,   86, 2269,   86, 2276,   86, 2265,   86, 2275, 2277,
+       86,   86,   86,   86,   86, 2279,   86,   86,   86, 2282,
 
-       86,   86, 2280,   86, 2288,   86, 2277, 2279, 2282, 2283,
-     2290, 2284,   86,   86,   86,   86, 2289,   86, 2286,   86,
-     2295, 2298,   86,   86,   86, 2293,   86,   86,   86, 2291,
-     2292, 2299, 2296, 2294,   86, 2297,   86,   86,   86,   86,
-       86, 3291,   86, 2300,   86, 2301, 2311, 2313,   86, 2306,
-     2302,   86, 2303, 2304, 2308, 2309, 2314, 2305, 2310, 2307,
-       86,   86, 2312,   86, 2315,   86,   86,   86,   86, 2319,
-     2320,   86,   86,   86, 2321,   86, 2316, 2322,   86, 2317,
-     2318, 2323,   86, 2325, 2326,   86, 2324, 2327, 2328,   86,
-     2329,   86,   86,   86,   86,   86,   86, 2330, 2331, 2335,
+       86,   86, 2285,   86,   86,   86, 2289, 2278, 2291,   86,
+       86,   86, 2280, 2284, 2292,   86, 2287,   86, 2281, 2283,
+     2294, 2286,   86,   86, 2288,   86, 2293, 2290,   86,   86,
+       86, 2302,   86, 2299,   86, 2297,   86,   86,   86,   86,
+     2296,   86, 2300, 2295, 2298, 2303,   86,   86, 2301,   86,
+       86,   86,   86, 2304, 3295, 2305,   86, 2317,   86, 2310,
+     2308, 2306, 2315, 2307, 2313, 2312, 2314, 2309,   86,   86,
+     2311, 2316,   86, 2318,   86, 2319,   86,   86,   86,   86,
+     2323, 2324,   86,   86,   86, 2325,   86, 2320, 2326,   86,
+     2321, 2322, 2327,   86, 2329, 2330,   86, 2328, 2331, 2332,
 
-       86, 2336,   86, 2338,   86, 2332,   86, 2334, 2340,   86,
-       86,   86, 2343,   86, 2333, 2337, 2342, 2344,   86,   86,
-       86,   86,   86,   86, 2339, 2341, 2350,   86, 2349, 2346,
-       86, 2352,   86, 2345,   86, 2347,   86,   86,   86, 2356,
-     2355, 2348, 2354, 2358,   86,   86,   86,   86,   86, 2351,
-     2362,   86, 2353,   86, 2357,   86,   86, 2367,   86,   86,
-     2366, 2360,   86,   86, 2359,   86, 2361, 2369, 2363,   86,
-     2365, 2372,   86,   86,   86,   86, 2364,   86, 2368,   86,
-     2370, 2374,   86, 2373, 2371,   86, 2379, 2375,   86,   86,
-     2381, 2380, 2382, 2376,   86, 2377,   86,   86,   86,   86,
+       86, 2333,   86,   86,   86,   86,   86,   86, 2334, 2335,
+     2339,   86, 2340,   86, 2342,   86, 2336,   86, 2338, 2344,
+       86,   86,   86, 2347,   86, 2337, 2341, 2346, 2348,   86,
+       86,   86,   86,   86,   86, 2343, 2345, 2354,   86, 2353,
+     2350,   86, 2356,   86, 2349,   86, 2351,   86,   86,   86,
+     2360, 2359, 2352, 2358, 2362,   86,   86,   86,   86,   86,
+     2355, 2366,   86, 2357,   86, 2361,   86,   86, 2371,   86,
+       86, 2370, 2364,   86,   86, 2363,   86, 2365, 2373, 2367,
+       86, 2369, 2376,   86,   86,   86,   86, 2368,   86, 2372,
+       86, 2374, 2378,   86, 2377, 2375,   86, 2383, 2379,   86,
 
-       86, 2386, 2387,   86,   86, 2378, 2385, 2383, 2391, 2384,
-       86,   86, 2389,   86, 2396, 2393, 2394,   86, 2398,   86,
-       86, 2390,   86, 2388,   86,   86,   86, 2399, 2395,   86,
-     2392, 2400,   86,   86, 2404, 2403,   86,   86, 2397,   86,
-       86, 3291, 2402, 2409, 2401, 2405, 2406, 2408, 2407,   86,
-     2410,   86,   86,   86, 2414, 2411,   86, 2415,   86, 2416,
-     2412, 2413,   86,   86,  168,   86,   86, 2417,   86, 2418,
-       86, 2423,   86,   86,   86, 2425,   86,   86,   86, 2434,
-       86, 2421, 2419, 2424, 2420, 2426, 2422,   86,   86, 2429,
-     2427, 2428,   86, 2431, 3291, 2430,   86, 2435, 2432, 2433,
+       86, 2385, 2384, 2386, 2380,   86, 2381,   86,   86,   86,
+       86,   86, 2390, 2391,   86,   86, 2382, 2389, 2387, 2395,
+     2388,   86,   86, 2393,   86, 2400, 2397, 2398,   86, 2402,
+       86,   86, 2394,   86, 2392,   86,   86,   86, 2403, 2399,
+       86, 2396, 2404,   86,   86, 2408, 2407,   86,   86, 2401,
+       86,   86, 3295, 2406, 2413, 2405, 2409, 2410, 2412, 2411,
+       86, 2414,   86,   86,   86, 2418, 2415,   86, 2419,   86,
+     2420, 2416, 2417,   86,   86,  169,   86,   86, 2421,   86,
+     2422,   86, 2427,   86,   86,   86, 2429,   86,   86,   86,
+     2438,   86, 2425, 2423, 2428, 2424, 2430, 2426,   86,   86,
 
-     2436,   86,   86,   86, 2439, 2437, 2440,   86, 2438,   86,
-       86,   86,   86, 2442,   86,   86, 2441,   86, 2444,   86,
-       86, 2448, 2449, 2443,   86, 2446,   86, 2445,   86, 2451,
-       86,   86,   86,   86, 2452, 2453, 2454,   86, 2447,   86,
-     2450,   86, 2456,   86, 2455, 2460,   86, 2459,   86,   86,
-     2457, 2458,   86,   86, 2462,   86,   86,   86,   86, 2469,
-     2466, 2461,   86, 2468,   86,   86,   86,   86, 2470, 2465,
-       86,   86, 2463, 2464,   86, 2474,   86, 2467,   86,   86,
-     2484, 2479, 2471, 2478,   86, 2472, 2473,   86, 2476,   86,
-     2477,   86, 2475, 2481,   86,   86,   86, 2480, 2483, 2485,
+     2433, 2431, 2432,   86, 2435, 3295, 2434,   86, 2439, 2436,
+     2437, 2440,   86,   86,   86, 2443, 2441, 2444,   86, 2442,
+       86,   86,   86,   86, 2446,   86,   86, 2445,   86, 2448,
+       86,   86, 2452, 2453, 2447,   86, 2450,   86, 2449,   86,
+     2455,   86,   86,   86,   86, 2456, 2457, 2458,   86, 2451,
+       86, 2454,   86, 2460,   86, 2459, 2464,   86, 2463,   86,
+       86, 2461, 2462,   86,   86, 2466,   86,   86,   86,   86,
+     2473, 2470, 2465,   86, 2472,   86,   86,   86,   86, 2474,
+     2469,   86,   86, 2467, 2468,   86, 2478,   86, 2471,   86,
+       86, 2488, 2483, 2475, 2482,   86, 2476, 2477,   86, 2480,
 
-       86, 2487,   86, 2482, 2489,   86, 2488, 2491,   86,   86,
-       86, 2493,   86,   86,   86,   86,   86, 2490, 2492,   86,
-     2497, 2486,   86,   86,   86, 2501,   86, 2499, 2495, 2500,
-     2503, 2494, 2496, 2502,   86,   86,   86,   86, 2504, 2505,
-       86,   86,   86, 2510,   86, 2498, 2507,   86,   86, 2512,
-       86, 2515,   86,   86, 2509,   86, 2511, 2506,   86, 2508,
-       86, 2516,   86, 2519,   86, 2514, 2513, 2520,   86, 2521,
-       86,   86, 2517,   86,   86, 2525,   86,   86, 2518, 2524,
-     2523,   86,   86,   86,   86, 2532,   86, 2529, 2522, 2531,
-     2526, 2527,   86, 2528, 2533,   86, 2534,   86, 2535,   86,
+       86, 2481,   86, 2479, 2485,   86,   86,   86, 2484, 2487,
+     2489,   86, 2491,   86, 2486, 2493,   86, 2492, 2495,   86,
+       86,   86, 2497,   86,   86,   86,   86,   86, 2494, 2496,
+       86, 2501, 2490,   86,   86,   86, 2505,   86, 2503, 2499,
+     2504, 2507, 2498, 2500, 2506,   86,   86,   86,   86, 2508,
+     2509,   86,   86,   86, 2514,   86, 2502, 2511,   86,   86,
+     2516,   86, 2519,   86,   86, 2513,   86, 2515, 2510,   86,
+     2512,   86, 2520,   86, 2523,   86, 2518, 2517, 2524,   86,
+     2525,   86,   86, 2521,   86,   86, 2529,   86,   86, 2522,
+     2528, 2527,   86,   86,   86,   86, 2536,   86, 2533, 2526,
 
-       86,   86,   86, 2530, 2536,   86, 2538,   86, 2539,   86,
-     2540,   86,   86,   86, 2541, 2545,   86, 2542, 2537, 2547,
-       86, 2548,   86,   86,   86,   86,   86,   86, 2544,   86,
-       86, 2543, 2546, 2551, 2549, 2554, 2550, 2552,   86, 2557,
-       86,   86,   86,   86,   86,   86,   86, 2553,   86, 2555,
-     2558,   86,  168,   86, 2565,   86,   86, 2561, 2556,   86,
-     2563,   86,   86, 2560, 2564, 2566, 2567, 3291, 2559, 2562,
-     2568, 2571,   86,   86,   86, 2572, 2573, 2569, 2574, 2575,
-     2576,   86,   86, 2570, 2577,   86,   86, 2578,   86, 2579,
-       86, 2580,   86,   86,   86,   86,   86,   86,   86,   86,
+     2535, 2530, 2531,   86, 2532, 2537,   86, 2538,   86, 2539,
+       86,   86,   86,   86, 2534, 2540,   86, 2542,   86, 2543,
+       86, 2544,   86,   86,   86, 2545, 2549,   86, 2546, 2541,
+     2551,   86, 2552,   86,   86,   86,   86,   86,   86, 2548,
+       86,   86, 2547, 2550, 2555, 2553, 2558, 2554, 2556,   86,
+     2561,   86,   86,   86,   86,   86,   86,   86, 2557,   86,
+     2559, 2562,   86,  169,   86, 2569,   86,   86, 2565, 2560,
+       86, 2567,   86,   86, 2564, 2568, 2570, 2571, 3295, 2563,
+     2566, 2572, 2575,   86,   86,   86, 2576, 2577, 2573, 2578,
+     2579, 2580,   86,   86, 2574, 2581,   86,   86, 2582,   86,
 
-     2581,   86,   86, 2582, 2591,   86,   86,   86, 2589, 2584,
-       86,   86, 2583,   86, 2586, 2585,   86, 2595, 2588, 2587,
-     2599, 2590, 2596,   86, 2593, 2592,   86, 2597, 2594, 2598,
-     2600,   86, 2602,   86,   86, 2601,   86,   86,   86,   86,
-       86,   86,   86,   86, 2605, 2611,   86, 2612,   86,   86,
-       86,   86, 2603, 2606, 2604, 2618, 2615, 2607, 2608, 2609,
-     2610,   86, 2613, 2616,   86, 2617,   86, 2614,   86, 2619,
-       86,   86,   86,   86,   86,   86,   86, 2623, 2627,   86,
-     2626, 2628,   86, 2620,   86, 2622, 2629, 2630,   86, 2621,
-       86,   86,   86, 2624, 2625,   86,   86,   86, 2631, 2632,
+     2583,   86, 2584,   86,   86,   86,   86,   86,   86,   86,
+       86, 2585,   86,   86, 2586, 2595,   86,   86,   86, 2593,
+     2588,   86,   86, 2587,   86, 2590, 2589,   86, 2599, 2592,
+     2591, 2603, 2594, 2600,   86, 2597, 2596,   86, 2601, 2598,
+     2602, 2604,   86, 2606,   86,   86, 2605,   86,   86,   86,
+       86,   86,   86,   86,   86, 2609, 2615,   86, 2616,   86,
+       86,   86,   86, 2607, 2610, 2608, 2622, 2619, 2611, 2612,
+     2613, 2614,   86, 2617, 2620,   86, 2621,   86, 2618,   86,
+     2623,   86,   86,   86,   86,   86,   86,   86, 2627, 2631,
+       86, 2630, 2632,   86, 2624,   86, 2626, 2633, 2634,   86,
 
-       86, 2636,   86,   86, 2634,   86, 2640, 2641,   86,   86,
-     2633, 2644,   86,   86,   86, 2635,   86, 2637, 2645, 2638,
-     2642,   86, 2639, 2648,   86, 2647,   86, 2643, 2646, 2649,
-       86,   86, 2653,   86,   86,   86,   86, 2657,   86,   86,
-     2656, 2650, 2659,   86, 2655,   86, 2654,   86,   86,   86,
-     2651, 2652, 2660,   86, 2661, 2664,   86,   86, 2658,   86,
-     2665, 2663, 2667,   86, 2662,   86,   86,   86,   86,   86,
-     2668, 2672,   86, 2674,   86, 2666, 2670, 2671, 2669,   86,
-       86, 2673,   86, 2677, 2675, 2676,   86, 2678,   86,   86,
-       86,   86,   86,   86, 2679,   86,   86, 2684, 2681, 2682,
+     2625,   86,   86,   86, 2628, 2629,   86,   86,   86, 2635,
+     2636,   86, 2640,   86,   86, 2638,   86, 2644, 2645,   86,
+       86, 2637, 2648,   86,   86,   86, 2639,   86, 2641, 2649,
+     2642, 2646,   86, 2643, 2652,   86, 2651,   86, 2647, 2650,
+     2653,   86,   86, 2657,   86,   86,   86,   86, 2661,   86,
+       86, 2660, 2654, 2663,   86, 2659,   86, 2658,   86,   86,
+       86, 2655, 2656, 2664,   86, 2665, 2668,   86,   86, 2662,
+       86, 2669, 2667, 2671,   86, 2666,   86,   86,   86,   86,
+       86, 2672, 2676,   86, 2678,   86, 2670, 2674, 2675, 2673,
+       86,   86, 2677,   86, 2681, 2679, 2680,   86, 2682,   86,
 
-     2685, 2687,   86, 2688,   86, 2683,   86, 2680, 2686, 2689,
-      168,   86,   86, 2690, 2692, 2694, 2691,   86,   86, 2696,
-       86,   86, 2695,   86, 2699,   86, 2700,   86, 2698,   86,
-     2693, 2702,   86,   86, 2704, 2697, 2703,   86,   86, 2705,
-       86,   86, 2701, 2706, 2709,   86, 2707,   86,   86, 2710,
-       86, 2708, 2711,   86,   86,   86,   86, 2712, 2716, 2717,
-       86, 2718, 2714,   86,   86,   86,   86,   86, 2713,   86,
-     2720, 2721, 2719,   86,   86,   86, 2715, 2722, 2724, 2723,
-     2725,   86,   86,   86,   86, 2730,   86, 2726,   86,   86,
-     2733, 2728, 2729,   86, 2727, 2731,   86,   86,   86, 2734,
+       86,   86,   86,   86,   86, 2683,   86,   86, 2688, 2685,
+     2686, 2689, 2691,   86, 2692,   86, 2687,   86, 2684, 2690,
+     2693,  169,   86,   86, 2694, 2696, 2698, 2695,   86,   86,
+     2700,   86,   86, 2699,   86, 2703,   86, 2704,   86, 2702,
+       86, 2697, 2706,   86,   86, 2708, 2701, 2707,   86,   86,
+     2709,   86,   86, 2705, 2710, 2713,   86, 2711,   86,   86,
+     2714,   86, 2712, 2715,   86,   86,   86,   86, 2716, 2720,
+     2721,   86, 2722, 2718,   86,   86,   86,   86,   86, 2717,
+       86, 2724, 2725, 2723,   86,   86,   86, 2719, 2726, 2728,
+     2727, 2729,   86,   86,   86,   86, 2734,   86, 2730,   86,
 
-       86, 2738,   86,   86,   86, 2739, 2732,   86, 2735,   86,
-     2743,   86,   86, 2741,   86,   86,   86, 2736,   86, 2737,
-     2747, 3291, 2740, 2755, 2742, 2750, 2744, 2745, 2748,   86,
-     2751,   86, 2752,   86, 2746,   86,   86,   86,   86,   86,
-     2749, 2753,   86, 2754,   86,   86, 2756, 2759, 2758,   86,
-     2761,   86, 2757, 2763,   86, 2764,   86, 2765,   86,   86,
-     2760,   86,   86, 2766, 2768,   86, 2767,   86,   86, 2762,
-     2772,   86, 2770,   86, 2775, 2773,   86, 2776,   86,   86,
-     2771,   86, 2769, 2777,   86,   86,   86,   86, 2778, 2782,
-       86, 2774, 2779,   86, 2783, 2784,   86, 2786,   86, 2780,
+       86, 2737, 2732, 2733,   86, 2731, 2735,   86,   86,   86,
+     2738,   86, 2742,   86,   86,   86, 2743, 2736,   86, 2739,
+       86, 2747,   86,   86, 2745,   86,   86,   86, 2740,   86,
+     2741, 2751, 3295, 2744, 2759, 2746, 2754, 2748, 2749, 2752,
+       86, 2755,   86, 2756,   86, 2750,   86,   86,   86,   86,
+       86, 2753, 2757,   86, 2758,   86,   86, 2760, 2763, 2762,
+       86, 2765,   86, 2761, 2767,   86, 2768,   86, 2769,   86,
+       86, 2764,   86,   86, 2770, 2772,   86, 2771,   86,   86,
+     2766, 2776,   86, 2774,   86, 2779, 2777,   86, 2780,   86,
+       86, 2775,   86, 2773, 2781,   86,   86,   86,   86, 2782,
 
-       86,   86, 2785,   86, 2790,   86, 2781, 2791,   86, 2792,
-       86,   86,   86, 2787,   86, 2793,   86, 2789,   86, 2788,
-     2794,   86, 2799,   86, 2798, 2802,   86, 2801,   86,   86,
-       86,   86, 2796,   86, 2795, 2803, 2797, 2804,   86, 2800,
-       86, 2805,   86, 2807,   86, 2808,   86, 2811,   86,   86,
-     2809, 2810, 2815,   86,   86,   86, 2806, 2817,   86,   86,
-       86, 2822,   86, 2814, 2812, 2818, 2823,   86, 2813, 2816,
-     2821, 2824, 2819, 2827,   86,   86, 2825,   86, 2820, 2826,
-       86, 2828,   86, 2829,   86, 2830,   86, 2831,   86,   86,
-       86, 2832,   86, 2833,   86,   86,   86, 2836,   86,   86,
+     2786,   86, 2778, 2783,   86, 2787, 2788,   86, 2790,   86,
+     2784,   86,   86, 2789,   86, 2794,   86, 2785, 2795,   86,
+     2796,   86,   86,   86, 2791,   86, 2797,   86, 2793,   86,
+     2792, 2798,   86, 2803,   86, 2802, 2806,   86, 2805,   86,
+       86,   86,   86, 2800,   86, 2799, 2807, 2801, 2808,   86,
+     2804,   86, 2809,   86, 2811,   86, 2812,   86, 2815,   86,
+       86, 2813, 2814, 2819,   86,   86,   86, 2810, 2821,   86,
+       86,   86, 2826,   86, 2818, 2816, 2822, 2827,   86, 2817,
+     2820, 2825, 2828, 2823, 2831,   86,   86, 2829,   86, 2824,
+     2830,   86, 2832,   86, 2833,   86, 2834,   86, 2835,   86,
 
-     2838, 2842,   86, 2843,   86, 2839,   86,   86,   86, 2834,
-     2844, 2846,   86, 2837,   86, 2847, 2835,   86, 2840, 2841,
-     2848,   86, 2849, 2851, 2845, 2850,   86,   86,   86,   86,
-     2855,   86,   86,   86,   86,   86, 2852, 2853, 2856, 2859,
-       86, 2857,   86,   86, 2860,   86,   86, 2854, 2858,   86,
-     2863, 2862,   86, 2861, 2864, 2865,   86, 2866,   86,   86,
-     2868, 2869,   86,   86,   86,   86, 2867,   86, 2870, 2875,
-       86,   86,   86, 2873, 2871,   86, 2878, 2879,   86, 2876,
-       86, 2880,   86, 2883,   86, 2874, 2884, 2881, 2872, 2882,
-       86, 2877, 2885,   86, 2886,   86, 2887,   86,   86, 2888,
+       86,   86, 2836,   86, 2837,   86,   86,   86, 2840,   86,
+       86, 2842, 2846,   86, 2847,   86, 2843,   86,   86,   86,
+     2838, 2848, 2850,   86, 2841,   86, 2851, 2839,   86, 2844,
+     2845, 2852,   86, 2853, 2855, 2849, 2854,   86,   86,   86,
+       86, 2859,   86,   86,   86,   86,   86, 2856, 2857, 2860,
+     2863,   86, 2861,   86,   86, 2864,   86,   86, 2858, 2862,
+       86, 2867, 2866,   86, 2865, 2868, 2869,   86, 2870,   86,
+       86, 2872, 2873,   86,   86,   86,   86, 2871,   86, 2874,
+     2879,   86,   86,   86, 2877, 2875,   86, 2882, 2883,   86,
+     2880,   86, 2884,   86, 2887,   86, 2878, 2888, 2885, 2876,
 
-       86,   86, 2892,   86,   86,   86, 2891,   86,   86, 2893,
-     2894, 2895,   86,   86,   86,   86, 2901,   86, 2889, 2890,
-     2899, 2896,   86, 2903,   86, 2897,   86,   86, 2898,   86,
-     2904,   86, 2900,   86, 2905,   86, 2906,   86, 2907,   86,
-     2912,   86, 2902,   86,   86,   86, 2908,   86, 2909, 2915,
-     2910,   86,   86,   86,   86, 2921, 2913, 2914,   86, 2911,
-     2916, 2919,   86, 2917,   86,   86,   86, 2920, 2925,   86,
-       86, 2918,   86, 2922, 2927,   86, 2923, 2928,   86, 2930,
-       86,   86,   86,   86,   86, 2926, 2931,   86, 2934, 2935,
-       86, 2924,   86, 2929,   86, 2939,   86, 2932, 2933,   86,
+     2886,   86, 2881, 2889,   86, 2890,   86, 2891,   86,   86,
+     2892,   86,   86, 2896,   86,   86,   86, 2895,   86,   86,
+     2897, 2898, 2899,   86,   86,   86,   86, 2905,   86, 2893,
+     2894, 2903, 2900,   86, 2907,   86, 2901,   86,   86, 2902,
+       86, 2908,   86, 2904,   86, 2909,   86, 2910,   86, 2911,
+       86, 2916,   86, 2906,   86,   86,   86, 2912,   86, 2913,
+     2919, 2914,   86,   86,   86,   86, 2925, 2917, 2918,   86,
+     2915, 2920, 2923,   86, 2921,   86,   86,   86, 2924, 2929,
+       86,   86, 2922,   86, 2926, 2931,   86, 2927, 2932,   86,
+     2934,   86,   86,   86,   86,   86, 2930, 2935,   86, 2938,
 
-     2942,   86,   86, 2944, 2936,   86,   86,   86,   86,   86,
-     2937, 2938, 2945, 2940,   86, 2941, 2947,   86, 2948,   86,
-     2950,   86, 2943,   86, 2955, 2952, 2949, 2946, 2954,   86,
-       86,   86, 2953,   86, 2959,   86,   86,   86, 2961, 2960,
-     2951,   86,   86, 2957, 2964, 2965,   86,   86, 2956,   86,
-       86, 2967, 2966, 2958, 2962,   86,   86,   86, 2970,   86,
-     2969, 2963,   86, 2973,   86, 2968,   86, 2971,   86,   86,
-     2976,   86,   86,   86,   86, 2972, 2981,   86, 2977,   86,
-       86, 2974, 2975, 2985,   86,   86, 2978, 2980,   86, 2984,
-     2986,   86, 2982, 2987,   86, 2983,   86, 2979,   86, 2988,
+     2939,   86, 2928,   86, 2933,   86, 2943,   86, 2936, 2937,
+       86, 2946,   86,   86, 2948, 2940,   86,   86,   86,   86,
+       86, 2941, 2942, 2949, 2944,   86, 2945, 2951,   86, 2952,
+       86, 2954,   86, 2947,   86, 2959, 2956, 2953, 2950, 2958,
+       86,   86,   86, 2957,   86, 2963,   86,   86,   86, 2965,
+     2964, 2955,   86,   86, 2961, 2968, 2969,   86,   86, 2960,
+       86,   86, 2971, 2970, 2962, 2966,   86,   86,   86, 2974,
+       86, 2973, 2967,   86, 2977,   86, 2972,   86, 2975,   86,
+       86, 2980,   86,   86,   86,   86, 2976, 2985,   86, 2981,
+       86,   86, 2978, 2979, 2989,   86,   86, 2982, 2984,   86,
 
-       86, 2989, 2990,   86, 2991,   86, 2992,   86, 2995,   86,
-       86, 2993, 2997,   86,   86, 2996,   86,   86,   86, 2998,
-     2994,   86, 3002, 3003,   86,   86,   86, 3007,   86, 3008,
-       86, 2999, 3004,   86, 3009, 3006,   86,   86, 3000, 3001,
-       86,   86, 3012, 3013,   86, 3005, 3014,   86,   86,   86,
-     3017,   86,   86, 3010, 3015, 3011,   86, 3020,   86,   86,
-     3019, 3022, 3016, 3018, 3021,   86,   86,   86,   86,   86,
-       86, 3024,   86,   86, 3026,   86,   86, 3027,   86, 3025,
-       86,   86,   86,   86, 3039, 3023, 3036, 3037,   86, 3028,
-       86, 3032, 3029, 3030, 3031, 3033, 3034,   86,   86, 3044,
+     2988, 2990,   86, 2986, 2991,   86, 2987,   86, 2983,   86,
+     2992,   86, 2993, 2994,   86, 2995,   86, 2996,   86, 2999,
+       86,   86, 2997, 3001,   86,   86, 3000,   86,   86,   86,
+     3002, 2998,   86, 3006, 3007,   86,   86,   86, 3011,   86,
+     3012,   86, 3003, 3008,   86, 3013, 3010,   86,   86, 3004,
+     3005,   86,   86, 3016, 3017,   86, 3009, 3018,   86,   86,
+       86, 3021,   86,   86, 3014, 3019, 3015,   86, 3024,   86,
+       86, 3023, 3026, 3020, 3022, 3025,   86,   86,   86,   86,
+       86,   86, 3028,   86,   86, 3030,   86,   86, 3031,   86,
+     3029,   86,   86,   86,   86, 3043, 3027, 3040, 3041,   86,
 
-       86, 3035, 3040, 3038,   86, 3045,   86, 3042, 3041,   86,
-       86, 3043,   86, 3046, 3047,   86, 3291, 3048, 3050,   86,
-     3051,   86, 3052, 3053,   86,   86,   86, 3054, 3055, 3049,
-       86, 3056, 3057,   86,   86, 3059,   86, 3058,   86,   86,
-     3061,   86, 3060, 3065,   86,   86, 3064,   86,   86,   86,
-       86,   86, 3068,   86, 3067,   86, 3073, 3082, 3062, 3063,
-     3069,   86, 3072,   86, 3070, 3074,   86,   86, 3071,   86,
-     3066, 3075,   86,   86, 3077, 3080, 3076,   86,   86,   86,
-     3081,   86, 3078,   86, 3086, 3079,   86, 3291, 3087, 3089,
-       86, 3090, 3083, 3084,   86, 3092,   86,   86, 3085,   86,
+     3032,   86, 3036, 3033, 3034, 3035, 3037, 3038,   86,   86,
+     3048,   86, 3039, 3044, 3042,   86, 3049,   86, 3046, 3045,
+       86,   86, 3047,   86, 3050, 3051,   86, 3295, 3052, 3054,
+       86, 3055,   86, 3056, 3057,   86,   86,   86, 3058, 3059,
+     3053,   86, 3060, 3061,   86,   86, 3063,   86, 3062,   86,
+       86, 3065,   86, 3064, 3069,   86,   86, 3068,   86,   86,
+       86,   86,   86, 3072,   86, 3071,   86, 3077, 3086, 3066,
+     3067, 3073,   86, 3076,   86, 3074, 3078,   86,   86, 3075,
+       86, 3070, 3079,   86,   86, 3081, 3084, 3080,   86,   86,
+       86, 3085,   86, 3082,   86, 3090, 3083,   86, 3295, 3091,
 
-     3091, 3093,   86,   86,   86, 3088, 3096,   86, 3095, 3097,
-       86, 3099,   86, 3098, 3094, 3100,   86, 3101,   86, 3102,
-       86, 3103,   86, 3104,   86, 3105,   86,   86, 3107,   86,
-       86,   86,   86,   86,   86,   86, 3106, 3112,   86, 3108,
-       86,   86,   86, 3109,   86, 3116,   86, 3115, 3113, 3118,
-       86,   86, 3110, 3111, 3114, 3117,   86,   86, 3122, 3120,
-     3119,   86, 3125,   86, 3124,   86,   86,   86,   86, 3123,
-     3127,   86, 3121,   86,   86,   86,   86, 3126, 3133, 3131,
-       86,   86,   86, 3130, 3132, 3128,   86,   86,   86, 3129,
-     3136, 3134, 3138,   86, 3137, 3139,   86, 3140,   86,   86,
+     3093,   86, 3094, 3087, 3088,   86, 3096,   86,   86, 3089,
+       86, 3095, 3097,   86,   86,   86, 3092, 3100,   86, 3099,
+     3101,   86, 3103,   86, 3102, 3098, 3104,   86, 3105,   86,
+     3106,   86, 3107,   86, 3108,   86, 3109,   86,   86, 3111,
+       86,   86,   86,   86,   86,   86,   86, 3110, 3116,   86,
+     3112,   86,   86,   86, 3113,   86, 3120,   86, 3119, 3117,
+     3122,   86,   86, 3114, 3115, 3118, 3121,   86,   86, 3126,
+     3124, 3123,   86, 3129,   86, 3128,   86,   86,   86,   86,
+     3127, 3131,   86, 3125,   86,   86,   86,   86, 3130, 3137,
+     3135,   86,   86,   86, 3134, 3136, 3132,   86,   86,   86,
 
-       86,   86, 3145,   86, 3143, 3141, 3135,   86, 3142, 3146,
-       86,   86, 3148, 3149, 3147,   86, 3151,   86,   86,   86,
-       86, 3144,   86,   86,   86, 3150,   86,   86,   86,   86,
-     3152, 3160, 3158,   86, 3162, 3155,   86, 3153, 3154, 3157,
-     3159, 3164,   86,   86, 3167,   86,   86, 3156, 3161, 3169,
-       86,   86, 3170, 3163,   86, 3168, 3165, 3171,   86, 3172,
-       86,   86,   86, 3166,   86, 3175,   86,   86,   86, 3176,
-     3180, 3177,   86, 3173,   86,   86,   86, 3184,   86, 3183,
-       86, 3174,   86, 3179, 3186,   86, 3181, 3182, 3187,   86,
-       86,   86, 3178, 3190,   86,   86,   86, 3188, 3193,   86,
+     3133, 3140, 3138, 3142,   86, 3141, 3143,   86, 3144,   86,
+       86,   86,   86, 3149,   86, 3147, 3145, 3139,   86, 3146,
+     3150,   86,   86, 3152, 3153, 3151,   86, 3155,   86,   86,
+       86,   86, 3148,   86,   86,   86, 3154,   86,   86,   86,
+       86, 3156, 3164, 3162,   86, 3166, 3159,   86, 3157, 3158,
+     3161, 3163, 3168,   86,   86, 3171,   86,   86, 3160, 3165,
+     3173,   86,   86, 3174, 3167,   86, 3172, 3169, 3175,   86,
+     3176,   86,   86,   86, 3170,   86, 3179,   86,   86,   86,
+     3180, 3184, 3181,   86, 3177,   86,   86,   86, 3188,   86,
+     3187,   86, 3178,   86, 3183, 3190,   86, 3185, 3186, 3191,
 
-     3185,   86, 3194,   86, 3195, 3197, 3191,   86, 3198, 3189,
-       86,   86,   86, 3192,   86,   86, 3203,   86, 3204,   86,
-     3202, 3199, 3196, 3200,   86,   86,   86,   86,   86,   86,
-       86, 3201, 3208,   86, 3210,   86,   86,   86,   86, 3207,
-       86, 3215,   86, 3216,   86, 3205, 3206, 3209, 3212, 3211,
-     3213, 3223, 3214, 3217,   86, 3221,   86,   86,   86,   86,
-     3218, 3220, 3219, 3222,   86, 3224,   86,   86,   86, 3229,
-       86, 3225, 3226, 3227,   86,   86, 3230,   86, 3228, 3231,
-     3232,   86,   86,   86,   86,   86, 3233, 3238,   86, 3234,
-     3235,   86,   86,   86,   86, 3241, 3242,   86,   86,   86,
+       86,   86,   86, 3182, 3194,   86,   86,   86, 3192, 3197,
+       86, 3189,   86, 3198,   86, 3199, 3201, 3195,   86, 3202,
+     3193,   86,   86,   86, 3196,   86,   86, 3207,   86, 3208,
+       86, 3206, 3203, 3200, 3204,   86,   86,   86,   86,   86,
+       86,   86, 3205, 3212,   86, 3214,   86,   86,   86,   86,
+     3211,   86, 3219,   86, 3220,   86, 3209, 3210, 3213, 3216,
+     3215, 3217, 3227, 3218, 3221,   86, 3225,   86,   86,   86,
+       86, 3222, 3224, 3223, 3226,   86, 3228,   86,   86,   86,
+     3233,   86, 3229, 3230, 3231,   86,   86, 3234,   86, 3232,
+     3235, 3236,   86,   86,   86,   86,   86, 3237, 3242,   86,
 
-       86,   86,   86, 3236, 3237, 3240, 3245, 3239, 3243,   86,
-     3246, 3244,   86, 3248,   86, 3249,   86, 3247,   86, 3253,
-       86, 3250, 3251,   86, 3255,   86, 3256,   86, 3252,   86,
-       86, 3254, 3257, 3260,   86, 3261, 3258,   86,   86, 3259,
-     3262, 3263,   86,   86, 3264,   86,   86,   86, 3269,   86,
-     3265, 3267,   86,   86,   86,   86,   86,   86, 3271, 3272,
-       86, 3275, 3276,   86, 3266,   86, 3268,   86, 3279, 3280,
-       86, 3270,   86,   86, 3273, 3274, 3277, 3282,   86, 3281,
-     3283,   86,   86,   86, 3278,   86,   86, 3291, 3285, 3284,
-     3286, 3291, 3287, 3289,   86, 3290,   86, 3291, 3291, 3291,
+     3238, 3239,   86,   86,   86,   86, 3245, 3246,   86,   86,
+       86,   86,   86,   86, 3240, 3241, 3244, 3249, 3243, 3247,
+       86, 3250, 3248,   86, 3252,   86, 3253,   86, 3251,   86,
+     3257,   86, 3254, 3255,   86, 3259,   86, 3260,   86, 3256,
+       86,   86, 3258, 3261, 3264,   86, 3265, 3262,   86,   86,
+     3263, 3266, 3267,   86,   86, 3268,   86,   86,   86, 3273,
+       86, 3269, 3271,   86,   86,   86,   86,   86,   86, 3275,
+     3276,   86, 3279, 3280,   86, 3270,   86, 3272,   86, 3283,
+     3284,   86, 3274,   86,   86, 3277, 3278, 3281, 3286,   86,
+     3285, 3287,   86,   86,   86, 3282,   86,   86, 3295, 3289,
 
-     3291, 3291, 3291, 3291, 3291, 3288,   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, 3291,   89,   89,
-       89,   89,  158,  158, 3291, 3291, 3291,  158,  158,  160,
-      160, 3291, 3291,  160, 3291,  160,  162, 3291, 3291, 3291,
-     3291, 3291,  162,  165,  165, 3291, 3291, 3291,  165,  165,
-      167, 3291, 3291, 3291, 3291, 3291,  167,  169,  169, 3291,
+     3288, 3290, 3295, 3291, 3293,   86, 3294,   86, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3292,   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, 3295,   89,
+       89,   89,   89,  159,  159, 3295, 3295, 3295,  159,  159,
+      161,  161, 3295, 3295,  161, 3295,  161,  163, 3295, 3295,
+     3295, 3295, 3295,  163,  166,  166, 3295, 3295, 3295,  166,
 
-      169,  169,  169,  169,  172, 3291, 3291, 3291, 3291, 3291,
-      172,  175,  175, 3291, 3291, 3291,  175,  175,   90,   90,
-     3291,   90,   90,   90,   90,   17, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291
+      166,  168, 3295, 3295, 3295, 3295, 3295,  168,  170,  170,
+     3295,  170,  170,  170,  170,  173, 3295, 3295, 3295, 3295,
+     3295,  173,  176,  176, 3295, 3295, 3295,  176,  176,   90,
+       90, 3295,   90,   90,   90,   90,   17, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295
     } ;
 
-static const flex_int16_t yy_chk[6467] =
+static const flex_int16_t yy_chk[6478] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2231,709 +2234,710 @@ static const flex_int16_t yy_chk[6467] =
         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, 3299,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3303,   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, 2689,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2693,   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, 1082,   32,   36,   36,   37,   37,
-       28,   45,   45,   37,  175,   36,   45,   39,   41,   41,
+       28,   92,   31,   32, 1086,   32,   36,   36,   37,   37,
+       28,   45,   45,   37,  176,   36,   45,   39,   41,   41,
 
-       45,   36,   39,   41,   94,   36,   39,   43,   43,   37,
-       43,   94,   39,   41,   41,   39,   41,   44,   42,   43,
-       87,   44,   39,   42,   87,   43,   42,   62,   95,   62,
-       62,   44,   62,   42,  174,   44,   44,   42,   42,   70,
-       95,   70,   70,   72,   70,   72,   72,   79,   72,   79,
-       79,   70,   79,   84,   84,   86,   96,   86,   86,   89,
-       86,   89,   89,   93,   89,   97,   86,   93,   97,   98,
-       89,   89,   98,  100,  101,  102,   96,  103,  104,  105,
-      106,  102,  100,  107,  111,   98,  106,  102,  101,  102,
-      108,  109,  112,  172,  110,  103,  103,  107,  105,  106,
+       45,   36,   39,   41,   87,   36,   39,   37,   87,   37,
+       84,   84,   39,   41,   41,   39,   41,   93,   42,   95,
+       96,   93,   39,   42,   43,   43,   42,   43,   94,   97,
+       44,   95,   97,   42,   44,   94,   43,   42,   42,  113,
+       96,  115,   43,  113,   44,  175,  115,  124,   44,   44,
+       62,  124,   62,   62,   70,   62,   70,   70,   72,   70,
+       72,   72,   79,   72,   79,   79,   70,   79,   86,  103,
+       86,   86,   89,   86,   89,   89,  100,   89,   98,   86,
+      104,   98,  101,   89,   89,  100,  102,  103,  103,  105,
+      107,  106,  102,  108,   98,  109,  101,  106,  102,  111,
 
-      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,  734,  121,
-      125,  117,  117,  121,  123,  119,  124,  125,  126,  128,
-      124,  127,  118,  129,  120,  734,  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,
-      141,  137,  138,  142,  144,  145,  145,  139,  140,  146,
-      149,  141,  148,  150,  147,  141,  146,  151,  152,  151,
+      102,  110,  104,  112,  107,  114,  173,  108,  105,  116,
+      106,  119,  110,  110,  122,  109,  117,  111,  118,  117,
+      110,  112,  117,  116,  118,  114,  120,  126,  123,  130,
+      119,  120,  125,  122,  121,  117,  117,  121,  122,  125,
+      126,  121,  123,  118,  128,  127,  129,  131,  133,  130,
+      132,  120,  127,  128,  132,  134,  135,  121,  137,  129,
+      134,  136,  136,  140,  134,  131,  133,  138,  139,  141,
+      168,  138,  143,  146,  146,  144,  135,  150,  137,  142,
+      138,  144,  142,  139,  145,  143,  138,  148,  141,  140,
+      149,  146,  147,  142,  146,  151,  145,  142,  150,  147,
 
-      153,  154,  157,  145,  155,  153,  145,  146,  151,  150,
-      152,  149,  156,  154,  159,  159,  157,  156,  161,  167,
-      151,  161,  155,  163,  171,  163,  163,  171,  163,  166,
-      166,  168,  179,  168,  168,  169,  168,  169,  169,  173,
-      169,  173,  173,  177,  173,  176,  176,  169,  177,  178,
-      179,  180,  181,  183,  182,  178,  184,  185,  186,  187,
-      181,  183,  188,  186,  178,  182,  180,  181,  190,  191,
-      189,  188,  185,  198,  191,  184,  189,  189,  193,  187,
-      192,  192,  195,  194,  193,  194,  195,  197,  194,  196,
-      196,  195,  198,  190,  202,  199,  195,  201,  203,  197,
+      153,  154,  152,  148,  152,  155,  154,  158,  156,  149,
+      147,  151,  153,  152,  157,  160,  160,  155,  180,  157,
+      162,  158,  254,  162,  254,  152,  156,  164,  172,  164,
+      164,  172,  164,  167,  167,  169,  180,  169,  169,  170,
+      169,  170,  170,  174,  170,  174,  174,  178,  174,  177,
+      177,  170,  178,  179,  181,  182,  183,  184,  185,  179,
+      186,  187,  188,  182,  189,  184,  187,  183,  179,  181,
+      182,  191,  190,  189,  194,  186,  192,  185,  190,  190,
+      194,  192,  188,  193,  193,  195,  198,  195,  196,  202,
+      195,  199,  196,  197,  197,  200,  191,  196,  198,  201,
 
-      199,  200,  195,  195,  203,  194,  200,  204,  205,  201,
-      206,  204,  215,  205,  202,  207,  208,  210,  209,  211,
-      212,  230,  216,  214,  211,  212,  206,  203,  214,  207,
-      209,  208,  215,  209,  230,  210,  213,  213,  216,  217,
-      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,  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,
+      200,  202,  196,  203,  201,  204,  207,  195,  196,  196,
+      199,  204,  205,  206,  208,  209,  205,  210,  206,  211,
+      212,  213,  207,  203,  216,  212,  213,  217,  208,  210,
+      209,  166,  210,  215,  204,  214,  214,  211,  215,  214,
+      218,  214,  222,  217,  216,  220,  218,  219,  219,  225,
+      221,  220,  223,  214,  224,  214,  221,  220,  223,  226,
+      224,  227,  222,  232,  229,  226,  227,  228,  229,  224,
+      225,  230,  231,  228,  233,  234,  232,  230,  235,  231,
+      233,  236,  237,  238,  235,  241,  239,  243,  240,  242,
+      237,  239,  246,  244,  236,  234,  238,  240,  244,  244,
 
-      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,
+      241,  245,  248,  236,  247,  242,  245,  243,  247,  249,
+      246,  250,  251,  252,  253,  249,  255,  257,  251,  253,
+      256,  259,  258,  257,  248,  260,  261,  256,  258,  250,
+      250,  260,  262,  252,  268,  255,  263,  263,  261,  265,
+      259,  264,  264,  266,  270,  265,  262,  269,  267,  266,
+      267,  271,  269,  272,  273,  274,  270,  268,  275,  276,
+      274,  272,  277,  265,  278,  276,  279,  267,  277,  278,
+      271,  279,  280,  281,  273,  282,  283,  284,  280,  285,
+      286,  275,  288,  291,  287,  288,  291,  285,  281,  282,
+      287,  284,  292,  289,  283,  289,  290,  290,  293,  293,
 
-      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,
+      294,  294,  295,  297,  296,  286,  297,  298,  299,  301,
+      292,  298,  300,  302,  303,  301,  311,  299,  295,  296,
+      303,  300,  304,  305,  304,  312,  306,  302,  308,  305,
+      306,  307,  307,  308,  309,  310,  311,  313,  314,  316,
+      309,  310,  316,  312,  315,  315,  317,  306,  318,  319,
+      165,  314,  318,  320,  321,  321,  322,  324,  313,  323,
+      310,  325,  323,  326,  317,  327,  326,  325,  319,  324,
+      330,  320,  329,  331,  322,  339,  339,  327,  331,  323,
+      328,  329,  332,  333,  335,  332,  333,  332,  330,  328,
+      338,  334,  328,  338,  341,  613,  335,  328,  328,  328,
 
-      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,  373,  164,  361,  367,  361,  370,  372,  367,  370,
-      375,  376,  371,  375,  379,  373,  367,  368,  368,  369,
-      368,  382,  372,  379,  378,  376,  380,  370,  381,  375,
+      328,  340,  613,  332,  334,  336,  337,  336,  336,  341,
+      342,  337,  337,  343,  344,  344,  346,  346,  340,  342,
+      345,  340,  343,  347,  347,  345,  348,  349,  350,  351,
+      352,  353,  349,  354,  357,  355,  355,  358,  355,  354,
+      350,  348,  358,  359,  365,  363,  353,  355,  351,  359,
+      352,  360,  361,  365,  357,  362,  360,  361,  362,  363,
+      362,  364,  367,  361,  364,  366,  366,  369,  367,  368,
+      368,  372,  369,  373,  374,  370,  373,  364,  370,  376,
+      364,  379,  364,  386,  370,  163,  375,  378,  370,  374,
+      378,  372,  381,  376,  373,  379,  370,  371,  371,  382,
 
-      383,  380,  380,  368,  381,  384,  368,  385,  368,  378,
-      368,  377,  382,  377,  377,  386,  385,  388,  387,  383,
-      384,  389,  390,  377,  387,  377,  377,  377,  392,  391,
-      377,  395,  393,  392,  386,  391,  390,  394,  397,  391,
-      396,  389,  398,  388,  400,  396,  395,  401,  398,  399,
-      399,  392,  393,  397,  402,  403,  404,  394,  405,  401,
-      406,  403,  408,  409,  400,  406,  407,  407,  402,  407,
-      410,  411,  417,  413,  405,  413,  413,  416,  416,  409,
-      414,  404,  408,  415,  414,  411,  410,  415,  418,  419,
-      420,  417,  421,  413,  424,  422,  423,  162,  425,  430,
+      371,  375,  386,  389,  383,  384,  378,  381,  382,  383,
+      383,  384,  387,  371,  392,  391,  371,  385,  371,  388,
+      371,  380,  389,  380,  380,  390,  396,  387,  388,  393,
+      397,  390,  161,  380,  392,  380,  380,  380,  385,  394,
+      380,  391,  395,  393,  398,  394,  396,  395,  399,  394,
+      397,  400,  401,  399,  402,  402,  403,  404,  401,  398,
+      405,  406,  407,  408,  411,  395,  400,  406,  409,  404,
+      412,  414,  413,  409,  405,  159,  403,  410,  410,  408,
+      410,  415,  420,  415,  411,  414,  412,  407,  413,  416,
+      417,  416,  416,  418,  417,  419,  419,  418,  421,  422,
 
-      424,  423,  415,  418,  422,  419,  421,  425,  420,  423,
-      423,  426,  428,  423,  423,  422,  426,  422,  427,  429,
-      430,  428,  427,  431,  432,  429,  434,  433,  432,  431,
-      433,  434,  435,  436,  436,  437,  438,  438,  439,  442,
-      440,  441,  441,  439,  444,  442,  443,  445,  437,  446,
-      443,  447,  435,  440,  446,  449,  447,  448,  448,  444,
-      450,  451,  452,  458,  455,  457,  448,  449,  445,  453,
-      457,  454,  453,  460,  452,  454,  455,  456,  456,  451,
-      450,  459,  459,  463,  458,  462,  462,  466,  464,  465,
-      467,  469,  470,  471,  472,  460,  464,  473,  465,  160,
+      423,  420,  424,  430,  427,  425,  426,  430,  428,  416,
+      427,  426,  418,  421,  425,  422,  424,  428,  423,  426,
+      426,  429,  431,  426,  426,  425,  429,  425,  432,  433,
+      434,  431,  436,  435,  432,  436,  434,  435,  437,  438,
+      439,  439,  440,  437,  441,  441,  442,  443,  444,  444,
+      433,  442,  445,  446,  447,  440,  448,  446,  445,  438,
+      443,  449,  450,  451,  451,  453,  449,  450,  452,  447,
+      454,  455,  451,  456,  457,  458,  456,  448,  457,  460,
+      452,  459,  459,  455,  460,  453,  461,  458,  454,  462,
+      462,  463,  465,  465,  467,  468,  469,  470,  471,  478,
 
-      475,  477,  467,  473,  463,  474,  475,  466,  472,  469,
-      470,  469,  476,  471,  474,  477,  478,  476,  479,  480,
-      481,  479,  482,  483,  478,  485,  484,  478,  482,  484,
-      486,  485,  487,  480,  488,  481,  489,  487,  490,  492,
-      491,  493,  490,  483,  486,  491,  493,  494,  495,  485,
-      499,  496,  502,  520,  492,  501,  488,  489,  500,  501,
-      506,  503,  504,  494,  496,  520,  504,  495,  497,  497,
-      499,  502,  509,  500,  497,  506,  497,  503,  507,  508,
-      505,  509,  497,  507,  497,  505,  510,  497,  497,  505,
-      511,  512,  510,  513,  497,  508,  513,  510,  508,  514,
+      473,  474,  475,  468,   85,  469,  477,  461,  478,  476,
+      471,  480,  477,  463,  481,  467,  480,  470,  473,  474,
+      473,  479,  475,  476,  482,  484,  483,  479,  481,  483,
+      485,  486,  482,  487,  489,  482,  490,  486,  488,  484,
+      489,  488,  491,  492,  494,  485,  493,  491,  494,  495,
+      490,  496,  497,  487,  495,  498,  499,  497,  489,  500,
+      503,  524,  506,  504,  505,  492,  496,  493,  505,  507,
+      508,  498,  500,  524,  508,  499,  501,  501,  504,  510,
+      503,  506,  501,   80,  501,  507,  511,  512,  509,  513,
+      501,  511,  501,  509,  510,  501,  501,  509,  513,  514,
 
-      515,  516,  516,  517,  519,  511,  521,  512,  518,  518,
-      522,  523,  524,  526,  525,  527,  530,  524,  528,  519,
-      515,  521,  514,  525,  528,  530,  533,  531,  517,  522,
-      527,  531,  526,  523,  532,  534,  535,  536,  533,  537,
-      532,  538,  539,  540,  542,  541,  539,  541,  546,  543,
-      534,  536,  544,  544,  537,  535,  540,  543,  545,  538,
-      546,  547,  548,  549,  545,  550,  549,  547,  542,  551,
-      552,  554,  555,  553,  548,  552,  553,  556,  557,  550,
-      554,  565,  556,  556,  551,  558,  558,  554,  555,  560,
-      554,  557,  559,  559,  563,  560,  561,  561,  562,  562,
+      515,  516,  501,  512,  517,  514,  512,  517,  518,  519,
+      514,  520,  520,  521,  526,  515,  529,  516,  522,  522,
+      523,  525,  527,  528,  530,  529,  531,   75,  528,  519,
+      534,  518,  538,  526,  532,  523,  525,  537,  521,  534,
+      532,  531,  535,  530,  527,  536,  535,  538,  539,  537,
+      540,  536,  542,  541,  543,  545,  544,  545,  543,  546,
+      548,  548,  550,  547,  540,  552,  549,  539,  541,  544,
+      542,  547,  549,  551,  550,  553,  554,  552,  553,  551,
+      555,  556,  557,  546,  558,  557,  556,  647,  559,  561,
+      554,  560,  569,  558,  647,  555,  560,  560,  562,  562,
 
-      563,  564,  565,  566,  568,  567,  564,  564,  567,  568,
-      569,  570,  572,  571,  573,  566,  571,  572,  575,  570,
-      574,  576,  575,  578,  577,  579,  580,  576,  577,  569,
-      579,  581,  581,  582,  583,  585,  586,  573,  584,  574,
-      580,  578,  588,  584,  587,  589,  590,  588,  582,  590,
-      587,  585,  591,  593,  590,  583,  586,  590,  590,  589,
-      592,  592,  594,  595,  596,  597,  598,  600,  595,  596,
-      591,  593,  602,  600,  601,  602,  603,  604,  594,  597,
-      603,  598,  604,  601,  605,  606,  609,  605,  607,  608,
-      606,  611,  610,  609,  612,  616,  611,  613,  613,  614,
+      558,  564,  561,  558,  559,  563,  563,  564,  565,  565,
+      566,  566,  567,  569,  568,  570,  573,  572,  567,  568,
+      568,  571,  572,  574,  571,  575,  577,  570,  575,  576,
+      580,  574,  578,  579,  576,  573,  580,  579,  581,  582,
+      583,  584,  581,  585,  585,  583,  586,  587,  588,  577,
+      589,  578,  590,  588,  591,  584,  593,  582,  592,  595,
+      591,  586,  597,  592,  596,  596,  589,   74,  587,  598,
+      593,  594,  590,  599,  594,  601,  600,  595,  599,  594,
+      597,  600,  594,  594,  602,  598,  604,  605,  606,  601,
+      607,  606,  604,  608,  607,  611,  605,  609,  608,  602,
 
-      615,  617,  603,  618,  607,  610,  619,  608,  614,  625,
-      617,  616,  619,  158,  612,  618,  620,  621,  623,  615,
-      621,  623,  620,  622,  622,  624,  622,  625,  626,  627,
-      624,  628,  629,  631,  630,  627,  628,  630,  629,  632,
-      633,  634,  626,  635,  632,  633,  633,  636,  639,  637,
-      638,  641,  636,   85,  634,  637,  635,  639,  631,  640,
-      642,  642,  644,  643,  640,  644,  636,  636,  645,  638,
-      643,  641,  646,  647,  645,  650,  648,  651,  647,  651,
-      644,  648,  648,  652,  646,  649,  649,  653,  654,  653,
-      655,  656,  657,  658,  660,  659,  661,  662,  660,  663,
+      609,  610,  612,  615,  614,  616,  610,  619,  615,  617,
+      617,  611,  618,  620,  621,  622,  607,  614,  623,  629,
+      612,  618,  624,  621,  623,  616,  619,  622,  624,  620,
+      625,  626,  626,  625,  626,  627,  628,  629,  627,  630,
+      631,  628,  632,  633,  635,  634,  631,  632,  634,  633,
+      636,  637,  638,  630,  639,  636,  637,  637,  640,  643,
+      641,  642,  645,  640,   68,  638,  641,  639,  643,  635,
+      644,  646,  646,  648,  650,  644,  648,  640,  640,  649,
+      642,  654,  645,  651,  652,  649,  650,  658,  651,  652,
+      652,  648,  653,  653,  655,  656,  655,  657,  659,  657,
 
-      650,  659,  652,  664,  665,  661,  654,  666,  655,  656,
-      667,  657,  662,  658,  663,  669,  668,  671,  670,  666,
-      672,  664,  668,  665,  673,  667,  674,  675,  673,  669,
-      670,  676,  677,  678,  680,  679,  671,  681,  681,  672,
-      679,  682,  683,  675,  674,  682,  684,  685,  680,  676,
-      677,  677,  678,  686,  687,  688,  683,  689,  685,  687,
-      690,  691,  696,  693,  692,  684,   80,  686,  691,  692,
-      693,  688,  694,  690,  695,  697,  689,  694,  698,  695,
-      696,  699,  697,  700,  701,  702,  703,  698,  705,  703,
-      702,  706,  700,  704,  707,  699,  701,  704,  708,  709,
+      660,  661,  662,  663,  664,  658,  654,  668,  664,  663,
+      665,  666,  667,  669,  656,  671,  659,  670,  660,  665,
+      661,  673,  662,  675,  674,  668,  666,  667,  672,  670,
+      671,  676,  669,  677,  672,  673,  674,  677,  678,  679,
+      680,  681,  675,  682,  683,  685,  685,  684,  686,  683,
+      676,  687,  686,  688,  692,  679,  678,  689,  680,  681,
+      681,  684,  682,  690,  691,  687,  693,  694,  689,  691,
+      692,  695,  688,  700,  696,  697,  698,  690,  695,  696,
+      694,  698,  697,  699,  703,  693,  701,  702,  699,  705,
+      704,  700,  706,  701,  709,  710,  702,  706,  703,  704,
 
-      706,  718,  705,  710,  710,  711,  711,  712,  712,  707,
-      713,  716,  708,  714,  711,  713,  721,  717,  722,  720,
-      709,  718,  714,  717,  719,  724,  723,  725,  719,  726,
-      716,  720,  723,  724,  725,  727,  722,  728,  731,  737,
-      738,  721,  741,  740,  744,  744,  738,  726,  737,  740,
-      743,  741,  742,  731,  743,  745,  745,  728,  746,  747,
-      727,  729,  748,  729,  749,  750,  729,  752,  742,  746,
-      729,  750,  752,  729,  753,  754,  748,  747,  755,  759,
-      729,  729,  755,  729,  749,  751,  751,  751,  756,  751,
-      757,  758,  751,  754,  757,  753,  758,  751,  759,  760,
+      707,  705,  708,  707,  710,  711,  708,  712,  709,  713,
+      714,  714,  717,  715,  715,  716,  716,  717,  718,  720,
+      711,  712,  715,  721,  722,  724,  725,  718,  723,  721,
+      713,  726,  723,  727,  728,  730,  729,  724,  720,  727,
+      731,  732,  728,  729,  722,  735,  738,  741,  742,  726,
+      745,  725,  744,  730,  742,  752,  741,  746,  744,  745,
+      735,  732,   63,  738,  751,  731,  733,  753,  733,  752,
+      747,  733,  750,  746,  747,  733,  748,  748,  733,  749,
+      749,  757,  751,  750,  754,  733,  733,  753,  733,  756,
+      754,  755,  755,  755,  756,  755,  758,  759,  755,  760,
 
-      761,  763,  762,  751,  751,  762,  763,  763,  764,  766,
-      757,   75,  756,  767,  760,  764,  765,  765,  767,  768,
-      768,  769,  774,  771,  766,  761,  769,  770,  771,  775,
-      770,  772,  772,  773,  774,  773,  776,  777,  779,  778,
-      776,  780,  780,  785,  781,  784,  779,  782,  775,  783,
-      783,  786,  789,  789,  787,  785,  808,  777,  778,  781,
-      787,  782,  788,  784,  790,  808,  792,  788,  793,  790,
-      790,  792,  794,  786,  793,  795,  796,  798,  794,  799,
-      795,  797,  796,  798,  797,  800,  800,  799,  801,  801,
-      802,  803,  804,  805,  806,  807,  807,  804,  802,  809,
+      761,  759,  757,  755,  761,  763,  762,  764,  765,  755,
+      755,  762,  766,  767,  758,  766,  769,  769,  767,  767,
+      761,  768,  764,  760,  763,  770,  771,  773,  768,  772,
+      772,  771,  773,  765,  774,  778,  775,  774,  776,  776,
+      770,  775,  777,  779,  777,  780,  781,  778,  782,  780,
+      783,  784,  784,  785,  788,  786,  787,  787,  783,  789,
+      790,  837,  779,  837,  791,   58,  781,  782,  785,  786,
+      791,  789,  788,  792,  793,  793,  796,  797,  792,  794,
+      798,  796,  790,  797,  794,  794,  798,  799,  800,  802,
+      801,  803,  799,  801,  800,  802,  804,  804,  806,  803,
 
-      805,  810,  810,  812,  811,  814,  815,  809,  816,  803,
-      811,  817,  818,  806,  814,  815,  817,  819,  820,  821,
-      819,  818,  812,  820,  822,  823,  824,  826,  826,  827,
-      825,  828,  816,  821,  823,  825,  825,  829,  830,  824,
-      831,  834,  834,  831,  827,  833,  829,  833,  835,  822,
-      828,  831,  836,  837,  842,  838,  839,  836,  840,  841,
-      843,  844,  830,  842,  845,  844,  846,  847,  848,  835,
-      850,   74,  849,  847,  837,  838,  839,  848,  851,  841,
-      840,  852,  845,  843,  849,  846,  853,  852,  854,  850,
-      855,  855,  851,  854,  856,  857,  858,  859,  860,  861,
+      805,  805,  807,  808,  809,  810,  806,  812,  808,  811,
+      811,  809,  815,  813,  814,  814,  812,  816,  815,  818,
+      807,  813,  819,  820,  810,  821,  822,  825,  818,  823,
+      821,  819,  823,  824,  826,  822,  816,  827,  824,  828,
+      831,  825,  832,  829,  830,  830,  827,  820,  829,  829,
+      834,  833,  828,  835,  839,  831,  835,  838,  838,  826,
+      833,  832,  840,  841,  835,  842,  843,  840,  844,  845,
+      846,  847,  848,  849,  834,  839,  848,  850,  854,  846,
+     1098,  851, 1098,  852,  841,  842,  843,  851,  853,  845,
+      844,  849,  852,  855,  847,  856,  850,  854,  857,  858,
 
-      853,  862,  863,  864,  857,  859,  865,  867,  869,  864,
-      866,  868,  865,  867,  856,  872,  858,  870,  860,  872,
-      862,  861,  863,  870,  866,  868,  871,  873,  869,  874,
-      875,  876,  871,  877,  877,  875,  878,  879,  880,  882,
-      879,  874,  878,  883,  881,  882,  873,  884,  884,  874,
-      885,  888,  876,  886,  887,  891,  880,  881,  886,  887,
-      887,  889,  892,  883,  894,  889,  888,  893,  885,  890,
-      890,  896,  893,  897,  900,  899,  901,  891,  903,  903,
-      904,  905,  892,  894,  904,  906,  906,  897,  899,  908,
-      907,  909,  919,  908,  900,  896,  905,  901,  902,  910,
+      853,  856,  859,  859,  858,  860,  861,  855,  862,  863,
+      864,  865,  857,  866,  867,  861,  868,  863,  869,  873,
+      871,  870,  868,  872,  869,  860,  871,  876,  862,  877,
+      864,  876,  866,  865,  867,  870,  874,  872,  875,  873,
+      878,  879,  874,  880,  875,  882,  879,  884,  877,  881,
+      881,  882,  878,  883,  885,  886,  883,  887,  888,  888,
+      878,  886,  889,  890,  880,  884,  891,  885,  890,  892,
+      893,  891,  891,  895,  893,  894,  894,  887,  896,  900,
+      889,  897,  898,  901,  892,  904,  897,  903,  905,  907,
+      907,  909,  908,  910,  910,  895,  908,  901,  896,  911,
 
-      911,  902,  912,  902,  919,  911,  909,  902,  915,  902,
-      932,  914,  913,  910,  902,  907,  912,  913,  913,  902,
-      914,  916,  915,  917,  918,  916,  920,  921,  922,  918,
-      923,  920,  932,  924,  925,  929,  929,  916,  917,  918,
-      925,  921,  924,  926,  923,  927,  928,  931,  926,  922,
-      930,  927,  928,  931,  933,  930,  934,  936,  937,  939,
-      940,  940,  941,  937,  938,  943,  944,  941,  945,  936,
-      946,  939,  942,  933,  934,  935,  935,  951,  938,  943,
-      942,  935,  947,  935,   68,  944,  946,  945,  947,  935,
-      949,  948,  950,  951,  935,  935,  948,  952,  953,  953,
+      903,  898,  913,  900,  912,  904,  909,  915,  912,  905,
+      906,  914,  915,  906,  916,  906,  919,  913,  920,  906,
+      918,  906,  920,  921,  911,  914,  906,  917,  916,  918,
+      919,  906,  917,  917,  920,  922,  923,  924,  921,  925,
+      922,  926,  924,  927,  930,  928,  929,  937,  923,  930,
+      922,  934,  929,  925,  928,  931,  934,  927,  932,  933,
+      933,  931,  926,  935,  932,  936,  937,  938,  940,  935,
+      941,  943,  942,  944,  944,  941,  945,  947,  948,  949,
+      940,  945,  946,  943,  950,  938,  942,  936,  939,  939,
+      946,  947,  953,  951,  939,  954,  939,  948,  949,  951,
 
-      954,  935,  949,  955,  954,  957,  958,  959,  960,  958,
-      950,  957,  961,  960,  962,  952,  963,  964,  966,  967,
-      962,  963,  968,  955,  969,  961,  959,  966,  967,  971,
-      969,  970,  972,  973,  975,  974,  964,  972,  968,  976,
-      970,  977,  980,  978,  983,  986,  989,  987,  971,  974,
-      977,  976,  978,  973,  975,  979,  981,  985,  988,  980,
-      983,  979,  981,  990,  989,  986,  987,  996,  991,  992,
-      995,  985,  988,  991,  992,  995,  996,  998,  990,  997,
-      997,  999, 1001,  998, 1002, 1006, 1007, 1004, 1004, 1002,
-     1002, 1004, 1005, 1008,  999, 1005, 1009, 1010, 1001, 1006,
+      950,  952,  939,  955,  953,  956,  952,  939,  939,  957,
+      957,  958,  959,  954,  939,  958,  961,  962,  963,  955,
+      962,  964,  961,  956,  966,  965,  964,  968,  967,  972,
+      966,  970,  959,  967,  971,  973,  975,  963,  965,  974,
+      970,  973,  976,  971,  977,  972,  968,  976,  974,  978,
+      979,  981,  982,  980,  984,  975,  983,  987,  990,  993,
+      981,  982,  983,  978,  977,  980,  985,  989,  991,  992,
+      979,  984,  985,  987,  994,  995,   57,  993,  990,  996,
+      995,  989, 1000,  992,  996,  999, 1003,  991, 1002,  994,
+      999, 1000, 1001, 1001, 1002, 1005, 1006, 1009, 1010, 1003,
 
-     1011, 1012, 1013, 1015, 1020, 1014, 1007, 1012, 1016, 1008,
-     1010, 1014, 1017, 1016, 1009, 1011, 1019, 1023, 1015, 1019,
-     1029,   63, 1013, 1021, 1022, 1020, 1017, 1024, 1021, 1022,
-     1025, 1026, 1024, 1023, 1028, 1025, 1029, 1033, 1030, 1031,
-     1028, 1032, 1032, 1026, 1030, 1031, 1033, 1034, 1035, 1036,
-     1036, 1035, 1037, 1038, 1039, 1040, 1041, 1042, 1040, 1044,
-     1043, 1049, 1045, 1042, 1044, 1034, 1043, 1045, 1046, 1041,
-     1037, 1047, 1038, 1046, 1039, 1050, 1051, 1047, 1052, 1049,
-     1053, 1053, 1051, 1052, 1054, 1055, 1056, 1057, 1058, 1059,
-     1060, 1058, 1059, 1054, 1055, 1050, 1062, 1061, 1063, 1064,
+     1009, 1006, 1006, 1008, 1008, 1011, 1012, 1008, 1013, 1015,
+     1014, 1005, 1010, 1016, 1017, 1018, 1019, 1023, 1024, 1016,
+     1023, 1018, 1012, 1014, 1015, 1011, 1013, 1020, 1021, 1027,
+     1025, 1019, 1020, 1026, 1017, 1025, 1028, 1030, 1026, 1024,
+     1032, 1028, 1021, 1029, 1033, 1027, 1032, 1034, 1029, 1030,
+     1035, 1036, 1036, 1034, 1037, 1038, 1035, 1041, 1039, 1042,
+     1033, 1039, 1043, 1037, 1040, 1040, 1044, 1045, 1046, 1044,
+     1047, 1054, 1048, 1038, 1046, 1041, 1047, 1048, 1042, 1049,
+     1045, 1050, 1043, 1051, 1049, 1053, 1050, 1055, 1060, 1051,
+     1056, 1054, 1058, 1055, 1061, 1056, 1057, 1057, 1059, 1062,
 
-     1067, 1060, 1061, 1065, 1056, 1066, 1057, 1068, 1070, 1065,
-     1063, 1066, 1068, 1072, 1062, 1067, 1069, 1069, 1064, 1071,
-     1073, 1074, 1075, 1076, 1073, 1072, 1077, 1070, 1079, 1080,
-     1080, 1075, 1081, 1071, 1083, 1084, 1086, 1085, 1089, 1074,
-     1092, 1086, 1076,   58, 1087, 1088, 1088, 1079, 1083, 1085,
-     1084, 1077, 1081, 1087, 1090, 1091, 1092, 1093, 1089, 1095,
-     1090, 1091, 1093, 1094, 1095, 1094, 1096, 1097, 1098, 1099,
-     1100, 1101, 1102, 1098, 1103, 1105, 1105, 1106, 1101, 1107,
-     1096, 1097, 1109, 1108, 1099, 1110,   57, 1102, 1109, 1100,
-     1111, 1106, 1113, 1103, 1117, 1111, 1113, 1107, 1108, 1114,
+     1064, 1058, 1062, 1053, 1065, 1063, 1060, 1059, 1063, 1065,
+     1066, 1064, 1067, 1061, 1068, 1069, 1070, 1071, 1072, 1073,
+     1073, 1069, 1070, 1072, 1067, 1074, 1075, 1076, 1066, 1078,
+     1077, 1080, 1071, 1068, 1077, 1081, 1079, 1083, 1085, 1076,
+     1075, 1084, 1084, 1087, 1074, 1079, 1088, 1078, 1090, 1093,
+     1080, 1089, 1105, 1090, 1096, 1091, 1083, 1087, 1085, 1105,
+     1081, 1088, 1094, 1089, 1091, 1092, 1092, 1095, 1094, 1093,
+     1096, 1097, 1099, 1095, 1100, 1101, 1097, 1099, 1102, 1103,
+     1104, 1106, 1107, 1102, 1109, 1109, 1110, 1111, 1100, 1101,
+     1114, 1112, 1113, 1234, 1103, 1234, 1106, 1115, 1113, 1104,
 
-     1114, 1117, 1115, 1118, 1111, 1110, 1111, 1115, 1120, 1111,
-     1116, 1116, 1119, 1121, 1122, 1119, 1123, 1118, 1124, 1126,
-     1125, 1123, 1127, 1122, 1126, 1129, 1134, 1120, 1128, 1131,
-     1131, 1121, 1125, 1132, 1137, 1133, 1127, 1124, 1132, 1128,
-     1133, 1136, 1135, 1137, 1129, 1136, 1134, 1135, 1138, 1139,
-     1140, 1142, 1143, 1141, 1145, 1144, 1146, 1147, 1150, 1143,
-     1151, 1149, 1148, 1138, 1139, 1141, 1142, 1144, 1148, 1140,
-     1152, 1153, 1154, 1145, 1157, 1147, 1149, 1146, 1150, 1152,
-     1151, 1155, 1156, 1158, 1159, 1162, 1153, 1164, 1161, 1163,
-     1165, 1154, 1166, 1155, 1161, 1164, 1170, 1167, 1158, 1157,
+     1110, 1107, 1115, 1117, 1125, 1111, 1112, 1117, 1118, 1118,
+     1114, 1115, 1119, 1115, 1120, 1120, 1115, 1119, 1121, 1122,
+     1123, 1124, 1125, 1123, 1127, 1121, 1126, 1128, 1132, 1127,
+     1129, 1130, 1133, 1122, 1131, 1126, 1130, 1135, 1135, 1132,
+     1124, 1138, 1129, 1142, 1136, 1137, 1128, 1139, 1131, 1136,
+     1137, 1133, 1139, 1140, 1141, 1143, 1144, 1140, 1142, 1145,
+     1147, 1138, 1146, 1141, 1148, 1149, 1150, 1147, 1151, 1154,
+     1143, 1145, 1152, 1153, 1155, 1144, 1148, 1146, 1152, 1158,
+     1157, 1156, 1160, 1161, 1149, 1159, 1151, 1150, 1153, 1154,
+     1156, 1162, 1163, 1165, 1155, 1157, 1166, 1159, 1158, 1165,
 
-     1162, 1156, 1167, 1163, 1159, 1168, 1169, 1171, 1166, 1172,
-     1165, 1169, 1169, 1173, 1173, 1170, 1175, 1168, 1176, 1177,
-     1181, 1171, 1172, 1174, 1174, 1177, 1181, 1176, 1174, 1175,
-     1179, 1174, 1174, 1178, 1178, 1179, 1174, 1185, 1180, 1182,
-     1183, 1188, 1174, 1319, 1182, 1183, 1174, 1180, 1184, 1184,
-     1186, 1186, 1187, 1189, 1190, 1187, 1191, 1187, 1185, 1192,
-     1193, 1188, 1194, 1190, 1192, 1197, 1195, 1196, 1199, 1319,
-     1197, 1189, 1195, 1196, 1193, 1198, 1191, 1199, 1205, 1198,
-     1194, 1206, 1199, 1204, 1199, 1202, 1199, 1204, 1199, 1200,
-     1200, 1201, 1201, 1205, 1201, 1207, 1202, 1208, 1209, 1206,
+     1167, 1160, 1168, 1169, 1170, 1172, 1162, 1174, 1161,   52,
+     1168, 1166, 1163, 1171, 1167, 1175, 1173, 1172, 1171, 1176,
+     1170, 1173, 1173, 1169, 1177, 1177, 1174, 1179, 1180, 1175,
+     1181, 1202, 1176, 1178, 1178, 1202, 1181, 1180, 1178, 1184,
+     1179, 1178, 1178, 1182, 1182, 1183, 1178, 1185, 1184, 1186,
+     1183, 1189, 1178, 1185, 1186, 1187, 1178, 1188, 1188, 1192,
+     1187, 1190, 1190, 1191, 1193, 1194, 1191, 1195, 1191, 1197,
+     1196, 1198, 1189,   47, 1194, 1196, 1201, 1206, 1199, 1192,
+     1200, 1201, 1193, 1197, 1199, 1203, 1200, 1195, 1206, 1198,
+     1204, 1204, 1205, 1205, 1203, 1205, 1208, 1209, 1210, 1203,
 
-     1210, 1211, 1208, 1208, 1207, 1212, 1211, 1209, 1213, 1214,
-     1215, 1216, 1217, 1218, 1218, 1219, 1220, 1213, 1217, 1212,
-     1222, 1221, 1210, 1219, 1223, 1216, 1221, 1224, 1214, 1215,
-     1220, 1225, 1226, 1223, 1222, 1227, 1227, 1226, 1228, 1229,
-     1229, 1230, 1234, 1230, 1232, 1224, 1233, 1232, 1235, 1236,
-     1236, 1233, 1237, 1228, 1238, 1238, 1225, 1235, 1239, 1239,
-     1240, 1234, 1241, 1242, 1250, 1240, 1243, 1243, 1244, 1246,
-     1245, 1247, 1237, 1245, 1261, 1261, 1247, 1248, 1249, 1253,
-     1249, 1255, 1250, 1241, 1242, 1257, 1248, 1252, 1244, 1246,
-     1252, 1254, 1256, 1257, 1253, 1255, 1254, 1256, 1258, 1259,
+     1208, 1203, 1211, 1203, 1212, 1203, 1213, 1214, 1215, 1212,
+     1212, 1211, 1209, 1215, 1216, 1213, 1210, 1217, 1218, 1219,
+     1220, 1221, 1222, 1222, 1223, 1224, 1217, 1221, 1216, 1214,
+     1225, 1226, 1223, 1227, 1220, 1225, 1228, 1218, 1219, 1224,
+     1229, 1230, 1227, 1231, 1231, 1226, 1230, 1232, 1233, 1233,
+     1236, 1237, 1238, 1236, 1228, 1239, 1237, 1240, 1240, 1241,
+     1242, 1242, 1232, 1244, 1239, 1229, 1243, 1243, 1244, 1245,
+     1246, 1238, 1247, 1247, 1248, 1249, 1250, 1251, 1249, 1241,
+     1252, 1253, 1251, 1253, 1254, 1256, 1257, 1258, 1256, 1252,
+     1245, 1246, 1258, 1259, 1248, 1260, 1250, 1261, 1262, 1264,
 
-     1260, 1262, 1259, 1258, 1263, 1260, 1262, 1264, 1265, 1270,
-     1266, 1268, 1269, 1264, 1270, 1265, 1273, 1268, 1269, 1271,
-     1272, 1274, 1263, 1266, 1276, 1271, 1275, 1275, 1278, 1272,
-     1279, 1280, 1274, 1281, 1282, 1273, 1283, 1286, 1287, 1281,
-     1282, 1285, 1283, 1278, 1276, 1288, 1291, 1285, 1289, 1290,
-     1279, 1286, 1292, 1292, 1280, 1293, 1294, 1286, 1287, 1295,
-     1289, 1296, 1298, 1290, 1291, 1288, 1296, 1297, 1297, 1299,
-     1301, 1304, 1303, 1302, 1299, 1293, 1305, 1295, 1302, 1302,
-     1304, 1294, 1306, 1307, 1305, 1298, 1308, 1309, 1310, 1301,
-     1303, 1311, 1309, 1311, 1312, 1309, 1306, 1310, 1307, 1314,
+     1260, 1257, 1254, 1262, 1264, 1261, 1263, 1259, 1266, 1263,
+     1265, 1265, 1267, 1266, 1268, 1269, 1270, 1272, 1273, 1275,
+     1268, 1274, 1269, 1272, 1273, 1275, 1274, 1276, 1277, 1270,
+     1267, 1278, 1279, 1279, 1280, 1282, 1276, 1283, 1284, 1285,
+     1286, 1293, 1278, 1287, 1291, 1285, 1286, 1277, 1290, 1287,
+     1282, 1292, 1289, 1293, 1280, 1294, 1295, 1283, 1289, 1296,
+     1296, 1284, 1290, 1297, 1291, 1298, 1299, 1300, 1290, 1294,
+     1302, 1292, 1300, 1303, 1295, 1301, 1301, 1305, 1303, 1307,
+     1306, 1309, 1308, 1297, 1299, 1306, 1306, 1310, 1311, 1309,
+     1298, 1308, 1312, 1302, 1313, 1314, 1305, 1307, 1315, 1313,
 
-     1316, 1308, 1315, 1318, 1308, 1314, 1315, 1317, 1312, 1320,
-     1321, 1316, 1317, 1317, 1322, 1321, 1323, 1324, 1325, 1322,
-     1326, 1328, 1318, 1325, 1329, 1330, 1332, 1320, 1331, 1331,
-     1332, 1333, 1334, 1335, 1323, 1328, 1336, 1324, 1337, 1335,
-     1326, 1338, 1329, 1330, 1339, 1340, 1341, 1342, 1336, 1333,
-     1345, 1334, 1342, 1344, 1343, 1338, 1354, 1337, 1344, 1339,
-     1340, 1343, 1346, 1347, 1347, 1341, 1348, 1349, 1345, 1350,
-     1354, 1346, 1351, 1351, 1352, 1357, 1349, 1353, 1355, 1355,
-     1352, 1348, 1356, 1353, 1358, 1359, 1360, 1361, 1356, 1350,
-     1359, 1357, 1360, 1361, 1362, 1363, 1363, 1364, 1364, 1367,
+     1315, 1310, 1313, 1311, 1314, 1316, 1318, 1312, 1322, 1319,
+     1312, 1320, 1318, 1319, 1323, 1321, 1324, 1327, 1325, 1316,
+     1321, 1321, 1320, 1325, 1326, 1328, 1329, 1322, 1330, 1326,
+     1332, 1329, 1333, 1334, 1324, 1327, 1335, 1335, 1336, 1337,
+     1323, 1338, 1336, 1339, 1332, 1328, 1340, 1341, 1330, 1339,
+     1333, 1334, 1345, 1342, 1343, 1344, 1346, 1337, 1340, 1348,
+     1338, 1346, 1349, 1352, 1348, 1347, 1341, 1342, 1350, 1343,
+     1344, 1345, 1347, 1351, 1351, 1353, 1354, 1350, 1352, 1356,
+     1349, 1355, 1355, 1357, 1353, 1356, 1358, 1359, 1359, 1357,
+     1361, 1360, 1362, 1363,   18, 1364, 1354, 1360, 1363, 1365,
 
-     1362, 1366, 1366, 1367, 1368, 1358, 1369, 1370, 1371, 1373,
-     1372, 1374, 1374, 1368, 1375, 1376, 1373, 1378, 1379, 1370,
-     1382, 1377, 1371, 1376, 1369, 1372, 1377, 1380, 1383, 1383,
-     1381, 1378, 1380, 1380, 1375, 1381, 1381, 1379, 1384, 1385,
-     1382, 1386, 1387, 1388, 1389, 1390, 1391, 1387, 1392, 1393,
-     1386, 1395, 1391, 1392, 1394, 1396, 1403, 1384, 1385, 1397,
-     1394, 1396, 1388, 1390, 1389, 1397, 1398, 1399, 1400, 1401,
-     1395, 1405, 1405,   52, 1404, 1393, 1402, 1403, 1406, 1407,
-     1411, 1406, 1408, 1408, 1411, 1398, 1399, 1400, 1401, 1404,
-     1402, 1407, 1409, 1409, 1410, 1412, 1413, 1414, 1415, 1410,
+     1358, 1364, 1366, 1367, 1367, 1365, 1361, 1372, 1366, 1368,
+     1368, 1370, 1370, 1362, 1371, 1373, 1372, 1374, 1371, 1377,
+     1375, 1376, 1378, 1378, 1379, 1381, 1377, 1380, 1382, 1374,
+     1381, 1383, 1384, 1373, 1375, 1380, 1376, 1384, 1384, 1386,
+     1385, 1388, 1382, 1389, 1379, 1385, 1385, 1387, 1387, 1390,
+     1383, 1391, 1392, 1393, 1394, 1395, 1391, 1397, 1390, 1386,
+     1388, 1395, 1389, 1396, 1398, 1399, 1402, 1403, 1396, 1400,
+     1398, 1392, 1394, 1393, 1401, 1400, 1404, 1405, 1406, 1407,
+     1401, 1416, 1408, 1397, 1399, 1402, 1403, 1409, 1409, 1411,
+     1410,   17, 1406, 1410, 1416, 1404, 1405, 1408, 1412, 1412,
 
-     1415, 1417, 1418, 1419, 1415, 1413, 1420, 1418, 1412, 1421,
-     1414, 1422, 1422, 1425, 1426, 1423, 1424, 1415, 1419, 1417,
-     1423, 1430, 1424, 1432, 1427, 1421, 1420, 1426, 1425, 1427,
-     1428, 1429, 1431, 1433, 1428, 1429, 1434, 1434, 1436, 1433,
-     1438, 1430, 1439, 1432, 1440, 1440, 1441, 1439, 1442, 1448,
-     1431, 1449, 1441, 1444, 1444, 1446, 1436, 1452, 1446, 1447,
-     1447, 1438, 1453, 1451, 1455, 1448, 1451, 1449, 1442, 1454,
-     1454, 1453, 1456, 1457, 1459, 1458, 1461, 1452, 1462, 1455,
-     1458, 1460, 1460, 1463, 1464, 1461, 1465, 1467, 1459, 1466,
-     1466, 1473, 1457, 1456, 1468, 1469, 1462, 1475, 1463, 1470,
+     1407, 1411, 1413, 1413, 1414, 1417, 1415, 1418, 1421, 1414,
+     1415, 1419, 1423, 1419, 1417, 1424, 1422, 1419, 1425, 1427,
+     1418, 1422, 1426, 1426, 1427, 1428, 1421, 1423, 1429, 1430,
+     1419, 1428, 1431, 1434, 1425, 1424, 1432, 1431, 1435, 1436,
+     1432, 1433, 1430, 1429, 1437, 1433, 1438, 1438, 1440, 1442,
+     1437, 1446, 1443, 1434, 1444, 1444, 1435, 1443, 1445, 1436,
+     1448, 1448, 1450, 1452, 1445, 1450, 1440, 1451, 1451, 1453,
+     1442, 1446, 1455, 1456, 1457, 1455, 1458, 1458, 1460, 1452,
+     1459, 1461, 1462, 1457, 1463, 1453, 1466, 1462, 1464, 1464,
+     1467, 1468, 1465, 1456, 1469, 1459, 1470, 1470, 1463, 1460,
 
-     1469, 1467, 1471, 1471, 1472, 1478, 1465, 1476, 1472, 1464,
-     1482, 1473, 1468, 1477, 1470, 1474, 1474, 1477, 1476, 1475,
-     1479, 1481, 1481, 1483, 1478, 1479, 1482, 1485, 1484, 1486,
-     1487, 1488, 1488, 1489, 1490, 1493, 1491, 1495, 1489, 1492,
-     1492, 1483, 1484, 1486, 1493, 1494, 1485, 1485, 1497, 1496,
-     1494, 1496, 1498, 1497, 1490, 1487, 1491, 1495, 1498, 1499,
-     1500, 1502, 1503, 1503, 1504, 1505, 1500, 1507, 1508, 1509,
-     1509, 1505, 1507, 1510, 1510, 1502, 1511, 1512, 1513, 1499,
-     1516, 1514, 1517, 1504, 1514, 1515, 1515, 1518, 1526,   47,
-     1511, 1520, 1508, 1513, 1517, 1512, 1519, 1520, 1516, 1519,
+     1461, 1465, 1472, 1471, 1466, 1467, 1473, 1474, 1475, 1475,
+     1477, 1473, 1478, 1478, 1469, 1476, 1468, 1471, 1479, 1476,
+     1472, 1480, 1474, 1481, 1482, 1486, 1483, 1481, 1485, 1485,
+     1477, 1483, 1480, 1487, 1488, 1489, 1490, 1491, 1492, 1492,
+     1479, 1486, 1493, 1482, 1494, 1495, 1499, 1493, 1488, 1497,
+     1490, 1487, 1496, 1496, 1489, 1489, 1498, 1500, 1497, 1500,
+     1503, 1498, 1491, 1501, 1494, 1495, 1499, 1502, 1501, 1504,
+     1506, 1507, 1507, 1502, 1508, 1504, 1509, 1512, 1511, 1516,
+     1503, 1515, 1509, 1511, 1506, 1513, 1513, 1514, 1514, 1517,
+     1520, 1518, 1530, 1508, 1518, 1515, 1522, 1516, 1519, 1519,
 
-     1521, 1522, 1519, 1524, 1522, 1521, 1525, 1518, 1528, 1528,
-     1529, 1525, 1524, 1526, 1519, 1527, 1529, 1530, 1527, 1531,
-     1522, 1532, 1532, 1530, 1531, 1533, 1533, 1534, 1536, 1535,
-     1537, 1538, 1539, 1534, 1535, 1540, 1541, 1542, 1540, 1543,
-     1544, 1536, 1541, 1542, 1543, 1545, 1544, 1549, 1537, 1546,
-     1538, 1550, 1539, 1548, 1546, 1547, 1547, 1551, 1548, 1552,
-     1553, 1554, 1555, 1556, 1559, 1549, 1557, 1558, 1545, 1558,
-     1557, 1550, 1561, 1552, 1553, 1554, 1563, 1551, 1562, 1564,
-     1555, 1565, 1566, 1559, 1561, 1564, 1567, 1569, 1556, 1563,
-     1562, 1568, 1571, 1571, 1572, 1573, 1576, 1574, 1566, 1577,
+     1521, 1512, 1525, 1523, 1517, 1524, 1523, 1525, 1520, 1523,
+     1526, 1524, 1521, 1526, 1528, 1529, 1522, 1530, 1540, 1531,
+     1529, 1523, 1531, 1528, 1532, 1532, 1533, 1534, 1538, 1526,
+     1535, 1540, 1533, 1534, 1538, 1535, 1536, 1536, 1537, 1537,
+     1539, 1541, 1542, 1543, 1544, 1539, 1545, 1544, 1546, 1549,
+     1547, 1548, 1545, 1550, 1546, 1547, 1553, 1548, 1550, 1541,
+     1554, 1542, 1552, 1543, 1551, 1551, 1555, 1552, 1556, 1557,
+     1558, 1559, 1549, 1560, 1553, 1561, 1562, 1563, 1562, 1561,
+     1554, 1565, 1556, 1557, 1558, 1566, 1555, 1567, 1568, 1559,
+     1569, 1570, 1571, 1565, 1568, 1572, 1563, 1566, 1560, 1573,
 
-     1573, 1565, 1575, 1575, 1578, 1568, 1567, 1579, 1569, 1574,
-     1580, 1576, 1581, 1577, 1572, 1582, 1584, 1583, 1586, 1580,
-     1588, 1589, 1582, 1593, 1589, 1579, 1583, 1581, 1578, 1583,
-     1590, 1590, 1584, 1586, 1591, 1591, 1592, 1594, 1586, 1596,
-     1594, 1593, 1595, 1595, 1597, 1588, 1598, 1600, 1592, 1599,
-     1602, 1598, 1596, 1601, 1599, 1603, 1604, 1608, 1605, 1602,
-     1607, 1607, 1609, 1597, 1606, 1604, 1600, 1605, 1604, 1601,
-     1606, 1610, 1611, 1613, 1603, 1609, 1612, 1608, 1616, 1617,
-     1618, 1618, 1619, 1621, 1620, 1613, 1611, 1623, 1621, 1610,
-     1622, 1622, 1612, 1620, 1625, 1624, 1623, 1617, 1619, 1623,
+     1567, 1575, 1575, 1576, 1578, 1581, 1577, 1570, 1582, 1572,
+     1569, 1577, 1571, 1579, 1579, 1580, 1578, 1583, 1584, 1581,
+     1573, 1585, 1586, 1576, 1588, 1587, 1590, 1584, 1592, 1586,
+     1580, 1597, 1582, 1596, 1587, 1583, 1585, 1587, 1601, 1593,
+     1588, 1590, 1593, 1594, 1594, 1596, 1590, 1595, 1595, 1597,
+     1600, 1598, 1604, 1592, 1598, 1599, 1599, 1601, 1605, 1602,
+     1603, 1606, 1607, 1600, 1602, 1603, 1608, 1609, 1611, 1611,
+     1606, 1604, 1612, 1610, 1605, 1608, 1609, 1613, 1608, 1610,
+     1614, 1607, 1615, 1616, 1620, 1617, 1621, 1622, 1622, 1623,
+     1613, 1624, 1612, 1626, 1626, 1629, 1615, 1617, 1614, 1616,
 
-     1624, 1626, 1627, 1616, 1628, 1622, 1632, 1630, 1631, 1628,
-     1628, 1633, 1625, 1634, 1635,   18, 1633, 1636, 1636, 1634,
-     1627, 1630, 1626, 1631, 1637, 1642, 1638, 1639, 1632, 1640,
-     1637, 1638, 1635, 1639, 1643, 1640, 1644, 1645, 1646, 1651,
-     1647, 1646, 1644, 1649, 1652, 1642, 1647, 1646, 1643, 1653,
-     1645, 1649, 1654, 1655, 1656, 1657, 1658, 1653, 1651, 1659,
-     1659, 1654, 1660, 1652, 1662, 1661, 1655, 1656, 1660, 1657,
-     1658, 1661, 1663, 1663, 1664, 1665, 1666, 1662, 1667, 1667,
-     1669, 1659, 1670, 1668, 1671, 1672, 1669, 1674, 1674, 1675,
-     1680, 1681,   17, 1665, 1664, 1666, 1668, 1676, 1684, 1680,
+     1624, 1625, 1627, 1630, 1621, 1623, 1625, 1628, 1626, 1620,
+     1631, 1627, 1628, 1629, 1627, 1632, 1634, 1635, 1636, 1638,
+     1632, 1632, 1637, 1639, 1630, 1638, 1642, 1637, 1631, 1641,
+     1634, 1642, 1635, 1640, 1640, 1641, 1643, 1644, 1646, 1647,
+     1636, 1639, 1643, 1644, 1648, 1650, 1649, 1655, 1650, 1651,
+     1648, 1656, 1653, 1647, 1650, 1651, 1657,    0, 1646, 1649,
+     1653, 1659, 1658, 1660, 1657, 1661, 1655, 1662, 1663, 1663,
+     1656, 1658, 1664, 1666, 1659, 1668, 1660, 1665, 1664, 1661,
+     1669, 1662, 1670, 1665, 1667, 1667, 1666, 1671, 1671, 1672,
+     1663, 1673, 1674, 1675, 1676, 1668, 1679, 1673, 1669, 1678,
 
-     1671, 1676, 1677, 1672, 1670, 1678, 1679, 1677, 1683, 1675,
-     1678, 1679, 1686, 1684, 1681, 1685, 1685, 1687, 1688, 1690,
-     1683, 1689, 1689, 1691, 1692, 1695, 1693, 1696, 1697, 1687,
-     1691, 1686, 1699, 1690, 1697, 1700, 1692, 1688, 1693, 1698,
-     1712, 1700, 1701, 1701, 1695, 1702, 1706, 1696, 1702, 1705,
-     1699, 1698, 1703, 1703, 1705, 1706, 1707, 1708, 1708, 1709,
-     1712, 1710, 1707, 1710, 1711, 1713, 1714, 1711, 1715, 1716,
-     1717, 1709, 1718, 1719, 1716, 1717, 1720, 1721, 1723, 1722,
-        0, 1718, 1721, 1729, 1714, 1719, 1715, 1713, 1722, 1725,
-     1724, 1720, 1726, 1728, 1725, 1724, 1727, 1727, 1723, 1728,
+     1678, 1670, 1672, 1680, 1685, 1681, 1682, 1680, 1683, 1675,
+     1681, 1682, 1676, 1683, 1674, 1684, 1679, 1687, 1688, 1689,
+     1689, 1690, 1691, 1692, 1684, 1693, 1693, 1685, 1695, 1687,
+     1694, 1696, 1699, 1688, 1691, 1695, 1697, 1700, 1702, 1701,
+     1690, 1703, 1692, 1696, 1694, 1701, 1704, 1710, 1697,    0,
+     1702, 1699, 1704, 1705, 1705, 1706, 1710, 1700, 1706, 1703,
+     1707, 1707, 1709, 1711, 1712, 1712, 1713, 1709, 1714, 1711,
+     1714, 1715, 1716, 1717, 1715, 1718, 1719, 1720, 1713, 1721,
+     1722, 1724, 1720, 1725, 1721, 1723, 1727, 1730, 1725, 1722,
+     1726,    0, 1716, 1718, 1719, 1717, 1724, 1723, 1728, 1726,
 
-     1731, 1722, 1724, 1732, 1729, 1733, 1734, 1726, 1735, 1736,
-     1735, 1737, 1737, 1738, 1738, 1739, 1739, 1740, 1743, 1731,
-     1744, 1733, 1732, 1736, 1753, 1736, 1734, 1741, 1741, 1742,
-     1742, 1745, 1745, 1751, 1746, 1756, 1747, 1740, 1746, 1743,
-     1748, 1744, 1747, 1748, 1750, 1754, 1752, 1759, 1754, 1753,
-     1750, 1751, 1752, 1755, 1755, 1756, 1757, 1758, 1758, 1760,
-     1761, 1757, 1759, 1762, 1762, 1761, 1763, 1764, 1767, 1765,
-     1766, 1763, 1768, 1764, 1770, 1773, 1776, 1775, 1769, 1775,
-     1760, 1765, 1765, 1765, 1769, 1774, 1767, 1776, 1765, 1773,
-     1766, 1772, 1768, 1777, 1770, 1778, 1772, 1772, 1779, 1780,
+     1729, 1733, 1730, 1728, 1735, 1729, 1727, 1731, 1731, 1732,
+     1728, 1736, 1726, 1737, 1738, 1732, 1739, 1740, 1739, 1741,
+     1741, 1744, 1733, 1735, 1742, 1742, 1743, 1743, 1747, 1737,
+     1736, 1740, 1748, 1740, 1738, 1745, 1745, 1746, 1746, 1749,
+     1749, 1744, 1750, 1755, 1751, 1752, 1750, 1757, 1752, 1747,
+     1751, 1754, 1756, 1748, 1759, 1759, 1758, 1754, 1756, 1758,
+     1760, 1755, 1761, 1762, 1762, 1764, 1763, 1761, 1765, 1766,
+     1766, 1767, 1757, 1765, 1771, 1769, 1767, 1768, 1770, 1772,
+     1760, 1763, 1774, 1768, 1773, 1778, 1764, 1769, 1769, 1769,
+     1773, 1776, 1771, 1777, 1769, 1780, 1776, 1776, 1770, 1772,
 
-     1774, 1778, 1781, 1782, 1782, 1783, 1785, 1779, 1777, 1784,
-     1784, 1786, 1787, 1787, 1788, 1788, 1789, 1792, 1792, 1780,
-     1793, 1794, 1797, 1781, 1801, 1796, 1785, 1799, 1799, 1798,
-     1794, 1783, 1800, 1786, 1796, 1798, 1789, 1802, 1803, 1801,
-     1804, 1805, 1805, 1797, 1802, 1793, 1806, 1803, 1807, 1809,
-     1810, 1811, 1812, 1800, 1809, 1813, 1810, 1814, 1819, 1812,
-     1816, 1813, 1818, 1814, 1807, 1816, 1804, 1815, 1815, 1817,
-     1822, 1811, 1806, 1820, 1823, 1827, 1821, 1819, 1817, 1821,
-     1824, 1824, 1818, 1825, 1826, 1820, 1828, 1829, 1822, 1825,
-     1826, 1829, 1831, 1832, 1833, 1827, 1834, 1834, 1835, 1833,
+     1778, 1779, 1774, 1779, 1781, 1782, 1780, 1777, 1783, 1784,
+     1785, 1782, 1786, 1786, 1787, 1788, 1788, 1783, 1789, 1781,
+     1790, 1791, 1791, 1792, 1792, 1793, 1796, 1796, 1797, 1784,
+     1798, 1785, 1800, 1801, 1803, 1803, 1804, 1802, 1789, 1798,
+     1787, 1800, 1790, 1802, 1805, 1793, 1808, 1807, 1806, 1809,
+     1809, 1810, 1811, 1797, 1801, 1806, 1807, 1804, 1813, 1805,
+     1814, 1815, 1816, 1813, 1817, 1818, 1814, 1821, 1811, 1816,
+     1817, 1818, 1808, 1819, 1819, 1820, 1821, 1810, 1822, 1824,
+     1820, 1815, 1823, 1825, 1826, 1827, 1825, 1828, 1828, 1829,
+     1830, 1824, 1831, 1832, 1835, 1829, 1830, 1839, 1822, 1833,
 
-     1823, 1828, 1838, 1836, 1839, 1840, 1846, 1829, 1839, 1848,
-     1841, 1840, 1831, 1842, 1842, 1832, 1843, 1835, 1836, 1841,
-     1843, 1838, 1844, 1845, 1845, 1847, 1849, 1846, 1848, 1850,
-     1851, 1849, 1853, 1844, 1852, 1861, 1854, 1859, 1844, 1847,
-     1852, 1854, 1855, 1855, 1856, 1856, 1859, 1853, 1857, 1850,
-     1851, 1860, 1857, 1862, 1862, 1861, 1864, 1864, 1865, 1866,
-     1868, 1869, 1860, 1865, 1865, 1866, 1868, 1860, 1870, 1871,
-     1872, 1874, 1876, 1870, 1875, 1877, 1872, 1879, 1875, 1878,
-     1880, 1871, 1882, 1874, 1876, 1878, 1880, 1869, 1881, 1884,
-     1885, 1886, 1888, 1881, 1882, 1888, 1886, 1889, 1889, 1879,
+     1836, 1823, 1826, 1833, 1837, 1838, 1838, 1842, 1832, 1837,
+     1840, 1827, 1831, 1843, 1835, 1844, 1839, 1843, 1845, 1833,
+     1848, 1844, 1836, 1846, 1846, 1840, 1842, 1845, 1847, 1849,
+     1849, 1848, 1847, 1850, 1851, 1853, 1848, 1852, 1854, 1855,
+     1853, 1856, 1857, 1863, 1858, 1859, 1859, 1856, 1851, 1858,
+     1860, 1860, 1863, 1865, 1850, 1864, 1852, 1857, 1854, 1855,
+     1861, 1866, 1866, 1873, 1861, 1881, 1864, 1868, 1868, 1869,
+     1870, 1864, 1872, 1865, 1869, 1869, 1870, 1874, 1872, 1875,
+     1876, 1878, 1874, 1879, 1880, 1883, 1876, 1879, 1882, 1873,
+     1881, 1875, 1884, 1878, 1882, 1885, 1880, 1886, 1884, 1888,
 
-     1877, 1884, 1890, 1890, 1891, 1891, 1892, 1893, 1894, 1885,
-     1895, 1896, 1897, 1893, 1894, 1895, 1901, 1896, 1899, 1901,
-     1902, 1897, 1905, 1899, 1903, 1903, 1892, 1906, 1907, 1908,
-     1908, 1909, 1902, 1907, 1905, 1912, 1910, 1911, 1912, 1906,
-     1909, 1910, 1911, 1913, 1913, 1914, 1915, 1918, 1916, 1917,
-     1920, 1918, 1919, 1921, 1922, 1915, 1920, 1919, 1923, 1924,
-     1926, 1926, 1927, 1922, 1929, 1914, 1916, 1933, 1917, 1928,
-     1931, 1921, 1926, 1924, 1930, 1930, 1923, 1932, 1928, 1931,
-     1927, 1934, 1935, 1941, 1929, 1942, 1934, 1944, 1933, 1932,
-     1938, 1938, 1945, 1940, 1946, 1935, 1940, 1947, 1956, 1941,
+     1885, 1889, 1892, 1890, 1896, 1892, 1922, 1883, 1890, 1886,
+     1922, 1888, 1893, 1893, 1894, 1894, 1895, 1895, 1899, 1897,
+     1889, 1898, 1900, 1899, 1896, 1897, 1901, 1898, 1900, 1903,
+     1905, 1906, 1909, 1905, 1903, 1901, 1907, 1907, 1910, 1913,
+     1911, 1912, 1912, 1906, 1909, 1911, 1914, 1915, 1913, 1918,
+     1910, 1914, 1915, 1916, 1917, 1917, 1916, 1919, 1920, 1921,
+     1923, 1924, 1925, 1926, 1927, 1923, 1919, 1924, 1931, 1918,
+     1928, 1933, 1926, 1930, 1930, 1936, 1920, 1937, 1921, 1932,
+     1925,    0, 1927, 1935, 1928, 1930, 1931, 1936, 1932, 1934,
+     1934, 1933, 1935, 1939, 1938, 1942, 1942, 1944, 1937, 1938,
 
-     1946, 1942, 1944, 1948, 1948, 1949, 1945, 1949, 1950, 1950,
-     1951, 1953, 1953, 1957, 1947, 1954, 1954, 1958, 1951, 1957,
-     1959, 1956, 1960, 1958, 1963, 1961, 1964, 1959, 1962, 1962,
-     1965, 1966, 1969, 1963, 1967, 1970, 1968, 1973, 1974, 1975,
-     1971,    0, 1965, 1966, 1960, 1961, 1971, 1964, 1968, 1967,
-     1970, 1975, 1976, 1976, 1977, 1978, 1981, 1973, 1969, 1971,
-     1979, 1974, 1980, 1979, 1983, 1985, 1984, 1980, 1984, 1983,
-     1987, 1989, 1977, 1986, 1991, 1978, 1981, 1987, 1986, 1992,
-     1989, 1993, 1994, 1985, 1994, 1995, 1998, 1997, 1992, 1997,
-     1999, 1999, 1991, 1993, 2000, 2002, 2001, 2002, 2003, 2005,
+     1944, 1945, 1946, 1950, 1948, 1951, 1939, 1949, 1960, 1950,
+     1952, 1952, 1953,    0, 1953, 1954, 1954, 1945, 1946, 1948,
+     1955, 1949, 1951, 1957, 1957, 1958, 1958, 1961, 1955, 1962,
+     1963, 1960, 1964, 1961, 1967, 1962, 1965, 1963, 1966, 1966,
+     1968, 1969, 1973, 1967, 1971, 1970, 1972, 1974, 1978, 1977,
+        0, 1979, 1981, 1969, 1964, 1982, 1965, 1970, 1972, 1971,
+     1975, 1968, 1974, 1979, 1980, 1980, 1975, 1984, 1973, 1977,
+     1981, 1978, 1984, 1983, 1985, 1982, 1983, 1987, 1988, 1975,
+     1988, 1989, 1987, 1990, 1991, 1995, 1993, 1996, 1990, 1997,
+     1998, 1991, 1998, 1999, 1985, 1993, 1996, 2002, 2001, 1989,
 
-     1998, 2001, 2004, 2003, 1995, 2006, 2007, 2004, 2008, 2009,
-     2010, 2012, 2007, 2008, 2013, 2014, 2014, 2005, 2010, 2016,
-     2000, 2017, 2009, 2015, 2015, 2006, 2018, 2020, 2013, 2020,
-     2012, 2019, 2018, 2021, 2016, 2024, 2019, 2022, 2023, 2023,
-     2029, 2017, 2025, 2025, 2033, 2022, 2027, 2024, 2026, 2026,
-     2031, 2021, 2028, 2022, 2032, 2027, 2032, 2028, 2029, 2031,
-     2035, 2034, 2031, 2036, 2038, 2033, 2034, 2034, 2039, 2035,
-     2042, 2043, 2040, 2039, 2046, 2036, 2038, 2040, 2044, 2045,
-     2045, 2047, 2048, 2042, 2052, 2053, 2049, 2044, 2050, 2054,
-     2055, 2043, 2046, 2057, 2063, 2055, 2052, 2053, 2048, 2047,
+     2001, 1997, 2004, 1995, 2003, 2003, 2009, 2006, 2005, 2006,
+     2007, 2002, 1999, 2005, 2008, 2007, 2010, 2011, 2013, 2008,
+     2012, 2014, 2016, 2011, 2009, 2012, 2017, 2020, 2004, 2014,
+     2021, 2013, 2018, 2018, 2019, 2019, 2010, 2022, 2025, 2023,
+     2017, 2016, 2020, 2022, 2023, 2024, 2026, 2024, 2027, 2027,
+     2021, 2028, 2029, 2029, 2026, 2031, 2025, 2030, 2030, 2033,
+     2032, 2035, 2026, 2028, 2031, 2032, 2036, 2037, 2036, 2038,
+     2035, 2039, 2040, 2035, 2038, 2038, 2043, 2033, 2042, 2046,
+     2039, 2043, 2044, 2047, 2040, 2048, 2050, 2044, 2037, 2051,
+     2042, 2053, 2046, 2052, 2048, 2049, 2049, 2054, 2056, 2057,
 
-     2049, 2056, 2057, 2050, 2060, 2062, 2056, 2064, 2065, 2054,
-     2060, 2062, 2066, 2068, 2068, 2067, 2069, 2063, 2070, 2070,
-     2071, 2074, 2064, 2060, 2067, 2069, 2065, 2072, 2073, 2075,
-     2076, 2072, 2077, 2073, 2074, 2076, 2076, 2066, 2077, 2071,
-     2078, 2079, 2080, 2081, 2079, 2086, 2078, 2084, 2084, 2089,
-     2080, 2075, 2085, 2085, 2086, 2087, 2087, 2088, 2088, 2090,
-     2091, 2089, 2096, 2081, 2092, 2099, 2091, 2085, 2096, 2092,
-     2093, 2093, 2094, 2094, 2095, 2101, 2098, 2090, 2085, 2095,
-     2098, 2103, 2100, 2104, 2105, 2099, 2100, 2106, 2104, 2107,
-     2108, 2110, 2111, 2109, 2107, 2101, 2112, 2111, 2113, 2113,
+     2058, 2059, 2067, 2047, 2050, 2053, 2059, 2051, 2060, 2052,
+     2056, 2057, 2054, 2060, 2061, 2064, 2066, 2068, 2069, 2070,
+     2058, 2064, 2066, 2061, 2071, 2067, 2072, 2072, 2073, 2074,
+     2074, 2075, 2068, 2071, 2064, 2076, 2069, 2073, 2077, 2076,
+     2078, 2079, 2080, 2077, 2070, 2081, 2082, 2080, 2080, 2085,
+     2075, 2081, 2082, 2078, 2083, 2094, 2084, 2083, 2088, 2088,
+     2089, 2089, 2090, 2079, 2084, 2091, 2091, 2092, 2092, 2085,
+     2093, 2090, 2095, 2094, 2096, 2089, 2097, 2097, 2095, 2096,
+     2098, 2098, 2093, 2099, 2100, 2102, 2089, 2103, 2099, 2102,
+     2100, 2104, 2105, 2107, 2108, 2104, 2109, 2111, 2110, 2108,
 
-     2114, 2115, 2106, 2117, 2114, 2116, 2103, 2105, 2108, 2109,
-     2116, 2110, 2118, 2119, 2120, 2121, 2115, 2123, 2112, 2122,
-     2121, 2124, 2124, 2126, 2127, 2119, 2128, 2129, 2130, 2117,
-     2118, 2126, 2122, 2120, 2131, 2123, 2132, 2133, 2134, 2136,
-     2140,    0, 2138, 2127, 2139, 2128, 2140, 2142, 2142, 2133,
-     2129, 2143, 2130, 2131, 2136, 2138, 2143, 2132, 2139, 2134,
-     2141, 2144, 2141, 2145, 2144, 2146, 2152, 2147, 2148, 2148,
-     2149, 2149, 2150, 2153, 2150, 2155, 2145, 2151, 2151, 2146,
-     2147, 2152, 2154, 2154, 2155, 2161, 2153, 2155, 2156, 2156,
-     2157, 2157, 2158, 2160, 2162, 2163, 2166, 2158, 2160, 2164,
+     2113, 2115, 2111, 2112, 2114, 2116, 2115, 2103, 2117, 2117,
+     2118, 2119, 2105, 2110, 2118, 2120, 2113, 2121, 2107, 2109,
+     2120, 2112, 2122, 2123, 2114, 2124, 2119, 2116, 2125, 2126,
+     2127, 2128, 2128, 2125, 2131, 2123, 2132, 2130, 2133, 2134,
+     2122, 2135, 2126, 2121, 2124, 2130, 2136, 2137, 2127, 2138,
+     2140, 2142, 2143, 2131,    0, 2132, 2144, 2146, 2146, 2137,
+     2135, 2133, 2144, 2134, 2142, 2140, 2143, 2136, 2147, 2145,
+     2138, 2145, 2148, 2147, 2149, 2148, 2150, 2156, 2151, 2152,
+     2152, 2153, 2153, 2154, 2157, 2154, 2159, 2149, 2155, 2155,
+     2150, 2151, 2156, 2158, 2158, 2159, 2165, 2157, 2159, 2160,
 
-     2164, 2165, 2165, 2167, 2167, 2161, 2168, 2163, 2169, 2169,
-     2170, 2171, 2172, 2172, 2162, 2166, 2171, 2173, 2173, 2174,
-     2175, 2176, 2177, 2179, 2168, 2170, 2180, 2180, 2179, 2175,
-     2181, 2182, 2182, 2174, 2183, 2176, 2184, 2185, 2186, 2186,
-     2185, 2177, 2184, 2187, 2187, 2188, 2189, 2190, 2193, 2181,
-     2191, 2191, 2183, 2194, 2186, 2195, 2196, 2197, 2197, 2198,
-     2196, 2189, 2199, 2204, 2188, 2200, 2190, 2199, 2193, 2201,
-     2195, 2203, 2203, 2206, 2205, 2207, 2194, 2208, 2198, 2209,
-     2200, 2205, 2211, 2204, 2201, 2210, 2210, 2206, 2212, 2213,
-     2212, 2211, 2213, 2207, 2215, 2208, 2216, 2217, 2218, 2219,
+     2160, 2161, 2161, 2162, 2164, 2166, 2167, 2170, 2162, 2164,
+     2168, 2168, 2169, 2169, 2171, 2171, 2165, 2172, 2167, 2173,
+     2173, 2174, 2175, 2176, 2176, 2166, 2170, 2175, 2177, 2177,
+     2178, 2179, 2180, 2181, 2183, 2172, 2174, 2184, 2184, 2183,
+     2179, 2185, 2186, 2186, 2178, 2187, 2180, 2188, 2189, 2190,
+     2190, 2189, 2181, 2188, 2191, 2191, 2192, 2193, 2194, 2197,
+     2185, 2195, 2195, 2187, 2198, 2190, 2199, 2200, 2201, 2201,
+     2202, 2200, 2193, 2203, 2208, 2192, 2204, 2194, 2203, 2197,
+     2205, 2199, 2207, 2207, 2210, 2209, 2211, 2198, 2212, 2202,
+     2213, 2204, 2209, 2215, 2208, 2205, 2214, 2214, 2210, 2216,
 
-     2220, 2216, 2217, 2221, 2222, 2209, 2215, 2213, 2221, 2213,
-     2224, 2225, 2219, 2226, 2227, 2224, 2225, 2228, 2229, 2232,
-     2227, 2220, 2230, 2218, 2229, 2235, 2231, 2230, 2226, 2233,
-     2222, 2231, 2234, 2239, 2235, 2234, 2236, 2237, 2228, 2238,
-     2244,    0, 2233, 2240, 2232, 2236, 2237, 2239, 2238, 2240,
-     2241, 2242, 2246, 2247, 2247, 2242, 2241, 2248, 2249, 2249,
-     2244, 2246, 2251, 2248, 2250, 2253, 2257, 2249, 2256, 2250,
-     2254, 2255, 2255, 2259, 2260, 2257, 2261, 2262, 2266, 2268,
-     2268, 2253, 2251, 2256, 2251, 2259, 2254, 2267, 2265, 2262,
-     2260, 2261, 2264, 2265,    0, 2264, 2269, 2269, 2266, 2267,
+     2217, 2216, 2215, 2217, 2211, 2219, 2212, 2220, 2221, 2222,
+     2223, 2224, 2220, 2221, 2225, 2226, 2213, 2219, 2217, 2225,
+     2217, 2228, 2229, 2223, 2230, 2231, 2228, 2229, 2232, 2233,
+     2236, 2231, 2224, 2234, 2222, 2233, 2239, 2235, 2234, 2230,
+     2237, 2226, 2235, 2238, 2243, 2239, 2238, 2240, 2241, 2232,
+     2242, 2248,    0, 2237, 2244, 2236, 2240, 2241, 2243, 2242,
+     2244, 2245, 2246, 2250, 2251, 2251, 2246, 2245, 2252, 2253,
+     2253, 2248, 2250, 2255, 2252, 2254, 2257, 2261, 2253, 2260,
+     2254, 2258, 2259, 2259, 2263, 2264, 2261, 2265, 2266, 2270,
+     2272, 2272, 2257, 2255, 2260, 2255, 2263, 2258, 2271, 2269,
 
-     2271, 2271, 2272, 2273, 2274, 2272, 2275, 2276, 2273, 2278,
-     2274, 2281, 2275, 2277, 2277, 2280, 2276, 2279, 2279, 2282,
-     2283, 2283, 2284, 2278, 2286, 2281, 2285, 2280, 2284, 2286,
-     2288, 2294, 2289, 2292, 2288, 2289, 2290, 2290, 2282, 2291,
-     2285, 2293, 2292, 2295, 2291, 2296, 2296, 2295, 2297, 2299,
-     2293, 2294, 2300, 2301, 2299, 2302, 2303, 2304, 2305, 2306,
-     2303, 2297, 2307, 2305, 2308, 2306, 2309, 2310, 2307, 2302,
-     2311, 2312, 2300, 2301, 2315, 2311, 2314, 2304, 2316, 2324,
-     2324, 2317, 2308, 2316, 2323, 2309, 2310, 2317, 2314, 2318,
-     2315, 2319, 2312, 2319, 2321, 2326, 2325, 2318, 2323, 2325,
+     2266, 2264, 2265, 2268, 2269,    0, 2268, 2273, 2273, 2270,
+     2271, 2275, 2275, 2276, 2277, 2278, 2276, 2279, 2280, 2277,
+     2282, 2278, 2285, 2279, 2281, 2281, 2284, 2280, 2283, 2283,
+     2286, 2287, 2287, 2288, 2282, 2290, 2285, 2289, 2284, 2288,
+     2290, 2292, 2298, 2293, 2296, 2292, 2293, 2294, 2294, 2286,
+     2295, 2289, 2297, 2296, 2299, 2295, 2300, 2300, 2299, 2301,
+     2303, 2297, 2298, 2304, 2305, 2303, 2306, 2307, 2308, 2309,
+     2310, 2307, 2301, 2311, 2309, 2312, 2310, 2313, 2314, 2311,
+     2306, 2315, 2316, 2304, 2305, 2319, 2315, 2318, 2308, 2320,
+     2328, 2328, 2321, 2312, 2320, 2327, 2313, 2314, 2321, 2318,
 
-     2327, 2327, 2330, 2321, 2331, 2332, 2330, 2333, 2333, 2334,
-     2331, 2337, 2337, 2339, 2341, 2345, 2342, 2332, 2334, 2346,
-     2345, 2326, 2347, 2355, 2348, 2349, 2349, 2347, 2341, 2348,
-     2353, 2339, 2342, 2351, 2351, 2356, 2353, 2354, 2354, 2355,
-     2359, 2357, 2360, 2361, 2361, 2346, 2357, 2363, 2365, 2364,
-     2366, 2368, 2368, 2370, 2360, 2364, 2363, 2356, 2369, 2359,
-     2371, 2369, 2373, 2373, 2375, 2366, 2365, 2374, 2374, 2375,
-     2376, 2377, 2370, 2379, 2378, 2379, 2380, 2381, 2371, 2378,
-     2377, 2382, 2383, 2384, 2385, 2386, 2386, 2383, 2376, 2385,
-     2380, 2381, 2390, 2382, 2387, 2387, 2388, 2388, 2389, 2389,
+     2322, 2319, 2323, 2316, 2323, 2325, 2330, 2329, 2322, 2327,
+     2329, 2331, 2331, 2334, 2325, 2335, 2336, 2334, 2337, 2337,
+     2338, 2335, 2341, 2341, 2343, 2345, 2349, 2346, 2336, 2338,
+     2350, 2349, 2330, 2351, 2359, 2352, 2353, 2353, 2351, 2345,
+     2352, 2357, 2343, 2346, 2355, 2355, 2360, 2357, 2358, 2358,
+     2359, 2363, 2361, 2364, 2365, 2365, 2350, 2361, 2367, 2369,
+     2368, 2370, 2372, 2372, 2374, 2364, 2368, 2367, 2360, 2373,
+     2363, 2375, 2373, 2377, 2377, 2379, 2370, 2369, 2378, 2378,
+     2379, 2380, 2381, 2374, 2383, 2382, 2383, 2384, 2385, 2375,
+     2382, 2381, 2386, 2387, 2388, 2389, 2390, 2390, 2387, 2380,
 
-     2391, 2392, 2395, 2384, 2390, 2396, 2392, 2393, 2393, 2394,
-     2394, 2397, 2398, 2400, 2395, 2399, 2399, 2396, 2391, 2401,
-     2401, 2402, 2402, 2403, 2404, 2406, 2405, 2407, 2398, 2409,
-     2408, 2397, 2400, 2405, 2403, 2408, 2404, 2406, 2410, 2411,
-     2411, 2412, 2413, 2414, 2415, 2416, 2417, 2407, 2426, 2409,
-     2412, 2421, 2418, 2419, 2419, 2422, 2420, 2415, 2410, 2424,
-     2417, 2425, 2428, 2414, 2418, 2420, 2421,    0, 2413, 2416,
-     2422, 2426, 2427, 2429, 2430, 2427, 2428, 2424, 2429, 2430,
-     2431, 2431, 2438, 2425, 2432, 2432, 2433, 2433, 2435, 2435,
-     2437, 2437, 2439, 2440, 2441, 2443, 2444, 2445, 2446, 2447,
+     2389, 2384, 2385, 2394, 2386, 2391, 2391, 2392, 2392, 2393,
+     2393, 2395, 2396, 2399, 2388, 2394, 2400, 2396, 2397, 2397,
+     2398, 2398, 2401, 2402, 2404, 2399, 2403, 2403, 2400, 2395,
+     2405, 2405, 2406, 2406, 2407, 2408, 2410, 2409, 2411, 2402,
+     2413, 2412, 2401, 2404, 2409, 2407, 2412, 2408, 2410, 2414,
+     2415, 2415, 2416, 2417, 2418, 2419, 2420, 2421, 2411, 2430,
+     2413, 2416, 2425, 2422, 2423, 2423, 2426, 2424, 2419, 2414,
+     2428, 2421, 2429, 2432, 2418, 2422, 2424, 2425,    0, 2417,
+     2420, 2426, 2430, 2431, 2433, 2434, 2431, 2432, 2428, 2433,
+     2434, 2435, 2435, 2442, 2429, 2436, 2436, 2437, 2437, 2439,
 
-     2438, 2448, 2449, 2439, 2449, 2450, 2451, 2457, 2447, 2441,
-     2452, 2458, 2440, 2456, 2444, 2443, 2453, 2453, 2446, 2445,
-     2458, 2448, 2455, 2455, 2451, 2450, 2461, 2456, 2452, 2457,
-     2459, 2459, 2462, 2462, 2463, 2461, 2464, 2465, 2466, 2467,
-     2468, 2470, 2473, 2469, 2465, 2471, 2471, 2472, 2472, 2474,
-     2475, 2479, 2463, 2466, 2464, 2478, 2475, 2467, 2468, 2469,
-     2470, 2478, 2473, 2476, 2476, 2477, 2477, 2474, 2480, 2479,
-     2481, 2482, 2483, 2484, 2485, 2486, 2487, 2483, 2487, 2492,
-     2486, 2488, 2488, 2480, 2489, 2482, 2489, 2490, 2490, 2481,
-     2494, 2495, 2496, 2484, 2485, 2497, 2498, 2499, 2492, 2494,
+     2439, 2441, 2441, 2443, 2444, 2445, 2447, 2448, 2449, 2450,
+     2451, 2442, 2452, 2453, 2443, 2453, 2454, 2455, 2461, 2451,
+     2445, 2456, 2462, 2444, 2460, 2448, 2447, 2457, 2457, 2450,
+     2449, 2462, 2452, 2459, 2459, 2455, 2454, 2465, 2460, 2456,
+     2461, 2463, 2463, 2466, 2466, 2467, 2465, 2468, 2469, 2470,
+     2471, 2472, 2474, 2477, 2473, 2469, 2475, 2475, 2476, 2476,
+     2478, 2479, 2483, 2467, 2470, 2468, 2482, 2479, 2471, 2472,
+     2473, 2474, 2482, 2477, 2480, 2480, 2481, 2481, 2478, 2484,
+     2483, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 2487, 2491,
+     2496, 2490, 2492, 2492, 2484, 2493, 2486, 2493, 2494, 2494,
 
-     2500, 2498, 2503, 2504, 2496, 2506, 2504, 2505, 2505, 2507,
-     2495, 2508, 2508, 2511, 2509, 2497, 2514, 2499, 2509, 2500,
-     2506, 2512, 2503, 2513, 2513, 2512, 2516, 2507, 2511, 2514,
-     2517, 2518, 2519, 2519, 2521, 2522, 2523, 2524, 2524, 2525,
-     2523, 2516, 2526, 2526, 2522, 2528, 2521, 2527, 2529, 2530,
-     2517, 2518, 2527, 2537, 2528, 2531, 2531, 2539, 2525, 2536,
-     2536, 2530, 2538, 2538, 2529, 2540, 2544, 2541, 2542, 2551,
-     2539, 2543, 2543, 2546, 2546, 2537, 2541, 2542, 2540, 2549,
-     2550, 2544, 2552, 2551, 2549, 2550, 2553, 2552, 2554, 2555,
-     2558, 2556, 2559, 2561, 2553, 2560, 2567, 2559, 2555, 2556,
+     2485, 2498, 2499, 2500, 2488, 2489, 2501, 2502, 2503, 2496,
+     2498, 2504, 2502, 2507, 2508, 2500, 2510, 2508, 2509, 2509,
+     2511, 2499, 2512, 2512, 2515, 2513, 2501, 2518, 2503, 2513,
+     2504, 2510, 2516, 2507, 2517, 2517, 2516, 2520, 2511, 2515,
+     2518, 2521, 2522, 2523, 2523, 2525, 2526, 2527, 2528, 2528,
+     2529, 2527, 2520, 2530, 2530, 2526, 2532, 2525, 2531, 2533,
+     2534, 2521, 2522, 2531, 2541, 2532, 2535, 2535, 2543, 2529,
+     2540, 2540, 2534, 2542, 2542, 2533, 2544, 2548, 2545, 2546,
+     2555, 2543, 2547, 2547, 2550, 2550, 2541, 2545, 2546, 2544,
+     2553, 2554, 2548, 2556, 2555, 2553, 2554, 2557, 2556, 2558,
 
-     2560, 2562, 2562, 2563, 2563, 2558, 2565, 2554, 2561, 2564,
-     2564, 2566, 2568, 2565, 2567, 2569, 2566, 2570, 2571, 2571,
-     2572, 2569, 2570, 2573, 2574, 2574, 2575, 2575, 2573, 2578,
-     2568, 2579, 2579, 2580, 2581, 2572, 2580, 2584, 2582, 2581,
-     2581, 2583, 2578, 2582, 2585, 2586, 2583, 2587, 2588, 2586,
-     2585, 2584, 2587, 2589, 2590, 2591, 2594, 2588, 2592, 2593,
-     2595, 2594, 2590, 2597, 2592, 2593, 2598, 2601, 2589, 2605,
-     2597, 2598, 2595, 2603, 2599, 2604, 2591, 2599, 2603, 2601,
-     2604, 2606, 2607, 2608, 2609, 2609, 2610, 2605, 2613, 2618,
-     2614, 2607, 2608, 2615, 2606, 2610, 2614, 2619, 2622, 2615,
+     2559, 2562, 2560, 2563, 2565, 2557, 2564, 2571, 2563, 2559,
+     2560, 2564, 2566, 2566, 2567, 2567, 2562, 2569, 2558, 2565,
+     2568, 2568, 2570, 2572, 2569, 2571, 2573, 2570, 2574, 2575,
+     2575, 2576, 2573, 2574, 2577, 2578, 2578, 2579, 2579, 2577,
+     2582, 2572, 2583, 2583, 2584, 2585, 2576, 2584, 2588, 2586,
+     2585, 2585, 2587, 2582, 2586, 2589, 2590, 2587, 2591, 2592,
+     2590, 2589, 2588, 2591, 2593, 2594, 2595, 2598, 2592, 2596,
+     2597, 2599, 2598, 2594, 2601, 2596, 2597, 2602, 2605, 2593,
+     2609, 2601, 2602, 2599, 2607, 2603, 2608, 2595, 2603, 2607,
+     2605, 2608, 2610, 2611, 2612, 2613, 2613, 2614, 2609, 2617,
 
-     2620, 2621, 2621, 2623, 2624, 2622, 2613, 2627, 2618, 2625,
-     2626, 2626, 2629, 2624, 2631, 2634, 2632, 2619, 2640, 2620,
-     2632,    0, 2623, 2640, 2625, 2635, 2627, 2629, 2633, 2633,
-     2636, 2635, 2637, 2646, 2631, 2639, 2636, 2642, 2637, 2643,
-     2634, 2638, 2638, 2639, 2645, 2647, 2642, 2646, 2645, 2649,
-     2649, 2650, 2643, 2651, 2651, 2652, 2652, 2654, 2654, 2655,
-     2647, 2656, 2660, 2655, 2658, 2658, 2656, 2661, 2662, 2650,
-     2663, 2665, 2661, 2666, 2666, 2663, 2663, 2668, 2668, 2671,
-     2662, 2673, 2660, 2669, 2669, 2670, 2675, 2679, 2670, 2676,
-     2676, 2665, 2671, 2677, 2677, 2678, 2678, 2680, 2680, 2673,
+     2622, 2618, 2611, 2612, 2619, 2610, 2614, 2618, 2623, 2626,
+     2619, 2624, 2625, 2625, 2627, 2628, 2626, 2617, 2631, 2622,
+     2629, 2630, 2630, 2633, 2628, 2635, 2638, 2636, 2623, 2644,
+     2624, 2636,    0, 2627, 2644, 2629, 2639, 2631, 2633, 2637,
+     2637, 2640, 2639, 2641, 2650, 2635, 2643, 2640, 2646, 2641,
+     2647, 2638, 2642, 2642, 2643, 2649, 2651, 2646, 2650, 2649,
+     2653, 2653, 2654, 2647, 2655, 2655, 2656, 2656, 2658, 2658,
+     2659, 2651, 2660, 2664, 2659, 2662, 2662, 2660, 2665, 2666,
+     2654, 2667, 2669, 2665, 2670, 2670, 2667, 2667, 2672, 2672,
+     2675, 2666, 2677, 2664, 2673, 2673, 2674, 2679, 2683, 2674,
 
-     2681, 2682, 2679, 2683, 2684, 2686, 2675, 2685, 2685, 2686,
-     2684, 2691, 2692, 2681, 2696, 2690, 2693, 2683, 2694, 2682,
-     2690, 2690, 2695, 2697, 2694, 2698, 2698, 2697, 2695, 2703,
-     2701, 2706, 2692, 2709, 2691, 2701, 2693, 2703, 2704, 2696,
-     2707, 2704, 2710, 2707, 2708, 2708, 2711, 2710, 2712, 2713,
-     2709, 2709, 2714, 2714, 2716, 2715, 2706, 2716, 2717, 2718,
-     2722, 2720, 2719, 2713, 2711, 2716, 2720, 2720, 2712, 2715,
-     2719, 2721, 2717, 2723, 2723, 2728, 2721, 2721, 2718, 2722,
-     2724, 2724, 2725, 2725, 2726, 2726, 2727, 2727, 2729, 2730,
-     2731, 2728, 2732, 2729, 2733, 2734, 2735, 2732, 2736, 2737,
+     2680, 2680, 2669, 2675, 2681, 2681, 2682, 2682, 2684, 2684,
+     2677, 2685, 2686, 2683, 2687, 2688, 2690, 2679, 2689, 2689,
+     2690, 2688, 2695, 2696, 2685, 2700, 2694, 2697, 2687, 2698,
+     2686, 2694, 2694, 2699, 2701, 2698, 2702, 2702, 2701, 2699,
+     2707, 2705, 2710, 2696, 2713, 2695, 2705, 2697, 2707, 2708,
+     2700, 2711, 2708, 2714, 2711, 2712, 2712, 2715, 2714, 2716,
+     2717, 2713, 2713, 2718, 2718, 2720, 2719, 2710, 2720, 2721,
+     2722, 2726, 2724, 2723, 2717, 2715, 2720, 2724, 2724, 2716,
+     2719, 2723, 2725, 2721, 2727, 2727, 2732, 2725, 2725, 2722,
+     2726, 2728, 2728, 2729, 2729, 2730, 2730, 2731, 2731, 2733,
 
-     2734, 2739, 2739, 2740, 2740, 2735, 2742, 2741, 2745, 2730,
-     2741, 2744, 2744, 2733, 2750, 2745, 2731, 2747, 2736, 2737,
-     2746, 2746, 2747, 2750, 2742, 2749, 2749, 2751, 2752, 2754,
-     2755, 2755, 2757, 2758, 2756, 2771, 2751, 2752, 2756, 2759,
-     2760, 2757, 2761, 2772, 2759, 2759, 2762, 2754, 2758, 2766,
-     2762, 2761, 2770, 2760, 2766, 2767, 2767, 2769, 2769, 2774,
-     2771, 2772, 2775, 2778, 2779, 2780, 2770, 2783, 2774, 2781,
-     2785, 2787, 2788, 2779, 2775, 2781, 2787, 2788, 2790, 2783,
-     2789, 2789, 2793, 2793, 2792, 2780, 2793, 2790, 2778, 2792,
-     2798, 2785, 2795, 2795, 2796, 2796, 2797, 2797, 2799, 2798,
+     2734, 2735, 2732, 2736, 2733, 2737, 2738, 2739, 2736, 2740,
+     2741, 2738, 2743, 2743, 2744, 2744, 2739, 2746, 2745, 2749,
+     2734, 2745, 2748, 2748, 2737, 2754, 2749, 2735, 2751, 2740,
+     2741, 2750, 2750, 2751, 2754, 2746, 2753, 2753, 2755, 2756,
+     2758, 2759, 2759, 2761, 2762, 2760, 2775, 2755, 2756, 2760,
+     2763, 2764, 2761, 2765, 2776, 2763, 2763, 2766, 2758, 2762,
+     2770, 2766, 2765, 2774, 2764, 2770, 2771, 2771, 2773, 2773,
+     2778, 2775, 2776, 2779, 2782, 2783, 2784, 2774, 2787, 2778,
+     2785, 2789, 2791, 2792, 2783, 2779, 2785, 2791, 2792, 2794,
+     2787, 2793, 2793, 2797, 2797, 2796, 2784, 2797, 2794, 2782,
 
-     2800, 2801, 2803, 2807, 2804, 2805, 2801, 2809, 2803, 2804,
-     2805, 2806, 2806, 2808, 2811, 2810, 2812, 2813, 2799, 2800,
-     2810, 2807, 2812, 2814, 2814, 2808, 2816, 2820, 2809, 2817,
-     2816, 2818, 2811, 2821, 2817, 2822, 2818, 2819, 2819, 2824,
-     2826, 2826, 2813, 2828, 2829, 2830, 2820, 2832, 2821, 2830,
-     2822, 2831, 2833, 2834, 2836, 2836, 2828, 2829, 2838, 2824,
-     2831, 2834, 2835, 2832, 2837, 2839, 2841, 2835, 2840, 2840,
-     2851, 2833, 2847, 2837, 2844, 2844, 2838, 2845, 2845, 2849,
-     2849, 2852, 2853, 2854, 2857, 2841, 2851, 2858, 2854, 2856,
-     2856, 2839, 2859, 2847, 2861, 2861, 2863, 2852, 2853, 2862,
+     2796, 2802, 2789, 2799, 2799, 2800, 2800, 2801, 2801, 2803,
+     2802, 2804, 2805, 2807, 2811, 2808, 2809, 2805, 2813, 2807,
+     2808, 2809, 2810, 2810, 2812, 2815, 2814, 2816, 2817, 2803,
+     2804, 2814, 2811, 2816, 2818, 2818, 2812, 2820, 2824, 2813,
+     2821, 2820, 2822, 2815, 2825, 2821, 2826, 2822, 2823, 2823,
+     2828, 2830, 2830, 2817, 2832, 2833, 2834, 2824, 2836, 2825,
+     2834, 2826, 2835, 2837, 2838, 2840, 2840, 2832, 2833, 2842,
+     2828, 2835, 2838, 2839, 2836, 2841, 2843, 2845, 2839, 2844,
+     2844, 2855, 2837, 2851, 2841, 2848, 2848, 2842, 2849, 2849,
+     2853, 2853, 2856, 2857, 2858, 2861, 2845, 2855, 2862, 2858,
 
-     2864, 2864, 2867, 2868, 2857, 2870, 2873, 2869, 2877, 2868,
-     2858, 2859, 2869, 2862, 2875, 2863, 2871, 2871, 2872, 2872,
-     2874, 2874, 2867, 2876, 2878, 2875, 2873, 2870, 2877, 2879,
-     2878, 2880, 2876, 2881, 2882, 2882, 2883, 2884, 2884, 2883,
-     2874, 2889, 2888, 2880, 2890, 2891, 2891, 2894, 2879, 2892,
-     2890, 2893, 2892, 2881, 2888, 2896, 2899, 2893, 2897, 2897,
-     2896, 2889, 2898, 2900, 2901, 2894, 2904, 2898, 2905, 2900,
-     2902, 2902, 2906, 2909, 2907, 2899, 2908, 2908, 2904, 2910,
-     2911, 2901, 2901, 2913, 2913, 2916, 2905, 2907, 2915, 2911,
-     2914, 2914, 2909, 2915, 2922, 2910, 2917, 2906, 2921, 2916,
+     2860, 2860, 2843, 2863, 2851, 2865, 2865, 2867, 2856, 2857,
+     2866, 2868, 2868, 2871, 2872, 2861, 2874, 2877, 2873, 2881,
+     2872, 2862, 2863, 2873, 2866, 2879, 2867, 2875, 2875, 2876,
+     2876, 2878, 2878, 2871, 2880, 2882, 2879, 2877, 2874, 2881,
+     2883, 2882, 2884, 2880, 2885, 2886, 2886, 2887, 2888, 2888,
+     2887, 2878, 2893, 2892, 2884, 2894, 2895, 2895, 2898, 2883,
+     2896, 2894, 2897, 2896, 2885, 2892, 2900, 2903, 2897, 2901,
+     2901, 2900, 2893, 2902, 2904, 2905, 2898, 2908, 2902, 2909,
+     2904, 2906, 2906, 2910, 2913, 2911, 2903, 2912, 2912, 2908,
+     2914, 2915, 2905, 2905, 2917, 2917, 2920, 2909, 2911, 2919,
 
-     2929, 2917, 2918, 2918, 2919, 2919, 2920, 2920, 2923, 2931,
-     2924, 2921, 2926, 2926, 2923, 2924, 2932, 2933, 2937, 2929,
-     2922, 2934, 2934, 2936, 2936, 2938, 2939, 2940, 2940, 2941,
-     2941, 2931, 2937, 2944, 2943, 2939, 2945, 2946, 2932, 2933,
-     2943, 2960, 2946, 2949, 2949, 2938, 2951, 2951, 2953, 2952,
-     2954, 2955, 2956, 2944, 2952, 2945, 2954, 2957, 2957, 2958,
-     2956, 2960, 2953, 2955, 2958, 2961, 2962, 2963, 2964, 2966,
-     2967, 2962, 2968, 2969, 2964, 2972, 2971, 2966, 2973, 2963,
-     2974, 2975, 2977, 2978, 2979, 2961, 2975, 2977, 2982, 2967,
-     2979, 2972, 2968, 2969, 2971, 2973, 2973, 2980, 2984, 2987,
+     2915, 2918, 2918, 2913, 2919, 2926, 2914, 2921, 2910, 2925,
+     2920, 2933, 2921, 2922, 2922, 2923, 2923, 2924, 2924, 2927,
+     2935, 2928, 2925, 2930, 2930, 2927, 2928, 2936, 2937, 2941,
+     2933, 2926, 2938, 2938, 2940, 2940, 2942, 2943, 2944, 2944,
+     2945, 2945, 2935, 2941, 2948, 2947, 2943, 2949, 2950, 2936,
+     2937, 2947, 2964, 2950, 2953, 2953, 2942, 2955, 2955, 2957,
+     2956, 2958, 2959, 2960, 2948, 2956, 2949, 2958, 2961, 2961,
+     2962, 2960, 2964, 2957, 2959, 2962, 2965, 2966, 2967, 2968,
+     2970, 2971, 2966, 2972, 2973, 2968, 2976, 2975, 2970, 2977,
+     2967, 2978, 2979, 2981, 2982, 2983, 2965, 2979, 2981, 2986,
 
-     2987, 2974, 2980, 2978, 2983, 2988, 2988, 2983, 2982, 2989,
-     2995, 2984, 2994, 2989, 2993, 2993,    0, 2994, 2996, 2996,
-     2998, 2998, 2999, 2999, 3005, 2999, 3006, 3000, 3000, 2995,
-     3000, 3001, 3001, 3002, 3001, 3004, 3004, 3002, 3009, 3010,
-     3006, 3011, 3005, 3012, 3012, 3015, 3011, 3016, 3017, 3019,
-     3021, 3018, 3017, 3022, 3016, 3023, 3023, 3030, 3009, 3010,
-     3018, 3026, 3022, 3030, 3019, 3024, 3024, 3031, 3021, 3027,
-     3015, 3025, 3025, 3028, 3027, 3029, 3026, 3033, 3032, 3034,
-     3029, 3029, 3028, 3035, 3034, 3028, 3036,    0, 3035, 3037,
-     3037, 3038, 3031, 3032, 3039, 3040, 3040, 3038, 3033, 3042,
+     2971, 2983, 2976, 2972, 2973, 2975, 2977, 2977, 2984, 2988,
+     2991, 2991, 2978, 2984, 2982, 2987, 2992, 2992, 2987, 2986,
+     2993, 2999, 2988, 2998, 2993, 2997, 2997,    0, 2998, 3000,
+     3000, 3002, 3002, 3003, 3003, 3009, 3003, 3010, 3004, 3004,
+     2999, 3004, 3005, 3005, 3006, 3005, 3008, 3008, 3006, 3013,
+     3014, 3010, 3015, 3009, 3016, 3016, 3019, 3015, 3020, 3021,
+     3023, 3025, 3022, 3021, 3026, 3020, 3027, 3027, 3034, 3013,
+     3014, 3022, 3030, 3026, 3034, 3023, 3028, 3028, 3035, 3025,
+     3031, 3019, 3029, 3029, 3032, 3031, 3033, 3030, 3037, 3036,
+     3038, 3033, 3033, 3032, 3039, 3038, 3032, 3040,    0, 3039,
 
-     3039, 3041, 3041, 3043, 3049, 3036, 3046, 3046, 3043, 3048,
-     3048, 3052, 3052, 3049, 3042, 3053, 3053, 3054, 3054, 3055,
-     3055, 3056, 3056, 3057, 3057, 3058, 3058, 3060, 3061, 3061,
-     3062, 3063, 3064, 3068, 3066, 3070, 3060, 3067, 3067, 3062,
-     3072, 3069, 3076, 3063, 3071, 3071, 3078, 3070, 3068, 3073,
-     3073, 3080, 3064, 3066, 3069, 3072, 3077, 3079, 3079, 3077,
-     3076, 3082, 3083, 3084, 3082, 3085, 3086, 3088, 3083, 3080,
-     3085, 3087, 3078, 3090, 3094, 3091, 3095, 3084, 3094, 3090,
-     3098, 3108, 3113, 3088, 3091, 3086, 3119, 3106, 3117, 3087,
-     3106, 3095, 3109, 3109, 3108, 3110, 3110, 3111, 3111, 3114,
+     3041, 3041, 3042, 3035, 3036, 3043, 3044, 3044, 3042, 3037,
+     3046, 3043, 3045, 3045, 3047, 3053, 3040, 3050, 3050, 3047,
+     3052, 3052, 3056, 3056, 3053, 3046, 3057, 3057, 3058, 3058,
+     3059, 3059, 3060, 3060, 3061, 3061, 3062, 3062, 3064, 3065,
+     3065, 3066, 3067, 3068, 3072, 3070, 3074, 3064, 3071, 3071,
+     3066, 3076, 3073, 3080, 3067, 3075, 3075, 3082, 3074, 3072,
+     3077, 3077, 3084, 3068, 3070, 3073, 3076, 3081, 3083, 3083,
+     3081, 3080, 3086, 3087, 3088, 3086, 3089, 3090, 3092, 3087,
+     3084, 3089, 3091, 3082, 3094, 3098, 3095, 3099, 3088, 3098,
+     3094, 3102, 3112, 3117, 3092, 3095, 3090, 3123, 3110, 3121,
 
-     3115, 3116, 3117, 3120, 3115, 3113, 3098, 3121, 3114, 3119,
-     3123, 3122, 3121, 3122, 3120, 3124, 3124, 3125, 3126, 3128,
-     3127, 3116, 3129, 3131, 3130, 3123, 3133, 3134, 3132, 3135,
-     3125, 3133, 3131, 3136, 3135, 3128, 3137, 3126, 3127, 3130,
-     3132, 3137, 3141, 3142, 3143, 3143, 3144, 3129, 3134, 3145,
-     3145, 3146, 3146, 3136, 3149, 3144, 3141, 3147, 3147, 3148,
-     3148, 3150, 3151, 3142, 3152, 3151, 3153, 3154, 3155, 3152,
-     3156, 3153, 3157, 3149, 3159, 3158, 3156, 3160, 3160, 3159,
-     3161, 3150, 3164, 3155, 3162, 3162, 3157, 3158, 3163, 3163,
-     3165, 3168, 3154, 3166, 3166, 3170, 3175, 3164, 3173, 3173,
+     3091, 3110, 3099, 3113, 3113, 3112, 3114, 3114, 3115, 3115,
+     3118, 3119, 3120, 3121, 3124, 3119, 3117, 3102, 3125, 3118,
+     3123, 3127, 3126, 3125, 3126, 3124, 3128, 3128, 3129, 3130,
+     3132, 3131, 3120, 3133, 3135, 3134, 3127, 3137, 3138, 3136,
+     3139, 3129, 3137, 3135, 3140, 3139, 3132, 3141, 3130, 3131,
+     3134, 3136, 3141, 3145, 3146, 3147, 3147, 3148, 3133, 3138,
+     3149, 3149, 3150, 3150, 3140, 3153, 3148, 3145, 3151, 3151,
+     3152, 3152, 3154, 3155, 3146, 3156, 3155, 3157, 3158, 3159,
+     3156, 3160, 3157, 3161, 3153, 3163, 3162, 3160, 3164, 3164,
+     3163, 3165, 3154, 3168, 3159, 3166, 3166, 3161, 3162, 3167,
 
-     3161, 3174, 3174, 3176, 3175, 3177, 3168, 3179, 3178, 3165,
-     3180, 3177, 3181, 3170, 3178, 3182, 3183, 3183, 3185, 3185,
-     3182, 3179, 3176, 3180, 3188, 3191, 3189, 3194, 3192, 3195,
-     3196, 3181, 3192, 3199, 3195, 3197, 3200, 3198, 3201, 3191,
-     3205, 3200, 3207, 3201, 3206, 3188, 3189, 3194, 3197, 3196,
-     3198, 3210, 3199, 3202, 3202, 3208, 3208, 3210, 3209, 3215,
-     3205, 3207, 3206, 3209, 3211, 3211, 3212, 3213, 3214, 3216,
-     3223, 3212, 3213, 3214, 3219, 3216, 3218, 3218, 3215, 3219,
-     3220, 3220, 3222, 3224, 3225, 3226, 3222, 3227, 3228, 3223,
-     3224, 3236, 3229, 3227, 3231, 3231, 3233, 3233, 3237, 3234,
+     3167, 3169, 3172, 3158, 3170, 3170, 3174, 3179, 3168, 3177,
+     3177, 3165, 3178, 3178, 3180, 3179, 3181, 3172, 3183, 3182,
+     3169, 3184, 3181, 3185, 3174, 3182, 3186, 3187, 3187, 3189,
+     3189, 3186, 3183, 3180, 3184, 3192, 3195, 3193, 3198, 3196,
+     3199, 3200, 3185, 3196, 3203, 3199, 3201, 3204, 3202, 3205,
+     3195, 3209, 3204, 3211, 3205, 3210, 3192, 3193, 3198, 3201,
+     3200, 3202, 3214, 3203, 3206, 3206, 3212, 3212, 3214, 3213,
+     3219, 3209, 3211, 3210, 3213, 3215, 3215, 3216, 3217, 3218,
+     3220, 3227, 3216, 3217, 3218, 3223, 3220, 3222, 3222, 3219,
+     3223, 3224, 3224, 3226, 3228, 3229, 3230, 3226, 3231, 3232,
 
-     3238, 3235, 3243, 3225, 3226, 3229, 3235, 3228, 3234, 3241,
-     3236, 3234, 3245, 3238, 3239, 3239, 3240, 3237, 3244, 3244,
-     3250, 3240, 3241, 3246, 3246, 3247, 3247, 3248, 3243, 3249,
-     3252, 3245, 3248, 3251, 3251, 3252, 3249, 3255, 3253, 3250,
-     3253, 3254, 3254, 3256, 3255, 3257, 3258, 3259, 3261, 3261,
-     3256, 3258, 3262, 3264, 3265, 3266, 3267, 3271, 3264, 3265,
-     3268, 3268, 3270, 3270, 3257, 3272, 3259, 3273, 3273, 3274,
-     3274, 3262, 3275, 3285, 3266, 3267, 3271, 3277, 3277, 3275,
-     3278, 3278, 3279, 3281, 3272, 3284, 3286,    0, 3281, 3279,
-     3284,    0, 3285, 3287, 3287, 3288, 3288,    0,    0,    0,
+     3227, 3228, 3240, 3233, 3231, 3235, 3235, 3237, 3237, 3241,
+     3238, 3242, 3239, 3247, 3229, 3230, 3233, 3239, 3232, 3238,
+     3245, 3240, 3238, 3249, 3242, 3243, 3243, 3244, 3241, 3248,
+     3248, 3254, 3244, 3245, 3250, 3250, 3251, 3251, 3252, 3247,
+     3253, 3256, 3249, 3252, 3255, 3255, 3256, 3253, 3259, 3257,
+     3254, 3257, 3258, 3258, 3260, 3259, 3261, 3262, 3263, 3265,
+     3265, 3260, 3262, 3266, 3268, 3269, 3270, 3271, 3275, 3268,
+     3269, 3272, 3272, 3274, 3274, 3261, 3276, 3263, 3277, 3277,
+     3278, 3278, 3266, 3279, 3289, 3270, 3271, 3275, 3281, 3281,
+     3279, 3282, 3282, 3283, 3285, 3276, 3288, 3290,    0, 3285,
 
-        0,    0,    0,    0,    0, 3286, 3292, 3292, 3292, 3292,
-     3292, 3292, 3292, 3293, 3293, 3293, 3293, 3293, 3293, 3293,
-     3294, 3294, 3294, 3294, 3294, 3294, 3294, 3295, 3295, 3295,
-     3295, 3295, 3295, 3295, 3296, 3296, 3296, 3296, 3296, 3296,
-     3296, 3297, 3297, 3297, 3297, 3297, 3297, 3297, 3298, 3298,
-     3298, 3298, 3298, 3298, 3298, 3300, 3300,    0, 3300, 3300,
-     3300, 3300, 3301, 3301,    0,    0,    0, 3301, 3301, 3302,
-     3302,    0,    0, 3302,    0, 3302, 3303,    0,    0,    0,
-        0,    0, 3303, 3304, 3304,    0,    0,    0, 3304, 3304,
-     3305,    0,    0,    0,    0,    0, 3305, 3306, 3306,    0,
+     3283, 3288,    0, 3289, 3291, 3291, 3292, 3292,    0,    0,
+        0,    0,    0,    0,    0,    0, 3290, 3296, 3296, 3296,
+     3296, 3296, 3296, 3296, 3297, 3297, 3297, 3297, 3297, 3297,
+     3297, 3298, 3298, 3298, 3298, 3298, 3298, 3298, 3299, 3299,
+     3299, 3299, 3299, 3299, 3299, 3300, 3300, 3300, 3300, 3300,
+     3300, 3300, 3301, 3301, 3301, 3301, 3301, 3301, 3301, 3302,
+     3302, 3302, 3302, 3302, 3302, 3302, 3304, 3304,    0, 3304,
+     3304, 3304, 3304, 3305, 3305,    0,    0,    0, 3305, 3305,
+     3306, 3306,    0,    0, 3306,    0, 3306, 3307,    0,    0,
+        0,    0,    0, 3307, 3308, 3308,    0,    0,    0, 3308,
 
-     3306, 3306, 3306, 3306, 3307,    0,    0,    0,    0,    0,
-     3307, 3308, 3308,    0,    0,    0, 3308, 3308, 3309, 3309,
-        0, 3309, 3309, 3309, 3309, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291,
-     3291, 3291, 3291, 3291, 3291, 3291
+     3308, 3309,    0,    0,    0,    0,    0, 3309, 3310, 3310,
+        0, 3310, 3310, 3310, 3310, 3311,    0,    0,    0,    0,
+        0, 3311, 3312, 3312,    0,    0,    0, 3312, 3312, 3313,
+     3313,    0, 3313, 3313, 3313, 3313, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295, 3295,
+     3295, 3295, 3295, 3295, 3295, 3295, 3295
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3139,7 +3143,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3140 "<stdout>"
+#line 3145 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3148,9 +3152,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3149 "<stdout>"
+#line 3154 "<stdout>"
 
-#line 3151 "<stdout>"
+#line 3156 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3374,7 +3378,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3375 "<stdout>"
+#line 3380 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3407,13 +3411,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 >= 3292 )
+				if ( yy_current_state >= 3296 )
 					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] != 6426 );
+		while ( yy_base[yy_current_state] != 6437 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -4992,40 +4996,45 @@ YY_RULE_SETUP
 { YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) }
 	YY_BREAK
 case 309:
-/* rule 309 can match eol */
 YY_RULE_SETUP
 #line 534 "./util/configlexer.lex"
+{ YDVAR(1, VAR_NSID ) }
+	YY_BREAK
+case 310:
+/* rule 310 can match eol */
+YY_RULE_SETUP
+#line 535 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 310:
+case 311:
 YY_RULE_SETUP
-#line 537 "./util/configlexer.lex"
+#line 538 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 538 "./util/configlexer.lex"
+#line 539 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 311:
-YY_RULE_SETUP
-#line 543 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 312:
-/* rule 312 can match eol */
 YY_RULE_SETUP
 #line 544 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 313:
+/* rule 313 can match eol */
+YY_RULE_SETUP
+#line 545 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 313:
+case 314:
 YY_RULE_SETUP
-#line 546 "./util/configlexer.lex"
+#line 547 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5038,34 +5047,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 314:
+case 315:
 YY_RULE_SETUP
-#line 558 "./util/configlexer.lex"
+#line 559 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 559 "./util/configlexer.lex"
+#line 560 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 315:
-YY_RULE_SETUP
-#line 564 "./util/configlexer.lex"
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 316:
-/* rule 316 can match eol */
 YY_RULE_SETUP
 #line 565 "./util/configlexer.lex"
+{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 317:
+/* rule 317 can match eol */
+YY_RULE_SETUP
+#line 566 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 317:
+case 318:
 YY_RULE_SETUP
-#line 567 "./util/configlexer.lex"
+#line 568 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5078,38 +5087,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 318:
+case 319:
 YY_RULE_SETUP
-#line 579 "./util/configlexer.lex"
+#line 580 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 581 "./util/configlexer.lex"
+#line 582 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 319:
-YY_RULE_SETUP
-#line 585 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 320:
-/* rule 320 can match eol */
 YY_RULE_SETUP
 #line 586 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 321:
+/* rule 321 can match eol */
 YY_RULE_SETUP
 #line 587 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 322:
 YY_RULE_SETUP
 #line 588 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 323:
+YY_RULE_SETUP
+#line 589 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -5117,27 +5126,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 593 "./util/configlexer.lex"
+#line 594 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 323:
-YY_RULE_SETUP
-#line 597 "./util/configlexer.lex"
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 324:
-/* rule 324 can match eol */
 YY_RULE_SETUP
 #line 598 "./util/configlexer.lex"
+{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 325:
+/* rule 325 can match eol */
+YY_RULE_SETUP
+#line 599 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 325:
+case 326:
 YY_RULE_SETUP
-#line 600 "./util/configlexer.lex"
+#line 601 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5147,7 +5156,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 606 "./util/configlexer.lex"
+#line 607 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5162,39 +5171,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 326:
+case 327:
 YY_RULE_SETUP
-#line 620 "./util/configlexer.lex"
+#line 621 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 623 "./util/configlexer.lex"
+#line 624 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 327:
-YY_RULE_SETUP
-#line 627 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
 case 328:
-/* rule 328 can match eol */
 YY_RULE_SETUP
 #line 628 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
 	YY_BREAK
 case 329:
+/* rule 329 can match eol */
 YY_RULE_SETUP
 #line 629 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 case 330:
 YY_RULE_SETUP
 #line 630 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 331:
+YY_RULE_SETUP
+#line 631 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5203,29 +5212,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 636 "./util/configlexer.lex"
+#line 637 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 331:
-YY_RULE_SETUP
-#line 640 "./util/configlexer.lex"
-{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
 case 332:
-/* rule 332 can match eol */
 YY_RULE_SETUP
 #line 641 "./util/configlexer.lex"
+{ LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
+	YY_BREAK
+case 333:
+/* rule 333 can match eol */
+YY_RULE_SETUP
+#line 642 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 333:
+case 334:
 YY_RULE_SETUP
-#line 645 "./util/configlexer.lex"
+#line 646 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5234,33 +5243,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 334:
+case 335:
 YY_RULE_SETUP
-#line 653 "./util/configlexer.lex"
+#line 654 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 335:
+case 336:
 YY_RULE_SETUP
-#line 657 "./util/configlexer.lex"
+#line 658 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 336:
+case 337:
 YY_RULE_SETUP
-#line 661 "./util/configlexer.lex"
+#line 662 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 337:
+case 338:
 YY_RULE_SETUP
-#line 665 "./util/configlexer.lex"
+#line 666 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5261 "<stdout>"
+#line 5271 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5555,7 +5564,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 >= 3292 )
+			if ( yy_current_state >= 3296 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5583,11 +5592,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 >= 3292 )
+		if ( yy_current_state >= 3296 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3291);
+	yy_is_jam = (yy_current_state == 3295);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6226,6 +6235,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 665 "./util/configlexer.lex"
+#line 666 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 55c584a76..c23e6db8f 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -531,6 +531,7 @@ udp-upstream-without-downstream{COLON} { YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNS
 tcp-connection-limit{COLON}	{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) }
 edns-client-string{COLON}	{ YDVAR(2, VAR_EDNS_CLIENT_STRING) }
 edns-client-string-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) }
+nsid{COLON}			{ YDVAR(1, VAR_NSID ) }
 <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 4e5bf5a41..76ef9b877 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.1.  */
+/* A Bison parser, made by GNU Bison 3.7.  */
 
 /* 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
@@ -34,6 +34,10 @@
 /* C LALR(1) parser skeleton written by Richard Stallman, by
    simplifying the original so-called "semantic" parser.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
+
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
    variables, as they might otherwise be expanded by user macros.
@@ -41,14 +45,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.7"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -95,8 +96,17 @@ extern struct config_parser_state* cfg_parser;
 #endif
 
 
-#line 99 "util/configparser.c"
+#line 100 "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
@@ -109,694 +119,731 @@ extern struct config_parser_state* cfg_parser;
 #  endif
 # endif
 
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Use api.header.include to #include this header
-   instead of duplicating it here.  */
-#ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
-# define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    SPACE = 258,
-    LETTER = 259,
-    NEWLINE = 260,
-    COMMENT = 261,
-    COLON = 262,
-    ANY = 263,
-    ZONESTR = 264,
-    STRING_ARG = 265,
-    VAR_FORCE_TOPLEVEL = 266,
-    VAR_SERVER = 267,
-    VAR_VERBOSITY = 268,
-    VAR_NUM_THREADS = 269,
-    VAR_PORT = 270,
-    VAR_OUTGOING_RANGE = 271,
-    VAR_INTERFACE = 272,
-    VAR_PREFER_IP4 = 273,
-    VAR_DO_IP4 = 274,
-    VAR_DO_IP6 = 275,
-    VAR_PREFER_IP6 = 276,
-    VAR_DO_UDP = 277,
-    VAR_DO_TCP = 278,
-    VAR_TCP_MSS = 279,
-    VAR_OUTGOING_TCP_MSS = 280,
-    VAR_TCP_IDLE_TIMEOUT = 281,
-    VAR_EDNS_TCP_KEEPALIVE = 282,
-    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283,
-    VAR_CHROOT = 284,
-    VAR_USERNAME = 285,
-    VAR_DIRECTORY = 286,
-    VAR_LOGFILE = 287,
-    VAR_PIDFILE = 288,
-    VAR_MSG_CACHE_SIZE = 289,
-    VAR_MSG_CACHE_SLABS = 290,
-    VAR_NUM_QUERIES_PER_THREAD = 291,
-    VAR_RRSET_CACHE_SIZE = 292,
-    VAR_RRSET_CACHE_SLABS = 293,
-    VAR_OUTGOING_NUM_TCP = 294,
-    VAR_INFRA_HOST_TTL = 295,
-    VAR_INFRA_LAME_TTL = 296,
-    VAR_INFRA_CACHE_SLABS = 297,
-    VAR_INFRA_CACHE_NUMHOSTS = 298,
-    VAR_INFRA_CACHE_LAME_SIZE = 299,
-    VAR_NAME = 300,
-    VAR_STUB_ZONE = 301,
-    VAR_STUB_HOST = 302,
-    VAR_STUB_ADDR = 303,
-    VAR_TARGET_FETCH_POLICY = 304,
-    VAR_HARDEN_SHORT_BUFSIZE = 305,
-    VAR_HARDEN_LARGE_QUERIES = 306,
-    VAR_FORWARD_ZONE = 307,
-    VAR_FORWARD_HOST = 308,
-    VAR_FORWARD_ADDR = 309,
-    VAR_DO_NOT_QUERY_ADDRESS = 310,
-    VAR_HIDE_IDENTITY = 311,
-    VAR_HIDE_VERSION = 312,
-    VAR_IDENTITY = 313,
-    VAR_VERSION = 314,
-    VAR_HARDEN_GLUE = 315,
-    VAR_MODULE_CONF = 316,
-    VAR_TRUST_ANCHOR_FILE = 317,
-    VAR_TRUST_ANCHOR = 318,
-    VAR_VAL_OVERRIDE_DATE = 319,
-    VAR_BOGUS_TTL = 320,
-    VAR_VAL_CLEAN_ADDITIONAL = 321,
-    VAR_VAL_PERMISSIVE_MODE = 322,
-    VAR_INCOMING_NUM_TCP = 323,
-    VAR_MSG_BUFFER_SIZE = 324,
-    VAR_KEY_CACHE_SIZE = 325,
-    VAR_KEY_CACHE_SLABS = 326,
-    VAR_TRUSTED_KEYS_FILE = 327,
-    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328,
-    VAR_USE_SYSLOG = 329,
-    VAR_OUTGOING_INTERFACE = 330,
-    VAR_ROOT_HINTS = 331,
-    VAR_DO_NOT_QUERY_LOCALHOST = 332,
-    VAR_CACHE_MAX_TTL = 333,
-    VAR_HARDEN_DNSSEC_STRIPPED = 334,
-    VAR_ACCESS_CONTROL = 335,
-    VAR_LOCAL_ZONE = 336,
-    VAR_LOCAL_DATA = 337,
-    VAR_INTERFACE_AUTOMATIC = 338,
-    VAR_STATISTICS_INTERVAL = 339,
-    VAR_DO_DAEMONIZE = 340,
-    VAR_USE_CAPS_FOR_ID = 341,
-    VAR_STATISTICS_CUMULATIVE = 342,
-    VAR_OUTGOING_PORT_PERMIT = 343,
-    VAR_OUTGOING_PORT_AVOID = 344,
-    VAR_DLV_ANCHOR_FILE = 345,
-    VAR_DLV_ANCHOR = 346,
-    VAR_NEG_CACHE_SIZE = 347,
-    VAR_HARDEN_REFERRAL_PATH = 348,
-    VAR_PRIVATE_ADDRESS = 349,
-    VAR_PRIVATE_DOMAIN = 350,
-    VAR_REMOTE_CONTROL = 351,
-    VAR_CONTROL_ENABLE = 352,
-    VAR_CONTROL_INTERFACE = 353,
-    VAR_CONTROL_PORT = 354,
-    VAR_SERVER_KEY_FILE = 355,
-    VAR_SERVER_CERT_FILE = 356,
-    VAR_CONTROL_KEY_FILE = 357,
-    VAR_CONTROL_CERT_FILE = 358,
-    VAR_CONTROL_USE_CERT = 359,
-    VAR_EXTENDED_STATISTICS = 360,
-    VAR_LOCAL_DATA_PTR = 361,
-    VAR_JOSTLE_TIMEOUT = 362,
-    VAR_STUB_PRIME = 363,
-    VAR_UNWANTED_REPLY_THRESHOLD = 364,
-    VAR_LOG_TIME_ASCII = 365,
-    VAR_DOMAIN_INSECURE = 366,
-    VAR_PYTHON = 367,
-    VAR_PYTHON_SCRIPT = 368,
-    VAR_VAL_SIG_SKEW_MIN = 369,
-    VAR_VAL_SIG_SKEW_MAX = 370,
-    VAR_CACHE_MIN_TTL = 371,
-    VAR_VAL_LOG_LEVEL = 372,
-    VAR_AUTO_TRUST_ANCHOR_FILE = 373,
-    VAR_KEEP_MISSING = 374,
-    VAR_ADD_HOLDDOWN = 375,
-    VAR_DEL_HOLDDOWN = 376,
-    VAR_SO_RCVBUF = 377,
-    VAR_EDNS_BUFFER_SIZE = 378,
-    VAR_PREFETCH = 379,
-    VAR_PREFETCH_KEY = 380,
-    VAR_SO_SNDBUF = 381,
-    VAR_SO_REUSEPORT = 382,
-    VAR_HARDEN_BELOW_NXDOMAIN = 383,
-    VAR_IGNORE_CD_FLAG = 384,
-    VAR_LOG_QUERIES = 385,
-    VAR_LOG_REPLIES = 386,
-    VAR_LOG_LOCAL_ACTIONS = 387,
-    VAR_TCP_UPSTREAM = 388,
-    VAR_SSL_UPSTREAM = 389,
-    VAR_SSL_SERVICE_KEY = 390,
-    VAR_SSL_SERVICE_PEM = 391,
-    VAR_SSL_PORT = 392,
-    VAR_FORWARD_FIRST = 393,
-    VAR_STUB_SSL_UPSTREAM = 394,
-    VAR_FORWARD_SSL_UPSTREAM = 395,
-    VAR_TLS_CERT_BUNDLE = 396,
-    VAR_HTTPS_PORT = 397,
-    VAR_HTTP_ENDPOINT = 398,
-    VAR_HTTP_MAX_STREAMS = 399,
-    VAR_HTTP_QUERY_BUFFER_SIZE = 400,
-    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401,
-    VAR_HTTP_NODELAY = 402,
-    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_UDP_CONNECT = 409,
-    VAR_UNBLOCK_LAN_ZONES = 410,
-    VAR_INSECURE_LAN_ZONES = 411,
-    VAR_INFRA_CACHE_MIN_RTT = 412,
-    VAR_INFRA_KEEP_PROBING = 413,
-    VAR_DNS64_PREFIX = 414,
-    VAR_DNS64_SYNTHALL = 415,
-    VAR_DNS64_IGNORE_AAAA = 416,
-    VAR_DNSTAP = 417,
-    VAR_DNSTAP_ENABLE = 418,
-    VAR_DNSTAP_SOCKET_PATH = 419,
-    VAR_DNSTAP_IP = 420,
-    VAR_DNSTAP_TLS = 421,
-    VAR_DNSTAP_TLS_SERVER_NAME = 422,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 423,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425,
-    VAR_DNSTAP_SEND_IDENTITY = 426,
-    VAR_DNSTAP_SEND_VERSION = 427,
-    VAR_DNSTAP_BIDIRECTIONAL = 428,
-    VAR_DNSTAP_IDENTITY = 429,
-    VAR_DNSTAP_VERSION = 430,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436,
-    VAR_RESPONSE_IP_TAG = 437,
-    VAR_RESPONSE_IP = 438,
-    VAR_RESPONSE_IP_DATA = 439,
-    VAR_HARDEN_ALGO_DOWNGRADE = 440,
-    VAR_IP_TRANSPARENT = 441,
-    VAR_IP_DSCP = 442,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 443,
-    VAR_IP_RATELIMIT = 444,
-    VAR_IP_RATELIMIT_SLABS = 445,
-    VAR_IP_RATELIMIT_SIZE = 446,
-    VAR_RATELIMIT = 447,
-    VAR_RATELIMIT_SLABS = 448,
-    VAR_RATELIMIT_SIZE = 449,
-    VAR_RATELIMIT_FOR_DOMAIN = 450,
-    VAR_RATELIMIT_BELOW_DOMAIN = 451,
-    VAR_IP_RATELIMIT_FACTOR = 452,
-    VAR_RATELIMIT_FACTOR = 453,
-    VAR_SEND_CLIENT_SUBNET = 454,
-    VAR_CLIENT_SUBNET_ZONE = 455,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456,
-    VAR_CLIENT_SUBNET_OPCODE = 457,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 458,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 459,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 460,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 461,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463,
-    VAR_CAPS_WHITELIST = 464,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 465,
-    VAR_PERMIT_SMALL_HOLDDOWN = 466,
-    VAR_QNAME_MINIMISATION = 467,
-    VAR_QNAME_MINIMISATION_STRICT = 468,
-    VAR_IP_FREEBIND = 469,
-    VAR_DEFINE_TAG = 470,
-    VAR_LOCAL_ZONE_TAG = 471,
-    VAR_ACCESS_CONTROL_TAG = 472,
-    VAR_LOCAL_ZONE_OVERRIDE = 473,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 474,
-    VAR_ACCESS_CONTROL_TAG_DATA = 475,
-    VAR_VIEW = 476,
-    VAR_ACCESS_CONTROL_VIEW = 477,
-    VAR_VIEW_FIRST = 478,
-    VAR_SERVE_EXPIRED = 479,
-    VAR_SERVE_EXPIRED_TTL = 480,
-    VAR_SERVE_EXPIRED_TTL_RESET = 481,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 482,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483,
-    VAR_FAKE_DSA = 484,
-    VAR_FAKE_SHA1 = 485,
-    VAR_LOG_IDENTITY = 486,
-    VAR_HIDE_TRUSTANCHOR = 487,
-    VAR_TRUST_ANCHOR_SIGNALING = 488,
-    VAR_AGGRESSIVE_NSEC = 489,
-    VAR_USE_SYSTEMD = 490,
-    VAR_SHM_ENABLE = 491,
-    VAR_SHM_KEY = 492,
-    VAR_ROOT_KEY_SENTINEL = 493,
-    VAR_DNSCRYPT = 494,
-    VAR_DNSCRYPT_ENABLE = 495,
-    VAR_DNSCRYPT_PORT = 496,
-    VAR_DNSCRYPT_PROVIDER = 497,
-    VAR_DNSCRYPT_SECRET_KEY = 498,
-    VAR_DNSCRYPT_PROVIDER_CERT = 499,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504,
-    VAR_IPSECMOD_ENABLED = 505,
-    VAR_IPSECMOD_HOOK = 506,
-    VAR_IPSECMOD_IGNORE_BOGUS = 507,
-    VAR_IPSECMOD_MAX_TTL = 508,
-    VAR_IPSECMOD_WHITELIST = 509,
-    VAR_IPSECMOD_STRICT = 510,
-    VAR_CACHEDB = 511,
-    VAR_CACHEDB_BACKEND = 512,
-    VAR_CACHEDB_SECRETSEED = 513,
-    VAR_CACHEDB_REDISHOST = 514,
-    VAR_CACHEDB_REDISPORT = 515,
-    VAR_CACHEDB_REDISTIMEOUT = 516,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 517,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518,
-    VAR_FOR_UPSTREAM = 519,
-    VAR_AUTH_ZONE = 520,
-    VAR_ZONEFILE = 521,
-    VAR_MASTER = 522,
-    VAR_URL = 523,
-    VAR_FOR_DOWNSTREAM = 524,
-    VAR_FALLBACK_ENABLED = 525,
-    VAR_TLS_ADDITIONAL_PORT = 526,
-    VAR_LOW_RTT = 527,
-    VAR_LOW_RTT_PERMIL = 528,
-    VAR_FAST_SERVER_PERMIL = 529,
-    VAR_FAST_SERVER_NUM = 530,
-    VAR_ALLOW_NOTIFY = 531,
-    VAR_TLS_WIN_CERT = 532,
-    VAR_TCP_CONNECTION_LIMIT = 533,
-    VAR_FORWARD_NO_CACHE = 534,
-    VAR_STUB_NO_CACHE = 535,
-    VAR_LOG_SERVFAIL = 536,
-    VAR_DENY_ANY = 537,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538,
-    VAR_LOG_TAG_QUERYREPLY = 539,
-    VAR_STREAM_WAIT_SIZE = 540,
-    VAR_TLS_CIPHERS = 541,
-    VAR_TLS_CIPHERSUITES = 542,
-    VAR_TLS_USE_SNI = 543,
-    VAR_IPSET = 544,
-    VAR_IPSET_NAME_V4 = 545,
-    VAR_IPSET_NAME_V6 = 546,
-    VAR_TLS_SESSION_TICKET_KEYS = 547,
-    VAR_RPZ = 548,
-    VAR_TAGS = 549,
-    VAR_RPZ_ACTION_OVERRIDE = 550,
-    VAR_RPZ_CNAME_OVERRIDE = 551,
-    VAR_RPZ_LOG = 552,
-    VAR_RPZ_LOG_NAME = 553,
-    VAR_DYNLIB = 554,
-    VAR_DYNLIB_FILE = 555,
-    VAR_EDNS_CLIENT_STRING = 556,
-    VAR_EDNS_CLIENT_STRING_OPCODE = 557
-  };
-#endif
-/* Tokens.  */
-#define SPACE 258
-#define LETTER 259
-#define NEWLINE 260
-#define COMMENT 261
-#define COLON 262
-#define ANY 263
-#define ZONESTR 264
-#define STRING_ARG 265
-#define VAR_FORCE_TOPLEVEL 266
-#define VAR_SERVER 267
-#define VAR_VERBOSITY 268
-#define VAR_NUM_THREADS 269
-#define VAR_PORT 270
-#define VAR_OUTGOING_RANGE 271
-#define VAR_INTERFACE 272
-#define VAR_PREFER_IP4 273
-#define VAR_DO_IP4 274
-#define VAR_DO_IP6 275
-#define VAR_PREFER_IP6 276
-#define VAR_DO_UDP 277
-#define VAR_DO_TCP 278
-#define VAR_TCP_MSS 279
-#define VAR_OUTGOING_TCP_MSS 280
-#define VAR_TCP_IDLE_TIMEOUT 281
-#define VAR_EDNS_TCP_KEEPALIVE 282
-#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 283
-#define VAR_CHROOT 284
-#define VAR_USERNAME 285
-#define VAR_DIRECTORY 286
-#define VAR_LOGFILE 287
-#define VAR_PIDFILE 288
-#define VAR_MSG_CACHE_SIZE 289
-#define VAR_MSG_CACHE_SLABS 290
-#define VAR_NUM_QUERIES_PER_THREAD 291
-#define VAR_RRSET_CACHE_SIZE 292
-#define VAR_RRSET_CACHE_SLABS 293
-#define VAR_OUTGOING_NUM_TCP 294
-#define VAR_INFRA_HOST_TTL 295
-#define VAR_INFRA_LAME_TTL 296
-#define VAR_INFRA_CACHE_SLABS 297
-#define VAR_INFRA_CACHE_NUMHOSTS 298
-#define VAR_INFRA_CACHE_LAME_SIZE 299
-#define VAR_NAME 300
-#define VAR_STUB_ZONE 301
-#define VAR_STUB_HOST 302
-#define VAR_STUB_ADDR 303
-#define VAR_TARGET_FETCH_POLICY 304
-#define VAR_HARDEN_SHORT_BUFSIZE 305
-#define VAR_HARDEN_LARGE_QUERIES 306
-#define VAR_FORWARD_ZONE 307
-#define VAR_FORWARD_HOST 308
-#define VAR_FORWARD_ADDR 309
-#define VAR_DO_NOT_QUERY_ADDRESS 310
-#define VAR_HIDE_IDENTITY 311
-#define VAR_HIDE_VERSION 312
-#define VAR_IDENTITY 313
-#define VAR_VERSION 314
-#define VAR_HARDEN_GLUE 315
-#define VAR_MODULE_CONF 316
-#define VAR_TRUST_ANCHOR_FILE 317
-#define VAR_TRUST_ANCHOR 318
-#define VAR_VAL_OVERRIDE_DATE 319
-#define VAR_BOGUS_TTL 320
-#define VAR_VAL_CLEAN_ADDITIONAL 321
-#define VAR_VAL_PERMISSIVE_MODE 322
-#define VAR_INCOMING_NUM_TCP 323
-#define VAR_MSG_BUFFER_SIZE 324
-#define VAR_KEY_CACHE_SIZE 325
-#define VAR_KEY_CACHE_SLABS 326
-#define VAR_TRUSTED_KEYS_FILE 327
-#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 328
-#define VAR_USE_SYSLOG 329
-#define VAR_OUTGOING_INTERFACE 330
-#define VAR_ROOT_HINTS 331
-#define VAR_DO_NOT_QUERY_LOCALHOST 332
-#define VAR_CACHE_MAX_TTL 333
-#define VAR_HARDEN_DNSSEC_STRIPPED 334
-#define VAR_ACCESS_CONTROL 335
-#define VAR_LOCAL_ZONE 336
-#define VAR_LOCAL_DATA 337
-#define VAR_INTERFACE_AUTOMATIC 338
-#define VAR_STATISTICS_INTERVAL 339
-#define VAR_DO_DAEMONIZE 340
-#define VAR_USE_CAPS_FOR_ID 341
-#define VAR_STATISTICS_CUMULATIVE 342
-#define VAR_OUTGOING_PORT_PERMIT 343
-#define VAR_OUTGOING_PORT_AVOID 344
-#define VAR_DLV_ANCHOR_FILE 345
-#define VAR_DLV_ANCHOR 346
-#define VAR_NEG_CACHE_SIZE 347
-#define VAR_HARDEN_REFERRAL_PATH 348
-#define VAR_PRIVATE_ADDRESS 349
-#define VAR_PRIVATE_DOMAIN 350
-#define VAR_REMOTE_CONTROL 351
-#define VAR_CONTROL_ENABLE 352
-#define VAR_CONTROL_INTERFACE 353
-#define VAR_CONTROL_PORT 354
-#define VAR_SERVER_KEY_FILE 355
-#define VAR_SERVER_CERT_FILE 356
-#define VAR_CONTROL_KEY_FILE 357
-#define VAR_CONTROL_CERT_FILE 358
-#define VAR_CONTROL_USE_CERT 359
-#define VAR_EXTENDED_STATISTICS 360
-#define VAR_LOCAL_DATA_PTR 361
-#define VAR_JOSTLE_TIMEOUT 362
-#define VAR_STUB_PRIME 363
-#define VAR_UNWANTED_REPLY_THRESHOLD 364
-#define VAR_LOG_TIME_ASCII 365
-#define VAR_DOMAIN_INSECURE 366
-#define VAR_PYTHON 367
-#define VAR_PYTHON_SCRIPT 368
-#define VAR_VAL_SIG_SKEW_MIN 369
-#define VAR_VAL_SIG_SKEW_MAX 370
-#define VAR_CACHE_MIN_TTL 371
-#define VAR_VAL_LOG_LEVEL 372
-#define VAR_AUTO_TRUST_ANCHOR_FILE 373
-#define VAR_KEEP_MISSING 374
-#define VAR_ADD_HOLDDOWN 375
-#define VAR_DEL_HOLDDOWN 376
-#define VAR_SO_RCVBUF 377
-#define VAR_EDNS_BUFFER_SIZE 378
-#define VAR_PREFETCH 379
-#define VAR_PREFETCH_KEY 380
-#define VAR_SO_SNDBUF 381
-#define VAR_SO_REUSEPORT 382
-#define VAR_HARDEN_BELOW_NXDOMAIN 383
-#define VAR_IGNORE_CD_FLAG 384
-#define VAR_LOG_QUERIES 385
-#define VAR_LOG_REPLIES 386
-#define VAR_LOG_LOCAL_ACTIONS 387
-#define VAR_TCP_UPSTREAM 388
-#define VAR_SSL_UPSTREAM 389
-#define VAR_SSL_SERVICE_KEY 390
-#define VAR_SSL_SERVICE_PEM 391
-#define VAR_SSL_PORT 392
-#define VAR_FORWARD_FIRST 393
-#define VAR_STUB_SSL_UPSTREAM 394
-#define VAR_FORWARD_SSL_UPSTREAM 395
-#define VAR_TLS_CERT_BUNDLE 396
-#define VAR_HTTPS_PORT 397
-#define VAR_HTTP_ENDPOINT 398
-#define VAR_HTTP_MAX_STREAMS 399
-#define VAR_HTTP_QUERY_BUFFER_SIZE 400
-#define VAR_HTTP_RESPONSE_BUFFER_SIZE 401
-#define VAR_HTTP_NODELAY 402
-#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_UDP_CONNECT 409
-#define VAR_UNBLOCK_LAN_ZONES 410
-#define VAR_INSECURE_LAN_ZONES 411
-#define VAR_INFRA_CACHE_MIN_RTT 412
-#define VAR_INFRA_KEEP_PROBING 413
-#define VAR_DNS64_PREFIX 414
-#define VAR_DNS64_SYNTHALL 415
-#define VAR_DNS64_IGNORE_AAAA 416
-#define VAR_DNSTAP 417
-#define VAR_DNSTAP_ENABLE 418
-#define VAR_DNSTAP_SOCKET_PATH 419
-#define VAR_DNSTAP_IP 420
-#define VAR_DNSTAP_TLS 421
-#define VAR_DNSTAP_TLS_SERVER_NAME 422
-#define VAR_DNSTAP_TLS_CERT_BUNDLE 423
-#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424
-#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425
-#define VAR_DNSTAP_SEND_IDENTITY 426
-#define VAR_DNSTAP_SEND_VERSION 427
-#define VAR_DNSTAP_BIDIRECTIONAL 428
-#define VAR_DNSTAP_IDENTITY 429
-#define VAR_DNSTAP_VERSION 430
-#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431
-#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432
-#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433
-#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434
-#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435
-#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436
-#define VAR_RESPONSE_IP_TAG 437
-#define VAR_RESPONSE_IP 438
-#define VAR_RESPONSE_IP_DATA 439
-#define VAR_HARDEN_ALGO_DOWNGRADE 440
-#define VAR_IP_TRANSPARENT 441
-#define VAR_IP_DSCP 442
-#define VAR_DISABLE_DNSSEC_LAME_CHECK 443
-#define VAR_IP_RATELIMIT 444
-#define VAR_IP_RATELIMIT_SLABS 445
-#define VAR_IP_RATELIMIT_SIZE 446
-#define VAR_RATELIMIT 447
-#define VAR_RATELIMIT_SLABS 448
-#define VAR_RATELIMIT_SIZE 449
-#define VAR_RATELIMIT_FOR_DOMAIN 450
-#define VAR_RATELIMIT_BELOW_DOMAIN 451
-#define VAR_IP_RATELIMIT_FACTOR 452
-#define VAR_RATELIMIT_FACTOR 453
-#define VAR_SEND_CLIENT_SUBNET 454
-#define VAR_CLIENT_SUBNET_ZONE 455
-#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456
-#define VAR_CLIENT_SUBNET_OPCODE 457
-#define VAR_MAX_CLIENT_SUBNET_IPV4 458
-#define VAR_MAX_CLIENT_SUBNET_IPV6 459
-#define VAR_MIN_CLIENT_SUBNET_IPV4 460
-#define VAR_MIN_CLIENT_SUBNET_IPV6 461
-#define VAR_MAX_ECS_TREE_SIZE_IPV4 462
-#define VAR_MAX_ECS_TREE_SIZE_IPV6 463
-#define VAR_CAPS_WHITELIST 464
-#define VAR_CACHE_MAX_NEGATIVE_TTL 465
-#define VAR_PERMIT_SMALL_HOLDDOWN 466
-#define VAR_QNAME_MINIMISATION 467
-#define VAR_QNAME_MINIMISATION_STRICT 468
-#define VAR_IP_FREEBIND 469
-#define VAR_DEFINE_TAG 470
-#define VAR_LOCAL_ZONE_TAG 471
-#define VAR_ACCESS_CONTROL_TAG 472
-#define VAR_LOCAL_ZONE_OVERRIDE 473
-#define VAR_ACCESS_CONTROL_TAG_ACTION 474
-#define VAR_ACCESS_CONTROL_TAG_DATA 475
-#define VAR_VIEW 476
-#define VAR_ACCESS_CONTROL_VIEW 477
-#define VAR_VIEW_FIRST 478
-#define VAR_SERVE_EXPIRED 479
-#define VAR_SERVE_EXPIRED_TTL 480
-#define VAR_SERVE_EXPIRED_TTL_RESET 481
-#define VAR_SERVE_EXPIRED_REPLY_TTL 482
-#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483
-#define VAR_FAKE_DSA 484
-#define VAR_FAKE_SHA1 485
-#define VAR_LOG_IDENTITY 486
-#define VAR_HIDE_TRUSTANCHOR 487
-#define VAR_TRUST_ANCHOR_SIGNALING 488
-#define VAR_AGGRESSIVE_NSEC 489
-#define VAR_USE_SYSTEMD 490
-#define VAR_SHM_ENABLE 491
-#define VAR_SHM_KEY 492
-#define VAR_ROOT_KEY_SENTINEL 493
-#define VAR_DNSCRYPT 494
-#define VAR_DNSCRYPT_ENABLE 495
-#define VAR_DNSCRYPT_PORT 496
-#define VAR_DNSCRYPT_PROVIDER 497
-#define VAR_DNSCRYPT_SECRET_KEY 498
-#define VAR_DNSCRYPT_PROVIDER_CERT 499
-#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501
-#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502
-#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503
-#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504
-#define VAR_IPSECMOD_ENABLED 505
-#define VAR_IPSECMOD_HOOK 506
-#define VAR_IPSECMOD_IGNORE_BOGUS 507
-#define VAR_IPSECMOD_MAX_TTL 508
-#define VAR_IPSECMOD_WHITELIST 509
-#define VAR_IPSECMOD_STRICT 510
-#define VAR_CACHEDB 511
-#define VAR_CACHEDB_BACKEND 512
-#define VAR_CACHEDB_SECRETSEED 513
-#define VAR_CACHEDB_REDISHOST 514
-#define VAR_CACHEDB_REDISPORT 515
-#define VAR_CACHEDB_REDISTIMEOUT 516
-#define VAR_CACHEDB_REDISEXPIRERECORDS 517
-#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518
-#define VAR_FOR_UPSTREAM 519
-#define VAR_AUTH_ZONE 520
-#define VAR_ZONEFILE 521
-#define VAR_MASTER 522
-#define VAR_URL 523
-#define VAR_FOR_DOWNSTREAM 524
-#define VAR_FALLBACK_ENABLED 525
-#define VAR_TLS_ADDITIONAL_PORT 526
-#define VAR_LOW_RTT 527
-#define VAR_LOW_RTT_PERMIL 528
-#define VAR_FAST_SERVER_PERMIL 529
-#define VAR_FAST_SERVER_NUM 530
-#define VAR_ALLOW_NOTIFY 531
-#define VAR_TLS_WIN_CERT 532
-#define VAR_TCP_CONNECTION_LIMIT 533
-#define VAR_FORWARD_NO_CACHE 534
-#define VAR_STUB_NO_CACHE 535
-#define VAR_LOG_SERVFAIL 536
-#define VAR_DENY_ANY 537
-#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538
-#define VAR_LOG_TAG_QUERYREPLY 539
-#define VAR_STREAM_WAIT_SIZE 540
-#define VAR_TLS_CIPHERS 541
-#define VAR_TLS_CIPHERSUITES 542
-#define VAR_TLS_USE_SNI 543
-#define VAR_IPSET 544
-#define VAR_IPSET_NAME_V4 545
-#define VAR_IPSET_NAME_V6 546
-#define VAR_TLS_SESSION_TICKET_KEYS 547
-#define VAR_RPZ 548
-#define VAR_TAGS 549
-#define VAR_RPZ_ACTION_OVERRIDE 550
-#define VAR_RPZ_CNAME_OVERRIDE 551
-#define VAR_RPZ_LOG 552
-#define VAR_RPZ_LOG_NAME 553
-#define VAR_DYNLIB 554
-#define VAR_DYNLIB_FILE 555
-#define VAR_EDNS_CLIENT_STRING 556
-#define VAR_EDNS_CLIENT_STRING_OPCODE 557
-
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-union YYSTYPE
+#include "configparser.h"
+/* Symbol kind.  */
+enum yysymbol_kind_t
 {
-#line 66 "./util/configparser.y"
-
-	char*	str;
-
-#line 750 "util/configparser.c"
-
+  YYSYMBOL_YYEMPTY = -2,
+  YYSYMBOL_YYEOF = 0,                      /* "end of file"  */
+  YYSYMBOL_YYerror = 1,                    /* error  */
+  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
+  YYSYMBOL_SPACE = 3,                      /* SPACE  */
+  YYSYMBOL_LETTER = 4,                     /* LETTER  */
+  YYSYMBOL_NEWLINE = 5,                    /* NEWLINE  */
+  YYSYMBOL_COMMENT = 6,                    /* COMMENT  */
+  YYSYMBOL_COLON = 7,                      /* COLON  */
+  YYSYMBOL_ANY = 8,                        /* ANY  */
+  YYSYMBOL_ZONESTR = 9,                    /* ZONESTR  */
+  YYSYMBOL_STRING_ARG = 10,                /* STRING_ARG  */
+  YYSYMBOL_VAR_FORCE_TOPLEVEL = 11,        /* VAR_FORCE_TOPLEVEL  */
+  YYSYMBOL_VAR_SERVER = 12,                /* VAR_SERVER  */
+  YYSYMBOL_VAR_VERBOSITY = 13,             /* VAR_VERBOSITY  */
+  YYSYMBOL_VAR_NUM_THREADS = 14,           /* VAR_NUM_THREADS  */
+  YYSYMBOL_VAR_PORT = 15,                  /* VAR_PORT  */
+  YYSYMBOL_VAR_OUTGOING_RANGE = 16,        /* VAR_OUTGOING_RANGE  */
+  YYSYMBOL_VAR_INTERFACE = 17,             /* VAR_INTERFACE  */
+  YYSYMBOL_VAR_PREFER_IP4 = 18,            /* VAR_PREFER_IP4  */
+  YYSYMBOL_VAR_DO_IP4 = 19,                /* VAR_DO_IP4  */
+  YYSYMBOL_VAR_DO_IP6 = 20,                /* VAR_DO_IP6  */
+  YYSYMBOL_VAR_PREFER_IP6 = 21,            /* VAR_PREFER_IP6  */
+  YYSYMBOL_VAR_DO_UDP = 22,                /* VAR_DO_UDP  */
+  YYSYMBOL_VAR_DO_TCP = 23,                /* VAR_DO_TCP  */
+  YYSYMBOL_VAR_TCP_MSS = 24,               /* VAR_TCP_MSS  */
+  YYSYMBOL_VAR_OUTGOING_TCP_MSS = 25,      /* VAR_OUTGOING_TCP_MSS  */
+  YYSYMBOL_VAR_TCP_IDLE_TIMEOUT = 26,      /* VAR_TCP_IDLE_TIMEOUT  */
+  YYSYMBOL_VAR_EDNS_TCP_KEEPALIVE = 27,    /* VAR_EDNS_TCP_KEEPALIVE  */
+  YYSYMBOL_VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 28, /* VAR_EDNS_TCP_KEEPALIVE_TIMEOUT  */
+  YYSYMBOL_VAR_CHROOT = 29,                /* VAR_CHROOT  */
+  YYSYMBOL_VAR_USERNAME = 30,              /* VAR_USERNAME  */
+  YYSYMBOL_VAR_DIRECTORY = 31,             /* VAR_DIRECTORY  */
+  YYSYMBOL_VAR_LOGFILE = 32,               /* VAR_LOGFILE  */
+  YYSYMBOL_VAR_PIDFILE = 33,               /* VAR_PIDFILE  */
+  YYSYMBOL_VAR_MSG_CACHE_SIZE = 34,        /* VAR_MSG_CACHE_SIZE  */
+  YYSYMBOL_VAR_MSG_CACHE_SLABS = 35,       /* VAR_MSG_CACHE_SLABS  */
+  YYSYMBOL_VAR_NUM_QUERIES_PER_THREAD = 36, /* VAR_NUM_QUERIES_PER_THREAD  */
+  YYSYMBOL_VAR_RRSET_CACHE_SIZE = 37,      /* VAR_RRSET_CACHE_SIZE  */
+  YYSYMBOL_VAR_RRSET_CACHE_SLABS = 38,     /* VAR_RRSET_CACHE_SLABS  */
+  YYSYMBOL_VAR_OUTGOING_NUM_TCP = 39,      /* VAR_OUTGOING_NUM_TCP  */
+  YYSYMBOL_VAR_INFRA_HOST_TTL = 40,        /* VAR_INFRA_HOST_TTL  */
+  YYSYMBOL_VAR_INFRA_LAME_TTL = 41,        /* VAR_INFRA_LAME_TTL  */
+  YYSYMBOL_VAR_INFRA_CACHE_SLABS = 42,     /* VAR_INFRA_CACHE_SLABS  */
+  YYSYMBOL_VAR_INFRA_CACHE_NUMHOSTS = 43,  /* VAR_INFRA_CACHE_NUMHOSTS  */
+  YYSYMBOL_VAR_INFRA_CACHE_LAME_SIZE = 44, /* VAR_INFRA_CACHE_LAME_SIZE  */
+  YYSYMBOL_VAR_NAME = 45,                  /* VAR_NAME  */
+  YYSYMBOL_VAR_STUB_ZONE = 46,             /* VAR_STUB_ZONE  */
+  YYSYMBOL_VAR_STUB_HOST = 47,             /* VAR_STUB_HOST  */
+  YYSYMBOL_VAR_STUB_ADDR = 48,             /* VAR_STUB_ADDR  */
+  YYSYMBOL_VAR_TARGET_FETCH_POLICY = 49,   /* VAR_TARGET_FETCH_POLICY  */
+  YYSYMBOL_VAR_HARDEN_SHORT_BUFSIZE = 50,  /* VAR_HARDEN_SHORT_BUFSIZE  */
+  YYSYMBOL_VAR_HARDEN_LARGE_QUERIES = 51,  /* VAR_HARDEN_LARGE_QUERIES  */
+  YYSYMBOL_VAR_FORWARD_ZONE = 52,          /* VAR_FORWARD_ZONE  */
+  YYSYMBOL_VAR_FORWARD_HOST = 53,          /* VAR_FORWARD_HOST  */
+  YYSYMBOL_VAR_FORWARD_ADDR = 54,          /* VAR_FORWARD_ADDR  */
+  YYSYMBOL_VAR_DO_NOT_QUERY_ADDRESS = 55,  /* VAR_DO_NOT_QUERY_ADDRESS  */
+  YYSYMBOL_VAR_HIDE_IDENTITY = 56,         /* VAR_HIDE_IDENTITY  */
+  YYSYMBOL_VAR_HIDE_VERSION = 57,          /* VAR_HIDE_VERSION  */
+  YYSYMBOL_VAR_IDENTITY = 58,              /* VAR_IDENTITY  */
+  YYSYMBOL_VAR_VERSION = 59,               /* VAR_VERSION  */
+  YYSYMBOL_VAR_HARDEN_GLUE = 60,           /* VAR_HARDEN_GLUE  */
+  YYSYMBOL_VAR_MODULE_CONF = 61,           /* VAR_MODULE_CONF  */
+  YYSYMBOL_VAR_TRUST_ANCHOR_FILE = 62,     /* VAR_TRUST_ANCHOR_FILE  */
+  YYSYMBOL_VAR_TRUST_ANCHOR = 63,          /* VAR_TRUST_ANCHOR  */
+  YYSYMBOL_VAR_VAL_OVERRIDE_DATE = 64,     /* VAR_VAL_OVERRIDE_DATE  */
+  YYSYMBOL_VAR_BOGUS_TTL = 65,             /* VAR_BOGUS_TTL  */
+  YYSYMBOL_VAR_VAL_CLEAN_ADDITIONAL = 66,  /* VAR_VAL_CLEAN_ADDITIONAL  */
+  YYSYMBOL_VAR_VAL_PERMISSIVE_MODE = 67,   /* VAR_VAL_PERMISSIVE_MODE  */
+  YYSYMBOL_VAR_INCOMING_NUM_TCP = 68,      /* VAR_INCOMING_NUM_TCP  */
+  YYSYMBOL_VAR_MSG_BUFFER_SIZE = 69,       /* VAR_MSG_BUFFER_SIZE  */
+  YYSYMBOL_VAR_KEY_CACHE_SIZE = 70,        /* VAR_KEY_CACHE_SIZE  */
+  YYSYMBOL_VAR_KEY_CACHE_SLABS = 71,       /* VAR_KEY_CACHE_SLABS  */
+  YYSYMBOL_VAR_TRUSTED_KEYS_FILE = 72,     /* VAR_TRUSTED_KEYS_FILE  */
+  YYSYMBOL_VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 73, /* VAR_VAL_NSEC3_KEYSIZE_ITERATIONS  */
+  YYSYMBOL_VAR_USE_SYSLOG = 74,            /* VAR_USE_SYSLOG  */
+  YYSYMBOL_VAR_OUTGOING_INTERFACE = 75,    /* VAR_OUTGOING_INTERFACE  */
+  YYSYMBOL_VAR_ROOT_HINTS = 76,            /* VAR_ROOT_HINTS  */
+  YYSYMBOL_VAR_DO_NOT_QUERY_LOCALHOST = 77, /* VAR_DO_NOT_QUERY_LOCALHOST  */
+  YYSYMBOL_VAR_CACHE_MAX_TTL = 78,         /* VAR_CACHE_MAX_TTL  */
+  YYSYMBOL_VAR_HARDEN_DNSSEC_STRIPPED = 79, /* VAR_HARDEN_DNSSEC_STRIPPED  */
+  YYSYMBOL_VAR_ACCESS_CONTROL = 80,        /* VAR_ACCESS_CONTROL  */
+  YYSYMBOL_VAR_LOCAL_ZONE = 81,            /* VAR_LOCAL_ZONE  */
+  YYSYMBOL_VAR_LOCAL_DATA = 82,            /* VAR_LOCAL_DATA  */
+  YYSYMBOL_VAR_INTERFACE_AUTOMATIC = 83,   /* VAR_INTERFACE_AUTOMATIC  */
+  YYSYMBOL_VAR_STATISTICS_INTERVAL = 84,   /* VAR_STATISTICS_INTERVAL  */
+  YYSYMBOL_VAR_DO_DAEMONIZE = 85,          /* VAR_DO_DAEMONIZE  */
+  YYSYMBOL_VAR_USE_CAPS_FOR_ID = 86,       /* VAR_USE_CAPS_FOR_ID  */
+  YYSYMBOL_VAR_STATISTICS_CUMULATIVE = 87, /* VAR_STATISTICS_CUMULATIVE  */
+  YYSYMBOL_VAR_OUTGOING_PORT_PERMIT = 88,  /* VAR_OUTGOING_PORT_PERMIT  */
+  YYSYMBOL_VAR_OUTGOING_PORT_AVOID = 89,   /* VAR_OUTGOING_PORT_AVOID  */
+  YYSYMBOL_VAR_DLV_ANCHOR_FILE = 90,       /* VAR_DLV_ANCHOR_FILE  */
+  YYSYMBOL_VAR_DLV_ANCHOR = 91,            /* VAR_DLV_ANCHOR  */
+  YYSYMBOL_VAR_NEG_CACHE_SIZE = 92,        /* VAR_NEG_CACHE_SIZE  */
+  YYSYMBOL_VAR_HARDEN_REFERRAL_PATH = 93,  /* VAR_HARDEN_REFERRAL_PATH  */
+  YYSYMBOL_VAR_PRIVATE_ADDRESS = 94,       /* VAR_PRIVATE_ADDRESS  */
+  YYSYMBOL_VAR_PRIVATE_DOMAIN = 95,        /* VAR_PRIVATE_DOMAIN  */
+  YYSYMBOL_VAR_REMOTE_CONTROL = 96,        /* VAR_REMOTE_CONTROL  */
+  YYSYMBOL_VAR_CONTROL_ENABLE = 97,        /* VAR_CONTROL_ENABLE  */
+  YYSYMBOL_VAR_CONTROL_INTERFACE = 98,     /* VAR_CONTROL_INTERFACE  */
+  YYSYMBOL_VAR_CONTROL_PORT = 99,          /* VAR_CONTROL_PORT  */
+  YYSYMBOL_VAR_SERVER_KEY_FILE = 100,      /* VAR_SERVER_KEY_FILE  */
+  YYSYMBOL_VAR_SERVER_CERT_FILE = 101,     /* VAR_SERVER_CERT_FILE  */
+  YYSYMBOL_VAR_CONTROL_KEY_FILE = 102,     /* VAR_CONTROL_KEY_FILE  */
+  YYSYMBOL_VAR_CONTROL_CERT_FILE = 103,    /* VAR_CONTROL_CERT_FILE  */
+  YYSYMBOL_VAR_CONTROL_USE_CERT = 104,     /* VAR_CONTROL_USE_CERT  */
+  YYSYMBOL_VAR_EXTENDED_STATISTICS = 105,  /* VAR_EXTENDED_STATISTICS  */
+  YYSYMBOL_VAR_LOCAL_DATA_PTR = 106,       /* VAR_LOCAL_DATA_PTR  */
+  YYSYMBOL_VAR_JOSTLE_TIMEOUT = 107,       /* VAR_JOSTLE_TIMEOUT  */
+  YYSYMBOL_VAR_STUB_PRIME = 108,           /* VAR_STUB_PRIME  */
+  YYSYMBOL_VAR_UNWANTED_REPLY_THRESHOLD = 109, /* VAR_UNWANTED_REPLY_THRESHOLD  */
+  YYSYMBOL_VAR_LOG_TIME_ASCII = 110,       /* VAR_LOG_TIME_ASCII  */
+  YYSYMBOL_VAR_DOMAIN_INSECURE = 111,      /* VAR_DOMAIN_INSECURE  */
+  YYSYMBOL_VAR_PYTHON = 112,               /* VAR_PYTHON  */
+  YYSYMBOL_VAR_PYTHON_SCRIPT = 113,        /* VAR_PYTHON_SCRIPT  */
+  YYSYMBOL_VAR_VAL_SIG_SKEW_MIN = 114,     /* VAR_VAL_SIG_SKEW_MIN  */
+  YYSYMBOL_VAR_VAL_SIG_SKEW_MAX = 115,     /* VAR_VAL_SIG_SKEW_MAX  */
+  YYSYMBOL_VAR_CACHE_MIN_TTL = 116,        /* VAR_CACHE_MIN_TTL  */
+  YYSYMBOL_VAR_VAL_LOG_LEVEL = 117,        /* VAR_VAL_LOG_LEVEL  */
+  YYSYMBOL_VAR_AUTO_TRUST_ANCHOR_FILE = 118, /* VAR_AUTO_TRUST_ANCHOR_FILE  */
+  YYSYMBOL_VAR_KEEP_MISSING = 119,         /* VAR_KEEP_MISSING  */
+  YYSYMBOL_VAR_ADD_HOLDDOWN = 120,         /* VAR_ADD_HOLDDOWN  */
+  YYSYMBOL_VAR_DEL_HOLDDOWN = 121,         /* VAR_DEL_HOLDDOWN  */
+  YYSYMBOL_VAR_SO_RCVBUF = 122,            /* VAR_SO_RCVBUF  */
+  YYSYMBOL_VAR_EDNS_BUFFER_SIZE = 123,     /* VAR_EDNS_BUFFER_SIZE  */
+  YYSYMBOL_VAR_PREFETCH = 124,             /* VAR_PREFETCH  */
+  YYSYMBOL_VAR_PREFETCH_KEY = 125,         /* VAR_PREFETCH_KEY  */
+  YYSYMBOL_VAR_SO_SNDBUF = 126,            /* VAR_SO_SNDBUF  */
+  YYSYMBOL_VAR_SO_REUSEPORT = 127,         /* VAR_SO_REUSEPORT  */
+  YYSYMBOL_VAR_HARDEN_BELOW_NXDOMAIN = 128, /* VAR_HARDEN_BELOW_NXDOMAIN  */
+  YYSYMBOL_VAR_IGNORE_CD_FLAG = 129,       /* VAR_IGNORE_CD_FLAG  */
+  YYSYMBOL_VAR_LOG_QUERIES = 130,          /* VAR_LOG_QUERIES  */
+  YYSYMBOL_VAR_LOG_REPLIES = 131,          /* VAR_LOG_REPLIES  */
+  YYSYMBOL_VAR_LOG_LOCAL_ACTIONS = 132,    /* VAR_LOG_LOCAL_ACTIONS  */
+  YYSYMBOL_VAR_TCP_UPSTREAM = 133,         /* VAR_TCP_UPSTREAM  */
+  YYSYMBOL_VAR_SSL_UPSTREAM = 134,         /* VAR_SSL_UPSTREAM  */
+  YYSYMBOL_VAR_SSL_SERVICE_KEY = 135,      /* VAR_SSL_SERVICE_KEY  */
+  YYSYMBOL_VAR_SSL_SERVICE_PEM = 136,      /* VAR_SSL_SERVICE_PEM  */
+  YYSYMBOL_VAR_SSL_PORT = 137,             /* VAR_SSL_PORT  */
+  YYSYMBOL_VAR_FORWARD_FIRST = 138,        /* VAR_FORWARD_FIRST  */
+  YYSYMBOL_VAR_STUB_SSL_UPSTREAM = 139,    /* VAR_STUB_SSL_UPSTREAM  */
+  YYSYMBOL_VAR_FORWARD_SSL_UPSTREAM = 140, /* VAR_FORWARD_SSL_UPSTREAM  */
+  YYSYMBOL_VAR_TLS_CERT_BUNDLE = 141,      /* VAR_TLS_CERT_BUNDLE  */
+  YYSYMBOL_VAR_HTTPS_PORT = 142,           /* VAR_HTTPS_PORT  */
+  YYSYMBOL_VAR_HTTP_ENDPOINT = 143,        /* VAR_HTTP_ENDPOINT  */
+  YYSYMBOL_VAR_HTTP_MAX_STREAMS = 144,     /* VAR_HTTP_MAX_STREAMS  */
+  YYSYMBOL_VAR_HTTP_QUERY_BUFFER_SIZE = 145, /* VAR_HTTP_QUERY_BUFFER_SIZE  */
+  YYSYMBOL_VAR_HTTP_RESPONSE_BUFFER_SIZE = 146, /* VAR_HTTP_RESPONSE_BUFFER_SIZE  */
+  YYSYMBOL_VAR_HTTP_NODELAY = 147,         /* VAR_HTTP_NODELAY  */
+  YYSYMBOL_VAR_HTTP_NOTLS_DOWNSTREAM = 148, /* VAR_HTTP_NOTLS_DOWNSTREAM  */
+  YYSYMBOL_VAR_STUB_FIRST = 149,           /* VAR_STUB_FIRST  */
+  YYSYMBOL_VAR_MINIMAL_RESPONSES = 150,    /* VAR_MINIMAL_RESPONSES  */
+  YYSYMBOL_VAR_RRSET_ROUNDROBIN = 151,     /* VAR_RRSET_ROUNDROBIN  */
+  YYSYMBOL_VAR_MAX_UDP_SIZE = 152,         /* VAR_MAX_UDP_SIZE  */
+  YYSYMBOL_VAR_DELAY_CLOSE = 153,          /* VAR_DELAY_CLOSE  */
+  YYSYMBOL_VAR_UDP_CONNECT = 154,          /* VAR_UDP_CONNECT  */
+  YYSYMBOL_VAR_UNBLOCK_LAN_ZONES = 155,    /* VAR_UNBLOCK_LAN_ZONES  */
+  YYSYMBOL_VAR_INSECURE_LAN_ZONES = 156,   /* VAR_INSECURE_LAN_ZONES  */
+  YYSYMBOL_VAR_INFRA_CACHE_MIN_RTT = 157,  /* VAR_INFRA_CACHE_MIN_RTT  */
+  YYSYMBOL_VAR_INFRA_KEEP_PROBING = 158,   /* VAR_INFRA_KEEP_PROBING  */
+  YYSYMBOL_VAR_DNS64_PREFIX = 159,         /* VAR_DNS64_PREFIX  */
+  YYSYMBOL_VAR_DNS64_SYNTHALL = 160,       /* VAR_DNS64_SYNTHALL  */
+  YYSYMBOL_VAR_DNS64_IGNORE_AAAA = 161,    /* VAR_DNS64_IGNORE_AAAA  */
+  YYSYMBOL_VAR_DNSTAP = 162,               /* VAR_DNSTAP  */
+  YYSYMBOL_VAR_DNSTAP_ENABLE = 163,        /* VAR_DNSTAP_ENABLE  */
+  YYSYMBOL_VAR_DNSTAP_SOCKET_PATH = 164,   /* VAR_DNSTAP_SOCKET_PATH  */
+  YYSYMBOL_VAR_DNSTAP_IP = 165,            /* VAR_DNSTAP_IP  */
+  YYSYMBOL_VAR_DNSTAP_TLS = 166,           /* VAR_DNSTAP_TLS  */
+  YYSYMBOL_VAR_DNSTAP_TLS_SERVER_NAME = 167, /* VAR_DNSTAP_TLS_SERVER_NAME  */
+  YYSYMBOL_VAR_DNSTAP_TLS_CERT_BUNDLE = 168, /* VAR_DNSTAP_TLS_CERT_BUNDLE  */
+  YYSYMBOL_VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 169, /* VAR_DNSTAP_TLS_CLIENT_KEY_FILE  */
+  YYSYMBOL_VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 170, /* VAR_DNSTAP_TLS_CLIENT_CERT_FILE  */
+  YYSYMBOL_VAR_DNSTAP_SEND_IDENTITY = 171, /* VAR_DNSTAP_SEND_IDENTITY  */
+  YYSYMBOL_VAR_DNSTAP_SEND_VERSION = 172,  /* VAR_DNSTAP_SEND_VERSION  */
+  YYSYMBOL_VAR_DNSTAP_BIDIRECTIONAL = 173, /* VAR_DNSTAP_BIDIRECTIONAL  */
+  YYSYMBOL_VAR_DNSTAP_IDENTITY = 174,      /* VAR_DNSTAP_IDENTITY  */
+  YYSYMBOL_VAR_DNSTAP_VERSION = 175,       /* VAR_DNSTAP_VERSION  */
+  YYSYMBOL_VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 176, /* VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES  */
+  YYSYMBOL_VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 177, /* VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES  */
+  YYSYMBOL_VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 178, /* VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES  */
+  YYSYMBOL_VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 179, /* VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES  */
+  YYSYMBOL_VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 180, /* VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES  */
+  YYSYMBOL_VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 181, /* VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES  */
+  YYSYMBOL_VAR_RESPONSE_IP_TAG = 182,      /* VAR_RESPONSE_IP_TAG  */
+  YYSYMBOL_VAR_RESPONSE_IP = 183,          /* VAR_RESPONSE_IP  */
+  YYSYMBOL_VAR_RESPONSE_IP_DATA = 184,     /* VAR_RESPONSE_IP_DATA  */
+  YYSYMBOL_VAR_HARDEN_ALGO_DOWNGRADE = 185, /* VAR_HARDEN_ALGO_DOWNGRADE  */
+  YYSYMBOL_VAR_IP_TRANSPARENT = 186,       /* VAR_IP_TRANSPARENT  */
+  YYSYMBOL_VAR_IP_DSCP = 187,              /* VAR_IP_DSCP  */
+  YYSYMBOL_VAR_DISABLE_DNSSEC_LAME_CHECK = 188, /* VAR_DISABLE_DNSSEC_LAME_CHECK  */
+  YYSYMBOL_VAR_IP_RATELIMIT = 189,         /* VAR_IP_RATELIMIT  */
+  YYSYMBOL_VAR_IP_RATELIMIT_SLABS = 190,   /* VAR_IP_RATELIMIT_SLABS  */
+  YYSYMBOL_VAR_IP_RATELIMIT_SIZE = 191,    /* VAR_IP_RATELIMIT_SIZE  */
+  YYSYMBOL_VAR_RATELIMIT = 192,            /* VAR_RATELIMIT  */
+  YYSYMBOL_VAR_RATELIMIT_SLABS = 193,      /* VAR_RATELIMIT_SLABS  */
+  YYSYMBOL_VAR_RATELIMIT_SIZE = 194,       /* VAR_RATELIMIT_SIZE  */
+  YYSYMBOL_VAR_RATELIMIT_FOR_DOMAIN = 195, /* VAR_RATELIMIT_FOR_DOMAIN  */
+  YYSYMBOL_VAR_RATELIMIT_BELOW_DOMAIN = 196, /* VAR_RATELIMIT_BELOW_DOMAIN  */
+  YYSYMBOL_VAR_IP_RATELIMIT_FACTOR = 197,  /* VAR_IP_RATELIMIT_FACTOR  */
+  YYSYMBOL_VAR_RATELIMIT_FACTOR = 198,     /* VAR_RATELIMIT_FACTOR  */
+  YYSYMBOL_VAR_SEND_CLIENT_SUBNET = 199,   /* VAR_SEND_CLIENT_SUBNET  */
+  YYSYMBOL_VAR_CLIENT_SUBNET_ZONE = 200,   /* VAR_CLIENT_SUBNET_ZONE  */
+  YYSYMBOL_VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 201, /* VAR_CLIENT_SUBNET_ALWAYS_FORWARD  */
+  YYSYMBOL_VAR_CLIENT_SUBNET_OPCODE = 202, /* VAR_CLIENT_SUBNET_OPCODE  */
+  YYSYMBOL_VAR_MAX_CLIENT_SUBNET_IPV4 = 203, /* VAR_MAX_CLIENT_SUBNET_IPV4  */
+  YYSYMBOL_VAR_MAX_CLIENT_SUBNET_IPV6 = 204, /* VAR_MAX_CLIENT_SUBNET_IPV6  */
+  YYSYMBOL_VAR_MIN_CLIENT_SUBNET_IPV4 = 205, /* VAR_MIN_CLIENT_SUBNET_IPV4  */
+  YYSYMBOL_VAR_MIN_CLIENT_SUBNET_IPV6 = 206, /* VAR_MIN_CLIENT_SUBNET_IPV6  */
+  YYSYMBOL_VAR_MAX_ECS_TREE_SIZE_IPV4 = 207, /* VAR_MAX_ECS_TREE_SIZE_IPV4  */
+  YYSYMBOL_VAR_MAX_ECS_TREE_SIZE_IPV6 = 208, /* VAR_MAX_ECS_TREE_SIZE_IPV6  */
+  YYSYMBOL_VAR_CAPS_WHITELIST = 209,       /* VAR_CAPS_WHITELIST  */
+  YYSYMBOL_VAR_CACHE_MAX_NEGATIVE_TTL = 210, /* VAR_CACHE_MAX_NEGATIVE_TTL  */
+  YYSYMBOL_VAR_PERMIT_SMALL_HOLDDOWN = 211, /* VAR_PERMIT_SMALL_HOLDDOWN  */
+  YYSYMBOL_VAR_QNAME_MINIMISATION = 212,   /* VAR_QNAME_MINIMISATION  */
+  YYSYMBOL_VAR_QNAME_MINIMISATION_STRICT = 213, /* VAR_QNAME_MINIMISATION_STRICT  */
+  YYSYMBOL_VAR_IP_FREEBIND = 214,          /* VAR_IP_FREEBIND  */
+  YYSYMBOL_VAR_DEFINE_TAG = 215,           /* VAR_DEFINE_TAG  */
+  YYSYMBOL_VAR_LOCAL_ZONE_TAG = 216,       /* VAR_LOCAL_ZONE_TAG  */
+  YYSYMBOL_VAR_ACCESS_CONTROL_TAG = 217,   /* VAR_ACCESS_CONTROL_TAG  */
+  YYSYMBOL_VAR_LOCAL_ZONE_OVERRIDE = 218,  /* VAR_LOCAL_ZONE_OVERRIDE  */
+  YYSYMBOL_VAR_ACCESS_CONTROL_TAG_ACTION = 219, /* VAR_ACCESS_CONTROL_TAG_ACTION  */
+  YYSYMBOL_VAR_ACCESS_CONTROL_TAG_DATA = 220, /* VAR_ACCESS_CONTROL_TAG_DATA  */
+  YYSYMBOL_VAR_VIEW = 221,                 /* VAR_VIEW  */
+  YYSYMBOL_VAR_ACCESS_CONTROL_VIEW = 222,  /* VAR_ACCESS_CONTROL_VIEW  */
+  YYSYMBOL_VAR_VIEW_FIRST = 223,           /* VAR_VIEW_FIRST  */
+  YYSYMBOL_VAR_SERVE_EXPIRED = 224,        /* VAR_SERVE_EXPIRED  */
+  YYSYMBOL_VAR_SERVE_EXPIRED_TTL = 225,    /* VAR_SERVE_EXPIRED_TTL  */
+  YYSYMBOL_VAR_SERVE_EXPIRED_TTL_RESET = 226, /* VAR_SERVE_EXPIRED_TTL_RESET  */
+  YYSYMBOL_VAR_SERVE_EXPIRED_REPLY_TTL = 227, /* VAR_SERVE_EXPIRED_REPLY_TTL  */
+  YYSYMBOL_VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 228, /* VAR_SERVE_EXPIRED_CLIENT_TIMEOUT  */
+  YYSYMBOL_VAR_FAKE_DSA = 229,             /* VAR_FAKE_DSA  */
+  YYSYMBOL_VAR_FAKE_SHA1 = 230,            /* VAR_FAKE_SHA1  */
+  YYSYMBOL_VAR_LOG_IDENTITY = 231,         /* VAR_LOG_IDENTITY  */
+  YYSYMBOL_VAR_HIDE_TRUSTANCHOR = 232,     /* VAR_HIDE_TRUSTANCHOR  */
+  YYSYMBOL_VAR_TRUST_ANCHOR_SIGNALING = 233, /* VAR_TRUST_ANCHOR_SIGNALING  */
+  YYSYMBOL_VAR_AGGRESSIVE_NSEC = 234,      /* VAR_AGGRESSIVE_NSEC  */
+  YYSYMBOL_VAR_USE_SYSTEMD = 235,          /* VAR_USE_SYSTEMD  */
+  YYSYMBOL_VAR_SHM_ENABLE = 236,           /* VAR_SHM_ENABLE  */
+  YYSYMBOL_VAR_SHM_KEY = 237,              /* VAR_SHM_KEY  */
+  YYSYMBOL_VAR_ROOT_KEY_SENTINEL = 238,    /* VAR_ROOT_KEY_SENTINEL  */
+  YYSYMBOL_VAR_DNSCRYPT = 239,             /* VAR_DNSCRYPT  */
+  YYSYMBOL_VAR_DNSCRYPT_ENABLE = 240,      /* VAR_DNSCRYPT_ENABLE  */
+  YYSYMBOL_VAR_DNSCRYPT_PORT = 241,        /* VAR_DNSCRYPT_PORT  */
+  YYSYMBOL_VAR_DNSCRYPT_PROVIDER = 242,    /* VAR_DNSCRYPT_PROVIDER  */
+  YYSYMBOL_VAR_DNSCRYPT_SECRET_KEY = 243,  /* VAR_DNSCRYPT_SECRET_KEY  */
+  YYSYMBOL_VAR_DNSCRYPT_PROVIDER_CERT = 244, /* VAR_DNSCRYPT_PROVIDER_CERT  */
+  YYSYMBOL_VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 245, /* VAR_DNSCRYPT_PROVIDER_CERT_ROTATED  */
+  YYSYMBOL_VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 246, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE  */
+  YYSYMBOL_VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 247, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS  */
+  YYSYMBOL_VAR_DNSCRYPT_NONCE_CACHE_SIZE = 248, /* VAR_DNSCRYPT_NONCE_CACHE_SIZE  */
+  YYSYMBOL_VAR_DNSCRYPT_NONCE_CACHE_SLABS = 249, /* VAR_DNSCRYPT_NONCE_CACHE_SLABS  */
+  YYSYMBOL_VAR_IPSECMOD_ENABLED = 250,     /* VAR_IPSECMOD_ENABLED  */
+  YYSYMBOL_VAR_IPSECMOD_HOOK = 251,        /* VAR_IPSECMOD_HOOK  */
+  YYSYMBOL_VAR_IPSECMOD_IGNORE_BOGUS = 252, /* VAR_IPSECMOD_IGNORE_BOGUS  */
+  YYSYMBOL_VAR_IPSECMOD_MAX_TTL = 253,     /* VAR_IPSECMOD_MAX_TTL  */
+  YYSYMBOL_VAR_IPSECMOD_WHITELIST = 254,   /* VAR_IPSECMOD_WHITELIST  */
+  YYSYMBOL_VAR_IPSECMOD_STRICT = 255,      /* VAR_IPSECMOD_STRICT  */
+  YYSYMBOL_VAR_CACHEDB = 256,              /* VAR_CACHEDB  */
+  YYSYMBOL_VAR_CACHEDB_BACKEND = 257,      /* VAR_CACHEDB_BACKEND  */
+  YYSYMBOL_VAR_CACHEDB_SECRETSEED = 258,   /* VAR_CACHEDB_SECRETSEED  */
+  YYSYMBOL_VAR_CACHEDB_REDISHOST = 259,    /* VAR_CACHEDB_REDISHOST  */
+  YYSYMBOL_VAR_CACHEDB_REDISPORT = 260,    /* VAR_CACHEDB_REDISPORT  */
+  YYSYMBOL_VAR_CACHEDB_REDISTIMEOUT = 261, /* VAR_CACHEDB_REDISTIMEOUT  */
+  YYSYMBOL_VAR_CACHEDB_REDISEXPIRERECORDS = 262, /* VAR_CACHEDB_REDISEXPIRERECORDS  */
+  YYSYMBOL_VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 263, /* VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM  */
+  YYSYMBOL_VAR_FOR_UPSTREAM = 264,         /* VAR_FOR_UPSTREAM  */
+  YYSYMBOL_VAR_AUTH_ZONE = 265,            /* VAR_AUTH_ZONE  */
+  YYSYMBOL_VAR_ZONEFILE = 266,             /* VAR_ZONEFILE  */
+  YYSYMBOL_VAR_MASTER = 267,               /* VAR_MASTER  */
+  YYSYMBOL_VAR_URL = 268,                  /* VAR_URL  */
+  YYSYMBOL_VAR_FOR_DOWNSTREAM = 269,       /* VAR_FOR_DOWNSTREAM  */
+  YYSYMBOL_VAR_FALLBACK_ENABLED = 270,     /* VAR_FALLBACK_ENABLED  */
+  YYSYMBOL_VAR_TLS_ADDITIONAL_PORT = 271,  /* VAR_TLS_ADDITIONAL_PORT  */
+  YYSYMBOL_VAR_LOW_RTT = 272,              /* VAR_LOW_RTT  */
+  YYSYMBOL_VAR_LOW_RTT_PERMIL = 273,       /* VAR_LOW_RTT_PERMIL  */
+  YYSYMBOL_VAR_FAST_SERVER_PERMIL = 274,   /* VAR_FAST_SERVER_PERMIL  */
+  YYSYMBOL_VAR_FAST_SERVER_NUM = 275,      /* VAR_FAST_SERVER_NUM  */
+  YYSYMBOL_VAR_ALLOW_NOTIFY = 276,         /* VAR_ALLOW_NOTIFY  */
+  YYSYMBOL_VAR_TLS_WIN_CERT = 277,         /* VAR_TLS_WIN_CERT  */
+  YYSYMBOL_VAR_TCP_CONNECTION_LIMIT = 278, /* VAR_TCP_CONNECTION_LIMIT  */
+  YYSYMBOL_VAR_FORWARD_NO_CACHE = 279,     /* VAR_FORWARD_NO_CACHE  */
+  YYSYMBOL_VAR_STUB_NO_CACHE = 280,        /* VAR_STUB_NO_CACHE  */
+  YYSYMBOL_VAR_LOG_SERVFAIL = 281,         /* VAR_LOG_SERVFAIL  */
+  YYSYMBOL_VAR_DENY_ANY = 282,             /* VAR_DENY_ANY  */
+  YYSYMBOL_VAR_UNKNOWN_SERVER_TIME_LIMIT = 283, /* VAR_UNKNOWN_SERVER_TIME_LIMIT  */
+  YYSYMBOL_VAR_LOG_TAG_QUERYREPLY = 284,   /* VAR_LOG_TAG_QUERYREPLY  */
+  YYSYMBOL_VAR_STREAM_WAIT_SIZE = 285,     /* VAR_STREAM_WAIT_SIZE  */
+  YYSYMBOL_VAR_TLS_CIPHERS = 286,          /* VAR_TLS_CIPHERS  */
+  YYSYMBOL_VAR_TLS_CIPHERSUITES = 287,     /* VAR_TLS_CIPHERSUITES  */
+  YYSYMBOL_VAR_TLS_USE_SNI = 288,          /* VAR_TLS_USE_SNI  */
+  YYSYMBOL_VAR_IPSET = 289,                /* VAR_IPSET  */
+  YYSYMBOL_VAR_IPSET_NAME_V4 = 290,        /* VAR_IPSET_NAME_V4  */
+  YYSYMBOL_VAR_IPSET_NAME_V6 = 291,        /* VAR_IPSET_NAME_V6  */
+  YYSYMBOL_VAR_TLS_SESSION_TICKET_KEYS = 292, /* VAR_TLS_SESSION_TICKET_KEYS  */
+  YYSYMBOL_VAR_RPZ = 293,                  /* VAR_RPZ  */
+  YYSYMBOL_VAR_TAGS = 294,                 /* VAR_TAGS  */
+  YYSYMBOL_VAR_RPZ_ACTION_OVERRIDE = 295,  /* VAR_RPZ_ACTION_OVERRIDE  */
+  YYSYMBOL_VAR_RPZ_CNAME_OVERRIDE = 296,   /* VAR_RPZ_CNAME_OVERRIDE  */
+  YYSYMBOL_VAR_RPZ_LOG = 297,              /* VAR_RPZ_LOG  */
+  YYSYMBOL_VAR_RPZ_LOG_NAME = 298,         /* VAR_RPZ_LOG_NAME  */
+  YYSYMBOL_VAR_DYNLIB = 299,               /* VAR_DYNLIB  */
+  YYSYMBOL_VAR_DYNLIB_FILE = 300,          /* VAR_DYNLIB_FILE  */
+  YYSYMBOL_VAR_EDNS_CLIENT_STRING = 301,   /* VAR_EDNS_CLIENT_STRING  */
+  YYSYMBOL_VAR_EDNS_CLIENT_STRING_OPCODE = 302, /* VAR_EDNS_CLIENT_STRING_OPCODE  */
+  YYSYMBOL_VAR_NSID = 303,                 /* VAR_NSID  */
+  YYSYMBOL_YYACCEPT = 304,                 /* $accept  */
+  YYSYMBOL_toplevelvars = 305,             /* toplevelvars  */
+  YYSYMBOL_toplevelvar = 306,              /* toplevelvar  */
+  YYSYMBOL_force_toplevel = 307,           /* force_toplevel  */
+  YYSYMBOL_serverstart = 308,              /* serverstart  */
+  YYSYMBOL_contents_server = 309,          /* contents_server  */
+  YYSYMBOL_content_server = 310,           /* content_server  */
+  YYSYMBOL_stubstart = 311,                /* stubstart  */
+  YYSYMBOL_contents_stub = 312,            /* contents_stub  */
+  YYSYMBOL_content_stub = 313,             /* content_stub  */
+  YYSYMBOL_forwardstart = 314,             /* forwardstart  */
+  YYSYMBOL_contents_forward = 315,         /* contents_forward  */
+  YYSYMBOL_content_forward = 316,          /* content_forward  */
+  YYSYMBOL_viewstart = 317,                /* viewstart  */
+  YYSYMBOL_contents_view = 318,            /* contents_view  */
+  YYSYMBOL_content_view = 319,             /* content_view  */
+  YYSYMBOL_authstart = 320,                /* authstart  */
+  YYSYMBOL_contents_auth = 321,            /* contents_auth  */
+  YYSYMBOL_content_auth = 322,             /* content_auth  */
+  YYSYMBOL_rpz_tag = 323,                  /* rpz_tag  */
+  YYSYMBOL_rpz_action_override = 324,      /* rpz_action_override  */
+  YYSYMBOL_rpz_cname_override = 325,       /* rpz_cname_override  */
+  YYSYMBOL_rpz_log = 326,                  /* rpz_log  */
+  YYSYMBOL_rpz_log_name = 327,             /* rpz_log_name  */
+  YYSYMBOL_rpzstart = 328,                 /* rpzstart  */
+  YYSYMBOL_contents_rpz = 329,             /* contents_rpz  */
+  YYSYMBOL_content_rpz = 330,              /* content_rpz  */
+  YYSYMBOL_server_num_threads = 331,       /* server_num_threads  */
+  YYSYMBOL_server_verbosity = 332,         /* server_verbosity  */
+  YYSYMBOL_server_statistics_interval = 333, /* server_statistics_interval  */
+  YYSYMBOL_server_statistics_cumulative = 334, /* server_statistics_cumulative  */
+  YYSYMBOL_server_extended_statistics = 335, /* server_extended_statistics  */
+  YYSYMBOL_server_shm_enable = 336,        /* server_shm_enable  */
+  YYSYMBOL_server_shm_key = 337,           /* server_shm_key  */
+  YYSYMBOL_server_port = 338,              /* server_port  */
+  YYSYMBOL_server_send_client_subnet = 339, /* server_send_client_subnet  */
+  YYSYMBOL_server_client_subnet_zone = 340, /* server_client_subnet_zone  */
+  YYSYMBOL_server_client_subnet_always_forward = 341, /* server_client_subnet_always_forward  */
+  YYSYMBOL_server_client_subnet_opcode = 342, /* server_client_subnet_opcode  */
+  YYSYMBOL_server_max_client_subnet_ipv4 = 343, /* server_max_client_subnet_ipv4  */
+  YYSYMBOL_server_max_client_subnet_ipv6 = 344, /* server_max_client_subnet_ipv6  */
+  YYSYMBOL_server_min_client_subnet_ipv4 = 345, /* server_min_client_subnet_ipv4  */
+  YYSYMBOL_server_min_client_subnet_ipv6 = 346, /* server_min_client_subnet_ipv6  */
+  YYSYMBOL_server_max_ecs_tree_size_ipv4 = 347, /* server_max_ecs_tree_size_ipv4  */
+  YYSYMBOL_server_max_ecs_tree_size_ipv6 = 348, /* server_max_ecs_tree_size_ipv6  */
+  YYSYMBOL_server_interface = 349,         /* server_interface  */
+  YYSYMBOL_server_outgoing_interface = 350, /* server_outgoing_interface  */
+  YYSYMBOL_server_outgoing_range = 351,    /* server_outgoing_range  */
+  YYSYMBOL_server_outgoing_port_permit = 352, /* server_outgoing_port_permit  */
+  YYSYMBOL_server_outgoing_port_avoid = 353, /* server_outgoing_port_avoid  */
+  YYSYMBOL_server_outgoing_num_tcp = 354,  /* server_outgoing_num_tcp  */
+  YYSYMBOL_server_incoming_num_tcp = 355,  /* server_incoming_num_tcp  */
+  YYSYMBOL_server_interface_automatic = 356, /* server_interface_automatic  */
+  YYSYMBOL_server_do_ip4 = 357,            /* server_do_ip4  */
+  YYSYMBOL_server_do_ip6 = 358,            /* server_do_ip6  */
+  YYSYMBOL_server_do_udp = 359,            /* server_do_udp  */
+  YYSYMBOL_server_do_tcp = 360,            /* server_do_tcp  */
+  YYSYMBOL_server_prefer_ip4 = 361,        /* server_prefer_ip4  */
+  YYSYMBOL_server_prefer_ip6 = 362,        /* server_prefer_ip6  */
+  YYSYMBOL_server_tcp_mss = 363,           /* server_tcp_mss  */
+  YYSYMBOL_server_outgoing_tcp_mss = 364,  /* server_outgoing_tcp_mss  */
+  YYSYMBOL_server_tcp_idle_timeout = 365,  /* server_tcp_idle_timeout  */
+  YYSYMBOL_server_tcp_keepalive = 366,     /* server_tcp_keepalive  */
+  YYSYMBOL_server_tcp_keepalive_timeout = 367, /* server_tcp_keepalive_timeout  */
+  YYSYMBOL_server_tcp_upstream = 368,      /* server_tcp_upstream  */
+  YYSYMBOL_server_udp_upstream_without_downstream = 369, /* server_udp_upstream_without_downstream  */
+  YYSYMBOL_server_ssl_upstream = 370,      /* server_ssl_upstream  */
+  YYSYMBOL_server_ssl_service_key = 371,   /* server_ssl_service_key  */
+  YYSYMBOL_server_ssl_service_pem = 372,   /* server_ssl_service_pem  */
+  YYSYMBOL_server_ssl_port = 373,          /* server_ssl_port  */
+  YYSYMBOL_server_tls_cert_bundle = 374,   /* server_tls_cert_bundle  */
+  YYSYMBOL_server_tls_win_cert = 375,      /* server_tls_win_cert  */
+  YYSYMBOL_server_tls_additional_port = 376, /* server_tls_additional_port  */
+  YYSYMBOL_server_tls_ciphers = 377,       /* server_tls_ciphers  */
+  YYSYMBOL_server_tls_ciphersuites = 378,  /* server_tls_ciphersuites  */
+  YYSYMBOL_server_tls_session_ticket_keys = 379, /* server_tls_session_ticket_keys  */
+  YYSYMBOL_server_tls_use_sni = 380,       /* server_tls_use_sni  */
+  YYSYMBOL_server_https_port = 381,        /* server_https_port  */
+  YYSYMBOL_server_http_endpoint = 382,     /* server_http_endpoint  */
+  YYSYMBOL_server_http_max_streams = 383,  /* server_http_max_streams  */
+  YYSYMBOL_server_http_query_buffer_size = 384, /* server_http_query_buffer_size  */
+  YYSYMBOL_server_http_response_buffer_size = 385, /* server_http_response_buffer_size  */
+  YYSYMBOL_server_http_nodelay = 386,      /* server_http_nodelay  */
+  YYSYMBOL_server_http_notls_downstream = 387, /* server_http_notls_downstream  */
+  YYSYMBOL_server_use_systemd = 388,       /* server_use_systemd  */
+  YYSYMBOL_server_do_daemonize = 389,      /* server_do_daemonize  */
+  YYSYMBOL_server_use_syslog = 390,        /* server_use_syslog  */
+  YYSYMBOL_server_log_time_ascii = 391,    /* server_log_time_ascii  */
+  YYSYMBOL_server_log_queries = 392,       /* server_log_queries  */
+  YYSYMBOL_server_log_replies = 393,       /* server_log_replies  */
+  YYSYMBOL_server_log_tag_queryreply = 394, /* server_log_tag_queryreply  */
+  YYSYMBOL_server_log_servfail = 395,      /* server_log_servfail  */
+  YYSYMBOL_server_log_local_actions = 396, /* server_log_local_actions  */
+  YYSYMBOL_server_chroot = 397,            /* server_chroot  */
+  YYSYMBOL_server_username = 398,          /* server_username  */
+  YYSYMBOL_server_directory = 399,         /* server_directory  */
+  YYSYMBOL_server_logfile = 400,           /* server_logfile  */
+  YYSYMBOL_server_pidfile = 401,           /* server_pidfile  */
+  YYSYMBOL_server_root_hints = 402,        /* server_root_hints  */
+  YYSYMBOL_server_dlv_anchor_file = 403,   /* server_dlv_anchor_file  */
+  YYSYMBOL_server_dlv_anchor = 404,        /* server_dlv_anchor  */
+  YYSYMBOL_server_auto_trust_anchor_file = 405, /* server_auto_trust_anchor_file  */
+  YYSYMBOL_server_trust_anchor_file = 406, /* server_trust_anchor_file  */
+  YYSYMBOL_server_trusted_keys_file = 407, /* server_trusted_keys_file  */
+  YYSYMBOL_server_trust_anchor = 408,      /* server_trust_anchor  */
+  YYSYMBOL_server_trust_anchor_signaling = 409, /* server_trust_anchor_signaling  */
+  YYSYMBOL_server_root_key_sentinel = 410, /* server_root_key_sentinel  */
+  YYSYMBOL_server_domain_insecure = 411,   /* server_domain_insecure  */
+  YYSYMBOL_server_hide_identity = 412,     /* server_hide_identity  */
+  YYSYMBOL_server_hide_version = 413,      /* server_hide_version  */
+  YYSYMBOL_server_hide_trustanchor = 414,  /* server_hide_trustanchor  */
+  YYSYMBOL_server_identity = 415,          /* server_identity  */
+  YYSYMBOL_server_version = 416,           /* server_version  */
+  YYSYMBOL_server_nsid = 417,              /* server_nsid  */
+  YYSYMBOL_server_so_rcvbuf = 418,         /* server_so_rcvbuf  */
+  YYSYMBOL_server_so_sndbuf = 419,         /* server_so_sndbuf  */
+  YYSYMBOL_server_so_reuseport = 420,      /* server_so_reuseport  */
+  YYSYMBOL_server_ip_transparent = 421,    /* server_ip_transparent  */
+  YYSYMBOL_server_ip_freebind = 422,       /* server_ip_freebind  */
+  YYSYMBOL_server_ip_dscp = 423,           /* server_ip_dscp  */
+  YYSYMBOL_server_stream_wait_size = 424,  /* server_stream_wait_size  */
+  YYSYMBOL_server_edns_buffer_size = 425,  /* server_edns_buffer_size  */
+  YYSYMBOL_server_msg_buffer_size = 426,   /* server_msg_buffer_size  */
+  YYSYMBOL_server_msg_cache_size = 427,    /* server_msg_cache_size  */
+  YYSYMBOL_server_msg_cache_slabs = 428,   /* server_msg_cache_slabs  */
+  YYSYMBOL_server_num_queries_per_thread = 429, /* server_num_queries_per_thread  */
+  YYSYMBOL_server_jostle_timeout = 430,    /* server_jostle_timeout  */
+  YYSYMBOL_server_delay_close = 431,       /* server_delay_close  */
+  YYSYMBOL_server_udp_connect = 432,       /* server_udp_connect  */
+  YYSYMBOL_server_unblock_lan_zones = 433, /* server_unblock_lan_zones  */
+  YYSYMBOL_server_insecure_lan_zones = 434, /* server_insecure_lan_zones  */
+  YYSYMBOL_server_rrset_cache_size = 435,  /* server_rrset_cache_size  */
+  YYSYMBOL_server_rrset_cache_slabs = 436, /* server_rrset_cache_slabs  */
+  YYSYMBOL_server_infra_host_ttl = 437,    /* server_infra_host_ttl  */
+  YYSYMBOL_server_infra_lame_ttl = 438,    /* server_infra_lame_ttl  */
+  YYSYMBOL_server_infra_cache_numhosts = 439, /* server_infra_cache_numhosts  */
+  YYSYMBOL_server_infra_cache_lame_size = 440, /* server_infra_cache_lame_size  */
+  YYSYMBOL_server_infra_cache_slabs = 441, /* server_infra_cache_slabs  */
+  YYSYMBOL_server_infra_cache_min_rtt = 442, /* server_infra_cache_min_rtt  */
+  YYSYMBOL_server_infra_keep_probing = 443, /* server_infra_keep_probing  */
+  YYSYMBOL_server_target_fetch_policy = 444, /* server_target_fetch_policy  */
+  YYSYMBOL_server_harden_short_bufsize = 445, /* server_harden_short_bufsize  */
+  YYSYMBOL_server_harden_large_queries = 446, /* server_harden_large_queries  */
+  YYSYMBOL_server_harden_glue = 447,       /* server_harden_glue  */
+  YYSYMBOL_server_harden_dnssec_stripped = 448, /* server_harden_dnssec_stripped  */
+  YYSYMBOL_server_harden_below_nxdomain = 449, /* server_harden_below_nxdomain  */
+  YYSYMBOL_server_harden_referral_path = 450, /* server_harden_referral_path  */
+  YYSYMBOL_server_harden_algo_downgrade = 451, /* server_harden_algo_downgrade  */
+  YYSYMBOL_server_use_caps_for_id = 452,   /* server_use_caps_for_id  */
+  YYSYMBOL_server_caps_whitelist = 453,    /* server_caps_whitelist  */
+  YYSYMBOL_server_private_address = 454,   /* server_private_address  */
+  YYSYMBOL_server_private_domain = 455,    /* server_private_domain  */
+  YYSYMBOL_server_prefetch = 456,          /* server_prefetch  */
+  YYSYMBOL_server_prefetch_key = 457,      /* server_prefetch_key  */
+  YYSYMBOL_server_deny_any = 458,          /* server_deny_any  */
+  YYSYMBOL_server_unwanted_reply_threshold = 459, /* server_unwanted_reply_threshold  */
+  YYSYMBOL_server_do_not_query_address = 460, /* server_do_not_query_address  */
+  YYSYMBOL_server_do_not_query_localhost = 461, /* server_do_not_query_localhost  */
+  YYSYMBOL_server_access_control = 462,    /* server_access_control  */
+  YYSYMBOL_server_module_conf = 463,       /* server_module_conf  */
+  YYSYMBOL_server_val_override_date = 464, /* server_val_override_date  */
+  YYSYMBOL_server_val_sig_skew_min = 465,  /* server_val_sig_skew_min  */
+  YYSYMBOL_server_val_sig_skew_max = 466,  /* server_val_sig_skew_max  */
+  YYSYMBOL_server_cache_max_ttl = 467,     /* server_cache_max_ttl  */
+  YYSYMBOL_server_cache_max_negative_ttl = 468, /* server_cache_max_negative_ttl  */
+  YYSYMBOL_server_cache_min_ttl = 469,     /* server_cache_min_ttl  */
+  YYSYMBOL_server_bogus_ttl = 470,         /* server_bogus_ttl  */
+  YYSYMBOL_server_val_clean_additional = 471, /* server_val_clean_additional  */
+  YYSYMBOL_server_val_permissive_mode = 472, /* server_val_permissive_mode  */
+  YYSYMBOL_server_aggressive_nsec = 473,   /* server_aggressive_nsec  */
+  YYSYMBOL_server_ignore_cd_flag = 474,    /* server_ignore_cd_flag  */
+  YYSYMBOL_server_serve_expired = 475,     /* server_serve_expired  */
+  YYSYMBOL_server_serve_expired_ttl = 476, /* server_serve_expired_ttl  */
+  YYSYMBOL_server_serve_expired_ttl_reset = 477, /* server_serve_expired_ttl_reset  */
+  YYSYMBOL_server_serve_expired_reply_ttl = 478, /* server_serve_expired_reply_ttl  */
+  YYSYMBOL_server_serve_expired_client_timeout = 479, /* server_serve_expired_client_timeout  */
+  YYSYMBOL_server_fake_dsa = 480,          /* server_fake_dsa  */
+  YYSYMBOL_server_fake_sha1 = 481,         /* server_fake_sha1  */
+  YYSYMBOL_server_val_log_level = 482,     /* server_val_log_level  */
+  YYSYMBOL_server_val_nsec3_keysize_iterations = 483, /* server_val_nsec3_keysize_iterations  */
+  YYSYMBOL_server_add_holddown = 484,      /* server_add_holddown  */
+  YYSYMBOL_server_del_holddown = 485,      /* server_del_holddown  */
+  YYSYMBOL_server_keep_missing = 486,      /* server_keep_missing  */
+  YYSYMBOL_server_permit_small_holddown = 487, /* server_permit_small_holddown  */
+  YYSYMBOL_server_key_cache_size = 488,    /* server_key_cache_size  */
+  YYSYMBOL_server_key_cache_slabs = 489,   /* server_key_cache_slabs  */
+  YYSYMBOL_server_neg_cache_size = 490,    /* server_neg_cache_size  */
+  YYSYMBOL_server_local_zone = 491,        /* server_local_zone  */
+  YYSYMBOL_server_local_data = 492,        /* server_local_data  */
+  YYSYMBOL_server_local_data_ptr = 493,    /* server_local_data_ptr  */
+  YYSYMBOL_server_minimal_responses = 494, /* server_minimal_responses  */
+  YYSYMBOL_server_rrset_roundrobin = 495,  /* server_rrset_roundrobin  */
+  YYSYMBOL_server_unknown_server_time_limit = 496, /* server_unknown_server_time_limit  */
+  YYSYMBOL_server_max_udp_size = 497,      /* server_max_udp_size  */
+  YYSYMBOL_server_dns64_prefix = 498,      /* server_dns64_prefix  */
+  YYSYMBOL_server_dns64_synthall = 499,    /* server_dns64_synthall  */
+  YYSYMBOL_server_dns64_ignore_aaaa = 500, /* server_dns64_ignore_aaaa  */
+  YYSYMBOL_server_define_tag = 501,        /* server_define_tag  */
+  YYSYMBOL_server_local_zone_tag = 502,    /* server_local_zone_tag  */
+  YYSYMBOL_server_access_control_tag = 503, /* server_access_control_tag  */
+  YYSYMBOL_server_access_control_tag_action = 504, /* server_access_control_tag_action  */
+  YYSYMBOL_server_access_control_tag_data = 505, /* server_access_control_tag_data  */
+  YYSYMBOL_server_local_zone_override = 506, /* server_local_zone_override  */
+  YYSYMBOL_server_access_control_view = 507, /* server_access_control_view  */
+  YYSYMBOL_server_response_ip_tag = 508,   /* server_response_ip_tag  */
+  YYSYMBOL_server_ip_ratelimit = 509,      /* server_ip_ratelimit  */
+  YYSYMBOL_server_ratelimit = 510,         /* server_ratelimit  */
+  YYSYMBOL_server_ip_ratelimit_size = 511, /* server_ip_ratelimit_size  */
+  YYSYMBOL_server_ratelimit_size = 512,    /* server_ratelimit_size  */
+  YYSYMBOL_server_ip_ratelimit_slabs = 513, /* server_ip_ratelimit_slabs  */
+  YYSYMBOL_server_ratelimit_slabs = 514,   /* server_ratelimit_slabs  */
+  YYSYMBOL_server_ratelimit_for_domain = 515, /* server_ratelimit_for_domain  */
+  YYSYMBOL_server_ratelimit_below_domain = 516, /* server_ratelimit_below_domain  */
+  YYSYMBOL_server_ip_ratelimit_factor = 517, /* server_ip_ratelimit_factor  */
+  YYSYMBOL_server_ratelimit_factor = 518,  /* server_ratelimit_factor  */
+  YYSYMBOL_server_low_rtt = 519,           /* server_low_rtt  */
+  YYSYMBOL_server_fast_server_num = 520,   /* server_fast_server_num  */
+  YYSYMBOL_server_fast_server_permil = 521, /* server_fast_server_permil  */
+  YYSYMBOL_server_qname_minimisation = 522, /* server_qname_minimisation  */
+  YYSYMBOL_server_qname_minimisation_strict = 523, /* server_qname_minimisation_strict  */
+  YYSYMBOL_server_ipsecmod_enabled = 524,  /* server_ipsecmod_enabled  */
+  YYSYMBOL_server_ipsecmod_ignore_bogus = 525, /* server_ipsecmod_ignore_bogus  */
+  YYSYMBOL_server_ipsecmod_hook = 526,     /* server_ipsecmod_hook  */
+  YYSYMBOL_server_ipsecmod_max_ttl = 527,  /* server_ipsecmod_max_ttl  */
+  YYSYMBOL_server_ipsecmod_whitelist = 528, /* server_ipsecmod_whitelist  */
+  YYSYMBOL_server_ipsecmod_strict = 529,   /* server_ipsecmod_strict  */
+  YYSYMBOL_server_edns_client_string = 530, /* server_edns_client_string  */
+  YYSYMBOL_server_edns_client_string_opcode = 531, /* server_edns_client_string_opcode  */
+  YYSYMBOL_stub_name = 532,                /* stub_name  */
+  YYSYMBOL_stub_host = 533,                /* stub_host  */
+  YYSYMBOL_stub_addr = 534,                /* stub_addr  */
+  YYSYMBOL_stub_first = 535,               /* stub_first  */
+  YYSYMBOL_stub_no_cache = 536,            /* stub_no_cache  */
+  YYSYMBOL_stub_ssl_upstream = 537,        /* stub_ssl_upstream  */
+  YYSYMBOL_stub_prime = 538,               /* stub_prime  */
+  YYSYMBOL_forward_name = 539,             /* forward_name  */
+  YYSYMBOL_forward_host = 540,             /* forward_host  */
+  YYSYMBOL_forward_addr = 541,             /* forward_addr  */
+  YYSYMBOL_forward_first = 542,            /* forward_first  */
+  YYSYMBOL_forward_no_cache = 543,         /* forward_no_cache  */
+  YYSYMBOL_forward_ssl_upstream = 544,     /* forward_ssl_upstream  */
+  YYSYMBOL_auth_name = 545,                /* auth_name  */
+  YYSYMBOL_auth_zonefile = 546,            /* auth_zonefile  */
+  YYSYMBOL_auth_master = 547,              /* auth_master  */
+  YYSYMBOL_auth_url = 548,                 /* auth_url  */
+  YYSYMBOL_auth_allow_notify = 549,        /* auth_allow_notify  */
+  YYSYMBOL_auth_for_downstream = 550,      /* auth_for_downstream  */
+  YYSYMBOL_auth_for_upstream = 551,        /* auth_for_upstream  */
+  YYSYMBOL_auth_fallback_enabled = 552,    /* auth_fallback_enabled  */
+  YYSYMBOL_view_name = 553,                /* view_name  */
+  YYSYMBOL_view_local_zone = 554,          /* view_local_zone  */
+  YYSYMBOL_view_response_ip = 555,         /* view_response_ip  */
+  YYSYMBOL_view_response_ip_data = 556,    /* view_response_ip_data  */
+  YYSYMBOL_view_local_data = 557,          /* view_local_data  */
+  YYSYMBOL_view_local_data_ptr = 558,      /* view_local_data_ptr  */
+  YYSYMBOL_view_first = 559,               /* view_first  */
+  YYSYMBOL_rcstart = 560,                  /* rcstart  */
+  YYSYMBOL_contents_rc = 561,              /* contents_rc  */
+  YYSYMBOL_content_rc = 562,               /* content_rc  */
+  YYSYMBOL_rc_control_enable = 563,        /* rc_control_enable  */
+  YYSYMBOL_rc_control_port = 564,          /* rc_control_port  */
+  YYSYMBOL_rc_control_interface = 565,     /* rc_control_interface  */
+  YYSYMBOL_rc_control_use_cert = 566,      /* rc_control_use_cert  */
+  YYSYMBOL_rc_server_key_file = 567,       /* rc_server_key_file  */
+  YYSYMBOL_rc_server_cert_file = 568,      /* rc_server_cert_file  */
+  YYSYMBOL_rc_control_key_file = 569,      /* rc_control_key_file  */
+  YYSYMBOL_rc_control_cert_file = 570,     /* rc_control_cert_file  */
+  YYSYMBOL_dtstart = 571,                  /* dtstart  */
+  YYSYMBOL_contents_dt = 572,              /* contents_dt  */
+  YYSYMBOL_content_dt = 573,               /* content_dt  */
+  YYSYMBOL_dt_dnstap_enable = 574,         /* dt_dnstap_enable  */
+  YYSYMBOL_dt_dnstap_bidirectional = 575,  /* dt_dnstap_bidirectional  */
+  YYSYMBOL_dt_dnstap_socket_path = 576,    /* dt_dnstap_socket_path  */
+  YYSYMBOL_dt_dnstap_ip = 577,             /* dt_dnstap_ip  */
+  YYSYMBOL_dt_dnstap_tls = 578,            /* dt_dnstap_tls  */
+  YYSYMBOL_dt_dnstap_tls_server_name = 579, /* dt_dnstap_tls_server_name  */
+  YYSYMBOL_dt_dnstap_tls_cert_bundle = 580, /* dt_dnstap_tls_cert_bundle  */
+  YYSYMBOL_dt_dnstap_tls_client_key_file = 581, /* dt_dnstap_tls_client_key_file  */
+  YYSYMBOL_dt_dnstap_tls_client_cert_file = 582, /* dt_dnstap_tls_client_cert_file  */
+  YYSYMBOL_dt_dnstap_send_identity = 583,  /* dt_dnstap_send_identity  */
+  YYSYMBOL_dt_dnstap_send_version = 584,   /* dt_dnstap_send_version  */
+  YYSYMBOL_dt_dnstap_identity = 585,       /* dt_dnstap_identity  */
+  YYSYMBOL_dt_dnstap_version = 586,        /* dt_dnstap_version  */
+  YYSYMBOL_dt_dnstap_log_resolver_query_messages = 587, /* dt_dnstap_log_resolver_query_messages  */
+  YYSYMBOL_dt_dnstap_log_resolver_response_messages = 588, /* dt_dnstap_log_resolver_response_messages  */
+  YYSYMBOL_dt_dnstap_log_client_query_messages = 589, /* dt_dnstap_log_client_query_messages  */
+  YYSYMBOL_dt_dnstap_log_client_response_messages = 590, /* dt_dnstap_log_client_response_messages  */
+  YYSYMBOL_dt_dnstap_log_forwarder_query_messages = 591, /* dt_dnstap_log_forwarder_query_messages  */
+  YYSYMBOL_dt_dnstap_log_forwarder_response_messages = 592, /* dt_dnstap_log_forwarder_response_messages  */
+  YYSYMBOL_pythonstart = 593,              /* pythonstart  */
+  YYSYMBOL_contents_py = 594,              /* contents_py  */
+  YYSYMBOL_content_py = 595,               /* content_py  */
+  YYSYMBOL_py_script = 596,                /* py_script  */
+  YYSYMBOL_dynlibstart = 597,              /* dynlibstart  */
+  YYSYMBOL_contents_dl = 598,              /* contents_dl  */
+  YYSYMBOL_content_dl = 599,               /* content_dl  */
+  YYSYMBOL_dl_file = 600,                  /* dl_file  */
+  YYSYMBOL_server_disable_dnssec_lame_check = 601, /* server_disable_dnssec_lame_check  */
+  YYSYMBOL_server_log_identity = 602,      /* server_log_identity  */
+  YYSYMBOL_server_response_ip = 603,       /* server_response_ip  */
+  YYSYMBOL_server_response_ip_data = 604,  /* server_response_ip_data  */
+  YYSYMBOL_dnscstart = 605,                /* dnscstart  */
+  YYSYMBOL_contents_dnsc = 606,            /* contents_dnsc  */
+  YYSYMBOL_content_dnsc = 607,             /* content_dnsc  */
+  YYSYMBOL_dnsc_dnscrypt_enable = 608,     /* dnsc_dnscrypt_enable  */
+  YYSYMBOL_dnsc_dnscrypt_port = 609,       /* dnsc_dnscrypt_port  */
+  YYSYMBOL_dnsc_dnscrypt_provider = 610,   /* dnsc_dnscrypt_provider  */
+  YYSYMBOL_dnsc_dnscrypt_provider_cert = 611, /* dnsc_dnscrypt_provider_cert  */
+  YYSYMBOL_dnsc_dnscrypt_provider_cert_rotated = 612, /* dnsc_dnscrypt_provider_cert_rotated  */
+  YYSYMBOL_dnsc_dnscrypt_secret_key = 613, /* dnsc_dnscrypt_secret_key  */
+  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_size = 614, /* dnsc_dnscrypt_shared_secret_cache_size  */
+  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_slabs = 615, /* dnsc_dnscrypt_shared_secret_cache_slabs  */
+  YYSYMBOL_dnsc_dnscrypt_nonce_cache_size = 616, /* dnsc_dnscrypt_nonce_cache_size  */
+  YYSYMBOL_dnsc_dnscrypt_nonce_cache_slabs = 617, /* dnsc_dnscrypt_nonce_cache_slabs  */
+  YYSYMBOL_cachedbstart = 618,             /* cachedbstart  */
+  YYSYMBOL_contents_cachedb = 619,         /* contents_cachedb  */
+  YYSYMBOL_content_cachedb = 620,          /* content_cachedb  */
+  YYSYMBOL_cachedb_backend_name = 621,     /* cachedb_backend_name  */
+  YYSYMBOL_cachedb_secret_seed = 622,      /* cachedb_secret_seed  */
+  YYSYMBOL_redis_server_host = 623,        /* redis_server_host  */
+  YYSYMBOL_redis_server_port = 624,        /* redis_server_port  */
+  YYSYMBOL_redis_timeout = 625,            /* redis_timeout  */
+  YYSYMBOL_redis_expire_records = 626,     /* redis_expire_records  */
+  YYSYMBOL_server_tcp_connection_limit = 627, /* server_tcp_connection_limit  */
+  YYSYMBOL_ipsetstart = 628,               /* ipsetstart  */
+  YYSYMBOL_contents_ipset = 629,           /* contents_ipset  */
+  YYSYMBOL_content_ipset = 630,            /* content_ipset  */
+  YYSYMBOL_ipset_name_v4 = 631,            /* ipset_name_v4  */
+  YYSYMBOL_ipset_name_v6 = 632             /* ipset_name_v6  */
 };
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
+typedef enum yysymbol_kind_t yysymbol_kind_t;
 
 
-extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
-
 
 
 #ifdef short
 # undef short
 #endif
 
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
+/* 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
 #endif
 
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
+/* 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;
 #else
 typedef signed char yytype_int8;
 #endif
 
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
+#ifdef __INT_LEAST16_MAX__
+typedef __INT_LEAST16_TYPE__ yytype_int16;
+#elif defined YY_STDINT_H
+typedef int_least16_t 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 YYSIZE_T
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -804,7 +851,20 @@ typedef short yytype_int16;
 # endif
 #endif
 
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#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;
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -818,22 +878,21 @@ typedef short yytype_int16;
 # endif
 #endif
 
-#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)
+
+#ifndef YY_ATTRIBUTE_PURE
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
 # else
-#  define YY_ATTRIBUTE(Spec) /* empty */
+#  define YY_ATTRIBUTE_PURE
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
 #ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define YY_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
@@ -845,11 +904,11 @@ typedef short yytype_int16;
 
 #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
@@ -862,10 +921,22 @@ typedef short yytype_int16;
 # 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)))
 
-#if ! defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -930,8 +1001,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 # endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
+#endif /* !defined yyoverflow */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
@@ -940,17 +1010,17 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
+  yy_state_t yyss_alloc;
   YYSTYPE yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 # define YYCOPY_NEEDED 1
@@ -963,11 +1033,11 @@ union yyalloc
 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     do                                                                  \
       {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
+        YYPTRDIFF_T yynewbytes;                                         \
         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
         Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
+        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
       }                                                                 \
     while (0)
 
@@ -979,12 +1049,12 @@ union yyalloc
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
 #  else
 #   define YYCOPY(Dst, Src, Count)              \
       do                                        \
         {                                       \
-          YYSIZE_T yyi;                         \
+          YYPTRDIFF_T yyi;                      \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
@@ -996,28 +1066,31 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   641
+#define YYLAST   642
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  303
+#define YYNTOKENS  304
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  328
+#define YYNNTS  329
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  632
+#define YYNRULES  634
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  939
+#define YYNSTATES  942
+
+/* YYMAXUTOK -- Last valid token kind.  */
+#define YYMAXUTOK   558
 
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   557
 
 /* 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)
+#define YYTRANSLATE(YYX)                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK                     \
+   ? YY_CAST (yysymbol_kind_t, yytranslate[YYX])        \
+   : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
-static const yytype_uint16 yytranslate[] =
+static const yytype_int16 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1074,12 +1147,12 @@ 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,   300,   301,   302
+     295,   296,   297,   298,   299,   300,   301,   302,   303
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
+static const yytype_int16 yyrline[] =
 {
        0,   185,   185,   185,   186,   186,   187,   187,   188,   188,
      188,   189,   189,   190,   190,   191,   191,   192,   194,   200,
@@ -1103,61 +1176,68 @@ static const yytype_uint16 yyrline[] =
      280,   280,   281,   281,   281,   282,   282,   282,   283,   283,
      284,   285,   285,   286,   286,   287,   287,   288,   288,   289,
      289,   289,   290,   290,   290,   291,   291,   291,   292,   292,
-     293,   293,   294,   294,   295,   295,   296,   298,   310,   311,
-     312,   312,   312,   312,   312,   313,   313,   315,   327,   328,
-     329,   329,   329,   329,   330,   330,   332,   346,   347,   348,
-     348,   348,   348,   349,   349,   349,   351,   368,   369,   370,
-     370,   370,   370,   371,   371,   371,   372,   375,   394,   411,
-     419,   429,   437,   454,   455,   456,   456,   456,   456,   456,
-     457,   457,   457,   458,   458,   460,   469,   478,   489,   498,
-     507,   516,   527,   536,   548,   562,   577,   588,   605,   622,
-     639,   656,   671,   686,   699,   714,   723,   732,   741,   750,
-     759,   768,   777,   786,   795,   804,   813,   822,   831,   840,
-     853,   862,   875,   884,   893,   902,   909,   916,   925,   932,
-     941,   949,   956,   963,   971,   980,   988,  1004,  1012,  1020,
-    1028,  1036,  1044,  1053,  1062,  1076,  1085,  1094,  1103,  1112,
-    1121,  1130,  1137,  1144,  1170,  1178,  1185,  1192,  1199,  1206,
-    1214,  1222,  1230,  1237,  1248,  1259,  1266,  1275,  1284,  1293,
-    1300,  1307,  1315,  1323,  1333,  1343,  1353,  1367,  1375,  1388,
-    1399,  1407,  1420,  1429,  1438,  1447,  1456,  1466,  1476,  1484,
-    1497,  1506,  1514,  1523,  1531,  1544,  1553,  1563,  1570,  1580,
-    1590,  1600,  1610,  1620,  1630,  1640,  1650,  1657,  1664,  1671,
-    1680,  1689,  1698,  1707,  1714,  1724,  1744,  1751,  1769,  1782,
-    1795,  1804,  1813,  1822,  1831,  1841,  1851,  1862,  1871,  1880,
-    1889,  1898,  1907,  1916,  1929,  1942,  1951,  1958,  1967,  1976,
-    1985,  1994,  2002,  2015,  2023,  2064,  2071,  2086,  2096,  2106,
-    2113,  2120,  2127,  2136,  2144,  2158,  2179,  2200,  2212,  2224,
-    2236,  2245,  2266,  2276,  2285,  2293,  2301,  2314,  2327,  2342,
-    2357,  2366,  2375,  2381,  2390,  2399,  2409,  2419,  2432,  2445,
-    2457,  2471,  2483,  2497,  2506,  2518,  2528,  2535,  2542,  2551,
-    2560,  2570,  2580,  2590,  2597,  2604,  2613,  2622,  2632,  2642,
-    2649,  2656,  2663,  2671,  2681,  2691,  2701,  2711,  2750,  2760,
-    2768,  2776,  2791,  2800,  2805,  2806,  2807,  2807,  2807,  2808,
-    2808,  2808,  2809,  2809,  2811,  2821,  2830,  2837,  2844,  2851,
-    2858,  2865,  2872,  2877,  2878,  2879,  2879,  2879,  2880,  2880,
-    2880,  2881,  2882,  2882,  2883,  2883,  2884,  2884,  2885,  2886,
-    2887,  2888,  2889,  2890,  2892,  2901,  2911,  2918,  2925,  2934,
-    2941,  2948,  2955,  2962,  2971,  2980,  2987,  2994,  3004,  3014,
-    3024,  3034,  3044,  3054,  3059,  3060,  3061,  3063,  3069,  3074,
-    3075,  3076,  3078,  3084,  3094,  3101,  3110,  3118,  3123,  3124,
-    3126,  3126,  3126,  3127,  3127,  3128,  3129,  3130,  3131,  3132,
-    3134,  3144,  3153,  3160,  3169,  3176,  3185,  3193,  3206,  3214,
-    3227,  3232,  3233,  3234,  3234,  3235,  3235,  3235,  3236,  3238,
-    3250,  3262,  3274,  3289,  3302,  3315,  3326,  3331,  3332,  3333,
-    3333,  3335,  3350
+     293,   293,   294,   294,   295,   295,   296,   296,   298,   310,
+     311,   312,   312,   312,   312,   312,   313,   313,   315,   327,
+     328,   329,   329,   329,   329,   330,   330,   332,   346,   347,
+     348,   348,   348,   348,   349,   349,   349,   351,   368,   369,
+     370,   370,   370,   370,   371,   371,   371,   372,   375,   394,
+     411,   419,   429,   437,   454,   455,   456,   456,   456,   456,
+     456,   457,   457,   457,   458,   458,   460,   469,   478,   489,
+     498,   507,   516,   527,   536,   548,   562,   577,   588,   605,
+     622,   639,   656,   671,   686,   699,   714,   723,   732,   741,
+     750,   759,   768,   777,   786,   795,   804,   813,   822,   831,
+     840,   853,   862,   875,   884,   893,   902,   909,   916,   925,
+     932,   941,   949,   956,   963,   971,   980,   988,  1004,  1012,
+    1020,  1028,  1036,  1044,  1053,  1062,  1076,  1085,  1094,  1103,
+    1112,  1121,  1130,  1137,  1144,  1170,  1178,  1185,  1192,  1199,
+    1206,  1214,  1222,  1230,  1237,  1248,  1259,  1266,  1275,  1284,
+    1293,  1300,  1307,  1323,  1331,  1339,  1349,  1359,  1369,  1383,
+    1391,  1404,  1415,  1423,  1436,  1445,  1454,  1463,  1472,  1482,
+    1492,  1500,  1513,  1522,  1530,  1539,  1547,  1560,  1569,  1579,
+    1586,  1596,  1606,  1616,  1626,  1636,  1646,  1656,  1666,  1673,
+    1680,  1687,  1696,  1705,  1714,  1723,  1730,  1740,  1760,  1767,
+    1785,  1798,  1811,  1820,  1829,  1838,  1847,  1857,  1867,  1878,
+    1887,  1896,  1905,  1914,  1923,  1932,  1945,  1958,  1967,  1974,
+    1983,  1992,  2001,  2010,  2018,  2031,  2039,  2080,  2087,  2102,
+    2112,  2122,  2129,  2136,  2143,  2152,  2160,  2174,  2195,  2216,
+    2228,  2240,  2252,  2261,  2282,  2292,  2301,  2309,  2317,  2330,
+    2343,  2358,  2373,  2382,  2391,  2397,  2406,  2415,  2425,  2435,
+    2448,  2461,  2473,  2487,  2499,  2513,  2522,  2534,  2544,  2551,
+    2558,  2567,  2576,  2586,  2596,  2606,  2613,  2620,  2629,  2638,
+    2648,  2658,  2665,  2672,  2679,  2687,  2697,  2707,  2717,  2727,
+    2766,  2776,  2784,  2792,  2807,  2816,  2821,  2822,  2823,  2823,
+    2823,  2824,  2824,  2824,  2825,  2825,  2827,  2837,  2846,  2853,
+    2860,  2867,  2874,  2881,  2888,  2893,  2894,  2895,  2895,  2895,
+    2896,  2896,  2896,  2897,  2898,  2898,  2899,  2899,  2900,  2900,
+    2901,  2902,  2903,  2904,  2905,  2906,  2908,  2917,  2927,  2934,
+    2941,  2950,  2957,  2964,  2971,  2978,  2987,  2996,  3003,  3010,
+    3020,  3030,  3040,  3050,  3060,  3070,  3075,  3076,  3077,  3079,
+    3085,  3090,  3091,  3092,  3094,  3100,  3110,  3117,  3126,  3134,
+    3139,  3140,  3142,  3142,  3142,  3143,  3143,  3144,  3145,  3146,
+    3147,  3148,  3150,  3160,  3169,  3176,  3185,  3192,  3201,  3209,
+    3222,  3230,  3243,  3248,  3249,  3250,  3250,  3251,  3251,  3251,
+    3252,  3254,  3266,  3278,  3290,  3305,  3318,  3331,  3342,  3347,
+    3348,  3349,  3349,  3351,  3366
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+/** Accessing symbol of state STATE.  */
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State])
+
+#if YYDEBUG || 0
+/* The user-facing name of the symbol whose (internal) number is
+   YYSYMBOL.  No bounds checking.  */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED;
+
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "SPACE", "LETTER", "NEWLINE", "COMMENT",
-  "COLON", "ANY", "ZONESTR", "STRING_ARG", "VAR_FORCE_TOPLEVEL",
-  "VAR_SERVER", "VAR_VERBOSITY", "VAR_NUM_THREADS", "VAR_PORT",
-  "VAR_OUTGOING_RANGE", "VAR_INTERFACE", "VAR_PREFER_IP4", "VAR_DO_IP4",
-  "VAR_DO_IP6", "VAR_PREFER_IP6", "VAR_DO_UDP", "VAR_DO_TCP",
+  "\"end of file\"", "error", "\"invalid token\"", "SPACE", "LETTER",
+  "NEWLINE", "COMMENT", "COLON", "ANY", "ZONESTR", "STRING_ARG",
+  "VAR_FORCE_TOPLEVEL", "VAR_SERVER", "VAR_VERBOSITY", "VAR_NUM_THREADS",
+  "VAR_PORT", "VAR_OUTGOING_RANGE", "VAR_INTERFACE", "VAR_PREFER_IP4",
+  "VAR_DO_IP4", "VAR_DO_IP6", "VAR_PREFER_IP6", "VAR_DO_UDP", "VAR_DO_TCP",
   "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS", "VAR_TCP_IDLE_TIMEOUT",
   "VAR_EDNS_TCP_KEEPALIVE", "VAR_EDNS_TCP_KEEPALIVE_TIMEOUT", "VAR_CHROOT",
   "VAR_USERNAME", "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE",
@@ -1265,7 +1345,7 @@ static const char *const yytname[] =
   "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_STRING",
-  "VAR_EDNS_CLIENT_STRING_OPCODE", "$accept", "toplevelvars",
+  "VAR_EDNS_CLIENT_STRING_OPCODE", "VAR_NSID", "$accept", "toplevelvars",
   "toplevelvar", "force_toplevel", "serverstart", "contents_server",
   "content_server", "stubstart", "contents_stub", "content_stub",
   "forwardstart", "contents_forward", "content_forward", "viewstart",
@@ -1307,7 +1387,7 @@ static const char *const yytname[] =
   "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_identity", "server_version", "server_nsid", "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",
@@ -1398,12 +1478,18 @@ static const char *const yytname[] =
   "server_tcp_connection_limit", "ipsetstart", "contents_ipset",
   "content_ipset", "ipset_name_v4", "ipset_name_v6", YY_NULLPTR
 };
+
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
+{
+  return yytname[yysymbol];
+}
 #endif
 
-# ifdef YYPRINT
+#ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum[] =
+static const yytype_int16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -1435,18 +1521,18 @@ static const yytype_uint16 yytoknum[] =
      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,
-     555,   556,   557
+     555,   556,   557,   558
 };
-# endif
+#endif
 
-#define YYPACT_NINF -291
+#define YYPACT_NINF (-291)
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-291)))
+#define yypact_value_is_default(Yyn) \
+  ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF -1
+#define YYTABLE_NINF (-1)
 
-#define yytable_value_is_error(Yytable_value) \
+#define yytable_value_is_error(Yyn) \
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1478,6 +1564,7 @@ static const yytype_int16 yypact[] =
      262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
      272,   273,   274,   275,   276,   277,   278,   280,   281,   282,
      284,   285,   286,   288,   322,   323,   324,   325,   329,   330,
+     331,  -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,
@@ -1497,67 +1584,67 @@ static const yytype_int16 yypact[] =
     -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,   373,   374,
+     375,   376,   377,   378,   379,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,   380,   381,   385,   389,   390,   415,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,   416,   417,   426,   439,
+     440,   441,   442,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,   443,   444,   445,   446,   447,   448,   449,   450,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   451,   452,
+     453,   454,   455,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,   456,   457,   458,   498,   500,   516,
+     517,   518,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,   519,   520,   521,   522,   523,   524,   525,   526,   533,
+     534,   535,   536,   537,   538,   539,   541,   542,   543,   544,
     -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,  -291,   331,   373,   374,   375,
-     376,   377,   378,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,   379,   380,   381,   385,   389,   390,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,   415,   416,   417,   426,   439,   440,
-     441,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   442,
-     443,   444,   445,   446,   447,   448,   449,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,  -291,   450,   451,   452,   453,
-     454,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,   455,   456,   457,   458,   498,   500,   516,   517,
-    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   533,   534,
-     535,   536,   537,   538,   539,   541,   542,   543,  -291,  -291,
     -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   544,  -291,
-    -291,   545,  -291,  -291,   546,   547,   550,   553,   556,   557,
-     566,   567,   568,   570,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,   571,   572,   573,   574,   575,
-     576,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   577,   580,
+     545,  -291,  -291,   546,  -291,  -291,   547,   550,   553,   556,
+     557,   566,   567,   568,   570,   571,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,   572,   573,   574,
+     575,   576,   577,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+     581,   582,  -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,   583,   584,  -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,   581,   582,  -291,  -291,  -291,  -291,  -291,
+    -291,   585,   586,   587,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,   588,   589,  -291,  -291,  -291,  -291,
     -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,   590,   591,   592,   593,   594,
+     595,  -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,   596,  -291,
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,   597,  -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,   583,
-     584,   585,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,   586,   587,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,  -291,   588,   589,   590,   591,   592,   593,  -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,   594,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,  -291,   595,  -291,  -291,  -291,
-    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
-    -291,  -291,   596,  -291,  -291,   597,   598,  -291,  -291,  -291,
+    -291,  -291,  -291,  -291,  -291,   598,  -291,  -291,   599,   600,
     -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,   599,   600,   601,
-    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291
+    -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+     601,   602,   603,  -291,  -291,  -291,  -291,  -291,  -291,  -291,
+    -291,  -291
 };
 
   /* 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_uint16 yydefact[] =
+static const yytype_int16 yydefact[] =
 {
-       2,     0,     1,    18,    19,   227,   237,   513,   573,   532,
-     246,   587,   610,   256,   626,   272,   578,     3,    17,    21,
-     229,   239,   248,   258,   274,   515,   534,   575,   580,   589,
-     612,   628,     4,     5,     6,    10,    14,    15,     8,     9,
+       2,     0,     1,    18,    19,   228,   238,   515,   575,   534,
+     247,   589,   612,   257,   628,   273,   580,     3,    17,    21,
+     230,   240,   249,   259,   275,   517,   536,   577,   582,   591,
+     614,   630,     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,
@@ -1579,75 +1666,76 @@ 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,
-      20,    22,    23,    86,    89,    98,   195,   196,    24,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,    37,
-      77,    25,    90,    91,    48,    70,    85,    26,    27,    30,
-      31,    28,    29,    32,    33,    34,    35,    36,   121,   207,
-     122,   124,   125,   126,   209,   214,   210,   221,   222,   223,
-     224,   127,   128,   129,   130,   131,   132,   133,   191,    87,
-      76,   102,   119,   120,   219,   216,   123,    38,    39,    40,
-      41,    42,    78,    92,    93,   108,    64,    74,    65,   199,
-     200,   103,    58,    59,   198,    60,    61,   112,   116,   137,
-     147,   174,   150,   220,   113,    71,    43,    44,    45,   100,
-     138,   139,   140,   141,    46,    47,    49,    50,    52,    53,
-      51,   145,   151,    54,    55,    56,    62,    81,   117,    95,
-     146,    88,   170,    96,    97,   114,   115,   217,   101,    57,
-      79,    82,    63,    66,   104,   105,    80,   171,   106,    67,
-      68,    69,   208,   118,   184,   185,   186,   187,   188,   189,
-     197,   107,    75,   109,   110,   111,   172,    72,    73,    94,
-      83,    84,    99,   134,   135,   218,   136,   142,   143,   144,
-     175,   176,   178,   180,   181,   179,   182,   192,   148,   149,
-     154,   155,   152,   153,   156,   157,   159,   158,   211,   213,
-     212,   173,   183,   201,   203,   202,   204,   205,   206,   225,
-     226,   177,   190,   193,   194,   215,     0,     0,     0,     0,
-       0,     0,     0,   228,   230,   231,   232,   234,   235,   236,
-     233,     0,     0,     0,     0,     0,     0,   238,   240,   241,
-     242,   243,   244,   245,     0,     0,     0,     0,     0,     0,
-       0,   247,   249,   250,   253,   254,   251,   255,   252,     0,
-       0,     0,     0,     0,     0,     0,     0,   257,   259,   260,
-     261,   262,   266,   263,   264,   265,     0,     0,     0,     0,
-       0,   277,   281,   282,   283,   284,   273,   275,   276,   278,
-     279,   280,     0,     0,     0,     0,     0,     0,     0,     0,
-     514,   516,   518,   517,   523,   519,   520,   521,   522,     0,
+       0,    20,    22,    23,    86,    89,    98,   195,   196,    24,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+      37,    77,    25,    90,    91,    48,    70,    85,    26,    27,
+      30,    31,    28,    29,    32,    33,    34,    35,    36,   121,
+     207,   122,   124,   125,   126,   209,   214,   210,   221,   222,
+     223,   224,   127,   128,   129,   130,   131,   132,   133,   191,
+      87,    76,   102,   119,   120,   219,   216,   123,    38,    39,
+      40,    41,    42,    78,    92,    93,   108,    64,    74,    65,
+     199,   200,   103,    58,    59,   198,    60,    61,   227,   112,
+     116,   137,   147,   174,   150,   220,   113,    71,    43,    44,
+      45,   100,   138,   139,   140,   141,    46,    47,    49,    50,
+      52,    53,    51,   145,   151,    54,    55,    56,    62,    81,
+     117,    95,   146,    88,   170,    96,    97,   114,   115,   217,
+     101,    57,    79,    82,    63,    66,   104,   105,    80,   171,
+     106,    67,    68,    69,   208,   118,   184,   185,   186,   187,
+     188,   189,   197,   107,    75,   109,   110,   111,   172,    72,
+      73,    94,    83,    84,    99,   134,   135,   218,   136,   142,
+     143,   144,   175,   176,   178,   180,   181,   179,   182,   192,
+     148,   149,   154,   155,   152,   153,   156,   157,   159,   158,
+     211,   213,   212,   173,   183,   201,   203,   202,   204,   205,
+     206,   225,   226,   177,   190,   193,   194,   215,     0,     0,
+       0,     0,     0,     0,     0,   229,   231,   232,   233,   235,
+     236,   237,   234,     0,     0,     0,     0,     0,     0,   239,
+     241,   242,   243,   244,   245,   246,     0,     0,     0,     0,
+       0,     0,     0,   248,   250,   251,   254,   255,   252,   256,
+     253,     0,     0,     0,     0,     0,     0,     0,     0,   258,
+     260,   261,   262,   263,   267,   264,   265,   266,     0,     0,
+       0,     0,     0,   278,   282,   283,   284,   285,   274,   276,
+     277,   279,   280,   281,     0,     0,     0,     0,     0,     0,
+       0,     0,   516,   518,   520,   519,   525,   521,   522,   523,
+     524,     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,   533,   535,
-     537,   536,   538,   539,   540,   541,   542,   543,   544,   545,
-     546,   547,   548,   549,   550,   551,   552,   553,     0,   574,
-     576,     0,   579,   581,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   588,   590,   591,   592,   594,   595,
-     593,   596,   597,   598,   599,     0,     0,     0,     0,     0,
-       0,   611,   613,   614,   615,   616,   617,   618,     0,     0,
-     627,   629,   630,   286,   285,   292,   305,   303,   315,   311,
-     312,   316,   313,   314,   317,   318,   319,   320,   321,   351,
-     352,   353,   354,   355,   380,   381,   382,   388,   389,   308,
-     390,   391,   394,   392,   393,   397,   398,   399,   413,   366,
-     367,   369,   370,   400,   416,   360,   362,   417,   423,   424,
-     425,   309,   379,   441,   442,   361,   436,   344,   304,   356,
-     414,   420,   401,     0,     0,   445,   310,   287,   343,   405,
-     288,   306,   307,   357,   358,   443,   403,   407,   408,   289,
-     446,   383,   412,   345,   365,   418,   419,   422,   435,   359,
-     439,   437,   438,   371,   378,   409,   410,   372,   373,   402,
-     427,   346,   347,   350,   322,   324,   325,   326,   327,   328,
-     335,   336,   337,   338,   339,   340,   341,   447,   448,   450,
-     384,   385,   386,   387,   395,   396,   451,   452,   453,     0,
-       0,     0,   404,   374,   376,   583,   462,   466,   464,   463,
-     467,   465,     0,     0,   470,   471,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   406,   421,   440,   475,
-     476,   375,   454,     0,     0,     0,     0,     0,     0,   428,
-     429,   430,   431,   432,   433,   434,   584,   368,   363,   426,
-     342,   290,   291,   364,   477,   479,   478,   480,   481,   482,
-     323,   330,   472,   474,   473,   329,     0,   349,   411,   449,
-     348,   377,   331,   332,   334,   333,     0,   484,   485,   486,
-     487,   491,   490,   488,   489,   492,   493,   494,   495,   497,
-     496,   506,     0,   510,   511,     0,     0,   512,   498,   504,
-     499,   500,   501,   503,   505,   502,   267,   268,   269,   270,
-     271,   524,   526,   525,   528,   529,   530,   531,   527,   554,
-     556,   557,   558,   559,   560,   561,   562,   563,   564,   555,
-     565,   566,   567,   568,   569,   570,   571,   572,   577,   582,
-     600,   601,   602,   605,   603,   604,   606,   607,   608,   609,
-     619,   620,   621,   622,   623,   624,   631,   632,   415,   444,
-     461,   585,   586,   468,   469,   455,   456,     0,     0,     0,
-     460,   625,   483,   507,   508,   509,   459,   457,   458
+     535,   537,   539,   538,   540,   541,   542,   543,   544,   545,
+     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
+       0,   576,   578,     0,   581,   583,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   590,   592,   593,   594,
+     596,   597,   595,   598,   599,   600,   601,     0,     0,     0,
+       0,     0,     0,   613,   615,   616,   617,   618,   619,   620,
+       0,     0,   629,   631,   632,   287,   286,   293,   306,   304,
+     316,   312,   313,   317,   314,   315,   318,   319,   320,   321,
+     322,   352,   353,   354,   355,   356,   382,   383,   384,   390,
+     391,   309,   392,   393,   396,   394,   395,   399,   400,   401,
+     415,   367,   368,   370,   371,   402,   418,   361,   363,   419,
+     425,   426,   427,   310,   381,   443,   444,   362,   438,   345,
+     305,   357,   416,   422,   403,     0,     0,   447,   311,   288,
+     344,   407,   289,   307,   308,   358,   359,   445,   405,   409,
+     410,   290,   448,   385,   414,   346,   366,   420,   421,   424,
+     437,   360,   441,   439,   440,   373,   380,   411,   412,   374,
+     375,   404,   429,   347,   348,   351,   323,   325,   326,   327,
+     328,   329,   336,   337,   338,   339,   340,   341,   342,   449,
+     450,   452,   386,   387,   388,   389,   397,   398,   453,   454,
+     455,     0,     0,     0,   406,   376,   378,   585,   464,   468,
+     466,   465,   469,   467,     0,     0,   472,   473,   294,   295,
+     296,   297,   298,   299,   300,   301,   302,   303,   408,   423,
+     442,   477,   478,   377,   456,     0,     0,     0,     0,     0,
+       0,   430,   431,   432,   433,   434,   435,   436,   586,   369,
+     364,   428,   343,   291,   292,   365,   479,   481,   480,   482,
+     483,   484,   324,   331,   474,   476,   475,   330,     0,   350,
+     413,   451,   349,   379,   332,   333,   335,   334,     0,   486,
+     372,   487,   488,   489,   493,   492,   490,   491,   494,   495,
+     496,   497,   499,   498,   508,     0,   512,   513,     0,     0,
+     514,   500,   506,   501,   502,   503,   505,   507,   504,   268,
+     269,   270,   271,   272,   526,   528,   527,   530,   531,   532,
+     533,   529,   556,   558,   559,   560,   561,   562,   563,   564,
+     565,   566,   557,   567,   568,   569,   570,   571,   572,   573,
+     574,   579,   584,   602,   603,   604,   607,   605,   606,   608,
+     609,   610,   611,   621,   622,   623,   624,   625,   626,   633,
+     634,   417,   446,   463,   587,   588,   470,   471,   457,   458,
+       0,     0,     0,   462,   627,   485,   509,   510,   511,   461,
+     459,   460
 };
 
   /* YYPGOTO[NTERM-NUM].  */
@@ -1677,7 +1765,7 @@ static const yytype_int16 yypgoto[] =
     -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,
-     578,   579,   602,   603,   604,  -291,  -291,  -291,  -291,  -291,
+    -291,   578,   579,   580,   604,   605,  -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,
@@ -1685,117 +1773,117 @@ static const yytype_int16 yypgoto[] =
     -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
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    17,    18,    19,    32,   250,    20,    33,   463,
-      21,    34,   477,    22,    35,   491,    23,    36,   507,   521,
-     522,   523,   524,   525,    24,    37,   526,   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,   447,   448,   449,   450,   464,   465,   466,
-     467,   468,   469,   470,   478,   479,   480,   481,   482,   483,
-     508,   509,   510,   511,   512,   513,   514,   515,   492,   493,
-     494,   495,   496,   497,   498,    25,    38,   540,   541,   542,
-     543,   544,   545,   546,   547,   548,    26,    39,   568,   569,
-     570,   571,   572,   573,   574,   575,   576,   577,   578,   579,
-     580,   581,   582,   583,   584,   585,   586,   587,    27,    40,
-     589,   590,    28,    41,   592,   593,   451,   452,   453,   454,
-      29,    42,   604,   605,   606,   607,   608,   609,   610,   611,
-     612,   613,   614,    30,    43,   621,   622,   623,   624,   625,
-     626,   627,   455,    31,    44,   630,   631,   632
+      -1,     1,    17,    18,    19,    32,   251,    20,    33,   465,
+      21,    34,   479,    22,    35,   493,    23,    36,   509,   523,
+     524,   525,   526,   527,    24,    37,   528,   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,   447,   448,   449,   450,   451,   452,   466,   467,
+     468,   469,   470,   471,   472,   480,   481,   482,   483,   484,
+     485,   510,   511,   512,   513,   514,   515,   516,   517,   494,
+     495,   496,   497,   498,   499,   500,    25,    38,   542,   543,
+     544,   545,   546,   547,   548,   549,   550,    26,    39,   570,
+     571,   572,   573,   574,   575,   576,   577,   578,   579,   580,
+     581,   582,   583,   584,   585,   586,   587,   588,   589,    27,
+      40,   591,   592,    28,    41,   594,   595,   453,   454,   455,
+     456,    29,    42,   606,   607,   608,   609,   610,   611,   612,
+     613,   614,   615,   616,    30,    43,   623,   624,   625,   626,
+     627,   628,   629,   457,    31,    44,   632,   633,   634
 };
 
   /* 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_uint16 yytable[] =
+static const yytype_int16 yytable[] =
 {
-       2,   499,   484,   456,   588,   457,   458,   471,   628,   629,
-     591,     3,     4,   633,   634,   472,   473,   615,   616,   617,
-     618,   619,   620,   635,   499,   594,   595,   596,   597,   598,
-     599,   600,   601,   602,   603,   636,   637,   638,   485,   486,
-     639,   640,   641,   642,   643,   644,     5,   645,   646,   647,
-     648,   649,     6,   650,   651,   652,   653,   654,   655,   656,
-     657,   658,   659,   487,   660,   661,   459,   549,   550,   551,
-     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
-     562,   563,   564,   565,   566,   567,   532,   533,   534,   535,
-     536,   537,   538,   539,   662,   663,     7,   460,   664,   665,
-     474,   666,   475,   667,   668,   669,   670,   461,   671,   672,
-     673,   674,     8,   675,   676,   677,   678,   679,   680,   681,
-     682,   683,   684,   685,   686,   687,   688,   689,   690,   691,
-     692,   693,   694,   695,   696,   697,   698,   699,   700,   701,
-     488,   489,   702,   703,   704,   705,   706,   707,   708,   709,
-     710,   711,   712,   713,   714,   715,   716,   717,   718,   719,
-     720,   721,     9,   722,   723,   724,   725,   726,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     490,   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,   773,   774,   775,   776,   777,
-     778,    10,   501,   502,   503,   779,   780,   781,   782,   783,
-     784,   785,   506,   786,   787,   788,   789,   790,   462,    11,
-     791,   476,   792,   500,   793,   501,   502,   503,   504,   505,
-     516,   517,   518,   519,   520,   506,    12,   794,   795,   796,
-     797,   798,   799,   800,   801,    13,   802,   803,   804,   805,
-     806,   807,   808,   809,   810,   811,   812,   813,   814,   815,
-     816,   817,   818,   819,   820,   821,   822,   823,   824,    14,
-     825,   826,   827,    15,   828,   829,   830,     0,   831,    16,
+       2,   501,   486,   458,   590,   459,   460,   473,   630,   631,
+     593,     3,     4,   635,   636,   474,   475,   617,   618,   619,
+     620,   621,   622,   637,   501,   596,   597,   598,   599,   600,
+     601,   602,   603,   604,   605,   638,   639,   640,   487,   488,
+     641,   642,   643,   644,   645,   646,     5,   647,   648,   649,
+     650,   651,     6,   652,   653,   654,   655,   656,   657,   658,
+     659,   660,   661,   489,   662,   663,   461,   551,   552,   553,
+     554,   555,   556,   557,   558,   559,   560,   561,   562,   563,
+     564,   565,   566,   567,   568,   569,   534,   535,   536,   537,
+     538,   539,   540,   541,   664,   665,     7,   462,   666,   667,
+     476,   668,   477,   669,   670,   671,   672,   463,   673,   674,
+     675,   676,     8,   677,   678,   679,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   692,   693,
+     694,   695,   696,   697,   698,   699,   700,   701,   702,   703,
+     490,   491,   704,   705,   706,   707,   708,   709,   710,   711,
+     712,   713,   714,   715,   716,   717,   718,   719,   720,   721,
+     722,   723,     9,   724,   725,   726,   727,   728,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     492,   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,   773,   774,   775,   776,   777,   778,   779,
+     780,    10,   503,   504,   505,   781,   782,   783,   784,   785,
+     786,   787,   508,   788,   789,   790,   791,   792,   464,    11,
+     793,   478,   794,   502,   795,   503,   504,   505,   506,   507,
+     518,   519,   520,   521,   522,   508,    12,   796,   797,   798,
+     799,   800,   801,   802,   803,    13,   804,   805,   806,   807,
+     808,   809,   810,   811,   812,   813,   814,   815,   816,   817,
+     818,   819,   820,   821,   822,   823,   824,   825,   826,    14,
+     827,   828,   829,    15,   830,   831,   832,     0,   833,    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,   832,   833,   834,   835,    77,    78,    79,   836,
-     837,   838,    80,    81,    82,    83,    84,    85,    86,    87,
+      75,    76,   834,   835,   836,   837,    77,    78,    79,   838,
+     839,   840,    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,   839,   840,   841,   842,   843,   844,   845,
-     846,   847,   121,   122,   123,   848,   124,   125,   126,   849,
-     850,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     118,   119,   120,   841,   842,   843,   844,   845,   846,   847,
+     848,   849,   121,   122,   123,   850,   124,   125,   126,   851,
+     852,   127,   128,   129,   130,   131,   132,   133,   134,   135,
      136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   851,   852,   853,   151,   152,
-     153,   154,   155,   156,   157,   158,   854,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,   170,   855,
-     856,   857,   858,   859,   860,   861,   862,   863,   864,   865,
-     866,   867,   868,   869,   870,   871,   872,   873,   874,   171,
+     146,   147,   148,   149,   150,   853,   854,   855,   151,   152,
+     153,   154,   155,   156,   157,   158,   856,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   857,
+     858,   859,   860,   861,   862,   863,   864,   865,   866,   867,
+     868,   869,   870,   871,   872,   873,   874,   875,   876,   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,   209,   875,   210,
-     876,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,   224,   225,   877,   878,   879,   880,
-     881,   882,   883,   884,   885,   886,   887,   226,   227,   228,
-     229,   230,   231,   888,   889,   890,   891,   892,   893,   894,
-     232,   895,   896,   897,   898,   899,   900,   901,   233,   234,
-     902,   235,   236,   903,   237,   238,   904,   905,   239,   240,
-     241,   242,   243,   244,   245,   246,   906,   907,   908,   247,
-     909,   910,   911,   912,   913,   914,   915,   916,   248,   249,
-     917,   918,   919,   920,   921,   922,   923,   924,   925,   926,
-     927,   928,   929,   930,   931,   932,   933,   934,   935,   936,
-     937,   938,     0,     0,     0,   527,   528,     0,     0,     0,
+     202,   203,   204,   205,   206,   207,   208,   209,   877,   210,
+     878,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,   225,   879,   880,   881,   882,
+     883,   884,   885,   886,   887,   888,   889,   226,   227,   228,
+     229,   230,   231,   890,   891,   892,   893,   894,   895,   896,
+     232,   897,   898,   899,   900,   901,   902,   903,   233,   234,
+     904,   235,   236,   905,   237,   238,   906,   907,   239,   240,
+     241,   242,   243,   244,   245,   246,   908,   909,   910,   247,
+     911,   912,   913,   914,   915,   916,   917,   918,   248,   249,
+     250,   919,   920,   921,   922,   923,   924,   925,   926,   927,
+     928,   929,   930,   931,   932,   933,   934,   935,   936,   937,
+     938,   939,   940,   941,     0,   529,   530,   531,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   529,
-     530,   531
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   532,   533
 };
 
 static const yytype_int16 yycheck[] =
@@ -1859,23 +1947,23 @@ static const yytype_int16 yycheck[] =
       10,   274,   275,    10,   277,   278,    10,    10,   281,   282,
      283,   284,   285,   286,   287,   288,    10,    10,    10,   292,
       10,    10,    10,    10,    10,    10,    10,    10,   301,   302,
+     303,    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,    37,    37,    -1,    -1,    -1,
+      10,    10,    10,    10,    -1,    37,    37,    37,    -1,    -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,    -1,    -1,    -1,    -1,    -1,
+      -1,    37,    37
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
-static const yytype_uint16 yystos[] =
+static const yytype_int16 yystos[] =
 {
-       0,   304,     0,    11,    12,    46,    52,    96,   112,   162,
-     221,   239,   256,   265,   289,   293,   299,   305,   306,   307,
-     310,   313,   316,   319,   327,   558,   569,   591,   595,   603,
-     616,   626,   308,   311,   314,   317,   320,   328,   559,   570,
-     592,   596,   604,   617,   627,    13,    14,    15,    16,    17,
+       0,   305,     0,    11,    12,    46,    52,    96,   112,   162,
+     221,   239,   256,   265,   289,   293,   299,   306,   307,   308,
+     311,   314,   317,   320,   328,   560,   571,   593,   597,   605,
+     618,   628,   309,   312,   315,   318,   321,   329,   561,   572,
+     594,   598,   606,   619,   629,    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,
@@ -1896,7 +1984,7 @@ static const yytype_uint16 yystos[] =
      233,   234,   235,   236,   237,   238,   250,   251,   252,   253,
      254,   255,   263,   271,   272,   274,   275,   277,   278,   281,
      282,   283,   284,   285,   286,   287,   288,   292,   301,   302,
-     309,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     303,   310,   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,
@@ -1916,25 +2004,25 @@ static const yytype_uint16 yystos[] =
      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,   528,
-     529,   599,   600,   601,   602,   625,    45,    47,    48,   108,
-     139,   149,   280,   312,   530,   531,   532,   533,   534,   535,
-     536,    45,    53,    54,   138,   140,   279,   315,   537,   538,
-     539,   540,   541,   542,    45,    81,    82,   106,   183,   184,
-     223,   318,   551,   552,   553,   554,   555,   556,   557,    45,
-     264,   266,   267,   268,   269,   270,   276,   321,   543,   544,
-     545,   546,   547,   548,   549,   550,   294,   295,   296,   297,
-     298,   322,   323,   324,   325,   326,   329,   543,   544,   545,
-     546,   547,    97,    98,    99,   100,   101,   102,   103,   104,
-     560,   561,   562,   563,   564,   565,   566,   567,   568,   163,
-     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   571,   572,
+     529,   530,   531,   601,   602,   603,   604,   627,    45,    47,
+      48,   108,   139,   149,   280,   313,   532,   533,   534,   535,
+     536,   537,   538,    45,    53,    54,   138,   140,   279,   316,
+     539,   540,   541,   542,   543,   544,    45,    81,    82,   106,
+     183,   184,   223,   319,   553,   554,   555,   556,   557,   558,
+     559,    45,   264,   266,   267,   268,   269,   270,   276,   322,
+     545,   546,   547,   548,   549,   550,   551,   552,   294,   295,
+     296,   297,   298,   323,   324,   325,   326,   327,   330,   545,
+     546,   547,   548,   549,    97,    98,    99,   100,   101,   102,
+     103,   104,   562,   563,   564,   565,   566,   567,   568,   569,
+     570,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
      573,   574,   575,   576,   577,   578,   579,   580,   581,   582,
-     583,   584,   585,   586,   587,   588,   589,   590,   113,   593,
-     594,   300,   597,   598,   240,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   605,   606,   607,   608,   609,   610,
-     611,   612,   613,   614,   615,   257,   258,   259,   260,   261,
-     262,   618,   619,   620,   621,   622,   623,   624,   290,   291,
-     628,   629,   630,    10,    10,    10,    10,    10,    10,    10,
+     583,   584,   585,   586,   587,   588,   589,   590,   591,   592,
+     113,   595,   596,   300,   599,   600,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   607,   608,   609,   610,
+     611,   612,   613,   614,   615,   616,   617,   257,   258,   259,
+     260,   261,   262,   620,   621,   622,   623,   624,   625,   626,
+     290,   291,   630,   631,   632,    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,
@@ -1964,41 +2052,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
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
+static const yytype_int16 yyr1[] =
 {
-       0,   303,   304,   304,   305,   305,   305,   305,   305,   305,
-     305,   305,   305,   305,   305,   305,   305,   305,   306,   307,
-     308,   308,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-     309,   309,   309,   309,   309,   309,   309,   310,   311,   311,
-     312,   312,   312,   312,   312,   312,   312,   313,   314,   314,
-     315,   315,   315,   315,   315,   315,   316,   317,   317,   318,
-     318,   318,   318,   318,   318,   318,   319,   320,   320,   321,
-     321,   321,   321,   321,   321,   321,   321,   322,   323,   324,
-     325,   326,   327,   328,   328,   329,   329,   329,   329,   329,
-     329,   329,   329,   329,   329,   330,   331,   332,   333,   334,
+       0,   304,   305,   305,   306,   306,   306,   306,   306,   306,
+     306,   306,   306,   306,   306,   306,   306,   306,   307,   308,
+     309,   309,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
+     310,   310,   310,   310,   310,   310,   310,   310,   311,   312,
+     312,   313,   313,   313,   313,   313,   313,   313,   314,   315,
+     315,   316,   316,   316,   316,   316,   316,   317,   318,   318,
+     319,   319,   319,   319,   319,   319,   319,   320,   321,   321,
+     322,   322,   322,   322,   322,   322,   322,   322,   323,   324,
+     325,   326,   327,   328,   329,   329,   330,   330,   330,   330,
+     330,   330,   330,   330,   330,   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,
@@ -2021,23 +2110,23 @@ static const yytype_uint16 yyr1[] =
      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,
-     555,   556,   557,   558,   559,   559,   560,   560,   560,   560,
-     560,   560,   560,   560,   561,   562,   563,   564,   565,   566,
-     567,   568,   569,   570,   570,   571,   571,   571,   571,   571,
-     571,   571,   571,   571,   571,   571,   571,   571,   571,   571,
-     571,   571,   571,   571,   572,   573,   574,   575,   576,   577,
+     555,   556,   557,   558,   559,   560,   561,   561,   562,   562,
+     562,   562,   562,   562,   562,   562,   563,   564,   565,   566,
+     567,   568,   569,   570,   571,   572,   572,   573,   573,   573,
+     573,   573,   573,   573,   573,   573,   573,   573,   573,   573,
+     573,   573,   573,   573,   573,   573,   574,   575,   576,   577,
      578,   579,   580,   581,   582,   583,   584,   585,   586,   587,
-     588,   589,   590,   591,   592,   592,   593,   594,   595,   596,
-     596,   597,   598,   599,   600,   601,   602,   603,   604,   604,
-     605,   605,   605,   605,   605,   605,   605,   605,   605,   605,
-     606,   607,   608,   609,   610,   611,   612,   613,   614,   615,
-     616,   617,   617,   618,   618,   618,   618,   618,   618,   619,
-     620,   621,   622,   623,   624,   625,   626,   627,   627,   628,
-     628,   629,   630
+     588,   589,   590,   591,   592,   593,   594,   594,   595,   596,
+     597,   598,   598,   599,   600,   601,   602,   603,   604,   605,
+     606,   606,   607,   607,   607,   607,   607,   607,   607,   607,
+     607,   607,   608,   609,   610,   611,   612,   613,   614,   615,
+     616,   617,   618,   619,   619,   620,   620,   620,   620,   620,
+     620,   621,   622,   623,   624,   625,   626,   627,   628,   629,
+     629,   630,   630,   631,   632
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+static const yytype_int8 yyr2[] =
 {
        0,     2,     0,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     1,     1,     1,
@@ -2061,13 +2150,13 @@ 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,     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,     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,
+       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,
@@ -2080,36 +2169,36 @@ static const yytype_uint8 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,     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,     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,     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,     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,     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
+       1,     2,     2,     2,     2,     2,     2,     3,     1,     2,
+       0,     1,     1,     2,     2
 };
 
 
+enum { YYENOMEM = -2 };
+
 #define yyerrok         (yyerrstatus = 0)
 #define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
@@ -2135,10 +2224,9 @@ static const yytype_uint8 yyr2[] =
       }                                                           \
   while (0)
 
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
+/* Backward compatibility with an undocumented macro.
+   Use YYerror or YYUNDEF. */
+#define YYERRCODE YYUNDEF
 
 
 /* Enable debugging if requested.  */
@@ -2156,18 +2244,18 @@ do {                                            \
 } while (0)
 
 /* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value); \
+                  Kind, Value); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
@@ -2178,17 +2266,20 @@ do {                                                                      \
 `-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo,
+                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
   FILE *yyoutput = yyo;
   YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
 # endif
-  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yykind);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
@@ -2197,12 +2288,13 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 `---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo,
+                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep)
 {
   YYFPRINTF (yyo, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
-  yy_symbol_value_print (yyo, yytype, yyvaluep);
+  yy_symbol_value_print (yyo, yykind, yyvaluep);
   YYFPRINTF (yyo, ")");
 }
 
@@ -2212,7 +2304,7 @@ yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 `------------------------------------------------------------------*/
 
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -2235,21 +2327,21 @@ do {                                                            \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+                 int yyrule)
 {
-  unsigned long yylno = yyrline[yyrule];
+  int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\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]],
-                       &yyvsp[(yyi + 1) - (yynrhs)]
-                                              );
+                       YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
+                       &yyvsp[(yyi + 1) - (yynrhs)]);
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -2264,8 +2356,8 @@ do {                                    \
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -2288,254 +2380,30 @@ int yydebug;
 #endif
 
 
-#if YYERROR_VERBOSE
 
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-yystrlen (const char *yystr)
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
 
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
 
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   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 YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            else
-              goto append;
-
-          append:
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *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 (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. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                    yysize = yysize1;
-                  else
-                    return 2;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      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"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-      yysize = yysize1;
-    else
-      return 2;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg,
+            yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
 {
   YYUSE (yyvaluep);
   if (!yymsg)
     yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
 
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
+  YYUSE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-
-
-/* The lookahead symbol.  */
+/* Lookahead token kind.  */
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
@@ -2544,6 +2412,8 @@ YYSTYPE yylval;
 int yynerrs;
 
 
+
+
 /*----------.
 | yyparse.  |
 `----------*/
@@ -2551,43 +2421,36 @@ int yynerrs;
 int
 yyparse (void)
 {
-    int yystate;
+    yy_state_fast_t yystate = 0;
     /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
+    int yyerrstatus = 0;
 
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
+    /* Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
+    /* Their size.  */
+    YYPTRDIFF_T yystacksize = YYINITDEPTH;
 
-    /* The semantic value stack.  */
+    /* The state stack: array, bottom, top.  */
+    yy_state_t yyssa[YYINITDEPTH];
+    yy_state_t *yyss = yyssa;
+    yy_state_t *yyssp = yyss;
+
+    /* The semantic value stack: array, bottom, top.  */
     YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
+    YYSTYPE *yyvs = yyvsa;
+    YYSTYPE *yyvsp = yyvs;
 
   int yyn;
+  /* The return value of yyparse.  */
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  /* Lookahead symbol kind.  */
+  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
@@ -2595,15 +2458,8 @@ yyparse (void)
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
@@ -2618,12 +2474,15 @@ yynewstate:
 
 
 /*--------------------------------------------------------------------.
-| yynewstate -- set current state (the top of the stack) to yystate.  |
+| yysetstate -- 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;
+  YY_IGNORE_USELESS_CAST_BEGIN
+  *yyssp = YY_CAST (yy_state_t, yystate);
+  YY_IGNORE_USELESS_CAST_END
+  YY_STACK_PRINT (yyss, yyssp);
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -2631,23 +2490,23 @@ yysetstate:
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
+      YYPTRDIFF_T yysize = 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 * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yyss1, yysize * YYSIZEOF (*yyssp),
+                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
                     &yystacksize);
         yyss = yyss1;
         yyvs = yyvs1;
@@ -2661,14 +2520,15 @@ yysetstate:
         yystacksize = YYMAXDEPTH;
 
       {
-        yytype_int16 *yyss1 = yyss;
+        yy_state_t *yyss1 = yyss;
         union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+          YY_CAST (union yyalloc *,
+                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+#  undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
@@ -2677,8 +2537,10 @@ yysetstate:
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long) yystacksize));
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+                  YY_CAST (long, yystacksize)));
+      YY_IGNORE_USELESS_CAST_END
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
@@ -2705,18 +2567,29 @@ yybackup:
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token: "));
+      YYDPRINTF ((stderr, "Reading a token\n"));
       yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
     {
-      yychar = yytoken = YYEOF;
+      yychar = YYEOF;
+      yytoken = YYSYMBOL_YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
+  else if (yychar == YYerror)
+    {
+      /* The scanner already issued an error message, process directly
+         to error recovery.  But do not keep the error token as
+         lookahead, it is too special and may lead us to an endless
+         loop in error recovery. */
+      yychar = YYUNDEF;
+      yytoken = YYSYMBOL_YYerror;
+      goto yyerrlab1;
+    }
   else
     {
       yytoken = YYTRANSLATE (yychar);
@@ -2744,14 +2617,13 @@ 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;
 
 
@@ -2786,25 +2658,25 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-  case 18:
+  case 18: /* force_toplevel: VAR_FORCE_TOPLEVEL  */
 #line 195 "./util/configparser.y"
-    {
+        {
 		OUTYY(("\nP(force-toplevel)\n"));
 	}
-#line 2795 "util/configparser.c"
+#line 2667 "util/configparser.c"
     break;
 
-  case 19:
+  case 19: /* serverstart: VAR_SERVER  */
 #line 201 "./util/configparser.y"
-    { 
+        { 
 		OUTYY(("\nP(server:)\n"));
 	}
-#line 2803 "util/configparser.c"
+#line 2675 "util/configparser.c"
     break;
 
-  case 227:
+  case 228: /* stubstart: VAR_STUB_ZONE  */
 #line 299 "./util/configparser.y"
-    {
+        {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -2814,12 +2686,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2818 "util/configparser.c"
+#line 2690 "util/configparser.c"
     break;
 
-  case 237:
+  case 238: /* forwardstart: VAR_FORWARD_ZONE  */
 #line 316 "./util/configparser.y"
-    {
+        {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
 		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
@@ -2829,12 +2701,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2833 "util/configparser.c"
+#line 2705 "util/configparser.c"
     break;
 
-  case 246:
+  case 247: /* viewstart: VAR_VIEW  */
 #line 333 "./util/configparser.y"
-    {
+        {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n")); 
 		s = (struct config_view*)calloc(1, sizeof(struct config_view));
@@ -2846,12 +2718,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2850 "util/configparser.c"
+#line 2722 "util/configparser.c"
     break;
 
-  case 256:
+  case 257: /* authstart: VAR_AUTH_ZONE  */
 #line 352 "./util/configparser.y"
-    {
+        {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -2866,12 +2738,12 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2870 "util/configparser.c"
+#line 2742 "util/configparser.c"
     break;
 
-  case 267:
+  case 268: /* rpz_tag: VAR_TAGS STRING_ARG  */
 #line 376 "./util/configparser.y"
-    {
+        {
 		uint8_t* bitlist;
 		size_t len = 0;
 		OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str)));
@@ -2887,12 +2759,12 @@ yyreduce:
 
 		}
 	}
-#line 2891 "util/configparser.c"
+#line 2763 "util/configparser.c"
     break;
 
-  case 268:
+  case 269: /* rpz_action_override: VAR_RPZ_ACTION_OVERRIDE STRING_ARG  */
 #line 395 "./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 &&
@@ -2906,44 +2778,44 @@ yyreduce:
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2910 "util/configparser.c"
+#line 2782 "util/configparser.c"
     break;
 
-  case 269:
+  case 270: /* rpz_cname_override: VAR_RPZ_CNAME_OVERRIDE STRING_ARG  */
 #line 412 "./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 2920 "util/configparser.c"
+#line 2792 "util/configparser.c"
     break;
 
-  case 270:
+  case 271: /* rpz_log: VAR_RPZ_LOG STRING_ARG  */
 #line 420 "./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 2932 "util/configparser.c"
+#line 2804 "util/configparser.c"
     break;
 
-  case 271:
+  case 272: /* rpz_log_name: VAR_RPZ_LOG_NAME STRING_ARG  */
 #line 430 "./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 2942 "util/configparser.c"
+#line 2814 "util/configparser.c"
     break;
 
-  case 272:
+  case 273: /* rpzstart: VAR_RPZ  */
 #line 438 "./util/configparser.y"
-    {
+        {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
 		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
@@ -2958,36 +2830,36 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2962 "util/configparser.c"
+#line 2834 "util/configparser.c"
     break;
 
-  case 285:
+  case 286: /* server_num_threads: VAR_NUM_THREADS STRING_ARG  */
 #line 461 "./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 2974 "util/configparser.c"
+#line 2846 "util/configparser.c"
     break;
 
-  case 286:
+  case 287: /* server_verbosity: VAR_VERBOSITY STRING_ARG  */
 #line 470 "./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 2986 "util/configparser.c"
+#line 2858 "util/configparser.c"
     break;
 
-  case 287:
+  case 288: /* server_statistics_interval: VAR_STATISTICS_INTERVAL STRING_ARG  */
 #line 479 "./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;
@@ -2996,48 +2868,48 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3000 "util/configparser.c"
+#line 2872 "util/configparser.c"
     break;
 
-  case 288:
+  case 289: /* server_statistics_cumulative: VAR_STATISTICS_CUMULATIVE STRING_ARG  */
 #line 490 "./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 3012 "util/configparser.c"
+#line 2884 "util/configparser.c"
     break;
 
-  case 289:
+  case 290: /* server_extended_statistics: VAR_EXTENDED_STATISTICS STRING_ARG  */
 #line 499 "./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 3024 "util/configparser.c"
+#line 2896 "util/configparser.c"
     break;
 
-  case 290:
+  case 291: /* server_shm_enable: VAR_SHM_ENABLE STRING_ARG  */
 #line 508 "./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 3036 "util/configparser.c"
+#line 2908 "util/configparser.c"
     break;
 
-  case 291:
+  case 292: /* server_shm_key: VAR_SHM_KEY STRING_ARG  */
 #line 517 "./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;
@@ -3046,24 +2918,24 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3050 "util/configparser.c"
+#line 2922 "util/configparser.c"
     break;
 
-  case 292:
+  case 293: /* server_port: VAR_PORT STRING_ARG  */
 #line 528 "./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 3062 "util/configparser.c"
+#line 2934 "util/configparser.c"
     break;
 
-  case 293:
+  case 294: /* server_send_client_subnet: VAR_SEND_CLIENT_SUBNET STRING_ARG  */
 #line 537 "./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)))
@@ -3073,12 +2945,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3077 "util/configparser.c"
+#line 2949 "util/configparser.c"
     break;
 
-  case 294:
+  case 295: /* server_client_subnet_zone: VAR_CLIENT_SUBNET_ZONE STRING_ARG  */
 #line 549 "./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,
@@ -3089,12 +2961,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3093 "util/configparser.c"
+#line 2965 "util/configparser.c"
     break;
 
-  case 295:
+  case 296: /* server_client_subnet_always_forward: VAR_CLIENT_SUBNET_ALWAYS_FORWARD STRING_ARG  */
 #line 563 "./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)
@@ -3107,12 +2979,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3111 "util/configparser.c"
+#line 2983 "util/configparser.c"
     break;
 
-  case 296:
+  case 297: /* server_client_subnet_opcode: VAR_CLIENT_SUBNET_OPCODE STRING_ARG  */
 #line 578 "./util/configparser.y"
-    {
+        {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
 		OUTYY(("P(Deprecated option, ignoring)\n"));
@@ -3121,12 +2993,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3125 "util/configparser.c"
+#line 2997 "util/configparser.c"
     break;
 
-  case 297:
+  case 298: /* server_max_client_subnet_ipv4: VAR_MAX_CLIENT_SUBNET_IPV4 STRING_ARG  */
 #line 589 "./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)
@@ -3141,12 +3013,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3145 "util/configparser.c"
+#line 3017 "util/configparser.c"
     break;
 
-  case 298:
+  case 299: /* server_max_client_subnet_ipv6: VAR_MAX_CLIENT_SUBNET_IPV6 STRING_ARG  */
 #line 606 "./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)
@@ -3161,12 +3033,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3165 "util/configparser.c"
+#line 3037 "util/configparser.c"
     break;
 
-  case 299:
+  case 300: /* server_min_client_subnet_ipv4: VAR_MIN_CLIENT_SUBNET_IPV4 STRING_ARG  */
 #line 623 "./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)
@@ -3181,12 +3053,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3185 "util/configparser.c"
+#line 3057 "util/configparser.c"
     break;
 
-  case 300:
+  case 301: /* server_min_client_subnet_ipv6: VAR_MIN_CLIENT_SUBNET_IPV6 STRING_ARG  */
 #line 640 "./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)
@@ -3201,12 +3073,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3205 "util/configparser.c"
+#line 3077 "util/configparser.c"
     break;
 
-  case 301:
+  case 302: /* server_max_ecs_tree_size_ipv4: VAR_MAX_ECS_TREE_SIZE_IPV4 STRING_ARG  */
 #line 657 "./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)
@@ -3219,12 +3091,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3223 "util/configparser.c"
+#line 3095 "util/configparser.c"
     break;
 
-  case 302:
+  case 303: /* server_max_ecs_tree_size_ipv6: VAR_MAX_ECS_TREE_SIZE_IPV6 STRING_ARG  */
 #line 672 "./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)
@@ -3237,12 +3109,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3241 "util/configparser.c"
+#line 3113 "util/configparser.c"
     break;
 
-  case 303:
+  case 304: /* server_interface: VAR_INTERFACE STRING_ARG  */
 #line 687 "./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*));
@@ -3253,12 +3125,12 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3257 "util/configparser.c"
+#line 3129 "util/configparser.c"
     break;
 
-  case 304:
+  case 305: /* server_outgoing_interface: VAR_OUTGOING_INTERFACE STRING_ARG  */
 #line 700 "./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*));
@@ -3271,180 +3143,180 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3275 "util/configparser.c"
+#line 3147 "util/configparser.c"
     break;
 
-  case 305:
+  case 306: /* server_outgoing_range: VAR_OUTGOING_RANGE STRING_ARG  */
 #line 715 "./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 3287 "util/configparser.c"
+#line 3159 "util/configparser.c"
     break;
 
-  case 306:
+  case 307: /* server_outgoing_port_permit: VAR_OUTGOING_PORT_PERMIT STRING_ARG  */
 #line 724 "./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 3299 "util/configparser.c"
+#line 3171 "util/configparser.c"
     break;
 
-  case 307:
+  case 308: /* server_outgoing_port_avoid: VAR_OUTGOING_PORT_AVOID STRING_ARG  */
 #line 733 "./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 3311 "util/configparser.c"
+#line 3183 "util/configparser.c"
     break;
 
-  case 308:
+  case 309: /* server_outgoing_num_tcp: VAR_OUTGOING_NUM_TCP STRING_ARG  */
 #line 742 "./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 3323 "util/configparser.c"
+#line 3195 "util/configparser.c"
     break;
 
-  case 309:
+  case 310: /* server_incoming_num_tcp: VAR_INCOMING_NUM_TCP STRING_ARG  */
 #line 751 "./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 3335 "util/configparser.c"
+#line 3207 "util/configparser.c"
     break;
 
-  case 310:
+  case 311: /* server_interface_automatic: VAR_INTERFACE_AUTOMATIC STRING_ARG  */
 #line 760 "./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 3347 "util/configparser.c"
+#line 3219 "util/configparser.c"
     break;
 
-  case 311:
+  case 312: /* server_do_ip4: VAR_DO_IP4 STRING_ARG  */
 #line 769 "./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 3359 "util/configparser.c"
+#line 3231 "util/configparser.c"
     break;
 
-  case 312:
+  case 313: /* server_do_ip6: VAR_DO_IP6 STRING_ARG  */
 #line 778 "./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 3371 "util/configparser.c"
+#line 3243 "util/configparser.c"
     break;
 
-  case 313:
+  case 314: /* server_do_udp: VAR_DO_UDP STRING_ARG  */
 #line 787 "./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 3383 "util/configparser.c"
+#line 3255 "util/configparser.c"
     break;
 
-  case 314:
+  case 315: /* server_do_tcp: VAR_DO_TCP STRING_ARG  */
 #line 796 "./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 3395 "util/configparser.c"
+#line 3267 "util/configparser.c"
     break;
 
-  case 315:
+  case 316: /* server_prefer_ip4: VAR_PREFER_IP4 STRING_ARG  */
 #line 805 "./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 3407 "util/configparser.c"
+#line 3279 "util/configparser.c"
     break;
 
-  case 316:
+  case 317: /* server_prefer_ip6: VAR_PREFER_IP6 STRING_ARG  */
 #line 814 "./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 3419 "util/configparser.c"
+#line 3291 "util/configparser.c"
     break;
 
-  case 317:
+  case 318: /* server_tcp_mss: VAR_TCP_MSS STRING_ARG  */
 #line 823 "./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 3431 "util/configparser.c"
+#line 3303 "util/configparser.c"
     break;
 
-  case 318:
+  case 319: /* server_outgoing_tcp_mss: VAR_OUTGOING_TCP_MSS STRING_ARG  */
 #line 832 "./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 3443 "util/configparser.c"
+#line 3315 "util/configparser.c"
     break;
 
-  case 319:
+  case 320: /* server_tcp_idle_timeout: VAR_TCP_IDLE_TIMEOUT STRING_ARG  */
 #line 841 "./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");
@@ -3455,24 +3327,24 @@ yyreduce:
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3459 "util/configparser.c"
+#line 3331 "util/configparser.c"
     break;
 
-  case 320:
+  case 321: /* server_tcp_keepalive: VAR_EDNS_TCP_KEEPALIVE STRING_ARG  */
 #line 854 "./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 3471 "util/configparser.c"
+#line 3343 "util/configparser.c"
     break;
 
-  case 321:
+  case 322: /* server_tcp_keepalive_timeout: VAR_EDNS_TCP_KEEPALIVE_TIMEOUT STRING_ARG  */
 #line 863 "./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");
@@ -3483,168 +3355,168 @@ yyreduce:
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3487 "util/configparser.c"
+#line 3359 "util/configparser.c"
     break;
 
-  case 322:
+  case 323: /* server_tcp_upstream: VAR_TCP_UPSTREAM STRING_ARG  */
 #line 876 "./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 3499 "util/configparser.c"
+#line 3371 "util/configparser.c"
     break;
 
-  case 323:
+  case 324: /* server_udp_upstream_without_downstream: VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM STRING_ARG  */
 #line 885 "./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 3511 "util/configparser.c"
+#line 3383 "util/configparser.c"
     break;
 
-  case 324:
+  case 325: /* server_ssl_upstream: VAR_SSL_UPSTREAM STRING_ARG  */
 #line 894 "./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 3523 "util/configparser.c"
+#line 3395 "util/configparser.c"
     break;
 
-  case 325:
+  case 326: /* server_ssl_service_key: VAR_SSL_SERVICE_KEY STRING_ARG  */
 #line 903 "./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 3533 "util/configparser.c"
+#line 3405 "util/configparser.c"
     break;
 
-  case 326:
+  case 327: /* server_ssl_service_pem: VAR_SSL_SERVICE_PEM STRING_ARG  */
 #line 910 "./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 3543 "util/configparser.c"
+#line 3415 "util/configparser.c"
     break;
 
-  case 327:
+  case 328: /* server_ssl_port: VAR_SSL_PORT STRING_ARG  */
 #line 917 "./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 3555 "util/configparser.c"
+#line 3427 "util/configparser.c"
     break;
 
-  case 328:
+  case 329: /* server_tls_cert_bundle: VAR_TLS_CERT_BUNDLE STRING_ARG  */
 #line 926 "./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 3565 "util/configparser.c"
+#line 3437 "util/configparser.c"
     break;
 
-  case 329:
+  case 330: /* server_tls_win_cert: VAR_TLS_WIN_CERT STRING_ARG  */
 #line 933 "./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 3577 "util/configparser.c"
+#line 3449 "util/configparser.c"
     break;
 
-  case 330:
+  case 331: /* server_tls_additional_port: VAR_TLS_ADDITIONAL_PORT STRING_ARG  */
 #line 942 "./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 3588 "util/configparser.c"
+#line 3460 "util/configparser.c"
     break;
 
-  case 331:
+  case 332: /* server_tls_ciphers: VAR_TLS_CIPHERS STRING_ARG  */
 #line 950 "./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 3598 "util/configparser.c"
+#line 3470 "util/configparser.c"
     break;
 
-  case 332:
+  case 333: /* server_tls_ciphersuites: VAR_TLS_CIPHERSUITES STRING_ARG  */
 #line 957 "./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 3608 "util/configparser.c"
+#line 3480 "util/configparser.c"
     break;
 
-  case 333:
+  case 334: /* server_tls_session_ticket_keys: VAR_TLS_SESSION_TICKET_KEYS STRING_ARG  */
 #line 964 "./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 3619 "util/configparser.c"
+#line 3491 "util/configparser.c"
     break;
 
-  case 334:
+  case 335: /* server_tls_use_sni: VAR_TLS_USE_SNI STRING_ARG  */
 #line 972 "./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 3631 "util/configparser.c"
+#line 3503 "util/configparser.c"
     break;
 
-  case 335:
+  case 336: /* server_https_port: VAR_HTTPS_PORT STRING_ARG  */
 #line 981 "./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 3643 "util/configparser.c"
+#line 3515 "util/configparser.c"
     break;
 
-  case 336:
+  case 337: /* server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG  */
 #line 989 "./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] != '/') {
@@ -3659,96 +3531,96 @@ yyreduce:
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3663 "util/configparser.c"
+#line 3535 "util/configparser.c"
     break;
 
-  case 337:
+  case 338: /* server_http_max_streams: VAR_HTTP_MAX_STREAMS STRING_ARG  */
 #line 1005 "./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 3675 "util/configparser.c"
+#line 3547 "util/configparser.c"
     break;
 
-  case 338:
+  case 339: /* server_http_query_buffer_size: VAR_HTTP_QUERY_BUFFER_SIZE STRING_ARG  */
 #line 1013 "./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 3687 "util/configparser.c"
+#line 3559 "util/configparser.c"
     break;
 
-  case 339:
+  case 340: /* server_http_response_buffer_size: VAR_HTTP_RESPONSE_BUFFER_SIZE STRING_ARG  */
 #line 1021 "./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 3699 "util/configparser.c"
+#line 3571 "util/configparser.c"
     break;
 
-  case 340:
+  case 341: /* server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG  */
 #line 1029 "./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 3711 "util/configparser.c"
+#line 3583 "util/configparser.c"
     break;
 
-  case 341:
+  case 342: /* server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG  */
 #line 1037 "./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 3723 "util/configparser.c"
+#line 3595 "util/configparser.c"
     break;
 
-  case 342:
+  case 343: /* server_use_systemd: VAR_USE_SYSTEMD STRING_ARG  */
 #line 1045 "./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 3735 "util/configparser.c"
+#line 3607 "util/configparser.c"
     break;
 
-  case 343:
+  case 344: /* server_do_daemonize: VAR_DO_DAEMONIZE STRING_ARG  */
 #line 1054 "./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 3747 "util/configparser.c"
+#line 3619 "util/configparser.c"
     break;
 
-  case 344:
+  case 345: /* server_use_syslog: VAR_USE_SYSLOG STRING_ARG  */
 #line 1063 "./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.");
@@ -3760,104 +3632,104 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3764 "util/configparser.c"
+#line 3636 "util/configparser.c"
     break;
 
-  case 345:
+  case 346: /* server_log_time_ascii: VAR_LOG_TIME_ASCII STRING_ARG  */
 #line 1077 "./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 3776 "util/configparser.c"
+#line 3648 "util/configparser.c"
     break;
 
-  case 346:
+  case 347: /* server_log_queries: VAR_LOG_QUERIES STRING_ARG  */
 #line 1086 "./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 3788 "util/configparser.c"
+#line 3660 "util/configparser.c"
     break;
 
-  case 347:
+  case 348: /* server_log_replies: VAR_LOG_REPLIES STRING_ARG  */
 #line 1095 "./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 3800 "util/configparser.c"
+#line 3672 "util/configparser.c"
     break;
 
-  case 348:
+  case 349: /* server_log_tag_queryreply: VAR_LOG_TAG_QUERYREPLY STRING_ARG  */
 #line 1104 "./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 3812 "util/configparser.c"
+#line 3684 "util/configparser.c"
     break;
 
-  case 349:
+  case 350: /* server_log_servfail: VAR_LOG_SERVFAIL STRING_ARG  */
 #line 1113 "./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 3824 "util/configparser.c"
+#line 3696 "util/configparser.c"
     break;
 
-  case 350:
+  case 351: /* server_log_local_actions: VAR_LOG_LOCAL_ACTIONS STRING_ARG  */
 #line 1122 "./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 3836 "util/configparser.c"
+#line 3708 "util/configparser.c"
     break;
 
-  case 351:
+  case 352: /* server_chroot: VAR_CHROOT STRING_ARG  */
 #line 1131 "./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 3846 "util/configparser.c"
+#line 3718 "util/configparser.c"
     break;
 
-  case 352:
+  case 353: /* server_username: VAR_USERNAME STRING_ARG  */
 #line 1138 "./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 3856 "util/configparser.c"
+#line 3728 "util/configparser.c"
     break;
 
-  case 353:
+  case 354: /* server_directory: VAR_DIRECTORY STRING_ARG  */
 #line 1145 "./util/configparser.y"
-    {
+        {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
 		cfg_parser->cfg->directory = (yyvsp[0].str);
@@ -3881,106 +3753,106 @@ yyreduce:
 			}
 		}
 	}
-#line 3885 "util/configparser.c"
+#line 3757 "util/configparser.c"
     break;
 
-  case 354:
+  case 355: /* server_logfile: VAR_LOGFILE STRING_ARG  */
 #line 1171 "./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 3896 "util/configparser.c"
+#line 3768 "util/configparser.c"
     break;
 
-  case 355:
+  case 356: /* server_pidfile: VAR_PIDFILE STRING_ARG  */
 #line 1179 "./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 3906 "util/configparser.c"
+#line 3778 "util/configparser.c"
     break;
 
-  case 356:
+  case 357: /* server_root_hints: VAR_ROOT_HINTS STRING_ARG  */
 #line 1186 "./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 3916 "util/configparser.c"
+#line 3788 "util/configparser.c"
     break;
 
-  case 357:
+  case 358: /* server_dlv_anchor_file: VAR_DLV_ANCHOR_FILE STRING_ARG  */
 #line 1193 "./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 3926 "util/configparser.c"
+#line 3798 "util/configparser.c"
     break;
 
-  case 358:
+  case 359: /* server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG  */
 #line 1200 "./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 3936 "util/configparser.c"
+#line 3808 "util/configparser.c"
     break;
 
-  case 359:
+  case 360: /* server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG  */
 #line 1207 "./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 3947 "util/configparser.c"
+#line 3819 "util/configparser.c"
     break;
 
-  case 360:
+  case 361: /* server_trust_anchor_file: VAR_TRUST_ANCHOR_FILE STRING_ARG  */
 #line 1215 "./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 3958 "util/configparser.c"
+#line 3830 "util/configparser.c"
     break;
 
-  case 361:
+  case 362: /* server_trusted_keys_file: VAR_TRUSTED_KEYS_FILE STRING_ARG  */
 #line 1223 "./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 3969 "util/configparser.c"
+#line 3841 "util/configparser.c"
     break;
 
-  case 362:
+  case 363: /* server_trust_anchor: VAR_TRUST_ANCHOR STRING_ARG  */
 #line 1231 "./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 3979 "util/configparser.c"
+#line 3851 "util/configparser.c"
     break;
 
-  case 363:
+  case 364: /* server_trust_anchor_signaling: VAR_TRUST_ANCHOR_SIGNALING STRING_ARG  */
 #line 1238 "./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.");
@@ -3989,12 +3861,12 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3993 "util/configparser.c"
+#line 3865 "util/configparser.c"
     break;
 
-  case 364:
+  case 365: /* server_root_key_sentinel: VAR_ROOT_KEY_SENTINEL STRING_ARG  */
 #line 1249 "./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.");
@@ -4003,99 +3875,118 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4007 "util/configparser.c"
+#line 3879 "util/configparser.c"
     break;
 
-  case 365:
+  case 366: /* server_domain_insecure: VAR_DOMAIN_INSECURE STRING_ARG  */
 #line 1260 "./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 4017 "util/configparser.c"
+#line 3889 "util/configparser.c"
     break;
 
-  case 366:
+  case 367: /* server_hide_identity: VAR_HIDE_IDENTITY STRING_ARG  */
 #line 1267 "./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 4029 "util/configparser.c"
+#line 3901 "util/configparser.c"
     break;
 
-  case 367:
+  case 368: /* server_hide_version: VAR_HIDE_VERSION STRING_ARG  */
 #line 1276 "./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 4041 "util/configparser.c"
+#line 3913 "util/configparser.c"
     break;
 
-  case 368:
+  case 369: /* server_hide_trustanchor: VAR_HIDE_TRUSTANCHOR STRING_ARG  */
 #line 1285 "./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 4053 "util/configparser.c"
+#line 3925 "util/configparser.c"
     break;
 
-  case 369:
+  case 370: /* server_identity: VAR_IDENTITY STRING_ARG  */
 #line 1294 "./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 4063 "util/configparser.c"
+#line 3935 "util/configparser.c"
     break;
 
-  case 370:
+  case 371: /* server_version: VAR_VERSION STRING_ARG  */
 #line 1301 "./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 4073 "util/configparser.c"
+#line 3945 "util/configparser.c"
     break;
 
-  case 371:
+  case 372: /* server_nsid: VAR_NSID STRING_ARG  */
 #line 1308 "./util/configparser.y"
-    {
+        {
+		OUTYY(("P(server_nsid:%s)\n", (yyvsp[0].str)));
+		free(cfg_parser->cfg->nsid_cfg_str);
+		cfg_parser->cfg->nsid_cfg_str = (yyvsp[0].str);
+		free(cfg_parser->cfg->nsid);
+		cfg_parser->cfg->nsid = NULL;
+		cfg_parser->cfg->nsid_len = 0;
+		if (*(yyvsp[0].str) == 0)
+			; /* pass; empty string is not setting nsid */
+		else if (!(cfg_parser->cfg->nsid = cfg_parse_nsid(
+					(yyvsp[0].str), &cfg_parser->cfg->nsid_len)))
+			yyerror("the NSID must be either a hex string or an "
+			    "ascii character string prepended with ascii_.");
+	}
+#line 3964 "util/configparser.c"
+    break;
+
+  case 373: /* server_so_rcvbuf: VAR_SO_RCVBUF STRING_ARG  */
+#line 1324 "./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 4084 "util/configparser.c"
+#line 3975 "util/configparser.c"
     break;
 
-  case 372:
-#line 1316 "./util/configparser.y"
-    {
+  case 374: /* server_so_sndbuf: VAR_SO_SNDBUF STRING_ARG  */
+#line 1332 "./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 4095 "util/configparser.c"
+#line 3986 "util/configparser.c"
     break;
 
-  case 373:
-#line 1324 "./util/configparser.y"
+  case 375: /* server_so_reuseport: VAR_SO_REUSEPORT STRING_ARG  */
+#line 1340 "./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)
@@ -4104,11 +3995,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4108 "util/configparser.c"
+#line 3999 "util/configparser.c"
     break;
 
-  case 374:
-#line 1334 "./util/configparser.y"
+  case 376: /* server_ip_transparent: VAR_IP_TRANSPARENT STRING_ARG  */
+#line 1350 "./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)
@@ -4117,11 +4008,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4121 "util/configparser.c"
+#line 4012 "util/configparser.c"
     break;
 
-  case 375:
-#line 1344 "./util/configparser.y"
+  case 377: /* server_ip_freebind: VAR_IP_FREEBIND STRING_ARG  */
+#line 1360 "./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)
@@ -4130,12 +4021,12 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 4134 "util/configparser.c"
+#line 4025 "util/configparser.c"
     break;
 
-  case 376:
-#line 1354 "./util/configparser.y"
-    {
+  case 378: /* server_ip_dscp: VAR_IP_DSCP STRING_ARG  */
+#line 1370 "./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");
@@ -4147,23 +4038,23 @@ yyreduce:
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4151 "util/configparser.c"
+#line 4042 "util/configparser.c"
     break;
 
-  case 377:
-#line 1368 "./util/configparser.y"
-    {
+  case 379: /* server_stream_wait_size: VAR_STREAM_WAIT_SIZE STRING_ARG  */
+#line 1384 "./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 4162 "util/configparser.c"
+#line 4053 "util/configparser.c"
     break;
 
-  case 378:
-#line 1376 "./util/configparser.y"
-    {
+  case 380: /* server_edns_buffer_size: VAR_EDNS_BUFFER_SIZE STRING_ARG  */
+#line 1392 "./util/configparser.y"
+        {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4174,12 +4065,12 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4178 "util/configparser.c"
+#line 4069 "util/configparser.c"
     break;
 
-  case 379:
-#line 1389 "./util/configparser.y"
-    {
+  case 381: /* server_msg_buffer_size: VAR_MSG_BUFFER_SIZE STRING_ARG  */
+#line 1405 "./util/configparser.y"
+        {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4188,23 +4079,23 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4192 "util/configparser.c"
+#line 4083 "util/configparser.c"
     break;
 
-  case 380:
-#line 1400 "./util/configparser.y"
-    {
+  case 382: /* server_msg_cache_size: VAR_MSG_CACHE_SIZE STRING_ARG  */
+#line 1416 "./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 4203 "util/configparser.c"
+#line 4094 "util/configparser.c"
     break;
 
-  case 381:
-#line 1408 "./util/configparser.y"
-    {
+  case 383: /* server_msg_cache_slabs: VAR_MSG_CACHE_SLABS STRING_ARG  */
+#line 1424 "./util/configparser.y"
+        {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4215,60 +4106,60 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4219 "util/configparser.c"
+#line 4110 "util/configparser.c"
     break;
 
-  case 382:
-#line 1421 "./util/configparser.y"
-    {
+  case 384: /* server_num_queries_per_thread: VAR_NUM_QUERIES_PER_THREAD STRING_ARG  */
+#line 1437 "./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 4231 "util/configparser.c"
+#line 4122 "util/configparser.c"
     break;
 
-  case 383:
-#line 1430 "./util/configparser.y"
-    {
+  case 385: /* server_jostle_timeout: VAR_JOSTLE_TIMEOUT STRING_ARG  */
+#line 1446 "./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 4243 "util/configparser.c"
+#line 4134 "util/configparser.c"
     break;
 
-  case 384:
-#line 1439 "./util/configparser.y"
-    {
+  case 386: /* server_delay_close: VAR_DELAY_CLOSE STRING_ARG  */
+#line 1455 "./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 4255 "util/configparser.c"
+#line 4146 "util/configparser.c"
     break;
 
-  case 385:
-#line 1448 "./util/configparser.y"
-    {
+  case 387: /* server_udp_connect: VAR_UDP_CONNECT STRING_ARG  */
+#line 1464 "./util/configparser.y"
+        {
 		OUTYY(("P(server_udp_connect:%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_connect = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4267 "util/configparser.c"
+#line 4158 "util/configparser.c"
     break;
 
-  case 386:
-#line 1457 "./util/configparser.y"
-    {
+  case 388: /* server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG  */
+#line 1473 "./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.");
@@ -4276,12 +4167,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4280 "util/configparser.c"
+#line 4171 "util/configparser.c"
     break;
 
-  case 387:
-#line 1467 "./util/configparser.y"
-    {
+  case 389: /* server_insecure_lan_zones: VAR_INSECURE_LAN_ZONES STRING_ARG  */
+#line 1483 "./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.");
@@ -4289,23 +4180,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4293 "util/configparser.c"
+#line 4184 "util/configparser.c"
     break;
 
-  case 388:
-#line 1477 "./util/configparser.y"
-    {
+  case 390: /* server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG  */
+#line 1493 "./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 4304 "util/configparser.c"
+#line 4195 "util/configparser.c"
     break;
 
-  case 389:
-#line 1485 "./util/configparser.y"
-    {
+  case 391: /* server_rrset_cache_slabs: VAR_RRSET_CACHE_SLABS STRING_ARG  */
+#line 1501 "./util/configparser.y"
+        {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4316,58 +4207,58 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4320 "util/configparser.c"
+#line 4211 "util/configparser.c"
     break;
 
-  case 390:
-#line 1498 "./util/configparser.y"
-    {
+  case 392: /* server_infra_host_ttl: VAR_INFRA_HOST_TTL STRING_ARG  */
+#line 1514 "./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 4332 "util/configparser.c"
+#line 4223 "util/configparser.c"
     break;
 
-  case 391:
-#line 1507 "./util/configparser.y"
-    {
+  case 393: /* server_infra_lame_ttl: VAR_INFRA_LAME_TTL STRING_ARG  */
+#line 1523 "./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 4343 "util/configparser.c"
+#line 4234 "util/configparser.c"
     break;
 
-  case 392:
-#line 1515 "./util/configparser.y"
-    {
+  case 394: /* server_infra_cache_numhosts: VAR_INFRA_CACHE_NUMHOSTS STRING_ARG  */
+#line 1531 "./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 4355 "util/configparser.c"
+#line 4246 "util/configparser.c"
     break;
 
-  case 393:
-#line 1524 "./util/configparser.y"
-    {
+  case 395: /* server_infra_cache_lame_size: VAR_INFRA_CACHE_LAME_SIZE STRING_ARG  */
+#line 1540 "./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 4366 "util/configparser.c"
+#line 4257 "util/configparser.c"
     break;
 
-  case 394:
-#line 1532 "./util/configparser.y"
-    {
+  case 396: /* server_infra_cache_slabs: VAR_INFRA_CACHE_SLABS STRING_ARG  */
+#line 1548 "./util/configparser.y"
+        {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4378,24 +4269,24 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4382 "util/configparser.c"
+#line 4273 "util/configparser.c"
     break;
 
-  case 395:
-#line 1545 "./util/configparser.y"
-    {
+  case 397: /* server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG  */
+#line 1561 "./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 4394 "util/configparser.c"
+#line 4285 "util/configparser.c"
     break;
 
-  case 396:
-#line 1554 "./util/configparser.y"
-    {
+  case 398: /* server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG  */
+#line 1570 "./util/configparser.y"
+        {
 		OUTYY(("P(server_infra_keep_probing:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
@@ -4403,22 +4294,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4407 "util/configparser.c"
+#line 4298 "util/configparser.c"
     break;
 
-  case 397:
-#line 1564 "./util/configparser.y"
-    {
+  case 399: /* server_target_fetch_policy: VAR_TARGET_FETCH_POLICY STRING_ARG  */
+#line 1580 "./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 4417 "util/configparser.c"
+#line 4308 "util/configparser.c"
     break;
 
-  case 398:
-#line 1571 "./util/configparser.y"
-    {
+  case 400: /* server_harden_short_bufsize: VAR_HARDEN_SHORT_BUFSIZE STRING_ARG  */
+#line 1587 "./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.");
@@ -4426,12 +4317,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4430 "util/configparser.c"
+#line 4321 "util/configparser.c"
     break;
 
-  case 399:
-#line 1581 "./util/configparser.y"
-    {
+  case 401: /* server_harden_large_queries: VAR_HARDEN_LARGE_QUERIES STRING_ARG  */
+#line 1597 "./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.");
@@ -4439,12 +4330,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4443 "util/configparser.c"
+#line 4334 "util/configparser.c"
     break;
 
-  case 400:
-#line 1591 "./util/configparser.y"
-    {
+  case 402: /* server_harden_glue: VAR_HARDEN_GLUE STRING_ARG  */
+#line 1607 "./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.");
@@ -4452,12 +4343,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4456 "util/configparser.c"
+#line 4347 "util/configparser.c"
     break;
 
-  case 401:
-#line 1601 "./util/configparser.y"
-    {
+  case 403: /* server_harden_dnssec_stripped: VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG  */
+#line 1617 "./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.");
@@ -4465,12 +4356,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4469 "util/configparser.c"
+#line 4360 "util/configparser.c"
     break;
 
-  case 402:
-#line 1611 "./util/configparser.y"
-    {
+  case 404: /* server_harden_below_nxdomain: VAR_HARDEN_BELOW_NXDOMAIN STRING_ARG  */
+#line 1627 "./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.");
@@ -4478,12 +4369,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4482 "util/configparser.c"
+#line 4373 "util/configparser.c"
     break;
 
-  case 403:
-#line 1621 "./util/configparser.y"
-    {
+  case 405: /* server_harden_referral_path: VAR_HARDEN_REFERRAL_PATH STRING_ARG  */
+#line 1637 "./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.");
@@ -4491,12 +4382,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4495 "util/configparser.c"
+#line 4386 "util/configparser.c"
     break;
 
-  case 404:
-#line 1631 "./util/configparser.y"
-    {
+  case 406: /* server_harden_algo_downgrade: VAR_HARDEN_ALGO_DOWNGRADE STRING_ARG  */
+#line 1647 "./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.");
@@ -4504,12 +4395,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4508 "util/configparser.c"
+#line 4399 "util/configparser.c"
     break;
 
-  case 405:
-#line 1641 "./util/configparser.y"
-    {
+  case 407: /* server_use_caps_for_id: VAR_USE_CAPS_FOR_ID STRING_ARG  */
+#line 1657 "./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.");
@@ -4517,100 +4408,100 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4521 "util/configparser.c"
+#line 4412 "util/configparser.c"
     break;
 
-  case 406:
-#line 1651 "./util/configparser.y"
-    {
+  case 408: /* server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG  */
+#line 1667 "./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 4531 "util/configparser.c"
+#line 4422 "util/configparser.c"
     break;
 
-  case 407:
-#line 1658 "./util/configparser.y"
-    {
+  case 409: /* server_private_address: VAR_PRIVATE_ADDRESS STRING_ARG  */
+#line 1674 "./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 4541 "util/configparser.c"
+#line 4432 "util/configparser.c"
     break;
 
-  case 408:
-#line 1665 "./util/configparser.y"
-    {
+  case 410: /* server_private_domain: VAR_PRIVATE_DOMAIN STRING_ARG  */
+#line 1681 "./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 4551 "util/configparser.c"
+#line 4442 "util/configparser.c"
     break;
 
-  case 409:
-#line 1672 "./util/configparser.y"
-    {
+  case 411: /* server_prefetch: VAR_PREFETCH STRING_ARG  */
+#line 1688 "./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 4563 "util/configparser.c"
+#line 4454 "util/configparser.c"
     break;
 
-  case 410:
-#line 1681 "./util/configparser.y"
-    {
+  case 412: /* server_prefetch_key: VAR_PREFETCH_KEY STRING_ARG  */
+#line 1697 "./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 4575 "util/configparser.c"
+#line 4466 "util/configparser.c"
     break;
 
-  case 411:
-#line 1690 "./util/configparser.y"
-    {
+  case 413: /* server_deny_any: VAR_DENY_ANY STRING_ARG  */
+#line 1706 "./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 4587 "util/configparser.c"
+#line 4478 "util/configparser.c"
     break;
 
-  case 412:
-#line 1699 "./util/configparser.y"
-    {
+  case 414: /* server_unwanted_reply_threshold: VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG  */
+#line 1715 "./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 4599 "util/configparser.c"
+#line 4490 "util/configparser.c"
     break;
 
-  case 413:
-#line 1708 "./util/configparser.y"
-    {
+  case 415: /* server_do_not_query_address: VAR_DO_NOT_QUERY_ADDRESS STRING_ARG  */
+#line 1724 "./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 4609 "util/configparser.c"
+#line 4500 "util/configparser.c"
     break;
 
-  case 414:
-#line 1715 "./util/configparser.y"
-    {
+  case 416: /* server_do_not_query_localhost: VAR_DO_NOT_QUERY_LOCALHOST STRING_ARG  */
+#line 1731 "./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.");
@@ -4618,12 +4509,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4622 "util/configparser.c"
+#line 4513 "util/configparser.c"
     break;
 
-  case 415:
-#line 1725 "./util/configparser.y"
-    {
+  case 417: /* server_access_control: VAR_ACCESS_CONTROL STRING_ARG STRING_ARG  */
+#line 1741 "./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 &&
@@ -4641,22 +4532,22 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 4645 "util/configparser.c"
+#line 4536 "util/configparser.c"
     break;
 
-  case 416:
-#line 1745 "./util/configparser.y"
-    {
+  case 418: /* server_module_conf: VAR_MODULE_CONF STRING_ARG  */
+#line 1761 "./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 4655 "util/configparser.c"
+#line 4546 "util/configparser.c"
     break;
 
-  case 417:
-#line 1752 "./util/configparser.y"
-    {
+  case 419: /* server_val_override_date: VAR_VAL_OVERRIDE_DATE STRING_ARG  */
+#line 1768 "./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;
@@ -4672,12 +4563,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4676 "util/configparser.c"
+#line 4567 "util/configparser.c"
     break;
 
-  case 418:
-#line 1770 "./util/configparser.y"
-    {
+  case 420: /* server_val_sig_skew_min: VAR_VAL_SIG_SKEW_MIN STRING_ARG  */
+#line 1786 "./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;
@@ -4688,12 +4579,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4692 "util/configparser.c"
+#line 4583 "util/configparser.c"
     break;
 
-  case 419:
-#line 1783 "./util/configparser.y"
-    {
+  case 421: /* server_val_sig_skew_max: VAR_VAL_SIG_SKEW_MAX STRING_ARG  */
+#line 1799 "./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;
@@ -4704,60 +4595,60 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4708 "util/configparser.c"
+#line 4599 "util/configparser.c"
     break;
 
-  case 420:
-#line 1796 "./util/configparser.y"
-    {
+  case 422: /* server_cache_max_ttl: VAR_CACHE_MAX_TTL STRING_ARG  */
+#line 1812 "./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 4720 "util/configparser.c"
+#line 4611 "util/configparser.c"
     break;
 
-  case 421:
-#line 1805 "./util/configparser.y"
-    {
+  case 423: /* server_cache_max_negative_ttl: VAR_CACHE_MAX_NEGATIVE_TTL STRING_ARG  */
+#line 1821 "./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 4732 "util/configparser.c"
+#line 4623 "util/configparser.c"
     break;
 
-  case 422:
-#line 1814 "./util/configparser.y"
-    {
+  case 424: /* server_cache_min_ttl: VAR_CACHE_MIN_TTL STRING_ARG  */
+#line 1830 "./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 4744 "util/configparser.c"
+#line 4635 "util/configparser.c"
     break;
 
-  case 423:
-#line 1823 "./util/configparser.y"
-    {
+  case 425: /* server_bogus_ttl: VAR_BOGUS_TTL STRING_ARG  */
+#line 1839 "./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 4756 "util/configparser.c"
+#line 4647 "util/configparser.c"
     break;
 
-  case 424:
-#line 1832 "./util/configparser.y"
-    {
+  case 426: /* server_val_clean_additional: VAR_VAL_CLEAN_ADDITIONAL STRING_ARG  */
+#line 1848 "./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.");
@@ -4765,12 +4656,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4769 "util/configparser.c"
+#line 4660 "util/configparser.c"
     break;
 
-  case 425:
-#line 1842 "./util/configparser.y"
-    {
+  case 427: /* server_val_permissive_mode: VAR_VAL_PERMISSIVE_MODE STRING_ARG  */
+#line 1858 "./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.");
@@ -4778,12 +4669,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4782 "util/configparser.c"
+#line 4673 "util/configparser.c"
     break;
 
-  case 426:
-#line 1852 "./util/configparser.y"
-    {
+  case 428: /* server_aggressive_nsec: VAR_AGGRESSIVE_NSEC STRING_ARG  */
+#line 1868 "./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.");
@@ -4792,84 +4683,84 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4796 "util/configparser.c"
+#line 4687 "util/configparser.c"
     break;
 
-  case 427:
-#line 1863 "./util/configparser.y"
-    {
+  case 429: /* server_ignore_cd_flag: VAR_IGNORE_CD_FLAG STRING_ARG  */
+#line 1879 "./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 4808 "util/configparser.c"
+#line 4699 "util/configparser.c"
     break;
 
-  case 428:
-#line 1872 "./util/configparser.y"
-    {
+  case 430: /* server_serve_expired: VAR_SERVE_EXPIRED STRING_ARG  */
+#line 1888 "./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 4820 "util/configparser.c"
+#line 4711 "util/configparser.c"
     break;
 
-  case 429:
-#line 1881 "./util/configparser.y"
-    {
+  case 431: /* server_serve_expired_ttl: VAR_SERVE_EXPIRED_TTL STRING_ARG  */
+#line 1897 "./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 4832 "util/configparser.c"
+#line 4723 "util/configparser.c"
     break;
 
-  case 430:
-#line 1890 "./util/configparser.y"
-    {
+  case 432: /* server_serve_expired_ttl_reset: VAR_SERVE_EXPIRED_TTL_RESET STRING_ARG  */
+#line 1906 "./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 4844 "util/configparser.c"
+#line 4735 "util/configparser.c"
     break;
 
-  case 431:
-#line 1899 "./util/configparser.y"
-    {
+  case 433: /* server_serve_expired_reply_ttl: VAR_SERVE_EXPIRED_REPLY_TTL STRING_ARG  */
+#line 1915 "./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 4856 "util/configparser.c"
+#line 4747 "util/configparser.c"
     break;
 
-  case 432:
-#line 1908 "./util/configparser.y"
-    {
+  case 434: /* server_serve_expired_client_timeout: VAR_SERVE_EXPIRED_CLIENT_TIMEOUT STRING_ARG  */
+#line 1924 "./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 4868 "util/configparser.c"
+#line 4759 "util/configparser.c"
     break;
 
-  case 433:
-#line 1917 "./util/configparser.y"
-    {
+  case 435: /* server_fake_dsa: VAR_FAKE_DSA STRING_ARG  */
+#line 1933 "./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.");
@@ -4880,12 +4771,12 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4884 "util/configparser.c"
+#line 4775 "util/configparser.c"
     break;
 
-  case 434:
-#line 1930 "./util/configparser.y"
-    {
+  case 436: /* server_fake_sha1: VAR_FAKE_SHA1 STRING_ARG  */
+#line 1946 "./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.");
@@ -4896,70 +4787,70 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 4900 "util/configparser.c"
+#line 4791 "util/configparser.c"
     break;
 
-  case 435:
-#line 1943 "./util/configparser.y"
-    {
+  case 437: /* server_val_log_level: VAR_VAL_LOG_LEVEL STRING_ARG  */
+#line 1959 "./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 4912 "util/configparser.c"
+#line 4803 "util/configparser.c"
     break;
 
-  case 436:
-#line 1952 "./util/configparser.y"
-    {
+  case 438: /* server_val_nsec3_keysize_iterations: VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG  */
+#line 1968 "./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 4922 "util/configparser.c"
+#line 4813 "util/configparser.c"
     break;
 
-  case 437:
-#line 1959 "./util/configparser.y"
-    {
+  case 439: /* server_add_holddown: VAR_ADD_HOLDDOWN STRING_ARG  */
+#line 1975 "./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 4934 "util/configparser.c"
+#line 4825 "util/configparser.c"
     break;
 
-  case 438:
-#line 1968 "./util/configparser.y"
-    {
+  case 440: /* server_del_holddown: VAR_DEL_HOLDDOWN STRING_ARG  */
+#line 1984 "./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 4946 "util/configparser.c"
+#line 4837 "util/configparser.c"
     break;
 
-  case 439:
-#line 1977 "./util/configparser.y"
-    {
+  case 441: /* server_keep_missing: VAR_KEEP_MISSING STRING_ARG  */
+#line 1993 "./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 4958 "util/configparser.c"
+#line 4849 "util/configparser.c"
     break;
 
-  case 440:
-#line 1986 "./util/configparser.y"
-    {
+  case 442: /* server_permit_small_holddown: VAR_PERMIT_SMALL_HOLDDOWN STRING_ARG  */
+#line 2002 "./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.");
@@ -4967,23 +4858,23 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4971 "util/configparser.c"
+#line 4862 "util/configparser.c"
     break;
 
-  case 441:
-#line 1995 "./util/configparser.y"
-    {
+  case 443: /* server_key_cache_size: VAR_KEY_CACHE_SIZE STRING_ARG  */
+#line 2011 "./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 4982 "util/configparser.c"
+#line 4873 "util/configparser.c"
     break;
 
-  case 442:
-#line 2003 "./util/configparser.y"
-    {
+  case 444: /* server_key_cache_slabs: VAR_KEY_CACHE_SLABS STRING_ARG  */
+#line 2019 "./util/configparser.y"
+        {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -4994,23 +4885,23 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4998 "util/configparser.c"
+#line 4889 "util/configparser.c"
     break;
 
-  case 443:
-#line 2016 "./util/configparser.y"
-    {
+  case 445: /* server_neg_cache_size: VAR_NEG_CACHE_SIZE STRING_ARG  */
+#line 2032 "./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 5009 "util/configparser.c"
+#line 4900 "util/configparser.c"
     break;
 
-  case 444:
-#line 2024 "./util/configparser.y"
-    {
+  case 446: /* server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG  */
+#line 2040 "./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 &&
@@ -5049,22 +4940,22 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5053 "util/configparser.c"
+#line 4944 "util/configparser.c"
     break;
 
-  case 445:
-#line 2065 "./util/configparser.y"
-    {
+  case 447: /* server_local_data: VAR_LOCAL_DATA STRING_ARG  */
+#line 2081 "./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 5063 "util/configparser.c"
+#line 4954 "util/configparser.c"
     break;
 
-  case 446:
-#line 2072 "./util/configparser.y"
-    {
+  case 448: /* server_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG  */
+#line 2088 "./util/configparser.y"
+        {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -5077,12 +4968,12 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5081 "util/configparser.c"
+#line 4972 "util/configparser.c"
     break;
 
-  case 447:
-#line 2087 "./util/configparser.y"
-    {
+  case 449: /* server_minimal_responses: VAR_MINIMAL_RESPONSES STRING_ARG  */
+#line 2103 "./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.");
@@ -5090,12 +4981,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5094 "util/configparser.c"
+#line 4985 "util/configparser.c"
     break;
 
-  case 448:
-#line 2097 "./util/configparser.y"
-    {
+  case 450: /* server_rrset_roundrobin: VAR_RRSET_ROUNDROBIN STRING_ARG  */
+#line 2113 "./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.");
@@ -5103,65 +4994,65 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5107 "util/configparser.c"
+#line 4998 "util/configparser.c"
     break;
 
-  case 449:
-#line 2107 "./util/configparser.y"
-    {
+  case 451: /* server_unknown_server_time_limit: VAR_UNKNOWN_SERVER_TIME_LIMIT STRING_ARG  */
+#line 2123 "./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 5117 "util/configparser.c"
+#line 5008 "util/configparser.c"
     break;
 
-  case 450:
-#line 2114 "./util/configparser.y"
-    {
+  case 452: /* server_max_udp_size: VAR_MAX_UDP_SIZE STRING_ARG  */
+#line 2130 "./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 5127 "util/configparser.c"
+#line 5018 "util/configparser.c"
     break;
 
-  case 451:
-#line 2121 "./util/configparser.y"
-    {
+  case 453: /* server_dns64_prefix: VAR_DNS64_PREFIX STRING_ARG  */
+#line 2137 "./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 5137 "util/configparser.c"
+#line 5028 "util/configparser.c"
     break;
 
-  case 452:
-#line 2128 "./util/configparser.y"
-    {
+  case 454: /* server_dns64_synthall: VAR_DNS64_SYNTHALL STRING_ARG  */
+#line 2144 "./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 5149 "util/configparser.c"
+#line 5040 "util/configparser.c"
     break;
 
-  case 453:
-#line 2137 "./util/configparser.y"
-    {
+  case 455: /* server_dns64_ignore_aaaa: VAR_DNS64_IGNORE_AAAA STRING_ARG  */
+#line 2153 "./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 5160 "util/configparser.c"
+#line 5051 "util/configparser.c"
     break;
 
-  case 454:
-#line 2145 "./util/configparser.y"
-    {
+  case 456: /* server_define_tag: VAR_DEFINE_TAG STRING_ARG  */
+#line 2161 "./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) {
@@ -5173,12 +5064,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5177 "util/configparser.c"
+#line 5068 "util/configparser.c"
     break;
 
-  case 455:
-#line 2159 "./util/configparser.y"
-    {
+  case 457: /* server_local_zone_tag: VAR_LOCAL_ZONE_TAG STRING_ARG STRING_ARG  */
+#line 2175 "./util/configparser.y"
+        {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5197,12 +5088,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5201 "util/configparser.c"
+#line 5092 "util/configparser.c"
     break;
 
-  case 456:
-#line 2180 "./util/configparser.y"
-    {
+  case 458: /* server_access_control_tag: VAR_ACCESS_CONTROL_TAG STRING_ARG STRING_ARG  */
+#line 2196 "./util/configparser.y"
+        {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5221,12 +5112,12 @@ yyreduce:
 			}
 		}
 	}
-#line 5225 "util/configparser.c"
+#line 5116 "util/configparser.c"
     break;
 
-  case 457:
-#line 2201 "./util/configparser.y"
-    {
+  case 459: /* server_access_control_tag_action: VAR_ACCESS_CONTROL_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG  */
+#line 2217 "./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))) {
@@ -5236,12 +5127,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5240 "util/configparser.c"
+#line 5131 "util/configparser.c"
     break;
 
-  case 458:
-#line 2213 "./util/configparser.y"
-    {
+  case 460: /* server_access_control_tag_data: VAR_ACCESS_CONTROL_TAG_DATA STRING_ARG STRING_ARG STRING_ARG  */
+#line 2229 "./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))) {
@@ -5251,12 +5142,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5255 "util/configparser.c"
+#line 5146 "util/configparser.c"
     break;
 
-  case 459:
-#line 2225 "./util/configparser.y"
-    {
+  case 461: /* server_local_zone_override: VAR_LOCAL_ZONE_OVERRIDE STRING_ARG STRING_ARG STRING_ARG  */
+#line 2241 "./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))) {
@@ -5266,24 +5157,24 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5270 "util/configparser.c"
+#line 5161 "util/configparser.c"
     break;
 
-  case 460:
-#line 2237 "./util/configparser.y"
-    {
+  case 462: /* server_access_control_view: VAR_ACCESS_CONTROL_VIEW STRING_ARG STRING_ARG  */
+#line 2253 "./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 5282 "util/configparser.c"
+#line 5173 "util/configparser.c"
     break;
 
-  case 461:
-#line 2246 "./util/configparser.y"
-    {
+  case 463: /* server_response_ip_tag: VAR_RESPONSE_IP_TAG STRING_ARG STRING_ARG  */
+#line 2262 "./util/configparser.y"
+        {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
 			&len);
@@ -5302,58 +5193,58 @@ yyreduce:
 			}
 		}
 	}
-#line 5306 "util/configparser.c"
+#line 5197 "util/configparser.c"
     break;
 
-  case 462:
-#line 2267 "./util/configparser.y"
-    { 
+  case 464: /* server_ip_ratelimit: VAR_IP_RATELIMIT STRING_ARG  */
+#line 2283 "./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 5318 "util/configparser.c"
+#line 5209 "util/configparser.c"
     break;
 
-  case 463:
-#line 2277 "./util/configparser.y"
-    { 
+  case 465: /* server_ratelimit: VAR_RATELIMIT STRING_ARG  */
+#line 2293 "./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 5330 "util/configparser.c"
+#line 5221 "util/configparser.c"
     break;
 
-  case 464:
-#line 2286 "./util/configparser.y"
-    {
+  case 466: /* server_ip_ratelimit_size: VAR_IP_RATELIMIT_SIZE STRING_ARG  */
+#line 2302 "./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 5341 "util/configparser.c"
+#line 5232 "util/configparser.c"
     break;
 
-  case 465:
-#line 2294 "./util/configparser.y"
-    {
+  case 467: /* server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG  */
+#line 2310 "./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 5352 "util/configparser.c"
+#line 5243 "util/configparser.c"
     break;
 
-  case 466:
-#line 2302 "./util/configparser.y"
-    {
+  case 468: /* server_ip_ratelimit_slabs: VAR_IP_RATELIMIT_SLABS STRING_ARG  */
+#line 2318 "./util/configparser.y"
+  {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -5364,12 +5255,12 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5368 "util/configparser.c"
+#line 5259 "util/configparser.c"
     break;
 
-  case 467:
-#line 2315 "./util/configparser.y"
-    {
+  case 469: /* server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG  */
+#line 2331 "./util/configparser.y"
+        {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
 			yyerror("number expected");
@@ -5380,12 +5271,12 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5384 "util/configparser.c"
+#line 5275 "util/configparser.c"
     break;
 
-  case 468:
-#line 2328 "./util/configparser.y"
-    {
+  case 470: /* server_ratelimit_for_domain: VAR_RATELIMIT_FOR_DOMAIN STRING_ARG STRING_ARG  */
+#line 2344 "./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");
@@ -5398,12 +5289,12 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5402 "util/configparser.c"
+#line 5293 "util/configparser.c"
     break;
 
-  case 469:
-#line 2343 "./util/configparser.y"
-    {
+  case 471: /* server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG  */
+#line 2359 "./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");
@@ -5416,69 +5307,69 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5420 "util/configparser.c"
+#line 5311 "util/configparser.c"
     break;
 
-  case 470:
-#line 2358 "./util/configparser.y"
-    { 
+  case 472: /* server_ip_ratelimit_factor: VAR_IP_RATELIMIT_FACTOR STRING_ARG  */
+#line 2374 "./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 5432 "util/configparser.c"
+#line 5323 "util/configparser.c"
     break;
 
-  case 471:
-#line 2367 "./util/configparser.y"
-    { 
+  case 473: /* server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG  */
+#line 2383 "./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 5444 "util/configparser.c"
+#line 5335 "util/configparser.c"
     break;
 
-  case 472:
-#line 2376 "./util/configparser.y"
-    { 
+  case 474: /* server_low_rtt: VAR_LOW_RTT STRING_ARG  */
+#line 2392 "./util/configparser.y"
+        { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5453 "util/configparser.c"
+#line 5344 "util/configparser.c"
     break;
 
-  case 473:
-#line 2382 "./util/configparser.y"
-    { 
+  case 475: /* server_fast_server_num: VAR_FAST_SERVER_NUM STRING_ARG  */
+#line 2398 "./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 5465 "util/configparser.c"
+#line 5356 "util/configparser.c"
     break;
 
-  case 474:
-#line 2391 "./util/configparser.y"
-    { 
+  case 476: /* server_fast_server_permil: VAR_FAST_SERVER_PERMIL STRING_ARG  */
+#line 2407 "./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 5477 "util/configparser.c"
+#line 5368 "util/configparser.c"
     break;
 
-  case 475:
-#line 2400 "./util/configparser.y"
-    {
+  case 477: /* server_qname_minimisation: VAR_QNAME_MINIMISATION STRING_ARG  */
+#line 2416 "./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.");
@@ -5486,12 +5377,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5490 "util/configparser.c"
+#line 5381 "util/configparser.c"
     break;
 
-  case 476:
-#line 2410 "./util/configparser.y"
-    {
+  case 478: /* server_qname_minimisation_strict: VAR_QNAME_MINIMISATION_STRICT STRING_ARG  */
+#line 2426 "./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.");
@@ -5499,12 +5390,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5503 "util/configparser.c"
+#line 5394 "util/configparser.c"
     break;
 
-  case 477:
-#line 2420 "./util/configparser.y"
-    {
+  case 479: /* server_ipsecmod_enabled: VAR_IPSECMOD_ENABLED STRING_ARG  */
+#line 2436 "./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)
@@ -5515,12 +5406,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5519 "util/configparser.c"
+#line 5410 "util/configparser.c"
     break;
 
-  case 478:
-#line 2433 "./util/configparser.y"
-    {
+  case 480: /* server_ipsecmod_ignore_bogus: VAR_IPSECMOD_IGNORE_BOGUS STRING_ARG  */
+#line 2449 "./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)
@@ -5531,12 +5422,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5535 "util/configparser.c"
+#line 5426 "util/configparser.c"
     break;
 
-  case 479:
-#line 2446 "./util/configparser.y"
-    {
+  case 481: /* server_ipsecmod_hook: VAR_IPSECMOD_HOOK STRING_ARG  */
+#line 2462 "./util/configparser.y"
+        {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ipsecmod_hook);
@@ -5546,12 +5437,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5550 "util/configparser.c"
+#line 5441 "util/configparser.c"
     break;
 
-  case 480:
-#line 2458 "./util/configparser.y"
-    {
+  case 482: /* server_ipsecmod_max_ttl: VAR_IPSECMOD_MAX_TTL STRING_ARG  */
+#line 2474 "./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)
@@ -5563,12 +5454,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5567 "util/configparser.c"
+#line 5458 "util/configparser.c"
     break;
 
-  case 481:
-#line 2472 "./util/configparser.y"
-    {
+  case 483: /* server_ipsecmod_whitelist: VAR_IPSECMOD_WHITELIST STRING_ARG  */
+#line 2488 "./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)))
@@ -5578,12 +5469,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5582 "util/configparser.c"
+#line 5473 "util/configparser.c"
     break;
 
-  case 482:
-#line 2484 "./util/configparser.y"
-    {
+  case 484: /* server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG  */
+#line 2500 "./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)
@@ -5595,24 +5486,24 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5599 "util/configparser.c"
+#line 5490 "util/configparser.c"
     break;
 
-  case 483:
-#line 2498 "./util/configparser.y"
-    {
+  case 485: /* server_edns_client_string: VAR_EDNS_CLIENT_STRING STRING_ARG STRING_ARG  */
+#line 2514 "./util/configparser.y"
+        {
 		OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->edns_client_strings, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding "
 				"edns-client-string");
 	}
-#line 5611 "util/configparser.c"
+#line 5502 "util/configparser.c"
     break;
 
-  case 484:
-#line 2507 "./util/configparser.y"
-    {
+  case 486: /* server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG  */
+#line 2523 "./util/configparser.y"
+        {
 		OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
 			yyerror("option code expected");
@@ -5622,12 +5513,12 @@ yyreduce:
 		free((yyvsp[0].str));
 
 	}
-#line 5626 "util/configparser.c"
+#line 5517 "util/configparser.c"
     break;
 
-  case 485:
-#line 2519 "./util/configparser.y"
-    {
+  case 487: /* stub_name: VAR_NAME STRING_ARG  */
+#line 2535 "./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 "
@@ -5635,56 +5526,56 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5639 "util/configparser.c"
+#line 5530 "util/configparser.c"
     break;
 
-  case 486:
-#line 2529 "./util/configparser.y"
-    {
+  case 488: /* stub_host: VAR_STUB_HOST STRING_ARG  */
+#line 2545 "./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 5649 "util/configparser.c"
+#line 5540 "util/configparser.c"
     break;
 
-  case 487:
-#line 2536 "./util/configparser.y"
-    {
+  case 489: /* stub_addr: VAR_STUB_ADDR STRING_ARG  */
+#line 2552 "./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 5659 "util/configparser.c"
+#line 5550 "util/configparser.c"
     break;
 
-  case 488:
-#line 2543 "./util/configparser.y"
-    {
+  case 490: /* stub_first: VAR_STUB_FIRST STRING_ARG  */
+#line 2559 "./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 5671 "util/configparser.c"
+#line 5562 "util/configparser.c"
     break;
 
-  case 489:
-#line 2552 "./util/configparser.y"
-    {
+  case 491: /* stub_no_cache: VAR_STUB_NO_CACHE STRING_ARG  */
+#line 2568 "./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 5683 "util/configparser.c"
+#line 5574 "util/configparser.c"
     break;
 
-  case 490:
-#line 2561 "./util/configparser.y"
-    {
+  case 492: /* stub_ssl_upstream: VAR_STUB_SSL_UPSTREAM STRING_ARG  */
+#line 2577 "./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.");
@@ -5692,12 +5583,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5696 "util/configparser.c"
+#line 5587 "util/configparser.c"
     break;
 
-  case 491:
-#line 2571 "./util/configparser.y"
-    {
+  case 493: /* stub_prime: VAR_STUB_PRIME STRING_ARG  */
+#line 2587 "./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.");
@@ -5705,12 +5596,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5709 "util/configparser.c"
+#line 5600 "util/configparser.c"
     break;
 
-  case 492:
-#line 2581 "./util/configparser.y"
-    {
+  case 494: /* forward_name: VAR_NAME STRING_ARG  */
+#line 2597 "./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 "
@@ -5718,56 +5609,56 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5722 "util/configparser.c"
+#line 5613 "util/configparser.c"
     break;
 
-  case 493:
-#line 2591 "./util/configparser.y"
-    {
+  case 495: /* forward_host: VAR_FORWARD_HOST STRING_ARG  */
+#line 2607 "./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 5732 "util/configparser.c"
+#line 5623 "util/configparser.c"
     break;
 
-  case 494:
-#line 2598 "./util/configparser.y"
-    {
+  case 496: /* forward_addr: VAR_FORWARD_ADDR STRING_ARG  */
+#line 2614 "./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 5742 "util/configparser.c"
+#line 5633 "util/configparser.c"
     break;
 
-  case 495:
-#line 2605 "./util/configparser.y"
-    {
+  case 497: /* forward_first: VAR_FORWARD_FIRST STRING_ARG  */
+#line 2621 "./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 5754 "util/configparser.c"
+#line 5645 "util/configparser.c"
     break;
 
-  case 496:
-#line 2614 "./util/configparser.y"
-    {
+  case 498: /* forward_no_cache: VAR_FORWARD_NO_CACHE STRING_ARG  */
+#line 2630 "./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 5766 "util/configparser.c"
+#line 5657 "util/configparser.c"
     break;
 
-  case 497:
-#line 2623 "./util/configparser.y"
-    {
+  case 499: /* forward_ssl_upstream: VAR_FORWARD_SSL_UPSTREAM STRING_ARG  */
+#line 2639 "./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.");
@@ -5775,12 +5666,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5779 "util/configparser.c"
+#line 5670 "util/configparser.c"
     break;
 
-  case 498:
-#line 2633 "./util/configparser.y"
-    {
+  case 500: /* auth_name: VAR_NAME STRING_ARG  */
+#line 2649 "./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 "
@@ -5788,53 +5679,53 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5792 "util/configparser.c"
+#line 5683 "util/configparser.c"
     break;
 
-  case 499:
-#line 2643 "./util/configparser.y"
-    {
+  case 501: /* auth_zonefile: VAR_ZONEFILE STRING_ARG  */
+#line 2659 "./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 5802 "util/configparser.c"
+#line 5693 "util/configparser.c"
     break;
 
-  case 500:
-#line 2650 "./util/configparser.y"
-    {
+  case 502: /* auth_master: VAR_MASTER STRING_ARG  */
+#line 2666 "./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 5812 "util/configparser.c"
+#line 5703 "util/configparser.c"
     break;
 
-  case 501:
-#line 2657 "./util/configparser.y"
-    {
+  case 503: /* auth_url: VAR_URL STRING_ARG  */
+#line 2673 "./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 5822 "util/configparser.c"
+#line 5713 "util/configparser.c"
     break;
 
-  case 502:
-#line 2664 "./util/configparser.y"
-    {
+  case 504: /* auth_allow_notify: VAR_ALLOW_NOTIFY STRING_ARG  */
+#line 2680 "./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 5833 "util/configparser.c"
+#line 5724 "util/configparser.c"
     break;
 
-  case 503:
-#line 2672 "./util/configparser.y"
-    {
+  case 505: /* auth_for_downstream: VAR_FOR_DOWNSTREAM STRING_ARG  */
+#line 2688 "./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.");
@@ -5842,12 +5733,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5846 "util/configparser.c"
+#line 5737 "util/configparser.c"
     break;
 
-  case 504:
-#line 2682 "./util/configparser.y"
-    {
+  case 506: /* auth_for_upstream: VAR_FOR_UPSTREAM STRING_ARG  */
+#line 2698 "./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.");
@@ -5855,12 +5746,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5859 "util/configparser.c"
+#line 5750 "util/configparser.c"
     break;
 
-  case 505:
-#line 2692 "./util/configparser.y"
-    {
+  case 507: /* auth_fallback_enabled: VAR_FALLBACK_ENABLED STRING_ARG  */
+#line 2708 "./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.");
@@ -5868,12 +5759,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5872 "util/configparser.c"
+#line 5763 "util/configparser.c"
     break;
 
-  case 506:
-#line 2702 "./util/configparser.y"
-    {
+  case 508: /* view_name: VAR_NAME STRING_ARG  */
+#line 2718 "./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 "
@@ -5881,12 +5772,12 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5885 "util/configparser.c"
+#line 5776 "util/configparser.c"
     break;
 
-  case 507:
-#line 2712 "./util/configparser.y"
-    {
+  case 509: /* view_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG  */
+#line 2728 "./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 &&
@@ -5923,12 +5814,12 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5927 "util/configparser.c"
+#line 5818 "util/configparser.c"
     break;
 
-  case 508:
-#line 2751 "./util/configparser.y"
-    {
+  case 510: /* view_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG  */
+#line 2767 "./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(
@@ -5936,34 +5827,34 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5940 "util/configparser.c"
+#line 5831 "util/configparser.c"
     break;
 
-  case 509:
-#line 2761 "./util/configparser.y"
-    {
+  case 511: /* view_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG  */
+#line 2777 "./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 5951 "util/configparser.c"
+#line 5842 "util/configparser.c"
     break;
 
-  case 510:
-#line 2769 "./util/configparser.y"
-    {
+  case 512: /* view_local_data: VAR_LOCAL_DATA STRING_ARG  */
+#line 2785 "./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 5962 "util/configparser.c"
+#line 5853 "util/configparser.c"
     break;
 
-  case 511:
-#line 2777 "./util/configparser.y"
-    {
+  case 513: /* view_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG  */
+#line 2793 "./util/configparser.y"
+        {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
 		ptr = cfg_ptr_reverse((yyvsp[0].str));
@@ -5976,32 +5867,32 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5980 "util/configparser.c"
+#line 5871 "util/configparser.c"
     break;
 
-  case 512:
-#line 2792 "./util/configparser.y"
-    {
+  case 514: /* view_first: VAR_VIEW_FIRST STRING_ARG  */
+#line 2808 "./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 5992 "util/configparser.c"
+#line 5883 "util/configparser.c"
     break;
 
-  case 513:
-#line 2801 "./util/configparser.y"
-    { 
+  case 515: /* rcstart: VAR_REMOTE_CONTROL  */
+#line 2817 "./util/configparser.y"
+        { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6000 "util/configparser.c"
+#line 5891 "util/configparser.c"
     break;
 
-  case 524:
-#line 2812 "./util/configparser.y"
-    {
+  case 526: /* rc_control_enable: VAR_CONTROL_ENABLE STRING_ARG  */
+#line 2828 "./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.");
@@ -6009,104 +5900,104 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6013 "util/configparser.c"
+#line 5904 "util/configparser.c"
     break;
 
-  case 525:
-#line 2822 "./util/configparser.y"
-    {
+  case 527: /* rc_control_port: VAR_CONTROL_PORT STRING_ARG  */
+#line 2838 "./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 6025 "util/configparser.c"
+#line 5916 "util/configparser.c"
     break;
 
-  case 526:
-#line 2831 "./util/configparser.y"
-    {
+  case 528: /* rc_control_interface: VAR_CONTROL_INTERFACE STRING_ARG  */
+#line 2847 "./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 6035 "util/configparser.c"
+#line 5926 "util/configparser.c"
     break;
 
-  case 527:
-#line 2838 "./util/configparser.y"
-    {
+  case 529: /* rc_control_use_cert: VAR_CONTROL_USE_CERT STRING_ARG  */
+#line 2854 "./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 6045 "util/configparser.c"
+#line 5936 "util/configparser.c"
     break;
 
-  case 528:
-#line 2845 "./util/configparser.y"
-    {
+  case 530: /* rc_server_key_file: VAR_SERVER_KEY_FILE STRING_ARG  */
+#line 2861 "./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 6055 "util/configparser.c"
+#line 5946 "util/configparser.c"
     break;
 
-  case 529:
-#line 2852 "./util/configparser.y"
-    {
+  case 531: /* rc_server_cert_file: VAR_SERVER_CERT_FILE STRING_ARG  */
+#line 2868 "./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 6065 "util/configparser.c"
+#line 5956 "util/configparser.c"
     break;
 
-  case 530:
-#line 2859 "./util/configparser.y"
-    {
+  case 532: /* rc_control_key_file: VAR_CONTROL_KEY_FILE STRING_ARG  */
+#line 2875 "./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 6075 "util/configparser.c"
+#line 5966 "util/configparser.c"
     break;
 
-  case 531:
-#line 2866 "./util/configparser.y"
-    {
+  case 533: /* rc_control_cert_file: VAR_CONTROL_CERT_FILE STRING_ARG  */
+#line 2882 "./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 6085 "util/configparser.c"
+#line 5976 "util/configparser.c"
     break;
 
-  case 532:
-#line 2873 "./util/configparser.y"
-    {
+  case 534: /* dtstart: VAR_DNSTAP  */
+#line 2889 "./util/configparser.y"
+        {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6093 "util/configparser.c"
+#line 5984 "util/configparser.c"
     break;
 
-  case 554:
-#line 2893 "./util/configparser.y"
-    {
+  case 556: /* dt_dnstap_enable: VAR_DNSTAP_ENABLE STRING_ARG  */
+#line 2909 "./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 6105 "util/configparser.c"
+#line 5996 "util/configparser.c"
     break;
 
-  case 555:
-#line 2902 "./util/configparser.y"
-    {
+  case 557: /* dt_dnstap_bidirectional: VAR_DNSTAP_BIDIRECTIONAL STRING_ARG  */
+#line 2918 "./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.");
@@ -6114,128 +6005,128 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6118 "util/configparser.c"
+#line 6009 "util/configparser.c"
     break;
 
-  case 556:
-#line 2912 "./util/configparser.y"
-    {
+  case 558: /* dt_dnstap_socket_path: VAR_DNSTAP_SOCKET_PATH STRING_ARG  */
+#line 2928 "./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 6128 "util/configparser.c"
+#line 6019 "util/configparser.c"
     break;
 
-  case 557:
-#line 2919 "./util/configparser.y"
-    {
+  case 559: /* dt_dnstap_ip: VAR_DNSTAP_IP STRING_ARG  */
+#line 2935 "./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 6138 "util/configparser.c"
+#line 6029 "util/configparser.c"
     break;
 
-  case 558:
-#line 2926 "./util/configparser.y"
-    {
+  case 560: /* dt_dnstap_tls: VAR_DNSTAP_TLS STRING_ARG  */
+#line 2942 "./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 6150 "util/configparser.c"
+#line 6041 "util/configparser.c"
     break;
 
-  case 559:
-#line 2935 "./util/configparser.y"
-    {
+  case 561: /* dt_dnstap_tls_server_name: VAR_DNSTAP_TLS_SERVER_NAME STRING_ARG  */
+#line 2951 "./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 6160 "util/configparser.c"
+#line 6051 "util/configparser.c"
     break;
 
-  case 560:
-#line 2942 "./util/configparser.y"
-    {
+  case 562: /* dt_dnstap_tls_cert_bundle: VAR_DNSTAP_TLS_CERT_BUNDLE STRING_ARG  */
+#line 2958 "./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 6170 "util/configparser.c"
+#line 6061 "util/configparser.c"
     break;
 
-  case 561:
-#line 2949 "./util/configparser.y"
-    {
+  case 563: /* dt_dnstap_tls_client_key_file: VAR_DNSTAP_TLS_CLIENT_KEY_FILE STRING_ARG  */
+#line 2965 "./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 6180 "util/configparser.c"
+#line 6071 "util/configparser.c"
     break;
 
-  case 562:
-#line 2956 "./util/configparser.y"
-    {
+  case 564: /* dt_dnstap_tls_client_cert_file: VAR_DNSTAP_TLS_CLIENT_CERT_FILE STRING_ARG  */
+#line 2972 "./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 6190 "util/configparser.c"
+#line 6081 "util/configparser.c"
     break;
 
-  case 563:
-#line 2963 "./util/configparser.y"
-    {
+  case 565: /* dt_dnstap_send_identity: VAR_DNSTAP_SEND_IDENTITY STRING_ARG  */
+#line 2979 "./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 6202 "util/configparser.c"
+#line 6093 "util/configparser.c"
     break;
 
-  case 564:
-#line 2972 "./util/configparser.y"
-    {
+  case 566: /* dt_dnstap_send_version: VAR_DNSTAP_SEND_VERSION STRING_ARG  */
+#line 2988 "./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 6214 "util/configparser.c"
+#line 6105 "util/configparser.c"
     break;
 
-  case 565:
-#line 2981 "./util/configparser.y"
-    {
+  case 567: /* dt_dnstap_identity: VAR_DNSTAP_IDENTITY STRING_ARG  */
+#line 2997 "./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 6224 "util/configparser.c"
+#line 6115 "util/configparser.c"
     break;
 
-  case 566:
-#line 2988 "./util/configparser.y"
-    {
+  case 568: /* dt_dnstap_version: VAR_DNSTAP_VERSION STRING_ARG  */
+#line 3004 "./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 6234 "util/configparser.c"
+#line 6125 "util/configparser.c"
     break;
 
-  case 567:
-#line 2995 "./util/configparser.y"
-    {
+  case 569: /* dt_dnstap_log_resolver_query_messages: VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES STRING_ARG  */
+#line 3011 "./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.");
@@ -6243,12 +6134,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6247 "util/configparser.c"
+#line 6138 "util/configparser.c"
     break;
 
-  case 568:
-#line 3005 "./util/configparser.y"
-    {
+  case 570: /* dt_dnstap_log_resolver_response_messages: VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES STRING_ARG  */
+#line 3021 "./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.");
@@ -6256,12 +6147,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6260 "util/configparser.c"
+#line 6151 "util/configparser.c"
     break;
 
-  case 569:
-#line 3015 "./util/configparser.y"
-    {
+  case 571: /* dt_dnstap_log_client_query_messages: VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES STRING_ARG  */
+#line 3031 "./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.");
@@ -6269,12 +6160,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6273 "util/configparser.c"
+#line 6164 "util/configparser.c"
     break;
 
-  case 570:
-#line 3025 "./util/configparser.y"
-    {
+  case 572: /* dt_dnstap_log_client_response_messages: VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES STRING_ARG  */
+#line 3041 "./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.");
@@ -6282,12 +6173,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6286 "util/configparser.c"
+#line 6177 "util/configparser.c"
     break;
 
-  case 571:
-#line 3035 "./util/configparser.y"
-    {
+  case 573: /* dt_dnstap_log_forwarder_query_messages: VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES STRING_ARG  */
+#line 3051 "./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.");
@@ -6295,12 +6186,12 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6299 "util/configparser.c"
+#line 6190 "util/configparser.c"
     break;
 
-  case 572:
-#line 3045 "./util/configparser.y"
-    {
+  case 574: /* dt_dnstap_log_forwarder_response_messages: VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES STRING_ARG  */
+#line 3061 "./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.");
@@ -6308,48 +6199,48 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6312 "util/configparser.c"
+#line 6203 "util/configparser.c"
     break;
 
-  case 573:
-#line 3055 "./util/configparser.y"
-    { 
+  case 575: /* pythonstart: VAR_PYTHON  */
+#line 3071 "./util/configparser.y"
+        { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6320 "util/configparser.c"
+#line 6211 "util/configparser.c"
     break;
 
-  case 577:
-#line 3064 "./util/configparser.y"
-    {
+  case 579: /* py_script: VAR_PYTHON_SCRIPT STRING_ARG  */
+#line 3080 "./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 6330 "util/configparser.c"
+#line 6221 "util/configparser.c"
     break;
 
-  case 578:
-#line 3070 "./util/configparser.y"
-    { 
+  case 580: /* dynlibstart: VAR_DYNLIB  */
+#line 3086 "./util/configparser.y"
+        { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6338 "util/configparser.c"
+#line 6229 "util/configparser.c"
     break;
 
-  case 582:
-#line 3079 "./util/configparser.y"
-    {
+  case 584: /* dl_file: VAR_DYNLIB_FILE STRING_ARG  */
+#line 3095 "./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 6348 "util/configparser.c"
+#line 6239 "util/configparser.c"
     break;
 
-  case 583:
-#line 3085 "./util/configparser.y"
-    {
+  case 585: /* server_disable_dnssec_lame_check: VAR_DISABLE_DNSSEC_LAME_CHECK STRING_ARG  */
+#line 3101 "./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.");
@@ -6357,132 +6248,132 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6361 "util/configparser.c"
+#line 6252 "util/configparser.c"
     break;
 
-  case 584:
-#line 3095 "./util/configparser.y"
-    {
+  case 586: /* server_log_identity: VAR_LOG_IDENTITY STRING_ARG  */
+#line 3111 "./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 6371 "util/configparser.c"
+#line 6262 "util/configparser.c"
     break;
 
-  case 585:
-#line 3102 "./util/configparser.y"
-    {
+  case 587: /* server_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG  */
+#line 3118 "./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 6383 "util/configparser.c"
+#line 6274 "util/configparser.c"
     break;
 
-  case 586:
-#line 3111 "./util/configparser.y"
-    {
+  case 588: /* server_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG  */
+#line 3127 "./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 6394 "util/configparser.c"
+#line 6285 "util/configparser.c"
     break;
 
-  case 587:
-#line 3119 "./util/configparser.y"
-    {
+  case 589: /* dnscstart: VAR_DNSCRYPT  */
+#line 3135 "./util/configparser.y"
+        {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6402 "util/configparser.c"
+#line 6293 "util/configparser.c"
     break;
 
-  case 600:
-#line 3135 "./util/configparser.y"
-    {
+  case 602: /* dnsc_dnscrypt_enable: VAR_DNSCRYPT_ENABLE STRING_ARG  */
+#line 3151 "./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 6414 "util/configparser.c"
+#line 6305 "util/configparser.c"
     break;
 
-  case 601:
-#line 3145 "./util/configparser.y"
-    {
+  case 603: /* dnsc_dnscrypt_port: VAR_DNSCRYPT_PORT STRING_ARG  */
+#line 3161 "./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 6426 "util/configparser.c"
+#line 6317 "util/configparser.c"
     break;
 
-  case 602:
-#line 3154 "./util/configparser.y"
-    {
+  case 604: /* dnsc_dnscrypt_provider: VAR_DNSCRYPT_PROVIDER STRING_ARG  */
+#line 3170 "./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 6436 "util/configparser.c"
+#line 6327 "util/configparser.c"
     break;
 
-  case 603:
-#line 3161 "./util/configparser.y"
-    {
+  case 605: /* dnsc_dnscrypt_provider_cert: VAR_DNSCRYPT_PROVIDER_CERT STRING_ARG  */
+#line 3177 "./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 6448 "util/configparser.c"
+#line 6339 "util/configparser.c"
     break;
 
-  case 604:
-#line 3170 "./util/configparser.y"
-    {
+  case 606: /* dnsc_dnscrypt_provider_cert_rotated: VAR_DNSCRYPT_PROVIDER_CERT_ROTATED STRING_ARG  */
+#line 3186 "./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 6458 "util/configparser.c"
+#line 6349 "util/configparser.c"
     break;
 
-  case 605:
-#line 3177 "./util/configparser.y"
-    {
+  case 607: /* dnsc_dnscrypt_secret_key: VAR_DNSCRYPT_SECRET_KEY STRING_ARG  */
+#line 3193 "./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 6470 "util/configparser.c"
+#line 6361 "util/configparser.c"
     break;
 
-  case 606:
-#line 3186 "./util/configparser.y"
-    {
+  case 608: /* dnsc_dnscrypt_shared_secret_cache_size: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE STRING_ARG  */
+#line 3202 "./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 6481 "util/configparser.c"
+#line 6372 "util/configparser.c"
     break;
 
-  case 607:
-#line 3194 "./util/configparser.y"
-    {
+  case 609: /* dnsc_dnscrypt_shared_secret_cache_slabs: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS STRING_ARG  */
+#line 3210 "./util/configparser.y"
+  {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -6493,23 +6384,23 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6497 "util/configparser.c"
+#line 6388 "util/configparser.c"
     break;
 
-  case 608:
-#line 3207 "./util/configparser.y"
-    {
+  case 610: /* dnsc_dnscrypt_nonce_cache_size: VAR_DNSCRYPT_NONCE_CACHE_SIZE STRING_ARG  */
+#line 3223 "./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 6508 "util/configparser.c"
+#line 6399 "util/configparser.c"
     break;
 
-  case 609:
-#line 3215 "./util/configparser.y"
-    {
+  case 611: /* dnsc_dnscrypt_nonce_cache_slabs: VAR_DNSCRYPT_NONCE_CACHE_SLABS STRING_ARG  */
+#line 3231 "./util/configparser.y"
+  {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
   		yyerror("number expected");
@@ -6520,20 +6411,20 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6524 "util/configparser.c"
+#line 6415 "util/configparser.c"
     break;
 
-  case 610:
-#line 3228 "./util/configparser.y"
-    {
+  case 612: /* cachedbstart: VAR_CACHEDB  */
+#line 3244 "./util/configparser.y"
+        {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6532 "util/configparser.c"
+#line 6423 "util/configparser.c"
     break;
 
-  case 619:
-#line 3239 "./util/configparser.y"
-    {
+  case 621: /* cachedb_backend_name: VAR_CACHEDB_BACKEND STRING_ARG  */
+#line 3255 "./util/configparser.y"
+        {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_backend);
@@ -6543,12 +6434,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6547 "util/configparser.c"
+#line 6438 "util/configparser.c"
     break;
 
-  case 620:
-#line 3251 "./util/configparser.y"
-    {
+  case 622: /* cachedb_secret_seed: VAR_CACHEDB_SECRETSEED STRING_ARG  */
+#line 3267 "./util/configparser.y"
+        {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->cachedb_secret);
@@ -6558,12 +6449,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6562 "util/configparser.c"
+#line 6453 "util/configparser.c"
     break;
 
-  case 621:
-#line 3263 "./util/configparser.y"
-    {
+  case 623: /* redis_server_host: VAR_CACHEDB_REDISHOST STRING_ARG  */
+#line 3279 "./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);
@@ -6573,12 +6464,12 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6577 "util/configparser.c"
+#line 6468 "util/configparser.c"
     break;
 
-  case 622:
-#line 3275 "./util/configparser.y"
-    {
+  case 624: /* redis_server_port: VAR_CACHEDB_REDISPORT STRING_ARG  */
+#line 3291 "./util/configparser.y"
+        {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
 		OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str)));
@@ -6591,12 +6482,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6595 "util/configparser.c"
+#line 6486 "util/configparser.c"
     break;
 
-  case 623:
-#line 3290 "./util/configparser.y"
-    {
+  case 625: /* redis_timeout: VAR_CACHEDB_REDISTIMEOUT STRING_ARG  */
+#line 3306 "./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)
@@ -6607,12 +6498,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6611 "util/configparser.c"
+#line 6502 "util/configparser.c"
     break;
 
-  case 624:
-#line 3303 "./util/configparser.y"
-    {
+  case 626: /* redis_expire_records: VAR_CACHEDB_REDISEXPIRERECORDS STRING_ARG  */
+#line 3319 "./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)
@@ -6623,12 +6514,12 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6627 "util/configparser.c"
+#line 6518 "util/configparser.c"
     break;
 
-  case 625:
-#line 3316 "./util/configparser.y"
-    {
+  case 627: /* server_tcp_connection_limit: VAR_TCP_CONNECTION_LIMIT STRING_ARG STRING_ARG  */
+#line 3332 "./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");
@@ -6637,20 +6528,20 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6641 "util/configparser.c"
+#line 6532 "util/configparser.c"
     break;
 
-  case 626:
-#line 3327 "./util/configparser.y"
-    {
+  case 628: /* ipsetstart: VAR_IPSET  */
+#line 3343 "./util/configparser.y"
+                {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6649 "util/configparser.c"
+#line 6540 "util/configparser.c"
     break;
 
-  case 631:
-#line 3336 "./util/configparser.y"
-    {
+  case 633: /* ipset_name_v4: VAR_IPSET_NAME_V4 STRING_ARG  */
+#line 3352 "./util/configparser.y"
+                {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v4)
@@ -6663,12 +6554,12 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6667 "util/configparser.c"
+#line 6558 "util/configparser.c"
     break;
 
-  case 632:
-#line 3351 "./util/configparser.y"
-    {
+  case 634: /* ipset_name_v6: VAR_IPSET_NAME_V6 STRING_ARG  */
+#line 3367 "./util/configparser.y"
+        {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
 			if(cfg_parser->cfg->ipset_name_v6)
@@ -6681,11 +6572,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6685 "util/configparser.c"
+#line 6576 "util/configparser.c"
     break;
 
 
-#line 6689 "util/configparser.c"
+#line 6580 "util/configparser.c"
 
       default: break;
     }
@@ -6700,11 +6591,10 @@ yyreduce:
      case of YYERROR or YYBACKUP, subsequent parser actions might lead
      to an incorrect destructor call or verbose syntax error message
      before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
   yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
@@ -6728,50 +6618,14 @@ yyreduce:
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
+  yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
     }
 
-
-
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
@@ -6820,13 +6674,14 @@ yyerrorlab:
 yyerrlab1:
   yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
+  /* Pop stack until we find a state that shifts the error token.  */
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
         {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+          yyn += YYSYMBOL_YYerror;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
             {
               yyn = yytable[yyn];
               if (0 < yyn)
@@ -6840,7 +6695,7 @@ yyerrlab1:
 
 
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
+                  YY_ACCESSING_SYMBOL (yystate), yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -6852,7 +6707,7 @@ yyerrlab1:
 
 
   /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -6874,20 +6729,20 @@ yyabortlab:
   goto yyreturn;
 
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  /* Fall through.  */
+  goto yyreturn;
 #endif
 
 
-/*-----------------------------------------------------.
-| yyreturn -- parsing is finished, return the result.  |
-`-----------------------------------------------------*/
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
 yyreturn:
   if (yychar != YYEMPTY)
     {
@@ -6904,20 +6759,18 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
+                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
+
   return yyresult;
 }
-#line 3365 "./util/configparser.y"
+
+#line 3381 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 323d587dd..0e82fd03d 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.1.  */
+/* A Bison parser, made by GNU Bison 3.7.  */
 
 /* 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
@@ -31,8 +31,9 @@
    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.  */
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
 #ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
 # define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
@@ -44,314 +45,323 @@
 extern int yydebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    SPACE = 258,
-    LETTER = 259,
-    NEWLINE = 260,
-    COMMENT = 261,
-    COLON = 262,
-    ANY = 263,
-    ZONESTR = 264,
-    STRING_ARG = 265,
-    VAR_FORCE_TOPLEVEL = 266,
-    VAR_SERVER = 267,
-    VAR_VERBOSITY = 268,
-    VAR_NUM_THREADS = 269,
-    VAR_PORT = 270,
-    VAR_OUTGOING_RANGE = 271,
-    VAR_INTERFACE = 272,
-    VAR_PREFER_IP4 = 273,
-    VAR_DO_IP4 = 274,
-    VAR_DO_IP6 = 275,
-    VAR_PREFER_IP6 = 276,
-    VAR_DO_UDP = 277,
-    VAR_DO_TCP = 278,
-    VAR_TCP_MSS = 279,
-    VAR_OUTGOING_TCP_MSS = 280,
-    VAR_TCP_IDLE_TIMEOUT = 281,
-    VAR_EDNS_TCP_KEEPALIVE = 282,
-    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283,
-    VAR_CHROOT = 284,
-    VAR_USERNAME = 285,
-    VAR_DIRECTORY = 286,
-    VAR_LOGFILE = 287,
-    VAR_PIDFILE = 288,
-    VAR_MSG_CACHE_SIZE = 289,
-    VAR_MSG_CACHE_SLABS = 290,
-    VAR_NUM_QUERIES_PER_THREAD = 291,
-    VAR_RRSET_CACHE_SIZE = 292,
-    VAR_RRSET_CACHE_SLABS = 293,
-    VAR_OUTGOING_NUM_TCP = 294,
-    VAR_INFRA_HOST_TTL = 295,
-    VAR_INFRA_LAME_TTL = 296,
-    VAR_INFRA_CACHE_SLABS = 297,
-    VAR_INFRA_CACHE_NUMHOSTS = 298,
-    VAR_INFRA_CACHE_LAME_SIZE = 299,
-    VAR_NAME = 300,
-    VAR_STUB_ZONE = 301,
-    VAR_STUB_HOST = 302,
-    VAR_STUB_ADDR = 303,
-    VAR_TARGET_FETCH_POLICY = 304,
-    VAR_HARDEN_SHORT_BUFSIZE = 305,
-    VAR_HARDEN_LARGE_QUERIES = 306,
-    VAR_FORWARD_ZONE = 307,
-    VAR_FORWARD_HOST = 308,
-    VAR_FORWARD_ADDR = 309,
-    VAR_DO_NOT_QUERY_ADDRESS = 310,
-    VAR_HIDE_IDENTITY = 311,
-    VAR_HIDE_VERSION = 312,
-    VAR_IDENTITY = 313,
-    VAR_VERSION = 314,
-    VAR_HARDEN_GLUE = 315,
-    VAR_MODULE_CONF = 316,
-    VAR_TRUST_ANCHOR_FILE = 317,
-    VAR_TRUST_ANCHOR = 318,
-    VAR_VAL_OVERRIDE_DATE = 319,
-    VAR_BOGUS_TTL = 320,
-    VAR_VAL_CLEAN_ADDITIONAL = 321,
-    VAR_VAL_PERMISSIVE_MODE = 322,
-    VAR_INCOMING_NUM_TCP = 323,
-    VAR_MSG_BUFFER_SIZE = 324,
-    VAR_KEY_CACHE_SIZE = 325,
-    VAR_KEY_CACHE_SLABS = 326,
-    VAR_TRUSTED_KEYS_FILE = 327,
-    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328,
-    VAR_USE_SYSLOG = 329,
-    VAR_OUTGOING_INTERFACE = 330,
-    VAR_ROOT_HINTS = 331,
-    VAR_DO_NOT_QUERY_LOCALHOST = 332,
-    VAR_CACHE_MAX_TTL = 333,
-    VAR_HARDEN_DNSSEC_STRIPPED = 334,
-    VAR_ACCESS_CONTROL = 335,
-    VAR_LOCAL_ZONE = 336,
-    VAR_LOCAL_DATA = 337,
-    VAR_INTERFACE_AUTOMATIC = 338,
-    VAR_STATISTICS_INTERVAL = 339,
-    VAR_DO_DAEMONIZE = 340,
-    VAR_USE_CAPS_FOR_ID = 341,
-    VAR_STATISTICS_CUMULATIVE = 342,
-    VAR_OUTGOING_PORT_PERMIT = 343,
-    VAR_OUTGOING_PORT_AVOID = 344,
-    VAR_DLV_ANCHOR_FILE = 345,
-    VAR_DLV_ANCHOR = 346,
-    VAR_NEG_CACHE_SIZE = 347,
-    VAR_HARDEN_REFERRAL_PATH = 348,
-    VAR_PRIVATE_ADDRESS = 349,
-    VAR_PRIVATE_DOMAIN = 350,
-    VAR_REMOTE_CONTROL = 351,
-    VAR_CONTROL_ENABLE = 352,
-    VAR_CONTROL_INTERFACE = 353,
-    VAR_CONTROL_PORT = 354,
-    VAR_SERVER_KEY_FILE = 355,
-    VAR_SERVER_CERT_FILE = 356,
-    VAR_CONTROL_KEY_FILE = 357,
-    VAR_CONTROL_CERT_FILE = 358,
-    VAR_CONTROL_USE_CERT = 359,
-    VAR_EXTENDED_STATISTICS = 360,
-    VAR_LOCAL_DATA_PTR = 361,
-    VAR_JOSTLE_TIMEOUT = 362,
-    VAR_STUB_PRIME = 363,
-    VAR_UNWANTED_REPLY_THRESHOLD = 364,
-    VAR_LOG_TIME_ASCII = 365,
-    VAR_DOMAIN_INSECURE = 366,
-    VAR_PYTHON = 367,
-    VAR_PYTHON_SCRIPT = 368,
-    VAR_VAL_SIG_SKEW_MIN = 369,
-    VAR_VAL_SIG_SKEW_MAX = 370,
-    VAR_CACHE_MIN_TTL = 371,
-    VAR_VAL_LOG_LEVEL = 372,
-    VAR_AUTO_TRUST_ANCHOR_FILE = 373,
-    VAR_KEEP_MISSING = 374,
-    VAR_ADD_HOLDDOWN = 375,
-    VAR_DEL_HOLDDOWN = 376,
-    VAR_SO_RCVBUF = 377,
-    VAR_EDNS_BUFFER_SIZE = 378,
-    VAR_PREFETCH = 379,
-    VAR_PREFETCH_KEY = 380,
-    VAR_SO_SNDBUF = 381,
-    VAR_SO_REUSEPORT = 382,
-    VAR_HARDEN_BELOW_NXDOMAIN = 383,
-    VAR_IGNORE_CD_FLAG = 384,
-    VAR_LOG_QUERIES = 385,
-    VAR_LOG_REPLIES = 386,
-    VAR_LOG_LOCAL_ACTIONS = 387,
-    VAR_TCP_UPSTREAM = 388,
-    VAR_SSL_UPSTREAM = 389,
-    VAR_SSL_SERVICE_KEY = 390,
-    VAR_SSL_SERVICE_PEM = 391,
-    VAR_SSL_PORT = 392,
-    VAR_FORWARD_FIRST = 393,
-    VAR_STUB_SSL_UPSTREAM = 394,
-    VAR_FORWARD_SSL_UPSTREAM = 395,
-    VAR_TLS_CERT_BUNDLE = 396,
-    VAR_HTTPS_PORT = 397,
-    VAR_HTTP_ENDPOINT = 398,
-    VAR_HTTP_MAX_STREAMS = 399,
-    VAR_HTTP_QUERY_BUFFER_SIZE = 400,
-    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401,
-    VAR_HTTP_NODELAY = 402,
-    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_UDP_CONNECT = 409,
-    VAR_UNBLOCK_LAN_ZONES = 410,
-    VAR_INSECURE_LAN_ZONES = 411,
-    VAR_INFRA_CACHE_MIN_RTT = 412,
-    VAR_INFRA_KEEP_PROBING = 413,
-    VAR_DNS64_PREFIX = 414,
-    VAR_DNS64_SYNTHALL = 415,
-    VAR_DNS64_IGNORE_AAAA = 416,
-    VAR_DNSTAP = 417,
-    VAR_DNSTAP_ENABLE = 418,
-    VAR_DNSTAP_SOCKET_PATH = 419,
-    VAR_DNSTAP_IP = 420,
-    VAR_DNSTAP_TLS = 421,
-    VAR_DNSTAP_TLS_SERVER_NAME = 422,
-    VAR_DNSTAP_TLS_CERT_BUNDLE = 423,
-    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424,
-    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425,
-    VAR_DNSTAP_SEND_IDENTITY = 426,
-    VAR_DNSTAP_SEND_VERSION = 427,
-    VAR_DNSTAP_BIDIRECTIONAL = 428,
-    VAR_DNSTAP_IDENTITY = 429,
-    VAR_DNSTAP_VERSION = 430,
-    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431,
-    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432,
-    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433,
-    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434,
-    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435,
-    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436,
-    VAR_RESPONSE_IP_TAG = 437,
-    VAR_RESPONSE_IP = 438,
-    VAR_RESPONSE_IP_DATA = 439,
-    VAR_HARDEN_ALGO_DOWNGRADE = 440,
-    VAR_IP_TRANSPARENT = 441,
-    VAR_IP_DSCP = 442,
-    VAR_DISABLE_DNSSEC_LAME_CHECK = 443,
-    VAR_IP_RATELIMIT = 444,
-    VAR_IP_RATELIMIT_SLABS = 445,
-    VAR_IP_RATELIMIT_SIZE = 446,
-    VAR_RATELIMIT = 447,
-    VAR_RATELIMIT_SLABS = 448,
-    VAR_RATELIMIT_SIZE = 449,
-    VAR_RATELIMIT_FOR_DOMAIN = 450,
-    VAR_RATELIMIT_BELOW_DOMAIN = 451,
-    VAR_IP_RATELIMIT_FACTOR = 452,
-    VAR_RATELIMIT_FACTOR = 453,
-    VAR_SEND_CLIENT_SUBNET = 454,
-    VAR_CLIENT_SUBNET_ZONE = 455,
-    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456,
-    VAR_CLIENT_SUBNET_OPCODE = 457,
-    VAR_MAX_CLIENT_SUBNET_IPV4 = 458,
-    VAR_MAX_CLIENT_SUBNET_IPV6 = 459,
-    VAR_MIN_CLIENT_SUBNET_IPV4 = 460,
-    VAR_MIN_CLIENT_SUBNET_IPV6 = 461,
-    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462,
-    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463,
-    VAR_CAPS_WHITELIST = 464,
-    VAR_CACHE_MAX_NEGATIVE_TTL = 465,
-    VAR_PERMIT_SMALL_HOLDDOWN = 466,
-    VAR_QNAME_MINIMISATION = 467,
-    VAR_QNAME_MINIMISATION_STRICT = 468,
-    VAR_IP_FREEBIND = 469,
-    VAR_DEFINE_TAG = 470,
-    VAR_LOCAL_ZONE_TAG = 471,
-    VAR_ACCESS_CONTROL_TAG = 472,
-    VAR_LOCAL_ZONE_OVERRIDE = 473,
-    VAR_ACCESS_CONTROL_TAG_ACTION = 474,
-    VAR_ACCESS_CONTROL_TAG_DATA = 475,
-    VAR_VIEW = 476,
-    VAR_ACCESS_CONTROL_VIEW = 477,
-    VAR_VIEW_FIRST = 478,
-    VAR_SERVE_EXPIRED = 479,
-    VAR_SERVE_EXPIRED_TTL = 480,
-    VAR_SERVE_EXPIRED_TTL_RESET = 481,
-    VAR_SERVE_EXPIRED_REPLY_TTL = 482,
-    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483,
-    VAR_FAKE_DSA = 484,
-    VAR_FAKE_SHA1 = 485,
-    VAR_LOG_IDENTITY = 486,
-    VAR_HIDE_TRUSTANCHOR = 487,
-    VAR_TRUST_ANCHOR_SIGNALING = 488,
-    VAR_AGGRESSIVE_NSEC = 489,
-    VAR_USE_SYSTEMD = 490,
-    VAR_SHM_ENABLE = 491,
-    VAR_SHM_KEY = 492,
-    VAR_ROOT_KEY_SENTINEL = 493,
-    VAR_DNSCRYPT = 494,
-    VAR_DNSCRYPT_ENABLE = 495,
-    VAR_DNSCRYPT_PORT = 496,
-    VAR_DNSCRYPT_PROVIDER = 497,
-    VAR_DNSCRYPT_SECRET_KEY = 498,
-    VAR_DNSCRYPT_PROVIDER_CERT = 499,
-    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501,
-    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502,
-    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503,
-    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504,
-    VAR_IPSECMOD_ENABLED = 505,
-    VAR_IPSECMOD_HOOK = 506,
-    VAR_IPSECMOD_IGNORE_BOGUS = 507,
-    VAR_IPSECMOD_MAX_TTL = 508,
-    VAR_IPSECMOD_WHITELIST = 509,
-    VAR_IPSECMOD_STRICT = 510,
-    VAR_CACHEDB = 511,
-    VAR_CACHEDB_BACKEND = 512,
-    VAR_CACHEDB_SECRETSEED = 513,
-    VAR_CACHEDB_REDISHOST = 514,
-    VAR_CACHEDB_REDISPORT = 515,
-    VAR_CACHEDB_REDISTIMEOUT = 516,
-    VAR_CACHEDB_REDISEXPIRERECORDS = 517,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518,
-    VAR_FOR_UPSTREAM = 519,
-    VAR_AUTH_ZONE = 520,
-    VAR_ZONEFILE = 521,
-    VAR_MASTER = 522,
-    VAR_URL = 523,
-    VAR_FOR_DOWNSTREAM = 524,
-    VAR_FALLBACK_ENABLED = 525,
-    VAR_TLS_ADDITIONAL_PORT = 526,
-    VAR_LOW_RTT = 527,
-    VAR_LOW_RTT_PERMIL = 528,
-    VAR_FAST_SERVER_PERMIL = 529,
-    VAR_FAST_SERVER_NUM = 530,
-    VAR_ALLOW_NOTIFY = 531,
-    VAR_TLS_WIN_CERT = 532,
-    VAR_TCP_CONNECTION_LIMIT = 533,
-    VAR_FORWARD_NO_CACHE = 534,
-    VAR_STUB_NO_CACHE = 535,
-    VAR_LOG_SERVFAIL = 536,
-    VAR_DENY_ANY = 537,
-    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538,
-    VAR_LOG_TAG_QUERYREPLY = 539,
-    VAR_STREAM_WAIT_SIZE = 540,
-    VAR_TLS_CIPHERS = 541,
-    VAR_TLS_CIPHERSUITES = 542,
-    VAR_TLS_USE_SNI = 543,
-    VAR_IPSET = 544,
-    VAR_IPSET_NAME_V4 = 545,
-    VAR_IPSET_NAME_V6 = 546,
-    VAR_TLS_SESSION_TICKET_KEYS = 547,
-    VAR_RPZ = 548,
-    VAR_TAGS = 549,
-    VAR_RPZ_ACTION_OVERRIDE = 550,
-    VAR_RPZ_CNAME_OVERRIDE = 551,
-    VAR_RPZ_LOG = 552,
-    VAR_RPZ_LOG_NAME = 553,
-    VAR_DYNLIB = 554,
-    VAR_DYNLIB_FILE = 555,
-    VAR_EDNS_CLIENT_STRING = 556,
-    VAR_EDNS_CLIENT_STRING_OPCODE = 557
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    SPACE = 258,                   /* SPACE  */
+    LETTER = 259,                  /* LETTER  */
+    NEWLINE = 260,                 /* NEWLINE  */
+    COMMENT = 261,                 /* COMMENT  */
+    COLON = 262,                   /* COLON  */
+    ANY = 263,                     /* ANY  */
+    ZONESTR = 264,                 /* ZONESTR  */
+    STRING_ARG = 265,              /* STRING_ARG  */
+    VAR_FORCE_TOPLEVEL = 266,      /* VAR_FORCE_TOPLEVEL  */
+    VAR_SERVER = 267,              /* VAR_SERVER  */
+    VAR_VERBOSITY = 268,           /* VAR_VERBOSITY  */
+    VAR_NUM_THREADS = 269,         /* VAR_NUM_THREADS  */
+    VAR_PORT = 270,                /* VAR_PORT  */
+    VAR_OUTGOING_RANGE = 271,      /* VAR_OUTGOING_RANGE  */
+    VAR_INTERFACE = 272,           /* VAR_INTERFACE  */
+    VAR_PREFER_IP4 = 273,          /* VAR_PREFER_IP4  */
+    VAR_DO_IP4 = 274,              /* VAR_DO_IP4  */
+    VAR_DO_IP6 = 275,              /* VAR_DO_IP6  */
+    VAR_PREFER_IP6 = 276,          /* VAR_PREFER_IP6  */
+    VAR_DO_UDP = 277,              /* VAR_DO_UDP  */
+    VAR_DO_TCP = 278,              /* VAR_DO_TCP  */
+    VAR_TCP_MSS = 279,             /* VAR_TCP_MSS  */
+    VAR_OUTGOING_TCP_MSS = 280,    /* VAR_OUTGOING_TCP_MSS  */
+    VAR_TCP_IDLE_TIMEOUT = 281,    /* VAR_TCP_IDLE_TIMEOUT  */
+    VAR_EDNS_TCP_KEEPALIVE = 282,  /* VAR_EDNS_TCP_KEEPALIVE  */
+    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 283, /* VAR_EDNS_TCP_KEEPALIVE_TIMEOUT  */
+    VAR_CHROOT = 284,              /* VAR_CHROOT  */
+    VAR_USERNAME = 285,            /* VAR_USERNAME  */
+    VAR_DIRECTORY = 286,           /* VAR_DIRECTORY  */
+    VAR_LOGFILE = 287,             /* VAR_LOGFILE  */
+    VAR_PIDFILE = 288,             /* VAR_PIDFILE  */
+    VAR_MSG_CACHE_SIZE = 289,      /* VAR_MSG_CACHE_SIZE  */
+    VAR_MSG_CACHE_SLABS = 290,     /* VAR_MSG_CACHE_SLABS  */
+    VAR_NUM_QUERIES_PER_THREAD = 291, /* VAR_NUM_QUERIES_PER_THREAD  */
+    VAR_RRSET_CACHE_SIZE = 292,    /* VAR_RRSET_CACHE_SIZE  */
+    VAR_RRSET_CACHE_SLABS = 293,   /* VAR_RRSET_CACHE_SLABS  */
+    VAR_OUTGOING_NUM_TCP = 294,    /* VAR_OUTGOING_NUM_TCP  */
+    VAR_INFRA_HOST_TTL = 295,      /* VAR_INFRA_HOST_TTL  */
+    VAR_INFRA_LAME_TTL = 296,      /* VAR_INFRA_LAME_TTL  */
+    VAR_INFRA_CACHE_SLABS = 297,   /* VAR_INFRA_CACHE_SLABS  */
+    VAR_INFRA_CACHE_NUMHOSTS = 298, /* VAR_INFRA_CACHE_NUMHOSTS  */
+    VAR_INFRA_CACHE_LAME_SIZE = 299, /* VAR_INFRA_CACHE_LAME_SIZE  */
+    VAR_NAME = 300,                /* VAR_NAME  */
+    VAR_STUB_ZONE = 301,           /* VAR_STUB_ZONE  */
+    VAR_STUB_HOST = 302,           /* VAR_STUB_HOST  */
+    VAR_STUB_ADDR = 303,           /* VAR_STUB_ADDR  */
+    VAR_TARGET_FETCH_POLICY = 304, /* VAR_TARGET_FETCH_POLICY  */
+    VAR_HARDEN_SHORT_BUFSIZE = 305, /* VAR_HARDEN_SHORT_BUFSIZE  */
+    VAR_HARDEN_LARGE_QUERIES = 306, /* VAR_HARDEN_LARGE_QUERIES  */
+    VAR_FORWARD_ZONE = 307,        /* VAR_FORWARD_ZONE  */
+    VAR_FORWARD_HOST = 308,        /* VAR_FORWARD_HOST  */
+    VAR_FORWARD_ADDR = 309,        /* VAR_FORWARD_ADDR  */
+    VAR_DO_NOT_QUERY_ADDRESS = 310, /* VAR_DO_NOT_QUERY_ADDRESS  */
+    VAR_HIDE_IDENTITY = 311,       /* VAR_HIDE_IDENTITY  */
+    VAR_HIDE_VERSION = 312,        /* VAR_HIDE_VERSION  */
+    VAR_IDENTITY = 313,            /* VAR_IDENTITY  */
+    VAR_VERSION = 314,             /* VAR_VERSION  */
+    VAR_HARDEN_GLUE = 315,         /* VAR_HARDEN_GLUE  */
+    VAR_MODULE_CONF = 316,         /* VAR_MODULE_CONF  */
+    VAR_TRUST_ANCHOR_FILE = 317,   /* VAR_TRUST_ANCHOR_FILE  */
+    VAR_TRUST_ANCHOR = 318,        /* VAR_TRUST_ANCHOR  */
+    VAR_VAL_OVERRIDE_DATE = 319,   /* VAR_VAL_OVERRIDE_DATE  */
+    VAR_BOGUS_TTL = 320,           /* VAR_BOGUS_TTL  */
+    VAR_VAL_CLEAN_ADDITIONAL = 321, /* VAR_VAL_CLEAN_ADDITIONAL  */
+    VAR_VAL_PERMISSIVE_MODE = 322, /* VAR_VAL_PERMISSIVE_MODE  */
+    VAR_INCOMING_NUM_TCP = 323,    /* VAR_INCOMING_NUM_TCP  */
+    VAR_MSG_BUFFER_SIZE = 324,     /* VAR_MSG_BUFFER_SIZE  */
+    VAR_KEY_CACHE_SIZE = 325,      /* VAR_KEY_CACHE_SIZE  */
+    VAR_KEY_CACHE_SLABS = 326,     /* VAR_KEY_CACHE_SLABS  */
+    VAR_TRUSTED_KEYS_FILE = 327,   /* VAR_TRUSTED_KEYS_FILE  */
+    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 328, /* VAR_VAL_NSEC3_KEYSIZE_ITERATIONS  */
+    VAR_USE_SYSLOG = 329,          /* VAR_USE_SYSLOG  */
+    VAR_OUTGOING_INTERFACE = 330,  /* VAR_OUTGOING_INTERFACE  */
+    VAR_ROOT_HINTS = 331,          /* VAR_ROOT_HINTS  */
+    VAR_DO_NOT_QUERY_LOCALHOST = 332, /* VAR_DO_NOT_QUERY_LOCALHOST  */
+    VAR_CACHE_MAX_TTL = 333,       /* VAR_CACHE_MAX_TTL  */
+    VAR_HARDEN_DNSSEC_STRIPPED = 334, /* VAR_HARDEN_DNSSEC_STRIPPED  */
+    VAR_ACCESS_CONTROL = 335,      /* VAR_ACCESS_CONTROL  */
+    VAR_LOCAL_ZONE = 336,          /* VAR_LOCAL_ZONE  */
+    VAR_LOCAL_DATA = 337,          /* VAR_LOCAL_DATA  */
+    VAR_INTERFACE_AUTOMATIC = 338, /* VAR_INTERFACE_AUTOMATIC  */
+    VAR_STATISTICS_INTERVAL = 339, /* VAR_STATISTICS_INTERVAL  */
+    VAR_DO_DAEMONIZE = 340,        /* VAR_DO_DAEMONIZE  */
+    VAR_USE_CAPS_FOR_ID = 341,     /* VAR_USE_CAPS_FOR_ID  */
+    VAR_STATISTICS_CUMULATIVE = 342, /* VAR_STATISTICS_CUMULATIVE  */
+    VAR_OUTGOING_PORT_PERMIT = 343, /* VAR_OUTGOING_PORT_PERMIT  */
+    VAR_OUTGOING_PORT_AVOID = 344, /* VAR_OUTGOING_PORT_AVOID  */
+    VAR_DLV_ANCHOR_FILE = 345,     /* VAR_DLV_ANCHOR_FILE  */
+    VAR_DLV_ANCHOR = 346,          /* VAR_DLV_ANCHOR  */
+    VAR_NEG_CACHE_SIZE = 347,      /* VAR_NEG_CACHE_SIZE  */
+    VAR_HARDEN_REFERRAL_PATH = 348, /* VAR_HARDEN_REFERRAL_PATH  */
+    VAR_PRIVATE_ADDRESS = 349,     /* VAR_PRIVATE_ADDRESS  */
+    VAR_PRIVATE_DOMAIN = 350,      /* VAR_PRIVATE_DOMAIN  */
+    VAR_REMOTE_CONTROL = 351,      /* VAR_REMOTE_CONTROL  */
+    VAR_CONTROL_ENABLE = 352,      /* VAR_CONTROL_ENABLE  */
+    VAR_CONTROL_INTERFACE = 353,   /* VAR_CONTROL_INTERFACE  */
+    VAR_CONTROL_PORT = 354,        /* VAR_CONTROL_PORT  */
+    VAR_SERVER_KEY_FILE = 355,     /* VAR_SERVER_KEY_FILE  */
+    VAR_SERVER_CERT_FILE = 356,    /* VAR_SERVER_CERT_FILE  */
+    VAR_CONTROL_KEY_FILE = 357,    /* VAR_CONTROL_KEY_FILE  */
+    VAR_CONTROL_CERT_FILE = 358,   /* VAR_CONTROL_CERT_FILE  */
+    VAR_CONTROL_USE_CERT = 359,    /* VAR_CONTROL_USE_CERT  */
+    VAR_EXTENDED_STATISTICS = 360, /* VAR_EXTENDED_STATISTICS  */
+    VAR_LOCAL_DATA_PTR = 361,      /* VAR_LOCAL_DATA_PTR  */
+    VAR_JOSTLE_TIMEOUT = 362,      /* VAR_JOSTLE_TIMEOUT  */
+    VAR_STUB_PRIME = 363,          /* VAR_STUB_PRIME  */
+    VAR_UNWANTED_REPLY_THRESHOLD = 364, /* VAR_UNWANTED_REPLY_THRESHOLD  */
+    VAR_LOG_TIME_ASCII = 365,      /* VAR_LOG_TIME_ASCII  */
+    VAR_DOMAIN_INSECURE = 366,     /* VAR_DOMAIN_INSECURE  */
+    VAR_PYTHON = 367,              /* VAR_PYTHON  */
+    VAR_PYTHON_SCRIPT = 368,       /* VAR_PYTHON_SCRIPT  */
+    VAR_VAL_SIG_SKEW_MIN = 369,    /* VAR_VAL_SIG_SKEW_MIN  */
+    VAR_VAL_SIG_SKEW_MAX = 370,    /* VAR_VAL_SIG_SKEW_MAX  */
+    VAR_CACHE_MIN_TTL = 371,       /* VAR_CACHE_MIN_TTL  */
+    VAR_VAL_LOG_LEVEL = 372,       /* VAR_VAL_LOG_LEVEL  */
+    VAR_AUTO_TRUST_ANCHOR_FILE = 373, /* VAR_AUTO_TRUST_ANCHOR_FILE  */
+    VAR_KEEP_MISSING = 374,        /* VAR_KEEP_MISSING  */
+    VAR_ADD_HOLDDOWN = 375,        /* VAR_ADD_HOLDDOWN  */
+    VAR_DEL_HOLDDOWN = 376,        /* VAR_DEL_HOLDDOWN  */
+    VAR_SO_RCVBUF = 377,           /* VAR_SO_RCVBUF  */
+    VAR_EDNS_BUFFER_SIZE = 378,    /* VAR_EDNS_BUFFER_SIZE  */
+    VAR_PREFETCH = 379,            /* VAR_PREFETCH  */
+    VAR_PREFETCH_KEY = 380,        /* VAR_PREFETCH_KEY  */
+    VAR_SO_SNDBUF = 381,           /* VAR_SO_SNDBUF  */
+    VAR_SO_REUSEPORT = 382,        /* VAR_SO_REUSEPORT  */
+    VAR_HARDEN_BELOW_NXDOMAIN = 383, /* VAR_HARDEN_BELOW_NXDOMAIN  */
+    VAR_IGNORE_CD_FLAG = 384,      /* VAR_IGNORE_CD_FLAG  */
+    VAR_LOG_QUERIES = 385,         /* VAR_LOG_QUERIES  */
+    VAR_LOG_REPLIES = 386,         /* VAR_LOG_REPLIES  */
+    VAR_LOG_LOCAL_ACTIONS = 387,   /* VAR_LOG_LOCAL_ACTIONS  */
+    VAR_TCP_UPSTREAM = 388,        /* VAR_TCP_UPSTREAM  */
+    VAR_SSL_UPSTREAM = 389,        /* VAR_SSL_UPSTREAM  */
+    VAR_SSL_SERVICE_KEY = 390,     /* VAR_SSL_SERVICE_KEY  */
+    VAR_SSL_SERVICE_PEM = 391,     /* VAR_SSL_SERVICE_PEM  */
+    VAR_SSL_PORT = 392,            /* VAR_SSL_PORT  */
+    VAR_FORWARD_FIRST = 393,       /* VAR_FORWARD_FIRST  */
+    VAR_STUB_SSL_UPSTREAM = 394,   /* VAR_STUB_SSL_UPSTREAM  */
+    VAR_FORWARD_SSL_UPSTREAM = 395, /* VAR_FORWARD_SSL_UPSTREAM  */
+    VAR_TLS_CERT_BUNDLE = 396,     /* VAR_TLS_CERT_BUNDLE  */
+    VAR_HTTPS_PORT = 397,          /* VAR_HTTPS_PORT  */
+    VAR_HTTP_ENDPOINT = 398,       /* VAR_HTTP_ENDPOINT  */
+    VAR_HTTP_MAX_STREAMS = 399,    /* VAR_HTTP_MAX_STREAMS  */
+    VAR_HTTP_QUERY_BUFFER_SIZE = 400, /* VAR_HTTP_QUERY_BUFFER_SIZE  */
+    VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, /* VAR_HTTP_RESPONSE_BUFFER_SIZE  */
+    VAR_HTTP_NODELAY = 402,        /* VAR_HTTP_NODELAY  */
+    VAR_HTTP_NOTLS_DOWNSTREAM = 403, /* VAR_HTTP_NOTLS_DOWNSTREAM  */
+    VAR_STUB_FIRST = 404,          /* VAR_STUB_FIRST  */
+    VAR_MINIMAL_RESPONSES = 405,   /* VAR_MINIMAL_RESPONSES  */
+    VAR_RRSET_ROUNDROBIN = 406,    /* VAR_RRSET_ROUNDROBIN  */
+    VAR_MAX_UDP_SIZE = 407,        /* VAR_MAX_UDP_SIZE  */
+    VAR_DELAY_CLOSE = 408,         /* VAR_DELAY_CLOSE  */
+    VAR_UDP_CONNECT = 409,         /* VAR_UDP_CONNECT  */
+    VAR_UNBLOCK_LAN_ZONES = 410,   /* VAR_UNBLOCK_LAN_ZONES  */
+    VAR_INSECURE_LAN_ZONES = 411,  /* VAR_INSECURE_LAN_ZONES  */
+    VAR_INFRA_CACHE_MIN_RTT = 412, /* VAR_INFRA_CACHE_MIN_RTT  */
+    VAR_INFRA_KEEP_PROBING = 413,  /* VAR_INFRA_KEEP_PROBING  */
+    VAR_DNS64_PREFIX = 414,        /* VAR_DNS64_PREFIX  */
+    VAR_DNS64_SYNTHALL = 415,      /* VAR_DNS64_SYNTHALL  */
+    VAR_DNS64_IGNORE_AAAA = 416,   /* VAR_DNS64_IGNORE_AAAA  */
+    VAR_DNSTAP = 417,              /* VAR_DNSTAP  */
+    VAR_DNSTAP_ENABLE = 418,       /* VAR_DNSTAP_ENABLE  */
+    VAR_DNSTAP_SOCKET_PATH = 419,  /* VAR_DNSTAP_SOCKET_PATH  */
+    VAR_DNSTAP_IP = 420,           /* VAR_DNSTAP_IP  */
+    VAR_DNSTAP_TLS = 421,          /* VAR_DNSTAP_TLS  */
+    VAR_DNSTAP_TLS_SERVER_NAME = 422, /* VAR_DNSTAP_TLS_SERVER_NAME  */
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 423, /* VAR_DNSTAP_TLS_CERT_BUNDLE  */
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, /* VAR_DNSTAP_TLS_CLIENT_KEY_FILE  */
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, /* VAR_DNSTAP_TLS_CLIENT_CERT_FILE  */
+    VAR_DNSTAP_SEND_IDENTITY = 426, /* VAR_DNSTAP_SEND_IDENTITY  */
+    VAR_DNSTAP_SEND_VERSION = 427, /* VAR_DNSTAP_SEND_VERSION  */
+    VAR_DNSTAP_BIDIRECTIONAL = 428, /* VAR_DNSTAP_BIDIRECTIONAL  */
+    VAR_DNSTAP_IDENTITY = 429,     /* VAR_DNSTAP_IDENTITY  */
+    VAR_DNSTAP_VERSION = 430,      /* VAR_DNSTAP_VERSION  */
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, /* VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES  */
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, /* VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES  */
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, /* VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES  */
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, /* VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES  */
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, /* VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES  */
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, /* VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES  */
+    VAR_RESPONSE_IP_TAG = 437,     /* VAR_RESPONSE_IP_TAG  */
+    VAR_RESPONSE_IP = 438,         /* VAR_RESPONSE_IP  */
+    VAR_RESPONSE_IP_DATA = 439,    /* VAR_RESPONSE_IP_DATA  */
+    VAR_HARDEN_ALGO_DOWNGRADE = 440, /* VAR_HARDEN_ALGO_DOWNGRADE  */
+    VAR_IP_TRANSPARENT = 441,      /* VAR_IP_TRANSPARENT  */
+    VAR_IP_DSCP = 442,             /* VAR_IP_DSCP  */
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 443, /* VAR_DISABLE_DNSSEC_LAME_CHECK  */
+    VAR_IP_RATELIMIT = 444,        /* VAR_IP_RATELIMIT  */
+    VAR_IP_RATELIMIT_SLABS = 445,  /* VAR_IP_RATELIMIT_SLABS  */
+    VAR_IP_RATELIMIT_SIZE = 446,   /* VAR_IP_RATELIMIT_SIZE  */
+    VAR_RATELIMIT = 447,           /* VAR_RATELIMIT  */
+    VAR_RATELIMIT_SLABS = 448,     /* VAR_RATELIMIT_SLABS  */
+    VAR_RATELIMIT_SIZE = 449,      /* VAR_RATELIMIT_SIZE  */
+    VAR_RATELIMIT_FOR_DOMAIN = 450, /* VAR_RATELIMIT_FOR_DOMAIN  */
+    VAR_RATELIMIT_BELOW_DOMAIN = 451, /* VAR_RATELIMIT_BELOW_DOMAIN  */
+    VAR_IP_RATELIMIT_FACTOR = 452, /* VAR_IP_RATELIMIT_FACTOR  */
+    VAR_RATELIMIT_FACTOR = 453,    /* VAR_RATELIMIT_FACTOR  */
+    VAR_SEND_CLIENT_SUBNET = 454,  /* VAR_SEND_CLIENT_SUBNET  */
+    VAR_CLIENT_SUBNET_ZONE = 455,  /* VAR_CLIENT_SUBNET_ZONE  */
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, /* VAR_CLIENT_SUBNET_ALWAYS_FORWARD  */
+    VAR_CLIENT_SUBNET_OPCODE = 457, /* VAR_CLIENT_SUBNET_OPCODE  */
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 458, /* VAR_MAX_CLIENT_SUBNET_IPV4  */
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 459, /* VAR_MAX_CLIENT_SUBNET_IPV6  */
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 460, /* VAR_MIN_CLIENT_SUBNET_IPV4  */
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 461, /* VAR_MIN_CLIENT_SUBNET_IPV6  */
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, /* VAR_MAX_ECS_TREE_SIZE_IPV4  */
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, /* VAR_MAX_ECS_TREE_SIZE_IPV6  */
+    VAR_CAPS_WHITELIST = 464,      /* VAR_CAPS_WHITELIST  */
+    VAR_CACHE_MAX_NEGATIVE_TTL = 465, /* VAR_CACHE_MAX_NEGATIVE_TTL  */
+    VAR_PERMIT_SMALL_HOLDDOWN = 466, /* VAR_PERMIT_SMALL_HOLDDOWN  */
+    VAR_QNAME_MINIMISATION = 467,  /* VAR_QNAME_MINIMISATION  */
+    VAR_QNAME_MINIMISATION_STRICT = 468, /* VAR_QNAME_MINIMISATION_STRICT  */
+    VAR_IP_FREEBIND = 469,         /* VAR_IP_FREEBIND  */
+    VAR_DEFINE_TAG = 470,          /* VAR_DEFINE_TAG  */
+    VAR_LOCAL_ZONE_TAG = 471,      /* VAR_LOCAL_ZONE_TAG  */
+    VAR_ACCESS_CONTROL_TAG = 472,  /* VAR_ACCESS_CONTROL_TAG  */
+    VAR_LOCAL_ZONE_OVERRIDE = 473, /* VAR_LOCAL_ZONE_OVERRIDE  */
+    VAR_ACCESS_CONTROL_TAG_ACTION = 474, /* VAR_ACCESS_CONTROL_TAG_ACTION  */
+    VAR_ACCESS_CONTROL_TAG_DATA = 475, /* VAR_ACCESS_CONTROL_TAG_DATA  */
+    VAR_VIEW = 476,                /* VAR_VIEW  */
+    VAR_ACCESS_CONTROL_VIEW = 477, /* VAR_ACCESS_CONTROL_VIEW  */
+    VAR_VIEW_FIRST = 478,          /* VAR_VIEW_FIRST  */
+    VAR_SERVE_EXPIRED = 479,       /* VAR_SERVE_EXPIRED  */
+    VAR_SERVE_EXPIRED_TTL = 480,   /* VAR_SERVE_EXPIRED_TTL  */
+    VAR_SERVE_EXPIRED_TTL_RESET = 481, /* VAR_SERVE_EXPIRED_TTL_RESET  */
+    VAR_SERVE_EXPIRED_REPLY_TTL = 482, /* VAR_SERVE_EXPIRED_REPLY_TTL  */
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, /* VAR_SERVE_EXPIRED_CLIENT_TIMEOUT  */
+    VAR_FAKE_DSA = 484,            /* VAR_FAKE_DSA  */
+    VAR_FAKE_SHA1 = 485,           /* VAR_FAKE_SHA1  */
+    VAR_LOG_IDENTITY = 486,        /* VAR_LOG_IDENTITY  */
+    VAR_HIDE_TRUSTANCHOR = 487,    /* VAR_HIDE_TRUSTANCHOR  */
+    VAR_TRUST_ANCHOR_SIGNALING = 488, /* VAR_TRUST_ANCHOR_SIGNALING  */
+    VAR_AGGRESSIVE_NSEC = 489,     /* VAR_AGGRESSIVE_NSEC  */
+    VAR_USE_SYSTEMD = 490,         /* VAR_USE_SYSTEMD  */
+    VAR_SHM_ENABLE = 491,          /* VAR_SHM_ENABLE  */
+    VAR_SHM_KEY = 492,             /* VAR_SHM_KEY  */
+    VAR_ROOT_KEY_SENTINEL = 493,   /* VAR_ROOT_KEY_SENTINEL  */
+    VAR_DNSCRYPT = 494,            /* VAR_DNSCRYPT  */
+    VAR_DNSCRYPT_ENABLE = 495,     /* VAR_DNSCRYPT_ENABLE  */
+    VAR_DNSCRYPT_PORT = 496,       /* VAR_DNSCRYPT_PORT  */
+    VAR_DNSCRYPT_PROVIDER = 497,   /* VAR_DNSCRYPT_PROVIDER  */
+    VAR_DNSCRYPT_SECRET_KEY = 498, /* VAR_DNSCRYPT_SECRET_KEY  */
+    VAR_DNSCRYPT_PROVIDER_CERT = 499, /* VAR_DNSCRYPT_PROVIDER_CERT  */
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, /* VAR_DNSCRYPT_PROVIDER_CERT_ROTATED  */
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE  */
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, /* VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS  */
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, /* VAR_DNSCRYPT_NONCE_CACHE_SIZE  */
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, /* VAR_DNSCRYPT_NONCE_CACHE_SLABS  */
+    VAR_IPSECMOD_ENABLED = 505,    /* VAR_IPSECMOD_ENABLED  */
+    VAR_IPSECMOD_HOOK = 506,       /* VAR_IPSECMOD_HOOK  */
+    VAR_IPSECMOD_IGNORE_BOGUS = 507, /* VAR_IPSECMOD_IGNORE_BOGUS  */
+    VAR_IPSECMOD_MAX_TTL = 508,    /* VAR_IPSECMOD_MAX_TTL  */
+    VAR_IPSECMOD_WHITELIST = 509,  /* VAR_IPSECMOD_WHITELIST  */
+    VAR_IPSECMOD_STRICT = 510,     /* VAR_IPSECMOD_STRICT  */
+    VAR_CACHEDB = 511,             /* VAR_CACHEDB  */
+    VAR_CACHEDB_BACKEND = 512,     /* VAR_CACHEDB_BACKEND  */
+    VAR_CACHEDB_SECRETSEED = 513,  /* VAR_CACHEDB_SECRETSEED  */
+    VAR_CACHEDB_REDISHOST = 514,   /* VAR_CACHEDB_REDISHOST  */
+    VAR_CACHEDB_REDISPORT = 515,   /* VAR_CACHEDB_REDISPORT  */
+    VAR_CACHEDB_REDISTIMEOUT = 516, /* VAR_CACHEDB_REDISTIMEOUT  */
+    VAR_CACHEDB_REDISEXPIRERECORDS = 517, /* VAR_CACHEDB_REDISEXPIRERECORDS  */
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, /* VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM  */
+    VAR_FOR_UPSTREAM = 519,        /* VAR_FOR_UPSTREAM  */
+    VAR_AUTH_ZONE = 520,           /* VAR_AUTH_ZONE  */
+    VAR_ZONEFILE = 521,            /* VAR_ZONEFILE  */
+    VAR_MASTER = 522,              /* VAR_MASTER  */
+    VAR_URL = 523,                 /* VAR_URL  */
+    VAR_FOR_DOWNSTREAM = 524,      /* VAR_FOR_DOWNSTREAM  */
+    VAR_FALLBACK_ENABLED = 525,    /* VAR_FALLBACK_ENABLED  */
+    VAR_TLS_ADDITIONAL_PORT = 526, /* VAR_TLS_ADDITIONAL_PORT  */
+    VAR_LOW_RTT = 527,             /* VAR_LOW_RTT  */
+    VAR_LOW_RTT_PERMIL = 528,      /* VAR_LOW_RTT_PERMIL  */
+    VAR_FAST_SERVER_PERMIL = 529,  /* VAR_FAST_SERVER_PERMIL  */
+    VAR_FAST_SERVER_NUM = 530,     /* VAR_FAST_SERVER_NUM  */
+    VAR_ALLOW_NOTIFY = 531,        /* VAR_ALLOW_NOTIFY  */
+    VAR_TLS_WIN_CERT = 532,        /* VAR_TLS_WIN_CERT  */
+    VAR_TCP_CONNECTION_LIMIT = 533, /* VAR_TCP_CONNECTION_LIMIT  */
+    VAR_FORWARD_NO_CACHE = 534,    /* VAR_FORWARD_NO_CACHE  */
+    VAR_STUB_NO_CACHE = 535,       /* VAR_STUB_NO_CACHE  */
+    VAR_LOG_SERVFAIL = 536,        /* VAR_LOG_SERVFAIL  */
+    VAR_DENY_ANY = 537,            /* VAR_DENY_ANY  */
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, /* VAR_UNKNOWN_SERVER_TIME_LIMIT  */
+    VAR_LOG_TAG_QUERYREPLY = 539,  /* VAR_LOG_TAG_QUERYREPLY  */
+    VAR_STREAM_WAIT_SIZE = 540,    /* VAR_STREAM_WAIT_SIZE  */
+    VAR_TLS_CIPHERS = 541,         /* VAR_TLS_CIPHERS  */
+    VAR_TLS_CIPHERSUITES = 542,    /* VAR_TLS_CIPHERSUITES  */
+    VAR_TLS_USE_SNI = 543,         /* VAR_TLS_USE_SNI  */
+    VAR_IPSET = 544,               /* VAR_IPSET  */
+    VAR_IPSET_NAME_V4 = 545,       /* VAR_IPSET_NAME_V4  */
+    VAR_IPSET_NAME_V6 = 546,       /* VAR_IPSET_NAME_V6  */
+    VAR_TLS_SESSION_TICKET_KEYS = 547, /* VAR_TLS_SESSION_TICKET_KEYS  */
+    VAR_RPZ = 548,                 /* VAR_RPZ  */
+    VAR_TAGS = 549,                /* VAR_TAGS  */
+    VAR_RPZ_ACTION_OVERRIDE = 550, /* VAR_RPZ_ACTION_OVERRIDE  */
+    VAR_RPZ_CNAME_OVERRIDE = 551,  /* VAR_RPZ_CNAME_OVERRIDE  */
+    VAR_RPZ_LOG = 552,             /* VAR_RPZ_LOG  */
+    VAR_RPZ_LOG_NAME = 553,        /* VAR_RPZ_LOG_NAME  */
+    VAR_DYNLIB = 554,              /* VAR_DYNLIB  */
+    VAR_DYNLIB_FILE = 555,         /* VAR_DYNLIB_FILE  */
+    VAR_EDNS_CLIENT_STRING = 556,  /* VAR_EDNS_CLIENT_STRING  */
+    VAR_EDNS_CLIENT_STRING_OPCODE = 557, /* VAR_EDNS_CLIENT_STRING_OPCODE  */
+    VAR_NSID = 558                 /* VAR_NSID  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
+/* Token kinds.  */
+#define YYEOF 0
+#define YYerror 256
+#define YYUNDEF 257
 #define SPACE 258
 #define LETTER 259
 #define NEWLINE 260
@@ -652,6 +662,7 @@ extern int yydebug;
 #define VAR_DYNLIB_FILE 555
 #define VAR_EDNS_CLIENT_STRING 556
 #define VAR_EDNS_CLIENT_STRING_OPCODE 557
+#define VAR_NSID 558
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -661,7 +672,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 665 "util/configparser.h"
+#line 676 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 4d6b5e3fb..cb9d898b2 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -179,7 +179,7 @@ extern struct config_parser_state* cfg_parser;
 %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_STRING
-%token VAR_EDNS_CLIENT_STRING_OPCODE
+%token VAR_EDNS_CLIENT_STRING_OPCODE VAR_NSID
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -293,7 +293,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_stream_wait_size | server_tls_ciphers |
 	server_tls_ciphersuites | server_tls_session_ticket_keys |
 	server_tls_use_sni | server_edns_client_string |
-	server_edns_client_string_opcode
+	server_edns_client_string_opcode | server_nsid
 	;
 stubstart: VAR_STUB_ZONE
 	{
@@ -1304,6 +1304,22 @@ server_version: VAR_VERSION STRING_ARG
 		cfg_parser->cfg->version = $2;
 	}
 	;
+server_nsid: VAR_NSID STRING_ARG
+	{
+		OUTYY(("P(server_nsid:%s)\n", $2));
+		free(cfg_parser->cfg->nsid_cfg_str);
+		cfg_parser->cfg->nsid_cfg_str = $2;
+		free(cfg_parser->cfg->nsid);
+		cfg_parser->cfg->nsid = NULL;
+		cfg_parser->cfg->nsid_len = 0;
+		if (*$2 == 0)
+			; /* pass; empty string is not setting nsid */
+		else if (!(cfg_parser->cfg->nsid = cfg_parse_nsid(
+					$2, &cfg_parser->cfg->nsid_len)))
+			yyerror("the NSID must be either a hex string or an "
+			    "ascii character string prepended with ascii_.");
+	}
+	;
 server_so_rcvbuf: VAR_SO_RCVBUF STRING_ARG
 	{
 		OUTYY(("P(server_so_rcvbuf:%s)\n", $2));
diff --git a/util/edns.c b/util/edns.c
index ddbb46e89..bfb6d65ca 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -160,5 +160,10 @@ int apply_edns_options(struct edns_data* edns_out, struct edns_data* edns_in,
 		!edns_keepalive(edns_out, edns_in, c, region))
 		return 0;
 
+	if (cfg->nsid && edns_opt_list_find(edns_in->opt_list, LDNS_EDNS_NSID)
+	&& !edns_opt_list_append(&edns_out->opt_list,
+			LDNS_EDNS_NSID, cfg->nsid_len, cfg->nsid, region))
+		return 0;
+
 	return 1;
 }

From 1ebf851bf0906dab0739fed9426c8184e2f59746 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 09:51:26 +0100
Subject: [PATCH 127/208] - Fix #360: for the additionally reported TCP Fast
 Open makes TCP   connections fail, in that case we print a hint that this is 
  happening with the error in the logs.

---
 doc/Changelog   | 5 +++++
 util/netevent.c | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 30b8d34a1..1e895f9f2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+2 December 2020: Wouter
+	- Fix #360: for the additionally reported TCP Fast Open makes TCP
+	  connections fail, in that case we print a hint that this is
+	  happening with the error in the logs.
+
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
 	  verbosity.
diff --git a/util/netevent.c b/util/netevent.c
index 311a114ee..1a5d22892 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1594,6 +1594,13 @@ 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
+#ifdef ENOTCONN
+			if(errno == ENOTCONN) {
+				log_err_addr("read (in tcp s) failed and this could be because TCP Fast Open is enabled [--disable-tfo-client --disable-tfo-server] but does not work", sock_strerror(errno),
+					&c->repinfo.addr, c->repinfo.addrlen);
+				return 0;
+			}
+#endif
 #else /* USE_WINSOCK */
 			if(WSAGetLastError() == WSAECONNRESET)
 				return 0;

From 16c496bff66faecef693ecadbd386f861b553752 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 10:10:27 +0100
Subject: [PATCH 128/208] - Fix #356: deadlock when listening tcp.

---
 doc/Changelog             |  1 +
 services/listen_dnsport.c | 10 +++++-----
 util/netevent.c           | 28 +++++++++++++++++-----------
 util/netevent.h           | 10 ++++++++++
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 1e895f9f2..405060fc4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix #360: for the additionally reported TCP Fast Open makes TCP
 	  connections fail, in that case we print a hint that this is
 	  happening with the error in the logs.
+	- Fix #356: deadlock when listening tcp.
 
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index d63c0e0aa..709c9e6ce 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1821,12 +1821,12 @@ tcp_req_info_setup_listen(struct tcp_req_info* req)
 		req->cp->tcp_is_reading = 0;
 		comm_point_stop_listening(req->cp);
 		comm_point_start_listening(req->cp, -1,
-			req->cp->tcp_timeout_msec);
+			adjusted_tcp_timeout(req->cp));
 	} else if(rd) {
 		req->cp->tcp_is_reading = 1;
 		comm_point_stop_listening(req->cp);
 		comm_point_start_listening(req->cp, -1,
-			req->cp->tcp_timeout_msec);
+			adjusted_tcp_timeout(req->cp));
 		/* and also read it (from SSL stack buffers), so
 		 * no event read event is expected since the remainder of
 		 * the TLS frame is sitting in the buffers. */
@@ -1834,7 +1834,7 @@ tcp_req_info_setup_listen(struct tcp_req_info* req)
 	} else {
 		comm_point_stop_listening(req->cp);
 		comm_point_start_listening(req->cp, -1,
-			req->cp->tcp_timeout_msec);
+			adjusted_tcp_timeout(req->cp));
 		comm_point_listen_for_rw(req->cp, 0, 0);
 	}
 }
@@ -1947,7 +1947,7 @@ tcp_req_info_handle_readdone(struct tcp_req_info* req)
 	send_it:
 		c->tcp_is_reading = 0;
 		comm_point_stop_listening(c);
-		comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+		comm_point_start_listening(c, -1, adjusted_tcp_timeout(c));
 		return;
 	}
 	req->in_worker_handle = 0;
@@ -2065,7 +2065,7 @@ tcp_req_info_send_reply(struct tcp_req_info* req)
 		/* switch to listen to write events */
 		comm_point_stop_listening(req->cp);
 		comm_point_start_listening(req->cp, -1,
-			req->cp->tcp_timeout_msec);
+			adjusted_tcp_timeout(req->cp));
 		return;
 	}
 	/* queue up the answer behind the others already pending */
diff --git a/util/netevent.c b/util/netevent.c
index 1a5d22892..98796a788 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -762,6 +762,13 @@ comm_point_udp_callback(int fd, short event, void* arg)
 	}
 }
 
+int adjusted_tcp_timeout(struct comm_point* c)
+{
+	if(c->tcp_timeout_msec < TCP_QUERY_TIMEOUT_MINIMUM)
+		return TCP_QUERY_TIMEOUT_MINIMUM;
+	return c->tcp_timeout_msec;
+}
+
 /** Use a new tcp handler for new query fd, set to read query */
 static void
 setup_tcp_handler(struct comm_point* c, int fd, int cur, int max) 
@@ -795,10 +802,7 @@ setup_tcp_handler(struct comm_point* c, int fd, int cur, int max)
 		c->tcp_timeout_msec /= 500;
 	else if (handler_usage > 80)
 		c->tcp_timeout_msec = 0;
-	comm_point_start_listening(c, fd,
-		c->tcp_timeout_msec < TCP_QUERY_TIMEOUT_MINIMUM
-			? TCP_QUERY_TIMEOUT_MINIMUM
-			: c->tcp_timeout_msec);
+	comm_point_start_listening(c, fd, adjusted_tcp_timeout(c));
 }
 
 void comm_base_handle_slow_accept(int ATTR_UNUSED(fd),
@@ -1108,10 +1112,11 @@ tcp_callback_writer(struct comm_point* c)
 			if( (*c->callback)(c, c->cb_arg, NETEVENT_PKT_WRITTEN,
 				&c->repinfo) ) {
 				comm_point_start_listening(c, -1,
-					c->tcp_timeout_msec);
+					adjusted_tcp_timeout(c));
 			}
 		} else {
-			comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+			comm_point_start_listening(c, -1,
+					adjusted_tcp_timeout(c));
 		}
 	}
 }
@@ -1132,7 +1137,8 @@ tcp_callback_reader(struct comm_point* c)
 			comm_point_stop_listening(c);
 		fptr_ok(fptr_whitelist_comm_point(c->callback));
 		if( (*c->callback)(c, c->cb_arg, NETEVENT_NOERROR, &c->repinfo) ) {
-			comm_point_start_listening(c, -1, c->tcp_timeout_msec);
+			comm_point_start_listening(c, -1,
+					adjusted_tcp_timeout(c));
 		}
 	}
 }
@@ -2656,7 +2662,7 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c)
 	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);
+		comm_point_start_listening(c, -1, adjusted_tcp_timeout(c));
 	} else if(!nghttp2_session_want_read(c->h2_session->session))
 		return 0; /* connection can be closed */
 	return 1;
@@ -2974,7 +2980,7 @@ comm_point_http2_handle_write(int ATTR_UNUSED(fd), struct comm_point* c)
 	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);
+		comm_point_start_listening(c, -1, adjusted_tcp_timeout(c));
 	} else if(!nghttp2_session_want_write(c->h2_session->session))
 		return 0; /* connection can be closed */
 	return 1;
@@ -3932,11 +3938,11 @@ comm_point_send_reply(struct comm_reply *repinfo)
 			repinfo->c->tcp_is_reading = 0;
 			comm_point_stop_listening(repinfo->c);
 			comm_point_start_listening(repinfo->c, -1,
-				repinfo->c->tcp_timeout_msec);
+				adjusted_tcp_timeout(repinfo->c));
 			return;
 		} else {
 			comm_point_start_listening(repinfo->c, -1,
-				repinfo->c->tcp_timeout_msec);
+				adjusted_tcp_timeout(repinfo->c));
 		}
 	}
 }
diff --git a/util/netevent.h b/util/netevent.h
index daa954b64..266a74ff3 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -661,6 +661,16 @@ void comm_point_start_listening(struct comm_point* c, int newfd, int msec);
  */
 void comm_point_listen_for_rw(struct comm_point* c, int rd, int wr);
 
+/**
+ * For TCP handlers that use c->tcp_timeout_msec, this routine adjusts
+ * it with the minimum.  Otherwise, a 0 value advertised without the
+ * minimum applied moves to a 0 in comm_point_start_listening and that
+ * routine treats it as no timeout, listen forever, which is not wanted.
+ * @param c: comm point to use the tcp_timeout_msec of.
+ * @return adjusted tcp_timeout_msec value with the minimum if smaller.
+ */
+int adjusted_tcp_timeout(struct comm_point* c);
+
 /**
  * Get size of memory used by comm point.
  * For TCP handlers this includes subhandlers.

From cbb4575a18ecbda829b949306de38817d0b3495f Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 10:58:05 +0100
Subject: [PATCH 129/208] Document existence of option

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

diff --git a/doc/Changelog b/doc/Changelog
index 30b8d34a1..d5121864e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+2 December 2020: Willem
+	- Support for RFC5001: DNS Name Server Identifier (NSID) Option
+	  with the nsid: option in unbound.conf
+
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
 	  verbosity.
diff --git a/doc/FEATURES b/doc/FEATURES
index 076988ea9..8d69aba9b 100644
--- a/doc/FEATURES
+++ b/doc/FEATURES
@@ -39,6 +39,7 @@ RFC 4343: case insensitive handling of domain names.
 RFC 4509: SHA256 DS hash.
 RFC 4592: wildcards.
 RFC 4697: No DNS Resolution Misbehavior.
+RFC 5001: DNS Name Server Identifier (NSID) Option
 RFC 5011: update of trust anchors with timers.
 RFC 5155: NSEC3, NSEC3PARAM types
 RFC 5358: reflectors-are-evil: access control list for recursive
diff --git a/doc/TODO b/doc/TODO
index a2690451a..839656154 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -14,7 +14,6 @@ o (option) store primed key data in a overlaid keyhints file (sort of like draft
 o windows version, auto update feature, a query to check for the version.
 o command the server with TSIG inband. get-config, clearcache, 
 	get stats, get memstats, get ..., reload, clear one zone from cache
-o NSID rfc 5001 support.
 o timers rfc 5011 support.
 o Treat YXDOMAIN from a DNAME properly, in iterator (not throwaway), validator.
 o make timeout backoffs randomized (a couple percent random) to spread traffic.
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 38bbc44df..0423f6200 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -819,6 +819,11 @@ If enabled version.server and version.bind queries are refused.
 Set the version to report. If set to "", the default, then the package
 version is returned.
 .TP
+.B nsid:\fR <string>
+Add the specified nsid to the EDNS section of the answer when queried
+with an NSID EDNS enabled packet.  As a sequence of hex characters or
+with ascii_ prefix and then an ascii string.
+.TP
 .B hide\-trustanchor: \fI<yes or no>
 If enabled trustanchor.unbound queries are refused.
 .TP

From eb052e15434f933202b3067fc3fc68eaacdb6311 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 11:51:54 +0100
Subject: [PATCH 130/208] - Fix unbound-dnstap-socket to not use log routine
 from interrupt   handler and not print so frequently when invoked in
 sequence.

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

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 3ebe2b4e4..8c37654e8 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -1166,7 +1166,8 @@ int sig_quit = 0;
 /** signal handler for user quit */
 static RETSIGTYPE main_sigh(int sig)
 {
-	verbose(VERB_ALGO, "exit on signal %d\n", sig);
+	if(!sig_quit)
+		fprintf(stderr, "exit on signal %d\n", sig);
 	if(sig_base) {
 		ub_event_base_loopexit(sig_base);
 		sig_base = NULL;
diff --git a/doc/Changelog b/doc/Changelog
index 405060fc4..9bb31615f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,8 @@
 	  connections fail, in that case we print a hint that this is
 	  happening with the error in the logs.
 	- Fix #356: deadlock when listening tcp.
+	- Fix unbound-dnstap-socket to not use log routine from interrupt
+	  handler and not print so frequently when invoked in sequence.
 
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low

From e049fb303c39eef9cda4a70c6e161819d7e08ffd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 11:58:24 +0100
Subject: [PATCH 131/208] - Fix on windows to ignore connection failure on UDP,
 unless verbose.

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

diff --git a/doc/Changelog b/doc/Changelog
index 9bb31615f..9d055b5df 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	- Fix #356: deadlock when listening tcp.
 	- Fix unbound-dnstap-socket to not use log routine from interrupt
 	  handler and not print so frequently when invoked in sequence.
+	- Fix on windows to ignore connection failure on UDP, unless verbose.
 
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
diff --git a/util/netevent.c b/util/netevent.c
index 98796a788..e7a674f8a 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -583,6 +583,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet,
 static int udp_recv_needs_log(int err)
 {
 	switch(err) {
+#ifndef USE_WINSOCK
 	case ECONNREFUSED:
 #  ifdef ENETUNREACH
 	case ENETUNREACH:
@@ -596,6 +597,13 @@ static int udp_recv_needs_log(int err)
 #  ifdef ENETDOWN
 	case ENETDOWN:
 #  endif
+#else /* USE_WINSOCK */
+	case WSAECONNREFUSED:
+	case WSAENETUNREACH:
+	case WSAEHOSTDOWN:
+	case WSAEHOSTUNREACH:
+	case WSAENETDOWN:
+#endif
 		if(verbosity >= VERB_ALGO)
 			return 1;
 		return 0;
@@ -736,7 +744,8 @@ comm_point_udp_callback(int fd, short event, void* arg)
 #else
 			if(WSAGetLastError() != WSAEINPROGRESS &&
 				WSAGetLastError() != WSAECONNRESET &&
-				WSAGetLastError()!= WSAEWOULDBLOCK)
+				WSAGetLastError()!= WSAEWOULDBLOCK &&
+				udp_recv_needs_log(WSAGetLastError()))
 				log_err("recvfrom failed: %s",
 					wsa_strerror(WSAGetLastError()));
 #endif

From 0502ab3026af59673b21133eb7c5a72126b37d66 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 15:42:24 +0100
Subject: [PATCH 132/208] - Fix for #283: fix stream reuse and tcp fast open.

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

diff --git a/doc/Changelog b/doc/Changelog
index 9d055b5df..890e439fe 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
 	- Fix unbound-dnstap-socket to not use log routine from interrupt
 	  handler and not print so frequently when invoked in sequence.
 	- Fix on windows to ignore connection failure on UDP, unless verbose.
+	- Fix for #283: fix stream reuse and tcp fast open.
 
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
diff --git a/util/netevent.c b/util/netevent.c
index e7a674f8a..eca2df83f 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2064,7 +2064,11 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 		}
 		return;
 	}
-	if(event&UB_EV_READ) {
+	if(event&UB_EV_READ
+#ifdef USE_MSG_FASTOPEN
+		&& !c->tcp_do_fastopen
+#endif
+		) {
 		int has_tcpq = (c->tcp_req_info != NULL);
 		int* moreread = c->tcp_more_read_again;
 		if(!comm_point_tcp_handle_read(fd, c, 0)) {

From 9eeb95a960460399d66f13fca02fb50464c50e10 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 16:17:26 +0100
Subject: [PATCH 133/208] - Fix update, with write event check with streamreuse
 and fastopen.

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

diff --git a/doc/Changelog b/doc/Changelog
index 890e439fe..4b6a4a318 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
 	  handler and not print so frequently when invoked in sequence.
 	- Fix on windows to ignore connection failure on UDP, unless verbose.
 	- Fix for #283: fix stream reuse and tcp fast open.
+	- Fix update, with write event check with streamreuse and fastopen.
 
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
diff --git a/util/netevent.c b/util/netevent.c
index eca2df83f..d3e268a01 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2066,7 +2066,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
 	}
 	if(event&UB_EV_READ
 #ifdef USE_MSG_FASTOPEN
-		&& !c->tcp_do_fastopen
+		&& !(c->tcp_do_fastopen && (event&UB_EV_WRITE))
 #endif
 		) {
 		int has_tcpq = (c->tcp_req_info != NULL);

From 37d751e1353b19dac1025c9b3a64c14812346ebc Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 3 Dec 2020 10:14:14 +0100
Subject: [PATCH 134/208] Code repo continues for 1.13.1 in development.

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

diff --git a/configure b/configure
index 7fa20f987..00d36a361 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.13.0.
+# Generated by GNU Autoconf 2.69 for unbound 1.13.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.13.0'
-PACKAGE_STRING='unbound 1.13.0'
+PACKAGE_VERSION='1.13.1'
+PACKAGE_STRING='unbound 1.13.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.13.0 to adapt to many kinds of systems.
+\`configure' configures unbound 1.13.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.13.0:";;
+     short | recursive ) echo "Configuration of unbound 1.13.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.13.0
+unbound configure 1.13.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.13.0, which was
+It was created by unbound $as_me 1.13.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=13
 
-UNBOUND_VERSION_MICRO=0
+UNBOUND_VERSION_MICRO=1
 
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=11
+LIBUNBOUND_REVISION=12
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2896,6 +2896,7 @@ LIBUNBOUND_AGE=1
 # 1.11.0 had 9:9:1
 # 1.12.0 had 9:10:1
 # 1.13.0 had 9:11:1
+# 1.13.1 had 9:12:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -21731,7 +21732,7 @@ _ACEOF
 
 
 
-version=1.13.0
+version=1.13.1
 
 date=`date +'%b %e, %Y'`
 
@@ -22250,7 +22251,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.13.0, which was
+This file was extended by unbound $as_me 1.13.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22316,7 +22317,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.13.0
+unbound config.status 1.13.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 5385f7747..d648f55ad 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],[13])
-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=11
+LIBUNBOUND_REVISION=12
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -97,6 +97,7 @@ LIBUNBOUND_AGE=1
 # 1.11.0 had 9:9:1
 # 1.12.0 had 9:10:1
 # 1.13.0 had 9:11:1
+# 1.13.1 had 9:12: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 4b6a4a318..d8ffabd52 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -17,7 +17,9 @@
 	- Fix assertion failure on double callback when iterator loses
 	  interest in query at head of line that then has the tcp stream
 	  not kept for reuse.
-	- tag for the 1.13.0rc4 release.
+	- tag for the 1.13.0rc4 release.  This also became the 1.13.0
+	  release version with the streamreuse and fastopen fix from
+	  2 dec 2020.  The code repo continues for 1.13.1 in development.
 
 27 November 2020: Wouter
 	- Fix compile warning for type cast in http2_submit_dns_response.

From e21d38dcb9da0d500c0f1e988c72d21f17245598 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 3 Dec 2020 10:26:37 +0100
Subject: [PATCH 135/208] - make depend.

---
 Makefile.in   | 489 +++++++++++++++++++++++++++++---------------------
 doc/Changelog |   8 +-
 2 files changed, 289 insertions(+), 208 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d2600e71f..4ca46496b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -429,6 +429,7 @@ dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h
 dtstream.lo dtstream.o: $(srcdir)/dnstap/dtstream.c config.h $(srcdir)/dnstap/dtstream.h
 dnstap_fstrm.lo dnstap_fstrm.o: $(srcdir)/dnstap/dnstap_fstrm.c config.h $(srcdir)/dnstap/dnstap_fstrm.h
 unbound-dnstap-socket.lo unbound-dnstap-socket.o: $(srcdir)/dnstap/unbound-dnstap-socket.c config.h $(srcdir)/dnstap/dtstream.h
+dynlibmod.lo dynlibdmod.o: $(srcdir)/dynlibmod/dynlibmod.c config.h $(srcdir)/dynlibmod/dynlibmod.h
 
 # dnscrypt
 dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h \
@@ -826,13 +827,16 @@ modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/service
  $(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)/util/fptr_wlist.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/dnscrypt/cert.h \
- $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/dns64/dns64.h \
- $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h \
- $(srcdir)/validator/val_utils.h $(srcdir)/respip/respip.h $(srcdir)/services/localzone.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(PYTHONMOD_HEADER) $(srcdir)/ipsecmod/ipsecmod.h \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \
- $(srcdir)/ipset/ipset.h $(srcdir)/dynlibmod/dynlibmod.h
+ $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/util/tube.h \
+ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.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)/dns64/dns64.h $(srcdir)/iterator/iterator.h \
+ $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \
+ $(PYTHONMOD_HEADER) $(DYNLIBMOD_HEADER) $(srcdir)/cachedb/cachedb.h \
+ $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/alloc.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h \
+ $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/ipset/ipset.h
 view.lo view.o: $(srcdir)/services/view.c config.h $(srcdir)/services/view.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \
  $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \
@@ -863,7 +867,8 @@ outside_network.lo outside_network.o: $(srcdir)/services/outside_network.c confi
  $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
  $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/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)/dnstap/dnstap.h
+ $(srcdir)/util/edns.h $(srcdir)/dnstap/dnstap.h \
+ 
 alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
@@ -884,7 +889,8 @@ config_file.lo config_file.o: $(srcdir)/util/config_file.c config.h $(srcdir)/ut
  $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \
  $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/data/dname.h \
  $(srcdir)/util/rtt.h $(srcdir)/services/cache/infra.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h \
- $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/iana_ports.inc
+ $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/edns-subnet/edns-subnet.h \
+ $(srcdir)/util/iana_ports.inc
 configlexer.lo configlexer.o: util/configlexer.c config.h $(srcdir)/util/configyyrename.h \
  $(srcdir)/util/config_file.h util/configparser.h
 configparser.lo configparser.o: util/configparser.c config.h $(srcdir)/util/configyyrename.h \
@@ -913,38 +919,31 @@ authzone.lo authzone.o: $(srcdir)/services/authzone.c config.h $(srcdir)/service
  $(srcdir)/util/data/msgencode.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \
  $(srcdir)/services/cache/dns.h $(srcdir)/services/outside_network.h  \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \
- $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/keyraw.h $(srcdir)/validator/val_nsec3.h \
- $(srcdir)/validator/val_secalgo.h
+ $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/keyraw.h \
+ $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_secalgo.h
 fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/fptr_wlist.h \
  $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
- $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/mini_event.h \
- $(srcdir)/services/outside_network.h  $(srcdir)/services/localzone.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/services/authzone.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 $(srcdir)/validator/validator.h \
- $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_nsec3.h \
- $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_neg.h \
- $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h $(srcdir)/libunbound/context.h \
- $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h \
- $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h \
- $(PYTHONMOD_HEADER) $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/net_help.h \
- $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/ipset/ipset.h \
- $(srcdir)/dynlibmod/dynlibmod.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 $(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 \
+ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_anchor.h \
+ $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h \
+ $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h \
+ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound-event.h \
+ $(srcdir)/libunbound/worker.h $(PYTHONMOD_HEADER) $(DYNLIBMOD_HEADER) \
+ $(srcdir)/cachedb/cachedb.h $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/edns-subnet/subnetmod.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h \
+ $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/ipset/ipset.h $(srcdir)/dnstap/dtstream.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
@@ -957,12 +956,14 @@ netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/neteve
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.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)/sldns/str2wire.h \
- $(srcdir)/dnstap/dnstap.h  $(srcdir)/services/listen_dnsport.h
+ $(srcdir)/dnstap/dnstap.h  $(srcdir)/services/listen_dnsport.h \
+ 
 net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
  $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
  $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \
- $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \
+ 
 random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h
 rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \
  $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
@@ -978,11 +979,11 @@ rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h $(srcdir)/itera
  $(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 \
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
-edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/edns.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/util/regional.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/msgreply.h \
- $(srcdir)/util/data/packed_rrset.h
+edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/edns.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+  $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/regional.h \
+ $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h
 dnstree.lo dnstree.o: $(srcdir)/util/storage/dnstree.c config.h $(srcdir)/util/storage/dnstree.h \
  $(srcdir)/util/rbtree.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
  $(srcdir)/util/log.h $(srcdir)/util/net_help.h
@@ -1016,7 +1017,8 @@ 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 \
@@ -1026,7 +1028,8 @@ 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 \
@@ -1039,7 +1042,8 @@ autotrust.lo autotrust.o: $(srcdir)/validator/autotrust.c config.h $(srcdir)/val
  $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/respip/respip.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/validator/val_kcache.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h
+ $(srcdir)/validator/val_kcache.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h \
+ 
 val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h $(srcdir)/validator/val_anchor.h \
  $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_sigcrypt.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h \
@@ -1069,11 +1073,13 @@ val_kcache.lo val_kcache.o: $(srcdir)/validator/val_kcache.c config.h $(srcdir)/
 val_kentry.lo val_kentry.o: $(srcdir)/validator/val_kentry.c config.h $(srcdir)/validator/val_kentry.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \
  $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h
-val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h \
- $(srcdir)/util/log.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
+ 
+val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h \
+ $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/config_file.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
  $(srcdir)/services/cache/dns.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h
 val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h $(srcdir)/validator/val_nsec3.h \
@@ -1091,15 +1097,17 @@ val_nsec.lo val_nsec.o: $(srcdir)/validator/val_nsec.c config.h $(srcdir)/valida
 val_secalgo.lo val_secalgo.o: $(srcdir)/validator/val_secalgo.c config.h $(srcdir)/util/data/packed_rrset.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h \
  $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
- $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/sldns/sbuffer.h \
+ 
 val_sigcrypt.lo val_sigcrypt.o: $(srcdir)/validator/val_sigcrypt.c config.h \
  $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/val_secalgo.h \
  $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h \
  $(srcdir)/util/data/dname.h $(srcdir)/util/rbtree.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \
- $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h \
- $(srcdir)/sldns/wire2str.h
+ $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \
+ 
 val_utils.lo val_utils.o: $(srcdir)/validator/val_utils.c config.h $(srcdir)/validator/val_utils.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
@@ -1120,15 +1128,43 @@ dns64.lo dns64.o: $(srcdir)/dns64/dns64.c config.h $(srcdir)/dns64/dns64.h $(src
  $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \
  $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/str2wire.h
-edns-subnet.lo edns-subnet.o: $(srcdir)/edns-subnet/edns-subnet.c config.h
-subnetmod.lo subnetmod.o: $(srcdir)/edns-subnet/subnetmod.c config.h
+edns-subnet.lo edns-subnet.o: $(srcdir)/edns-subnet/edns-subnet.c config.h \
+ $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h
+subnetmod.lo subnetmod.o: $(srcdir)/edns-subnet/subnetmod.c config.h $(srcdir)/edns-subnet/subnetmod.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)/services/outbound_list.h $(srcdir)/util/alloc.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/data/dname.h \
+ $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \
+ $(srcdir)/edns-subnet/subnet-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \
+ $(srcdir)/services/localzone.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/cache/dns.h $(srcdir)/util/regional.h \
+ $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h
 addrtree.lo addrtree.o: $(srcdir)/edns-subnet/addrtree.c config.h $(srcdir)/util/log.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \
  $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/edns-subnet/addrtree.h
-subnet-whitelist.lo subnet-whitelist.o: $(srcdir)/edns-subnet/subnet-whitelist.c config.h
-cachedb.lo cachedb.o: $(srcdir)/cachedb/cachedb.c config.h
-redis.lo redis.o: $(srcdir)/cachedb/redis.c config.h
+subnet-whitelist.lo subnet-whitelist.o: $(srcdir)/edns-subnet/subnet-whitelist.c config.h \
+ $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
+ $(srcdir)/edns-subnet/subnet-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
+cachedb.lo cachedb.o: $(srcdir)/cachedb/cachedb.c config.h $(srcdir)/cachedb/cachedb.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)/cachedb/redis.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/data/msgencode.h $(srcdir)/services/cache/dns.h \
+ $(srcdir)/validator/val_neg.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_secalgo.h \
+ $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h $(srcdir)/sldns/parseutil.h \
+ $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/sbuffer.h
+redis.lo redis.o: $(srcdir)/cachedb/redis.c config.h $(srcdir)/cachedb/redis.h $(srcdir)/cachedb/cachedb.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)/util/alloc.h $(srcdir)/util/config_file.h \
+ $(srcdir)/sldns/sbuffer.h
 respip.lo respip.o: $(srcdir)/respip/respip.c config.h $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/module.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
@@ -1143,31 +1179,40 @@ checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/u
  $(srcdir)/testcode/checklocks.h
 dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c  config.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/dnscrypt/cert.h \
- $(srcdir)/util/locks.h $(srcdir)/dnstap/dnstap.h \
- dnstap/dnstap.pb-c.h
+ $(srcdir)/dnscrypt/dnscrypt.h  \
+ $(srcdir)/dnstap/dnstap.h \
+ $(srcdir)/dnstap/dtstream.h $(srcdir)/util/locks.h dnstap/dnstap.pb-c.h
 dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h \
  
-dynlibmod.lo dynlibmod.o: $(srcdir)/dynlibmod/dynlibmod.c config.h $(srcdir)/dynlibmod/dynlibmod.h \
+dnstap_fstrm.lo dnstap_fstrm.o: $(srcdir)/dnstap/dnstap_fstrm.c config.h $(srcdir)/dnstap/dnstap_fstrm.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h
+dtstream.lo dtstream.o: $(srcdir)/dnstap/dtstream.c config.h $(srcdir)/dnstap/dtstream.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/dnstap/dnstap_fstrm.h $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h \
+ $(srcdir)/util/net_help.h $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h \
+ $(srcdir)/dnscrypt/dnscrypt.h   \
+ $(srcdir)/sldns/sbuffer.h \
+ 
+ipsecmod.lo ipsecmod.o: $(srcdir)/ipsecmod/ipsecmod.c config.h $(srcdir)/ipsecmod/ipsecmod.h \
  $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/rbtree.h\
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/rbtree.h $(srcdir)/ipsecmod/ipsecmod-whitelist.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h \
  $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/util/tube.h \
- $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
- $(srcdir)/util/config_file.h $(srcdir)/services/cache/dns.h $(srcdir)/sldns/wire2str.h
-dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/dnscrypt/cert.h \
- $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/storage/lookup3.h
-ipsecmod.lo ipsecmod.o: $(srcdir)/ipsecmod/ipsecmod.c config.h
+ $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
+ $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/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/regional.h $(srcdir)/util/net_help.h $(srcdir)/services/cache/dns.h $(srcdir)/sldns/wire2str.h
+ipsecmod-whitelist.lo ipsecmod-whitelist.o: $(srcdir)/ipsecmod/ipsecmod-whitelist.c config.h \
+ $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/ipsecmod/ipsecmod-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/regional.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/str2wire.h
 ipset.lo ipset.o: $(srcdir)/ipset/ipset.c config.h $(srcdir)/ipset/ipset.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)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/services/cache/dns.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h
-ipsecmod-whitelist.lo ipsecmod-whitelist.o: $(srcdir)/ipsecmod/ipsecmod-whitelist.c config.h
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h \
+ $(srcdir)/services/cache/dns.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h
 unitanchor.lo unitanchor.o: $(srcdir)/testcode/unitanchor.c config.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/testcode/unitmain.h \
  $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h
@@ -1176,7 +1221,8 @@ unitdname.lo unitdname.o: $(srcdir)/testcode/unitdname.c config.h $(srcdir)/util
  $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h
 unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h $(srcdir)/testcode/unitmain.h \
  $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h
-unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
+unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
  $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/util/timehist.h $(srcdir)/iterator/iterator.h \
  $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \
@@ -1184,7 +1230,8 @@ unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h $(srcdir)/sldns/r
  $(srcdir)/sldns/pkthdr.h $(srcdir)/libunbound/unbound.h $(srcdir)/services/cache/infra.h \
  $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/util/random.h $(srcdir)/respip/respip.h \
- $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/services/outside_network.h 
 unitmsgparse.lo unitmsgparse.o: $(srcdir)/testcode/unitmsgparse.c config.h $(srcdir)/util/log.h \
  $(srcdir)/testcode/unitmain.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
@@ -1216,7 +1263,13 @@ testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcod
 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/parseutil.h
-unitecs.lo unitecs.o: $(srcdir)/testcode/unitecs.c config.h
+unitecs.lo unitecs.o: $(srcdir)/testcode/unitecs.c config.h $(srcdir)/util/log.h $(srcdir)/util/module.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.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)/testcode/unitmain.h $(srcdir)/edns-subnet/addrtree.h \
+ $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/services/outbound_list.h $(srcdir)/util/alloc.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/data/dname.h \
+ $(srcdir)/edns-subnet/edns-subnet.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 \
  $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/util/data/msgparse.h \
@@ -1233,40 +1286,43 @@ acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/ac
  $(srcdir)/services/localzone.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.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/sbuffer.h $(srcdir)/sldns/str2wire.h
-cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h $(srcdir)/daemon/cachedump.h \
- $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
- $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
- $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  \
- $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h \
- $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h \
- $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
- $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
-daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \
- $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h  \
-  $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
+cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h \
+ $(srcdir)/daemon/cachedump.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
  $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+  $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \
  $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
- $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
- $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h \
- $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h \
+  $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \
+ $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \
+ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/sldns/wire2str.h \
+ $(srcdir)/sldns/str2wire.h
+daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
+ $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+   $(srcdir)/daemon/worker.h \
+ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \
+ $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
+ $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/util/storage/lookup3.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
  $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
  $(srcdir)/services/rpz.h $(srcdir)/respip/respip.h $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \
  $(srcdir)/sldns/keyraw.h
-remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \
- $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/util/alloc.h \
- $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
+remote.lo remote.o: $(srcdir)/daemon/remote.c config.h \
+ $(srcdir)/daemon/remote.h \
+ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
+ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
+ $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
+ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
  $(srcdir)/services/modstack.h $(srcdir)/daemon/cachedump.h $(srcdir)/util/config_file.h \
  $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
  $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
@@ -1291,19 +1347,21 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
  $(srcdir)/util/net_help.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \
  $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h \
  $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.h
+ $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.h $(srcdir)/edns-subnet/subnetmod.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \
+ 
 unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \
  $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h  \
-  $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h \
- $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h \
- $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
- $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \
- $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h \
- $(srcdir)/util/ub_event.h
+  $(srcdir)/daemon/remote.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \
+ $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \
+ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h
 worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
@@ -1311,23 +1369,24 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr
  $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
- $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \
- $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \
- $(srcdir)/services/localzone.h $(srcdir)/respip/respip.h $(srcdir)/util/data/msgencode.h \
- $(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)/dnstap/dtstream.h
+ $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
+ $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \
+ $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
+ $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
+ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/respip/respip.h \
+ $(srcdir)/util/data/msgencode.h $(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)/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 \
- $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c \
- $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+ $(srcdir)/daemon/remote.h \
+ $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/util/log.h \
+ $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
   $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
@@ -1346,34 +1405,35 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr
  $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
- $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \
- $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \
- $(srcdir)/services/localzone.h $(srcdir)/respip/respip.h $(srcdir)/util/data/msgencode.h \
- $(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)/dnstap/dtstream.h
+ $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
+ $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \
+ $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
+ $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
+ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/respip/respip.h \
+ $(srcdir)/util/data/msgencode.h $(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)/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 \
  $(srcdir)/services/localzone.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.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/sbuffer.h $(srcdir)/sldns/str2wire.h
-daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \
- $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h  \
-  $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgreply.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \
- $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
- $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
- $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h \
- $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h \
+daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
+ $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+   $(srcdir)/daemon/worker.h \
+ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \
+ $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
+ $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/util/storage/lookup3.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
  $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
  $(srcdir)/services/rpz.h $(srcdir)/respip/respip.h $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \
@@ -1391,7 +1451,9 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
  $(srcdir)/util/net_help.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \
  $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h \
  $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.h
+ $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.h $(srcdir)/edns-subnet/subnetmod.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \
+ 
 replay.lo replay.o: $(srcdir)/testcode/replay.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/config_file.h $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/testcode/testpkts.h $(srcdir)/util/rbtree.h \
@@ -1401,13 +1463,14 @@ fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/t
  $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/config_file.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \
- $(srcdir)/util/rbtree.h  $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h $(srcdir)/testcode/replay.h $(srcdir)/testcode/testpkts.h \
- $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \
- $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
+ $(srcdir)/util/edns.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h \
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \
+  $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
+ $(srcdir)/testcode/replay.h $(srcdir)/testcode/testpkts.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \
+ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \
+ $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \
+ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \
+ $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
 lock_verify.lo lock_verify.o: $(srcdir)/testcode/lock_verify.c config.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \
@@ -1442,7 +1505,8 @@ unbound-checkconf.lo unbound-checkconf.o: $(srcdir)/smallapp/unbound-checkconf.c
  $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
  $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
  $(srcdir)/services/modstack.h $(srcdir)/services/rpz.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)/sldns/str2wire.h \
+ $(PYTHONMOD_HEADER) $(srcdir)/edns-subnet/subnet-whitelist.h
 worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c config.h $(srcdir)/libunbound/context.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
  $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.h \
@@ -1463,76 +1527,83 @@ context.lo context.o: $(srcdir)/libunbound/context.c config.h $(srcdir)/libunbou
  $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
  $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
  $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h \
- $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h
+ $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/util/edns.h
 libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbound/unbound.h \
  $(srcdir)/libunbound/unbound-event.h config.h $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h \
  $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/libunbound/libworker.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h \
- $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/util/ub_event.h \
- $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \
+ $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/util/ub_event.h $(srcdir)/util/edns.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \
  $(srcdir)/sldns/sbuffer.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h \
  $(srcdir)/dnscrypt/dnscrypt.h  $(srcdir)/services/cache/rrset.h \
  $(srcdir)/util/storage/slabhash.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \
  $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h
-libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/libunbound/libworker.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/worker.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/services/outside_network.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnscrypt/dnscrypt.h   \
- $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \
- $(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)/respip/respip.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h \
- $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h \
- $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
- $(srcdir)/sldns/str2wire.h
+libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h \
+ $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h \
+ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/outside_network.h \
+ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h  \
+  $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(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)/respip/respip.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h $(srcdir)/util/storage/lookup3.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h \
+ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/sldns/str2wire.h
 unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c config.h $(srcdir)/libunbound/unbound.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h \
+ 
 asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
  $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/rrdef.h
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/rrdef.h \
+ 
 streamtcp.lo streamtcp.o: $(srcdir)/testcode/streamtcp.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/net_help.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgparse.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \
+ 
 perf.lo perf.o: $(srcdir)/testcode/perf.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
 delayer.lo delayer.o: $(srcdir)/testcode/delayer.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
  $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
-unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h $(srcdir)/util/log.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h $(srcdir)/util/shm_side/shm_main.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/sldns/wire2str.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \
- $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h \
+ $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/shm_side/shm_main.h $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/stats.h \
+ $(srcdir)/util/timehist.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/rpz.h \
+ $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/module.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/services/modstack.h $(srcdir)/respip/respip.h
 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
+ $(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
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h \
+ dnstap/dnstap.pb-c.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 \
  $(srcdir)/sldns/rrdef.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
   $(srcdir)/util/net_help.h $(srcdir)/services/cache/dns.h \
  $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \
- $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h \
+ 
 win_svc.lo win_svc.o: $(srcdir)/winrc/win_svc.c config.h $(srcdir)/winrc/win_svc.h $(srcdir)/winrc/w_inst.h \
  $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
    $(srcdir)/daemon/worker.h \
@@ -1540,8 +1611,8 @@ win_svc.lo win_svc.o: $(srcdir)/winrc/win_svc.c config.h $(srcdir)/winrc/win_svc
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
  $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h \
- $(srcdir)/util/net_help.h
+ $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h
 w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h
 unbound-service-install.lo unbound-service-install.o: $(srcdir)/winrc/unbound-service-install.c config.h \
  $(srcdir)/winrc/w_inst.h
@@ -1549,12 +1620,14 @@ unbound-service-remove.lo unbound-service-remove.o: $(srcdir)/winrc/unbound-serv
  $(srcdir)/winrc/w_inst.h
 anchor-update.lo anchor-update.o: $(srcdir)/winrc/anchor-update.c config.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/wire2str.h
-keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/rrdef.h
+keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h \
+ $(srcdir)/sldns/rrdef.h \
+ 
 sbuffer.lo sbuffer.o: $(srcdir)/sldns/sbuffer.c config.h $(srcdir)/sldns/sbuffer.h
 wire2str.lo wire2str.o: $(srcdir)/sldns/wire2str.c config.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/sldns/keyraw.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
- $(srcdir)/util/log.h
+ $(srcdir)/sldns/keyraw.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
 parse.lo parse.o: $(srcdir)/sldns/parse.c config.h $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h \
  $(srcdir)/sldns/sbuffer.h
 parseutil.lo parseutil.o: $(srcdir)/sldns/parseutil.c config.h $(srcdir)/sldns/parseutil.h
@@ -1562,9 +1635,11 @@ rrdef.lo rrdef.o: $(srcdir)/sldns/rrdef.c config.h $(srcdir)/sldns/rrdef.h $(src
 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
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.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/data/msgparse.h \
+ $(srcdir)/sldns/pkthdr.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
@@ -1579,9 +1654,11 @@ strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h
 strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h
 strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h
 getentropy_freebsd.lo getentropy_freebsd.o: $(srcdir)/compat/getentropy_freebsd.c
-getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h
+getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h \
+ 
 getentropy_osx.lo getentropy_osx.o: $(srcdir)/compat/getentropy_osx.c
-getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h
+getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h \
+ 
 getentropy_win.lo getentropy_win.o: $(srcdir)/compat/getentropy_win.c
 explicit_bzero.lo explicit_bzero.o: $(srcdir)/compat/explicit_bzero.c config.h
 arc4random.lo arc4random.o: $(srcdir)/compat/arc4random.c config.h $(srcdir)/compat/chacha_private.h
diff --git a/doc/Changelog b/doc/Changelog
index d8ffabd52..e1753a2db 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 December 2020: Wouter
+	- make depend.
+
 2 December 2020: Wouter
 	- Fix #360: for the additionally reported TCP Fast Open makes TCP
 	  connections fail, in that case we print a hint that this is
@@ -18,8 +21,9 @@
 	  interest in query at head of line that then has the tcp stream
 	  not kept for reuse.
 	- tag for the 1.13.0rc4 release.  This also became the 1.13.0
-	  release version with the streamreuse and fastopen fix from
-	  2 dec 2020.  The code repo continues for 1.13.1 in development.
+	  release version on 3 dec 2020 with the streamreuse and fastopen
+	  fix from 2 dec 2020.  The code repo continues for 1.13.1 in
+	  development.
 
 27 November 2020: Wouter
 	- Fix compile warning for type cast in http2_submit_dns_response.

From b49cc2e66797dcf66c991bd7ff1d4986642bb088 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 3 Dec 2020 10:27:19 +0100
Subject: [PATCH 136/208] - 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 e1753a2db..3aaa19338 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 3 December 2020: Wouter
 	- make depend.
+	- iana portlist updated.
 
 2 December 2020: Wouter
 	- Fix #360: for the additionally reported TCP Fast Open makes TCP
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index d9978f92e..adeafc4ad 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -2014,6 +2014,7 @@
 2368,
 2370,
 2372,
+2378,
 2381,
 2382,
 2383,

From a4fc32809cee523acfa9a3b82a9f5d6d46006e98 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 11 Dec 2020 09:33:56 +0100
Subject: [PATCH 137/208] - Fix #371: unbound-control timeout when Unbound is
 not running.

---
 doc/Changelog              |   3 ++
 smallapp/unbound-control.c | 106 +++++++++++++++++++++++++++++++------
 2 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 3aaa19338..af111d8a0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+11 December 2020: Wouter
+	- Fix #371: unbound-control timeout when Unbound is not running.
+
 3 December 2020: Wouter
 	- make depend.
 	- iana portlist updated.
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 842dbe0d8..93281736a 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -82,6 +82,9 @@ static void usage(void) ATTR_NORETURN;
 static void ssl_err(const char* s) ATTR_NORETURN;
 static void ssl_path_err(const char* s, const char *path) ATTR_NORETURN;
 
+/** timeout to wait for connection over stream, in msec */
+#define UNBOUND_CONTROL_CONNECT_TIMEOUT 5000
+
 /** Give unbound-control usage, and exit (1). */
 static void
 usage(void)
@@ -545,6 +548,30 @@ setup_ctx(struct config_file* cfg)
 	return ctx;
 }
 
+/** check connect error */
+static void
+checkconnecterr(int err, const char* svr, struct sockaddr_storage* addr,
+	socklen_t addrlen, int statuscmd, int useport)
+{
+#ifndef USE_WINSOCK
+	if(!useport) log_err("connect: %s for %s", strerror(err), svr);
+	else log_err_addr("connect", strerror(err), addr, addrlen);
+	if(err == ECONNREFUSED && statuscmd) {
+		printf("unbound is stopped\n");
+		exit(3);
+	}
+#else
+	int wsaerr = err;
+	if(!useport) log_err("connect: %s for %s", wsa_strerror(wsaerr), svr);
+	else log_err_addr("connect", wsa_strerror(wsaerr), addr, addrlen);
+	if(wsaerr == WSAECONNREFUSED && statuscmd) {
+		printf("unbound is stopped\n");
+		exit(3);
+	}
+#endif
+	exit(1);
+}
+
 /** contact the server with TCP connect */
 static int
 contact_server(const char* svr, struct config_file* cfg, int statuscmd)
@@ -598,26 +625,75 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
 	if(fd == -1) {
 		fatal_exit("socket: %s", sock_strerror(errno));
 	}
+	fd_set_nonblock(fd);
 	if(connect(fd, (struct sockaddr*)&addr, addrlen) < 0) {
 #ifndef USE_WINSOCK
-		int err = errno;
-		if(!useport) log_err("connect: %s for %s", strerror(err), svr);
-		else log_err_addr("connect", strerror(err), &addr, addrlen);
-		if(err == ECONNREFUSED && statuscmd) {
-			printf("unbound is stopped\n");
-			exit(3);
-		}
-#else
-		int wsaerr = WSAGetLastError();
-		if(!useport) log_err("connect: %s for %s", wsa_strerror(wsaerr), svr);
-		else log_err_addr("connect", wsa_strerror(wsaerr), &addr, addrlen);
-		if(wsaerr == WSAECONNREFUSED && statuscmd) {
-			printf("unbound is stopped\n");
-			exit(3);
+#ifdef EINPROGRESS
+		if(errno != EINPROGRESS) {
+			checkconnecterr(errno, svr, &addr,
+				addrlen, statuscmd, useport);
+		}
+#endif
+#else
+		if(WSAGetLastError() != WSAEINPROGRESS &&
+			WSAGetLastError() != WSAEWOULDBLOCK) {
+			checkconnecterr(WSAGetLastError(), svr, &addr,
+				addrlen, statuscmd, useport);
 		}
 #endif
-		exit(1);
 	}
+	while(1) {
+		fd_set rset, wset, eset;
+		struct timeval tv;
+		FD_ZERO(&rset);
+		FD_SET(FD_SET_T fd, &rset);
+		FD_ZERO(&wset);
+		FD_SET(FD_SET_T fd, &wset);
+		FD_ZERO(&eset);
+		FD_SET(FD_SET_T fd, &eset);
+		tv.tv_sec = UNBOUND_CONTROL_CONNECT_TIMEOUT/1000;
+		tv.tv_usec= (UNBOUND_CONTROL_CONNECT_TIMEOUT%1000)*1000;
+		if(select(fd+1, &rset, &wset, &eset, &tv) == -1) {
+			fatal_exit("select: %s", sock_strerror(errno));
+		}
+		if(!FD_ISSET(fd, &rset) && !FD_ISSET(fd, &wset) &&
+			!FD_ISSET(fd, &eset)) {
+			fatal_exit("timeout: could not connect to server");
+		} else {
+			/* check nonblocking connect error */
+			int error = 0;
+			socklen_t len = (socklen_t)sizeof(error);
+			if(getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&error,
+				&len) < 0) {
+#ifndef USE_WINSOCK
+				error = errno; /* on solaris errno is error */
+#else
+				error = WSAGetLastError();
+#endif
+			}
+			if(error != 0) {
+#ifndef USE_WINSOCK
+#ifdef EINPROGRESS
+				if(error == EINPROGRESS)
+					continue; /* try again later */
+#endif
+#ifdef EWOULDBLOCK
+				if(error == EWOULDBLOCK)
+					continue; /* try again later */
+#endif
+#else
+				if(error == WSAEINPROGRESS)
+					continue; /* try again later */
+				if(error == WSAEWOULDBLOCK)
+					continue; /* try again later */
+#endif
+				checkconnecterr(error, svr, &addr, addrlen,
+					statuscmd, useport);
+			}
+		}
+		break;
+	}
+	fd_set_block(fd);
 	return fd;
 }
 

From 70776609322d4629fd1418224887470498a670e0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 11 Dec 2020 10:30:54 +0100
Subject: [PATCH 138/208] - Fix to squelch permission denied and other errors
 from remote host,   they are logged at higher verbosity but not on low
 verbosity.

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

diff --git a/doc/Changelog b/doc/Changelog
index af111d8a0..26e423f8e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 11 December 2020: Wouter
 	- Fix #371: unbound-control timeout when Unbound is not running.
+	- Fix to squelch permission denied and other errors from remote host,
+	  they are logged at higher verbosity but not on low verbosity.
 
 3 December 2020: Wouter
 	- make depend.
diff --git a/util/netevent.c b/util/netevent.c
index d3e268a01..7e604a9fa 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -583,6 +583,7 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet,
 static int udp_recv_needs_log(int err)
 {
 	switch(err) {
+	case EACCES: /* some hosts send ICMP 'Permission Denied' */
 #ifndef USE_WINSOCK
 	case ECONNREFUSED:
 #  ifdef ENETUNREACH
@@ -1609,6 +1610,26 @@ 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
+#ifdef ENETUNREACH
+			if(errno == ENETUNREACH && verbosity < 2)
+				return 0; /* silence it */
+#endif
+#ifdef EHOSTDOWN
+			if(errno == EHOSTDOWN && verbosity < 2)
+				return 0; /* silence it */
+#endif
+#ifdef EHOSTUNREACH
+			if(errno == EHOSTUNREACH && verbosity < 2)
+				return 0; /* silence it */
+#endif
+#ifdef ENETDOWN
+			if(errno == ENETDOWN && verbosity < 2)
+				return 0; /* silence it */
+#endif
+#ifdef EACCES
+			if(errno == EACCES && verbosity < 2)
+				return 0; /* silence it */
+#endif
 #ifdef ENOTCONN
 			if(errno == ENOTCONN) {
 				log_err_addr("read (in tcp s) failed and this could be because TCP Fast Open is enabled [--disable-tfo-client --disable-tfo-server] but does not work", sock_strerror(errno),

From 15e1b16da0d7a75220c7365de3cf91d027437d00 Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@narrans.de>
Date: Fri, 11 Dec 2020 14:00:20 +0100
Subject: [PATCH 139/208] Warning: arithmetic on a pointer to void is a GNU
 extension.

---
 util/netevent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/netevent.c b/util/netevent.c
index 7e604a9fa..9eaa3c871 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1935,7 +1935,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 	log_assert(c->tcp_write_and_read || sldns_buffer_remaining(buffer) > 0);
 	log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2);
 	if(c->tcp_write_and_read) {
-		r = send(fd, (void*)c->tcp_write_pkt + c->tcp_write_byte_count - 2,
+		r = send(fd, (void*)(c->tcp_write_pkt + c->tcp_write_byte_count - 2),
 			c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count, 0);
 	} else {
 		r = send(fd, (void*)sldns_buffer_current(buffer),

From f09b05877669ca41e5ec625bde14a2c468ed33ea Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 11 Dec 2020 14:04:01 +0100
Subject: [PATCH 140/208] Changelog note for #335 - Merge PR #335 from fobser:
 Sprinkle in some static to prevent   missing prototype warnings.

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

diff --git a/doc/Changelog b/doc/Changelog
index 26e423f8e..7e38775ec 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
 	- Fix #371: unbound-control timeout when Unbound is not running.
 	- Fix to squelch permission denied and other errors from remote host,
 	  they are logged at higher verbosity but not on low verbosity.
+	- Merge PR #335 from fobser: Sprinkle in some static to prevent
+	  missing prototype warnings.
 
 3 December 2020: Wouter
 	- make depend.

From e1c678864d7d727d3bb729a577a21b235508c070 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 11 Dec 2020 14:07:42 +0100
Subject: [PATCH 141/208] Changelog note for #373 - Merge PR #373 from fobser:
 Warning: arithmetic on a pointer to void   is a GNU extension.

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

diff --git a/doc/Changelog b/doc/Changelog
index 7e38775ec..dc4dee115 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,8 @@
 	  they are logged at higher verbosity but not on low verbosity.
 	- Merge PR #335 from fobser: Sprinkle in some static to prevent
 	  missing prototype warnings.
+	- Merge PR #373 from fobser: Warning: arithmetic on a pointer to void
+	  is a GNU extension.
 
 3 December 2020: Wouter
 	- make depend.

From 811cf6db0c722fc8be7ebd7bf3b719ab387601f0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 11 Dec 2020 14:34:39 +0100
Subject: [PATCH 142/208] - Fix missing prototypes in the code.

---
 dnstap/unbound-dnstap-socket.c |  6 +++++-
 doc/Changelog                  |  1 +
 dynlibmod/dynlibmod.c          | 14 +++++++-------
 libunbound/libworker.c         |  3 +++
 pythonmod/pythonmod_utils.c    |  1 +
 pythonmod/pythonmod_utils.h    |  3 ++-
 services/listen_dnsport.c      |  2 +-
 services/listen_dnsport.h      |  2 +-
 smallapp/worker_cb.c           |  3 +++
 testcode/fake_event.c          |  1 +
 testcode/testbound.c           | 16 ++++++++++++++--
 11 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
index 8c37654e8..8e28be4e8 100644
--- a/dnstap/unbound-dnstap-socket.c
+++ b/dnstap/unbound-dnstap-socket.c
@@ -727,7 +727,7 @@ static ssize_t tap_receive(struct tap_data* data, void* buf, size_t len)
 }
 
 /** delete the tap structure */
-void tap_data_free(struct tap_data* data)
+static void tap_data_free(struct tap_data* data)
 {
 	ub_event_del(data->ev);
 	ub_event_free(data->ev);
@@ -1355,6 +1355,10 @@ int main(int argc, char** argv)
 struct tube;
 struct query_info;
 #include "util/data/packed_rrset.h"
+#include "daemon/worker.h"
+#include "daemon/remote.h"
+#include "util/fptr_wlist.h"
+#include "libunbound/context.h"
 
 void worker_handle_control_cmd(struct tube* ATTR_UNUSED(tube),
 	uint8_t* ATTR_UNUSED(buffer), size_t ATTR_UNUSED(len),
diff --git a/doc/Changelog b/doc/Changelog
index dc4dee115..07a8e6ea4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
 	  missing prototype warnings.
 	- Merge PR #373 from fobser: Warning: arithmetic on a pointer to void
 	  is a GNU extension.
+	- Fix missing prototypes in the code.
 
 3 December 2020: Wouter
 	- make depend.
diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index 3bf9d1acb..3f148ebb6 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -5,16 +5,16 @@
  * module actions.
  */
 #include "config.h"
+#include "dynlibmod/dynlibmod.h"
 #include "util/module.h"
 #include "util/config_file.h"
-#include "dynlibmod/dynlibmod.h"
 
 #if HAVE_WINDOWS_H
 #include <windows.h>
 #define __DYNMOD HMODULE
 #define __DYNSYM FARPROC
 #define __LOADSYM GetProcAddress
-void log_dlerror() {
+static void log_dlerror() {
     DWORD dwLastError = GetLastError();
     LPSTR MessageBuffer;
     DWORD dwBufferLength;
@@ -37,11 +37,11 @@ void log_dlerror() {
 
 }
 
-HMODULE open_library(const char* fname) {
+static HMODULE open_library(const char* fname) {
     return LoadLibrary(fname);
 }
 
-void close_library(const char* fname, __DYNMOD handle) {
+static void close_library(const char* fname, __DYNMOD handle) {
 	(void)fname;
 	(void)handle;
 }
@@ -50,15 +50,15 @@ void close_library(const char* fname, __DYNMOD handle) {
 #define __DYNMOD void*
 #define __DYNSYM void*
 #define __LOADSYM dlsym
-void log_dlerror() {
+static void log_dlerror() {
     log_err("dynlibmod: %s", dlerror());
 }
 
-void* open_library(const char* fname) {
+static void* open_library(const char* fname) {
     return dlopen(fname, RTLD_LAZY | RTLD_GLOBAL);
 }
 
-void close_library(const char* fname, __DYNMOD handle) {
+static void close_library(const char* fname, __DYNMOD handle) {
 	if(!handle) return;
 	if(dlclose(handle) != 0) {
 		log_err("dlclose %s: %s", fname, strerror(errno));
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 06cbb8869..03bbaf768 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -73,6 +73,9 @@
 #include "iterator/iter_hints.h"
 #include "sldns/sbuffer.h"
 #include "sldns/str2wire.h"
+#ifdef USE_DNSTAP
+#include "dnstap/dtstream.h"
+#endif
 
 #ifdef HAVE_TARGETCONDITIONALS_H
 #include <TargetConditionals.h>
diff --git a/pythonmod/pythonmod_utils.c b/pythonmod/pythonmod_utils.c
index 5d70f2b4b..9f7282540 100644
--- a/pythonmod/pythonmod_utils.c
+++ b/pythonmod/pythonmod_utils.c
@@ -39,6 +39,7 @@
  * conversions.
  */
 #include "config.h"
+#include "pythonmod/pythonmod_utils.h"
 #include "util/module.h"
 #include "util/netevent.h"
 #include "util/net_help.h"
diff --git a/pythonmod/pythonmod_utils.h b/pythonmod/pythonmod_utils.h
index 768eb46de..4ea86f9be 100644
--- a/pythonmod/pythonmod_utils.h
+++ b/pythonmod/pythonmod_utils.h
@@ -43,6 +43,7 @@
 
 #include "util/module.h"
 struct delegpt_addr;
+struct sldns_buffer;
 
 /**
  *  Store the reply_info and query_info pair in message cache (qstate->msg_cache)
@@ -77,7 +78,7 @@ void invalidateQueryInCache(struct module_qstate* qstate, struct query_info* qin
  * @param pkt: a sldns_buffer which contains sldns_packet data
  * @return 0 on failure, out of memory or parse error.
  */
-int createResponse(struct module_qstate* qstate, sldns_buffer* pkt);
+int createResponse(struct module_qstate* qstate, struct sldns_buffer* pkt);
 
 /**
  *  Convert reply->addr to string
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 709c9e6ce..629d4de72 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -2793,7 +2793,7 @@ void http2_req_stream_clear(struct http2_stream* h2_stream)
 	}
 }
 
-nghttp2_session_callbacks* http2_req_callbacks_create()
+nghttp2_session_callbacks* http2_req_callbacks_create(void)
 {
 	nghttp2_session_callbacks *callbacks;
 	if(nghttp2_session_callbacks_new(&callbacks) == NGHTTP2_ERR_NOMEM) {
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index 9d6ea2c33..f438ff458 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -404,7 +404,7 @@ size_t http2_get_response_buffer_size(void);
  * Create nghttp2 callbacks to handle HTTP2 requests.
  * @return malloc'ed struct, NULL on failure
  */
-nghttp2_session_callbacks* http2_req_callbacks_create();
+nghttp2_session_callbacks* http2_req_callbacks_create(void);
 
 /** Free http2 stream buffers and decrease buffer counters */
 void http2_req_stream_clear(struct http2_stream* h2_stream);
diff --git a/smallapp/worker_cb.c b/smallapp/worker_cb.c
index 78d921a3c..cdf855dc3 100644
--- a/smallapp/worker_cb.c
+++ b/smallapp/worker_cb.c
@@ -46,6 +46,9 @@
 #include "util/fptr_wlist.h"
 #include "util/log.h"
 #include "services/mesh.h"
+#ifdef USE_DNSTAP
+#include "dnstap/dtstream.h"
+#endif
 
 void worker_handle_control_cmd(struct tube* ATTR_UNUSED(tube),
 	uint8_t* ATTR_UNUSED(buffer), size_t ATTR_UNUSED(len),
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 591557c35..75a6b8db9 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -64,6 +64,7 @@
 #include "sldns/sbuffer.h"
 #include "sldns/wire2str.h"
 #include "sldns/str2wire.h"
+#include "daemon/remote.h"
 #include <signal.h>
 struct worker;
 struct daemon_remote;
diff --git a/testcode/testbound.c b/testcode/testbound.c
index 3f3e106b0..5e10779fc 100644
--- a/testcode/testbound.c
+++ b/testcode/testbound.c
@@ -42,16 +42,22 @@
 #ifdef HAVE_TIME_H
 #  include <time.h>
 #endif
+#include <ctype.h>
 #include "testcode/testpkts.h"
 #include "testcode/replay.h"
 #include "testcode/fake_event.h"
 #include "daemon/remote.h"
+#include "libunbound/worker.h"
 #include "util/config_file.h"
 #include "sldns/keyraw.h"
-#include <ctype.h>
+#ifdef UB_ON_WINDOWS
+#include "winrc/win_svc.h"
+#endif
 
 /** signal that this is a testbound compile */
 #define unbound_testbound 1
+/** renamed main routine */
+int daemon_main(int argc, char* argv[]);
 /** 
  * include the main program from the unbound daemon.
  * rename main to daemon_main to call it
@@ -333,7 +339,7 @@ setup_playback(const char* filename, int* pass_argc, char* pass_argv[])
 }
 
 /** remove config file at exit */
-void remove_configfile(void)
+static void remove_configfile(void)
 {
 	struct config_strlist* p;
 	for(p=cfgfiles; p; p=p->next)
@@ -551,22 +557,28 @@ void remote_get_opt_ssl(char* ATTR_UNUSED(str), void* ATTR_UNUSED(arg))
         log_assert(0);
 }
 
+#ifdef UB_ON_WINDOWS
 void wsvc_command_option(const char* ATTR_UNUSED(wopt), 
 	const char* ATTR_UNUSED(cfgfile), int ATTR_UNUSED(v), 
 	int ATTR_UNUSED(c))
 {
 	log_assert(0);
 }
+#endif
 
+#ifdef UB_ON_WINDOWS
 void wsvc_setup_worker(struct worker* ATTR_UNUSED(worker))
 {
 	/* do nothing */
 }
+#endif
 
+#ifdef UB_ON_WINDOWS
 void wsvc_desetup_worker(struct worker* ATTR_UNUSED(worker))
 {
 	/* do nothing */
 }
+#endif
 
 #ifdef UB_ON_WINDOWS
 void worker_win_stop_cb(int ATTR_UNUSED(fd), short ATTR_UNUSED(ev),

From 42d764eeda2ae2fb545bbffda603865892fa5fab Mon Sep 17 00:00:00 2001
From: Frank Riley <fhriley@gmail.com>
Date: Sun, 13 Dec 2020 12:35:11 -0700
Subject: [PATCH 143/208] Add rpz_enable and rpz_disable commands to
 unbound-control.

---
 daemon/remote.c          | 55 ++++++++++++++++++++++++++++++++++++++++
 doc/unbound-control.8.in |  6 +++++
 services/rpz.c           | 18 +++++++++++--
 services/rpz.h           | 13 ++++++++++
 4 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index 8324e1901..64057a57b 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2860,6 +2860,57 @@ do_ip_ratelimit_list(RES* ssl, struct worker* worker, char* arg)
 	slabhash_traverse(a.infra->client_ip_rates, 0, ip_rate_list, &a);
 }
 
+/** do the rpz_enable/disable command */
+static void
+do_rpz_enable_disable(RES* ssl, struct worker* worker, char* arg, int enable) {
+    size_t nmlen;
+    int nmlabs;
+    uint8_t *nm = NULL;
+    struct auth_zones *az = worker->env.auth_zones;
+    struct auth_zone *z = NULL;
+    if (!parse_arg_name(ssl, arg, &nm, &nmlen, &nmlabs))
+        return;
+    if (az) {
+        lock_rw_rdlock(&az->lock);
+        z = auth_zone_find(az, nm, nmlen, LDNS_RR_CLASS_IN);
+        if (z) {
+            lock_rw_wrlock(&z->lock);
+        }
+        lock_rw_unlock(&az->lock);
+    }
+    free(nm);
+    if (!z) {
+        (void) ssl_printf(ssl, "error no auth-zone %s\n", arg);
+        return;
+    }
+    if (!z->rpz) {
+        (void) ssl_printf(ssl, "error auth-zone %s not RPZ\n", arg);
+        lock_rw_unlock(&z->lock);
+        return;
+    }
+    if (enable) {
+        rpz_enable(z->rpz);
+    } else {
+        rpz_disable(z->rpz);
+    }
+    lock_rw_unlock(&z->lock);
+    send_ok(ssl);
+}
+
+/** do the rpz_enable command */
+static void
+do_rpz_enable(RES* ssl, struct worker* worker, char* arg)
+{
+    do_rpz_enable_disable(ssl, worker, arg, 1);
+}
+
+/** do the rpz_disable command */
+static void
+do_rpz_disable(RES* ssl, struct worker* worker, char* arg)
+{
+    do_rpz_enable_disable(ssl, worker, arg, 0);
+}
+
 /** tell other processes to execute the command */
 static void
 distribute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd)
@@ -3060,6 +3111,10 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd,
 		do_flush_bogus(ssl, worker);
 	} else if(cmdcmp(p, "flush_negative", 14)) {
 		do_flush_negative(ssl, worker);
+    } else if(cmdcmp(p, "rpz_enable", 10)) {
+        do_rpz_enable(ssl, worker, skipwhite(p+10));
+    } else if(cmdcmp(p, "rpz_disable", 11)) {
+        do_rpz_disable(ssl, worker, skipwhite(p+11));
 	} else {
 		(void)ssl_printf(ssl, "error unknown command '%s'\n", p);
 	}
diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in
index 97972ff27..20325abf2 100644
--- a/doc/unbound-control.8.in
+++ b/doc/unbound-control.8.in
@@ -305,6 +305,12 @@ Transfer the auth zone from master.  The auth zone probe sequence is started,
 where the masters are probed to see if they have an updated zone (with the SOA
 serial check).  And then the zone is transferred for a newer zone version.
 .TP
+.B rpz_enable \fIzone\fR
+Enable the RPZ zone if it had previously been disabled.
+.TP
+.B rpz_enable \fIzone\fR
+Disable the RPZ zone.
+.TP
 .B view_list_local_zones \fIview\fR
 \fIlist_local_zones\fR for given view.
 .TP
diff --git a/services/rpz.c b/services/rpz.c
index 13304652c..d7dd17f7e 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -963,8 +963,8 @@ rpz_apply_qname_trigger(struct auth_zones* az, struct module_env* env,
 	for(a = az->rpz_first; a; a = a->rpz_az_next) {
 		lock_rw_rdlock(&a->lock);
 		r = a->rpz;
-		if(!r->taglist || taglist_intersect(r->taglist, 
-			r->taglistlen, taglist, taglen)) {
+		if(!r->disabled && (!r->taglist || taglist_intersect(r->taglist,
+			r->taglistlen, taglist, taglen))) {
 			z = rpz_find_zone(r, qinfo->qname, qinfo->qname_len,
 				qinfo->qclass, 0, 0, 0);
 			if(z && r->action_override == RPZ_DISABLED_ACTION) {
@@ -1044,3 +1044,17 @@ rpz_apply_qname_trigger(struct auth_zones* az, struct module_env* env,
 
 	return ret;
 }
+
+void rpz_enable(struct rpz* r)
+{
+    if(!r)
+        return;
+    r->disabled = 0;
+}
+
+void rpz_disable(struct rpz* r)
+{
+    if(!r)
+        return;
+    r->disabled = 1;
+}
diff --git a/services/rpz.h b/services/rpz.h
index 77a2db55c..d5996a6cf 100644
--- a/services/rpz.h
+++ b/services/rpz.h
@@ -99,6 +99,7 @@ struct rpz {
 	int log;
 	char* log_name;
 	struct regional* region;
+	int disabled;
 };
 
 /**
@@ -198,4 +199,16 @@ void rpz_finish_config(struct rpz* r);
 enum respip_action
 rpz_action_to_respip_action(enum rpz_action a);
 
+/**
+ * Enable RPZ
+ * @param r: RPZ struct to enable
+ */
+void rpz_enable(struct rpz* r);
+
+/**
+ * Disable RPZ
+ * @param r: RPZ struct to disable
+ */
+void rpz_disable(struct rpz* r);
+
 #endif /* SERVICES_RPZ_H */

From 08968baec1122a58bb90d8f97ad948a75f8a5d69 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 16 Dec 2020 17:11:41 +0100
Subject: [PATCH 144/208] - Fix error cases when udp-connect is set and send()
 returns an error   (modified patch from Xin Li @delphij).

---
 doc/Changelog              |  4 ++++
 services/authzone.c        |  2 +-
 services/outside_network.c | 15 ++++-----------
 testcode/fake_event.c      |  2 +-
 util/netevent.c            | 29 +++++++++++++++++++----------
 util/netevent.h            |  3 ++-
 6 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 07a8e6ea4..3b831fea1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+16 December 2020: George
+	- Fix error cases when udp-connect is set and send() returns an error
+	  (modified patch from Xin Li @delphij).
+
 11 December 2020: Wouter
 	- Fix #371: unbound-control timeout when Unbound is not running.
 	- Fix to squelch permission denied and other errors from remote host,
diff --git a/services/authzone.c b/services/authzone.c
index 15be5d60c..e59548fc3 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -6093,7 +6093,7 @@ xfr_probe_send_probe(struct auth_xfer* xfr, struct module_env* env,
 
 	/* send udp packet */
 	if(!comm_point_send_udp_msg(xfr->task_probe->cp, env->scratch_buffer,
-		(struct sockaddr*)&addr, addrlen)) {
+		(struct sockaddr*)&addr, addrlen, 0)) {
 		char zname[255+1], as[256];
 		dname_str(xfr->name, zname);
 		addr_to_str(&addr, addrlen, as, sizeof(as));
diff --git a/services/outside_network.c b/services/outside_network.c
index 0886907f7..d8f9874e6 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1899,17 +1899,10 @@ randomize_and_send_udp(struct pending* pend, sldns_buffer* packet, int timeout)
 	log_assert(pend->pc && pend->pc->cp);
 
 	/* send it over the commlink */
-	if(outnet->udp_connect) {
-		if(!comm_point_send_udp_msg(pend->pc->cp, packet, NULL, 0)) {
-			portcomm_loweruse(outnet, pend->pc);
-			return 0;
-		}
-	} else {
-		if(!comm_point_send_udp_msg(pend->pc->cp, packet,
-			(struct sockaddr*)&pend->addr, pend->addrlen)) {
-			portcomm_loweruse(outnet, pend->pc);
-			return 0;
-		}
+	if(!comm_point_send_udp_msg(pend->pc->cp, packet,
+		(struct sockaddr*)&pend->addr, pend->addrlen, outnet->udp_connect)) {
+		portcomm_loweruse(outnet, pend->pc);
+		return 0;
 	}
 
 	/* system calls to set timeout after sending UDP to make roundtrip
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 75a6b8db9..5164332c0 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1766,7 +1766,7 @@ struct comm_point* outnet_comm_point_for_http(struct outside_network* outnet,
 }
 
 int comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
-	struct sockaddr* addr, socklen_t addrlen) 
+	struct sockaddr* addr, socklen_t addrlen, int ATTR_UNUSED(is_connected))
 {
 	struct fake_commpoint* fc = (struct fake_commpoint*)c;
 	struct replay_runtime* runtime = fc->runtime;
diff --git a/util/netevent.c b/util/netevent.c
index 7c6da50be..88be007e7 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -333,7 +333,7 @@ int tcp_connect_errno_needs_log(struct sockaddr* addr, socklen_t addrlen)
 /* send a UDP reply */
 int
 comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
-	struct sockaddr* addr, socklen_t addrlen) 
+	struct sockaddr* addr, socklen_t addrlen, int is_connected)
 {
 	ssize_t sent;
 	log_assert(c->fd != -1);
@@ -341,8 +341,8 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 	if(sldns_buffer_remaining(packet) == 0)
 		log_err("error: send empty UDP packet");
 #endif
-	if(addr) {
-		log_assert(addr && addrlen > 0);
+	log_assert(addr && addrlen > 0);
+	if(!is_connected) {
 		sent = sendto(c->fd, (void*)sldns_buffer_begin(packet),
 			sldns_buffer_remaining(packet), 0,
 			addr, addrlen);
@@ -367,9 +367,14 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 #endif
 			int e;
 			fd_set_block(c->fd);
-			sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), 
-				sldns_buffer_remaining(packet), 0,
-				addr, addrlen);
+			if (!is_connected) {
+				sent = sendto(c->fd, (void*)sldns_buffer_begin(packet),
+					sldns_buffer_remaining(packet), 0,
+					addr, addrlen);
+			} else {
+				sent = send(c->fd, (void*)sldns_buffer_begin(packet),
+					sldns_buffer_remaining(packet), 0);
+			}
 			e = errno;
 			fd_set_nonblock(c->fd);
 			errno = e;
@@ -378,8 +383,12 @@ 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;
-		verbose(VERB_OPS, "sendto failed: %s", sock_strerror(errno));
-		log_addr(VERB_OPS, "remote address is", 
+		if (!is_connected) {
+			verbose(VERB_OPS, "sendto failed: %s", sock_strerror(errno));
+		} else {
+			verbose(VERB_OPS, "send failed: %s", sock_strerror(errno));
+		}
+		log_addr(VERB_OPS, "remote address is",
 			(struct sockaddr_storage*)addr, addrlen);
 		return 0;
 	} else if((size_t)sent != sldns_buffer_remaining(packet)) {
@@ -764,7 +773,7 @@ comm_point_udp_callback(int fd, short event, void* arg)
 			buffer = rep.c->buffer;
 #endif
 			(void)comm_point_send_udp_msg(rep.c, buffer,
-				(struct sockaddr*)&rep.addr, rep.addrlen);
+				(struct sockaddr*)&rep.addr, rep.addrlen, 0);
 		}
 		if(!rep.c || rep.c->fd != fd) /* commpoint closed to -1 or reused for
 		another UDP port. Note rep.c cannot be reused with TCP fd. */
@@ -3944,7 +3953,7 @@ comm_point_send_reply(struct comm_reply *repinfo)
 			repinfo->addrlen, repinfo);
 		else
 			comm_point_send_udp_msg(repinfo->c, buffer,
-			(struct sockaddr*)&repinfo->addr, repinfo->addrlen);
+			(struct sockaddr*)&repinfo->addr, repinfo->addrlen, 0);
 #ifdef USE_DNSTAP
 		if(repinfo->c->dtenv != NULL &&
 		   repinfo->c->dtenv->log_client_response_messages)
diff --git a/util/netevent.h b/util/netevent.h
index 266a74ff3..810190683 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -633,10 +633,11 @@ void comm_point_drop_reply(struct comm_reply* repinfo);
  * @param addr: where to send it to.   If NULL, send is performed,
  * 	for connected sockets, to the connected address.
  * @param addrlen: length of addr.
+ * @param is_connected: if the UDP socket is connect()ed.
  * @return: false on a failure.
  */
 int comm_point_send_udp_msg(struct comm_point* c, struct sldns_buffer* packet,
-	struct sockaddr* addr, socklen_t addrlen);
+	struct sockaddr* addr, socklen_t addrlen,int is_connected);
 
 /**
  * Stop listening for input on the commpoint. No callbacks will happen.

From e3abd772f7b247c9b97e8656f8cf765eaca7c431 Mon Sep 17 00:00:00 2001
From: Frank Riley <fhriley@gmail.com>
Date: Fri, 1 Jan 2021 15:29:32 -0700
Subject: [PATCH 145/208] Add start_time to reply callbacks so modules can
 compute the response time.

---
 daemon/worker.c                 | 21 ++++++++++++++-------
 dynlibmod/dynlibmod.c           |  6 +++---
 dynlibmod/dynlibmod.h           |  4 ++--
 dynlibmod/examples/helloworld.c |  8 ++++----
 pythonmod/interface.i           | 24 +++++++++++++++++++++---
 pythonmod/pythonmod.h           |  4 ++--
 services/authzone.c             |  4 ++--
 services/localzone.c            |  4 ++--
 services/mesh.c                 | 32 +++++++++++++++++++-------------
 util/data/msgreply.c            | 25 +++++++++++++++----------
 util/data/msgreply.h            | 12 ++++++++----
 util/module.h                   |  4 ++--
 12 files changed, 94 insertions(+), 54 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 76c4bb5b1..edf96988a 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -513,7 +513,8 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 			edns->ext_rcode = 0;
 			edns->bits &= EDNS_DO;
 			if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL,
-				msg->rep, LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad))
+				msg->rep, LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
+				*worker->env.now_tv))
 					return 0;
 			error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 				&msg->qinfo, id, flags, edns);
@@ -544,7 +545,8 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 	edns->ext_rcode = 0;
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, msg->rep,
-		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad))
+		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
+        *worker->env.now_tv))
 			return 0;
 	msg->rep->flags |= BIT_QR|BIT_RA;
 	if(!apply_edns_options(edns, &edns_bak, worker->env.cfg,
@@ -553,7 +555,8 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 		repinfo->c->buffer, 0, 1, worker->scratchpad,
 		udpsize, edns, (int)(edns->bits & EDNS_DO), secure)) {
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, NULL,
-			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad))
+			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
+			*worker->env.now_tv))
 				edns->opt_list = NULL;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 			&msg->qinfo, id, flags, edns);
@@ -684,7 +687,8 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 		edns->ext_rcode = 0;
 		edns->bits &= EDNS_DO;
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, rep,
-			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad))
+			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
+           *worker->env.now_tv))
 			goto bail_out;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL,
 			qinfo, id, flags, edns);
@@ -718,7 +722,8 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 	edns->ext_rcode = 0;
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, rep,
-		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad))
+		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
+		*worker->env.now_tv))
 		goto bail_out;
 	*alias_rrset = NULL; /* avoid confusion if caller set it to non-NULL */
 	if((worker->daemon->use_response_ip || worker->daemon->use_rpz) &&
@@ -754,7 +759,8 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 		repinfo->c->buffer, timenow, 1, worker->scratchpad,
 		udpsize, edns, (int)(edns->bits & EDNS_DO), *is_secure_answer)) {
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, NULL,
-			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad))
+			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
+           *worker->env.now_tv))
 				edns->opt_list = NULL;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 			qinfo, id, flags, edns);
@@ -842,7 +848,8 @@ chaos_replystr(sldns_buffer* pkt, char** str, int num, struct edns_data* edns,
 	edns->udp_size = EDNS_ADVERTISED_SIZE;
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_local_call(&worker->env, NULL, NULL, NULL,
-		LDNS_RCODE_NOERROR, edns, repinfo, worker->scratchpad))
+		LDNS_RCODE_NOERROR, edns, repinfo, worker->scratchpad,
+        *worker->env.now_tv))
 			edns->opt_list = NULL;
 	if(sldns_buffer_capacity(pkt) >=
 		sldns_buffer_limit(pkt)+calc_edns_field_size(edns))
diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index 3f148ebb6..e842c9d8a 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -212,10 +212,10 @@ size_t dynlibmod_get_mem(struct module_env* env, int id) {
 int dynlib_inplace_cb_reply_generic(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
-    struct comm_reply* repinfo, struct regional* region, int id,
-    void* callback) {
+    struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time, int id, void* callback) {
     struct cb_pair* cb_pair = (struct cb_pair*) callback;
-    return ((inplace_cb_reply_func_type*) cb_pair->cb)(qinfo, qstate, rep, rcode, edns, opt_list_out, repinfo, region, id, cb_pair->cb_arg);
+    return ((inplace_cb_reply_func_type*) cb_pair->cb)(qinfo, qstate, rep, rcode, edns, opt_list_out, repinfo, region, start_time, id, cb_pair->cb_arg);
 }
 
 int dynlib_inplace_cb_query_generic(struct query_info* qinfo, uint16_t flags,
diff --git a/dynlibmod/dynlibmod.h b/dynlibmod/dynlibmod.h
index c34cf0e88..f35dafa1a 100644
--- a/dynlibmod/dynlibmod.h
+++ b/dynlibmod/dynlibmod.h
@@ -70,8 +70,8 @@ size_t dynlibmod_get_mem(struct module_env* env, int id);
 int dynlib_inplace_cb_reply_generic(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
-    struct comm_reply* repinfo, struct regional* region, int id,
-    void* callback);
+    struct comm_reply* repinfo, struct regional* region,
+	struct timeval start_time, int id, void* callback);
 
 int dynlib_inplace_cb_query_generic(struct query_info* qinfo, uint16_t flags,
     struct module_qstate* qstate, struct sockaddr_storage* addr,
diff --git a/dynlibmod/examples/helloworld.c b/dynlibmod/examples/helloworld.c
index acb6b5d9b..5ea9c51be 100644
--- a/dynlibmod/examples/helloworld.c
+++ b/dynlibmod/examples/helloworld.c
@@ -30,8 +30,8 @@
 int reply_callback(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
-    struct comm_reply* repinfo, struct regional* region, int id,
-    void* callback);
+    struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time, int id, void* callback);
 
 /* Init is called when the module is first loaded. It should be used to set up
  * the environment for this module and do any other initialisation required. */
@@ -116,8 +116,8 @@ EXPORT size_t get_mem(struct module_env* env, int id) {
 int reply_callback(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
-    struct comm_reply* repinfo, struct regional* region, int id,
-    void* callback) {
+    struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time, int id, void* callback) {
     log_info("dynlib: hello world from callback");
     struct dynlibmod_env* env = qstate->env->modinfo[id];
     if (env->dyn_env != NULL) {
diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index cbee4f714..8f44e52b6 100644
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -20,6 +20,7 @@
  * called to perform operations on queries.
  */
    #include <sys/types.h>
+   #include <time.h>
    #ifdef HAVE_SYS_SOCKET_H
    #include <sys/socket.h>
    #endif
@@ -696,6 +697,8 @@ struct edns_data {
 /* ************************************************************************************ *
    Structure module_env
  * ************************************************************************************ */
+%rename(_now) module_env::now;
+%rename(_now_tv) module_env::now_tv;
 struct module_env {
     struct config_file* cfg;
     struct slabhash* msg_cache;
@@ -739,6 +742,19 @@ struct module_env {
     size_t edns_known_options_num;
 };
 
+%inline %{
+    PyObject* _module_env_now_get(struct module_env* env) {
+        double ts = env->now_tv->tv_sec + env->now_tv->tv_usec / 1e6;
+        return PyFloat_FromDouble(ts);
+    }
+%}
+%extend module_env {
+    %pythoncode %{
+        def _now_get(self): return _module_env_now_get(self)
+        now = property(_now_get)
+    %}
+}
+
 /* ************************************************************************************ *
    Structure module_qstate
  * ************************************************************************************ */
@@ -1525,13 +1541,14 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
     int python_inplace_cb_reply_generic(struct query_info* qinfo,
         struct module_qstate* qstate, struct reply_info* rep, int rcode,
         struct edns_data* edns, struct edns_option** opt_list_out,
-        struct comm_reply* repinfo, struct regional* region, int id,
-        void* python_callback)
+        struct comm_reply* repinfo, struct regional* region,
+        struct timeval start_time, int id, void* python_callback)
     {
         PyObject *func, *py_edns, *py_qstate, *py_opt_list_out, *py_qinfo;
         PyObject *py_rep, *py_repinfo, *py_region;
         PyObject *py_args, *py_kwargs, *result;
         int res = 0;
+        double py_start_time = start_time.tv_sec + start_time.tv_usec / 1e6;
 
         PyGILState_STATE gstate = PyGILState_Ensure();
         func = (PyObject *) python_callback;
@@ -1546,7 +1563,8 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
         py_region = SWIG_NewPointerObj((void*) region, SWIGTYPE_p_regional, 0);
         py_args = Py_BuildValue("(OOOiOOO)", py_qinfo, py_qstate, py_rep,
             rcode, py_edns, py_opt_list_out, py_region);
-        py_kwargs = Py_BuildValue("{s:O}", "repinfo", py_repinfo);
+        py_kwargs = Py_BuildValue("{s:O,s:d}", "repinfo", py_repinfo, "start_time",
+                                  py_start_time);
         result = PyObject_Call(func, py_args, py_kwargs);
         Py_XDECREF(py_edns);
         Py_XDECREF(py_qstate);
diff --git a/pythonmod/pythonmod.h b/pythonmod/pythonmod.h
index ae8af27eb..222ebd71e 100644
--- a/pythonmod/pythonmod.h
+++ b/pythonmod/pythonmod.h
@@ -72,8 +72,8 @@ size_t pythonmod_get_mem(struct module_env* env, int id);
 int python_inplace_cb_reply_generic(struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct edns_option** opt_list_out,
-	struct comm_reply* repinfo, struct regional* region, int id,
-	void* python_callback);
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time, int id, void* python_callback);
 
 /** Declared here for fptr_wlist access. The definition is in interface.i. */
 int python_inplace_cb_query_generic(
diff --git a/services/authzone.c b/services/authzone.c
index e59548fc3..0f6d691a2 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -3286,7 +3286,7 @@ auth_answer_encode(struct query_info* qinfo, struct module_env* env,
 	edns->bits &= EDNS_DO;
 
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, msg->rep,
-		(int)FLAGS_GET_RCODE(msg->rep->flags), edns, repinfo, temp)
+		(int)FLAGS_GET_RCODE(msg->rep->flags), edns, repinfo, temp, *env->now_tv)
 		|| !reply_info_answer_encode(qinfo, msg->rep,
 		*(uint16_t*)sldns_buffer_begin(buf),
 		sldns_buffer_read_u16_at(buf, 2),
@@ -3310,7 +3310,7 @@ auth_error_encode(struct query_info* qinfo, struct module_env* env,
 	edns->bits &= EDNS_DO;
 
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, NULL,
-		rcode, edns, repinfo, temp))
+		rcode, edns, repinfo, temp, *env->now_tv))
 		edns->opt_list = NULL;
 	error_encode(buf, rcode|BIT_AA, qinfo,
 		*(uint16_t*)sldns_buffer_begin(buf),
diff --git a/services/localzone.c b/services/localzone.c
index cad460663..308150a00 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -1215,7 +1215,7 @@ local_encode(struct query_info* qinfo, struct module_env* env,
 	edns->ext_rcode = 0;
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, &rep, rcode, edns,
-		repinfo, temp) || !reply_info_answer_encode(qinfo, &rep,
+		repinfo, temp, *env->now_tv) || !reply_info_answer_encode(qinfo, &rep,
 		*(uint16_t*)sldns_buffer_begin(buf), sldns_buffer_read_u16_at(buf, 2),
 		buf, 0, 0, temp, udpsize, edns, (int)(edns->bits&EDNS_DO), 0)) {
 		error_encode(buf, (LDNS_RCODE_SERVFAIL|BIT_AA), qinfo,
@@ -1237,7 +1237,7 @@ local_error_encode(struct query_info* qinfo, struct module_env* env,
 	edns->bits &= EDNS_DO;
 
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, NULL,
-		rcode, edns, repinfo, temp))
+		rcode, edns, repinfo, temp, *env->now_tv))
 		edns->opt_list = NULL;
 	error_encode(buf, r, qinfo, *(uint16_t*)sldns_buffer_begin(buf),
 		sldns_buffer_read_u16_at(buf, 2), edns);
diff --git a/services/mesh.c b/services/mesh.c
index cd9050936..de481c0d5 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -498,7 +498,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 		if(!s) {
 			log_err("mesh_state_create: out of memory; SERVFAIL");
 			if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL, NULL,
-				LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch))
+				LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, *s->s.env->now_tv))
 					edns->opt_list = NULL;
 			error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 				qinfo, qid, qflags, edns);
@@ -514,7 +514,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			if(!s->s.edns_opts_front_in) {
 				log_err("mesh_state_create: out of memory; SERVFAIL");
 				if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL,
-					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch))
+					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, *s->s.env->now_tv))
 						edns->opt_list = NULL;
 				error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 					qinfo, qid, qflags, edns);
@@ -587,7 +587,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 
 servfail_mem:
 	if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, &s->s,
-		NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch))
+		NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, *s->s.env->now_tv))
 			edns->opt_list = NULL;
 	error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 		qinfo, qid, qflags, edns);
@@ -1115,7 +1115,7 @@ int mesh_state_attachment(struct mesh_state* super, struct mesh_state* sub)
  */
 static void
 mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep,
-	struct mesh_cb* r)
+	struct mesh_cb* r, struct timeval start_time)
 {
 	int secure;
 	char* reason = NULL;
@@ -1136,11 +1136,11 @@ mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep,
 	if(rcode) {
 		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, NULL, m->s.region, start_time))
 					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, NULL, m->s.region, start_time))
 					r->edns.opt_list = NULL;
 		}
 		fptr_ok(fptr_whitelist_mesh_cb(r->cb));
@@ -1155,7 +1155,7 @@ mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep,
 		r->edns.bits &= EDNS_DO;
 
 		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, NULL, m->s.region, start_time) ||
 			!reply_info_answer_encode(&m->s.qinfo, rep, r->qid, 
 			r->qflags, r->buf, 0, 1, 
 			m->s.env->scratch, udp_size, &r->edns, 
@@ -1256,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, &r->query_reply, m->s.region))
+				rep, rcode, &r->edns, &r->query_reply, m->s.region, r->start_time))
 					r->edns.opt_list = NULL;
 		} else { 
 			if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, rcode,
-				&r->edns, &r->query_reply, m->s.region))
+				&r->edns, &r->query_reply, m->s.region, r->start_time))
 					r->edns.opt_list = NULL;
 		}
 		error_encode(r_buffer, rcode, &m->s.qinfo, r->qid,
@@ -1277,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, &r->query_reply, m->s.region) ||
+			LDNS_RCODE_NOERROR, &r->edns, &r->query_reply, m->s.region, r->start_time) ||
 			!apply_edns_options(&r->edns, &edns_bak,
 				m->s.env->cfg, r->query_reply.c,
 				m->s.region) ||
@@ -1287,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, &r->query_reply, m->s.region))
+			rep, LDNS_RCODE_SERVFAIL, &r->edns, &r->query_reply, m->s.region, r->start_time))
 				r->edns.opt_list = NULL;
 			error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 				&m->s.qinfo, r->qid, r->qflags, &r->edns);
@@ -1330,6 +1330,7 @@ void mesh_query_done(struct mesh_state* mstate)
 	struct mesh_cb* c;
 	struct reply_info* rep = (mstate->s.return_msg?
 		mstate->s.return_msg->rep:NULL);
+	struct timeval tv = {0, 0};
 	/* No need for the serve expired timer anymore; we are going to reply. */
 	if(mstate->s.serve_expired_data) {
 		comm_timer_delete(mstate->s.serve_expired_data->timer);
@@ -1349,6 +1350,8 @@ void mesh_query_done(struct mesh_state* mstate)
 		}
 	}
 	for(r = mstate->reply_list; r; r = r->next) {
+	    tv = r->start_time;
+
 		/* if a response-ip address block has been stored the
 		 *  information should be logged for each client. */
 		if(mstate->s.respip_action_info &&
@@ -1421,7 +1424,7 @@ void mesh_query_done(struct mesh_state* mstate)
 		if(!mstate->reply_list && !mstate->cb_list &&
 			mstate->super_set.count == 0)
 			mstate->s.env->mesh->num_detached_states++;
-		mesh_do_callback(mstate, mstate->s.return_rcode, rep, c);
+		mesh_do_callback(mstate, mstate->s.return_rcode, rep, c, tv);
 	}
 }
 
@@ -1917,6 +1920,7 @@ mesh_serve_expired_callback(void* arg)
 	struct respip_action_info actinfo;
 	struct query_info* lookup_qinfo = &qstate->qinfo;
 	struct query_info qinfo_tmp;
+	struct timeval tv = {0, 0};
 	int must_validate = (!(qstate->query_flags&BIT_CD)
 		|| qstate->env->cfg->ignore_cd) && qstate->env->need_to_validate;
 	if(!qstate->serve_expired_data) return;
@@ -1988,6 +1992,8 @@ mesh_serve_expired_callback(void* arg)
 		log_dns_msg("Serve expired lookup", &qstate->qinfo, msg->rep);
 
 	for(r = mstate->reply_list; r; r = r->next) {
+	    tv = r->start_time;
+
 		/* If address info is returned, it means the action should be an
 		* 'inform' variant and the information should be logged. */
 		if(actinfo.addrinfo) {
@@ -2042,6 +2048,6 @@ mesh_serve_expired_callback(void* arg)
 		if(!mstate->reply_list && !mstate->cb_list &&
 			mstate->super_set.count == 0)
 			qstate->env->mesh->num_detached_states++;
-		mesh_do_callback(mstate, LDNS_RCODE_NOERROR, msg->rep, c);
+		mesh_do_callback(mstate, LDNS_RCODE_NOERROR, msg->rep, c, tv);
 	}
 }
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 927bf09a2..3f7eb5fc9 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -1035,7 +1035,8 @@ static int inplace_cb_reply_call_generic(
     struct inplace_cb* callback_list, enum inplace_cb_list_type type,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region)
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time)
 {
 	struct inplace_cb* cb;
 	struct edns_option* opt_list_out = NULL;
@@ -1048,7 +1049,7 @@ static int inplace_cb_reply_call_generic(
 		fptr_ok(fptr_whitelist_inplace_cb_reply_generic(
 			(inplace_cb_reply_func_type*)cb->cb, type));
 		(void)(*(inplace_cb_reply_func_type*)cb->cb)(qinfo, qstate, rep,
-			rcode, edns, &opt_list_out, repinfo, region, cb->id, cb->cb_arg);
+			rcode, edns, &opt_list_out, repinfo, region, start_time, cb->id, cb->cb_arg);
 	}
 	edns->opt_list = opt_list_out;
 	return 1;
@@ -1056,37 +1057,41 @@ static int inplace_cb_reply_call_generic(
 
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
-	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region)
+	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply], inplace_cb_reply, qinfo,
-		qstate, rep, rcode, edns, repinfo, region);
+		qstate, rep, rcode, edns, repinfo, region, start_time);
 }
 
 int inplace_cb_reply_cache_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region)
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_cache], inplace_cb_reply_cache,
-		qinfo, qstate, rep, rcode, edns, repinfo, region);
+		qinfo, qstate, rep, rcode, edns, repinfo, region, start_time);
 }
 
 int inplace_cb_reply_local_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region)
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_local], inplace_cb_reply_local,
-		qinfo, qstate, rep, rcode, edns, repinfo, region);
+		qinfo, qstate, rep, rcode, edns, repinfo, region, start_time);
 }
 
 int inplace_cb_reply_servfail_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region)
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time)
 {
 	/* We are going to servfail. Remove any potential edns options. */
 	if(qstate)
@@ -1094,7 +1099,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_servfail],
 		inplace_cb_reply_servfail, qinfo, qstate, rep, rcode, edns, repinfo,
-		region);
+		region, start_time);
 }
 
 int inplace_cb_query_call(struct module_env* env, struct query_info* qinfo,
diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index 385780268..b7706b023 100644
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -558,7 +558,8 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code);
  */
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
-	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region);
+	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_cache linked list.
@@ -576,7 +577,8 @@ int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 int inplace_cb_reply_cache_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region);
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_local linked list.
@@ -594,7 +596,8 @@ int inplace_cb_reply_cache_call(struct module_env* env,
 int inplace_cb_reply_local_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region);
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply linked list.
@@ -613,7 +616,8 @@ int inplace_cb_reply_local_call(struct module_env* env,
 int inplace_cb_reply_servfail_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
-	struct comm_reply* repinfo, struct regional* region);
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time);
 
 /**
  * Call the registered functions in the inplace_cb_query linked list.
diff --git a/util/module.h b/util/module.h
index 7b833f8ad..d29b6f318 100644
--- a/util/module.h
+++ b/util/module.h
@@ -257,8 +257,8 @@ struct inplace_cb {
 typedef int inplace_cb_reply_func_type(struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct edns_option** opt_list_out,
-	struct comm_reply* repinfo, struct regional* region, int id,
-	void* callback);
+	struct comm_reply* repinfo, struct regional* region,
+    struct timeval start_time, int id, void* callback);
 
 /**
  * Inplace callback function called before sending the query to a nameserver.

From 4d51c6b86e84e0786d9cd5134fce536e5cf1980f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 4 Jan 2021 14:05:50 +0100
Subject: [PATCH 146/208] - For #376: Fix that comm point event is not double
 removed or double   added to event map.

---
 doc/Changelog   |  4 ++++
 util/netevent.c | 34 ++++++++++++++++++++++++++++------
 util/netevent.h |  2 ++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 3b831fea1..be7d1756e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+4 January 2021: Wouter
+	- For #376: Fix that comm point event is not double removed or double
+	  added to event map.
+
 16 December 2020: George
 	- Fix error cases when udp-connect is set and send() returns an error
 	  (modified patch from Xin Li @delphij).
diff --git a/util/netevent.c b/util/netevent.c
index 88be007e7..5c7550805 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3230,6 +3230,7 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
 		comm_point_delete(c);
 		return NULL;
 	}
+	c->event_added = 1;
 	return c;
 }
 
@@ -3289,6 +3290,7 @@ comm_point_create_udp_ancil(struct comm_base *base, int fd,
 		comm_point_delete(c);
 		return NULL;
 	}
+	c->event_added = 1;
 	return c;
 }
 
@@ -3573,6 +3575,7 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num,
 		comm_point_delete(c);
 		return NULL;
 	}
+	c->event_added = 1;
 	/* now prealloc the handlers */
 	for(i=0; i<num; i++) {
 		if(port_type == listen_type_tcp ||
@@ -3796,6 +3799,7 @@ comm_point_create_local(struct comm_base *base, int fd, size_t bufsize,
 		free(c);
 		return NULL;
 	}
+	c->event_added = 1;
 	return c;
 }
 
@@ -3858,6 +3862,7 @@ comm_point_create_raw(struct comm_base* base, int fd, int writing,
 		free(c);
 		return NULL;
 	}
+	c->event_added = 1;
 	return c;
 }
 
@@ -3868,8 +3873,11 @@ comm_point_close(struct comm_point* c)
 		return;
 	if(c->fd != -1) {
 		verbose(5, "comm_point_close of %d: event_del", c->fd);
-		if(ub_event_del(c->ev->ev) != 0) {
-			log_err("could not event_del on close");
+		if(c->event_added) {
+			if(ub_event_del(c->ev->ev) != 0) {
+				log_err("could not event_del on close");
+			}
+			c->event_added = 0;
 		}
 	}
 	tcl_close_connection(c->tcl_addr);
@@ -4018,8 +4026,11 @@ void
 comm_point_stop_listening(struct comm_point* c)
 {
 	verbose(VERB_ALGO, "comm point stop listening %d", c->fd);
-	if(ub_event_del(c->ev->ev) != 0) {
-		log_err("event_del error to stoplisten");
+	if(c->event_added) {
+		if(ub_event_del(c->ev->ev) != 0) {
+			log_err("event_del error to stoplisten");
+		}
+		c->event_added = 0;
 	}
 }
 
@@ -4032,6 +4043,12 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 		/* no use to start listening no free slots. */
 		return;
 	}
+	if(c->event_added) {
+		if(ub_event_del(c->ev->ev) != 0) {
+			log_err("event_del error to startlisten");
+		}
+		c->event_added = 0;
+	}
 	if(msec != -1 && msec != 0) {
 		if(!c->timeout) {
 			c->timeout = (struct timeval*)malloc(sizeof(
@@ -4071,13 +4088,17 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec)
 	if(ub_event_add(c->ev->ev, msec==0?NULL:c->timeout) != 0) {
 		log_err("event_add failed. in cpsl.");
 	}
+	c->event_added = 1;
 }
 
 void comm_point_listen_for_rw(struct comm_point* c, int rd, int wr)
 {
 	verbose(VERB_ALGO, "comm point listen_for_rw %d %d", c->fd, wr);
-	if(ub_event_del(c->ev->ev) != 0) {
-		log_err("event_del error to cplf");
+	if(c->event_added) {
+		if(ub_event_del(c->ev->ev) != 0) {
+			log_err("event_del error to cplf");
+		}
+		c->event_added = 0;
 	}
 	ub_event_del_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE);
 	if(rd) ub_event_add_bits(c->ev->ev, UB_EV_READ);
@@ -4085,6 +4106,7 @@ void comm_point_listen_for_rw(struct comm_point* c, int rd, int wr)
 	if(ub_event_add(c->ev->ev, c->timeout) != 0) {
 		log_err("event_add failed. in cplf.");
 	}
+	c->event_added = 1;
 }
 
 size_t comm_point_get_mem(struct comm_point* c)
diff --git a/util/netevent.h b/util/netevent.h
index 810190683..4a2aa1677 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -166,6 +166,8 @@ struct comm_reply {
 struct comm_point {
 	/** behind the scenes structure, with say libevent info. alloced. */
 	struct internal_event* ev;
+	/** if the event is added or not */
+	int event_added;
 
 	/** file descriptor for communication point */
 	int fd;

From 64cccdb8d512e2d0205dc519bc884fc2ec30a925 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 4 Jan 2021 14:18:24 +0100
Subject: [PATCH 147/208] - iana portlist updated.

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

diff --git a/doc/Changelog b/doc/Changelog
index be7d1756e..093a4b8aa 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 4 January 2021: Wouter
 	- For #376: Fix that comm point event is not double removed or double
 	  added to event map.
+	- iana portlist updated.
 
 16 December 2020: George
 	- Fix error cases when udp-connect is set and send() returns an error
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index adeafc4ad..875851e6a 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -3575,7 +3575,6 @@
 3977,
 3978,
 3979,
-3980,
 3981,
 3982,
 3983,

From 4c4ca2433c522fd2c5d15a6fa7157791db741921 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 5 Jan 2021 10:27:13 +0100
Subject: [PATCH 148/208] - Fix #385: autoconf 2.70 impacts unbound build

---
 acx_nlnetlabs.m4     |  63 +++++++--------
 acx_python.m4        |   6 +-
 config.h.in          |   3 +-
 configure            |  45 ++---------
 configure.ac         | 180 ++++++++++++++++++-------------------------
 dnscrypt/dnscrypt.m4 |   2 +-
 dnstap/dnstap.m4     |   2 +-
 doc/Changelog        |   3 +
 8 files changed, 117 insertions(+), 187 deletions(-)

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 31e43d67e..2b7768075 100644
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 35
+# Version 36
+# 2021-01-05 autoconf 2.70 autoupdate and fixes, no AC_TRY_COMPILE
 # 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).
@@ -447,15 +448,12 @@ AC_DEFUN([ACX_CHECK_FORMAT_ATTRIBUTE],
 AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "format" attribute)
 AC_CACHE_VAL(ac_cv_c_format_attribute,
 [ac_cv_c_format_attribute=no
-AC_TRY_COMPILE(
-[#include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 void f (char *format, ...) __attribute__ ((format (printf, 1, 2)));
 void (*pf) (char *format, ...) __attribute__ ((format (printf, 1, 2)));
-], [
+]], [[
    f ("%s", "str");
-],
-[ac_cv_c_format_attribute="yes"],
-[ac_cv_c_format_attribute="no"])
+]])],[ac_cv_c_format_attribute="yes"],[ac_cv_c_format_attribute="no"])
 ])
 
 AC_MSG_RESULT($ac_cv_c_format_attribute)
@@ -484,14 +482,11 @@ AC_DEFUN([ACX_CHECK_UNUSED_ATTRIBUTE],
 AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "unused" attribute)
 AC_CACHE_VAL(ac_cv_c_unused_attribute,
 [ac_cv_c_unused_attribute=no
-AC_TRY_COMPILE(
-[#include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 void f (char *u __attribute__((unused)));
-], [
+]], [[
    f ("x");
-],
-[ac_cv_c_unused_attribute="yes"],
-[ac_cv_c_unused_attribute="no"])
+]])],[ac_cv_c_unused_attribute="yes"],[ac_cv_c_unused_attribute="no"])
 ])
 
 dnl Setup ATTR_UNUSED config.h parts.
@@ -524,8 +519,8 @@ AC_DEFUN([AC_PROG_CXX], [:])
 AC_DEFUN([AC_PROG_CXXCPP], [:])
 AC_DEFUN([AC_PROG_OBJC], [:])
 AC_DEFUN([AC_PROG_OBJCCPP], [:])
-AC_DEFUN([AC_LIBTOOL_CXX], [:])
-AC_DEFUN([AC_LIBTOOL_F77], [:])
+AC_DEFUN([LT_LANG([C++])], [:])
+AC_DEFUN([LT_LANG([Fortran 77])], [:])
 # always use ./libtool unless override from commandline (libtool=mylibtool)
 if test -z "$libtool"; then
 	libtool="./libtool"
@@ -548,7 +543,7 @@ dnl as a requirement so that is gets called before LIBTOOL
 dnl because libtools 'AC_REQUIRE' names are right after this one, before
 dnl this function contents.
 AC_REQUIRE([ACX_LIBTOOL_C_PRE])
-AC_PROG_LIBTOOL
+LT_INIT
 ])
 
 dnl Detect if u_char type is defined, otherwise define it.
@@ -677,14 +672,14 @@ AC_DEFUN([ACX_SSL_CHECKS], [
             AC_MSG_CHECKING([for EVP_sha256 in -lcrypto])
             LIBS="$LIBS -lcrypto"
             LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
-            AC_TRY_LINK(, [
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
                 int EVP_sha256(void);
                 (void)EVP_sha256();
-              ], [
+              ]])],[
                 AC_MSG_RESULT(yes)
                 AC_DEFINE([HAVE_EVP_SHA256], 1,
                           [If you have EVP_sha256])
-              ], [
+              ],[
                 AC_MSG_RESULT(no)
                 # check if -lwsock32 or -lgdi32 are needed.	
                 BAKLIBS="$LIBS"
@@ -692,10 +687,10 @@ AC_DEFUN([ACX_SSL_CHECKS], [
 		LIBS="$LIBS -lgdi32 -lws2_32"
 		LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32"
                 AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
-                AC_TRY_LINK([], [
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
                     int EVP_sha256(void);
                     (void)EVP_sha256();
-                  ],[
+                  ]])],[
                     AC_DEFINE([HAVE_EVP_SHA256], 1,
                         [If you have EVP_sha256])
                     AC_MSG_RESULT(yes) 
@@ -706,10 +701,10 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                     LIBS="$LIBS -ldl"
                     LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
                     AC_MSG_CHECKING([if -lcrypto needs -ldl])
-                    AC_TRY_LINK([], [
+                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
                         int EVP_sha256(void);
                         (void)EVP_sha256();
-                      ],[
+                      ]])],[
                         AC_DEFINE([HAVE_EVP_SHA256], 1,
                             [If you have EVP_sha256])
                         AC_MSG_RESULT(yes) 
@@ -720,10 +715,10 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                         LIBS="$LIBS -ldl -pthread"
                         LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread"
                         AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread])
-                        AC_TRY_LINK([], [
+                        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
                             int EVP_sha256(void);
                             (void)EVP_sha256();
-                          ],[
+                          ]])],[
                             AC_DEFINE([HAVE_EVP_SHA256], 1,
                                 [If you have EVP_sha256])
                             AC_MSG_RESULT(yes) 
@@ -750,8 +745,7 @@ dnl Checks main header files of SSL.
 dnl
 AC_DEFUN([ACX_WITH_SSL],
 [
-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
-                                    [enable SSL (will check /usr/local/ssl
+AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl=pathname],[enable SSL (will check /usr/local/ssl
                             /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
         ],[
             withval="yes"
@@ -769,8 +763,7 @@ dnl Checks main header files of SSL.
 dnl
 AC_DEFUN([ACX_WITH_SSL_OPTIONAL],
 [
-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
-                                [enable SSL (will check /usr/local/ssl
+AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl=pathname],[enable SSL (will check /usr/local/ssl
                                 /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
         ],[
             withval="yes"
@@ -1062,7 +1055,7 @@ dnl defines MKDIR_HAS_ONE_ARG
 AC_DEFUN([ACX_MKDIR_ONE_ARG],
 [
 AC_MSG_CHECKING([whether mkdir has one arg])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <unistd.h>
 #ifdef HAVE_WINSOCK2_H
@@ -1071,14 +1064,12 @@ AC_TRY_COMPILE([
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-], [
+]], [[
 	(void)mkdir("directory");
-],
-AC_MSG_RESULT(yes)
+]])],[AC_MSG_RESULT(yes)
 AC_DEFINE(MKDIR_HAS_ONE_ARG, 1, [Define if mkdir has one argument.])
-,
-AC_MSG_RESULT(no)
-)
+],[AC_MSG_RESULT(no)
+])
 ])dnl end of ACX_MKDIR_ONE_ARG
 
 dnl Check for ioctlsocket function. works on mingw32 too.
diff --git a/acx_python.m4 b/acx_python.m4
index a84daa035..767db5b65 100644
--- a/acx_python.m4
+++ b/acx_python.m4
@@ -85,11 +85,11 @@ $ac_distutils_result])
 
         LIBS="$LIBS $PYTHON_LDFLAGS"
         CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-        AC_TRY_LINK([
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
                 #include <Python.h>
-        ],[
+        ]],[[
                 Py_Initialize();
-        ],[pythonexists=yes],[pythonexists=no])
+        ]])],[pythonexists=yes],[pythonexists=no])
 
         AC_MSG_RESULT([$pythonexists])
 
diff --git a/config.h.in b/config.h.in
index f993b81b0..103ad9f00 100644
--- a/config.h.in
+++ b/config.h.in
@@ -747,7 +747,8 @@
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
 
-/* Define as the return type of signal handlers (`int' or `void'). */
+/* Return type of signal handlers, but autoconf 2.70 says 'your code may
+   safely assume C89 semantics that RETSIGTYPE is void.' */
 #undef RETSIGTYPE
 
 /* if REUSEPORT is enabled by default */
diff --git a/configure b/configure
index 00d36a361..87959deae 100755
--- a/configure
+++ b/configure
@@ -4177,7 +4177,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
-
 if test "$ac_cv_header_minix_config_h" = "yes"; then
 
 $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
@@ -15596,38 +15595,8 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
 
+$as_echo "#define RETSIGTYPE void" >>confdefs.h
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
@@ -18288,17 +18257,13 @@ $as_echo_n "checking if libssl needs -lcrypt32... " >&6; }
 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 EVP_sha256 ();
 int
 main ()
 {
-return EVP_sha256 ();
+
+	int EVP_sha256(void);
+	(void)EVP_sha256();
+
   ;
   return 0;
 }
diff --git a/configure.ac b/configure.ac
index d648f55ad..02b9eb47b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.56)
+AC_PREREQ([2.56])
 sinclude(acx_nlnetlabs.m4)
 sinclude(ax_pthread.m4)
 sinclude(acx_python.m4)
@@ -12,7 +12,7 @@ sinclude(dnscrypt/dnscrypt.m4)
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[13])
 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_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])
@@ -126,7 +126,7 @@ cmdln="`echo $@ | sed -e 's/\\\\/\\\\\\\\/g' | sed -e 's/"/\\\\"/'g`"
 AC_DEFINE_UNQUOTED(CONFCMDLINE, ["$cmdln"], [Command line arguments used with configure])
 
 CFLAGS="$CFLAGS"
-AC_AIX
+AC_USE_SYSTEM_EXTENSIONS
 if test "$ac_cv_header_minix_config_h" = "yes"; then
 	AC_DEFINE(_NETBSD_SOURCE,1, [Enable for compile on Minix])
 fi
@@ -167,8 +167,7 @@ else
   ub_conf_file="C:\\Program Files\\Unbound\\service.conf"
 fi
 AC_ARG_WITH([conf_file],
-        AC_HELP_STRING([--with-conf-file=path], 
-	[Pathname to the Unbound configuration file]),
+        AS_HELP_STRING([--with-conf-file=path],[Pathname to the Unbound configuration file]),
 	[ub_conf_file="$withval"])
 AC_SUBST(ub_conf_file)
 ACX_ESCAPE_BACKSLASH($ub_conf_file, hdr_config)
@@ -178,8 +177,7 @@ AC_SUBST(ub_conf_dir)
 
 # Determine run, chroot directory and pidfile locations
 AC_ARG_WITH(run-dir, 
-    AC_HELP_STRING([--with-run-dir=path], 
-    [set default directory to chdir to (by default dir part of cfg file)]), 
+    AS_HELP_STRING([--with-run-dir=path],[set default directory to chdir to (by default dir part of cfg file)]), 
     UNBOUND_RUN_DIR="$withval", 
 if test $on_mingw = no; then
     UNBOUND_RUN_DIR=`dirname "$ub_conf_file"`
@@ -192,8 +190,7 @@ ACX_ESCAPE_BACKSLASH($UNBOUND_RUN_DIR, hdr_run)
 AC_DEFINE_UNQUOTED(RUN_DIR, ["$hdr_run"], [Directory to chdir to])
 
 AC_ARG_WITH(chroot-dir, 
-    AC_HELP_STRING([--with-chroot-dir=path], 
-    [set default directory to chroot to (by default same as run-dir)]), 
+    AS_HELP_STRING([--with-chroot-dir=path],[set default directory to chroot to (by default same as run-dir)]), 
     UNBOUND_CHROOT_DIR="$withval", 
 if test $on_mingw = no; then
     UNBOUND_CHROOT_DIR="$UNBOUND_RUN_DIR"
@@ -206,16 +203,14 @@ ACX_ESCAPE_BACKSLASH($UNBOUND_CHROOT_DIR, hdr_chroot)
 AC_DEFINE_UNQUOTED(CHROOT_DIR, ["$hdr_chroot"], [Directory to chroot to])
 
 AC_ARG_WITH(share-dir,
-    AC_HELP_STRING([--with-share-dir=path],
-    [set default directory with shared data (by default same as share/unbound)]),
+    AS_HELP_STRING([--with-share-dir=path],[set default directory with shared data (by default same as share/unbound)]),
     UNBOUND_SHARE_DIR="$withval",
     UNBOUND_SHARE_DIR="$UNBOUND_RUN_DIR")
 AC_SUBST(UNBOUND_SHARE_DIR)
 AC_DEFINE_UNQUOTED(SHARE_DIR, ["$UNBOUND_SHARE_DIR"], [Shared data])
 
 AC_ARG_WITH(pidfile, 
-    AC_HELP_STRING([--with-pidfile=filename], 
-    [set default pathname to unbound pidfile (default run-dir/unbound.pid)]), 
+    AS_HELP_STRING([--with-pidfile=filename],[set default pathname to unbound pidfile (default run-dir/unbound.pid)]), 
     UNBOUND_PIDFILE="$withval", 
 if test $on_mingw = no; then
     UNBOUND_PIDFILE="$UNBOUND_RUN_DIR/unbound.pid"
@@ -228,8 +223,7 @@ ACX_ESCAPE_BACKSLASH($UNBOUND_PIDFILE, hdr_pid)
 AC_DEFINE_UNQUOTED(PIDFILE, ["$hdr_pid"], [default pidfile location])
 
 AC_ARG_WITH(rootkey-file, 
-    AC_HELP_STRING([--with-rootkey-file=filename], 
-    [set default pathname to root key file (default run-dir/root.key). This file is read and written.]), 
+    AS_HELP_STRING([--with-rootkey-file=filename],[set default pathname to root key file (default run-dir/root.key). This file is read and written.]), 
     UNBOUND_ROOTKEY_FILE="$withval", 
 if test $on_mingw = no; then
     UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
@@ -242,8 +236,7 @@ ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTKEY_FILE, hdr_rkey)
 AC_DEFINE_UNQUOTED(ROOT_ANCHOR_FILE, ["$hdr_rkey"], [default rootkey location])
 
 AC_ARG_WITH(rootcert-file, 
-    AC_HELP_STRING([--with-rootcert-file=filename], 
-    [set default pathname to root update certificate file (default run-dir/icannbundle.pem).  This file need not exist if you are content with the builtin.]), 
+    AS_HELP_STRING([--with-rootcert-file=filename],[set default pathname to root update certificate file (default run-dir/icannbundle.pem).  This file need not exist if you are content with the builtin.]), 
     UNBOUND_ROOTCERT_FILE="$withval", 
 if test $on_mingw = no; then
     UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
@@ -256,8 +249,7 @@ ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTCERT_FILE, hdr_rpem)
 AC_DEFINE_UNQUOTED(ROOT_CERT_FILE, ["$hdr_rpem"], [default rootcert location])
 
 AC_ARG_WITH(username, 
-    AC_HELP_STRING([--with-username=user], 
-    [set default user that unbound changes to (default user is unbound)]), 
+    AS_HELP_STRING([--with-username=user],[set default user that unbound changes to (default user is unbound)]), 
     UNBOUND_USERNAME="$withval", 
     UNBOUND_USERNAME="unbound")
 AC_SUBST(UNBOUND_USERNAME)
@@ -269,7 +261,7 @@ AC_DEFINE_UNQUOTED(RSRC_PACKAGE_VERSION, [$wnvs], [version number for resource f
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
-AC_LANG_C
+AC_LANG([C])
 # allow user to override the -g -O2 flags.
 default_cflags=no
 if test "x$CFLAGS" = "x" ; then
@@ -282,8 +274,8 @@ ACX_DEPFLAG
 ACX_DETERMINE_EXT_FLAGS_UNBOUND
 
 # debug mode flags warnings
-AC_ARG_ENABLE(checking, AC_HELP_STRING([--enable-checking], [Enable warnings, asserts, makefile-dependencies]))
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [same as enable-checking]))
+AC_ARG_ENABLE(checking, AS_HELP_STRING([--enable-checking],[Enable warnings, asserts, makefile-dependencies]))
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[same as enable-checking]))
 if test "$enable_debug" = "yes"; then debug_enabled="$enable_debug"; 
 else debug_enabled="$enable_checking"; fi
 AC_SUBST(debug_enabled)
@@ -317,14 +309,11 @@ AC_DEFUN([CHECK_WEAK_ATTRIBUTE],
 AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "weak" attribute)
 AC_CACHE_VAL(ac_cv_c_weak_attribute,
 [ac_cv_c_weak_attribute=no
-AC_TRY_COMPILE(
-[ #include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h>
 __attribute__((weak)) void f(int x) { printf("%d", x); }
-], [
+]], [[
    f(1);
-],
-[ac_cv_c_weak_attribute="yes"],
-[ac_cv_c_weak_attribute="no"])
+]])],[ac_cv_c_weak_attribute="yes"],[ac_cv_c_weak_attribute="no"])
 ])
 
 AC_MSG_RESULT($ac_cv_c_weak_attribute)
@@ -341,14 +330,11 @@ AC_DEFUN([CHECK_NORETURN_ATTRIBUTE],
 AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "noreturn" attribute)
 AC_CACHE_VAL(ac_cv_c_noreturn_attribute,
 [ac_cv_c_noreturn_attribute=no
-AC_TRY_COMPILE(
-[ #include <stdio.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h>
 __attribute__((noreturn)) void f(int x) { printf("%d", x); }
-], [
+]], [[
    f(1);
-],
-[ac_cv_c_noreturn_attribute="yes"],
-[ac_cv_c_noreturn_attribute="no"])
+]])],[ac_cv_c_noreturn_attribute="yes"],[ac_cv_c_noreturn_attribute="no"])
 ])
 
 AC_MSG_RESULT($ac_cv_c_noreturn_attribute)
@@ -386,7 +372,7 @@ EOF
 	fi
 ])
 
-AC_PROG_LEX
+AC_PROG_LEX([noyywrap])
 if test "$LEX" != "" -a "$LEX" != ":"; then
 ACX_YYLEX_DESTROY
 fi
@@ -495,7 +481,7 @@ fi
 # check some functions of the OS before linking libs (while still runnable).
 AC_FUNC_CHOWN
 AC_FUNC_FORK
-AC_TYPE_SIGNAL
+AC_DEFINE(RETSIGTYPE,void,[Return type of signal handlers, but autoconf 2.70 says 'your code may safely assume C89 semantics that RETSIGTYPE is void.'])
 AC_FUNC_FSEEKO
 ACX_SYS_LARGEFILE
 ACX_CHECK_NONBLOCKING_BROKEN
@@ -514,14 +500,11 @@ sinclude(systemd.m4)
 # Include systemd.m4 - end
 
 # set memory allocation checking if requested
-AC_ARG_ENABLE(alloc-checks, AC_HELP_STRING([--enable-alloc-checks],
-	[ enable to memory allocation statistics, for debug purposes ]), 
+AC_ARG_ENABLE(alloc-checks, AS_HELP_STRING([--enable-alloc-checks],[ enable to memory allocation statistics, for debug purposes ]), 
 	, )
-AC_ARG_ENABLE(alloc-lite, AC_HELP_STRING([--enable-alloc-lite],
-	[ enable for lightweight alloc assertions, for debug purposes ]), 
+AC_ARG_ENABLE(alloc-lite, AS_HELP_STRING([--enable-alloc-lite],[ enable for lightweight alloc assertions, for debug purposes ]), 
 	, )
-AC_ARG_ENABLE(alloc-nonregional, AC_HELP_STRING([--enable-alloc-nonregional],
-	[ enable nonregional allocs, slow but exposes regional allocations to other memory purifiers, for debug purposes ]), 
+AC_ARG_ENABLE(alloc-nonregional, AS_HELP_STRING([--enable-alloc-nonregional],[ enable nonregional allocs, slow but exposes regional allocations to other memory purifiers, for debug purposes ]), 
 	, )
 if test x_$enable_alloc_nonregional = x_yes; then
 	AC_DEFINE(UNBOUND_ALLOC_NONREGIONAL, 1, [use malloc not regions, for debug use])
@@ -565,8 +548,7 @@ else
 # check this first, so that the pthread lib does not get linked in via
 # libssl or libpython, and thus distorts the tests, and we end up using
 # the non-threadsafe C libraries.
-AC_ARG_WITH(pthreads, AC_HELP_STRING([--with-pthreads], 
- [use pthreads library, or --without-pthreads to disable threading support.]), 
+AC_ARG_WITH(pthreads, AS_HELP_STRING([--with-pthreads],[use pthreads library, or --without-pthreads to disable threading support.]), 
  [ ],[ withval="yes" ])
 ub_have_pthreads=no
 if test x_$withval != x_no; then
@@ -613,12 +595,11 @@ int main(void) {return 0;}
 fi
 
 # check solaris thread library 
-AC_ARG_WITH(solaris-threads, AC_HELP_STRING([--with-solaris-threads], 
-	[use solaris native thread library.]), [ ],[ withval="no" ])
+AC_ARG_WITH(solaris-threads, AS_HELP_STRING([--with-solaris-threads],[use solaris native thread library.]), [ ],[ withval="no" ])
 ub_have_sol_threads=no
 if test x_$withval != x_no; then
 	if test x_$ub_have_pthreads != x_no; then
-	    AC_WARN([Have pthreads already, ignoring --with-solaris-threads])
+	    AC_MSG_WARN([Have pthreads already, ignoring --with-solaris-threads])
 	else
 	AC_SEARCH_LIBS(thr_create, [thread],
 	[
@@ -628,7 +609,7 @@ if test x_$withval != x_no; then
 			[CFLAGS="$CFLAGS -D_REENTRANT"])
 		ub_have_sol_threads=yes
 	] , [ 
-		AC_ERROR([no solaris threads found.]) 
+		AC_MSG_ERROR([no solaris threads found.]) 
 	])
 	fi
 fi
@@ -636,7 +617,7 @@ fi
 fi # end of non-mingw check of thread libraries
 
 # Check for SYSLOG_FACILITY
-AC_ARG_WITH(syslog-facility, AC_HELP_STRING([--with-syslog-facility=LOCAL0 - LOCAL7], [ set SYSLOG_FACILITY, default DAEMON ]),
+AC_ARG_WITH(syslog-facility, AS_HELP_STRING([--with-syslog-facility=LOCAL0 - LOCAL7],[ set SYSLOG_FACILITY, default DAEMON ]),
 	[ UNBOUND_SYSLOG_FACILITY="$withval" ], [])
 case "${UNBOUND_SYSLOG_FACILITY}" in
 
@@ -649,8 +630,7 @@ AC_DEFINE_UNQUOTED(UB_SYSLOG_FACILITY,${UNBOUND_SYSLOG_FACILITY},[the SYSLOG_FAC
 
 # Check for dynamic library module
 AC_ARG_WITH(dynlibmodule,
-   AC_HELP_STRING([--with-dynlibmodule],
-   [build dynamic library module, or --without-dynlibmodule to disable it. (default=no)]),
+   AS_HELP_STRING([--with-dynlibmodule],[build dynamic library module, or --without-dynlibmodule to disable it. (default=no)]),
    [], [ withval="no" ])
 
 if test x_$withval != x_no; then
@@ -671,8 +651,7 @@ fi
 
 # Check for PyUnbound
 AC_ARG_WITH(pyunbound,
-   AC_HELP_STRING([--with-pyunbound],
-   [build PyUnbound, or --without-pyunbound to skip it. (default=no)]),
+   AS_HELP_STRING([--with-pyunbound],[build PyUnbound, or --without-pyunbound to skip it. (default=no)]),
    [], [ withval="no" ])
 
 ub_test_python=no
@@ -684,8 +663,7 @@ fi
 
 # Check for Python module
 AC_ARG_WITH(pythonmodule,
-   AC_HELP_STRING([--with-pythonmodule],
-   [build Python module, or --without-pythonmodule to disable script engine. (default=no)]),
+   AS_HELP_STRING([--with-pythonmodule],[build Python module, or --without-pythonmodule to disable script engine. (default=no)]),
    [], [ withval="no" ])
 
 ub_with_pythonmod=no
@@ -703,7 +681,7 @@ if test x_$ub_test_python != x_no; then
    AC_PYTHON_DEVEL
    if test ! -z "$PYTHON_VERSION"; then
 	if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then
-		AC_ERROR([Python version >= 2.4.0 is required])
+		AC_MSG_ERROR([Python version >= 2.4.0 is required])
 	fi
 
       [PY_MAJOR_VERSION="`$PYTHON -c \"import sys; print(sys.version_info[0])\"`"]
@@ -731,7 +709,7 @@ if test x_$ub_test_python != x_no; then
 
       # Check for SWIG
       ub_have_swig=no
-      AC_ARG_ENABLE(swig-version-check, AC_HELP_STRING([--disable-swig-version-check], [Disable swig version check to build python modules with older swig even though that is unreliable]))
+      AC_ARG_ENABLE(swig-version-check, AS_HELP_STRING([--disable-swig-version-check],[Disable swig version check to build python modules with older swig even though that is unreliable]))
       if test "$enable_swig_version_check" = "yes"; then
       	AC_PROG_SWIG(2.0.1)
       else
@@ -739,7 +717,7 @@ if test x_$ub_test_python != x_no; then
       fi
       AC_MSG_CHECKING(SWIG)
       if test ! -x "$SWIG"; then
-         AC_ERROR([failed to find swig tool, install it, or do not build Python module and PyUnbound])
+         AC_MSG_ERROR([failed to find swig tool, install it, or do not build Python module and PyUnbound])
       else
          AC_DEFINE(HAVE_SWIG, 1, [Define if you have Swig libraries and header files.])
          AC_SUBST(swig, "$SWIG")
@@ -794,8 +772,7 @@ AC_SUBST(CONFIG_DATE)
 
 # libnss
 USE_NSS="no"
-AC_ARG_WITH([nss], AC_HELP_STRING([--with-nss=path],
-	[use libnss instead of openssl, installed at path.]),
+AC_ARG_WITH([nss], AS_HELP_STRING([--with-nss=path],[use libnss instead of openssl, installed at path.]),
 	[
 	USE_NSS="yes"
 	AC_DEFINE(HAVE_NSS, 1, [Use libnss for crypto])
@@ -817,8 +794,7 @@ AC_ARG_WITH([nss], AC_HELP_STRING([--with-nss=path],
 
 # libnettle
 USE_NETTLE="no"
-AC_ARG_WITH([nettle], AC_HELP_STRING([--with-nettle=path],
-	[use libnettle as crypto library, installed at path.]),
+AC_ARG_WITH([nettle], AS_HELP_STRING([--with-nettle=path],[use libnettle as crypto library, installed at path.]),
 	[
 	USE_NETTLE="yes"
 	AC_DEFINE(HAVE_NETTLE, 1, [Use libnettle for crypto])
@@ -850,7 +826,10 @@ AC_SUBST(PC_CRYPTO_DEPENDENCY)
 BAKLIBS="$LIBS"
 LIBS="-lssl $LIBS"
 AC_MSG_CHECKING([if libssl needs -lcrypt32])
-AC_TRY_LINK_FUNC([EVP_sha256], [
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
+	int EVP_sha256(void);
+	(void)EVP_sha256();
+]])], [
 	AC_MSG_RESULT([no])
 	LIBS="$BAKLIBS"
 ], [
@@ -938,7 +917,7 @@ fi
 AC_SUBST(SSLLIB)
 
 # libbsd
-AC_ARG_WITH([libbsd], AC_HELP_STRING([--with-libbsd], [Use portable libbsd functions]), [
+AC_ARG_WITH([libbsd], AS_HELP_STRING([--with-libbsd],[Use portable libbsd functions]), [
 	AC_CHECK_HEADERS([bsd/string.h bsd/stdlib.h],,, [AC_INCLUDES_DEFAULT])
 	if test "x$ac_cv_header_bsd_string_h" = xyes -a "x$ac_cv_header_bsd_stdlib_h" = xyes; then
 		for func in strlcpy strlcat arc4random arc4random_uniform reallocarray; do
@@ -951,7 +930,7 @@ AC_ARG_WITH([libbsd], AC_HELP_STRING([--with-libbsd], [Use portable libbsd funct
 	fi
 ])
 
-AC_ARG_ENABLE(sha1, AC_HELP_STRING([--disable-sha1], [Disable SHA1 RRSIG support, does not disable nsec3 support]))
+AC_ARG_ENABLE(sha1, AS_HELP_STRING([--disable-sha1],[Disable SHA1 RRSIG support, does not disable nsec3 support]))
 case "$enable_sha1" in
 	no)
 	;;
@@ -961,7 +940,7 @@ case "$enable_sha1" in
 esac
 
 
-AC_ARG_ENABLE(sha2, AC_HELP_STRING([--disable-sha2], [Disable SHA256 and SHA512 RRSIG support]))
+AC_ARG_ENABLE(sha2, AS_HELP_STRING([--disable-sha2],[Disable SHA256 and SHA512 RRSIG support]))
 case "$enable_sha2" in
 	no)
 	;;
@@ -970,7 +949,7 @@ case "$enable_sha2" in
 	;;
 esac
 
-AC_ARG_ENABLE(subnet, AC_HELP_STRING([--enable-subnet], [Enable client subnet]))
+AC_ARG_ENABLE(subnet, AS_HELP_STRING([--enable-subnet],[Enable client subnet]))
 case "$enable_subnet" in
 	yes)
 	AC_DEFINE([CLIENT_SUBNET], [1], [Define this to enable client subnet option.])
@@ -1081,7 +1060,7 @@ fi
 AC_MSG_RESULT($ac_cv_c_gost_works)
 ])dnl
 
-AC_ARG_ENABLE(gost, AC_HELP_STRING([--disable-gost], [Disable GOST support]))
+AC_ARG_ENABLE(gost, AS_HELP_STRING([--disable-gost],[Disable GOST support]))
 use_gost="no"
 if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
 case "$enable_gost" in
@@ -1099,7 +1078,7 @@ case "$enable_gost" in
 esac
 fi dnl !USE_NSS && !USE_NETTLE
 
-AC_ARG_ENABLE(ecdsa, AC_HELP_STRING([--disable-ecdsa], [Disable ECDSA support]))
+AC_ARG_ENABLE(ecdsa, AS_HELP_STRING([--disable-ecdsa],[Disable ECDSA support]))
 use_ecdsa="no"
 case "$enable_ecdsa" in
     no)
@@ -1131,7 +1110,7 @@ case "$enable_ecdsa" in
       ;;
 esac
 
-AC_ARG_ENABLE(dsa, AC_HELP_STRING([--disable-dsa], [Disable DSA support]))
+AC_ARG_ENABLE(dsa, AS_HELP_STRING([--disable-dsa],[Disable DSA support]))
 use_dsa="no"
 case "$enable_dsa" in
     yes)
@@ -1171,7 +1150,7 @@ AC_INCLUDES_DEFAULT
       ;;
 esac
 
-AC_ARG_ENABLE(ed25519, AC_HELP_STRING([--disable-ed25519], [Disable ED25519 support]))
+AC_ARG_ENABLE(ed25519, AS_HELP_STRING([--disable-ed25519],[Disable ED25519 support]))
 use_ed25519="no"
 case "$enable_ed25519" in
     no)
@@ -1194,7 +1173,7 @@ case "$enable_ed25519" in
       ;;
 esac
 
-AC_ARG_ENABLE(ed448, AC_HELP_STRING([--disable-ed448], [Disable ED448 support]))
+AC_ARG_ENABLE(ed448, AS_HELP_STRING([--disable-ed448],[Disable ED448 support]))
 use_ed448="no"
 case "$enable_ed448" in
     no)
@@ -1214,7 +1193,7 @@ case "$enable_ed448" in
       ;;
 esac
 
-AC_ARG_ENABLE(event-api, AC_HELP_STRING([--enable-event-api], [Enable (experimental) pluggable event base libunbound API installed to unbound-event.h]))
+AC_ARG_ENABLE(event-api, AS_HELP_STRING([--enable-event-api],[Enable (experimental) pluggable event base libunbound API installed to unbound-event.h]))
 case "$enable_event_api" in
     yes)
       AC_SUBST(UNBOUND_EVENT_INSTALL, [unbound-event-install])
@@ -1224,7 +1203,7 @@ case "$enable_event_api" in
       ;;
 esac
 
-AC_ARG_ENABLE(tfo-client, AC_HELP_STRING([--enable-tfo-client], [Enable TCP Fast Open for client mode]))
+AC_ARG_ENABLE(tfo-client, AS_HELP_STRING([--enable-tfo-client],[Enable TCP Fast Open for client mode]))
 case "$enable_tfo_client" in
 	yes)
 		case `uname` in
@@ -1248,7 +1227,7 @@ case "$enable_tfo_client" in
 		;;
 esac
 
-AC_ARG_ENABLE(tfo-server, AC_HELP_STRING([--enable-tfo-server], [Enable TCP Fast Open for server mode]))
+AC_ARG_ENABLE(tfo-server, AS_HELP_STRING([--enable-tfo-server],[Enable TCP Fast Open for server mode]))
 case "$enable_tfo_server" in
 	yes)
 	      AC_CHECK_DECL([TCP_FASTOPEN], [AC_MSG_WARN([Check the platform specific TFO kernel parameters are correctly configured to support server mode TFO])], [AC_MSG_ERROR([TCP Fast Open is not available for server mode: please rerun without --enable-tfo-server])], [AC_INCLUDES_DEFAULT
@@ -1261,8 +1240,7 @@ case "$enable_tfo_server" in
 esac
 
 # check for libevent
-AC_ARG_WITH(libevent, AC_HELP_STRING([--with-libevent=pathname],
-    [use libevent (will check /usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr  or you can specify an explicit path). Slower, but allows use of large outgoing port ranges.]),
+AC_ARG_WITH(libevent, AS_HELP_STRING([--with-libevent=pathname],[use libevent (will check /usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr  or you can specify an explicit path). Slower, but allows use of large outgoing port ranges.]),
     [ ],[ with_libevent="no" ])
 if test "x_$with_libevent" != x_no; then
         AC_DEFINE([USE_LIBEVENT], [1], [Define if you enable libevent])
@@ -1356,8 +1334,7 @@ else
 fi
 
 # check for libexpat
-AC_ARG_WITH(libexpat, AC_HELP_STRING([--with-libexpat=path],
-    [specify explicit path for libexpat.]),
+AC_ARG_WITH(libexpat, AS_HELP_STRING([--with-libexpat=path],[specify explicit path for libexpat.]),
     [ ],[ withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr" ])
 AC_MSG_CHECKING(for libexpat)
 found_libexpat="no"
@@ -1374,7 +1351,7 @@ for dir in $withval ; do
             fi
 done
 if test x_$found_libexpat != x_yes; then
-	AC_ERROR([Could not find libexpat, expat.h])
+	AC_MSG_ERROR([Could not find libexpat, expat.h])
 fi
 AC_CHECK_HEADERS([expat.h],,, [AC_INCLUDES_DEFAULT])
 AC_CHECK_DECLS([XML_StopParser], [], [], [AC_INCLUDES_DEFAULT
@@ -1382,8 +1359,7 @@ AC_CHECK_DECLS([XML_StopParser], [], [], [AC_INCLUDES_DEFAULT
 ])
 
 # hiredis (redis C client for cachedb)
-AC_ARG_WITH(libhiredis, AC_HELP_STRING([--with-libhiredis=path],
-    [specify explicit path for libhiredis.]),
+AC_ARG_WITH(libhiredis, AS_HELP_STRING([--with-libhiredis=path],[specify explicit path for libhiredis.]),
     [ ],[ withval="no" ])
 found_libhiredis="no"
 if test x_$withval = x_yes -o x_$withval != x_no; then
@@ -1406,7 +1382,7 @@ if test x_$withval = x_yes -o x_$withval != x_no; then
             fi
     done
     if test x_$found_libhiredis != x_yes; then
-	AC_ERROR([Could not find libhiredis, hiredis.h])
+	AC_MSG_ERROR([Could not find libhiredis, hiredis.h])
     fi
     AC_CHECK_HEADERS([hiredis/hiredis.h],,, [AC_INCLUDES_DEFAULT])
     AC_CHECK_DECLS([redisConnect], [], [], [AC_INCLUDES_DEFAULT
@@ -1415,8 +1391,7 @@ 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.]),
+AC_ARG_WITH(libnghttp2, AS_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
@@ -1439,7 +1414,7 @@ if test x_$withval = x_yes -o x_$withval != x_no; then
             fi
     done
     if test x_$found_libnghttp2 != x_yes; then
-	AC_ERROR([Could not find libnghttp2, nghttp2.h])
+	AC_MSG_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
@@ -1450,8 +1425,7 @@ fi
 # set static linking for uninstalled libraries if requested
 AC_SUBST(staticexe)
 staticexe=""
-AC_ARG_ENABLE(static-exe, AC_HELP_STRING([--enable-static-exe],
-	[ enable to compile executables statically against (event) uninstalled libs, for debug purposes ]),
+AC_ARG_ENABLE(static-exe, AS_HELP_STRING([--enable-static-exe],[ enable to compile executables statically against (event) uninstalled libs, for debug purposes ]),
 	, )
 if test x_$enable_static_exe = x_yes; then
 	staticexe="-static"
@@ -1468,8 +1442,7 @@ if test x_$enable_static_exe = x_yes; then
 fi
 
 # set full static linking if requested
-AC_ARG_ENABLE(fully-static, AC_HELP_STRING([--enable-fully-static],
-	[ enable to compile fully static ]),
+AC_ARG_ENABLE(fully-static, AS_HELP_STRING([--enable-fully-static],[ enable to compile fully static ]),
 	, )
 if test x_$enable_fully_static = x_yes; then
 	staticexe="-all-static"
@@ -1485,8 +1458,7 @@ if test x_$enable_fully_static = x_yes; then
 fi
 
 # set lock checking if requested
-AC_ARG_ENABLE(lock_checks, AC_HELP_STRING([--enable-lock-checks],
-	[ enable to check lock and unlock calls, for debug purposes ]), 
+AC_ARG_ENABLE(lock_checks, AS_HELP_STRING([--enable-lock-checks],[ enable to check lock and unlock calls, for debug purposes ]), 
 	, )
 if test x_$enable_lock_checks = x_yes; then
 	AC_DEFINE(ENABLE_LOCK_CHECKS, 1, [Define if you want to use debug lock checking (slow).])
@@ -1728,7 +1700,7 @@ AC_SUBST(LIBOBJ_WITHOUT_CTIME)
 AC_REPLACE_FUNCS(ctime_r)
 AC_REPLACE_FUNCS(strsep)
 
-AC_ARG_ENABLE(allsymbols, AC_HELP_STRING([--enable-allsymbols], [export all symbols from libunbound and link binaries to it, smaller install size but libunbound export table is polluted by internal symbols]))
+AC_ARG_ENABLE(allsymbols, AS_HELP_STRING([--enable-allsymbols],[export all symbols from libunbound and link binaries to it, smaller install size but libunbound export table is polluted by internal symbols]))
 case "$enable_allsymbols" in
 	yes)
 	COMMON_OBJ_ALL_SYMBOLS=""
@@ -1794,7 +1766,7 @@ dnsc_DNSCRYPT([
 )
 
 # check for cachedb if requested
-AC_ARG_ENABLE(cachedb, AC_HELP_STRING([--enable-cachedb], [enable cachedb module that can use external cache storage]))
+AC_ARG_ENABLE(cachedb, AS_HELP_STRING([--enable-cachedb],[enable cachedb module that can use external cache storage]))
 # turn on cachedb when hiredis support is enabled.
 if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi
 case "$enable_cachedb" in
@@ -1807,7 +1779,7 @@ case "$enable_cachedb" in
 esac
 
 # check for ipsecmod if requested
-AC_ARG_ENABLE(ipsecmod, AC_HELP_STRING([--enable-ipsecmod], [Enable ipsecmod module that facilitates opportunistic IPsec]))
+AC_ARG_ENABLE(ipsecmod, AS_HELP_STRING([--enable-ipsecmod],[Enable ipsecmod module that facilitates opportunistic IPsec]))
 case "$enable_ipsecmod" in
 	yes)
 		AC_DEFINE([USE_IPSECMOD], [1], [Define to 1 to use ipsecmod support.])
@@ -1822,7 +1794,7 @@ case "$enable_ipsecmod" in
 esac
 
 # check for ipset if requested
-AC_ARG_ENABLE(ipset, AC_HELP_STRING([--enable-ipset], [enable ipset module]))
+AC_ARG_ENABLE(ipset, AS_HELP_STRING([--enable-ipset],[enable ipset module]))
 case "$enable_ipset" in
     yes)
 		AC_DEFINE([USE_IPSET], [1], [Define to 1 to use ipset support])
@@ -1832,8 +1804,7 @@ case "$enable_ipset" in
 		AC_SUBST(IPSET_OBJ)
 
 		# mnl
-		AC_ARG_WITH(libmnl, AC_HELP_STRING([--with-libmnl=path],
-			[specify explicit path for libmnl.]),
+		AC_ARG_WITH(libmnl, AS_HELP_STRING([--with-libmnl=path],[specify explicit path for libmnl.]),
 			[ ],[ withval="yes" ])
 		found_libmnl="no"
 		AC_MSG_CHECKING(for libmnl)
@@ -1854,14 +1825,14 @@ case "$enable_ipset" in
 			fi
 		done
 		if test x_$found_libmnl != x_yes; then
-			AC_ERROR([Could not find libmnl, libmnl.h])
+			AC_MSG_ERROR([Could not find libmnl, libmnl.h])
 		fi
 		;;
     no|*)
     	# nothing
 		;;
 esac
-AC_ARG_ENABLE(explicit-port-randomisation, AC_HELP_STRING([--disable-explicit-port-randomisation], [disable explicit source port randomisation and rely on the kernel to provide random source ports]))
+AC_ARG_ENABLE(explicit-port-randomisation, AS_HELP_STRING([--disable-explicit-port-randomisation],[disable explicit source port randomisation and rely on the kernel to provide random source ports]))
 case "$enable_explicit_port_randomisation" in
 	no)
 		AC_DEFINE([DISABLE_EXPLICIT_PORT_RANDOMISATION], [1], [Define this to enable kernel based UDP source port randomization.])
@@ -1909,8 +1880,7 @@ AC_SUBST(SOURCEFILE)
 # see if we want to build the library or everything
 ALLTARGET="alltargets"
 INSTALLTARGET="install-all"
-AC_ARG_WITH(libunbound-only, AC_HELP_STRING([--with-libunbound-only],
-	[do not build daemon and tool programs]),
+AC_ARG_WITH(libunbound-only, AS_HELP_STRING([--with-libunbound-only],[do not build daemon and tool programs]),
 	[
 	if test "$withval" = "yes"; then
 		ALLTARGET="lib"
@@ -1919,10 +1889,10 @@ AC_ARG_WITH(libunbound-only, AC_HELP_STRING([--with-libunbound-only],
 ])
 if test $ALLTARGET = "alltargets"; then
 	if test $USE_NSS = "yes"; then 
-		AC_ERROR([--with-nss can only be used in combination with --with-libunbound-only.])	
+		AC_MSG_ERROR([--with-nss can only be used in combination with --with-libunbound-only.])	
 	fi
 	if test $USE_NETTLE = "yes"; then
-		AC_ERROR([--with-nettle can only be used in combination with --with-libunbound-only.])	
+		AC_MSG_ERROR([--with-nettle can only be used in combination with --with-libunbound-only.])	
 	fi
 fi
 
@@ -2199,5 +2169,5 @@ AC_SUBST(version, [VERSION_MAJOR.VERSION_MINOR.VERSION_MICRO])
 AC_SUBST(date, [`date +'%b %e, %Y'`])
 
 AC_CONFIG_FILES([Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 doc/unbound-host.1 smallapp/unbound-control-setup.sh dnstap/dnstap_config.h dnscrypt/dnscrypt_config.h contrib/libunbound.pc contrib/unbound.socket contrib/unbound.service contrib/unbound_portable.service])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT
diff --git a/dnscrypt/dnscrypt.m4 b/dnscrypt/dnscrypt.m4
index 591bd1375..68964242a 100644
--- a/dnscrypt/dnscrypt.m4
+++ b/dnscrypt/dnscrypt.m4
@@ -11,7 +11,7 @@ AC_DEFUN([dnsc_DNSCRYPT],
     [opt_dnscrypt=$enableval], [opt_dnscrypt=no])
 
   if test "x$opt_dnscrypt" != "xno"; then
-    AC_ARG_WITH([libsodium], AC_HELP_STRING([--with-libsodium=path],
+    AC_ARG_WITH([libsodium], AS_HELP_STRING([--with-libsodium=path],
     	[Path where libsodium is installed, for dnscrypt]), [
 	CFLAGS="$CFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
diff --git a/dnstap/dnstap.m4 b/dnstap/dnstap.m4
index ba723e0be..1ff6c3fea 100644
--- a/dnstap/dnstap.m4
+++ b/dnstap/dnstap.m4
@@ -20,7 +20,7 @@ AC_DEFUN([dt_DNSTAP],
     if test -z "$PROTOC_C"; then
       AC_MSG_ERROR([The protoc-c program was not found. Please install protobuf-c!])
     fi
-    AC_ARG_WITH([protobuf-c], AC_HELP_STRING([--with-protobuf-c=path],
+    AC_ARG_WITH([protobuf-c], AS_HELP_STRING([--with-protobuf-c=path],
     	[Path where protobuf-c is installed, for dnstap]), [
 	  # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
 	  if test -f $withval/include/google/protobuf-c/protobuf-c.h; then
diff --git a/doc/Changelog b/doc/Changelog
index 093a4b8aa..f48fe64c0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 January 2021: Wouter
+	- Fix #385: autoconf 2.70 impacts unbound build
+
 4 January 2021: Wouter
 	- For #376: Fix that comm point event is not double removed or double
 	  added to event map.

From b788e292656c66d8a8ba9e5be793acd84c1e8881 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 5 Jan 2021 12:48:27 +0100
Subject: [PATCH 149/208] Fix acx_nlnetlabs.m4 for aclocal

---
 acx_nlnetlabs.m4 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 2b7768075..d33352f17 100644
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 36
+# Version 37
+# 2021-01-05 fix defun for aclocal
 # 2021-01-05 autoconf 2.70 autoupdate and fixes, no AC_TRY_COMPILE
 # 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.
@@ -519,8 +520,8 @@ AC_DEFUN([AC_PROG_CXX], [:])
 AC_DEFUN([AC_PROG_CXXCPP], [:])
 AC_DEFUN([AC_PROG_OBJC], [:])
 AC_DEFUN([AC_PROG_OBJCCPP], [:])
-AC_DEFUN([LT_LANG([C++])], [:])
-AC_DEFUN([LT_LANG([Fortran 77])], [:])
+AC_DEFUN([AC_LIBTOOL_CXX], [:])
+AC_DEFUN([AC_LIBTOOL_F77], [:])
 # always use ./libtool unless override from commandline (libtool=mylibtool)
 if test -z "$libtool"; then
 	libtool="./libtool"

From c357e0fea46028225c9caec5494479f472741c36 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 5 Jan 2021 13:43:53 +0100
Subject: [PATCH 150/208] Changelog note for #375 and -h output. - Merge PR
 #375 by fhriley: Add rpz_enable and rpz_disable commands   to
 unbound-control.

---
 doc/Changelog              | 2 ++
 smallapp/unbound-control.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index f48fe64c0..a596befee 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 5 January 2021: Wouter
 	- Fix #385: autoconf 2.70 impacts unbound build
+	- Merge PR #375 by fhriley: Add rpz_enable and rpz_disable commands
+	  to unbound-control.
 
 4 January 2021: Wouter
 	- For #376: Fix that comm point event is not double removed or double
diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 93281736a..d58f1b2f9 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -167,6 +167,9 @@ usage(void)
 	printf("  view_local_data_remove view name  	remove local-data in view\n");
 	printf("  view_local_datas_remove view 		remove list of local-data from view\n");
 	printf("  					one entry per line read from stdin\n");
+	printf("  rpz_enable zone		Enable the RPZ zone if it had previously\n");
+	printf("  				been disabled\n");
+	printf("  rpz_disable zone		Disable the RPZ zone\n");
 	printf("Version %s\n", PACKAGE_VERSION);
 	printf("BSD licensed, see LICENSE in source package for details.\n");
 	printf("Report bugs to %s\n", PACKAGE_BUGREPORT);

From 44075a06a5c716fe44d5c9756bc17a6f808a8748 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 6 Jan 2021 10:36:23 +0100
Subject: [PATCH 151/208] - Fix #379: zone loading over HTTP appears to have
 buffer issues.

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

diff --git a/doc/Changelog b/doc/Changelog
index a596befee..b450e75e2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 January 2021: Wouter
+	- Fix #379: zone loading over HTTP appears to have buffer issues.
+
 5 January 2021: Wouter
 	- Fix #385: autoconf 2.70 impacts unbound build
 	- Merge PR #375 by fhriley: Add rpz_enable and rpz_disable commands
diff --git a/util/netevent.c b/util/netevent.c
index 5c7550805..a5c3fe666 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2412,7 +2412,7 @@ http_nonchunk_segment(struct comm_point* c)
 	return 1;
 }
 
-/** handle nonchunked data segment, return 0=fail, 1=wait, 2=process more */
+/** handle chunked data segment, return 0=fail, 1=wait, 2=process more */
 static int
 http_chunked_segment(struct comm_point* c)
 {
@@ -2422,6 +2422,7 @@ http_chunked_segment(struct comm_point* c)
 	 */
 	size_t remainbufferlen;
 	size_t got_now = sldns_buffer_limit(c->buffer) - c->http_stored;
+	verbose(VERB_ALGO, "http_chunked_segment: got now %d, tcpbytcount %d, http_stored %d, buffer pos %d, buffer limit %d", (int)got_now, (int)c->tcp_byte_count, (int)c->http_stored, (int)sldns_buffer_position(c->buffer), (int)sldns_buffer_limit(c->buffer));
 	if(c->tcp_byte_count <= got_now) {
 		/* the chunk has completed (with perhaps some extra data
 		 * from next chunk header and next chunk) */
@@ -2761,6 +2762,11 @@ comm_point_http_handle_read(int fd, struct comm_point* c)
 	}
 
 	sldns_buffer_flip(c->buffer);
+	/* if we are partway in a segment of data, position us at the point
+	 * where we left off previously */
+	if(c->http_stored < sldns_buffer_limit(c->buffer))
+		sldns_buffer_set_position(c->buffer, c->http_stored);
+	else	sldns_buffer_set_position(c->buffer, sldns_buffer_limit(c->buffer));
 
 	while(sldns_buffer_remaining(c->buffer) > 0) {
 		/* Handle HTTP/1.x data */

From 422213c1719ca324faced1b4c6210a36b4c7506a Mon Sep 17 00:00:00 2001
From: Anton Lindqvist <anton@basename.se>
Date: Wed, 6 Jan 2021 12:35:22 +0100
Subject: [PATCH 152/208] add missing null check

I have a unbound forward zone configured on my router for my $DAYJOB.
The address associated with the zone is only accessible when the router
is connected to a VPN. If the VPN connection is absent, trying to
resolve any domain that must be handled by the zone crashes unbound.
Turns out there's a missing NULL check in `comm_point_send_udp_msg()`.
The same routine already has `if (addr) {} else {}` branches so I guess
protecting the call to `log_addr()` using the same conditional is
reasonable

I have also committed the same fix to unbound shipped with OpenBSD[1].

[1] https://marc.info/?l=openbsd-cvs&m=160993335615698&w=2
---
 util/netevent.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/netevent.c b/util/netevent.c
index a5c3fe666..a2c0e6073 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -388,8 +388,9 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet,
 		} else {
 			verbose(VERB_OPS, "send failed: %s", sock_strerror(errno));
 		}
-		log_addr(VERB_OPS, "remote address is",
-			(struct sockaddr_storage*)addr, addrlen);
+		if(addr)
+			log_addr(VERB_OPS, "remote address is",
+				(struct sockaddr_storage*)addr, addrlen);
 		return 0;
 	} else if((size_t)sent != sldns_buffer_remaining(packet)) {
 		log_err("sent %d in place of %d bytes", 

From 752aea84073f865d17cb6ed85d0fa5b6488a2c24 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 6 Jan 2021 13:19:46 +0100
Subject: [PATCH 153/208] Changelog note for #395 - Merge PR #395 from mptre:
 add missing null check.

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

diff --git a/doc/Changelog b/doc/Changelog
index b450e75e2..6c1e9a20e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
+	- Merge PR #395 from mptre: add missing null check.
 
 5 January 2021: Wouter
 	- Fix #385: autoconf 2.70 impacts unbound build

From 2e4d64684e0bc6352d469650689c14690218bf57 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 6 Jan 2021 13:42:00 +0100
Subject: [PATCH 154/208] - Fix #387: client-subnet-always-forward seems to
 effectively bypass   any caching?

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

diff --git a/doc/Changelog b/doc/Changelog
index 6c1e9a20e..7e8313333 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
 	- Merge PR #395 from mptre: add missing null check.
+	- Fix #387: client-subnet-always-forward seems to effectively bypass
+	  any caching?
 
 5 January 2021: Wouter
 	- Fix #385: autoconf 2.70 impacts unbound build
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 38bbc44df..fa6f91b7c 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -2033,7 +2033,8 @@ Specify whether the ECS address check (configured using
 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 address check is skipped when the client
-query contains an ECS record. Default is no.
+query contains an ECS record. And the lookup in the regular cache is skipped.
+Default is no.
 .TP
 .B max\-client\-subnet\-ipv6: \fI<number>\fR
 Specifies the maximum prefix length of the client source address we are willing

From 260837e05000e9f82977afd8c3887568f7c136e5 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 8 Jan 2021 09:36:37 +0100
Subject: [PATCH 155/208] Changelog note for #391 - Merge PR #391 from fhriley:
 Add start_time to reply callbacks so   modules can compute the response time.

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

diff --git a/doc/Changelog b/doc/Changelog
index 7e8313333..fa91a09bb 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+8 January 2021: Wouter
+	- Merge PR #391 from fhriley: Add start_time to reply callbacks so
+	  modules can compute the response time.
+
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
 	- Merge PR #395 from mptre: add missing null check.

From 3e03e2c26db500dff237a426de7688f9a8277625 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 8 Jan 2021 09:47:46 +0100
Subject: [PATCH 156/208] - For #391: use struct timeval* start_time for
 callback information.

---
 daemon/worker.c                 | 14 +++++++-------
 doc/Changelog                   |  1 +
 dynlibmod/dynlibmod.c           |  2 +-
 dynlibmod/dynlibmod.h           |  2 +-
 dynlibmod/examples/helloworld.c |  4 ++--
 pythonmod/interface.i           |  4 ++--
 pythonmod/pythonmod.h           |  2 +-
 services/authzone.c             |  4 ++--
 services/localzone.c            |  4 ++--
 services/mesh.c                 | 20 ++++++++++----------
 util/data/msgreply.c            | 10 +++++-----
 util/data/msgreply.h            |  8 ++++----
 util/module.h                   |  2 +-
 13 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index edf96988a..33b70e83e 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -514,7 +514,7 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 			edns->bits &= EDNS_DO;
 			if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL,
 				msg->rep, LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-				*worker->env.now_tv))
+				worker->env.now_tv))
 					return 0;
 			error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 				&msg->qinfo, id, flags, edns);
@@ -546,7 +546,7 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, msg->rep,
 		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
-        *worker->env.now_tv))
+        worker->env.now_tv))
 			return 0;
 	msg->rep->flags |= BIT_QR|BIT_RA;
 	if(!apply_edns_options(edns, &edns_bak, worker->env.cfg,
@@ -556,7 +556,7 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 		udpsize, edns, (int)(edns->bits & EDNS_DO), secure)) {
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, NULL,
 			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-			*worker->env.now_tv))
+			worker->env.now_tv))
 				edns->opt_list = NULL;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 			&msg->qinfo, id, flags, edns);
@@ -688,7 +688,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 		edns->bits &= EDNS_DO;
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, rep,
 			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-           *worker->env.now_tv))
+           worker->env.now_tv))
 			goto bail_out;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL,
 			qinfo, id, flags, edns);
@@ -723,7 +723,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, rep,
 		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
-		*worker->env.now_tv))
+		worker->env.now_tv))
 		goto bail_out;
 	*alias_rrset = NULL; /* avoid confusion if caller set it to non-NULL */
 	if((worker->daemon->use_response_ip || worker->daemon->use_rpz) &&
@@ -760,7 +760,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 		udpsize, edns, (int)(edns->bits & EDNS_DO), *is_secure_answer)) {
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, NULL,
 			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-           *worker->env.now_tv))
+           worker->env.now_tv))
 				edns->opt_list = NULL;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 			qinfo, id, flags, edns);
@@ -849,7 +849,7 @@ chaos_replystr(sldns_buffer* pkt, char** str, int num, struct edns_data* edns,
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_local_call(&worker->env, NULL, NULL, NULL,
 		LDNS_RCODE_NOERROR, edns, repinfo, worker->scratchpad,
-        *worker->env.now_tv))
+        worker->env.now_tv))
 			edns->opt_list = NULL;
 	if(sldns_buffer_capacity(pkt) >=
 		sldns_buffer_limit(pkt)+calc_edns_field_size(edns))
diff --git a/doc/Changelog b/doc/Changelog
index fa91a09bb..e8da85d6a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 8 January 2021: Wouter
 	- Merge PR #391 from fhriley: Add start_time to reply callbacks so
 	  modules can compute the response time.
+	- For #391: use struct timeval* start_time for callback information.
 
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c
index e842c9d8a..ffac7ff30 100644
--- a/dynlibmod/dynlibmod.c
+++ b/dynlibmod/dynlibmod.c
@@ -213,7 +213,7 @@ int dynlib_inplace_cb_reply_generic(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
     struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time, int id, void* callback) {
+    struct timeval* start_time, int id, void* callback) {
     struct cb_pair* cb_pair = (struct cb_pair*) callback;
     return ((inplace_cb_reply_func_type*) cb_pair->cb)(qinfo, qstate, rep, rcode, edns, opt_list_out, repinfo, region, start_time, id, cb_pair->cb_arg);
 }
diff --git a/dynlibmod/dynlibmod.h b/dynlibmod/dynlibmod.h
index f35dafa1a..321f4f693 100644
--- a/dynlibmod/dynlibmod.h
+++ b/dynlibmod/dynlibmod.h
@@ -71,7 +71,7 @@ int dynlib_inplace_cb_reply_generic(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
     struct comm_reply* repinfo, struct regional* region,
-	struct timeval start_time, int id, void* callback);
+	struct timeval* start_time, int id, void* callback);
 
 int dynlib_inplace_cb_query_generic(struct query_info* qinfo, uint16_t flags,
     struct module_qstate* qstate, struct sockaddr_storage* addr,
diff --git a/dynlibmod/examples/helloworld.c b/dynlibmod/examples/helloworld.c
index 5ea9c51be..7da32d9bb 100644
--- a/dynlibmod/examples/helloworld.c
+++ b/dynlibmod/examples/helloworld.c
@@ -31,7 +31,7 @@ int reply_callback(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
     struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time, int id, void* callback);
+    struct timeval* start_time, int id, void* callback);
 
 /* Init is called when the module is first loaded. It should be used to set up
  * the environment for this module and do any other initialisation required. */
@@ -117,7 +117,7 @@ int reply_callback(struct query_info* qinfo,
     struct module_qstate* qstate, struct reply_info* rep, int rcode,
     struct edns_data* edns, struct edns_option** opt_list_out,
     struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time, int id, void* callback) {
+    struct timeval* start_time, int id, void* callback) {
     log_info("dynlib: hello world from callback");
     struct dynlibmod_env* env = qstate->env->modinfo[id];
     if (env->dyn_env != NULL) {
diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index 8f44e52b6..6e629fa70 100644
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -1542,13 +1542,13 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
         struct module_qstate* qstate, struct reply_info* rep, int rcode,
         struct edns_data* edns, struct edns_option** opt_list_out,
         struct comm_reply* repinfo, struct regional* region,
-        struct timeval start_time, int id, void* python_callback)
+        struct timeval* start_time, int id, void* python_callback)
     {
         PyObject *func, *py_edns, *py_qstate, *py_opt_list_out, *py_qinfo;
         PyObject *py_rep, *py_repinfo, *py_region;
         PyObject *py_args, *py_kwargs, *result;
         int res = 0;
-        double py_start_time = start_time.tv_sec + start_time.tv_usec / 1e6;
+        double py_start_time = start_time->tv_sec + start_time->tv_usec / 1e6;
 
         PyGILState_STATE gstate = PyGILState_Ensure();
         func = (PyObject *) python_callback;
diff --git a/pythonmod/pythonmod.h b/pythonmod/pythonmod.h
index 222ebd71e..f5ae9ca56 100644
--- a/pythonmod/pythonmod.h
+++ b/pythonmod/pythonmod.h
@@ -73,7 +73,7 @@ int python_inplace_cb_reply_generic(struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct edns_option** opt_list_out,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time, int id, void* python_callback);
+    struct timeval* start_time, int id, void* python_callback);
 
 /** Declared here for fptr_wlist access. The definition is in interface.i. */
 int python_inplace_cb_query_generic(
diff --git a/services/authzone.c b/services/authzone.c
index 0f6d691a2..3ad38865e 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -3286,7 +3286,7 @@ auth_answer_encode(struct query_info* qinfo, struct module_env* env,
 	edns->bits &= EDNS_DO;
 
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, msg->rep,
-		(int)FLAGS_GET_RCODE(msg->rep->flags), edns, repinfo, temp, *env->now_tv)
+		(int)FLAGS_GET_RCODE(msg->rep->flags), edns, repinfo, temp, env->now_tv)
 		|| !reply_info_answer_encode(qinfo, msg->rep,
 		*(uint16_t*)sldns_buffer_begin(buf),
 		sldns_buffer_read_u16_at(buf, 2),
@@ -3310,7 +3310,7 @@ auth_error_encode(struct query_info* qinfo, struct module_env* env,
 	edns->bits &= EDNS_DO;
 
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, NULL,
-		rcode, edns, repinfo, temp, *env->now_tv))
+		rcode, edns, repinfo, temp, env->now_tv))
 		edns->opt_list = NULL;
 	error_encode(buf, rcode|BIT_AA, qinfo,
 		*(uint16_t*)sldns_buffer_begin(buf),
diff --git a/services/localzone.c b/services/localzone.c
index 308150a00..c7ae95888 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -1215,7 +1215,7 @@ local_encode(struct query_info* qinfo, struct module_env* env,
 	edns->ext_rcode = 0;
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, &rep, rcode, edns,
-		repinfo, temp, *env->now_tv) || !reply_info_answer_encode(qinfo, &rep,
+		repinfo, temp, env->now_tv) || !reply_info_answer_encode(qinfo, &rep,
 		*(uint16_t*)sldns_buffer_begin(buf), sldns_buffer_read_u16_at(buf, 2),
 		buf, 0, 0, temp, udpsize, edns, (int)(edns->bits&EDNS_DO), 0)) {
 		error_encode(buf, (LDNS_RCODE_SERVFAIL|BIT_AA), qinfo,
@@ -1237,7 +1237,7 @@ local_error_encode(struct query_info* qinfo, struct module_env* env,
 	edns->bits &= EDNS_DO;
 
 	if(!inplace_cb_reply_local_call(env, qinfo, NULL, NULL,
-		rcode, edns, repinfo, temp, *env->now_tv))
+		rcode, edns, repinfo, temp, env->now_tv))
 		edns->opt_list = NULL;
 	error_encode(buf, r, qinfo, *(uint16_t*)sldns_buffer_begin(buf),
 		sldns_buffer_read_u16_at(buf, 2), edns);
diff --git a/services/mesh.c b/services/mesh.c
index de481c0d5..4c806dc4b 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -498,7 +498,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 		if(!s) {
 			log_err("mesh_state_create: out of memory; SERVFAIL");
 			if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL, NULL,
-				LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, *s->s.env->now_tv))
+				LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, s->s.env->now_tv))
 					edns->opt_list = NULL;
 			error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 				qinfo, qid, qflags, edns);
@@ -514,7 +514,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			if(!s->s.edns_opts_front_in) {
 				log_err("mesh_state_create: out of memory; SERVFAIL");
 				if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL,
-					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, *s->s.env->now_tv))
+					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, s->s.env->now_tv))
 						edns->opt_list = NULL;
 				error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 					qinfo, qid, qflags, edns);
@@ -587,7 +587,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 
 servfail_mem:
 	if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, &s->s,
-		NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, *s->s.env->now_tv))
+		NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, s->s.env->now_tv))
 			edns->opt_list = NULL;
 	error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 		qinfo, qid, qflags, edns);
@@ -1115,7 +1115,7 @@ int mesh_state_attachment(struct mesh_state* super, struct mesh_state* sub)
  */
 static void
 mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep,
-	struct mesh_cb* r, struct timeval start_time)
+	struct mesh_cb* r, struct timeval* start_time)
 {
 	int secure;
 	char* reason = NULL;
@@ -1256,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, &r->query_reply, m->s.region, r->start_time))
+				rep, rcode, &r->edns, &r->query_reply, m->s.region, &r->start_time))
 					r->edns.opt_list = NULL;
 		} else { 
 			if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, rcode,
-				&r->edns, &r->query_reply, m->s.region, r->start_time))
+				&r->edns, &r->query_reply, m->s.region, &r->start_time))
 					r->edns.opt_list = NULL;
 		}
 		error_encode(r_buffer, rcode, &m->s.qinfo, r->qid,
@@ -1277,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, &r->query_reply, m->s.region, r->start_time) ||
+			LDNS_RCODE_NOERROR, &r->edns, &r->query_reply, m->s.region, &r->start_time) ||
 			!apply_edns_options(&r->edns, &edns_bak,
 				m->s.env->cfg, r->query_reply.c,
 				m->s.region) ||
@@ -1287,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, &r->query_reply, m->s.region, r->start_time))
+			rep, LDNS_RCODE_SERVFAIL, &r->edns, &r->query_reply, m->s.region, &r->start_time))
 				r->edns.opt_list = NULL;
 			error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 				&m->s.qinfo, r->qid, r->qflags, &r->edns);
@@ -1424,7 +1424,7 @@ void mesh_query_done(struct mesh_state* mstate)
 		if(!mstate->reply_list && !mstate->cb_list &&
 			mstate->super_set.count == 0)
 			mstate->s.env->mesh->num_detached_states++;
-		mesh_do_callback(mstate, mstate->s.return_rcode, rep, c, tv);
+		mesh_do_callback(mstate, mstate->s.return_rcode, rep, c, &tv);
 	}
 }
 
@@ -2048,6 +2048,6 @@ mesh_serve_expired_callback(void* arg)
 		if(!mstate->reply_list && !mstate->cb_list &&
 			mstate->super_set.count == 0)
 			qstate->env->mesh->num_detached_states++;
-		mesh_do_callback(mstate, LDNS_RCODE_NOERROR, msg->rep, c, tv);
+		mesh_do_callback(mstate, LDNS_RCODE_NOERROR, msg->rep, c, &tv);
 	}
 }
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index 3f7eb5fc9..a48cb78f1 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -1036,7 +1036,7 @@ static int inplace_cb_reply_call_generic(
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time)
+    struct timeval* start_time)
 {
 	struct inplace_cb* cb;
 	struct edns_option* opt_list_out = NULL;
@@ -1058,7 +1058,7 @@ static int inplace_cb_reply_call_generic(
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time)
+    struct timeval* start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply], inplace_cb_reply, qinfo,
@@ -1069,7 +1069,7 @@ int inplace_cb_reply_cache_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time)
+    struct timeval* start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_cache], inplace_cb_reply_cache,
@@ -1080,7 +1080,7 @@ int inplace_cb_reply_local_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time)
+    struct timeval* start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_local], inplace_cb_reply_local,
@@ -1091,7 +1091,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time)
+    struct timeval* start_time)
 {
 	/* We are going to servfail. Remove any potential edns options. */
 	if(qstate)
diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index b7706b023..32466644f 100644
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -559,7 +559,7 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code);
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time);
+    struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_cache linked list.
@@ -578,7 +578,7 @@ int inplace_cb_reply_cache_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time);
+    struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_local linked list.
@@ -597,7 +597,7 @@ int inplace_cb_reply_local_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time);
+    struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply linked list.
@@ -617,7 +617,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time);
+    struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_query linked list.
diff --git a/util/module.h b/util/module.h
index d29b6f318..9267b49e8 100644
--- a/util/module.h
+++ b/util/module.h
@@ -258,7 +258,7 @@ typedef int inplace_cb_reply_func_type(struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct edns_option** opt_list_out,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval start_time, int id, void* callback);
+    struct timeval* start_time, int id, void* callback);
 
 /**
  * Inplace callback function called before sending the query to a nameserver.

From ee2545d93926a8fc80ff0a0bac6df14425f32a02 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 8 Jan 2021 09:53:52 +0100
Subject: [PATCH 157/208] - For #391: fix indentation.

---
 daemon/worker.c       |  8 ++++----
 doc/Changelog         |  1 +
 pythonmod/pythonmod.h |  2 +-
 services/mesh.c       |  4 ++--
 util/data/msgreply.c  | 10 +++++-----
 util/data/msgreply.h  |  8 ++++----
 util/module.h         |  2 +-
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 33b70e83e..37a8e1fe0 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -546,7 +546,7 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, msg->rep,
 		(int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
-        worker->env.now_tv))
+		worker->env.now_tv))
 			return 0;
 	msg->rep->flags |= BIT_QR|BIT_RA;
 	if(!apply_edns_options(edns, &edns_bak, worker->env.cfg,
@@ -688,7 +688,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 		edns->bits &= EDNS_DO;
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, rep,
 			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-           worker->env.now_tv))
+			worker->env.now_tv))
 			goto bail_out;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL,
 			qinfo, id, flags, edns);
@@ -760,7 +760,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 		udpsize, edns, (int)(edns->bits & EDNS_DO), *is_secure_answer)) {
 		if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, NULL,
 			LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-           worker->env.now_tv))
+			worker->env.now_tv))
 				edns->opt_list = NULL;
 		error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
 			qinfo, id, flags, edns);
@@ -849,7 +849,7 @@ chaos_replystr(sldns_buffer* pkt, char** str, int num, struct edns_data* edns,
 	edns->bits &= EDNS_DO;
 	if(!inplace_cb_reply_local_call(&worker->env, NULL, NULL, NULL,
 		LDNS_RCODE_NOERROR, edns, repinfo, worker->scratchpad,
-        worker->env.now_tv))
+		worker->env.now_tv))
 			edns->opt_list = NULL;
 	if(sldns_buffer_capacity(pkt) >=
 		sldns_buffer_limit(pkt)+calc_edns_field_size(edns))
diff --git a/doc/Changelog b/doc/Changelog
index e8da85d6a..c7d09cbb6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Merge PR #391 from fhriley: Add start_time to reply callbacks so
 	  modules can compute the response time.
 	- For #391: use struct timeval* start_time for callback information.
+	- For #391: fix indentation.
 
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
diff --git a/pythonmod/pythonmod.h b/pythonmod/pythonmod.h
index f5ae9ca56..26d74e09f 100644
--- a/pythonmod/pythonmod.h
+++ b/pythonmod/pythonmod.h
@@ -73,7 +73,7 @@ int python_inplace_cb_reply_generic(struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct edns_option** opt_list_out,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time, int id, void* python_callback);
+	struct timeval* start_time, int id, void* python_callback);
 
 /** Declared here for fptr_wlist access. The definition is in interface.i. */
 int python_inplace_cb_query_generic(
diff --git a/services/mesh.c b/services/mesh.c
index 4c806dc4b..270ffb8ba 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1350,7 +1350,7 @@ void mesh_query_done(struct mesh_state* mstate)
 		}
 	}
 	for(r = mstate->reply_list; r; r = r->next) {
-	    tv = r->start_time;
+		tv = r->start_time;
 
 		/* if a response-ip address block has been stored the
 		 *  information should be logged for each client. */
@@ -1992,7 +1992,7 @@ mesh_serve_expired_callback(void* arg)
 		log_dns_msg("Serve expired lookup", &qstate->qinfo, msg->rep);
 
 	for(r = mstate->reply_list; r; r = r->next) {
-	    tv = r->start_time;
+		tv = r->start_time;
 
 		/* If address info is returned, it means the action should be an
 		* 'inform' variant and the information should be logged. */
diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index a48cb78f1..35cd8b93e 100644
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -1036,7 +1036,7 @@ static int inplace_cb_reply_call_generic(
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+	struct timeval* start_time)
 {
 	struct inplace_cb* cb;
 	struct edns_option* opt_list_out = NULL;
@@ -1058,7 +1058,7 @@ static int inplace_cb_reply_call_generic(
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+	struct timeval* start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply], inplace_cb_reply, qinfo,
@@ -1069,7 +1069,7 @@ int inplace_cb_reply_cache_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+	struct timeval* start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_cache], inplace_cb_reply_cache,
@@ -1080,7 +1080,7 @@ int inplace_cb_reply_local_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+	struct timeval* start_time)
 {
 	return inplace_cb_reply_call_generic(
 		env->inplace_cb_lists[inplace_cb_reply_local], inplace_cb_reply_local,
@@ -1091,7 +1091,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+	struct timeval* start_time)
 {
 	/* We are going to servfail. Remove any potential edns options. */
 	if(qstate)
diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index 32466644f..76b75ea8a 100644
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -559,7 +559,7 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code);
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+	struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_cache linked list.
@@ -578,7 +578,7 @@ int inplace_cb_reply_cache_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+	struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_local linked list.
@@ -597,7 +597,7 @@ int inplace_cb_reply_local_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+	struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply linked list.
@@ -617,7 +617,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
 	struct query_info* qinfo, struct module_qstate* qstate,
 	struct reply_info* rep, int rcode, struct edns_data* edns,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+	struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_query linked list.
diff --git a/util/module.h b/util/module.h
index 9267b49e8..81a31a9cc 100644
--- a/util/module.h
+++ b/util/module.h
@@ -258,7 +258,7 @@ typedef int inplace_cb_reply_func_type(struct query_info* qinfo,
 	struct module_qstate* qstate, struct reply_info* rep, int rcode,
 	struct edns_data* edns, struct edns_option** opt_list_out,
 	struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time, int id, void* callback);
+	struct timeval* start_time, int id, void* callback);
 
 /**
  * Inplace callback function called before sending the query to a nameserver.

From 1aa7168c6a7f107892c82dc94d7aee3a84316e5b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 8 Jan 2021 09:55:55 +0100
Subject: [PATCH 158/208] - For #391: more double casts in python start time
 calculation.

---
 doc/Changelog         | 1 +
 pythonmod/interface.i | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index c7d09cbb6..f5861eb98 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	  modules can compute the response time.
 	- For #391: use struct timeval* start_time for callback information.
 	- For #391: fix indentation.
+	- For #391: more double casts in python start time calculation.
 
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index 6e629fa70..5dae04aa4 100644
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -1548,7 +1548,7 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
         PyObject *py_rep, *py_repinfo, *py_region;
         PyObject *py_args, *py_kwargs, *result;
         int res = 0;
-        double py_start_time = start_time->tv_sec + start_time->tv_usec / 1e6;
+        double py_start_time = ((double)start_time->tv_sec) + ((double)start_time->tv_usec) / 1.0e6;
 
         PyGILState_STATE gstate = PyGILState_Ensure();
         func = (PyObject *) python_callback;

From d9dd7bc36f4e5b79e5966e51dffb7d9e26217709 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 8 Jan 2021 11:01:06 +0100
Subject: [PATCH 159/208] - Add comment documentation.

---
 doc/Changelog        | 1 +
 services/mesh.c      | 2 ++
 util/data/msgreply.h | 8 ++++++++
 3 files changed, 11 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index f5861eb98..9f4f41265 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- For #391: use struct timeval* start_time for callback information.
 	- For #391: fix indentation.
 	- For #391: more double casts in python start time calculation.
+	- Add comment documentation.
 
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
diff --git a/services/mesh.c b/services/mesh.c
index 270ffb8ba..27de47eef 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1112,6 +1112,8 @@ int mesh_state_attachment(struct mesh_state* super, struct mesh_state* sub)
  * @param rcode: if not 0, error code.
  * @param rep: reply to send (or NULL if rcode is set).
  * @param r: callback entry
+ * @param start_time: the time to pass to callback functions, it is 0 or
+ * 	a value from one of the packets if the mesh state had packets.
  */
 static void
 mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep,
diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index 76b75ea8a..c6b220ed8 100644
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -554,6 +554,8 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code);
  * @param edns: edns data of the reply.
  * @param repinfo: comm_reply. Reply information for a communication point.
  * @param region: region to store data.
+ * @param start_time: the start time of recursion, when the packet arrived,
+ * 	or the current time for cache responses.
  * @return false on failure (a callback function returned an error).
  */
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
@@ -572,6 +574,8 @@ int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
  * @param edns: edns data of the reply. Edns input can be found here.
  * @param repinfo: comm_reply. Reply information for a communication point.
  * @param region: region to store data.
+ * @param start_time: the start time of recursion, when the packet arrived,
+ * 	or the current time for cache responses.
  * @return false on failure (a callback function returned an error).
  */
 int inplace_cb_reply_cache_call(struct module_env* env,
@@ -591,6 +595,8 @@ int inplace_cb_reply_cache_call(struct module_env* env,
  * @param edns: edns data of the reply. Edns input can be found here.
  * @param repinfo: comm_reply. Reply information for a communication point.
  * @param region: region to store data.
+ * @param start_time: the start time of recursion, when the packet arrived,
+ * 	or the current time for cache responses.
  * @return false on failure (a callback function returned an error).
  */
 int inplace_cb_reply_local_call(struct module_env* env,
@@ -611,6 +617,8 @@ int inplace_cb_reply_local_call(struct module_env* env,
  *	is NULL.
  * @param repinfo: comm_reply. Reply information for a communication point.
  * @param region: region to store data.
+ * @param start_time: the start time of recursion, when the packet arrived,
+ * 	or the current time for cache responses.
  * @return false on failure (a callback function returned an error).
  */
 int inplace_cb_reply_servfail_call(struct module_env* env,

From 64f508fa00c8f456a89293b981496a62efd63689 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 8 Jan 2021 11:10:05 +0100
Subject: [PATCH 160/208] - Fix clang analysis warning.

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

diff --git a/doc/Changelog b/doc/Changelog
index 9f4f41265..58a5bf69e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	- For #391: fix indentation.
 	- For #391: more double casts in python start time calculation.
 	- Add comment documentation.
+	- Fix clang analysis warning.
 
 6 January 2021: Wouter
 	- Fix #379: zone loading over HTTP appears to have buffer issues.
diff --git a/services/mesh.c b/services/mesh.c
index 27de47eef..69f4d75e3 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -498,7 +498,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 		if(!s) {
 			log_err("mesh_state_create: out of memory; SERVFAIL");
 			if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL, NULL,
-				LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, s->s.env->now_tv))
+				LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, mesh->env->now_tv))
 					edns->opt_list = NULL;
 			error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 				qinfo, qid, qflags, edns);
@@ -514,7 +514,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			if(!s->s.edns_opts_front_in) {
 				log_err("mesh_state_create: out of memory; SERVFAIL");
 				if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL,
-					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, s->s.env->now_tv))
+					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, mesh->env->now_tv))
 						edns->opt_list = NULL;
 				error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 					qinfo, qid, qflags, edns);
@@ -587,7 +587,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 
 servfail_mem:
 	if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, &s->s,
-		NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, s->s.env->now_tv))
+		NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, mesh->env->now_tv))
 			edns->opt_list = NULL;
 	error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 		qinfo, qid, qflags, edns);

From 3322f631e5927c5d3adb66da05f867c64bdcb9c9 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 12 Jan 2021 13:35:05 +0100
Subject: [PATCH 161/208] - Fix #397: [Feature request] add new type
 always_null to local-zone   similar to always_nxdomain.

---
 doc/Changelog          |   4 +
 doc/example.conf.in    |   1 +
 doc/unbound.conf.5.in  |   7 +-
 services/localzone.c   |  43 ++++
 services/localzone.h   |   3 +
 testdata/localdata.rpl |  35 +++
 util/configparser.c    | 559 +++++++++++++++++++++--------------------
 util/configparser.y    |   5 +-
 8 files changed, 375 insertions(+), 282 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 58a5bf69e..2cd7baf00 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+12 January 2021: Wouter
+	- Fix #397: [Feature request] add new type always_null to local-zone
+	  similar to always_nxdomain.
+
 8 January 2021: Wouter
 	- Merge PR #391 from fhriley: Add start_time to reply callbacks so
 	  modules can compute the response time.
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 9269461cf..c3c7c0f26 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -706,6 +706,7 @@ server:
 	# o inform_redirect redirects queries and logs client IP address
 	# o always_transparent, always_refuse, always_nxdomain, resolve in
 	#   that way but ignore local data for that name
+	# o always_null returns 0.0.0.0 or ::0 for any name in the zone.
 	# o noview breaks out of that view towards global local-zones.
 	#
 	# defaults are localhost address, reverse for 127.0.0.1 and ::1
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index fa6f91b7c..4eeb41bf9 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1231,7 +1231,7 @@ address space are not validated.  This is usually required whenever
 Configure a local zone. The type determines the answer to give if
 there is no match from local\-data. The types are deny, refuse, static,
 transparent, redirect, nodefault, typetransparent, inform, inform_deny,
-inform_redirect, always_transparent, always_refuse, always_nxdomain, noview,
+inform_redirect, always_transparent, always_refuse, always_nxdomain, always_null, noview,
 and are explained below. After that the default settings are listed. Use
 local\-data: to enter data into the local zone. Answers for local zones
 are authoritative DNS answers. By default the zones are class IN.
@@ -1305,6 +1305,11 @@ Like refuse, but ignores local data and refuses the query.
 \h'5'\fIalways_nxdomain\fR
 Like static, but ignores local data and returns nxdomain for the query.
 .TP 10
+\h'5'\fIalways_null\fR
+Always returns 0.0.0.0 or ::0 for every name in the zone.  Like redirect
+with zero data for A and AAAA.  Ignores local data in the zone.  Used for
+some block lists.
+.TP 10
 \h'5'\fInoview\fR
 Breaks out of that view and moves towards the global local zones for answer
 to the query.  If the view first is no, it'll resolve normally.  If view first
diff --git a/services/localzone.c b/services/localzone.c
index c7ae95888..ed0d2c565 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -1558,6 +1558,46 @@ local_zones_zone_answer(struct local_zone* z, struct module_env* env,
 		|| lz_type == local_zone_always_transparent) {
 		/* no NODATA or NXDOMAINS for this zone type */
 		return 0;
+	} else if(lz_type == local_zone_always_null) {
+		/* 0.0.0.0 or ::0 or noerror/nodata for this zone type,
+		 * used for blocklists. */
+		if(qinfo->qtype == LDNS_RR_TYPE_A ||
+			qinfo->qtype == LDNS_RR_TYPE_AAAA) {
+			struct ub_packed_rrset_key lrr;
+			struct packed_rrset_data d;
+			time_t rr_ttl = 3600;
+			size_t rr_len = 0;
+			uint8_t rr_data[2+16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+			uint8_t* rr_datas = rr_data;
+			memset(&lrr, 0, sizeof(lrr));
+			memset(&d, 0, sizeof(d));
+			lrr.entry.data = &d;
+			lrr.rk.dname = qinfo->qname;
+			lrr.rk.dname_len = qinfo->qname_len;
+			lrr.rk.type = htons(qinfo->qtype);
+			lrr.rk.rrset_class = htons(qinfo->qclass);
+			if(qinfo->qtype == LDNS_RR_TYPE_A) {
+				rr_len = 4;
+				sldns_write_uint16(rr_data, rr_len);
+				rr_len += 2;
+			} else {
+				rr_len = 16;
+				sldns_write_uint16(rr_data, rr_len);
+				rr_len += 2;
+			}
+			d.ttl = rr_ttl;
+			d.count = 1;
+			d.rr_len = &rr_len;
+			d.rr_data = &rr_datas;
+			d.rr_ttl = &rr_ttl;
+			return local_encode(qinfo, env, edns, repinfo, buf, temp,
+				&lrr, 1, LDNS_RCODE_NOERROR);
+		} else {
+			local_error_encode(qinfo, env, edns, repinfo, buf,
+				temp, LDNS_RCODE_NOERROR,
+				(LDNS_RCODE_NOERROR|BIT_AA));
+		}
+		return 1;
 	}
 	/* else lz_type == local_zone_transparent */
 
@@ -1762,6 +1802,7 @@ const char* local_zone_type2str(enum localzone_type t)
 		case local_zone_always_nxdomain: return "always_nxdomain";
 		case local_zone_always_nodata: return "always_nodata";
 		case local_zone_always_deny: return "always_deny";
+		case local_zone_always_null: return "always_null";
 		case local_zone_noview: return "noview";
 		case local_zone_invalid: return "invalid";
 	}
@@ -1798,6 +1839,8 @@ int local_zone_str2type(const char* type, enum localzone_type* t)
 		*t = local_zone_always_nodata;
 	else if(strcmp(type, "always_deny") == 0)
 		*t = local_zone_always_deny;
+	else if(strcmp(type, "always_null") == 0)
+		*t = local_zone_always_null;
 	else if(strcmp(type, "noview") == 0)
 		*t = local_zone_noview;
 	else if(strcmp(type, "nodefault") == 0)
diff --git a/services/localzone.h b/services/localzone.h
index bb3593936..492629936 100644
--- a/services/localzone.h
+++ b/services/localzone.h
@@ -96,6 +96,9 @@ enum localzone_type {
 	local_zone_always_nodata,
 	/** drop query, even when there is local data */
 	local_zone_always_deny,
+	/** answer with 0.0.0.0 or ::0 or noerror/nodata, even when there is
+	 * local data */
+	local_zone_always_null,
 	/** answer not from the view, but global or no-answer */
 	local_zone_noview,
 	/** Invalid type, cannot be used to generate answer */
diff --git a/testdata/localdata.rpl b/testdata/localdata.rpl
index a2e7eeba2..eb25ef573 100644
--- a/testdata/localdata.rpl
+++ b/testdata/localdata.rpl
@@ -35,6 +35,9 @@ server:
 	local-zone: "redirect.top." redirect
 	local-data: "redirect.top. A 20.30.40.54"
 
+	; null zone
+	local-zone: "null.top." always_null
+
 	; create implicit data in the IN domain as well
 	local-data: "a.a.implicit. A 20.30.41.50"
 	local-data: "b.a.implicit. A 20.30.42.50"
@@ -355,4 +358,36 @@ SECTION ANSWER
 www.redirect.top. IN A 20.30.40.54
 ENTRY_END
 
+; always_null zone
+STEP 60 QUERY
+ENTRY_BEGIN
+SECTION QUESTION
+null.top. IN A
+ENTRY_END
+STEP 61 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RA AA NOERROR
+SECTION QUESTION
+null.top. IN A
+SECTION ANSWER
+null.top. IN A 0.0.0.0
+ENTRY_END
+
+; always_null zone AAAA
+STEP 62 QUERY
+ENTRY_BEGIN
+SECTION QUESTION
+foo.null.top. IN AAAA
+ENTRY_END
+STEP 63 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RA AA NOERROR
+SECTION QUESTION
+foo.null.top. IN AAAA
+SECTION ANSWER
+foo.null.top. IN AAAA ::0
+ENTRY_END
+
 SCENARIO_END
diff --git a/util/configparser.c b/util/configparser.c
index 4e5bf5a41..cc5d9fb5e 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1125,26 +1125,26 @@ static const yytype_uint16 yyrline[] =
     1680,  1689,  1698,  1707,  1714,  1724,  1744,  1751,  1769,  1782,
     1795,  1804,  1813,  1822,  1831,  1841,  1851,  1862,  1871,  1880,
     1889,  1898,  1907,  1916,  1929,  1942,  1951,  1958,  1967,  1976,
-    1985,  1994,  2002,  2015,  2023,  2064,  2071,  2086,  2096,  2106,
-    2113,  2120,  2127,  2136,  2144,  2158,  2179,  2200,  2212,  2224,
-    2236,  2245,  2266,  2276,  2285,  2293,  2301,  2314,  2327,  2342,
-    2357,  2366,  2375,  2381,  2390,  2399,  2409,  2419,  2432,  2445,
-    2457,  2471,  2483,  2497,  2506,  2518,  2528,  2535,  2542,  2551,
-    2560,  2570,  2580,  2590,  2597,  2604,  2613,  2622,  2632,  2642,
-    2649,  2656,  2663,  2671,  2681,  2691,  2701,  2711,  2750,  2760,
-    2768,  2776,  2791,  2800,  2805,  2806,  2807,  2807,  2807,  2808,
-    2808,  2808,  2809,  2809,  2811,  2821,  2830,  2837,  2844,  2851,
-    2858,  2865,  2872,  2877,  2878,  2879,  2879,  2879,  2880,  2880,
-    2880,  2881,  2882,  2882,  2883,  2883,  2884,  2884,  2885,  2886,
-    2887,  2888,  2889,  2890,  2892,  2901,  2911,  2918,  2925,  2934,
-    2941,  2948,  2955,  2962,  2971,  2980,  2987,  2994,  3004,  3014,
-    3024,  3034,  3044,  3054,  3059,  3060,  3061,  3063,  3069,  3074,
-    3075,  3076,  3078,  3084,  3094,  3101,  3110,  3118,  3123,  3124,
-    3126,  3126,  3126,  3127,  3127,  3128,  3129,  3130,  3131,  3132,
-    3134,  3144,  3153,  3160,  3169,  3176,  3185,  3193,  3206,  3214,
-    3227,  3232,  3233,  3234,  3234,  3235,  3235,  3235,  3236,  3238,
-    3250,  3262,  3274,  3289,  3302,  3315,  3326,  3331,  3332,  3333,
-    3333,  3335,  3350
+    1985,  1994,  2002,  2015,  2023,  2065,  2072,  2087,  2097,  2107,
+    2114,  2121,  2128,  2137,  2145,  2159,  2180,  2201,  2213,  2225,
+    2237,  2246,  2267,  2277,  2286,  2294,  2302,  2315,  2328,  2343,
+    2358,  2367,  2376,  2382,  2391,  2400,  2410,  2420,  2433,  2446,
+    2458,  2472,  2484,  2498,  2507,  2519,  2529,  2536,  2543,  2552,
+    2561,  2571,  2581,  2591,  2598,  2605,  2614,  2623,  2633,  2643,
+    2650,  2657,  2664,  2672,  2682,  2692,  2702,  2712,  2751,  2761,
+    2769,  2777,  2792,  2801,  2806,  2807,  2808,  2808,  2808,  2809,
+    2809,  2809,  2810,  2810,  2812,  2822,  2831,  2838,  2845,  2852,
+    2859,  2866,  2873,  2878,  2879,  2880,  2880,  2880,  2881,  2881,
+    2881,  2882,  2883,  2883,  2884,  2884,  2885,  2885,  2886,  2887,
+    2888,  2889,  2890,  2891,  2893,  2902,  2912,  2919,  2926,  2935,
+    2942,  2949,  2956,  2963,  2972,  2981,  2988,  2995,  3005,  3015,
+    3025,  3035,  3045,  3055,  3060,  3061,  3062,  3064,  3070,  3075,
+    3076,  3077,  3079,  3085,  3095,  3102,  3111,  3119,  3124,  3125,
+    3127,  3127,  3127,  3128,  3128,  3129,  3130,  3131,  3132,  3133,
+    3135,  3145,  3154,  3161,  3170,  3177,  3186,  3194,  3207,  3215,
+    3228,  3233,  3234,  3235,  3235,  3236,  3236,  3236,  3237,  3239,
+    3251,  3263,  3275,  3290,  3303,  3316,  3327,  3332,  3333,  3334,
+    3334,  3336,  3351
 };
 #endif
 
@@ -5019,6 +5019,7 @@ yyreduce:
 		   && strcmp((yyvsp[0].str), "always_transparent")!=0
 		   && strcmp((yyvsp[0].str), "always_refuse")!=0
 		   && strcmp((yyvsp[0].str), "always_nxdomain")!=0
+		   && strcmp((yyvsp[0].str), "always_null")!=0
 		   && strcmp((yyvsp[0].str), "noview")!=0
 		   && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0
 		   && strcmp((yyvsp[0].str), "inform_redirect") != 0
@@ -5027,8 +5028,8 @@ yyreduce:
 				"refuse, redirect, transparent, "
 				"typetransparent, inform, inform_deny, "
 				"inform_redirect, always_transparent, "
-				"always_refuse, always_nxdomain, noview "
-				", nodefault or ipset");
+				"always_refuse, always_nxdomain, always_null, "
+				"noview, nodefault or ipset");
 			free((yyvsp[-1].str));
 			free((yyvsp[0].str));
 		} else if(strcmp((yyvsp[0].str), "nodefault")==0) {
@@ -5049,21 +5050,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5053 "util/configparser.c"
+#line 5054 "util/configparser.c"
     break;
 
   case 445:
-#line 2065 "./util/configparser.y"
+#line 2066 "./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 5063 "util/configparser.c"
+#line 5064 "util/configparser.c"
     break;
 
   case 446:
-#line 2072 "./util/configparser.y"
+#line 2073 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5077,11 +5078,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5081 "util/configparser.c"
+#line 5082 "util/configparser.c"
     break;
 
   case 447:
-#line 2087 "./util/configparser.y"
+#line 2088 "./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)
@@ -5090,11 +5091,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5094 "util/configparser.c"
+#line 5095 "util/configparser.c"
     break;
 
   case 448:
-#line 2097 "./util/configparser.y"
+#line 2098 "./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)
@@ -5103,41 +5104,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5107 "util/configparser.c"
+#line 5108 "util/configparser.c"
     break;
 
   case 449:
-#line 2107 "./util/configparser.y"
+#line 2108 "./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 5117 "util/configparser.c"
+#line 5118 "util/configparser.c"
     break;
 
   case 450:
-#line 2114 "./util/configparser.y"
+#line 2115 "./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 5127 "util/configparser.c"
+#line 5128 "util/configparser.c"
     break;
 
   case 451:
-#line 2121 "./util/configparser.y"
+#line 2122 "./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 5137 "util/configparser.c"
+#line 5138 "util/configparser.c"
     break;
 
   case 452:
-#line 2128 "./util/configparser.y"
+#line 2129 "./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)
@@ -5145,22 +5146,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5149 "util/configparser.c"
+#line 5150 "util/configparser.c"
     break;
 
   case 453:
-#line 2137 "./util/configparser.y"
+#line 2138 "./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 5160 "util/configparser.c"
+#line 5161 "util/configparser.c"
     break;
 
   case 454:
-#line 2145 "./util/configparser.y"
+#line 2146 "./util/configparser.y"
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -5173,11 +5174,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5177 "util/configparser.c"
+#line 5178 "util/configparser.c"
     break;
 
   case 455:
-#line 2159 "./util/configparser.y"
+#line 2160 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5197,11 +5198,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5201 "util/configparser.c"
+#line 5202 "util/configparser.c"
     break;
 
   case 456:
-#line 2180 "./util/configparser.y"
+#line 2181 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5221,11 +5222,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5225 "util/configparser.c"
+#line 5226 "util/configparser.c"
     break;
 
   case 457:
-#line 2201 "./util/configparser.y"
+#line 2202 "./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,
@@ -5236,11 +5237,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5240 "util/configparser.c"
+#line 5241 "util/configparser.c"
     break;
 
   case 458:
-#line 2213 "./util/configparser.y"
+#line 2214 "./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,
@@ -5251,11 +5252,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5255 "util/configparser.c"
+#line 5256 "util/configparser.c"
     break;
 
   case 459:
-#line 2225 "./util/configparser.y"
+#line 2226 "./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,
@@ -5266,11 +5267,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5270 "util/configparser.c"
+#line 5271 "util/configparser.c"
     break;
 
   case 460:
-#line 2237 "./util/configparser.y"
+#line 2238 "./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,
@@ -5278,11 +5279,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5282 "util/configparser.c"
+#line 5283 "util/configparser.c"
     break;
 
   case 461:
-#line 2246 "./util/configparser.y"
+#line 2247 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5302,11 +5303,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5306 "util/configparser.c"
+#line 5307 "util/configparser.c"
     break;
 
   case 462:
-#line 2267 "./util/configparser.y"
+#line 2268 "./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)
@@ -5314,11 +5315,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5318 "util/configparser.c"
+#line 5319 "util/configparser.c"
     break;
 
   case 463:
-#line 2277 "./util/configparser.y"
+#line 2278 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5326,33 +5327,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5330 "util/configparser.c"
+#line 5331 "util/configparser.c"
     break;
 
   case 464:
-#line 2286 "./util/configparser.y"
+#line 2287 "./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 5341 "util/configparser.c"
+#line 5342 "util/configparser.c"
     break;
 
   case 465:
-#line 2294 "./util/configparser.y"
+#line 2295 "./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 5352 "util/configparser.c"
+#line 5353 "util/configparser.c"
     break;
 
   case 466:
-#line 2302 "./util/configparser.y"
+#line 2303 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5364,11 +5365,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5368 "util/configparser.c"
+#line 5369 "util/configparser.c"
     break;
 
   case 467:
-#line 2315 "./util/configparser.y"
+#line 2316 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5380,11 +5381,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5384 "util/configparser.c"
+#line 5385 "util/configparser.c"
     break;
 
   case 468:
-#line 2328 "./util/configparser.y"
+#line 2329 "./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) {
@@ -5398,11 +5399,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5402 "util/configparser.c"
+#line 5403 "util/configparser.c"
     break;
 
   case 469:
-#line 2343 "./util/configparser.y"
+#line 2344 "./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) {
@@ -5416,11 +5417,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5420 "util/configparser.c"
+#line 5421 "util/configparser.c"
     break;
 
   case 470:
-#line 2358 "./util/configparser.y"
+#line 2359 "./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)
@@ -5428,11 +5429,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5432 "util/configparser.c"
+#line 5433 "util/configparser.c"
     break;
 
   case 471:
-#line 2367 "./util/configparser.y"
+#line 2368 "./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)
@@ -5440,20 +5441,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5444 "util/configparser.c"
+#line 5445 "util/configparser.c"
     break;
 
   case 472:
-#line 2376 "./util/configparser.y"
+#line 2377 "./util/configparser.y"
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5453 "util/configparser.c"
+#line 5454 "util/configparser.c"
     break;
 
   case 473:
-#line 2382 "./util/configparser.y"
+#line 2383 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5461,11 +5462,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5465 "util/configparser.c"
+#line 5466 "util/configparser.c"
     break;
 
   case 474:
-#line 2391 "./util/configparser.y"
+#line 2392 "./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)
@@ -5473,11 +5474,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5477 "util/configparser.c"
+#line 5478 "util/configparser.c"
     break;
 
   case 475:
-#line 2400 "./util/configparser.y"
+#line 2401 "./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)
@@ -5486,11 +5487,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5490 "util/configparser.c"
+#line 5491 "util/configparser.c"
     break;
 
   case 476:
-#line 2410 "./util/configparser.y"
+#line 2411 "./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)
@@ -5499,11 +5500,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5503 "util/configparser.c"
+#line 5504 "util/configparser.c"
     break;
 
   case 477:
-#line 2420 "./util/configparser.y"
+#line 2421 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5515,11 +5516,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5519 "util/configparser.c"
+#line 5520 "util/configparser.c"
     break;
 
   case 478:
-#line 2433 "./util/configparser.y"
+#line 2434 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5531,11 +5532,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5535 "util/configparser.c"
+#line 5536 "util/configparser.c"
     break;
 
   case 479:
-#line 2446 "./util/configparser.y"
+#line 2447 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5546,11 +5547,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5550 "util/configparser.c"
+#line 5551 "util/configparser.c"
     break;
 
   case 480:
-#line 2458 "./util/configparser.y"
+#line 2459 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5563,11 +5564,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5567 "util/configparser.c"
+#line 5568 "util/configparser.c"
     break;
 
   case 481:
-#line 2472 "./util/configparser.y"
+#line 2473 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5578,11 +5579,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5582 "util/configparser.c"
+#line 5583 "util/configparser.c"
     break;
 
   case 482:
-#line 2484 "./util/configparser.y"
+#line 2485 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5595,11 +5596,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5599 "util/configparser.c"
+#line 5600 "util/configparser.c"
     break;
 
   case 483:
-#line 2498 "./util/configparser.y"
+#line 2499 "./util/configparser.y"
     {
 		OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(
@@ -5607,11 +5608,11 @@ yyreduce:
 			fatal_exit("out of memory adding "
 				"edns-client-string");
 	}
-#line 5611 "util/configparser.c"
+#line 5612 "util/configparser.c"
     break;
 
   case 484:
-#line 2507 "./util/configparser.y"
+#line 2508 "./util/configparser.y"
     {
 		OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5622,11 +5623,11 @@ yyreduce:
 		free((yyvsp[0].str));
 
 	}
-#line 5626 "util/configparser.c"
+#line 5627 "util/configparser.c"
     break;
 
   case 485:
-#line 2519 "./util/configparser.y"
+#line 2520 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5635,31 +5636,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5639 "util/configparser.c"
+#line 5640 "util/configparser.c"
     break;
 
   case 486:
-#line 2529 "./util/configparser.y"
+#line 2530 "./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 5649 "util/configparser.c"
+#line 5650 "util/configparser.c"
     break;
 
   case 487:
-#line 2536 "./util/configparser.y"
+#line 2537 "./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 5659 "util/configparser.c"
+#line 5660 "util/configparser.c"
     break;
 
   case 488:
-#line 2543 "./util/configparser.y"
+#line 2544 "./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)
@@ -5667,11 +5668,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5671 "util/configparser.c"
+#line 5672 "util/configparser.c"
     break;
 
   case 489:
-#line 2552 "./util/configparser.y"
+#line 2553 "./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)
@@ -5679,11 +5680,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5683 "util/configparser.c"
+#line 5684 "util/configparser.c"
     break;
 
   case 490:
-#line 2561 "./util/configparser.y"
+#line 2562 "./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)
@@ -5692,11 +5693,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5696 "util/configparser.c"
+#line 5697 "util/configparser.c"
     break;
 
   case 491:
-#line 2571 "./util/configparser.y"
+#line 2572 "./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)
@@ -5705,11 +5706,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5709 "util/configparser.c"
+#line 5710 "util/configparser.c"
     break;
 
   case 492:
-#line 2581 "./util/configparser.y"
+#line 2582 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5718,31 +5719,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5722 "util/configparser.c"
+#line 5723 "util/configparser.c"
     break;
 
   case 493:
-#line 2591 "./util/configparser.y"
+#line 2592 "./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 5732 "util/configparser.c"
+#line 5733 "util/configparser.c"
     break;
 
   case 494:
-#line 2598 "./util/configparser.y"
+#line 2599 "./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 5742 "util/configparser.c"
+#line 5743 "util/configparser.c"
     break;
 
   case 495:
-#line 2605 "./util/configparser.y"
+#line 2606 "./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)
@@ -5750,11 +5751,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5754 "util/configparser.c"
+#line 5755 "util/configparser.c"
     break;
 
   case 496:
-#line 2614 "./util/configparser.y"
+#line 2615 "./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)
@@ -5762,11 +5763,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5766 "util/configparser.c"
+#line 5767 "util/configparser.c"
     break;
 
   case 497:
-#line 2623 "./util/configparser.y"
+#line 2624 "./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)
@@ -5775,11 +5776,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5779 "util/configparser.c"
+#line 5780 "util/configparser.c"
     break;
 
   case 498:
-#line 2633 "./util/configparser.y"
+#line 2634 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5788,52 +5789,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5792 "util/configparser.c"
+#line 5793 "util/configparser.c"
     break;
 
   case 499:
-#line 2643 "./util/configparser.y"
+#line 2644 "./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 5802 "util/configparser.c"
+#line 5803 "util/configparser.c"
     break;
 
   case 500:
-#line 2650 "./util/configparser.y"
+#line 2651 "./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 5812 "util/configparser.c"
+#line 5813 "util/configparser.c"
     break;
 
   case 501:
-#line 2657 "./util/configparser.y"
+#line 2658 "./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 5822 "util/configparser.c"
+#line 5823 "util/configparser.c"
     break;
 
   case 502:
-#line 2664 "./util/configparser.y"
+#line 2665 "./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 5833 "util/configparser.c"
+#line 5834 "util/configparser.c"
     break;
 
   case 503:
-#line 2672 "./util/configparser.y"
+#line 2673 "./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)
@@ -5842,11 +5843,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5846 "util/configparser.c"
+#line 5847 "util/configparser.c"
     break;
 
   case 504:
-#line 2682 "./util/configparser.y"
+#line 2683 "./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)
@@ -5855,11 +5856,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5859 "util/configparser.c"
+#line 5860 "util/configparser.c"
     break;
 
   case 505:
-#line 2692 "./util/configparser.y"
+#line 2693 "./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)
@@ -5868,11 +5869,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5872 "util/configparser.c"
+#line 5873 "util/configparser.c"
     break;
 
   case 506:
-#line 2702 "./util/configparser.y"
+#line 2703 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5881,11 +5882,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5885 "util/configparser.c"
+#line 5886 "util/configparser.c"
     break;
 
   case 507:
-#line 2712 "./util/configparser.y"
+#line 2713 "./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 &&
@@ -5923,11 +5924,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5927 "util/configparser.c"
+#line 5928 "util/configparser.c"
     break;
 
   case 508:
-#line 2751 "./util/configparser.y"
+#line 2752 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5936,33 +5937,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5940 "util/configparser.c"
+#line 5941 "util/configparser.c"
     break;
 
   case 509:
-#line 2761 "./util/configparser.y"
+#line 2762 "./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 5951 "util/configparser.c"
+#line 5952 "util/configparser.c"
     break;
 
   case 510:
-#line 2769 "./util/configparser.y"
+#line 2770 "./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 5962 "util/configparser.c"
+#line 5963 "util/configparser.c"
     break;
 
   case 511:
-#line 2777 "./util/configparser.y"
+#line 2778 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5976,11 +5977,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5980 "util/configparser.c"
+#line 5981 "util/configparser.c"
     break;
 
   case 512:
-#line 2792 "./util/configparser.y"
+#line 2793 "./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)
@@ -5988,19 +5989,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5992 "util/configparser.c"
+#line 5993 "util/configparser.c"
     break;
 
   case 513:
-#line 2801 "./util/configparser.y"
+#line 2802 "./util/configparser.y"
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6000 "util/configparser.c"
+#line 6001 "util/configparser.c"
     break;
 
   case 524:
-#line 2812 "./util/configparser.y"
+#line 2813 "./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)
@@ -6009,11 +6010,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6013 "util/configparser.c"
+#line 6014 "util/configparser.c"
     break;
 
   case 525:
-#line 2822 "./util/configparser.y"
+#line 2823 "./util/configparser.y"
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6021,79 +6022,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6025 "util/configparser.c"
+#line 6026 "util/configparser.c"
     break;
 
   case 526:
-#line 2831 "./util/configparser.y"
+#line 2832 "./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 6035 "util/configparser.c"
+#line 6036 "util/configparser.c"
     break;
 
   case 527:
-#line 2838 "./util/configparser.y"
+#line 2839 "./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 6045 "util/configparser.c"
+#line 6046 "util/configparser.c"
     break;
 
   case 528:
-#line 2845 "./util/configparser.y"
+#line 2846 "./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 6055 "util/configparser.c"
+#line 6056 "util/configparser.c"
     break;
 
   case 529:
-#line 2852 "./util/configparser.y"
+#line 2853 "./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 6065 "util/configparser.c"
+#line 6066 "util/configparser.c"
     break;
 
   case 530:
-#line 2859 "./util/configparser.y"
+#line 2860 "./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 6075 "util/configparser.c"
+#line 6076 "util/configparser.c"
     break;
 
   case 531:
-#line 2866 "./util/configparser.y"
+#line 2867 "./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 6085 "util/configparser.c"
+#line 6086 "util/configparser.c"
     break;
 
   case 532:
-#line 2873 "./util/configparser.y"
+#line 2874 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6093 "util/configparser.c"
+#line 6094 "util/configparser.c"
     break;
 
   case 554:
-#line 2893 "./util/configparser.y"
+#line 2894 "./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)
@@ -6101,11 +6102,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6105 "util/configparser.c"
+#line 6106 "util/configparser.c"
     break;
 
   case 555:
-#line 2902 "./util/configparser.y"
+#line 2903 "./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)
@@ -6114,31 +6115,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6118 "util/configparser.c"
+#line 6119 "util/configparser.c"
     break;
 
   case 556:
-#line 2912 "./util/configparser.y"
+#line 2913 "./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 6128 "util/configparser.c"
+#line 6129 "util/configparser.c"
     break;
 
   case 557:
-#line 2919 "./util/configparser.y"
+#line 2920 "./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 6138 "util/configparser.c"
+#line 6139 "util/configparser.c"
     break;
 
   case 558:
-#line 2926 "./util/configparser.y"
+#line 2927 "./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)
@@ -6146,51 +6147,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6150 "util/configparser.c"
+#line 6151 "util/configparser.c"
     break;
 
   case 559:
-#line 2935 "./util/configparser.y"
+#line 2936 "./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 6160 "util/configparser.c"
+#line 6161 "util/configparser.c"
     break;
 
   case 560:
-#line 2942 "./util/configparser.y"
+#line 2943 "./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 6170 "util/configparser.c"
+#line 6171 "util/configparser.c"
     break;
 
   case 561:
-#line 2949 "./util/configparser.y"
+#line 2950 "./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 6180 "util/configparser.c"
+#line 6181 "util/configparser.c"
     break;
 
   case 562:
-#line 2956 "./util/configparser.y"
+#line 2957 "./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 6190 "util/configparser.c"
+#line 6191 "util/configparser.c"
     break;
 
   case 563:
-#line 2963 "./util/configparser.y"
+#line 2964 "./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)
@@ -6198,11 +6199,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6202 "util/configparser.c"
+#line 6203 "util/configparser.c"
     break;
 
   case 564:
-#line 2972 "./util/configparser.y"
+#line 2973 "./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)
@@ -6210,31 +6211,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6214 "util/configparser.c"
+#line 6215 "util/configparser.c"
     break;
 
   case 565:
-#line 2981 "./util/configparser.y"
+#line 2982 "./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 6224 "util/configparser.c"
+#line 6225 "util/configparser.c"
     break;
 
   case 566:
-#line 2988 "./util/configparser.y"
+#line 2989 "./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 6234 "util/configparser.c"
+#line 6235 "util/configparser.c"
     break;
 
   case 567:
-#line 2995 "./util/configparser.y"
+#line 2996 "./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)
@@ -6243,11 +6244,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6247 "util/configparser.c"
+#line 6248 "util/configparser.c"
     break;
 
   case 568:
-#line 3005 "./util/configparser.y"
+#line 3006 "./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)
@@ -6256,11 +6257,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6260 "util/configparser.c"
+#line 6261 "util/configparser.c"
     break;
 
   case 569:
-#line 3015 "./util/configparser.y"
+#line 3016 "./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)
@@ -6269,11 +6270,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6273 "util/configparser.c"
+#line 6274 "util/configparser.c"
     break;
 
   case 570:
-#line 3025 "./util/configparser.y"
+#line 3026 "./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)
@@ -6282,11 +6283,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6286 "util/configparser.c"
+#line 6287 "util/configparser.c"
     break;
 
   case 571:
-#line 3035 "./util/configparser.y"
+#line 3036 "./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)
@@ -6295,11 +6296,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6299 "util/configparser.c"
+#line 6300 "util/configparser.c"
     break;
 
   case 572:
-#line 3045 "./util/configparser.y"
+#line 3046 "./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)
@@ -6308,47 +6309,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6312 "util/configparser.c"
+#line 6313 "util/configparser.c"
     break;
 
   case 573:
-#line 3055 "./util/configparser.y"
+#line 3056 "./util/configparser.y"
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6320 "util/configparser.c"
+#line 6321 "util/configparser.c"
     break;
 
   case 577:
-#line 3064 "./util/configparser.y"
+#line 3065 "./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 6330 "util/configparser.c"
+#line 6331 "util/configparser.c"
     break;
 
   case 578:
-#line 3070 "./util/configparser.y"
+#line 3071 "./util/configparser.y"
     { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6338 "util/configparser.c"
+#line 6339 "util/configparser.c"
     break;
 
   case 582:
-#line 3079 "./util/configparser.y"
+#line 3080 "./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 6348 "util/configparser.c"
+#line 6349 "util/configparser.c"
     break;
 
   case 583:
-#line 3085 "./util/configparser.y"
+#line 3086 "./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)
@@ -6357,21 +6358,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6361 "util/configparser.c"
+#line 6362 "util/configparser.c"
     break;
 
   case 584:
-#line 3095 "./util/configparser.y"
+#line 3096 "./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 6371 "util/configparser.c"
+#line 6372 "util/configparser.c"
     break;
 
   case 585:
-#line 3102 "./util/configparser.y"
+#line 3103 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6379,30 +6380,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6383 "util/configparser.c"
+#line 6384 "util/configparser.c"
     break;
 
   case 586:
-#line 3111 "./util/configparser.y"
+#line 3112 "./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 6394 "util/configparser.c"
+#line 6395 "util/configparser.c"
     break;
 
   case 587:
-#line 3119 "./util/configparser.y"
+#line 3120 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6402 "util/configparser.c"
+#line 6403 "util/configparser.c"
     break;
 
   case 600:
-#line 3135 "./util/configparser.y"
+#line 3136 "./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)
@@ -6410,11 +6411,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6414 "util/configparser.c"
+#line 6415 "util/configparser.c"
     break;
 
   case 601:
-#line 3145 "./util/configparser.y"
+#line 3146 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6422,21 +6423,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6426 "util/configparser.c"
+#line 6427 "util/configparser.c"
     break;
 
   case 602:
-#line 3154 "./util/configparser.y"
+#line 3155 "./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 6436 "util/configparser.c"
+#line 6437 "util/configparser.c"
     break;
 
   case 603:
-#line 3161 "./util/configparser.y"
+#line 3162 "./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)))
@@ -6444,21 +6445,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 6448 "util/configparser.c"
+#line 6449 "util/configparser.c"
     break;
 
   case 604:
-#line 3170 "./util/configparser.y"
+#line 3171 "./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 6458 "util/configparser.c"
+#line 6459 "util/configparser.c"
     break;
 
   case 605:
-#line 3177 "./util/configparser.y"
+#line 3178 "./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)))
@@ -6466,22 +6467,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 6470 "util/configparser.c"
+#line 6471 "util/configparser.c"
     break;
 
   case 606:
-#line 3186 "./util/configparser.y"
+#line 3187 "./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 6481 "util/configparser.c"
+#line 6482 "util/configparser.c"
     break;
 
   case 607:
-#line 3194 "./util/configparser.y"
+#line 3195 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6493,22 +6494,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6497 "util/configparser.c"
+#line 6498 "util/configparser.c"
     break;
 
   case 608:
-#line 3207 "./util/configparser.y"
+#line 3208 "./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 6508 "util/configparser.c"
+#line 6509 "util/configparser.c"
     break;
 
   case 609:
-#line 3215 "./util/configparser.y"
+#line 3216 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6520,19 +6521,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6524 "util/configparser.c"
+#line 6525 "util/configparser.c"
     break;
 
   case 610:
-#line 3228 "./util/configparser.y"
+#line 3229 "./util/configparser.y"
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6532 "util/configparser.c"
+#line 6533 "util/configparser.c"
     break;
 
   case 619:
-#line 3239 "./util/configparser.y"
+#line 3240 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6543,11 +6544,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6547 "util/configparser.c"
+#line 6548 "util/configparser.c"
     break;
 
   case 620:
-#line 3251 "./util/configparser.y"
+#line 3252 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6558,11 +6559,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6562 "util/configparser.c"
+#line 6563 "util/configparser.c"
     break;
 
   case 621:
-#line 3263 "./util/configparser.y"
+#line 3264 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6573,11 +6574,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6577 "util/configparser.c"
+#line 6578 "util/configparser.c"
     break;
 
   case 622:
-#line 3275 "./util/configparser.y"
+#line 3276 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6591,11 +6592,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6595 "util/configparser.c"
+#line 6596 "util/configparser.c"
     break;
 
   case 623:
-#line 3290 "./util/configparser.y"
+#line 3291 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6607,11 +6608,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6611 "util/configparser.c"
+#line 6612 "util/configparser.c"
     break;
 
   case 624:
-#line 3303 "./util/configparser.y"
+#line 3304 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6623,11 +6624,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6627 "util/configparser.c"
+#line 6628 "util/configparser.c"
     break;
 
   case 625:
-#line 3316 "./util/configparser.y"
+#line 3317 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6637,19 +6638,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6641 "util/configparser.c"
+#line 6642 "util/configparser.c"
     break;
 
   case 626:
-#line 3327 "./util/configparser.y"
+#line 3328 "./util/configparser.y"
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6649 "util/configparser.c"
+#line 6650 "util/configparser.c"
     break;
 
   case 631:
-#line 3336 "./util/configparser.y"
+#line 3337 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6663,11 +6664,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6667 "util/configparser.c"
+#line 6668 "util/configparser.c"
     break;
 
   case 632:
-#line 3351 "./util/configparser.y"
+#line 3352 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6681,11 +6682,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6685 "util/configparser.c"
+#line 6686 "util/configparser.c"
     break;
 
 
-#line 6689 "util/configparser.c"
+#line 6690 "util/configparser.c"
 
       default: break;
     }
@@ -6917,7 +6918,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3365 "./util/configparser.y"
+#line 3366 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.y b/util/configparser.y
index 4d6b5e3fb..cc965a477 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -2030,6 +2030,7 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG
 		   && strcmp($3, "always_transparent")!=0
 		   && strcmp($3, "always_refuse")!=0
 		   && strcmp($3, "always_nxdomain")!=0
+		   && strcmp($3, "always_null")!=0
 		   && strcmp($3, "noview")!=0
 		   && strcmp($3, "inform")!=0 && strcmp($3, "inform_deny")!=0
 		   && strcmp($3, "inform_redirect") != 0
@@ -2038,8 +2039,8 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG
 				"refuse, redirect, transparent, "
 				"typetransparent, inform, inform_deny, "
 				"inform_redirect, always_transparent, "
-				"always_refuse, always_nxdomain, noview "
-				", nodefault or ipset");
+				"always_refuse, always_nxdomain, always_null, "
+				"noview, nodefault or ipset");
 			free($2);
 			free($3);
 		} else if(strcmp($3, "nodefault")==0) {

From d1b92a6ce22d1eb8c3da2a6691033a07046035a7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 12 Jan 2021 13:39:07 +0100
Subject: [PATCH 162/208] - Fix so local zone types always_nodata and
 always_deny can be used   from the config file.

---
 doc/Changelog       |   2 +
 doc/example.conf.in |   5 +-
 util/configparser.c | 559 ++++++++++++++++++++++----------------------
 util/configparser.y |   5 +-
 4 files changed, 290 insertions(+), 281 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 2cd7baf00..b9d449371 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 12 January 2021: Wouter
 	- Fix #397: [Feature request] add new type always_null to local-zone
 	  similar to always_nxdomain.
+	- Fix so local zone types always_nodata and always_deny can be used
+	  from the config file.
 
 8 January 2021: Wouter
 	- Merge PR #391 from fhriley: Add start_time to reply callbacks so
diff --git a/doc/example.conf.in b/doc/example.conf.in
index c3c7c0f26..b51bcfca5 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -704,8 +704,9 @@ server:
 	# o inform acts like transparent, but logs client IP address
 	# o inform_deny drops queries and logs client IP address
 	# o inform_redirect redirects queries and logs client IP address
-	# o always_transparent, always_refuse, always_nxdomain, resolve in
-	#   that way but ignore local data for that name
+	# o always_transparent, always_refuse, always_nxdomain, always_nodata,
+	#   always_deny resolve in that way but ignore local data for
+	#   that name
 	# o always_null returns 0.0.0.0 or ::0 for any name in the zone.
 	# o noview breaks out of that view towards global local-zones.
 	#
diff --git a/util/configparser.c b/util/configparser.c
index cc5d9fb5e..c8ea478ea 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1125,26 +1125,26 @@ static const yytype_uint16 yyrline[] =
     1680,  1689,  1698,  1707,  1714,  1724,  1744,  1751,  1769,  1782,
     1795,  1804,  1813,  1822,  1831,  1841,  1851,  1862,  1871,  1880,
     1889,  1898,  1907,  1916,  1929,  1942,  1951,  1958,  1967,  1976,
-    1985,  1994,  2002,  2015,  2023,  2065,  2072,  2087,  2097,  2107,
-    2114,  2121,  2128,  2137,  2145,  2159,  2180,  2201,  2213,  2225,
-    2237,  2246,  2267,  2277,  2286,  2294,  2302,  2315,  2328,  2343,
-    2358,  2367,  2376,  2382,  2391,  2400,  2410,  2420,  2433,  2446,
-    2458,  2472,  2484,  2498,  2507,  2519,  2529,  2536,  2543,  2552,
-    2561,  2571,  2581,  2591,  2598,  2605,  2614,  2623,  2633,  2643,
-    2650,  2657,  2664,  2672,  2682,  2692,  2702,  2712,  2751,  2761,
-    2769,  2777,  2792,  2801,  2806,  2807,  2808,  2808,  2808,  2809,
-    2809,  2809,  2810,  2810,  2812,  2822,  2831,  2838,  2845,  2852,
-    2859,  2866,  2873,  2878,  2879,  2880,  2880,  2880,  2881,  2881,
-    2881,  2882,  2883,  2883,  2884,  2884,  2885,  2885,  2886,  2887,
-    2888,  2889,  2890,  2891,  2893,  2902,  2912,  2919,  2926,  2935,
-    2942,  2949,  2956,  2963,  2972,  2981,  2988,  2995,  3005,  3015,
-    3025,  3035,  3045,  3055,  3060,  3061,  3062,  3064,  3070,  3075,
-    3076,  3077,  3079,  3085,  3095,  3102,  3111,  3119,  3124,  3125,
-    3127,  3127,  3127,  3128,  3128,  3129,  3130,  3131,  3132,  3133,
-    3135,  3145,  3154,  3161,  3170,  3177,  3186,  3194,  3207,  3215,
-    3228,  3233,  3234,  3235,  3235,  3236,  3236,  3236,  3237,  3239,
-    3251,  3263,  3275,  3290,  3303,  3316,  3327,  3332,  3333,  3334,
-    3334,  3336,  3351
+    1985,  1994,  2002,  2015,  2023,  2068,  2075,  2090,  2100,  2110,
+    2117,  2124,  2131,  2140,  2148,  2162,  2183,  2204,  2216,  2228,
+    2240,  2249,  2270,  2280,  2289,  2297,  2305,  2318,  2331,  2346,
+    2361,  2370,  2379,  2385,  2394,  2403,  2413,  2423,  2436,  2449,
+    2461,  2475,  2487,  2501,  2510,  2522,  2532,  2539,  2546,  2555,
+    2564,  2574,  2584,  2594,  2601,  2608,  2617,  2626,  2636,  2646,
+    2653,  2660,  2667,  2675,  2685,  2695,  2705,  2715,  2754,  2764,
+    2772,  2780,  2795,  2804,  2809,  2810,  2811,  2811,  2811,  2812,
+    2812,  2812,  2813,  2813,  2815,  2825,  2834,  2841,  2848,  2855,
+    2862,  2869,  2876,  2881,  2882,  2883,  2883,  2883,  2884,  2884,
+    2884,  2885,  2886,  2886,  2887,  2887,  2888,  2888,  2889,  2890,
+    2891,  2892,  2893,  2894,  2896,  2905,  2915,  2922,  2929,  2938,
+    2945,  2952,  2959,  2966,  2975,  2984,  2991,  2998,  3008,  3018,
+    3028,  3038,  3048,  3058,  3063,  3064,  3065,  3067,  3073,  3078,
+    3079,  3080,  3082,  3088,  3098,  3105,  3114,  3122,  3127,  3128,
+    3130,  3130,  3130,  3131,  3131,  3132,  3133,  3134,  3135,  3136,
+    3138,  3148,  3157,  3164,  3173,  3180,  3189,  3197,  3210,  3218,
+    3231,  3236,  3237,  3238,  3238,  3239,  3239,  3239,  3240,  3242,
+    3254,  3266,  3278,  3293,  3306,  3319,  3330,  3335,  3336,  3337,
+    3337,  3339,  3354
 };
 #endif
 
@@ -5019,6 +5019,8 @@ yyreduce:
 		   && strcmp((yyvsp[0].str), "always_transparent")!=0
 		   && strcmp((yyvsp[0].str), "always_refuse")!=0
 		   && strcmp((yyvsp[0].str), "always_nxdomain")!=0
+		   && strcmp((yyvsp[0].str), "always_nodata")!=0
+		   && strcmp((yyvsp[0].str), "always_deny")!=0
 		   && strcmp((yyvsp[0].str), "always_null")!=0
 		   && strcmp((yyvsp[0].str), "noview")!=0
 		   && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0
@@ -5028,7 +5030,8 @@ yyreduce:
 				"refuse, redirect, transparent, "
 				"typetransparent, inform, inform_deny, "
 				"inform_redirect, always_transparent, "
-				"always_refuse, always_nxdomain, always_null, "
+				"always_refuse, always_nxdomain, "
+				"always_nodata, always_deny, always_null, "
 				"noview, nodefault or ipset");
 			free((yyvsp[-1].str));
 			free((yyvsp[0].str));
@@ -5050,21 +5053,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5054 "util/configparser.c"
+#line 5057 "util/configparser.c"
     break;
 
   case 445:
-#line 2066 "./util/configparser.y"
+#line 2069 "./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 5064 "util/configparser.c"
+#line 5067 "util/configparser.c"
     break;
 
   case 446:
-#line 2073 "./util/configparser.y"
+#line 2076 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5078,11 +5081,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5082 "util/configparser.c"
+#line 5085 "util/configparser.c"
     break;
 
   case 447:
-#line 2088 "./util/configparser.y"
+#line 2091 "./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)
@@ -5091,11 +5094,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5095 "util/configparser.c"
+#line 5098 "util/configparser.c"
     break;
 
   case 448:
-#line 2098 "./util/configparser.y"
+#line 2101 "./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)
@@ -5104,41 +5107,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5108 "util/configparser.c"
+#line 5111 "util/configparser.c"
     break;
 
   case 449:
-#line 2108 "./util/configparser.y"
+#line 2111 "./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 5118 "util/configparser.c"
+#line 5121 "util/configparser.c"
     break;
 
   case 450:
-#line 2115 "./util/configparser.y"
+#line 2118 "./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 5128 "util/configparser.c"
+#line 5131 "util/configparser.c"
     break;
 
   case 451:
-#line 2122 "./util/configparser.y"
+#line 2125 "./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 5138 "util/configparser.c"
+#line 5141 "util/configparser.c"
     break;
 
   case 452:
-#line 2129 "./util/configparser.y"
+#line 2132 "./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)
@@ -5146,22 +5149,22 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5150 "util/configparser.c"
+#line 5153 "util/configparser.c"
     break;
 
   case 453:
-#line 2138 "./util/configparser.y"
+#line 2141 "./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 5161 "util/configparser.c"
+#line 5164 "util/configparser.c"
     break;
 
   case 454:
-#line 2146 "./util/configparser.y"
+#line 2149 "./util/configparser.y"
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -5174,11 +5177,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5178 "util/configparser.c"
+#line 5181 "util/configparser.c"
     break;
 
   case 455:
-#line 2160 "./util/configparser.y"
+#line 2163 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5198,11 +5201,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5202 "util/configparser.c"
+#line 5205 "util/configparser.c"
     break;
 
   case 456:
-#line 2181 "./util/configparser.y"
+#line 2184 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5222,11 +5225,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5226 "util/configparser.c"
+#line 5229 "util/configparser.c"
     break;
 
   case 457:
-#line 2202 "./util/configparser.y"
+#line 2205 "./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,
@@ -5237,11 +5240,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5241 "util/configparser.c"
+#line 5244 "util/configparser.c"
     break;
 
   case 458:
-#line 2214 "./util/configparser.y"
+#line 2217 "./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,
@@ -5252,11 +5255,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5256 "util/configparser.c"
+#line 5259 "util/configparser.c"
     break;
 
   case 459:
-#line 2226 "./util/configparser.y"
+#line 2229 "./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,
@@ -5267,11 +5270,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 5271 "util/configparser.c"
+#line 5274 "util/configparser.c"
     break;
 
   case 460:
-#line 2238 "./util/configparser.y"
+#line 2241 "./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,
@@ -5279,11 +5282,11 @@ yyreduce:
 			yyerror("out of memory");
 		}
 	}
-#line 5283 "util/configparser.c"
+#line 5286 "util/configparser.c"
     break;
 
   case 461:
-#line 2247 "./util/configparser.y"
+#line 2250 "./util/configparser.y"
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5303,11 +5306,11 @@ yyreduce:
 			}
 		}
 	}
-#line 5307 "util/configparser.c"
+#line 5310 "util/configparser.c"
     break;
 
   case 462:
-#line 2268 "./util/configparser.y"
+#line 2271 "./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)
@@ -5315,11 +5318,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5319 "util/configparser.c"
+#line 5322 "util/configparser.c"
     break;
 
   case 463:
-#line 2278 "./util/configparser.y"
+#line 2281 "./util/configparser.y"
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5327,33 +5330,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5331 "util/configparser.c"
+#line 5334 "util/configparser.c"
     break;
 
   case 464:
-#line 2287 "./util/configparser.y"
+#line 2290 "./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 5342 "util/configparser.c"
+#line 5345 "util/configparser.c"
     break;
 
   case 465:
-#line 2295 "./util/configparser.y"
+#line 2298 "./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 5353 "util/configparser.c"
+#line 5356 "util/configparser.c"
     break;
 
   case 466:
-#line 2303 "./util/configparser.y"
+#line 2306 "./util/configparser.y"
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5365,11 +5368,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5369 "util/configparser.c"
+#line 5372 "util/configparser.c"
     break;
 
   case 467:
-#line 2316 "./util/configparser.y"
+#line 2319 "./util/configparser.y"
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5381,11 +5384,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 5385 "util/configparser.c"
+#line 5388 "util/configparser.c"
     break;
 
   case 468:
-#line 2329 "./util/configparser.y"
+#line 2332 "./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) {
@@ -5399,11 +5402,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 5403 "util/configparser.c"
+#line 5406 "util/configparser.c"
     break;
 
   case 469:
-#line 2344 "./util/configparser.y"
+#line 2347 "./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) {
@@ -5417,11 +5420,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 5421 "util/configparser.c"
+#line 5424 "util/configparser.c"
     break;
 
   case 470:
-#line 2359 "./util/configparser.y"
+#line 2362 "./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)
@@ -5429,11 +5432,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 5433 "util/configparser.c"
+#line 5436 "util/configparser.c"
     break;
 
   case 471:
-#line 2368 "./util/configparser.y"
+#line 2371 "./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)
@@ -5441,20 +5444,20 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5445 "util/configparser.c"
+#line 5448 "util/configparser.c"
     break;
 
   case 472:
-#line 2377 "./util/configparser.y"
+#line 2380 "./util/configparser.y"
     { 
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5454 "util/configparser.c"
+#line 5457 "util/configparser.c"
     break;
 
   case 473:
-#line 2383 "./util/configparser.y"
+#line 2386 "./util/configparser.y"
     { 
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5462,11 +5465,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5466 "util/configparser.c"
+#line 5469 "util/configparser.c"
     break;
 
   case 474:
-#line 2392 "./util/configparser.y"
+#line 2395 "./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)
@@ -5474,11 +5477,11 @@ yyreduce:
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5478 "util/configparser.c"
+#line 5481 "util/configparser.c"
     break;
 
   case 475:
-#line 2401 "./util/configparser.y"
+#line 2404 "./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)
@@ -5487,11 +5490,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5491 "util/configparser.c"
+#line 5494 "util/configparser.c"
     break;
 
   case 476:
-#line 2411 "./util/configparser.y"
+#line 2414 "./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)
@@ -5500,11 +5503,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5504 "util/configparser.c"
+#line 5507 "util/configparser.c"
     break;
 
   case 477:
-#line 2421 "./util/configparser.y"
+#line 2424 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5516,11 +5519,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5520 "util/configparser.c"
+#line 5523 "util/configparser.c"
     break;
 
   case 478:
-#line 2434 "./util/configparser.y"
+#line 2437 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5532,11 +5535,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5536 "util/configparser.c"
+#line 5539 "util/configparser.c"
     break;
 
   case 479:
-#line 2447 "./util/configparser.y"
+#line 2450 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5547,11 +5550,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5551 "util/configparser.c"
+#line 5554 "util/configparser.c"
     break;
 
   case 480:
-#line 2459 "./util/configparser.y"
+#line 2462 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5564,11 +5567,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5568 "util/configparser.c"
+#line 5571 "util/configparser.c"
     break;
 
   case 481:
-#line 2473 "./util/configparser.y"
+#line 2476 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5579,11 +5582,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5583 "util/configparser.c"
+#line 5586 "util/configparser.c"
     break;
 
   case 482:
-#line 2485 "./util/configparser.y"
+#line 2488 "./util/configparser.y"
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5596,11 +5599,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5600 "util/configparser.c"
+#line 5603 "util/configparser.c"
     break;
 
   case 483:
-#line 2499 "./util/configparser.y"
+#line 2502 "./util/configparser.y"
     {
 		OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(
@@ -5608,11 +5611,11 @@ yyreduce:
 			fatal_exit("out of memory adding "
 				"edns-client-string");
 	}
-#line 5612 "util/configparser.c"
+#line 5615 "util/configparser.c"
     break;
 
   case 484:
-#line 2508 "./util/configparser.y"
+#line 2511 "./util/configparser.y"
     {
 		OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5623,11 +5626,11 @@ yyreduce:
 		free((yyvsp[0].str));
 
 	}
-#line 5627 "util/configparser.c"
+#line 5630 "util/configparser.c"
     break;
 
   case 485:
-#line 2520 "./util/configparser.y"
+#line 2523 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5636,31 +5639,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 5640 "util/configparser.c"
+#line 5643 "util/configparser.c"
     break;
 
   case 486:
-#line 2530 "./util/configparser.y"
+#line 2533 "./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 5650 "util/configparser.c"
+#line 5653 "util/configparser.c"
     break;
 
   case 487:
-#line 2537 "./util/configparser.y"
+#line 2540 "./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 5660 "util/configparser.c"
+#line 5663 "util/configparser.c"
     break;
 
   case 488:
-#line 2544 "./util/configparser.y"
+#line 2547 "./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)
@@ -5668,11 +5671,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5672 "util/configparser.c"
+#line 5675 "util/configparser.c"
     break;
 
   case 489:
-#line 2553 "./util/configparser.y"
+#line 2556 "./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)
@@ -5680,11 +5683,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5684 "util/configparser.c"
+#line 5687 "util/configparser.c"
     break;
 
   case 490:
-#line 2562 "./util/configparser.y"
+#line 2565 "./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)
@@ -5693,11 +5696,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5697 "util/configparser.c"
+#line 5700 "util/configparser.c"
     break;
 
   case 491:
-#line 2572 "./util/configparser.y"
+#line 2575 "./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)
@@ -5706,11 +5709,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5710 "util/configparser.c"
+#line 5713 "util/configparser.c"
     break;
 
   case 492:
-#line 2582 "./util/configparser.y"
+#line 2585 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -5719,31 +5722,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 5723 "util/configparser.c"
+#line 5726 "util/configparser.c"
     break;
 
   case 493:
-#line 2592 "./util/configparser.y"
+#line 2595 "./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 5733 "util/configparser.c"
+#line 5736 "util/configparser.c"
     break;
 
   case 494:
-#line 2599 "./util/configparser.y"
+#line 2602 "./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 5743 "util/configparser.c"
+#line 5746 "util/configparser.c"
     break;
 
   case 495:
-#line 2606 "./util/configparser.y"
+#line 2609 "./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)
@@ -5751,11 +5754,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5755 "util/configparser.c"
+#line 5758 "util/configparser.c"
     break;
 
   case 496:
-#line 2615 "./util/configparser.y"
+#line 2618 "./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)
@@ -5763,11 +5766,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5767 "util/configparser.c"
+#line 5770 "util/configparser.c"
     break;
 
   case 497:
-#line 2624 "./util/configparser.y"
+#line 2627 "./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)
@@ -5776,11 +5779,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5780 "util/configparser.c"
+#line 5783 "util/configparser.c"
     break;
 
   case 498:
-#line 2634 "./util/configparser.y"
+#line 2637 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -5789,52 +5792,52 @@ yyreduce:
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 5793 "util/configparser.c"
+#line 5796 "util/configparser.c"
     break;
 
   case 499:
-#line 2644 "./util/configparser.y"
+#line 2647 "./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 5803 "util/configparser.c"
+#line 5806 "util/configparser.c"
     break;
 
   case 500:
-#line 2651 "./util/configparser.y"
+#line 2654 "./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 5813 "util/configparser.c"
+#line 5816 "util/configparser.c"
     break;
 
   case 501:
-#line 2658 "./util/configparser.y"
+#line 2661 "./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 5823 "util/configparser.c"
+#line 5826 "util/configparser.c"
     break;
 
   case 502:
-#line 2665 "./util/configparser.y"
+#line 2668 "./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 5834 "util/configparser.c"
+#line 5837 "util/configparser.c"
     break;
 
   case 503:
-#line 2673 "./util/configparser.y"
+#line 2676 "./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)
@@ -5843,11 +5846,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5847 "util/configparser.c"
+#line 5850 "util/configparser.c"
     break;
 
   case 504:
-#line 2683 "./util/configparser.y"
+#line 2686 "./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)
@@ -5856,11 +5859,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5860 "util/configparser.c"
+#line 5863 "util/configparser.c"
     break;
 
   case 505:
-#line 2693 "./util/configparser.y"
+#line 2696 "./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)
@@ -5869,11 +5872,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5873 "util/configparser.c"
+#line 5876 "util/configparser.c"
     break;
 
   case 506:
-#line 2703 "./util/configparser.y"
+#line 2706 "./util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -5882,11 +5885,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 5886 "util/configparser.c"
+#line 5889 "util/configparser.c"
     break;
 
   case 507:
-#line 2713 "./util/configparser.y"
+#line 2716 "./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 &&
@@ -5924,11 +5927,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5928 "util/configparser.c"
+#line 5931 "util/configparser.c"
     break;
 
   case 508:
-#line 2752 "./util/configparser.y"
+#line 2755 "./util/configparser.y"
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5937,33 +5940,33 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 5941 "util/configparser.c"
+#line 5944 "util/configparser.c"
     break;
 
   case 509:
-#line 2762 "./util/configparser.y"
+#line 2765 "./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 5952 "util/configparser.c"
+#line 5955 "util/configparser.c"
     break;
 
   case 510:
-#line 2770 "./util/configparser.y"
+#line 2773 "./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 5963 "util/configparser.c"
+#line 5966 "util/configparser.c"
     break;
 
   case 511:
-#line 2778 "./util/configparser.y"
+#line 2781 "./util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5977,11 +5980,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5981 "util/configparser.c"
+#line 5984 "util/configparser.c"
     break;
 
   case 512:
-#line 2793 "./util/configparser.y"
+#line 2796 "./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)
@@ -5989,19 +5992,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5993 "util/configparser.c"
+#line 5996 "util/configparser.c"
     break;
 
   case 513:
-#line 2802 "./util/configparser.y"
+#line 2805 "./util/configparser.y"
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 6001 "util/configparser.c"
+#line 6004 "util/configparser.c"
     break;
 
   case 524:
-#line 2813 "./util/configparser.y"
+#line 2816 "./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)
@@ -6010,11 +6013,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6014 "util/configparser.c"
+#line 6017 "util/configparser.c"
     break;
 
   case 525:
-#line 2823 "./util/configparser.y"
+#line 2826 "./util/configparser.y"
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6022,79 +6025,79 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6026 "util/configparser.c"
+#line 6029 "util/configparser.c"
     break;
 
   case 526:
-#line 2832 "./util/configparser.y"
+#line 2835 "./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 6036 "util/configparser.c"
+#line 6039 "util/configparser.c"
     break;
 
   case 527:
-#line 2839 "./util/configparser.y"
+#line 2842 "./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 6046 "util/configparser.c"
+#line 6049 "util/configparser.c"
     break;
 
   case 528:
-#line 2846 "./util/configparser.y"
+#line 2849 "./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 6056 "util/configparser.c"
+#line 6059 "util/configparser.c"
     break;
 
   case 529:
-#line 2853 "./util/configparser.y"
+#line 2856 "./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 6066 "util/configparser.c"
+#line 6069 "util/configparser.c"
     break;
 
   case 530:
-#line 2860 "./util/configparser.y"
+#line 2863 "./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 6076 "util/configparser.c"
+#line 6079 "util/configparser.c"
     break;
 
   case 531:
-#line 2867 "./util/configparser.y"
+#line 2870 "./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 6086 "util/configparser.c"
+#line 6089 "util/configparser.c"
     break;
 
   case 532:
-#line 2874 "./util/configparser.y"
+#line 2877 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 6094 "util/configparser.c"
+#line 6097 "util/configparser.c"
     break;
 
   case 554:
-#line 2894 "./util/configparser.y"
+#line 2897 "./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)
@@ -6102,11 +6105,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6106 "util/configparser.c"
+#line 6109 "util/configparser.c"
     break;
 
   case 555:
-#line 2903 "./util/configparser.y"
+#line 2906 "./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)
@@ -6115,31 +6118,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6119 "util/configparser.c"
+#line 6122 "util/configparser.c"
     break;
 
   case 556:
-#line 2913 "./util/configparser.y"
+#line 2916 "./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 6129 "util/configparser.c"
+#line 6132 "util/configparser.c"
     break;
 
   case 557:
-#line 2920 "./util/configparser.y"
+#line 2923 "./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 6139 "util/configparser.c"
+#line 6142 "util/configparser.c"
     break;
 
   case 558:
-#line 2927 "./util/configparser.y"
+#line 2930 "./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)
@@ -6147,51 +6150,51 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6151 "util/configparser.c"
+#line 6154 "util/configparser.c"
     break;
 
   case 559:
-#line 2936 "./util/configparser.y"
+#line 2939 "./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 6161 "util/configparser.c"
+#line 6164 "util/configparser.c"
     break;
 
   case 560:
-#line 2943 "./util/configparser.y"
+#line 2946 "./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 6171 "util/configparser.c"
+#line 6174 "util/configparser.c"
     break;
 
   case 561:
-#line 2950 "./util/configparser.y"
+#line 2953 "./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 6181 "util/configparser.c"
+#line 6184 "util/configparser.c"
     break;
 
   case 562:
-#line 2957 "./util/configparser.y"
+#line 2960 "./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 6191 "util/configparser.c"
+#line 6194 "util/configparser.c"
     break;
 
   case 563:
-#line 2964 "./util/configparser.y"
+#line 2967 "./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)
@@ -6199,11 +6202,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6203 "util/configparser.c"
+#line 6206 "util/configparser.c"
     break;
 
   case 564:
-#line 2973 "./util/configparser.y"
+#line 2976 "./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)
@@ -6211,31 +6214,31 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6215 "util/configparser.c"
+#line 6218 "util/configparser.c"
     break;
 
   case 565:
-#line 2982 "./util/configparser.y"
+#line 2985 "./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 6225 "util/configparser.c"
+#line 6228 "util/configparser.c"
     break;
 
   case 566:
-#line 2989 "./util/configparser.y"
+#line 2992 "./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 6235 "util/configparser.c"
+#line 6238 "util/configparser.c"
     break;
 
   case 567:
-#line 2996 "./util/configparser.y"
+#line 2999 "./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)
@@ -6244,11 +6247,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6248 "util/configparser.c"
+#line 6251 "util/configparser.c"
     break;
 
   case 568:
-#line 3006 "./util/configparser.y"
+#line 3009 "./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)
@@ -6257,11 +6260,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6261 "util/configparser.c"
+#line 6264 "util/configparser.c"
     break;
 
   case 569:
-#line 3016 "./util/configparser.y"
+#line 3019 "./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)
@@ -6270,11 +6273,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6274 "util/configparser.c"
+#line 6277 "util/configparser.c"
     break;
 
   case 570:
-#line 3026 "./util/configparser.y"
+#line 3029 "./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)
@@ -6283,11 +6286,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6287 "util/configparser.c"
+#line 6290 "util/configparser.c"
     break;
 
   case 571:
-#line 3036 "./util/configparser.y"
+#line 3039 "./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)
@@ -6296,11 +6299,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6300 "util/configparser.c"
+#line 6303 "util/configparser.c"
     break;
 
   case 572:
-#line 3046 "./util/configparser.y"
+#line 3049 "./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)
@@ -6309,47 +6312,47 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6313 "util/configparser.c"
+#line 6316 "util/configparser.c"
     break;
 
   case 573:
-#line 3056 "./util/configparser.y"
+#line 3059 "./util/configparser.y"
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 6321 "util/configparser.c"
+#line 6324 "util/configparser.c"
     break;
 
   case 577:
-#line 3065 "./util/configparser.y"
+#line 3068 "./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 6331 "util/configparser.c"
+#line 6334 "util/configparser.c"
     break;
 
   case 578:
-#line 3071 "./util/configparser.y"
+#line 3074 "./util/configparser.y"
     { 
 		OUTYY(("\nP(dynlib:)\n")); 
 	}
-#line 6339 "util/configparser.c"
+#line 6342 "util/configparser.c"
     break;
 
   case 582:
-#line 3080 "./util/configparser.y"
+#line 3083 "./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 6349 "util/configparser.c"
+#line 6352 "util/configparser.c"
     break;
 
   case 583:
-#line 3086 "./util/configparser.y"
+#line 3089 "./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)
@@ -6358,21 +6361,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6362 "util/configparser.c"
+#line 6365 "util/configparser.c"
     break;
 
   case 584:
-#line 3096 "./util/configparser.y"
+#line 3099 "./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 6372 "util/configparser.c"
+#line 6375 "util/configparser.c"
     break;
 
   case 585:
-#line 3103 "./util/configparser.y"
+#line 3106 "./util/configparser.y"
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6380,30 +6383,30 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6384 "util/configparser.c"
+#line 6387 "util/configparser.c"
     break;
 
   case 586:
-#line 3112 "./util/configparser.y"
+#line 3115 "./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 6395 "util/configparser.c"
+#line 6398 "util/configparser.c"
     break;
 
   case 587:
-#line 3120 "./util/configparser.y"
+#line 3123 "./util/configparser.y"
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 6403 "util/configparser.c"
+#line 6406 "util/configparser.c"
     break;
 
   case 600:
-#line 3136 "./util/configparser.y"
+#line 3139 "./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)
@@ -6411,11 +6414,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6415 "util/configparser.c"
+#line 6418 "util/configparser.c"
     break;
 
   case 601:
-#line 3146 "./util/configparser.y"
+#line 3149 "./util/configparser.y"
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6423,21 +6426,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6427 "util/configparser.c"
+#line 6430 "util/configparser.c"
     break;
 
   case 602:
-#line 3155 "./util/configparser.y"
+#line 3158 "./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 6437 "util/configparser.c"
+#line 6440 "util/configparser.c"
     break;
 
   case 603:
-#line 3162 "./util/configparser.y"
+#line 3165 "./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)))
@@ -6445,21 +6448,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 6449 "util/configparser.c"
+#line 6452 "util/configparser.c"
     break;
 
   case 604:
-#line 3171 "./util/configparser.y"
+#line 3174 "./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 6459 "util/configparser.c"
+#line 6462 "util/configparser.c"
     break;
 
   case 605:
-#line 3178 "./util/configparser.y"
+#line 3181 "./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)))
@@ -6467,22 +6470,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 6471 "util/configparser.c"
+#line 6474 "util/configparser.c"
     break;
 
   case 606:
-#line 3187 "./util/configparser.y"
+#line 3190 "./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 6482 "util/configparser.c"
+#line 6485 "util/configparser.c"
     break;
 
   case 607:
-#line 3195 "./util/configparser.y"
+#line 3198 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6494,22 +6497,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6498 "util/configparser.c"
+#line 6501 "util/configparser.c"
     break;
 
   case 608:
-#line 3208 "./util/configparser.y"
+#line 3211 "./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 6509 "util/configparser.c"
+#line 6512 "util/configparser.c"
     break;
 
   case 609:
-#line 3216 "./util/configparser.y"
+#line 3219 "./util/configparser.y"
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -6521,19 +6524,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 6525 "util/configparser.c"
+#line 6528 "util/configparser.c"
     break;
 
   case 610:
-#line 3229 "./util/configparser.y"
+#line 3232 "./util/configparser.y"
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 6533 "util/configparser.c"
+#line 6536 "util/configparser.c"
     break;
 
   case 619:
-#line 3240 "./util/configparser.y"
+#line 3243 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6544,11 +6547,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6548 "util/configparser.c"
+#line 6551 "util/configparser.c"
     break;
 
   case 620:
-#line 3252 "./util/configparser.y"
+#line 3255 "./util/configparser.y"
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6559,11 +6562,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6563 "util/configparser.c"
+#line 6566 "util/configparser.c"
     break;
 
   case 621:
-#line 3264 "./util/configparser.y"
+#line 3267 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -6574,11 +6577,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6578 "util/configparser.c"
+#line 6581 "util/configparser.c"
     break;
 
   case 622:
-#line 3276 "./util/configparser.y"
+#line 3279 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -6592,11 +6595,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6596 "util/configparser.c"
+#line 6599 "util/configparser.c"
     break;
 
   case 623:
-#line 3291 "./util/configparser.y"
+#line 3294 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -6608,11 +6611,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6612 "util/configparser.c"
+#line 6615 "util/configparser.c"
     break;
 
   case 624:
-#line 3304 "./util/configparser.y"
+#line 3307 "./util/configparser.y"
     {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -6624,11 +6627,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 6628 "util/configparser.c"
+#line 6631 "util/configparser.c"
     break;
 
   case 625:
-#line 3317 "./util/configparser.y"
+#line 3320 "./util/configparser.y"
     {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -6638,19 +6641,19 @@ yyreduce:
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 6642 "util/configparser.c"
+#line 6645 "util/configparser.c"
     break;
 
   case 626:
-#line 3328 "./util/configparser.y"
+#line 3331 "./util/configparser.y"
     {
 			OUTYY(("\nP(ipset:)\n"));
 		}
-#line 6650 "util/configparser.c"
+#line 6653 "util/configparser.c"
     break;
 
   case 631:
-#line 3337 "./util/configparser.y"
+#line 3340 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -6664,11 +6667,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6668 "util/configparser.c"
+#line 6671 "util/configparser.c"
     break;
 
   case 632:
-#line 3352 "./util/configparser.y"
+#line 3355 "./util/configparser.y"
     {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -6682,11 +6685,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 6686 "util/configparser.c"
+#line 6689 "util/configparser.c"
     break;
 
 
-#line 6690 "util/configparser.c"
+#line 6693 "util/configparser.c"
 
       default: break;
     }
@@ -6918,7 +6921,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 3366 "./util/configparser.y"
+#line 3369 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.y b/util/configparser.y
index cc965a477..32419593a 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -2030,6 +2030,8 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG
 		   && strcmp($3, "always_transparent")!=0
 		   && strcmp($3, "always_refuse")!=0
 		   && strcmp($3, "always_nxdomain")!=0
+		   && strcmp($3, "always_nodata")!=0
+		   && strcmp($3, "always_deny")!=0
 		   && strcmp($3, "always_null")!=0
 		   && strcmp($3, "noview")!=0
 		   && strcmp($3, "inform")!=0 && strcmp($3, "inform_deny")!=0
@@ -2039,7 +2041,8 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG
 				"refuse, redirect, transparent, "
 				"typetransparent, inform, inform_deny, "
 				"inform_redirect, always_transparent, "
-				"always_refuse, always_nxdomain, always_null, "
+				"always_refuse, always_nxdomain, "
+				"always_nodata, always_deny, always_null, "
 				"noview, nodefault or ipset");
 			free($2);
 			free($3);

From 4d1d8b4cddfde95d50bf3a4f5dcfe36f652c2f58 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 12 Jan 2021 13:40:45 +0100
Subject: [PATCH 163/208] And man page documentation for them.

---
 doc/unbound.conf.5.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 4eeb41bf9..e7964d969 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1305,6 +1305,12 @@ Like refuse, but ignores local data and refuses the query.
 \h'5'\fIalways_nxdomain\fR
 Like static, but ignores local data and returns nxdomain for the query.
 .TP 10
+\h'5'\fIalways_nodata\fR
+Like static, but ignores local data and returns nodata for the query.
+.TP 10
+\h'5'\fIalways_deny\fR
+Like deny, but ignores local data and drops the query.
+.TP 10
 \h'5'\fIalways_null\fR
 Always returns 0.0.0.0 or ::0 for every name in the zone.  Like redirect
 with zero data for A and AAAA.  Ignores local data in the zone.  Used for

From 93e5705259d4ebc4131b46ffee4e68163d171f04 Mon Sep 17 00:00:00 2001
From: xiangbao227 <1004129700@qq.com>
Date: Wed, 13 Jan 2021 10:33:41 +0800
Subject: [PATCH 164/208] I found that in function lruhash_remove, table was
 locked at first ,then lru_remove the entry , then unlock the table, and then
 markdel entry , but in function rrset_cache_touch , the entry will be touched
 to lru again before markdelling entry in function lruhash_remove. This is a
 bug!

---
 util/storage/lruhash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/storage/lruhash.c b/util/storage/lruhash.c
index 0003ff491..3500a4ef0 100644
--- a/util/storage/lruhash.c
+++ b/util/storage/lruhash.c
@@ -398,13 +398,13 @@ lruhash_remove(struct lruhash* table, hashvalue_type hash, void* key)
 		return;
 	}
 	table->num--;
-	table->space_used -= (*table->sizefunc)(entry->key, entry->data);
-	lock_quick_unlock(&table->lock);
+	table->space_used -= (*table->sizefunc)(entry->key, entry->data);	
 	lock_rw_wrlock(&entry->lock);
 	if(table->markdelfunc)
 		(*table->markdelfunc)(entry->key);
 	lock_rw_unlock(&entry->lock);
 	lock_quick_unlock(&bin->lock);
+	lock_quick_unlock(&table->lock);
 	/* finish removal */
 	d = entry->data;
 	(*table->delkeyfunc)(entry->key, table->cb_arg);

From 24fd871245b7520f23dcfdcbf420de1798c12cdf Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 13 Jan 2021 10:07:15 +0100
Subject: [PATCH 165/208] Changelog note for #399 - Merge #399 from
 xiangbao227: The function rrset_cache_touch can   touch an entry to the lru
 while markdelling the entry in   lruhash_remove.

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

diff --git a/doc/Changelog b/doc/Changelog
index b9d449371..c57e43179 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+13 January 2021: Wouter
+	- Merge #399 from xiangbao227: The function rrset_cache_touch can
+	  touch an entry to the lru while markdelling the entry in
+	  lruhash_remove.
+
 12 January 2021: Wouter
 	- Fix #397: [Feature request] add new type always_null to local-zone
 	  similar to always_nxdomain.

From 5314f633430b87816038531aeb903eeb302fc505 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 13 Jan 2021 10:10:12 +0100
Subject: [PATCH 166/208] Nicer changelog note for #399 - Merge #399 from
 xiangbao227: The lock of lruhash table should   unlocked after markdel entry.

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

diff --git a/doc/Changelog b/doc/Changelog
index c57e43179..ce922f6fc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,7 +1,6 @@
 13 January 2021: Wouter
-	- Merge #399 from xiangbao227: The function rrset_cache_touch can
-	  touch an entry to the lru while markdelling the entry in
-	  lruhash_remove.
+	- Merge #399 from xiangbao227: The lock of lruhash table should
+	  unlocked after markdel entry.
 
 12 January 2021: Wouter
 	- Fix #397: [Feature request] add new type always_null to local-zone

From 3b82e690efc83a96c9e559750fc4576034ad2ea7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 13 Jan 2021 14:56:25 +0100
Subject: [PATCH 167/208] - Fix for #93: dynlibmodule link fix for Windows.

---
 Makefile.in   | 24 ++++++++++++------------
 doc/Changelog |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4ca46496b..99943a650 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -349,10 +349,10 @@ unbound$(EXEEXT):	$(DAEMON_OBJ_LINK) libunbound.la
 	$(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
 
 unbound-checkconf$(EXEEXT):	$(CHECKCONF_OBJ_LINK) libunbound.la
-	$(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
 
 unbound-control$(EXEEXT):	$(CONTROL_OBJ_LINK) libunbound.la
-	$(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
 
 unbound-host$(EXEEXT):	$(HOST_OBJ_LINK) libunbound.la
 	$(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(SSLLIB) $(LIBS)
@@ -370,37 +370,37 @@ anchor-update$(EXEEXT):  $(ANCHORUPD_OBJ_LINK) libunbound.la
 	$(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
 
 unittest$(EXEEXT):	$(UNITTEST_OBJ_LINK)
-	$(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 testbound$(EXEEXT):	$(TESTBOUND_OBJ_LINK)
-	$(LINK) -o $@ $(TESTBOUND_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(TESTBOUND_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 lock-verify$(EXEEXT):	$(LOCKVERIFY_OBJ_LINK)
-	$(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 petal$(EXEEXT):	$(PETAL_OBJ_LINK)
 	$(LINK) -o $@ $(PETAL_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 pktview$(EXEEXT):	$(PKTVIEW_OBJ_LINK)
-	$(LINK) -o $@ $(PKTVIEW_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(PKTVIEW_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 memstats$(EXEEXT):	$(MEMSTATS_OBJ_LINK)
-	$(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 asynclook$(EXEEXT):	$(ASYNCLOOK_OBJ_LINK) libunbound.la
 	$(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) -L. -L.libs -lunbound $(SSLLIB) $(LIBS)
 
 streamtcp$(EXEEXT):	$(STREAMTCP_OBJ_LINK)
-	$(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 dohclient$(EXEEXT):	$(DOHCLIENT_OBJ_LINK)
-	$(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 perf$(EXEEXT):	$(PERF_OBJ_LINK)
-	$(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 delayer$(EXEEXT):	$(DELAYER_OBJ_LINK)
-	$(LINK) -o $@ $(DELAYER_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(DELAYER_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 signit$(EXEEXT):	testcode/signit.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@ -o $@ testcode/signit.c $(LDFLAGS) -lldns $(SSLLIB) $(LIBS)
@@ -423,7 +423,7 @@ dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h: $(srcdir)/dnstap/dnstap.proto
 	$(PROTOC_C) --c_out=. --proto_path=$(srcdir) $(srcdir)/dnstap/dnstap.proto
 
 unbound-dnstap-socket$(EXEEXT):	$(DNSTAP_SOCKET_OBJ_LINK)
-	$(LINK) -o $@ $(DNSTAP_SOCKET_OBJ_LINK) $(SSLLIB) $(LIBS) $(DYNLIBMOD_EXTRALIBS)
+	$(LINK) -o $@ $(DNSTAP_SOCKET_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h
 dtstream.lo dtstream.o: $(srcdir)/dnstap/dtstream.c config.h $(srcdir)/dnstap/dtstream.h
diff --git a/doc/Changelog b/doc/Changelog
index ce922f6fc..c3223b05a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 13 January 2021: Wouter
 	- Merge #399 from xiangbao227: The lock of lruhash table should
 	  unlocked after markdel entry.
+	- Fix for #93: dynlibmodule link fix for Windows.
 
 12 January 2021: Wouter
 	- Fix #397: [Feature request] add new type always_null to local-zone

From 4613d2bf047857442c63d8f9177cda91b82e84e0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 14 Jan 2021 16:50:17 +0100
Subject: [PATCH 168/208] - Fix for #93: dynlibmodule import library is named
 libunbound.dll.a.

---
 configure                       | 2 +-
 configure.ac                    | 2 +-
 doc/Changelog                   | 3 +++
 dynlibmod/examples/helloworld.c | 6 ++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 87959deae..7957f0dd6 100755
--- a/configure
+++ b/configure
@@ -17237,7 +17237,7 @@ $as_echo "#define WITH_DYNLIBMODULE 1" >>confdefs.h
   if test $on_mingw = "no"; then
     DYNLIBMOD_EXTRALIBS="-ldl -export-dynamic"
   else
-    DYNLIBMOD_EXTRALIBS="-Wl,--export-all-symbols,--out-implib,libunbound.a"
+    DYNLIBMOD_EXTRALIBS="-Wl,--export-all-symbols,--out-implib,libunbound.dll.a"
   fi
 
 fi
diff --git a/configure.ac b/configure.ac
index 02b9eb47b..3e872bca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,7 +644,7 @@ if test x_$withval != x_no; then
   if test $on_mingw = "no"; then
     DYNLIBMOD_EXTRALIBS="-ldl -export-dynamic"
   else
-    DYNLIBMOD_EXTRALIBS="-Wl,--export-all-symbols,--out-implib,libunbound.a"
+    DYNLIBMOD_EXTRALIBS="-Wl,--export-all-symbols,--out-implib,libunbound.dll.a"
   fi
   AC_SUBST(DYNLIBMOD_EXTRALIBS)
 fi
diff --git a/doc/Changelog b/doc/Changelog
index c3223b05a..335ecf89b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+14 January 2021: Wouter
+	- Fix for #93: dynlibmodule import library is named libunbound.dll.a.
+
 13 January 2021: Wouter
 	- Merge #399 from xiangbao227: The lock of lruhash table should
 	  unlocked after markdel entry.
diff --git a/dynlibmod/examples/helloworld.c b/dynlibmod/examples/helloworld.c
index 7da32d9bb..be2116843 100644
--- a/dynlibmod/examples/helloworld.c
+++ b/dynlibmod/examples/helloworld.c
@@ -7,8 +7,10 @@
  * And to build for windows, first make unbound with the --with-dynlibmod
  * switch, then use this command:
  *   x86_64-w64-mingw32-gcc -m64 -I../.. -shared -Wall -Werror -fpic
- *      -o helloworld.dll helloworld.c -L../.. -l:libunbound.a
- * to cross-compile a 64-bit Windows DLL.
+ *      -o helloworld.dll helloworld.c -L../.. -l:libunbound.dll.a
+ * to cross-compile a 64-bit Windows DLL.  The libunbound.dll.a is produced
+ * by the compile step that makes unbound.exe and allows the dynlib dll to
+ * access definitions in unbound.exe.
  */
 
 #include "../../config.h"

From 285a7fdd2151672ba3d60914848c2113d4ed9d15 Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@narrans.de>
Date: Thu, 14 Jan 2021 19:15:30 +0100
Subject: [PATCH 169/208] Implement IPv4-Embedded addresses according to
 RFC6052.

The original algorithm assumed that any prefix length would be valid
and did not skip over bits 64 to 71 and set them to zero.
This means that only dns64 prefixes with length 32 and 96 generated
embedded addresses according to RFC6052, cf. Figure 1 in 2.2.
---
 dns64/dns64.c | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/dns64/dns64.c b/dns64/dns64.c
index 5c70119a5..e7552bb7d 100644
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -198,14 +198,17 @@ uitoa(unsigned n, char* s)
 static uint32_t
 extract_ipv4(const uint8_t ipv6[], size_t ipv6_len, const int offset)
 {
-    uint32_t ipv4;
+    uint32_t ipv4 = 0;
+    int i, pos;
     log_assert(ipv6_len == 16); (void)ipv6_len;
-    ipv4 = (uint32_t)ipv6[offset/8+0] << (24 + (offset%8))
-         | (uint32_t)ipv6[offset/8+1] << (16 + (offset%8))
-         | (uint32_t)ipv6[offset/8+2] << ( 8 + (offset%8))
-         | (uint32_t)ipv6[offset/8+3] << ( 0 + (offset%8));
-    if (offset/8+4 < 16)
-        ipv4 |= (uint32_t)ipv6[offset/8+4] >> (8 - offset%8);
+    log_assert(offset == 32 || offset == 40 || offset == 48 || offset == 56 ||
+        offset == 64 || offset == 96);
+    for(i = 0, pos = offset / 8; i < 4; i++, pos++) {
+        if (pos == 8)
+            pos++;
+        ipv4 = ipv4 << 8;
+        ipv4 |= ipv6[pos];
+    }
     return ipv4;
 }
 
@@ -297,17 +300,16 @@ synthesize_aaaa(const uint8_t prefix_addr[], size_t prefix_addr_len,
 	size_t aaaa_len)
 {
     log_assert(prefix_addr_len == 16 && a_len == 4 && aaaa_len == 16);
+    log_assert(prefix_net == 32 || prefix_net == 40 || prefix_net == 48 ||
+        prefix_net == 56 || prefix_net == 64 || prefix_net == 96);
+    int i, pos;
     (void)prefix_addr_len; (void)a_len; (void)aaaa_len;
     memcpy(aaaa, prefix_addr, 16);
-    aaaa[prefix_net/8+0] |= a[0] >> (0+prefix_net%8);
-    aaaa[prefix_net/8+1] |= a[0] << (8-prefix_net%8);
-    aaaa[prefix_net/8+1] |= a[1] >> (0+prefix_net%8);
-    aaaa[prefix_net/8+2] |= a[1] << (8-prefix_net%8);
-    aaaa[prefix_net/8+2] |= a[2] >> (0+prefix_net%8);
-    aaaa[prefix_net/8+3] |= a[2] << (8-prefix_net%8);
-    aaaa[prefix_net/8+3] |= a[3] >> (0+prefix_net%8);
-    if (prefix_net/8+4 < 16)  /* <-- my beautiful symmetry is destroyed! */
-    aaaa[prefix_net/8+4] |= a[3] << (8-prefix_net%8);
+    for(i = 0, pos = prefix_net / 8; i < a_len; i++, pos++) {
+        if(pos == 8)
+            aaaa[pos++] = 0;
+        aaaa[pos] = a[i];
+    }
 }
 
 
@@ -374,8 +376,10 @@ dns64_apply_cfg(struct dns64_env* dns64_env, struct config_file* cfg)
         log_err("dns64_prefix is not IPv6: %s", cfg->dns64_prefix);
         return 0;
     }
-    if (dns64_env->prefix_net < 0 || dns64_env->prefix_net > 96) {
-        log_err("dns64-prefix length it not between 0 and 96: %s",
+    if (dns64_env->prefix_net != 32 && dns64_env->prefix_net != 40 &&
+            dns64_env->prefix_net != 48 && dns64_env->prefix_net != 56 &&
+            dns64_env->prefix_net != 64 && dns64_env->prefix_net != 96 ) {
+        log_err("dns64-prefix length it not 32, 40, 48, 56, 64 or 96: %s",
                 cfg->dns64_prefix);
         return 0;
     }

From e55f38fa83f5d43f202ca489cc72078adeeb694f Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 15 Jan 2021 08:15:54 +0100
Subject: [PATCH 170/208] Changelog entry for #402. - Merge #402 from fobser:
 Implement IPv4-Embedded addresses according   to RFC6052.

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

diff --git a/doc/Changelog b/doc/Changelog
index 335ecf89b..2edaa330d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 January 2021: Wouter
+	- Merge #402 from fobser: Implement IPv4-Embedded addresses according
+	  to RFC6052.
+
 14 January 2021: Wouter
 	- Fix for #93: dynlibmodule import library is named libunbound.dll.a.
 

From c125fe67bc42ec732ad53a3d2f095d656c9a03f4 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 18 Jan 2021 08:29:52 +0100
Subject: [PATCH 171/208] - Fix #404: DNS query with small edns bufsize fail.

---
 doc/Changelog         | 3 +++
 doc/example.conf.in   | 2 +-
 doc/unbound.conf.5.in | 5 ++---
 util/config_file.c    | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 2edaa330d..27e8621c3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+18 January 2021: Wouter
+	- Fix #404: DNS query with small edns bufsize fail.
+
 15 January 2021: Wouter
 	- Merge #402 from fobser: Implement IPv4-Embedded addresses according
 	  to RFC6052.
diff --git a/doc/example.conf.in b/doc/example.conf.in
index b51bcfca5..c1c3eb9b3 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -388,7 +388,7 @@ server:
 	# target-fetch-policy: "3 2 1 0 0"
 
 	# Harden against very small EDNS buffer sizes.
-	# harden-short-bufsize: no
+	# harden-short-bufsize: yes
 
 	# Harden against unseemly large queries.
 	# harden-large-queries: no
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index e7964d969..2fa8e7a95 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -839,9 +839,8 @@ closer to that of BIND 9, while setting "\-1 \-1 \-1 \-1 \-1" gives behaviour
 rumoured to be closer to that of BIND 8.
 .TP
 .B harden\-short\-bufsize: \fI<yes or no>
-Very small EDNS buffer sizes from queries are ignored. Default is off, since
-it is legal protocol wise to send these, and unbound tries to give very
-small answers to these queries, where possible.
+Very small EDNS buffer sizes from queries are ignored. Default is on, as
+described in the standard.
 .TP
 .B harden\-large\-queries: \fI<yes or no>
 Very large queries are ignored. Default is off, since it is legal protocol
diff --git a/util/config_file.c b/util/config_file.c
index 4c827b74e..a845dde23 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -220,7 +220,7 @@ config_create(void)
 	cfg->views = NULL;
 	cfg->acls = NULL;
 	cfg->tcp_connection_limits = NULL;
-	cfg->harden_short_bufsize = 0;
+	cfg->harden_short_bufsize = 1;
 	cfg->harden_large_queries = 0;
 	cfg->harden_glue = 1;
 	cfg->harden_dnssec_stripped = 1;
@@ -388,6 +388,7 @@ struct config_file* config_create_forlib(void)
 	cfg->val_log_level = 2; /* to fill why_bogus with */
 	cfg->val_log_squelch = 1;
 	cfg->minimal_responses = 0;
+	cfg->harden_short_bufsize = 1;
 	return cfg;
 }
 

From f273716b8045e2b4f91306966582adafabb4f3f0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 18 Jan 2021 10:23:01 +0100
Subject: [PATCH 172/208] - Fix declaration before statement and signed
 comparison warning in   dns64.

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

diff --git a/dns64/dns64.c b/dns64/dns64.c
index e7552bb7d..0a40fd49e 100644
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -299,10 +299,11 @@ synthesize_aaaa(const uint8_t prefix_addr[], size_t prefix_addr_len,
 	int prefix_net, const uint8_t a[], size_t a_len, uint8_t aaaa[],
 	size_t aaaa_len)
 {
+    size_t i;
+    int pos;
     log_assert(prefix_addr_len == 16 && a_len == 4 && aaaa_len == 16);
     log_assert(prefix_net == 32 || prefix_net == 40 || prefix_net == 48 ||
         prefix_net == 56 || prefix_net == 64 || prefix_net == 96);
-    int i, pos;
     (void)prefix_addr_len; (void)a_len; (void)aaaa_len;
     memcpy(aaaa, prefix_addr, 16);
     for(i = 0, pos = prefix_net / 8; i < a_len; i++, pos++) {
diff --git a/doc/Changelog b/doc/Changelog
index 27e8621c3..f50f294af 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 18 January 2021: Wouter
 	- Fix #404: DNS query with small edns bufsize fail.
+	- Fix declaration before statement and signed comparison warning in
+	  dns64.
 
 15 January 2021: Wouter
 	- Merge #402 from fobser: Implement IPv4-Embedded addresses according

From 9056613a79c08a26ae70463e748aa0988a85c8a9 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 19 Jan 2021 12:15:18 +0100
Subject: [PATCH 173/208] - Fix TTL of SOA record for negative answers
 (localzone data and   authzone) to be the minimum of the SOA TTL and the
 SOA.MINIMUM.

---
 services/authzone.c             |  11 ++-
 services/localzone.c            |  57 ++++++++++--
 services/localzone.h            |   4 +
 testdata/auth_zonefile_down.rpl | 157 +++++++++++++++++++++++++++++++-
 testdata/localdata.rpl          |  18 ++--
 5 files changed, 227 insertions(+), 20 deletions(-)

diff --git a/services/authzone.c b/services/authzone.c
index 3ad38865e..3d7f49388 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -2331,7 +2331,8 @@ static int
 az_add_negative_soa(struct auth_zone* z, struct regional* region,
 	struct dns_msg* msg)
 {
-	uint32_t minimum;
+	time_t minimum;
+	size_t i;
 	struct packed_rrset_data* d;
 	struct auth_rrset* soa;
 	struct auth_data* apex = az_find_name(z, z->name, z->namelen);
@@ -2348,9 +2349,11 @@ az_add_negative_soa(struct auth_zone* z, struct regional* region,
 	/* last 4 bytes are minimum ttl in network format */
 	if(d->count == 0) return 0;
 	if(d->rr_len[0] < 2+4) return 0;
-	minimum = sldns_read_uint32(d->rr_data[0]+(d->rr_len[0]-4));
-	d->ttl = (time_t)minimum;
-	d->rr_ttl[0] = (time_t)minimum;
+	minimum = (time_t)sldns_read_uint32(d->rr_data[0]+(d->rr_len[0]-4));
+	minimum = d->ttl<minimum?d->ttl:minimum;
+	d->ttl = minimum;
+	for(i=0; i < d->count + d->rrsig_count; i++)
+		d->rr_ttl[i] = minimum;
 	msg->rep->ttl = get_rrset_ttl(msg->rep->rrsets[0]);
 	msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl);
 	msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL;
diff --git a/services/localzone.c b/services/localzone.c
index ed0d2c565..00067705e 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -463,6 +463,48 @@ lz_find_create_node(struct local_zone* z, uint8_t* nm, size_t nmlen,
 	return 1;
 }
 
+/* Mark the SOA record for the zone. This only marks the SOA rrset; the data
+ * for the RR is entered later on local_zone_enter_rr() as with the other
+ * records. An artifical soa_negative record with a modified TTL (minimum of
+ * the TTL and the SOA.MINIMUM) is also created and marked for usage with
+ * negative answers and to avoid allocations during those answers. */
+static int
+lz_mark_soa_for_zone(struct local_zone* z, struct ub_packed_rrset_key* soa_rrset,
+	uint8_t* rdata, size_t rdata_len, time_t ttl, const char* rrstr)
+{
+	struct packed_rrset_data* pd = (struct packed_rrset_data*)
+		regional_alloc_zero(z->region, sizeof(*pd));
+	struct ub_packed_rrset_key* rrset_negative = (struct ub_packed_rrset_key*)
+		regional_alloc_zero(z->region, sizeof(*rrset_negative));
+	time_t minimum;
+	if(!rrset_negative||!pd) {
+		log_err("out of memory");
+		return 0;
+	}
+	/* Mark the original SOA record and then continue with the negative one. */
+	z->soa = soa_rrset;
+	rrset_negative->entry.key = rrset_negative;
+	pd->trust = rrset_trust_prim_noglue;
+	pd->security = sec_status_insecure;
+	rrset_negative->entry.data = pd;
+	rrset_negative->rk.dname = soa_rrset->rk.dname;
+	rrset_negative->rk.dname_len = soa_rrset->rk.dname_len;
+	rrset_negative->rk.type = soa_rrset->rk.type;
+	rrset_negative->rk.rrset_class = soa_rrset->rk.rrset_class;
+	if(!rrset_insert_rr(z->region, pd, rdata, rdata_len, ttl, rrstr))
+		return 0;
+	/* last 4 bytes are minimum ttl in network format */
+	if(pd->count == 0 || pd->rr_len[0] < 2+4) {
+		return 0;
+	}
+	minimum = (time_t)sldns_read_uint32(pd->rr_data[0]+(pd->rr_len[0]-4));
+	pd->ttl = ttl<minimum?ttl:minimum;
+	pd->rr_ttl[0] = pd->ttl;
+
+	z->soa_negative = rrset_negative;
+	return 1;
+}
+
 int
 local_zone_enter_rr(struct local_zone* z, uint8_t* nm, size_t nmlen,
 	int nmlabs, uint16_t rrtype, uint16_t rrclass, time_t ttl,
@@ -502,8 +544,10 @@ local_zone_enter_rr(struct local_zone* z, uint8_t* nm, size_t nmlen,
 		if(query_dname_compare(node->name, z->name) == 0) {
 			if(rrtype == LDNS_RR_TYPE_NSEC)
 			  rrset->rrset->rk.flags = PACKED_RRSET_NSEC_AT_APEX;
-			if(rrtype == LDNS_RR_TYPE_SOA)
-				z->soa = rrset->rrset;
+			if(rrtype == LDNS_RR_TYPE_SOA &&
+				!lz_mark_soa_for_zone(z, rrset->rrset, rdata, rdata_len, ttl,
+					rrstr))
+				return 0;
 		}
 	} 
 	pd = (struct packed_rrset_data*)rrset->rrset->entry.data;
@@ -1548,9 +1592,9 @@ local_zones_zone_answer(struct local_zone* z, struct module_env* env,
 			lz_type == local_zone_inform_redirect ||
 			lz_type == local_zone_always_nodata)?
 			LDNS_RCODE_NOERROR:LDNS_RCODE_NXDOMAIN;
-		if(z->soa)
+		if(z->soa && z->soa_negative)
 			return local_encode(qinfo, env, edns, repinfo, buf, temp,
-				z->soa, 0, rcode);
+				z->soa_negative, 0, rcode);
 		local_error_encode(qinfo, env, edns, repinfo, buf, temp, rcode,
 			(rcode|BIT_AA));
 		return 1;
@@ -1605,9 +1649,9 @@ local_zones_zone_answer(struct local_zone* z, struct module_env* env,
 	 * does not, then we should make this noerror/nodata */
 	if(ld && ld->rrsets) {
 		int rcode = LDNS_RCODE_NOERROR;
-		if(z->soa)
+		if(z->soa && z->soa_negative)
 			return local_encode(qinfo, env, edns, repinfo, buf, temp,
-				z->soa, 0, rcode);
+				z->soa_negative, 0, rcode);
 		local_error_encode(qinfo, env, edns, repinfo, buf, temp, rcode,
 			(rcode|BIT_AA));
 		return 1;
@@ -2045,6 +2089,7 @@ void local_zones_del_data(struct local_zones* zones,
 		/* did we delete the soa record ? */
 		if(query_dname_compare(d->name, z->name) == 0)
 			z->soa = NULL;
+			z->soa_negative = NULL;
 
 		/* cleanup the empty nonterminals for this name */
 		del_empty_term(z, d, name, len, labs);
diff --git a/services/localzone.h b/services/localzone.h
index 492629936..3da5c8754 100644
--- a/services/localzone.h
+++ b/services/localzone.h
@@ -158,6 +158,10 @@ struct local_zone {
 	rbtree_type data;
 	/** if data contains zone apex SOA data, this is a ptr to it. */
 	struct ub_packed_rrset_key* soa;
+	/** if data contains zone apex SOA data, this is a prt to an
+	 * artificial negative SOA rrset (TTL is the minimum of the TTL and the
+	 * SOA.MINIMUM). */
+	struct ub_packed_rrset_key* soa_negative;
 };
 
 /**
diff --git a/testdata/auth_zonefile_down.rpl b/testdata/auth_zonefile_down.rpl
index 09e7fd061..2b17c8433 100644
--- a/testdata/auth_zonefile_down.rpl
+++ b/testdata/auth_zonefile_down.rpl
@@ -1,6 +1,12 @@
 ; config options
 server:
 	target-fetch-policy: "0 0 0 0 0"
+	; Options for singed zone. The zone is partially copied from val_negcache_nxdomain.rpl
+	trust-anchor: "testzone.nlnetlabs.nl.	IN	DS	2926 8 2 6f8512d1e82eecbd684fc4a76f39f8c5b411af385494873bdead663ddb78a88b"
+	val-override-date: "20180213111425"
+	qname-minimisation: "no"
+	trust-anchor-signaling: no
+	aggressive-nsec: yes
 
 auth-zone:
 	name: "example.com."
@@ -41,6 +47,50 @@ ns1	3600	IN	A	1.2.3.4
 ns2	3600	IN	AAAA	::2
 TEMPFILE_END
 
+auth-zone:
+	name: "soa.high.com."
+	for-downstream: yes
+	for-upstream: no
+	zonefile:
+TEMPFILE_NAME soa.high.com
+TEMPFILE_CONTENTS soa.high.com
+$ORIGIN high.com.
+soa	500	IN	SOA	dns.example.de. hostmaster.dns.example.de. (
+		1379078166 28800 7200 604800 200 )
+	3600	IN	NS	ns1.example.com.
+	3600	IN	NS	ns2.example.com.
+TEMPFILE_END
+
+auth-zone:
+	name: "soa.low.com."
+	for-downstream: yes
+	for-upstream: no
+	zonefile:
+TEMPFILE_NAME soa.low.com
+TEMPFILE_CONTENTS soa.low.com
+$ORIGIN low.com.
+soa	200	IN	SOA	dns.example.de. hostmaster.dns.example.de. (
+		1379078166 28800 7200 604800 500 )
+	3600	IN	NS	ns1.example.com.
+	3600	IN	NS	ns2.example.com.
+TEMPFILE_END
+
+auth-zone:
+	name: "testzone.nlnetlabs.nl."
+	for-downstream: yes
+	for-upstream: no
+	zonefile:
+TEMPFILE_NAME testzone.nlnetlabs.nl
+TEMPFILE_CONTENTS testzone.nlnetlabs.nl
+$ORIGIN testzone.nlnetlabs.nl.
+testzone.nlnetlabs.nl.  3600    IN      NSEC    alligator.testzone.nlnetlabs.nl. NS SOA RRSIG NSEC DNSKEY
+testzone.nlnetlabs.nl.  3600    IN      RRSIG   NSEC 8 3 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. gTKn6U1nal9oA79IRxLa/7zexl6A0yJZzeEGBbZ5rh5feyAr2X4LTR9bPCgcHeMVggf4FP+kD1L/sxzj/YLwB1ZKGKlwnzsHtPFTlmvDClaqQ76DRZq5Vejr2ZfnclBUb2vtxaXywTRW8oueaaq9flcShEQ/cQ+KRU8sc344qd0=
+alligator.testzone.nlnetlabs.nl.        3600    IN      NSEC    cheetah.testzone.nlnetlabs.nl. TXT RRSIG NSEC
+alligator.testzone.nlnetlabs.nl.        3600    IN      RRSIG   NSEC 8 4 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. QAgQ0AsMoYG02+VPfoOctSPlTHdQOkQt5fFkSkzIbVhUzNOqa+dB/Qkc81AwFeJosA+PvYjt6utcVkIWmK2Djy9eXC49gILtVF79vUe4G7ZrybO5NXjqNa5ANoUGM+yew4wkjeNOMVAsvs+1kvFY7S8RAa/0AIYlZHQ8vNBPNaI=
+testzone.nlnetlabs.nl.  4600    IN      SOA     ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1 14400 3600 604800 3600
+testzone.nlnetlabs.nl.  4600    IN      RRSIG   SOA 8 3 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. GhmXNFQktZIgaBpGKwj9Q2mfq5+jcbRPK+PPgtRVicUPZga/d/iGEL8PV/8DzGwkaZbM14pamSUMgdJibW4zNhLz/ukjPilbjoj6giH1jtbdZLAQ6iK9pZ/4jKUEq4txviTczZNnDeolgPEEl4xo4NclQmi7zj1XBlQRbjvG0/0=
+TEMPFILE_END
+
 stub-zone:
 	name: "."
 	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
@@ -50,7 +100,7 @@ SCENARIO_BEGIN Test authority zone with zonefile for downstream responses
 
 ; K.ROOT-SERVERS.NET.
 RANGE_BEGIN 0 100
-	ADDRESS 193.0.14.129 
+	ADDRESS 193.0.14.129
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
@@ -182,4 +232,109 @@ SECTION ANSWER
 www.example.com. IN A	1.2.3.4
 ENTRY_END
 
+; check SOA TTL to be the minimum of the SOA.minimum and the SOA TTL
+STEP 30 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+nonexistent.soa.high.com. IN A
+ENTRY_END
+STEP 31 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA AA NXDOMAIN
+SECTION QUESTION
+nonexistent.soa.high.com IN A
+SECTION AUTHORITY
+soa.high.com. 200 IN SOA dns.example.de. hostmaster.dns.example.de. 1379078166 28800 7200 604800 200
+ENTRY_END
+; check that the original SOA is also returned
+STEP 32 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+soa.high.com. IN SOA
+ENTRY_END
+STEP 33 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA AA NOERROR
+SECTION QUESTION
+soa.high.com. IN SOA
+SECTION ANSWER
+soa.high.com. 500 IN SOA dns.example.de. hostmaster.dns.example.de. 1379078166 28800 7200 604800 200
+ENTRY_END
+
+; check SOA TTL to be the minimum of the SOA.minimum and the SOA TTL
+STEP 40 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+nonexistent.soa.low.com. IN A
+ENTRY_END
+STEP 41 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA AA NXDOMAIN
+SECTION QUESTION
+nonexistent.soa.low.com. IN A
+SECTION AUTHORITY
+soa.low.com. 200 IN SOA dns.example.de. hostmaster.dns.example.de. 1379078166 28800 7200 604800 500
+ENTRY_END
+; check that the original SOA is also returned
+STEP 42 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+soa.low.com. IN SOA
+ENTRY_END
+STEP 43 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD RA AA NOERROR
+SECTION QUESTION
+soa.low.com. IN SOA
+SECTION ANSWER
+soa.low.com. 200 IN SOA dns.example.de. hostmaster.dns.example.de. 1379078166 28800 7200 604800 500
+ENTRY_END
+
+; check SOA TTL to be minimum of the SOA.minimum and the SOA TTL for DNSSEC
+STEP 50 QUERY
+ENTRY_BEGIN
+REPLY RD DO
+SECTION QUESTION
+ant.testzone.nlnetlabs.nl. IN A
+ENTRY_END
+STEP 51 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD DO RA AA NXDOMAIN
+SECTION QUESTION
+ant.testzone.nlnetlabs.nl. IN A
+SECTION AUTHORITY
+testzone.nlnetlabs.nl.  3600    IN      SOA     ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1 14400 3600 604800 3600
+testzone.nlnetlabs.nl.  3600    IN      RRSIG   SOA 8 3 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. GhmXNFQktZIgaBpGKwj9Q2mfq5+jcbRPK+PPgtRVicUPZga/d/iGEL8PV/8DzGwkaZbM14pamSUMgdJibW4zNhLz/ukjPilbjoj6giH1jtbdZLAQ6iK9pZ/4jKUEq4txviTczZNnDeolgPEEl4xo4NclQmi7zj1XBlQRbjvG0/0=
+alligator.testzone.nlnetlabs.nl.        3600    IN      NSEC    cheetah.testzone.nlnetlabs.nl. TXT RRSIG NSEC
+alligator.testzone.nlnetlabs.nl.        3600    IN      RRSIG   NSEC 8 4 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. QAgQ0AsMoYG02+VPfoOctSPlTHdQOkQt5fFkSkzIbVhUzNOqa+dB/Qkc81AwFeJosA+PvYjt6utcVkIWmK2Djy9eXC49gILtVF79vUe4G7ZrybO5NXjqNa5ANoUGM+yew4wkjeNOMVAsvs+1kvFY7S8RAa/0AIYlZHQ8vNBPNaI=
+testzone.nlnetlabs.nl.  3600    IN      NSEC    alligator.testzone.nlnetlabs.nl. NS SOA RRSIG NSEC DNSKEY
+testzone.nlnetlabs.nl.  3600    IN      RRSIG   NSEC 8 3 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. gTKn6U1nal9oA79IRxLa/7zexl6A0yJZzeEGBbZ5rh5feyAr2X4LTR9bPCgcHeMVggf4FP+kD1L/sxzj/YLwB1ZKGKlwnzsHtPFTlmvDClaqQ76DRZq5Vejr2ZfnclBUb2vtxaXywTRW8oueaaq9flcShEQ/cQ+KRU8sc344qd0=
+ENTRY_END
+; check that the original SOA is also returned
+STEP 52 QUERY
+ENTRY_BEGIN
+REPLY RD DO
+SECTION QUESTION
+testzone.nlnetlabs.nl. IN SOA
+ENTRY_END
+STEP 53 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all ttl
+REPLY QR RD DO RA AA NOERROR
+SECTION QUESTION
+testzone.nlnetlabs.nl. IN SOA
+SECTION ANSWER
+testzone.nlnetlabs.nl.  4600    IN      SOA     ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1 14400 3600 604800 3600
+testzone.nlnetlabs.nl.  4600    IN      RRSIG   SOA 8 3 3600 20180313102201 20180213102201 44940 testzone.nlnetlabs.nl. GhmXNFQktZIgaBpGKwj9Q2mfq5+jcbRPK+PPgtRVicUPZga/d/iGEL8PV/8DzGwkaZbM14pamSUMgdJibW4zNhLz/ukjPilbjoj6giH1jtbdZLAQ6iK9pZ/4jKUEq4txviTczZNnDeolgPEEl4xo4NclQmi7zj1XBlQRbjvG0/0=
+ENTRY_END
+
 SCENARIO_END
diff --git a/testdata/localdata.rpl b/testdata/localdata.rpl
index eb25ef573..047fbeeba 100644
--- a/testdata/localdata.rpl
+++ b/testdata/localdata.rpl
@@ -88,12 +88,12 @@ local. IN A
 ENTRY_END
 STEP 6 CHECK_ANSWER
 ENTRY_BEGIN
-MATCH all
+MATCH all ttl
 REPLY QR RA AA
 SECTION QUESTION
 local. IN A
 SECTION AUTHORITY
-local. 3600 IN SOA nobody nobody 1 2 3 4 5
+local. 5 IN SOA nobody nobody 1 2 3 4 5
 ENTRY_END
 
 ; positive SOA
@@ -104,7 +104,7 @@ local. IN SOA
 ENTRY_END
 STEP 8 CHECK_ANSWER
 ENTRY_BEGIN
-MATCH all
+MATCH all ttl
 REPLY QR RA AA
 SECTION QUESTION
 local. IN SOA
@@ -136,12 +136,12 @@ serv.local. IN MX
 ENTRY_END
 STEP 12 CHECK_ANSWER
 ENTRY_BEGIN
-MATCH all
+MATCH all ttl
 REPLY QR RA AA
 SECTION QUESTION
 serv.local. IN MX
 SECTION AUTHORITY
-local. 3600 IN SOA nobody nobody 1 2 3 4 5
+local. 5 IN SOA nobody nobody 1 2 3 4 5
 ENTRY_END
 
 ; no such type, empty nonterminal
@@ -152,12 +152,12 @@ bla.local. IN MX
 ENTRY_END
 STEP 14 CHECK_ANSWER
 ENTRY_BEGIN
-MATCH all
+MATCH all ttl
 REPLY QR RA AA
 SECTION QUESTION
 bla.local. IN MX
 SECTION AUTHORITY
-local. 3600 IN SOA nobody nobody 1 2 3 4 5
+local. 5 IN SOA nobody nobody 1 2 3 4 5
 ENTRY_END
 
 ; nxdomain with SOA
@@ -168,12 +168,12 @@ doing.local. IN MX
 ENTRY_END
 STEP 16 CHECK_ANSWER
 ENTRY_BEGIN
-MATCH all
+MATCH all ttl
 REPLY QR RA AA NXDOMAIN
 SECTION QUESTION
 doing.local. IN MX
 SECTION AUTHORITY
-local. 3600 IN SOA nobody nobody 1 2 3 4 5
+local. 5 IN SOA nobody nobody 1 2 3 4 5
 ENTRY_END
 
 ; nxdomain without SOA

From 7ba51fce244f242ceeba3ecd0d77b37ce48c0ae3 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 19 Jan 2021 16:18:36 +0100
Subject: [PATCH 174/208] example.conf.in entry for nsid

---
 doc/example.conf.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/example.conf.in b/doc/example.conf.in
index c1c3eb9b3..08d1620cf 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -377,6 +377,9 @@ server:
 	# the version to report. Leave "" or default to return package version.
 	# version: ""
 
+	# NSID identity (hex string, or "ascii_somestring"). default disabled.
+	# nsid: "aabbccdd"
+
 	# the target fetch policy.
 	# series of integers describing the policy per dependency depth.
 	# The number of values in the list determines the maximum dependency

From 68d92b7bbbf1ffc5ff1300ec7f4f5361294155ab Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@narrans.de>
Date: Tue, 19 Jan 2021 17:12:14 +0100
Subject: [PATCH 175/208] Prevent a few more yacc clashes.

---
 util/configyyrename.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/util/configyyrename.h b/util/configyyrename.h
index f529be577..8c7ff5b5c 100644
--- a/util/configyyrename.h
+++ b/util/configyyrename.h
@@ -84,5 +84,11 @@
 #define yyget_leng ub_c_get_leng
 #define yylineno ub_c_lineno
 #define yyget_text ub_c_get_text
+#define yyss    ub_c_ss
+#define yysslim ub_c_sslim
+#define yyssp   ub_c_ssp
+#define yystacksize ub_c_stacksize
+#define yyvs    ub_c_vs
+#define yyvsp   ub_c_vsp
 
 #endif /* UTIL_CONFIGYYRENAME_H */

From 68d51317fe6b8869b52c3f6c5dcc68bf5e9a70bf Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 19 Jan 2021 17:18:26 +0100
Subject: [PATCH 176/208] rpl tests for nsid

---
 testdata/nsid_ascii.rpl   | 54 +++++++++++++++++++++++++++++++++++++++
 testdata/nsid_hex.rpl     | 54 +++++++++++++++++++++++++++++++++++++++
 testdata/nsid_not_set.rpl | 47 ++++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+)
 create mode 100644 testdata/nsid_ascii.rpl
 create mode 100644 testdata/nsid_hex.rpl
 create mode 100644 testdata/nsid_not_set.rpl

diff --git a/testdata/nsid_ascii.rpl b/testdata/nsid_ascii.rpl
new file mode 100644
index 000000000..f357db5ae
--- /dev/null
+++ b/testdata/nsid_ascii.rpl
@@ -0,0 +1,54 @@
+; config options
+server:
+	nsid: "ascii_hopsa kidee"
+
+stub-zone:
+	name: "example."
+	stub-addr: 192.0.2.1
+CONFIG_END
+
+SCENARIO_BEGIN Test EDNS string tag option
+
+RANGE_BEGIN 0 1000
+	ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example. IN A
+SECTION ANSWER
+example. IN A 198.51.100.1
+SECTION ADDITIONAL
+ENTRY_END
+RANGE_END
+
+STEP 10 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+example. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 03 ; Opcode NSID (3)
+		00 00 ; Length 0
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 30 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+example. IN A
+SECTION ANSWER
+example. IN A 198.51.100.1
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 03             ; Opcode NSID (3)
+		00 0b             ; Length 11
+		68 6F 70 73 61 20 ; "hopsa "
+		6B 69 64 65 65    ; "kidee"
+	HEX_EDNSDATA_END
+ENTRY_END
+SCENARIO_END
diff --git a/testdata/nsid_hex.rpl b/testdata/nsid_hex.rpl
new file mode 100644
index 000000000..0d5e8f40d
--- /dev/null
+++ b/testdata/nsid_hex.rpl
@@ -0,0 +1,54 @@
+; config options
+server:
+	nsid: "0123456789abcdef"
+
+stub-zone:
+	name: "example."
+	stub-addr: 192.0.2.1
+CONFIG_END
+
+SCENARIO_BEGIN Test EDNS string tag option
+
+RANGE_BEGIN 0 1000
+	ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example. IN A
+SECTION ANSWER
+example. IN A 198.51.100.1
+SECTION ADDITIONAL
+ENTRY_END
+RANGE_END
+
+STEP 10 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+example. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 03 ; Opcode NSID (3)
+		00 00 ; Length 0
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 30 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+example. IN A
+SECTION ANSWER
+example. IN A 198.51.100.1
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 03       ; Opcode NSID (3)
+		00 08       ; Length 8
+		01 23 45 67 ;
+		89 ab cd ef ;
+	HEX_EDNSDATA_END
+ENTRY_END
+SCENARIO_END
diff --git a/testdata/nsid_not_set.rpl b/testdata/nsid_not_set.rpl
new file mode 100644
index 000000000..06abe5985
--- /dev/null
+++ b/testdata/nsid_not_set.rpl
@@ -0,0 +1,47 @@
+; config options
+stub-zone:
+	name: "example."
+	stub-addr: 192.0.2.1
+CONFIG_END
+
+SCENARIO_BEGIN Test EDNS string tag option
+
+RANGE_BEGIN 0 1000
+	ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example. IN A
+SECTION ANSWER
+example. IN A 198.51.100.1
+SECTION ADDITIONAL
+ENTRY_END
+RANGE_END
+
+STEP 10 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+example. IN A
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+		00 03 ; Opcode NSID (3)
+		00 00 ; Length 0
+	HEX_EDNSDATA_END
+ENTRY_END
+
+STEP 30 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+example. IN A
+SECTION ANSWER
+example. IN A 198.51.100.1
+SECTION ADDITIONAL
+	HEX_EDNSDATA_BEGIN
+	HEX_EDNSDATA_END
+ENTRY_END
+SCENARIO_END

From 38e12229b8e6cd5c6b45c61851574492af5a2fa6 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 19 Jan 2021 20:09:34 +0100
Subject: [PATCH 177/208] - Feedback for PR #407.

---
 services/localzone.c            | 8 ++++----
 testdata/auth_zonefile_down.rpl | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/localzone.c b/services/localzone.c
index 00067705e..4369e23c1 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -494,12 +494,12 @@ lz_mark_soa_for_zone(struct local_zone* z, struct ub_packed_rrset_key* soa_rrset
 	if(!rrset_insert_rr(z->region, pd, rdata, rdata_len, ttl, rrstr))
 		return 0;
 	/* last 4 bytes are minimum ttl in network format */
-	if(pd->count == 0 || pd->rr_len[0] < 2+4) {
+	if(pd->count == 0 || pd->rr_len[0] < 2+4)
 		return 0;
-	}
 	minimum = (time_t)sldns_read_uint32(pd->rr_data[0]+(pd->rr_len[0]-4));
-	pd->ttl = ttl<minimum?ttl:minimum;
-	pd->rr_ttl[0] = pd->ttl;
+	minimum = ttl<minimum?ttl:minimum;
+	pd->ttl = minimum;
+	pd->rr_ttl[0] = minimum;
 
 	z->soa_negative = rrset_negative;
 	return 1;
diff --git a/testdata/auth_zonefile_down.rpl b/testdata/auth_zonefile_down.rpl
index 2b17c8433..9c5ecbb1c 100644
--- a/testdata/auth_zonefile_down.rpl
+++ b/testdata/auth_zonefile_down.rpl
@@ -1,7 +1,7 @@
 ; config options
 server:
 	target-fetch-policy: "0 0 0 0 0"
-	; Options for singed zone. The zone is partially copied from val_negcache_nxdomain.rpl
+	; Options for signed zone. The zone is partially copied from val_negcache_nxdomain.rpl
 	trust-anchor: "testzone.nlnetlabs.nl.	IN	DS	2926 8 2 6f8512d1e82eecbd684fc4a76f39f8c5b411af385494873bdead663ddb78a88b"
 	val-override-date: "20180213111425"
 	qname-minimisation: "no"

From dc23502abb07eba7e0819ee24f0e2bf51a2516f5 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Fri, 22 Jan 2021 12:33:56 +0100
Subject: [PATCH 178/208] - Updated Changelog for PR #407.

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

diff --git a/doc/Changelog b/doc/Changelog
index f50f294af..2b093005b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+22 January 2021: George
+	- Fix TTL of SOA record for negative answers (localzone and
+	  authzone data) to be the minimum of the SOA TTL and the SOA.MINIMUM.
+
 18 January 2021: Wouter
 	- Fix #404: DNS query with small edns bufsize fail.
 	- Fix declaration before statement and signed comparison warning in

From 3a6f1ecafae3e34444089f2d81f4de49d9e94f3c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 22 Jan 2021 13:11:41 +0100
Subject: [PATCH 179/208] Fixup if brackets.

---
 services/localzone.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/localzone.c b/services/localzone.c
index 4369e23c1..fd2ff2bb6 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -2087,9 +2087,10 @@ void local_zones_del_data(struct local_zones* zones,
 		/* no memory recycling for zone deletions ... */
 		d->rrsets = NULL;
 		/* did we delete the soa record ? */
-		if(query_dname_compare(d->name, z->name) == 0)
+		if(query_dname_compare(d->name, z->name) == 0) {
 			z->soa = NULL;
 			z->soa_negative = NULL;
+		}
 
 		/* cleanup the empty nonterminals for this name */
 		del_empty_term(z, d, name, len, labs);

From 2a3548e1efbdfcc6d5e04d8633c13b1b5ea63e0a Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 22 Jan 2021 15:10:57 +0100
Subject: [PATCH 180/208] Move NSID Changelog entry to day of merge

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

diff --git a/doc/Changelog b/doc/Changelog
index d7b4c21ee..5cb33ef2e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,10 @@
 	- Fix TTL of SOA record for negative answers (localzone and
 	  authzone data) to be the minimum of the SOA TTL and the SOA.MINIMUM.
 
+19 January 2021: Willem
+	- Support for RFC5001: DNS Name Server Identifier (NSID) Option
+	  with the nsid: option in unbound.conf
+
 18 January 2021: Wouter
 	- Fix #404: DNS query with small edns bufsize fail.
 	- Fix declaration before statement and signed comparison warning in
@@ -79,10 +83,6 @@
 	- Fix for #283: fix stream reuse and tcp fast open.
 	- Fix update, with write event check with streamreuse and fastopen.
 
-2 December 2020: Willem
-	- Support for RFC5001: DNS Name Server Identifier (NSID) Option
-	  with the nsid: option in unbound.conf
-
 1 December 2020: Wouter
 	- Fix #358: Squelch udp connect 'no route to host' errors on low
 	  verbosity.

From fc49d145b51faefe45db538a9a57c8e1524babc6 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 22 Jan 2021 15:14:10 +0100
Subject: [PATCH 181/208] Changelog entry for padding option

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

diff --git a/doc/Changelog b/doc/Changelog
index 5cb33ef2e..f77355945 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+22 January 2022: Willem
+	- Padding of queries and responses with DNS over TLS as specified in
+	  RFC7830 and RFC8467.
+
 22 January 2021: George
 	- Fix TTL of SOA record for negative answers (localzone and
 	  authzone data) to be the minimum of the SOA TTL and the SOA.MINIMUM.

From d253db04fddb915bdd98de1683bb9c5bfd8f862b Mon Sep 17 00:00:00 2001
From: Roland van Rijswijk-Deij <roland@nlnetlabs.nl>
Date: Fri, 22 Jan 2021 18:56:09 +0000
Subject: [PATCH 182/208] Addressed review comment from @wcawijngaards

---
 util/data/packed_rrset.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/util/data/packed_rrset.c b/util/data/packed_rrset.c
index 6147233ab..e1a0833a2 100644
--- a/util/data/packed_rrset.c
+++ b/util/data/packed_rrset.c
@@ -276,6 +276,7 @@ int packed_rr_to_string(struct ub_packed_rrset_key* rrset, size_t i,
 		entry.data;
 	uint8_t rr[65535];
 	size_t rlen = rrset->rk.dname_len + 2 + 2 + 4 + d->rr_len[i];
+	time_t adjust = 0;
 	log_assert(dest_len > 0 && dest);
 	if(rlen > dest_len) {
 		dest[0] = 0;
@@ -286,8 +287,10 @@ int packed_rr_to_string(struct ub_packed_rrset_key* rrset, size_t i,
 		memmove(rr+rrset->rk.dname_len, &rrset->rk.type, 2);
 	else	sldns_write_uint16(rr+rrset->rk.dname_len, LDNS_RR_TYPE_RRSIG);
 	memmove(rr+rrset->rk.dname_len+2, &rrset->rk.rrset_class, 2);
+	adjust = SERVE_ORIGINAL_TTL ? d->ttl_add : now;
+	if (d->rr_ttl[i] < adjust) adjust = d->rr_ttl[i]; /* Prevent negative TTL overflow */
 	sldns_write_uint32(rr+rrset->rk.dname_len+4,
-		(uint32_t)(d->rr_ttl[i]-(SERVE_ORIGINAL_TTL ? d->ttl_add : now)));
+		(uint32_t)(d->rr_ttl[i]-adjust));
 	memmove(rr+rrset->rk.dname_len+8, d->rr_data[i], d->rr_len[i]);
 	if(sldns_wire2str_rr_buf(rr, rlen, dest, dest_len) == -1) {
 		log_info("rrbuf failure %d %s", (int)d->rr_len[i], dest);
@@ -333,6 +336,7 @@ packed_rrset_copy_region(struct ub_packed_rrset_key* key,
 	struct packed_rrset_data* data = (struct packed_rrset_data*)
 		key->entry.data;
 	size_t dsize, i;
+	time_t adjust = 0;
 	if(!ck)
 		return NULL;
 	ck->id = key->id;
@@ -351,14 +355,15 @@ packed_rrset_copy_region(struct ub_packed_rrset_key* key,
 	ck->entry.data = d;
 	packed_rrset_ptr_fixup(d);
 	/* make TTLs relative - once per rrset */
+	adjust = SERVE_ORIGINAL_TTL ? data->ttl_add : now;
 	for(i=0; i<d->count + d->rrsig_count; i++) {
-		if(d->rr_ttl[i] < now)
+		if(d->rr_ttl[i] < adjust)
 			d->rr_ttl[i] = SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0;
-		else	d->rr_ttl[i] -= SERVE_ORIGINAL_TTL ? data->ttl_add : now;
+		else	d->rr_ttl[i] -= adjust;
 	}
-	if(d->ttl < now)
+	if(d->ttl < adjust)
 		d->ttl = SERVE_EXPIRED?SERVE_EXPIRED_REPLY_TTL:0;
-	else	d->ttl -= SERVE_ORIGINAL_TTL ? data->ttl_add : now;
+	else	d->ttl -= adjust;
 	d->ttl_add = 0; /* TTLs have been made relative */
 	return ck;
 }

From 54b84381f43937f26e3826f2c4024ae83645599b Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Sun, 24 Jan 2021 18:12:08 +0100
Subject: [PATCH 183/208] tdir test for padding option

---
 testdata/padding.tdir/padding.conf        |  18 ++++
 testdata/padding.tdir/padding.conf2       |  36 +++++++
 testdata/padding.tdir/padding.dsc         |  16 ++++
 testdata/padding.tdir/padding.msgsizes    |   4 +
 testdata/padding.tdir/padding.post        |  23 +++++
 testdata/padding.tdir/padding.pre         |  65 +++++++++++++
 testdata/padding.tdir/padding.test        | 109 ++++++++++++++++++++++
 testdata/padding.tdir/padding.testns      |  33 +++++++
 testdata/padding.tdir/unbound_control.key |  39 ++++++++
 testdata/padding.tdir/unbound_control.pem |  22 +++++
 testdata/padding.tdir/unbound_server.key  |  39 ++++++++
 testdata/padding.tdir/unbound_server.pem  |  22 +++++
 12 files changed, 426 insertions(+)
 create mode 100644 testdata/padding.tdir/padding.conf
 create mode 100644 testdata/padding.tdir/padding.conf2
 create mode 100644 testdata/padding.tdir/padding.dsc
 create mode 100644 testdata/padding.tdir/padding.msgsizes
 create mode 100644 testdata/padding.tdir/padding.post
 create mode 100644 testdata/padding.tdir/padding.pre
 create mode 100644 testdata/padding.tdir/padding.test
 create mode 100644 testdata/padding.tdir/padding.testns
 create mode 100644 testdata/padding.tdir/unbound_control.key
 create mode 100644 testdata/padding.tdir/unbound_control.pem
 create mode 100644 testdata/padding.tdir/unbound_server.key
 create mode 100644 testdata/padding.tdir/unbound_server.pem

diff --git a/testdata/padding.tdir/padding.conf b/testdata/padding.tdir/padding.conf
new file mode 100644
index 000000000..8ae6428cc
--- /dev/null
+++ b/testdata/padding.tdir/padding.conf
@@ -0,0 +1,18 @@
+server:
+	interface: 127.0.0.1
+	port: @PORT@
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+
+	tls-cert-bundle: "unbound_server.pem"
+	tls-upstream: yes
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@#unbound"
+
+
diff --git a/testdata/padding.tdir/padding.conf2 b/testdata/padding.tdir/padding.conf2
new file mode 100644
index 000000000..193209233
--- /dev/null
+++ b/testdata/padding.tdir/padding.conf2
@@ -0,0 +1,36 @@
+# this is the upstream server that has pipelining and responds to queries.
+server:
+	verbosity: 1
+	# num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	port: @PORT@
+	use-syslog: no
+	directory: .
+	pidfile: "unbound2.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	tls-port: @PORT@
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+	tcp-idle-timeout: 10000
+	log-queries: yes
+	log-replies: yes
+	log-identity: "upstream"
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
+dnstap:
+        dnstap-enable: yes
+        dnstap-socket-path: "dnstap.socket"
+        dnstap-send-identity: yes
+        dnstap-send-version: yes
+        #dnstap-identity
+        #dnstap-version
+        dnstap-log-resolver-query-messages: no
+        dnstap-log-resolver-response-messages: no
+        dnstap-log-client-query-messages: yes
+        dnstap-log-client-response-messages: yes
+        dnstap-log-forwarder-query-messages: no
+        dnstap-log-forwarder-response-messages: no
diff --git a/testdata/padding.tdir/padding.dsc b/testdata/padding.tdir/padding.dsc
new file mode 100644
index 000000000..37aceb353
--- /dev/null
+++ b/testdata/padding.tdir/padding.dsc
@@ -0,0 +1,16 @@
+BaseName: padding
+Version: 1.0
+Description: Test EDNS0 padding option (RFC7830 and RFC8467).
+CreationDate: Sun Jan 24 16:41:42 CET 2021
+Maintainer: Willem Toorop
+Category: 
+Component:
+CmdDepends: 
+Depends: 
+Help:
+Pre: padding.pre
+Post: padding.post
+Test: padding.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/testdata/padding.tdir/padding.msgsizes b/testdata/padding.tdir/padding.msgsizes
new file mode 100644
index 000000000..c43d05a96
--- /dev/null
+++ b/testdata/padding.tdir/padding.msgsizes
@@ -0,0 +1,4 @@
+;; MSG SIZE  rcvd: 128
+;; MSG SIZE  rcvd: 468
+;; MSG SIZE  rcvd: 128
+;; MSG SIZE  rcvd: 936
diff --git a/testdata/padding.tdir/padding.post b/testdata/padding.tdir/padding.post
new file mode 100644
index 000000000..826798a8f
--- /dev/null
+++ b/testdata/padding.tdir/padding.post
@@ -0,0 +1,23 @@
+# #-- padding.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
+PRE="../.."
+if grep "define USE_DNSTAP 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+kill_pid $DNSTAP_SOCKET_PID
+kill_pid $FWD_PID
+kill_pid `cat unbound2.pid`
+if test -f unbound2.log; then
+	echo ">>> upstream log"
+	cat unbound2.log
+fi
+#kill_pid $UNBOUND_PID
+kill_pid `cat unbound.pid`
+if test -f unbound.log; then
+	echo ">>> unbound log"
+	cat unbound.log
+fi
diff --git a/testdata/padding.tdir/padding.pre b/testdata/padding.tdir/padding.pre
new file mode 100644
index 000000000..6022cf4e4
--- /dev/null
+++ b/testdata/padding.tdir/padding.pre
@@ -0,0 +1,65 @@
+# #-- padding.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 USE_DNSTAP 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
+get_random_port 3 
+UNBOUND_PORT=$RND_PORT
+UPSTREAM_PORT=$(($RND_PORT + 1))
+FWD_PORT=$(($RND_PORT + 2))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+
+# start ldns-testnd
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT padding.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# start the dnstap log server
+# the -vvvv flag prints protocol and connection information from the
+# unbound-dnstap-socket server.
+# the -l flag prints the DNS info in the DNSTAP packet in multiline output.
+# stderr is the '-vvvv' server logs and errors.
+# stdout is the one-line packet logs (or with -l, multiline).
+$PRE/unbound-dnstap-socket -u dnstap.socket -l -vvvv 2>tap.errlog >tap.log &
+if test $? -ne 0; then
+        echo "could not start unbound-dnstap-socket server"
+        exit 1
+fi
+DNSTAP_SOCKET_PID=$!
+echo "DNSTAP_SOCKET_PID=$DNSTAP_SOCKET_PID" >> .tpkg.var.test
+# wait for the server to go up and make the dnstap.socket file
+wait_server_up "tap.errlog" "creating unix socket"
+if test ! -S dnstap.socket; then 
+        echo "the dnstap.socket file does not exist!"
+fi
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < padding.conf > ub.conf
+# start unbound in the background
+$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+#$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+# make upstream config file
+sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < padding.conf2 > ub2.conf
+# start upstream unbound in the background
+$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
+#$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
+UPSTREAM_PID=$!
+echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test
+
+wait_ldns_testns_up fwd.log
+wait_unbound_up unbound.log
+wait_unbound_up unbound2.log
+
+cat .tpkg.var.test
+
diff --git a/testdata/padding.tdir/padding.test b/testdata/padding.tdir/padding.test
new file mode 100644
index 000000000..53874b585
--- /dev/null
+++ b/testdata/padding.tdir/padding.test
@@ -0,0 +1,109 @@
+echo There we go...
+
+# #-- padding.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 USE_DNSTAP 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
+
+echo "> query www.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile
+echo "> check answer"
+if grep "10.20.30.40" outfile; then
+        echo "OK"
+else
+        echo "> cat logfiles"
+        cat tap.log
+        cat tap.errlog
+        cat fwd.log
+	cat unbound2.log 
+        cat unbound.log
+        echo "Not OK"
+        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.
+if grep "www.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "www.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "www.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "www.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "www.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "www.example.com" tap.log >/dev/null; then :; else sleep 10; fi
+if grep "www.example.com" tap.log; then echo "yes it is in tap.log";
+else
+        echo "information not in tap.log"
+        echo "failed"
+        echo "> cat logfiles"
+        cat tap.log
+        cat tap.errlog
+        cat fwd.log
+        cat unbound.log
+        echo "Not OK"
+        exit 1
+fi
+
+echo "> query txt.example.com."
+dig @127.0.0.1 -p $UNBOUND_PORT txt.example.com. TXT | tee outfile
+echo "> check answer"
+if grep "Lorem ipsum" outfile; then
+        echo "OK"
+else
+        echo "> cat logfiles"
+        cat tap.log
+        cat tap.errlog
+        cat fwd.log
+	cat unbound2.log 
+        cat unbound.log
+        echo "Not OK"
+        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.
+if grep "txt.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "txt.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "txt.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "txt.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "txt.example.com" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "txt.example.com" tap.log >/dev/null; then :; else sleep 10; fi
+if grep "txt.example.com" tap.log; then echo "yes it is in tap.log";
+else
+        echo "information not in tap.log"
+        echo "failed"
+        echo "> cat logfiles"
+        cat tap.log
+        cat tap.errlog
+        cat fwd.log
+        cat unbound.log
+        echo "Not OK"
+        exit 1
+fi
+
+echo "> wait for message to be fully written to log"
+sleep 1
+grep '^;; MSG SIZE  rcvd: ' tap.log > message.sizes
+if diff message.sizes padding.msgsizes
+then
+	echo "OK"
+	exit 0
+else
+        echo "unexpected message sizes"
+        echo "failed"
+        echo "> cat logfiles"
+        cat tap.log
+        cat tap.errlog
+        cat fwd.log
+        cat unbound.log
+        echo "Not OK"
+        exit 1
+fi
diff --git a/testdata/padding.tdir/padding.testns b/testdata/padding.tdir/padding.testns
new file mode 100644
index 000000000..714c35912
--- /dev/null
+++ b/testdata/padding.tdir/padding.testns
@@ -0,0 +1,33 @@
+; 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
+txt	IN	TXT
+SECTION ANSWER
+txt	IN	TXT	"Lorem ipsum dolor sit amet, consectetur adipiscing "
+txt	IN	TXT	"elit, sed do eiusmod tempor incididunt ut labore et "
+txt	IN	TXT	"dolore magna aliqua. Ut enim ad minim veniam, quis "
+txt	IN	TXT	"nostrud exercitation ullamco laboris nisi ut aliquip "
+txt	IN	TXT	"ex ea commodo consequat. Duis aute irure dolor in "
+txt	IN	TXT	"reprehenderit in voluptate velit esse cillum dolore "
+txt	IN	TXT	"eu fugiat nulla pariatur. Excepteur sint occaecat "
+txt	IN	TXT	"cupidatat non proident, sunt in culpa qui officia "
+txt	IN	TXT	"deserunt mollit anim id est laborum."
+ENTRY_END
+
+
diff --git a/testdata/padding.tdir/unbound_control.key b/testdata/padding.tdir/unbound_control.key
new file mode 100644
index 000000000..753a4ef61
--- /dev/null
+++ b/testdata/padding.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/padding.tdir/unbound_control.pem b/testdata/padding.tdir/unbound_control.pem
new file mode 100644
index 000000000..a1edf7017
--- /dev/null
+++ b/testdata/padding.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/padding.tdir/unbound_server.key b/testdata/padding.tdir/unbound_server.key
new file mode 100644
index 000000000..370a7bbb2
--- /dev/null
+++ b/testdata/padding.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/padding.tdir/unbound_server.pem b/testdata/padding.tdir/unbound_server.pem
new file mode 100644
index 000000000..986807310
--- /dev/null
+++ b/testdata/padding.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 efc8022ca4d5de01017915c87d375c82362e450a Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Sun, 24 Jan 2021 18:29:00 +0100
Subject: [PATCH 184/208] padding.tdir text in single TXT RR

So the sentences are not re-ordered and the text makes sense!
---
 testdata/padding.tdir/padding.testns | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/testdata/padding.tdir/padding.testns b/testdata/padding.tdir/padding.testns
index 714c35912..599323646 100644
--- a/testdata/padding.tdir/padding.testns
+++ b/testdata/padding.tdir/padding.testns
@@ -19,15 +19,7 @@ ADJUST copy_id
 SECTION QUESTION
 txt	IN	TXT
 SECTION ANSWER
-txt	IN	TXT	"Lorem ipsum dolor sit amet, consectetur adipiscing "
-txt	IN	TXT	"elit, sed do eiusmod tempor incididunt ut labore et "
-txt	IN	TXT	"dolore magna aliqua. Ut enim ad minim veniam, quis "
-txt	IN	TXT	"nostrud exercitation ullamco laboris nisi ut aliquip "
-txt	IN	TXT	"ex ea commodo consequat. Duis aute irure dolor in "
-txt	IN	TXT	"reprehenderit in voluptate velit esse cillum dolore "
-txt	IN	TXT	"eu fugiat nulla pariatur. Excepteur sint occaecat "
-txt	IN	TXT	"cupidatat non proident, sunt in culpa qui officia "
-txt	IN	TXT	"deserunt mollit anim id est laborum."
+txt	IN	TXT	"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 ENTRY_END
 
 

From 4694323b1cfe38bc4cc53e65d1d0899ed11e1a2b Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Sun, 24 Jan 2021 20:17:44 +0100
Subject: [PATCH 185/208] Test some different padding sizes

---
 testdata/padding.tdir/padding.conf     |  9 ++++
 testdata/padding.tdir/padding.conf2    | 11 ++++
 testdata/padding.tdir/padding.msgsizes | 16 ++++++
 testdata/padding.tdir/padding.pre      | 10 ++--
 testdata/padding.tdir/padding.test     | 75 +++++++++++++++++++++++---
 testdata/padding.tdir/padding.testns   |  9 ++++
 6 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/testdata/padding.tdir/padding.conf b/testdata/padding.tdir/padding.conf
index 8ae6428cc..c310d355d 100644
--- a/testdata/padding.tdir/padding.conf
+++ b/testdata/padding.tdir/padding.conf
@@ -11,6 +11,15 @@ server:
 	tls-cert-bundle: "unbound_server.pem"
 	tls-upstream: yes
 
+remote-control:
+        control-enable: yes
+        control-interface: 127.0.0.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@#unbound"
diff --git a/testdata/padding.tdir/padding.conf2 b/testdata/padding.tdir/padding.conf2
index 193209233..98be8fec7 100644
--- a/testdata/padding.tdir/padding.conf2
+++ b/testdata/padding.tdir/padding.conf2
@@ -18,9 +18,20 @@ server:
 	log-replies: yes
 	log-identity: "upstream"
 
+remote-control:
+        control-enable: yes
+        control-interface: 127.0.0.1
+        # control-interface: ::1
+        control-port: @CONTROL_PORT2@
+        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@"
+
 dnstap:
         dnstap-enable: yes
         dnstap-socket-path: "dnstap.socket"
diff --git a/testdata/padding.tdir/padding.msgsizes b/testdata/padding.tdir/padding.msgsizes
index c43d05a96..f0d4a496d 100644
--- a/testdata/padding.tdir/padding.msgsizes
+++ b/testdata/padding.tdir/padding.msgsizes
@@ -2,3 +2,19 @@
 ;; MSG SIZE  rcvd: 468
 ;; MSG SIZE  rcvd: 128
 ;; MSG SIZE  rcvd: 936
+;; MSG SIZE  rcvd: 128
+;; MSG SIZE  rcvd: 60
+;; MSG SIZE  rcvd: 128
+;; MSG SIZE  rcvd: 502
+;; MSG SIZE  rcvd: 44
+;; MSG SIZE  rcvd: 60
+;; MSG SIZE  rcvd: 44
+;; MSG SIZE  rcvd: 502
+;; MSG SIZE  rcvd: 48
+;; MSG SIZE  rcvd: 64
+;; MSG SIZE  rcvd: 48
+;; MSG SIZE  rcvd: 512
+;; MSG SIZE  rcvd: 48
+;; MSG SIZE  rcvd: 512
+;; MSG SIZE  rcvd: 48
+;; MSG SIZE  rcvd: 512
diff --git a/testdata/padding.tdir/padding.pre b/testdata/padding.tdir/padding.pre
index 6022cf4e4..4a13d0229 100644
--- a/testdata/padding.tdir/padding.pre
+++ b/testdata/padding.tdir/padding.pre
@@ -8,13 +8,17 @@ PRE="../.."
 . ../common.sh
 if grep "define USE_DNSTAP 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 
-get_random_port 3 
+get_random_port 5
 UNBOUND_PORT=$RND_PORT
 UPSTREAM_PORT=$(($RND_PORT + 1))
 FWD_PORT=$(($RND_PORT + 2))
+CONTROL_PORT=$(($RND_PORT + 3))
+CONTROL_PORT2=$(($RND_PORT + 4))
 echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test
 echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+echo "CONTROL_PORT=$CONTROL_PORT" >> .tpkg.var.test
+echo "CONTROL_PORT2=$CONTROL_PORT2" >> .tpkg.var.test
 
 # start ldns-testnd
 get_ldns_testns
@@ -42,7 +46,7 @@ if test ! -S dnstap.socket; then
 fi
 
 # make config file
-sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < padding.conf > ub.conf
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < padding.conf > ub.conf
 # start unbound in the background
 $PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
 #$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log &
@@ -50,7 +54,7 @@ UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
 
 # make upstream config file
-sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < padding.conf2 > ub2.conf
+sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@CONTROL_PORT2\@/'$CONTROL_PORT2'/' < padding.conf2 > ub2.conf
 # start upstream unbound in the background
 $PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 &
 #$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log &
diff --git a/testdata/padding.tdir/padding.test b/testdata/padding.tdir/padding.test
index 53874b585..5111d8139 100644
--- a/testdata/padding.tdir/padding.test
+++ b/testdata/padding.tdir/padding.test
@@ -10,7 +10,7 @@ PRE="../.."
 . ../common.sh
 if grep "define USE_DNSTAP 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi
 
-echo "> query www.example.com."
+echo "> query www.example.com. A"
 dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile
 echo "> check answer"
 if grep "10.20.30.40" outfile; then
@@ -50,7 +50,7 @@ else
         exit 1
 fi
 
-echo "> query txt.example.com."
+echo "> query txt.example.com. TXT"
 dig @127.0.0.1 -p $UNBOUND_PORT txt.example.com. TXT | tee outfile
 echo "> check answer"
 if grep "Lorem ipsum" outfile; then
@@ -65,8 +65,6 @@ else
         echo "Not OK"
         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.
@@ -89,12 +87,75 @@ else
         exit 1
 fi
 
-echo "> wait for message to be fully written to log"
-sleep 1
+echo "> flush cache entries."
+$PRE/unbound-control -c ub.conf flush_type www.example.com A
+$PRE/unbound-control -c ub.conf flush_type txt.example.com TXT
+echo "> disable padding of responses."
+$PRE/unbound-control -c ub2.conf set_option pad-responses: no
+echo "> query www.example.com. A"
+dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. A | tee outfile
+echo "> query txt.example.com. TXT"
+dig @127.0.0.1 -p $UNBOUND_PORT txt.example.com. TXT | tee outfile
+echo "> flush cache entries."
+$PRE/unbound-control -c ub.conf flush_type www.example.com A
+$PRE/unbound-control -c ub.conf flush_type txt.example.com TXT
+echo "> enable padding of responses."
+$PRE/unbound-control -c ub2.conf set_option pad-responses: yes
+echo "> set pad responses block size to 64"
+$PRE/unbound-control -c ub2.conf set_option pad-responses-block-size: 64
+echo "> disable padding of queries."
+$PRE/unbound-control -c ub.conf set_option pad-queries: no
+echo "> query www.example.com. A"
+dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. A | tee outfile
+echo "> query txt.example.com. TXT"
+dig @127.0.0.1 -p $UNBOUND_PORT txt.example.com. TXT | tee outfile
+echo "> flush cache entries."
+$PRE/unbound-control -c ub.conf flush_type www.example.com A
+$PRE/unbound-control -c ub.conf flush_type txt.example.com TXT
+echo "> enable padding of queries."
+$PRE/unbound-control -c ub.conf set_option pad-queries: yes
+echo "> set pad queries block size to 48"
+$PRE/unbound-control -c ub.conf set_option pad-queries-block-size: 48
+echo "> query www.example.com. A"
+dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. A | tee outfile
+echo "> query txt.example.com. TXT"
+dig @127.0.0.1 -p $UNBOUND_PORT txt.example.com. TXT | tee outfile
+echo "> flush cache entries."
+$PRE/unbound-control -c ub.conf flush_type www.example.com A
+$PRE/unbound-control -c ub.conf flush_type txt.example.com TXT
+echo "> set pad responses block size to 512"
+$PRE/unbound-control -c ub2.conf set_option pad-responses-block-size: 512
+echo "> query www.example.com. A"
+dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. A | tee outfile
+echo "> query fin.example.com. TXT"
+dig @127.0.0.1 -p $UNBOUND_PORT fin.example.com. TXT | tee outfile
+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.
+if grep "fini" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "fini" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "fini" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "fini" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "fini" tap.log >/dev/null; then :; else sleep 1; fi
+if grep "fini" tap.log >/dev/null; then :; else sleep 10; fi
+if grep "fini" tap.log; then echo "yes it is in tap.log";
+else
+        echo "information not in tap.log"
+        echo "failed"
+        echo "> cat logfiles"
+        cat tap.log
+        cat tap.errlog
+        cat fwd.log
+        cat unbound.log
+        echo "Not OK"
+        exit 1
+fi
+
 grep '^;; MSG SIZE  rcvd: ' tap.log > message.sizes
+
 if diff message.sizes padding.msgsizes
 then
-	echo "OK"
+	echo "OK - Message sizes matched expected sizes"
 	exit 0
 else
         echo "unexpected message sizes"
diff --git a/testdata/padding.tdir/padding.testns b/testdata/padding.tdir/padding.testns
index 599323646..bd3718ff6 100644
--- a/testdata/padding.tdir/padding.testns
+++ b/testdata/padding.tdir/padding.testns
@@ -22,4 +22,13 @@ SECTION ANSWER
 txt	IN	TXT	"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR AA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+fin	IN	TXT
+SECTION ANSWER
+fin	IN	TXT	"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." "fini"
+ENTRY_END
 

From ca2139bf3d4e10aa7fb8b810c08ca861194f72f6 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 25 Jan 2021 15:13:54 +0100
Subject: [PATCH 186/208] Some review nits from George

---
 services/outside_network.c | 2 +-
 util/config_file.h         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/outside_network.c b/services/outside_network.c
index 7527a6321..11559ffac 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -3039,7 +3039,7 @@ outnet_serviced_query(struct outside_network* outnet,
 			addrlen, zone, zonelen, (int)qinfo->qtype,
 			qstate->edns_opts_back_out,
 			( ssl_upstream && env->cfg->pad_queries
-			? env->cfg->pad_queries_block_size : 0));
+			? env->cfg->pad_queries_block_size : 0 ));
 		if(!sq) {
 			free(cb);
 			return NULL;
diff --git a/util/config_file.h b/util/config_file.h
index 480b800c0..8f9dfa75a 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -601,12 +601,12 @@ struct config_file {
 	/** number of slabs for dnscrypt nonces cache */
 	size_t dnscrypt_nonce_cache_slabs;
 
-	/** EDNS padding according to FC7830 and RFC8467 */
+	/** EDNS padding according to RFC7830 and RFC8467 */
 	/** true to enable padding of responses (default: on) */
 	int pad_responses;
 	/** block size with which to pad encrypted responses (default: 468) */
 	size_t pad_responses_block_size;
-	/** true to enable padding of queries (default: off) */
+	/** true to enable padding of queries (default: on) */
 	int pad_queries;
 	/** block size with which to pad encrypted queries (default: 128) */
 	size_t pad_queries_block_size;

From b7acaaa9b836bec4dc934d9c73f6655989699ba4 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 25 Jan 2021 19:26:19 +0100
Subject: [PATCH 187/208] - Update example.con.in and add a testcase for PR
 #275.

---
 doc/example.conf.in             |   7 ++
 testdata/serve_original_ttl.rpl | 136 ++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 testdata/serve_original_ttl.rpl

diff --git a/doc/example.conf.in b/doc/example.conf.in
index b9b1c0525..9db622a47 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -598,6 +598,13 @@ server:
 	# A recommended value is 1800.
 	# serve-expired-client-timeout: 0
 
+	# Return the original TTL as received from the upstream name server rather
+	# than the decrementing TTL as stored in the cache.  Enabling this feature
+	# does not impact cache expiry, it only changes the TTL unbound embeds in
+	# responses to queries. Note that enabling this feature implicitly disables
+	# enforcement of the configured minimum and maximum TTL.
+	# serve-original-ttl: no
+
 	# Have the validator log failed validations for your diagnosis.
 	# 0: off. 1: A line per failed user query. 2: With reason and bad IP.
 	# val-log-level: 0
diff --git a/testdata/serve_original_ttl.rpl b/testdata/serve_original_ttl.rpl
new file mode 100644
index 000000000..630fb39a4
--- /dev/null
+++ b/testdata/serve_original_ttl.rpl
@@ -0,0 +1,136 @@
+; config options
+server:
+	access-control: 127.0.0.1 allow_snoop
+	module-config: "validator iterator"
+	qname-minimisation: "no"
+	minimal-responses: no
+	serve-original-ttl: yes
+	cache-max-ttl: 1000
+	cache-min-ttl: 20
+	serve-expired: yes
+	serve-expired-reply-ttl: 123
+
+stub-zone:
+	name: "example.com"
+	stub-addr: 1.2.3.4
+CONFIG_END
+
+SCENARIO_BEGIN Test serve-original-ttl
+; Scenario overview:
+; - query for example.com. IN A
+; - check that we get an answer for example.com. IN A with the correct TTL
+; - query again after a couple seconds and check that we get the original TTL
+; (next steps are combination with serve-expired)
+; - query again after the TTL expired
+; - check that we get the expired cached answer with the original TTL
+
+; 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.
+		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.com. IN A
+		SECTION ANSWER
+			example.com. 10 IN A 5.6.7.8
+		SECTION AUTHORITY
+			example.com. IN NS ns.example.com.
+		SECTION ADDITIONAL
+			ns.example.com. IN A 1.2.3.4
+	ENTRY_END
+RANGE_END
+
+; Query with RD flag
+STEP 1 QUERY
+ENTRY_BEGIN
+	REPLY RD
+	SECTION QUESTION
+		example.com. IN A
+ENTRY_END
+
+; Check that we got the correct answer (should be cached)
+STEP 10 CHECK_ANSWER
+ENTRY_BEGIN
+	MATCH all ttl
+	REPLY QR RD RA NOERROR
+	SECTION QUESTION
+		example.com. IN A
+	SECTION ANSWER
+		example.com. 10 IN A 5.6.7.8
+	SECTION AUTHORITY
+		example.com. IN NS ns.example.com.
+	SECTION ADDITIONAL
+		ns.example.com. IN A 1.2.3.4
+ENTRY_END
+
+; Wait a couple of seconds (< 10)
+STEP 11 TIME_PASSES ELAPSE 5
+
+; Query again
+STEP 20 QUERY
+ENTRY_BEGIN
+	REPLY
+	SECTION QUESTION
+		example.com. IN A
+ENTRY_END
+
+; Check that we got the cached answer with the original TTL
+; (Passively checks that minimum and maximum TTLs are ignored)
+STEP 30 CHECK_ANSWER
+ENTRY_BEGIN
+	MATCH all ttl
+	REPLY QR RA NOERROR
+	SECTION QUESTION
+		example.com. IN A
+	SECTION ANSWER
+		example.com.  10 A 5.6.7.8
+	SECTION AUTHORITY
+		example.com. 3600 NS ns.example.com.
+	SECTION ADDITIONAL
+		ns.example.com. 3600 A 1.2.3.4
+ENTRY_END
+
+; Wait for the TTL to expire
+STEP 31 TIME_PASSES ELAPSE 3601
+
+; Query again
+STEP 40 QUERY
+ENTRY_BEGIN
+	REPLY
+	SECTION QUESTION
+		example.com. IN A
+ENTRY_END
+
+; Check that we got a stale answer with the original TTL
+STEP 50 CHECK_ANSWER
+ENTRY_BEGIN
+	MATCH all ttl
+	REPLY QR RA NOERROR
+	SECTION QUESTION
+		example.com. IN A
+	SECTION ANSWER
+		example.com.  10 A 5.6.7.8
+	SECTION AUTHORITY
+		example.com. NS ns.example.com.
+	SECTION ADDITIONAL
+		ns.example.com. A 1.2.3.4
+ENTRY_END
+
+; Give time for the pending query to get answered
+STEP 51 TRAFFIC
+
+SCENARIO_END

From 83d9f9d26801296fd1f5ee6200f5b15c1092da30 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 26 Jan 2021 12:55:55 +0100
Subject: [PATCH 188/208] Changelog entry for: - Merge PR #408 from fobser:
 Prevent a few more yacc clashes.

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

diff --git a/doc/Changelog b/doc/Changelog
index f77355945..2bad8d96b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+26 January 2022: George
+	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
+
 22 January 2022: Willem
 	- Padding of queries and responses with DNS over TLS as specified in
 	  RFC7830 and RFC8467.

From 2925fa46b06e1fef72c523d65635875754280bab Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 26 Jan 2021 13:01:33 +0100
Subject: [PATCH 189/208] Changelog entry for: - Merge PR #275 by Roland van
 Rijswijk-Deij, Add feature to return the   original instead of a decrementing
 TTL ('serve-original-ttl').

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

diff --git a/doc/Changelog b/doc/Changelog
index 2bad8d96b..1c8af380d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
+	- Merge PR #275 from Roland van Rijswijk-Deij: Add feature to return the
+	  original instead of a decrementing TTL ('serve-original-ttl')
 
 22 January 2022: Willem
 	- Padding of queries and responses with DNS over TLS as specified in

From 3b9c7e28263da07e69e38e1739a5d4c77eea6d67 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 26 Jan 2021 13:19:05 +0100
Subject: [PATCH 190/208] Changelog entry for: - Merge PR #355 from noloader:
 Make ICANN Update CA and DS Trust Anchor   static data.

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

diff --git a/doc/Changelog b/doc/Changelog
index 1c8af380d..fed967d55 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
 	- Merge PR #275 from Roland van Rijswijk-Deij: Add feature to return the
 	  original instead of a decrementing TTL ('serve-original-ttl')
+	- Merge PR #355 from noloader: Make ICANN Update CA and DS Trust Anchor
+	  static data.
 
 22 January 2022: Willem
 	- Padding of queries and responses with DNS over TLS as specified in

From 3124eb052df3144f3b996e8367ed76bc23e927ac Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 26 Jan 2021 15:31:50 +0100
Subject: [PATCH 191/208] - Ignore cache blacklisting when trying to reply with
 expired data from   cache. (#394)

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

diff --git a/doc/Changelog b/doc/Changelog
index fed967d55..af53d7836 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,8 @@
 	  original instead of a decrementing TTL ('serve-original-ttl')
 	- Merge PR #355 from noloader: Make ICANN Update CA and DS Trust Anchor
 	  static data.
+	- Ignore cache blacklisting when trying to reply with expired data from
+	  cache (#394).
 
 22 January 2022: Willem
 	- Padding of queries and responses with DNS over TLS as specified in
diff --git a/services/mesh.c b/services/mesh.c
index 69f4d75e3..91d23debf 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1929,7 +1929,9 @@ mesh_serve_expired_callback(void* arg)
 	verbose(VERB_ALGO, "Serve expired: Trying to reply with expired data");
 	comm_timer_delete(qstate->serve_expired_data->timer);
 	qstate->serve_expired_data->timer = NULL;
-	if(qstate->blacklist || qstate->no_cache_lookup || qstate->is_drop) {
+	/* If is_drop or no_cache_lookup (modules that handle their own cache e.g.,
+	 * subnetmod) ignore stale data from the main cache. */
+	if(qstate->no_cache_lookup || qstate->is_drop) {
 		verbose(VERB_ALGO,
 			"Serve expired: Not allowed to look into cache for stale");
 		return;

From 8ad4c9f92ae3acafac386925d12c1ee084e5a777 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 26 Jan 2021 17:29:22 +0100
Subject: [PATCH 192/208] - Fix compile of unbound-dnstap-socket without dnstap
 installed.

---
 Makefile.in   | 3 ++-
 configure     | 2 ++
 configure.ac  | 2 +-
 doc/Changelog | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 99943a650..6809881b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -248,6 +248,7 @@ DNSTAP_SOCKET_SRC=dnstap/unbound-dnstap-socket.c
 DNSTAP_SOCKET_OBJ=unbound-dnstap-socket.lo
 DNSTAP_SOCKET_OBJ_LINK=$(DNSTAP_SOCKET_OBJ) $(COMMON_OBJ) \
 $(COMPAT_OBJ) $(SLDNS_OBJ)
+DNSTAP_SOCKET_TESTBIN=@DNSTAP_SOCKET_TESTBIN@
 LIBUNBOUND_SRC=libunbound/context.c libunbound/libunbound.c \
 libunbound/libworker.c
 LIBUNBOUND_OBJ=context.lo libunbound.lo libworker.lo ub_event_pluggable.lo
@@ -323,7 +324,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) dohclient$(EXEEXT) \
+	$(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \
 	testbound$(EXEEXT) unittest$(EXEEXT)
 tests:	all $(TEST_BIN)
 
diff --git a/configure b/configure
index 7957f0dd6..9d10e6ee7 100755
--- a/configure
+++ b/configure
@@ -649,6 +649,7 @@ ENABLE_DNSCRYPT
 ENABLE_DNSCRYPT_XCHACHA20
 DNSTAP_OBJ
 DNSTAP_SRC
+DNSTAP_SOCKET_TESTBIN
 DNSTAP_SOCKET_PATH
 opt_dnstap_socket_path
 ENABLE_DNSTAP
@@ -21191,6 +21192,7 @@ _ACEOF
 
 	DNSTAP_SOCKET_PATH="$hdr_dnstap_socket_path"
 
+	DNSTAP_SOCKET_TESTBIN='unbound-dnstap-socket$(EXEEXT)'
 
         DNSTAP_SRC="dnstap/dnstap.c dnstap/dnstap.pb-c.c dnstap/dnstap_fstrm.c dnstap/dtstream.c"
 
diff --git a/configure.ac b/configure.ac
index 3e872bca9..ee9ff1696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1743,7 +1743,7 @@ dt_DNSTAP([$UNBOUND_RUN_DIR/dnstap.sock],
         AC_DEFINE_UNQUOTED(DNSTAP_SOCKET_PATH,
             ["$hdr_dnstap_socket_path"], [default dnstap socket path])
 	AC_SUBST(DNSTAP_SOCKET_PATH,["$hdr_dnstap_socket_path"])
-
+	AC_SUBST(DNSTAP_SOCKET_TESTBIN,['unbound-dnstap-socket$(EXEEXT)'])
         AC_SUBST([DNSTAP_SRC], ["dnstap/dnstap.c dnstap/dnstap.pb-c.c dnstap/dnstap_fstrm.c dnstap/dtstream.c"])
         AC_SUBST([DNSTAP_OBJ], ["dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo"])
     ],
diff --git a/doc/Changelog b/doc/Changelog
index af53d7836..0ccec087a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,9 @@
 	- Ignore cache blacklisting when trying to reply with expired data from
 	  cache (#394).
 
+26 January 2022: Wouter
+	- Fix compile of unbound-dnstap-socket without dnstap installed.
+
 22 January 2022: Willem
 	- Padding of queries and responses with DNS over TLS as specified in
 	  RFC7830 and RFC8467.

From 9d700e1f850fca1c687789e57f9c43236474a133 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 28 Jan 2021 09:04:00 +0100
Subject: [PATCH 193/208] - Annotate that we ignore the return value of
 if_indextoname.

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

diff --git a/doc/Changelog b/doc/Changelog
index 0ccec087a..268d51ff2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+28 January 2022: Wouter
+	- Annotate that we ignore the return value of if_indextoname.
+
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
 	- Merge PR #275 from Roland van Rijswijk-Deij: Add feature to return the
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 629d4de72..b790660f2 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1456,7 +1456,7 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres
 				log_err("inet_ntop failed");
 				return 0;
 			}
-			if_indextoname(in6->sin6_scope_id,
+			(void)if_indextoname(in6->sin6_scope_id,
 				(char *)if_index_name);
 			if (strlen(if_index_name) != 0) {
 				snprintf(addr_buf, sizeof(addr_buf),

From 9e6f8567ded09f432842afd96b9fb0a160e037c0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 28 Jan 2021 09:07:16 +0100
Subject: [PATCH 194/208] - Fix to use correct type for label count in rpz
 routine.

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

diff --git a/doc/Changelog b/doc/Changelog
index 268d51ff2..f6d32249b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 28 January 2022: Wouter
 	- Annotate that we ignore the return value of if_indextoname.
+	- Fix to use correct type for label count in rpz routine.
 
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
diff --git a/services/rpz.c b/services/rpz.c
index d7dd17f7e..2b6b0ac3f 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -668,7 +668,8 @@ rpz_find_zone(struct rpz* r, uint8_t* qname, size_t qname_len, uint16_t qclass,
 	int only_exact, int wr, int zones_keep_lock)
 {
 	uint8_t* ce;
-	size_t ce_len, ce_labs;
+	size_t ce_len;
+	int ce_labs;
 	uint8_t wc[LDNS_MAX_DOMAINLEN+1];
 	int exact;
 	struct local_zone* z = NULL;

From cb55b5906a5748462eb720d2bd5278ecfbef8503 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 28 Jan 2021 09:11:46 +0100
Subject: [PATCH 195/208] - Fix empty clause warning in config_file nsid parse.

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

diff --git a/doc/Changelog b/doc/Changelog
index f6d32249b..8e6794136 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 28 January 2022: Wouter
 	- Annotate that we ignore the return value of if_indextoname.
 	- Fix to use correct type for label count in rpz routine.
+	- Fix empty clause warning in config_file nsid parse.
 
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
diff --git a/util/config_file.c b/util/config_file.c
index 28816f747..4d87dee9b 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -2064,8 +2064,9 @@ uint8_t* cfg_parse_nsid(const char* str, uint16_t* nsid_len)
 		if ((nsid = (uint8_t *)strdup(str + 6)))
 			*nsid_len = strlen(str + 6);
 
-	} else if (strlen(str) % 2) 
+	} else if (strlen(str) % 2) {
 		; /* hex string has even number of characters */
+	}
 
 	else if (*str && (nsid = calloc(1, strlen(str) / 2))) {
 		const char *ch;

From 3a19ceaae67fc0d33dd79a3057834f1f54d2999c Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 28 Jan 2021 09:14:19 +0100
Subject: [PATCH 196/208] - Fix to use correct type for label count in
 ipdnametoaddr rpz routine.

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

diff --git a/doc/Changelog b/doc/Changelog
index 8e6794136..83e617c9a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Annotate that we ignore the return value of if_indextoname.
 	- Fix to use correct type for label count in rpz routine.
 	- Fix empty clause warning in config_file nsid parse.
+	- Fix to use correct type for label count in ipdnametoaddr rpz routine.
 
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
diff --git a/util/net_help.c b/util/net_help.c
index c5216bc2d..3b5527adf 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -321,7 +321,7 @@ static int ipdnametoaddr(uint8_t* dname, size_t dnamelen,
 	struct sockaddr_storage* addr, socklen_t* addrlen, int* af)
 {
 	uint8_t* ia;
-	size_t dnamelabs = dname_count_labels(dname);
+	int dnamelabs = dname_count_labels(dname);
 	uint8_t lablen;
 	char* e = NULL;
 	int z = 0;

From ad8104bb7c3d27a3f70a27e764455112d541e454 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 28 Jan 2021 09:15:45 +0100
Subject: [PATCH 197/208] - Fix empty clause warning in edns pass for padding.

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

diff --git a/doc/Changelog b/doc/Changelog
index 83e617c9a..66b46d230 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- Fix to use correct type for label count in rpz routine.
 	- Fix empty clause warning in config_file nsid parse.
 	- Fix to use correct type for label count in ipdnametoaddr rpz routine.
+	- Fix empty clause warning in edns pass for padding.
 
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
diff --git a/util/edns.c b/util/edns.c
index 5d2121636..84308449c 100644
--- a/util/edns.c
+++ b/util/edns.c
@@ -166,8 +166,9 @@ int apply_edns_options(struct edns_data* edns_out, struct edns_data* edns_in,
 		return 0;
 
 	if(!cfg->pad_responses || c->type != comm_tcp || !c->ssl
-	|| !edns_opt_list_find(edns_in->opt_list, LDNS_EDNS_PADDING))
+	|| !edns_opt_list_find(edns_in->opt_list, LDNS_EDNS_PADDING)) {
 	       ; /* pass */
+	}
 
 	else if(!edns_opt_list_append(&edns_out->opt_list, LDNS_EDNS_PADDING
 	                                                 , 0, NULL, region))

From 0ea86f6ccb68f885b2ed0d553e4627bc97b6f329 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 28 Jan 2021 11:19:34 +0100
Subject: [PATCH 198/208] - Fix fwd ancil test post script when not supported.

---
 doc/Changelog                          | 1 +
 testdata/fwd_ancil.tdir/fwd_ancil.post | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 66b46d230..cae27729a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- Fix empty clause warning in config_file nsid parse.
 	- Fix to use correct type for label count in ipdnametoaddr rpz routine.
 	- Fix empty clause warning in edns pass for padding.
+	- Fix fwd ancil test post script when not supported.
 
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
diff --git a/testdata/fwd_ancil.tdir/fwd_ancil.post b/testdata/fwd_ancil.tdir/fwd_ancil.post
index a74ba856e..6578151af 100644
--- a/testdata/fwd_ancil.tdir/fwd_ancil.post
+++ b/testdata/fwd_ancil.tdir/fwd_ancil.post
@@ -14,5 +14,9 @@ fi
 kill_pid $FWD_PID
 if fgrep "service stopped" unbound.log; then
 	exit 0
-fi      
+fi
+if fgrep "disable interface-automatic" unbound.log; then
+	echo "skip test"
+	exit 0
+fi
 kill_pid $UNBOUND_PID

From 7262a249f1c55116b14e8e6bae08a6b0224d00cd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 29 Jan 2021 16:34:46 +0100
Subject: [PATCH 199/208] - Fix for doxygen 1.8.20 compatibility.

---
 doc/Changelog       | 3 +++
 doc/unbound.doxygen | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index cae27729a..33668733c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+29 January 2022: Wouter
+	- Fix for doxygen 1.8.20 compatibility.
+
 28 January 2022: Wouter
 	- Annotate that we ignore the return value of if_indextoname.
 	- Fix to use correct type for label count in rpz routine.
diff --git a/doc/unbound.doxygen b/doc/unbound.doxygen
index 45f49b367..4c32d8943 100644
--- a/doc/unbound.doxygen
+++ b/doc/unbound.doxygen
@@ -1143,7 +1143,7 @@ COMPACT_LATEX          = NO
 # by the printer. Possible values are: a4, a4wide, letter, legal and
 # executive. If left blank a4wide will be used.
 
-PAPER_TYPE             = a4wide
+#PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
@@ -1451,7 +1451,7 @@ EXTERNAL_GROUPS        = YES
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH              = /usr/bin/perl
+#PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
@@ -1473,7 +1473,7 @@ CLASS_DIAGRAMS         = YES
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            =
+#MSCGEN_PATH            =
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented

From a8485d58ca33b9841841e552dc98230e401b5588 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 1 Feb 2021 16:57:56 +0100
Subject: [PATCH 200/208] - Attempt to fix NULL keys in the reuse_tcp tree;
 relates to #411.

---
 doc/Changelog              |  3 +++
 services/outside_network.c | 25 +++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index af53d7836..4a095a076 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+1 February 2022: George
+	- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.
+
 26 January 2022: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
 	- Merge PR #275 from Roland van Rijswijk-Deij: Add feature to return the
diff --git a/services/outside_network.c b/services/outside_network.c
index 11559ffac..6c6b42ccb 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -90,6 +90,10 @@ static int randomize_and_send_udp(struct pending* pend, sldns_buffer* packet,
 static void waiting_list_remove(struct outside_network* outnet,
 	struct waiting_tcp* w);
 
+/** remove reused element from tree and lru list */
+static void reuse_tcp_remove_tree_list(struct outside_network* outnet,
+	struct reuse_tcp* reuse);
+
 int 
 pending_cmp(const void* key1, const void* key2)
 {
@@ -424,8 +428,11 @@ static int
 reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp)
 {
 	log_reuse_tcp(VERB_CLIENT, "reuse_tcp_insert", &pend_tcp->reuse);
-	if(pend_tcp->reuse.item_on_lru_list)
+	if(pend_tcp->reuse.item_on_lru_list) {
+		if(!pend_tcp->reuse.node.key)
+			log_err("internal error: reuse_tcp_insert: on lru list without key");
 		return 1;
+	}
 	pend_tcp->reuse.node.key = &pend_tcp->reuse;
 	pend_tcp->reuse.pending = pend_tcp;
 	if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) {
@@ -477,7 +484,7 @@ reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr,
 	if(outnet->tcp_reuse.root == NULL ||
 		outnet->tcp_reuse.root == RBTREE_NULL)
 		return NULL;
-	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node,
+	if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse,
 		&result)) {
 		/* exact match */
 		/* but the key is on stack, and ptr is compared, impossible */
@@ -661,6 +668,14 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->reuse.cp_more_write_again = 0;
 	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
+
+	/* Remove from tree in case the is_ssl will be different and causes the
+	 * identity of the reuse_tcp to change; could result in nodes not being
+	 * deleted from the tree (because the new identity does not match the
+	 * previous node) but their ->key would be changed to NULL. */
+	if(pend->reuse.node.key)
+		reuse_tcp_remove_tree_list(w->outnet, &pend->reuse);
+
 	if(pend->c->ssl)
 		pend->reuse.is_ssl = 1;
 	else	pend->reuse.is_ssl = 0;
@@ -677,8 +692,10 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 static void
 reuse_tcp_lru_touch(struct outside_network* outnet, struct reuse_tcp* reuse)
 {
-	if(!reuse->item_on_lru_list)
+	if(!reuse->item_on_lru_list) {
+		log_err("internal error: we need to touch the lru_list but item not in list");
 		return; /* not on the list, no lru to modify */
+	}
 	if(!reuse->lru_prev)
 		return; /* already first in the list */
 	/* remove at current position */
@@ -847,7 +864,7 @@ reuse_tcp_remove_tree_list(struct outside_network* outnet,
 	verbose(VERB_CLIENT, "reuse_tcp_remove_tree_list");
 	if(reuse->node.key) {
 		/* delete it from reuse tree */
-		(void)rbtree_delete(&outnet->tcp_reuse, &reuse->node);
+		(void)rbtree_delete(&outnet->tcp_reuse, reuse);
 		reuse->node.key = NULL;
 	}
 	/* delete from reuse list */

From 21def26405345915711af8a43c191627dce305ed Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 1 Feb 2021 17:02:19 +0100
Subject: [PATCH 201/208] - Hide our time traveling abilities.

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

diff --git a/doc/Changelog b/doc/Changelog
index 0e8687470..b4778827c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,10 +1,10 @@
-1 February 2022: George
+1 February 2021: George
 	- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.
 
-29 January 2022: Wouter
+29 January 2021: Wouter
 	- Fix for doxygen 1.8.20 compatibility.
 
-28 January 2022: Wouter
+28 January 2021: Wouter
 	- Annotate that we ignore the return value of if_indextoname.
 	- Fix to use correct type for label count in rpz routine.
 	- Fix empty clause warning in config_file nsid parse.
@@ -12,7 +12,7 @@
 	- Fix empty clause warning in edns pass for padding.
 	- Fix fwd ancil test post script when not supported.
 
-26 January 2022: George
+26 January 2021: George
 	- Merge PR #408 from fobser: Prevent a few more yacc clashes.
 	- Merge PR #275 from Roland van Rijswijk-Deij: Add feature to return the
 	  original instead of a decrementing TTL ('serve-original-ttl')
@@ -21,10 +21,10 @@
 	- Ignore cache blacklisting when trying to reply with expired data from
 	  cache (#394).
 
-26 January 2022: Wouter
+26 January 2021: Wouter
 	- Fix compile of unbound-dnstap-socket without dnstap installed.
 
-22 January 2022: Willem
+22 January 2021: Willem
 	- Padding of queries and responses with DNS over TLS as specified in
 	  RFC7830 and RFC8467.
 

From a5a9672dc426ff0213cb3a1004cb3ffcf5e9ee84 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 2 Feb 2021 08:48:44 +0100
Subject: [PATCH 202/208] - branch-1.13.1 is created, with release-1.13.1rc1
 tag.

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

diff --git a/doc/Changelog b/doc/Changelog
index b4778827c..690b0b268 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+2 February 2021: Wouter
+	- branch-1.13.1 is created, with release-1.13.1rc1 tag.
+
 1 February 2021: George
 	- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.
 

From bc013b66ed1716a1a703cc98b4d8406e75a54fe7 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 2 Feb 2021 13:18:18 +0100
Subject: [PATCH 203/208] - Fix dynlibmod link on rhel8 for -ldl inclusion.

---
 configure     | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac  |  6 ++++-
 doc/Changelog |  1 +
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9d10e6ee7..c896bbc96 100755
--- a/configure
+++ b/configure
@@ -17236,7 +17236,66 @@ $as_echo "#define WITH_DYNLIBMODULE 1" >>confdefs.h
   DYNLIBMOD_HEADER='$(srcdir)/dynlibmod/dynlibmod.h'
 
   if test $on_mingw = "no"; then
-    DYNLIBMOD_EXTRALIBS="-ldl -export-dynamic"
+    # link with -ldl if not already there, for all executables because
+    # dlopen call is in the dynlib module.  For unbound executable, also
+    # export symbols.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$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
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+    DYNLIBMOD_EXTRALIBS="-export-dynamic"
   else
     DYNLIBMOD_EXTRALIBS="-Wl,--export-all-symbols,--out-implib,libunbound.dll.a"
   fi
diff --git a/configure.ac b/configure.ac
index ee9ff1696..0b37bfc30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -642,7 +642,11 @@ if test x_$withval != x_no; then
   DYNLIBMOD_HEADER='$(srcdir)/dynlibmod/dynlibmod.h'
   AC_SUBST(DYNLIBMOD_HEADER)
   if test $on_mingw = "no"; then
-    DYNLIBMOD_EXTRALIBS="-ldl -export-dynamic"
+    # link with -ldl if not already there, for all executables because
+    # dlopen call is in the dynlib module.  For unbound executable, also
+    # export symbols.
+    AC_SEARCH_LIBS([dlopen], [dl])
+    DYNLIBMOD_EXTRALIBS="-export-dynamic"
   else
     DYNLIBMOD_EXTRALIBS="-Wl,--export-all-symbols,--out-implib,libunbound.dll.a"
   fi
diff --git a/doc/Changelog b/doc/Changelog
index 690b0b268..fcf84deb5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 2 February 2021: Wouter
 	- branch-1.13.1 is created, with release-1.13.1rc1 tag.
+	- Fix dynlibmod link on rhel8 for -ldl inclusion.
 
 1 February 2021: George
 	- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.

From f9a1ac3f0b1a415d8085e113d44797e62c436a52 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 2 Feb 2021 14:30:53 +0100
Subject: [PATCH 204/208] - Fix windows dependency on libssp.dll because of
 default stack   protector in mingw.

---
 configure.ac  | 2 ++
 doc/Changelog | 2 ++
 makedist.sh   | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/configure.ac b/configure.ac
index 0b37bfc30..9f3455c0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1442,6 +1442,7 @@ if test x_$enable_static_exe = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
+		staticexe="$staticexe -l:libssp.a"
 	fi
 fi
 
@@ -1458,6 +1459,7 @@ if test x_$enable_fully_static = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
+		staticexe="$staticexe -l:libssp.a"
 	fi
 fi
 
diff --git a/doc/Changelog b/doc/Changelog
index fcf84deb5..328b84663 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 2 February 2021: Wouter
 	- branch-1.13.1 is created, with release-1.13.1rc1 tag.
 	- Fix dynlibmod link on rhel8 for -ldl inclusion.
+	- Fix windows dependency on libssp.dll because of default stack
+	  protector in mingw.
 
 1 February 2021: George
 	- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.
diff --git a/makedist.sh b/makedist.sh
index c3bfcaad3..25cabe136 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -412,6 +412,11 @@ if [ "$DOWIN" = "yes" ]; then
     cp ../unbound.exe ../unbound-anchor.exe ../unbound-host.exe ../unbound-control.exe ../unbound-checkconf.exe ../unbound-service-install.exe ../unbound-service-remove.exe ../LICENSE ../winrc/unbound-control-setup.cmd ../winrc/unbound-website.url ../winrc/service.conf ../winrc/README.txt ../contrib/create_unbound_ad_servers.cmd ../contrib/warmup.cmd ../contrib/unbound_cache.cmd .
     mkdir libunbound
     cp ../../unbound_shared/unbound.h ../../unbound_shared/.libs/libunbound*.dll ../../unbound_shared/.libs/libunbound.dll.a ../../unbound_shared/.libs/libunbound.a ../../unbound_shared/.libs/libunbound*.def ../../sslsharedinstall/lib/libcrypto.dll.a ../../sslsharedinstall/lib/libssl.dll.a ../../sslsharedinstall/bin/libcrypto*.dll ../../sslsharedinstall/bin/libssl*.dll ../../wxpinstall/bin/libexpat*.dll ../../wxpinstall/lib/libexpat.dll.a libunbound/.
+    if test "$W64" = "no"; then
+	    cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+    else
+	    cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
+    fi
     # zipfile
     zip -r ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf root.key unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog libunbound
     info "Testing $file"

From 18840665bcbb28c9de07bc3b20157a0dde13f8fd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 2 Feb 2021 14:31:05 +0100
Subject: [PATCH 205/208] And autoconf.

---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index c896bbc96..12f6a97d6 100755
--- a/configure
+++ b/configure
@@ -19825,6 +19825,7 @@ if test x_$enable_static_exe = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
+		staticexe="$staticexe -l:libssp.a"
 	fi
 fi
 
@@ -19844,6 +19845,7 @@ if test x_$enable_fully_static = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
+		staticexe="$staticexe -l:libssp.a"
 	fi
 fi
 

From aa8dfe94d31e11c19897444b955af6ac10aec1cd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 2 Feb 2021 14:52:05 +0100
Subject: [PATCH 206/208] Fixup to add to LIBS.

---
 configure    | 4 ++--
 configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 12f6a97d6..622f51e87 100755
--- a/configure
+++ b/configure
@@ -19825,7 +19825,7 @@ if test x_$enable_static_exe = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
-		staticexe="$staticexe -l:libssp.a"
+		LIBS="$LIBS -l:libssp.a"
 	fi
 fi
 
@@ -19845,7 +19845,7 @@ if test x_$enable_fully_static = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
-		staticexe="$staticexe -l:libssp.a"
+		LIBS="$LIBS -l:libssp.a"
 	fi
 fi
 
diff --git a/configure.ac b/configure.ac
index 9f3455c0f..2d88048f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1442,7 +1442,7 @@ if test x_$enable_static_exe = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
-		staticexe="$staticexe -l:libssp.a"
+		LIBS="$LIBS -l:libssp.a"
 	fi
 fi
 
@@ -1459,7 +1459,7 @@ if test x_$enable_fully_static = x_yes; then
 			LIBS="$LIBS -lgdi32"
 		fi
 		LIBS="$LIBS -lz"
-		staticexe="$staticexe -l:libssp.a"
+		LIBS="$LIBS -l:libssp.a"
 	fi
 fi
 

From 46939294710d24a37f9f838141f26e6b063b01f3 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 2 Feb 2021 17:04:29 +0100
Subject: [PATCH 207/208] - Fix indentation of root anchor for use by windows
 install script.

---
 doc/Changelog             | 1 +
 smallapp/unbound-anchor.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 328b84663..eea220c41 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- Fix dynlibmod link on rhel8 for -ldl inclusion.
 	- Fix windows dependency on libssp.dll because of default stack
 	  protector in mingw.
+	- Fix indentation of root anchor for use by windows install script.
 
 1 February 2021: George
 	- Attempt to fix NULL keys in the reuse_tcp tree; relates to #411.
diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index c4e9b3bfd..3e6fc6e6f 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -183,7 +183,7 @@ static const char DS_TRUST_ANCHOR[] =
 	/* The anchors must start on a new line with ". IN DS and end with \n"[;]
 	 * because the makedist script greps on the source here */
 	/* anchor 20326 is from 2017 */
-	". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D\n";
+". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D\n";
 
 /** verbosity for this application */
 static int verb = 0;

From c365e3ab9af99e3c06a8f3431f6935a383b56c51 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 4 Feb 2021 09:18:40 +0100
Subject: [PATCH 208/208] - release 1.13.1rc2 tag on branch-1.13.1 with added
 changes of 2 feb.

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

diff --git a/doc/Changelog b/doc/Changelog
index eea220c41..37d496835 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+4 February 2021: Wouter
+	- release 1.13.1rc2 tag on branch-1.13.1 with added changes of 2 feb.
+
 2 February 2021: Wouter
 	- branch-1.13.1 is created, with release-1.13.1rc1 tag.
 	- Fix dynlibmod link on rhel8 for -ldl inclusion.