From: Wouter Wijngaards Date: Tue, 25 Aug 2009 08:46:33 +0000 (+0000) Subject: autotrust options X-Git-Tag: release-1.4.0rc1~127 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d90b75ce8ddec40d54fd8284ee6957833154a50;p=thirdparty%2Funbound.git autotrust options git-svn-id: file:///svn/unbound/trunk@1776 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 96526531f..4817fb4f7 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 25 August 2009: Wouter - fixup memleak in trust anchor unsupported algorithm check. - iana portlist updated. + - autotrust options: add-holddown, del-holddown, keep-missing. 24 August 2009: Wouter - cleaner memory allocation on exit. autotrust test routines. diff --git a/doc/example.conf.in b/doc/example.conf.in index a3f62f2d7..bdee80879 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -355,6 +355,16 @@ server: # A message with an NSEC3 with larger count is marked insecure. # List in ascending order the keysize and count values. # val-nsec3-keysize-iterations: "1024 150 2048 500 4096 2500" + + # instruct the auto-trust-anchor-file probing to add anchors after ttl. + # add-holddown: 2592000 # 30 days + + # instruct the auto-trust-anchor-file probing to del anchors after ttl. + # del-holddown: 2592000 # 30 days + + # auto-trust-anchor-file probing removes missing anchors after ttl. + # If the value 0 is given, missing anchors are not removed. + # keep-missing: 31622400 # 366 days # the amount of memory to use for the key cache. # plain value in bytes or you can append k, m or G. default is "4Mb". diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index ca2e04eaa..82e53e92d 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -594,6 +594,26 @@ be in ascending order and have at least one entry. If you set it to "1024 65535" there is no restriction to NSEC3 iteration values. This table must be kept short; a very long list could cause slower operation. .TP +.B add\-holddown: \fI +Instruct the \fBauto\-trust\-anchor\-file\fR probe mechanism for RFC5011 +autotrust updates to add new trust anchors only after they have been +visible for this time. Default is 30 days as per the RFC. +.TP +.B del\-holddown: \fI +Instruct the \fBauto\-trust\-anchor\-file\fR probe mechanism for RFC5011 +autotrust updates to remove revoked trust anchors after they have been +kept in the revoked list for this long. Default is 30 days as per +the RFC. +.TP +.B keep\-missing: \fI +Instruct the \fBauto\-trust\-anchor\-file\fR probe mechanism for RFC5011 +autotrust updates to remove missing trust anchors after they have been +unseen for this long. This cleans up the state file if the target zone +does not perform trust anchor revocation, so this makes the auto probe +mechanism work with zones that perform regular (non\-5011) rollovers. +The default is 366 days. The value 0 does not remove missing anchors, +as per the RFC. +.TP .B key\-cache\-size: \fI Number of bytes size of the key cache. Default is 4 megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c index 46c196a41..8130a2d41 100644 --- a/smallapp/unbound-checkconf.c +++ b/smallapp/unbound-checkconf.c @@ -178,6 +178,9 @@ print_option(struct config_file* cfg, const char* opt) else O_DEC(opt, "val-log-level", val_log_level) else O_YNO(opt, "val-permissive-mode", val_permissive_mode) else O_STR(opt, "val-nsec3-keysize-iterations",val_nsec3_key_iterations) + else O_UNS(opt, "add-holddown", add_holddown) + else O_UNS(opt, "del-holddown", del_holddown) + else O_UNS(opt, "keep-missing", keep_missing) else O_MEM(opt, "key-cache-size", key_cache_size) else O_DEC(opt, "key-cache-slabs", key_cache_slabs) else O_MEM(opt, "neg-cache-size", neg_cache_size) diff --git a/util/config_file.c b/util/config_file.c index a74f2e62f..2ce763905 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -394,6 +394,15 @@ int config_set_option(struct config_file* cfg, const char* opt, } else if(strcmp(opt, "val-nsec3-keysize-iterations:") == 0) { free(cfg->val_nsec3_key_iterations); return (cfg->val_nsec3_key_iterations = strdup(val)) != NULL; + } else if(strcmp(opt, "add-holddown:") == 0) { + IS_NUMBER_OR_ZERO; + cfg->add_holddown = (unsigned)atoi(val); + } else if(strcmp(opt, "del-holddown:") == 0) { + IS_NUMBER_OR_ZERO; + cfg->del_holddown = (unsigned)atoi(val); + } else if(strcmp(opt, "keep-missing:") == 0) { + IS_NUMBER_OR_ZERO; + cfg->keep_missing = (unsigned)atoi(val); } else if(strcmp(opt, "key-cache-size:") == 0) { return cfg_parse_memsize(val, &cfg->key_cache_size); } else if(strcmp(opt, "key-cache-slabs:") == 0) { diff --git a/util/configlexer.c b/util/configlexer.c index 50544831d..fc0547961 100644 --- 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 122 -#define YY_END_OF_BUFFER 123 +#define YY_NUM_RULES 125 +#define YY_END_OF_BUFFER 126 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -371,134 +371,137 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1143] = +static yyconst flex_int16_t yy_accept[1178] = { 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 + 1, 1, 107, 107, 111, 111, 115, 115, 119, 119, + 1, 1, 126, 123, 1, 105, 105, 124, 123, 124, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 107, + 108, 108, 109, 124, 111, 112, 112, 113, 124, 118, + 115, 116, 116, 117, 124, 119, 120, 120, 121, 124, + 122, 106, 122, 110, 124, 122, 123, 0, 1, 0, + 123, 0, 2, 0, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 107, 0, 111, 0, 118, 0, + 115, 119, 0, 122, 0, 122, 0, 122, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 122, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 122, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 51, 123, 123, 123, 123, 123, 6, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 122, 123, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 122, 123, 123, 123, 123, 20, 123, 123, 123, + 123, 123, 12, 13, 123, 15, 14, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 103, 123, 123, + 123, 123, 3, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 122, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 114, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 23, + 123, 123, 123, 123, 123, 123, 123, 24, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 64, 114, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 63, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 21, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 22, 123, 123, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 17, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 52, + 53, 123, 50, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 5, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 66, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 89, 88, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 25, 123, 123, 123, 123, 54, 123, 123, 123, 123, + 123, 86, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 43, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 4, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 83, + + 123, 123, 123, 123, 123, 123, 123, 97, 84, 123, + 16, 123, 123, 123, 56, 57, 55, 123, 123, 123, + 123, 123, 62, 123, 123, 123, 123, 123, 123, 123, + 123, 85, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 71, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 31, 32, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 61, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 65, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 102, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 75, 123, 78, 123, 123, 123, 123, + 60, 123, 123, 95, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 33, + 34, 123, 39, 79, 123, 90, 87, 123, 27, 123, + 81, 123, 123, 123, 123, 123, 7, 123, 49, 94, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 67, 123, 123, 104, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 80, 26, 28, 123, 123, + 123, 123, 123, 48, 123, 123, 123, 98, 123, 123, + 123, 123, 123, 123, 46, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 100, 123, 123, 123, 123, 123, + 123, 123, 11, 123, 123, 123, 123, 123, 123, 10, + 123, 123, 29, 123, 99, 123, 123, 123, 123, 123, + 123, 123, 123, 123, 123, 74, 73, 123, 101, 96, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 35, + 123, 123, 123, 123, 123, 30, 123, 123, 123, 68, + 70, 123, 123, 123, 72, 123, 123, 123, 123, 123, + + 123, 123, 123, 123, 123, 123, 123, 123, 18, 123, + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 93, 123, 123, 123, 123, 123, 123, 19, 123, + 9, 123, 123, 91, 40, 123, 123, 123, 77, 123, + 58, 123, 123, 42, 45, 41, 123, 36, 123, 8, + 123, 123, 76, 123, 123, 123, 123, 37, 123, 92, + 123, 123, 69, 59, 44, 38, 123, 123, 123, 123, + 47, 123, 123, 123, 123, 82, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -541,530 +544,547 @@ static yyconst flex_int32_t yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1157] = +static yyconst flex_int16_t yy_base[1192] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 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 + 87, 108, 2270, 2256, 50, 2359, 2359, 2359, 129, 94, + 70, 124, 122, 71, 89, 105, 112, 92, 110, 94, + 130, 135, 61, 133, 147, 141, 153, 150, 167, 2255, + 2359, 2359, 2359, 58, 2254, 2359, 2359, 2359, 42, 2250, + 2199, 2359, 2359, 2359, 184, 2118, 2359, 2359, 2359, 152, + 2067, 2359, 190, 2359, 194, 160, 1958, 200, 166, 1628, + 211, 1432, 2359, 1319, 163, 193, 157, 195, 72, 204, + 196, 206, 62, 212, 209, 213, 214, 215, 216, 217, + 222, 228, 227, 235, 236, 238, 240, 242, 226, 244, + + 245, 249, 250, 252, 254, 256, 259, 260, 262, 257, + 264, 266, 267, 268, 1239, 281, 1175, 291, 1127, 299, + 1086, 999, 292, 944, 303, 309, 784, 302, 306, 312, + 274, 103, 304, 276, 313, 310, 321, 322, 317, 320, + 314, 323, 324, 330, 333, 328, 334, 332, 335, 354, + 340, 355, 338, 358, 357, 365, 368, 364, 366, 347, + 356, 369, 370, 373, 374, 375, 376, 380, 381, 383, + 386, 389, 395, 392, 391, 398, 400, 404, 401, 405, + 409, 410, 412, 413, 421, 416, 419, 423, 424, 429, + 425, 430, 435, 441, 433, 437, 442, 443, 445, 447, + + 451, 449, 448, 450, 456, 454, 469, 462, 464, 457, + 468, 473, 476, 478, 480, 481, 489, 485, 486, 487, + 493, 492, 490, 494, 499, 498, 519, 500, 504, 503, + 506, 511, 507, 514, 516, 517, 528, 520, 523, 539, + 548, 529, 541, 542, 547, 550, 551, 552, 553, 555, + 556, 559, 570, 567, 571, 572, 577, 579, 580, 581, + 582, 563, 590, 2359, 594, 583, 588, 592, 586, 2359, + 597, 599, 600, 602, 608, 606, 607, 611, 609, 620, + 614, 621, 113, 630, 618, 616, 623, 632, 635, 636, + 639, 640, 643, 642, 649, 650, 645, 647, 653, 654, + + 655, 656, 661, 665, 669, 673, 675, 677, 680, 686, + 682, 684, 690, 689, 691, 674, 692, 695, 698, 699, + 707, 703, 705, 711, 704, 713, 719, 716, 720, 721, + 725, 726, 727, 728, 729, 736, 743, 739, 742, 751, + 732, 749, 740, 747, 754, 761, 757, 759, 762, 760, + 764, 766, 768, 772, 771, 780, 781, 770, 782, 784, + 773, 790, 791, 792, 797, 798, 2359, 805, 802, 801, + 803, 808, 2359, 2359, 170, 2359, 2359, 804, 810, 817, + 824, 815, 809, 816, 822, 825, 829, 833, 834, 837, + 826, 838, 839, 844, 849, 850, 852, 853, 854, 858, + + 859, 861, 863, 862, 871, 877, 865, 2359, 873, 874, + 880, 875, 2359, 882, 883, 885, 889, 892, 890, 893, + 899, 897, 895, 900, 903, 902, 909, 916, 915, 913, + 917, 924, 905, 921, 927, 922, 928, 929, 933, 935, + 958, 934, 939, 936, 940, 941, 942, 950, 952, 959, + 943, 946, 965, 968, 966, 971, 982, 2359, 977, 983, + 975, 979, 984, 987, 985, 988, 991, 995, 1002, 2359, + 998, 1000, 1001, 1003, 1007, 1014, 1017, 2359, 1018, 1020, + 1010, 1021, 1024, 1026, 1028, 1029, 1030, 1034, 1036, 1035, + 1037, 1043, 1039, 1052, 1056, 1038, 1045, 1055, 1057, 1058, + + 1063, 1060, 1064, 1061, 1062, 2359, 683, 1065, 1066, 1068, + 1072, 1082, 1084, 1069, 1076, 1086, 1085, 1092, 1094, 1095, + 1096, 1097, 1098, 1099, 1104, 1101, 1106, 1103, 1109, 1110, + 1114, 1111, 1112, 1115, 2359, 1119, 1123, 1125, 1129, 1140, + 1136, 1137, 1143, 1141, 1147, 1150, 1144, 1148, 1159, 1160, + 1156, 1153, 1162, 1163, 1164, 1165, 1168, 1169, 1173, 1172, + 1170, 1174, 1185, 1187, 1189, 1192, 1177, 1196, 1198, 1199, + 1200, 1201, 2359, 1207, 1210, 1209, 1216, 1212, 1213, 1215, + 1219, 1220, 1222, 1228, 1224, 1227, 1225, 1229, 1231, 1233, + 1234, 1236, 2359, 1242, 1235, 1238, 1248, 1246, 1250, 1249, + + 1255, 1257, 1260, 1263, 1262, 1264, 1271, 1272, 1273, 1274, + 1283, 1286, 1284, 2359, 1288, 1275, 1277, 1300, 1291, 1292, + 1297, 1306, 1298, 1302, 1304, 1305, 1308, 1307, 1310, 1312, + 1314, 1316, 1326, 1319, 1331, 1315, 1327, 1337, 1338, 2359, + 2359, 1341, 2359, 1342, 1334, 1336, 1343, 1344, 1351, 1346, + 1352, 1354, 1356, 1358, 1355, 1360, 2359, 1357, 1363, 1368, + 1364, 1370, 1371, 1378, 1381, 1387, 1372, 1379, 1383, 2359, + 1394, 1373, 1385, 1395, 1397, 1400, 1401, 1402, 1404, 1405, + 1408, 1409, 1411, 1413, 1412, 1419, 1416, 1417, 1418, 1423, + 1421, 1432, 1424, 2359, 2359, 1430, 1434, 1435, 1446, 1442, + + 1450, 1448, 1449, 1452, 1453, 1456, 1457, 1459, 1461, 1462, + 2359, 1468, 1472, 1473, 1478, 2359, 1466, 1464, 1476, 1483, + 1484, 2359, 1485, 1486, 1488, 1489, 1491, 1492, 1497, 1498, + 1504, 1500, 1506, 1507, 1515, 1509, 1508, 1511, 1523, 1525, + 1527, 1529, 1535, 1512, 1531, 1538, 1540, 1542, 1543, 2359, + 1549, 1516, 1550, 1532, 1548, 1558, 1552, 1554, 1555, 1556, + 1559, 1561, 1562, 1567, 1563, 1569, 1565, 1570, 1573, 1581, + 1577, 1584, 2359, 1585, 1591, 1587, 1589, 1592, 1593, 1594, + 1595, 1598, 1605, 1604, 1601, 1606, 1621, 1624, 1630, 1615, + 1631, 1628, 1608, 1629, 1609, 1637, 1633, 1643, 1635, 2359, + + 1636, 1645, 1649, 1646, 1651, 1653, 1654, 2359, 2359, 1650, + 2359, 1657, 1642, 1661, 2359, 2359, 2359, 1671, 1664, 1667, + 1672, 1676, 2359, 1665, 1677, 1673, 1679, 1680, 1683, 1682, + 1684, 2359, 1688, 1687, 1690, 1696, 1699, 1686, 1701, 1700, + 1709, 1710, 1703, 1707, 1716, 1713, 1717, 1719, 1723, 1720, + 1725, 1726, 1728, 1729, 1724, 1730, 1739, 2359, 1741, 1731, + 1743, 1749, 1750, 1754, 1738, 1751, 1758, 1760, 1762, 1764, + 2359, 2359, 1765, 1767, 1768, 1770, 1771, 1775, 1777, 1778, + 1780, 1781, 1784, 1785, 1786, 2359, 1787, 1788, 1789, 1793, + 1796, 1804, 1798, 1809, 1813, 1791, 1815, 1817, 2359, 1818, + + 1820, 1806, 1822, 1824, 1826, 1827, 1828, 1834, 1831, 1836, + 2359, 1838, 1839, 1840, 1843, 1846, 1845, 1847, 1848, 1849, + 1853, 1859, 1856, 2359, 1857, 2359, 1861, 1867, 1869, 1871, + 2359, 1873, 1874, 2359, 1875, 1876, 1883, 1885, 1884, 1891, + 1879, 1892, 1893, 1900, 1896, 1894, 1901, 1897, 1907, 2359, + 2359, 1903, 2359, 2359, 1914, 2359, 2359, 1916, 2359, 1918, + 2359, 1924, 1920, 1911, 1908, 1923, 2359, 1926, 2359, 2359, + 1929, 1931, 1932, 1936, 1938, 1922, 1939, 1941, 1942, 1943, + 1945, 1946, 1947, 1948, 1949, 1952, 1956, 1957, 1959, 1960, + 1967, 2359, 1961, 1971, 2359, 1969, 1974, 1977, 1980, 1981, + + 1983, 1989, 1986, 1985, 1987, 2359, 2359, 2359, 1988, 1990, + 1998, 1991, 1994, 2359, 2003, 1999, 2010, 2359, 2013, 2005, + 2011, 2016, 2017, 2015, 2359, 2019, 2024, 2025, 2026, 2032, + 2036, 2033, 2038, 2040, 2359, 2042, 2043, 2045, 2044, 2049, + 2050, 2052, 2359, 2046, 2054, 2057, 2059, 2062, 2064, 2359, + 2063, 2066, 2359, 2075, 2359, 2060, 2076, 2078, 2083, 2085, + 2071, 2086, 2092, 2091, 2093, 2359, 2359, 2088, 2359, 2359, + 2095, 2096, 2098, 2099, 2101, 2102, 2103, 2107, 2105, 2359, + 2108, 2109, 2113, 2119, 2121, 2359, 2124, 2120, 2110, 2359, + 2359, 2126, 2136, 2134, 2359, 2139, 2138, 2140, 2141, 2146, + + 2142, 2148, 2149, 2150, 2128, 2151, 2153, 2160, 2359, 2162, + 2163, 2164, 2169, 2172, 2166, 2175, 2173, 2177, 2178, 2180, + 2181, 2359, 2184, 2192, 2195, 2197, 2198, 2202, 2359, 2204, + 2359, 2207, 2208, 2359, 2359, 2174, 2210, 2211, 2359, 2212, + 2359, 2199, 2214, 2359, 2359, 2359, 2221, 2359, 2222, 2359, + 2224, 2215, 2359, 2225, 2228, 2232, 2234, 2359, 2236, 2359, + 2229, 2237, 2359, 2359, 2359, 2359, 2240, 2239, 2246, 2242, + 2359, 2247, 2249, 2248, 2253, 2359, 2359, 2280, 2286, 2292, + 2298, 2304, 542, 2310, 2316, 2322, 2328, 2334, 2340, 2346, + 2352 + } ; -static yyconst flex_int16_t yy_def[1157] = +static yyconst flex_int16_t yy_def[1192] = { 0, - 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 + 1177, 1, 1178, 1178, 1179, 1179, 1180, 1180, 1181, 1181, + 1182, 1182, 1177, 1183, 1177, 1177, 1177, 1177, 1184, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1185, + 1177, 1177, 1177, 1185, 1186, 1177, 1177, 1177, 1186, 1187, + 1177, 1177, 1177, 1177, 1187, 1188, 1177, 1177, 1177, 1188, + 1189, 1177, 1190, 1177, 1189, 1189, 1183, 1183, 1177, 1191, + 1184, 1191, 1177, 1184, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1185, 1185, 1186, 1186, 1187, 1187, + 1177, 1188, 1188, 1189, 1189, 1190, 1190, 1189, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1189, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1189, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1177, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1189, 1183, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1189, 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, + 1183, 1183, 1177, 1177, 1183, 1177, 1177, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1189, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1177, 1189, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1177, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1177, 1177, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1177, 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, + 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1177, 1183, + 1177, 1183, 1183, 1183, 1177, 1177, 1177, 1183, 1183, 1183, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1177, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1177, 1183, 1177, 1183, 1183, 1183, 1183, + 1177, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1177, 1183, 1177, 1177, 1183, 1177, 1177, 1183, 1177, 1183, + 1177, 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1177, 1177, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1177, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1177, 1177, 1177, 1183, 1183, + 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1177, 1183, 1183, + 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1183, 1183, 1177, 1183, 1177, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1177, 1177, 1183, 1177, 1177, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, + 1183, 1183, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1177, + 1177, 1183, 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1183, + + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1177, 1183, 1183, 1183, 1183, 1183, 1183, 1177, 1183, + 1177, 1183, 1183, 1177, 1177, 1183, 1183, 1183, 1177, 1183, + 1177, 1183, 1183, 1177, 1177, 1177, 1183, 1177, 1183, 1177, + 1183, 1183, 1177, 1183, 1183, 1183, 1183, 1177, 1183, 1177, + 1183, 1183, 1177, 1177, 1177, 1177, 1183, 1183, 1183, 1183, + 1177, 1183, 1183, 1183, 1183, 1177, 0, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177 + } ; -static yyconst flex_int16_t yy_nxt[2335] = +static yyconst flex_int16_t yy_nxt[2399] = { 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, 115, 46, 47, 115, 44, + 42, 43, 41, 42, 43, 117, 46, 47, 117, 44, 48, 69, 44, 46, 47, 70, 49, 48, 57, 58, - 59, 67, 68, 49, 51, 52, 53, 54, 60, 18, + 59, 115, 115, 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 + 60, 18, 68, 68, 68, 75, 76, 55, 15, 16, + 17, 62, 63, 64, 99, 67, 137, 67, 67, 65, + + 67, 68, 133, 77, 68, 67, 68, 85, 66, 15, + 16, 17, 62, 63, 64, 68, 86, 68, 87, 91, + 65, 93, 68, 179, 68, 68, 88, 92, 89, 66, + 72, 73, 72, 72, 68, 72, 68, 78, 90, 81, + 72, 74, 68, 82, 79, 68, 83, 68, 96, 84, + 351, 80, 97, 68, 100, 122, 122, 94, 107, 68, + 101, 95, 68, 102, 104, 68, 109, 69, 98, 68, + 103, 70, 125, 108, 105, 68, 111, 106, 129, 68, + 113, 112, 68, 110, 114, 119, 128, 119, 119, 131, + 119, 72, 73, 72, 72, 124, 72, 124, 124, 446, + + 124, 67, 127, 67, 67, 68, 67, 68, 68, 130, + 132, 67, 72, 73, 72, 72, 68, 72, 68, 138, + 135, 68, 72, 74, 68, 68, 68, 68, 68, 68, + 134, 143, 145, 144, 68, 146, 136, 139, 68, 68, + 68, 140, 151, 141, 142, 149, 152, 68, 68, 147, + 68, 153, 68, 148, 68, 154, 68, 68, 158, 156, + 159, 68, 68, 155, 68, 150, 68, 157, 68, 68, + 161, 68, 68, 167, 68, 160, 68, 163, 68, 68, + 68, 164, 162, 172, 115, 115, 68, 165, 68, 166, + 170, 173, 169, 168, 117, 122, 122, 117, 174, 171, + + 119, 178, 119, 119, 124, 119, 124, 124, 181, 124, + 72, 73, 72, 72, 125, 72, 68, 175, 68, 177, + 182, 127, 68, 176, 68, 68, 68, 183, 184, 68, + 190, 180, 68, 68, 68, 68, 68, 191, 185, 193, + 68, 194, 68, 186, 68, 68, 68, 68, 187, 192, + 68, 199, 68, 203, 188, 189, 195, 196, 198, 68, + 197, 202, 204, 201, 200, 207, 68, 68, 68, 68, + 68, 206, 209, 205, 208, 210, 68, 68, 68, 213, + 68, 68, 68, 211, 212, 68, 68, 68, 68, 215, + 214, 218, 68, 68, 221, 68, 225, 216, 68, 224, + + 222, 68, 227, 125, 68, 217, 228, 68, 220, 219, + 68, 233, 68, 68, 223, 230, 68, 68, 234, 226, + 232, 68, 68, 229, 68, 68, 239, 238, 68, 231, + 237, 68, 235, 68, 240, 68, 68, 68, 243, 236, + 244, 68, 68, 247, 241, 68, 242, 68, 249, 68, + 245, 246, 248, 68, 68, 68, 253, 68, 256, 68, + 68, 68, 68, 68, 257, 250, 68, 252, 68, 68, + 251, 255, 258, 264, 68, 254, 68, 260, 261, 265, + 68, 68, 259, 262, 263, 68, 266, 270, 68, 267, + 68, 271, 68, 68, 269, 268, 274, 68, 68, 68, + + 278, 68, 68, 276, 68, 68, 68, 272, 277, 279, + 68, 68, 68, 273, 282, 125, 68, 275, 68, 68, + 281, 298, 280, 68, 284, 293, 68, 292, 68, 68, + 283, 68, 68, 285, 286, 68, 294, 295, 296, 297, + 68, 68, 67, 287, 300, 288, 289, 290, 299, 303, + 291, 68, 302, 68, 68, 301, 304, 305, 306, 68, + 68, 307, 68, 68, 68, 68, 311, 68, 68, 308, + 309, 68, 317, 310, 314, 68, 316, 319, 313, 68, + 318, 312, 68, 68, 68, 320, 324, 315, 321, 68, + 323, 68, 68, 68, 68, 68, 328, 322, 68, 327, + + 68, 325, 68, 329, 68, 326, 68, 330, 332, 68, + 334, 68, 68, 333, 68, 339, 331, 337, 68, 68, + 68, 68, 338, 68, 342, 336, 68, 347, 68, 335, + 68, 343, 68, 68, 350, 68, 340, 348, 341, 344, + 354, 346, 68, 352, 68, 353, 349, 68, 68, 345, + 355, 68, 68, 358, 125, 68, 363, 68, 362, 68, + 359, 68, 68, 356, 367, 68, 68, 68, 68, 357, + 361, 360, 366, 68, 364, 365, 371, 68, 368, 369, + 373, 68, 375, 370, 374, 68, 68, 68, 376, 68, + 372, 377, 68, 378, 68, 125, 68, 381, 68, 379, + + 380, 68, 68, 68, 68, 382, 384, 68, 383, 385, + 68, 68, 390, 387, 391, 68, 68, 68, 388, 68, + 393, 386, 389, 68, 392, 68, 398, 394, 68, 396, + 397, 68, 68, 68, 399, 400, 401, 68, 68, 68, + 68, 68, 402, 407, 68, 405, 406, 408, 68, 395, + 409, 68, 68, 404, 68, 68, 403, 411, 412, 68, + 410, 68, 413, 68, 414, 415, 68, 416, 419, 68, + 420, 68, 68, 68, 68, 421, 68, 417, 68, 422, + 68, 418, 68, 68, 68, 68, 73, 426, 423, 427, + 428, 425, 68, 68, 68, 424, 68, 429, 430, 434, + + 431, 432, 125, 68, 68, 433, 436, 435, 437, 68, + 68, 439, 441, 68, 68, 68, 68, 68, 442, 440, + 68, 68, 68, 444, 449, 447, 448, 68, 68, 68, + 438, 443, 455, 458, 68, 445, 68, 68, 68, 456, + 450, 68, 460, 451, 459, 68, 68, 462, 452, 68, + 68, 68, 463, 457, 453, 454, 68, 467, 464, 466, + 461, 68, 68, 470, 68, 68, 68, 469, 471, 465, + 68, 68, 472, 68, 68, 68, 468, 68, 473, 474, + 476, 477, 478, 68, 479, 68, 68, 68, 481, 68, + 484, 475, 68, 483, 68, 68, 480, 68, 485, 487, + + 482, 68, 68, 486, 68, 68, 493, 68, 491, 68, + 489, 68, 68, 494, 68, 68, 488, 68, 490, 492, + 497, 68, 499, 500, 496, 68, 495, 68, 68, 68, + 501, 504, 506, 68, 68, 498, 68, 505, 507, 125, + 68, 68, 503, 502, 509, 68, 68, 68, 68, 508, + 518, 68, 68, 68, 68, 68, 125, 524, 68, 530, + 510, 512, 68, 520, 68, 525, 521, 529, 523, 511, + 68, 68, 526, 513, 522, 514, 519, 68, 68, 515, + 68, 516, 531, 68, 536, 528, 517, 68, 532, 68, + 527, 68, 533, 535, 68, 68, 68, 68, 537, 68, + + 68, 540, 534, 68, 539, 543, 538, 68, 541, 546, + 68, 123, 68, 68, 68, 68, 542, 548, 549, 68, + 550, 545, 68, 544, 553, 547, 68, 552, 551, 68, + 68, 554, 68, 68, 555, 556, 68, 557, 68, 559, + 68, 68, 68, 560, 562, 561, 68, 68, 68, 68, + 68, 68, 566, 558, 567, 68, 573, 68, 568, 570, + 563, 565, 569, 571, 68, 572, 564, 68, 68, 68, + 68, 577, 68, 68, 68, 68, 68, 68, 68, 585, + 68, 68, 576, 575, 68, 579, 574, 121, 68, 586, + 578, 582, 580, 583, 68, 588, 68, 68, 68, 581, + + 584, 587, 589, 590, 68, 593, 68, 68, 68, 68, + 68, 68, 591, 68, 596, 68, 68, 595, 68, 592, + 599, 68, 68, 68, 68, 594, 68, 68, 600, 597, + 598, 68, 605, 601, 602, 68, 608, 68, 606, 120, + 604, 68, 603, 610, 607, 609, 612, 613, 68, 68, + 617, 614, 68, 68, 618, 68, 68, 611, 616, 68, + 68, 615, 68, 620, 619, 68, 623, 624, 68, 626, + 621, 68, 68, 625, 68, 68, 68, 68, 622, 631, + 68, 68, 68, 627, 68, 68, 68, 118, 628, 68, + 629, 632, 630, 636, 634, 633, 640, 68, 641, 68, + + 635, 68, 637, 643, 68, 639, 642, 638, 68, 644, + 68, 68, 68, 68, 650, 646, 645, 651, 648, 68, + 649, 68, 68, 653, 68, 68, 652, 68, 68, 647, + 657, 68, 68, 654, 68, 660, 68, 68, 656, 68, + 68, 68, 664, 68, 655, 68, 68, 68, 68, 669, + 68, 116, 658, 670, 68, 663, 661, 659, 68, 662, + 68, 68, 68, 665, 667, 673, 675, 68, 672, 68, + 666, 668, 68, 671, 68, 68, 68, 679, 674, 681, + 676, 677, 680, 68, 68, 68, 68, 68, 678, 68, + 687, 686, 683, 688, 682, 68, 68, 689, 68, 684, + + 68, 691, 695, 68, 68, 690, 685, 693, 692, 68, + 68, 694, 68, 698, 68, 697, 68, 68, 68, 68, + 68, 73, 68, 696, 68, 706, 68, 68, 68, 699, + 707, 68, 712, 700, 703, 701, 702, 705, 68, 68, + 704, 708, 711, 68, 714, 715, 68, 709, 68, 68, + 68, 710, 716, 68, 68, 68, 68, 717, 68, 713, + 720, 718, 722, 68, 68, 724, 68, 68, 68, 68, + 68, 721, 68, 719, 727, 68, 68, 729, 723, 726, + 68, 732, 68, 68, 68, 68, 728, 730, 725, 731, + 68, 68, 736, 68, 738, 68, 733, 68, 737, 68, + + 744, 741, 734, 735, 739, 740, 68, 68, 745, 68, + 743, 742, 68, 68, 68, 750, 68, 68, 748, 749, + 68, 68, 751, 68, 68, 68, 757, 746, 68, 68, + 68, 68, 747, 68, 73, 68, 68, 756, 752, 755, + 762, 753, 68, 754, 68, 766, 68, 68, 758, 759, + 761, 760, 765, 763, 68, 767, 764, 772, 68, 773, + 68, 68, 68, 771, 68, 68, 768, 769, 68, 68, + 770, 68, 779, 68, 68, 782, 68, 775, 68, 783, + 68, 774, 777, 776, 68, 68, 787, 778, 68, 780, + 68, 784, 781, 785, 788, 68, 68, 68, 68, 786, + + 68, 68, 793, 68, 68, 794, 795, 789, 796, 68, + 68, 790, 68, 797, 791, 800, 68, 792, 68, 68, + 68, 68, 804, 68, 68, 799, 801, 68, 68, 807, + 802, 803, 798, 805, 808, 68, 809, 68, 806, 68, + 811, 68, 812, 68, 68, 813, 820, 68, 810, 815, + 68, 816, 68, 817, 68, 68, 819, 821, 818, 823, + 68, 68, 68, 814, 68, 824, 68, 68, 68, 822, + 68, 68, 832, 68, 68, 68, 825, 68, 826, 68, + 834, 68, 68, 827, 837, 68, 828, 829, 830, 68, + 836, 838, 831, 68, 840, 835, 68, 68, 844, 68, + + 833, 68, 843, 68, 68, 68, 68, 68, 846, 847, + 68, 839, 842, 68, 848, 841, 68, 68, 68, 845, + 68, 68, 850, 852, 863, 853, 849, 68, 856, 851, + 73, 857, 855, 68, 854, 858, 68, 859, 861, 860, + 68, 68, 68, 68, 866, 68, 865, 68, 68, 68, + 868, 870, 862, 864, 68, 68, 871, 68, 68, 869, + 872, 68, 68, 68, 873, 68, 68, 867, 874, 68, + 878, 875, 880, 68, 877, 876, 68, 68, 882, 68, + 884, 879, 881, 68, 68, 68, 885, 886, 68, 68, + 888, 68, 68, 883, 68, 68, 68, 887, 68, 68, + + 68, 896, 68, 890, 891, 895, 889, 892, 68, 893, + 899, 68, 68, 68, 902, 68, 894, 898, 901, 68, + 897, 68, 68, 907, 900, 68, 903, 904, 68, 68, + 908, 68, 68, 905, 911, 68, 68, 68, 68, 906, + 68, 68, 68, 68, 912, 910, 913, 915, 909, 914, + 68, 68, 916, 68, 917, 68, 918, 920, 919, 921, + 924, 68, 68, 68, 923, 926, 68, 928, 922, 927, + 68, 925, 68, 931, 68, 929, 68, 68, 934, 68, + 68, 935, 68, 68, 932, 930, 933, 68, 937, 68, + 68, 938, 68, 68, 936, 940, 68, 68, 68, 68, + + 68, 68, 946, 68, 939, 68, 949, 950, 68, 944, + 68, 941, 942, 947, 948, 951, 68, 943, 68, 945, + 953, 68, 955, 952, 954, 68, 956, 68, 957, 68, + 68, 959, 68, 961, 68, 958, 68, 960, 68, 68, + 68, 965, 964, 68, 963, 967, 68, 969, 68, 970, + 68, 68, 68, 972, 962, 68, 966, 68, 68, 68, + 68, 68, 968, 974, 976, 68, 980, 973, 68, 68, + 978, 68, 981, 68, 979, 977, 985, 971, 975, 68, + 984, 68, 983, 68, 986, 68, 68, 68, 68, 982, + 990, 68, 987, 991, 992, 68, 68, 68, 989, 994, + + 988, 993, 995, 68, 68, 68, 68, 999, 68, 68, + 998, 996, 68, 68, 1000, 68, 1005, 1003, 1002, 68, + 68, 1004, 1001, 68, 997, 1006, 68, 1007, 68, 1008, + 68, 1009, 68, 1010, 68, 68, 68, 1014, 68, 1011, + 1013, 68, 1012, 68, 68, 1016, 1015, 1018, 68, 1017, + 68, 68, 1020, 68, 68, 68, 1025, 68, 68, 68, + 68, 68, 1019, 1021, 68, 1022, 1023, 1026, 68, 68, + 68, 68, 68, 68, 1029, 1024, 1033, 1034, 1035, 68, + 1028, 68, 1031, 68, 1037, 1027, 68, 1032, 1030, 68, + 1038, 1036, 68, 68, 1043, 68, 1044, 68, 68, 68, + + 68, 68, 68, 68, 1039, 1049, 68, 1040, 1041, 1050, + 68, 68, 1042, 1045, 1053, 68, 1046, 68, 1051, 1047, + 1048, 1055, 68, 68, 1052, 68, 1056, 68, 68, 68, + 1054, 68, 1058, 1059, 1060, 1061, 68, 68, 68, 1057, + 1068, 1063, 1064, 1066, 68, 68, 1062, 1067, 68, 1069, + 68, 1070, 68, 1065, 68, 68, 68, 68, 68, 1071, + 1073, 68, 68, 1076, 68, 1074, 68, 1072, 1080, 68, + 1075, 68, 68, 1077, 68, 68, 68, 1078, 68, 125, + 1081, 1083, 1082, 68, 1084, 1079, 1086, 68, 68, 1088, + 68, 1085, 1087, 1089, 1090, 68, 1091, 68, 68, 1094, + + 68, 1092, 1095, 68, 68, 68, 1097, 68, 68, 1096, + 68, 68, 1093, 68, 68, 68, 1099, 68, 1102, 68, + 68, 68, 68, 1107, 1109, 68, 1098, 1101, 1105, 1100, + 123, 68, 68, 68, 1103, 1110, 68, 1106, 68, 1108, + 68, 1104, 1111, 1115, 1113, 1112, 68, 1114, 68, 1116, + 68, 68, 68, 68, 68, 1117, 1118, 1122, 68, 1119, + 68, 68, 68, 68, 1129, 68, 1127, 1126, 1121, 1125, + 1123, 1120, 68, 1131, 68, 68, 68, 1130, 68, 1124, + 1134, 68, 1128, 1135, 68, 68, 68, 68, 1139, 68, + 68, 1141, 68, 68, 1152, 1132, 68, 1136, 1133, 1137, + + 121, 1143, 1140, 1144, 68, 1138, 1145, 68, 1146, 68, + 68, 68, 1142, 1148, 68, 1147, 68, 1149, 1150, 68, + 68, 1153, 68, 68, 68, 1151, 68, 68, 1154, 1155, + 1157, 1156, 1158, 68, 68, 1160, 68, 68, 1159, 1163, + 68, 68, 1161, 1164, 68, 1165, 68, 1166, 68, 68, + 1168, 68, 68, 1167, 68, 1162, 1169, 1171, 68, 68, + 68, 68, 120, 1172, 1176, 68, 118, 116, 68, 1177, + 1177, 1170, 1177, 1177, 1173, 1174, 1177, 1177, 1177, 1175, + 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, 115, 115, 1177, 1177, + 115, 115, 117, 117, 1177, 117, 1177, 117, 119, 1177, + 1177, 1177, 1177, 119, 122, 122, 1177, 1177, 122, 122, + 124, 1177, 1177, 1177, 1177, 124, 126, 126, 126, 126, + 126, 126, 72, 72, 72, 72, 72, 72, 13, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177 + } ; -static yyconst flex_int16_t yy_chk[2335] = +static yyconst flex_int16_t yy_chk[2399] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1072,257 +1092,264 @@ static yyconst flex_int16_t yy_chk[2335] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 4, 4, 4, 49, 5, 5, 49, 3, 5, 15, 4, 6, 6, 15, 5, 6, 9, 9, - 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 + 9, 44, 44, 6, 7, 7, 7, 7, 9, 7, + 10, 10, 10, 33, 83, 7, 8, 8, 8, 8, + 10, 8, 21, 24, 79, 21, 21, 8, 11, 11, + 11, 11, 11, 11, 33, 20, 83, 20, 20, 11, + + 20, 25, 79, 21, 28, 20, 30, 24, 11, 12, + 12, 12, 12, 12, 12, 132, 25, 26, 26, 28, + 12, 30, 29, 132, 27, 283, 26, 29, 27, 12, + 19, 19, 19, 19, 23, 19, 22, 22, 27, 23, + 19, 19, 31, 23, 22, 34, 23, 32, 32, 23, + 283, 22, 32, 36, 34, 60, 60, 31, 36, 35, + 34, 31, 38, 34, 35, 37, 37, 69, 32, 77, + 34, 69, 66, 36, 35, 75, 38, 35, 75, 39, + 39, 38, 375, 37, 39, 55, 66, 55, 55, 77, + 55, 63, 63, 63, 63, 65, 63, 65, 65, 375, + + 65, 68, 63, 68, 68, 76, 68, 78, 81, 76, + 78, 68, 71, 71, 71, 71, 80, 71, 82, 84, + 81, 85, 71, 71, 84, 86, 87, 88, 89, 90, + 80, 88, 90, 89, 91, 90, 82, 84, 99, 93, + 92, 85, 93, 86, 87, 92, 93, 94, 95, 90, + 96, 94, 97, 91, 98, 95, 100, 101, 99, 97, + 100, 102, 103, 96, 104, 92, 105, 98, 106, 110, + 102, 107, 108, 108, 109, 101, 111, 104, 112, 113, + 114, 105, 103, 112, 116, 116, 131, 106, 134, 107, + 110, 113, 109, 108, 118, 123, 123, 118, 114, 111, + + 120, 131, 120, 120, 125, 120, 125, 125, 134, 125, + 126, 126, 126, 126, 128, 126, 133, 128, 129, 130, + 135, 126, 136, 129, 130, 135, 141, 136, 137, 139, + 139, 133, 140, 137, 138, 142, 143, 140, 138, 142, + 146, 143, 144, 138, 148, 145, 147, 149, 138, 141, + 153, 147, 151, 151, 138, 138, 144, 145, 146, 160, + 145, 150, 152, 149, 148, 154, 150, 152, 161, 155, + 154, 153, 156, 152, 155, 157, 158, 156, 159, 160, + 157, 162, 163, 158, 159, 164, 165, 166, 167, 162, + 161, 165, 168, 169, 168, 170, 172, 163, 171, 171, + + 169, 172, 173, 175, 174, 164, 174, 173, 167, 166, + 176, 178, 177, 179, 170, 175, 178, 180, 179, 172, + 177, 181, 182, 174, 183, 184, 184, 183, 186, 176, + 182, 187, 180, 185, 185, 188, 189, 191, 188, 181, + 189, 190, 192, 192, 186, 195, 187, 193, 194, 196, + 190, 191, 193, 194, 197, 198, 198, 199, 201, 200, + 203, 202, 204, 201, 202, 195, 206, 197, 205, 210, + 196, 200, 203, 208, 208, 199, 209, 205, 206, 209, + 211, 207, 204, 207, 207, 212, 210, 213, 213, 210, + 214, 214, 215, 216, 212, 211, 217, 218, 219, 220, + + 221, 217, 223, 219, 222, 221, 224, 215, 220, 222, + 226, 225, 228, 216, 225, 230, 229, 218, 231, 233, + 224, 234, 223, 232, 226, 229, 234, 228, 235, 236, + 225, 227, 238, 227, 227, 239, 230, 231, 232, 233, + 237, 242, 1183, 227, 236, 227, 227, 227, 235, 239, + 227, 240, 238, 243, 244, 237, 240, 241, 241, 245, + 241, 242, 246, 247, 248, 249, 246, 250, 251, 243, + 244, 252, 251, 245, 249, 262, 250, 253, 248, 254, + 252, 247, 253, 255, 256, 254, 258, 249, 255, 257, + 257, 258, 259, 260, 261, 266, 262, 256, 269, 261, + + 267, 259, 263, 263, 268, 260, 265, 265, 267, 271, + 269, 272, 273, 268, 274, 275, 266, 273, 276, 277, + 275, 279, 274, 278, 278, 272, 281, 280, 286, 271, + 285, 278, 280, 282, 282, 287, 276, 280, 277, 278, + 286, 279, 284, 284, 288, 285, 281, 289, 290, 278, + 287, 291, 292, 290, 294, 293, 295, 297, 294, 298, + 291, 295, 296, 288, 299, 299, 300, 301, 302, 289, + 293, 292, 298, 303, 296, 297, 303, 304, 300, 301, + 305, 305, 307, 302, 306, 306, 316, 307, 308, 308, + 304, 309, 309, 310, 311, 507, 312, 313, 310, 311, + + 312, 314, 313, 315, 317, 314, 316, 318, 315, 317, + 319, 320, 320, 319, 321, 322, 325, 323, 319, 321, + 323, 318, 319, 324, 322, 326, 327, 324, 328, 325, + 326, 327, 329, 330, 328, 329, 330, 331, 332, 333, + 334, 335, 331, 336, 341, 334, 335, 336, 336, 324, + 337, 338, 343, 333, 339, 337, 332, 339, 340, 344, + 338, 342, 340, 340, 341, 342, 345, 343, 346, 347, + 347, 348, 350, 346, 349, 348, 351, 344, 352, 349, + 353, 345, 358, 355, 354, 361, 127, 353, 350, 354, + 355, 352, 356, 357, 359, 351, 360, 356, 357, 361, + + 358, 359, 362, 363, 364, 360, 363, 362, 364, 365, + 366, 366, 368, 370, 369, 371, 378, 368, 369, 366, + 372, 383, 379, 371, 380, 378, 379, 382, 384, 380, + 365, 370, 382, 385, 385, 372, 381, 386, 391, 383, + 381, 387, 387, 381, 386, 388, 389, 389, 381, 390, + 392, 393, 390, 384, 381, 381, 394, 394, 391, 393, + 388, 395, 396, 397, 397, 398, 399, 396, 398, 392, + 400, 401, 399, 402, 404, 403, 395, 407, 400, 401, + 403, 404, 405, 405, 406, 409, 410, 412, 409, 406, + 412, 402, 411, 411, 414, 415, 407, 416, 412, 415, + + 410, 417, 419, 414, 418, 420, 421, 423, 419, 422, + 417, 421, 424, 422, 426, 425, 416, 433, 418, 420, + 425, 427, 427, 428, 424, 430, 423, 429, 428, 431, + 429, 432, 434, 434, 436, 426, 432, 433, 435, 435, + 437, 438, 431, 430, 437, 439, 442, 440, 444, 436, + 442, 443, 445, 446, 447, 451, 124, 448, 452, 452, + 438, 440, 448, 444, 449, 449, 445, 451, 447, 439, + 441, 450, 449, 441, 446, 441, 443, 453, 455, 441, + 454, 441, 453, 456, 459, 450, 441, 461, 454, 459, + 449, 462, 455, 457, 457, 460, 463, 465, 460, 464, + + 466, 463, 456, 467, 462, 466, 461, 468, 464, 469, + 471, 122, 472, 473, 469, 474, 465, 472, 473, 475, + 474, 468, 481, 467, 477, 471, 476, 476, 475, 477, + 479, 479, 480, 482, 479, 480, 483, 481, 484, 483, + 485, 486, 487, 484, 486, 485, 488, 490, 489, 491, + 496, 493, 490, 482, 491, 492, 497, 497, 492, 494, + 487, 489, 493, 495, 494, 496, 488, 498, 495, 499, + 500, 501, 502, 504, 505, 501, 503, 508, 509, 511, + 510, 514, 500, 499, 511, 503, 498, 121, 515, 512, + 502, 508, 504, 509, 512, 514, 513, 517, 516, 505, + + 510, 513, 515, 516, 518, 519, 519, 520, 521, 522, + 523, 524, 517, 526, 522, 528, 525, 521, 527, 518, + 525, 529, 530, 532, 533, 520, 531, 534, 526, 523, + 524, 536, 531, 527, 528, 537, 534, 538, 532, 119, + 530, 539, 529, 537, 533, 536, 539, 540, 541, 542, + 543, 540, 540, 544, 544, 543, 547, 538, 542, 545, + 548, 541, 546, 546, 545, 552, 549, 550, 551, 552, + 547, 549, 550, 551, 553, 554, 555, 556, 548, 554, + 557, 558, 561, 553, 560, 559, 562, 117, 553, 567, + 553, 555, 553, 559, 557, 556, 563, 563, 564, 564, + + 558, 565, 560, 566, 566, 562, 565, 561, 568, 567, + 569, 570, 571, 572, 574, 569, 568, 575, 571, 574, + 572, 576, 575, 577, 578, 579, 576, 580, 577, 570, + 581, 581, 582, 578, 583, 584, 585, 587, 580, 586, + 584, 588, 588, 589, 579, 590, 591, 595, 592, 594, + 596, 115, 582, 594, 594, 587, 585, 583, 598, 586, + 597, 600, 599, 589, 591, 597, 599, 601, 596, 602, + 590, 592, 603, 595, 605, 604, 606, 603, 598, 605, + 600, 601, 604, 607, 608, 609, 610, 616, 602, 617, + 611, 610, 607, 612, 606, 611, 613, 613, 612, 608, + + 615, 616, 619, 619, 620, 615, 609, 618, 617, 621, + 623, 618, 618, 622, 624, 621, 625, 626, 622, 628, + 627, 74, 629, 620, 630, 630, 631, 636, 632, 623, + 631, 634, 636, 624, 627, 625, 626, 629, 633, 637, + 628, 632, 635, 635, 638, 639, 645, 633, 646, 638, + 639, 634, 642, 642, 644, 647, 648, 644, 650, 637, + 647, 645, 649, 649, 651, 651, 652, 655, 653, 658, + 654, 648, 656, 646, 654, 659, 661, 656, 650, 653, + 660, 660, 662, 663, 667, 672, 655, 658, 652, 659, + 664, 668, 664, 665, 666, 669, 661, 673, 665, 666, + + 673, 669, 662, 663, 667, 668, 671, 674, 674, 675, + 672, 671, 676, 677, 678, 679, 679, 680, 677, 678, + 681, 682, 680, 683, 685, 684, 686, 675, 687, 688, + 689, 686, 676, 691, 72, 690, 693, 685, 681, 684, + 691, 682, 696, 683, 692, 696, 697, 698, 687, 688, + 690, 689, 693, 692, 700, 697, 692, 701, 699, 702, + 702, 703, 701, 700, 704, 705, 698, 699, 706, 707, + 699, 708, 708, 709, 710, 712, 718, 704, 717, 713, + 712, 703, 706, 705, 713, 714, 717, 707, 719, 709, + 715, 714, 710, 715, 718, 720, 721, 723, 724, 715, + + 725, 726, 724, 727, 728, 725, 726, 719, 727, 729, + 730, 720, 732, 728, 721, 731, 731, 723, 733, 734, + 737, 736, 735, 738, 744, 730, 732, 735, 752, 738, + 733, 734, 729, 736, 739, 739, 740, 740, 737, 741, + 742, 742, 743, 745, 754, 744, 752, 743, 741, 746, + 746, 747, 747, 748, 748, 749, 751, 753, 749, 755, + 755, 751, 753, 745, 757, 756, 758, 759, 760, 754, + 756, 761, 762, 762, 763, 765, 757, 767, 757, 764, + 764, 766, 768, 757, 767, 769, 758, 759, 760, 771, + 766, 768, 761, 770, 770, 765, 772, 774, 775, 776, + + 763, 777, 774, 775, 778, 779, 780, 781, 777, 778, + 782, 769, 772, 785, 779, 771, 784, 783, 786, 776, + 793, 795, 781, 783, 793, 784, 780, 790, 787, 782, + 70, 788, 786, 787, 785, 788, 788, 789, 791, 790, + 792, 794, 789, 791, 796, 797, 795, 799, 801, 796, + 798, 801, 792, 794, 813, 798, 802, 802, 804, 799, + 803, 803, 810, 805, 804, 806, 807, 797, 805, 812, + 812, 806, 813, 814, 810, 807, 819, 824, 818, 820, + 820, 812, 814, 818, 821, 826, 821, 822, 822, 825, + 825, 827, 828, 819, 830, 829, 831, 824, 838, 834, + + 833, 834, 835, 827, 828, 833, 826, 829, 836, 830, + 837, 837, 840, 839, 840, 843, 831, 836, 839, 844, + 835, 841, 842, 845, 838, 846, 841, 842, 845, 847, + 846, 848, 850, 843, 849, 849, 855, 851, 852, 844, + 853, 854, 856, 860, 850, 848, 851, 852, 847, 851, + 865, 857, 853, 859, 854, 861, 855, 857, 856, 859, + 862, 862, 863, 866, 861, 864, 864, 866, 860, 865, + 867, 863, 868, 869, 869, 867, 870, 873, 874, 874, + 875, 875, 876, 877, 870, 868, 873, 878, 877, 879, + 880, 878, 881, 882, 876, 880, 883, 884, 885, 887, + + 888, 889, 887, 896, 879, 890, 890, 891, 891, 884, + 893, 881, 882, 888, 889, 892, 892, 883, 902, 885, + 894, 894, 896, 893, 895, 895, 897, 897, 898, 898, + 900, 901, 901, 903, 903, 900, 904, 902, 905, 906, + 907, 907, 906, 909, 905, 908, 908, 910, 910, 912, + 912, 913, 914, 914, 904, 915, 907, 917, 916, 918, + 919, 920, 909, 916, 918, 921, 922, 915, 923, 925, + 920, 922, 923, 927, 921, 919, 929, 913, 917, 928, + 928, 929, 927, 930, 930, 932, 933, 935, 936, 925, + 935, 941, 930, 936, 937, 937, 939, 938, 933, 939, + + 932, 938, 940, 940, 942, 943, 946, 944, 945, 948, + 943, 941, 944, 947, 945, 952, 952, 948, 947, 949, + 965, 949, 946, 964, 942, 955, 955, 958, 958, 960, + 960, 962, 963, 963, 976, 966, 962, 968, 968, 964, + 966, 971, 965, 972, 973, 972, 971, 974, 974, 973, + 975, 977, 976, 978, 979, 980, 981, 981, 982, 983, + 984, 985, 975, 977, 986, 978, 979, 982, 987, 988, + 67, 989, 990, 993, 985, 980, 989, 990, 991, 991, + 984, 996, 987, 994, 994, 983, 997, 988, 986, 998, + 996, 993, 999, 1000, 1001, 1001, 1002, 1004, 1003, 1005, + + 1009, 1002, 1010, 1012, 997, 1010, 1013, 998, 999, 1011, + 1011, 1016, 1000, 1003, 1015, 1015, 1004, 1020, 1012, 1005, + 1009, 1017, 1017, 1021, 1013, 1019, 1019, 1024, 1022, 1023, + 1016, 1026, 1021, 1022, 1023, 1024, 1027, 1028, 1029, 1020, + 1032, 1027, 1028, 1030, 1030, 1032, 1026, 1031, 1031, 1033, + 1033, 1034, 1034, 1029, 1036, 1037, 1039, 1038, 1044, 1036, + 1038, 1040, 1041, 1041, 1042, 1039, 1045, 1037, 1046, 1046, + 1040, 1047, 1056, 1042, 1048, 1051, 1049, 1044, 1052, 61, + 1047, 1049, 1048, 1061, 1051, 1045, 1054, 1054, 1057, 1057, + 1058, 1052, 1056, 1058, 1059, 1059, 1060, 1060, 1062, 1063, + + 1068, 1061, 1064, 1064, 1063, 1065, 1068, 1071, 1072, 1065, + 1073, 1074, 1062, 1075, 1076, 1077, 1072, 1079, 1075, 1078, + 1081, 1082, 1089, 1081, 1083, 1083, 1071, 1074, 1078, 1073, + 56, 1084, 1088, 1085, 1076, 1084, 1087, 1079, 1092, 1082, + 1105, 1077, 1085, 1092, 1088, 1087, 1094, 1089, 1093, 1093, + 1097, 1096, 1098, 1099, 1101, 1094, 1096, 1100, 1100, 1097, + 1102, 1103, 1104, 1106, 1107, 1107, 1105, 1104, 1099, 1103, + 1101, 1098, 1108, 1110, 1110, 1111, 1112, 1108, 1115, 1102, + 1113, 1113, 1106, 1114, 1114, 1117, 1136, 1116, 1118, 1118, + 1119, 1120, 1120, 1121, 1136, 1111, 1123, 1115, 1112, 1116, + + 51, 1123, 1119, 1124, 1124, 1117, 1125, 1125, 1126, 1126, + 1127, 1142, 1121, 1128, 1128, 1127, 1130, 1130, 1132, 1132, + 1133, 1137, 1137, 1138, 1140, 1133, 1143, 1152, 1138, 1140, + 1143, 1142, 1147, 1147, 1149, 1151, 1151, 1154, 1149, 1155, + 1155, 1161, 1152, 1156, 1156, 1157, 1157, 1159, 1159, 1162, + 1162, 1168, 1167, 1161, 1170, 1154, 1167, 1169, 1169, 1172, + 1174, 1173, 50, 1170, 1175, 1175, 45, 40, 14, 13, + 0, 1168, 0, 0, 1172, 1173, 0, 0, 0, 1174, + 1178, 1178, 1178, 1178, 1178, 1178, 1179, 1179, 1179, 1179, + 1179, 1179, 1180, 1180, 1180, 1180, 1180, 1180, 1181, 1181, + + 1181, 1181, 1181, 1181, 1182, 1182, 1182, 1182, 1182, 1182, + 1184, 1184, 1184, 1184, 1184, 1184, 1185, 1185, 0, 0, + 1185, 1185, 1186, 1186, 0, 1186, 0, 1186, 1187, 0, + 0, 0, 0, 1187, 1188, 1188, 0, 0, 1188, 1188, + 1189, 0, 0, 0, 0, 1189, 1190, 1190, 1190, 1190, + 1190, 1190, 1191, 1191, 1191, 1191, 1191, 1191, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, + 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177 + } ; static yy_state_type yy_last_accepting_state; @@ -1449,7 +1476,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 1451 "" +#line 1478 "" #define INITIAL 0 #define quotedstring 1 @@ -1636,7 +1663,7 @@ YY_DECL #line 123 "util/configlexer.lex" -#line 1638 "" +#line 1665 "" if ( !(yy_init) ) { @@ -1695,13 +1722,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 >= 1143 ) + if ( yy_current_state >= 1178 ) 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] != 2295 ); + while ( yy_base[yy_current_state] != 2359 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2144,133 +2171,148 @@ YY_RULE_SETUP case 83: YY_RULE_SETUP #line 209 "util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 84: YY_RULE_SETUP #line 210 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 85: YY_RULE_SETUP #line 211 "util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 86: YY_RULE_SETUP #line 212 "util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 87: YY_RULE_SETUP #line 213 "util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 88: YY_RULE_SETUP #line 214 "util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 89: YY_RULE_SETUP #line 215 "util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 90: YY_RULE_SETUP #line 216 "util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 91: YY_RULE_SETUP #line 217 "util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 92: YY_RULE_SETUP #line 218 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 93: YY_RULE_SETUP #line 219 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 94: YY_RULE_SETUP #line 220 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 95: YY_RULE_SETUP #line 221 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 96: YY_RULE_SETUP #line 222 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 97: YY_RULE_SETUP #line 223 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 98: YY_RULE_SETUP #line 224 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 99: YY_RULE_SETUP #line 225 "util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 100: YY_RULE_SETUP #line 226 "util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 101: YY_RULE_SETUP #line 227 "util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 102: -/* rule 102 can match eol */ YY_RULE_SETUP #line 228 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++; } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK -/* Quoted strings. Strip leading and ending quotes */ case 103: YY_RULE_SETUP +#line 229 "util/configlexer.lex" +{ YDVAR(0, VAR_PYTHON) } + YY_BREAK +case 104: +YY_RULE_SETUP +#line 230 "util/configlexer.lex" +{ YDVAR(1, VAR_DOMAIN_INSECURE) } + YY_BREAK +case 105: +/* rule 105 can match eol */ +YY_RULE_SETUP #line 231 "util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++; } + YY_BREAK +/* Quoted strings. Strip leading and ending quotes */ +case 106: +YY_RULE_SETUP +#line 234 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 232 "util/configlexer.lex" +#line 235 "util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 104: +case 107: YY_RULE_SETUP -#line 237 "util/configlexer.lex" +#line 240 "util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 105: -/* rule 105 can match eol */ +case 108: +/* rule 108 can match eol */ YY_RULE_SETUP -#line 238 "util/configlexer.lex" +#line 241 "util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 106: +case 109: YY_RULE_SETUP -#line 240 "util/configlexer.lex" +#line 243 "util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2283,34 +2325,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 107: +case 110: YY_RULE_SETUP -#line 252 "util/configlexer.lex" +#line 255 "util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 253 "util/configlexer.lex" +#line 256 "util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 108: +case 111: YY_RULE_SETUP -#line 258 "util/configlexer.lex" +#line 261 "util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 109: -/* rule 109 can match eol */ +case 112: +/* rule 112 can match eol */ YY_RULE_SETUP -#line 259 "util/configlexer.lex" +#line 262 "util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 110: +case 113: YY_RULE_SETUP -#line 261 "util/configlexer.lex" +#line 264 "util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2323,38 +2365,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 111: +case 114: YY_RULE_SETUP -#line 273 "util/configlexer.lex" +#line 276 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 275 "util/configlexer.lex" +#line 278 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 112: +case 115: YY_RULE_SETUP -#line 279 "util/configlexer.lex" +#line 282 "util/configlexer.lex" { LEXOUT(("ISP ")); /* ignore */ } YY_BREAK -case 113: -/* rule 113 can match eol */ +case 116: +/* rule 116 can match eol */ YY_RULE_SETUP -#line 280 "util/configlexer.lex" +#line 283 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK -case 114: +case 117: YY_RULE_SETUP -#line 281 "util/configlexer.lex" +#line 284 "util/configlexer.lex" { LEXOUT(("IQS ")); BEGIN(include_quoted); } YY_BREAK -case 115: +case 118: YY_RULE_SETUP -#line 282 "util/configlexer.lex" +#line 285 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -2362,27 +2404,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 287 "util/configlexer.lex" +#line 290 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 116: +case 119: YY_RULE_SETUP -#line 291 "util/configlexer.lex" +#line 294 "util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 117: -/* rule 117 can match eol */ +case 120: +/* rule 120 can match eol */ YY_RULE_SETUP -#line 292 "util/configlexer.lex" +#line 295 "util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 118: +case 121: YY_RULE_SETUP -#line 294 "util/configlexer.lex" +#line 297 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -2392,7 +2434,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 300 "util/configlexer.lex" +#line 303 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -2403,33 +2445,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 119: +case 122: YY_RULE_SETUP -#line 310 "util/configlexer.lex" +#line 313 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 120: +case 123: YY_RULE_SETUP -#line 314 "util/configlexer.lex" +#line 317 "util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 121: +case 124: YY_RULE_SETUP -#line 318 "util/configlexer.lex" +#line 321 "util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 122: +case 125: YY_RULE_SETUP -#line 322 "util/configlexer.lex" +#line 325 "util/configlexer.lex" ECHO; YY_BREAK -#line 2431 "" +#line 2473 "" case YY_END_OF_BUFFER: { @@ -2719,7 +2761,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 >= 1143 ) + if ( yy_current_state >= 1178 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2747,11 +2789,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 >= 1143 ) + if ( yy_current_state >= 1178 ) 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 == 1142); + yy_is_jam = (yy_current_state == 1177); return yy_is_jam ? 0 : yy_current_state; } @@ -3388,7 +3430,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 322 "util/configlexer.lex" +#line 325 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index c6db89c6e..40ea10dc1 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -206,6 +206,9 @@ key-cache-slabs{COLON} { YDVAR(1, VAR_KEY_CACHE_SLABS) } neg-cache-size{COLON} { YDVAR(1, VAR_NEG_CACHE_SIZE) } val-nsec3-keysize-iterations{COLON} { YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +add-holddown{COLON} { YDVAR(1, VAR_ADD_HOLDDOWN) } +del-holddown{COLON} { YDVAR(1, VAR_DEL_HOLDDOWN) } +keep-missing{COLON} { YDVAR(1, VAR_KEEP_MISSING) } use-syslog{COLON} { YDVAR(1, VAR_USE_SYSLOG) } log-time-ascii{COLON} { YDVAR(1, VAR_LOG_TIME_ASCII) } local-zone{COLON} { YDVAR(2, VAR_LOCAL_ZONE) } diff --git a/util/configparser.c b/util/configparser.c index 544d3f4fd..936b319c1 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -230,7 +230,10 @@ extern struct config_parser_state* cfg_parser; VAR_VAL_SIG_SKEW_MAX = 361, VAR_CACHE_MIN_TTL = 362, VAR_VAL_LOG_LEVEL = 363, - VAR_AUTO_TRUST_ANCHOR_FILE = 364 + VAR_AUTO_TRUST_ANCHOR_FILE = 364, + VAR_KEEP_MISSING = 365, + VAR_ADD_HOLDDOWN = 366, + VAR_DEL_HOLDDOWN = 367 }; #endif /* Tokens. */ @@ -341,6 +344,9 @@ extern struct config_parser_state* cfg_parser; #define VAR_CACHE_MIN_TTL 362 #define VAR_VAL_LOG_LEVEL 363 #define VAR_AUTO_TRUST_ANCHOR_FILE 364 +#define VAR_KEEP_MISSING 365 +#define VAR_ADD_HOLDDOWN 366 +#define VAR_DEL_HOLDDOWN 367 @@ -357,7 +363,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 361 "util/configparser.c" +#line 367 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -369,7 +375,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 373 "util/configparser.c" +#line 379 "util/configparser.c" #ifdef short # undef short @@ -584,20 +590,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 201 +#define YYLAST 205 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 110 +#define YYNTOKENS 113 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 113 +#define YYNNTS 116 /* YYNRULES -- Number of rules. */ -#define YYNRULES 213 +#define YYNRULES 219 /* YYNRULES -- Number of states. */ -#define YYNSTATES 311 +#define YYNSTATES 320 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 364 +#define YYMAXUTOK 367 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -641,7 +647,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, 109 + 105, 106, 107, 108, 109, 110, 111, 112 }; #if YYDEBUG @@ -658,104 +664,106 @@ 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, 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 + 184, 186, 188, 190, 192, 194, 196, 199, 200, 202, + 204, 206, 208, 210, 213, 214, 216, 218, 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, 403, + 406, 410, 413, 416, 419, 422, 425, 428, 431, 434, + 437, 440, 443, 446, 449, 452, 455, 458, 461, 465, + 468, 471, 474, 477, 480, 483, 486, 489, 492, 494, + 497, 498, 500, 502, 504, 506, 508, 510, 512, 515, + 518, 521, 524, 527, 530, 533, 535, 538, 539, 541 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 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 + 114, 0, -1, -1, 114, 115, -1, 116, 117, -1, + 119, 120, -1, 122, 123, -1, 225, 226, -1, 215, + 216, -1, 11, -1, 117, 118, -1, -1, 125, -1, + 126, -1, 130, -1, 133, -1, 139, -1, 140, -1, + 141, -1, 142, -1, 131, -1, 146, -1, 147, -1, + 148, -1, 149, -1, 150, -1, 164, -1, 165, -1, + 166, -1, 168, -1, 169, -1, 136, -1, 170, -1, + 171, -1, 174, -1, 172, -1, 173, -1, 175, -1, + 176, -1, 177, -1, 185, -1, 159, -1, 160, -1, + 161, -1, 162, -1, 178, -1, 188, -1, 155, -1, + 157, -1, 189, -1, 194, -1, 195, -1, 196, -1, + 137, -1, 163, -1, 202, -1, 203, -1, 156, -1, + 198, -1, 144, -1, 132, -1, 151, -1, 186, -1, + 192, -1, 179, -1, 187, -1, 205, -1, 206, -1, + 138, -1, 127, -1, 143, -1, 181, -1, 128, -1, + 134, -1, 135, -1, 152, -1, 153, -1, 204, -1, + 180, -1, 182, -1, 183, -1, 129, -1, 207, -1, + 167, -1, 184, -1, 145, -1, 158, -1, 190, -1, + 191, -1, 193, -1, 197, -1, 154, -1, 199, -1, + 200, -1, 201, -1, 38, -1, 120, 121, -1, -1, + 208, -1, 209, -1, 210, -1, 211, -1, 44, -1, + 123, 124, -1, -1, 212, -1, 213, -1, 214, -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, 111, 10, -1, 112, 10, -1, 110, + 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, 216, 217, -1, -1, 218, -1, + 220, -1, 219, -1, 221, -1, 222, -1, 223, -1, + 224, -1, 89, 10, -1, 91, 10, -1, 90, 10, + -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, + 95, 10, -1, 103, -1, 226, 227, -1, -1, 228, + -1, 104, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 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 + 0, 106, 106, 106, 107, 107, 108, 108, 109, 113, + 118, 119, 120, 120, 120, 121, 121, 122, 122, 122, + 123, 123, 123, 124, 124, 124, 125, 125, 126, 126, + 127, 127, 128, 128, 129, 129, 130, 130, 131, 131, + 132, 132, 133, 133, 133, 134, 134, 134, 135, 135, + 135, 136, 136, 137, 137, 138, 138, 139, 139, 140, + 140, 140, 141, 141, 142, 142, 143, 143, 143, 144, + 144, 145, 145, 146, 146, 147, 147, 147, 148, 148, + 149, 149, 150, 150, 151, 151, 152, 152, 153, 153, + 153, 154, 154, 155, 155, 157, 169, 170, 171, 171, + 171, 171, 173, 185, 186, 187, 187, 187, 189, 198, + 207, 218, 227, 236, 245, 258, 273, 282, 291, 300, + 309, 318, 327, 336, 345, 354, 363, 372, 386, 395, + 402, 409, 416, 424, 431, 438, 445, 452, 460, 468, + 476, 483, 490, 499, 508, 515, 522, 533, 541, 554, + 563, 572, 580, 593, 602, 611, 620, 629, 642, 649, + 659, 669, 679, 689, 699, 709, 716, 723, 732, 739, + 749, 763, 770, 788, 801, 814, 823, 832, 841, 851, + 861, 870, 877, 886, 895, 904, 912, 925, 933, 953, + 960, 975, 982, 989, 996, 1006, 1013, 1020, 1027, 1032, + 1033, 1034, 1034, 1034, 1035, 1035, 1035, 1036, 1038, 1048, + 1057, 1064, 1071, 1078, 1085, 1092, 1097, 1098, 1099, 1101 }; #endif @@ -798,11 +806,12 @@ 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", "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", + "VAR_VAL_LOG_LEVEL", "VAR_AUTO_TRUST_ANCHOR_FILE", "VAR_KEEP_MISSING", + "VAR_ADD_HOLDDOWN", "VAR_DEL_HOLDDOWN", "$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", @@ -834,6 +843,7 @@ static const char *const yytname[] = "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_add_holddown", "server_del_holddown", "server_keep_missing", "server_key_cache_size", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", "server_local_data_ptr", "stub_name", "stub_host", "stub_addr", @@ -860,24 +870,25 @@ 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, 364 + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 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, + 0, 113, 114, 114, 115, 115, 115, 115, 115, 116, + 117, 117, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 119, 120, 120, 121, 121, + 121, 121, 122, 123, 123, 124, 124, 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, @@ -886,9 +897,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, 209, 210, 210, 211, 211, 211, 211, 211, - 211, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 220, 221, 222 + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 216, 217, 217, 217, 217, 217, 217, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 226, 227, 228 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -903,19 +914,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, 1, 2, 0, 1, 1, 1, 1, 1, - 2, 0, 1, 1, 1, 2, 2, 2, 2, 2, + 1, 1, 1, 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, 3, 2, 2, 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 + 3, 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, 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 @@ -923,8 +934,8 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 9, 92, 99, 192, 209, 3, 11, - 94, 101, 194, 211, 4, 5, 6, 8, 7, 0, + 2, 0, 1, 9, 95, 102, 198, 215, 3, 11, + 97, 104, 200, 217, 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, @@ -932,46 +943,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, 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 + 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, 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, 92, 93, 94, + 55, 56, 77, 66, 67, 82, 0, 0, 0, 0, + 96, 98, 99, 100, 101, 0, 0, 0, 103, 105, + 106, 107, 0, 0, 0, 0, 0, 0, 0, 199, + 201, 203, 202, 204, 205, 206, 207, 0, 216, 218, + 109, 108, 113, 116, 114, 122, 123, 124, 125, 129, + 130, 131, 132, 133, 147, 148, 149, 151, 152, 119, + 153, 154, 157, 155, 156, 158, 159, 160, 168, 142, + 143, 144, 145, 161, 171, 138, 140, 172, 177, 178, + 179, 120, 146, 185, 186, 139, 181, 127, 115, 134, + 169, 175, 162, 0, 0, 189, 121, 110, 126, 164, + 111, 117, 118, 135, 136, 187, 163, 165, 166, 112, + 190, 150, 167, 128, 141, 173, 174, 176, 180, 137, + 184, 182, 183, 191, 192, 193, 194, 195, 196, 197, + 208, 210, 209, 211, 212, 213, 214, 219, 170, 188 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -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 + -1, 1, 8, 9, 14, 102, 10, 15, 190, 11, + 16, 198, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 191, 192, 193, 194, 199, + 200, 201, 12, 17, 209, 210, 211, 212, 213, 214, + 215, 216, 13, 18, 218, 219 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -988,8 +999,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, 90, -103, - -103, -103, -103, -103, -103, -103, -103, -103, -103, -103, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 119, 120, -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, @@ -997,20 +1008,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, - 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, 121, 122, 126, 127, + -103, -103, -103, -103, -103, 128, 170, 171, -103, -103, + -103, -103, 172, 173, 174, 175, 176, 177, 181, -103, + -103, -103, -103, -103, -103, -103, -103, 185, -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, 186, 195, -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 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1027,7 +1038,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, -103, -103, -103, -103 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1037,27 +1048,27 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint16 yytable[] = { - 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, + 2, 186, 217, 187, 188, 195, 220, 221, 222, 223, + 0, 3, 224, 196, 197, 202, 203, 204, 205, 206, + 207, 208, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 4, 241, + 242, 243, 244, 245, 5, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, + 261, 262, 263, 189, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 280, 281, 282, 283, 284, 285, 286, 287, 6, 288, + 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 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, 295, - 296, 297, 298, 44, 45, 46, 299, 300, 301, 47, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 301, + 302, 303, 304, 44, 45, 46, 305, 306, 307, 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, - 302, 303, 304, 305, 306, 307, 308, 309, 88, 89, - 90, 310, 91, 92, 93, 0, 0, 94, 95, 96, - 97, 98 + 308, 309, 310, 311, 312, 313, 314, 315, 88, 89, + 90, 316, 91, 92, 93, 317, 318, 94, 95, 96, + 97, 98, 99, 100, 101, 319 }; static const yytype_int8 yycheck[] = @@ -1081,16 +1092,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, 10, 100, 101, 102, -1, -1, 105, 106, 107, - 108, 109 + 98, 10, 100, 101, 102, 10, 10, 105, 106, 107, + 108, 109, 110, 111, 112, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 111, 0, 11, 38, 44, 88, 103, 112, 113, - 116, 119, 209, 219, 114, 117, 120, 210, 220, 12, + 0, 114, 0, 11, 38, 44, 88, 103, 115, 116, + 119, 122, 215, 225, 117, 120, 123, 216, 226, 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, @@ -1098,8 +1109,8 @@ 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, 109, 115, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 98, 100, 101, 102, 105, 106, 107, 108, 109, 110, + 111, 112, 118, 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, @@ -1107,10 +1118,10 @@ static const yytype_uint8 yystos[] = 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 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, + 202, 203, 204, 205, 206, 207, 37, 39, 40, 99, + 121, 208, 209, 210, 211, 37, 45, 46, 124, 212, + 213, 214, 89, 90, 91, 92, 93, 94, 95, 217, + 218, 219, 220, 221, 222, 223, 224, 104, 227, 228, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1120,7 +1131,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, 10, 10 }; #define yyerrok (yyerrstatus = 0) @@ -1934,16 +1945,16 @@ yyreduce: case 9: /* Line 1455 of yacc.c */ -#line 113 "util/configparser.y" +#line 114 "util/configparser.y" { OUTYY(("\nP(server:)\n")); } break; - case 92: + case 95: /* Line 1455 of yacc.c */ -#line 156 "util/configparser.y" +#line 158 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -1956,10 +1967,10 @@ yyreduce: } break; - case 99: + case 102: /* Line 1455 of yacc.c */ -#line 172 "util/configparser.y" +#line 174 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -1972,10 +1983,10 @@ yyreduce: } break; - case 105: + case 108: /* Line 1455 of yacc.c */ -#line 188 "util/configparser.y" +#line 190 "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) @@ -1985,10 +1996,10 @@ yyreduce: } break; - case 106: + case 109: /* Line 1455 of yacc.c */ -#line 197 "util/configparser.y" +#line 199 "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) @@ -1998,10 +2009,10 @@ yyreduce: } break; - case 107: + case 110: /* Line 1455 of yacc.c */ -#line 206 "util/configparser.y" +#line 208 "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) @@ -2013,10 +2024,10 @@ yyreduce: } break; - case 108: + case 111: /* Line 1455 of yacc.c */ -#line 217 "util/configparser.y" +#line 219 "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) @@ -2026,10 +2037,10 @@ yyreduce: } break; - case 109: + case 112: /* Line 1455 of yacc.c */ -#line 226 "util/configparser.y" +#line 228 "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) @@ -2039,10 +2050,10 @@ yyreduce: } break; - case 110: + case 113: /* Line 1455 of yacc.c */ -#line 235 "util/configparser.y" +#line 237 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2052,10 +2063,10 @@ yyreduce: } break; - case 111: + case 114: /* Line 1455 of yacc.c */ -#line 244 "util/configparser.y" +#line 246 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2069,10 +2080,10 @@ yyreduce: } break; - case 112: + case 115: /* Line 1455 of yacc.c */ -#line 257 "util/configparser.y" +#line 259 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2088,10 +2099,10 @@ yyreduce: } break; - case 113: + case 116: /* Line 1455 of yacc.c */ -#line 272 "util/configparser.y" +#line 274 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2101,10 +2112,10 @@ yyreduce: } break; - case 114: + case 117: /* Line 1455 of yacc.c */ -#line 281 "util/configparser.y" +#line 283 "util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, @@ -2114,10 +2125,10 @@ yyreduce: } break; - case 115: + case 118: /* Line 1455 of yacc.c */ -#line 290 "util/configparser.y" +#line 292 "util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, @@ -2127,10 +2138,10 @@ yyreduce: } break; - case 116: + case 119: /* Line 1455 of yacc.c */ -#line 299 "util/configparser.y" +#line 301 "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) @@ -2140,10 +2151,10 @@ yyreduce: } break; - case 117: + case 120: /* Line 1455 of yacc.c */ -#line 308 "util/configparser.y" +#line 310 "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) @@ -2153,10 +2164,10 @@ yyreduce: } break; - case 118: + case 121: /* Line 1455 of yacc.c */ -#line 317 "util/configparser.y" +#line 319 "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) @@ -2166,10 +2177,10 @@ yyreduce: } break; - case 119: + case 122: /* Line 1455 of yacc.c */ -#line 326 "util/configparser.y" +#line 328 "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) @@ -2179,10 +2190,10 @@ yyreduce: } break; - case 120: + case 123: /* Line 1455 of yacc.c */ -#line 335 "util/configparser.y" +#line 337 "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) @@ -2192,10 +2203,10 @@ yyreduce: } break; - case 121: + case 124: /* Line 1455 of yacc.c */ -#line 344 "util/configparser.y" +#line 346 "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) @@ -2205,10 +2216,10 @@ yyreduce: } break; - case 122: + case 125: /* Line 1455 of yacc.c */ -#line 353 "util/configparser.y" +#line 355 "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) @@ -2218,10 +2229,10 @@ yyreduce: } break; - case 123: + case 126: /* Line 1455 of yacc.c */ -#line 362 "util/configparser.y" +#line 364 "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) @@ -2231,10 +2242,10 @@ yyreduce: } break; - case 124: + case 127: /* Line 1455 of yacc.c */ -#line 371 "util/configparser.y" +#line 373 "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) @@ -2249,10 +2260,10 @@ yyreduce: } break; - case 125: + case 128: /* Line 1455 of yacc.c */ -#line 385 "util/configparser.y" +#line 387 "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) @@ -2262,10 +2273,10 @@ yyreduce: } break; - case 126: + case 129: /* Line 1455 of yacc.c */ -#line 394 "util/configparser.y" +#line 396 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -2273,10 +2284,10 @@ yyreduce: } break; - case 127: + case 130: /* Line 1455 of yacc.c */ -#line 401 "util/configparser.y" +#line 403 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -2284,10 +2295,10 @@ yyreduce: } break; - case 128: + case 131: /* Line 1455 of yacc.c */ -#line 408 "util/configparser.y" +#line 410 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2295,10 +2306,10 @@ yyreduce: } break; - case 129: + case 132: /* Line 1455 of yacc.c */ -#line 415 "util/configparser.y" +#line 417 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2307,10 +2318,10 @@ yyreduce: } break; - case 130: + case 133: /* Line 1455 of yacc.c */ -#line 423 "util/configparser.y" +#line 425 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2318,10 +2329,10 @@ yyreduce: } break; - case 131: + case 134: /* Line 1455 of yacc.c */ -#line 430 "util/configparser.y" +#line 432 "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))) @@ -2329,10 +2340,10 @@ yyreduce: } break; - case 132: + case 135: /* Line 1455 of yacc.c */ -#line 437 "util/configparser.y" +#line 439 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dlv_anchor_file); @@ -2340,10 +2351,10 @@ yyreduce: } break; - case 133: + case 136: /* Line 1455 of yacc.c */ -#line 444 "util/configparser.y" +#line 446 "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))) @@ -2351,10 +2362,10 @@ yyreduce: } break; - case 134: + case 137: /* Line 1455 of yacc.c */ -#line 451 "util/configparser.y" +#line 453 "util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2363,10 +2374,10 @@ yyreduce: } break; - case 135: + case 138: /* Line 1455 of yacc.c */ -#line 459 "util/configparser.y" +#line 461 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2375,10 +2386,10 @@ yyreduce: } break; - case 136: + case 139: /* Line 1455 of yacc.c */ -#line 467 "util/configparser.y" +#line 469 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2387,10 +2398,10 @@ yyreduce: } break; - case 137: + case 140: /* Line 1455 of yacc.c */ -#line 475 "util/configparser.y" +#line 477 "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))) @@ -2398,10 +2409,10 @@ yyreduce: } break; - case 138: + case 141: /* Line 1455 of yacc.c */ -#line 482 "util/configparser.y" +#line 484 "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))) @@ -2409,10 +2420,10 @@ yyreduce: } break; - case 139: + case 142: /* Line 1455 of yacc.c */ -#line 489 "util/configparser.y" +#line 491 "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) @@ -2422,10 +2433,10 @@ yyreduce: } break; - case 140: + case 143: /* Line 1455 of yacc.c */ -#line 498 "util/configparser.y" +#line 500 "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) @@ -2435,10 +2446,10 @@ yyreduce: } break; - case 141: + case 144: /* Line 1455 of yacc.c */ -#line 507 "util/configparser.y" +#line 509 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2446,10 +2457,10 @@ yyreduce: } break; - case 142: + case 145: /* Line 1455 of yacc.c */ -#line 514 "util/configparser.y" +#line 516 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2457,10 +2468,10 @@ yyreduce: } break; - case 143: + case 146: /* Line 1455 of yacc.c */ -#line 521 "util/configparser.y" +#line 523 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2472,10 +2483,10 @@ yyreduce: } break; - case 144: + case 147: /* Line 1455 of yacc.c */ -#line 532 "util/configparser.y" +#line 534 "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)) @@ -2484,10 +2495,10 @@ yyreduce: } break; - case 145: + case 148: /* Line 1455 of yacc.c */ -#line 540 "util/configparser.y" +#line 542 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2501,10 +2512,10 @@ yyreduce: } break; - case 146: + case 149: /* Line 1455 of yacc.c */ -#line 553 "util/configparser.y" +#line 555 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2514,10 +2525,10 @@ yyreduce: } break; - case 147: + case 150: /* Line 1455 of yacc.c */ -#line 562 "util/configparser.y" +#line 564 "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) @@ -2527,10 +2538,10 @@ yyreduce: } break; - case 148: + case 151: /* Line 1455 of yacc.c */ -#line 571 "util/configparser.y" +#line 573 "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)) @@ -2539,10 +2550,10 @@ yyreduce: } break; - case 149: + case 152: /* Line 1455 of yacc.c */ -#line 579 "util/configparser.y" +#line 581 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2556,10 +2567,10 @@ yyreduce: } break; - case 150: + case 153: /* Line 1455 of yacc.c */ -#line 592 "util/configparser.y" +#line 594 "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) @@ -2569,10 +2580,10 @@ yyreduce: } break; - case 151: + case 154: /* Line 1455 of yacc.c */ -#line 601 "util/configparser.y" +#line 603 "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) @@ -2582,10 +2593,10 @@ yyreduce: } break; - case 152: + case 155: /* Line 1455 of yacc.c */ -#line 610 "util/configparser.y" +#line 612 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2595,10 +2606,10 @@ yyreduce: } break; - case 153: + case 156: /* Line 1455 of yacc.c */ -#line 619 "util/configparser.y" +#line 621 "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-> @@ -2608,10 +2619,10 @@ yyreduce: } break; - case 154: + case 157: /* Line 1455 of yacc.c */ -#line 628 "util/configparser.y" +#line 630 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2625,10 +2636,10 @@ yyreduce: } break; - case 155: + case 158: /* Line 1455 of yacc.c */ -#line 641 "util/configparser.y" +#line 643 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2636,10 +2647,10 @@ yyreduce: } break; - case 156: + case 159: /* Line 1455 of yacc.c */ -#line 648 "util/configparser.y" +#line 650 "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) @@ -2650,10 +2661,10 @@ yyreduce: } break; - case 157: + case 160: /* Line 1455 of yacc.c */ -#line 658 "util/configparser.y" +#line 660 "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) @@ -2664,10 +2675,10 @@ yyreduce: } break; - case 158: + case 161: /* Line 1455 of yacc.c */ -#line 668 "util/configparser.y" +#line 670 "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) @@ -2678,10 +2689,10 @@ yyreduce: } break; - case 159: + case 162: /* Line 1455 of yacc.c */ -#line 678 "util/configparser.y" +#line 680 "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) @@ -2692,10 +2703,10 @@ yyreduce: } break; - case 160: + case 163: /* Line 1455 of yacc.c */ -#line 688 "util/configparser.y" +#line 690 "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) @@ -2706,10 +2717,10 @@ yyreduce: } break; - case 161: + case 164: /* Line 1455 of yacc.c */ -#line 698 "util/configparser.y" +#line 700 "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) @@ -2720,10 +2731,10 @@ yyreduce: } break; - case 162: + case 165: /* Line 1455 of yacc.c */ -#line 708 "util/configparser.y" +#line 710 "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))) @@ -2731,10 +2742,10 @@ yyreduce: } break; - case 163: + case 166: /* Line 1455 of yacc.c */ -#line 715 "util/configparser.y" +#line 717 "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))) @@ -2742,10 +2753,10 @@ yyreduce: } break; - case 164: + case 167: /* Line 1455 of yacc.c */ -#line 722 "util/configparser.y" +#line 724 "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) @@ -2755,10 +2766,10 @@ yyreduce: } break; - case 165: + case 168: /* Line 1455 of yacc.c */ -#line 731 "util/configparser.y" +#line 733 "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))) @@ -2766,10 +2777,10 @@ yyreduce: } break; - case 166: + case 169: /* Line 1455 of yacc.c */ -#line 738 "util/configparser.y" +#line 740 "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) @@ -2780,10 +2791,10 @@ yyreduce: } break; - case 167: + case 170: /* Line 1455 of yacc.c */ -#line 748 "util/configparser.y" +#line 750 "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 && @@ -2798,10 +2809,10 @@ yyreduce: } break; - case 168: + case 171: /* Line 1455 of yacc.c */ -#line 762 "util/configparser.y" +#line 764 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -2809,10 +2820,10 @@ yyreduce: } break; - case 169: + case 172: /* Line 1455 of yacc.c */ -#line 769 "util/configparser.y" +#line 771 "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) { @@ -2831,10 +2842,10 @@ yyreduce: } break; - case 170: + case 173: /* Line 1455 of yacc.c */ -#line 787 "util/configparser.y" +#line 789 "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) { @@ -2848,10 +2859,10 @@ yyreduce: } break; - case 171: + case 174: /* Line 1455 of yacc.c */ -#line 800 "util/configparser.y" +#line 802 "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) { @@ -2865,10 +2876,10 @@ yyreduce: } break; - case 172: + case 175: /* Line 1455 of yacc.c */ -#line 813 "util/configparser.y" +#line 815 "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) @@ -2878,10 +2889,10 @@ yyreduce: } break; - case 173: + case 176: /* Line 1455 of yacc.c */ -#line 822 "util/configparser.y" +#line 824 "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) @@ -2891,10 +2902,10 @@ yyreduce: } break; - case 174: + case 177: /* Line 1455 of yacc.c */ -#line 831 "util/configparser.y" +#line 833 "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) @@ -2904,10 +2915,10 @@ yyreduce: } break; - case 175: + case 178: /* Line 1455 of yacc.c */ -#line 840 "util/configparser.y" +#line 842 "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) @@ -2918,10 +2929,10 @@ yyreduce: } break; - case 176: + case 179: /* Line 1455 of yacc.c */ -#line 850 "util/configparser.y" +#line 852 "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) @@ -2932,10 +2943,10 @@ yyreduce: } break; - case 177: + case 180: /* Line 1455 of yacc.c */ -#line 860 "util/configparser.y" +#line 862 "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) @@ -2945,10 +2956,10 @@ yyreduce: } break; - case 178: + case 181: /* Line 1455 of yacc.c */ -#line 869 "util/configparser.y" +#line 871 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -2956,10 +2967,49 @@ yyreduce: } break; - case 179: + case 182: + +/* Line 1455 of yacc.c */ +#line 878 "util/configparser.y" + { + OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->add_holddown = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 183: /* Line 1455 of yacc.c */ -#line 876 "util/configparser.y" +#line 887 "util/configparser.y" + { + OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->del_holddown = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 184: + +/* Line 1455 of yacc.c */ +#line 896 "util/configparser.y" + { + OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->keep_missing = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 185: + +/* Line 1455 of yacc.c */ +#line 905 "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)) @@ -2968,10 +3018,10 @@ yyreduce: } break; - case 180: + case 186: /* Line 1455 of yacc.c */ -#line 884 "util/configparser.y" +#line 913 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2985,10 +3035,10 @@ yyreduce: } break; - case 181: + case 187: /* Line 1455 of yacc.c */ -#line 897 "util/configparser.y" +#line 926 "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)) @@ -2997,10 +3047,10 @@ yyreduce: } break; - case 182: + case 188: /* Line 1455 of yacc.c */ -#line 905 "util/configparser.y" +#line 934 "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 && @@ -3021,10 +3071,10 @@ yyreduce: } break; - case 183: + case 189: /* Line 1455 of yacc.c */ -#line 925 "util/configparser.y" +#line 954 "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))) @@ -3032,10 +3082,10 @@ yyreduce: } break; - case 184: + case 190: /* Line 1455 of yacc.c */ -#line 932 "util/configparser.y" +#line 961 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3051,10 +3101,10 @@ yyreduce: } break; - case 185: + case 191: /* Line 1455 of yacc.c */ -#line 947 "util/configparser.y" +#line 976 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->stubs->name); @@ -3062,10 +3112,10 @@ yyreduce: } break; - case 186: + case 192: /* Line 1455 of yacc.c */ -#line 954 "util/configparser.y" +#line 983 "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))) @@ -3073,10 +3123,10 @@ yyreduce: } break; - case 187: + case 193: /* Line 1455 of yacc.c */ -#line 961 "util/configparser.y" +#line 990 "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))) @@ -3084,10 +3134,10 @@ yyreduce: } break; - case 188: + case 194: /* Line 1455 of yacc.c */ -#line 968 "util/configparser.y" +#line 997 "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) @@ -3098,10 +3148,10 @@ yyreduce: } break; - case 189: + case 195: /* Line 1455 of yacc.c */ -#line 978 "util/configparser.y" +#line 1007 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->forwards->name); @@ -3109,10 +3159,10 @@ yyreduce: } break; - case 190: + case 196: /* Line 1455 of yacc.c */ -#line 985 "util/configparser.y" +#line 1014 "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))) @@ -3120,10 +3170,10 @@ yyreduce: } break; - case 191: + case 197: /* Line 1455 of yacc.c */ -#line 992 "util/configparser.y" +#line 1021 "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))) @@ -3131,19 +3181,19 @@ yyreduce: } break; - case 192: + case 198: /* Line 1455 of yacc.c */ -#line 999 "util/configparser.y" +#line 1028 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 202: + case 208: /* Line 1455 of yacc.c */ -#line 1010 "util/configparser.y" +#line 1039 "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) @@ -3154,10 +3204,10 @@ yyreduce: } break; - case 203: + case 209: /* Line 1455 of yacc.c */ -#line 1020 "util/configparser.y" +#line 1049 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3167,10 +3217,10 @@ yyreduce: } break; - case 204: + case 210: /* Line 1455 of yacc.c */ -#line 1029 "util/configparser.y" +#line 1058 "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))) @@ -3178,10 +3228,10 @@ yyreduce: } break; - case 205: + case 211: /* Line 1455 of yacc.c */ -#line 1036 "util/configparser.y" +#line 1065 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3189,10 +3239,10 @@ yyreduce: } break; - case 206: + case 212: /* Line 1455 of yacc.c */ -#line 1043 "util/configparser.y" +#line 1072 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3200,10 +3250,10 @@ yyreduce: } break; - case 207: + case 213: /* Line 1455 of yacc.c */ -#line 1050 "util/configparser.y" +#line 1079 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3211,10 +3261,10 @@ yyreduce: } break; - case 208: + case 214: /* Line 1455 of yacc.c */ -#line 1057 "util/configparser.y" +#line 1086 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3222,19 +3272,19 @@ yyreduce: } break; - case 209: + case 215: /* Line 1455 of yacc.c */ -#line 1064 "util/configparser.y" +#line 1093 "util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 213: + case 219: /* Line 1455 of yacc.c */ -#line 1073 "util/configparser.y" +#line 1102 "util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -3245,7 +3295,7 @@ yyreduce: /* Line 1455 of yacc.c */ -#line 3249 "util/configparser.c" +#line 3299 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3457,7 +3507,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1078 "util/configparser.y" +#line 1107 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 7f8ef12d9..1a5c5f2ee 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -145,7 +145,10 @@ VAR_VAL_SIG_SKEW_MAX = 361, VAR_CACHE_MIN_TTL = 362, VAR_VAL_LOG_LEVEL = 363, - VAR_AUTO_TRUST_ANCHOR_FILE = 364 + VAR_AUTO_TRUST_ANCHOR_FILE = 364, + VAR_KEEP_MISSING = 365, + VAR_ADD_HOLDDOWN = 366, + VAR_DEL_HOLDDOWN = 367 }; #endif /* Tokens. */ @@ -256,6 +259,9 @@ #define VAR_CACHE_MIN_TTL 362 #define VAR_VAL_LOG_LEVEL 363 #define VAR_AUTO_TRUST_ANCHOR_FILE 364 +#define VAR_KEEP_MISSING 365 +#define VAR_ADD_HOLDDOWN 366 +#define VAR_DEL_HOLDDOWN 367 @@ -272,7 +278,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 276 "util/configparser.h" +#line 282 "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 c71a1ec70..0ea227e19 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -99,7 +99,8 @@ 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 +%token VAR_AUTO_TRUST_ANCHOR_FILE VAR_KEEP_MISSING VAR_ADD_HOLDDOWN +%token VAR_DEL_HOLDDOWN %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -150,7 +151,8 @@ content_server: server_num_threads | server_verbosity | server_port | 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_auto_trust_anchor_file + server_auto_trust_anchor_file | server_add_holddown | + server_del_holddown | server_keep_missing ; stubstart: VAR_STUB_ZONE { @@ -872,6 +874,33 @@ server_val_nsec3_keysize_iterations: VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG cfg_parser->cfg->val_nsec3_key_iterations = $2; } ; +server_add_holddown: VAR_ADD_HOLDDOWN STRING_ARG + { + OUTYY(("P(server_add_holddown:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->add_holddown = atoi($2); + free($2); + } + ; +server_del_holddown: VAR_DEL_HOLDDOWN STRING_ARG + { + OUTYY(("P(server_del_holddown:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->del_holddown = atoi($2); + free($2); + } + ; +server_keep_missing: VAR_KEEP_MISSING STRING_ARG + { + OUTYY(("P(server_keep_missing:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->keep_missing = atoi($2); + free($2); + } + ; server_key_cache_size: VAR_KEY_CACHE_SIZE STRING_ARG { OUTYY(("P(server_key_cache_size:%s)\n", $2));