autotrust work

git-svn-id: file:///svn/unbound/trunk@1758 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 6942bcdeeb9280715c50e1fd89c6f59f64fa3180..4b3a01d9b32e9528d015efe0a3105bae61bdd249 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+12 August 2009: Wouter
+       - autotrust import work.
+
 11 August 2009: Wouter
        - Check for openssl compatible with gost if enabled.
        - updated unit test for GOST=211 code.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 1a0baba20a1b451ef83577aa2767061e0b6e7f12..a3f62f2d73d5f003ec23c5d17faf249f126fac1d 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -298,6 +298,10 @@ server:
        # with several entries, one file per entry.
        # Zone file format, with DS and DNSKEY entries.
        # trust-anchor-file: ""
+       
+       # File with trusted keys, kept uptodate using RFC5011 probes,
+       # initial file like trust-anchor-file, then it stores metadata.
+       # auto-trust-anchor-file: ""
 
        # Trusted key for validation. DS or DNSKEY. specify the RR on a
        # single line, surrounded by "". TTL is ignored. class is IN default.

diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 91c5a4ec6564ee6f6b4c7ce2cf211c20a45669ff..46c196a4168f4780472cf089e958ca4f721f143e 100644 (file)
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -192,6 +192,7 @@ print_option(struct config_file* cfg, const char* opt)
        else O_LST(opt, "do-not-query-address", donotqueryaddrs)
        else O_LST(opt, "private-address", private_address)
        else O_LST(opt, "private-domain", private_domain)
+       else O_LST(opt, "auto-trust-anchor-file", auto_trust_anchor_file_list)
        else O_LST(opt, "trust-anchor-file", trust_anchor_file_list)
        else O_LST(opt, "trust-anchor", trust_anchor_list)
        else O_LST(opt, "trusted-keys-file", trusted_keys_file_list)

diff --git a/util/config_file.c b/util/config_file.c
index a115466378bb2d1a0491e9238be2b72e7109b675..4f3efafc1eeb6af6aa51521d2486da3adcc32496 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -145,6 +145,7 @@ config_create()
        cfg->hide_version = 0;
        cfg->identity = NULL;
        cfg->version = NULL;
+       cfg->auto_trust_anchor_file_list = NULL;
        cfg->trust_anchor_file_list = NULL;
        cfg->trust_anchor_list = NULL;
        cfg->trusted_keys_file_list = NULL;
@@ -343,6 +344,9 @@ int config_set_option(struct config_file* cfg, const char* opt,
                cfg->donotquery_localhost = (strcmp(val, "yes") == 0);
        } else if(strcmp(opt, "do-not-query-address:") == 0) {
                return cfg_strlist_insert(&cfg->donotqueryaddrs, strdup(val));
+       } else if(strcmp(opt, "auto-trust-anchor-file:") == 0) {
+               return cfg_strlist_insert(&cfg->auto_trust_anchor_file_list, 
+                       strdup(val));
        } else if(strcmp(opt, "trust-anchor-file:") == 0) {
                return cfg_strlist_insert(&cfg->trust_anchor_file_list, 
                        strdup(val));
@@ -539,6 +543,7 @@ config_delete(struct config_file* cfg)
        free(cfg->outgoing_avail_ports);
        config_delstrlist(cfg->private_address);
        config_delstrlist(cfg->private_domain);
+       config_delstrlist(cfg->auto_trust_anchor_file_list);
        config_delstrlist(cfg->trust_anchor_file_list);
        config_delstrlist(cfg->trusted_keys_file_list);
        config_delstrlist(cfg->trust_anchor_list);

diff --git a/util/config_file.h b/util/config_file.h
index 54e38e425b757d4af600d582f6c68bf99e254922..f3aa0dd9e8a970eaaf1d680812d27e12b2915ad2 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -190,6 +190,8 @@ struct config_file {
        struct config_strlist* trust_anchor_file_list;
        /** list of trustanchor keys, linked list */
        struct config_strlist* trust_anchor_list;
+       /** files with 5011 autotrust tracked keys */
+       struct config_strlist* auto_trust_anchor_file_list;
        /** files with trusted DNSKEYs in named.conf format, list */
        struct config_strlist* trusted_keys_file_list;
        /** DLV anchor file */

diff --git a/util/configlexer.c b/util/configlexer.c
index 4967049093d2a7f3a9ecde4734c0c4542d250494..50544831d9ed1f41261145886874f8fac3982fba 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -362,8 +362,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 121
-#define YY_END_OF_BUFFER 122
+#define YY_NUM_RULES 122
+#define YY_END_OF_BUFFER 123
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -371,131 +371,134 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[1121] =
+static yyconst flex_int16_t yy_accept[1143] =
     {   0,
-        1,    1,  103,  103,  107,  107,  111,  111,  115,  115,
-        1,    1,  122,  119,    1,  101,  101,  120,  119,  120,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  103,
-      104,  104,  105,  120,  107,  108,  108,  109,  120,  114,
-      111,  112,  112,  113,  120,  115,  116,  116,  117,  120,
-      118,  102,  118,  106,  120,  118,  119,    0,    1,    0,
-      119,    0,    2,    0,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  103,    0,  107,    0,  114,    0,  111,  115,    0,
-      118,    0,  118,    0,  118,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  118,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  118,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,   51,  119,
-      119,  119,  119,  119,    6,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  118,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  118,  119,  119,   20,  119,  119,  119,  119,
-       12,   13,  119,   15,   14,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,   99,  119,  119,  119,  119,    3,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  118,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  110,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,   23,  119,  119,  119,  119,  119,  119,  119,
-       24,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,   64,  110,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,   63,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,   21,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,   22,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,   17,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,   52,   53,  119,   50,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,    5,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,   66,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,   85,   84,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,   25,  119,  119,  119,  119,   54,  119,  119,  119,
-      119,  119,   82,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,  119,  119,  119,   43,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,    4,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,   93,  119,   16,  119,  119,  119,   56,   57,
-       55,  119,  119,  119,  119,  119,   62,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-       70,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,   31,   32,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,   61,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-       65,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,   98,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,   74,  119,   77,  119,  119,
-      119,  119,   60,  119,   91,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-
-       33,   34,  119,   39,   78,  119,   86,   83,  119,   27,
-      119,   80,  119,  119,  119,  119,  119,    7,  119,   49,
-       90,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,   67,  119,  119,  100,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,   79,   26,   28,  119,  119,
-      119,  119,  119,   48,  119,  119,  119,   94,  119,  119,
-      119,  119,  119,  119,   46,  119,  119,  119,  119,  119,
-      119,  119,  119,   96,  119,  119,  119,  119,  119,  119,
-      119,   11,  119,  119,  119,  119,  119,  119,   10,  119,
-
-      119,   29,  119,   95,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,   73,   72,   97,   92,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,   35,  119,  119,
-      119,  119,  119,   30,  119,  119,  119,   68,   69,  119,
-      119,  119,   71,  119,  119,  119,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,   18,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  119,   89,  119,  119,
-      119,  119,  119,  119,   19,  119,    9,  119,  119,   87,
-       40,  119,  119,  119,   76,   58,  119,  119,   42,   45,
-       41,  119,   36,  119,    8,  119,  119,   75,  119,  119,
-
-      119,   37,  119,   88,  119,  119,   59,   44,   38,  119,
-      119,  119,  119,   47,  119,  119,  119,  119,   81,    0
+        1,    1,  104,  104,  108,  108,  112,  112,  116,  116,
+        1,    1,  123,  120,    1,  102,  102,  121,  120,  121,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  104,
+      105,  105,  106,  121,  108,  109,  109,  110,  121,  115,
+      112,  113,  113,  114,  121,  116,  117,  117,  118,  121,
+      119,  103,  119,  107,  121,  119,  120,    0,    1,    0,
+      120,    0,    2,    0,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  104,    0,  108,    0,  115,    0,  112,  116,
+        0,  119,    0,  119,    0,  119,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  119,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  119,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,   51,  120,  120,  120,  120,  120,    6,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  119,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  119,  120,  120,
+      120,   20,  120,  120,  120,  120,   12,   13,  120,   15,
+       14,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      100,  120,  120,  120,  120,    3,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  119,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  111,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,   23,
+      120,  120,  120,  120,  120,  120,  120,   24,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,   64,  111,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,   63,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,   21,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,   22,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,   17,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,   52,   53,  120,   50,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+        5,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,   66,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,   86,   85,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,   25,  120,  120,  120,  120,   54,  120,  120,  120,
+      120,  120,   83,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,   43,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+        4,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,   94,  120,   16,  120,  120,  120,
+       56,   57,   55,  120,  120,  120,  120,  120,   62,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,   71,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,   31,   32,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+       61,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,   65,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,   99,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,   75,  120,
+       78,  120,  120,  120,  120,   60,  120,  120,   92,  120,
+
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,   33,   34,  120,   39,   79,  120,
+       87,   84,  120,   27,  120,   81,  120,  120,  120,  120,
+      120,    7,  120,   49,   91,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,   67,  120,  120,  101,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+       80,   26,   28,  120,  120,  120,  120,  120,   48,  120,
+      120,  120,   95,  120,  120,  120,  120,  120,  120,   46,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,   97,
+
+      120,  120,  120,  120,  120,  120,  120,   11,  120,  120,
+      120,  120,  120,  120,   10,  120,  120,   29,  120,   96,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+       74,   73,  120,   98,   93,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,   35,  120,  120,  120,  120,  120,
+       30,  120,  120,  120,   68,   70,  120,  120,  120,   72,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,   18,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,  120,  120,   90,  120,  120,  120,
+      120,  120,  120,   19,  120,    9,  120,  120,   88,   40,
+
+      120,  120,  120,   77,  120,   58,  120,  120,   42,   45,
+       41,  120,   36,  120,    8,  120,  120,   76,  120,  120,
+      120,  120,   37,  120,   89,  120,  120,   69,   59,   44,
+       38,  120,  120,  120,  120,   47,  120,  120,  120,  120,
+       82,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -538,772 +541,788 @@ static yyconst flex_int32_t yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1135] =
+static yyconst flex_int16_t yy_base[1157] =
     {   0,
         0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2160, 2146,   50, 2250, 2250, 2250,  129,   94,
-       33,  124,   94,   49,   74,   61,   91,   92,  110,  111,
-      112,  133,   50,  135,  137,  136,  145,  143,  164, 2145,
-     2250, 2250, 2250,  122, 2144, 2250, 2250, 2250,  157, 2083,
-     2025, 2250, 2250, 2250,  179, 1968, 2250, 2250, 2250,  167,
-     1930, 2250,  185, 2250,  189,   90, 1920,  195,  199, 1782,
-      206, 1556, 2250, 1362,  190,  199,  122,  116,  149,  182,
-      208,  191,  201,  207,  209,  161,  212,  210,  147,  217,
-      222,  216,  214,  228,  230,  231,  233,  234,  236,  238,
-
-      240,  239,  241,  244,  246,  248,  242,  249,  250,   72,
-      256, 1200,  273, 1113,  277,  828,  284,  676,  655,  278,
-      627,  288,  294,  537,  287,  291,  281,  292,  293,  295,
-      302,  314,  298,  301,  303,  257,  304,  305,  310,  311,
-      312,  316,  320,  330,  332,  321,  344,  340,  346,  348,
-      347,  349,  333,  337,  350,  351,  352,  356,  357,  360,
-      362,  363,  365,  367,  374,  376,  375,  373,  378,  381,
-      383,  382,  387,  388,  395,  308,  391,  399,  401,  403,
-      393,  408,  410,  416,  404,  413,  414,  417,  419,  420,
-      422,  421,  423,  426,  428,  436,  430,  441,  431,  442,
-
-      445,  447,  449,  452,  453,  460,  456,  458,  459,  466,
-      464,  462,  465,  471,  470,  491,  472,  477,  475,  478,
-      485,  481,  483,  488,  495,  499,  514,  500,  502,  513,
-      516,  515,  517,  522,  523,  524,  521,  528,  531,  534,
-      538,  541,  544,  546,  547,  548,  549,  550, 2250,  556,
-      552,  554,  558,  560, 2250,  561,  563,  564,  566,  576,
-      565,  568,  578,  575,  585,  582,  588,  584,  591,  593,
-      598,  596,  597,  599,  600,  603,  601,  607,  613,  619,
-      615,  624,  606,  625,  489,  626,  630,  632,  638,  635,
-      637,  646,  642,  644,  650,  649,  651,  643,  652,  654,
-
-      658,  659,  667,  669,  671,  664,  673,  679,  676,  680,
-      681,  685,  686,  687,  688,  689,  696,  703,  699,  702,
-      711,  692,  709,  700,  707,  714,  721,  717,  719,  722,
-      720,  724,  726,  728,  732,  731,  740,  741,  730,  742,
-      744,  733,  750,  751,  756, 2250,  763,  734,  759,  760,
-     2250, 2250,  761, 2250, 2250,  762,  764,  774,  779,  772,
-      766,  770,  781,  782,  787,  785,  792,  773,  790,  794,
-      803,  796,  801,  808,  809,  799,  813,  814,  815,  818,
-      817,  820,  830,  816, 2250,  826,  827,  831,  834, 2250,
-      838,  836,  839,  842,  843,  844,  846,  853,  852,  849,
-
-      854,  859,  855,  861,  870,  869,  863,  867,  878,  871,
-      875,  883,  877,  879,  884,  904,  885,  886,  888,  887,
-      897,  894,  916,  900,  893,  895,  918,  919,  912,  906,
-      922, 2250,  933,  929,  930,  931,  934,  890,  935,  936,
-      937,  943, 2250,  945,  941,  947,  948,  950,  954,  962,
-     2250,  963,  958,  965,  966,  968,  969,  970,  973,  972,
-      977,  978,  979,  982,  985,  981,  994,  998,  995, 1000,
-      983, 1001,  996, 1007, 1004, 1005, 1006, 1009, 2250,  259,
-     1012, 1016, 1018, 1019, 1017, 1021, 1023, 1027, 1030, 1020,
-     1032, 1039, 1033, 1036, 1043, 1045, 1046, 1037, 1048, 1040,
-
-     1051, 1049, 1050, 1053, 2250, 1054, 1059, 1063, 1066, 1077,
-     1065, 1079, 1080, 1082, 1084, 1075, 1073, 1093, 1095, 1092,
-     1094, 1096, 1099, 1086, 1100, 1102, 1104, 1107, 1106, 1108,
-     1109, 1120, 1122, 1125, 1127, 1111, 1129, 1134, 1117, 1132,
-     1136, 2250, 1145, 1146, 1142, 1149, 1148, 1150, 1151, 1153,
-     1154, 1155, 1156, 1159, 1160, 1158, 1163, 1164, 2250, 1171,
-     1165, 1167, 1168, 1172, 1179, 1180, 1181, 1184, 1189, 1186,
-     1196, 1187, 1197, 1198, 1190, 1202, 1209, 1215, 1216, 2250,
-     1214, 1208, 1223, 1221, 1212, 1224, 1233, 1225, 1226, 1229,
-     1232, 1235, 1234, 1237, 1238, 1236, 1241, 1247, 1242, 1258,
-
-     1259, 1243, 1265, 1266, 2250, 2250, 1268, 2250, 1250, 1269,
-     1246, 1270, 1272, 1274, 1276, 1277, 1279, 1280, 1281, 1283,
-     1288, 2250, 1282, 1286, 1289, 1290, 1292, 1298, 1304, 1295,
-     1305, 2250, 1307, 1297, 1313, 1317, 1308, 1314, 1319, 1320,
-     1328, 1330, 1321, 1323, 1329, 1331, 1333, 1337, 1336, 1338,
-     1340, 1342, 1341, 1344, 2250, 2250, 1348, 1354, 1347, 1355,
-     1359, 1370, 1372, 1362, 1373, 1369, 1374, 1375, 1376, 1378,
-     1379, 2250, 1385, 1389, 1390, 1392, 2250, 1383, 1381, 1398,
-     1400, 1402, 2250, 1403, 1404, 1405, 1406, 1407, 1409, 1413,
-     1414, 1415, 1419, 1426, 1422, 1424, 1432, 1440, 1428, 1444,
-
-     1430, 1433, 1435, 1446, 1448, 1450, 1453, 2250, 1457, 1441,
-     1463, 1451, 1461, 1467, 1465, 1466, 1468, 1469, 1464, 1470,
-     1471, 1473, 1474, 1475, 1478, 1480, 1490, 1481, 1492, 2250,
-     1494, 1500, 1497, 1498, 1504, 1501, 1502, 1503, 1511, 1513,
-     1512, 1514, 1515, 1525, 1528, 1531, 1524, 1537, 1533, 1534,
-     1539, 1516, 1547, 1540, 1548, 1544, 1550, 1553, 1554, 1558,
-     1555, 1557, 2250, 1559, 2250, 1564, 1567, 1568, 2250, 2250,
-     2250, 1574, 1570, 1572, 1578, 1582, 2250, 1575, 1583, 1579,
-     1586, 1589, 1590, 1588, 1591, 1592, 1594, 1599, 1604, 1606,
-     1593, 1607, 1608, 1609, 1615, 1616, 1618, 1626, 1622, 1623,
-
-     1625, 1629, 1624, 1631, 1632, 1633, 1635, 1630, 1637, 1646,
-     2250, 1649, 1644, 1647, 1658, 1651, 1662, 1654, 1659, 1665,
-     1664, 1667, 2250, 2250, 1671, 1675, 1678, 1672, 1676, 1682,
-     1668, 1685, 1687, 1688, 1689, 1691, 1692, 2250, 1693, 1695,
-     1698, 1699, 1702, 1705, 1709, 1715, 1717, 1712, 1719, 1721,
-     2250, 1723, 1725, 1726, 1730, 1732, 1727, 1694, 1735, 1738,
-     1734, 1740, 2250, 1742, 1743, 1746, 1744, 1749, 1752, 1755,
-     1748, 1757, 1758, 1764, 1761, 2250, 1762, 2250, 1768, 1770,
-     1779, 1775, 2250, 1778, 2250, 1780, 1781, 1788, 1785, 1791,
-     1793, 1795, 1796, 1797, 1803, 1799, 1801, 1804, 1800, 1810,
-
-     2250, 2250, 1806, 2250, 2250, 1814, 2250, 2250, 1819, 2250,
-     1821, 2250, 1827, 1823, 1825, 1811, 1826, 2250, 1829, 2250,
-     2250, 1830, 1832, 1837, 1839, 1836, 1840, 1843, 1844, 1845,
-     1846, 1850, 1851, 1847, 1852, 1854, 1853, 1861, 1859, 1863,
-     1870, 2250, 1862, 1878, 2250, 1865, 1871, 1876, 1881, 1882,
-     1884, 1890, 1887, 1886, 1888, 2250, 2250, 2250, 1891, 1892,
-     1899, 1900, 1896, 2250, 1904, 1893, 1907, 2250, 1909, 1913,
-     1916, 1917, 1918, 1919, 2250, 1921, 1924, 1926, 1928, 1933,
-     1938, 1940, 1942, 2250, 1944, 1934, 1945, 1947, 1950, 1951,
-     1953, 2250, 1954, 1955, 1958, 1960, 1963, 1961, 2250, 1967,
-
-     1964, 2250, 1979, 2250, 1965, 1980, 1972, 1983, 1987, 1970,
-     1984, 1994, 1991, 1992, 2250, 2250, 2250, 2250, 1993, 1995,
-     1997, 1999, 2000, 2001, 2002, 2004, 2006, 2250, 2007, 2009,
-     2018, 2019, 2011, 2250, 2022, 2024, 2008, 2250, 2250, 2025,
-     2034, 2029, 2250, 2032, 2039, 2040, 2042, 2043, 2044, 2045,
-     2046, 2047, 2048, 2050, 2052, 2250, 2061, 2054, 2056, 2065,
-     2069, 2062, 2070, 2066, 2072, 2076, 2077, 2250, 2079, 2088,
-     2090, 2092, 2080, 2094, 2250, 2097, 2250, 2100, 2101, 2250,
-     2250, 2095, 2105, 2102, 2250, 2250, 2108, 2109, 2250, 2250,
-     2250, 2111, 2250, 2112, 2250, 2115, 2117, 2250, 2118, 2120,
-
-     2122, 2250, 2124, 2250, 2125, 2126, 2250, 2250, 2250, 2129,
-     2130, 2135, 2131, 2250, 2138, 2141, 2139, 2143, 2250, 2250,
-     2171, 2177, 2183, 2189, 2195,   94, 2201, 2207, 2213, 2219,
-     2225, 2231, 2237, 2243
+       87,  108, 2203, 2186,   50, 2295, 2295, 2295,  129,   94,
+       70,  124,   94,   50,   89,  113,  112,   90,  110,   92,
+      127,  130,   61,  134,  140,  133,  136,  147,  162, 2124,
+     2295, 2295, 2295,   80, 2054, 2295, 2295, 2295,   42, 2004,
+     1952, 2295, 2295, 2295,  179, 1509, 2295, 2295, 2295,  165,
+     1137, 2295,  185, 2295,  189,  150, 1088,  195,  155,  802,
+      206,  754, 2295,  718,  169,  182,  188,  190,  193,  192,
+       62,  204,  201,  209,  211,  212,  160,  219,  213,  203,
+      223,  214,  224,  220,  234,  235,  236,  238,  237,  240,
+
+      243,  244,  245,  246,  250,  251,  253,  254,  247,  259,
+      261,  258,  659,  275,  649,  283,  533,  289,  514,  434,
+      293,  331,  297,  303,  225,  279,  296,  287,  290,  299,
+      300,  304,  310,  321,  306,  308,  311,  312,  317,  315,
+      324,  319,  318,  326,  332,  343,  345,  328,  338,  347,
+      353,  355,  262,  354,  356,  357,  358,  359,  361,  362,
+      363,  364,  368,  365,  369,  377,  380,  387,  371,  383,
+      386,  394,  391,  392,  393,  397,  401,  403,   95,  399,
+      406,  408,  410,  413,  415,  417,  423,  420,  421,  424,
+      425,  428,  429,  430,  431,  432,  435,  436,  447,  439,
+
+      451,  445,  453,  455,  457,  458,  460,  461,  471,  463,
+      467,  469,  479,  477,  470,  473,  485,  480,  505,  476,
+      484,  489,  492,  486,  500,  496,  497,  498,  499,  509,
+      525,  515,  526,  527,  530,  528,  529,  531,  537,  539,
+      534,  540,  541,  550,  552,  501,  558,  551,  554,  562,
+      555,  563, 2295,  568,  561,  565,  570,  571, 2295,  572,
+      574,  575,  577,  586,  578,  584,  589,  587,  599,  591,
+      600,  593,  608,  595,  602,  598,  606,  612,  616,  617,
+      619,  620,  623,  629,  622,  628,  631,  632,  633,  636,
+      637,  643,  646,  652,  654,  656,  662,  658,  660,  666,
+
+      665,  667,  651,  668,  670,  674,  675,  683,  685,  687,
+      679,  689,  695,  693,  697,  698,  702,  696,  703,  704,
+      705,  716,  723,  712,  719,  725,  706,  727,  728,  729,
+      730,  737,  680,  734,  735,  733,  736,  739,  741,  746,
+      750,  753,  754,  742,  756,  761,  762,  764,  765,  766,
+      771, 2295,  778,  767,  774,  775, 2295, 2295,  777, 2295,
+     2295,  779,  789,  786,  795,  791,  783,  784,  798,  803,
+      804,  800,  811,  816,  806,  817,  820,  808,  822,  829,
+      830,  818,  831,  832,  834,  836,  835,  838,  848,  844,
+     2295,  846,  845,  850,  853, 2295,  857,  854,  855,  860,
+
+      847,  862,  865,  872,  871,  870,  873,  876,  877,  882,
+      891,  884,  878,  880,  895,  888,  900,  902,  892,  894,
+      897,  903,  922,  904,  905,  909,  911,  910,  919,  934,
+      912,  906,  915,  936,  937,  930,  928,  940, 2295,  948,
+      946,  950,  951,  952,  953,  954,  955,  956,  963, 2295,
+      961,  966,  967,  968,  965,  977,  984, 2295,  981,  980,
+      986,  987,  988,  989,  990,  993,  992,  997,  998,  999,
+     1000, 1003, 1002, 1014, 1020, 1008, 1019, 1012, 1016, 1021,
+     1026, 1024, 1025, 1027, 1028, 2295,  141, 1029, 1032, 1040,
+     1041, 1039, 1037, 1045, 1049, 1047, 1056, 1048, 1058, 1060,
+
+     1038, 1050, 1064, 1061, 1063, 1070, 1071, 1072, 1073, 1080,
+     1074, 1075, 2295, 1077, 1085, 1081, 1082, 1103, 1083, 1104,
+     1105, 1107, 1108, 1086, 1097, 1116, 1118, 1114, 1117, 1120,
+     1122, 1110, 1123, 1128, 1124, 1127, 1130, 1131, 1132, 1140,
+     1145, 1147, 1150, 1133, 1146, 1155, 1157, 1158, 1159, 2295,
+     1167, 1168, 1165, 1174, 1171, 1172, 1173, 1177, 1161, 1183,
+     1179, 1182, 1185, 1186, 1188, 1189, 1192, 2295, 1195, 1193,
+     1197, 1196, 1198, 1200, 1205, 1206, 1207, 1211, 1221, 1212,
+     1209, 1213, 1223, 1225, 1229, 1235, 1236, 1232, 2295, 1237,
+     1239, 1245, 1248, 1241, 1243, 1255, 1251, 1252, 1253, 1254,
+
+     1261, 1256, 1259, 1262, 1264, 1265, 1257, 1267, 1280, 1276,
+     1269, 1288, 1290, 2295, 2295, 1292, 2295, 1293, 1282, 1284,
+     1294, 1286, 1303, 1295, 1304, 1298, 1300, 1306, 1307, 1308,
+     2295, 1312, 1316, 1314, 1318, 1319, 1321, 1322, 1329, 1325,
+     1331, 2295, 1328, 1332, 1340, 1335, 1341, 1342, 1344, 1346,
+     1348, 1350, 1352, 1353, 1354, 1358, 1356, 1365, 1361, 1363,
+     1364, 1367, 1366, 1368, 2295, 2295, 1376, 1371, 1377, 1386,
+     1388, 1392, 1390, 1391, 1393, 1394, 1399, 1400, 1401, 1403,
+     1404, 2295, 1410, 1414, 1415, 1417, 2295, 1408, 1407, 1423,
+     1424, 1427, 2295, 1428, 1429, 1430, 1431, 1432, 1434, 1438,
+
+     1439, 1441, 1444, 1446, 1452, 1450, 1449, 1451, 1460, 1463,
+     1465, 1471, 1453, 1468, 1470, 1476, 1478, 1479, 2295, 1485,
+     1473, 1486, 1483, 1490, 1492, 1484, 1493, 1494, 1495, 1497,
+     1499, 1500, 1502, 1507, 1504, 1510, 1505, 1520, 1506, 1512,
+     2295, 1524, 1535, 1517, 1526, 1534, 1527, 1523, 1538, 1540,
+     1541, 1542, 1544, 1546, 1550, 1557, 1554, 1555, 1563, 1561,
+     1562, 1564, 1568, 1574, 1548, 1577, 1571, 1575, 1580, 1582,
+     1584, 1586, 1588, 1587, 2295, 1585, 2295, 1598, 1589, 1592,
+     2295, 2295, 2295, 1600, 1602, 1603, 1606, 1612, 2295, 1605,
+     1613, 1609, 1615, 1616, 1617, 1618, 1620, 1621, 1622, 1623,
+
+     1634, 1632, 1635, 1637, 1636, 1639, 1645, 1646, 1647, 1653,
+     1649, 1651, 1652, 1656, 1657, 1659, 1663, 1662, 1660, 1658,
+     1665, 1676, 2295, 1677, 1675, 1679, 1685, 1680, 1687, 1690,
+     1691, 1692, 1693, 1699, 1694, 2295, 2295, 1696, 1704, 1707,
+     1701, 1710, 1712, 1711, 1714, 1717, 1718, 1720, 1721, 1722,
+     2295, 1724, 1725, 1729, 1730, 1735, 1740, 1732, 1747, 1749,
+     1744, 1751, 1753, 2295, 1723, 1755, 1756, 1758, 1759, 1760,
+     1761, 1767, 1770, 1762, 1772, 2295, 1774, 1765, 1778, 1776,
+     1780, 1782, 1784, 1786, 1787, 1790, 1797, 1794, 2295, 1793,
+     2295, 1795, 1805, 1807, 1808, 2295, 1800, 1810, 2295, 1811,
+
+     1816, 1819, 1820, 1823, 1828, 1812, 1825, 1829, 1835, 1831,
+     1833, 1836, 1838, 1840, 2295, 2295, 1843, 2295, 2295, 1848,
+     2295, 2295, 1851, 2295, 1853, 2295, 1859, 1855, 1857, 1839,
+     1858, 2295, 1865, 2295, 2295, 1862, 1866, 1869, 1871, 1860,
+     1875, 1876, 1877, 1878, 1879, 1881, 1882, 1883, 1884, 1885,
+     1886, 1887, 1894, 1892, 1895, 1903, 2295, 1896, 1905, 2295,
+     1907, 1908, 1911, 1915, 1913, 1918, 1924, 1920, 1921, 1922,
+     2295, 2295, 2295, 1923, 1925, 1934, 1930, 1936, 2295, 1938,
+     1927, 1948, 2295, 1949, 1939, 1944, 1951, 1952, 1955, 2295,
+     1958, 1959, 1960, 1962, 1967, 1969, 1975, 1972, 1979, 2295,
+
+     1976, 1974, 1980, 1982, 1984, 1987, 1985, 2295, 1989, 1990,
+     1996, 1992, 1997, 1998, 2295, 2002, 1999, 2295, 2007, 2295,
+     2000, 2013, 2015, 2017, 2022, 2010, 2019, 2029, 2026, 2023,
+     2295, 2295, 2030, 2295, 2295, 2031, 2032, 2034, 2035, 2037,
+     2038, 2039, 2043, 2041, 2295, 2044, 2045, 2049, 2055, 2057,
+     2295, 2060, 2056, 2046, 2295, 2295, 2062, 2072, 2070, 2295,
+     2075, 2074, 2076, 2077, 2082, 2078, 2084, 2085, 2086, 2064,
+     2087, 2089, 2096, 2295, 2098, 2099, 2100, 2105, 2108, 2102,
+     2111, 2109, 2113, 2114, 2116, 2117, 2295, 2120, 2128, 2131,
+     2133, 2134, 2138, 2295, 2140, 2295, 2143, 2144, 2295, 2295,
+
+     2110, 2146, 2147, 2295, 2148, 2295, 2135, 2150, 2295, 2295,
+     2295, 2157, 2295, 2158, 2295, 2160, 2151, 2295, 2161, 2164,
+     2168, 2170, 2295, 2172, 2295, 2165, 2173, 2295, 2295, 2295,
+     2295, 2176, 2175, 2182, 2178, 2295, 2183, 2185, 2184, 2189,
+     2295, 2295, 2216, 2222, 2228, 2234, 2240,   61, 2246, 2252,
+     2258, 2264, 2270, 2276, 2282, 2288
     } ;
 
-static yyconst flex_int16_t yy_def[1135] =
+static yyconst flex_int16_t yy_def[1157] =
     {   0,
-     1120,    1, 1121, 1121, 1122, 1122, 1123, 1123, 1124, 1124,
-     1125, 1125, 1120, 1126, 1120, 1120, 1120, 1120, 1127, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1128,
-     1120, 1120, 1120, 1128, 1129, 1120, 1120, 1120, 1129, 1130,
-     1120, 1120, 1120, 1120, 1130, 1131, 1120, 1120, 1120, 1131,
-     1132, 1120, 1133, 1120, 1132, 1132, 1126, 1126, 1120, 1134,
-     1127, 1134, 1120, 1127, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1128, 1128, 1129, 1129, 1130, 1130, 1120, 1131, 1131,
-     1132, 1132, 1133, 1133, 1132, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1132, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1132, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126,
-     1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1132, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1132, 1126, 1126, 1120, 1126, 1126, 1126, 1126,
-     1120, 1120, 1126, 1120, 1120, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1120,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1132, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1132,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1120, 1120, 1126, 1120, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1120, 1120, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126,
-     1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1120, 1126, 1120, 1126, 1126, 1126, 1120, 1120,
-     1120, 1126, 1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1120, 1120, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1120, 1126, 1120, 1126, 1126,
-     1126, 1126, 1120, 1126, 1120, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-
-     1120, 1120, 1126, 1120, 1120, 1126, 1120, 1120, 1126, 1120,
-     1126, 1120, 1126, 1126, 1126, 1126, 1126, 1120, 1126, 1120,
-     1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1120, 1120, 1120, 1126, 1126,
-     1126, 1126, 1126, 1120, 1126, 1126, 1126, 1120, 1126, 1126,
-     1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126,
-
-     1126, 1120, 1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1120, 1120, 1120, 1120, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126, 1126,
-     1126, 1126, 1126, 1120, 1126, 1126, 1126, 1120, 1120, 1126,
-     1126, 1126, 1120, 1126, 1126, 1126, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126,
-     1126, 1126, 1126, 1126, 1126, 1126, 1126, 1120, 1126, 1126,
-     1126, 1126, 1126, 1126, 1120, 1126, 1120, 1126, 1126, 1120,
-     1120, 1126, 1126, 1126, 1120, 1120, 1126, 1126, 1120, 1120,
-     1120, 1126, 1120, 1126, 1120, 1126, 1126, 1120, 1126, 1126,
-
-     1126, 1120, 1126, 1120, 1126, 1126, 1120, 1120, 1120, 1126,
-     1126, 1126, 1126, 1120, 1126, 1126, 1126, 1126, 1120,    0,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120
+     1142,    1, 1143, 1143, 1144, 1144, 1145, 1145, 1146, 1146,
+     1147, 1147, 1142, 1148, 1142, 1142, 1142, 1142, 1149, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1150,
+     1142, 1142, 1142, 1150, 1151, 1142, 1142, 1142, 1151, 1152,
+     1142, 1142, 1142, 1142, 1152, 1153, 1142, 1142, 1142, 1153,
+     1154, 1142, 1155, 1142, 1154, 1154, 1148, 1148, 1142, 1156,
+     1149, 1156, 1142, 1149, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1150, 1150, 1151, 1151, 1152, 1152, 1142, 1153,
+     1153, 1154, 1154, 1155, 1155, 1154, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1154,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1154, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1154, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1154, 1148, 1148,
+     1148, 1142, 1148, 1148, 1148, 1148, 1142, 1142, 1148, 1142,
+     1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1142, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1154, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1142, 1154, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1142, 1142, 1148, 1142, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1142, 1142, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1142, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1148,
+     1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1142, 1148, 1142, 1148, 1148, 1148,
+     1142, 1142, 1142, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1142, 1142, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1142, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1142, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1142, 1148,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1142, 1142, 1148, 1142, 1142, 1148,
+     1142, 1142, 1148, 1142, 1148, 1142, 1148, 1148, 1148, 1148,
+     1148, 1142, 1148, 1142, 1142, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1142,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1142, 1142, 1142, 1148, 1148, 1148, 1148, 1148, 1142, 1148,
+     1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148, 1142,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142,
+
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148, 1148,
+     1148, 1148, 1148, 1148, 1142, 1148, 1148, 1142, 1148, 1142,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1142, 1142, 1148, 1142, 1142, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148,
+     1142, 1148, 1148, 1148, 1142, 1142, 1148, 1148, 1148, 1142,
+     1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1142, 1148, 1148, 1148, 1148, 1148, 1148,
+     1148, 1148, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1148,
+     1148, 1148, 1148, 1142, 1148, 1142, 1148, 1148, 1142, 1142,
+
+     1148, 1148, 1148, 1142, 1148, 1142, 1148, 1148, 1142, 1142,
+     1142, 1148, 1142, 1148, 1142, 1148, 1148, 1142, 1148, 1148,
+     1148, 1148, 1142, 1148, 1142, 1148, 1148, 1142, 1142, 1142,
+     1142, 1148, 1148, 1148, 1148, 1142, 1148, 1148, 1148, 1148,
+     1142,    0, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142, 1142, 1142
     } ;
 
-static yyconst flex_int16_t yy_nxt[2290] =
+static yyconst flex_int16_t yy_nxt[2335] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
        26,   27,   28,   29,   30,   31,   32,   33,   34,   14,
        35,   36,   37,   38,   39,   14,   14,   14,   14,   41,
-       42,   43,   41,   42,   43,   68,   46,   47,   75,   44,
+       42,   43,   41,   42,   43,  115,   46,   47,  115,   44,
        48,   69,   44,   46,   47,   70,   49,   48,   57,   58,
-       59,   68,   68,   49,   51,   52,   53,   54,   60,   18,
-       57,   58,   59,   68,   84,   55,   51,   52,   53,   54,
-       60,   18,   85,   96,   68,   82,   68,   55,   15,   16,
-       17,   62,   63,   64,   67,   67,  166,   67,   67,   65,
-
-       67,   83,  122,   68,   68,   67,   68,   86,   66,   15,
-       16,   17,   62,   63,   64,   79,  125,   87,   80,   88,
-       65,   81,   68,   68,   68,  112,  112,   89,   68,   66,
-       72,   73,   72,   72,   68,   72,   68,   76,   90,   91,
-       72,   74,  129,   92,   77,   68,   93,   68,   68,   68,
-       94,   78,  128,  104,  101,   68,   97,   68,  106,   68,
-      114,   68,   98,  114,  102,   99,   95,  103,  105,  108,
-      119,  119,  100,   68,  109,  107,   68,  110,  138,  130,
-      116,  111,  116,  116,  143,  116,   72,   73,   72,   72,
-      121,   72,  121,  121,   68,  121,   67,  124,   67,   67,
-
-       69,   67,   68,   68,   70,  126,   67,   72,   73,   72,
-       72,   68,   72,   68,  127,  132,  131,   72,   74,   68,
-       68,   68,   68,  134,   68,  137,   68,  139,   68,   68,
-      140,  135,  144,  133,   68,  147,  145,  136,  146,  148,
-       68,  142,   68,   68,  141,   68,   68,  149,   68,  152,
-       68,   68,   68,   68,   68,  150,   68,  154,   68,  160,
-       68,   68,   68,  151,  153,  156,  157,  165,   68,   68,
-      155,  122,  158,  183,  159,  163,  112,  112,  162,  161,
-      114,  119,  119,  114,  164,  116,  167,  116,  116,  121,
-      116,  121,  121,   68,  121,   72,   73,   72,   72,  122,
-
-       72,  170,  168,   68,   68,   68,  124,   68,  169,  174,
-       68,  180,  173,   68,   68,   68,   68,   68,  181,  171,
-       68,  184,   68,   68,   68,  172,   68,  191,   68,  189,
-      175,  185,   68,   68,  186,  176,  227,  187,  182,  193,
-      177,  188,   68,  192,   68,   68,  178,  179,  190,   68,
-      194,  196,   68,  198,  195,  199,   68,  197,   68,   68,
-       68,   68,   68,   68,   68,  202,  200,  201,   68,   68,
-      204,  203,   68,  207,   68,   68,  210,   68,  205,   68,
-      213,  214,  211,  216,  206,  122,   68,   68,   68,  217,
-       68,  208,  209,   68,   68,   68,  212,  219,  221,   68,
-
-       68,  225,  224,   68,  215,   68,  218,   68,  226,  220,
-      222,   68,  223,   68,  229,   68,   68,  230,  228,  232,
-       68,  233,   68,  235,  231,   68,   68,  234,   68,   68,
-      239,   68,   68,   68,   68,   68,  236,  242,   68,  238,
-       68,  249,   68,   68,  241,  243,  237,  245,   68,  240,
-      247,  248,  246,   68,   68,  244,  250,   68,  255,   68,
-      251,   68,  256,  252,   68,   68,  254,  259,   68,  253,
-       68,   68,   68,  263,   68,  261,   68,   68,   68,  257,
-      262,  264,   68,   68,   68,  258,  267,  122,  260,   68,
-       68,  266,  281,   68,  265,   68,  269,   68,  278,  277,
-
-       68,   68,  268,   68,  349,  270,  271,   68,  279,  280,
-      283,   68,   68,  282,   68,  272,  286,  273,  274,  275,
-      284,  285,  276,  287,  288,   68,   68,   68,   68,   68,
-      290,  293,  289,   68,   68,   68,   68,  299,  301,   73,
-       68,  291,  292,   68,  296,  298,   68,  294,  295,  300,
-       68,  305,  302,   68,  304,  303,   68,  297,   68,   68,
-       68,   68,   68,  310,   68,  308,   68,  306,   68,  311,
-       68,  307,   68,   68,  313,   68,   68,   68,   68,  314,
-       68,  318,  309,  320,  315,  312,  319,   68,   68,  317,
-       68,  323,  328,  316,   68,  321,   68,   68,  324,  322,
-
-       68,  331,  329,   68,  333,   68,  325,  327,   68,   68,
-       68,   68,   68,   68,  330,   68,  326,  339,   68,   68,
-      334,  332,  335,  336,  340,  122,  344,   68,  337,  343,
-      347,   68,  341,  338,  342,  346,   68,   68,   68,  122,
-      345,  351,   68,  352,   68,  353,  354,   68,  355,   68,
-       68,  350,  348,  356,   68,   68,   68,  359,   68,  357,
-      358,   68,   68,   68,   68,  360,   68,  120,  361,  363,
-       68,   68,  368,  365,  369,  362,   68,  118,  366,   68,
-      364,   68,  367,   68,  370,   68,  375,  371,   68,  373,
-      374,   68,   68,   68,  376,  377,  378,   68,   68,   68,
-
-       68,   68,  379,  384,   68,  382,  383,  385,   68,  372,
-      386,   68,   68,  381,   68,   68,  380,  388,  389,   68,
-      387,   68,  390,   68,  391,  392,   68,  393,  396,   68,
-      397,   68,   68,   68,   68,  398,   68,  394,   68,  399,
-       68,  395,   68,   68,   68,   68,   68,  403,  400,  404,
-      405,  402,   68,   68,   68,  401,   68,  406,  407,  411,
-      408,  409,  122,   68,  417,  410,  413,  412,   68,  414,
-      416,   68,   68,   68,   68,   68,   68,  415,   68,  418,
-      422,  423,   68,  421,   68,   68,   68,  419,  437,  429,
-      420,   68,  432,   68,   68,  424,  430,   68,  425,   68,
-
-      434,  433,   68,  426,   68,  436,   68,  431,   68,  427,
-      428,   68,  435,   68,  439,   68,  440,  445,  442,  443,
-       68,   68,  438,  441,  444,   68,   68,   68,   68,   68,
-       68,  451,   68,  446,  447,  449,  450,  452,   68,   68,
-      117,  454,   68,   68,  456,  448,   68,  453,   68,  457,
-       68,   68,  460,  455,   68,   68,   68,  458,   68,  459,
-      466,   68,  464,  462,   68,   68,   68,   68,  467,  463,
-      461,   68,  465,   68,  472,   68,  470,  473,  469,   68,
-      468,   68,   68,   68,  474,  477,  479,   68,  471,   68,
-       68,   68,  476,  475,  480,  122,   68,   68,   68,   68,
-
-       68,  494,   68,  478,  481,   68,   68,   68,  500,   68,
-      483,  511,   68,  490,  491,  482,   68,  499,   68,  484,
-      492,  485,  489,  493,   68,  486,  498,  487,   68,  495,
-       68,   68,  488,  505,   68,  501,  496,  504,  503,  502,
-      506,   68,   68,   68,  507,   68,   68,   68,   68,   68,
-      515,  510,  512,   68,  497,   68,  509,   68,  517,   68,
-       68,  508,   68,  514,  518,  519,   68,  521,  513,  522,
-       68,  520,  516,  525,   68,   68,  523,   68,   68,  524,
-       68,   68,   68,  528,   68,   68,  529,  530,  531,   68,
-       68,   68,  526,   68,   68,   68,  535,   68,  527,  536,
-
-      537,  539,  532,  534,  538,  540,   68,   68,   68,  533,
-       68,  542,   68,   68,  543,  546,   68,   68,   68,   68,
-      545,   68,  541,  552,   68,  553,  548,  544,   68,   68,
-       68,   68,   68,   68,  547,   68,  554,  549,  551,   68,
-      557,  559,   68,  555,   68,   68,  550,  556,   68,   68,
-      560,   68,   68,  561,  558,   68,  562,   68,   68,  565,
-       68,   68,   68,   68,  563,   68,   68,  564,  568,  571,
-      570,   68,  566,  567,  574,   68,  572,   68,   68,  576,
-      575,  569,  573,  578,  579,   68,  582,   68,  580,   68,
-      581,   68,   68,  583,   68,  577,   68,  585,   68,  584,
-
-      588,  586,  589,  587,   68,   68,   68,   68,   68,  590,
-      591,   68,   68,  597,   68,  596,   68,  592,   68,   68,
-       68,   68,  593,   68,  594,  115,  595,  601,  599,   68,
-      598,  605,   68,  606,   68,  600,  602,   68,  608,   68,
-      604,   68,  607,  609,   68,  603,   68,  612,   68,  610,
-      613,  611,  615,  616,   68,  614,  618,   68,   68,  617,
-       68,   68,   68,   68,  622,   68,   68,   68,   68,  619,
-       68,   68,   68,  627,  621,   68,   68,   68,  631,   68,
-       68,  620,  632,   68,   68,  635,  623,  624,  625,  626,
-      628,   68,   68,   68,  630,  637,   68,  634,   68,   68,
-
-      629,   68,   68,  633,  636,  642,  641,  639,   68,   68,
-       68,  638,  113,  643,   68,  640,  649,  644,  645,  648,
-       68,   68,  650,  647,   68,  646,   68,   68,   68,  651,
-      654,  652,  656,   68,  655,   68,   68,   68,   68,  653,
-      659,   68,  658,  657,   68,   68,   68,   68,   68,   68,
-       68,  667,  668,   68,   68,   68,  660,  661,   68,   68,
-      662,  664,   68,  663,  666,  678,  669,  665,  670,  672,
-       68,   68,  675,  676,  671,  674,  673,   68,   68,  677,
-       68,   68,   68,  680,   68,  683,   68,  681,   68,   68,
-      685,   68,   68,   68,   68,   68,  679,  688,   68,  682,
-
-       68,   68,   68,  687,   68,  690,  695,   68,  684,   68,
-       68,  697,  691,  686,  689,  696,   68,   68,  692,   68,
-       68,  693,  694,  699,  700,   68,   68,  698,  702,   68,
-      703,   68,   68,   68,  701,   68,  706,  707,  704,  708,
-       68,   68,   68,   68,  715,   68,  705,  709,   68,   68,
-       68,  710,   68,   68,   68,  711,   68,  713,  714,   68,
-       68,  712,  720,  723,   73,  721,   68,   68,  716,  719,
-      717,   68,  722,  718,   68,  724,  726,  729,  725,  727,
-      728,   68,   68,  730,   68,   68,   68,   68,   68,  736,
-       68,   68,  739,   68,  731,   68,  740,   68,  732,  733,
-
-      734,   68,   68,  744,   68,  735,  737,  742,  741,  738,
-       68,  745,   68,  743,   68,   68,   68,   68,   68,   68,
-      750,   68,  751,  752,  753,   68,   68,   68,  747,  746,
-      754,   68,  748,  759,   68,  749,   68,  766,   68,  757,
-       68,  756,   68,  758,   68,   68,  760,   68,  755,  764,
-      762,  763,   68,   68,  761,  765,   68,  769,   68,  770,
-       68,  771,   68,   68,  773,   68,  767,  768,  772,   68,
-      775,  774,  777,   68,  778,   68,   68,   68,   68,   68,
-       68,   68,   68,   68,  787,   68,   68,   68,  776,  779,
-       68,  780,   68,   68,  790,  789,  781,  785,  782,  791,
-
-      783,  784,   68,  793,   68,  788,   68,  797,  786,   68,
-       68,  796,   68,   68,   68,   68,   68,  799,  792,  794,
-      795,  800,  801,   68,   68,   68,   68,   68,   68,  798,
-      803,  805,  809,  806,  802,  810,   68,   68,  812,  811,
-       68,  808,  804,   68,  814,   68,   68,  807,  813,   68,
-      816,   68,   68,  818,  819,  821,   68,  815,   73,   68,
-       68,  823,   68,  817,  824,   68,   68,   68,  822,   68,
-       68,   68,  825,  827,  820,  826,   68,  830,  828,   68,
-       68,  834,   68,  829,   68,  836,   68,   68,  831,  833,
-       68,   68,  837,  838,   68,   68,  840,  832,   68,  835,
-
-       68,   68,   68,   68,   68,   68,   68,  839,  848,  847,
-      842,   68,  841,  843,  844,  845,   68,  851,   68,   68,
-       68,   68,  854,  846,  853,  850,  855,   68,   68,  849,
-       68,  852,  856,  859,   68,   68,   68,   68,   68,  860,
-      863,   68,   68,   68,   68,   68,  857,   68,  864,   68,
-      858,  862,  865,  867,  861,  866,   68,  868,   68,   68,
-      869,   68,  870,   68,  872,  871,   68,  873,  875,  876,
-       68,   68,  877,  878,   68,  880,   68,   68,  883,   68,
-       68,  874,  881,   68,   68,  879,  885,   68,   68,  882,
-       68,  886,  884,  888,   68,  890,  887,   68,  889,   68,
-
-       68,   68,  891,   68,   68,   68,   68,   68,  897,  915,
-       68,   68,  900,  901,   68,  895,  902,   68,  892,  893,
-      898,   68,  894,  899,   68,  896,  904,   68,  905,   68,
-      907,   68,  908,   68,  903,   68,  910,   68,   68,   68,
-      909,  912,   68,  906,   68,  914,   68,   68,  916,  918,
-       68,  920,   68,  921,   68,   68,   68,  911,   68,  923,
-       68,   68,  913,  917,   68,  919,  925,   68,  924,   68,
-       68,  931,  927,   68,   68,  928,   68,  932,  929,  930,
-       68,  922,   68,  935,   73,  926,  936,   68,  937,  934,
-       68,   68,   68,   68,  933,  940,  938,   68,  941,  942,
-
-       68,  943,  939,   68,  945,   68,  944,   68,   68,   68,
-      949,   68,   68,   68,  948,   68,   68,  950,   68,  955,
-      953,  952,   68,   68,  954,  956,   68,  946,  947,  951,
-      957,   68,  958,   68,  959,   68,  960,   68,   68,   68,
-      964,   68,   68,  963,   68,  962,  966,  965,   68,   68,
-      968,   68,   68,  961,  967,   68,   68,   68,   68,   68,
-      969,  975,   68,   68,   68,   68,   68,  971,  972,  973,
-      970,   68,  976,   68,   68,   68,  982,   68,  974,  979,
-      983,  984,   68,   68,  978,  977,  987,  981,   68,  980,
-       68,  986,  985,   68,   68,  992,   68,  993,   68,   68,
-
-       68,  988,   68,   68,   68,   68,  989,  998,   68,  990,
-      999,   68,   68,  991,  994, 1002,   68,  995, 1004,   68,
-      996,   68, 1005,  997, 1003,   68, 1001, 1000,   68,   68,
-       68,   68,   68,   68, 1008, 1009,   68, 1007,   68, 1010,
-       68, 1012,  122, 1013, 1015,   68,   68, 1006, 1011, 1016,
-       68, 1017,   68, 1018,   68, 1014,   68,   68, 1020,   68,
-     1021, 1019,   68,   68, 1024,   68,   68,   68, 1022, 1028,
-       68, 1023,   68,   68, 1025,   68,   68,   68, 1031,   68,
-      120, 1029,   68, 1030,   68, 1026, 1027, 1037, 1032, 1033,
-     1034,   68,   68, 1036, 1038,   68,   68, 1035, 1039,   68,
-
-     1040, 1042, 1043,   68,   68,   68,   68,   68, 1044,   68,
-     1041,   68,   68,   68,   68, 1046,   68, 1049,   68,   68,
-       68,   68, 1054,   68, 1045, 1052,  118, 1048, 1047, 1056,
-       68,   68, 1058, 1050,   68, 1057,   68,   68, 1053, 1055,
-     1051,   68, 1062, 1059,   68, 1061,   68, 1063, 1060, 1065,
-     1064,   68,   68, 1068,   68,   68,   68,   68,   68,   68,
-       68, 1075,   68, 1072,   68, 1071,   68, 1067,   68, 1076,
-     1066, 1069, 1077,   68,   68, 1070, 1080,   68,   68, 1074,
-     1081,   68,   68, 1085,   68, 1073, 1078, 1086,   68,   68,
-     1079,   68,   68, 1082, 1083,  117, 1088, 1092, 1084, 1089,
-
-       68, 1090,   68, 1091,   68, 1093,   68,   68, 1087,   68,
-     1094, 1095,   68,   68,   68, 1097, 1098,   68, 1096, 1099,
-       68,   68, 1102,   68,   68, 1101, 1104,   68, 1103,   68,
-       68, 1107,   68, 1108,   68, 1109,   68,   68,   68, 1111,
-     1100,   68,   68,   68, 1105, 1112, 1114,   68, 1106, 1110,
-       68,   68, 1115,   68, 1119,   68,  115,  113,   68, 1120,
-     1120, 1120, 1113, 1120, 1120, 1116, 1120, 1117, 1120, 1120,
-     1118,   40,   40,   40,   40,   40,   40,   45,   45,   45,
-       45,   45,   45,   50,   50,   50,   50,   50,   50,   56,
-       56,   56,   56,   56,   56,   61,   61,   61,   61,   61,
-
-       61,   71,   71,   71,   71,   71,   71,  112,  112, 1120,
-     1120,  112,  112,  114,  114, 1120,  114, 1120,  114,  116,
-     1120, 1120, 1120, 1120,  116,  119,  119, 1120, 1120,  119,
-      119,  121, 1120, 1120, 1120, 1120,  121,  123,  123,  123,
-      123,  123,  123,   72,   72,   72,   72,   72,   72,   13,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120
+       59,   67,   68,   49,   51,   52,   53,   54,   60,   18,
+       57,   58,   59,   68,   68,   55,   51,   52,   53,   54,
+       60,   18,   68,  113,  113,   75,   83,   55,   15,   16,
+       17,   62,   63,   64,   97,   67,  133,   67,   67,   65,
+
+       67,   68,   68,   76,   68,   67,   68,   68,   66,   15,
+       16,   17,   62,   63,   64,   80,   84,   89,   81,   91,
+       65,   82,   68,  231,   68,   68,   85,   90,   87,   66,
+       72,   73,   72,   72,   86,   72,   68,   77,   88,   68,
+       72,   74,   68,   94,   78,   68,   68,   95,   68,  107,
+      105,   79,   68,  123,   92,   98,   69,  102,   93,   68,
+       70,   99,  123,   96,  100,  106,  108,  103,  120,  120,
+      104,  101,   68,  109,   68,  111,  126,  140,  110,  112,
+      117,   68,  117,  117,  127,  117,   72,   73,   72,   72,
+      122,   72,  122,  122,   68,  122,   67,  125,   67,   67,
+
+       68,   67,   68,  129,   68,   68,   67,   72,   73,   72,
+       72,  134,   72,   68,  128,   68,   68,   72,   74,  131,
+      130,   68,  132,   68,   68,   68,   68,   73,  139,  135,
+      148,   68,   68,  136,  141,   68,   68,  142,  146,  137,
+      145,  138,  147,  149,  144,  150,   68,   68,   68,   68,
+       68,  143,   68,  151,  154,   68,   68,   68,   68,   68,
+      152,  156,   68,   68,  162,   68,   68,  155,  153,  158,
+       68,   68,  159,   68,   68,  157,  167,  160,  113,  113,
+      161,  203,  166,  164,  163,  168,  115,  165,  169,  115,
+      117,  123,  117,  117,  170,  117,  120,  120,  122,   68,
+
+      122,  122,   68,  122,   72,   73,   72,   72,   68,   72,
+      173,   68,   68,  171,  172,  125,   68,  177,   68,  183,
+       68,  176,   68,   68,   68,  184,  174,   68,  186,   68,
+       68,   68,  175,   68,  187,  192,   68,  178,   68,  194,
+       68,  188,  179,  123,   68,  199,  185,  180,  189,  191,
+       68,  190,  196,  181,  182,   68,  195,   68,  193,   68,
+      201,  198,  202,  197,  200,   68,   68,   68,   68,   68,
+       68,   68,  204,   68,   68,   68,   68,   68,  207,  210,
+       68,   68,  213,   68,  214,  220,  208,  217,  205,   68,
+      216,  206,   68,  209,  219,  123,  212,  211,   68,   68,
+
+      215,  224,  221,   68,   68,   68,   68,  222,  225,   68,
+      218,   68,  228,   68,  229,   68,  230,  223,   68,  226,
+       68,  233,   68,  227,  234,   68,  232,   68,  237,   68,
+      239,  235,   68,   68,  238,   68,   68,   68,  243,  236,
+       68,   68,   68,   68,   68,  246,  121,   68,   68,  242,
+      253,   68,  240,  245,  241,  247,  249,   68,  244,   68,
+      250,  251,  252,   68,  248,   68,  254,   68,  259,   68,
+       68,  260,   68,   68,  255,   68,  258,  256,  263,   68,
+      257,   68,   68,   68,  265,   68,  267,  261,   68,   68,
+      266,   68,   68,  262,  268,  264,   68,   68,   68,  270,
+
+      271,  123,  269,  281,   68,  282,  273,  286,   68,   68,
+       68,   68,   68,   68,  309,  119,  272,   68,  285,  274,
+      275,   68,  283,  284,  288,  290,  291,   68,  287,  276,
+      289,  277,  278,  279,  292,  293,  280,   68,   68,   68,
+       68,   68,   68,   68,  298,  118,   68,  294,  306,   68,
+      304,   68,   68,   68,  295,  296,  297,  300,  301,  299,
+      303,  305,   68,   68,   68,  310,   68,   68,  307,  308,
+       68,  302,  311,   68,   68,   68,  315,   68,  312,  313,
+       68,  316,   68,   68,   68,  318,   68,   68,  314,   68,
+       68,  319,  323,  325,  317,  320,   68,  324,   68,   68,
+
+      322,   68,  328,   68,  321,   68,  333,   68,  326,  329,
+       68,   68,   68,  336,   68,  327,  334,  330,   68,  332,
+       68,  338,  339,  335,   68,  341,  340,  331,   68,   68,
+      337,   68,   68,  344,   68,  123,  349,  342,  345,  348,
+       68,   68,  352,   68,   68,   68,  343,  347,   68,   68,
+      346,  355,  350,  351,  357,   68,  353,  358,   68,  359,
+      354,  116,  356,   68,   68,  360,   68,  361,   68,  362,
+       68,  114,   68,  365,   68,  363,  364,   68,   68,   68,
+       68,  366,   68,  368,  367,  369,   68,   68,  374,  371,
+      375,   68,   68,  403,  372,   68,  370,   68,  373,   68,
+
+      376,   68,  381,  377,  379,   68,  380,   68,   68,   68,
+       68,  382,  383,  384,   68,   68,   68,   68,   68,  385,
+       73,  388,  389,  390,   68,  378,  386,  391,   68,  387,
+      392,   68,  395,  393,  394,   68,  396,   68,  397,   68,
+       68,   68,   68,  398,  402,   68,   68,   68,   68,   68,
+      404,   68,  405,   68,   68,  399,   73,  401,   68,  400,
+      409,  406,   68,  410,  408,   68,   68,  407,   68,  411,
+      412,  413,  414,   68,   68,  415,  123,   68,   68,   68,
+      419,  418,  416,   68,  421,  423,   68,   68,  417,   68,
+       68,   68,  422,  430,  425,   68,   68,  424,   68,  420,
+
+      428,   68,  426,   68,   73,  429,  427,   68,  436,  439,
+       68,  431,   68,  437,  432,   68,   68,  441,   68,  433,
+       68,  438,  440,   68,  443,  434,  435,  442,   68,   68,
+       68,  444,   68,  447,   68,  448,  452,  446,  445,  449,
+      450,   68,   68,   68,   68,  451,   68,   68,   68,  458,
+       68,  453,  454,  456,  457,  459,   68,   68,   68,   68,
+       68,  461,   68,  463,  455,   68,   68,   68,  464,   68,
+      467,  462,   68,  470,   68,  460,  465,   68,  466,  473,
+      471,  469,   68,   68,   68,   68,  468,  474,   68,   68,
+       68,  472,   68,  477,   68,  479,   68,  476,  480,  481,
+
+       68,  475,  484,   68,   68,  483,   68,   68,  482,   68,
+      478,  486,   68,  487,  123,   68,   68,   68,   68,  488,
+      485,   68,   68,   68,   68,  489,  502,   68,  508,  491,
+      507,   68,  498,  490,   68,  499,  501,  492,  506,  493,
+       68,  497,   68,  494,  500,  495,   68,  503,   68,   68,
+      496,  513,   68,  509,  504,  514,  511,  510,   68,  512,
+       68,  515,   68,   68,   68,   68,   68,   68,   68,  518,
+      523,  520,  505,   68,  519,   68,  517,   68,   68,   68,
+       68,  516,  522,  525,  526,  527,  528,  521,  524,   68,
+      529,  530,   68,   68,  531,  533,   68,  532,   68,   68,
+
+       68,   68,   68,  536,   68,   68,  537,  538,  539,   68,
+       68,   68,   68,  534,   68,   68,  543,  544,  545,  535,
+       68,  547,  540,  542,   68,  546,   68,  548,   68,  541,
+      550,   68,   68,   68,  554,  549,   68,   68,   68,   68,
+       68,   68,  552,  551,   68,  553,  556,  561,  562,   68,
+       68,   68,   68,   68,  555,  559,  563,   68,  557,   68,
+       68,   68,   68,  564,  560,  558,  566,  568,   68,  572,
+       68,  565,   68,   68,  567,   68,   68,  571,  569,  570,
+      574,  573,   68,   68,   68,   68,   68,   68,  575,   68,
+      576,  580,   68,   68,   68,   68,  583,   68,   68,  587,
+
+       68,  577,  579,  584,  578,  585,  582,  581,  590,   68,
+      588,  591,  595,  586,  589,   68,   68,   68,  592,   68,
+       68,  594,   68,  597,  593,  598,   68,  596,   68,   68,
+       68,  599,   68,  600,   68,   68,   68,  606,  605,   68,
+       68,  601,   68,   68,   68,   68,  602,  610,  603,  123,
+      604,  614,   68,  607,  608,  609,  615,   68,   68,   68,
+      611,  617,   68,  613,  616,  618,  619,   68,  612,   68,
+       68,   68,  620,   68,  624,  625,  622,   68,  623,   68,
+       68,  627,  626,   68,   68,   68,   68,  621,  631,   68,
+      633,   68,  628,  632,   68,   68,  630,   68,   68,  637,
+
+       68,   68,  641,  629,   68,   68,  642,   68,   68,   68,
+       68,  634,   68,  645,  635,  636,  647,   68,   68,   68,
+      638,   68,  640,   68,   68,   68,  639,  644,  651,  653,
+      646,  643,  649,   68,  655,   68,  648,   68,  650,  654,
+      652,   68,  659,  660,   68,  661,  658,   68,   68,   68,
+      656,   68,  664,   68,  662,   68,  665,   68,  657,  666,
+       68,  668,  669,   68,   68,   68,   68,   68,   68,   68,
+      663,   68,  667,   68,   68,  677,   68,   68,  680,   68,
+      678,   68,  670,  671,  672,  673,  676,  674,   68,  675,
+      679,  682,   68,  683,   68,  685,   68,  686,   68,  681,
+
+       68,  684,   68,  687,   68,   68,   68,   68,  688,  689,
+       68,  691,   68,  692,  693,   68,   68,  695,   68,   68,
+       68,  690,  698,  697,   68,  700,   68,  694,   68,  702,
+       68,   68,  696,   68,   68,  706,  708,   68,  699,  707,
+       68,   68,  701,   68,   68,  711,  703,   68,  714,  710,
+      704,  705,   68,   68,   68,  713,   68,  709,   68,  719,
+       68,  717,   68,  718,   68,   68,   68,  720,   68,  712,
+       68,  715,  726,   68,  716,   68,   68,   68,   68,   68,
+       68,  725,  721,   68,  724,  722,  723,  731,   68,   68,
+      732,  734,  735,  727,  730,  728,  733,  729,   68,  740,
+
+       68,  741,   68,   68,   68,   68,   68,  737,  736,  739,
+      738,   68,   68,   68,  747,   68,   68,  750,  743,   68,
+       68,  751,   68,  742,  744,  745,   68,   68,  755,   68,
+      746,  748,  753,  752,  749,   68,   68,  756,  754,   68,
+       68,   68,   68,   68,   68,  761,   68,  762,  763,  764,
+       68,   68,  758,   68,  757,  765,   68,  759,   68,  771,
+      760,   68,   68,   68,   68,   68,  767,  768,  769,  774,
+      770,  775,   68,  766,  772,   68,  777,   68,  778,  773,
+       68,  781,   68,   68,  776,   68,  779,  782,   68,  783,
+       68,   68,  785,  787,  784,   68,   68,   68,   68,  790,
+
+      780,  789,   68,  786,   68,   68,   68,   68,  791,   68,
+      792,   68,   68,  799,   68,  793,   68,   68,   68,   68,
+      788,  121,   68,  802,   68,  794,  795,  796,  801,   68,
+      797,  803,   68,  805,  800,   68,   68,  798,   68,   68,
+      807,  808,  809,  804,  806,  811,   68,   68,  813,  810,
+       68,  812,   68,   68,   68,  814,   68,  821,   68,  817,
+       68,  824,   68,  818,  822,  815,   68,   68,  823,   68,
+      826,  816,  820,   68,   68,   68,   68,  819,  828,  825,
+       68,  831,  832,   68,  833,  827,   68,   68,  829,   68,
+      835,  836,   68,  837,   68,  834,   68,   68,   68,   68,
+
+       68,   68,  838,  839,   68,  830,  840,  847,  841,  842,
+       68,  843,   68,  846,   68,   68,  849,   68,   68,  845,
+      850,   68,  844,  851,   68,   68,  853,   68,   68,   68,
+       68,  848,   68,   68,   68,   68,  861,  852,  860,  855,
+      856,  857,  854,  864,   68,  858,   68,   68,   68,   68,
+      867,   68,  859,  862,  866,  863,  868,   68,   68,   68,
+      872,   68,  869,   68,   68,   68,  873,  876,   68,   68,
+       68,   68,   68,  865,   68,   68,  870,   68,  875,  871,
+      878,  877,  874,  879,  880,  882,  881,   68,   68,   68,
+      883,   68,   68,  884,  885,  886,  889,   68,  891,   68,
+
+      888,  890,   68,   68,   68,   68,   68,  893,   68,  894,
+      896,   68,  887,   68,  897,  899,   68,  898,  895,   68,
+      900,  892,   68,   68,   68,  901,   68,  902,  903,   68,
+       68,  905,   68,   68,   68,   68,   68,   68,  904,  911,
+      923,   68,   68,  914,   68,  909,  915,   68,  906,  907,
+      912,  916,   68,  908,  913,  910,   68,  917,  918,   68,
+      919,   68,  921,   68,  922,   68,  924,   68,   68,  926,
+       68,   68,   68,   68,   68,  920,  929,   68,  928,   68,
+      930,  932,   68,  934,   68,  935,   68,  925,   68,  927,
+       68,  937,   68,  933,   68,  931,   68,  939,   68,   68,
+
+      938,  941,   68,  936,  945,   68,   68,   68,  943,   68,
+      946,  944,   68,  942,  950,  940,  948,   68,  949,   68,
+       68,  951,   68,   68,   68,  947,  955,  953,   68,  952,
+      957,   68,   68,  956,  954,   68,  958,   68,  959,  960,
+       68,   68,  964,   68,  961,   68,  963,   68,   68,  965,
+       68,   68,   68,  967,  969,   68,  970,  962,  968,  971,
+       68,  966,  972,   68,  973,   68,  974,   68,  975,   68,
+       68,   68,   68,  977,   68,  978,  979,   68,   68,  980,
+      981,   68,  983,   68,  984,  976,  982,   68,   68,   68,
+       68,   68,  990,   68,   68,   68,   68,   68,   68,   68,
+
+      986,  987,  988,  991,   68,  985,   68,   68,   68,  998,
+      994,  989,  999,  996, 1000,   68,  993,   68, 1002,   68,
+       68,  992,  995,   68,  997,   68, 1001,   68, 1003, 1008,
+       68, 1009,   68,   68,   68,   68,   68,   68, 1004,   68,
+     1014, 1005,   68, 1006, 1007, 1015,   68, 1010,   68, 1018,
+       68,   68, 1011,  119, 1012, 1013,   68, 1016, 1019, 1020,
+       68,   68, 1021,   68,   68, 1023, 1017,   68, 1024, 1025,
+       68,   68,   68, 1022,   68, 1026, 1028, 1029, 1031,   68,
+     1032,   68, 1033, 1034,   68, 1027,   68,   68,   68, 1030,
+     1035,   68,   68, 1036,   68, 1038,   68,   68, 1037,   68,
+
+     1041,   68,   68, 1039,   68, 1040, 1042, 1045,   68,   68,
+       68,   68,   68, 1046,   68, 1048,  118, 1047, 1051,   68,
+     1043, 1044,   68, 1049, 1050,   68, 1053,   68, 1055,   68,
+     1054,   68, 1052, 1056,   68,   68, 1059, 1060,   68, 1061,
+     1057,   68,   68,   68,   68, 1058,   68,   68, 1062,   68,
+       68,   68, 1064,   68, 1067,   68,   68,   68,   68, 1072,
+     1074,   68, 1063, 1066, 1070, 1065,  116,   68,   68,   68,
+     1068, 1075,   68, 1071,   68, 1073,   68, 1069, 1076, 1080,
+     1078, 1077,   68, 1079,   68, 1081,   68,   68,   68,   68,
+       68, 1082, 1083, 1087,   68, 1084,   68,   68,   68,   68,
+
+     1094,   68, 1092, 1091, 1086, 1090, 1088, 1085,   68, 1096,
+       68,   68,   68, 1095,   68, 1089, 1099,   68, 1093, 1100,
+       68,   68,   68,   68, 1104,   68,   68, 1106,   68,   68,
+     1117, 1097,   68, 1101, 1098, 1102,  114, 1108, 1105, 1109,
+       68, 1103, 1110,   68, 1111,   68,   68,   68, 1107, 1113,
+       68, 1112,   68, 1114, 1115,   68,   68, 1118,   68,   68,
+       68, 1116,   68,   68, 1119, 1120, 1122, 1121, 1123,   68,
+       68, 1125,   68,   68, 1124, 1128,   68,   68, 1126, 1129,
+       68, 1130,   68, 1131,   68,   68, 1133,   68,   68, 1132,
+       68, 1127, 1134, 1136,   68,   68,   68,   68,   68, 1137,
+
+     1141,   68, 1142, 1142, 1142, 1142, 1142, 1135, 1142, 1142,
+     1138, 1139, 1142, 1142, 1142, 1140,   40,   40,   40,   40,
+       40,   40,   45,   45,   45,   45,   45,   45,   50,   50,
+       50,   50,   50,   50,   56,   56,   56,   56,   56,   56,
+       61,   61,   61,   61,   61,   61,   71,   71,   71,   71,
+       71,   71,  113,  113, 1142, 1142,  113,  113,  115,  115,
+     1142,  115, 1142,  115,  117, 1142, 1142, 1142, 1142,  117,
+      120,  120, 1142, 1142,  120,  120,  122, 1142, 1142, 1142,
+     1142,  122,  124,  124,  124,  124,  124,  124,   72,   72,
+       72,   72,   72,   72,   13, 1142, 1142, 1142, 1142, 1142,
+
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142
     } ;
 
-static yyconst flex_int16_t yy_chk[2290] =
+static yyconst flex_int16_t yy_chk[2335] =
     {   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,    3,
-        3,    3,    4,    4,    4,   21,    5,    5,   21,    3,
+        3,    3,    4,    4,    4,   49,    5,    5,   49,    3,
         5,   15,    4,    6,    6,   15,    5,    6,    9,    9,
-        9,   24,   33,    6,    7,    7,    7,    7,    9,    7,
-       10,   10,   10,   26,   26,    7,    8,    8,    8,    8,
-       10,    8,   26,   33,  110,   24,   25,    8,   11,   11,
-       11,   11,   11,   11, 1126,   20,  110,   20,   20,   11,
-
-       20,   25,   66,   27,   28,   20,   23,   27,   11,   12,
-       12,   12,   12,   12,   12,   23,   66,   27,   23,   28,
-       12,   23,   29,   30,   31,   44,   44,   29,   78,   12,
-       19,   19,   19,   19,   77,   19,   22,   22,   30,   31,
-       19,   19,   78,   31,   22,   32,   32,   34,   36,   35,
-       32,   22,   77,   36,   35,   38,   34,   37,   37,   89,
-       49,   79,   34,   49,   35,   34,   32,   35,   36,   38,
-       60,   60,   34,   86,   38,   37,   39,   39,   86,   79,
-       55,   39,   55,   55,   89,   55,   63,   63,   63,   63,
-       65,   63,   65,   65,   80,   65,   68,   63,   68,   68,
-
-       69,   68,   75,   82,   69,   75,   68,   71,   71,   71,
-       71,   76,   71,   83,   76,   81,   80,   71,   71,   84,
-       81,   85,   88,   82,   87,   85,   93,   87,   92,   90,
-       87,   83,   90,   81,   91,   92,   90,   84,   91,   93,
-       94,   88,   95,   96,   87,   97,   98,   94,   99,   97,
-      100,  102,  101,  103,  107,   95,  104,   99,  105,  105,
-      106,  108,  109,   96,   98,  101,  102,  109,  111,  136,
-      100,  480,  103,  136,  104,  107,  113,  113,  106,  105,
-      115,  120,  120,  115,  108,  117,  111,  117,  117,  122,
-      117,  122,  122,  127,  122,  123,  123,  123,  123,  125,
-
-      123,  127,  125,  126,  128,  129,  123,  130,  126,  131,
-      133,  133,  130,  134,  131,  135,  137,  138,  134,  128,
-      176,  137,  139,  140,  141,  129,  132,  143,  142,  141,
-      132,  138,  143,  146,  139,  132,  176,  139,  135,  145,
-      132,  140,  144,  144,  145,  153,  132,  132,  142,  154,
-      145,  147,  148,  149,  146,  150,  147,  148,  149,  151,
-      150,  152,  155,  156,  157,  153,  151,  152,  158,  159,
-      155,  154,  160,  158,  161,  162,  161,  163,  156,  164,
-      164,  165,  162,  166,  157,  168,  165,  167,  166,  167,
-      169,  159,  160,  170,  172,  171,  163,  168,  170,  173,
-
-      174,  174,  173,  177,  165,  181,  167,  175,  175,  169,
-      171,  178,  172,  179,  178,  180,  185,  179,  177,  181,
-      182,  182,  183,  184,  180,  186,  187,  183,  184,  188,
-      188,  189,  190,  192,  191,  193,  185,  191,  194,  187,
-      195,  197,  197,  199,  190,  192,  186,  194,  196,  189,
-      196,  196,  195,  198,  200,  193,  198,  201,  202,  202,
-      199,  203,  203,  199,  204,  205,  201,  206,  207,  200,
-      208,  209,  206,  210,  212,  208,  211,  213,  210,  204,
-      209,  211,  215,  214,  217,  205,  214,  219,  207,  218,
-      220,  213,  221,  222,  212,  223,  215,  221,  218,  217,
-
-      224,  285,  214,  216,  285,  216,  216,  225,  219,  220,
-      223,  226,  228,  222,  229,  216,  226,  216,  216,  216,
-      224,  225,  216,  227,  227,  230,  227,  232,  231,  233,
-      229,  232,  228,  237,  234,  235,  236,  237,  239,  124,
-      238,  230,  231,  239,  235,  236,  240,  233,  234,  238,
-      241,  243,  240,  242,  242,  241,  243,  235,  244,  245,
-      246,  247,  248,  248,  251,  246,  252,  244,  250,  250,
-      253,  245,  254,  256,  252,  257,  258,  261,  259,  253,
-      262,  258,  247,  260,  254,  251,  259,  264,  260,  257,
-      263,  263,  265,  256,  266,  261,  268,  265,  263,  262,
-
-      267,  267,  265,  269,  269,  270,  263,  264,  272,  273,
-      271,  274,  275,  277,  266,  276,  263,  275,  283,  278,
-      270,  268,  271,  272,  276,  279,  280,  281,  273,  279,
-      283,  280,  277,  274,  278,  282,  282,  284,  286,  121,
-      281,  287,  287,  288,  288,  289,  290,  290,  291,  291,
-      289,  286,  284,  292,  293,  298,  294,  295,  292,  293,
-      294,  296,  295,  297,  299,  296,  300,  119,  297,  299,
-      301,  302,  302,  301,  303,  298,  306,  118,  301,  303,
-      300,  304,  301,  305,  304,  307,  308,  305,  309,  306,
-      307,  308,  310,  311,  309,  310,  311,  312,  313,  314,
-
-      315,  316,  312,  317,  322,  315,  316,  317,  317,  305,
-      318,  319,  324,  314,  320,  318,  313,  320,  321,  325,
-      319,  323,  321,  321,  322,  323,  326,  324,  327,  328,
-      328,  329,  331,  327,  330,  329,  332,  325,  333,  330,
-      334,  326,  339,  336,  335,  342,  348,  334,  331,  335,
-      336,  333,  337,  338,  340,  332,  341,  337,  338,  342,
-      339,  340,  343,  344,  348,  341,  344,  343,  345,  345,
-      347,  349,  350,  353,  356,  347,  357,  345,  361,  349,
-      357,  358,  362,  356,  360,  368,  358,  350,  368,  360,
-      353,  359,  363,  363,  364,  359,  361,  366,  359,  365,
-
-      365,  364,  369,  359,  367,  367,  370,  362,  372,  359,
-      359,  376,  366,  373,  370,  371,  371,  376,  373,  374,
-      374,  375,  369,  372,  375,  377,  378,  379,  384,  381,
-      380,  382,  382,  377,  378,  380,  381,  383,  386,  387,
-      116,  386,  383,  388,  388,  379,  389,  384,  392,  389,
-      391,  393,  392,  387,  394,  395,  396,  389,  397,  391,
-      398,  400,  396,  394,  399,  398,  401,  403,  399,  395,
-      393,  402,  397,  404,  404,  407,  402,  405,  401,  408,
-      400,  406,  405,  410,  406,  409,  411,  411,  403,  413,
-      409,  414,  408,  407,  412,  412,  415,  417,  418,  420,
-
-      419,  422,  438,  410,  413,  425,  422,  426,  426,  421,
-      415,  438,  424,  418,  419,  414,  416,  425,  430,  416,
-      420,  416,  417,  421,  429,  416,  424,  416,  423,  423,
-      427,  428,  416,  431,  431,  427,  423,  430,  429,  428,
-      433,  434,  435,  436,  434,  433,  437,  439,  440,  441,
-      442,  437,  439,  445,  423,  442,  436,  444,  445,  446,
-      447,  435,  448,  441,  446,  447,  449,  449,  440,  450,
-      453,  448,  444,  453,  450,  452,  452,  454,  455,  452,
-      456,  457,  458,  456,  460,  459,  457,  458,  459,  461,
-      462,  463,  454,  466,  464,  471,  463,  465,  455,  464,
-
-      465,  467,  460,  462,  466,  468,  467,  469,  473,  461,
-      468,  470,  470,  472,  471,  474,  475,  476,  477,  474,
-      473,  478,  469,  482,  481,  483,  476,  472,  482,  485,
-      483,  484,  490,  486,  475,  487,  484,  477,  481,  488,
-      487,  489,  489,  485,  491,  493,  478,  486,  494,  498,
-      490,  492,  500,  491,  488,  495,  492,  496,  497,  495,
-      499,  502,  503,  501,  493,  504,  506,  494,  498,  501,
-      500,  507,  496,  497,  504,  508,  502,  511,  509,  507,
-      506,  499,  503,  509,  510,  517,  512,  516,  510,  510,
-      511,  512,  513,  513,  514,  508,  515,  515,  524,  514,
-
-      518,  516,  519,  517,  520,  518,  521,  519,  522,  520,
-      521,  523,  525,  524,  526,  523,  527,  522,  529,  528,
-      530,  531,  522,  536,  522,  114,  522,  528,  526,  539,
-      525,  532,  532,  533,  533,  527,  529,  534,  535,  535,
-      531,  537,  534,  536,  540,  530,  538,  539,  541,  537,
-      540,  538,  543,  544,  545,  541,  546,  543,  544,  545,
-      547,  546,  548,  549,  550,  550,  551,  552,  553,  547,
-      556,  554,  555,  555,  549,  557,  558,  561,  560,  562,
-      563,  548,  560,  560,  564,  563,  551,  552,  553,  554,
-      556,  565,  566,  567,  558,  565,  568,  562,  570,  572,
-
-      557,  569,  575,  561,  564,  570,  569,  567,  571,  573,
-      574,  566,  112,  571,  576,  568,  577,  572,  573,  576,
-      582,  577,  578,  575,  585,  574,  581,  578,  579,  579,
-      583,  581,  584,  584,  583,  583,  586,  588,  589,  582,
-      587,  590,  586,  585,  591,  587,  593,  592,  596,  594,
-      595,  595,  596,  597,  599,  602,  588,  589,  611,  598,
-      590,  592,  609,  591,  594,  609,  597,  593,  598,  600,
-      600,  601,  603,  604,  599,  602,  601,  603,  604,  607,
-      607,  610,  612,  611,  613,  614,  614,  612,  615,  616,
-      616,  617,  618,  619,  623,  620,  610,  619,  624,  613,
-
-      621,  625,  626,  618,  627,  621,  627,  630,  615,  634,
-      628,  629,  623,  617,  620,  628,  629,  631,  624,  633,
-      637,  625,  626,  631,  633,  635,  638,  630,  635,  636,
-      636,  639,  640,  643,  634,  644,  639,  640,  637,  641,
-      641,  645,  642,  646,  648,  647,  638,  642,  649,  648,
-      650,  643,  651,  653,  652,  644,  654,  646,  647,  659,
-      657,  645,  653,  657,   74,  653,  658,  660,  649,  652,
-      650,  661,  654,  651,  664,  658,  660,  662,  659,  660,
-      661,  666,  662,  663,  663,  665,  667,  668,  669,  669,
-      670,  671,  673,  679,  664,  678,  674,  673,  665,  666,
-
-      667,  674,  675,  678,  676,  668,  670,  676,  675,  671,
-      680,  679,  681,  676,  682,  684,  685,  686,  687,  688,
-      685,  689,  686,  687,  688,  690,  691,  692,  681,  680,
-      689,  693,  682,  694,  695,  684,  696,  701,  694,  692,
-      699,  691,  701,  693,  697,  702,  695,  703,  690,  699,
-      697,  698,  698,  710,  696,  700,  700,  704,  704,  705,
-      705,  706,  706,  712,  709,  707,  702,  703,  707,  709,
-      711,  710,  713,  713,  714,  711,  719,  715,  716,  714,
-      717,  718,  720,  721,  721,  722,  723,  724,  712,  715,
-      725,  715,  726,  728,  724,  723,  715,  719,  716,  725,
-
-      717,  718,  727,  727,  729,  722,  731,  732,  720,  733,
-      734,  731,  732,  736,  737,  738,  735,  734,  726,  728,
-      729,  735,  736,  739,  741,  740,  742,  743,  752,  733,
-      738,  740,  744,  741,  737,  745,  747,  744,  746,  745,
-      745,  743,  739,  746,  748,  749,  750,  742,  747,  748,
-      750,  751,  754,  752,  753,  755,  756,  749,   72,  753,
-      755,  757,  757,  751,  758,  758,  759,  761,  756,  762,
-      760,  764,  759,  761,  754,  760,  766,  766,  762,  767,
-      768,  772,  773,  764,  774,  774,  772,  778,  766,  768,
-      775,  780,  775,  776,  776,  779,  779,  767,  781,  773,
-
-      784,  782,  783,  785,  786,  791,  787,  778,  787,  786,
-      781,  788,  780,  782,  783,  784,  789,  790,  790,  792,
-      793,  794,  793,  785,  792,  789,  794,  795,  796,  788,
-      797,  791,  795,  798,  799,  800,  803,  801,  798,  799,
-      802,  802,  808,  804,  805,  806,  796,  807,  803,  809,
-      797,  801,  804,  805,  800,  804,  813,  806,  810,  814,
-      807,  812,  808,  816,  810,  809,  818,  812,  814,  815,
-      815,  819,  816,  817,  817,  819,  821,  820,  822,  822,
-      831,  813,  820,  825,  828,  818,  826,  826,  829,  821,
-      827,  827,  825,  829,  830,  831,  828,  832,  830,  833,
-
-      834,  835,  832,  836,  837,  839,  858,  840,  839,  858,
-      841,  842,  842,  843,  843,  836,  844,  844,  833,  834,
-      840,  845,  835,  841,  848,  837,  846,  846,  847,  847,
-      849,  849,  850,  850,  845,  852,  853,  853,  854,  857,
-      852,  855,  855,  848,  856,  857,  861,  859,  859,  860,
-      860,  862,  862,  864,  864,  865,  867,  854,  866,  866,
-      871,  868,  856,  859,  869,  861,  868,  870,  867,  872,
-      873,  874,  870,  875,  877,  871,  874,  875,  872,  873,
-      879,  865,  880,  880,   70,  869,  881,  882,  882,  879,
-      884,  881,  886,  887,  877,  886,  882,  889,  887,  888,
-
-      888,  889,  884,  890,  891,  891,  890,  892,  893,  894,
-      895,  896,  899,  897,  894,  895,  898,  896,  903,  903,
-      899,  898,  900,  916,  900,  906,  906,  892,  893,  897,
-      909,  909,  911,  911,  913,  914,  914,  915,  917,  913,
-      919,  919,  922,  917,  923,  916,  923,  922,  926,  924,
-      925,  925,  927,  915,  924,  928,  929,  930,  931,  934,
-      926,  932,  932,  933,  935,  937,  936,  928,  929,  930,
-      927,  939,  933,  938,  943,  940,  939,  946,  931,  936,
-      940,  941,  941,  947,  935,  934,  946,  938,  948,  937,
-      944,  944,  943,  949,  950,  951,  951,  952,  954,  953,
-
-      955,  947,  952,  959,  960,  966,  948,  960,  963,  949,
-      961,  961,  962,  950,  953,  965,  965,  954,  967,  967,
-      955,  969,  969,  959,  966,  970,  963,  962,  971,  972,
-      973,  974,   67,  976,  972,  973,  977,  971,  978,  974,
-      979,  977,   61,  978,  980,  980,  986,  970,  976,  981,
-      981,  982,  982,  983,  983,  979,  985,  987,  986,  988,
-      987,  985,  989,  990,  990,  991,  993,  994,  988,  995,
-      995,  989,  996,  998,  991,  997, 1001, 1005,  998, 1000,
-       56,  996, 1010,  997, 1007,  993,  994, 1007, 1000, 1001,
-     1003, 1003, 1006, 1006, 1008, 1008, 1011, 1005, 1009, 1009,
-
-     1010, 1012, 1013, 1013, 1014, 1019, 1012, 1020, 1014, 1021,
-     1011, 1022, 1023, 1024, 1025, 1020, 1026, 1023, 1027, 1029,
-     1037, 1030, 1029, 1033, 1019, 1026,   51, 1022, 1021, 1031,
-     1031, 1032, 1033, 1024, 1035, 1032, 1036, 1040, 1027, 1030,
-     1025, 1042, 1040, 1035, 1044, 1037, 1041, 1041, 1036, 1044,
-     1042, 1045, 1046, 1047, 1047, 1048, 1049, 1050, 1051, 1052,
-     1053, 1054, 1054, 1051, 1055, 1050, 1058, 1046, 1059, 1055,
-     1045, 1048, 1057, 1057, 1062, 1049, 1060, 1060, 1064, 1053,
-     1061, 1061, 1063, 1065, 1065, 1052, 1058, 1066, 1066, 1067,
-     1059, 1069, 1073, 1062, 1063,   50, 1069, 1073, 1064, 1070,
-
-     1070, 1071, 1071, 1072, 1072, 1074, 1074, 1082, 1067, 1076,
-     1076, 1078, 1078, 1079, 1084, 1082, 1083, 1083, 1079, 1084,
-     1087, 1088, 1092, 1092, 1094, 1088, 1096, 1096, 1094, 1097,
-     1099, 1100, 1100, 1101, 1101, 1103, 1103, 1105, 1106, 1106,
-     1087, 1110, 1111, 1113, 1097, 1110, 1112, 1112, 1099, 1105,
-     1115, 1117, 1113, 1116, 1118, 1118,   45,   40,   14,   13,
-        0,    0, 1111,    0,    0, 1115,    0, 1116,    0,    0,
-     1117, 1121, 1121, 1121, 1121, 1121, 1121, 1122, 1122, 1122,
-     1122, 1122, 1122, 1123, 1123, 1123, 1123, 1123, 1123, 1124,
-     1124, 1124, 1124, 1124, 1124, 1125, 1125, 1125, 1125, 1125,
-
-     1125, 1127, 1127, 1127, 1127, 1127, 1127, 1128, 1128,    0,
-        0, 1128, 1128, 1129, 1129,    0, 1129,    0, 1129, 1130,
-        0,    0,    0,    0, 1130, 1131, 1131,    0,    0, 1131,
-     1131, 1132,    0,    0,    0,    0, 1132, 1133, 1133, 1133,
-     1133, 1133, 1133, 1134, 1134, 1134, 1134, 1134, 1134, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120,
-     1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120
+        9, 1148,   24,    6,    7,    7,    7,    7,    9,    7,
+       10,   10,   10,   33,   81,    7,    8,    8,    8,    8,
+       10,    8,   21,   44,   44,   21,   24,    8,   11,   11,
+       11,   11,   11,   11,   33,   20,   81,   20,   20,   11,
+
+       20,   25,   28,   21,   30,   20,   23,  179,   11,   12,
+       12,   12,   12,   12,   12,   23,   25,   28,   23,   30,
+       12,   23,   29,  179,   27,   26,   26,   29,   27,   12,
+       19,   19,   19,   19,   26,   19,   22,   22,   27,   31,
+       19,   19,   32,   32,   22,   36,   34,   32,   37,   37,
+       36,   22,   35,  487,   31,   34,   69,   35,   31,   38,
+       69,   34,   66,   32,   34,   36,   37,   35,   60,   60,
+       35,   34,   87,   38,   39,   39,   66,   87,   38,   39,
+       55,   75,   55,   55,   75,   55,   63,   63,   63,   63,
+       65,   63,   65,   65,   76,   65,   68,   63,   68,   68,
+
+       77,   68,   78,   77,   80,   79,   68,   71,   71,   71,
+       71,   82,   71,   83,   76,   90,   82,   71,   71,   79,
+       78,   84,   80,   85,   86,   89,   92,  125,   86,   82,
+       92,   88,   94,   83,   88,   91,   93,   88,   91,   84,
+       90,   85,   91,   93,   89,   94,   95,   96,   97,   99,
+       98,   88,  100,   95,   98,  101,  102,  103,  104,  109,
+       96,  100,  105,  106,  106,  107,  108,   99,   97,  102,
+      112,  110,  103,  111,  153,  101,  110,  104,  114,  114,
+      105,  153,  109,  107,  106,  111,  116,  108,  112,  116,
+      118,  126,  118,  118,  126,  118,  121,  121,  123,  128,
+
+      123,  123,  129,  123,  124,  124,  124,  124,  127,  124,
+      129,  130,  131,  127,  128,  124,  132,  133,  135,  135,
+      136,  132,  133,  137,  138,  136,  130,  140,  138,  139,
+      143,  142,  131,  134,  139,  143,  141,  134,  144,  145,
+      148,  140,  134,  122,  145,  149,  137,  134,  141,  142,
+      149,  141,  147,  134,  134,  146,  146,  147,  144,  150,
+      151,  148,  152,  147,  150,  151,  154,  152,  155,  156,
+      157,  158,  154,  159,  160,  161,  162,  164,  157,  160,
+      163,  165,  163,  169,  164,  169,  158,  167,  155,  166,
+      166,  156,  167,  159,  168,  170,  162,  161,  171,  168,
+
+      165,  172,  169,  173,  174,  175,  172,  170,  173,  176,
+      167,  180,  176,  177,  177,  178,  178,  171,  181,  174,
+      182,  181,  183,  175,  182,  184,  180,  185,  185,  186,
+      187,  183,  188,  189,  186,  187,  190,  191,  191,  184,
+      192,  193,  194,  195,  196,  194,  120,  197,  198,  190,
+      200,  200,  188,  193,  189,  195,  197,  202,  192,  199,
+      198,  199,  199,  201,  196,  203,  201,  204,  205,  205,
+      206,  206,  207,  208,  202,  210,  204,  202,  209,  211,
+      203,  212,  215,  209,  211,  216,  213,  207,  220,  214,
+      212,  213,  218,  208,  214,  210,  221,  217,  224,  216,
+
+      217,  222,  215,  220,  223,  221,  218,  225,  226,  227,
+      228,  229,  225,  246,  246,  119,  217,  219,  224,  219,
+      219,  230,  222,  223,  227,  229,  230,  232,  226,  219,
+      228,  219,  219,  219,  231,  231,  219,  231,  233,  234,
+      236,  237,  235,  238,  236,  117,  241,  232,  243,  239,
+      241,  240,  242,  243,  233,  234,  235,  238,  239,  237,
+      240,  242,  244,  248,  245,  247,  249,  251,  244,  245,
+      247,  239,  248,  255,  250,  252,  252,  256,  249,  250,
+      254,  254,  257,  258,  260,  256,  261,  262,  251,  263,
+      265,  257,  262,  264,  255,  258,  266,  263,  264,  268,
+
+      261,  267,  267,  270,  260,  272,  269,  274,  265,  267,
+      276,  269,  271,  271,  275,  266,  269,  267,  277,  268,
+      273,  273,  274,  270,  278,  276,  275,  267,  279,  280,
+      272,  281,  282,  279,  285,  283,  284,  277,  280,  283,
+      286,  284,  287,  287,  288,  289,  278,  282,  290,  291,
+      281,  290,  285,  286,  292,  292,  288,  293,  293,  294,
+      289,  115,  291,  303,  294,  295,  295,  296,  296,  297,
+      298,  113,  299,  300,  297,  298,  299,  301,  300,  302,
+      304,  301,  305,  303,  302,  304,  306,  307,  307,  306,
+      308,  311,  333,  333,  306,  308,  305,  309,  306,  310,
+
+      309,  312,  313,  310,  311,  314,  312,  313,  318,  315,
+      316,  314,  315,  316,  317,  319,  320,  321,  327,  317,
+       74,  320,  321,  322,  324,  310,  318,  322,  322,  319,
+      323,  325,  326,  324,  325,  323,  326,  326,  327,  328,
+      329,  330,  331,  328,  332,  336,  334,  335,  337,  332,
+      334,  338,  335,  339,  344,  329,   72,  331,  340,  330,
+      339,  336,  341,  340,  338,  342,  343,  337,  345,  341,
+      342,  343,  344,  346,  347,  345,  348,  349,  350,  354,
+      349,  348,  346,  351,  351,  353,  355,  356,  347,  359,
+      353,  362,  351,  364,  355,  367,  368,  354,  364,  350,
+
+      362,  363,  356,  366,   70,  363,  359,  365,  366,  369,
+      369,  365,  372,  367,  365,  370,  371,  371,  375,  365,
+      378,  368,  370,  373,  373,  365,  365,  372,  374,  376,
+      382,  374,  377,  377,  379,  378,  382,  376,  375,  379,
+      380,  380,  381,  383,  384,  381,  385,  387,  386,  388,
+      388,  383,  384,  386,  387,  389,  390,  393,  392,  401,
+      389,  392,  394,  394,  385,  395,  398,  399,  395,  397,
+      398,  393,  400,  401,  402,  390,  395,  403,  397,  404,
+      402,  400,  406,  405,  404,  407,  399,  405,  408,  409,
+      413,  403,  414,  408,  410,  410,  412,  407,  411,  412,
+
+      416,  406,  415,  411,  419,  414,  420,  415,  413,  421,
+      409,  417,  417,  418,  418,  422,  424,  425,  432,  419,
+      416,  426,  428,  427,  431,  420,  429,  433,  433,  422,
+      432,  429,  425,  421,  423,  426,  428,  423,  431,  423,
+      437,  424,  436,  423,  427,  423,  430,  430,  434,  435,
+      423,  438,  438,  434,  430,  440,  436,  435,  441,  437,
+      440,  441,  442,  443,  444,  445,  446,  447,  448,  444,
+      449,  446,  430,  451,  445,  449,  443,  455,  452,  453,
+      454,  442,  448,  452,  453,  454,  455,  447,  451,  456,
+      456,  457,  460,  459,  459,  460,  457,  459,  461,  462,
+
+      463,  464,  465,  463,  467,  466,  464,  465,  466,  468,
+      469,  470,  471,  461,  473,  472,  470,  471,  472,  462,
+      476,  474,  467,  469,  478,  473,  474,  475,  479,  468,
+      477,  477,  475,  480,  481,  476,  482,  483,  481,  484,
+      485,  488,  479,  478,  489,  480,  483,  490,  491,  493,
+      501,  492,  490,  491,  482,  488,  492,  494,  484,  496,
+      498,  495,  502,  493,  489,  485,  495,  497,  497,  501,
+      499,  494,  500,  504,  496,  505,  503,  500,  498,  499,
+      503,  502,  506,  507,  508,  509,  511,  512,  504,  514,
+      505,  509,  510,  516,  517,  519,  512,  515,  524,  517,
+
+       67,  506,  508,  514,  507,  515,  511,  510,  519,  525,
+      518,  520,  524,  516,  518,  518,  520,  521,  521,  522,
+      523,  523,  532,  526,  522,  527,  528,  525,  526,  529,
+      527,  528,  530,  529,  531,  533,  535,  532,  531,  536,
+      534,  530,  537,  538,  539,  544,  530,  536,  530,   61,
+      530,  540,  540,  533,  534,  535,  541,  541,  545,  542,
+      537,  543,  543,  539,  542,  544,  545,  546,  538,  547,
+      548,  549,  546,  559,  551,  552,  548,  553,  549,  551,
+      552,  554,  553,  555,  556,  557,  554,  547,  558,  558,
+      560,  561,  555,  559,  562,  560,  557,  563,  564,  564,
+
+      565,  566,  569,  556,  567,  570,  569,  569,  572,  571,
+      573,  561,  574,  572,  562,  563,  574,  575,  576,  577,
+      565,  581,  567,  578,  580,  582,  566,  571,  578,  580,
+      573,  570,  576,  579,  582,  583,  575,  584,  577,  581,
+      579,  585,  586,  587,  588,  588,  585,  586,  587,  590,
+      583,  591,  592,  594,  590,  595,  592,  592,  584,  593,
+      593,  595,  596,  597,  598,  599,  600,  596,  602,  607,
+      591,  603,  594,  601,  604,  604,  605,  606,  607,  608,
+      605,  611,  597,  598,  599,  600,  603,  601,  610,  602,
+      606,  609,  609,  610,  619,  612,  620,  613,  622,  608,
+
+      612,  611,  613,  616,  616,  618,  621,  624,  618,  619,
+      626,  621,  627,  622,  623,  623,  625,  625,  628,  629,
+      630,  620,  628,  627,  632,  630,  634,  624,  633,  633,
+      635,  636,  626,  637,  638,  637,  639,  640,  629,  638,
+      643,  639,  632,  641,  644,  643,  634,  646,  646,  641,
+      635,  636,  645,  647,  648,  645,  649,  640,  650,  651,
+      651,  649,  652,  650,  653,  654,  655,  652,  657,  644,
+      656,  647,  658,  659,  648,  660,  661,  658,  663,  662,
+      664,  657,  653,  668,  656,  654,  655,  663,  667,  669,
+      663,  667,  668,  659,  662,  660,  664,  661,  670,  672,
+
+      671,  673,  673,  674,  672,  675,  676,  670,  669,  671,
+      670,  677,  678,  679,  679,  680,  681,  683,  675,  689,
+      688,  684,  683,  674,  676,  677,  684,  685,  688,  686,
+      678,  680,  686,  685,  681,  690,  691,  689,  686,  692,
+      694,  695,  696,  697,  698,  695,  699,  696,  697,  698,
+      700,  701,  691,  702,  690,  699,  703,  692,  704,  705,
+      694,  707,  706,  708,  705,  713,  701,  702,  703,  708,
+      704,  709,  709,  700,  706,  710,  711,  711,  712,  707,
+      714,  715,  715,  712,  710,  721,  713,  716,  716,  717,
+      717,  718,  720,  722,  718,  723,  726,  720,  722,  725,
+
+      714,  724,  724,  721,  725,  727,  728,  729,  726,  730,
+      726,  731,  732,  732,  733,  726,  735,  737,  739,  734,
+      723,   56,  736,  735,  740,  727,  728,  729,  734,  744,
+      730,  736,  738,  738,  733,  748,  742,  731,  745,  747,
+      740,  742,  743,  737,  739,  745,  746,  743,  747,  744,
+      749,  746,  750,  751,  752,  748,  753,  755,  754,  751,
+      765,  757,  755,  752,  756,  749,  757,  758,  756,  756,
+      759,  750,  754,  760,  761,  759,  762,  753,  761,  758,
+      763,  764,  765,  767,  766,  760,  764,  768,  762,  766,
+      768,  769,  769,  770,  770,  767,  771,  776,  772,  774,
+
+      773,  779,  771,  772,  780,  763,  773,  784,  774,  776,
+      778,  778,  784,  780,  785,  786,  786,  790,  787,  779,
+      787,  792,  778,  788,  788,  791,  791,  793,  794,  795,
+      796,  785,  797,  798,  799,  800,  799,  790,  798,  793,
+      794,  795,  792,  802,  802,  796,  801,  803,  805,  804,
+      805,  806,  797,  800,  804,  801,  806,  807,  808,  809,
+      810,  811,  807,  812,  813,  810,  811,  814,  814,  815,
+      820,  816,  819,  803,  818,  817,  808,  821,  813,  809,
+      816,  815,  812,  816,  817,  819,  818,  825,  822,  824,
+      820,  826,  828,  821,  822,  824,  827,  827,  829,  829,
+
+      826,  828,  830,  831,  832,  833,  835,  831,  838,  832,
+      834,  834,  825,  841,  835,  839,  839,  838,  833,  840,
+      840,  830,  842,  844,  843,  841,  845,  842,  843,  846,
+      847,  845,  848,  849,  850,  865,  852,  853,  844,  852,
+      865,  854,  855,  855,  858,  849,  856,  856,  846,  847,
+      853,  857,  857,  848,  854,  850,  861,  858,  859,  859,
+      860,  860,  862,  862,  863,  863,  866,  866,  867,  868,
+      868,  869,  870,  871,  874,  861,  871,  878,  870,  872,
+      872,  873,  873,  875,  875,  877,  877,  867,  880,  869,
+      879,  879,  881,  874,  882,  872,  883,  881,  884,  885,
+
+      880,  883,  886,  878,  887,  890,  888,  892,  885,  887,
+      888,  886,  897,  884,  894,  882,  892,  893,  893,  894,
+      895,  895,  898,  900,  906,  890,  900,  897,  901,  895,
+      902,  902,  903,  901,  898,  904,  903,  907,  904,  905,
+      905,  908,  909,  910,  906,  911,  908,  909,  912,  910,
+      913,  930,  914,  912,  914,  917,  917,  907,  913,  920,
+      920,  911,  923,  923,  925,  925,  927,  928,  928,  929,
+      931,  927,  940,  930,  936,  931,  933,  933,  937,  936,
+      937,  938,  939,  939,  940,  929,  938,  941,  942,  943,
+      944,  945,  946,  946,  947,  948,  949,  950,  951,  952,
+
+      942,  943,  944,  947,  954,  941,  953,  955,  958,  954,
+      950,  945,  955,  952,  956,  956,  949,  959,  959,  961,
+      962,  948,  951,  963,  953,  965,  958,  964,  961,  966,
+      966,  967,  968,  969,  970,  974,  967,  975,  962,  981,
+      975,  963,  977,  964,  965,  976,  976,  968,  978,  980,
+      980,  985,  969,   51,  970,  974,  986,  977,  981,  982,
+      982,  984,  984,  987,  988,  986,  978,  989,  987,  988,
+      991,  992,  993,  985,  994,  989,  992,  993,  995,  995,
+      996,  996,  997,  998,  998,  991, 1002,  997, 1001,  994,
+      999,  999, 1003, 1001, 1004, 1003, 1005, 1007, 1002, 1006,
+
+     1006, 1009, 1010, 1004, 1012, 1005, 1007, 1011, 1011, 1013,
+     1014, 1017, 1021, 1012, 1016, 1014,   50, 1013, 1019, 1019,
+     1009, 1010, 1026, 1016, 1017, 1022, 1022, 1023, 1024, 1024,
+     1023, 1027, 1021, 1025, 1025, 1030, 1028, 1029, 1029, 1030,
+     1026, 1028, 1033, 1036, 1037, 1027, 1038, 1039, 1033, 1040,
+     1041, 1042, 1037, 1044, 1040, 1043, 1046, 1047, 1054, 1046,
+     1048, 1048, 1036, 1039, 1043, 1038,   45, 1049, 1053, 1050,
+     1041, 1049, 1052, 1044, 1057, 1047, 1070, 1042, 1050, 1057,
+     1053, 1052, 1059, 1054, 1058, 1058, 1062, 1061, 1063, 1064,
+     1066, 1059, 1061, 1065, 1065, 1062, 1067, 1068, 1069, 1071,
+
+     1072, 1072, 1070, 1069, 1064, 1068, 1066, 1063, 1073, 1075,
+     1075, 1076, 1077, 1073, 1080, 1067, 1078, 1078, 1071, 1079,
+     1079, 1082, 1101, 1081, 1083, 1083, 1084, 1085, 1085, 1086,
+     1101, 1076, 1088, 1080, 1077, 1081,   40, 1088, 1084, 1089,
+     1089, 1082, 1090, 1090, 1091, 1091, 1092, 1107, 1086, 1093,
+     1093, 1092, 1095, 1095, 1097, 1097, 1098, 1102, 1102, 1103,
+     1105, 1098, 1108, 1117, 1103, 1105, 1108, 1107, 1112, 1112,
+     1114, 1116, 1116, 1119, 1114, 1120, 1120, 1126, 1117, 1121,
+     1121, 1122, 1122, 1124, 1124, 1127, 1127, 1133, 1132, 1126,
+     1135, 1119, 1132, 1134, 1134, 1137, 1139, 1138,   14, 1135,
+
+     1140, 1140,   13,    0,    0,    0,    0, 1133,    0,    0,
+     1137, 1138,    0,    0,    0, 1139, 1143, 1143, 1143, 1143,
+     1143, 1143, 1144, 1144, 1144, 1144, 1144, 1144, 1145, 1145,
+     1145, 1145, 1145, 1145, 1146, 1146, 1146, 1146, 1146, 1146,
+     1147, 1147, 1147, 1147, 1147, 1147, 1149, 1149, 1149, 1149,
+     1149, 1149, 1150, 1150,    0,    0, 1150, 1150, 1151, 1151,
+        0, 1151,    0, 1151, 1152,    0,    0,    0,    0, 1152,
+     1153, 1153,    0,    0, 1153, 1153, 1154,    0,    0,    0,
+        0, 1154, 1155, 1155, 1155, 1155, 1155, 1155, 1156, 1156,
+     1156, 1156, 1156, 1156, 1142, 1142, 1142, 1142, 1142, 1142,
+
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+     1142, 1142, 1142, 1142
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1430,7 +1449,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 1432 "<stdout>"
+#line 1451 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -1617,7 +1636,7 @@ YY_DECL
     
 #line 123 "util/configlexer.lex"
 
-#line 1619 "<stdout>"
+#line 1638 "<stdout>"
 
        if ( !(yy_init) )
                {
@@ -1676,13 +1695,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 >= 1121 )
+                               if ( yy_current_state >= 1143 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 2250 );
+               while ( yy_base[yy_current_state] != 2295 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -2054,199 +2073,204 @@ YY_RULE_SETUP
 case 69:
 YY_RULE_SETUP
 #line 194 "util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 195 "util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
        YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 196 "util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
        YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 197 "util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
        YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 198 "util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
        YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 199 "util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
        YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 200 "util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
        YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 201 "util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
        YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 202 "util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
        YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 203 "util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
        YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 204 "util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
        YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 205 "util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
        YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 206 "util/configlexer.lex"
-{ 
-                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
        YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 208 "util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+#line 207 "util/configlexer.lex"
+{ 
+                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
        YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 209 "util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
        YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 210 "util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
        YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 211 "util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
        YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 212 "util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
        YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 213 "util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
        YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 214 "util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
        YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 215 "util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
        YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 216 "util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
        YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 217 "util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 218 "util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 219 "util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 220 "util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 221 "util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 222 "util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
        YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 223 "util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 224 "util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
        YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 225 "util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 226 "util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_PYTHON) }
        YY_BREAK
 case 101:
-/* rule 101 can match eol */
 YY_RULE_SETUP
 #line 227 "util/configlexer.lex"
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+       YY_BREAK
+case 102:
+/* rule 102 can match eol */
+YY_RULE_SETUP
+#line 228 "util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
        YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 230 "util/configlexer.lex"
+#line 231 "util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 231 "util/configlexer.lex"
+#line 232 "util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 236 "util/configlexer.lex"
+#line 237 "util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 104:
-/* rule 104 can match eol */
+case 105:
+/* rule 105 can match eol */
 YY_RULE_SETUP
-#line 237 "util/configlexer.lex"
+#line 238 "util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 239 "util/configlexer.lex"
+#line 240 "util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2259,34 +2283,34 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 251 "util/configlexer.lex"
+#line 252 "util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 252 "util/configlexer.lex"
+#line 253 "util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 257 "util/configlexer.lex"
+#line 258 "util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 108:
-/* rule 108 can match eol */
+case 109:
+/* rule 109 can match eol */
 YY_RULE_SETUP
-#line 258 "util/configlexer.lex"
+#line 259 "util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 109:
+case 110:
 YY_RULE_SETUP
-#line 260 "util/configlexer.lex"
+#line 261 "util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2299,38 +2323,38 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* include: directive */
-case 110:
+case 111:
 YY_RULE_SETUP
-#line 272 "util/configlexer.lex"
+#line 273 "util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 274 "util/configlexer.lex"
+#line 275 "util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 111:
-YY_RULE_SETUP
-#line 278 "util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-       YY_BREAK
 case 112:
-/* rule 112 can match eol */
 YY_RULE_SETUP
 #line 279 "util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
 case 113:
+/* rule 113 can match eol */
 YY_RULE_SETUP
 #line 280 "util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 281 "util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+       YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 282 "util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include(yytext);
@@ -2338,27 +2362,27 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 286 "util/configlexer.lex"
+#line 287 "util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 115:
+case 116:
 YY_RULE_SETUP
-#line 290 "util/configlexer.lex"
+#line 291 "util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 116:
-/* rule 116 can match eol */
+case 117:
+/* rule 117 can match eol */
 YY_RULE_SETUP
-#line 291 "util/configlexer.lex"
+#line 292 "util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
-case 117:
+case 118:
 YY_RULE_SETUP
-#line 293 "util/configlexer.lex"
+#line 294 "util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -2368,7 +2392,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 299 "util/configlexer.lex"
+#line 300 "util/configlexer.lex"
 {
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
        if (config_include_stack_ptr == 0) {
@@ -2379,33 +2403,33 @@ case YY_STATE_EOF(val):
        }
 }
        YY_BREAK
-case 118:
+case 119:
 YY_RULE_SETUP
-#line 309 "util/configlexer.lex"
+#line 310 "util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
-case 119:
+case 120:
 YY_RULE_SETUP
-#line 313 "util/configlexer.lex"
+#line 314 "util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
-case 120:
+case 121:
 YY_RULE_SETUP
-#line 317 "util/configlexer.lex"
+#line 318 "util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
-case 121:
+case 122:
 YY_RULE_SETUP
-#line 321 "util/configlexer.lex"
+#line 322 "util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 2407 "<stdout>"
+#line 2431 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -2695,7 +2719,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 >= 1121 )
+                       if ( yy_current_state >= 1143 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2723,11 +2747,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 >= 1121 )
+               if ( yy_current_state >= 1143 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 1120);
+       yy_is_jam = (yy_current_state == 1142);
 
        return yy_is_jam ? 0 : yy_current_state;
 }
@@ -3364,7 +3388,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 321 "util/configlexer.lex"
+#line 322 "util/configlexer.lex"
 
 
 

diff --git a/util/configlexer.lex b/util/configlexer.lex
index 7c21253b784a764bde771f4e3cbfb18077707db1..c6db89c6eb09b2764f87a79b405ad5dc7661dd24 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -191,6 +191,7 @@ module-config{COLON}        { YDVAR(1, VAR_MODULE_CONF) }
 dlv-anchor{COLON}              { YDVAR(1, VAR_DLV_ANCHOR) }
 dlv-anchor-file{COLON}         { YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 trust-anchor-file{COLON}       { YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+auto-trust-anchor-file{COLON}  { YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 trusted-keys-file{COLON}       { YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 trust-anchor{COLON}            { YDVAR(1, VAR_TRUST_ANCHOR) }
 val-override-date{COLON}       { YDVAR(1, VAR_VAL_OVERRIDE_DATE) }

diff --git a/util/configparser.c b/util/configparser.c
index 8ce125f88ee8d1a74d8268e334419524e6ea18be..544d3f4fdf9bffb3d53938d06699fae004ae9044 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -229,7 +229,8 @@ extern struct config_parser_state* cfg_parser;
      VAR_VAL_SIG_SKEW_MIN = 360,
      VAR_VAL_SIG_SKEW_MAX = 361,
      VAR_CACHE_MIN_TTL = 362,
-     VAR_VAL_LOG_LEVEL = 363
+     VAR_VAL_LOG_LEVEL = 363,
+     VAR_AUTO_TRUST_ANCHOR_FILE = 364
    };
 #endif
 /* Tokens.  */
@@ -339,6 +340,7 @@ extern struct config_parser_state* cfg_parser;
 #define VAR_VAL_SIG_SKEW_MAX 361
 #define VAR_CACHE_MIN_TTL 362
 #define VAR_VAL_LOG_LEVEL 363
+#define VAR_AUTO_TRUST_ANCHOR_FILE 364
 
 
 
@@ -355,7 +357,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 359 "util/configparser.c"
+#line 361 "util/configparser.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -367,7 +369,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 371 "util/configparser.c"
+#line 373 "util/configparser.c"
 
 #ifdef short
 # undef short
@@ -582,20 +584,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   200
+#define YYLAST   201
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  109
+#define YYNTOKENS  110
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  112
+#define YYNNTS  113
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  211
+#define YYNRULES  213
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  308
+#define YYNSTATES  311
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   363
+#define YYMAXUTOK   364
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -639,7 +641,7 @@ static const yytype_uint8 yytranslate[] =
       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
+     105,   106,   107,   108,   109
 };
 
 #if YYDEBUG
@@ -656,104 +658,104 @@ static const yytype_uint16 yyprhs[] =
      124,   126,   128,   130,   132,   134,   136,   138,   140,   142,
      144,   146,   148,   150,   152,   154,   156,   158,   160,   162,
      164,   166,   168,   170,   172,   174,   176,   178,   180,   182,
-     184,   186,   188,   191,   192,   194,   196,   198,   200,   202,
-     205,   206,   208,   210,   212,   215,   218,   221,   224,   227,
-     230,   233,   236,   239,   242,   245,   248,   251,   254,   257,
-     260,   263,   266,   269,   272,   275,   278,   281,   284,   287,
-     290,   293,   296,   299,   302,   305,   308,   311,   314,   317,
-     320,   323,   326,   329,   332,   335,   338,   341,   344,   347,
-     350,   353,   356,   359,   362,   365,   368,   371,   374,   377,
-     380,   383,   386,   389,   392,   395,   399,   402,   405,   408,
-     411,   414,   417,   420,   423,   426,   429,   432,   435,   438,
-     441,   445,   448,   451,   454,   457,   460,   463,   466,   469,
-     472,   474,   477,   478,   480,   482,   484,   486,   488,   490,
-     492,   495,   498,   501,   504,   507,   510,   513,   515,   518,
-     519,   521
+     184,   186,   188,   190,   193,   194,   196,   198,   200,   202,
+     204,   207,   208,   210,   212,   214,   217,   220,   223,   226,
+     229,   232,   235,   238,   241,   244,   247,   250,   253,   256,
+     259,   262,   265,   268,   271,   274,   277,   280,   283,   286,
+     289,   292,   295,   298,   301,   304,   307,   310,   313,   316,
+     319,   322,   325,   328,   331,   334,   337,   340,   343,   346,
+     349,   352,   355,   358,   361,   364,   367,   370,   373,   376,
+     379,   382,   385,   388,   391,   394,   397,   400,   404,   407,
+     410,   413,   416,   419,   422,   425,   428,   431,   434,   437,
+     440,   443,   446,   450,   453,   456,   459,   462,   465,   468,
+     471,   474,   477,   479,   482,   483,   485,   487,   489,   491,
+     493,   495,   497,   500,   503,   506,   509,   512,   515,   518,
+     520,   523,   524,   526
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     110,     0,    -1,    -1,   110,   111,    -1,   112,   113,    -1,
-     115,   116,    -1,   118,   119,    -1,   217,   218,    -1,   207,
-     208,    -1,    11,    -1,   113,   114,    -1,    -1,   121,    -1,
-     122,    -1,   126,    -1,   129,    -1,   135,    -1,   136,    -1,
-     137,    -1,   138,    -1,   127,    -1,   142,    -1,   143,    -1,
-     144,    -1,   145,    -1,   146,    -1,   159,    -1,   160,    -1,
-     161,    -1,   163,    -1,   164,    -1,   132,    -1,   165,    -1,
-     166,    -1,   169,    -1,   167,    -1,   168,    -1,   170,    -1,
-     171,    -1,   172,    -1,   180,    -1,   154,    -1,   155,    -1,
-     156,    -1,   157,    -1,   173,    -1,   183,    -1,   150,    -1,
-     152,    -1,   184,    -1,   189,    -1,   190,    -1,   191,    -1,
-     133,    -1,   158,    -1,   194,    -1,   195,    -1,   151,    -1,
-     193,    -1,   140,    -1,   128,    -1,   147,    -1,   181,    -1,
-     187,    -1,   174,    -1,   182,    -1,   197,    -1,   198,    -1,
-     134,    -1,   123,    -1,   139,    -1,   176,    -1,   124,    -1,
-     130,    -1,   131,    -1,   148,    -1,   149,    -1,   196,    -1,
-     175,    -1,   177,    -1,   178,    -1,   125,    -1,   199,    -1,
-     162,    -1,   179,    -1,   141,    -1,   153,    -1,   185,    -1,
-     186,    -1,   188,    -1,   192,    -1,    38,    -1,   116,   117,
-      -1,    -1,   200,    -1,   201,    -1,   202,    -1,   203,    -1,
-      44,    -1,   119,   120,    -1,    -1,   204,    -1,   205,    -1,
-     206,    -1,    13,    10,    -1,    12,    10,    -1,    76,    10,
-      -1,    79,    10,    -1,    96,    10,    -1,    14,    10,    -1,
-      16,    10,    -1,    67,    10,    -1,    15,    10,    -1,    80,
-      10,    -1,    81,    10,    -1,    31,    10,    -1,    60,    10,
-      -1,    75,    10,    -1,    17,    10,    -1,    18,    10,    -1,
-      19,    10,    -1,    20,    10,    -1,    77,    10,    -1,    66,
-      10,    -1,   101,    10,    -1,    21,    10,    -1,    22,    10,
-      -1,    23,    10,    -1,    24,    10,    -1,    25,    10,    -1,
-      68,    10,    -1,    82,    10,    -1,    83,    10,    -1,    54,
-      10,    -1,    64,    10,    -1,    55,    10,    -1,   102,    10,
-      -1,    48,    10,    -1,    49,    10,    -1,    50,    10,    -1,
-      51,    10,    -1,    61,    10,    -1,    26,    10,    -1,    27,
-      10,    -1,    28,    10,    -1,    98,    10,    -1,    29,    10,
-      -1,    30,    10,    -1,    32,    10,    -1,    33,    10,    -1,
-      35,    10,    -1,    36,    10,    -1,    34,    10,    -1,    41,
-      10,    -1,    42,    10,    -1,    43,    10,    -1,    52,    10,
-      -1,    71,    10,    -1,    85,    10,    -1,    78,    10,    -1,
-      86,    10,    -1,    87,    10,    -1,   100,    10,    -1,    47,
-      10,    -1,    69,    10,    -1,    72,    10,    10,    -1,    53,
-      10,    -1,    56,    10,    -1,   105,    10,    -1,   106,    10,
-      -1,    70,    10,    -1,   107,    10,    -1,    57,    10,    -1,
-      58,    10,    -1,    59,    10,    -1,   108,    10,    -1,    65,
-      10,    -1,    62,    10,    -1,    63,    10,    -1,    84,    10,
-      -1,    73,    10,    10,    -1,    74,    10,    -1,    97,    10,
-      -1,    37,    10,    -1,    39,    10,    -1,    40,    10,    -1,
-      99,    10,    -1,    37,    10,    -1,    45,    10,    -1,    46,
-      10,    -1,    88,    -1,   208,   209,    -1,    -1,   210,    -1,
-     212,    -1,   211,    -1,   213,    -1,   214,    -1,   215,    -1,
-     216,    -1,    89,    10,    -1,    91,    10,    -1,    90,    10,
-      -1,    92,    10,    -1,    93,    10,    -1,    94,    10,    -1,
-      95,    10,    -1,   103,    -1,   218,   219,    -1,    -1,   220,
-      -1,   104,    10,    -1
+     111,     0,    -1,    -1,   111,   112,    -1,   113,   114,    -1,
+     116,   117,    -1,   119,   120,    -1,   219,   220,    -1,   209,
+     210,    -1,    11,    -1,   114,   115,    -1,    -1,   122,    -1,
+     123,    -1,   127,    -1,   130,    -1,   136,    -1,   137,    -1,
+     138,    -1,   139,    -1,   128,    -1,   143,    -1,   144,    -1,
+     145,    -1,   146,    -1,   147,    -1,   161,    -1,   162,    -1,
+     163,    -1,   165,    -1,   166,    -1,   133,    -1,   167,    -1,
+     168,    -1,   171,    -1,   169,    -1,   170,    -1,   172,    -1,
+     173,    -1,   174,    -1,   182,    -1,   156,    -1,   157,    -1,
+     158,    -1,   159,    -1,   175,    -1,   185,    -1,   152,    -1,
+     154,    -1,   186,    -1,   191,    -1,   192,    -1,   193,    -1,
+     134,    -1,   160,    -1,   196,    -1,   197,    -1,   153,    -1,
+     195,    -1,   141,    -1,   129,    -1,   148,    -1,   183,    -1,
+     189,    -1,   176,    -1,   184,    -1,   199,    -1,   200,    -1,
+     135,    -1,   124,    -1,   140,    -1,   178,    -1,   125,    -1,
+     131,    -1,   132,    -1,   149,    -1,   150,    -1,   198,    -1,
+     177,    -1,   179,    -1,   180,    -1,   126,    -1,   201,    -1,
+     164,    -1,   181,    -1,   142,    -1,   155,    -1,   187,    -1,
+     188,    -1,   190,    -1,   194,    -1,   151,    -1,    38,    -1,
+     117,   118,    -1,    -1,   202,    -1,   203,    -1,   204,    -1,
+     205,    -1,    44,    -1,   120,   121,    -1,    -1,   206,    -1,
+     207,    -1,   208,    -1,    13,    10,    -1,    12,    10,    -1,
+      76,    10,    -1,    79,    10,    -1,    96,    10,    -1,    14,
+      10,    -1,    16,    10,    -1,    67,    10,    -1,    15,    10,
+      -1,    80,    10,    -1,    81,    10,    -1,    31,    10,    -1,
+      60,    10,    -1,    75,    10,    -1,    17,    10,    -1,    18,
+      10,    -1,    19,    10,    -1,    20,    10,    -1,    77,    10,
+      -1,    66,    10,    -1,   101,    10,    -1,    21,    10,    -1,
+      22,    10,    -1,    23,    10,    -1,    24,    10,    -1,    25,
+      10,    -1,    68,    10,    -1,    82,    10,    -1,    83,    10,
+      -1,   109,    10,    -1,    54,    10,    -1,    64,    10,    -1,
+      55,    10,    -1,   102,    10,    -1,    48,    10,    -1,    49,
+      10,    -1,    50,    10,    -1,    51,    10,    -1,    61,    10,
+      -1,    26,    10,    -1,    27,    10,    -1,    28,    10,    -1,
+      98,    10,    -1,    29,    10,    -1,    30,    10,    -1,    32,
+      10,    -1,    33,    10,    -1,    35,    10,    -1,    36,    10,
+      -1,    34,    10,    -1,    41,    10,    -1,    42,    10,    -1,
+      43,    10,    -1,    52,    10,    -1,    71,    10,    -1,    85,
+      10,    -1,    78,    10,    -1,    86,    10,    -1,    87,    10,
+      -1,   100,    10,    -1,    47,    10,    -1,    69,    10,    -1,
+      72,    10,    10,    -1,    53,    10,    -1,    56,    10,    -1,
+     105,    10,    -1,   106,    10,    -1,    70,    10,    -1,   107,
+      10,    -1,    57,    10,    -1,    58,    10,    -1,    59,    10,
+      -1,   108,    10,    -1,    65,    10,    -1,    62,    10,    -1,
+      63,    10,    -1,    84,    10,    -1,    73,    10,    10,    -1,
+      74,    10,    -1,    97,    10,    -1,    37,    10,    -1,    39,
+      10,    -1,    40,    10,    -1,    99,    10,    -1,    37,    10,
+      -1,    45,    10,    -1,    46,    10,    -1,    88,    -1,   210,
+     211,    -1,    -1,   212,    -1,   214,    -1,   213,    -1,   215,
+      -1,   216,    -1,   217,    -1,   218,    -1,    89,    10,    -1,
+      91,    10,    -1,    90,    10,    -1,    92,    10,    -1,    93,
+      10,    -1,    94,    10,    -1,    95,    10,    -1,   103,    -1,
+     220,   221,    -1,    -1,   222,    -1,   104,    10,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   104,   104,   104,   105,   105,   106,   106,   107,   111,
-     116,   117,   118,   118,   118,   119,   119,   120,   120,   120,
-     121,   121,   121,   122,   122,   122,   123,   123,   124,   124,
-     125,   125,   126,   126,   127,   127,   128,   128,   129,   129,
-     130,   130,   131,   131,   131,   132,   132,   132,   133,   133,
-     133,   134,   134,   135,   135,   136,   136,   137,   137,   138,
-     138,   138,   139,   139,   140,   140,   141,   141,   141,   142,
-     142,   143,   143,   144,   144,   145,   145,   145,   146,   146,
-     147,   147,   148,   148,   149,   149,   150,   150,   151,   151,
-     151,   153,   165,   166,   167,   167,   167,   167,   169,   181,
-     182,   183,   183,   183,   185,   194,   203,   214,   223,   232,
-     241,   254,   269,   278,   287,   296,   305,   314,   323,   332,
-     341,   350,   359,   368,   382,   391,   398,   405,   412,   420,
-     427,   434,   441,   448,   456,   464,   471,   478,   487,   496,
-     503,   510,   521,   529,   542,   551,   560,   568,   581,   590,
-     599,   608,   617,   630,   637,   647,   657,   667,   677,   687,
-     697,   704,   711,   720,   727,   737,   751,   758,   776,   789,
-     802,   811,   820,   829,   839,   849,   858,   865,   873,   886,
-     894,   914,   921,   936,   943,   950,   957,   967,   974,   981,
-     988,   993,   994,   995,   995,   995,   996,   996,   996,   997,
-     999,  1009,  1018,  1025,  1032,  1039,  1046,  1053,  1058,  1059,
-    1060,  1062
+       0,   105,   105,   105,   106,   106,   107,   107,   108,   112,
+     117,   118,   119,   119,   119,   120,   120,   121,   121,   121,
+     122,   122,   122,   123,   123,   123,   124,   124,   125,   125,
+     126,   126,   127,   127,   128,   128,   129,   129,   130,   130,
+     131,   131,   132,   132,   132,   133,   133,   133,   134,   134,
+     134,   135,   135,   136,   136,   137,   137,   138,   138,   139,
+     139,   139,   140,   140,   141,   141,   142,   142,   142,   143,
+     143,   144,   144,   145,   145,   146,   146,   146,   147,   147,
+     148,   148,   149,   149,   150,   150,   151,   151,   152,   152,
+     152,   153,   155,   167,   168,   169,   169,   169,   169,   171,
+     183,   184,   185,   185,   185,   187,   196,   205,   216,   225,
+     234,   243,   256,   271,   280,   289,   298,   307,   316,   325,
+     334,   343,   352,   361,   370,   384,   393,   400,   407,   414,
+     422,   429,   436,   443,   450,   458,   466,   474,   481,   488,
+     497,   506,   513,   520,   531,   539,   552,   561,   570,   578,
+     591,   600,   609,   618,   627,   640,   647,   657,   667,   677,
+     687,   697,   707,   714,   721,   730,   737,   747,   761,   768,
+     786,   799,   812,   821,   830,   839,   849,   859,   868,   875,
+     883,   896,   904,   924,   931,   946,   953,   960,   967,   977,
+     984,   991,   998,  1003,  1004,  1005,  1005,  1005,  1006,  1006,
+    1006,  1007,  1009,  1019,  1028,  1035,  1042,  1049,  1056,  1063,
+    1068,  1069,  1070,  1072
 };
 #endif
 
@@ -796,39 +798,40 @@ static const char *const yytname[] =
   "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", "$accept", "toplevelvars", "toplevelvar",
-  "serverstart", "contents_server", "content_server", "stubstart",
-  "contents_stub", "content_stub", "forwardstart", "contents_forward",
-  "content_forward", "server_num_threads", "server_verbosity",
-  "server_statistics_interval", "server_statistics_cumulative",
-  "server_extended_statistics", "server_port", "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_do_daemonize",
+  "VAR_VAL_LOG_LEVEL", "VAR_AUTO_TRUST_ANCHOR_FILE", "$accept",
+  "toplevelvars", "toplevelvar", "serverstart", "contents_server",
+  "content_server", "stubstart", "contents_stub", "content_stub",
+  "forwardstart", "contents_forward", "content_forward",
+  "server_num_threads", "server_verbosity", "server_statistics_interval",
+  "server_statistics_cumulative", "server_extended_statistics",
+  "server_port", "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_do_daemonize",
   "server_use_syslog", "server_log_time_ascii", "server_chroot",
   "server_username", "server_directory", "server_logfile",
   "server_pidfile", "server_root_hints", "server_dlv_anchor_file",
-  "server_dlv_anchor", "server_trust_anchor_file",
-  "server_trusted_keys_file", "server_trust_anchor",
-  "server_domain_insecure", "server_hide_identity", "server_hide_version",
-  "server_identity", "server_version", "server_msg_buffer_size",
-  "server_msg_cache_size", "server_msg_cache_slabs",
-  "server_num_queries_per_thread", "server_jostle_timeout",
-  "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_target_fetch_policy",
-  "server_harden_short_bufsize", "server_harden_large_queries",
-  "server_harden_glue", "server_harden_dnssec_stripped",
-  "server_harden_referral_path", "server_use_caps_for_id",
-  "server_private_address", "server_private_domain",
-  "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_min_ttl", "server_bogus_ttl",
+  "server_dlv_anchor", "server_auto_trust_anchor_file",
+  "server_trust_anchor_file", "server_trusted_keys_file",
+  "server_trust_anchor", "server_domain_insecure", "server_hide_identity",
+  "server_hide_version", "server_identity", "server_version",
+  "server_msg_buffer_size", "server_msg_cache_size",
+  "server_msg_cache_slabs", "server_num_queries_per_thread",
+  "server_jostle_timeout", "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_target_fetch_policy", "server_harden_short_bufsize",
+  "server_harden_large_queries", "server_harden_glue",
+  "server_harden_dnssec_stripped", "server_harden_referral_path",
+  "server_use_caps_for_id", "server_private_address",
+  "server_private_domain", "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_min_ttl", "server_bogus_ttl",
   "server_val_clean_additional", "server_val_permissive_mode",
   "server_val_log_level", "server_val_nsec3_keysize_iterations",
   "server_key_cache_size", "server_key_cache_slabs",
@@ -857,24 +860,24 @@ static const yytype_uint16 yytoknum[] =
      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
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   109,   110,   110,   111,   111,   111,   111,   111,   112,
-     113,   113,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   114,   114,   114,   114,   114,   114,   114,   114,   114,
-     114,   115,   116,   116,   117,   117,   117,   117,   118,   119,
-     119,   120,   120,   120,   121,   122,   123,   124,   125,   126,
+       0,   110,   111,   111,   112,   112,   112,   112,   112,   113,
+     114,   114,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+     115,   115,   116,   117,   117,   118,   118,   118,   118,   119,
+     120,   120,   121,   121,   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,
@@ -883,9 +886,9 @@ static const yytype_uint8 yyr1[] =
      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,   208,   209,   209,   209,   209,   209,   209,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   218,
-     219,   220
+     207,   208,   209,   210,   210,   211,   211,   211,   211,   211,
+     211,   211,   212,   213,   214,   215,   216,   217,   218,   219,
+     220,   220,   221,   222
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -900,19 +903,19 @@ 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,     2,     0,     1,     1,     1,     1,     1,     2,
-       0,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
+       2,     0,     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,     3,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       3,     2,     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,     1,     2,     0,
-       1,     2
+       2,     2,     3,     2,     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,     1,
+       2,     0,     1,     2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -920,8 +923,8 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       2,     0,     1,     9,    91,    98,   190,   207,     3,    11,
-      93,   100,   192,   209,     4,     5,     6,     8,     7,     0,
+       2,     0,     1,     9,    92,    99,   192,   209,     3,    11,
+      94,   101,   194,   211,     4,     5,     6,     8,     7,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -929,45 +932,46 @@ static const yytype_uint8 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,    10,    12,
-      13,    69,    72,    81,    14,    20,    60,    15,    73,    74,
-      31,    53,    68,    16,    17,    18,    19,    70,    59,    85,
-      21,    22,    23,    24,    25,    61,    75,    76,    47,    57,
-      48,    86,    41,    42,    43,    44,    54,    26,    27,    28,
-      83,    29,    30,    32,    33,    35,    36,    34,    37,    38,
-      39,    45,    64,    78,    71,    79,    80,    84,    40,    62,
-      65,    46,    49,    87,    88,    63,    89,    50,    51,    52,
-      90,    58,    55,    56,    77,    66,    67,    82,     0,     0,
-       0,     0,    92,    94,    95,    96,    97,     0,     0,     0,
-      99,   101,   102,   103,     0,     0,     0,     0,     0,     0,
-       0,   191,   193,   195,   194,   196,   197,   198,   199,     0,
-     208,   210,   105,   104,   109,   112,   110,   118,   119,   120,
-     121,   125,   126,   127,   128,   129,   142,   143,   144,   146,
-     147,   115,   148,   149,   152,   150,   151,   153,   154,   155,
-     163,   137,   138,   139,   140,   156,   166,   133,   135,   167,
-     172,   173,   174,   116,   141,   177,   178,   134,   176,   123,
-     111,   130,   164,   170,   157,     0,     0,   181,   117,   106,
-     122,   159,   107,   113,   114,   131,   132,   179,   158,   160,
-     161,   108,   182,   145,   162,   124,   136,   168,   169,   171,
-     175,   183,   184,   185,   186,   187,   188,   189,   200,   202,
-     201,   203,   204,   205,   206,   211,   165,   180
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    10,
+      12,    13,    69,    72,    81,    14,    20,    60,    15,    73,
+      74,    31,    53,    68,    16,    17,    18,    19,    70,    59,
+      85,    21,    22,    23,    24,    25,    61,    75,    76,    91,
+      47,    57,    48,    86,    41,    42,    43,    44,    54,    26,
+      27,    28,    83,    29,    30,    32,    33,    35,    36,    34,
+      37,    38,    39,    45,    64,    78,    71,    79,    80,    84,
+      40,    62,    65,    46,    49,    87,    88,    63,    89,    50,
+      51,    52,    90,    58,    55,    56,    77,    66,    67,    82,
+       0,     0,     0,     0,    93,    95,    96,    97,    98,     0,
+       0,     0,   100,   102,   103,   104,     0,     0,     0,     0,
+       0,     0,     0,   193,   195,   197,   196,   198,   199,   200,
+     201,     0,   210,   212,   106,   105,   110,   113,   111,   119,
+     120,   121,   122,   126,   127,   128,   129,   130,   144,   145,
+     146,   148,   149,   116,   150,   151,   154,   152,   153,   155,
+     156,   157,   165,   139,   140,   141,   142,   158,   168,   135,
+     137,   169,   174,   175,   176,   117,   143,   179,   180,   136,
+     178,   124,   112,   131,   166,   172,   159,     0,     0,   183,
+     118,   107,   123,   161,   108,   114,   115,   132,   133,   181,
+     160,   162,   163,   109,   184,   147,   164,   125,   138,   170,
+     171,   173,   177,   134,   185,   186,   187,   188,   189,   190,
+     191,   202,   204,   203,   205,   206,   207,   208,   213,   167,
+     182
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     8,     9,    14,    98,    10,    15,   182,    11,
-      16,   190,    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,   183,   184,   185,   186,   191,   192,   193,    12,    17,
-     201,   202,   203,   204,   205,   206,   207,   208,    13,    18,
-     210,   211
+      -1,     1,     8,     9,    14,    99,    10,    15,   184,    11,
+      16,   192,   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,   185,   186,   187,   188,   193,   194,   195,    12,
+      17,   203,   204,   205,   206,   207,   208,   209,   210,    13,
+      18,   212,   213
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -984,7 +988,8 @@ static const yytype_int16 yypact[] =
       50,    51,    52,    54,    55,    56,    57,    58,    59,    60,
       61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
       71,    72,    73,    74,    75,    76,    77,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,  -103,  -103,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,  -103,
+    -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
@@ -992,20 +997,20 @@ static const yytype_int16 yypact[] =
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
-    -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,    90,    91,
-     119,   120,  -103,  -103,  -103,  -103,  -103,   121,   122,   126,
-    -103,  -103,  -103,  -103,   127,   128,   170,   171,   172,   173,
-     174,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,   175,
+      91,   119,   120,   121,  -103,  -103,  -103,  -103,  -103,   122,
+     126,   127,  -103,  -103,  -103,  -103,   128,   170,   171,   172,
+     173,   174,   175,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
+    -103,   176,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
+    -103,  -103,  -103,  -103,  -103,  -103,  -103,   177,   181,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
-    -103,  -103,  -103,  -103,  -103,   176,   177,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
-    -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103
+    -103
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -1022,7 +1027,7 @@ static const yytype_int8 yypgoto[] =
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
     -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,  -103,
-    -103,  -103
+    -103,  -103,  -103
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1032,27 +1037,27 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint16 yytable[] =
 {
-       2,   178,   209,   179,   180,   187,   212,   213,   214,   215,
-       0,     3,   216,   188,   189,   194,   195,   196,   197,   198,
-     199,   200,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,     4,   233,
-     234,   235,   236,   237,     5,   238,   239,   240,   241,   242,
-     243,   244,   245,   246,   247,   248,   249,   250,   251,   252,
-     253,   254,   255,   181,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,     6,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,     0,     7,    19,    20,    21,    22,    23,    24,
+       2,   180,   211,   181,   182,   189,   214,   215,   216,   217,
+       0,     3,   218,   190,   191,   196,   197,   198,   199,   200,
+     201,   202,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,     4,   235,
+     236,   237,   238,   239,     5,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   183,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,     6,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,   294,     0,     7,    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,   293,
-     294,   295,   296,    44,    45,    46,   297,   298,   299,    47,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,   295,
+     296,   297,   298,    44,    45,    46,   299,   300,   301,    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,
-     300,   301,   302,   303,   304,   305,   306,   307,    88,    89,
-      90,     0,    91,    92,    93,     0,     0,    94,    95,    96,
-      97
+     302,   303,   304,   305,   306,   307,   308,   309,    88,    89,
+      90,   310,    91,    92,    93,     0,     0,    94,    95,    96,
+      97,    98
 };
 
 static const yytype_int8 yycheck[] =
@@ -1076,16 +1081,16 @@ static const yytype_int8 yycheck[] =
       68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
       78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
       10,    10,    10,    10,    10,    10,    10,    10,    96,    97,
-      98,    -1,   100,   101,   102,    -1,    -1,   105,   106,   107,
-     108
+      98,    10,   100,   101,   102,    -1,    -1,   105,   106,   107,
+     108,   109
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   110,     0,    11,    38,    44,    88,   103,   111,   112,
-     115,   118,   207,   217,   113,   116,   119,   208,   218,    12,
+       0,   111,     0,    11,    38,    44,    88,   103,   112,   113,
+     116,   119,   209,   219,   114,   117,   120,   210,   220,    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,    41,    42,    43,    47,    48,    49,
@@ -1093,7 +1098,7 @@ static const yytype_uint8 yystos[] =
       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,    96,    97,
-      98,   100,   101,   102,   105,   106,   107,   108,   114,   121,
+      98,   100,   101,   102,   105,   106,   107,   108,   109,   115,
      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,
@@ -1101,11 +1106,12 @@ static const yytype_uint8 yystos[] =
      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,    37,    39,
-      40,    99,   117,   200,   201,   202,   203,    37,    45,    46,
-     120,   204,   205,   206,    89,    90,    91,    92,    93,    94,
-      95,   209,   210,   211,   212,   213,   214,   215,   216,   104,
-     219,   220,    10,    10,    10,    10,    10,    10,    10,    10,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+      37,    39,    40,    99,   118,   202,   203,   204,   205,    37,
+      45,    46,   121,   206,   207,   208,    89,    90,    91,    92,
+      93,    94,    95,   211,   212,   213,   214,   215,   216,   217,
+     218,   104,   221,   222,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1114,7 +1120,7 @@ static const yytype_uint8 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
 };
 
 #define yyerrok                (yyerrstatus = 0)
@@ -1928,16 +1934,16 @@ yyreduce:
         case 9:
 
 /* Line 1455 of yacc.c  */
-#line 112 "util/configparser.y"
+#line 113 "util/configparser.y"
     { 
                OUTYY(("\nP(server:)\n")); 
        }
     break;
 
-  case 91:
+  case 92:
 
 /* Line 1455 of yacc.c  */
-#line 154 "util/configparser.y"
+#line 156 "util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(stub_zone:)\n")); 
@@ -1950,10 +1956,10 @@ yyreduce:
        }
     break;
 
-  case 98:
+  case 99:
 
 /* Line 1455 of yacc.c  */
-#line 170 "util/configparser.y"
+#line 172 "util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(forward_zone:)\n")); 
@@ -1966,10 +1972,10 @@ yyreduce:
        }
     break;
 
-  case 104:
+  case 105:
 
 /* Line 1455 of yacc.c  */
-#line 186 "util/configparser.y"
+#line 188 "util/configparser.y"
     { 
                OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -1979,10 +1985,10 @@ yyreduce:
        }
     break;
 
-  case 105:
+  case 106:
 
 /* Line 1455 of yacc.c  */
-#line 195 "util/configparser.y"
+#line 197 "util/configparser.y"
     { 
                OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -1992,10 +1998,10 @@ yyreduce:
        }
     break;
 
-  case 106:
+  case 107:
 
 /* Line 1455 of yacc.c  */
-#line 204 "util/configparser.y"
+#line 206 "util/configparser.y"
     { 
                OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0)
@@ -2007,10 +2013,10 @@ yyreduce:
        }
     break;
 
-  case 107:
+  case 108:
 
 /* Line 1455 of yacc.c  */
-#line 215 "util/configparser.y"
+#line 217 "util/configparser.y"
     {
                OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2020,10 +2026,10 @@ yyreduce:
        }
     break;
 
-  case 108:
+  case 109:
 
 /* Line 1455 of yacc.c  */
-#line 224 "util/configparser.y"
+#line 226 "util/configparser.y"
     {
                OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2033,10 +2039,10 @@ yyreduce:
        }
     break;
 
-  case 109:
+  case 110:
 
 /* Line 1455 of yacc.c  */
-#line 233 "util/configparser.y"
+#line 235 "util/configparser.y"
     {
                OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2046,10 +2052,10 @@ yyreduce:
        }
     break;
 
-  case 110:
+  case 111:
 
 /* Line 1455 of yacc.c  */
-#line 242 "util/configparser.y"
+#line 244 "util/configparser.y"
     {
                OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_ifs == 0)
@@ -2063,10 +2069,10 @@ yyreduce:
        }
     break;
 
-  case 111:
+  case 112:
 
 /* Line 1455 of yacc.c  */
-#line 255 "util/configparser.y"
+#line 257 "util/configparser.y"
     {
                OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2082,10 +2088,10 @@ yyreduce:
        }
     break;
 
-  case 112:
+  case 113:
 
 /* Line 1455 of yacc.c  */
-#line 270 "util/configparser.y"
+#line 272 "util/configparser.y"
     {
                OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2095,10 +2101,10 @@ yyreduce:
        }
     break;
 
-  case 113:
+  case 114:
 
 /* Line 1455 of yacc.c  */
-#line 279 "util/configparser.y"
+#line 281 "util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, 
@@ -2108,10 +2114,10 @@ yyreduce:
        }
     break;
 
-  case 114:
+  case 115:
 
 /* Line 1455 of yacc.c  */
-#line 288 "util/configparser.y"
+#line 290 "util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, 
@@ -2121,10 +2127,10 @@ yyreduce:
        }
     break;
 
-  case 115:
+  case 116:
 
 /* Line 1455 of yacc.c  */
-#line 297 "util/configparser.y"
+#line 299 "util/configparser.y"
     {
                OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2134,10 +2140,10 @@ yyreduce:
        }
     break;
 
-  case 116:
+  case 117:
 
 /* Line 1455 of yacc.c  */
-#line 306 "util/configparser.y"
+#line 308 "util/configparser.y"
     {
                OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2147,10 +2153,10 @@ yyreduce:
        }
     break;
 
-  case 117:
+  case 118:
 
 /* Line 1455 of yacc.c  */
-#line 315 "util/configparser.y"
+#line 317 "util/configparser.y"
     {
                OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2160,10 +2166,10 @@ yyreduce:
        }
     break;
 
-  case 118:
+  case 119:
 
 /* Line 1455 of yacc.c  */
-#line 324 "util/configparser.y"
+#line 326 "util/configparser.y"
     {
                OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2173,10 +2179,10 @@ yyreduce:
        }
     break;
 
-  case 119:
+  case 120:
 
 /* Line 1455 of yacc.c  */
-#line 333 "util/configparser.y"
+#line 335 "util/configparser.y"
     {
                OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2186,10 +2192,10 @@ yyreduce:
        }
     break;
 
-  case 120:
+  case 121:
 
 /* Line 1455 of yacc.c  */
-#line 342 "util/configparser.y"
+#line 344 "util/configparser.y"
     {
                OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2199,10 +2205,10 @@ yyreduce:
        }
     break;
 
-  case 121:
+  case 122:
 
 /* Line 1455 of yacc.c  */
-#line 351 "util/configparser.y"
+#line 353 "util/configparser.y"
     {
                OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2212,10 +2218,10 @@ yyreduce:
        }
     break;
 
-  case 122:
+  case 123:
 
 /* Line 1455 of yacc.c  */
-#line 360 "util/configparser.y"
+#line 362 "util/configparser.y"
     {
                OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2225,10 +2231,10 @@ yyreduce:
        }
     break;
 
-  case 123:
+  case 124:
 
 /* Line 1455 of yacc.c  */
-#line 369 "util/configparser.y"
+#line 371 "util/configparser.y"
     {
                OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2243,10 +2249,10 @@ yyreduce:
        }
     break;
 
-  case 124:
+  case 125:
 
 /* Line 1455 of yacc.c  */
-#line 383 "util/configparser.y"
+#line 385 "util/configparser.y"
     {
                OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2256,10 +2262,10 @@ yyreduce:
        }
     break;
 
-  case 125:
+  case 126:
 
 /* Line 1455 of yacc.c  */
-#line 392 "util/configparser.y"
+#line 394 "util/configparser.y"
     {
                OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->chrootdir);
@@ -2267,10 +2273,10 @@ yyreduce:
        }
     break;
 
-  case 126:
+  case 127:
 
 /* Line 1455 of yacc.c  */
-#line 399 "util/configparser.y"
+#line 401 "util/configparser.y"
     {
                OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->username);
@@ -2278,10 +2284,10 @@ yyreduce:
        }
     break;
 
-  case 127:
+  case 128:
 
 /* Line 1455 of yacc.c  */
-#line 406 "util/configparser.y"
+#line 408 "util/configparser.y"
     {
                OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->directory);
@@ -2289,10 +2295,10 @@ yyreduce:
        }
     break;
 
-  case 128:
+  case 129:
 
 /* Line 1455 of yacc.c  */
-#line 413 "util/configparser.y"
+#line 415 "util/configparser.y"
     {
                OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->logfile);
@@ -2301,10 +2307,10 @@ yyreduce:
        }
     break;
 
-  case 129:
+  case 130:
 
 /* Line 1455 of yacc.c  */
-#line 421 "util/configparser.y"
+#line 423 "util/configparser.y"
     {
                OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->pidfile);
@@ -2312,10 +2318,10 @@ yyreduce:
        }
     break;
 
-  case 130:
+  case 131:
 
 /* Line 1455 of yacc.c  */
-#line 428 "util/configparser.y"
+#line 430 "util/configparser.y"
     {
                OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str)))
@@ -2323,10 +2329,10 @@ yyreduce:
        }
     break;
 
-  case 131:
+  case 132:
 
 /* Line 1455 of yacc.c  */
-#line 435 "util/configparser.y"
+#line 437 "util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dlv_anchor_file);
@@ -2334,10 +2340,10 @@ yyreduce:
        }
     break;
 
-  case 132:
+  case 133:
 
 /* Line 1455 of yacc.c  */
-#line 442 "util/configparser.y"
+#line 444 "util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2345,10 +2351,22 @@ yyreduce:
        }
     break;
 
-  case 133:
+  case 134:
+
+/* Line 1455 of yacc.c  */
+#line 451 "util/configparser.y"
+    {
+               OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->
+                       auto_trust_anchor_file_list, (yyvsp[(2) - (2)].str)))
+                       yyerror("out of memory");
+       }
+    break;
+
+  case 135:
 
 /* Line 1455 of yacc.c  */
-#line 449 "util/configparser.y"
+#line 459 "util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2357,10 +2375,10 @@ yyreduce:
        }
     break;
 
-  case 134:
+  case 136:
 
 /* Line 1455 of yacc.c  */
-#line 457 "util/configparser.y"
+#line 467 "util/configparser.y"
     {
                OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2369,10 +2387,10 @@ yyreduce:
        }
     break;
 
-  case 135:
+  case 137:
 
 /* Line 1455 of yacc.c  */
-#line 465 "util/configparser.y"
+#line 475 "util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2380,10 +2398,10 @@ yyreduce:
        }
     break;
 
-  case 136:
+  case 138:
 
 /* Line 1455 of yacc.c  */
-#line 472 "util/configparser.y"
+#line 482 "util/configparser.y"
     {
                OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[(2) - (2)].str)))
@@ -2391,10 +2409,10 @@ yyreduce:
        }
     break;
 
-  case 137:
+  case 139:
 
 /* Line 1455 of yacc.c  */
-#line 479 "util/configparser.y"
+#line 489 "util/configparser.y"
     {
                OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2404,10 +2422,10 @@ yyreduce:
        }
     break;
 
-  case 138:
+  case 140:
 
 /* Line 1455 of yacc.c  */
-#line 488 "util/configparser.y"
+#line 498 "util/configparser.y"
     {
                OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2417,10 +2435,10 @@ yyreduce:
        }
     break;
 
-  case 139:
+  case 141:
 
 /* Line 1455 of yacc.c  */
-#line 497 "util/configparser.y"
+#line 507 "util/configparser.y"
     {
                OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->identity);
@@ -2428,10 +2446,10 @@ yyreduce:
        }
     break;
 
-  case 140:
+  case 142:
 
 /* Line 1455 of yacc.c  */
-#line 504 "util/configparser.y"
+#line 514 "util/configparser.y"
     {
                OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->version);
@@ -2439,10 +2457,10 @@ yyreduce:
        }
     break;
 
-  case 141:
+  case 143:
 
 /* Line 1455 of yacc.c  */
-#line 511 "util/configparser.y"
+#line 521 "util/configparser.y"
     {
                OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2454,10 +2472,10 @@ yyreduce:
        }
     break;
 
-  case 142:
+  case 144:
 
 /* Line 1455 of yacc.c  */
-#line 522 "util/configparser.y"
+#line 532 "util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size))
@@ -2466,10 +2484,10 @@ yyreduce:
        }
     break;
 
-  case 143:
+  case 145:
 
 /* Line 1455 of yacc.c  */
-#line 530 "util/configparser.y"
+#line 540 "util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2483,10 +2501,10 @@ yyreduce:
        }
     break;
 
-  case 144:
+  case 146:
 
 /* Line 1455 of yacc.c  */
-#line 543 "util/configparser.y"
+#line 553 "util/configparser.y"
     {
                OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2496,10 +2514,10 @@ yyreduce:
        }
     break;
 
-  case 145:
+  case 147:
 
 /* Line 1455 of yacc.c  */
-#line 552 "util/configparser.y"
+#line 562 "util/configparser.y"
     {
                OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2509,10 +2527,10 @@ yyreduce:
        }
     break;
 
-  case 146:
+  case 148:
 
 /* Line 1455 of yacc.c  */
-#line 561 "util/configparser.y"
+#line 571 "util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size))
@@ -2521,10 +2539,10 @@ yyreduce:
        }
     break;
 
-  case 147:
+  case 149:
 
 /* Line 1455 of yacc.c  */
-#line 569 "util/configparser.y"
+#line 579 "util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2538,10 +2556,10 @@ yyreduce:
        }
     break;
 
-  case 148:
+  case 150:
 
 /* Line 1455 of yacc.c  */
-#line 582 "util/configparser.y"
+#line 592 "util/configparser.y"
     {
                OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2551,10 +2569,10 @@ yyreduce:
        }
     break;
 
-  case 149:
+  case 151:
 
 /* Line 1455 of yacc.c  */
-#line 591 "util/configparser.y"
+#line 601 "util/configparser.y"
     {
                OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2564,10 +2582,10 @@ yyreduce:
        }
     break;
 
-  case 150:
+  case 152:
 
 /* Line 1455 of yacc.c  */
-#line 600 "util/configparser.y"
+#line 610 "util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2577,10 +2595,10 @@ yyreduce:
        }
     break;
 
-  case 151:
+  case 153:
 
 /* Line 1455 of yacc.c  */
-#line 609 "util/configparser.y"
+#line 619 "util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->
@@ -2590,10 +2608,10 @@ yyreduce:
        }
     break;
 
-  case 152:
+  case 154:
 
 /* Line 1455 of yacc.c  */
-#line 618 "util/configparser.y"
+#line 628 "util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2607,10 +2625,10 @@ yyreduce:
        }
     break;
 
-  case 153:
+  case 155:
 
 /* Line 1455 of yacc.c  */
-#line 631 "util/configparser.y"
+#line 641 "util/configparser.y"
     {
                OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->target_fetch_policy);
@@ -2618,10 +2636,10 @@ yyreduce:
        }
     break;
 
-  case 154:
+  case 156:
 
 /* Line 1455 of yacc.c  */
-#line 638 "util/configparser.y"
+#line 648 "util/configparser.y"
     {
                OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2632,10 +2650,10 @@ yyreduce:
        }
     break;
 
-  case 155:
+  case 157:
 
 /* Line 1455 of yacc.c  */
-#line 648 "util/configparser.y"
+#line 658 "util/configparser.y"
     {
                OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2646,10 +2664,10 @@ yyreduce:
        }
     break;
 
-  case 156:
+  case 158:
 
 /* Line 1455 of yacc.c  */
-#line 658 "util/configparser.y"
+#line 668 "util/configparser.y"
     {
                OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2660,10 +2678,10 @@ yyreduce:
        }
     break;
 
-  case 157:
+  case 159:
 
 /* Line 1455 of yacc.c  */
-#line 668 "util/configparser.y"
+#line 678 "util/configparser.y"
     {
                OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2674,10 +2692,10 @@ yyreduce:
        }
     break;
 
-  case 158:
+  case 160:
 
 /* Line 1455 of yacc.c  */
-#line 678 "util/configparser.y"
+#line 688 "util/configparser.y"
     {
                OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2688,10 +2706,10 @@ yyreduce:
        }
     break;
 
-  case 159:
+  case 161:
 
 /* Line 1455 of yacc.c  */
-#line 688 "util/configparser.y"
+#line 698 "util/configparser.y"
     {
                OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2702,10 +2720,10 @@ yyreduce:
        }
     break;
 
-  case 160:
+  case 162:
 
 /* Line 1455 of yacc.c  */
-#line 698 "util/configparser.y"
+#line 708 "util/configparser.y"
     {
                OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str)))
@@ -2713,10 +2731,10 @@ yyreduce:
        }
     break;
 
-  case 161:
+  case 163:
 
 /* Line 1455 of yacc.c  */
-#line 705 "util/configparser.y"
+#line 715 "util/configparser.y"
     {
                OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str)))
@@ -2724,10 +2742,10 @@ yyreduce:
        }
     break;
 
-  case 162:
+  case 164:
 
 /* Line 1455 of yacc.c  */
-#line 712 "util/configparser.y"
+#line 722 "util/configparser.y"
     {
                OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2737,10 +2755,10 @@ yyreduce:
        }
     break;
 
-  case 163:
+  case 165:
 
 /* Line 1455 of yacc.c  */
-#line 721 "util/configparser.y"
+#line 731 "util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str)))
@@ -2748,10 +2766,10 @@ yyreduce:
        }
     break;
 
-  case 164:
+  case 166:
 
 /* Line 1455 of yacc.c  */
-#line 728 "util/configparser.y"
+#line 738 "util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2762,10 +2780,10 @@ yyreduce:
        }
     break;
 
-  case 165:
+  case 167:
 
 /* Line 1455 of yacc.c  */
-#line 738 "util/configparser.y"
+#line 748 "util/configparser.y"
     {
                OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 &&
@@ -2780,10 +2798,10 @@ yyreduce:
        }
     break;
 
-  case 166:
+  case 168:
 
 /* Line 1455 of yacc.c  */
-#line 752 "util/configparser.y"
+#line 762 "util/configparser.y"
     {
                OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->module_conf);
@@ -2791,10 +2809,10 @@ yyreduce:
        }
     break;
 
-  case 167:
+  case 169:
 
 /* Line 1455 of yacc.c  */
-#line 759 "util/configparser.y"
+#line 769 "util/configparser.y"
     {
                OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -2813,10 +2831,10 @@ yyreduce:
        }
     break;
 
-  case 168:
+  case 170:
 
 /* Line 1455 of yacc.c  */
-#line 777 "util/configparser.y"
+#line 787 "util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -2830,10 +2848,10 @@ yyreduce:
        }
     break;
 
-  case 169:
+  case 171:
 
 /* Line 1455 of yacc.c  */
-#line 790 "util/configparser.y"
+#line 800 "util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -2847,10 +2865,10 @@ yyreduce:
        }
     break;
 
-  case 170:
+  case 172:
 
 /* Line 1455 of yacc.c  */
-#line 803 "util/configparser.y"
+#line 813 "util/configparser.y"
     {
                OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2860,10 +2878,10 @@ yyreduce:
        }
     break;
 
-  case 171:
+  case 173:
 
 /* Line 1455 of yacc.c  */
-#line 812 "util/configparser.y"
+#line 822 "util/configparser.y"
     {
                OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2873,10 +2891,10 @@ yyreduce:
        }
     break;
 
-  case 172:
+  case 174:
 
 /* Line 1455 of yacc.c  */
-#line 821 "util/configparser.y"
+#line 831 "util/configparser.y"
     {
                OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2886,10 +2904,10 @@ yyreduce:
        }
     break;
 
-  case 173:
+  case 175:
 
 /* Line 1455 of yacc.c  */
-#line 830 "util/configparser.y"
+#line 840 "util/configparser.y"
     {
                OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2900,10 +2918,10 @@ yyreduce:
        }
     break;
 
-  case 174:
+  case 176:
 
 /* Line 1455 of yacc.c  */
-#line 840 "util/configparser.y"
+#line 850 "util/configparser.y"
     {
                OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2914,10 +2932,10 @@ yyreduce:
        }
     break;
 
-  case 175:
+  case 177:
 
 /* Line 1455 of yacc.c  */
-#line 850 "util/configparser.y"
+#line 860 "util/configparser.y"
     {
                OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2927,10 +2945,10 @@ yyreduce:
        }
     break;
 
-  case 176:
+  case 178:
 
 /* Line 1455 of yacc.c  */
-#line 859 "util/configparser.y"
+#line 869 "util/configparser.y"
     {
                OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->val_nsec3_key_iterations);
@@ -2938,10 +2956,10 @@ yyreduce:
        }
     break;
 
-  case 177:
+  case 179:
 
 /* Line 1455 of yacc.c  */
-#line 866 "util/configparser.y"
+#line 876 "util/configparser.y"
     {
                OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size))
@@ -2950,10 +2968,10 @@ yyreduce:
        }
     break;
 
-  case 178:
+  case 180:
 
 /* Line 1455 of yacc.c  */
-#line 874 "util/configparser.y"
+#line 884 "util/configparser.y"
     {
                OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2967,10 +2985,10 @@ yyreduce:
        }
     break;
 
-  case 179:
+  case 181:
 
 /* Line 1455 of yacc.c  */
-#line 887 "util/configparser.y"
+#line 897 "util/configparser.y"
     {
                OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size))
@@ -2979,10 +2997,10 @@ yyreduce:
        }
     break;
 
-  case 180:
+  case 182:
 
 /* Line 1455 of yacc.c  */
-#line 895 "util/configparser.y"
+#line 905 "util/configparser.y"
     {
                OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 &&
@@ -3003,10 +3021,10 @@ yyreduce:
        }
     break;
 
-  case 181:
+  case 183:
 
 /* Line 1455 of yacc.c  */
-#line 915 "util/configparser.y"
+#line 925 "util/configparser.y"
     {
                OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str)))
@@ -3014,10 +3032,10 @@ yyreduce:
        }
     break;
 
-  case 182:
+  case 184:
 
 /* Line 1455 of yacc.c  */
-#line 922 "util/configparser.y"
+#line 932 "util/configparser.y"
     {
                char* ptr;
                OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
@@ -3033,10 +3051,10 @@ yyreduce:
        }
     break;
 
-  case 183:
+  case 185:
 
 /* Line 1455 of yacc.c  */
-#line 937 "util/configparser.y"
+#line 947 "util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->stubs->name);
@@ -3044,10 +3062,10 @@ yyreduce:
        }
     break;
 
-  case 184:
+  case 186:
 
 /* Line 1455 of yacc.c  */
-#line 944 "util/configparser.y"
+#line 954 "util/configparser.y"
     {
                OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str)))
@@ -3055,10 +3073,10 @@ yyreduce:
        }
     break;
 
-  case 185:
+  case 187:
 
 /* Line 1455 of yacc.c  */
-#line 951 "util/configparser.y"
+#line 961 "util/configparser.y"
     {
                OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str)))
@@ -3066,10 +3084,10 @@ yyreduce:
        }
     break;
 
-  case 186:
+  case 188:
 
 /* Line 1455 of yacc.c  */
-#line 958 "util/configparser.y"
+#line 968 "util/configparser.y"
     {
                OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3080,10 +3098,10 @@ yyreduce:
        }
     break;
 
-  case 187:
+  case 189:
 
 /* Line 1455 of yacc.c  */
-#line 968 "util/configparser.y"
+#line 978 "util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->forwards->name);
@@ -3091,10 +3109,10 @@ yyreduce:
        }
     break;
 
-  case 188:
+  case 190:
 
 /* Line 1455 of yacc.c  */
-#line 975 "util/configparser.y"
+#line 985 "util/configparser.y"
     {
                OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str)))
@@ -3102,10 +3120,10 @@ yyreduce:
        }
     break;
 
-  case 189:
+  case 191:
 
 /* Line 1455 of yacc.c  */
-#line 982 "util/configparser.y"
+#line 992 "util/configparser.y"
     {
                OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str)))
@@ -3113,19 +3131,19 @@ yyreduce:
        }
     break;
 
-  case 190:
+  case 192:
 
 /* Line 1455 of yacc.c  */
-#line 989 "util/configparser.y"
+#line 999 "util/configparser.y"
     { 
                OUTYY(("\nP(remote-control:)\n")); 
        }
     break;
 
-  case 200:
+  case 202:
 
 /* Line 1455 of yacc.c  */
-#line 1000 "util/configparser.y"
+#line 1010 "util/configparser.y"
     {
                OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3136,10 +3154,10 @@ yyreduce:
        }
     break;
 
-  case 201:
+  case 203:
 
 /* Line 1455 of yacc.c  */
-#line 1010 "util/configparser.y"
+#line 1020 "util/configparser.y"
     {
                OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3149,10 +3167,10 @@ yyreduce:
        }
     break;
 
-  case 202:
+  case 204:
 
 /* Line 1455 of yacc.c  */
-#line 1019 "util/configparser.y"
+#line 1029 "util/configparser.y"
     {
                OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str)))
@@ -3160,10 +3178,10 @@ yyreduce:
        }
     break;
 
-  case 203:
+  case 205:
 
 /* Line 1455 of yacc.c  */
-#line 1026 "util/configparser.y"
+#line 1036 "util/configparser.y"
     {
                OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_key_file);
@@ -3171,10 +3189,10 @@ yyreduce:
        }
     break;
 
-  case 204:
+  case 206:
 
 /* Line 1455 of yacc.c  */
-#line 1033 "util/configparser.y"
+#line 1043 "util/configparser.y"
     {
                OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_cert_file);
@@ -3182,10 +3200,10 @@ yyreduce:
        }
     break;
 
-  case 205:
+  case 207:
 
 /* Line 1455 of yacc.c  */
-#line 1040 "util/configparser.y"
+#line 1050 "util/configparser.y"
     {
                OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_key_file);
@@ -3193,10 +3211,10 @@ yyreduce:
        }
     break;
 
-  case 206:
+  case 208:
 
 /* Line 1455 of yacc.c  */
-#line 1047 "util/configparser.y"
+#line 1057 "util/configparser.y"
     {
                OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_cert_file);
@@ -3204,19 +3222,19 @@ yyreduce:
        }
     break;
 
-  case 207:
+  case 209:
 
 /* Line 1455 of yacc.c  */
-#line 1054 "util/configparser.y"
+#line 1064 "util/configparser.y"
     { 
                OUTYY(("\nP(python:)\n")); 
        }
     break;
 
-  case 211:
+  case 213:
 
 /* Line 1455 of yacc.c  */
-#line 1063 "util/configparser.y"
+#line 1073 "util/configparser.y"
     {
                OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->python_script);
@@ -3227,7 +3245,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 3231 "util/configparser.c"
+#line 3249 "util/configparser.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3439,7 +3457,7 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 1068 "util/configparser.y"
+#line 1078 "util/configparser.y"
 
 
 /* parse helper routines could be here */

diff --git a/util/configparser.h b/util/configparser.h
index da82420fc0f1952b76532fb8f2740bc0b803d02f..7f8ef12d92dcec5e89beb3da5062dfa843832e10 100644 (file)
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -144,7 +144,8 @@
      VAR_VAL_SIG_SKEW_MIN = 360,
      VAR_VAL_SIG_SKEW_MAX = 361,
      VAR_CACHE_MIN_TTL = 362,
-     VAR_VAL_LOG_LEVEL = 363
+     VAR_VAL_LOG_LEVEL = 363,
+     VAR_AUTO_TRUST_ANCHOR_FILE = 364
    };
 #endif
 /* Tokens.  */
@@ -254,6 +255,7 @@
 #define VAR_VAL_SIG_SKEW_MAX 361
 #define VAR_CACHE_MIN_TTL 362
 #define VAR_VAL_LOG_LEVEL 363
+#define VAR_AUTO_TRUST_ANCHOR_FILE 364
 
 
 
@@ -270,7 +272,7 @@ typedef union YYSTYPE
 
 
 /* Line 1676 of yacc.c  */
-#line 274 "util/configparser.h"
+#line 276 "util/configparser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/util/configparser.y b/util/configparser.y
index 5a948a46cc4ff27c3e991b3e35c9975567dd51df..c71a1ec700dc53333e9aa68c0d9b6dbb359db3b8 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -99,6 +99,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_STUB_PRIME VAR_UNWANTED_REPLY_THRESHOLD VAR_LOG_TIME_ASCII
 %token VAR_DOMAIN_INSECURE VAR_PYTHON VAR_PYTHON_SCRIPT VAR_VAL_SIG_SKEW_MIN
 %token VAR_VAL_SIG_SKEW_MAX VAR_CACHE_MIN_TTL VAR_VAL_LOG_LEVEL
+%token VAR_AUTO_TRUST_ANCHOR_FILE
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -148,7 +149,8 @@ content_server: server_num_threads | server_verbosity | server_port |
        server_local_data_ptr | server_jostle_timeout | 
        server_unwanted_reply_threshold | server_log_time_ascii | 
        server_domain_insecure | server_val_sig_skew_min | 
-       server_val_sig_skew_max | server_cache_min_ttl | server_val_log_level
+       server_val_sig_skew_max | server_cache_min_ttl | server_val_log_level |
+       server_auto_trust_anchor_file
        ;
 stubstart: VAR_STUB_ZONE
        {
@@ -445,6 +447,14 @@ server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG
                        yyerror("out of memory");
        }
        ;
+server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG
+       {
+               OUTYY(("P(server_auto_trust_anchor_file:%s)\n", $2));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->
+                       auto_trust_anchor_file_list, $2))
+                       yyerror("out of memory");
+       }
+       ;
 server_trust_anchor_file: VAR_TRUST_ANCHOR_FILE STRING_ARG
        {
                OUTYY(("P(server_trust_anchor_file:%s)\n", $2));

diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index f5e3efa17559f78df064dd8cac3ed13b77bc4504..71e723e7e1d02d72cc08a3d38bdd2ad0aca9ba84 100644 (file)
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -61,6 +61,7 @@
 #include "validator/val_sigcrypt.h"
 #include "validator/val_kentry.h"
 #include "validator/val_neg.h"
+#include "validator/autotrust.h"
 #include "util/data/msgreply.h"
 #include "util/data/packed_rrset.h"
 #include "util/storage/slabhash.h"
@@ -181,6 +182,7 @@ fptr_whitelist_rbtree_cmp(int (*fptr) (const void *, const void *))
        else if(fptr == &context_query_cmp) return 1;
        else if(fptr == &val_neg_data_compare) return 1;
        else if(fptr == &val_neg_zone_compare) return 1;
+       else if(fptr == &probetree_cmp) return 1;
        return 0;
 }
 

diff --git a/validator/autotrust.c b/validator/autotrust.c
new file mode 100644 (file)
index 0000000..d5593cc
--- /dev/null
+++ b/validator/autotrust.c
@@ -0,0 +1,332 @@
+/*
+ * validator/autotrust.c - RFC5011 trust anchor management for unbound.
+ *
+ * Copyright (c) 2009, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * Contains autotrust implementation.
+ */
+#include "config.h"
+#include "validator/autotrust.h"
+#include "validator/val_anchor.h"
+#include "util/log.h"
+#include "util/net_help.h"
+
+/** max length of parse lines */
+#define MAXLEN 10240
+
+struct autr_global_data* autr_global_create(void)
+{
+       struct autr_global_data* global;
+       global = (struct autr_global_data*)malloc(sizeof(*global));
+       if(!global) 
+               return NULL;
+       rbtree_init(&global->probetree, &probetree_cmp);
+       return global;
+}
+
+void autr_global_delete(struct autr_global_data* global)
+{
+       if(!global)
+               return;
+       /* elements deleted by parent, nothing to do */
+       memset(global, 0, sizeof(*global));
+}
+
+int probetree_cmp(const void* x, const void* y)
+{
+       struct trust_anchor* a = (struct trust_anchor*)x;
+       struct trust_anchor* b = (struct trust_anchor*)y;
+       if(a->autr->next_probe_time < b->autr->next_probe_time)
+               return -1;
+       if(a->autr->next_probe_time > b->autr->next_probe_time)
+               return 1;
+       return 0;
+}
+
+/** Position in string */
+static int
+position_in_string(char *str, const char* sub)
+{
+        int pos = -1, i = 0, j = 0;
+        char* walk;
+        const char* restore = sub;
+        while (*str != '\0')
+        {
+                walk = str;
+                j = 0;
+                while (*sub != '\0' && *walk == *sub)
+                {
+                        sub++;
+                        walk++;
+                        j++;
+                }
+
+                if (*sub == '\0' && j > 0)
+                        pos = i;
+
+                sub = restore;
+                j = 0;
+                i++;
+                str++;
+        }
+        if (pos < 0)
+                return pos;
+        return pos + strlen(sub);
+}
+
+/** 
+ * Parse comments 
+ * @param str: to parse
+ * @param ta: trust key autotrust metadata
+ * @param tp: trust anchor
+ * @return false on failure.
+ */
+static int
+parse_comments(char* str, struct autr_ta_data* ta, struct trust_anchor* tp)
+{
+        char* comment = (char*) malloc(sizeof(char)*MAXLEN);
+        char* comments = comment;
+        int len = strlen(str), pos = 0, timestamp = 0;
+        if (len >= MAXLEN) {
+               log_err("line too long");
+                return 0;
+       }
+        while (*str != '\0' && *str != ';')
+                str++;
+        /* comments */
+        if (*str == ';')
+                str++;
+        while (*str != '\0')
+        {
+                *comments = *str;
+                comments++;
+                str++;
+        }
+        *comments = '\0';
+
+        comments = comment;
+
+        if (!ta || !comments) {
+               log_err("malloc failure in parse");
+                return 0;
+       }
+        /* read state */
+        pos = position_in_string(comments, "state=");
+        if (pos >= (int) strlen(comments))
+        {
+               log_err("parse error");
+                free(comment);
+                return 0;
+        }
+        if (pos <= 0)
+                ta->s = AUTR_STATE_START;
+        else
+        {
+                int s = (int) comments[pos] - '0';
+
+                switch(s)
+                {
+                        case AUTR_STATE_START:
+                        case AUTR_STATE_ADDPEND:
+                        case AUTR_STATE_VALID:
+                        case AUTR_STATE_MISSING:
+                        case AUTR_STATE_REVOKED:
+                        case AUTR_STATE_REMOVED:
+                                ta->s = s;
+                                break;
+                        default:
+                                log_nametypeclass(0, "warning: trust anchor "
+                                       "has undefined state, considered "
+                                       "NewKey", tp->name, 
+                                       LDNS_RR_TYPE_DNSKEY, tp->dclass);
+                                ta->s = AUTR_STATE_START;
+                                break;
+                }
+
+                free(str);
+        }
+        /* read pending count */
+        pos = position_in_string(comments, "count=");
+        if (pos >= (int) strlen(comments))
+        {
+               log_err("parse error");
+                free(comment);
+                return 0;
+        }
+        if (pos <= 0)
+                ta->pending_count = 0;
+        else
+        {
+                comments += pos;
+                ta->pending_count = atoi(comments);
+        }
+
+        /* read last change */
+        pos = position_in_string(comments, "lastchange=");
+        if (pos >= (int) strlen(comments))
+        {
+               log_err("parse error");
+                free(comment);
+                return 0;
+        }
+        if (pos >= 0)
+        {
+                comments += pos;
+                timestamp = atoi(comments);
+        }
+        if (pos < 0 || !timestamp)
+        {
+                log_warn("trust anchor has no timestamp, considered NOW");
+                free(str);
+                ta->last_change = time(NULL);
+        }
+        else
+                ta->last_change = timestamp;
+
+        free(comment);
+        return 1;
+}
+
+/** Check if a line contains data (besides comments) */
+static int
+str_contains_data(char* str, char comment)
+{
+        while (*str != '\0') {
+                if (*str == comment || *str == '\n')
+                        return 0;
+                if (*str != ' ' && *str != '\t')
+                        return 1;
+                str++;
+        }
+        return 0;
+}
+
+/** Get DNSKEY flags */
+static int
+ta_dnskey_flags(struct ta_key* ta)
+{
+       uint16_t f;
+       if(ta->type != LDNS_RR_TYPE_DNSKEY)
+               return 0;
+       if(ta->len < 2+2)
+               return 0;
+       memmove(&f, ta->data+2, 2);
+       f = ntohs(f);
+       return f;
+}
+
+
+/** Check if KSK DNSKEY */
+static int
+rr_is_dnskey_sep(struct ta_key* ta)
+{
+       return (ta_dnskey_flags(ta)&DNSKEY_BIT_SEP);
+}
+
+/**
+ * Add new trust anchor from a string in file.
+ * @param anchors: all anchors
+ * @param str: string with comments before the anchor, if any comments.
+ * @param tp: trust point returned.
+ * @return new key in trust point.
+ */
+static struct ta_key*
+add_trustanchor_frm_str(struct val_anchors* anchors, char* str, 
+       struct trust_anchor** tp)
+{
+       if(!str_contains_data(str, ';'))
+               return NULL; /* empty line */
+}
+
+/** 
+ * Load single anchor 
+ * @param anchors: all points.
+ * @param str: comments line
+ * @return false on failure.
+ */
+static int
+load_trustanchor(struct val_anchors* anchors, char* str)
+{
+        int status_ok = 1;
+        struct ta_key* ta = NULL;
+        struct trust_anchor* tp = NULL;
+
+        if (!str_contains_data(str, ';'))
+                return status_ok; /* empty lines allowed */
+        ta = add_trustanchor_frm_str(anchors, str, &tp);
+        if (ta) {
+               status_ok = parse_comments(str, ta->autr, tp);
+               if (rr_is_dnskey_sep(ta)) {
+                       if (ta->autr->s == AUTR_STATE_VALID)
+                               tp->autr->valid ++;
+                       else if (ta->autr->s == AUTR_STATE_MISSING)
+                               tp->autr->missing ++;
+               }
+        }
+        else
+                return 0;
+        return status_ok;
+}
+
+int autr_read_file(struct val_anchors* anchors, ldns_buffer* parsebuf,
+       const char* nm)
+{
+        /* the file descriptor */
+        FILE* fd;
+        /* keep track of line numbers */
+        int line_nr = 0;
+        /* single line */
+        char line[MAXLEN];
+
+        if (!(fd = fopen(nm, "r"))) {
+                log_err("unable to open %s for reading: %s", 
+                       nm, strerror(errno));
+                return 0;
+        }
+        verbose(VERB_ALGO, "reading trust anchor file %s", nm);
+        while (fgets(line, MAXLEN, fd) != NULL) {
+                line_nr++;
+                if (!load_trustanchor(anchors, line)) {
+                        log_err("failed to load trust anchor from %s "
+                               "at line %i, skipping", nm, line_nr);
+                        /* try to do the rest */
+                }
+        }
+
+        fclose(fd);
+       return 1;
+}
+

diff --git a/validator/autotrust.h b/validator/autotrust.h
new file mode 100644 (file)
index 0000000..1ce209d
--- /dev/null
+++ b/validator/autotrust.h
@@ -0,0 +1,132 @@
+/*
+ * validator/autotrust.h - RFC5011 trust anchor management for unbound.
+ *
+ * Copyright (c) 2009, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * Contains autotrust definitions.
+ */
+
+#ifndef VALIDATOR_AUTOTRUST_H
+#define VALIDATOR_AUTOTRUST_H
+#include "util/rbtree.h"
+struct val_anchors;
+
+/** Autotrust anchor states */
+typedef enum {
+       AUTR_STATE_START   = 0,
+       AUTR_STATE_ADDPEND = 1,
+       AUTR_STATE_VALID   = 2,
+       AUTR_STATE_MISSING = 3,
+       AUTR_STATE_REVOKED = 4,
+       AUTR_STATE_REMOVED = 5
+} autr_state_t;
+
+/** 
+ * Autotrust metadata for one trust anchor key.
+ */
+struct autr_ta_data {
+       /** 5011 state */
+       autr_state_t s;
+       /** last update of key */
+       time_t last_change;
+       /** pending count */
+       uint8_t pending_count;
+       /** fresh TA was seen */
+       uint8_t fetched;
+       /** revoked TA was seen */
+       uint8_t revoked;
+};
+
+/** 
+ * Autotrust metadata for a trust point.
+ */
+struct autr_point_data {
+       /** file to store the trust point in */
+       const char* file;
+       /** next probe time */
+       uint32_t next_probe_time;
+       /** rbtree node for probe sort */
+       rbnode_t pnode;
+
+       /** last queried DNSKEY set */
+       time_t last_queried;
+       /** how many times did it fail */
+       uint8_t query_failed;
+       /** when to query if !failed */
+       uint32_t query_interval;
+       /** when to retry if failed */
+       uint32_t retry_time;
+
+       /** number of valid DNSKEYs */
+       uint8_t valid;
+       /** number of missing DNSKEYs */
+       uint8_t missing;
+};
+
+/** 
+ * Autotrust global metadata.
+ */
+struct autr_global_data {
+       /** rbtree of autotrust anchors sorted by next probe time */
+       rbtree_t probetree;
+};
+
+/**
+ * Create new global 5011 data structure.
+ * @return new structure or NULL on malloc failure.
+ */
+struct autr_global_data* autr_global_create(void);
+
+/**
+ * Delete global 5011 data structure.
+ * @param global: global autotrust state to delete.
+ */
+void autr_global_delete(struct autr_global_data* global);
+
+/** probe tree compare function */
+int probetree_cmp(const void* x, const void* y);
+
+/**
+ * Read autotrust file.
+ * @param anchors: the anchors structure.
+ * @param parsebuf: buffer temporary for parsing data.
+ * @param nm: name of the file (copied).
+ * @return false on failure.
+ */
+int autr_read_file(struct val_anchors* anchors, ldns_buffer* parsebuf,
+       const char* nm);
+
+#endif /* VALIDATOR_AUTOTRUST_H */

diff --git a/validator/val_anchor.c b/validator/val_anchor.c
index 1e5ca3af825506f12ebeff9283f05164ee717750..e442044d416906f67e3f7e8762145360562b2caa 100644 (file)
--- a/validator/val_anchor.c
+++ b/validator/val_anchor.c
@@ -41,6 +41,7 @@
 #include "config.h"
 #include "validator/val_anchor.h"
 #include "validator/val_sigcrypt.h"
+#include "validator/autotrust.h"
 #include "util/data/packed_rrset.h"
 #include "util/data/dname.h"
 #include "util/log.h"
@@ -83,6 +84,11 @@ anchors_create()
                anchors_delete(a);
                return NULL;
        }
+       a->autr = autr_global_create();
+       if(!a->autr) {
+               anchors_delete(a);
+               return NULL;
+       }
        return a;
 }
 
@@ -93,6 +99,7 @@ anchors_delete(struct val_anchors* anchors)
                return;
        free(anchors->tree);
        regional_destroy(anchors->region);
+       autr_global_delete(anchors->autr);
        free(anchors);
 }
 
@@ -997,6 +1004,20 @@ anchors_apply_cfg(struct val_anchors* anchors, struct config_file* cfg)
                        return 0;
                }
        }
+       for(f = cfg->auto_trust_anchor_file_list; f; f = f->next) {
+               if(!f->str || f->str[0] == 0) /* empty "" */
+                       continue;
+               nm = f->str;
+               if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm,
+                       cfg->chrootdir, strlen(cfg->chrootdir)) == 0)
+                       nm += strlen(cfg->chrootdir);
+               if(!autr_read_file(anchors, parsebuf, nm)) {
+                       log_err("error reading auto-trust-anchor-file: %s", 
+                               f->str);
+                       ldns_buffer_free(parsebuf);
+                       return 0;
+               }
+       }
        /* first assemble, since it may delete useless anchors */
        anchors_assemble_rrsets(anchors);
        init_parents(anchors);

diff --git a/validator/val_anchor.h b/validator/val_anchor.h
index 3ce14b53bca9242cfacd1b4db92a3cae9ff2afc0..a5274d2693624970a2555fd88b4dc9f4c29b413a 100644 (file)
--- a/validator/val_anchor.h
+++ b/validator/val_anchor.h
@@ -46,6 +46,9 @@ struct regional;
 struct trust_anchor;
 struct config_file;
 struct ub_packed_rrset_key;
+struct autr_ta_data;
+struct autr_point_data;
+struct autr_global_data;
 
 /**
  * Trust anchor store.
@@ -62,6 +65,8 @@ struct val_anchors {
        rbtree_t* tree;
        /** The DLV trust anchor (if one is configured, else NULL) */
        struct trust_anchor* dlv_anchor;
+       /** Autotrust global data, anchors sorted by next probe time */
+       struct autr_global_data* autr;
 };
 
 /**
@@ -76,6 +81,8 @@ struct ta_key {
        size_t len;
        /** DNS type (host format) of the key, DS or DNSKEY */
        uint16_t type;
+       /** Autotrust ta key state, or NULL */
+       struct autr_ta_data* autr;
 };
 
 /**
@@ -98,6 +105,8 @@ struct trust_anchor {
         * It is allocated in the region.
         */
        struct ta_key* keylist;
+       /** Autotrust anchor point data, or NULL */
+       struct autr_point_data* autr;
        /** number of DSs in the keylist */
        size_t numDS;
        /** number of DNSKEYs in the keylist */